diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..c4f73e690c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/.idea/*
+/target/*
+/build.properties
+/build.log
+/tmp/*
\ No newline at end of file
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000000..ac279f753a
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,213 @@
+# This is the properties-file for building imCMS with ant.
+# You just have to fill in the blanks.
+# You shouldn't change any defaults unless you know what you are doing.
+
+# Database schema version.
+db-schema-version = 4.17
+
+# Denies multiple login for same user. To enable this option change property value to true. 
+deny-multiple-user-login = false
+
+#Server host
+server-name = http://localhost:8080
+
+# Database parameters
+
+db-host = localhost
+db-name = imcmsrb4
+db-user = root
+db-pass = root
+db-maxconnections = 20
+
+# For MSSQL
+#db-target = mssql
+#db-port = 1433
+#db-driver = net.sourceforge.jtds.jdbc.Driver
+#db-url-without-db-name = jdbc:jtds:sqlserver://${db-host}:${db-port}/;AppName=imCMS
+#db-url = ${db-url-without-db-name};DatabaseName=${db-name}
+
+# For MySQL
+db-target = mysql
+db-port = 3306
+db-driver = com.mysql.jdbc.Driver
+db-url-without-db-name = jdbc:mysql://${db-host}:${db-port}/
+db-url = ${db-url-without-db-name}${db-name}?characterEncoding=utf8
+
+cgi-metadata-url = https://m00-mg-local.testidp.funktionstjanster.se/samlv2/idp/metadata/0/0
+authentication-configuration = loginPassword,cgi
+cgi-user-role-name = BankID
+external-authenticator=
+external-user-and-role-registry=
+#Azure Active Directory authentication parameter
+aad.client.id=92a11e03-7eb3-420e-9a8a-1c874307a9a2
+aad.secret.key=2l8MLkts2Y77x+ClvyQg5KzKzYxpURoYUADTi/tfiRs=
+aad.tenant.id=sergmaximchukgmail.onmicrosoft.com
+
+# LDAP-authentication-parameters
+
+ldap-url = ldap://localhost:389/CN=Users,DC=example,DC=com
+ldap-bind-dn =
+ldap-password =
+ldap-test-user =
+ldap-test-password =
+ldap-read-timeout-millis = 5000
+ldap-max-connections = 20
+ldap-connection-expiry-seconds = 540
+ldap-user-object-class = inetOrgPerson
+ldap-attribute-login-name = uid
+
+# For Microsoft Active Directory
+#ldap-user-object-class = user
+#ldap-attribute-login-name = sAMAccountName
+
+
+secondary-external-authenticator =
+secondary-external-user-and-role-registry =
+
+# Secondary LDAP-authentication-parameters
+
+secondary-ldap-url = ldap://localhost:389/CN=Users,DC=example,DC=com
+secondary-ldap-bind-dn =
+secondary-ldap-password =
+secondary-ldap-test-user =
+secondary-ldap-test-password =
+secondary-ldap-user-object-class = inetOrgPerson
+secondary-ldap-attribute-login-name = uid
+
+# For Microsoft Active Directory
+#secondary-ldap-user-object-class = user
+#secondary-ldap-attribute-login-name = sAMAccountName
+
+
+sso-enabled = false
+
+sso-use-local-jaas-config = true
+sso-jaas-config-name = Imcms
+sso-jaas-principal-name = 
+sso-jaas-principal-password = 
+
+sso-use-local-krb-config = true
+sso-krb-realm = 
+sso-krb-kdc = 
+
+sso-kerberos-debug = false
+
+
+# The smtp-server used for sending mails.
+
+smtp-server =
+
+
+# The name and e-mail-address of the servermaster.
+
+servermaster-name  =
+servermaster-email =
+
+
+# The name and e-mail-address of the webmaster.
+# Defaults to the values for the servermaster.
+
+webmaster-name  = ${servermaster-name}
+webmaster-email = ${servermaster-email}
+
+
+# The default language to use when build the webapp ( swe | eng )
+
+defaultlanguage = eng
+
+
+# The imCMS documents is usually on the imCMS public site, http://doc.imcms.net/
+# If you want to install a local server for handling (modifying) the documents
+# change this:
+
+documentation-host = doc.imcms.net
+
+
+# URL to the separate image archive application, as seen by the clients browser.
+# For example: test.com/image-archive/archive
+# 
+# <host> [":" <port>] "/" <context-path> "/archive"
+image-archive-url = 
+
+# IDs of the roles that are allowed to see the "Choose from image archive" button in image edit page, delimited by ",".
+# If not specified, everyone is allowed.
+image-archive-allowed-role-ids = 
+
+# IDs of the roles that are allowed to see the "Choose file" (old archive) button in image edit page, delimited by ",".
+# If not specified, everyone is allowed.
+choose-file-allowed-role-ids = 
+
+# ImageMagick is a software suite for creating, editing and composing images. It can be downloaded from http://www.imagemagick.org. 
+# It is used by both image archive and image handling. 
+# This path should lead to where ImageMagick is installed, and is required only on windows.
+# For example: c:/program files/imagemagick-6.4.9-q16
+image-magick-path = 
+
+# Maximum size in bytes of cache for images created in the text editor (xinha). By default 500 MB.
+image-cache-max-size = 524288000
+
+# Enables login passwords encryption
+# Type: boolean; optional; default: false
+# Any non-true value or absence of value is treated as false.
+# When enabled
+# --passwords are stored in encrypted form.
+# --any unencrypted passwords will be encrypted on system start/restart.
+# Since 4.0.7
+login-password-encryption-enabled =
+
+# Shared salt used in login passwords encryption.
+# Type: string; optional; default: blank
+# An additional, shared 'salt' used for all internal users' login passwords encryption.
+# WARNING!
+# Assigning a different value on a running system with enabled password encryption
+# will immediately lead to inability to login for all internal users whom passwords are already encrypted.
+# See description of [login-password-encryption-enabled] property.
+# Since 4.0.7
+login-password-encryption-salt =
+
+# Password reset lifespan in hours, after rest link is created and sent by email
+# Type: positive int; optional; default: 24 (hours)
+# Since 4.0.7
+login-password-reset-lifespan =
+
+# Allows superadmins to reset their passwords.
+# Type: boolean; optional; default: false
+# Any non-true value or absence of value is treated as false.
+# Since 4.0.7
+superadmin-login-password-reset-allowed =
+
+# Maximum number of cached image size objects.
+image-size-cache-objects = 10000
+
+# Comma separated list of mime types
+# Since 4.2.4
+index-disabled-file-mimes =
+
+# Comma separated list of filename extensions
+# Since 4.2.4
+index-disabled-file-extensions =
+
+# Error logger url.
+error-logger-url =
+
+#SMS Gateway settings
+sms.gateway.username =
+sms.gateway.password =
+sms.gateway.url =
+sms.gateway.originAddress =
+sms.gateway.defaultCountryCode =
+
+#2FA settings
+2fa.cookie.lifetime =
+
+# Filters
+
+# Type: boolean; optional; default: true
+csrf-include = true
+
+# Type: boolean; optional; default: true
+xss-include = true
+
+AllowFileAdmin =
+
+w3c.validation = true
diff --git a/build.properties.template b/build.properties.template
index 4ae6b01500..d09b8d91db 100644
--- a/build.properties.template
+++ b/build.properties.template
@@ -2,26 +2,15 @@
 # You just have to fill in the blanks.
 # You shouldn't change any defaults unless you know what you are doing.
 
-
-# The deployment directory (parent of the webapp directory).
-# Do *not* use back-slashes ('\'). Use forward-slashes ('/').
-# You only need this if you want to use "ant install" and "ant install-war".
-
-deployroot =
-
-
-# The name of the webapp. Used for filenames and URIs.
-
-webappname = imcms
-
-
-# The deployed web application diretory
-
-webapproot = ${deployroot}/${webappname}
+# Database schema version.
+db-schema-version = 4.17
 
 # Denies multiple login for same user. To enable this option change property value to true. 
 deny-multiple-user-login = false
 
+#Server host
+server-name = http://localhost:8080
+
 # Database parameters
 
 db-host = localhost
@@ -31,19 +20,23 @@ db-pass =
 db-maxconnections = 20
 
 # For MSSQL
-db-target = mssql
-db-port = 1433
-db-driver = net.sourceforge.jtds.jdbc.Driver
-db-url-without-db-name = jdbc:jtds:sqlserver://${db-host}:${db-port}/;AppName=imCMS
-db-url = ${db-url-without-db-name};DatabaseName=${db-name}
+#db-target = mssql
+#db-port = 1433
+#db-driver = net.sourceforge.jtds.jdbc.Driver
+#db-url-without-db-name = jdbc:jtds:sqlserver://${db-host}:${db-port}/;AppName=imCMS
+#db-url = ${db-url-without-db-name};DatabaseName=${db-name}
 
 # For MySQL
-#db-target = mysql
-#db-port = 3306
-#db-driver = com.mysql.jdbc.Driver
-#db-url-without-db-name = jdbc:mysql://${db-host}:${db-port}/
-#db-url = ${db-url-without-db-name}${db-name}?characterEncoding=utf8
+db-target = mysql
+db-port = 3306
+db-driver = com.mysql.jdbc.Driver
+db-url-without-db-name = jdbc:mysql://${db-host}:${db-port}/
+db-url = ${db-url-without-db-name}${db-name}?characterEncoding=utf8
 
+cgi-metadata-url = https://m00-mg-local.testidp.funktionstjanster.se/samlv2/idp/metadata/0/0
+#Add '2FA' to enable sms authentication
+authentication-configuration = loginPassword,cgi
+cgi-user-role-name = BankID
 
 external-authenticator =
 external-user-and-role-registry =
@@ -55,6 +48,9 @@ ldap-bind-dn =
 ldap-password =
 ldap-test-user =
 ldap-test-password =
+ldap-read-timeout-millis = 5000
+ldap-max-connections = 20
+ldap-connection-expiry-seconds = 540
 ldap-user-object-class = inetOrgPerson
 ldap-attribute-login-name = uid
 
@@ -81,6 +77,20 @@ secondary-ldap-attribute-login-name = uid
 #secondary-ldap-attribute-login-name = sAMAccountName
 
 
+sso-enabled = false
+
+sso-use-local-jaas-config = true
+sso-jaas-config-name = Imcms
+sso-jaas-principal-name = 
+sso-jaas-principal-password = 
+
+sso-use-local-krb-config = true
+sso-krb-realm = 
+sso-krb-kdc = 
+
+sso-kerberos-debug = false
+
+
 # The smtp-server used for sending mails.
 
 smtp-server =
@@ -104,11 +114,6 @@ webmaster-email = ${servermaster-email}
 defaultlanguage = eng
 
 
-# The root-URI of the webapp, relative to the server root-URI (/).
-
-rooturl = /${webappname}
-
-
 # The imCMS documents is usually on the imCMS public site, http://doc.imcms.net/
 # If you want to install a local server for handling (modifying) the documents
 # change this:
@@ -116,37 +121,82 @@ rooturl = /${webappname}
 documentation-host = doc.imcms.net
 
 
-# Whether the build should be optimized or not.
-
-optimize = on
-
-
-# Whether to leave debug info in or not.
-
-debug = on
-
-
-# Whether to compile with deprecation warnings on or not.
-
-deprecation = on
-
-
-# For JUnit-tests to work, you need to add junit.jar to the classpath of ant.
-# If this is impossible, uncomment the following property.
-# Note that this will prevent tests from running.
-
-#no-junit-task-available
-
-
-# Which log4j-config-file to use.
-# You might want to change this to log4j-debug.xml to turn on debug-logs.
-
-log4j-config = log4j-nodebug.xml
-
-
-# Tomcat settings for quick deployment during development
-
-tomcat-admin-username = admin
-tomcat-admin-password =
-tomcat-webapp-manager-url = http://localhost:8080/manager
-tomcat-deployroot-local-directory =
+# URL to the separate image archive application, as seen by the clients browser.
+# For example: test.com/image-archive/archive
+# 
+# <host> [":" <port>] "/" <context-path> "/archive"
+image-archive-url = 
+
+# IDs of the roles that are allowed to see the "Choose from image archive" button in image edit page, delimited by ",".
+# If not specified, everyone is allowed.
+image-archive-allowed-role-ids = 
+
+# IDs of the roles that are allowed to see the "Choose file" (old archive) button in image edit page, delimited by ",".
+# If not specified, everyone is allowed.
+choose-file-allowed-role-ids = 
+
+# ImageMagick is a software suite for creating, editing and composing images. It can be downloaded from http://www.imagemagick.org. 
+# It is used by both image archive and image handling. 
+# This path should lead to where ImageMagick is installed, and is required only on windows.
+# For example: c:/program files/imagemagick-6.4.9-q16
+image-magick-path = 
+
+# Maximum size in bytes of cache for images created in the text editor (xinha). By default 500 MB.
+image-cache-max-size = 524288000
+
+# Enables login passwords encryption
+# Type: boolean; optional; default: false
+# Any non-true value or absence of value is treated as false.
+# When enabled
+# --passwords are stored in encrypted form.
+# --any unencrypted passwords will be encrypted on system start/restart.
+# Since 4.0.7
+login-password-encryption-enabled =
+
+# Shared salt used in login passwords encryption.
+# Type: string; optional; default: blank
+# An additional, shared 'salt' used for all internal users' login passwords encryption.
+# WARNING!
+# Assigning a different value on a running system with enabled password encryption
+# will immediately lead to inability to login for all internal users whom passwords are already encrypted.
+# See description of [login-password-encryption-enabled] property.
+# Since 4.0.7
+login-password-encryption-salt =
+
+# Password reset lifespan in hours, after rest link is created and sent by email
+# Type: positive int; optional; default: 24 (hours)
+# Since 4.0.7
+login-password-reset-lifespan =
+
+# Allows superadmins to reset their passwords.
+# Type: boolean; optional; default: false
+# Any non-true value or absence of value is treated as false.
+# Since 4.0.7
+superadmin-login-password-reset-allowed =
+
+# Maximum number of cached image size objects.
+image-size-cache-objects = 10000
+
+# Comma separated list of mime types
+# Since 4.2.4
+index-disabled-file-mimes =
+
+# Comma separated list of filename extensions
+# Since 4.2.4
+index-disabled-file-extensions =
+
+# Error logger url.
+error-logger-url =
+
+#SMS Gateway settings
+sms.gateway.username =
+sms.gateway.password =
+sms.gateway.url =
+sms.gateway.originAddress =
+sms.gateway.defaultCountryCode =
+
+#2FA settings
+2fa.cookie.lifetime =
+
+# comma separated user ids allowed to access FileAdmin
+AllowFileAdmin =
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 4f41bb8746..48ff6ca741 100644
--- a/build.xml
+++ b/build.xml
@@ -86,8 +86,6 @@
     <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask" classpathref="libraries"/>
     <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask" classpathref="libraries"/>
 
-    <setsystemproperty name="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.NoOpLog"/>
-
     <taskdef classname="org.apache.jasper.JspC" name="jasper2" classpathref="libraries-with-commons-logging"/>
     <taskdef resource="checkstyletask.properties" classpathref="libraries-with-commons-logging"/>
     <taskdef name="ddl2db" classname="org.apache.ddlutils.task.DdlToDatabaseTask"  classpathref="libraries-with-commons-logging"/>
@@ -96,7 +94,7 @@
 
     <target name="dist" depends="bindist,srcdist" description="Build all binary and source distributions."/>
 
-    <target name="bindist" depends="bindist-jar,bindist-zip,bindist-tgz" description="Build all binary distributions."/>
+    <target name="bindist" depends="bindist-jar,bindist-api-jar,bindist-zip,bindist-tgz" description="Build all binary distributions."/>
 
     <target name="bindist-zip" depends="bindist-war">
         <mkdir dir="${dist}"/>
@@ -125,7 +123,12 @@
         <war warfile="${war}" basedir="${build}" webxml="${WEB-INF}/web.xml"/>
     </target>
 
-    <target name="bindist-jar" depends="test">
+    <target name="bindist-jar" depends="build">
+        <mkdir dir="${dist}"/>
+        <copy file="${jar}" tofile="${bindist-jar}"/>
+    </target>
+        
+    <target name="bindist-api-jar" depends="test">
         <mkdir dir="${dist}"/>
         <jar destfile="${bindist-api-jar}" basedir="${classes}" includes="com/imcode/imcms/api/**"/>
     </target>
@@ -192,17 +195,17 @@
     </target>
 
     <target name="database-create" depends="init">
-
         <sql classpathref="libraries" driver="${db-driver}" url="${db-url-without-db-name}"
              userid="${db-user}" password="${db-pass}" delimiter=";" onerror="abort">
             CREATE DATABASE ${db-name}
         </sql>
+    </target>
 
+    <target name="database-init" depends="init">
         <sql classpathref="libraries" driver="${db-driver}" url="${db-url}"
             userid="${db-user}" password="${db-pass}" delimiter=";" onerror="abort">
             <transaction src="${sql}/imcms${versionfilesuffix}-${defaultlanguage}-${db-target}.sql"/>
         </sql>
-
     </target>
 
     <target name="database-drop" depends="init">
@@ -216,6 +219,8 @@
 
     <target name="database-recreate" depends="init,database-drop,database-create"/>
 
+    <target name="database-recreate-init" depends="init,database-drop,database-create,database-init"/>
+
     <target name="install" depends="init,check-deployroot" description="Install files already built, without running 'build' first.">
         <copy todir="${webapproot}">
             <fileset dir="${build}"/>
@@ -313,7 +318,7 @@
 
         <javac destdir="${classes}"
             debug="${debug}" optimize="${optimize}" deprecation="${deprecation}"
-            source="1.5" target="1.5"
+            source="1.6" target="1.6"
             encoding="iso-8859-1">
 
             <src path="server/src"/>
@@ -376,6 +381,10 @@
             <fileset dir="sql/diff" includes="diff-*.sql"/>
         </copy>
 
+        <copy todir="${sql-diff}">
+            <fileset file="sql/diff/schema-upgrade.xml"/>
+        </copy>
+
         <copy todir="${sql-sprocs}">
             <fileset dir="sql/sprocs" includes="*.prc"/>
         </copy>
@@ -520,6 +529,7 @@
 
         <property name="sprocs-sql" value="${sql}/imcms-sprocs${versionfilesuffix}.sql"/>
 
+        <property name="bindist-jar" value="${dist}/imcms${versionfilesuffix}.jar"/>        
         <property name="bindist-api-jar" value="${dist}/imcms${versionfilesuffix}-api.jar"/>
         <property name="bindist-util-jar" value="${dist}/imcms${versionfilesuffix}-util.jar"/>
 
@@ -536,7 +546,6 @@
         depends="check-build-properties,init-version-properties">
 
         <filter token="defaultlanguage" value="${defaultlanguage}"/>
-
         <filter token="documentationwebappurl" value="http://${documentation-host}/${versionnumber}"/>
         <filter token="documentationurl" value="http://${documentation-host}/${versionnumber}"/>
 
@@ -549,12 +558,24 @@
         <filter token="db-pass" value="${db-pass}"/>
         <filter token="db-maxconnections" value="${db-maxconnections}"/>
 
+		<filter token="server-name" value="${ServerName}"/>
+		<filter token="cgi-metadata-url" value="${CgiMetadataUrl}"/>
+		<filter token="authentication-configuration" value="${AuthenticationConfiguration}"/>
+		<filter token="cgi-user-role-name" value="${CgiUserRoleName}"/>
+
+        <!--<filter token="authentication-method-1" value="${authentication-method-1}"/>-->
+        <!--<filter token="authentication-method-2" value="${authentication-method-2}"/>-->
+        <!--<filter token="cgi-authentication-method-url" value="${cgi-authentication-method-url}"/>-->
+
         <filter token="external-authenticator" value="${external-authenticator}"/>
         <filter token="external-user-and-role-registry" value="${external-user-and-role-registry}"/>
 
         <filter token="ldap-url" value="${ldap-url}"/>
         <filter token="ldap-bind-dn" value="${ldap-bind-dn}"/>
         <filter token="ldap-password" value="${ldap-password}"/>
+        <filter token="ldap-read-timeout-millis" value="${ldap-read-timeout-millis}"/>
+        <filter token="ldap-max-connections" value="${ldap-max-connections}"/>
+        <filter token="ldap-connection-expiry-seconds" value="${ldap-connection-expiry-seconds}"/>
         <filter token="ldap-user-object-class" value="${ldap-user-object-class}"/>
         <filter token="ldap-attribute-login-name" value="${ldap-attribute-login-name}"/>
 
@@ -569,6 +590,20 @@
         <filter token="secondary-ldap-attribute-login-name" value="${secondary-ldap-attribute-login-name}"/>
 
 
+        <filter token="sso-enabled" value="${sso-enabled}"/>
+        
+        <filter token="sso-jaas-config-name" value="${sso-jaas-config-name}"/>
+        <filter token="sso-use-local-jaas-config" value="${sso-use-local-jaas-config}"/>
+        <filter token="sso-jaas-principal-name" value="${sso-jaas-principal-name}"/>
+        <filter token="sso-jaas-principal-password" value="${sso-jaas-principal-password}"/>
+        
+        <filter token="sso-use-local-krb-config" value="${sso-use-local-krb-config}"/>
+        <filter token="sso-krb-realm" value="${sso-krb-realm}"/>
+        <filter token="sso-krb-kdc" value="${sso-krb-kdc}"/>
+        
+        <filter token="sso-kerberos-debug" value="${sso-kerberos-debug}"/>
+
+
         <filter token="smtp-server" value="${smtp-server}"/>
 
         <filter token="servermaster-name" value="${servermaster-name}"/>
@@ -577,6 +612,11 @@
         <filter token="webmaster-name" value="${webmaster-name}"/>
         <filter token="webmaster-email" value="${webmaster-email}"/>
 
+	<filter token="image-archive-url" value="${image-archive-url}"/>
+	<filter token="image-archive-allowed-role-ids" value="${image-archive-allowed-role-ids}"/>
+	<filter token="choose-file-allowed-role-ids" value="${choose-file-allowed-role-ids}"/>
+	<filter token="image-magick-path" value="${image-magick-path}"/>
+	<filter token="image-cache-max-size" value="${image-cache-max-size}"/>
     </target>
 
     <!-- Check targets -->
diff --git a/docs/BUILD.TXT b/docs/BUILD.TXT
index 5a8caed171..6643bc1e60 100644
--- a/docs/BUILD.TXT
+++ b/docs/BUILD.TXT
@@ -3,7 +3,7 @@ Building imCMS:
 
 Prerequisites:
 
-    * Install the Java Development Kit version 1.4 or later.
+    * Install the Java Development Kit version 1.5 or later.
 
     * Install Apache Ant 1.6.2 or later.
 
diff --git a/docs/CHANGES.HTML b/docs/CHANGES.HTML
new file mode 100644
index 0000000000..f10746c784
--- /dev/null
+++ b/docs/CHANGES.HTML
@@ -0,0 +1,3749 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+                    Changes in imCMS
+                 </title>
+<link rel="stylesheet" href="changes.css">
+</head>
+<body>
+<h1>
+        Changes in version 4.0.0</h1>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_4596"></a>
+<p>
+                The HTMLArea text field editor was no longer supported and has been replaced with Xinha.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4596">Issue 4596</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_206"></a>
+<p>
+                imCMS now automatically upgrades the database on startup.
+                When upgrading from version 3.0 or later, no manual running of SQL scripts is required.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=206">Issue 206</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4491"></a><a name="issue_4593"></a>
+<p>
+                The default character encoding has been changed from windows-1252 to UTF-8. 
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4491">Issue 4491</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4593">Issue 4593</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_4677"></a>
+<p>
+                Fixed a crash when trying to add a link to a document that doesn't exist.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4677">Issue 4677</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3437"></a>
+<p>
+                Created new "dual list" user interface for setting document categories.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3437">Issue 3437</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2939"></a><a name="issue_4605"></a>
+<p>
+                Created a new user interface for editing menus.
+                Menus are now edited on a separate page from the containing text document. 
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2939">Issue 2939</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4605">Issue 4605</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2155"></a>
+<p>
+                Menus can now be sorted in order of published datetime.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2155">Issue 2155</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4636"></a>
+<p>
+                The "Edit permissions for new documents" was wrongly displayed for non-text documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4636">Issue 4636</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_4724"></a>
+<p>
+                The template administration user interface would crash if demo template directory was missing.
+                It will now be created if needed.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4724">Issue 4724</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4595"></a>
+<p>
+                Use english language error page if no user language is available.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4595">Issue 4595</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4687"></a>
+<p>
+                The maximum length for a category name was changed from 50 characters to 128.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4687">Issue 4687</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_4712"></a>
+<p>
+                Added API method <span class="method">Image.toHtmlTag()</span> for 
+                generating the html tag for an <span class="class">Image</span>. 
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4712">Issue 4712</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4623"></a>
+<p>
+                Added 
+        "<span class="attr">title</span>"
+     attribute to <span class="tag">&lt;img&gt;</span>
+                with the same content as the 
+        "<span class="attr">alt</span>"
+     attribute.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4623">Issue 4623</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4579"></a>
+<p>
+                Removed non-XHTML compatible 
+        "<span class="attr">border</span>"
+     attribute from <span class="tag">&lt;img&gt;</span>,
+                instead passing through 
+        "<span class="attr">style</span>"
+    , 
+        "<span class="attr">class</span>"
+    , and 
+        "<span class="attr">usemap</span>"
+     attributes
+                from the <span class="tag">&lt;imcms:image&gt;</span> in the template.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4579">Issue 4579</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4581"></a>
+<p>
+                Line breaks in text fields now generate <span class="tag">"&lt;br /&gt;"</span> instead of <span class="tag">"&lt;BR&gt;"</span>,
+                providing XHTML compatibility.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4581">Issue 4581</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4553"></a>
+<p>
+<span class="method">UserService.saveUser(User)</span> did not respect the UserAdmin role.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4553">Issue 4553</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 3.2.0</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_2155"></a>
+<p>
+                Added "by published datetime" sorting to menus.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2155">Issue 2155</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4500"></a>
+<p>
+                Fixed "NullPointerException in FrequencyOrderedBag" crash.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4500">Issue 4500</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4498"></a>
+<p>
+                Fixed crash caused by menuitems not being properly removed
+                when deleting a document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4498">Issue 4498</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4800"></a>
+<p>
+                Fixed crash caused by documents not being removed from the cache
+                when their template was deleted.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4800">Issue 4800</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_4833"></a>
+<p>
+                Fixed image preview in the file administrator. 
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4833">Issue 4833</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_4412"></a>
+<p>
+                Added capability to send HTML mail.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4412">Issue 4412</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4412"></a>
+<p>
+                Mails now use UTF-8 encoding.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4412">Issue 4412</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4505"></a>
+<p>
+                Fixed a typo in <a class="localfile" href="TEMPLATE_SYNTAX.TXT">TEMPLATE_SYNTAX.TXT</a>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4505">Issue 4505</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4553"></a>
+<p>
+                Fixed a bug preventing users with the UserAdmin role
+                from editing users through the API.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4553">Issue 4553</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4804"></a>
+<p>
+                Fixed a bug making it impossible to change sort keys for menu items
+                through the API.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4804">Issue 4804</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_4506"></a>
+<p>
+                Made the error page output less redundant by only displaying one stack trace.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4506">Issue 4506</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 3.1.2</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_4380"></a>
+<p>
+                Fixed bug that made it impossible to create new documents if there was a category-type defined.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4380">Issue 4380</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4385"></a>
+<p>
+                Made option "linked for unauthorized users" work in searches as well as in menus.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4385">Issue 4385</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4401"></a>
+<p>
+                Fixed bug that caused template ids not to be cloned when cloning text documents.
+                This means that for example changing the template for a newly created text document
+                also changes the template of the parent in the cache.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4401">Issue 4401</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_4415"></a>
+<p>
+                Fixed error when running api example "<span class="path">document_search.jsp</span>"
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4415">Issue 4415</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4352"></a>
+<p>
+                Fixed bug that excluded documents without a valid archived datetime from search result.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4352">Issue 4352</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4386"></a>
+<p>
+                Made the list returned by <span class="method">DocumentService.getDocuments(SearchQuery)</span> modifiable.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4386">Issue 4386</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4415"></a>
+<p>
+                Fixed bug when trying to sort search result on "meta_headline".
+                Added new non-tokenized field "meta_headline_keyword" to use for sorting on
+                document headlines.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4415">Issue 4415</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_4389"></a>
+<p>
+                Upgrade imcode-db to version 0.3.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4389">Issue 4389</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 3.1.1</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_4305"></a>
+<p>
+                Fixed missing version number in help links.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4305">Issue 4305</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4313"></a>
+<p>
+                Fixed a bug which prevented sort keys for menuitems from being saved.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4313">Issue 4313</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 3.1.0</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_1855"></a>
+<p>
+                You can now search in PDF files, as well as in Microsoft Word, Excel, and Powerpoint files. 
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1855">Issue 1855</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4135"></a>
+<p>
+                Performance has been improved, so searching for documents should be much faster.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4135">Issue 4135</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2926"></a>
+<p>
+                Fixed a NullPointerException when browsing search result, for example when searching for images.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2926">Issue 2926</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4148"></a>
+<p>
+                Fixed a problem with image filenames containing spaces.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4148">Issue 4148</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4212"></a>
+<p>
+                Fixed an exception when entering an invalid text document id for an include.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4212">Issue 4212</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4092"></a>
+<p>
+                Fixed a bug where menus would cache their documents,
+                so changes to documents would not be visible in menus immediately.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4092">Issue 4092</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_4140"></a><a name="issue_4142"></a>
+<p>
+                You can now search for users by role, title, company, and email address.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4140">Issue 4140</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4142">Issue 4142</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4235"></a>
+<p>
+                Made sure that temporary upload files are removed in a timely manner.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4235">Issue 4235</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4117"></a>
+<p>
+                Fixed a bug where a superadmin which was also useradmin couldn't edit all roles for a user.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4117">Issue 4117</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4278"></a>
+<p>
+                Fixed a bug where the file manager would fail to change directories if the webapp
+                was situated in a symlinked path.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4278">Issue 4278</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_4135"></a>
+<p>
+                Documents are now lazily loaded,
+                so as to not retrieve more from the database than is needed.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4135">Issue 4135</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_4233"></a>
+<p>
+                Removed the unused <span class="config">addon</span> property from <span class="path">build.properties.template</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=4233">Issue 4233</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 3.0.1</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_3646"></a>
+<p>
+                Image-paths are URL-encoded to fix problems with image-paths containing non-ASCII characters.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3646">Issue 3646</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3773"></a>
+<p>
+                Users with "restricted 1/2" permissions on a page could not save a text document
+                if it linked to documents the user couldn't link to.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3773">Issue 3773</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3691"></a>
+<p>
+                Searches on the "phase" field of a document, such as "phase:published" or "phase:new",
+                would search based on the time that the document was indexed, not the time of the search.
+                Such queries are now rewritten on the fly to fix this.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3691">Issue 3691</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_3706"></a>
+<p>
+                If there was an error while deploying, the deploy failed completely.
+                Now the deploy succeeds, and the error appears in the browser instead.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3706">Issue 3706</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3643"></a>
+<p>
+                Fixed a problem with default values in the SQL script for MySQL 5.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3643">Issue 3643</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3681"></a>
+<p>
+                Ignore IPv6 and other non IPv4-addresses instead of choking on them.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3681">Issue 3681</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3705"></a>
+<p>
+                Added MySQL sample to <span class="path">server.properties</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3705">Issue 3705</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3707"></a>
+<p>
+                The upgrade SQL script <span class="path">diff-2-3.sql</span> did not work in some cases,
+                due to some foreign keys to the 'users' table changing name.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3707">Issue 3707</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3778"></a>
+<p>
+                The imCMS advertisement at the top of every page was not output when the <span class="tag">html</span> tag contained attributes.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3778">Issue 3778</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3860"></a>
+<p>
+                An attempt to reduce ThreadDeath errors with Tomcat has been done,
+                by providing only commons-logging-api and calling
+                <span class="method">LogFactory.releaseAll()</span> on shutdown.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3860">Issue 3860</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_3708"></a>
+<p>
+                Source is now included for our own libraries.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3708">Issue 3708</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3914"></a>
+<p>
+                The ddlutils and commons-betwixt libraries have been updated to newer non-released versions
+                from the Apache Subversion repository, so we don't have to keep the ddlutils version patched by us.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3914">Issue 3914</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 3.0.0</h1>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_3347"></a>
+<p>
+                Removed deprecated features "conference", "billboard", "chat", "shop", "poll", "qengine", "fortune".
+                Warning! If you are using these features, all data for them will be deleted in the upgrade!
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3347">Issue 3347</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_1288"></a>
+<p>
+                imCMS may now also be run on MySQL.
+                In theory it may run on any DBMS which has a JDBC 3.0 compliant driver,
+                but this has not been tested.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1288">Issue 1288</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3537"></a>
+<p>
+                The setting <span class="config">LdapUserAttribute.CountyCouncil</span> in <span class="path">server.properties</span>
+                has been replaced by <span class="config">LdapUserAttribute.Province</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3537">Issue 3537</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2980"></a>
+<p>
+                Many methods no longer throw <span class="class">NoPermissionException</span>,
+                notably most accessors of <span class="class">Document</span> and its subclasses.
+                Permissions are instead checked when saving the document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2980">Issue 2980</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<p>
+                The text editor now runs the MS Word-code removal filter every time you paste.
+            </p>
+</li>
+<li class="change">
+<a name="issue_3385"></a>
+<p>
+                Linking a document for which you had no permissions was impossible
+                regardless of whether the document was "linkableByOtherUsers".
+            </p>
+<p>
+                This has been worked around so that you can add a document by entering its id,
+                if a search for that id doesn't match another document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3385">Issue 3385</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3469"></a>
+<p>
+                The reset button in the text editor did not work.                
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3469">Issue 3469</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3468"></a>
+<p>
+                Removed broken undo/redo support in the text editor until properly supported by upstream.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3468">Issue 3468</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3442"></a>
+<p>
+                Integrated jsCalendar (<a class="url" href="http://www.dynarch.com/projects/calendar/">http://www.dynarch.com/projects/calendar/</a>) for selecting datetimes.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3442">Issue 3442</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3409"></a>
+<p>
+                If a user with "restricted 1" or "restricted 2" permissions created a document,
+                the default "default template" was ignored.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3409">Issue 3409</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2975"></a>
+<p>
+                Added a new default tab "Create new" to "My pages",
+                which doesn't list documents, but allows creating new documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2975">Issue 2975</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3094"></a>
+<p>
+                The text editor ctrl-key combinations would ignore the alt-key.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3094">Issue 3094</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2924"></a>
+<p>
+                A non-numeric prefix in a tree menu sort key would cause an exception.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2924">Issue 2924</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2992"></a>
+<p>
+                Copying a document did not copy its menus.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2992">Issue 2992</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3526"></a>
+<p>
+                If a category type was changed it would not affect editing cached documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3526">Issue 3526</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_3519"></a>
+<p>
+                Accessing <span class="path">/servlet/Version</span> now 
+                prints the versions of java, the servlet container, and the database along with the imCMS version.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3519">Issue 3519</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3509"></a>
+<p>
+                It was impossible to delete some directories in the file manager.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3509">Issue 3509</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3511"></a>
+<p>
+                Disconnect from database when the webapp is shut down.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3511">Issue 3511</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3479"></a>
+<p>
+                Pressing "Add" or "Remove" when assigning templates to template groups with no templates listed
+                would throw an exception.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3479">Issue 3479</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3467"></a>
+<p>
+                Refactored <span class="path">login/access_denied.jsp</span> and <span class="path">login/no_permission.jsp</span>
+                into <span class="path">login/index.jsp</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3467">Issue 3467</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3466"></a>
+<p>
+                Renaming templates to already existing name would throw an exception.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3466">Issue 3466</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2935"></a>
+<p>
+                Allow superadmin to edit his/her own roles.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2935">Issue 2935</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3421"></a>
+<p>
+                Removed "List new/modified documents", and moved its functionality to the search form.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3421">Issue 3421</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3420"></a>
+<p>
+                If a role was removed, editing permissions for a cached document with that role would throw an exception.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3420">Issue 3420</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3150"></a>
+<p>
+                Prevent multiple users from being created with the same name.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3150">Issue 3150</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2757"></a>
+<p>
+                Users with the useradmin role could edit any user under certain conditions.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2757">Issue 2757</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3144"></a>
+<p>
+                Scheduled indexing may now be disabled by setting <span class="config">IndexingSchedulePeriodInMinutes</span>
+                in <span class="path">server.properties</span> to 
+        "<span class="value">0</span>"
+    .
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3144">Issue 3144</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3491"></a>
+<p>
+                Build index in subdirectories of <span class="path">WEB-INF/index</span> instead of in <span class="path">WEB-INF/index.new</span>. 
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3491">Issue 3491</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3155"></a>
+<p>
+                For each reload of the webapp a new background indexing thread would be started,
+                leading to multiple concurrent indexings.
+                This has been worked around so that an indexing thread terminates
+                if it notices that the index has been changed.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3155">Issue 3155</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3501"></a>
+<p>
+                Some error pages were shown as html code.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3501">Issue 3501</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2923"></a>
+<p>
+                Fixed spurious NullPointerExceptions in "LRUMap.reuseMapping()" due to unsynchronized access.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2923">Issue 2923</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3182"></a>
+<p>
+                Documents were not removed from the index when deleted.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3182">Issue 3182</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3072"></a>
+<p>
+                Increased space for system message to 1000 characters.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3072">Issue 3072</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_3527"></a>
+<p>
+                Added the method <span class="method">DatabaseService.getDataSource()</span>
+                for accessing the underlying DataSource.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3527">Issue 3527</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3433"></a>
+<p>
+                The login page now passes along parameters "next_meta" and "next_url",
+                either of which can be used to redirect the user after login.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3433">Issue 3433</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2930"></a><a name="issue_2931"></a><a name="issue_2932"></a>
+<p>
+                Added the following methods to <span class="class">com.imcode.imcms.api.Document</span>:
+            </p>
+<ul>
+<li>
+<span class="method">Document.getKeywords()</span>
+</li>
+<li>
+<span class="method">Document.setKeywords(Set)</span>
+</li>
+<li>
+<span class="method">Document.isLinkableByOtherUsers()</span>
+</li>
+<li>
+<span class="method">Document.setLinkableByOtherUsers(boolean)</span>
+</li>
+<li>
+<span class="method">Document.isSearchDisabled()</span>
+</li>
+<li>
+<span class="method">Document.setSearchDisabled(boolean)</span>
+</li>
+</ul>
+<p>
+                    (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2930">Issue 2930</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2931">Issue 2931</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2932">Issue 2932</a>)
+                </p>
+</li>
+<li class="change">
+<a name="issue_2927"></a>
+<p>
+                Deprecated the method <span class="method">TextDocument.MenuItem.getManualNumber()</span>,
+                and added the replacement methods <span class="method">TextDocument.MenuItem.setSortKey(Integer)</span>
+                and <span class="method">TextDocument.MenuItem.getSortKey()</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2927">Issue 2927</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2928"></a>
+<p>
+                Added method <span class="method">TextDocument.MenuItem.setTreeKey(TreeKey)</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2928">Issue 2928</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3037"></a>
+<p>
+                Deprecated methods <span class="method">Document.setStatus(int)</span> and <span class="method">Document.getStatus()</span>.
+                Added the replacement methods <span class="method">Document.setPublicationStatus(PublicationStatus)</span>
+                and <span class="method">Document.getPublicationStatus()</span> and the class <span class="class">Document.PublicationStatus</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3037">Issue 3037</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3037"></a>
+<p>
+                Deprecated methods <span class="method">Document.setPermissionSetIdForRole(Role,int)</span>
+                and <span class="method">Document.getPermissionSetIdForRole(Role)</span>.
+                Added the replacement methods <span class="method">Document.setPermissionSetTypeForRole(Role,DocumentPermissionSetType)</span>
+                and <span class="method">Document.getPermissionSetTypeForRole(Role)</span>
+                and the class <span class="class">DocumentPermissionSetType</span>.
+            </p>
+<p>
+                Deprecated method <span class="method">DocumentPermissionSet.getType()</span> with no replacement.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3037">Issue 3037</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3537"></a>
+<p>
+                Deprecated methods <span class="method">User.setCountyCouncil(String)</span>
+                and <span class="method">User.getCountyCouncil()</span>.
+                Added the replacement methods <span class="method">User.setProvince(String)</span>
+                and <span class="method">User.getProvince()</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3537">Issue 3537</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3428"></a>
+<p>
+                Added method <span class="method">DocumentService.deleteDocument(Document)</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3428">Issue 3428</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2929"></a>
+<p>
+                Added method <span class="method">UserService.getUser(int)</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2929">Issue 2929</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3012"></a>
+<p>
+                You can now set the creator of a new Document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3012">Issue 3012</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2364"></a>
+<p>
+                Added class <span class="class">LuceneQuery</span> which allows using the Lucene API directly.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2364">Issue 2364</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3490"></a>
+<p>
+                Including a non-existent path using an include-tag would throw a <span class="class">NullPointerException</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3490">Issue 3490</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_1288"></a><a name="issue_3436"></a>
+<p>
+                SQL DDL is now generated from XML source using Apache DdlUtils.
+            </p>
+<p>
+                SQL procedures previously stored in the database are now loaded from disk.
+                Many of them have been removed.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1288">Issue 1288</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3436">Issue 3436</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3454"></a>
+<p>
+                Refactored parts of the database layer into a separate library named imcode-db.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3454">Issue 3454</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3304"></a>
+<p>
+                Removed the tools classes and extracted libraries imcode-util and imcode-ant-tasks.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3304">Issue 3304</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3162"></a>
+<p>
+                A document is always fetched from the database inside of a transaction.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3162">Issue 3162</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2089"></a>
+<p>
+                JSPs are now compiled during the build to find errors.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2089">Issue 2089</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3443"></a>
+<p>
+                Checkstyle is run during the build to find style errors.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3443">Issue 3443</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3459"></a><a name="issue_3462"></a>
+<p>
+                Building with a platform default encoding other than iso-8859-1 would fail.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3459">Issue 3459</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3462">Issue 3462</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3510"></a>
+<p>
+                A <span class="class">ServletContextListener</span> is used to start up, instead of a load-on-startup servlet.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3510">Issue 3510</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3514"></a>
+<p>
+                The links on the first welcome page will now be accurate regardless of context path.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3514">Issue 3514</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 2a.0.0</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_3125"></a>
+<p>
+                Fixed a NullPointerException when trying to view a textpage containing a
+                filedocument-image that had been deleted.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3125">Issue 3125</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_3122"></a>
+<p>
+                Made <span class="tag">&lt;?imcms:include file="..."?&gt;</span> recursively parse tags.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3122">Issue 3122</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_3167"></a>
+<p>
+<span class="method">UserService.getUser(String)</span> now returns null for non-existing users.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3167">Issue 3167</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 2.2.0</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_2937"></a>
+<p>
+                Added "Save" and "Save and close" buttons to text editor.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2937">Issue 2937</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_3062"></a>
+<p>
+                When including other documents,
+                the <span class="class">TextDocumentViewing</span> in the request was replaced,
+                so that subsequent <span class="class">TextDocumentViewings</span>
+                in the including document came from the included document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=3062">Issue 3062</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 2.1.1</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_2925"></a>
+<p>
+                Fixed a problem where a user would lose all his roles when editing himself.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2925">Issue 2925</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2901"></a>
+<p>
+                There was a mistake made with the
+                <span class="method">ContentManagementSystem.runAsSuperadmin(ContentManagementSystemRunnable)</span>
+                method so it actually did not work at all.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2901">Issue 2901</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 2.1.0</h1>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_2891"></a>
+<p>
+                Fixed a security hole that could let an attacker overwrite any file in the system.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2891">Issue 2891</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_2895"></a>
+<p>
+                Only read permission on a document was required to add it to a menu.
+                Now at least restricted 2 is required.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2895">Issue 2895</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2885"></a>
+<p>
+                Fixed a bug that made it impossible to set "edit texts" permission for restricted 1 or 2.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2885">Issue 2885</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2892"></a>
+<p>
+                Fixed a bug that would cause text in text fields to be interpreted as velocity code when
+                displayed for editing.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2892">Issue 2892</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2881"></a>
+<p>
+                Made enter submit a text field when using "rows='1'".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2881">Issue 2881</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2879"></a>
+<p>
+                Fixed a javascript error when editing texts and using the 
+        "<span class="attr">formats</span>"
+     attribute.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2879">Issue 2879</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2890"></a>
+<p>
+                The text editor would insert spurious <span class="tag">&lt;br /&gt;</span>-tags when the text was empty.
+                They are now removed when saving and when switching formats.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2890">Issue 2890</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2898"></a>
+<p>
+                Fixed an exception when trying to edit a non-existing document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2898">Issue 2898</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            template creators</h2>
+<ul>
+<li class="change">
+<a name="issue_2785"></a>
+<p>
+                Allow velocity code in all tag attributes.
+                See <a class="localfile" href="TEMPLATE_SYNTAX.TXT">TEMPLATE_SYNTAX.TXT</a> for details.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2785">Issue 2785</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2874"></a>
+<p>
+                Whitespace in 
+        "<span class="attr">label</span>"
+    -attributes are now normalized,
+                i.e. consecutive runs of whitespace are replaced by a single space.
+                This is a workaround for newlines in the 
+        "<span class="attr">label</span>"
+    -attribute
+                not being handled correctly in some places.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2874">Issue 2874</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_2882"></a>
+<p>
+                Fixed a bug where deleted documents would remain in the cache.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2882">Issue 2882</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2889"></a>
+<p>
+                Allow role names of up to 60 characters, and display more than three roles at a time.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2889">Issue 2889</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2888"></a>
+<p>
+                Fixed a bug that caused text in templates to be interpreted as velocity code when displayed for editing.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2888">Issue 2888</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2883"></a>
+<p>
+                Updated jTDS to version 1.0.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2883">Issue 2883</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2894"></a>
+<p>
+                Fixed a problem where references to removed documents
+                were retained in menus, causing NullPointerExceptions.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2894">Issue 2894</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2897"></a>
+<p>
+                Added package <span class="package">com.imcode.imcms.api.contrib</span>,
+                containing class <span class="class">DateTextFieldTextDocumentComparator</span>,
+                contributed by Anders Flodell and Pontus Amberg at Vetenskapsr&aring;det.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2897">Issue 2897</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2875"></a>
+<p>
+                Added class <span class="class">ContentManagementSystemRunnable</span> and
+                method <span class="method">ContentManagementSystem.runAsSuperadmin(ContentManagementSystemRunnable)</span>
+                to allow code that has been signed by an administrator to run with superadmin-privileges.
+            </p>
+<p>
+                The following things are required to run code with superadmin-privileges:
+            </p>
+<ul>
+<li>
+<span class="config">KeyStorePath</span> in <span class="path">server.properties</span> must be the path of a keystore.</li>
+<li>The class implementing <span class="class">ContentManagementSystemRunnable</span> must be signed (e.g. inside a signed jar-file).</li>
+<li>All certificates used for signing the class must be found in the keystore.</li>
+</ul>
+<p>
+                See <a class="url" href="http://java.sun.com/docs/books/tutorial/jar/sign/">http://java.sun.com/docs/books/tutorial/jar/sign/</a>
+                for more information about signing jar files.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2875">Issue 2875</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2790"></a>
+<p>
+                Made it possible to edit categories through the API.
+            </p>
+<p>
+                Added methods <span class="method">setName()</span>, <span class="method">setDescription()</span>,
+                and <span class="method">setImage()</span> to <span class="class">Category</span>.
+            </p>
+<p>
+                Added method <span class="method">DocumentService.saveCategory(Category)</span>.
+            </p>
+<p>
+                Deprecated method <span class="method">DocumentService.createNewCategory(String, String, String, CategoryType)</span>.
+                Use <span class="method">Category.Category(String, CategoryType)</span>
+                and <span class="method">DocumentService.saveCategory(Category)</span> instead.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2790">Issue 2790</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2884"></a>
+<p>
+                Methods <span class="method">UserService.getRole(int)</span> and <span class="method">UserService.getRole(String)</span>
+                no longer require superadmin-permissions.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2884">Issue 2884</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2893"></a>
+<p>
+                Methods <span class="method">TextDocument.Menu.addDocument(Document)</span>
+                and <span class="method">TextDocument.Menu.removeDocument(Document)</span> erroneously required
+                edit-permissions for the document added or removed, instead of the menu document as intended.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2893">Issue 2893</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2887"></a>
+<p>
+                Added fields <span class="tag">section_id</span>, <span class="tag">category</span>, <span class="tag">category_type</span>,
+                and <span class="tag">category_type_id</span> to search index.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2887">Issue 2887</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2880"></a>
+<p>
+                Added the constants <span class="variable">Document.LifeCyclePhase.NEW</span>,
+                <span class="variable">Document.LifeCyclePhase.APPROVED</span>,
+                <span class="variable">Document.LifeCyclePhase.DISAPPROVED</span>,
+                <span class="variable">Document.LifeCyclePhase.PUBLISHED</span>,
+                <span class="variable">Document.LifeCyclePhase.ARCHIVED</span>,
+                and <span class="variable">Document.LifeCyclePhase.UNPUBLISHED</span>,
+                to be used as values in searches on the field "phase".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2880">Issue 2880</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2878"></a>
+<p>
+                The java code in the <span class="path">tools</span> directory were not built with
+                source="1.4" and target="1.4".
+                This caused parts of imCMS to break when compiled with java 1.5 and run on java 1.4.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2878">Issue 2878</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 2.0.0</h1>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_1163"></a>
+<p>
+                New url format for documents: <span class="path">/imcms/1001</span> instead of <span class="path">/imcms/servlet/GetDoc?meta_id=1001</span>.
+                The old format still works, but this means that relative links in pages are likely to break.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1163">Issue 1163</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2727"></a>
+<p>
+                To alleviate broken relative links, <span class="path">/imcms/GetDoc?meta_id=1001</span> now works as well as <span class="path">/imcms/servlet/GetDoc?meta_id=1001</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2727">Issue 2727</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_1850"></a>
+<p>
+                We're now using jTDS instead of Microsofts JDBC driver.
+                The Microsoft driver may still somewhat work,
+                but it is strongly recommended that you use jTDS instead.
+                To do this, change the following values in <span class="path">server.properties</span>:
+            </p>
+<ul>
+<li>Set <span class="config">JdbcDriver</span> to 
+        "<span class="value">net.sourceforge.jtds.jdbc.Driver</span>"
+    </li>
+<li>Set <span class="config">JdbcUrl</span> to
+                    
+        "<span class="value">jdbc:jtds:sqlserver://<span class="replace">&lt;host&gt;</span>:<span class="replace">&lt;port&gt;</span>/;AppName=imCMS;DatabaseName=<span class="replace">&lt;databasename&gt;</span></span>"
+    
+                    substituting correct values for <span class="replace">&lt;host&gt;</span>,
+                    <span class="replace">&lt;port&gt;</span>, and <span class="replace">&lt;databasename&gt;</span>.</li>
+</ul>
+<p>
+                    (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1850">Issue 1850</a>)
+                </p>
+</li>
+<li class="change">
+<a name="issue_2859"></a>
+<p>
+                We require javamail 1.3 or later, but Tomcat 4.1.30 and earlier includes javamail 1.2,
+                which overrides our included implementation (GNU classpathx javamail).
+            </p>
+<p>
+                If you're using Tomcat 4.1.30 or earlier, you can do one of three things:
+            </p>
+<ul>
+<li>Recommended: Upgrade Tomcat to version 4.1.31 or later.</li>
+<li>Remove <span class="path">mail.jar</span> and <span class="path">activation.jar</span> from <span class="path">tomcat/common/lib</span>.
+                    If you use any web applications that require any of them, you can put them in the <span class="path">WEB-INF/lib</span> directory of those applications.
+                     imCMS will use its own implementation.</li>
+<li>Replace <span class="path">mail.jar</span> in the directory <span class="path">tomcat/common/lib</span> with <span class="path">mail.jar</span> from JavaMail 1.3 or later.
+                    JavaMail can be downloaded from <a class="url" href="http://java.sun.com/products/javamail/downloads/">http://java.sun.com/products/javamail/downloads/</a>
+</li>
+</ul>
+<p>
+                If you are using another servlet engine that includes an older implementation of javamail,
+                similar action may be required.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2859">Issue 2859</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2733"></a>
+<p>
+                Specifically, the new url format is
+                <span class="path"><span class="replace">&lt;contextpath&gt;</span><span class="replace">&lt;prefix&gt;</span><span class="replace">&lt;document-id&gt;</span></span>,
+                e.g. <span class="path">/imcms<span class="replace">&lt;prefix&gt;</span>1001</span>.
+                The <span class="replace">&lt;prefix&gt;</span> can be set with the setting <span class="config">DocumentPathPrefix</span> in <span class="path">server.properties</span>.
+                The default is 
+        "<span class="value">/</span>"
+    . Comment this out to disable the new url format.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2733">Issue 2733</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2083"></a><a name="issue_2864"></a>
+<p>
+                The latest documents requested from the database are now cached in memory.
+                This makes imCMS much faster, but means that changes to the database won't be seen.
+                The maximum number of documents cached can be set using
+                <span class="config">DocumentCacheMaxSize</span> in <span class="path">server.properties</span>.
+                The default is to cache at most 100 documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2083">Issue 2083</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2864">Issue 2864</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2746"></a>
+<p>
+                All the class-files that used to live in <span class="path">WEB-INF/classes</span>
+                are now packaged in one jar file in <span class="path">WEB-INF/lib</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2746">Issue 2746</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2750"></a>
+<p>
+                Some objects were put in sessions when editing documents, and never removed.
+                These are now removed when no longer needed. This might reduce memory usage a bit.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2750">Issue 2750</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_2578"></a>
+<p>
+                A new function called "My pages" gives you an easy overview of your documents.
+                It is accessible through the "admin" button for users
+                which have any role that has permission to access "My pages".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2578">Issue 2578</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2548"></a>
+<p>
+                A new better html editor (<a class="url" href="http://www.dynarch.com/projects/htmlarea/">http://www.dynarch.com/projects/htmlarea/</a>)
+                which also supports Mozilla browsers has been incorporated.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2548">Issue 2548</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2578"></a>
+<p>
+                The search page now allows much more advanced searches.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2578">Issue 2578</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2681"></a>
+<p>
+                File extension "dot" is now recognized as a Microsoft Word file.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2681">Issue 2681</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2743"></a>
+<p>
+                File extension "ppt" is now recognized as a Microsoft Powerpoint file.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2743">Issue 2743</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2796"></a>
+<p>
+                Updated the look of the user interface a bit, notably the adminbuttons and the template dialog.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2796">Issue 2796</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2451"></a>
+<p>
+                One can now on the permission page set a default template to be used for new text documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2451">Issue 2451</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2567"></a>
+<p>
+                Don't display a broken image for an empty image field.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2567">Issue 2567</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2653"></a>
+<p>
+                Fixed problem with previewing images with non-ASCII characters in the name in the image browser.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2653">Issue 2653</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2734"></a>
+<p>
+                Don't show button to upload images if lacking permission to do so.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2734">Issue 2734</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2591"></a>
+<p>
+                Changed certain file uploading error messages to be somewhat clearer.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2591">Issue 2591</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2680"></a>
+<p>
+                Fixed a problem where users were allowed to access the document "page info" without proper permissions.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2680">Issue 2680</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2737"></a>
+<p>
+                Set creation date to "now" for copies of documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2737">Issue 2737</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2682"></a>
+<p>
+                Fixed help message on "file edit page".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2682">Issue 2682</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2703"></a>
+<p>
+                The OK button on the document "page info" page was unclickable in Safari on Mac due to a javascript.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2703">Issue 2703</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2794"></a>
+<p>
+                Hide categories on "page info" page if none exist.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2794">Issue 2794</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2794"></a>
+<p>
+                Added shortcut buttons to set dates to "Now" on "page info" page.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2794">Issue 2794</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2803"></a>
+<p>
+                The creator and some dates were not set properly for copied documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2803">Issue 2803</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2799"></a>
+<p>
+                Removed misleading instructions on how to create documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2799">Issue 2799</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2839"></a>
+<p>
+                Fixed problem with data for browser documents not being saved on creation.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2839">Issue 2839</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2860"></a>
+<p>
+                Missing schemes are now automatically added to urls.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2860">Issue 2860</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2861"></a>
+<p>
+                The link checker now handles relative and schemeless urls.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2861">Issue 2861</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2800"></a>
+<p>
+                When editing menus, for each menu display two numbers.
+            </p>
+<p>
+                One number is the number of documents a visitor to the site would see in the menu,
+                and the other number is the number of documents the current user can see when editing the menu.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2800">Issue 2800</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2771"></a>
+<p>
+                Allow setting the link target when editing a file document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2771">Issue 2771</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            template creators</h2>
+<ul>
+<li class="change">
+<a name="issue_2689"></a>
+<p>
+                Added the file <a class="localfile" href="TEMPLATE_SYNTAX.TXT">TEMPLATE_SYNTAX.TXT</a> containing a basic reference to the template tags.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2689">Issue 2689</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2684"></a>
+<p>
+                Local includes can now be made using <span class="tag">&lt;?imcms:include path="/relative/to/context/path"?&gt;</span>.
+                These don't require a http-request to localhost as url-includes do,
+                are a magnitude more efficient, and don't spam the access-log.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2684">Issue 2684</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2668"></a>
+<p>
+                Jakarta Velocity can now be used in templates, between <span class="tag">&lt;?imcms:velocity?&gt; ... &lt;?/imcms:velocity?&gt;</span> tags.
+                See the file <a class="localfile" href="TEMPLATE_SYNTAX.TXT">TEMPLATE_SYNTAX.TXT</a> for details.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2668">Issue 2668</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2668"></a>
+<p>
+                Attributes 
+        "<span class="attr">pre</span>"
+     and 
+        "<span class="attr">post</span>"
+    
+                can now be used on <span class="tag">&lt;?imcms:menu?&gt;</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2668">Issue 2668</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2783"></a>
+<p>
+                Attributes in tags can now be html-escaped, like so: <span class="tag">&lt;?imcms:text label="&amp;quot;quoted text&amp;quot;"?&gt;</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2783">Issue 2783</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2689"></a>
+<p>
+                New attribute for <span class="tag">&lt;?imcms:menu?&gt;</span>: 
+        "<span class="attr">defaulttemplate</span>"
+     - specify the name of a template to use for new text documents created in this menu.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2689">Issue 2689</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2709"></a>
+<p>
+                New attribute for <span class="tag">&lt;?imcms:text?&gt;</span>: 
+        "<span class="attr">formats</span>"
+     - specify what editor modes are available.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2709">Issue 2709</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2764"></a>
+<p>
+                New attribute for <span class="tag">&lt;?imcms:text?&gt;</span>: 
+        "<span class="attr">rows</span>"
+     - indicate the preferred number of rows to the editor.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2764">Issue 2764</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_2669"></a>
+<p>
+                When something went wrong during initialization, a useless generic "NoClassDefFoundError" was given.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2669">Issue 2669</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2661"></a>
+<p>
+                Certain html files were not viewable in the file manager.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2661">Issue 2661</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2692"></a>
+<p>
+                Fixed a problem in the <span class="path">diff-1.10.2-1.11.sql</span> database upgrade script.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2692">Issue 2692</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2696"></a>
+<p>
+                Fixed an error when trying to edit a user.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2696">Issue 2696</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2757"></a>
+<p>
+                Make sure a useradmin only can list users he can edit.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2757">Issue 2757</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2442"></a>
+<p>
+                Sometimes when using the file administrator, some files would be unremovable.
+                Trying to remove them will now give a rather nasty error message instead of failing silently.
+                This still needs improvement.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2442">Issue 2442</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2587"></a><a name="issue_2789"></a>
+<p>
+                The link checker is now multithreaded, and one can choose to list only broken links.
+                Also, one can specify a range of document ids to check.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2587">Issue 2587</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2789">Issue 2789</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2786"></a>
+<p>
+                Use a default value of 
+        "<span class="value">1440</span>"
+     (24 hours) for <span class="config">IndexingSchedulePeriodInMinutes</span>
+                if missing from <span class="path">server.properties</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2786">Issue 2786</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2842"></a>
+<p>
+                Reversed sort order of "List new/updated pages".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2842">Issue 2842</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2806"></a>
+<p>
+                Allow to set no roles for users, leaving only the "Users"-role.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2806">Issue 2806</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2845"></a>
+<p>
+                Fixed a problem with mismatched filenames in the chat on case-sensitive filesystems.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2845">Issue 2845</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2847"></a>
+<p>
+                Empty passwords are no longer allowed for external authentication, e.g. LDAP.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2847">Issue 2847</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2334"></a>
+<p>
+                Updated the look of the "Edit external user" page.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2334">Issue 2334</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2858"></a>
+<p>
+                Fixed a problem with modified date of a document only being updated on every second save.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2858">Issue 2858</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2865"></a>
+<p>
+                The checksums in <span class="path">WEB-INF/version.txt</span> are now in <span class="path">WEB-INF/checksums.txt</span> instead,
+                and are not output by the "Version" servlet.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2865">Issue 2865</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2855"></a>
+<p>
+                Made a "RebuildIndex" servlet for rebuilding the index,
+                and fixed the "Restart" servlet to do a more thorough/proper restart of imCMS.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2855">Issue 2855</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2836"></a>
+<p>
+                Don't allow removing a template group that contains templates.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2836">Issue 2836</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2828"></a>
+<p>
+                Don't print password to log when failing to log in to an LDAP server.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2828">Issue 2828</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2821"></a>
+<p>
+                List users in order of last name and first name instead of by id.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2821">Issue 2821</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2493"></a>
+<p>
+                Created package <span class="package">com.imcode.util</span> with generic non-imCMS-specific utilities:
+            </p>
+<dl>
+<dt>
+<span class="class">ChainableReversibleNullComparator</span>
+</dt>
+<dd>
+            - Moved here from <span class="package">com.imcode.imcms.api.util</span>
+</dd>
+<dt>
+<span class="class">ComparatorWrapper</span>
+</dt>
+<dd>
+            - Moved here from <span class="package">com.imcode.imcms.api.util</span>
+</dd>
+<dt>
+<span class="class">HumanReadable</span>
+</dt>
+<dd>
+            - Get human readable byte sizes and time spans.</dd>
+<dt>
+<span class="class">ImageSize</span>
+</dt>
+<dd>
+            - Get the size of an image in somewhat more efficient manner than <span class="method"><span class="class">ImageIO</span>.read()</span>.</dd>
+<dt>
+<span class="class">MultipartHttpServletRequest</span>
+</dt>
+<dd>
+            - Extends <span class="class">HttpServletRequest</span> for file upload with support from Jakarta Commons-FileUpload.</dd>
+</dl>
+<p>
+                    (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2493">Issue 2493</a>)
+                </p>
+</li>
+<li class="change">
+<a name="issue_2708"></a>
+<p>
+                Users can now change their own attributes.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2708">Issue 2708</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2676"></a><a name="issue_2776"></a>
+<p>
+                Added classes:
+            </p>
+<dl>
+<dt>
+<span class="class">Role</span>
+</dt>
+<dd>
+            - Represents a user-role.</dd>
+<dt>
+<span class="class">SaveException</span>
+</dt>
+<dd>
+            - Thrown when something can't be saved.</dd>
+<dt>
+<span class="class">AlreadyExistsException</span>
+</dt>
+<dd>
+            - Extends SaveException.</dd>
+<dt>
+<span class="class">TextDocumentViewing</span>
+</dt>
+<dd>
+            - Accessible in included JSPs and velocity code. Represents one viewing of a text document.</dd>
+</dl>
+<p>
+                    (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2676">Issue 2676</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2776">Issue 2776</a>)
+                </p>
+</li>
+<li class="change">
+<p>
+                Changed classes:
+            </p>
+<dl>
+<dt>
+<span class="class">MaxCategoriesOfTypeExceededException</span>
+</dt>
+<dd>
+            - Extends <span class="class">SaveException</span>
+</dd>
+<dt>
+<span class="class">CategoryAlreadyExistsException</span>
+</dt>
+<dd>
+            - Extends <span class="class">AlreadyExistsException</span>
+</dd>
+<dt>
+<span class="class">CategoryTypeAlreadyExistsException</span>
+</dt>
+<dd>
+            - Extends <span class="class">AlreadyExistsException</span>
+</dd>
+<dt>
+<span class="class">UserAlreadyExistsException</span>
+</dt>
+<dd>
+            - Extends <span class="class">AlreadyExistsException</span>
+</dd>
+<dt>
+<span class="class">RoleAlreadyExistsException</span>
+</dt>
+<dd>
+            - Extends <span class="class">AlreadyExistsException</span>
+</dd>
+</dl>
+</li>
+<li class="change">
+<p>
+                Deprecated classes:
+            </p>
+<dl>
+<dt>
+<span class="class">com.imcode.imcms.api.util.ChainableReversibleNullComparator</span>
+</dt>
+<dd>
+            - Moved to <span class="package">com.imcode.util</span>
+</dd>
+<dt>
+<span class="class">com.imcode.imcms.api.util.ComparatorWrapper</span>
+</dt>
+<dd>
+            - Moved to com.imcode.util</dd>
+</dl>
+</li>
+<li class="change">
+<a name="issue_2648"></a><a name="issue_2648"></a><a name="issue_2677"></a><a name="issue_2827"></a><a name="issue_2827"></a>
+<p>
+                Added methods:
+            </p>
+<dl>
+<dt>
+<span class="method">ContentManagementSystem.fromRequest(ServletRequest)</span>
+</dt>
+<dd>
+            - Get the <span class="class">ContentManagementSystem</span>.</dd>
+<dt>
+<span class="method">Document.setPermissionSetIdForRole(Role,int)</span>m</dt>
+<dd>
+            - Replaces <span class="method">Document.setPermissionSetForRole(String,int)</span>
+</dd>
+<dt>
+<span class="method">Document.getPermissionSetIdForRole(Role)</span>
+</dt>
+<dd>
+            - Get the permission set id for a role</dd>
+<dt>
+<span class="method">DocumentService.getSection(String)</span>
+</dt>
+<dd>
+            - Get a section by name.</dd>
+<dt>
+<span class="method">Section.getId()</span>
+</dt>
+<dd>
+            - Get the id for a section.</dd>
+<dt>
+<span class="method">TextDocument.Menu.getVisibleDocuments()</span>
+</dt>
+<dd>
+            - Returns the documents visible in the menu.</dd>
+<dt>
+<span class="method">TextDocument.Menu.getVisibleMenuItems()</span>
+</dt>
+<dd>
+            - Returns the menuitems visible in the menu.</dd>
+<dt>
+<span class="method">User.getRoles()</span>
+</dt>
+<dd>
+            - Get the user's roles.</dd>
+<dt>
+<span class="method">User.setRoles(Role[])</span>
+</dt>
+<dd>
+            - Set the user's roles.</dd>
+<dt>
+<span class="method">User.hasRole(Role)</span>
+</dt>
+<dd>
+            - Returns true if the user has the role.</dd>
+<dt>
+<span class="method">User.addRole(Role)</span>
+</dt>
+<dd>
+            - Add a role to the user.</dd>
+<dt>
+<span class="method">User.removeRole(Role)</span>
+</dt>
+<dd>
+            - Remove a role from the user.</dd>
+<dt>
+<span class="method">UserService.createNewRole(String)</span>
+</dt>
+<dd>
+            - Create a new role</dd>
+<dt>
+<span class="method">UserService.deleteRole(Role)</span>
+</dt>
+<dd>
+            - Delete a role, requires superadmin permission.</dd>
+<dt>
+<span class="method">UserService.getAllRoles()</span>
+</dt>
+<dd>
+            - Returns all roles in the system, requires superadmin permission.</dd>
+<dt>
+<span class="method">UserService.getAllUsersWithRole(Role)</span>
+</dt>
+<dd>
+            - Get all users with the given permission.</dd>
+<dt>
+<span class="method">UserService.getRole(int)</span>
+</dt>
+<dd>
+            - Get a role by id, requires superadmin permission.</dd>
+<dt>
+<span class="method">UserService.getRole(String)</span>
+</dt>
+<dd>
+            - Get a role by name, requires superadmin permission.</dd>
+<dt>
+<span class="method">UserService.saveRole(Role)</span>
+</dt>
+<dd>
+            - Save changes to the role, requires superadmin permission.</dd>
+<dt>
+<span class="method">UserService.createNewUser(String, String)</span>
+</dt>
+<dd>
+            - Create a new user.</dd>
+<dt>
+<span class="method">UserService.saveUser(User)</span>
+</dt>
+<dd>
+            - Save a new or existing user, requires superadmin permission.</dd>
+<dt>
+<span class="method">User.set*</span>
+</dt>
+<dd>
+            - Added a bunch of setters.</dd>
+<dt>
+<span class="method">User.get*</span>
+</dt>
+<dd>
+            - Added a few missing getters.</dd>
+</dl>
+<p>
+                    (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2648">Issue 2648</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2648">Issue 2648</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2677">Issue 2677</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2827">Issue 2827</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2827">Issue 2827</a>)
+                </p>
+</li>
+<li class="change">
+<a name="issue_2827"></a><a name="issue_2827"></a>
+<p>
+                Changed methods:
+            </p>
+<dl>
+<dt>
+<span class="method">DocumentService.saveChanges(Document)</span>
+</dt>
+<dd>
+            - Throws <span class="class">SaveException</span> instead of <span class="class">MaxCategoriesOfTypeExceededException</span>.</dd>
+<dt>
+<span class="method">TextDocument.setInclude(int,TextDocument)</span>
+</dt>
+<dd>
+            - Now requires you to call <span class="method">DocumentService.saveChanges()</span> afterwards.</dd>
+<dt>
+<span class="method">TextDocument.Menu.getDocuments()</span>
+</dt>
+<dd>
+            - Returns the same documents as can be seen when editing the menu.</dd>
+<dt>
+<span class="method">TextDocument.Menu.getMenuItems()</span>
+</dt>
+<dd>
+            - Returns the same menuitems as can be seen when editing the menu. No longer throws <span class="class">NoPermissionException</span>.</dd>
+<dt>
+<span class="method">UserService.addNewRole(String)</span>
+</dt>
+<dd>
+            - Returns the new role.</dd>
+</dl>
+<p>
+                    (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2827">Issue 2827</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2827">Issue 2827</a>)
+                </p>
+</li>
+<li class="change">
+<a name="issue_2791"></a>
+<p>
+                Undeprecated methods:
+            </p>
+<dl>
+<dt>
+<span class="method">TextDocument.setTemplate(Template)</span>
+</dt>
+<dd>
+            - Use when you don't care about setting a template group.</dd>
+</dl>
+<p>
+                    (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2791">Issue 2791</a>)
+                </p>
+</li>
+<li class="change">
+<p>
+                Deprecated methods:
+            </p>
+<dl>
+<dt>
+<span class="method">Document.setPermissionSetForRole(String,int)</span>
+</dt>
+<dd>
+            - Use <span class="method">Document.setPermissionSetIdForRole(Role,int)</span>.</dd>
+<dt>
+<span class="method">User.getRoleNames()</span>
+</dt>
+<dd>
+            - Use <span class="method">User.getRoles()</span>
+</dd>
+<dt>
+<span class="method">User.hasRole(String)</span>
+</dt>
+<dd>
+            - Use <span class="method">User.hasRole(Role)</span>
+</dd>
+<dt>
+<span class="method">UserService.deleteRole(String)</span>
+</dt>
+<dd>
+            - Use <span class="method">UserService.deleteRole(Role)</span>
+</dd>
+<dt>
+<span class="method">UserService.getAllUserWithRole(String)</span>
+</dt>
+<dd>
+            - Use <span class="method">UserService.getAllUsersWithRole(Role)</span>
+</dd>
+<dt>
+<span class="method">UserService.getRoleNames(User)</span>
+</dt>
+<dd>
+            - Use <span class="method">User.getRoles()</span>
+</dd>
+<dt>
+<span class="method">UserService.getAllRolesNames()</span>
+</dt>
+<dd>
+            - Use <span class="method">UserService.getAllRoles()</span>
+</dd>
+<dt>
+<span class="method">UserService.setUserRoles(User,String[])</span>
+</dt>
+<dd>
+            - Use <span class="method">User.setRoles(Role[])</span>
+</dd>
+<dt>
+<span class="method">UserService.addNewRole(String)</span>
+</dt>
+<dd>
+            - Use <span class="method">UserService.createNewRole(String)</span> and <span class="method">UserService.saveRole(Role)</span>
+</dd>
+</dl>
+</li>
+<li class="change">
+<p>
+                Removed methods:
+            </p>
+<dl>
+<dt>DocumentService.createAndSaveNewTextDocument(Document)</dt>
+<dd>
+            - Use <span class="method">DocumentService.createNewTextDocument()</span> and <span class="method">DocumentService.saveChanges(Document)</span>
+</dd>
+<dt>DocumentService.createAndSaveNewUrlDocument(Document)</dt>
+<dd>
+            - Use <span class="method">DocumentService.createNewUrlDocument()</span> and <span class="method">DocumentService.saveChanges(Document)</span>
+</dd>
+</dl>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2664"></a>
+<p>
+                Unit tests are now enabled in the build by default.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2664">Issue 2664</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2674"></a>
+<p>
+                Target "copy-web" in an addon <span class="path">build.xml</span> is now run when running the "web"-target in the main <span class="path">build.xml</span>.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2674">Issue 2674</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2549"></a>
+<p>
+                Use jsp for "edit text" page.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2549">Issue 2549</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2663"></a>
+<p>
+                Added a unique index on column "login_name" in table "users".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2663">Issue 2663</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2687"></a>
+<p>
+                Compileable with java 1.5.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2687">Issue 2687</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2686"></a>
+<p>
+                Updated jars to the latest versions, and made sure all have understandable names with version numbers.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2686">Issue 2686</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2685"></a>
+<p>
+                Getting the size of an image was very slow.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2685">Issue 2685</a>)
+            </p>
+</li>
+<li class="change">
+<p>
+                The column "role_id" in the table "roles" is now an identity column, and "role_name" is varchar(60).
+            </p>
+</li>
+<li class="change">
+<a name="issue_2672"></a>
+<p>
+                Don't update menus in database if they don't differ from the cache when saving a text-document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2672">Issue 2672</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2701"></a>
+<p>
+                Fixed a problem where clones of users would share the same set of roles.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2701">Issue 2701</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2705"></a>
+<p>
+                Added possibility to set permissions for roles.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2705">Issue 2705</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2718"></a>
+<p>
+                Fixed hardcoded urls to the documentation site in the default template.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2718">Issue 2718</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2705"></a>
+<p>
+                Removed table "roles_permissions", no longer needed.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2705">Issue 2705</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2770"></a>
+<p>
+                All users are now always considered to have the "Users" role regardless of what the database says.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2770">Issue 2770</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2774"></a>
+<p>
+                Made an ant-target "distcheck" for verifying that the source distribution is buildable.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2774">Issue 2774</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2818"></a>
+<p>
+                Made it easier to build with LDAP enabled
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2818">Issue 2818</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2775"></a>
+<p>
+                Texts are doubly indexed: With and without HTML-tags.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2775">Issue 2775</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2855"></a>
+<p>
+                Introduced the concept of <span class="class">LifeCyclePhase</span> for a <span class="class">DocumentDomainObject</span> (indexed as "phase"),
+                corresponding to what users think of as "status".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2855">Issue 2855</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2798"></a>
+<p>
+                A group can now be used as the to-address of e-mails.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2798">Issue 2798</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2765"></a>
+<p>
+                The changelog (previously <span class="path">CHANGES.TXT</span>, now <span class="path">CHANGES.HTML</span>)
+                is now generated from an xml-file using an xsl-stylesheet.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2765">Issue 2765</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.11.1</h1>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_2452"></a><a name="issue_2650"></a>
+<p>
+                In the fix to bug 2452 in 1.11.0, we changed the way files in file documents are saved to disk, forgetting backwards-compatibility. Administrators had to remove the "_se"-suffix from all files under "WEB-INF/uploads", or the files would not be found after an upgrade. This was fixed so the "_se" suffix is recognized again, and will be automatically removed when the file document is saved. Removing the suffix from the files on upgrade is still recommended.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2452">Issue 2452</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2650">Issue 2650</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2640"></a>
+<p>
+                On a related note, don't show "WEB-INF/uploads" in "FileAdmin" by default.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2640">Issue 2640</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2633"></a>
+<p>
+                Made "/RD/*"-paths (as seen in the log) work again.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2633">Issue 2633</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.11.0</h1>
+<h2>Of
+            <span class="important">importance</span>
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_2569"></a>
+<p>
+                The "SelectMethod" in the JdbcUrl in "server.properties" MUST be set to "SelectMethod=cursor", otherwise you will get the error "Can't start a cloned connection while in manual transaction mode." when you try to save a document. This is due to the new transaction code. The default used to be "SelectMethod=direct".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2569">Issue 2569</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_2452"></a>
+<p>
+                Made it possible to upload several files in one filedocument.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2452">Issue 2452</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2569"></a>
+<p>
+                Fixed a race condition that could cause menus to be cleared when editing a text-document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2569">Issue 2569</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2534"></a>
+<p>
+                File-extension "xls" on uploaded files is now recognized as a Microsoft Excel Spreadsheet.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2534">Issue 2534</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2511"></a>
+<p>
+                Fixed a problem with viewing uploaded PDF files with Adobe Acrobat 6.0.1.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2511">Issue 2511</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2543"></a>
+<p>
+                Fixed exception when trying to create an HTML-document.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2543">Issue 2543</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_1496"></a>
+<p>
+                Changed some swedish names for different document types.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1496">Issue 1496</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2391"></a>
+<p>
+                Some form elements looked strange in "page info" in Internet Explorer 5.2 on Macintosh.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2391">Issue 2391</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2567"></a>
+<p>
+                Fixed a bug that made it hard to remove images.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2567">Issue 2567</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2520"></a>
+<p>
+                Show file-size on file-document-files and images.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2520">Issue 2520</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2572"></a>
+<p>
+                Distinguish directories in "FileAdmin" with gray background color, sort files and directories in alphabetical order, and make file-sizes more readable.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2572">Issue 2572</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2585"></a>
+<p>
+                Fixed a bug making it impossible to delete a text-document with more than one menu.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2585">Issue 2585</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2593"></a>
+<p>
+                HTML is now removed from text-fields before indexing, so a search for "foo bar" will now also find "&lt;em&gt;foo&lt;/em&gt; bar".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2593">Issue 2593</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_1496"></a>
+<p>
+                Changed swedish name of text-document, "Ny sida" to "Textsida".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1496">Issue 1496</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2628"></a>
+<p>
+                Image-preview in old image archive was broken.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2628">Issue 2628</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2607"></a>
+<p>
+                Submitting the form several times (i.e. by double-clicking) when creating a new document no longer results in an error message and several documents created.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2607">Issue 2607</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            template creators</h2>
+<ul>
+<li class="change">
+<a name="issue_2623"></a>
+<p>
+                Put the imCMS-commercial html-comment (imcms_message.html) before the &lt;html&gt;-tag instead of the before doctype declaration.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2623">Issue 2623</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_2479"></a>
+<p>
+                Disallow editing of user "user".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2479">Issue 2479</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2514"></a>
+<p>
+                Fixed a bug that made it impossible to create a category.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2514">Issue 2514</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2515"></a>
+<p>
+                Fixed a bug that prevented changing a category-type from multi-choice to single-choice.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2515">Issue 2515</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2144"></a>
+<p>
+                Database connections are now tested before use. This allows imCMS to survive database server restarts.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2144">Issue 2144</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2614"></a>
+<p>
+                "IndexingSchedulePeriodInMinutes" in "server.properties" now controls the time period between reindexings in minutes.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2614">Issue 2614</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2625"></a>
+<p>
+                Reindexing is no longer performed on startup unless needed.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2625">Issue 2625</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2484"></a>
+<p>
+                Added a little note about running SQL-scripts to INSTALL.TXT.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2484">Issue 2484</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2629"></a>
+<p>
+                The admin button is now visible for users with role "Useradmin" again.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2629">Issue 2629</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<p>
+                Category now implements Comparable. Compares by name, ignoring case.
+            </p>
+</li>
+<li class="change">
+<a name="issue_2527"></a>
+<p>
+                UserService.getUser(String) no longer requires superadmin permissions.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2527">Issue 2527</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2490"></a><a name="issue_2490"></a><a name="issue_2551"></a><a name="issue_2551"></a><a name="issue_2551"></a>
+<p>
+                Added classes:
+        - MailService - provides methods for sending e-mail.
+        - Mail - represents a mail to be sent with MailService. Uses javax.activation.DataSource for attachments.
+        - MailException - thrown by MailService.
+        - FileDocument - represents a filedocument
+        - FileDocument.FileDocumentFile - represents a single file in a filedocument. Implements javax.activation.DataSource.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2490">Issue 2490</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2490">Issue 2490</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2551">Issue 2551</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2551">Issue 2551</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2551">Issue 2551</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2490"></a><a name="issue_2491"></a><a name="issue_2491"></a><a name="issue_2491"></a><a name="issue_2551"></a><a name="issue_2551"></a><a name="issue_2609"></a><a name="issue_2609"></a><a name="issue_2616"></a><a name="issue_2616"></a>
+<p>
+                Added methods:
+        - ContentManagementSystem.getMailService() -
+        - DocumentService.createNewFileDocument() -
+        - DocumentService.getXmlDomForDocument() - returns an org.w3c.dom.Document representing a document. Currently only works with text-documents.
+        - Image.getSrc(String contextPath) - returns image-src with contextPath prepended.
+        - Image.getSrcRelativeToContextPath() - returns image-src without contextPath prepended.
+        - Image.getSize() - returns the size of the image in bytes.
+        - User.getId() - returns the user id.
+        - User.isDefaultUser() - returns true if the user is the default user ("user/user").
+        - DocumentPermissionSet.getEditMenusPermission() - returns true if this permission-set allows editing of menus.
+        - DocumentPermissionSet.setEditMenusPermission(boolean) - sets whether this permission-set allows editing of menus.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2490">Issue 2490</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2491">Issue 2491</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2491">Issue 2491</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2491">Issue 2491</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2551">Issue 2551</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2551">Issue 2551</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2609">Issue 2609</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2609">Issue 2609</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2616">Issue 2616</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2616">Issue 2616</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2491"></a><a name="issue_2491"></a>
+<p>
+                Removed methods:
+        - Image.getSrc() - use Image.getSrc(String contextPath) or Image.getSrcRelativeToContextPath()
+        - Image.getSrcUrl() - use Image.getSrc(String contextPath) or Image.getSrcRelativeToContextPath() This was necessary to completely remove imCMS dependence on a specific context path.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2491">Issue 2491</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2491">Issue 2491</a>)
+            </p>
+</li>
+<li class="change">
+<p>
+                Removed deprecated fields:
+        - Document.Comparator.ACTIVATED_DATETIME - use Document.Comparator.PUBLICATION_START_DATETIME
+            </p>
+</li>
+<li class="change">
+<a name="issue_2560"></a><a name="issue_2560"></a><a name="issue_2609"></a><a name="issue_2609"></a><a name="issue_2609"></a>
+<p>
+                Removed deprecated methods
+        - Document.setModifiedDateTime(Date) - use Document.setModifiedDatetime(Date)
+        - Document.getModifiedDateTime() - use Document.getModifiedDatetime()
+        - Document.getCreatedDateTime() - use Document.getCreatedDatetime()
+        - TextDocument.getMenuSortOrder() - use Menu.getSortOrder()
+        - TextDocument.setMenuSortOrder(int) - use Menu.setSortOrder(int)
+        - DocumentPermissionSet.getEditHeadlinePermission() - use DocumentPermissionSet.getEditDocumentInformationPermission()
+        - DocumentPermissionSet.setEditHeadlinePermission(boolean) - use DocumentPermissionSet.setEditDocumentInformationPermission(boolean)
+        - DocumentPermissionSet.getEditableMenuDocumentTypeNames() - removed, returning type-names is broken.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2560">Issue 2560</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2560">Issue 2560</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2609">Issue 2609</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2609">Issue 2609</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2609">Issue 2609</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2495"></a>
+<p>
+                The document-deletion procedure is now run in an transaction.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2495">Issue 2495</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2542"></a>
+<p>
+                It's now possible to send attachments with mails. This uses the Java Activation Framework (javax.activation) and JavaMail API implementations from the GNU classpathx project.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2542">Issue 2542</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2493"></a>
+<p>
+                Replaced imCMS own image-parsing routines with javax.imageio.ImageIO
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2493">Issue 2493</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2569"></a>
+<p>
+                Started to change the database API to allow for transactions.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2569">Issue 2569</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2569"></a>
+<p>
+                Text document menus are now saved inside a transaction.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2569">Issue 2569</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.10.3</h1>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<p>
+                Added constants for use in search-strings:
+        - TextDocument.TYPE_ID
+        - UrlDocument.TYPE_ID
+            </p>
+</li>
+<li class="change">
+<a name="issue_2521"></a><a name="issue_2521"></a>
+<p>
+                Added methods:
+        - boolean User.isSuperAdmin()
+        - boolean User.canEdit(Document)
+        - String[] User.getRoleNames()
+        - DocumentService.createNewTextDocument(Document)
+        - DocumentService.createNewUrlDocument(Document)
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2521">Issue 2521</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2521">Issue 2521</a>)
+            </p>
+</li>
+<li class="change">
+<p>
+                Deprecated methods:
+        - DocumentService.createAndSaveNewTextDocument(Document)
+        - DocumentService.createAndSaveNewUrlDocument(Document)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_1981"></a><a name="issue_2516"></a>
+<p>
+                The ldap implementation should no longer be dependent on Microsoft Active Directory. Rewrote a big part of the ldap-configuration in "server.properties":
+        - "LdapUserName" is replaced by "LdapBindDn",
+        - "LdapUserObjectClass" is set to "inetOrgPerson" by default.
+        - "LdapUserIdentifyingAttribute" is replaced by "LdapUserAttribute.LoginName" which is only required if not using 'uid' in the "inetOrgPerson" objectclass. Ldap-attributes can now be arbitrarily mapped to user-properties. See the comments in "server.properties" for details.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1981">Issue 1981</a>, <a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2516">Issue 2516</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2471"></a>
+<p>
+                Fixed a bug where removing a single phone number from a user had no effect.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2471">Issue 2471</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2485"></a>
+<p>
+                Use dos-style line-endings in the text-files in the zip file, and unix-style line-endings in the tarball.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2485">Issue 2485</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2488"></a>
+<p>
+                Instead of empty strings, use "localhost" for default database-host and "imcms" for default database-name.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2488">Issue 2488</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.10.2</h1>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2344"></a>
+<p>
+                Added method Image.isEmpty() to determine whether an image is empty or not.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2344">Issue 2344</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2475"></a>
+<p>
+                Image.getWidth() and Image.getHeight() now return the actual size of the image as it will be displayed, instead of 0, unless the actual size couldn't be determined.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2475">Issue 2475</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2449"></a>
+<p>
+                Fixed a bug which caused includes to be done with the included document in adminmode.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2449">Issue 2449</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2454"></a>
+<p>
+                Image-tags containing filedocument-images are hidden from users without permissions to the filedocument.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2454">Issue 2454</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2445"></a>
+<p>
+                Fixed a mistake which prevented the imCMS-advertisement in "imcms_message.html" from being output at the beginning of every page.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2445">Issue 2445</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2406"></a>
+<p>
+                Allow files with extensions "jsp" and "js" to be edited in the file administrator ("FileAdmin").
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2406">Issue 2406</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2460"></a>
+<p>
+                Build a zip file/tarball so people don't have to download more than one file.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2460">Issue 2460</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2419"></a>
+<p>
+                Fixed a number of problems with the conference login.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2419">Issue 2419</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2462"></a>
+<p>
+                Fixed a bug with the linkeditor in browsers other than Internet Explorer.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2462">Issue 2462</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2327"></a>
+<p>
+                Made the html-editor optional through the use of a cookie.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2327">Issue 2327</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2418"></a>
+<p>
+                Fixed a bug with creating external links in the html-editor.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2418">Issue 2418</a>)
+            </p>
+</li>
+<li class="change">
+<p>
+                Fixed a couple of bugs related to creating new conferences and new conference-users.
+            </p>
+</li>
+<li class="change">
+<a name="issue_2316"></a>
+<p>
+                Made listing many users somewhat quicker.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2316">Issue 2316</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.10.1</h1>
+<h2>Of
+            interest
+            to
+            </h2>
+<ul>
+<li class="change">
+<a name="issue_2443"></a>
+<p>
+                Fixed exception and possible menu-deletion when trying to readd an already existing document to a menu sorted by "manual" order.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2443">Issue 2443</a>)
+            </p>
+</li>
+<li class="change">
+<p>
+                Included both english and swedish sql scripts in the distribution.
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.10.0</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<a name="issue_2128"></a>
+<p>
+                Filedocuments of types "png", "gif", or "jpeg" can now be used as images.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2128">Issue 2128</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2128"></a>
+<p>
+                Completely redid the image-selecting interface to allow for the new filedocuments-as-images paradigm.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2128">Issue 2128</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2149"></a>
+<p>
+                Replaced dropdown for selecting document publisher with a user-select dialog, and made the document creator settable in the same manner.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2149">Issue 2149</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2088"></a>
+<p>
+                Allow filedocument filenames of up to 255 characters, truncating somewhat intelligently if needed.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2088">Issue 2088</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2387"></a>
+<p>
+                Only show links to documents which the user has at least read permission on, or which are visible to non-authorized users.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2387">Issue 2387</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2390"></a>
+<p>
+                Fixed exception when adding documents to a menu sorted by "manual" order.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2390">Issue 2390</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2367"></a>
+<p>
+                Setting the modified time of a document is now possible, but it will still be updated the next time the document is modified.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2367">Issue 2367</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            template creators</h2>
+<ul>
+<li class="change">
+<a name="issue_1622"></a>
+<p>
+                The label attribute now works for the include-tag: &lt;?imcms:include label="Include label"?&gt;
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1622">Issue 1622</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2151"></a>
+<p>
+                The outputdescription-attribute of the documentcategories tag now takes two values, "true" or "only":
+        - "true": &lt;?imcms:documentcategories outputdescription="true"?&gt; will output "categoryname - categorydescription"
+        - "only": &lt;?imcms:documentcategories outputdescription="only"?&gt; will output "categorydescription"
+        - Not present: &lt;?imcms:documentcategories?&gt; will output "categoryname".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2151">Issue 2151</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<a name="issue_2424"></a>
+<p>
+                The file "host.properties" is gone, and everything is put in "server.properties".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2424">Issue 2424</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2354"></a>
+<p>
+                Worked a little more on indexing robustness.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2354">Issue 2354</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2362"></a>
+<p>
+                Made the indexing work at a lower priority.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2362">Issue 2362</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2365"></a>
+<p>
+                Remove documents from the index when deleted.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2365">Issue 2365</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2336"></a>
+<p>
+                Fixed a bug in the linkchecker where some broken links would be flagged as OK.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2336">Issue 2336</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_1886"></a>
+<p>
+                If "SessionCookieDomain" is set in "server.properties", a second JSESSIONID cookie will be set with the given domain.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=1886">Issue 1886</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2344"></a>
+<p>
+                Added methods TextDocument.getTextFields(), TextDocument.getImages(), and TextDocument.getIncludes()
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2344">Issue 2344</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2351"></a>
+<p>
+                Added accessors Document.setVisibleInMenusForUnauthorizedUsers(boolean visibleInMenusForUnauthorizedUsers) and Document.isVisibleInMenusForUnauthorizedUsers()
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2351">Issue 2351</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2388"></a>
+<p>
+                Added accessor Document.setCreator(User creator)
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2388">Issue 2388</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2153"></a>
+<p>
+                Added method Document.getDocumentPermissionSetForUser()
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2153">Issue 2153</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2438"></a>
+<p>
+                Added accessors TextDocument.Menu.getSortOrder() and TextDocument.Menu.setSortOrder(int sortOrder)
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2438">Issue 2438</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2438"></a>
+<p>
+                Added method TextDocument.getMenus()
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2438">Issue 2438</a>)
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<a name="issue_2149"></a>
+<p>
+                Removed user-"categories".
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2149">Issue 2149</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2039"></a>
+<p>
+                Refactored the code for creating and editing documents.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2039">Issue 2039</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.9.3</h1>
+<h2>Of
+            interest
+            to
+            </h2>
+<ul>
+<li class="change">
+<a name="issue_2387"></a>
+<p>
+                Only show links to documents which the user has at least read permission on, or which are visible to non-authorized users.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2387">Issue 2387</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.9.2</h1>
+<h2>Of
+            interest
+            to
+            </h2>
+<ul>
+<li class="change">
+<a name="issue_2390"></a>
+<p>
+                Fixed exception when adding documents to a menu sorted by "manual" order.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2390">Issue 2390</a>)
+            </p>
+</li>
+<li class="change">
+<a name="issue_2365"></a>
+<p>
+                Remove documents from the index when deleted.
+            
+                (<a class="issue" href="http://bugzilla.imcode.com/show_bug.cgi?id=2365">Issue 2365</a>)
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.9.1</h1>
+<h2>Of
+            interest
+            to
+            </h2>
+<ul>
+<li class="change">
+<p>
+                Made the indexing a little more robust.
+            </p>
+</li>
+</ul>
+<h1>
+        Changes in version 1.9.0</h1>
+<h2>Of
+            interest
+            to
+            users</h2>
+<ul>
+<li class="change">
+<p>
+                Simple/advanced view toggle for docinfo.
+            </p>
+</li>
+<li class="change">
+<p>
+                Admin-pages will now work on non-javascript-enabled browsers.
+            </p>
+</li>
+<li class="change">
+<p>
+                All admin-pages now use the new blue/white look.
+            </p>
+</li>
+<li class="change">
+<p>
+                The link checker will now also check linked images and urls in text-fields.
+            </p>
+</li>
+<li class="change">
+<p>
+                "Administer conferences" functionality moved to "List new/updated pages".
+            </p>
+</li>
+<li class="change">
+<p>
+                The session counter now counts sessions, not logins. This means that each visitor is only counted once per browser session, instead of once when entering the site and then again when logging in.
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            template creators</h2>
+<ul>
+<li class="change">
+<p>
+                New template tag: &lt;?imcms:contextpath?&gt; will be replaced by the "context path" of the webapp. The context path is the root path to the webapp, usually the name of the webapp preceded by a slash, for example "/imcms". This is useful when one wants to construct an absolute URL. Example: &lt;img src="&lt;?imcms:contextpath?&gt;/images/imCMSpower.gif" alt="Powered by imCMS"&gt;
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            administrators</h2>
+<ul>
+<li class="change">
+<p>
+                The webapp should now be possible to rename without having to change any templates.
+            </p>
+</li>
+<li class="change">
+<p>
+                We now return correct HTTP status codes: 404 for "Not found", and 403 for "Forbidden/Permission denied".
+            </p>
+</li>
+<li class="change">
+<p>
+                Changed database parameters to allow for different database-drivers: The parameters "Url", "Host", "Port", "DatabaseName" in imcms/WEB-INF/conf/server.properties were replaced by the single option "JdbcUrl", which for the Microsoft JDBC driver maps to the old parameters as follows: jdbc:microsoft:sqlserver://&lt;Host&gt;:&lt;Port&gt;;DatabaseName=&lt;DatabaseName&gt;
+            </p>
+</li>
+<li class="change">
+<p>
+                The "MaxConnectionCount" in server.properties is ignored by the Microsoft JDBC Driver, unless one sets the driver parameter "SelectMethod" to "cursor". To do this, append ";SelectMethod=cursor" (note the semicolon) to the JdbcUrl. The default is "SelectMethod=direct", and this causes the MS JDBC driver to clone connections internally. See http://support.microsoft.com/default.aspx?scid=kb;EN-US;313220 for more information.
+            </p>
+</li>
+<li class="change">
+<p>
+                Conference, billboard, and chat should now work on case sensitive filesystems, for example on linux.
+            </p>
+</li>
+<li class="change">
+<p>
+                Reindexing of documents is now scheduled every 24 hours from startup. Reindexing is done to a new directory, "imcms/WEB-INF/index.new", which replaces the current index "imcms/WEB-INF/index" when complete.
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            site developers</h2>
+<ul>
+<li class="change">
+<p>
+                Moved the apisamples from "/apisamples/" to "/imcms/docs/apisamples/".
+            </p>
+</li>
+<li class="change">
+<p>
+                DocumentService.saveChanges(Document) is now synchronized as a poor mans transaction to prevent database conflicts.
+            </p>
+</li>
+<li class="change">
+<p>
+                Added method DocumentService.getCategoryType(int categoryTypeId)
+            </p>
+</li>
+<li class="change">
+<p>
+                Added method DocumentService.createNewCategoryType(String name, int maxChoices)
+            </p>
+</li>
+<li class="change">
+<p>
+                Added method DocumentService.createNewCategory(String name, String description, String imageUrl, CategoryType categoryType)
+            </p>
+</li>
+<li class="change">
+<p>
+                Added method TemplateService.getAllTemplateGroups()
+            </p>
+</li>
+<li class="change">
+<p>
+                Added accessors Template.getId() and TemplateGroup.getId().
+            </p>
+</li>
+<li class="change">
+<p>
+                Added convenience method DocumentService.parseLuceneSearchQuery(String) which returns a SearchQuery parsed according to Lucene syntax, see http://jakarta.apache.org/lucene/docs/queryparsersyntax.html
+            </p>
+</li>
+</ul>
+<h2>Of
+            interest
+            to
+            developers</h2>
+<ul>
+<li class="change">
+<p>
+                Cleaned up the file organization in the project.
+            </p>
+</li>
+<li class="change">
+<p>
+                Renamed all the ant-targets using more consistent names.
+            </p>
+</li>
+<li class="change">
+<p>
+                The API now has its own connection pool, so developers using the API can't accidentally starve the system of connections.
+            </p>
+</li>
+<li class="change">
+<p>
+                Jakarta Velocity (http://jakarta.apache.org/velocity/) can now be used in admintemplates and JSP-pages.
+            </p>
+</li>
+<li class="change">
+<p>
+                Searchable tokens in the index may now only consist of letters, digits, and underscores, instead of non-whitespace. This makes html index a little bit better, so that for example &lt;b&gt;bold&lt;/b&gt; is indexed as two words ("b" and "bold").
+            </p>
+</li>
+</ul>
+</body>
+</html>
diff --git a/docs/INSTALL.TXT b/docs/INSTALL.TXT
index c84752ad10..004a3307ba 100644
--- a/docs/INSTALL.TXT
+++ b/docs/INSTALL.TXT
@@ -3,7 +3,7 @@ Installing imCMS:
 
 Prerequisites:
 
-    * Install the Java Development Kit version 1.4 or later.
+    * Install the Java Development Kit version 1.5 or later.
 
     * Install Apache Tomcat 4 or later,
       or another servlet-api 2.3 (or later) compatible servlet engine.
@@ -45,6 +45,7 @@ Setting up imCMS:
     * Edit the file "server.properties" in the directory "tomcat/webapps/imcms/WEB-INF/conf",
       and set the database parameters ("JdbcDriver", "JdbcUrl", "User", "Password", "MaxConnectionCount")
       according to your setup.
+      Set "server-name" to show where imcms installed for example - "http://localhost:8080"
       Set "SmtpServer" to the hostname of your SMTP (outgoing mail) server.
 
     * If you want to add a file-extension to be recognized as a mime-type by imCMS,
@@ -65,5 +66,11 @@ Running:
       
     * When the database setup is finished you should see the welcome page.
 
+if you wont to use CGI service (BankID and etc) follow this steps:
+    1.	Run IDEA.
+    2.	Make key combination ALT+F12
+    3.	In Opened Terminal Window write command cd %JAVA_HOME%. If nothing has happened - execute command “C:�  where C – java_home parent disk name
+    4.	Execute command “keytool -alias {sitename} -importcert –file {pathtocertificate}/***.crt� where {pathtocertificate} – path to certificate, as file extension can by any certificate extension, {sitename} – site address, that certificating by
+
 
 You're done!
diff --git a/docs/_test__iso_8859-1.txt b/docs/_test__iso_8859-1.txt
new file mode 100644
index 0000000000..87deefb593
--- /dev/null
+++ b/docs/_test__iso_8859-1.txt
@@ -0,0 +1,9 @@
+ISO 8859-1 : Lorem ipsum dolor sit amet, consectetur adipiscing eöit. Cras quis eros dolor. Mauris quis lorem a urna aliquaä dignissåm sit amet ac tårpis. Suspendisse pharetra adipiäcing neque a accumsan!
+Nulåa dapibus elementum turpås, ut eleifenö nåque euismåd id. In pärttiéor libero ac quam tincidunt ac bibendum quam aliquet. Cras quam lectus, éharetra vitae imperdéet eget, aliquam vitae justo.
+Suspendisse gravida feliä eu enim adiéisciög id oråaäe niöi sagittiö.
+
+	Moäbä vitae neque eöet lacus dictum tristique.
+	Aliquam tempus egestas dui, et iééulis nunc pretium ac.
+	Phaselluå ut tortor eu ärcu pharetra öuscipié?
+
+Préesent eu sem nibh.
diff --git a/docs/_test__utf-8.txt b/docs/_test__utf-8.txt
new file mode 100644
index 0000000000..f3bcedfcf7
--- /dev/null
+++ b/docs/_test__utf-8.txt
@@ -0,0 +1,9 @@
+UTF-8 : Lorem ipsum dolor sit amet, consectetur adipiscing eöit. Cras quis eros dolor. Mauris quis lorem a urna aliquaä dignissåm sit amet ac tårpis. Suspendisse pharetra adipiäcing neque a accumsan!
+Nulåa dapibus elementum turpås, ut eleifenö nåque euismåd id. In pärttiéor libero ac quam tincidunt ac bibendum quam aliquet. Cras quam lectus, éharetra vitae imperdéet eget, aliquam vitae justo.
+Suspendisse gravida feliä eu enim adiéisciög id oråaäe niöi sagittiö.
+
+    Moäbä vitae neque eöet lacus dictum tristique.
+    Aliquam tempus egestas dui, et iééulis nunc pretium ac.
+    Phaselluå ut tortor eu ärcu pharetra öuscipié?
+
+Préesent eu sem nibh.
diff --git a/docs/html_bankid_login_cgi/images/1x1.gif b/docs/html_bankid_login_cgi/images/1x1.gif
new file mode 100644
index 0000000000..1d11fa9ada
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/1x1.gif differ
diff --git a/docs/html_bankid_login_cgi/images/arrow_right.png b/docs/html_bankid_login_cgi/images/arrow_right.png
new file mode 100644
index 0000000000..c737f59cc0
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/arrow_right.png differ
diff --git a/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom.gif b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom.gif
new file mode 100644
index 0000000000..7d2e5cee36
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom.gif differ
diff --git a/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom_left.gif b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom_left.gif
new file mode 100644
index 0000000000..1553ee34b1
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom_left.gif differ
diff --git a/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom_right.gif b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom_right.gif
new file mode 100644
index 0000000000..2ce42ca2ef
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_bottom_right.gif differ
diff --git a/docs/html_bankid_login_cgi/images/imcms_admin_shadow_right.gif b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_right.gif
new file mode 100644
index 0000000000..9f4b969341
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_right.gif differ
diff --git a/docs/html_bankid_login_cgi/images/imcms_admin_shadow_right_top.gif b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_right_top.gif
new file mode 100644
index 0000000000..58c1f91a93
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/imcms_admin_shadow_right_top.gif differ
diff --git a/docs/html_bankid_login_cgi/images/logo_imcms_admin.gif b/docs/html_bankid_login_cgi/images/logo_imcms_admin.gif
new file mode 100644
index 0000000000..23a5a1c193
Binary files /dev/null and b/docs/html_bankid_login_cgi/images/logo_imcms_admin.gif differ
diff --git a/lib/commons-beanutils-1.7.0.jar b/lib/commons-beanutils-1.7.0.jar
deleted file mode 100644
index b1b89c9c92..0000000000
Binary files a/lib/commons-beanutils-1.7.0.jar and /dev/null differ
diff --git a/lib/commons-betwixt-0.8.jar b/lib/commons-betwixt-0.8.jar
deleted file mode 100644
index ab00040b7b..0000000000
Binary files a/lib/commons-betwixt-0.8.jar and /dev/null differ
diff --git a/lib/commons-collections-3.1.jar b/lib/commons-collections-3.1.jar
deleted file mode 100644
index 41e230feea..0000000000
Binary files a/lib/commons-collections-3.1.jar and /dev/null differ
diff --git a/lib/commons-dbcp-1.2.1.jar b/lib/commons-dbcp-1.2.1.jar
deleted file mode 100644
index 08440c02e5..0000000000
Binary files a/lib/commons-dbcp-1.2.1.jar and /dev/null differ
diff --git a/lib/commons-dbutils-1.0.jar b/lib/commons-dbutils-1.0.jar
deleted file mode 100644
index be1a49a519..0000000000
Binary files a/lib/commons-dbutils-1.0.jar and /dev/null differ
diff --git a/lib/commons-digester-1.7.jar b/lib/commons-digester-1.7.jar
deleted file mode 100644
index 1783dbea23..0000000000
Binary files a/lib/commons-digester-1.7.jar and /dev/null differ
diff --git a/lib/commons-email-1.0.jar b/lib/commons-email-1.0.jar
deleted file mode 100644
index c19e70504b..0000000000
Binary files a/lib/commons-email-1.0.jar and /dev/null differ
diff --git a/lib/commons-fileupload-1.2.jar b/lib/commons-fileupload-1.2.jar
deleted file mode 100644
index 12539f5edb..0000000000
Binary files a/lib/commons-fileupload-1.2.jar and /dev/null differ
diff --git a/lib/commons-httpclient-2.0.2.jar b/lib/commons-httpclient-2.0.2.jar
deleted file mode 100644
index c5c52adfca..0000000000
Binary files a/lib/commons-httpclient-2.0.2.jar and /dev/null differ
diff --git a/lib/commons-io-1.1.jar b/lib/commons-io-1.1.jar
deleted file mode 100644
index 624fc1a724..0000000000
Binary files a/lib/commons-io-1.1.jar and /dev/null differ
diff --git a/lib/commons-lang-2.1.jar b/lib/commons-lang-2.1.jar
deleted file mode 100644
index 87b80ab5db..0000000000
Binary files a/lib/commons-lang-2.1.jar and /dev/null differ
diff --git a/lib/commons-logging-api-1.0.5-alpha1.jar b/lib/commons-logging-api-1.0.5-alpha1.jar
deleted file mode 100644
index cba5d3fe38..0000000000
Binary files a/lib/commons-logging-api-1.0.5-alpha1.jar and /dev/null differ
diff --git a/lib/commons-pool-1.2.jar b/lib/commons-pool-1.2.jar
deleted file mode 100644
index 4ba534c90e..0000000000
Binary files a/lib/commons-pool-1.2.jar and /dev/null differ
diff --git a/lib/ddlutils-imcms-svn20060906-src.jar b/lib/ddlutils-imcms-svn20060906-src.jar
deleted file mode 100644
index 5de5f94f57..0000000000
Binary files a/lib/ddlutils-imcms-svn20060906-src.jar and /dev/null differ
diff --git a/lib/ddlutils-imcms-svn20060906.jar b/lib/ddlutils-imcms-svn20060906.jar
deleted file mode 100644
index 5ff189ea76..0000000000
Binary files a/lib/ddlutils-imcms-svn20060906.jar and /dev/null differ
diff --git a/lib/gnu-activation-1.0.jar b/lib/gnu-activation-1.0.jar
deleted file mode 100644
index b1a72c1dfc..0000000000
Binary files a/lib/gnu-activation-1.0.jar and /dev/null differ
diff --git a/lib/gnu-crypto-javax-security-2.0.1.jar b/lib/gnu-crypto-javax-security-2.0.1.jar
deleted file mode 100644
index 2b0d549a4a..0000000000
Binary files a/lib/gnu-crypto-javax-security-2.0.1.jar and /dev/null differ
diff --git a/lib/gnu-inetlib-1.1.jar b/lib/gnu-inetlib-1.1.jar
deleted file mode 100644
index 89c796dd62..0000000000
Binary files a/lib/gnu-inetlib-1.1.jar and /dev/null differ
diff --git a/lib/gnu-mail-1.0.jar b/lib/gnu-mail-1.0.jar
deleted file mode 100644
index ae395c102e..0000000000
Binary files a/lib/gnu-mail-1.0.jar and /dev/null differ
diff --git a/lib/gnu-mail-providers-1.0.jar b/lib/gnu-mail-providers-1.0.jar
deleted file mode 100644
index 75d9a90643..0000000000
Binary files a/lib/gnu-mail-providers-1.0.jar and /dev/null differ
diff --git a/lib/imcode-db-0.3-src.tar.gz b/lib/imcode-db-0.3-src.tar.gz
deleted file mode 100644
index 94e7828faf..0000000000
Binary files a/lib/imcode-db-0.3-src.tar.gz and /dev/null differ
diff --git a/lib/imcode-db-0.3.jar b/lib/imcode-db-0.3.jar
deleted file mode 100644
index 09e137b321..0000000000
Binary files a/lib/imcode-db-0.3.jar and /dev/null differ
diff --git a/lib/imcode-ldap-0.1-src.tar.gz b/lib/imcode-ldap-0.1-src.tar.gz
deleted file mode 100644
index 46fb119dc4..0000000000
Binary files a/lib/imcode-ldap-0.1-src.tar.gz and /dev/null differ
diff --git a/lib/imcode-ldap-0.1.jar b/lib/imcode-ldap-0.1.jar
deleted file mode 100644
index d565290f3f..0000000000
Binary files a/lib/imcode-ldap-0.1.jar and /dev/null differ
diff --git a/lib/imcode-util-2.0-src.tar.gz b/lib/imcode-util-2.0-src.tar.gz
deleted file mode 100644
index 83f7498fdd..0000000000
Binary files a/lib/imcode-util-2.0-src.tar.gz and /dev/null differ
diff --git a/lib/imcode-util-2.0.1.jar b/lib/imcode-util-2.0.1.jar
deleted file mode 100644
index ec7bca5500..0000000000
Binary files a/lib/imcode-util-2.0.1.jar and /dev/null differ
diff --git a/lib/jakarta-oro-2.0.8.jar b/lib/jakarta-oro-2.0.8.jar
deleted file mode 100644
index 23488d2600..0000000000
Binary files a/lib/jakarta-oro-2.0.8.jar and /dev/null differ
diff --git a/lib/jstl-1.1.2.jar b/lib/jstl-1.1.2.jar
deleted file mode 100644
index a02abecc8b..0000000000
Binary files a/lib/jstl-1.1.2.jar and /dev/null differ
diff --git a/lib/jtds-1.1.jar b/lib/jtds-1.1.jar
deleted file mode 100644
index 41766cbf26..0000000000
Binary files a/lib/jtds-1.1.jar and /dev/null differ
diff --git a/lib/log4j-1.2.12.jar b/lib/log4j-1.2.12.jar
deleted file mode 100644
index 9b5a720088..0000000000
Binary files a/lib/log4j-1.2.12.jar and /dev/null differ
diff --git a/lib/lucene-1.4.3.jar b/lib/lucene-1.4.3.jar
deleted file mode 100644
index 58add9901b..0000000000
Binary files a/lib/lucene-1.4.3.jar and /dev/null differ
diff --git a/lib/mysql-connector-java-3.1.7-bin.jar b/lib/mysql-connector-java-3.1.7-bin.jar
deleted file mode 100644
index b939771131..0000000000
Binary files a/lib/mysql-connector-java-3.1.7-bin.jar and /dev/null differ
diff --git a/lib/nodist/junit.jar b/lib/nodist/junit.jar
deleted file mode 100644
index 674d71e89e..0000000000
Binary files a/lib/nodist/junit.jar and /dev/null differ
diff --git a/lib/noinstall/ant-contrib-0.6.jar b/lib/noinstall/ant-contrib-0.6.jar
deleted file mode 100644
index db90b0aae8..0000000000
Binary files a/lib/noinstall/ant-contrib-0.6.jar and /dev/null differ
diff --git a/lib/noinstall/antlr-2.7.5.jar b/lib/noinstall/antlr-2.7.5.jar
deleted file mode 100644
index fbe5e3cd38..0000000000
Binary files a/lib/noinstall/antlr-2.7.5.jar and /dev/null differ
diff --git a/lib/noinstall/catalina-ant.jar b/lib/noinstall/catalina-ant.jar
deleted file mode 100644
index bb0055926a..0000000000
Binary files a/lib/noinstall/catalina-ant.jar and /dev/null differ
diff --git a/lib/noinstall/checkstyle-4.3.jar b/lib/noinstall/checkstyle-4.3.jar
deleted file mode 100644
index c72639cd03..0000000000
Binary files a/lib/noinstall/checkstyle-4.3.jar and /dev/null differ
diff --git a/lib/noinstall/commons-digester-1.7.jar b/lib/noinstall/commons-digester-1.7.jar
deleted file mode 100644
index 1783dbea23..0000000000
Binary files a/lib/noinstall/commons-digester-1.7.jar and /dev/null differ
diff --git a/lib/noinstall/commons-el-1.0.jar b/lib/noinstall/commons-el-1.0.jar
deleted file mode 100644
index 608ed796ca..0000000000
Binary files a/lib/noinstall/commons-el-1.0.jar and /dev/null differ
diff --git a/lib/noinstall/imcode-ant-tasks-1.3-src.tar.gz b/lib/noinstall/imcode-ant-tasks-1.3-src.tar.gz
deleted file mode 100644
index 8902f7bff6..0000000000
Binary files a/lib/noinstall/imcode-ant-tasks-1.3-src.tar.gz and /dev/null differ
diff --git a/lib/noinstall/imcode-ant-tasks-1.3.jar b/lib/noinstall/imcode-ant-tasks-1.3.jar
deleted file mode 100644
index 4448ed9a8a..0000000000
Binary files a/lib/noinstall/imcode-ant-tasks-1.3.jar and /dev/null differ
diff --git a/lib/noinstall/jakarta-regexp-1.3.jar b/lib/noinstall/jakarta-regexp-1.3.jar
deleted file mode 100644
index d653a388c9..0000000000
Binary files a/lib/noinstall/jakarta-regexp-1.3.jar and /dev/null differ
diff --git a/lib/noinstall/jasper-compiler-5.0.28.jar b/lib/noinstall/jasper-compiler-5.0.28.jar
deleted file mode 100644
index 96ec53852d..0000000000
Binary files a/lib/noinstall/jasper-compiler-5.0.28.jar and /dev/null differ
diff --git a/lib/noinstall/jasper-runtime-5.0.28.jar b/lib/noinstall/jasper-runtime-5.0.28.jar
deleted file mode 100644
index 5c3b4bfff7..0000000000
Binary files a/lib/noinstall/jasper-runtime-5.0.28.jar and /dev/null differ
diff --git a/lib/noinstall/jsp-api-2.0.jar b/lib/noinstall/jsp-api-2.0.jar
deleted file mode 100644
index 3d0c81fef3..0000000000
Binary files a/lib/noinstall/jsp-api-2.0.jar and /dev/null differ
diff --git a/lib/noinstall/servlet-api-2.4.jar b/lib/noinstall/servlet-api-2.4.jar
deleted file mode 100644
index dd326d3611..0000000000
Binary files a/lib/noinstall/servlet-api-2.4.jar and /dev/null differ
diff --git a/lib/pdfbox-0.7.2.jar b/lib/pdfbox-0.7.2.jar
deleted file mode 100644
index 6d4b513fcc..0000000000
Binary files a/lib/pdfbox-0.7.2.jar and /dev/null differ
diff --git a/lib/poi-3.0-alpha1.jar b/lib/poi-3.0-alpha1.jar
deleted file mode 100644
index 4bfbbb8667..0000000000
Binary files a/lib/poi-3.0-alpha1.jar and /dev/null differ
diff --git a/lib/poi-scratchpad-3.0-alpha1.jar b/lib/poi-scratchpad-3.0-alpha1.jar
deleted file mode 100644
index d266fdb474..0000000000
Binary files a/lib/poi-scratchpad-3.0-alpha1.jar and /dev/null differ
diff --git a/lib/standard-1.1.2.jar b/lib/standard-1.1.2.jar
deleted file mode 100644
index bc528acb94..0000000000
Binary files a/lib/standard-1.1.2.jar and /dev/null differ
diff --git a/lib/velocity-1.4.jar b/lib/velocity-1.4.jar
deleted file mode 100644
index 04ec9d2f85..0000000000
Binary files a/lib/velocity-1.4.jar and /dev/null differ
diff --git a/pom-ant.xml b/pom-ant.xml
new file mode 100644
index 0000000000..19ec686664
--- /dev/null
+++ b/pom-ant.xml
@@ -0,0 +1,263 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!--
+    Contains tasks for maven-driven build - see pom.xml for more details.
+    Not intended to be used as a standalone ant build.
+-->
+<project name="pom-ant">
+
+    <property file="build.properties"/>
+
+    <!-- todo: add jsp compilation as pre-integration test -->
+    <!-- todo: commons NOP logger ??? -->
+
+    <property name="version" value="" description="Artifact version is written into the WEB-INF/version.txt file. Set from Maven build."/>
+    <property name="webroot" value="" description="Generated webapp dir. Set from Maven build."/>
+    <property name="log4j2-conf.file" value="" description="Log4j2 configuration file to use. Set from Maven build."/>
+
+    <property name="imcms" value="${webroot}/imcms"/>
+    <property name="docs" value="${imcms}/docs"/>
+    <property name="apisamples" value="${docs}/apisamples"/>
+
+    <property name="WEB-INF" value="${webroot}/WEB-INF"/>
+    <property name="versionfile" value="${WEB-INF}/version.txt"/>
+
+    <property name="conf" value="${WEB-INF}/conf"/>
+    <property name="templates" value="${WEB-INF}/templates"/>
+    <property name="sql" value="${WEB-INF}/sql"/>
+    <property name="sql-diff" value="${sql}/diff"/>
+    <property name="sql-sprocs" value="${sql}/sprocs"/>
+
+    <!-- Paths for other templates -->
+    <property name="texttemplates" value="${templates}/text"/>
+
+    <property name="imagespattern" value="**/*.png,**/*.jpg,**/*.gif"/>
+
+    <taskdef name="imtranslate" classname="com.imcode.ant.tasks.Translate"/>
+    <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+    <!-- todo: API??? -->
+    <!--<target name="bindist-api-jar" depends="test">-->
+    <!--<mkdir dir="${dist}"/>-->
+    <!--<jar destfile="${bindist-api-jar}" basedir="${classes}" includes="com/imcode/imcms/api/**"/>-->
+    <!--</target>-->
+
+    <!-- todo: not in use ?!? -->
+    <target name="changes" depends="init">
+        <xslt in="docs/changes.xml" style="docs/changes.xsl" out="docs/CHANGES.HTML"/>
+    </target>
+
+    <target name="sql" depends="init">
+        <concat destfile="${sql}/ddl.xml">
+            <header>&lt;database defaultIdMethod="native" name="imcms"&gt;${line.separator}</header>
+            <fileset dir="sql/tables" includes="*.tab"/>
+            <footer>&lt;/database&gt;${line.separator}</footer>
+        </concat>
+
+        <copy todir="${sql}">
+            <fileset file="sql/data/init.sql"/>
+        </copy>
+
+        <copy todir="${sql-diff}">
+            <fileset dir="sql/diff" includes="diff-*.sql"/>
+        </copy>
+
+        <copy todir="${sql-diff}">
+            <fileset file="sql/diff/schema-upgrade.xml"/>
+        </copy>
+
+        <copy todir="${sql-sprocs}">
+            <fileset dir="sql/sprocs" includes="*.prc"/>
+        </copy>
+    </target>
+
+
+    <!-- Creates the directories and copies the files that are to be public. -->
+    <target name="web"
+            depends="init,changes"
+            description="Translates and copies the webfiles.">
+
+        <dependset>
+            <srcfileset file="build.properties"/>
+            <targetfileset dir="${conf}"/>
+        </dependset>
+
+        <echo message="${version}" file="${versionfile}"/>
+
+        <copy todir="${webroot}" filtering="true" encoding="utf-8">
+            <fileset dir="web" excludes="imcms/lang/**,WEB-INF/templates/lang/**,${imagespattern}"/>
+        </copy>
+
+        <copy todir="${webroot}">
+            <fileset dir="web" excludes="imcms/lang/**,WEB-INF/templates/lang/**" includes="${imagespattern}"/>
+        </copy>
+
+        <antcall target="web-lang">
+            <param name="buildlanguage" value="swe"/>
+        </antcall>
+
+        <antcall target="web-lang">
+            <param name="buildlanguage" value="eng"/>
+        </antcall>
+
+        <copy todir="${apisamples}" description="appending .txt on all jsp files making the source browsable">
+            <fileset dir="${apisamples}">
+                <include name="*.jsp"/>
+            </fileset>
+            <mapper type="glob" from="*" to="*.txt"/>
+        </copy>
+
+        <copy todir="${docs}">
+            <fileset dir="${basedir}/docs"/>
+        </copy>
+
+        <copy file="${conf}/${log4j2-conf.file}" tofile="${conf}/log4j2.xml" overwrite="true"/>
+
+        <!--<copy file="${basedir}/server.xml" todir="${conf}" overwrite="true"/>-->
+    </target>
+
+
+    <target name="web-lang" depends="init">
+        <imtranslate bundle="web/WEB-INF/conf/imcms" bundlelanguage="${buildlanguage}"
+                     starttoken="&lt;? " endtoken=" ?&gt;"
+                     todir="${templates}/${buildlanguage}" filtering="true" encoding="utf-8">
+            <fileset dir="web/WEB-INF/templates/lang"/>
+        </imtranslate>
+
+        <imtranslate bundle="web/WEB-INF/conf/imcms" bundlelanguage="${buildlanguage}"
+                     starttoken="&lt;? " endtoken=" ?&gt;"
+                     todir="${imcms}/${buildlanguage}" filtering="true" encoding="utf-8">
+            <fileset dir="web/imcms/lang" excludes="${imagespattern}"/>
+        </imtranslate>
+
+        <copy todir="${imcms}/${buildlanguage}" filtering="false">
+            <fileset dir="web/imcms/lang" includes="${imagespattern}"/>
+        </copy>
+    </target>
+
+
+    <!-- Init targets -->
+    <target name="init" depends="init-global-filters"
+            description="Handy target for everything else to depend on.">
+
+        <record name="${basedir}/build.log"/>
+
+        <tstamp/>
+
+        <if>
+            <equals arg1="${version}" arg2=""/>
+            <then>
+                <fail message="version property is not set"/>
+            </then>
+        </if>
+        <if>
+            <equals arg1="${webroot}" arg2=""/>
+            <then>
+                <fail message="webroot property is not set"/>
+            </then>
+        </if>
+        <if>
+            <equals arg1="${log4j2-conf.file}" arg2=""/>
+            <then>
+                <fail message="log4j2-conf.file property is not set"/>
+            </then>
+        </if>
+    </target>
+
+
+    <target name="init-global-filters">
+        <filter token="defaultlanguage" value="${defaultlanguage}"/>
+        <filter token="server-name" value="${server-name}"/>
+        <filter token="documentationwebappurl" value="http://${documentation-host}/${version}"/>
+        <filter token="documentationurl" value="http://${documentation-host}/${version}"/>
+
+        <filter token="deny-multiple-user-login" value="${deny-multiple-user-login}"/>
+
+        <filter token="db-schema-version" value="${db-schema-version}"/>
+        <filter token="db-driver" value="${db-driver}"/>
+        <filter token="db-url" value="${db-url}"/>
+        <filter token="db-name" value="${db-name}"/>
+        <filter token="db-user" value="${db-user}"/>
+        <filter token="db-pass" value="${db-pass}"/>
+        <filter token="db-maxconnections" value="${db-maxconnections}"/>
+
+		<filter token="cgi-metadata-url" value="${cgi-metadata-url}"/>
+		<filter token="authentication-configuration" value="${authentication-configuration}"/>
+		<filter token="cgi-user-role-name" value="${cgi-user-role-name}"/>
+
+        <filter token="external-authenticator" value="${external-authenticator}"/>
+        <filter token="external-user-and-role-registry" value="${external-user-and-role-registry}"/>
+
+        <filter token="aad.tenant.id" value="${aad.tenant.id}"/>
+        <filter token="aad.client.id" value="${aad.client.id}"/>
+        <filter token="aad.secret.key" value="${aad.secret.key}"/>
+
+        <filter token="ldap-url" value="${ldap-url}"/>
+        <filter token="ldap-bind-dn" value="${ldap-bind-dn}"/>
+        <filter token="ldap-password" value="${ldap-password}"/>
+        <filter token="ldap-read-timeout-millis" value="${ldap-read-timeout-millis}"/>
+        <filter token="ldap-max-connections" value="${ldap-max-connections}"/>
+        <filter token="ldap-connection-expiry-seconds" value="${ldap-connection-expiry-seconds}"/>
+        <filter token="ldap-user-object-class" value="${ldap-user-object-class}"/>
+        <filter token="ldap-attribute-login-name" value="${ldap-attribute-login-name}"/>
+
+
+        <filter token="secondary-external-authenticator" value="${secondary-external-authenticator}"/>
+        <filter token="secondary-external-user-and-role-registry" value="${secondary-external-user-and-role-registry}"/>
+
+        <filter token="secondary-ldap-url" value="${secondary-ldap-url}"/>
+        <filter token="secondary-ldap-bind-dn" value="${secondary-ldap-bind-dn}"/>
+        <filter token="secondary-ldap-password" value="${secondary-ldap-password}"/>
+        <filter token="secondary-ldap-user-object-class" value="${secondary-ldap-user-object-class}"/>
+        <filter token="secondary-ldap-attribute-login-name" value="${secondary-ldap-attribute-login-name}"/>
+
+
+        <filter token="sso-enabled" value="${sso-enabled}"/>
+
+        <filter token="sso-jaas-config-name" value="${sso-jaas-config-name}"/>
+        <filter token="sso-use-local-jaas-config" value="${sso-use-local-jaas-config}"/>
+        <filter token="sso-jaas-principal-name" value="${sso-jaas-principal-name}"/>
+        <filter token="sso-jaas-principal-password" value="${sso-jaas-principal-password}"/>
+
+        <filter token="sso-use-local-krb-config" value="${sso-use-local-krb-config}"/>
+        <filter token="sso-krb-realm" value="${sso-krb-realm}"/>
+        <filter token="sso-krb-kdc" value="${sso-krb-kdc}"/>
+
+        <filter token="sso-kerberos-debug" value="${sso-kerberos-debug}"/>
+
+
+        <filter token="smtp-server" value="${smtp-server}"/>
+
+        <filter token="servermaster-name" value="${servermaster-name}"/>
+        <filter token="servermaster-email" value="${servermaster-email}"/>
+
+        <filter token="webmaster-name" value="${webmaster-name}"/>
+        <filter token="webmaster-email" value="${webmaster-email}"/>
+
+        <filter token="image-archive-url" value="${image-archive-url}"/>
+        <filter token="image-archive-allowed-role-ids" value="${image-archive-allowed-role-ids}"/>
+        <filter token="choose-file-allowed-role-ids" value="${choose-file-allowed-role-ids}"/>
+        <filter token="image-magick-path" value="${image-magick-path}"/>
+        <filter token="image-cache-max-size" value="${image-cache-max-size}"/>
+        <filter token="image-size-cache-objects" value="${image-size-cache-objects}"/>
+
+        <filter token="login-password-encryption-enabled" value="${login-password-encryption-enabled}"/>
+        <filter token="login-password-encryption-salt" value="${login-password-encryption-salt}"/>
+
+        <filter token="login-password-reset-lifespan" value="${login-password-reset-lifespan}"/>
+        <filter token="superadmin-login-password-reset-allowed" value="${superadmin-login-password-reset-allowed}"/>
+
+        <filter token="index-disabled-file-mimes" value="${index-disabled-file-mimes}"/>
+        <filter token="index-disabled-file-extensions" value="${index-disabled-file-extensions}"/>
+
+        <filter token="error-logger-url" value="${error-logger-url}"/>
+
+        <filter token="sms.gateway.username" value="${sms.gateway.username}"/>
+        <filter token="sms.gateway.password" value="${sms.gateway.password}"/>
+        <filter token="sms.gateway.url" value="${sms.gateway.url}"/>
+        <filter token="sms.gateway.originAddress" value="${sms.gateway.originAddress}"/>
+        <filter token="sms.gateway.defaultCountryCode" value="${sms.gateway.defaultCountryCode}"/>
+
+        <filter token="2fa.cookie.lifetime" value="${2fa.cookie.lifetime}"/>
+    </target>
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..e2561d4704
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,989 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    :: Build Profiles
+       Activating debug profile
+       :: forces java compiler to show all warnings.
+       :: selects log4j2-debug.xml as a log4j2 engine configuration file.
+
+    :: WAR plugin ignores empty dirs when builds a webapp (as a war file or an exploded directory form).
+       However a number of dirs (such as images, uploads, etc) must always present in the webapp.
+       Workaround: add empty README file into the dir that must be included into the webapp.
+
+    :: Webapp sources generation (lang jsps->eng/swe, configs processing) is bound to the 'process-sources' phase.
+
+    :: Webapp can be tested under pre-configured embedded Jetty and Tomcat and remote Tomcat.
+       Webapp's context path defaults to /imcms-${project.version}
+       ex: http://localhost:[port]/imcms-4.1.6-SNAPSHOT
+
+      :: Embedded Jetty 7.x is configured to listen on port 9090.
+         goal 'jetty:run'.
+      :: Embedded Tomcat 6.x and 7.x is configured to listen on port 8888.
+         goal 'tomcat6/7:run'.
+
+      :: Remote Tomcat 6.x and 7.x is configured to use default tomcat address - http://localhost:8080.
+         Full list of available goals with examples can be found on plugin's website:
+         http://tomcat.apache.org/maven-plugin-2/tomcat6-maven-plugin/plugin-info.html
+
+         To manage remote tomcat plugin uses tomcat manager - the application included with a tomcat distribution.
+         For security reasons access to the manager app is disabled.
+
+         To enable remote management from the plugins and browsers (http://localhost:8080/manager/html)
+         add the following line into your $CATALINA_HOME/conf/tomcat-users.xml file:
+         <user username="manager" password="manager" roles="manager-gui,manager-script" />
+
+         The plugin provides a number of goals to deploy webapp to the remote server - deploy, deploy-only, exploded and inplace.
+         But only deploy goal is most safest and recommended.
+         Unlike other goals it invokes the execution of the lifecycle phase 'package' prior to executing itself.
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.imcode.imcms</groupId>
+	<artifactId>imcms</artifactId>
+	<packaging>war</packaging>
+	<version>4.6.2-SNAPSHOT</version>
+	<name>imCMS</name>
+
+	<properties>
+        <sp.id>sp.rainbow.org</sp.id>
+        <acs.url>https://sp.rainbow.org:8443/sso/acs</acs.url>
+        <!--<idp.sso.url>https://idp.rainbow.org:8443/idp/profile/SAML2/Redirect/SSO</idp.sso.url>-->
+        <idp.sso.url>https://m00-mg-local.testidp.funktionstjanster.se/samlv2/idp/req/0/0</idp.sso.url>
+        <logout.url>/logout</logout.url>
+		<generated.webapp.dir>${project.build.directory}/${project.build.finalName}</generated.webapp.dir>
+
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
+		<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
+
+		<javac.deprecation>false</javac.deprecation>
+		<javac.args/>
+
+		<log4j2-conf.file>log4j2-nodebug.xml</log4j2-conf.file>
+
+		<slf4j.version>1.7.36</slf4j.version>
+
+		<!-- jetty plugin since version 7.5.3+ requires maven v3.x -->
+		<jetty.version>7.5.4.v20111024</jetty.version>
+		<jetty.port>9090</jetty.port>
+		<jetty.stop.key>${project.name}</jetty.stop.key>
+		<jetty.stop.port>9696</jetty.stop.port>
+		<jetty.scanIntervalSeconds>0</jetty.scanIntervalSeconds>
+		<jetty.contextPath>/${project.artifactId}</jetty.contextPath>
+
+		<lucene.version>8.5.2</lucene.version>
+
+		<tomcat.port>8888</tomcat.port>
+		<tomcat.contextPath>/${project.artifactId}</tomcat.contextPath>
+		<tomcat.username>manager</tomcat.username>
+		<tomcat.password>manager</tomcat.password>
+	</properties>
+
+	<profiles>
+		<profile>
+			<id>debug</id>
+			<properties>
+				<javac.args>-Xlint</javac.args>
+				<javac.deprecation>true</javac.deprecation>
+				<log4j2-conf.file>log4j2-debug.xml</log4j2-conf.file>
+			</properties>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<!--
+			Logging engine configuration - forwards logging to log4j2
+
+			Tika uses slf4j
+			  -added slf4j-log4j12
+
+			Most libraries depends on commons-logging:
+			  -replaced common-logging with jcl-over-slf4j
+
+			imCMS uses both commons-logging and log4j2 directly
+			  -updated log4j2
+		-->
+
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.17.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-reload4j</artifactId>
+			<version>1.7.36</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.36</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- End of logging configuration -->
+
+		<dependency>
+			<groupId>org.apache.tika</groupId>
+			<artifactId>tika-core</artifactId>
+			<version>2.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tika</groupId>
+			<artifactId>tika-parsers-standard-package</artifactId>
+			<version>2.4.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+
+		<!-- Since 4.0.17 -->
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.1</version>
+		</dependency>
+
+		<!-- Since 4.1.16 -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>11.0.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.9</version>
+			<scope>test</scope>
+		</dependency>
+
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.4.01</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml</artifactId>
+            <version>2.6.4</version>
+	        <exclusions>
+		        <exclusion>
+			        <groupId>commons-logging</groupId>
+			        <artifactId>commons-logging</artifactId>
+		        </exclusion>
+		        <exclusion>
+			        <artifactId>bcprov-jdk15on</artifactId>
+			        <groupId>org.bouncycastle</groupId>
+		        </exclusion>
+		        <exclusion>
+			        <artifactId>commons-codec</artifactId>
+			        <groupId>commons-codec</groupId>
+		        </exclusion>
+		        <exclusion>
+			        <groupId>commons-httpclient</groupId>
+			        <artifactId>commons-httpclient</artifactId>
+		        </exclusion>
+		        <exclusion>
+			        <artifactId>commons-lang</artifactId>
+			        <groupId>commons-lang</groupId>
+		        </exclusion>
+	        </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.0</version>
+        </dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>2.14.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.14.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.microsoft.azure/adal4j -->
+		<dependency>
+			<groupId>com.microsoft.azure</groupId>
+			<artifactId>adal4j</artifactId>
+			<version>1.6.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-lang3</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
+		<dependency>
+			<groupId>com.nimbusds</groupId>
+			<artifactId>oauth2-oidc-sdk</artifactId>
+			<version>5.24.2</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-collections4</artifactId>
+					<groupId>org.apache.commons</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-lang3</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.8.3</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-betwixt</groupId>
+			<artifactId>commons-betwixt</artifactId>
+			<version>0.8</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-beanutils-core</artifactId>
+					<groupId>commons-beanutils</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+		</dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>2.2.0</version>
+	        <exclusions>
+		        <exclusion>
+			        <groupId>commons-logging</groupId>
+			        <artifactId>commons-logging</artifactId>
+		        </exclusion>
+	        </exclusions>
+        </dependency>
+
+		<dependency>
+			<groupId>commons-dbutils</groupId>
+			<artifactId>commons-dbutils</artifactId>
+            <version>1.7</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-digester</groupId>
+			<artifactId>commons-digester</artifactId>
+			<version>2.1</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>xml-apis</artifactId>
+					<groupId>xml-apis</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- @since 4.0.7 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-email</artifactId>
+			<version>1.3</version>
+		</dependency>
+
+		<!-- @since 4.0.7 -->
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+			<version>1.4.1</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-codec</artifactId>
+					<groupId>commons-codec</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.jcip</groupId>
+			<artifactId>jcip-annotations</artifactId>
+			<version>1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>1.10.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>31.1-jre</version>
+		</dependency>
+		<dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
+		<!-- imCode Internal Repository dependencies -->
+		<dependency>
+			<groupId>ddlutils-imcms</groupId>
+			<artifactId>ddlutils-imcms</artifactId>
+			<version>svn20060906</version>
+		</dependency>
+
+		<dependency>
+			<groupId>gnu-crypto-javax-security</groupId>
+			<artifactId>gnu-crypto-javax-security</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+
+		<!--<dependency>-->
+		<!--<groupId>gnu-inetlib</groupId>-->
+		<!--<artifactId>gnu-inetlib</artifactId>-->
+		<!--<version>1.1</version>-->
+		<!--</dependency>-->
+
+		<dependency>
+			<groupId>org.codehaus.guessencoding</groupId>
+			<artifactId>guessencoding</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<!-- imCode Internal Repository dependencies -->
+		<dependency>
+			<groupId>com.imcode.db</groupId>
+			<artifactId>imcode-db</artifactId>
+            <version>0.6</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-collections4</artifactId>
+					<groupId>org.apache.commons</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-lang3</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-dbutils</groupId>
+					<artifactId>commons-dbutils</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.imcode.net.ldap</groupId>
+			<artifactId>imcode-ldap</artifactId>
+			<version>1.1-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.imcode.util</groupId>
+			<artifactId>imcode-util</artifactId>
+			<version>2.0.4</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-io</artifactId>
+					<groupId>commons-io</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- End of imCode Internal Repository dependencies -->
+
+		<dependency>
+			<groupId>oro</groupId>
+			<artifactId>oro</artifactId>
+			<version>2.0.8</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.sourceforge.jtds</groupId>
+			<artifactId>jtds</artifactId>
+			<version>1.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-core</artifactId>
+			<version>${lucene.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-queryparser</artifactId>
+			<version>${lucene.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-analyzers-common</artifactId>
+			<version>${lucene.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.21</version>
+		</dependency>
+
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>velocity</groupId>
+			<artifactId>velocity</artifactId>
+			<version>1.4</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>velocity-dep</artifactId>
+					<groupId>velocity</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<sourceDirectory>server/src</sourceDirectory>
+		<plugins>
+			<!--<plugin>-->
+			<!--<groupId>org.codehaus.mojo</groupId>-->
+			<!--<artifactId>properties-maven-plugin</artifactId>-->
+			<!--<version>1.0-alpha-2</version>-->
+			<!--<executions>-->
+			<!--<execution>-->
+			<!--<phase>initialize</phase>-->
+			<!--<configuration>-->
+			<!--<files>-->
+			<!--<file>build.properties</file>-->
+			<!--</files>-->
+			<!--</configuration>-->
+			<!--<goals>-->
+			<!--<goal>read-project-properties</goal>-->
+			<!--</goals>-->
+			<!--</execution>-->
+			<!--</executions>-->
+			<!--</plugin>-->
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.0</version>
+				<configuration>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
+					<showDeprecation>${javac.deprecation}</showDeprecation>
+					<compilerArgument>${javac.args}</compilerArgument>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-ssh</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+			<!--<plugin>-->
+			<!--<artifactId>maven-resources-plugin</artifactId>-->
+			<!--<version>2.5</version>-->
+			<!--<configuration>-->
+			<!--<includeEmptyDirs>true</includeEmptyDirs>-->
+			<!--</configuration>-->
+			<!--</plugin>-->
+
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12</version>
+				<configuration>
+					<excludes>
+						<exclude>**/*$*</exclude>
+						<exclude>**/test/casual/*</exclude>
+						<exclude>**/test/external/*</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<archiveClasses>true</archiveClasses>
+					<attachClasses>true</attachClasses>
+					<warSourceDirectory>${generated.webapp.dir}</warSourceDirectory>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<dependencies>
+					<dependency>
+						<groupId>ant-contrib</groupId>
+						<artifactId>ant-contrib</artifactId>
+						<version>1.0b3</version>
+						<exclusions>
+							<exclusion>
+								<groupId>ant</groupId>
+								<artifactId>ant</artifactId>
+							</exclusion>
+						</exclusions>
+					</dependency>
+
+					<dependency>
+						<groupId>com.imcode.ant.tasks</groupId>
+						<artifactId>imcode-ant-tasks</artifactId>
+						<version>1.3</version>
+					</dependency>
+
+					<dependency>
+						<groupId>com.imcode.util</groupId>
+						<artifactId>imcode-util</artifactId>
+						<version>2.0.1</version>
+					</dependency>
+				</dependencies>
+
+				<executions>
+					<execution>
+						<id>clean-generated-webapp-dir</id>
+						<phase>pre-clean</phase>
+						<configuration>
+							<target>
+								<delete dir="${generated.webapp.dir}" verbose="false"/>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>validate-build-properties</id>
+						<phase>validate</phase>
+						<configuration>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+
+								<if>
+									<not>
+										<available file="${basedir}/build.properties"/>
+									</not>
+									<then>
+										<copy file="${basedir}/build.properties.template"
+										      tofile="${basedir}/build.properties"/>
+									</then>
+								</if>
+
+								<uptodate targetfile="${basedir}/build.properties"
+								          property="build-properties-up-to-date">
+									<srcfiles dir="${basedir}" includes="build.properties.template"/>
+								</uptodate>
+
+								<fail unless="build-properties-up-to-date">
+									'build.properties.template' is newer than 'build.properties'. (See docs/BUILD.TXT
+									for details.)
+									Copy 'build.properties.template' content into 'build.properties' and edit it!
+								</fail>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>generate-webapp-directory-content</id>
+						<phase>process-sources</phase>
+						<configuration>
+							<target>
+								<ant antfile="${basedir}/pom-ant.xml" target="web">
+									<property name="version" value="${project.version}"/>
+									<property name="webroot" value="${generated.webapp.dir}"/>
+									<property name="log4j2-conf.file" value="${log4j2-conf.file}"/>
+								</ant>
+
+								<ant antfile="${basedir}/pom-ant.xml" target="sql">
+									<property name="version" value="${project.version}"/>
+									<property name="webroot" value="${generated.webapp.dir}"/>
+									<property name="log4j2-conf.file" value="${log4j2-conf.file}"/>
+								</ant>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.9.1</version>
+				<configuration>
+					<configLocation>${basedir}/docs/checkstyle.xml</configLocation>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.8.1</version>
+				<!-- todo: check -->
+				<!--<include name="com/imcode/imcms/api/**" />-->
+				<!--<include name="com/imcode/util/**" />-->
+				<configuration>
+					<windowtitle>imCMS API ${project.version}</windowtitle>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+						<!-- todo: fix -->
+						<configuration>
+							<excludes>
+								<exclude>**/Mock*.java</exclude>
+								<exclude>**/Test*.java</exclude>
+								<exclude>**/*Test.java</exclude>
+								<exclude>**/*TestCase.java</exclude>
+								<exclude>**/test/**/*.*</exclude>
+							</excludes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!--<plugin>-->
+				<!--&lt;!&ndash;-->
+				<!--Plugin home: http://wiki.eclipse.org/Jetty/Feature/Jetty_Maven_Plugin-->
+				<!--&ndash;&gt;-->
+				<!--<groupId>org.mortbay.jetty</groupId>-->
+				<!--<artifactId>jetty-maven-plugin</artifactId>-->
+				<!--<version>${jetty.version}</version>-->
+				<!--<configuration>-->
+					<!--<scanIntervalSeconds>${jetty.scanIntervalSeconds}</scanIntervalSeconds>-->
+					<!--<stopKey>${jetty.stop.key}</stopKey>-->
+					<!--<stopPort>${jetty.stop.port}</stopPort>-->
+					<!--<webAppSourceDirectory>${generated.webapp.dir}</webAppSourceDirectory>-->
+					<!--<connectors>-->
+						<!--<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">-->
+							<!--<port>${jetty.port}</port>-->
+							<!--<maxIdleTime>60000</maxIdleTime>-->
+						<!--</connector>-->
+					<!--</connectors>-->
+					<!--<webAppConfig>-->
+						<!--<contextPath>${jetty.contextPath}</contextPath>-->
+					<!--</webAppConfig>-->
+				<!--</configuration>-->
+			<!--</plugin>-->
+
+			<!--&lt;!&ndash; Used for testing purposes ONLY &ndash;&gt;-->
+			<!--&lt;!&ndash; The artifact must not contain pre-compiled JSP classes. &ndash;&gt;-->
+			<!--<plugin>-->
+				<!--<groupId>org.mortbay.jetty</groupId>-->
+				<!--<artifactId>jetty-jspc-maven-plugin</artifactId>-->
+				<!--<version>${jetty.version}</version>-->
+				<!--<executions>-->
+					<!--<execution>-->
+						<!--<id>jspc</id>-->
+						<!--&lt;!&ndash;<phase>prepare-package</phase>&ndash;&gt;-->
+						<!--<goals>-->
+							<!--<goal>jspc</goal>-->
+						<!--</goals>-->
+					<!--</execution>-->
+				<!--</executions>-->
+				<!--<configuration>-->
+					<!--<webAppSourceDirectory>${generated.webapp.dir}</webAppSourceDirectory>-->
+					<!--<excludes>-->
+						<!--**/eng/jsp/category_admin_category.included.jsp,-->
+						<!--**/swe/jsp/category_admin_category.included.jsp-->
+					<!--</excludes>-->
+					<!--<generatedClasses>${project.build.directory}/tmp/pre-compiled-jsp</generatedClasses>-->
+					<!--<mergeFragment>false</mergeFragment>-->
+					<!--<keepSources>true</keepSources>-->
+				<!--</configuration>-->
+			<!--</plugin>-->
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.2.2</version>
+				<configuration>
+					<scmCommentPrefix>Issue 7753:</scmCommentPrefix>
+					<tagNameFormat>@{project.version}</tagNameFormat>
+					<!--<releaseProfiles>release</releaseProfiles>-->
+					<goals>deploy</goals>
+				</configuration>
+			</plugin>
+
+			<!-- http://tomcat.apache.org/maven-plugin-2/ -->
+			<!--<user username="manager" password="manager" roles="manager-gui,manager-script" />-->
+
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat6-maven-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<warSourceDirectory>${generated.webapp.dir}</warSourceDirectory>
+					<port>${tomcat.port}</port>
+					<path>${tomcat.contextPath}</path>
+					<username>${tomcat.username}</username>
+					<password>${tomcat.password}</password>
+					<update>true</update>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat7-maven-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<warSourceDirectory>${generated.webapp.dir}</warSourceDirectory>
+					<port>${tomcat.port}</port>
+					<path>${tomcat.contextPath}</path>
+					<username>${tomcat.username}</username>
+					<password>${tomcat.password}</password>
+					<update>true</update>
+				</configuration>
+			</plugin>
+		</plugins>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-ssh-external</artifactId>
+				<version>2.6</version>
+			</extension>
+		</extensions>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>imcode</id>
+			<url>https://repo.imcode.com/maven2</url>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>imcode</id>
+			<url>https://repo.imcode.com/maven2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<distributionManagement>
+		<repository>
+			<id>imcode</id>
+			<name>imCode Internal Repository</name>
+			<url>sftp://repo.imcode.com:2022/srv/www/repo.imcode.com/maven2</url>
+		</repository>
+	</distributionManagement>
+
+	<scm>
+		<connection>scm:git:https://github.com/imCodePartnerAB/imcms.git</connection>
+		<developerConnection>scm:git:https://github.com/imCodePartnerAB/imcms.git</developerConnection>
+		<url></url>
+	</scm>
+</project>
+
+		<!--
+		todo: check non utf-files:
+		docs/_test__iso_8859-1.txt -> iso-8859-1
+		docs/changes.xml -> iso-8859-1
+		server/src/com/imcode/imcms/test/external/imcms-init-3.0.sql -> iso-8859-1
+		sql/data/init.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.10.2-1.11.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.11-2.0.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.7.0.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.7.3-1.7.4.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.7.5-1.8.0.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.8.1-1.8.2.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.8.2-1.8.3.sql -> iso-8859-1
+		sql/diff/version3.0/diff-1.8.4-1.9.0.sql -> iso-8859-1
+		sql/diff/version3.0/diff-2-2a.sql -> iso-8859-1
+		sql/diff/version3.0/diff-2-3.sql -> iso-8859-1
+		sql/diff/version3.0/diff-2a-3.sql -> iso-8859-1
+		sql/diff/version3.0/diff_update.sql -> iso-8859-1
+		tools/sql/DEUmla_tbl_meta.sql -> iso-8859-1
+		web/css/style.css -> iso-8859-1
+		web/imcms/lang/htmleditor/css/default_word.css -> iso-8859-1
+		web/imcms/lang/htmleditor/editor.jsp -> iso-8859-1
+		web/imcms/lang/htmleditor/scripts/editor_config.js.jsp -> iso-8859-1
+		web/imcms/lang/htmleditor/scripts/editor_config.vbs.jsp -> iso-8859-1
+		web/imcms/lang/htmleditor/scripts/editor_functions.js -> iso-8859-1
+		web/imcms/lang/htmleditor/scripts/editor_functions.vbs -> iso-8859-1
+		web/imcms/lang/htmleditor/scripts/editor_functions_wordsupport.js -> iso-8859-1
+		web/imcms/xinha/htmlarea.js -> iso-8859-1
+		web/imcms/xinha/lang/lv.js -> iso-8859-1
+		web/imcms/xinha/plugins/ExtendedFileManager/assets/editor.js -> iso-8859-1
+		web/imcms/xinha/plugins/ExtendedFileManager/assets/EditorContent.js -> iso-8859-1
+		web/imcms/xinha/plugins/ImageManager/assets/editor.js -> iso-8859-1
+		web/imcms/xinha/plugins/ImageManager/assets/EditorContent.js -> iso-8859-1
+		web/imcms/xinha/plugins/LangMarks/lang-marks.css -> iso-8859-1
+		-->
diff --git a/server/src/com/imcode/imcms/addon/ui/DocumentPaging.java b/server/src/com/imcode/imcms/addon/ui/DocumentPaging.java
new file mode 100644
index 0000000000..e79bbe42cb
--- /dev/null
+++ b/server/src/com/imcode/imcms/addon/ui/DocumentPaging.java
@@ -0,0 +1,257 @@
+package com.imcode.imcms.addon.ui;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Tommy Ullberg, imCode
+ * Mail: tommy@imcode.com
+ * Date: 2010-mar-31
+ * Time: 15:12:27
+ */
+public class DocumentPaging {
+    String thisPagesPath = "";
+    int currentPageNumber = 0;
+    int docListSize = 0;
+    int hitsPerPage = 10;
+    int shortVisPagesCount = 3;
+    int maxVisPagesCount = 12;
+    String spaceBetween = "";
+    String divId = "";
+    String divClass = "paging";
+    String textPrev = "&laquo;";
+    String titlePrev = "F\u00f6reg\u00e5ende";
+    String textNext = "&raquo;";
+    String titleNext = "N\u00e4sta";
+
+    public DocumentPaging(String thisPagesPath, int currentPageNumber, int docListSize, int hitsPerPage) {
+        this.thisPagesPath = thisPagesPath;
+        this.currentPageNumber = currentPageNumber;
+        this.docListSize = docListSize;
+        this.hitsPerPage = hitsPerPage;
+    }
+
+    public void setThisPagesPath(String thisPagesPath) {
+        this.thisPagesPath = thisPagesPath;
+    }
+
+    public void setCurrentPageNumber(int currentPageNumber) {
+        this.currentPageNumber = currentPageNumber;
+    }
+
+    public void setDocListSize(int docListSize) {
+        this.docListSize = docListSize;
+    }
+
+    public void setHitsPerPage(int hitsPerPage) {
+        this.hitsPerPage = hitsPerPage;
+    }
+
+    public void setShortVisPagesCount(int shortVisPagesCount) {
+        this.shortVisPagesCount = shortVisPagesCount;
+    }
+
+    public void setMaxVisPagesCount(int maxVisPagesCount) {
+        this.maxVisPagesCount = maxVisPagesCount;
+    }
+
+    public void setSpaceBetween(String spaceBetween) {
+        this.spaceBetween = spaceBetween;
+    }
+
+    public void setDivId(String divId) {
+        this.divId = divId;
+    }
+
+    public void setDivClass(String divClass) {
+        this.divClass = divClass;
+    }
+
+    public void setTextPrev(String textPrev) {
+        this.textPrev = textPrev;
+    }
+
+    public void setTitlePrev(String titlePrev) {
+        this.titlePrev = titlePrev;
+    }
+
+    public void setTextNext(String textNext) {
+        this.textNext = textNext;
+    }
+
+    public void setTitleNext(String titleNext) {
+        this.titleNext = titleNext;
+    }
+
+    public String getPagingLinksAsHtml() {
+
+        if (currentPageNumber < 1) {
+            currentPageNumber = 1;
+        }
+        int iNbrOfPages = (int) Math.ceil((double) docListSize / (double) hitsPerPage);
+
+        //int shortVisPagesCount ; // this = N => NNN...nnnnnnnnnnn OR NNN...nnnnnnnn...NNN
+        int midVisPagesCount = (maxVisPagesCount - (2 * shortVisPagesCount) - 2); //  // this = N => nnn...NNNNNNNN...nnn
+        int longVisPagesCount = (maxVisPagesCount - shortVisPagesCount - 1); // this = N => nnn...NNNNNNNNNNN OR NNNNNNNNNNN...nnn
+
+        StringBuffer sb = new StringBuffer();
+        int i;
+
+        String debug = "";
+
+        // hide paging if only one page
+        if (iNbrOfPages >= 1) {
+            sb.append("<div" + (!"".equals(divId) ? " id=\"" + divId + "\"" : "") + (!"".equals(divClass) ? " class=\"" + divClass + "\"" : "") + ">");
+
+            /* *******************************************************************************************
+             *         Prev button                                                                       *
+             ******************************************************************************************* */
+
+            if (currentPageNumber != 1) {
+                sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (currentPageNumber - 1) + "\" class=\"prevBtn toolTip\" title=\"" + titlePrev + "\">" + textPrev + "</a>");
+            } else {
+                sb.append(spaceBetween + "<span class=\"prevBtn dim\">" + textPrev + "</span>");
+            }
+
+            /* *******************************************************************************************
+             *         No special paging - Less than MAX                                                                *
+             ******************************************************************************************* */
+
+            if (iNbrOfPages <= maxVisPagesCount) {
+                debug += "<br/>group1";
+                // numbers
+                for (i = 0; i < iNbrOfPages; i++) {
+                    String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                    String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                    if (i != currentPageNumber - 1) {
+                        sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + ">" + (i + 1) + "</a>");
+                    } else {
+                        sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + "</span>");
+                    }
+                }
+
+            } else {
+
+                /* *******************************************************************************************
+                 *         2 group paging - First - LONG FIRST + SHORT LAST                                  *
+                 ******************************************************************************************* */
+
+                if (currentPageNumber < longVisPagesCount) {
+                    debug += "<br/>group2";
+                    // numbers
+                    for (i = 0; i < longVisPagesCount; i++) {
+                        String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                        String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                        if (i != currentPageNumber - 1) {
+                            sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + ">" + (i + 1) + "</a>");
+                        } else {
+                            sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + "</span>");
+                        }
+                    }
+
+                    sb.append(spaceBetween + "<span class=\"paging_dots\">...</span>");
+
+                    // numbers
+                    for (i = iNbrOfPages - shortVisPagesCount; i < iNbrOfPages; i++) {
+                        String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                        String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                        if (i != currentPageNumber - 1) {
+                            sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + ">" + (i + 1) + "</a>");
+                        } else {
+                            sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + "</span>");
+                        }
+                    }
+
+                    /* *******************************************************************************************
+                     *         2 group paging - Last - SHORT FIRST + LONG LAST                                   *
+                     ******************************************************************************************* */
+
+                } else if (currentPageNumber >= iNbrOfPages - shortVisPagesCount) {
+                    debug += "<br/>group3";
+                    // numbers
+                    for (i = 0; i < shortVisPagesCount; i++) {
+                        String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                        String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                        if (i != currentPageNumber - 1) {
+                            sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + ">" + (i + 1) + "</a>");
+                        } else {
+                            sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + "</span>");
+                        }
+                    }
+
+                    sb.append(spaceBetween + "<span class=\"paging_dots\">...</span>");
+
+                    // numbers
+                    for (i = iNbrOfPages - longVisPagesCount; i < iNbrOfPages; i++) {
+                        String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                        String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                        if (i != currentPageNumber - 1) {
+                            sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + ">" + (i + 1) + "</a>");
+                        } else {
+                            sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + " </span>");
+                        }
+                    }
+
+                    /* *******************************************************************************************
+                     *         3 group paging - SHORT FIRST + MID + SHORT LAST                                   *
+                     ******************************************************************************************* */
+
+                } else {
+                    debug += "<br/>group4";
+                    // numbers
+                    for (i = 0; i < shortVisPagesCount; i++) {
+                        String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                        String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                        if (i != currentPageNumber - 1) {
+                            sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + ">" + (i + 1) + "</a>");
+                        } else {
+                            sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + "</span>");
+                        }
+                    }
+
+                    sb.append(spaceBetween + "<span class=\"paging_dots\">...</span>");
+
+                    // numbers
+                    for (i = currentPageNumber - (midVisPagesCount / 2); i < currentPageNumber + (midVisPagesCount / 2); i++)
+                    {
+                        String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                        String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                        if (i != currentPageNumber - 1) {
+                            sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + ">" + (i + 1) + "</a>");
+                        } else {
+                            sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + "</span>");
+                        }
+                    }
+
+                    sb.append(spaceBetween + "<span class=\"paging_dots\">...</span>");
+
+                    // numbers
+                    for (i = iNbrOfPages - shortVisPagesCount; i < iNbrOfPages; i++) {
+                        String singleDigitClass = (1 == ((i + 1) + "").length()) ? " class=\"oneDigit\"" : "";
+                        String singleDigitCl = (1 == ((i + 1) + "").length()) ? " oneDigit" : "";
+                        if (i != currentPageNumber - 1) {
+                            sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (i + 1) + "\"" + singleDigitClass + "> " + (i + 1) + "</a>");
+                        } else {
+                            sb.append(spaceBetween + "<span class=\"active" + singleDigitCl + "\">" + (i + 1) + " </span>");
+                        }
+                    }
+
+                }
+            }
+
+            /* *******************************************************************************************
+             *         Next button                                                                       *
+             ******************************************************************************************* */
+
+            if (currentPageNumber < iNbrOfPages) {
+                sb.append(spaceBetween + "<a href=\"" + thisPagesPath + "?idx=" + (currentPageNumber + 1) + "\" class=\"nextBtn toolTip\" title=\"" + titleNext + "\">" + textNext + "</a>");
+            } else {
+                sb.append(spaceBetween + "<span class=\"nextBtn dim\">" + textNext + "</span>");
+            }
+            //sb.append("</div>iNbrOfPages: " + iNbrOfPages + "<br/>currentPageNumber: " + currentPageNumber + "<br/>debug: " + debug) ;
+            sb.append("</div>");
+
+            // builds string
+            return sb.toString();
+        }
+        return "";
+    }
+}
diff --git a/server/src/com/imcode/imcms/api/AliasAlreadyExistsException.java b/server/src/com/imcode/imcms/api/AliasAlreadyExistsException.java
index 40b403f803..43d401d6d6 100644
--- a/server/src/com/imcode/imcms/api/AliasAlreadyExistsException.java
+++ b/server/src/com/imcode/imcms/api/AliasAlreadyExistsException.java
@@ -1,5 +1,8 @@
 package com.imcode.imcms.api;
 
+/**
+ * Usually thrown when saving a {@link Document}. Signals that there's already another document in imcms with an alias that the document that's being saved has.
+ */
 public class AliasAlreadyExistsException extends SaveException {
     public AliasAlreadyExistsException(Throwable cause) {
         super("Alias already exists.", cause);
diff --git a/server/src/com/imcode/imcms/api/AlreadyExistsException.java b/server/src/com/imcode/imcms/api/AlreadyExistsException.java
index 5fe1aa37fd..c0421dcebf 100644
--- a/server/src/com/imcode/imcms/api/AlreadyExistsException.java
+++ b/server/src/com/imcode/imcms/api/AlreadyExistsException.java
@@ -1,11 +1,13 @@
 package com.imcode.imcms.api;
 
 /**
+ * General exception produced when duplicate entries of some sort are not acceptable in the cms.
+ *
  * @since 2.0
  */
 public class AlreadyExistsException extends SaveException {
 
     public AlreadyExistsException(String message, Throwable cause) {
-        super( message, cause );
+        super(message, cause);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/BadQueryException.java b/server/src/com/imcode/imcms/api/BadQueryException.java
index 889636d018..beba96773b 100644
--- a/server/src/com/imcode/imcms/api/BadQueryException.java
+++ b/server/src/com/imcode/imcms/api/BadQueryException.java
@@ -6,12 +6,15 @@
  */
 package com.imcode.imcms.api;
 
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 
+/**
+ * Thrown when parse errors are encountered.
+ */
 public class BadQueryException extends Exception {
 
-    public BadQueryException( String queryString, ParseException cause ) {
-        super("Bad query: "+queryString,cause) ;
+    public BadQueryException(String queryString, ParseException cause) {
+        super("Bad query: " + queryString, cause);
     }
 
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/Category.java b/server/src/com/imcode/imcms/api/Category.java
index 602fd8bccc..0250c2004b 100644
--- a/server/src/com/imcode/imcms/api/Category.java
+++ b/server/src/com/imcode/imcms/api/Category.java
@@ -3,32 +3,56 @@
 import imcode.server.document.CategoryDomainObject;
 
 /**
+ * Represents a category in imcms.
+ *
  * @author kreiger
  */
 public class Category implements Comparable {
 
-    private final CategoryDomainObject internalCategory ;
+    private final CategoryDomainObject internalCategory;
 
-    public Category( String name, CategoryType categoryType ) {
-        this.internalCategory = new CategoryDomainObject( 0, name, "","", categoryType.getInternal() );
+    /**
+     * Constructs a Category from the given name and {@link CategoryType}
+     *
+     * @param name         a String with name for this category
+     * @param categoryType a {@link CategoryType}
+     */
+    public Category(String name, CategoryType categoryType) {
+        this.internalCategory = new CategoryDomainObject(0, name, "", "", categoryType.getInternal());
     }
 
-    Category( CategoryDomainObject internalCategory ) {
-        this.internalCategory = internalCategory ;
+    Category(CategoryDomainObject internalCategory) {
+        this.internalCategory = internalCategory;
     }
 
     CategoryDomainObject getInternal() {
-        return internalCategory ;
+        return internalCategory;
     }
 
+    /**
+     * Returns this category's name
+     *
+     * @return a string with this category's name
+     */
     public String getName() {
-        return internalCategory.getName() ;
+        return internalCategory.getName();
     }
 
+    /**
+     * Sets this category's name
+     *
+     * @param name name for this category
+     */
     public void setName(String name) {
-        internalCategory.setName( name );
+        internalCategory.setName(name);
     }
 
+    /**
+     * Compares the specified object with this category for equality.
+     *
+     * @param o the object to be compared for equality with this category
+     * @return true if the specified object is a Category and it's id is the same as this category's id, false otherwise
+     */
     public boolean equals(Object o) {
         if (this == o) {
             return true;
@@ -43,35 +67,79 @@ public boolean equals(Object o) {
 
     }
 
+    /**
+     * Returns this category's hashcode
+     *
+     * @return hash code value in the form of this category's id
+     */
     public int hashCode() {
         return internalCategory.hashCode();
     }
 
+    /**
+     * Returns string representation of this category in the form
+     * of {@link com.imcode.imcms.api.CategoryType#getName()} + ":" + {@link com.imcode.imcms.api.Category#getName()}
+     *
+     * @return a string representation of this category
+     */
     public String toString() {
         return internalCategory.toString();
     }
 
+    /**
+     * Returns this category's description
+     *
+     * @return this category's description or an empty string
+     */
     public String getDescription() {
-        return internalCategory.getDescription() ;
+        return internalCategory.getDescription();
     }
 
+    /**
+     * Sets the description of this category
+     *
+     * @param description this category's description
+     */
+    public void setDescription(String description) {
+        internalCategory.setDescription(description);
+    }
+
+    /**
+     * Returns this category's id
+     *
+     * @return this category's id
+     */
     public int getId() {
         return internalCategory.getId();
     }
 
-    public String getImage(){
+    /**
+     * Get image url. The url is not used internally anywhere in the cms, just stored as string.
+     *
+     * @return image url or an empty string if it's not set
+     */
+    public String getImage() {
         return internalCategory.getImageUrl();
     }
 
-    public void setImage( String imageUrl ) {
-        internalCategory.setImageUrl( imageUrl );
-    }
-
-    public void setDescription( String description ) {
-        internalCategory.setDescription( description );
+    /**
+     * Sets the image url of this category
+     *
+     * @param imageUrl url, relative or absolute
+     */
+    public void setImage(String imageUrl) {
+        internalCategory.setImageUrl(imageUrl);
     }
 
-    public int compareTo( Object o ) {
-        return internalCategory.compareTo( ((Category)o).internalCategory ) ;
+    /**
+     * Compares this Category to the given Object.
+     *
+     * @param o the Object to be compared with
+     * @return 0 if the argument is a Category and it's name is equal ignoring case to this category's name. Value less than 0
+     * if the argument's name is lexicographically greater(ignoring case) than this category's name. Value more than 0
+     * if the argument's name is lexicographically less(ignoring case) than this category's name.
+     */
+    public int compareTo(Object o) {
+        return internalCategory.compareTo(((Category) o).internalCategory);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/CategoryAlreadyExistsException.java b/server/src/com/imcode/imcms/api/CategoryAlreadyExistsException.java
index d2c20adbc2..468a4cd57e 100644
--- a/server/src/com/imcode/imcms/api/CategoryAlreadyExistsException.java
+++ b/server/src/com/imcode/imcms/api/CategoryAlreadyExistsException.java
@@ -1,7 +1,11 @@
 package com.imcode.imcms.api;
 
+/**
+ * Usually thrown when saving a {@link Category}. Signals that there's already a category under it's {@link CategoryType}
+ * with the same name.
+ */
 public class CategoryAlreadyExistsException extends AlreadyExistsException {
-    public CategoryAlreadyExistsException( String message ) {
-        super( message, null );
+    public CategoryAlreadyExistsException(String message) {
+        super(message, null);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/CategoryType.java b/server/src/com/imcode/imcms/api/CategoryType.java
index ad2c91ea11..05a6d47855 100644
--- a/server/src/com/imcode/imcms/api/CategoryType.java
+++ b/server/src/com/imcode/imcms/api/CategoryType.java
@@ -3,6 +3,9 @@
 import imcode.server.document.CategoryTypeDomainObject;
 
 /**
+ * Represents a category type. Category types help distinguish between Categories with the same name.
+ * They also control if the categories belonging to them can be inherited or used in image archive.
+ *
  * @author kreiger
  */
 public class CategoryType {
@@ -16,19 +19,49 @@ CategoryTypeDomainObject getInternal() {
         return internalCategoryType;
     }
 
+    /**
+     * Returns string representation on this category type, calls {@link com.imcode.imcms.api.CategoryType#getName()}
+     *
+     * @return string representation on this category type
+     */
     public String toString() {
-        return internalCategoryType.toString() ;
-    }  
+        return internalCategoryType.toString();
+    }
 
+    /**
+     * Returns category type's name
+     *
+     * @return category type's name
+     */
     public String getName() {
-        return internalCategoryType.getName() ;
+        return internalCategoryType.getName();
     }
 
+    /**
+     * Returns category type's id
+     *
+     * @return category type's id
+     */
     public int getId() {
         return internalCategoryType.getId();
     }
 
+    /**
+     * Indicates whether the categories of this category type are inherited by new documents when a document that
+     * has categories of this type is used as parent.
+     *
+     * @return true if this category type's categories are inherited, false otherwise
+     */
     public boolean isInherited() {
         return internalCategoryType.isInherited();
     }
+
+    /**
+     * Indicates whether this category type can be used in image archive
+     *
+     * @return true if this category type can be used in image archive
+     */
+    public boolean isImageArchive() {
+        return internalCategoryType.isImageArchive();
+    }
 }
diff --git a/server/src/com/imcode/imcms/api/CategoryTypeAlreadyExistsException.java b/server/src/com/imcode/imcms/api/CategoryTypeAlreadyExistsException.java
index fc96cd6c68..da184105a3 100644
--- a/server/src/com/imcode/imcms/api/CategoryTypeAlreadyExistsException.java
+++ b/server/src/com/imcode/imcms/api/CategoryTypeAlreadyExistsException.java
@@ -1,7 +1,11 @@
 package com.imcode.imcms.api;
 
+/**
+ * Usually thrown when creating a {@link CategoryType}.
+ * Signals that the new category type's name already belongs to another category type.
+ */
 public class CategoryTypeAlreadyExistsException extends AlreadyExistsException {
-    public CategoryTypeAlreadyExistsException( String message ) {
-        super( message, null );
+    public CategoryTypeAlreadyExistsException(String message) {
+        super(message, null);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/ContentManagementSystem.java b/server/src/com/imcode/imcms/api/ContentManagementSystem.java
index c8b5b6705b..23973e1489 100644
--- a/server/src/com/imcode/imcms/api/ContentManagementSystem.java
+++ b/server/src/com/imcode/imcms/api/ContentManagementSystem.java
@@ -4,51 +4,52 @@
 import imcode.server.ImcmsServices;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+/**
+ * Abstract class acting as a base for full ContentManagementSystem implementations. Provides methods for getting ContentManagementSystem
+ * for a given user, and retrieval of previously created ContentManagementSystem.
+ * Provides means of running {@link ContentManagementSystemRunnable} with super admin privileges
+ */
 public abstract class ContentManagementSystem {
 
-    public abstract UserService getUserService();
-
-    public abstract DocumentService getDocumentService();
-
-    public abstract User getCurrentUser();
-
-    public abstract DatabaseService getDatabaseService();
-
-    public abstract TemplateService getTemplateService();
-
-    public abstract MailService getMailService() ;
-
-    public abstract void runAsSuperadmin(ContentManagementSystemRunnable runnable) throws NoPermissionException;
-
     /**
-        Get a ContentManagementSystem for the given username and password.
-    **/
-    public static ContentManagementSystem getContentManagementSystem( String userName, String password ) {
+     * Get a ContentManagementSystem for the given username and password.
+     *
+     * @param userName user's login name
+     * @param password user's password
+     **/
+    public static ContentManagementSystem getContentManagementSystem(String userName, String password) {
         ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = imcref.verifyUser( userName, password );
-        return DefaultContentManagementSystem.create( imcref, user, Imcms.getApiDataSource());
+        UserDomainObject user = imcref.verifyUser(userName, password);
+        return DefaultContentManagementSystem.create(imcref, user, Imcms.getApiDataSource());
     }
 
     /**
-     * Try to login the current user with the given name and password.
+     * Attempts to login the current user with the given name and password. Returns ContentManagementSystem for that user
+     * if login is successful.
      *
-     * @param request
-     * @param username
-     * @param password
+     * @param request  HttpServletRequest request
+     * @param response HttpServletResponse response
+     * @param username user's login name
+     * @param password user's password
      * @return The new ContentManagementSystem, or null if the login failed.
      */
-    public static ContentManagementSystem login(HttpServletRequest request, String username, String password) {
+    public static ContentManagementSystem login(HttpServletRequest request, HttpServletResponse response,
+                                                String username, String password) {
         ImcmsServices services = Imcms.getServices();
         UserDomainObject user = services.verifyUser(username, password);
 
-        if ( null == user || user.isDefaultUser()) {
-            return null ;
+        if (null == user || user.isDefaultUser()) {
+            return null;
         }
-        
+
+        Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().checkUserIpAllowed(user, request);
+
         ContentManagementSystem cms = Utility.initRequestWithApi(request, user);
 
         if (services.getConfig().isDenyMultipleUserLogin()) {
@@ -56,20 +57,79 @@ public static ContentManagementSystem login(HttpServletRequest request, String u
             currentUser.setSessionId(request.getSession().getId());
             cms.getUserService().updateUserSession(currentUser);
         }
-        
-        Utility.makeUserLoggedIn(request, user);
+
+        String rememberCd = user.getRememberCd();
+        if (StringUtils.isEmpty(rememberCd)) {
+            cms.getUserService().updateUserRememberCd(user);
+        }
+
+        Utility.makeUserLoggedIn(request, response, user);
 
         return cms;
     }
 
     /**
+     * Returns ContentManagementSystem set in the given request.
+     *
+     * @param request ServletRequest to get ContentManagementSystem from
      * @return The ContentManagementSystem for the request
      * @since 2.0
      */
     public static ContentManagementSystem fromRequest(ServletRequest request) {
-        return Utility.getContentManagementSystemFromRequest(request) ;
+        return Utility.getContentManagementSystemFromRequest(request);
     }
 
-    abstract ImcmsServices getInternal() ;
+    /**
+     * Returns {@link UserService}
+     *
+     * @return UserService
+     */
+    public abstract UserService getUserService();
+
+    /**
+     * Returns {@link DocumentService}
+     *
+     * @return DocumentService
+     */
+    public abstract DocumentService getDocumentService();
+
+    /**
+     * Returns current {@link User}
+     *
+     * @return current user
+     */
+    public abstract User getCurrentUser();
+
+    /**
+     * Returns {@link DatabaseService}
+     *
+     * @return DatabaseService
+     */
+    public abstract DatabaseService getDatabaseService();
+
+    /**
+     * Returns {@link TemplateService}
+     *
+     * @return TemplateService
+     */
+    public abstract TemplateService getTemplateService();
+
+    /**
+     * Returns {@link MailService}
+     *
+     * @return MailService
+     */
+    public abstract MailService getMailService();
+
+    /**
+     * Runs {@link ContentManagementSystemRunnable#runWith(ContentManagementSystem)} with passed ContentManagementSystem's
+     * user having super admin privileges.
+     *
+     * @param runnable class implementing ContentManagementSystemRunnable
+     * @throws NoPermissionException if ContentManagementSystemRunnable implementer is not signed with the key store
+     */
+    public abstract void runAsSuperadmin(ContentManagementSystemRunnable runnable) throws NoPermissionException;
+
+    abstract ImcmsServices getInternal();
 
 }
diff --git a/server/src/com/imcode/imcms/api/ContentManagementSystemRunnable.java b/server/src/com/imcode/imcms/api/ContentManagementSystemRunnable.java
index 6b15aaf0fb..6b052fc2cf 100644
--- a/server/src/com/imcode/imcms/api/ContentManagementSystemRunnable.java
+++ b/server/src/com/imcode/imcms/api/ContentManagementSystemRunnable.java
@@ -1,7 +1,15 @@
 package com.imcode.imcms.api;
 
+/**
+ * Used with {@link ContentManagementSystem#runAsSuperadmin(ContentManagementSystemRunnable)}
+ */
 public interface ContentManagementSystemRunnable {
 
-    void runWith(ContentManagementSystem contentManagementSystem) ;
+    /**
+     * Runs with passed {@link ContentManagementSystem}
+     *
+     * @param contentManagementSystem {@link ContentManagementSystem}
+     */
+    void runWith(ContentManagementSystem contentManagementSystem);
 
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/DatabaseService.java b/server/src/com/imcode/imcms/api/DatabaseService.java
index e6f2c5968f..26dc2a521c 100644
--- a/server/src/com/imcode/imcms/api/DatabaseService.java
+++ b/server/src/com/imcode/imcms/api/DatabaseService.java
@@ -4,17 +4,25 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
+/**
+ * Class giving access to the database connection used by {@link ContentManagementSystem}
+ */
 public class DatabaseService {
 
     private DataSource dataSource;
 
+    /**
+     * Constructs DatabaseService with the given DataSource
+     *
+     * @param dataSource DataSource to get connection from
+     */
     public DatabaseService(DataSource dataSource) {
         this.dataSource = dataSource;
     }
 
     /**
      * Get a databaseconnection from the connectionpool.
-     *
+     * <p>
      * <strong>IMPORTANT</strong>: Do not forget to make sure that the connection is closed
      * (inside a "finally" block!), otherwise it won't be returned to the pool.
      *
@@ -22,15 +30,15 @@ public DatabaseService(DataSource dataSource) {
      * @throws SQLException if there was a problem getting the connection.
      */
     public Connection getConnection() throws SQLException {
-        return dataSource.getConnection() ;
+        return dataSource.getConnection();
     }
-    
+
     /**
      * Get the underlying DataSource.
-     * 
+     *
      * @return a {@link DataSource}.
      */
     public DataSource getDataSource() {
-        return dataSource ;
+        return dataSource;
     }
 }
diff --git a/server/src/com/imcode/imcms/api/DefaultContentManagementSystem.java b/server/src/com/imcode/imcms/api/DefaultContentManagementSystem.java
index 43127b9348..80e3ba5bd2 100644
--- a/server/src/com/imcode/imcms/api/DefaultContentManagementSystem.java
+++ b/server/src/com/imcode/imcms/api/DefaultContentManagementSystem.java
@@ -9,79 +9,134 @@
 import javax.sql.DataSource;
 import java.security.KeyStore;
 
+/**
+ * The default implementation of ContentManagementSystem, supporting services like {@link UserService}, {@link DocumentService},
+ * {@link TemplateService}, {@link DatabaseService}, {@link MailService}
+ */
 public class DefaultContentManagementSystem extends ContentManagementSystem implements Cloneable {
 
+    protected ImcmsServices service;
+    UserDomainObject currentUser;
     private UserService userService;
     private DocumentService documentService;
     private TemplateService templateService;
     private DatabaseService databaseService;
     private MailService mailService;
-    UserDomainObject currentUser;
-    protected ImcmsServices service;
 
-    public DefaultContentManagementSystem( ImcmsServices service, UserDomainObject accessor ) {
-        this.service = service ;
+    /**
+     * Constructs DefaultContentManagementSystem for the given user, does not initiallize the services like {@link UserService} etc
+     *
+     * @param service  ImcmsServices
+     * @param accessor UserDomainObject becomes current user
+     */
+    public DefaultContentManagementSystem(ImcmsServices service, UserDomainObject accessor) {
+        this.service = service;
         currentUser = accessor;
     }
 
+    /**
+     * Constructs DefaultContentManagementSystem and initializes services
+     *
+     * @param service       ImcmsServices
+     * @param accessor      UserDomainObject becomes current user
+     * @param apiDataSource DataSource to be user for {@link DatabaseService}
+     * @return DefaultContentManagementSystem with initialized services
+     */
     public static DefaultContentManagementSystem create(ImcmsServices service, UserDomainObject accessor,
                                                         DataSource apiDataSource) {
-        DefaultContentManagementSystem contentManagementSystem = new DefaultContentManagementSystem( service, accessor );
+        DefaultContentManagementSystem contentManagementSystem = new DefaultContentManagementSystem(service, accessor);
         contentManagementSystem.init(apiDataSource);
-        return contentManagementSystem ;
+        return contentManagementSystem;
     }
 
     private void init(DataSource apiDataSource) {
-        userService = new UserService( this );
-        documentService = new DocumentService( this ) ;
-        templateService = new TemplateService( this );
-        databaseService = new DatabaseService( apiDataSource );
-        mailService = new MailService(service.getSMTP()) ;
+        userService = new UserService(this);
+        documentService = new DocumentService(this);
+        templateService = new TemplateService(this);
+        databaseService = new DatabaseService(apiDataSource);
+        mailService = new MailService(service.getSMTP());
     }
 
     protected Object clone() throws CloneNotSupportedException {
-        DefaultContentManagementSystem clone = (DefaultContentManagementSystem)super.clone() ;
-        clone.currentUser = (UserDomainObject)currentUser.clone() ;
-        return clone ;
+        DefaultContentManagementSystem clone = (DefaultContentManagementSystem) super.clone();
+        clone.currentUser = (UserDomainObject) currentUser.clone();
+        return clone;
     }
 
-    public UserService getUserService(){
+    /**
+     * Returns {@link UserService}
+     *
+     * @return UserService
+     */
+    public UserService getUserService() {
         return userService;
     }
 
-    public DocumentService getDocumentService(){
+    /**
+     * Returns {@link DocumentService}
+     *
+     * @return DocumentService
+     */
+    public DocumentService getDocumentService() {
         return documentService;
     }
 
+    /**
+     * Returns current {@link User}
+     *
+     * @return current user
+     */
     public User getCurrentUser() {
-        return new User((UserDomainObject)currentUser.clone()) ;
+        return new User((UserDomainObject) currentUser.clone());
     }
 
+    /**
+     * Returns {@link DatabaseService}
+     *
+     * @return DatabaseService
+     */
     public DatabaseService getDatabaseService() {
         return databaseService;
     }
 
+    /**
+     * Returns {@link TemplateService}
+     *
+     * @return TemplateService
+     */
     public TemplateService getTemplateService() {
         return templateService;
     }
 
+    /**
+     * Returns {@link MailService}
+     *
+     * @return MailService
+     */
     public MailService getMailService() {
-        return mailService ;
+        return mailService;
     }
 
     ImcmsServices getInternal() {
-        return service ;
+        return service;
     }
 
-    public void runAsSuperadmin( ContentManagementSystemRunnable runnable ) throws NoPermissionException {
+    /**
+     * Runs {@link ContentManagementSystemRunnable#runWith(ContentManagementSystem)} with passed ContentManagementSystem's
+     * user having super admin privileges.
+     *
+     * @param runnable class implementing ContentManagementSystemRunnable
+     * @throws NoPermissionException if ContentManagementSystemRunnable implementer is not signed with the key store
+     */
+    public void runAsSuperadmin(ContentManagementSystemRunnable runnable) throws NoPermissionException {
         KeyStore keyStore = service.getKeyStore();
         Class clazz = runnable.getClass();
-        if (!Utility.classIsSignedByCertificatesInKeyStore( clazz, keyStore )) {
-            throw new NoPermissionException("Class "+clazz.getName()+" is not signed by certificates in keystore.") ;
+        if (!Utility.classIsSignedByCertificatesInKeyStore(clazz, keyStore)) {
+            throw new NoPermissionException("Class " + clazz.getName() + " is not signed by certificates in keystore.");
         }
-        DefaultContentManagementSystem cms = create( service, (UserDomainObject)currentUser.clone(), Imcms.getApiDataSource());
-        cms.currentUser.addRoleId( RoleId.SUPERADMIN );
-        runnable.runWith( cms );
+        DefaultContentManagementSystem cms = create(service, (UserDomainObject) currentUser.clone(), Imcms.getApiDataSource());
+        cms.currentUser.addRoleId(RoleId.SUPERADMIN);
+        runnable.runWith(cms);
         cms.currentUser = null;
     }
 }
diff --git a/server/src/com/imcode/imcms/api/Document.java b/server/src/com/imcode/imcms/api/Document.java
index 26565edf35..a1502b1621 100644
--- a/server/src/com/imcode/imcms/api/Document.java
+++ b/server/src/com/imcode/imcms/api/Document.java
@@ -2,395 +2,703 @@
 
 import com.imcode.util.ChainableReversibleNullComparator;
 import com.imcode.util.CountingIterator;
-import com.imcode.imcms.mapping.CategoryMapper;
 import imcode.server.document.*;
 import imcode.server.user.RoleDomainObject;
 import imcode.server.user.RoleGetter;
 import imcode.server.user.RoleId;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.Serializable;
 import java.util.*;
 
+/**
+ * The base class for all document types, such as {@link TextDocument}, {@link UrlDocument}, {@link FileDocument} etc.
+ * In charge of document information such as headline, alias, publication status. Publication, archivation and setting as
+ * unpublished dates.
+ * Assignment of {@link Category}, {@link Section} and keywords.
+ * Holds information about document creating and modification, the dates and {@link User}.
+ */
+@SuppressWarnings("unused")
 public class Document implements Serializable {
 
+    private static final int STATUS_NEW = 0;
+    private static final int STATUS_PUBLICATION_DISAPPROVED = 1;
+    private static final int STATUS_PUBLICATION_APPROVED = 2;
+
+    private final static Logger log = LogManager.getLogger(Document.class.getName());
     private final DocumentDomainObject internalDocument;
     ContentManagementSystem contentManagementSystem;
 
-    private final static Logger log = Logger.getLogger( Document.class.getName() );
-
-    /** @deprecated Use {@link Document.PublicationStatus#NEW} instead. */
-    public static final int STATUS_NEW = 0;
-    /** @deprecated Use {@link Document.PublicationStatus#DISAPPROVED} instead. */
-    public static final int STATUS_PUBLICATION_DISAPPROVED = 1;
-    /** @deprecated Use {@link Document.PublicationStatus#APPROVED} instead. */
-    public static final int STATUS_PUBLICATION_APPROVED = 2;
-
-    protected Document( DocumentDomainObject document, ContentManagementSystem contentManagementSystem ) {
+    protected Document(DocumentDomainObject document, ContentManagementSystem contentManagementSystem) {
         this.internalDocument = document;
         this.contentManagementSystem = contentManagementSystem;
     }
 
+    public ContentManagementSystem getCMS() {
+        return contentManagementSystem;
+    }
+
+    private static Map<Role, DocumentPermissionSet> wrapDomainObjectsInMap(Map<RoleDomainObject, DocumentPermissionSetDomainObject> rolesMappedToPermissionsIds) {
+        Map<Role, DocumentPermissionSet> result = new HashMap<>();
+
+        for (Map.Entry<RoleDomainObject, DocumentPermissionSetDomainObject> entry : rolesMappedToPermissionsIds.entrySet()) {
+            result.put(new Role(entry.getKey()), new DocumentPermissionSet(entry.getValue()));
+        }
+
+        return result;
+    }
+
     DocumentDomainObject getInternal() {
         return internalDocument;
     }
 
+    /**
+     * Returns the unique identifier of this document in imcms
+     *
+     * @return int, the id of this document
+     */
     public int getId() {
         return internalDocument.getId();
     }
 
     /**
-     * @return map of roles Role -> DocumentPermissionSet instances.
+     * Returns a map of roles mapped to their permission set for this document.
+     * For example Role "Users" has a permission set of type{@link DocumentPermissionSetType#RESTRICTED_1}, and some
+     * privileges there.
+     *
+     * @return map of roles {@link Role} -> {@link DocumentPermissionSet} instances.
      */
     public Map getRolesMappedToPermissions() {
         RoleIdToDocumentPermissionSetTypeMappings roleIdToDocumentPermissionSetTypeMappings = internalDocument.getRoleIdsMappedToDocumentPermissionSetTypes();
 
-        Map result = new HashMap();
+        Map<RoleDomainObject, DocumentPermissionSetDomainObject> result = new HashMap<>();
         RoleIdToDocumentPermissionSetTypeMappings.Mapping[] mappings = roleIdToDocumentPermissionSetTypeMappings.getMappings();
         RoleGetter roleGetter = contentManagementSystem.getInternal().getRoleGetter();
-        for ( int i = 0; i < mappings.length; i++ ) {
-            RoleIdToDocumentPermissionSetTypeMappings.Mapping mapping = mappings[i];
+        for (RoleIdToDocumentPermissionSetTypeMappings.Mapping mapping : mappings) {
             RoleId roleId = mapping.getRoleId();
-            RoleDomainObject role = roleGetter.getRole(roleId) ;
+            RoleDomainObject role = roleGetter.getRole(roleId);
             DocumentPermissionSetTypeDomainObject documentPermissionSetType = mapping.getDocumentPermissionSetType();
-            if ( DocumentPermissionSetTypeDomainObject.FULL.equals(documentPermissionSetType) ) {
+            if (DocumentPermissionSetTypeDomainObject.FULL.equals(documentPermissionSetType)) {
                 result.put(role, DocumentPermissionSetDomainObject.FULL);
-            } else if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(documentPermissionSetType) ) {
+            } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(documentPermissionSetType)) {
                 result.put(role, internalDocument.getPermissionSets().getRestricted1());
-            } else if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(documentPermissionSetType) ) {
+            } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(documentPermissionSetType)) {
                 result.put(role, internalDocument.getPermissionSets().getRestricted2());
-            } else if ( DocumentPermissionSetTypeDomainObject.READ.equals(documentPermissionSetType) ) {
+            } else if (DocumentPermissionSetTypeDomainObject.READ.equals(documentPermissionSetType)) {
                 result.put(role, DocumentPermissionSetDomainObject.READ);
-            } else if ( !DocumentPermissionSetTypeDomainObject.NONE.equals(documentPermissionSetType) ) {
+            } else if (!DocumentPermissionSetTypeDomainObject.NONE.equals(documentPermissionSetType)) {
                 log.warn("A missing mapping in DocumentPermissionSetMapper");
             }
         }
 
-        return wrapDomainObjectsInMap( result );
+        return wrapDomainObjectsInMap(result);
 
     }
 
-    private static Map wrapDomainObjectsInMap( Map rolesMappedToPermissionsIds ) {
-        Map result = new HashMap();
-        Set keys = rolesMappedToPermissionsIds.keySet();
-        Iterator keyIterator = keys.iterator();
-        while ( keyIterator.hasNext() ) {
-            RoleDomainObject role = (RoleDomainObject)keyIterator.next();
-            DocumentPermissionSetDomainObject documentPermissionSetDO = (DocumentPermissionSetDomainObject)rolesMappedToPermissionsIds.get( role );
-            DocumentPermissionSet documentPermissionSet = new DocumentPermissionSet( documentPermissionSetDO );
-            result.put( new Role(role), documentPermissionSet );
-        }
-        return result;
-    }
-
-    /** Whether the document is archived. **/
+    /**
+     * Tests if the document is archived.
+     *
+     * @return true if the document is archived, false otherwise.
+     */
     public boolean isArchived() {
         return internalDocument.isArchived();
     }
 
-    /** Whether the document is published and not archived. **/
+    /**
+     * Tests if the document is published and not archived.
+     *
+     * @return true if the document is published and not archived, false otherwise.
+     */
     public boolean isActive() {
         return internalDocument.isActive();
     }
 
-    /** Whether the document is published. **/
+    /**
+     * Tests if the document is published.
+     *
+     * @return true if the document is published, false otherwise.
+     */
     public boolean isPublished() {
         return internalDocument.isPublished();
     }
 
+    /**
+     * Tests if search is disabled for this document.
+     * Note that {@link DocumentService#getDocument(String)} will still find the document,
+     * however the {@link DocumentService#getDocuments(SearchQuery)} won't.
+     *
+     * @return true if search is disabled for this document, false otherwise.
+     */
     public boolean isSearchDisabled() {
         return internalDocument.isSearchDisabled();
     }
 
+    /**
+     * Sets whether search is disabled for this document.
+     *
+     * @param searchDisabled boolean, true to disable search, false to enable
+     */
     public void setSearchDisabled(boolean searchDisabled) {
         internalDocument.setSearchDisabled(searchDisabled);
     }
 
+    /**
+     * Returns the most privileged DocumentPermissionSet of this document for current user.
+     * The lowest DocumentPermissionSet returned here is of type {@link DocumentPermissionSetType#NONE}
+     *
+     * @return the most privileged DocumentPermissionSet of this document for current user or {@link DocumentPermissionSetType#NONE}
+     */
     public DocumentPermissionSet getDocumentPermissionSetForUser() {
-        return new DocumentPermissionSet( contentManagementSystem.getCurrentUser().getInternal().getPermissionSetFor( internalDocument ) );
+        return new DocumentPermissionSet(contentManagementSystem.getCurrentUser().getInternal().getPermissionSetFor(internalDocument));
     }
 
-    public boolean equals( Object o ) {
-        if ( this == o ) {
+    /**
+     * Checks whether this and the given Objects are the same.
+     * Uses id as a criteria of equality.
+     *
+     * @param o Object to compare with
+     * @return true if the parameter is of class Document or it's subclass and their id attributes are the same.
+     */
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof Document ) ) {
+        if (!(o instanceof Document)) {
             return false;
         }
 
-        final Document document = (Document)o;
+        final Document document = (Document) o;
 
         return internalDocument.equals(document.internalDocument);
 
     }
 
+    /**
+     * Returns the id of this document.
+     *
+     * @return id of this document
+     */
     public int hashCode() {
         return internalDocument.hashCode();
     }
 
+    /**
+     * Returns keywords of this document.
+     *
+     * @return a Set of keywords assigned to this document
+     */
     public Set getKeywords() {
         return internalDocument.getKeywords();
     }
 
+    /**
+     * Sets keywords for this document.
+     *
+     * @param keywords a Set of keywords for this document.
+     */
     public void setKeywords(Set keywords) {
         internalDocument.setKeywords(keywords);
     }
 
+    /**
+     * Returns this document's {@link DocumentPermissionSet} of type {@link DocumentPermissionSetType#RESTRICTED_1}
+     *
+     * @return can't be null, this document's {@link DocumentPermissionSet} of type {@link DocumentPermissionSetType#RESTRICTED_1}
+     */
     public DocumentPermissionSet getPermissionSetRestrictedOne() {
-        DocumentPermissionSetDomainObject restrictedOne = internalDocument.getPermissionSets().getRestricted1() ;
-        return new DocumentPermissionSet( restrictedOne );
+        DocumentPermissionSetDomainObject restrictedOne = internalDocument.getPermissionSets().getRestricted1();
+        return new DocumentPermissionSet(restrictedOne);
     }
 
+    /**
+     * Returns this document's {@link DocumentPermissionSet} of type {@link DocumentPermissionSetType#RESTRICTED_2}
+     *
+     * @return can't be null, this document's {@link DocumentPermissionSet} of type {@link DocumentPermissionSetType#RESTRICTED_2}
+     */
     public DocumentPermissionSet getPermissionSetRestrictedTwo() {
-        DocumentPermissionSetDomainObject restrictedTwo = internalDocument.getPermissionSets().getRestricted2() ;
-        return new DocumentPermissionSet( restrictedTwo );
+        DocumentPermissionSetDomainObject restrictedTwo = internalDocument.getPermissionSets().getRestricted2();
+        return new DocumentPermissionSet(restrictedTwo);
     }
 
+    /**
+     * Returns this document's headline.
+     *
+     * @return headline or an empty String
+     */
     public String getHeadline() {
         return internalDocument.getHeadline();
     }
 
+    /**
+     * Sets this document's headline.
+     *
+     * @param headline new headline
+     */
+    public void setHeadline(String headline) {
+        internalDocument.setHeadline(headline);
+    }
+
+    /**
+     * Returns this document's menu text.
+     *
+     * @return menu text or an empty String
+     */
     public String getMenuText() {
         return internalDocument.getMenuText();
     }
 
+    /**
+     * Sets this document's menu text
+     *
+     * @param menuText new menu text
+     */
+    public void setMenuText(String menuText) {
+        internalDocument.setMenuText(menuText);
+    }
+
+    /**
+     * Returns this document's alias.
+     *
+     * @return this document's alias or null if doesn't exist
+     */
     public String getAlias() {
-        return  internalDocument.getAlias();
+        return internalDocument.getAlias();
     }
 
+    /**
+     * Sets this document's alias
+     *
+     * @param alias new alias or null to remove
+     */
     public void setAlias(String alias) {
         internalDocument.setAlias(alias);
     }
 
+    /**
+     * Returns this document's alias if there's one, id otherwise.
+     *
+     * @return id or alias, if no alias then id
+     */
     public String getName() {
         return internalDocument.getName();
     }
 
+    /**
+     * Returns this document's menu image url
+     *
+     * @return this document's menu image url, or an empty String if doesn't exist
+     */
     public String getMenuImageURL() {
         return internalDocument.getMenuImage();
     }
 
-    public void setHeadline( String headline ) {
-        internalDocument.setHeadline( headline );
+    /**
+     * Sets this document's menu image url
+     *
+     * @param imageUrl new menu image url
+     */
+    public void setMenuImageURL(String imageUrl) {
+        internalDocument.setMenuImage(imageUrl);
     }
 
-    public void setMenuText( String menuText ) {
-        internalDocument.setMenuText( menuText );
+    /**
+     * Returns the creator of this document
+     *
+     * @return User or null if doesn't exist
+     */
+    public User getCreator() {
+        int creatorId = internalDocument.getCreatorId();
+        return contentManagementSystem.getUserService().getUser(creatorId);
     }
 
-    public void setMenuImageURL( String imageUrl ) {
-        internalDocument.setMenuImage( imageUrl );
+    /**
+     * Sets the creator of this document.
+     *
+     * @param creator a User to be the new creator.
+     */
+    public void setCreator(User creator) {
+        internalDocument.setCreator(creator.getInternal());
     }
 
-    public User getCreator() {
-        int creatorId = internalDocument.getCreatorId();
-        return contentManagementSystem.getUserService().getUser(creatorId) ;
+    /**
+     * Returns the last user who modified this document.
+     *
+     * @return a user who modified document or null if there is no such data or user can not be found.
+     */
+    public User getModifier() {
+        Integer modifierId = internalDocument.getModifierId();
+        return modifierId == null ? null : contentManagementSystem.getUserService().getUser(modifierId);
     }
 
-    public void setCreator( User creator ) {
-        internalDocument.setCreator( creator.getInternal() );
+    /**
+     * Returns the languages set for this document.
+     *
+     * @return {@link Language} set for this document
+     */
+    public Language getLanguage() {
+        return Language.getLanguageByISO639_2(internalDocument.getLanguageIso639_2());
     }
 
-    public Language getLanguage() {
-        return Language.getLanguageByISO639_2( internalDocument.getLanguageIso639_2() );
+    /**
+     * Sets the language of this document
+     *
+     * @param language language for this document
+     */
+    public void setLanguage(Language language) {
+        internalDocument.setLanguageIso639_2(language.getIsoCode639_2());
+    }
+
+    /**
+     * Adds a {@link Category} to this document.
+     *
+     * @param category a category to add
+     */
+    public void addCategory(Category category) {
+        addCategory(category.getId());
     }
 
-    public void addCategory( Category category ) {
-        internalDocument.addCategoryId( category.getId() );
+    public void addCategory(int categoryId) {
+        internalDocument.addCategoryId(categoryId);
+    }
+
+    /**
+     * Removes a {@link Category} from this document.
+     *
+     * @param category a category to remove
+     */
+    public void removeCategory(Category category) {
+        removeCategory(category.getId());
     }
 
-    public void removeCategory( Category category ) {
-        internalDocument.removeCategoryId( category.getId() );
+    public void removeCategory(int categoryId) {
+        internalDocument.removeCategoryId(categoryId);
     }
 
     /**
-     * @return An array of Categories, an empty if no one found.
+     * Returns categories assigned to this document.
+     *
+     * @return An array of Categories, an empty if none assigned.
      */
     public Category[] getCategories() {
-        Set categories = contentManagementSystem.getInternal().getCategoryMapper().getCategories(internalDocument.getCategoryIds());
-        CategoryDomainObject[] categoryDomainObjects = (CategoryDomainObject[]) categories.toArray(new CategoryDomainObject[categories.size()]);
-        return getCategoryArrayFromCategoryDomainObjectArray( categoryDomainObjects );
+        CategoryDomainObject[] categoryDomainObjects = contentManagementSystem.getInternal()
+                .getCategoryMapper()
+                .getCategories(internalDocument.getCategoryIds())
+                .toArray(new CategoryDomainObject[0]);
+
+        return getCategoryArrayFromCategoryDomainObjectArray(categoryDomainObjects);
     }
 
-    private Category[] getCategoryArrayFromCategoryDomainObjectArray( CategoryDomainObject[] categoryDomainObjects ) {
+    private Category[] getCategoryArrayFromCategoryDomainObjectArray(CategoryDomainObject[] categoryDomainObjects) {
         Category[] categories = new Category[categoryDomainObjects.length];
 
-        for ( int i = 0; i < categories.length; i++ ) {
+        for (int i = 0; i < categories.length; i++) {
             CategoryDomainObject categoryDomainObject = categoryDomainObjects[i];
-            categories[i] = new Category( categoryDomainObject );
+            categories[i] = new Category(categoryDomainObject);
         }
         return categories;
     }
 
     /**
-        @param permissionSetId One of the constants in {@link DocumentPermissionSet}.
-        @deprecated Use {@link #setPermissionSetTypeForRole(Role, DocumentPermissionSetType)}
-        @since 2.0
+     * @param permissionSetId One of the constants in {@link DocumentPermissionSet}.
+     * @since 2.0
+     * @deprecated Use {@link #setPermissionSetTypeForRole(Role, DocumentPermissionSetType)}
      **/
-    public void setPermissionSetIdForRole( Role role, int permissionSetId ) {
-        if ( null != role ) {
+    public void setPermissionSetIdForRole(Role role, int permissionSetId) {
+        if (null != role) {
             internalDocument.setDocumentPermissionSetTypeForRoleId(role.getInternal().getId(), DocumentPermissionSetTypeDomainObject.fromInt(permissionSetId));
         }
     }
 
     /**
-        @since 3.0
+     * Sets a {@link DocumentPermissionSetType} for a {@link Role} for this document
+     *
+     * @param role                      a Role
+     * @param documentPermissionSetType one of DocumentPermissionSetType constants
+     * @since 3.0
      */
-    public void setPermissionSetTypeForRole( Role role, DocumentPermissionSetType documentPermissionSetType ) {
+    public void setPermissionSetTypeForRole(Role role, DocumentPermissionSetType documentPermissionSetType) {
         internalDocument.setDocumentPermissionSetTypeForRoleId(role.getInternal().getId(), documentPermissionSetType.getInternal());
     }
 
     /**
-     *   @deprecated Use {@link #getPermissionSetTypeForRole(Role)}
-         @since 2.0
+     * @since 2.0
+     * @deprecated Use {@link #getPermissionSetTypeForRole(Role)}
      */
-    public int getPermissionSetIdForRole( Role role ) {
+    public int getPermissionSetIdForRole(Role role) {
         return internalDocument.getDocumentPermissionSetTypeForRoleId(role.getInternal().getId()).getId();
     }
 
     /**
-        @since 3.0
-    */
-    public DocumentPermissionSetType getPermissionSetTypeForRole( Role role ) {
-        return new DocumentPermissionSetType(internalDocument.getDocumentPermissionSetTypeForRoleId(role.getInternal().getId())) ;
+     * Returns a {@link DocumentPermissionSetType} for the given {@link Role}
+     *
+     * @return {@link DocumentPermissionSetType} for the given {@link Role} or {@link DocumentPermissionSetType#NONE} if none exist
+     * @since 3.0
+     */
+    public DocumentPermissionSetType getPermissionSetTypeForRole(Role role) {
+        return new DocumentPermissionSetType(internalDocument.getDocumentPermissionSetTypeForRoleId(role.getInternal().getId()));
     }
 
     /**
-     * @param categoryType
+     * Returns categories of the provided type assigned to this document.
+     *
+     * @param categoryType CategoryType to get categories of
      * @return an array of Categories, empty array if no one found.
      */
-    public Category[] getCategoriesOfType( CategoryType categoryType ) {
-        CategoryMapper categoryMapper = contentManagementSystem.getInternal().getCategoryMapper();
-        Set categoriesOfType = categoryMapper.getCategoriesOfType(categoryType.getInternal(), internalDocument.getCategoryIds());
-        CategoryDomainObject[] categories = (CategoryDomainObject[]) categoriesOfType.toArray(new CategoryDomainObject[categoriesOfType.size()]);
-        return getCategoryArrayFromCategoryDomainObjectArray( categories );
+    public Category[] getCategoriesOfType(CategoryType categoryType) {
+        CategoryDomainObject[] categories = contentManagementSystem.getInternal()
+                .getCategoryMapper()
+                .getCategoriesOfType(categoryType.getInternal(), internalDocument.getCategoryIds())
+                .toArray(new CategoryDomainObject[0]);
+
+        return getCategoryArrayFromCategoryDomainObjectArray(categories);
     }
 
+    /**
+     * Returns the publisher of this document
+     *
+     * @return publisher User, or null if none
+     */
     public User getPublisher() {
         Integer publisherId = internalDocument.getPublisherId();
-        if ( null != publisherId ) {
-            return contentManagementSystem.getUserService().getUser(publisherId.intValue()) ;
-        } else {
-            return null;
-        }
+        return (null == publisherId) ? null : contentManagementSystem.getUserService().getUser(publisherId);
+    }
+
+    /**
+     * Sets this document's publisher
+     *
+     * @param user a {@link User} to be this document's publisher
+     */
+    public void setPublisher(User user) {
+        internalDocument.setPublisher(user.getInternal());
     }
 
+    /**
+     * Returns a String represending html link target, such as '_blank' etc.
+     *
+     * @return String representing html link target attribute
+     */
     public String getTarget() {
         return internalDocument.getTarget();
     }
 
+    /**
+     * Returns the {@link java.util.Date} this document was published or the date it will be.
+     *
+     * @return publication Date for/of this document
+     */
     public Date getPublicationStartDatetime() {
         return internalDocument.getPublicationStartDatetime();
     }
 
-    public void setPublicationStartDatetime( Date datetime ) {
-        internalDocument.setPublicationStartDatetime( datetime );
+    /**
+     * Sets publication date for this document
+     *
+     * @param datetime new publication {@link java.util.Date} or null to remove
+     */
+    public void setPublicationStartDatetime(Date datetime) {
+        internalDocument.setPublicationStartDatetime(datetime);
     }
 
+    /**
+     * Returns the archivation Date for this document.
+     *
+     * @return archivation Date or null if not set.
+     */
     public Date getArchivedDatetime() {
         return internalDocument.getArchivedDatetime();
     }
 
-    public void setArchivedDatetime( Date datetime ) {
-        internalDocument.setArchivedDatetime( datetime );
-    }
-
-    public void setPublisher( User user ) {
-        internalDocument.setPublisher( user.getInternal() );
+    /**
+     * Sets archivation Date for this document.
+     *
+     * @param datetime new archivation date
+     */
+    public void setArchivedDatetime(Date datetime) {
+        internalDocument.setArchivedDatetime(datetime);
     }
 
     /**
-     * @return An array of Sections, an empty array if none found.
+     * Returns the sections assigned to this document
+     *
+     * @return An array of {@link Section}, an empty array if none found.
      */
     public Section[] getSections() {
         Set sectionIds = internalDocument.getSectionIds();
         Section[] sections = new Section[sectionIds.size()];
         DocumentService documentService = contentManagementSystem.getDocumentService();
-        for ( CountingIterator iterator = new CountingIterator(sectionIds.iterator()); iterator.hasNext(); ) {
+        for (CountingIterator iterator = new CountingIterator(sectionIds.iterator()); iterator.hasNext(); ) {
             Integer sectionId = (Integer) iterator.next();
-            sections[iterator.getCount() - 1] = documentService.getSection(sectionId.intValue()) ;
+            sections[iterator.getCount() - 1] = documentService.getSection(sectionId);
         }
         return sections;
     }
 
-    public void setSections( Section[] sections ) {
+    /**
+     * Sets sections for this document.
+     *
+     * @param sections an array of {@link Section} for this document
+     */
+    public void setSections(Section[] sections) {
         Set sectionIds = new HashSet();
-        for ( int i = 0; i < sections.length; i++ ) {
-            Section section = sections[i];
+        for (Section section : sections) {
             int sectionId = section.getId();
-            sectionIds.add(new Integer(sectionId)) ;
+            sectionIds.add(sectionId);
         }
-        internalDocument.setSectionIds( sectionIds );
+        internalDocument.setSectionIds(sectionIds);
     }
 
+    /**
+     * Returns the last {@link java.util.Date} this document was modified.
+     *
+     * @return the last date this document was modified
+     */
     public Date getModifiedDatetime() {
         return internalDocument.getModifiedDatetime();
     }
 
-    public void setModifiedDatetime( Date date ) {
-        internalDocument.setModifiedDatetime( date );
+    /**
+     * Sets a modification date for this document.
+     *
+     * @param date new modification date for this document
+     */
+    public void setModifiedDatetime(Date date) {
+        internalDocument.setModifiedDatetime(date);
     }
 
+    /**
+     * Returns the creation date of this document.
+     *
+     * @return creation date
+     */
     public Date getCreatedDatetime() {
         return internalDocument.getCreatedDatetime();
     }
 
-    public void addSection( Section section ) {
-        internalDocument.addSectionId( section.getId() );
-    }
-
-    /** @deprecated Use {@link #setPublicationStatus} instead. */
-    public void setStatus( int status ) {
-        internalDocument.setPublicationStatus( new PublicationStatus(status) );
-    }
-
-    public void setLanguage( Language language ) {
-        internalDocument.setLanguageIso639_2( language.getIsoCode639_2() );
-    }
-
-    public void setPublicationEndDatetime( Date datetime ) {
-        internalDocument.setPublicationEndDatetime( datetime );
+    /**
+     * Adds a {@link Section} to this document
+     *
+     * @param section to add, can't be null
+     */
+    public void addSection(Section section) {
+        internalDocument.addSectionId(section.getId());
     }
 
+    /**
+     * Returns publication date of this document
+     *
+     * @return publication end date or null if not set
+     */
     public Date getPublicationEndDatetime() {
         return internalDocument.getPublicationEndDatetime();
     }
 
-    /** @deprecated Use {@link #getPublicationStatus} instead. */
+    /**
+     * Sets publication end date for this document
+     *
+     * @param datetime publication end date
+     */
+    public void setPublicationEndDatetime(Date datetime) {
+        internalDocument.setPublicationEndDatetime(datetime);
+    }
+
+    /**
+     * @deprecated Use {@link #getPublicationStatus} instead.
+     */
     public int getStatus() {
-        return internalDocument.getPublicationStatus().status ;
+        return internalDocument.getPublicationStatus().status;
     }
 
-    public void setVisibleInMenusForUnauthorizedUsers( boolean visibleInMenusForUnauthorizedUsers ) {
-        internalDocument.setLinkedForUnauthorizedUsers( visibleInMenusForUnauthorizedUsers );
+    /**
+     * @deprecated Use {@link #setPublicationStatus} instead.
+     */
+    public void setStatus(int status) {
+        internalDocument.setPublicationStatus(new PublicationStatus(status));
     }
 
+    /**
+     * Tests if this document is visible in menus for anauthorized users
+     *
+     * @return document visibility in menus for unauthorized users
+     */
     public boolean isVisibleInMenusForUnauthorizedUsers() {
         return internalDocument.isLinkedForUnauthorizedUsers();
     }
 
+    /**
+     * Sets whether this document's link is visible in menus for anauthorized users
+     *
+     * @param visibleInMenusForUnauthorizedUsers true to allow unauthorized users see this document's link in menus, false not to
+     */
+    public void setVisibleInMenusForUnauthorizedUsers(boolean visibleInMenusForUnauthorizedUsers) {
+        internalDocument.setLinkedForUnauthorizedUsers(visibleInMenusForUnauthorizedUsers);
+    }
+
+    /**
+     * Tests whether other users can add this document to a menu.
+     * Note that if a user can edit this document, they can also add it to a menu.
+     *
+     * @return whether other users can add this document to a menu.
+     */
     public boolean isLinkableByOtherUsers() {
         return internalDocument.isLinkableByOtherUsers();
     }
 
+    /**
+     * Sets whether other users can add this document to a menu.
+     * Note that users that can edit this document can link it to a menu too too
+     *
+     * @param linkableByOtherUsers true to allow, false not to
+     */
     public void setLinkableByOtherUsers(boolean linkableByOtherUsers) {
         internalDocument.setLinkableByOtherUsers(linkableByOtherUsers);
     }
 
+    /**
+     * Returns the {@link PublicationStatus} of this document.
+     *
+     * @return publication status of this document, defaults to {@link PublicationStatus#NEW}
+     */
     public PublicationStatus getPublicationStatus() {
         return internalDocument.getPublicationStatus();
     }
 
+    /**
+     * Sets {@link PublicationStatus} of this document.
+     *
+     * @param publicationStatus new publication status
+     */
     public void setPublicationStatus(PublicationStatus publicationStatus) {
-        internalDocument.setPublicationStatus(publicationStatus) ;
+        internalDocument.setPublicationStatus(publicationStatus);
+    }
+
+    public Map<String, String> getProperties() {
+        return getInternal().getProperties();
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        getInternal().setProperties(properties);
     }
 
     /**
-        @since 3.0
+     * Represents publication status of a {@link Document}
+     *
+     * @since 3.0
      */
     public static class PublicationStatus implements Serializable {
+        /**
+         * New publication status
+         */
         public static final PublicationStatus NEW = new PublicationStatus(STATUS_NEW);
+
+        /**
+         * Approved publication status
+         */
         public static final PublicationStatus APPROVED = new PublicationStatus(STATUS_PUBLICATION_APPROVED);
+
+        /**
+         * Disapproved publication status
+         */
         public static final PublicationStatus DISAPPROVED = new PublicationStatus(STATUS_PUBLICATION_DISAPPROVED);
 
         private final int status;
@@ -399,103 +707,192 @@ private PublicationStatus(int status) {
             this.status = status;
         }
 
+        public static PublicationStatus fromInt(int status) {
+            switch (status) {
+                case STATUS_NEW:
+                    return NEW;
+                case STATUS_PUBLICATION_APPROVED:
+                    return APPROVED;
+                case STATUS_PUBLICATION_DISAPPROVED:
+                    return DISAPPROVED;
+            }
+
+            throw new PublicationStatusNotExistException(status);
+        }
+
+        /**
+         * Int values of this status as a string
+         *
+         * @return Int values of this status as a string
+         */
         public String toString() {
-            return ""+status ;
+            return "" + status;
         }
 
+        /**
+         * Compares two statuses
+         *
+         * @param o Status to compare with
+         * @return true if this and the argument have the same status
+         */
         public boolean equals(Object o) {
-            if ( this == o ) {
+            if (this == o) {
                 return true;
             }
-            if ( o == null || getClass() != o.getClass() ) {
+            if (o == null || getClass() != o.getClass()) {
                 return false;
             }
 
-            return status == ( (PublicationStatus) o ).status;
+            return status == ((PublicationStatus) o).status;
 
         }
 
+        /**
+         * Returns int value of this PublicationStatus
+         *
+         * @return status
+         */
         public int hashCode() {
             return status;
         }
+
+        private static class PublicationStatusNotExistException extends RuntimeException {
+            PublicationStatusNotExistException(int status) {
+                super("Publication status " + status + " not exist.");
+            }
+        }
     }
 
+
+    /**
+     * Represents document's life cycle phase
+     *
+     * @see <a href="http://doc.imcms.net/4.0/239" target="_blank">Page information</a>
+     */
     public static class LifeCyclePhase implements Serializable {
+
+        /**
+         * New phase
+         */
         public static final LifeCyclePhase NEW = new LifeCyclePhase(imcode.server.document.LifeCyclePhase.NEW);
+
+        /**
+         * Disapproved phase
+         */
         public static final LifeCyclePhase DISAPPROVED = new LifeCyclePhase(imcode.server.document.LifeCyclePhase.DISAPPROVED);
+
+        /**
+         * Published phase
+         */
         public static final LifeCyclePhase PUBLISHED = new LifeCyclePhase(imcode.server.document.LifeCyclePhase.PUBLISHED);
+
+        /**
+         * Unpublished phase
+         */
         public static final LifeCyclePhase UNPUBLISHED = new LifeCyclePhase(imcode.server.document.LifeCyclePhase.UNPUBLISHED);
+
+        /**
+         * Archived phase
+         */
         public static final LifeCyclePhase ARCHIVED = new LifeCyclePhase(imcode.server.document.LifeCyclePhase.ARCHIVED);
+
+        /**
+         * Approved phase
+         */
         public static final LifeCyclePhase APPROVED = new LifeCyclePhase(imcode.server.document.LifeCyclePhase.APPROVED);
 
-        private imcode.server.document.LifeCyclePhase phase ;
+        private imcode.server.document.LifeCyclePhase phase;
 
-        private LifeCyclePhase( imcode.server.document.LifeCyclePhase phase ) {
+        private LifeCyclePhase(imcode.server.document.LifeCyclePhase phase) {
             this.phase = phase;
         }
 
+        /**
+         * Returns string representation of this life cycle phase
+         *
+         * @return string representation in form of internal life cycle phase name, e.g. "published"
+         */
         public String toString() {
-            return phase.toString() ;
+            return phase.toString();
         }
     }
 
+    /**
+     * Abstract class in charge of {@link Document} comparison with a number of static comparators extending it for comparison by
+     * different document attributes.
+     */
     public abstract static class Comparator extends ChainableReversibleNullComparator {
 
-        public int compare( Object o1, Object o2 ) {
-            final Document d1 = (Document)o1;
-            final Document d2 = (Document)o2;
-            try {
-                return compareDocuments( d1, d2 );
-            } catch ( NullPointerException npe ) {
-                NullPointerException nullPointerException = new NullPointerException("Tried sorting on null fields! You need to call .nullsFirst() or .nullsLast() on your Comparator.");
-                nullPointerException.initCause(npe);
-                throw nullPointerException;
-            }
-        }
-
-        protected abstract int compareDocuments( Document d1, Document d2 );
-
+        /**
+         * Document id comparator
+         */
         public final static Comparator ID = new Comparator() {
-            protected int compareDocuments( Document d1, Document d2 ) {
+            protected int compareDocuments(Document d1, Document d2) {
                 return d1.getId() - d2.getId();
             }
         };
-
+        /**
+         * Case insensitive document headline comparator
+         */
         public final static Comparator HEADLINE = new Comparator() {
-            protected int compareDocuments( Document d1, Document d2 ) {
-                return d1.getHeadline().compareToIgnoreCase( d2.getHeadline() );
+            protected int compareDocuments(Document d1, Document d2) {
+                return d1.getHeadline().compareToIgnoreCase(d2.getHeadline());
             }
         };
-
+        /**
+         * Creation date comparator
+         */
         public final static Comparator CREATED_DATETIME = new Comparator() {
-            protected int compareDocuments( Document d1, Document d2 ) {
-                return d1.getCreatedDatetime().compareTo( d2.getCreatedDatetime() );
+            protected int compareDocuments(Document d1, Document d2) {
+                return d1.getCreatedDatetime().compareTo(d2.getCreatedDatetime());
             }
         };
-
+        /**
+         * Modification date comparator
+         */
         public final static Comparator MODIFIED_DATETIME = new Comparator() {
-            protected int compareDocuments( Document d1, Document d2 ) {
-                return d1.getModifiedDatetime().compareTo( d2.getModifiedDatetime() );
+            protected int compareDocuments(Document d1, Document d2) {
+                return d1.getModifiedDatetime().compareTo(d2.getModifiedDatetime());
             }
         };
-
+        /**
+         * Publication start date comparator
+         */
         public final static Comparator PUBLICATION_START_DATETIME = new Comparator() {
-            protected int compareDocuments( Document document1, Document document2 ) {
-                return document1.getPublicationStartDatetime().compareTo( document2.getPublicationStartDatetime() );
+            protected int compareDocuments(Document document1, Document document2) {
+                return document1.getPublicationStartDatetime().compareTo(document2.getPublicationStartDatetime());
             }
         };
-
+        /**
+         * Publication end date comparator
+         */
         public final static Comparator PUBLICATION_END_DATETIME = new Comparator() {
-            protected int compareDocuments( Document document1, Document document2 ) {
-                return document1.getPublicationEndDatetime().compareTo( document2.getPublicationEndDatetime() );
+            protected int compareDocuments(Document document1, Document document2) {
+                return document1.getPublicationEndDatetime().compareTo(document2.getPublicationEndDatetime());
             }
         };
-
+        /**
+         * Archivation date comparator
+         */
         public final static Comparator ARCHIVED_DATETIME = new Comparator() {
-            protected int compareDocuments( Document document1, Document document2 ) {
-                return document1.getArchivedDatetime().compareTo( document2.getArchivedDatetime() );
+            protected int compareDocuments(Document document1, Document document2) {
+                return document1.getArchivedDatetime().compareTo(document2.getArchivedDatetime());
             }
         };
 
+        public int compare(Object o1, Object o2) {
+            final Document d1 = (Document) o1;
+            final Document d2 = (Document) o2;
+            try {
+                return compareDocuments(d1, d2);
+            } catch (NullPointerException npe) {
+                NullPointerException nullPointerException = new NullPointerException("Tried sorting on null fields! You need to call .nullsFirst() or .nullsLast() on your Comparator.");
+                nullPointerException.initCause(npe);
+                throw nullPointerException;
+            }
+        }
+
+        protected abstract int compareDocuments(Document d1, Document d2);
+
     }
 }
diff --git a/server/src/com/imcode/imcms/api/DocumentAlreadyInMenuException.java b/server/src/com/imcode/imcms/api/DocumentAlreadyInMenuException.java
index 5def3dbb3b..e5386fe293 100644
--- a/server/src/com/imcode/imcms/api/DocumentAlreadyInMenuException.java
+++ b/server/src/com/imcode/imcms/api/DocumentAlreadyInMenuException.java
@@ -1,12 +1,14 @@
 package com.imcode.imcms.api;
 
 /**
+ * Not used.
+ *
  * @author kreiger
  */
 public class DocumentAlreadyInMenuException extends Exception {
 
-    public DocumentAlreadyInMenuException( String message ) {
-        super(message) ;
+    public DocumentAlreadyInMenuException(String message) {
+        super(message);
     }
 
 }
diff --git a/server/src/com/imcode/imcms/api/DocumentPermissionSet.java b/server/src/com/imcode/imcms/api/DocumentPermissionSet.java
index ff6a9a4edb..2b841e18b6 100644
--- a/server/src/com/imcode/imcms/api/DocumentPermissionSet.java
+++ b/server/src/com/imcode/imcms/api/DocumentPermissionSet.java
@@ -10,121 +10,223 @@
 import java.util.List;
 import java.util.Set;
 
+/**
+ * Class describing which actions are allowed to be performed on a document.
+ */
 public class DocumentPermissionSet {
 
-    /** @deprecated Use {@link DocumentPermissionSetType#FULL} */
+    /**
+     * @deprecated Use {@link DocumentPermissionSetType#FULL}
+     */
     public final static int FULL = DocumentPermissionSetTypeDomainObject.FULL.getId();
-    /** @deprecated Use {@link DocumentPermissionSetType#RESTRICTED_1} */
+    /**
+     * @deprecated Use {@link DocumentPermissionSetType#RESTRICTED_1}
+     */
     public final static int RESTRICTED_1 = DocumentPermissionSetTypeDomainObject.RESTRICTED_1.getId();
-    /** @deprecated Use {@link DocumentPermissionSetType#RESTRICTED_2} */
+    /**
+     * @deprecated Use {@link DocumentPermissionSetType#RESTRICTED_2}
+     */
     public final static int RESTRICTED_2 = DocumentPermissionSetTypeDomainObject.RESTRICTED_2.getId();
-    /** @deprecated Use {@link DocumentPermissionSetType#READ} */
+    /**
+     * @deprecated Use {@link DocumentPermissionSetType#READ}
+     */
     public final static int READ = DocumentPermissionSetTypeDomainObject.READ.getId();
-    /** @deprecated Use {@link DocumentPermissionSetType#NONE} */
+    /**
+     * @deprecated Use {@link DocumentPermissionSetType#NONE}
+     */
     public final static int NONE = DocumentPermissionSetTypeDomainObject.NONE.getId();
 
     private DocumentPermissionSetDomainObject internalDocPermSet;
 
-    public DocumentPermissionSet( DocumentPermissionSetDomainObject internalDocPermSet ) {
+    /**
+     * Constructs document permission set with the given DocumentPermissionSetDomainObject or it's sub-class backing it.
+     * Depending on the class of internalDocPermSet backing this set some action permissions are ignored.
+     * Such as, TextDocumentPermissionSetDomainObject supports editing of texts, images, etc
+     * while plain DocumentPermissionSetDomainObject (used for url documents for example) doesn't,
+     * since URLDocuments don't have text, images, etc.
+     *
+     * @param internalDocPermSet DocumentPermissionSetDomainObject to be used internally
+     */
+    public DocumentPermissionSet(DocumentPermissionSetDomainObject internalDocPermSet) {
         this.internalDocPermSet = internalDocPermSet;
     }
 
     /**
-     * @deprecated No replacement, don't use. Will be removed in 4.0 or later. 
+     * @deprecated No replacement, don't use. Will be removed in 4.0 or later.
      */
     public String getType() {
         return internalDocPermSet.getTypeName();
     }
 
+    /**
+     * Returns a string representation of this permission set, consisting of DocumentPermissionSetType name and if the
+     * type is either {@link DocumentPermissionSetType#RESTRICTED_1} or {@link DocumentPermissionSetType#RESTRICTED_2} values of
+     * {@link DocumentPermissionSet#getEditDocumentInformationPermission} and {@link DocumentPermissionSet#getEditRolePermissionsPermission}
+     *
+     * @return a String representation of this DocumentPermissionSet
+     */
     public String toString() {
         return internalDocPermSet.toString();
     }
 
+    /**
+     * Returns if the permission set allows editing of document's meta data(info)
+     *
+     * @return boolean value if meta data is allowed to be edited
+     */
     public boolean getEditDocumentInformationPermission() {
         return internalDocPermSet.getEditDocumentInformation();
     }
 
+    /**
+     * Sets if the pemission set allows editing of document's meta data.
+     *
+     * @param b true to allow meta data editing, false to not to
+     */
+    public void setEditDocumentInformationPermission(boolean b) {
+        internalDocPermSet.setEditDocumentInformation(b);
+    }
+
+    /**
+     * Returns if the permission set allows editing of document's role privileges.
+     *
+     * @return boolean value if role privileges are allowed to be edited
+     */
     public boolean getEditRolePermissionsPermission() {
         return internalDocPermSet.getEditPermissions();
     }
 
+    /**
+     * Sets if the pemission set allows editing of document's role permission.
+     * Same as {@link DocumentPermissionSet#setEditPermissionsPermission(boolean)}
+     *
+     * @param b true to allow editing of includes, false to not to
+     */
+    public void setEditRolePermissionsPermission(boolean b) {
+        internalDocPermSet.setEditPermissions(b);
+    }
+
+    /**
+     * Returns if the permission set allows editing of text fields
+     *
+     * @return boolean value if text fields are allowed to be edited
+     */
     public boolean getEditTextsPermission() {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            return ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).getEditTexts();
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            return ((TextDocumentPermissionSetDomainObject) internalDocPermSet).getEditTexts();
         }
 
         return false;
     }
 
-    public boolean getEditIncludesPermission() {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            return ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).getEditIncludes();
+    /**
+     * Sets if the pemission set allows editing of document's texts.
+     *
+     * @param b true to allow editing of texts, false to not to
+     */
+    public void setEditTextsPermission(boolean b) {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            ((TextDocumentPermissionSetDomainObject) internalDocPermSet).setEditTexts(b);
         }
-        return false;
     }
 
-    public boolean getEditPicturesPermission() {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            return ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).getEditImages();
+    /**
+     * Returns if the permission set allows editing of includes
+     *
+     * @return boolean value if includes are allowed to be edited
+     */
+    public boolean getEditIncludesPermission() {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            return ((TextDocumentPermissionSetDomainObject) internalDocPermSet).getEditIncludes();
         }
         return false;
     }
 
-    public boolean getEditMenusPermission() {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            return ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).getEditMenus();
+    /**
+     * Sets if the pemission set allows editing of document's includes.
+     *
+     * @param b true to allow editing of includes, false to not to
+     */
+    public void setEditIncludesPermission(boolean b) {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            ((TextDocumentPermissionSetDomainObject) internalDocPermSet).setEditIncludes(b);
         }
-
-        return false;
     }
 
-    public String[] getEditableTemplateGroupNames() {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            Set allowedTemplateGroupIds = ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).getAllowedTemplateGroupIds();
-            List allowedTemplateGroups = Imcms.getServices().getTemplateMapper().getTemplateGroups(allowedTemplateGroupIds);
-            String[] templateGroupNames = new String[allowedTemplateGroupIds.size()] ;
-            for ( CountingIterator iterator = new CountingIterator(allowedTemplateGroups.iterator()); iterator.hasNext(); ) {
-                TemplateGroupDomainObject templateGroup = (TemplateGroupDomainObject) iterator.next();
-                templateGroupNames[iterator.getCount()-1] = templateGroup.getName() ;
-            }
-            return templateGroupNames ;
+    /**
+     * Returns if the permission set allows editing of images
+     *
+     * @return boolean value if images are allowed to be edited
+     */
+    public boolean getEditPicturesPermission() {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            return ((TextDocumentPermissionSetDomainObject) internalDocPermSet).getEditImages();
         }
-        return new String[]{};
-    }
-
-    public void setEditDocumentInformationPermission( boolean b ) {
-        internalDocPermSet.setEditDocumentInformation( b );
+        return false;
     }
 
-    public void setEditIncludesPermission( boolean b ) {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).setEditIncludes( b );
+    /**
+     * Sets if the pemission set allows editing of document's includes.
+     *
+     * @param b true to allow editing of includes, false to not to
+     */
+    public void setEditPicturesPermission(boolean b) {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            ((TextDocumentPermissionSetDomainObject) internalDocPermSet).setEditImages(b);
         }
     }
 
-    public void setEditPermissionsPermission( boolean b ) {
-        internalDocPermSet.setEditPermissions( b );
-    }
-
-    public void setEditPicturesPermission( boolean b ) {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).setEditImages( b );
+    /**
+     * Returns if the permission set allows editing of menus
+     *
+     * @return boolean value if menus are allowed to be edited
+     */
+    public boolean getEditMenusPermission() {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            return ((TextDocumentPermissionSetDomainObject) internalDocPermSet).getEditMenus();
         }
+
+        return false;
     }
 
-    public void setEditMenusPermission( boolean b ) {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).setEditMenus( b );
+    /**
+     * Sets if the pemission set allows editing of document's menus.
+     *
+     * @param b true to allow editing of menus, false to not to
+     */
+    public void setEditMenusPermission(boolean b) {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            ((TextDocumentPermissionSetDomainObject) internalDocPermSet).setEditMenus(b);
         }
     }
 
-    public void setEditTextsPermission( boolean b ) {
-        if ( internalDocPermSet instanceof TextDocumentPermissionSetDomainObject ) {
-            ( (TextDocumentPermissionSetDomainObject)internalDocPermSet ).setEditTexts( b );
+    /**
+     * Returns the names of template groups, templates of which are allowed to be assigned to the document
+     * possessing this permission set.
+     *
+     * @return array of template group names.
+     */
+    public String[] getEditableTemplateGroupNames() {
+        if (internalDocPermSet instanceof TextDocumentPermissionSetDomainObject) {
+            Set allowedTemplateGroupIds = ((TextDocumentPermissionSetDomainObject) internalDocPermSet).getAllowedTemplateGroupIds();
+            List allowedTemplateGroups = Imcms.getServices().getTemplateMapper().getTemplateGroups(allowedTemplateGroupIds);
+            String[] templateGroupNames = new String[allowedTemplateGroupIds.size()];
+            for (CountingIterator iterator = new CountingIterator(allowedTemplateGroups.iterator()); iterator.hasNext(); )
+            {
+                TemplateGroupDomainObject templateGroup = (TemplateGroupDomainObject) iterator.next();
+                templateGroupNames[iterator.getCount() - 1] = templateGroup.getName();
+            }
+            return templateGroupNames;
         }
+        return new String[]{};
     }
 
-    public void setEditRolePermissionsPermission( boolean b ) {
-        internalDocPermSet.setEditPermissions( b );
+    /**
+     * Sets if the pemission set allows editing of document's role permissions.
+     *
+     * @param b true to allow editing of role permissions, false to not to
+     */
+    public void setEditPermissionsPermission(boolean b) {
+        internalDocPermSet.setEditPermissions(b);
     }
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/DocumentPermissionSetType.java b/server/src/com/imcode/imcms/api/DocumentPermissionSetType.java
index a687048a7e..7676e33c1f 100644
--- a/server/src/com/imcode/imcms/api/DocumentPermissionSetType.java
+++ b/server/src/com/imcode/imcms/api/DocumentPermissionSetType.java
@@ -2,15 +2,38 @@
 
 import imcode.server.document.DocumentPermissionSetTypeDomainObject;
 
+/**
+ * Describes a type of permission set.
+ * Some types have a defined permisssion set, while other can have a permission set giving or not certain privileges.
+ */
 public class DocumentPermissionSetType {
 
+    /**
+     * Permission set type giving full permission set
+     */
     public final static DocumentPermissionSetType FULL = new DocumentPermissionSetType(DocumentPermissionSetTypeDomainObject.FULL);
+
+    /**
+     * A permission set type which permission set can be defined.
+     */
     public final static DocumentPermissionSetType RESTRICTED_1 = new DocumentPermissionSetType(DocumentPermissionSetTypeDomainObject.RESTRICTED_1);
+
+    /**
+     * A permission set type which permission set can be defined.
+     */
     public final static DocumentPermissionSetType RESTRICTED_2 = new DocumentPermissionSetType(DocumentPermissionSetTypeDomainObject.RESTRICTED_2);
+
+    /**
+     * Permission set type giving read-only permission set
+     */
     public final static DocumentPermissionSetType READ = new DocumentPermissionSetType(DocumentPermissionSetTypeDomainObject.READ);
+
+    /**
+     * The permission set of this type doesn't allow nor editing for seeing the document.
+     */
     public final static DocumentPermissionSetType NONE = new DocumentPermissionSetType(DocumentPermissionSetTypeDomainObject.NONE);
 
-    private final DocumentPermissionSetTypeDomainObject internal ;
+    private final DocumentPermissionSetTypeDomainObject internal;
 
     DocumentPermissionSetType(DocumentPermissionSetTypeDomainObject internal) {
         this.internal = internal;
diff --git a/server/src/com/imcode/imcms/api/DocumentService.java b/server/src/com/imcode/imcms/api/DocumentService.java
index 743a86ded0..a2a95be3e9 100644
--- a/server/src/com/imcode/imcms/api/DocumentService.java
+++ b/server/src/com/imcode/imcms/api/DocumentService.java
@@ -1,24 +1,41 @@
 package com.imcode.imcms.api;
 
+import com.imcode.imcms.mapping.AliasAlreadyExistsInternalException;
 import com.imcode.imcms.mapping.CategoryMapper;
 import com.imcode.imcms.mapping.DocumentMapper;
-import com.imcode.imcms.mapping.AliasAlreadyExistsInternalException;
 import com.imcode.imcms.mapping.DocumentSaveException;
-import imcode.server.document.*;
-import imcode.server.document.index.DocumentQuery;
+import imcode.server.document.CategoryDomainObject;
+import imcode.server.document.CategoryTypeDomainObject;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.DocumentTypeDomainObject;
+import imcode.server.document.DocumentVisitor;
+import imcode.server.document.FileDocumentDomainObject;
+import imcode.server.document.MaxCategoryDomainObjectsOfTypeExceededException;
+import imcode.server.document.SectionDomainObject;
+import imcode.server.document.UrlDocumentDomainObject;
+import imcode.server.document.XmlDocumentBuilder;
+import imcode.server.document.index.DocumentIndex;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 
-import java.util.List;
 import java.util.AbstractList;
+import java.util.List;
+import java.util.function.Predicate;
 
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-
+/**
+ * In charge of document, category type and category operations such as creation, saving, deletion and look up.
+ * As well as representation of imcms document in as xml document.
+ */
+@SuppressWarnings({"unused", "JavaDoc"})
 public class DocumentService {
 
     private final ContentManagementSystem contentManagementSystem;
 
+    /**
+     * Returns DocumentService with the given cms
+     *
+     * @param contentManagementSystem cms used by DocumentService
+     */
     public DocumentService(ContentManagementSystem contentManagementSystem) {
         this.contentManagementSystem = contentManagementSystem;
     }
@@ -26,7 +43,7 @@ public DocumentService(ContentManagementSystem contentManagementSystem) {
     static Document wrapDocumentDomainObject(DocumentDomainObject document,
                                              ContentManagementSystem contentManagementSystem) {
         if (null == document) {
-            return null ;
+            return null;
         }
         ApiWrappingDocumentVisitor apiWrappingDocumentVisitor = new ApiWrappingDocumentVisitor(contentManagementSystem);
         document.accept(apiWrappingDocumentVisitor);
@@ -38,17 +55,14 @@ static Document wrapDocumentDomainObject(DocumentDomainObject document,
      * instead.
      *
      * @param documentIdString The unique id or name of the document requested, can be either the int value also known as "meta_id"
-     * or the document name also known as "alias".
+     *                         or the document name also known as "alias".
      * @return The document The type is usually a subclass to document, if there exist one.
-     * @throws NoPermissionException If the current user dosen't have the rights to read this document.
+     * @throws NoPermissionException If the current user doesn't have the rights to read this document.
      */
     public Document getDocument(String documentIdString) throws NoPermissionException {
         DocumentDomainObject doc = getDocumentMapper().getDocument(documentIdString);
-        Document result = null;
-        if ( null != doc ) {
-            result = wrapDocumentDomainObject(doc, contentManagementSystem);
-        }
-        return result;
+
+        return (null == doc) ? null : wrapDocumentDomainObject(doc, contentManagementSystem);
     }
 
     /**
@@ -57,137 +71,221 @@ public Document getDocument(String documentIdString) throws NoPermissionExceptio
      *
      * @param documentId The id number of the document requested, also sometimes known as "meta_id"
      * @return The document The type is usually a subclass to document, if there exist one.
-     * @throws NoPermissionException If the current user dosen't have the rights to read this document.
+     * @throws NoPermissionException If the current user doesn't have the rights to read this document.
      */
     public Document getDocument(int documentId) throws NoPermissionException {
-        return getDocument(""+documentId);
+        return getDocument("" + documentId);
     }
 
     /**
+     * Returns TextDocument with given meta_id or alias.
+     *
      * @param documentIdString The unique id or name of the document requested, can be either the int value alsp known as "meta_id"
-     * or the document name also known as "alias".
-     * @return The document
-     * @throws NoPermissionException If the current user dosen't have the rights to read this document.
+     *                         or the document name also known as "alias".
+     * @return The document with given id or null if such doesn't exist.
+     * @throws NoPermissionException If the current user doesn't have the rights to read this document.
      */
     public TextDocument getTextDocument(String documentIdString) throws NoPermissionException {
         return (TextDocument) getDocument(documentIdString);
     }
 
     /**
+     * Returns TextDocument with given id.
+     *
      * @param documentId The id number of the document requested, also known as "meta_id"
-     * @return The document
-     * @throws NoPermissionException If the current user dosen't have the rights to read this document.
+     * @return The document with given id or null if such doesn't exist.
+     * @throws NoPermissionException If the current user doesn't have the rights to read this document.
      */
     public TextDocument getTextDocument(int documentId) throws NoPermissionException {
-        return (TextDocument) getDocument(""+documentId);
+        return getTextDocument(String.valueOf(documentId));
     }
 
     /**
+     * Returns UrlDocument with given meta_id or alias.
+     *
      * @param documentIdString The unique id or name of the document requested, can be either the int value also known as "meta_id"
-     * or the document name also known as "alias".
-     * @return The document
-     * @throws NoPermissionException If the current user dosen't have the rights to read this document.
+     *                         or the document name also known as "alias".
+     * @return The document with given id or null if such doesn't exist.
+     * @throws NoPermissionException If the current user doesn't have the rights to read this document.
      */
     public UrlDocument getUrlDocument(String documentIdString) throws NoPermissionException {
         return (UrlDocument) getDocument(documentIdString);
     }
 
     /**
+     * Returns UrlDocument with given meta_id.
+     *
      * @param documentId The id number of the document requested, also known as "meta_id"
-     * @return The document
-     * @throws NoPermissionException If the current user dosen't have the rights to read this document.
+     * @return The document with given id or null if such doesn't exist.
+     * @throws NoPermissionException If the current user doesn't have the rights to read this document.
      */
     public UrlDocument getUrlDocument(int documentId) throws NoPermissionException {
-        return (UrlDocument) getDocument(documentId);
+        return getUrlDocument(String.valueOf(documentId));
     }
 
+    /**
+     * Creates new TextDocument with given document acting as parent
+     *
+     * @param parent document to be used as a parent for the new document
+     * @return new TextDocument
+     * @throws NoPermissionException
+     */
     public TextDocument createNewTextDocument(Document parent) throws NoPermissionException {
         return (TextDocument) createNewDocument(DocumentTypeDomainObject.TEXT_ID, parent);
     }
 
+    /**
+     * Creates new UrlDocument with given document acting as parent
+     *
+     * @param parent document to be used as a parent for the new document
+     * @return new UrlDocument
+     * @throws NoPermissionException
+     */
     public UrlDocument createNewUrlDocument(Document parent) throws NoPermissionException {
         return (UrlDocument) createNewDocument(DocumentTypeDomainObject.URL_ID, parent);
     }
 
+    /**
+     * Creates new FileDocument with given document acting as parent
+     *
+     * @param parent document to be used as a parent for the new document
+     * @return new FileDocument
+     * @throws NoPermissionException
+     */
     public FileDocument createNewFileDocument(Document parent) throws NoPermissionException {
         return (FileDocument) createNewDocument(DocumentTypeDomainObject.FILE_ID, parent);
     }
 
+    /**
+     * Creates new document with given parent and of specified document type(text, url or file document)
+     *
+     * @param doctype document type i.e DocumentTypeDomainObject.TEXT_ID, DocumentTypeDomainObject.URL_ID, DocumentTypeDomainObject.FILE_ID
+     * @param parent  document to serve as new document's parent
+     * @return new document
+     * @throws NoPermissionException if current user can't create new documents
+     */
     private Document createNewDocument(int doctype, Document parent) throws NoPermissionException {
-        return wrapDocumentDomainObject(getDocumentMapper().createDocumentOfTypeFromParent(doctype, parent.getInternal(), contentManagementSystem.getCurrentUser().getInternal()), contentManagementSystem);
+
+        final DocumentDomainObject docFromParent = getDocumentMapper().createDocumentOfTypeFromParent(
+                doctype, parent.getInternal(), getInternalUser()
+        );
+
+        return wrapDocumentDomainObject(docFromParent, contentManagementSystem);
     }
 
-    /** Saves the changes to a modified document. Note that this method is synchronized. */
+    /**
+     * Saves the changes to a modified document. Note that this method is synchronized.
+     *
+     * @param document Document to save
+     * @throws SaveException if the given document's alias already belongs to some other existing document. Or if the
+     *                       document was assigned more categories of type that that type's maximum category choice number allows.
+     * @see imcode.server.document.CategoryTypeDomainObject#getMaxChoices()
+     */
     public synchronized void saveChanges(Document document) throws NoPermissionException, SaveException {
         try {
-            if ( 0 == document.getId() ) {
-                getDocumentMapper().saveNewDocument(document.getInternal(), contentManagementSystem.getCurrentUser().getInternal(), false);
+            final DocumentDomainObject internalDoc = document.getInternal();
+            final UserDomainObject internalUser = getInternalUser();
+            final DocumentMapper documentMapper = getDocumentMapper();
+
+            if (0 == document.getId()) {
+                documentMapper.saveNewDocument(internalDoc, internalUser, false);
             } else {
-                getDocumentMapper().saveDocument(document.getInternal(), contentManagementSystem.getCurrentUser().getInternal());
+                documentMapper.saveDocument(internalDoc, internalUser);
             }
-        } catch ( MaxCategoryDomainObjectsOfTypeExceededException e ) {
+        } catch (MaxCategoryDomainObjectsOfTypeExceededException e) {
             throw new MaxCategoriesOfTypeExceededException(e);
         } catch (AliasAlreadyExistsInternalException e) {
             throw new AliasAlreadyExistsException(e);
         } catch (DocumentSaveException e) {
-            throw new SaveException(e) ;
+            throw new SaveException(e);
         }
     }
 
+    /**
+     * Returns a category of given category type and name
+     *
+     * @param categoryType category type to look for in
+     * @param categoryName category name to look category for by
+     * @return category, or null if given category type doesn't have category with given name
+     */
     public Category getCategory(CategoryType categoryType, String categoryName) {
-        final CategoryDomainObject category = getCategoryMapper().getCategoryByTypeAndName(categoryType.getInternal(), categoryName);
-        if ( null != category ) {
-            return new Category(category);
-        } else {
-            return null;
-        }
+
+        final CategoryDomainObject category = getCategoryMapper().getCategoryByTypeAndName(
+                categoryType.getInternal(), categoryName
+        );
+
+        return (null != category) ? new Category(category) : null;
     }
 
     private CategoryMapper getCategoryMapper() {
         return contentManagementSystem.getInternal().getCategoryMapper();
     }
 
+    /**
+     * Returns category with given id
+     *
+     * @param categoryId category id
+     * @return category or null if none exist by given id
+     */
     public Category getCategory(int categoryId) {
         final CategoryDomainObject category = getCategoryMapper().getCategoryById(categoryId);
-        if ( null != category ) {
-            return new Category(category);
-        } else {
-            return null;
-        }
+        return (null != category) ? new Category(category) : null;
     }
 
+    /**
+     * Returns category type with given id
+     *
+     * @param categoryTypeId category type id
+     * @return category type or null if none exist by given id
+     */
     public CategoryType getCategoryType(int categoryTypeId) {
         final CategoryTypeDomainObject categoryType = getCategoryMapper().getCategoryTypeById(categoryTypeId);
         return returnCategoryTypeAPIObjectOrNull(categoryType);
     }
 
+    /**
+     * Returns category type with given name
+     *
+     * @param categoryTypeName category type name
+     * @return category type or null if none exist by given name
+     */
     public CategoryType getCategoryType(String categoryTypeName) {
         final CategoryTypeDomainObject categoryType = getCategoryMapper().getCategoryTypeByName(categoryTypeName);
         return returnCategoryTypeAPIObjectOrNull(categoryType);
     }
 
     private CategoryType returnCategoryTypeAPIObjectOrNull(final CategoryTypeDomainObject categoryType) {
-        if ( null != categoryType ) {
-            return new CategoryType(categoryType);
-        }
-        return null;
+        return (null != categoryType) ? new CategoryType(categoryType) : null;
     }
 
+    /**
+     * Returns all categories of given category type
+     *
+     * @param categoryType category type whose categories to return
+     * @return an array of categories belonging to given category type
+     */
     public Category[] getAllCategoriesOfType(CategoryType categoryType) {
         // Allow everyone to get a CategoryType. No security check.
         CategoryDomainObject[] categoryDomainObjects = getCategoryMapper().getAllCategoriesOfType(categoryType.getInternal());
         Category[] categories = new Category[categoryDomainObjects.length];
-        for ( int i = 0; i < categoryDomainObjects.length; i++ ) {
+
+        for (int i = 0; i < categoryDomainObjects.length; i++) {
             CategoryDomainObject categoryDomainObject = categoryDomainObjects[i];
             categories[i] = new Category(categoryDomainObject);
         }
         return categories;
     }
 
+    /**
+     * Returns all category types.
+     *
+     * @return an array of category types in the cms
+     */
     public CategoryType[] getAllCategoryTypes() {
         CategoryTypeDomainObject[] categoryTypeDomainObjects = getCategoryMapper().getAllCategoryTypes();
         CategoryType[] categoryTypes = new CategoryType[categoryTypeDomainObjects.length];
-        for ( int i = 0; i < categoryTypeDomainObjects.length; i++ ) {
+
+        for (int i = 0; i < categoryTypeDomainObjects.length; i++) {
             CategoryTypeDomainObject categoryTypeDomainObject = categoryTypeDomainObjects[i];
             categoryTypes[i] = new CategoryType(categoryTypeDomainObject);
         }
@@ -195,17 +293,18 @@ public CategoryType[] getAllCategoryTypes() {
     }
 
     /**
-     * @param name
-     * @param maxChoices
-     * @return The newly craeated category type.
-     * @throws NoPermissionException
-     * @throws CategoryTypeAlreadyExistsException
+     * Creates new category type with given name and maximum number of categories a document is allowed to have(of this category type)
      *
+     * @param name       name of the new category type
+     * @param maxChoices maximum number of category choice of this category type
+     * @return The newly created category type.
+     * @throws NoPermissionException
+     * @throws CategoryTypeAlreadyExistsException if there's already a category type with given name
      */
     public CategoryType createNewCategoryType(String name,
                                               int maxChoices) throws NoPermissionException, CategoryTypeAlreadyExistsException {
-        if ( getCategoryMapper().isUniqueCategoryTypeName(name) ) {
-            CategoryTypeDomainObject newCategoryTypeDO = new CategoryTypeDomainObject(0, name, maxChoices, false);
+        if (getCategoryMapper().isUniqueCategoryTypeName(name)) {
+            CategoryTypeDomainObject newCategoryTypeDO = new CategoryTypeDomainObject(0, name, maxChoices, false, false);
             newCategoryTypeDO = getCategoryMapper().addCategoryTypeToDb(newCategoryTypeDO);
             return new CategoryType(newCategoryTypeDO);
         } else {
@@ -213,70 +312,183 @@ public CategoryType createNewCategoryType(String name,
         }
     }
 
+    /**
+     * Returns a section with given id
+     *
+     * @param sectionId id of a section
+     * @return a section with give id or null if none found
+     */
     public Section getSection(int sectionId) {
-        SectionDomainObject section = getDocumentMapper().getSectionById(sectionId);
-        if ( null == section ) {
-            return null;
-        }
-        return new Section(section);
+        final SectionDomainObject section = getDocumentMapper().getSectionById(sectionId);
+        return (null == section) ? null : new Section(section);
     }
 
-    /** @since 2.0 */
+    /**
+     * Returns a section with given name
+     *
+     * @param name name of a section
+     * @return a section with give name or null if none found
+     * @since 2.0
+     */
     public Section getSection(String name) {
-        SectionDomainObject section = getDocumentMapper().getSectionByName(name);
-        if ( null == section ) {
-            return null;
-        }
-        return new Section(section);
+        final SectionDomainObject section = getDocumentMapper().getSectionByName(name);
+        return (null == section) ? null : new Section(section);
     }
 
-    public List getDocuments(final SearchQuery query) throws SearchException {
+    /**
+     * Searches for documents using given query, takes into account current cms user
+     *
+     * @param query search query to look for documents with
+     * @return a list of documents found
+     * @throws SearchException
+     * @see com.imcode.imcms.api.LuceneParsedQuery
+     */
+    public List<Document> getDocuments(final SearchQuery query) throws SearchException {
         try {
-            final List documentList = getDocumentMapper().getDocumentIndex().search(new DocumentQuery() {
-                public Query getQuery() {
-                    return query.getQuery();
-                }
-
-                public Sort getSort() {
-                    return query.getSort();
-                }
-
-                public boolean isLogged() {
-                    return query.isLogged();
-                }
-            }, contentManagementSystem.getCurrentUser().getInternal());
+            final List<DocumentDomainObject> documentList = getDocumentMapper()
+                    .getDocumentIndex()
+                    .search(query, getInternalUser());
+
             return new ApiDocumentWrappingList(documentList, contentManagementSystem);
-        } catch ( RuntimeException e ) {
+
+        } catch (RuntimeException e) {
             throw new SearchException(e);
         }
     }
 
+    private UserDomainObject getInternalUser() {
+        return contentManagementSystem.getCurrentUser().getInternal();
+    }
+
+    public SearchResult<Document> getDocuments(final SearchQuery query, int startPosition, int maxResults) throws SearchException {
+        return getDocuments(query, startPosition, maxResults, null);
+    }
+
+    public SearchResult<Document> getDocuments(final SearchQuery query,
+                                               int startPosition,
+                                               int maxResults,
+                                               Predicate<Document> filterPredicate) throws SearchException {
+        try {
+            final DocumentIndex documentIndex = getDocumentMapper().getDocumentIndex();
+            final SearchResult<DocumentDomainObject> searchResult;
+
+            if (filterPredicate == null) {
+                searchResult = documentIndex.search(query, getInternalUser(), startPosition, maxResults);
+
+            } else {
+                searchResult = documentIndex.search(
+                        query, getInternalUser(), startPosition, maxResults, new ApiDocumentWrappingPredicate(
+                                filterPredicate, contentManagementSystem
+                        )
+                );
+            }
+
+            return searchResult.mapResult(document -> wrapDocumentDomainObject(document, contentManagementSystem));
+
+        } catch (RuntimeException e) {
+            throw new SearchException(e);
+        }
+    }
+
+    /**
+     * Searches for documents using given query, takes into account current cms user
+     *
+     * @param query search query to look for documents with
+     * @return an array of documents found
+     * @throws SearchException
+     * @see com.imcode.imcms.api.LuceneParsedQuery
+     */
     public Document[] search(SearchQuery query) throws SearchException {
-        List documents = getDocuments(query) ;
-        return (Document[]) documents.toArray(new Document[documents.size()]);
+        return getDocuments(query).toArray(new Document[0]);
     }
 
     private DocumentMapper getDocumentMapper() {
         return contentManagementSystem.getInternal().getDocumentMapper();
     }
 
+    /**
+     * Creates a search query
+     *
+     * @param query a string representing document search query
+     * @return search query
+     * @throws BadQueryException if something is wrong with the query, like syntax error
+     */
     public SearchQuery parseLuceneSearchQuery(String query) throws BadQueryException {
         return new LuceneParsedQuery(query);
     }
 
+    /**
+     * Returns xml representation of the given document
+     *
+     * @param document a document to get xml representation of
+     * @return org.w3c.dom.Document of given document
+     */
     public org.w3c.dom.Document getXmlDomForDocument(Document document) {
-        XmlDocumentBuilder xmlDocumentBuilder = new XmlDocumentBuilder(contentManagementSystem.getCurrentUser().getInternal());
+        XmlDocumentBuilder xmlDocumentBuilder = new XmlDocumentBuilder(getInternalUser());
         xmlDocumentBuilder.addDocument(document.getInternal());
         return xmlDocumentBuilder.getXmlDocument();
     }
 
+    /**
+     * Saves given category
+     *
+     * @param category category to save, be it a new one or an existing category
+     * @throws NoPermissionException
+     * @throws CategoryAlreadyExistsException if the given category is new and it's category type already contains a category with the same name
+     */
     public void saveCategory(Category category) throws NoPermissionException, CategoryAlreadyExistsException {
         getCategoryMapper().saveCategory(category.getInternal());
     }
 
+    /**
+     * Deletes document from cms
+     *
+     * @param document document to delete
+     * @throws NoPermissionException
+     */
     public void deleteDocument(Document document) throws NoPermissionException {
-        UserDomainObject internalUser = contentManagementSystem.getCurrentUser().getInternal();
-        getDocumentMapper().deleteDocument(document.getInternal(), internalUser);
+        getDocumentMapper().deleteDocument(document.getInternal(), getInternalUser());
+    }
+
+    /**
+     * Removes all image cache entries.
+     */
+    public void clearImageCache() {
+        getDocumentMapper().clearImageCache();
+    }
+
+    /**
+     * Removes all image cache entries that have been created for a document that is identified
+     * with {@code metaId}.
+     * <p/>
+     * If a document contains 3 image fields (1, 2, 3), then the cache entries for these 3 images will be removed.
+     *
+     * @param metaId the ID of a text document
+     */
+    public void clearImageCache(int metaId) {
+        getDocumentMapper().clearImageCache(metaId);
+    }
+
+    /**
+     * Removes a specific image cache entry that is identified with a document ID ({@code metaId}) and an image field
+     * number ({@code no}).
+     *
+     * @param metaId the ID of a text document
+     * @param no     the ID of an image field
+     */
+    public void clearImageCache(int metaId, int no) {
+        getDocumentMapper().clearImageCache(metaId, no);
+    }
+
+    /**
+     * Removes a specific image cache entry that is identified with a document ID ({@code metaId}) and a
+     * {@link FileDocument} file ID ({@code fileNo}).
+     *
+     * @param metaId the ID of a text document
+     * @param fileNo the file ID of a {@link FileDocument}
+     */
+    public void clearImageCache(int metaId, String fileNo) {
+        getDocumentMapper().clearImageCache(metaId, fileNo);
     }
 
     static class ApiWrappingDocumentVisitor extends DocumentVisitor {
@@ -309,18 +521,34 @@ public Document getDocument() {
         }
     }
 
-    static class ApiDocumentWrappingList extends AbstractList {
+    private static class ApiDocumentWrappingPredicate implements Predicate<DocumentDomainObject> {
+
+        private final Predicate<Document> predicate;
+        private final ContentManagementSystem contentManagementSystem;
+
+        ApiDocumentWrappingPredicate(Predicate<Document> predicate, ContentManagementSystem contentManagementSystem) {
+            this.predicate = predicate;
+            this.contentManagementSystem = contentManagementSystem;
+        }
+
+        @Override
+        public boolean test(DocumentDomainObject document) {
+            return predicate.test(wrapDocumentDomainObject(document, contentManagementSystem));
+        }
+    }
+
+    static class ApiDocumentWrappingList extends AbstractList<Document> {
 
-        private final List documentList;
+        private final List<DocumentDomainObject> documentList;
         private ContentManagementSystem contentManagementSystem;
 
-        ApiDocumentWrappingList(List documentList, ContentManagementSystem contentManagementSystem) {
+        ApiDocumentWrappingList(List<DocumentDomainObject> documentList, ContentManagementSystem contentManagementSystem) {
             this.documentList = documentList;
             this.contentManagementSystem = contentManagementSystem;
         }
 
-        public Object get(int index) {
-            DocumentDomainObject document = (DocumentDomainObject) documentList.get(index);
+        public Document get(int index) {
+            DocumentDomainObject document = documentList.get(index);
             return wrapDocumentDomainObject(document, contentManagementSystem);
         }
 
@@ -328,12 +556,12 @@ public int size() {
             return documentList.size();
         }
 
-        public Object remove(int index) {
-            return wrapDocumentDomainObject((DocumentDomainObject) documentList.remove(index), contentManagementSystem) ;
+        public Document remove(int index) {
+            return wrapDocumentDomainObject(documentList.remove(index), contentManagementSystem);
         }
 
-        public Object set(int index, Object element) {
-            return wrapDocumentDomainObject((DocumentDomainObject) documentList.set(index, ((Document)element).getInternal()), contentManagementSystem) ;
+        public Document set(int index, Document element) {
+            return wrapDocumentDomainObject(documentList.set(index, element.getInternal()), contentManagementSystem);
         }
     }
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/ExternalUserService.java b/server/src/com/imcode/imcms/api/ExternalUserService.java
new file mode 100644
index 0000000000..51e53e142f
--- /dev/null
+++ b/server/src/com/imcode/imcms/api/ExternalUserService.java
@@ -0,0 +1,8 @@
+package com.imcode.imcms.api;
+
+import com.imcode.imcms.model.ExternalUser;
+
+public interface ExternalUserService {
+
+    ExternalUser saveExternalUser(ExternalUser user) throws SaveException;
+}
diff --git a/server/src/com/imcode/imcms/api/FileDocument.java b/server/src/com/imcode/imcms/api/FileDocument.java
index 9a7074227b..ca4557f029 100644
--- a/server/src/com/imcode/imcms/api/FileDocument.java
+++ b/server/src/com/imcode/imcms/api/FileDocument.java
@@ -14,94 +14,192 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * Document holding a file or files.
+ */
 public class FileDocument extends Document {
 
-    public final static int TYPE_ID = DocumentTypeDomainObject.FILE_ID ;
+    /**
+     * FileDocument TYPE_ID
+     */
+    public final static int TYPE_ID = DocumentTypeDomainObject.FILE_ID;
 
-    FileDocument( FileDocumentDomainObject document, ContentManagementSystem contentManagementSystem ) {
-        super( document, contentManagementSystem );
+    FileDocument(FileDocumentDomainObject document, ContentManagementSystem contentManagementSystem) {
+        super(document, contentManagementSystem);
     }
 
     private FileDocumentDomainObject getInternalFileDocument() {
-        return (FileDocumentDomainObject)getInternal() ;
+        return (FileDocumentDomainObject) getInternal();
     }
 
-    public FileDocumentFile getFile( String fileId ) {
-        return new FileDocumentFile(getInternalFileDocument().getFile( fileId ));
+    /**
+     * Returns a {@link FileDocumentFile} with the given id
+     *
+     * @param fileId id of a {@link FileDocument} file.
+     * @return FileDocumentFile with the given id
+     */
+    public FileDocumentFile getFile(String fileId) {
+        return new FileDocumentFile(getInternalFileDocument().getFile(fileId));
     }
 
-    public FileDocumentFile removeFile( String fileId ) {
-        return new FileDocumentFile( getInternalFileDocument().removeFile( fileId ) );
+    /**
+     * Removes a {@link FileDocumentFile} with the given id.
+     * If the returned filedocument file was the default one, sets the next filedocument file in case insensitive order
+     * as the default one or null if no filedocument files left.
+     *
+     * @param fileId {@link FileDocumentFile} id to remove.
+     * @return the removed {@link FileDocumentFile}
+     */
+    public FileDocumentFile removeFile(String fileId) {
+        return new FileDocumentFile(getInternalFileDocument().removeFile(fileId));
     }
 
+    /**
+     * Returns all filedocument files in this file filedocument.
+     *
+     * @return not null, an array of {@link FileDocumentFile}
+     */
     public FileDocumentFile[] getFiles() {
         Map filesMap = getInternalFileDocument().getFiles();
         List files = TransformedList.decorate(new ArrayList(filesMap.size()), new Transformer() {
-            public Object transform( Object input ) {
-                return new FileDocumentFile( (FileDocumentDomainObject.FileDocumentFile)input ) ;
+            public Object transform(Object input) {
+                return new FileDocumentFile((FileDocumentDomainObject.FileDocumentFile) input);
             }
-        }) ;
-        files.addAll( filesMap.values() ) ;
-        return (FileDocumentFile[])files.toArray( new FileDocumentFile[files.size()] );
+        });
+        files.addAll(filesMap.values());
+        return (FileDocumentFile[]) files.toArray(new FileDocumentFile[files.size()]);
     }
 
-    public FileDocumentFile getFileOrDefault( String fileId ) {
-        return new FileDocumentFile( getInternalFileDocument().getFileOrDefault( fileId ) );
+    /**
+     * Returns FileDocumentFile with given id. The default FileDocumentFile is returned if the id is null or there is
+     * no FileDocumentFile with such id.
+     *
+     * @param fileId id of FileDocumentFile
+     * @return FileDocumentFile with given id or null if fileId is null or none found with given id.
+     */
+    public FileDocumentFile getFileOrDefault(String fileId) {
+        return new FileDocumentFile(getInternalFileDocument().getFileOrDefault(fileId));
     }
 
+    /**
+     * Returns the default file id
+     *
+     * @return default file id or null if there's no default file
+     */
     public String getDefaultFileId() {
         return getInternalFileDocument().getDefaultFileId();
     }
 
+    /**
+     * Returns the default {@link FileDocumentFile} of this {@link FileDocument}
+     *
+     * @return the default {@link FileDocumentFile} or null if there's no default file
+     */
     public FileDocumentFile getDefaultFile() {
-        return new FileDocumentFile( getInternalFileDocument().getDefaultFile() );
+        return new FileDocumentFile(getInternalFileDocument().getDefaultFile());
     }
 
-    public void addFile( String fileId, FileDocumentFile file) {
-        getInternalFileDocument().addFile( fileId, file.getInternal() );
+    /**
+     * Adds a file to the file document
+     * The added file becomes the default one if there's no default file.
+     *
+     * @param fileId id of the file to be added, not null
+     * @param file   file to add
+     */
+    public void addFile(String fileId, FileDocumentFile file) {
+        getInternalFileDocument().addFile(fileId, file.getInternal());
     }
 
+    /**
+     * Class representing a file contained in a {@link FileDocument}
+     */
     public static class FileDocumentFile implements DataSource {
 
-        private FileDocumentDataSource dataSource ;
+        private FileDocumentDataSource dataSource;
 
-        public FileDocumentFile( DataSource dataSource ) {
+        /**
+         * Constructs FileDocumentFile from the given {@link javax.activation.DataSource}
+         *
+         * @param dataSource data source of a file for this FileDocumentFile
+         */
+        public FileDocumentFile(DataSource dataSource) {
             FileDocumentDomainObject.FileDocumentFile file = new FileDocumentDomainObject.FileDocumentFile();
-            file.setFilename( dataSource.getName() );
-            file.setMimeType( dataSource.getContentType() );
-            file.setInputStreamSource( new DataSourceInputStreamSource( dataSource ));
-            this.dataSource = new FileDocumentDataSource( file ) ;
-        }
-
-        public FileDocumentFile( FileDocumentDomainObject.FileDocumentFile file ) {
-            dataSource = new FileDocumentDataSource( file ) ;
-        }
-
+            file.setFilename(dataSource.getName());
+            file.setMimeType(dataSource.getContentType());
+            file.setInputStreamSource(new DataSourceInputStreamSource(dataSource));
+            this.dataSource = new FileDocumentDataSource(file);
+        }
+
+        /**
+         * Constructs FileDocumentFile from another FileDocumentFile
+         *
+         * @param file FileDocumentFile
+         */
+        public FileDocumentFile(FileDocumentDomainObject.FileDocumentFile file) {
+            dataSource = new FileDocumentDataSource(file);
+        }
+
+        /**
+         * Returns internally used FileDocumentFile
+         *
+         * @return internally used FileDocumentFile
+         */
         public FileDocumentDomainObject.FileDocumentFile getInternal() {
-            return dataSource.getFile() ;
+            return dataSource.getFile();
         }
 
+        /**
+         * Returns the content type of this FileDocumentFile
+         *
+         * @return a String representing content type
+         */
         public String getContentType() {
             return dataSource.getContentType();
         }
 
+        /**
+         * Returns {@link java.io.InputStream} of this FileDocumentFile
+         *
+         * @return {@link java.io.InputStream} of this FileDocumentFile
+         * @throws IOException
+         */
         public InputStream getInputStream() throws IOException {
             return dataSource.getInputStream();
         }
 
+        /**
+         * Returns the name of this FileDocumentFile's data source
+         *
+         * @return a String with the name of this FileDocumentFile's data source
+         */
         public String getName() {
             return dataSource.getName();
         }
 
-        /** @throws UnsupportedOperationException */
+        /**
+         * Not supported.
+         *
+         * @throws UnsupportedOperationException to signal that this is not supported
+         */
         public OutputStream getOutputStream() throws IOException {
-            throw new UnsupportedOperationException() ;
+            throw new UnsupportedOperationException();
         }
 
+        /**
+         * Returns the size of underlying data source's file input stream
+         *
+         * @return input stream's size in long
+         * @throws IOException
+         */
         public long getSize() throws IOException {
-            return dataSource.getFile().getInputStreamSource().getSize() ;
+            return dataSource.getFile().getInputStreamSource().getSize();
         }
 
+        /**
+         * Returns the id of underlying data source file
+         *
+         * @return a String representing underlying data source file's id
+         */
         public String getId() {
             return dataSource.getFile().getId();
         }
@@ -112,7 +210,7 @@ private static class FileDocumentDataSource implements DataSource {
 
         private FileDocumentDomainObject.FileDocumentFile file;
 
-        private FileDocumentDataSource( FileDocumentDomainObject.FileDocumentFile file ) {
+        private FileDocumentDataSource(FileDocumentDomainObject.FileDocumentFile file) {
             this.file = file;
         }
 
@@ -141,7 +239,7 @@ private static class DataSourceInputStreamSource implements InputStreamSource {
 
         private final DataSource dataSource;
 
-        private DataSourceInputStreamSource( DataSource dataSource ) {
+        private DataSourceInputStreamSource(DataSource dataSource) {
             this.dataSource = dataSource;
         }
 
diff --git a/server/src/com/imcode/imcms/api/Image.java b/server/src/com/imcode/imcms/api/Image.java
index 4ba647596d..b76f79342b 100644
--- a/server/src/com/imcode/imcms/api/Image.java
+++ b/server/src/com/imcode/imcms/api/Image.java
@@ -3,123 +3,284 @@
 import imcode.server.document.textdocument.ImageDomainObject;
 import imcode.server.document.textdocument.ImageSource;
 import imcode.util.ImcmsImageUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Properties;
 
+/**
+ * A representation of an image in imcms. Provides methods of presentation as html <img/> tag along with a multitude of
+ * attributes.
+ */
 public class Image {
 
     private ImageDomainObject internalImage;
+    private Integer metaId;
 
-    Image(ImageDomainObject internalImage) {
+    Image(ImageDomainObject internalImage, Integer metaId) {
         this.internalImage = internalImage;
+        this.metaId = metaId;
     }
 
+    /**
+     * Constructs an empty image.
+     */
     public Image() {
-        this( new ImageDomainObject() );
+        this(new ImageDomainObject(), null);
     }
 
+    /**
+     * Returns the ID of a document that this image is part of.
+     *
+     * @return ID of a document
+     */
+    public Integer getMetaId() {
+        return metaId;
+    }
+
+    /**
+     * Sets the ID of a document that this image is part of.
+     *
+     * @param metaId ID of a document
+     */
+    public void setMetaId(Integer metaId) {
+        this.metaId = metaId;
+    }
+
+    /**
+     * Returns the name of this image
+     *
+     * @return a String with image's name
+     */
     public String getName() {    // html imagetag name
         return internalImage.getName();
     }
 
-    public void setName( String name ) {    // html imagetag name
-        internalImage.setName( name );
+    /**
+     * Sets this image's name.
+     *
+     * @param name new name
+     */
+    public void setName(String name) {    // html imagetag name
+        internalImage.setName(name);
     }
 
+    /**
+     * Returns this image's src url relative to context path.
+     * For a full url 'http://localhost:9090/images/imCMSpower.gif', the returned string would contain '/images/imCMSpower.gif'
+     *
+     * @return this image's src url relative to context path.
+     */
     public String getSrcRelativeToContextPath() { // image srcurl,  relative imageurl
         return internalImage.getUrlPathRelativeToContextPath();
     }
 
+    /**
+     * Returns the url of the low resolution version of this image if there's one.
+     *
+     * @return src url of the low resolution version of this image or an empty string.
+     */
     public String getLowSrc() {
         return internalImage.getLowResolutionUrl();
     }
 
-    public void setLowSrc( String low_src ) {
-        internalImage.setLowResolutionUrl( low_src );
+    /**
+     * Sets the url of the low resolution version of this image.
+     *
+     * @param low_src low resolution url.
+     */
+    public void setLowSrc(String low_src) {
+        internalImage.setLowResolutionUrl(low_src);
     }
 
+    /**
+     * Returns width attribute of this image.
+     *
+     * @return image width
+     */
     public int getWidth() {
         return internalImage.getDisplayImageSize().getWidth();
     }
 
-    public void setWidth( int width ) {
-        internalImage.setWidth( width );
+    /**
+     * Sets this image's width attribute
+     * The underlying image is not modified, this is just one of <img/> attributes.
+     *
+     * @param width new image width
+     */
+    public void setWidth(int width) {
+        internalImage.setWidth(width);
     }
 
+    /**
+     * Returns height attribute of this image.
+     *
+     * @return image height
+     */
     public int getHeight() {
         return internalImage.getDisplayImageSize().getHeight();
     }
 
-    public void setHeight( int height ) {
-        internalImage.setHeight( height );
+    /**
+     * Sets this image's height attribute.
+     *
+     * @param height new image height
+     */
+    public void setHeight(int height) {
+        internalImage.setHeight(height);
     }
 
+    /**
+     * Returns border width attribute of this image.
+     *
+     * @return border width in pixels
+     */
     public int getBorder() {
         return internalImage.getBorder();
     }
 
-    public void setBorder( int border ) {
-        internalImage.setBorder( border );
+    /**
+     * Sets this image's border width attribute.
+     *
+     * @param border border width in pixels
+     */
+    public void setBorder(int border) {
+        internalImage.setBorder(border);
     }
 
+    /**
+     * Returns this image's 'align' attribute.
+     *
+     * @return 'align' attribute
+     */
     public String getAlign() {
         return internalImage.getAlign();
     }
 
-    public void setAlign( String align ) {
-        internalImage.setAlign( align );
+    /**
+     * Sets this image's 'align' attribute.
+     *
+     * @param align new value for 'align' attribute
+     */
+    public void setAlign(String align) {
+        internalImage.setAlign(align);
     }
 
+    /**
+     * Returns alt text of this image
+     *
+     * @return alt text
+     */
     public String getAltText() {
         return internalImage.getAlternateText();
     }
 
-    public void setAltText( String alt_text ) {
-        internalImage.setAlternateText( alt_text );
+    /**
+     * Sets alt text of this image
+     *
+     * @param alt_text new alt text string
+     */
+    public void setAltText(String alt_text) {
+        internalImage.setAlternateText(alt_text);
     }
 
+    /**
+     * Returns 'vspace' attribute
+     *
+     * @return 'vspace' attribute
+     */
     public int getVspace() {
         return internalImage.getVerticalSpace();
     }
 
-    public void setVspace( int v_space ) {
-        internalImage.setVerticalSpace( v_space );
+    /**
+     * Sets 'vspace' attribute
+     *
+     * @param v_space new 'vspace' attribute
+     */
+    public void setVspace(int v_space) {
+        internalImage.setVerticalSpace(v_space);
     }
 
+    /**
+     * Returns 'hspace' attribute
+     *
+     * @return 'hspace' attribute
+     */
     public int getHspace() {
         return internalImage.getHorizontalSpace();
     }
 
-    public void setHspace( int h_space ) {
-        internalImage.setHorizontalSpace( h_space );
+    /**
+     * Sets 'hspace' attribute
+     *
+     * @param h_space new 'hspace' attribute
+     */
+    public void setHspace(int h_space) {
+        internalImage.setHorizontalSpace(h_space);
     }
 
+    /**
+     * Returns the 'href' attribute of a link surrounding this image's <img/> presentation
+     *
+     * @return 'href' attribute of a link surrounding this image's <img/> presentation or an empty String
+     */
     public String getLinkHref() {
         return internalImage.getLinkUrl();
     }
 
-    public void setLinkHref( String link_href ) {
-        internalImage.setLinkUrl( link_href );
+    /**
+     * Sets the url of the link surrounding(if present) this image.
+     *
+     * @param link_href href attribute for a link.
+     */
+    public void setLinkHref(String link_href) {
+        internalImage.setLinkUrl(link_href);
     }
 
+    /**
+     * Returns the 'target' attribute of a link surrounding(if present) this image.
+     *
+     * @return 'target' attribute
+     */
     public String getLinkTarget() {  // use target_name if target = _other
         return internalImage.getTarget();
     }
 
-    public void setLinkTarget( String target ) {
-        internalImage.setTarget( target );
+    /**
+     * Sets the 'target' attribute of a link surrounding(if present) this image.
+     *
+     * @param target new 'target' attribute value
+     */
+    public void setLinkTarget(String target) {
+        internalImage.setTarget(target);
     }
 
-    public void setSrc( String src ) {   // image srcurl,  relative imageurl
-        ImageSource imageSource = ImcmsImageUtils.createImageSourceFromString( src ) ;
-        internalImage.setSource( imageSource );
+    /**
+     * Attempt to replace this image's datasource, with a new one created from the given src url.
+     * Sets {@link imcode.server.document.textdocument.NullImageSource} if the argument is empty.
+     *
+     * @param src relative imageurl
+     */
+    public void setSrc(String src) {   // image srcurl,  relative imageurl
+        ImageSource imageSource = ImcmsImageUtils.createImageSourceFromString(src);
+        internalImage.setSource(imageSource);
     }
 
+    /**
+     * Tests whether this image's underlying datasource's inputstream size is 0
+     *
+     * @return true if there's an actual image backing this Image object, false otherwise.
+     */
     public boolean isEmpty() {
-        return internalImage.isEmpty() ;
+        return internalImage.isEmpty();
     }
 
+    /**
+     * Returns this image's size in bytes.
+     *
+     * @return image's size in bytes.
+     */
     public long getSize() {
         return internalImage.getSize();
     }
@@ -128,14 +289,46 @@ ImageDomainObject getInternal() {
         return internalImage;
     }
 
+    /**
+     * Returns image src url with given context path.
+     *
+     * @param contextPath context path to append the image url to.
+     * @return a String representing this image's url with provided context path.
+     */
     public String getSrc(String contextPath) { // image srcurl relative webapp ( /imcms/images/theimage.gif )
-        return internalImage.getUrlPath( contextPath ) ;
-    }
-
+        return internalImage.getUrlPath(contextPath);
+    }
+
+    /**
+     * Returns a string representing this image as html <img/> tag
+     *
+     * @param contextPath context path for <img/> tag 'src' attribute's url.
+     * @return a string with html image tag produced from this image
+     */
+    public String toHtmlUrl(String contextPath) {
+        return StringEscapeUtils.escapeHtml(ImcmsImageUtils.getImageUrl(metaId, internalImage, contextPath));
+    }
+
+    /**
+     * Returns a string representing the image as html img tag, adds optional attributes like id, class, usemap and style.
+     *
+     * @param request    a http request
+     * @param attributes Not null, optional attributes such as id, class, usemap and style.
+     * @param absolute   true if the url in img src attribute should be absolute
+     * @return a string representing the image as html img tag
+     */
     public String toHtmlTag(HttpServletRequest request, Properties attributes, boolean absolute) {
-        return ImcmsImageUtils.getImageHtmlTag(internalImage, request, attributes, absolute);
+        return ImcmsImageUtils.getImageHtmlTag(metaId, internalImage, request, attributes, absolute);
     }
 
+    /**
+     * Returns a string representing the image as html img tag, adds optional attributes like id, class, usemap and style.
+     * The src attribute will have relative path
+     *
+     * @param request    a http request
+     * @param attributes Not null, optional attributes such as id, class, usemap and style.
+     * @return a string representing the image as html img tag
+     */
     public String toHtmlTag(HttpServletRequest request, Properties attributes) {
         return toHtmlTag(request, attributes, false);
     }
diff --git a/server/src/com/imcode/imcms/api/Language.java b/server/src/com/imcode/imcms/api/Language.java
index 84089d2e83..8d08107c7d 100644
--- a/server/src/com/imcode/imcms/api/Language.java
+++ b/server/src/com/imcode/imcms/api/Language.java
@@ -3,45 +3,76 @@
 import imcode.server.LanguageMapper;
 
 /**
+ * Represents Language in imcms
+ *
  * @author kreiger
  */
 public class Language {
 
-    private String isoCode639_2 ;
+    private String isoCode639_2;
 
-    private Language( String isoCode639_2 ) {
-        this.isoCode639_2 = isoCode639_2 ;
+    private Language(String isoCode639_2) {
+        this.isoCode639_2 = isoCode639_2;
     }
 
-    public static Language getLanguageByISO639_2( String isoCode639_2 ) {
+    /**
+     * Returns Language by given ISO 639-2 code
+     *
+     * @param isoCode639_2 language code
+     * @return language mapped to the given code or null if the given code is not mapped to any language
+     * @see <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes">List_of_ISO_639-2_codes</a>
+     */
+    public static Language getLanguageByISO639_2(String isoCode639_2) {
         if (LanguageMapper.existsIsoCode639_2(isoCode639_2)) {
-            return new Language( isoCode639_2 );
+            return new Language(isoCode639_2);
         } else {
-            return null ;
+            return null;
         }
     }
 
-    public static Language getLanguageByISO639_1( String isoCode639_1 ) {
+    /**
+     * Returns Language by given ISO 639-1 code
+     *
+     * @param isoCode639_1 language code
+     * @return language mapped to the given code or null if the given code is not mapped to any language
+     * @see <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes">List_of_ISO_639-2_codes</a>
+     */
+    public static Language getLanguageByISO639_1(String isoCode639_1) {
         try {
-            return getLanguageByISO639_2(LanguageMapper.convert639_1to639_2(isoCode639_1)) ;
-        } catch ( LanguageMapper.LanguageNotSupportedException e ) {
-            return null ;
+            return getLanguageByISO639_2(LanguageMapper.convert639_1to639_2(isoCode639_1));
+        } catch (LanguageMapper.LanguageNotSupportedException e) {
+            return null;
         }
     }
 
+    /**
+     * Returns a string representation of this object. In the form of "ISO 639-2: " + {@link Language#getIsoCode639_2()}
+     *
+     * @return a string representation of this Language
+     */
     public String toString() {
-        return "ISO 639-2: "+isoCode639_2 ;
+        return "ISO 639-2: " + isoCode639_2;
     }
 
+    /**
+     * Returns ISO 639-2 string of this Language
+     *
+     * @return ISO 639-2 string of this Language
+     */
     public String getIsoCode639_2() {
         return isoCode639_2;
     }
 
+    /**
+     * Returns ISO 639-1 code of this Language.
+     *
+     * @return ISO 639-1 code of this Language or null if not found.
+     */
     public String getIsoCode639_1() {
         try {
-            return LanguageMapper.convert639_2to639_1(isoCode639_2) ;
-        } catch ( LanguageMapper.LanguageNotSupportedException e ) {
-            return null ;
+            return LanguageMapper.convert639_2to639_1(isoCode639_2);
+        } catch (LanguageMapper.LanguageNotSupportedException e) {
+            return null;
         }
     }
 
diff --git a/server/src/com/imcode/imcms/api/LuceneParsedQuery.java b/server/src/com/imcode/imcms/api/LuceneParsedQuery.java
index 1be00ace28..7de03cccf9 100644
--- a/server/src/com/imcode/imcms/api/LuceneParsedQuery.java
+++ b/server/src/com/imcode/imcms/api/LuceneParsedQuery.java
@@ -1,26 +1,42 @@
 package com.imcode.imcms.api;
 
 import imcode.server.document.index.DefaultQueryParser;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.Query;
 
+/**
+ * Document search query. Provides means of query creation from String
+ */
 public class LuceneParsedQuery extends SearchQuery {
 
     private Query query;
 
-    public LuceneParsedQuery( String queryString ) throws BadQueryException {
+    /**
+     * Constructs Lucene search query from a String
+     *
+     * @param queryString a string representing a search query
+     * @throws BadQueryException if the given string cannot be parsed into query
+     */
+    public LuceneParsedQuery(String queryString) throws BadQueryException {
         try {
             query = parse(queryString);
-        } catch ( ParseException e ) {
-            throw new BadQueryException( queryString, e );
+        } catch (ParseException e) {
+            throw new BadQueryException(queryString, e);
         }
     }
 
+    /**
+     * Attempts parsing of a String into Lucene search query
+     *
+     * @param queryString a string representing a search query
+     * @return a {@link Query} parsed from the given String
+     * @throws ParseException if the given string cannot be parsed into query
+     */
     public static Query parse(String queryString) throws ParseException {
-        return new DefaultQueryParser().parse( queryString );
+        return new DefaultQueryParser().parse(queryString);
     }
 
-    Query getQuery() {
+    public Query getQuery() {
         return query;
     }
 
diff --git a/server/src/com/imcode/imcms/api/LuceneQuery.java b/server/src/com/imcode/imcms/api/LuceneQuery.java
index dfd09dfb54..999f35589d 100644
--- a/server/src/com/imcode/imcms/api/LuceneQuery.java
+++ b/server/src/com/imcode/imcms/api/LuceneQuery.java
@@ -2,16 +2,24 @@
 
 import org.apache.lucene.search.Query;
 
+/**
+ * Wraps lucene search {@link Query} into a query acceptable by {@link DocumentService#getDocuments(SearchQuery)}
+ */
 public class LuceneQuery extends SearchQuery {
 
     private Query query;
 
+    /**
+     * Constructs LuceneQuery from already created {@link Query}
+     *
+     * @param query {@link Query}
+     */
     public LuceneQuery(Query query) {
         this.query = query;
     }
 
-    Query getQuery() {
+    public Query getQuery() {
         return query;
     }
-    
+
 }
diff --git a/server/src/com/imcode/imcms/api/Mail.java b/server/src/com/imcode/imcms/api/Mail.java
index f4d7c3e516..37e0d877b4 100644
--- a/server/src/com/imcode/imcms/api/Mail.java
+++ b/server/src/com/imcode/imcms/api/Mail.java
@@ -3,49 +3,138 @@
 import imcode.util.net.SMTP;
 
 import javax.activation.DataSource;
+import java.util.Map;
 
+/**
+ * Represents an email sent using {@link MailService}
+ */
 public class Mail {
 
-    private SMTP.Mail internal ;
+    private SMTP.Mail internal;
 
+    /**
+     * Constructs email with the given string used as the sender address
+     *
+     * @param fromAddress sender address
+     */
     public Mail(String fromAddress) {
-        this.internal = new SMTP.Mail( fromAddress );
+        this.internal = new SMTP.Mail(fromAddress);
     }
 
-    public Mail( String fromAddress, String[] toAddresses, String subject, String body ) {
-        this.internal = new SMTP.Mail( fromAddress, toAddresses, subject, body );
+    /**
+     * Constructs email with the given from, to addresses, subject and body
+     *
+     * @param fromAddress sender email address
+     * @param toAddresses array of recipient addresses
+     * @param subject     email subject
+     * @param body        email body
+     */
+    public Mail(String fromAddress, String[] toAddresses, String subject, String body) {
+        this.internal = new SMTP.Mail(fromAddress, toAddresses, subject, body);
     }
 
     SMTP.Mail getInternal() {
-        return internal ;
+        return internal;
     }
 
-    public void setAttachments( DataSource[] attachments ) {
-        internal.setAttachments( attachments );
+    /**
+     * Sets attachments for this email
+     *
+     * @param attachments attachments, not null
+     */
+    public void setAttachments(DataSource[] attachments) {
+        internal.setAttachments(attachments);
     }
 
-    public void setBccAddresses( String[] bccAddresses ) {
-        internal.setBccAddresses( bccAddresses );
+    /**
+     * Sets bcc addresses
+     *
+     * @param bccAddresses an array of Strings with bcc addresses, not null
+     */
+    public void setBccAddresses(String[] bccAddresses) {
+        internal.setBccAddresses(bccAddresses);
     }
 
-    public void setBody( String body ) {
-        internal.setBody( body );
+    /**
+     * Sets the text version of body of this email
+     *
+     * @param body mail body
+     */
+    public void setBody(String body) {
+        internal.setBody(body);
     }
-    
-    public void setHtmlBody( String htmlBody ) {
-        internal.setHtmlBody( htmlBody );
+
+    /**
+     * Sets the html version of body of this email
+     *
+     * @param htmlBody mail body
+     */
+    public void setHtmlBody(String htmlBody) {
+        internal.setHtmlBody(htmlBody);
+    }
+
+    /**
+     * Sets cc addresses
+     *
+     * @param ccAddresses an array of Strings with cc addresses, not null
+     */
+    public void setCcAddresses(String[] ccAddresses) {
+        internal.setCcAddresses(ccAddresses);
+    }
+
+    /**
+     * Sets the subject of this email
+     *
+     * @param subject subject of this email
+     */
+    public void setSubject(String subject) {
+        internal.setSubject(subject);
+    }
+
+    /**
+     * Sets the recipient addresses of this email
+     *
+     * @param toAddresses an array of String with recipient addresses, not null
+     */
+    public void setToAddresses(String[] toAddresses) {
+        internal.setToAddresses(toAddresses);
     }
 
-    public void setCcAddresses( String[] ccAddresses ) {
-        internal.setCcAddresses( ccAddresses );
+    /**
+     * Sets the 'reply to' addresses of this email
+     *
+     * @param replyToAddresses an array of String with addresses which will be in 'Reply to:' field.
+     */
+    public void setReplyToAddresses(String[] replyToAddresses) {
+        internal.setReplyToAddresses(replyToAddresses);
     }
 
-    public void setSubject( String subject ) {
-        internal.setSubject( subject );
+    /**
+     * Simply adds email header with specified name and value
+     *
+     * @param name  header name
+     * @param value header value
+     */
+    public void addHeader(String name, String value) {
+        internal.addHeader(name, value);
     }
 
-    public void setToAddresses( String[] toAddresses ) {
-        internal.setToAddresses( toAddresses );
+    /**
+     * Get headers map as header name and header value pairs.
+     *
+     * @return header name and header value pairs map
+     */
+    public Map<String, String> getHeaders() {
+        return internal.getHeaders();
     }
 
+    /**
+     * Set email headers and values as kay-value map.
+     * Note that this methods will replace all previous headers that was set.
+     *
+     * @param headers header name and header value pairs map
+     */
+    public void setHeaders(Map<String, String> headers) {
+        internal.setHeaders(headers);
+    }
 }
diff --git a/server/src/com/imcode/imcms/api/MailException.java b/server/src/com/imcode/imcms/api/MailException.java
index a74ae714f5..e37189230e 100644
--- a/server/src/com/imcode/imcms/api/MailException.java
+++ b/server/src/com/imcode/imcms/api/MailException.java
@@ -1,8 +1,12 @@
 package com.imcode.imcms.api;
 
+/**
+ * Usually thrown when something wrong happens when sending out emails. Like {@link MailService} not being able to contact
+ * the mail server etc.
+ */
 public class MailException extends Exception {
 
-    public MailException( Exception e ) {
-        super(e) ;
+    public MailException(Exception e) {
+        super(e);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/MailService.java b/server/src/com/imcode/imcms/api/MailService.java
index 20265113ca..c3db7bc17e 100644
--- a/server/src/com/imcode/imcms/api/MailService.java
+++ b/server/src/com/imcode/imcms/api/MailService.java
@@ -2,19 +2,29 @@
 
 import imcode.util.net.SMTP;
 
+/**
+ * Class used to send out {@link Mail}
+ */
 public class MailService {
 
     private SMTP smtp;
 
-    MailService( SMTP smtp ) {
+    MailService(SMTP smtp) {
         this.smtp = smtp;
     }
 
+    /**
+     * Sends out the given email
+     *
+     * @param mail {@link Mail} to send
+     * @throws MailException if the email can't be sent due to unavailability of a mail server or invalid
+     *                       attributes in the {@link Mail} object, such as sender address, destination addresses, cc, bcc addresses etc.
+     */
     public void sendMail(Mail mail) throws MailException {
         try {
-            smtp.sendMail( mail.getInternal() );
-        } catch ( Exception e ) {
-            throw new MailException( e );
+            smtp.sendMail(mail.getInternal());
+        } catch (Exception e) {
+            throw new MailException(e);
         }
     }
 }
diff --git a/server/src/com/imcode/imcms/api/MaxCategoriesOfTypeExceededException.java b/server/src/com/imcode/imcms/api/MaxCategoriesOfTypeExceededException.java
index 3749ad4316..1d84c7436b 100644
--- a/server/src/com/imcode/imcms/api/MaxCategoriesOfTypeExceededException.java
+++ b/server/src/com/imcode/imcms/api/MaxCategoriesOfTypeExceededException.java
@@ -1,11 +1,14 @@
 package com.imcode.imcms.api;
 
 /**
+ * Usually thrown when saving a {@link Document}. Signals that a document was assigned more categories of a
+ * {@link CategoryType} that that category type's maximum number of choices allows.
+ *
  * @author kreiger
  */
 public class MaxCategoriesOfTypeExceededException extends SaveException {
 
     MaxCategoriesOfTypeExceededException(Throwable cause) {
-        super(cause) ;
+        super(cause);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/NoPermissionException.java b/server/src/com/imcode/imcms/api/NoPermissionException.java
index 2f75ac65b8..d8b10ac069 100644
--- a/server/src/com/imcode/imcms/api/NoPermissionException.java
+++ b/server/src/com/imcode/imcms/api/NoPermissionException.java
@@ -2,11 +2,11 @@
 
 /**
  * This exception is thrown from almost all methods in the service classes. It is thrown when the current logged
- * in user dosen't have the apropiate rights to do that operation. See the message for futher information.
+ * in user doesn't have the apropiate rights to do that operation. See the message for further information.
  */
 public class NoPermissionException extends RuntimeException {
 
-    public NoPermissionException( String message ) {
-        super( message );
+    public NoPermissionException(String message) {
+        super(message);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/P.java b/server/src/com/imcode/imcms/api/P.java
new file mode 100644
index 0000000000..b3817f5be9
--- /dev/null
+++ b/server/src/com/imcode/imcms/api/P.java
@@ -0,0 +1,32 @@
+package com.imcode.imcms.api;
+
+// Product
+public final class P {
+
+    public static <A, B> P2<A, B> of(final A a, final B b) {
+        return new P2<A, B>() {
+            public A _1() {
+                return a;
+            }
+
+            public B _2() {
+                return b;
+            }
+        };
+    }
+
+    public abstract static class P2<A, B> {
+        public abstract A _1();
+
+        public abstract B _2();
+
+        @Override
+        public String toString() {
+            return String.format("P.P2{_1=%s, _2=%s}", _1(), _2());
+        }
+    }
+
+
+}
+
+
diff --git a/server/src/com/imcode/imcms/api/Role.java b/server/src/com/imcode/imcms/api/Role.java
index efe127f23d..4b6e1beb45 100644
--- a/server/src/com/imcode/imcms/api/Role.java
+++ b/server/src/com/imcode/imcms/api/Role.java
@@ -4,17 +4,30 @@
 import imcode.server.user.RoleId;
 
 /**
+ * Represent a role in imcms.
+ *
  * @since 2.0
  */
 public class Role implements Comparable {
 
-    public static final int SUPERADMIN_ID = RoleId.SUPERADMIN_ID ;
-    public static final int USERADMIN_ID = RoleId.USERADMIN_ID ;
-    public static final int USERS_ID = RoleId.USERS_ID ;
+    /**
+     * Super admin role id
+     */
+    public static final int SUPERADMIN_ID = RoleId.SUPERADMIN_ID;
 
-    private final RoleDomainObject internalRole ;
+    /**
+     * User admin role id
+     */
+    public static final int USERADMIN_ID = RoleId.USERADMIN_ID;
 
-    Role( RoleDomainObject role ) {
+    /**
+     * Default user role id.
+     */
+    public static final int USERS_ID = RoleId.USERS_ID;
+
+    private final RoleDomainObject internalRole;
+
+    Role(RoleDomainObject role) {
         this.internalRole = role;
     }
 
@@ -22,43 +35,92 @@ RoleDomainObject getInternal() {
         return internalRole;
     }
 
+    /**
+     * Returns the id of this role
+     *
+     * @return id of this role
+     */
     public int getId() {
         return internalRole.getId().intValue();
     }
 
+    /**
+     * Returns the name of this role
+     *
+     * @return name of this role
+     */
     public String getName() {
         return internalRole.getName();
     }
 
-    public void setName( String name ) {
-        internalRole.setName( name );
+    /**
+     * Sets name of this role.
+     *
+     * @param name new name of this role
+     */
+    public void setName(String name) {
+        internalRole.setName(name);
     }
 
-    public boolean equals( Object o ) {
-        return internalRole.equals( ((Role)o).internalRole );
+    /**
+     * Tests this role for equality with the given one.
+     * Two roles are the same if their ids are the same.
+     *
+     * @param o a {@link Role} to test with
+     * @return true if equal, false otherwise
+     */
+    public boolean equals(Object o) {
+        return internalRole.equals(((Role) o).internalRole);
     }
 
+    /**
+     * Returns hash code of this role
+     *
+     * @return hash code
+     */
     public int hashCode() {
         return internalRole.hashCode();
     }
 
+    /**
+     * Calls {@link com.imcode.imcms.api.Role#getName()}
+     *
+     * @return the String form of this role
+     */
     public String toString() {
-        return getName() ;
+        return getName();
     }
 
+    /**
+     * Sets if the role owners are allowed to have their password sent out by email
+     *
+     * @param passwordMailPermission whether to allow password be sent out by email
+     */
     public void setPasswordMailPermission(boolean passwordMailPermission) {
         if (passwordMailPermission) {
-            internalRole.addPermission( RoleDomainObject.PASSWORD_MAIL_PERMISSION );
+            internalRole.addPermission(RoleDomainObject.PASSWORD_MAIL_PERMISSION);
         } else {
-            internalRole.removePermission( RoleDomainObject.PASSWORD_MAIL_PERMISSION );
+            internalRole.removePermission(RoleDomainObject.PASSWORD_MAIL_PERMISSION);
         }
     }
 
+    /**
+     * Tests whether this role owners have permission to get their passwords by email
+     *
+     * @return true if are allowed, false otherwise
+     */
     public boolean hasPasswordMailPermission() {
-        return internalRole.hasPermission( RoleDomainObject.PASSWORD_MAIL_PERMISSION ) ;
+        return internalRole.hasPermission(RoleDomainObject.PASSWORD_MAIL_PERMISSION);
     }
 
-    public int compareTo( Object o ) {
-        return internalRole.compareTo( ((Role)o).internalRole ) ;
+    /**
+     * Compares two roles by name, the comparison is case insensitive.
+     *
+     * @param o another role to compare with
+     * @return 0 if equal lexicographically, less than 0 if this Role is lesser lexicographically than the argument,
+     * more than 0 if greater than the argument.
+     */
+    public int compareTo(Object o) {
+        return internalRole.compareTo(((Role) o).internalRole);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/RoleAlreadyExistsException.java b/server/src/com/imcode/imcms/api/RoleAlreadyExistsException.java
index 769457c421..2e29aeef3d 100644
--- a/server/src/com/imcode/imcms/api/RoleAlreadyExistsException.java
+++ b/server/src/com/imcode/imcms/api/RoleAlreadyExistsException.java
@@ -1,8 +1,11 @@
 package com.imcode.imcms.api;
 
+/**
+ * Usually thrown when saving a {@link Role}. Signals that there's already a role with the name that the role being save has.
+ */
 public class RoleAlreadyExistsException extends AlreadyExistsException {
 
     public RoleAlreadyExistsException(String message, Throwable cause) {
-        super(message, cause) ;
+        super(message, cause);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/SaveException.java b/server/src/com/imcode/imcms/api/SaveException.java
index cd03342b6a..1709b07a26 100644
--- a/server/src/com/imcode/imcms/api/SaveException.java
+++ b/server/src/com/imcode/imcms/api/SaveException.java
@@ -1,15 +1,17 @@
 package com.imcode.imcms.api;
 
 /**
+ * Base exception, thrown when saving failed.
+ *
  * @since 2.0
  */
 public class SaveException extends Exception {
 
     public SaveException(String message, Throwable cause) {
-        super(message, cause) ;
+        super(message, cause);
     }
 
-    public SaveException( Throwable cause ) {
-        super(cause) ;
+    public SaveException(Throwable cause) {
+        super(cause);
     }
 }
diff --git a/server/src/com/imcode/imcms/api/SearchException.java b/server/src/com/imcode/imcms/api/SearchException.java
index 487752e632..56facbce4d 100644
--- a/server/src/com/imcode/imcms/api/SearchException.java
+++ b/server/src/com/imcode/imcms/api/SearchException.java
@@ -1,9 +1,12 @@
 package com.imcode.imcms.api;
 
-public class SearchException extends Exception {
+/**
+ * Base class for search related exceptions.
+ */
+public class SearchException extends RuntimeException {
 
-    public SearchException( Throwable cause ) {
-        super(cause) ;
+    public SearchException(Throwable cause) {
+        super(cause);
     }
 
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/SearchQuery.java b/server/src/com/imcode/imcms/api/SearchQuery.java
index e338142713..80987d885e 100644
--- a/server/src/com/imcode/imcms/api/SearchQuery.java
+++ b/server/src/com/imcode/imcms/api/SearchQuery.java
@@ -1,29 +1,53 @@
 package com.imcode.imcms.api;
 
+import imcode.server.document.index.DocumentQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Sort;
 
-public abstract class SearchQuery {
+/**
+ * Base class for Lucene based document search queries, used with {@link DocumentService#getDocuments(SearchQuery)}
+ */
+public abstract class SearchQuery implements DocumentQuery {
 
-    private Sort sort ;
+    private Sort sort;
     private boolean logged;
 
-    abstract Query getQuery() ;
-    
-    Sort getSort() {
-        return sort ;
+    /**
+     * Returns the query
+     *
+     * @return query
+     */
+    public abstract Query getQuery();
+
+    public Sort getSort() {
+        return sort;
     }
 
+    /**
+     * Sets sorting of for this query
+     *
+     * @param sort sorting for this query
+     */
     public void setSort(Sort sort) {
         this.sort = sort;
     }
-    
-    public void setLogged(boolean logged) {
-        this.logged = logged;
-    }
 
-    boolean isLogged() {
+    /**
+     * Tests whether this query should be logged
+     *
+     * @return true if this query is set to be logged, false otherwise
+     */
+    public boolean isLogged() {
         return logged;
     }
 
+    /**
+     * Sets whether this query should be logged
+     *
+     * @param logged true if the query should be logged, false otherwise
+     */
+    public void setLogged(boolean logged) {
+        this.logged = logged;
+    }
+
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/SearchResult.java b/server/src/com/imcode/imcms/api/SearchResult.java
new file mode 100644
index 0000000000..b35da59a16
--- /dev/null
+++ b/server/src/com/imcode/imcms/api/SearchResult.java
@@ -0,0 +1,48 @@
+package com.imcode.imcms.api;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Getter
+@ToString
+@EqualsAndHashCode
+public class SearchResult<T> {
+
+    private final List<T> result;
+    private final int totalCount;
+    private final int nextSkip;
+
+    public SearchResult(List<T> result, int totalCount) {
+        this(result, totalCount, 0);
+    }
+
+    public SearchResult(List<T> result, int totalCount, int nextSkip) {
+        this.result = result;
+        this.totalCount = totalCount;
+        this.nextSkip = nextSkip;
+    }
+
+    public static <T> SearchResult<T> empty() {
+        return new SearchResult<>(Collections.emptyList(), 0);
+    }
+
+    public static <T> SearchResult<T> of(List<T> result, int totalCount) {
+        return new SearchResult<>(result, totalCount);
+    }
+
+    public <T2> SearchResult<T2> mapResult(Function<T, T2> transformer) {
+
+        final List<T2> newResult = this.result.parallelStream()
+                .map(transformer)
+                .collect(Collectors.toList());
+
+        return new SearchResult<>(newResult, totalCount, nextSkip);
+    }
+
+}
diff --git a/server/src/com/imcode/imcms/api/Section.java b/server/src/com/imcode/imcms/api/Section.java
index b252ba82fa..375b23e7a1 100644
--- a/server/src/com/imcode/imcms/api/Section.java
+++ b/server/src/com/imcode/imcms/api/Section.java
@@ -1,21 +1,38 @@
 package com.imcode.imcms.api;
 
-import imcode.server.document.*;
+import imcode.server.document.SectionDomainObject;
 
+/**
+ * Represents a section in imcms
+ */
 public class Section {
     SectionDomainObject internalSection;
-    public Section( SectionDomainObject sectionDomainObject ) {
+
+    /**
+     * Constructs a Section with the given SectionDomainObject used internally.
+     *
+     * @param sectionDomainObject SectionDomainObject to be used internally.
+     */
+    public Section(SectionDomainObject sectionDomainObject) {
         this.internalSection = sectionDomainObject;
     }
 
-   public String getName(){
-       return this.internalSection.getName();
-   }
+    /**
+     * Returns the name of this serction
+     *
+     * @return a string with name of this section
+     */
+    public String getName() {
+        return this.internalSection.getName();
+    }
 
     /**
-         @since 2.0
+     * Returns the id of this section.
+     *
+     * @return id of this section
+     * @since 2.0
      */
-   public int getId() {
-       return internalSection.getId();
-   }
+    public int getId() {
+        return internalSection.getId();
+    }
 }
diff --git a/server/src/com/imcode/imcms/api/Template.java b/server/src/com/imcode/imcms/api/Template.java
index 3e55afe80c..5ff7a8025a 100644
--- a/server/src/com/imcode/imcms/api/Template.java
+++ b/server/src/com/imcode/imcms/api/Template.java
@@ -2,28 +2,49 @@
 
 import imcode.server.document.TemplateDomainObject;
 
+/**
+ * Represents a template in imcms
+ */
 public class Template {
 
     private final TemplateDomainObject internalTemplate;
 
+    /**
+     * Constructs Template with the given TemplateDomainObject backing it.
+     *
+     * @param internalTemplate TemplateDomainObject to be used internally.
+     */
     public Template(TemplateDomainObject internalTemplate) {
         this.internalTemplate = internalTemplate;
     }
 
+    /**
+     * Returns the name of this template
+     *
+     * @return name of this template
+     */
     public String getName() {
         return internalTemplate.getName();
     }
 
-    /** @deprecated Returns 0, use {@link #getName()} instead. **/
+    /**
+     * @deprecated Returns 0, use {@link #getName()} instead.
+     **/
     public int getId() {
         return 0;
     }
 
+    /**
+     * Compares two templates, uses {@link com.imcode.imcms.api.Template#getName()} as a criteria of equality.
+     *
+     * @param o template to compare with
+     * @return true if both templates are the same
+     */
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof Template ) ) {
+        if (!(o instanceof Template)) {
             return false;
         }
 
@@ -33,14 +54,24 @@ public boolean equals(Object o) {
 
     }
 
+    /**
+     * Hash code of this Template, calls hashCode() of Template's name.
+     *
+     * @return
+     */
     public int hashCode() {
-        return internalTemplate.hashCode() ;
+        return internalTemplate.hashCode();
     }
 
     TemplateDomainObject getInternal() {
         return internalTemplate;
     }
 
+    /**
+     * String representation of this template in the form of a name
+     *
+     * @return same as {@link com.imcode.imcms.api.Template#getName()}
+     */
     public String toString() {
         return getName();
     }
diff --git a/server/src/com/imcode/imcms/api/TemplateGroup.java b/server/src/com/imcode/imcms/api/TemplateGroup.java
index 32032e6eec..f7e81aa099 100644
--- a/server/src/com/imcode/imcms/api/TemplateGroup.java
+++ b/server/src/com/imcode/imcms/api/TemplateGroup.java
@@ -2,18 +2,36 @@
 
 import imcode.server.document.TemplateGroupDomainObject;
 
+/**
+ * Class describing a group of templates
+ */
 public class TemplateGroup {
 
     private final TemplateGroupDomainObject internalTemplateGroup;
 
+    /**
+     * Constructs TemplateGroup with TemplateGroupDomainObject backing it
+     *
+     * @param internal TemplateGroupDomainObject to be used internally
+     */
     public TemplateGroup(TemplateGroupDomainObject internal) {
         internalTemplateGroup = internal;
     }
 
+    /**
+     * Returns template group's name
+     *
+     * @return template group's name
+     */
     public String getName() {
         return internalTemplateGroup.getName();
     }
 
+    /**
+     * Returns template group's id
+     *
+     * @return template group's id
+     */
     public int getId() {
         return internalTemplateGroup.getId();
     }
@@ -23,20 +41,20 @@ TemplateGroupDomainObject getInternal() {
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof TemplateGroup ) ) {
+        if (!(o instanceof TemplateGroup)) {
             return false;
         }
 
         final TemplateGroup templateGroup = (TemplateGroup) o;
 
-        return internalTemplateGroup.equals(templateGroup.internalTemplateGroup) ;
+        return internalTemplateGroup.equals(templateGroup.internalTemplateGroup);
 
     }
 
     public int hashCode() {
-        return internalTemplateGroup.hashCode() ;
+        return internalTemplateGroup.hashCode();
     }
 }
diff --git a/server/src/com/imcode/imcms/api/TemplateService.java b/server/src/com/imcode/imcms/api/TemplateService.java
index bd2e3270dc..3745680e07 100644
--- a/server/src/com/imcode/imcms/api/TemplateService.java
+++ b/server/src/com/imcode/imcms/api/TemplateService.java
@@ -9,11 +9,14 @@
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * In charge of {@link Template} and {@link TemplateGroup} look up.
+ */
 public class TemplateService {
 
     private ContentManagementSystem contentManagementSystem;
 
-    TemplateService( ContentManagementSystem contentManagementSystem ) {
+    TemplateService(ContentManagementSystem contentManagementSystem) {
         this.contentManagementSystem = contentManagementSystem;
     }
 
@@ -24,29 +27,30 @@ public class TemplateService {
      * @return Only the templategroups that the current logged in user has the permissions to see
      * @throws NoPermissionException If the current user isn't superadmin
      */
-    public TemplateGroup[] getTemplatesGroups( TextDocument textDocument ) throws NoPermissionException {
+    public TemplateGroup[] getTemplatesGroups(TextDocument textDocument) throws NoPermissionException {
         UserDomainObject user = contentManagementSystem.getCurrentUser().getInternal();
-        TemplateGroupDomainObject[] internalTemplates = getTemplateMapper().getAllTemplateGroupsAvailableForUserOnDocument( user, textDocument.getId() );
-        return createTemplateGroupArray( internalTemplates );
+        TemplateGroupDomainObject[] internalTemplates = getTemplateMapper().getAllTemplateGroupsAvailableForUserOnDocument(user, textDocument.getId());
+        return createTemplateGroupArray(internalTemplates);
     }
 
     private TemplateMapper getTemplateMapper() {
-        return contentManagementSystem.getInternal().getTemplateMapper() ;
+        return contentManagementSystem.getInternal().getTemplateMapper();
     }
 
     /**
      * Get all the template groups found in the system.
+     *
      * @return An array of template groups
      */
     public TemplateGroup[] getAllTemplateGroups() {
         TemplateGroupDomainObject[] templateGroupDomainObject = getTemplateMapper().getAllTemplateGroups();
-        return createTemplateGroupArray( templateGroupDomainObject );
+        return createTemplateGroupArray(templateGroupDomainObject);
     }
 
-    private TemplateGroup[] createTemplateGroupArray( TemplateGroupDomainObject[] internalTemplates ) {
+    private TemplateGroup[] createTemplateGroupArray(TemplateGroupDomainObject[] internalTemplates) {
         TemplateGroup[] result = new TemplateGroup[internalTemplates.length];
         for (int i = 0; i < internalTemplates.length; i++) {
-            result[i] = new TemplateGroup( internalTemplates[i] );
+            result[i] = new TemplateGroup(internalTemplates[i]);
         }
         return result;
     }
@@ -58,12 +62,12 @@ private TemplateGroup[] createTemplateGroupArray( TemplateGroupDomainObject[] in
      * @return An array of all the Templates in the given TemplateGroup
      * @throws NoPermissionException If the current user doesn't have permission to list the templates in the templategroup.
      */
-    public Template[] getTemplates( TemplateGroup templateGroup ) throws NoPermissionException {
-        List<TemplateDomainObject> templates = getTemplateMapper().getTemplatesInGroup( templateGroup.getInternal() );
-        
-        List<Template> result = new ArrayList<Template>(templates.size());
-        for ( TemplateDomainObject template : templates ) {
-            result.add(new Template( template ));
+    public Template[] getTemplates(TemplateGroup templateGroup) throws NoPermissionException {
+        List<TemplateDomainObject> templates = getTemplateMapper().getTemplatesInGroup(templateGroup.getInternal());
+
+        List<Template> result = new ArrayList<>(templates.size());
+        for (TemplateDomainObject template : templates) {
+            result.add(new Template(template));
         }
         return result.toArray(new Template[result.size()]);
     }
@@ -74,23 +78,35 @@ public Template[] getTemplates( TemplateGroup templateGroup ) throws NoPermissio
      * @param textDocument The TextDocument
      * @return An array of all templates that may be used for the given TextDocument.
      */
-    public Template[] getPossibleTemplates( TextDocument textDocument ) throws NoPermissionException {
-        TemplateGroup[] groups = getTemplatesGroups( textDocument );
+    public Template[] getPossibleTemplates(TextDocument textDocument) throws NoPermissionException {
+        TemplateGroup[] groups = getTemplatesGroups(textDocument);
         List temp = new ArrayList();
-        for ( TemplateGroup group : groups ) {
+        for (TemplateGroup group : groups) {
             Template[] templates = getTemplates(group);
             temp.addAll(Arrays.asList(templates));
         }
-        return (Template[]) temp.toArray( new Template[temp.size()] );
+        return (Template[]) temp.toArray(new Template[temp.size()]);
     }
 
-    public Template getTemplate( String templateName ) {
-        TemplateDomainObject template = getTemplateMapper().getTemplateByName( templateName );
-        return null != template ? new Template( template ) : null;
+    /**
+     * Returns a {@link Template} by name
+     *
+     * @param templateName name of a {@link Template}
+     * @return template with the given name or null if none found
+     */
+    public Template getTemplate(String templateName) {
+        TemplateDomainObject template = getTemplateMapper().getTemplateByName(templateName);
+        return null != template ? new Template(template) : null;
     }
 
-    public TemplateGroup getTemplateGroupById( int templateGroupId ) {
-        TemplateGroupDomainObject template = getTemplateMapper().getTemplateGroupById( templateGroupId );
-        return null != template ? new TemplateGroup( template ) : null;
+    /**
+     * Returns a {@link TemplateGroup} by id
+     *
+     * @param templateGroupId template group id
+     * @return a {@link TemplateGroup} with the given id or null if none found.
+     */
+    public TemplateGroup getTemplateGroupById(int templateGroupId) {
+        TemplateGroupDomainObject template = getTemplateMapper().getTemplateGroupById(templateGroupId);
+        return null != template ? new TemplateGroup(template) : null;
     }
 }
diff --git a/server/src/com/imcode/imcms/api/TextDocument.java b/server/src/com/imcode/imcms/api/TextDocument.java
index 8da82c2c6e..a94458d904 100644
--- a/server/src/com/imcode/imcms/api/TextDocument.java
+++ b/server/src/com/imcode/imcms/api/TextDocument.java
@@ -6,7 +6,12 @@
 import imcode.server.document.DocumentPredicate;
 import imcode.server.document.DocumentReference;
 import imcode.server.document.DocumentTypeDomainObject;
-import imcode.server.document.textdocument.*;
+import imcode.server.document.textdocument.ImageDomainObject;
+import imcode.server.document.textdocument.MenuDomainObject;
+import imcode.server.document.textdocument.MenuItemDomainObject;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
+import imcode.server.document.textdocument.TextDomainObject;
+import imcode.server.document.textdocument.TreeSortKeyDomainObject;
 import imcode.server.user.UserDomainObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
@@ -15,20 +20,33 @@
 import org.apache.commons.collections.map.TransformedSortedMap;
 import org.apache.commons.lang.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
+/**
+ * Document that can contain texts, images, menus, includes.
+ */
 public class TextDocument extends Document {
 
+    /**
+     * TextDocument TYPE_ID
+     */
     public final static int TYPE_ID = DocumentTypeDomainObject.TEXT_ID;
 
-    TextDocument( TextDocumentDomainObject textDocument,
-                  ContentManagementSystem contentManagementSystem ) {
+    public TextDocument(TextDocumentDomainObject textDocument,
+                        ContentManagementSystem contentManagementSystem) {
         super(textDocument, contentManagementSystem);
     }
 
     /**
-     * @return A SortedMap that contains the textFileds index as keys, and instaces of TextFields as values. Only the
-     *         TextFields that contains any text is returned.
+     * Returns this document's TextFields that are not empty.
+     *
+     * @return A SortedMap that has {@link TextField} indices as keys, and instances of TextFields as values. Only the
+     * TextFields that contain any text are mapped.
      */
     public SortedMap getTextFields() {
         Predicate predicate = new Predicate() {
@@ -52,8 +70,10 @@ public Object transform(Object o) {
     }
 
     /**
-     * @return A SortedMap that contains the images index as keys, and instaces of Image as values. Only the
-     *         Image that has an url is returned.
+     * Returns this document's Images
+     *
+     * @return A SortedMap that contains {@link Image} indices as keys, and instaces of {@link Image} as values. Only the
+     * Images that have url(not empty) are returned.
      */
     public SortedMap getImages() {
         Predicate predicate = new Predicate() {
@@ -67,7 +87,7 @@ public boolean evaluate(Object o) {
         Transformer fromDomainToAPITransformer = new Transformer() {
             public Object transform(Object o) {
                 ImageDomainObject tempImage = (ImageDomainObject) o;
-                return new Image(tempImage);
+                return new Image(tempImage, getInternalTextDocument().getId());
             }
         };
 
@@ -78,8 +98,10 @@ public Object transform(Object o) {
     }
 
     /**
-     * @return A SortedMap that contains the index of the include as keys, and instaces of Document as values. Only the
-     *         includes that has a document is returned.
+     * Returns this document's includes
+     *
+     * @return A SortedMap that contains indices of the includes as keys, and instaces of {@link Document} as values. Only the
+     * includes that have a {@link Document} are returned.
      */
     public SortedMap getIncludes() {
         Predicate predicate = new Predicate() {
@@ -93,7 +115,7 @@ public boolean evaluate(Object o) {
         Transformer fromDomainToAPITransformer = new Transformer() {
             public Object transform(Object o) {
                 Integer tempMetaId = (Integer) o;
-                return DocumentService.wrapDocumentDomainObject(getDocumentGetter().getDocument(tempMetaId), contentManagementSystem );
+                return DocumentService.wrapDocumentDomainObject(getDocumentGetter().getDocument(tempMetaId), contentManagementSystem);
             }
         };
 
@@ -104,20 +126,26 @@ public Object transform(Object o) {
     }
 
     private DocumentGetter getDocumentGetter() {
-        return contentManagementSystem.getInternal().getDocumentMapper() ;
+        return contentManagementSystem.getInternal().getDocumentMapper();
     }
 
     private SortedMap filterAndConvertValues(Map map, Predicate predicate, Transformer transformer) {
         Collection<Map.Entry> nonEmptyTextFields = CollectionUtils.select(map.entrySet(), predicate);
         final SortedMap sortedMap = TransformedSortedMap.decorate(new TreeMap(), CloneTransformer.INSTANCE, transformer);
 
-        for ( Map.Entry entry : nonEmptyTextFields ) {
+        for (Map.Entry entry : nonEmptyTextFields) {
             sortedMap.put(entry.getKey(), entry.getValue());
         }
 
         return sortedMap;
     }
 
+    /**
+     * Returns a TextField with the given index.
+     *
+     * @param textFieldIndexInDocument text field index in this document
+     * @return TextField with the given index or an empty string TextField if the document doesn't have a TextField with the given index
+     */
     public TextField getTextField(int textFieldIndexInDocument) {
         TextDomainObject imcmsText = getInternalTextDocument().getText(textFieldIndexInDocument);
         if (null == imcmsText) {
@@ -127,37 +155,89 @@ public TextField getTextField(int textFieldIndexInDocument) {
         return new TextField(imcmsText);
     }
 
-    private TextDocumentDomainObject getInternalTextDocument() {
-        return (TextDocumentDomainObject)getInternal();
+    /**
+     * Returns internal {@code TextDocumentDomainObject} that is encapsulated
+     * by {@code Document} class.
+     * Method has {@code public} access since 4.2.21
+     *
+     * @return internal {@code TextDocumentDomainObject}
+     */
+    public TextDocumentDomainObject getInternalTextDocument() {
+        return (TextDocumentDomainObject) getInternal();
     }
 
+    /**
+     * Sets the text of the TextField with the given index to the text provided, in {@link com.imcode.imcms.api.TextDocument.TextField.Format#PLAIN} format
+     *
+     * @param textFieldIndexInDocument index of a TextField in this document
+     * @param newText                  text do be set
+     */
     public void setPlainTextField(int textFieldIndexInDocument, String newText) {
         setTextField(textFieldIndexInDocument, newText, TextField.Format.PLAIN);
     }
 
+    /**
+     * Sets the text of the TextField with the given index to the text provided, in {@link com.imcode.imcms.api.TextDocument.TextField.Format#HTML} format
+     *
+     * @param textFieldIndexInDocument index of a TextField in this document
+     * @param newText                  text do be set
+     */
     public void setHtmlTextField(int textFieldIndexInDocument, String newText) {
         setTextField(textFieldIndexInDocument, newText, TextField.Format.HTML);
     }
 
+    /**
+     * Sets the TextField with the given index to the provided text and {@link com.imcode.imcms.api.TextDocument.TextField.Format}
+     *
+     * @param textFieldIndexInDocument index of a TextField in this document
+     * @param newText                  text do be set
+     * @param format                   {@link com.imcode.imcms.api.TextDocument.TextField.Format}
+     */
     public void setTextField(int textFieldIndexInDocument, String newText, TextField.Format format) {
         TextDomainObject imcmsText = new TextDomainObject(newText, format.getType());
         getInternalTextDocument().setText(textFieldIndexInDocument, imcmsText);
     }
 
+    /**
+     * Returns Image with the given index in this document.
+     *
+     * @param imageIndexInDocument image index in this document
+     * @return Image or null if the document does contain any with the given index
+     */
     public Image getImage(int imageIndexInDocument) {
         ImageDomainObject internalImage = getInternalTextDocument().getImage(imageIndexInDocument);
         if (null != internalImage) {
-            return new Image(internalImage);
+            return new Image(internalImage, getInternalTextDocument().getId());
         } else {
             return null;
         }
     }
 
+    /**
+     * Returns this text document's template
+     *
+     * @return the template used by this document or null if the {@link Template} doesn't exist.
+     */
     public Template getTemplate() {
         String templateName = getInternalTextDocument().getTemplateName();
-        return contentManagementSystem.getTemplateService().getTemplate(templateName) ;
+        return contentManagementSystem.getTemplateService().getTemplate(templateName);
     }
 
+    /**
+     * Sets the {@link Template} of this text document to the given one.
+     *
+     * @param template a template to be set for this text document, null is used for template group
+     */
+    public void setTemplate(Template template) {
+        setTemplate(null, template);
+    }
+
+    /**
+     * Sets template group and template to be used by this text document.
+     *
+     * @param templateGroup can be null. {@link TemplateGroup}, note that the template group doesn't have to have the template provided
+     * @param template      not null, template to be used by this document
+     */
     public void setTemplate(TemplateGroup templateGroup, Template template) {
         getInternalTextDocument().setTemplateName(template.getInternal().getName());
         if (null != templateGroup) {
@@ -165,74 +245,83 @@ public void setTemplate(TemplateGroup templateGroup, Template template) {
         }
     }
 
-    public void setTemplate(Template template) {
-        setTemplate(null, template);
-    }
-
+    /**
+     * Returns included Document by the given index in the document.
+     *
+     * @param includeIndexInDocument index of an include in this document
+     * @return included Document or null if no document include exists by the given index in this document
+     * or the included document doesn't exist anymore.
+     */
     public Document getInclude(int includeIndexInDocument) {
         Integer includedDocumentId = getInternalTextDocument().getIncludedDocumentId(includeIndexInDocument);
         if (null != includedDocumentId) {
-            DocumentDomainObject includedDocument = getDocumentGetter().getDocument(new Integer(includedDocumentId.intValue()));
+            DocumentDomainObject includedDocument = getDocumentGetter().getDocument(includedDocumentId);
             if (null != includedDocument) {
-                return DocumentService.wrapDocumentDomainObject(includedDocument, contentManagementSystem );
+                return DocumentService.wrapDocumentDomainObject(includedDocument, contentManagementSystem);
             }
         }
         return null;
     }
 
+    /**
+     * Sets or removes the given document with the given index in this document.
+     *
+     * @param includeIndexInDocument index of an inlcude in this document
+     * @param documentToBeIncluded   TextDocument to be set or a null, if null is given, the include is removed.
+     */
     public void setInclude(int includeIndexInDocument, TextDocument documentToBeIncluded) {
         if (null == documentToBeIncluded) {
-            getInternalTextDocument().removeInclude( includeIndexInDocument );
+            getInternalTextDocument().removeInclude(includeIndexInDocument);
         } else {
-            getInternalTextDocument().setInclude( includeIndexInDocument, documentToBeIncluded.getId() );
+            getInternalTextDocument().setInclude(includeIndexInDocument, documentToBeIncluded.getId());
         }
     }
 
     /**
-     * Get the menu with the given index in the owner.
+     * Get the {@link Menu} with the given index in this document.
      *
-     * @param menuIndexInDocument the index of the menu in the owner.
-     * @return the menu with the given index in the owner.
+     * @param menuIndexInDocument the index of the menu in this document.
+     * @return {@link Menu} with the given index in this document.
      */
     public Menu getMenu(int menuIndexInDocument) {
         return new Menu(this, menuIndexInDocument);
     }
 
+    /**
+     * Returns all menus in this document.
+     *
+     * @return a SortedMap of menus in this document, with menu indices as keys and menus as values
+     */
     public SortedMap getMenus() {
-        Map<Integer, MenuDomainObject> internalMenus = getInternalTextDocument().getMenus() ;
+        Map<Integer, MenuDomainObject> internalMenus = getInternalTextDocument().getMenus();
         SortedMap menus = new TreeMap();
-        for ( Integer menuIndex : internalMenus.keySet() ) {
-            menus.put(menuIndex, new Menu(this, menuIndex.intValue()));
+        for (Integer menuIndex : internalMenus.keySet()) {
+            menus.put(menuIndex, new Menu(this, menuIndex));
         }
-        return menus ;
+        return menus;
     }
 
-    public void setImage( int imageIndex, Image image ) {
-        TextDocumentDomainObject textDocument = (TextDocumentDomainObject)getInternal() ;
-        textDocument.setImage( imageIndex, image.getInternal());
+    /**
+     * Sets the given {@link Image} to the given index in this document.
+     *
+     * @param imageIndex index in this document
+     * @param image      Image to set, not null
+     */
+    public void setImage(int imageIndex, Image image) {
+        TextDocumentDomainObject textDocument = (TextDocumentDomainObject) getInternal();
+        textDocument.setImage(imageIndex, image.getInternal());
     }
 
     ContentManagementSystem getContentManagementSystem() {
         return contentManagementSystem;
     }
 
+    /**
+     * Class represents a text field inside TextDocument
+     */
     public static class TextField {
         private final TextDomainObject imcmsText;
 
-        public enum Format {
-            PLAIN(TextDomainObject.TEXT_TYPE_PLAIN),
-            HTML(TextDomainObject.TEXT_TYPE_HTML);
-            private final int type;
-
-            Format(int type) {
-                this.type = type;
-            }
-
-            public int getType() {
-                return type;
-            }
-        }
-
         private TextField(TextDomainObject imcmsText) {
             this.imcmsText = imcmsText;
         }
@@ -251,10 +340,20 @@ public void setPlainFormat() {
             imcmsText.setType(TextDomainObject.TEXT_TYPE_PLAIN);
         }
 
+        /**
+         * Returns format set for this text field
+         *
+         * @return Format of this text field
+         */
         public Format getFormat() {
             return imcmsText.getType() == TextDomainObject.TEXT_TYPE_PLAIN ? Format.PLAIN : Format.HTML;
         }
 
+        /**
+         * Sets format of this text field
+         *
+         * @param format Format to use by this text field
+         */
         public void setFormat(Format format) {
             imcmsText.setType(format.getType());
         }
@@ -277,62 +376,127 @@ public String getText() {
         public String getHtmlFormattedText() {
             return imcmsText.toHtmlString();
         }
+
+        /**
+         * Format in which the text inside TextField is set or returned.
+         * When {@link Format#PLAIN} format is used, the reserved HTML characters are replaced with character entities.
+         */
+        public enum Format {
+            PLAIN(TextDomainObject.TEXT_TYPE_PLAIN),
+            HTML(TextDomainObject.TEXT_TYPE_HTML);
+            private final int type;
+
+            Format(int type) {
+                this.type = type;
+            }
+
+            public int getType() {
+                return type;
+            }
+        }
     }
 
+    /**
+     * Represents a menu item in a {@link Menu}.
+     */
     public static class MenuItem {
         MenuItemDomainObject internalMenuItem;
         Document child;
 
-        public MenuItem( MenuItemDomainObject internalMenuItem, ContentManagementSystem contentManagementSystem ) {
+        public MenuItem(MenuItemDomainObject internalMenuItem, ContentManagementSystem contentManagementSystem) {
             this.internalMenuItem = internalMenuItem;
-            DocumentService.ApiWrappingDocumentVisitor visitor = new DocumentService.ApiWrappingDocumentVisitor( contentManagementSystem );
-            internalMenuItem.getDocument().accept( visitor );
-            child = visitor.getDocument() ;
+            DocumentService.ApiWrappingDocumentVisitor visitor = new DocumentService.ApiWrappingDocumentVisitor(contentManagementSystem);
+            internalMenuItem.getDocument().accept(visitor);
+            child = visitor.getDocument();
         }
 
+        /**
+         * Returns a {@link Document} contained by this menu item.
+         *
+         * @return Document contained in the menu item
+         */
         public Document getDocument() {
             return child;
         }
 
 
         /**
-            @deprecated Use {@link #getSortKey()}
-       **/
+         * @deprecated Use {@link #getSortKey()}
+         **/
         public int getManualNumber() {
             Integer sortKey = internalMenuItem.getSortKey();
             if (null == sortKey) {
                 return 0;
             }
-            return sortKey.intValue();
+            return sortKey;
         }
 
+        /**
+         * Returns the manual sort key of this menu item
+         *
+         * @return integer representing sort of key of this menu item
+         */
         public Integer getSortKey() {
             return internalMenuItem.getSortKey();
         }
 
-        public void setSortKey( Integer sortKey ) {
+        /**
+         * Sets the manual sort key of this menu item
+         *
+         * @param sortKey sort key
+         */
+        public void setSortKey(Integer sortKey) {
             internalMenuItem.setSortKey(sortKey);
         }
 
+        /**
+         * Returns the {@link TreeKey} of this menu item.
+         *
+         * @return a TreeKey, which can be empty if the menu item doesn't have any set.
+         */
         public TreeKey getTreeKey() {
             return new TreeKey(internalMenuItem.getTreeSortKey());
         }
 
+        /**
+         * Sets the tree key of this menu item to the given one
+         *
+         * @param treeKey {@link TreeKey} to be used for this menu item
+         */
         public void setTreeKey(TreeKey treeKey) {
             internalMenuItem.setTreeSortKey(treeKey.internalTreeSortKey);
         }
 
+        /**
+         * Represents hierarchical order key e.g. 1.3 is a child of 1
+         */
         public static class TreeKey {
             TreeSortKeyDomainObject internalTreeSortKey;
 
+            /**
+             * Constructs TreeKey with TreeSortKeyDomainObject backing it.
+             *
+             * @param internalTreeSortKey TreeSortKeyDomainObject to be used internally
+             */
             public TreeKey(TreeSortKeyDomainObject internalTreeSortKey) {
                 this.internalTreeSortKey = internalTreeSortKey;
             }
 
+            /**
+             * Constructs TreeKey from a String, not digit characters are treated as a separator, so
+             * 1.3 and 1,3 produce the same key.
+             *
+             * @param treeSortKey a String to construct TreeKey from
+             */
             public TreeKey(String treeSortKey) {
                 internalTreeSortKey = new TreeSortKeyDomainObject(treeSortKey);
             }
 
+            /**
+             * Returns the number of levels in this tree key.
+             *
+             * @return int, number of levels
+             */
             public int getLevelCount() {
                 return internalTreeSortKey.getLevelCount();
             }
@@ -346,36 +510,50 @@ public int getLevelKey(int level) {
                 return internalTreeSortKey.getLevelKey(level - 1);
             }
 
+            /**
+             * Returns a string representation of this tree key in a form of numbers separated by periods('.')
+             *
+             * @return a String representing tree key in a form of numbers separated by periods('.')
+             */
             public String toString() {
                 return internalTreeSortKey.toString();
             }
         }
     }
 
+    /**
+     * Represents a menu in a {@link TextDocument}.
+     */
     public static class Menu {
         /**
-         * Menu sorted by headline.
+         * Menu sort order by headline.
          */
         public final static int SORT_BY_HEADLINE = MenuDomainObject.MENU_SORT_ORDER__BY_HEADLINE;
+
         /**
-         * Menu sorted by 'manual' order.
+         * Menu sort order by 'manual' order.
          */
         public final static int SORT_BY_MANUAL_ORDER_DESCENDING = MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED;
+
         /**
-         * Menu sorted by datetime.
+         * Menu sort order by datetime.
          */
         public final static int SORT_BY_MODIFIED_DATETIME_DESCENDING = MenuDomainObject.MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED;
+
         /**
-         * Menu sorted by tree sort order.
+         * Menu sort order by {@link com.imcode.imcms.api.TextDocument.MenuItem.TreeKey} order.
+         *
          * @deprecated Wrong name, use {@link #SORT_BY_TREE_ORDER_ASCENDING}.
          */
         public final static int SORT_BY_TREE_ORDER_DESCENDING = MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER;
+
         /**
-         * Menu sorted by tree sort order.
+         * Menu sort order by {@link com.imcode.imcms.api.TextDocument.MenuItem.TreeKey} order. Ascending.
          */
         public final static int SORT_BY_TREE_ORDER_ASCENDING = MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER;
+
         /**
-         * Menu sorted by tree sort order.
+         * Menu sort order by {@link com.imcode.imcms.api.Document#getPublicationStartDatetime()}. Descending.
          */
         public final static int SORT_BY_PUBLISHED_DATETIME_DESCENDING = MenuDomainObject.MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED;
 
@@ -386,7 +564,7 @@ public static class Menu {
         Menu(TextDocument document, int menuIndex) {
             internalTextDocument = document.getInternalTextDocument();
             this.menuIndex = menuIndex;
-            contentManagementSystem = document.getContentManagementSystem() ;
+            contentManagementSystem = document.getContentManagementSystem();
         }
 
         /**
@@ -395,7 +573,7 @@ public static class Menu {
          * @param documentToAdd the document to add
          */
         public void addDocument(Document documentToAdd) {
-            DocumentReference documentReference = new DirectDocumentReference( documentToAdd.getInternal() );
+            DocumentReference documentReference = new DirectDocumentReference(documentToAdd.getInternal());
             internalTextDocument.getMenu(menuIndex).addMenuItem(new MenuItemDomainObject(documentReference));
         }
 
@@ -409,87 +587,103 @@ public void removeDocument(Document documentToRemove) {
         }
 
         /**
-         * @param sortOrder One of {@link #SORT_BY_HEADLINE}, {@link #SORT_BY_MANUAL_ORDER_DESCENDING},
-         *                  {@link #SORT_BY_MODIFIED_DATETIME_DESCENDING}, or {@link #SORT_BY_TREE_ORDER_DESCENDING}
+         * Returns the sort order of this menu.
+         *
+         * @return sort order of this menu
          */
-        public void setSortOrder( int sortOrder ) {
-            internalTextDocument.getMenu( menuIndex ).setSortOrder( sortOrder );
+        public int getSortOrder() {
+            return internalTextDocument.getMenu(menuIndex).getSortOrder();
         }
 
-        public int getSortOrder() {
-            return internalTextDocument.getMenu( menuIndex ).getSortOrder();
+        /**
+         * @param sortOrder One of {@link #SORT_BY_HEADLINE}, {@link #SORT_BY_MANUAL_ORDER_DESCENDING},
+         *                  {@link #SORT_BY_MODIFIED_DATETIME_DESCENDING}, or {@link #SORT_BY_TREE_ORDER_DESCENDING}
+         */
+        public void setSortOrder(int sortOrder) {
+            internalTextDocument.getMenu(menuIndex).setSortOrder(sortOrder);
         }
 
         /**
-         * @return The visible menuitems in this menu.
+         * Returns menu items that current user can see.
+         *
+         * @return array of visible {@link MenuItem} in this menu.
          * @since 2.0
          */
         public MenuItem[] getVisibleMenuItems() {
             final UserDomainObject user = contentManagementSystem.getCurrentUser().getInternal();
             DocumentPredicate documentPredicate = new DocumentPredicate() {
-                public boolean evaluateDocument( DocumentDomainObject document ) {
-                    return user.canSeeDocumentInMenus( document ) ;
+                public boolean evaluateDocument(DocumentDomainObject document) {
+                    return user.canSeeDocumentInMenus(document);
                 }
             };
-            return getMenuItems( documentPredicate );
+            return getMenuItems(documentPredicate);
         }
 
         /**
+         * Returns documents the menu items hold in this menu that current user can see.
+         *
          * @return the documents returned by {@link #getVisibleMenuItems()}.
          * @since 2.0
          */
         public Document[] getVisibleDocuments() {
-            MenuItem[] menuItems = getVisibleMenuItems() ;
-            return getDocumentsFromMenuItems( menuItems ) ;
+            MenuItem[] menuItems = getVisibleMenuItems();
+            return getDocumentsFromMenuItems(menuItems);
         }
 
         /**
-         * @return The menuitems in this menu that the user can see or edit, excluding archived documents.
+         * Returns menu items in this menu that current user can see or edit, excluding archived documents.
+         * The menu items that have a missing document(due to deletion etc) are not returned.
+         *
+         * @return array of menuitems in this menu that the user can see or edit, excluding archived documents.
          */
         public MenuItem[] getMenuItems() {
             final UserDomainObject user = contentManagementSystem.getCurrentUser().getInternal();
-            return getMenuItems( new DocumentPredicate() {
-                public boolean evaluateDocument( DocumentDomainObject document ) {
-                    return user.canSeeDocumentInMenus( document ) || user.canEdit( document ) ;
+            return getMenuItems(new DocumentPredicate() {
+                public boolean evaluateDocument(DocumentDomainObject document) {
+                    return user.canSeeDocumentInMenus(document) || user.canEdit(document);
                 }
-            } ) ;
+            });
         }
 
         /**
-         * @return The menuitems in this menu that the user can see or edit, including archived documents.
+         * Returns menu items in this menu that current user can see or edit, excluding archived documents.
+         *
+         * @return array of menuitems in this menu that the user can see or edit, including archived documents.
          */
         public MenuItem[] getPublishedMenuItems() {
             final UserDomainObject user = contentManagementSystem.getCurrentUser().getInternal();
-            return getMenuItems( new DocumentPredicate() {
-                public boolean evaluateDocument( DocumentDomainObject document ) {
-                    return document.isPublished() && user.canSeeDocumentWhenEditingMenus( document ) ;
+            return getMenuItems(new DocumentPredicate() {
+                public boolean evaluateDocument(DocumentDomainObject document) {
+                    return document.isPublished() && user.canSeeDocumentWhenEditingMenus(document);
                 }
-            } ) ;
+            });
         }
 
         /**
+         * Returns documents contained in menu items returned by {@link #getMenuItems()}.
+         *
          * @return the documents returned by {@link #getMenuItems()}.
          */
         public Document[] getDocuments() {
             MenuItem[] menuItems = getMenuItems();
-            return getDocumentsFromMenuItems( menuItems );
+            return getDocumentsFromMenuItems(menuItems);
         }
 
-        private MenuItem[] getMenuItems( DocumentPredicate documentPredicate ) {
-            MenuItemDomainObject[] menuItemsDomainObjects = internalTextDocument.getMenu( menuIndex ).getMenuItems();
-            List menuItems = new ArrayList( menuItemsDomainObjects.length );
-            for ( MenuItemDomainObject menuItemDomainObject : menuItemsDomainObjects ) {
+        private MenuItem[] getMenuItems(DocumentPredicate documentPredicate) {
+            MenuItemDomainObject[] menuItemsDomainObjects = internalTextDocument.getMenu(menuIndex).getMenuItems();
+            List menuItems = new ArrayList(menuItemsDomainObjects.length);
+            for (MenuItemDomainObject menuItemDomainObject : menuItemsDomainObjects) {
                 DocumentDomainObject document = menuItemDomainObject.getDocument();
-                if ( documentPredicate.evaluateDocument(document) ) {
+                if (documentPredicate.evaluateDocument(document)) {
                     menuItems.add(new MenuItem(menuItemDomainObject, contentManagementSystem));
                 }
             }
-            return (MenuItem[])menuItems.toArray( new MenuItem[menuItems.size()] );
+            return (MenuItem[]) menuItems.toArray(new MenuItem[menuItems.size()]);
         }
 
-        private Document[] getDocumentsFromMenuItems( MenuItem[] menuItems ) {
+        private Document[] getDocumentsFromMenuItems(MenuItem[] menuItems) {
             Document[] documents = new Document[menuItems.length];
-            for ( int i = 0; i < menuItems.length; i++ ) {
+            for (int i = 0; i < menuItems.length; i++) {
                 MenuItem menuItem = menuItems[i];
                 documents[i] = menuItem.getDocument();
             }
diff --git a/server/src/com/imcode/imcms/api/TextDocumentViewing.java b/server/src/com/imcode/imcms/api/TextDocumentViewing.java
index 25219433d0..0180f5f809 100644
--- a/server/src/com/imcode/imcms/api/TextDocumentViewing.java
+++ b/server/src/com/imcode/imcms/api/TextDocumentViewing.java
@@ -6,52 +6,107 @@
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * An instance of this class is fetchable in JSPs included in text documents (with &lt;?imcms:include path="..."?&gt;)
- * via {@link #fromRequest(javax.servlet.http.HttpServletRequest)},
+ * Represents currently viewed TextDocument. Provides information if the current text document is in text, image, menu etc
+ * edit mode.
+ * An instance of this class is fetchable in JSPs included in text documents (with &lt;?imcms:include path="..."?&gt; or
+ * jsp:include) via {@link #fromRequest(javax.servlet.http.HttpServletRequest)},
  * and in velocity code in text templates as <code>$viewing</code>.
  *
  * @since 2.0
  */
 public class TextDocumentViewing {
 
+    private static final String REQUEST_ATTRIBUTE__VIEWING = TextDocumentViewing.class.getName();
     private TextDocument textDocument;
     private ParserParameters parserParameters;
 
-    private static final String REQUEST_ATTRIBUTE__VIEWING = TextDocumentViewing.class.getName();
-
-    public TextDocumentViewing( ParserParameters parserParameters ) {
+    public TextDocumentViewing(ParserParameters parserParameters) {
         this.parserParameters = parserParameters;
-        textDocument = new TextDocument( (TextDocumentDomainObject)parserParameters.getDocumentRequest().getDocument(), ContentManagementSystem.fromRequest( parserParameters.getDocumentRequest().getHttpServletRequest() ) );
+        textDocument = new TextDocument((TextDocumentDomainObject) parserParameters.getDocumentRequest().getDocument(), ContentManagementSystem.fromRequest(parserParameters.getDocumentRequest().getHttpServletRequest()));
+    }
+
+    /**
+     * Returns TextDocumentViewing from the given request
+     *
+     * @param request HttpServletRequest to get TextDocumentViewing from
+     * @return TextDocumentViewing or null, if the request doesn't have any set
+     */
+    public static TextDocumentViewing fromRequest(HttpServletRequest request) {
+        return (TextDocumentViewing) request.getAttribute(REQUEST_ATTRIBUTE__VIEWING);
     }
 
-    public static TextDocumentViewing fromRequest( HttpServletRequest request ) {
-        return (TextDocumentViewing)request.getAttribute( REQUEST_ATTRIBUTE__VIEWING );
+    /**
+     * Puts the given TextDocumentViewing object into request attribute and requests the one previously set.
+     *
+     * @param viewing TextDocumentViewing to put into request attribute.
+     * @return TextDocumentViewing that was previously in request attribute or null if none was before.
+     */
+    public static TextDocumentViewing putInRequest(TextDocumentViewing viewing) {
+        HttpServletRequest httpServletRequest = viewing.parserParameters.getDocumentRequest().getHttpServletRequest();
+        TextDocumentViewing previousViewing = fromRequest(httpServletRequest);
+        httpServletRequest.setAttribute(REQUEST_ATTRIBUTE__VIEWING, viewing);
+        return previousViewing;
     }
 
+    /**
+     * Returns currently viewed TextDocument
+     *
+     * @return currently viewed TextDocument
+     */
     public TextDocument getTextDocument() {
         return textDocument;
     }
 
+    /**
+     * Tests if current TextDocument is in edit mode(be it text, images, menus etc)
+     *
+     * @return true if current TextDocument is being edited, false otherwise
+     */
     public boolean isEditing() {
-        return parserParameters.isAnyMode() ;
+        return parserParameters.isAnyMode();
     }
 
+    /**
+     * Tests if current TextDocument is in text edit mode
+     *
+     * @return true if current TextDocument is in text edit mode, false otherwise
+     */
     public boolean isEditingTexts() {
         return parserParameters.isTextMode();
     }
 
+    /**
+     * Tests if current TextDocument is in image edit mode
+     *
+     * @return true if current TextDocument is in image edit mode, false otherwise
+     */
     public boolean isEditingImages() {
         return parserParameters.isImageMode();
     }
 
+    /**
+     * Tests if current TextDocument is in menu edit mode
+     *
+     * @return true if current TextDocument is in menu edit mode, false otherwise
+     */
     public boolean isEditingMenus() {
         return parserParameters.isMenuMode();
     }
 
+    /**
+     * Tests if current TextDocument is in include edit mode
+     *
+     * @return true if current TextDocument is in include edit mode, false otherwise
+     */
     public boolean isEditingIncludes() {
         return parserParameters.isIncludesMode();
     }
 
+    /**
+     * Tests if current TextDocument is in template edit mode
+     *
+     * @return true if current TextDocument is in template edit mode, false otherwise
+     */
     public boolean isEditingTemplate() {
         return parserParameters.isTemplateMode();
     }
@@ -63,11 +118,4 @@ public Integer getEditedMenuIndex() {
         return parserParameters.getEditingMenuIndex();
     }
 
-    public static TextDocumentViewing putInRequest( TextDocumentViewing viewing ) {
-        HttpServletRequest httpServletRequest = viewing.parserParameters.getDocumentRequest().getHttpServletRequest();
-        TextDocumentViewing previousViewing = fromRequest( httpServletRequest );
-        httpServletRequest.setAttribute( REQUEST_ATTRIBUTE__VIEWING, viewing );
-        return previousViewing ;
-    }
-
 }
diff --git a/server/src/com/imcode/imcms/api/UrlDocument.java b/server/src/com/imcode/imcms/api/UrlDocument.java
index 4d6beaf959..f638467c53 100644
--- a/server/src/com/imcode/imcms/api/UrlDocument.java
+++ b/server/src/com/imcode/imcms/api/UrlDocument.java
@@ -3,25 +3,41 @@
 import imcode.server.document.DocumentTypeDomainObject;
 import imcode.server.document.UrlDocumentDomainObject;
 
+/**
+ * Document that points to url.
+ */
 public class UrlDocument extends Document {
 
+    /**
+     * TYPE_ID of url document
+     */
     public final static int TYPE_ID = DocumentTypeDomainObject.URL_ID;
 
     UrlDocument(UrlDocumentDomainObject document, ContentManagementSystem contentManagementSystem) {
         super(document, contentManagementSystem);
     }
 
-    public void setUrl(String url ) {
-        UrlDocumentDomainObject urlDocumentDomainObject = getInternalUrlDocument();
-        urlDocumentDomainObject.setUrl( url );
-    }
-
     private UrlDocumentDomainObject getInternalUrlDocument() {
-        UrlDocumentDomainObject urlDocumentDomainObject = (UrlDocumentDomainObject)getInternal();
+        UrlDocumentDomainObject urlDocumentDomainObject = (UrlDocumentDomainObject) getInternal();
         return urlDocumentDomainObject;
     }
 
+    /**
+     * Returns url of this url document
+     *
+     * @return this url document's url
+     */
     public String getUrl() {
         return getInternalUrlDocument().getUrl();
     }
+
+    /**
+     * Sets url of this url document to the given one
+     *
+     * @param url a url
+     */
+    public void setUrl(String url) {
+        UrlDocumentDomainObject urlDocumentDomainObject = getInternalUrlDocument();
+        urlDocumentDomainObject.setUrl(url);
+    }
 }
diff --git a/server/src/com/imcode/imcms/api/User.java b/server/src/com/imcode/imcms/api/User.java
index 17b3f26f85..331a8fe9fc 100644
--- a/server/src/com/imcode/imcms/api/User.java
+++ b/server/src/com/imcode/imcms/api/User.java
@@ -4,57 +4,194 @@
 import imcode.server.user.RoleId;
 import imcode.server.user.UserDomainObject;
 
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * Class describing imcms user
+ */
 public class User {
     private UserDomainObject internalUser;
 
-    imcode.server.user.UserDomainObject getInternal() {
-        return internalUser;
+    User(UserDomainObject internalUser) {
+        this.internalUser = internalUser;
     }
 
-    User( UserDomainObject internalUser ) {
-        this.internalUser = internalUser;
+    imcode.server.user.UserDomainObject getInternal() {
+        return internalUser;
     }
 
+    /**
+     * Returns user id
+     *
+     * @return user id
+     */
     public int getId() {
         return internalUser.getId();
     }
 
+    /**
+     * Returns user login name
+     *
+     * @return login name
+     */
     public String getLoginName() {
         return internalUser.getLoginName();
     }
 
+    /**
+     * Sets this user's login name
+     *
+     * @param loginName login name
+     */
+    public void setLoginName(String loginName) {
+        internalUser.setLoginName(loginName);
+    }
+
+    /**
+     * Returns user company
+     *
+     * @return user company
+     */
     public String getCompany() {
         return internalUser.getCompany();
     }
 
+    /**
+     * Sets this user's company
+     *
+     * @param company user company
+     */
+    public void setCompany(String company) {
+        internalUser.setCompany(company);
+    }
+
+    /**
+     * Returns user first name
+     *
+     * @return first name
+     */
     public String getFirstName() {
         return internalUser.getFirstName();
     }
 
+    /**
+     * Sets this user's first name
+     *
+     * @param firstName user first name
+     */
+    public void setFirstName(String firstName) {
+        internalUser.setFirstName(firstName);
+    }
+
+    /**
+     * Returns user last name
+     *
+     * @return last name
+     */
     public String getLastName() {
         return internalUser.getLastName();
     }
 
+    /**
+     * Sets this user's last name
+     *
+     * @param lastName last name
+     */
+    public void setLastName(String lastName) {
+        internalUser.setLastName(lastName);
+    }
+
+    /**
+     * Returns user title(Mr., Mrs etc)
+     *
+     * @return user title
+     */
     public String getTitle() {
         return internalUser.getTitle();
     }
 
+    /**
+     * Sets user's title (ie Mr., Mrs etc)
+     *
+     * @param title user's title
+     */
+    public void setTitle(String title) {
+        internalUser.setTitle(title);
+    }
+
+    /**
+     * Returns address
+     *
+     * @return address
+     */
     public String getAddress() {
         return internalUser.getAddress();
     }
 
+    /**
+     * Sets this user's address
+     *
+     * @param address user address
+     */
+    public void setAddress(String address) {
+        internalUser.setAddress(address);
+    }
+
+    /**
+     * Returns user city
+     *
+     * @return user city
+     */
     public String getCity() {
         return internalUser.getCity();
     }
 
+    /**
+     * Sets this user's city
+     *
+     * @param city user city
+     */
+    public void setCity(String city) {
+        internalUser.setCity(city);
+    }
+
+    /**
+     * Returns zip code
+     *
+     * @return zip code
+     */
     public String getZip() {
         return internalUser.getZip();
     }
 
+    /**
+     * Sets user's zip code
+     *
+     * @param zip user zip code
+     */
+    public void setZip(String zip) {
+        internalUser.setZip(zip);
+    }
+
+    /**
+     * Returns country
+     *
+     * @return country
+     */
     public String getCountry() {
         return internalUser.getCountry();
     }
 
+    /**
+     * Sets this user's country
+     *
+     * @param country user country
+     */
+    public void setCountry(String country) {
+        internalUser.setCountry(country);
+    }
+
     /**
      * @deprecated Use {@link #getProvince()}. Will be removed in 4.0.
      */
@@ -62,80 +199,187 @@ public String getCountyCouncil() {
         return internalUser.getProvince();
     }
 
+    /**
+     * @deprecated Use {@link #setProvince(String)}. Will be removed in 4.0.
+     */
+    public void setCountyCouncil(String countyCouncil) {
+        internalUser.setProvince(countyCouncil);
+    }
+
+    /**
+     * Returns province
+     *
+     * @return province
+     */
     public String getProvince() {
         return internalUser.getProvince();
     }
 
+    /**
+     * Sets province
+     *
+     * @param province a string representing a province
+     */
     public void setProvince(String province) {
         internalUser.setProvince(province);
     }
 
+    /**
+     * Returns user's email address
+     *
+     * @return email address
+     */
     public String getEmailAddress() {
         return internalUser.getEmailAddress();
     }
 
+    /**
+     * Sets this user's email address
+     *
+     * @param emailAddress user email address
+     */
+    public void setEmailAddress(String emailAddress) {
+        internalUser.setEmailAddress(emailAddress);
+    }
+
     public String getOtherPhone() {
         return internalUser.getOtherPhone();
     }
 
+    /**
+     * Sets this user 'other' phone number. A number that doens't fall into any phone number category.
+     * Often used as storage for meta_id connected to the user.
+     *
+     * @param otherphone a string representing any phone.
+     */
+    public void setOtherPhone(String otherphone) {
+        internalUser.setOtherPhone(otherphone);
+    }
+
     public String getWorkPhone() {
         return internalUser.getWorkPhone();
     }
 
+    /**
+     * Sets user's work phone number
+     *
+     * @param workphone work phone number
+     */
+    public void setWorkPhone(String workphone) {
+        internalUser.setWorkPhone(workphone);
+    }
+
     public String getMobilePhone() {
         return internalUser.getMobilePhone();
     }
 
+    /**
+     * Sets this user's mobile phone number
+     *
+     * @param mobilephone a string representing this user's mobile phone number
+     */
+    public void setMobilePhone(String mobilephone) {
+        internalUser.setMobilePhone(mobilephone);
+    }
+
     public String getHomePhone() {
         return internalUser.getHomePhone();
     }
 
+    /**
+     * Sets this user's home phone number
+     *
+     * @param homephone a string representing this user's home phone number
+     */
+    public void setHomePhone(String homephone) {
+        internalUser.setHomePhone(homephone);
+    }
+
+    /**
+     * Indicates if the user is active
+     *
+     * @return true if the user is active, false othewise
+     */
     public boolean isActive() {
         return internalUser.isActive();
     }
 
+    /**
+     * Sets this user's active status
+     *
+     * @param active true to make this user active, false to make inactive
+     */
+    public void setActive(boolean active) {
+        internalUser.setActive(active);
+    }
+
+    /**
+     * Returns a String representation of this user, in form of user's login name.
+     *
+     * @return a string representing this user.
+     */
     public String toString() {
         return getLoginName();
     }
 
     /**
+     * Tests if this user possesses the given role
+     *
+     * @return true if the user has the given role
      * @since 2.0
      */
     public boolean hasRole(Role role) {
-        return internalUser.hasRoleId(role.getInternal().getId()) ;
+        return internalUser.hasRoleId(role.getInternal().getId());
     }
 
+    /**
+     * Tests if this user is a default one
+     *
+     * @return true if this user is a default one, false otherwise
+     */
     public boolean isDefaultUser() {
-        return internalUser.isDefaultUser() ;
+        return internalUser.isDefaultUser();
     }
 
+    /**
+     * Tests if this user is a super admin, meaning, possesses SuperAdmin role.
+     *
+     * @return true if this user is a super admin, false otherwise
+     */
     public boolean isSuperAdmin() {
-        return internalUser.isSuperAdmin() ;
+        return internalUser.isSuperAdmin();
     }
 
+    /**
+     * Tests if this user is a user admin, meaning, possesses UserAdmin role.
+     *
+     * @return true if this user is a user admin, false otherwise
+     */
     public boolean isUserAdmin() {
         return internalUser.isUserAdmin();
     }
 
+    /**
+     * Tests if this user can edit the given document
+     *
+     * @param document Document to be tested for this user's ability to be edited
+     * @return true if this user can edit the given document, false otherwise
+     */
     public boolean canEdit(Document document) {
-        return internalUser.canEdit(document.getInternal()) ;
+        return internalUser.canEdit(document.getInternal());
     }
 
-    public boolean equals( Object o ) {
-        if ( this == o ) {
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof User ) ) {
+        if (!(o instanceof User)) {
             return false;
         }
 
-        final User user = (User)o;
+        final User user = (User) o;
 
-        if ( internalUser != null ? !internalUser.equals( user.internalUser ) : user.internalUser != null ) {
-            return false;
-        }
-
-        return true;
+        return internalUser != null ? internalUser.equals(user.internalUser) : user.internalUser == null;
     }
 
     public int hashCode() {
@@ -143,29 +387,38 @@ public int hashCode() {
     }
 
     /**
+     * Returns user roles
+     *
+     * @return an array of Roles this user has.
      * @since 2.0
      */
     public Role[] getRoles() {
         RoleId[] roleDOs = internalUser.getRoleIds();
         Role[] roles = new Role[roleDOs.length];
-        for ( int i = 0; i < roleDOs.length; i++ ) {
+        for (int i = 0; i < roleDOs.length; i++) {
             roles[i] = new Role(Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().getRole(roleDOs[i]));
         }
-        return roles ;
+        return roles;
     }
 
     /**
+     * Replaces user's roles with the given ones
+     *
+     * @param roles an array of roles to replace user's roles with
      * @since 2.0
      */
     public void setRoles(Role[] roles) {
         RoleId[] roleIds = new RoleId[roles.length];
-        for ( int i = 0; i < roles.length; i++ ) {
+        for (int i = 0; i < roles.length; i++) {
             roleIds[i] = roles[i].getInternal().getId();
         }
-        internalUser.setRoleIds( roleIds );
+        internalUser.setRoleIds(roleIds);
     }
 
     /**
+     * Adds a role to this user
+     *
+     * @param role a Role to add
      * @since 2.0
      */
     public void addRole(Role role) {
@@ -173,104 +426,91 @@ public void addRole(Role role) {
     }
 
     /**
+     * Removes the given role from this user
+     *
+     * @param role a Role to remove
      * @since 2.0
      */
     public void removeRole(Role role) {
-        internalUser.removeRoleId(role.getInternal().getId()) ;
-    }
-
-    public void setActive( boolean active ) {
-        internalUser.setActive( active );
-    }
-
-    public void setAddress( String address ) {
-        internalUser.setAddress( address );
-    }
-
-    public void setCity( String city ) {
-        internalUser.setCity( city );
-    }
-
-    public void setCompany( String company ) {
-        internalUser.setCompany( company );
-    }
-
-    public void setCountry( String country ) {
-        internalUser.setCountry( country );
+        internalUser.removeRoleId(role.getInternal().getId());
     }
 
     /**
-     * @deprecated Use {@link #setProvince(String)}. Will be removed in 4.0.
+     * Returns this user's fax number
+     *
+     * @return user's fax number
      */
-    public void setCountyCouncil( String countyCouncil ) {
-        internalUser.setProvince( countyCouncil );
-    }
-
-    public void setEmailAddress( String emailAddress ) {
-        internalUser.setEmailAddress( emailAddress );
-    }
-
-    public void setFaxPhone( String faxphone ) {
-        internalUser.setFaxPhone( faxphone );
-    }
-
     public String getFaxPhone() {
         return internalUser.getFaxPhone();
     }
 
-    public void setFirstName( String firstName ) {
-        internalUser.setFirstName( firstName );
-    }
-
-    public void setHomePhone( String homephone ) {
-        internalUser.setHomePhone( homephone );
-    }
-
-    public void setLastName( String lastName ) {
-        internalUser.setLastName( lastName );
-    }
-
-    public void setLoginName( String loginName ) {
-        internalUser.setLoginName( loginName );
-    }
-
-    public void setMobilePhone( String mobilephone ) {
-        internalUser.setMobilePhone( mobilephone );
+    /**
+     * Sets this user's fax number
+     *
+     * @param faxphone a string representing user's fax number
+     */
+    public void setFaxPhone(String faxphone) {
+        internalUser.setFaxPhone(faxphone);
     }
 
-    public void setOtherPhone( String otherphone ) {
-        internalUser.setOtherPhone( otherphone );
+    /**
+     * Sets user's password
+     *
+     * @param password user password
+     */
+    public void setPassword(String password) {
+        internalUser.setPassword(password);
     }
 
-    public void setPassword( String password ) {
-        internalUser.setPassword( password );
+    /**
+     * Returns user's language.
+     *
+     * @return Language used by the user
+     */
+    public Language getLanguage() {
+        return Language.getLanguageByISO639_2(internalUser.getLanguageIso639_2());
     }
 
-    public void setTitle( String title ) {
-        internalUser.setTitle( title );
+    /**
+     * Sets user language. User language is used in some areas of imcms for internationalization.
+     *
+     * @param language Language used by this user
+     */
+    public void setLanguage(Language language) {
+        internalUser.setLanguageIso639_2(language.getIsoCode639_2());
     }
 
-    public void setWorkPhone( String workphone ) {
-        internalUser.setWorkPhone( workphone );
+    /**
+     * Returns session id associated with this user.
+     *
+     * @return a String with user session id
+     */
+    public String getSessionId() {
+        return internalUser.getSessionId();
     }
 
-    public void setZip( String zip ) {
-        internalUser.setZip( zip );
+    /**
+     * Sets user's session id
+     *
+     * @param sessionId String do be used as this user's session id
+     */
+    public void setSessionId(String sessionId) {
+        internalUser.setSessionId(sessionId);
     }
 
-    public void setLanguage( Language language ) {
-        internalUser.setLanguageIso639_2( language.getIsoCode639_2() );
+    public Map<String, String> getProperties() {
+        return internalUser.getProperties();
     }
 
-    public Language getLanguage() {
-        return Language.getLanguageByISO639_2( internalUser.getLanguageIso639_2() ) ;
+    public void setProperties(Map<String, String> properties) {
+        internalUser.setProperties(properties);
     }
 
-    public String getSessionId() {
-        return internalUser.getSessionId();
+    public Date getLastLoginDate() {
+        return internalUser.getLastLoginDate();
     }
 
-    public void setSessionId(String sessionId) {
-        internalUser.setSessionId(sessionId);
+    public void setLastLoginDate(Date lastLoginDate) {
+        internalUser.setLastLoginDate(lastLoginDate);
     }
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/UserAlreadyExistsException.java b/server/src/com/imcode/imcms/api/UserAlreadyExistsException.java
index 994bf170c4..4265aa2188 100644
--- a/server/src/com/imcode/imcms/api/UserAlreadyExistsException.java
+++ b/server/src/com/imcode/imcms/api/UserAlreadyExistsException.java
@@ -1,5 +1,8 @@
 package com.imcode.imcms.api;
 
+/**
+ * Thrown when saving users, indicating that a user with given name already exists.
+ */
 public class UserAlreadyExistsException extends AlreadyExistsException {
 
     public UserAlreadyExistsException(String message, Throwable cause) {
diff --git a/server/src/com/imcode/imcms/api/UserService.java b/server/src/com/imcode/imcms/api/UserService.java
index 197bf86a2b..8bc26c6df2 100644
--- a/server/src/com/imcode/imcms/api/UserService.java
+++ b/server/src/com/imcode/imcms/api/UserService.java
@@ -1,196 +1,316 @@
 package com.imcode.imcms.api;
 
-import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
-import imcode.server.user.NameTooLongException;
-import imcode.server.user.RoleDomainObject;
-import imcode.server.user.UserDomainObject;
+import com.imcode.imcms.model.ExternalUser;
+import imcode.server.Imcms;
+import imcode.server.user.*;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
+import java.security.SecureRandom;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
 
-public class UserService {
+/**
+ * In charge of {@link User} and {@link Role} operations, such as look up, creation, deletion and saving as well as sending out password reminder
+ * emails.
+ */
+public class UserService implements ExternalUserService {
 
+    private static final Logger log = LogManager.getLogger(UserService.class);
+    private static final SecureRandom RANDOM = new SecureRandom();
     private ContentManagementSystem contentManagementSystem;
 
-    public UserService( ContentManagementSystem contentManagementSystem ) {
+    /**
+     * Returns UserService with given cms
+     *
+     * @param contentManagementSystem cms used by UserService
+     */
+    public UserService(ContentManagementSystem contentManagementSystem) {
         this.contentManagementSystem = contentManagementSystem;
     }
 
     private ImcmsAuthenticatorAndUserAndRoleMapper getMapper() {
-        return contentManagementSystem.getInternal().getImcmsAuthenticatorAndUserAndRoleMapper() ;
+        return contentManagementSystem.getInternal().getImcmsAuthenticatorAndUserAndRoleMapper();
     }
 
+    /**
+     * Returns all users in cms
+     *
+     * @return An array containing all users in cms
+     * @throws NoPermissionException see {@link NoPermissionException}
+     */
     public User[] getAllUsers() throws NoPermissionException {
 
         UserDomainObject[] internalUsers = getMapper().getAllUsers();
         User[] result = new User[internalUsers.length];
-        for( int i = 0; i < result.length; i++ ) {
+        for (int i = 0; i < result.length; i++) {
             UserDomainObject internalUser = internalUsers[i];
-            result[i] = new User( internalUser );
+            result[i] = new User(internalUser);
         }
         return result;
     }
 
+    /**
+     * Returns a list of users with given role
+     *
+     * @param role that users in the returned list should have
+     * @return List of users with the given role.
+     */
     public List<User> getUsersWithRole(Role role) {
-        User[] allUsersWithRole = getAllUsersWithRole(role) ;
-        return new ArrayList<User>(Arrays.asList(allUsersWithRole)) ;
+        User[] allUsersWithRole = getAllUsersWithRole(role);
+        return new ArrayList<>(Arrays.asList(allUsersWithRole));
     }
 
     /**
-     @param userId
-     @return User with the specified id, or null if none.
-     **/
-    public User getUser( int userId ) {
-        return wrapUser(getMapper().getUser( userId ));
+     * Returns user by given id.
+     *
+     * @param userId user id to look user by
+     * @return User with the specified id, or null if none.
+     */
+    public User getUser(int userId) {
+        return wrapUser(getMapper().getUser(userId));
     }
 
     private User wrapUser(UserDomainObject internalUser) {
         if (null == internalUser) {
-            return null ;
+            return null;
         }
-        return new User( internalUser );
+        return new User(internalUser);
     }
 
     /**
-        @param userLoginName
-        @return User with the specified login name, or null if none.
-    **/
-     public User getUser( String userLoginName ) {
-        return wrapUser(getMapper().getUser( userLoginName ));
+     * Returns user with given name
+     *
+     * @param userLoginName name to look user by.
+     * @return User with the specified login name, or null if none.
+     */
+    public User getUser(String userLoginName) {
+        return wrapUser(getMapper().getUser(userLoginName));
     }
 
     /**
+     * Returns all users in the cms
+     *
+     * @return An array of all roles in the cms
      * @since 2.0
      */
     public Role[] getAllRoles() throws NoPermissionException {
         RoleDomainObject[] roleDOs = getMapper().getAllRoles();
-        Role[] roles = new Role[roleDOs.length] ;
-        for ( int i = 0; i < roleDOs.length; i++ ) {
+        Role[] roles = new Role[roleDOs.length];
+        for (int i = 0; i < roleDOs.length; i++) {
             roles[i] = new Role(roleDOs[i]);
         }
-        return roles ;
+        return roles;
     }
 
     /**
+     * Returns role specified by given id.
+     *
+     * @param roleId role id to look role by
+     * @return Role with given id or null if such role doesn't exist.
      * @since 2.0
      */
-    public Role getRole( int roleId ) {
-        RoleDomainObject roleDO = getMapper().getRoleById( roleId );
-        return null == roleDO ? null : new Role( roleDO );
+    public Role getRole(int roleId) {
+        RoleDomainObject roleDO = getMapper().getRoleById(roleId);
+        return null == roleDO ? null : new Role(roleDO);
     }
 
     /**
+     * Returns role specified by given name
+     *
+     * @param roleName role's name
+     * @return Role with given name or null if such role doesn't exist
      * @since 2.0
      */
-    public Role getRole( String roleName ) {
-        RoleDomainObject roleDO = getMapper().getRoleByName( roleName );
-        return null == roleDO ? null : new Role( roleDO );
+    public Role getRole(String roleName) {
+        RoleDomainObject roleDO = getMapper().getRoleByName(roleName);
+        return null == roleDO ? null : new Role(roleDO);
     }
 
     /**
+     * Deletes given role from cms
+     *
+     * @param role to be deleted
+     * @throws NoPermissionException see {@link NoPermissionException}
      * @since 2.0
      */
-    public void deleteRole( Role role ) throws NoPermissionException {
-        getMapper().deleteRole( role.getInternal() );
+    public void deleteRole(Role role) throws NoPermissionException {
+        getMapper().deleteRole(role.getInternal());
     }
 
     /**
+     * Returns an array of users with given role.
+     *
+     * @param role that users should have to be included in the returned array
+     * @return Array of users with given role
+     * @throws NoPermissionException see {@link NoPermissionException}
      * @since 2.0
      */
-    public User[] getAllUsersWithRole( Role role ) throws NoPermissionException {
-        UserDomainObject[] internalUsersWithRole = getMapper().getAllUsersWithRole( role.getInternal() );
+    public User[] getAllUsersWithRole(Role role) throws NoPermissionException {
+        UserDomainObject[] internalUsersWithRole = getMapper().getAllUsersWithRole(role.getInternal());
 
         User[] users = new User[internalUsersWithRole.length];
-        for( int i = 0; i < internalUsersWithRole.length; i++ ) {
+        for (int i = 0; i < internalUsersWithRole.length; i++) {
             UserDomainObject user = internalUsersWithRole[i];
-            users[i] = new User( user );
+            users[i] = new User(user);
         }
 
         return users;
     }
 
     /**
+     * Creates new role with given name, returned role is not persisted by this method in cms.
+     *
+     * @param roleName name given to new role
+     * @return new role
+     * @see UserService#saveRole(Role role)
      * @since 2.0
      */
-    public Role createNewRole( String roleName ) {
-        return new Role( new RoleDomainObject( roleName ) );
+    public Role createNewRole(String roleName) {
+        return new Role(new RoleDomainObject(roleName));
     }
 
     /**
-     * @throws NoPermissionException unless superadmin.
+     * Saves exisiting or a not yet persisted role in cms.
+     *
+     * @throws NoPermissionException  unless superadmin.
      * @throws AlreadyExistsException if another role with the same name exists.
-     * @throws SaveException if the name is too long.
+     * @throws SaveException          if the name is too long.
      * @since 2.0
      */
-    public void saveRole( Role role ) throws NoPermissionException, SaveException {
+    public void saveRole(Role role) throws NoPermissionException, SaveException {
         if (null == role) {
-            return ;
+            return;
         }
         try {
-            getMapper().saveRole(role.getInternal()) ;
-        } catch ( imcode.server.user.RoleAlreadyExistsException icvse ) {
-            throw new RoleAlreadyExistsException("A role with the name \""+role.getName()+"\" already exists.", icvse) ;
-        } catch( NameTooLongException stle ) {
-            throw new SaveException( "Role name too long.", stle);
+            getMapper().saveRole(role.getInternal());
+        } catch (imcode.server.user.RoleAlreadyExistsException icvse) {
+            throw new RoleAlreadyExistsException("A role with the name \"" + role.getName() + "\" already exists.", icvse);
+        } catch (NameTooLongException stle) {
+            throw new SaveException("Role name too long.", stle);
         }
     }
 
     /**
-     * Create a new user. Don't forget to call {@link #saveUser(User)}.
+     * Creates a new user.
+     *
      * @param loginName The user's login name
-     * @param password The user's password
+     * @param password  The user's password
      * @return A new user
      */
-    public User createNewUser( String loginName, String password ) {
+    public User createNewUser(String loginName, String password) {
         UserDomainObject internalUser = new UserDomainObject();
-        internalUser.setLoginName( loginName );
-        internalUser.setPassword( password );
-        internalUser.setLanguageIso639_2( contentManagementSystem.getInternal().getLanguageMapper().getDefaultLanguage() );
-        internalUser.setActive( true );
-        return new User( internalUser );
+        internalUser.setLoginName(loginName);
+        internalUser.setPassword(password);
+        internalUser.setLanguageIso639_2(contentManagementSystem.getInternal().getLanguageMapper().getDefaultLanguage());
+        internalUser.setActive(true);
+        return new User(internalUser);
     }
 
-    public void saveUser( User user ) throws NoPermissionException, SaveException {
+    /**
+     * Saves changes made to the given existing user or a new user.
+     *
+     * @param user user to save
+     * @throws NoPermissionException see {@link NoPermissionException}
+     * @throws SaveException         if the user being saved has a login name that another user in the system already has
+     */
+    public void saveUser(User user) throws NoPermissionException, SaveException {
         if (null == user) {
-            return ;
+            return;
         }
         try {
             ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper = getMapper();
             if (0 == user.getId()) {
-                imcmsAuthenticatorAndUserAndRoleMapper.addUser(user.getInternal()) ;
+                imcmsAuthenticatorAndUserAndRoleMapper.addUser(user.getInternal());
             } else {
                 imcmsAuthenticatorAndUserAndRoleMapper.saveUser(user.getInternal());
             }
-        } catch ( imcode.server.user.UserAlreadyExistsException uaee ) {
-            throw new UserAlreadyExistsException( "A user with the login name \""+user.getLoginName()+"\" already exists.", uaee ) ;
+        } catch (imcode.server.user.UserAlreadyExistsException uaee) {
+            throw new UserAlreadyExistsException("A user with the login name \"" + user.getLoginName() + "\" already exists.", uaee);
         }
     }
 
 
+    /**
+     * Updates given user's session
+     *
+     * @param user whose session to update
+     */
     public void updateUserSession(User user) {
         getMapper().updateUserSessionId(user.getInternal());
     }
 
+    /**
+     * Updates unique user code used in cookie set for the given user
+     *
+     * @param user whose cookie code to update
+     * @see imcode.util.Utility#setRememberCdCookie(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, String)
+     */
+    public void updateUserRememberCd(UserDomainObject user) {
+        String code = generateNewRememberCd(user);
+        user.setRememberCd(code);
+
+        getMapper().updateUserRememberCd(user);
+    }
+
+    public String generateNewRememberCd(UserDomainObject user){
+        long rand = 0L;
+
+        synchronized (RANDOM) {
+            rand = RANDOM.nextLong();
+        }
+
+        return DigestUtils.shaHex(Integer.toString(user.getId()) + Long.toString(rand));
+    }
+
     /**
      * Send a password reminder mail
      *
-     * @param user The user to send mail to
-     * @param fromAddress The address to send from
-     * @param subject The subject of the mail
-     * @param body The body of the mail, containing a placeholder for the password
+     * @param user                         The user to send mail to
+     * @param fromAddress                  The address to send from
+     * @param subject                      The subject of the mail
+     * @param body                         The body of the mail, containing a placeholder for the password
      * @param bodyPasswordPlaceHolderRegex Is replaced with the password in the body.
-     * @throws MailException
+     * @throws MailException if the email can't be sent due to unavailability of a mail server or invalid
+     *                       attributes in the {@link Mail} object, such as sender address, destination addresses, cc, bcc addresses etc.
      */
     public void sendPasswordReminderMail(User user, String fromAddress, String subject, String body, String bodyPasswordPlaceHolderRegex) throws MailException {
         UserDomainObject userDO = user.getInternal();
         String password = userDO.getPassword();
-        String bodyWithPassword = body.replaceAll(bodyPasswordPlaceHolderRegex, password) ;
+        String bodyWithPassword = body.replaceAll(bodyPasswordPlaceHolderRegex, password);
         Mail mail = new Mail(fromAddress);
         mail.setSubject(subject);
         mail.setBody(bodyWithPassword);
-        mail.setToAddresses(new String[] {userDO.getEmailAddress()});
+        mail.setToAddresses(new String[]{userDO.getEmailAddress()});
         MailService mailService = contentManagementSystem.getMailService();
         mailService.sendMail(mail);
     }
+
+    @Override
+    public ExternalUser saveExternalUser(ExternalUser user) {
+
+        user.setRoleIds((Imcms.getServices().getExternalToLocalRoleLinkService()
+                .toLinkedLocalRoles(user.getExternalRoles())
+                .stream()
+                .map(RoleDomainObject::getId)
+                .distinct()
+                .toArray(RoleId[]::new)));
+
+        final User savedUser = getUser(user.getLoginName());
+
+        if (null != savedUser) {
+            user.setId(savedUser.getId());
+        }
+
+        try {
+            saveUser(new User(user.clone()));
+        } catch (SaveException e) {
+            e.printStackTrace();
+            log.error(String.format("User with id %d wasn't saved!", user.getId()));
+        }
+
+        return user;
+    }
 }
diff --git a/server/src/com/imcode/imcms/api/contrib/DateTextFieldTextDocumentComparator.java b/server/src/com/imcode/imcms/api/contrib/DateTextFieldTextDocumentComparator.java
index a505814a23..ce19338f8a 100644
--- a/server/src/com/imcode/imcms/api/contrib/DateTextFieldTextDocumentComparator.java
+++ b/server/src/com/imcode/imcms/api/contrib/DateTextFieldTextDocumentComparator.java
@@ -10,85 +10,94 @@
 import java.util.Date;
 
 /**
- * Compares text-documents by a date in a textfield.
+ * Compares text documents by a date in a textfield.
  *
- * @author Anders Flodell, Vetenskapsrådet
- * @author Pontus Amberg, Vetenskapsrådet
+ * @author Anders Flodell, Vetenskapsrådet
+ * @author Pontus Amberg, Vetenskapsrådet
  */
 public class DateTextFieldTextDocumentComparator extends Document.Comparator {
 
     private String datePattern = DateConstants.DATE_FORMAT_STRING;
     private int textFieldNumber;
 
-    public DateTextFieldTextDocumentComparator( int textFieldNumber ) {
+    /**
+     * Constructs DateTextFieldTextDocumentComparator using the given {@link com.imcode.imcms.api.TextDocument.TextField}
+     * index.
+     *
+     * @param textFieldNumber {@link com.imcode.imcms.api.TextDocument.TextField} index in a {@link TextDocument}
+     */
+    public DateTextFieldTextDocumentComparator(int textFieldNumber) {
         this.textFieldNumber = textFieldNumber;
     }
 
-    public DateTextFieldTextDocumentComparator( int textFieldNumber, String datePattern ) {
-        this(textFieldNumber) ;
+    /**
+     * Constructs DateTextFieldTextDocumentComparator using the given {@link com.imcode.imcms.api.TextDocument.TextField}
+     * index and a string representing a pattern used for parsing dates.
+     *
+     * @param textFieldNumber {@link com.imcode.imcms.api.TextDocument.TextField} index in a {@link TextDocument}
+     * @param datePattern     a String representing a pattern used for parsing dates.
+     */
+    public DateTextFieldTextDocumentComparator(int textFieldNumber, String datePattern) {
+        this(textFieldNumber);
         this.datePattern = datePattern;
     }
 
-    private int compareDate( Date date1, Date date2 ) {
-        if ( date1 == null && date2 == null ) {
+    private int compareDate(Date date1, Date date2) {
+        if (date1 == null && date2 == null) {
             return 0;
         }
-        if ( date1 == null ) {
+        if (date1 == null) {
             return -1;
         }
-        if ( date2 == null ) {
+        if (date2 == null) {
             return 1;
         }
-        return date1.compareTo( date2 );
+        return date1.compareTo(date2);
     }
 
-    private int compareDateStrings( String s1, String s2 ) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat( datePattern );
+    private int compareDateStrings(String s1, String s2) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(datePattern);
         Date date1 = null;
         Date date2 = null;
-        if ( StringUtils.isBlank( s1 ) && StringUtils.isBlank( s2 ) ) {
+        if (StringUtils.isBlank(s1) && StringUtils.isBlank(s2)) {
             return 0;
         }
-        if ( StringUtils.isBlank( s1 ) ) {
+        if (StringUtils.isBlank(s1)) {
             return -1;
         }
-        if ( StringUtils.isBlank( s2 ) ) {
+        if (StringUtils.isBlank(s2)) {
             return 1;
         }
         try {
-            date1 = simpleDateFormat.parse( s1 );
-        } catch ( ParseException ex ) { }
+            date1 = simpleDateFormat.parse(s1);
+        } catch (ParseException ex) {
+        }
         try {
-            date2 = simpleDateFormat.parse( s2 );
-        } catch ( ParseException ex1 ) { }
-        return compareDate( date1, date2 );
+            date2 = simpleDateFormat.parse(s2);
+        } catch (ParseException ex1) {
+        }
+        return compareDate(date1, date2);
     }
 
-    protected int compareDocuments( Document d1, Document d2 ) {
+    protected int compareDocuments(Document d1, Document d2) {
         TextDocument textDocument1 = (TextDocument) d1;
         TextDocument textDocument2 = (TextDocument) d2;
         int result;
-        if ( textDocument1 == null && textDocument2 == null ) {
+        if (textDocument1 == null && textDocument2 == null) {
             return 0;
         }
-        if ( textDocument1 == null ) {
+        if (textDocument1 == null) {
             return -1;
         }
-        if ( textDocument2 == null ) {
+        if (textDocument2 == null) {
             return 1;
         }
         result = compareDateStrings(textDocument1.getTextField(this.textFieldNumber).getText(),
-                                    textDocument2.getTextField(this.textFieldNumber).getText());
-        if ( result != 0 ) {
+                textDocument2.getTextField(this.textFieldNumber).getText());
+        if (result != 0) {
             return result;
         }
 
-        if ( textDocument1.getId() > textDocument2.getId() ) {
-            return 1;
-        } else if ( textDocument1.getId() < textDocument2.getId() ) {
-            return -1;
-        } else {
-            return 0;
-        }
+        return Integer.compare(textDocument1.getId(), textDocument2.getId());
     }
 }
diff --git a/server/src/com/imcode/imcms/db/AddVarcharColumnUpgrade.java b/server/src/com/imcode/imcms/db/AddVarcharColumnUpgrade.java
index 33287ddeb6..bda8fd697e 100644
--- a/server/src/com/imcode/imcms/db/AddVarcharColumnUpgrade.java
+++ b/server/src/com/imcode/imcms/db/AddVarcharColumnUpgrade.java
@@ -22,8 +22,8 @@ class AddVarcharColumnUpgrade extends ImcmsDatabaseUpgrade {
     private String tableName;
 
     protected AddVarcharColumnUpgrade(org.apache.ddlutils.model.Database ddl,
-            String tableName, String previousColumnName,
-                            String name, int size, boolean required) {
+                                      String tableName, String previousColumnName,
+                                      String name, int size, boolean required) {
         super(ddl);
         this.tableName = tableName;
 
@@ -49,7 +49,7 @@ protected Object executeSqlBuilder(DatabaseConnection databaseConnection,
                 acc.setAtEnd(true);
                 changes.add(acc);
                 sqlBuilder.processChanges(actualDdl, actualDdl, changes, null);
-                return null ;
+                return null;
             }
         });
     }
diff --git a/server/src/com/imcode/imcms/db/ColumnSizeUpgrade.java b/server/src/com/imcode/imcms/db/ColumnSizeUpgrade.java
index 36ea8e19b1..8e9c80ef0a 100644
--- a/server/src/com/imcode/imcms/db/ColumnSizeUpgrade.java
+++ b/server/src/com/imcode/imcms/db/ColumnSizeUpgrade.java
@@ -3,15 +3,15 @@
 import com.imcode.db.Database;
 import com.imcode.db.DatabaseConnection;
 import com.imcode.db.DatabaseException;
-import org.apache.ddlutils.platform.SqlBuilder;
-import org.apache.ddlutils.alteration.ModelChange;
 import org.apache.ddlutils.alteration.ColumnSizeChange;
+import org.apache.ddlutils.alteration.ModelChange;
 import org.apache.ddlutils.model.Column;
 import org.apache.ddlutils.model.Table;
+import org.apache.ddlutils.platform.SqlBuilder;
 
-import java.util.List;
-import java.util.ArrayList;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 class ColumnSizeUpgrade extends ImcmsDatabaseUpgrade {
 
@@ -38,7 +38,7 @@ protected Object executeSqlBuilder(DatabaseConnection databaseConnection,
                 final List<ModelChange> changes = new ArrayList();
                 changes.add(new ColumnSizeChange(actualTable, column, columnSize, 0));
                 sqlBuilder.processChanges(actualDdl, actualDdl, changes, null);
-                return null ;
+                return null;
             }
         });
     }
diff --git a/server/src/com/imcode/imcms/db/CompositeUpgrade.java b/server/src/com/imcode/imcms/db/CompositeUpgrade.java
index a444c70617..3c0e96a246 100644
--- a/server/src/com/imcode/imcms/db/CompositeUpgrade.java
+++ b/server/src/com/imcode/imcms/db/CompositeUpgrade.java
@@ -4,20 +4,19 @@
 import com.imcode.db.DatabaseException;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class CompositeUpgrade implements DatabaseUpgrade {
 
-    List<DatabaseUpgrade> upgrades = new ArrayList() ;
+    List<DatabaseUpgrade> upgrades = new ArrayList();
 
     public CompositeUpgrade(DatabaseUpgrade... ups) {
-        for (DatabaseUpgrade upgrade : ups) {
-            upgrades.add(upgrade);
-        }
+        Collections.addAll(upgrades, ups);
     }
 
     public void upgrade(Database database) throws DatabaseException {
-        for ( DatabaseUpgrade upgrade : upgrades ) {
+        for (DatabaseUpgrade upgrade : upgrades) {
             upgrade.upgrade(database);
         }
     }
diff --git a/server/src/com/imcode/imcms/db/CreateTableUpgrade.java b/server/src/com/imcode/imcms/db/CreateTableUpgrade.java
index 64e8eea340..16816b8def 100644
--- a/server/src/com/imcode/imcms/db/CreateTableUpgrade.java
+++ b/server/src/com/imcode/imcms/db/CreateTableUpgrade.java
@@ -1,20 +1,10 @@
 package com.imcode.imcms.db;
 
-import com.imcode.db.DatabaseConnection;
 import com.imcode.db.DatabaseException;
 import com.imcode.imcms.db.refactoring.DatabasePlatform;
 import com.imcode.imcms.db.refactoring.model.DdlUtilsTable;
-import org.apache.ddlutils.alteration.AddTableChange;
-import org.apache.ddlutils.alteration.ModelChange;
-import org.apache.ddlutils.alteration.AddForeignKeyChange;
 import org.apache.ddlutils.model.Database;
 import org.apache.ddlutils.model.Table;
-import org.apache.ddlutils.model.ForeignKey;
-import org.apache.ddlutils.platform.SqlBuilder;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class CreateTableUpgrade extends ImcmsDatabaseUpgrade {
 
diff --git a/server/src/com/imcode/imcms/db/DatabaseTypeSpecificUpgrade.java b/server/src/com/imcode/imcms/db/DatabaseTypeSpecificUpgrade.java
index 6f38f179d2..0bbedfe8e5 100644
--- a/server/src/com/imcode/imcms/db/DatabaseTypeSpecificUpgrade.java
+++ b/server/src/com/imcode/imcms/db/DatabaseTypeSpecificUpgrade.java
@@ -4,14 +4,13 @@
 import com.imcode.db.DatabaseCommand;
 import com.imcode.db.DatabaseConnection;
 import com.imcode.db.DatabaseException;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-
 import org.apache.ddlutils.PlatformUtils;
 import org.apache.ddlutils.platform.mssql.MSSqlPlatform;
 import org.apache.ddlutils.platform.mysql.MySqlPlatform;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
+
 abstract class DatabaseTypeSpecificUpgrade extends ImcmsDatabaseUpgrade {
 
     protected DatabaseTypeSpecificUpgrade(org.apache.ddlutils.model.Database ddl) {
@@ -27,9 +26,9 @@ public Object executeOn(DatabaseConnection databaseConnection) throws DatabaseEx
                 return platformUtils.determineDatabaseType(dataSource);
             }
         });
-        if ( MSSqlPlatform.DATABASENAME.equals(databaseName) ) {
+        if (MSSqlPlatform.DATABASENAME.equals(databaseName)) {
             upgradeMssql(database);
-        } else if ( MySqlPlatform.DATABASENAME.equals(databaseName) ) {
+        } else if (MySqlPlatform.DATABASENAME.equals(databaseName)) {
             upgradeMysql(database);
         } else {
             upgradeOther(database);
diff --git a/server/src/com/imcode/imcms/db/DatabaseUtils.java b/server/src/com/imcode/imcms/db/DatabaseUtils.java
index 58e87309da..37ad257359 100644
--- a/server/src/com/imcode/imcms/db/DatabaseUtils.java
+++ b/server/src/com/imcode/imcms/db/DatabaseUtils.java
@@ -1,18 +1,28 @@
 package com.imcode.imcms.db;
 
+import com.imcode.db.DatabaseCommand;
 import com.imcode.db.DatabaseConnection;
+import com.imcode.db.DatabaseException;
+import com.imcode.db.mock.MockDatabase;
 import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
 import org.apache.ddlutils.Platform;
 import org.apache.ddlutils.PlatformFactory;
-import org.apache.ddlutils.model.Database;
+import org.apache.ddlutils.PlatformUtils;
 import org.apache.ddlutils.io.DatabaseIO;
+import org.apache.ddlutils.model.Database;
+import org.apache.ddlutils.platform.mssql.MSSqlPlatform;
 
+import javax.sql.DataSource;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.sql.Connection;
 
 public class DatabaseUtils {
 
+    private static String currentDatabaseName = null;
+
     private DatabaseUtils() {
     }
 
@@ -25,4 +35,27 @@ public static Database getWantedDdl() throws IOException {
     public static Platform getPlatform(DatabaseConnection databaseConnection) {
         return PlatformFactory.createNewPlatformInstance(new SingleConnectionDataSource(databaseConnection.getConnection()));
     }
+
+    public static String getCurrentDatabaseName(ImcmsServices services) {
+        if (currentDatabaseName == null) {
+            com.imcode.db.Database database = services.getDatabase();
+            if (database instanceof MockDatabase) {
+                currentDatabaseName = "mock";
+            } else {
+                currentDatabaseName = (String) services.getDatabase().execute(new DatabaseCommand() {
+                    public Object executeOn(DatabaseConnection databaseConnection) throws DatabaseException {
+                        final Connection connection = databaseConnection.getConnection();
+                        DataSource dataSource = new SingleConnectionDataSource(connection);
+                        PlatformUtils platformUtils = new PlatformUtils();
+                        return platformUtils.determineDatabaseType(dataSource);
+                    }
+                });
+            }
+        }
+        return currentDatabaseName;
+    }
+
+    public static boolean isDatabaseMSSql(ImcmsServices services) {
+        return MSSqlPlatform.DATABASENAME.equals(getCurrentDatabaseName(services));
+    }
 }
diff --git a/server/src/com/imcode/imcms/db/DatabaseVersion.java b/server/src/com/imcode/imcms/db/DatabaseVersion.java
index 6add2b0e53..683d7beed1 100644
--- a/server/src/com/imcode/imcms/db/DatabaseVersion.java
+++ b/server/src/com/imcode/imcms/db/DatabaseVersion.java
@@ -1,44 +1,59 @@
 package com.imcode.imcms.db;
 
-public class DatabaseVersion implements Comparable {
+public class DatabaseVersion implements Comparable<DatabaseVersion> {
 
-    private final int majorVersion ;
-    private final int minorVersion ;
+    private final int majorVersion;
+    private final int minorVersion;
+    private final int clientVersion;
 
     public DatabaseVersion(int majorVersion, int minorVersion) {
+        this(majorVersion, minorVersion, 0);
+    }
+
+    public DatabaseVersion(int majorVersion, int minorVersion, int clientVersion) {
         this.majorVersion = majorVersion;
         this.minorVersion = minorVersion;
+        this.clientVersion = clientVersion;
     }
 
-    public int compareTo(Object o) {
-        DatabaseVersion other = (DatabaseVersion) o ;
-        int result = new Integer(majorVersion).compareTo(new Integer(other.majorVersion));
+    public DatabaseVersion(String... versions) {
+        this.majorVersion = Integer.parseInt(versions[0]);
+        this.minorVersion = Integer.parseInt(versions[1]);
+
+        this.clientVersion = (versions.length == 3)
+                ? Integer.parseInt(versions[2])
+                : 0;
+    }
+
+    public int compareTo(DatabaseVersion other) {
+        int result = Integer.compare(majorVersion, other.majorVersion);
+        if (0 == result) {
+            result = Integer.compare(minorVersion, other.minorVersion);
+        }
         if (0 == result) {
-            result = new Integer(minorVersion).compareTo(new Integer(other.minorVersion));
+            result = Integer.compare(clientVersion, other.clientVersion);
         }
-        return result ;
+        return result;
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
         final DatabaseVersion that = (DatabaseVersion) o;
 
-        if ( majorVersion != that.majorVersion ) {
-            return false;
-        }
-        return minorVersion == that.minorVersion;
-
+        return (majorVersion == that.majorVersion)
+                && (minorVersion == that.minorVersion)
+                && (clientVersion == that.clientVersion);
     }
 
     public int hashCode() {
         int result = majorVersion;
-        result = 29 * result + minorVersion;
+        result = 29 * result + minorVersion + clientVersion;
         return result;
     }
 
@@ -50,7 +65,11 @@ public int getMinorVersion() {
         return minorVersion;
     }
 
+    public int getClientVersion() {
+        return clientVersion;
+    }
+
     public String toString() {
-        return majorVersion+"."+minorVersion ;
+        return majorVersion + "." + minorVersion + "." + clientVersion;
     }
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/db/DatabaseVersionUpgradePair.java b/server/src/com/imcode/imcms/db/DatabaseVersionUpgradePair.java
index 69b3d0e5a6..2d40a0abc0 100644
--- a/server/src/com/imcode/imcms/db/DatabaseVersionUpgradePair.java
+++ b/server/src/com/imcode/imcms/db/DatabaseVersionUpgradePair.java
@@ -6,8 +6,8 @@ public class DatabaseVersionUpgradePair {
     private DatabaseUpgrade upgrade;
 
     public DatabaseVersionUpgradePair(int major, int minor, DatabaseUpgrade upgrade) {
-        version = new DatabaseVersion(major,minor) ;
-        this.upgrade = upgrade ;
+        version = new DatabaseVersion(major, minor);
+        this.upgrade = upgrade;
     }
 
     public DatabaseVersion getVersion() {
diff --git a/server/src/com/imcode/imcms/db/DdlUtilsPlatformCommand.java b/server/src/com/imcode/imcms/db/DdlUtilsPlatformCommand.java
index aa16f441f5..2a1524b232 100644
--- a/server/src/com/imcode/imcms/db/DdlUtilsPlatformCommand.java
+++ b/server/src/com/imcode/imcms/db/DdlUtilsPlatformCommand.java
@@ -12,5 +12,5 @@ public Object executeOn(DatabaseConnection databaseConnection) throws DatabaseEx
         return executePlatform(databaseConnection, platform);
     }
 
-    protected abstract Object executePlatform(DatabaseConnection databaseConnection, Platform platform) ;
+    protected abstract Object executePlatform(DatabaseConnection databaseConnection, Platform platform);
 }
diff --git a/server/src/com/imcode/imcms/db/DdlUtilsSqlBuilderCommand.java b/server/src/com/imcode/imcms/db/DdlUtilsSqlBuilderCommand.java
index 1ddef20211..5f69a2c550 100644
--- a/server/src/com/imcode/imcms/db/DdlUtilsSqlBuilderCommand.java
+++ b/server/src/com/imcode/imcms/db/DdlUtilsSqlBuilderCommand.java
@@ -2,14 +2,13 @@
 
 import com.imcode.db.DatabaseConnection;
 import com.imcode.db.DatabaseException;
-import com.imcode.db.commands.SqlUpdateCommand;
-import org.apache.ddlutils.platform.SqlBuilder;
-import org.apache.ddlutils.Platform;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.platform.SqlBuilder;
 
-import java.io.Writer;
-import java.io.StringWriter;
 import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
 
 public abstract class DdlUtilsSqlBuilderCommand extends DdlUtilsPlatformCommand {
 
@@ -21,18 +20,18 @@ protected Object executePlatform(DatabaseConnection databaseConnection, Platform
         sqlBuilder.setWriter(newWriter);
         Object result;
         try {
-            result = executeSqlBuilder(databaseConnection, sqlBuilder) ;
-        } catch ( IOException e ) {
-            throw new DatabaseException(null, e) ;
+            result = executeSqlBuilder(databaseConnection, sqlBuilder);
+        } catch (IOException e) {
+            throw new DatabaseException(null, e);
         }
         sqlBuilder.setWriter(oldWriter);
         String sql = newWriter.toString();
-        if ( StringUtils.isNotBlank(sql)) {
-            platform.evaluateBatch(databaseConnection.getConnection(), sql, false) ;
+        if (StringUtils.isNotBlank(sql)) {
+            platform.evaluateBatch(databaseConnection.getConnection(), sql, false);
         }
-        return result ;
+        return result;
     }
 
     protected abstract Object executeSqlBuilder(DatabaseConnection databaseConnection,
-                                                SqlBuilder sqlBuilder) throws IOException ;
+                                                SqlBuilder sqlBuilder) throws IOException;
 }
diff --git a/server/src/com/imcode/imcms/db/DefaultProcedureExecutor.java b/server/src/com/imcode/imcms/db/DefaultProcedureExecutor.java
index fefb7267fc..b4fb8f2f86 100644
--- a/server/src/com/imcode/imcms/db/DefaultProcedureExecutor.java
+++ b/server/src/com/imcode/imcms/db/DefaultProcedureExecutor.java
@@ -2,14 +2,15 @@
 
 import com.imcode.db.Database;
 import com.imcode.db.DatabaseException;
-import com.imcode.db.commands.SqlUpdateDatabaseCommand;
 import com.imcode.db.commands.SqlQueryCommand;
+import com.imcode.db.commands.SqlUpdateDatabaseCommand;
 import imcode.util.CachingFileLoader;
 import imcode.util.io.FileUtility;
 import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,10 +23,10 @@
 
 public class DefaultProcedureExecutor implements ProcedureExecutor {
 
+    private final static Logger log = LogManager.getLogger(DefaultProcedureExecutor.class.getName());
     private final Database database;
     private final CachingFileLoader fileLoader;
     private Map procedureCache = new HashMap();
-    private final static Logger log = Logger.getLogger( DefaultProcedureExecutor.class.getName() );
 
     public DefaultProcedureExecutor(Database database, CachingFileLoader fileLoader) {
         this.database = database;
@@ -34,108 +35,108 @@ public DefaultProcedureExecutor(Database database, CachingFileLoader fileLoader)
 
     public int executeUpdateProcedure(String procedureName,
                                       Object[] parameters) throws DatabaseException {
-        Procedure procedure = getProcedure( procedureName );
-        Object[] parametersAtCorrectIndices = getParametersAtCorrectIndicesForProcedure( procedure, parameters );
+        Procedure procedure = getProcedure(procedureName);
+        Object[] parametersAtCorrectIndices = getParametersAtCorrectIndicesForProcedure(procedure, parameters);
         String body = procedure.getBody();
         logProcedureCall(procedureName, body, parametersAtCorrectIndices);
-        return ( (Integer) database.execute(new SqlUpdateDatabaseCommand(body, parametersAtCorrectIndices)) ).intValue() ;
+        return (Integer) database.execute(new SqlUpdateDatabaseCommand(body, parametersAtCorrectIndices));
     }
 
     private void logProcedureCall(String procedureName, String body, Object[] parametersAtCorrectIndices) {
-        log.trace( "Calling procedure " + procedureName + " with parameters "
-                   + ArrayUtils.toString( parametersAtCorrectIndices ) + " and body " + body );
+        log.trace("Calling procedure " + procedureName + " with parameters "
+                + ArrayUtils.toString(parametersAtCorrectIndices) + " and body " + body);
     }
 
     public Object executeProcedure(String procedureName, Object[] params,
                                    ResultSetHandler resultSetHandler) {
-        Procedure procedure = getProcedure( procedureName );
-        Object[] parametersAtCorrectIndices = getParametersAtCorrectIndicesForProcedure( procedure, params );
+        Procedure procedure = getProcedure(procedureName);
+        Object[] parametersAtCorrectIndices = getParametersAtCorrectIndicesForProcedure(procedure, params);
         String body = procedure.getBody();
         logProcedureCall(procedureName, body, parametersAtCorrectIndices);
         return database.execute(new SqlQueryCommand(body, parametersAtCorrectIndices, resultSetHandler));
     }
 
-    private Object[] getParametersAtCorrectIndicesForProcedure( Procedure procedure, Object[] parameters ) {
+    private Object[] getParametersAtCorrectIndicesForProcedure(Procedure procedure, Object[] parameters) {
         int[] parameterIndices = procedure.getParameterIndices();
         Object[] parametersAtCorrectIndices = new String[parameterIndices.length];
-        for ( int i = 0; i < parameterIndices.length; i++ ) {
+        for (int i = 0; i < parameterIndices.length; i++) {
             int parameterIndex = parameterIndices[i];
             parametersAtCorrectIndices[i] = parameters[parameterIndex];
         }
         return parametersAtCorrectIndices;
     }
 
-    private Procedure getProcedure( String wantedProcedure ) {
+    private Procedure getProcedure(String wantedProcedure) {
         String procedureName = wantedProcedure.toLowerCase();
-        File file = getFile( procedureName );
-        Procedure procedure = (Procedure)procedureCache.get( procedureName );
-        String procedureContents = fileLoader.getCachedFileStringIfRecent( file );
-        if ( null == procedureContents ) {
+        File file = getFile(procedureName);
+        Procedure procedure = (Procedure) procedureCache.get(procedureName);
+        String procedureContents = fileLoader.getCachedFileStringIfRecent(file);
+        if (null == procedureContents) {
             String procedureContents1 = loadFile(file);
-            log.debug("Loading procedure "+procedureName) ;
-            procedure = prepareProcedure(procedureContents1, procedureName );
-            procedureCache.put( procedureName, procedure ) ;
+            log.debug("Loading procedure " + procedureName);
+            procedure = prepareProcedure(procedureContents1, procedureName);
+            procedureCache.put(procedureName, procedure);
         }
         return procedure;
     }
 
-    Procedure prepareProcedure( String procedureContents, String procedureName ) {
-        Pattern headerPattern = Pattern.compile( "CREATE\\s+PROCEDURE\\s+\\S+\\s+(.*)\\bAS\\s+", Pattern.CASE_INSENSITIVE
-                                                                                                 | Pattern.DOTALL );
-        Matcher headerMatcher = headerPattern.matcher( procedureContents );
-        if ( !headerMatcher.find() ) {
-            throw new RuntimeException( "Failed to parse procedure " + procedureName + ": " + procedureContents );
+    Procedure prepareProcedure(String procedureContents, String procedureName) {
+        Pattern headerPattern = Pattern.compile("CREATE\\s+PROCEDURE\\s+\\S+\\s+(.*)\\bAS\\s+", Pattern.CASE_INSENSITIVE
+                | Pattern.DOTALL);
+        Matcher headerMatcher = headerPattern.matcher(procedureContents);
+        if (!headerMatcher.find()) {
+            throw new RuntimeException("Failed to parse procedure " + procedureName + ": " + procedureContents);
         }
-        String headerParameters = headerMatcher.group( 1 );
-        String body = procedureContents.substring( headerMatcher.end() );
+        String headerParameters = headerMatcher.group(1);
+        String body = procedureContents.substring(headerMatcher.end());
 
-        Pattern parameterPattern = Pattern.compile( "@(\\w+)" );
-        Map parameterNameToIndexMap = getParameterNameToIndexMapParsedFromHeader( parameterPattern, headerParameters );
+        Pattern parameterPattern = Pattern.compile("@(\\w+)");
+        Map parameterNameToIndexMap = getParameterNameToIndexMapParsedFromHeader(parameterPattern, headerParameters);
         List parameterIndices = new ArrayList();
-        String bodyWithParametersReplaced = replaceVariablesInBodyAndAddIndicesToList( parameterPattern, body, parameterNameToIndexMap, parameterIndices, procedureName );
-        int[] parameterIndicesArray = ArrayUtils.toPrimitive( (Integer[])parameterIndices.toArray( new Integer[parameterIndices.size()] ) );
+        String bodyWithParametersReplaced = replaceVariablesInBodyAndAddIndicesToList(parameterPattern, body, parameterNameToIndexMap, parameterIndices, procedureName);
+        int[] parameterIndicesArray = ArrayUtils.toPrimitive((Integer[]) parameterIndices.toArray(new Integer[parameterIndices.size()]));
         return new Procedure(bodyWithParametersReplaced, parameterIndicesArray);
     }
 
-    private String loadFile( File file ) {
+    private String loadFile(File file) {
         try {
-            return fileLoader.getCachedFileString( file );
-        } catch ( IOException e ) {
-            throw new UnhandledException( e );
+            return fileLoader.getCachedFileString(file);
+        } catch (IOException e) {
+            throw new UnhandledException(e);
         }
     }
 
-    protected File getFile( String wantedProcedure ) {
-        return FileUtility.getFileFromWebappRelativePath( "WEB-INF/sql/sprocs/"
-                                                          + wantedProcedure.toLowerCase() + ".prc" );
+    protected File getFile(String wantedProcedure) {
+        return FileUtility.getFileFromWebappRelativePath("WEB-INF/sql/sprocs/"
+                + wantedProcedure.toLowerCase() + ".prc");
     }
 
-    private Map getParameterNameToIndexMapParsedFromHeader( Pattern parameterPattern, String headerParameters ) {
-        Matcher parametersMatcher = parameterPattern.matcher( headerParameters );
+    private Map getParameterNameToIndexMapParsedFromHeader(Pattern parameterPattern, String headerParameters) {
+        Matcher parametersMatcher = parameterPattern.matcher(headerParameters);
         Map parameterNameToIndexMap = new HashMap();
         int headerParametersFound = 0;
-        while ( parametersMatcher.find() ) {
-            String parameterName = parametersMatcher.group( 1 );
-            parameterNameToIndexMap.put( parameterName, new Integer( headerParametersFound++ ) );
+        while (parametersMatcher.find()) {
+            String parameterName = parametersMatcher.group(1);
+            parameterNameToIndexMap.put(parameterName, headerParametersFound++);
         }
         return parameterNameToIndexMap;
     }
 
-    private String replaceVariablesInBodyAndAddIndicesToList( Pattern parameterPattern, String body,
-                                                              Map parameterNameToIndexMap, List parameterIndices,
-                                                              String procedureName ) {
-        Matcher bodyParametersMatcher = parameterPattern.matcher( body );
+    private String replaceVariablesInBodyAndAddIndicesToList(Pattern parameterPattern, String body,
+                                                             Map parameterNameToIndexMap, List parameterIndices,
+                                                             String procedureName) {
+        Matcher bodyParametersMatcher = parameterPattern.matcher(body);
         StringBuffer bodyStringBuffer = new StringBuffer();
-        while ( bodyParametersMatcher.find() ) {
-            bodyParametersMatcher.appendReplacement( bodyStringBuffer, "?" );
-            String parameterName = bodyParametersMatcher.group( 1 );
-            Integer parameterIndex = (Integer)parameterNameToIndexMap.get( parameterName );
+        while (bodyParametersMatcher.find()) {
+            bodyParametersMatcher.appendReplacement(bodyStringBuffer, "?");
+            String parameterName = bodyParametersMatcher.group(1);
+            Integer parameterIndex = (Integer) parameterNameToIndexMap.get(parameterName);
             if (null == parameterIndex) {
-                throw new IllegalArgumentException( "No parameter @"+parameterName+" in parameter list of procedure "+procedureName);
+                throw new IllegalArgumentException("No parameter @" + parameterName + " in parameter list of procedure " + procedureName);
             }
-            parameterIndices.add( parameterIndex );
+            parameterIndices.add(parameterIndex);
         }
-        bodyParametersMatcher.appendTail( bodyStringBuffer );
+        bodyParametersMatcher.appendTail(bodyStringBuffer);
         return bodyStringBuffer.toString();
     }
 
@@ -144,7 +145,7 @@ static class Procedure {
         private String sql;
         private int[] parameterIndices;
 
-        Procedure( String sql, int[] parameterIndices ) {
+        Procedure(String sql, int[] parameterIndices) {
             this.sql = sql;
             this.parameterIndices = parameterIndices;
         }
diff --git a/server/src/com/imcode/imcms/db/ImcmsDatabaseCreator.java b/server/src/com/imcode/imcms/db/ImcmsDatabaseCreator.java
index 5eb64ea273..f489503c48 100644
--- a/server/src/com/imcode/imcms/db/ImcmsDatabaseCreator.java
+++ b/server/src/com/imcode/imcms/db/ImcmsDatabaseCreator.java
@@ -5,23 +5,25 @@
 import com.imcode.db.DatabaseConnection;
 import com.imcode.db.commands.CompositeDatabaseCommand;
 import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
+import imcode.server.Imcms;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.ddlutils.Platform;
 import org.apache.ddlutils.platform.CreationParameters;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.io.*;
-import java.util.regex.Pattern;
+import java.io.IOException;
+import java.io.Reader;
 import java.util.Locale;
+import java.util.regex.Pattern;
 
 public class ImcmsDatabaseCreator {
 
+    private final static Logger LOG = LogManager.getLogger(ImcmsDatabaseCreator.class);
     private final LocalizedMessageProvider localizedMessageProvider;
     private final Reader initScriptReader;
 
-    private final static Logger LOG = Logger.getLogger(ImcmsDatabaseCreator.class);
-    
     public ImcmsDatabaseCreator(Reader initScriptReader, LocalizedMessageProvider localizedMessageProvider) {
         this.initScriptReader = initScriptReader;
         this.localizedMessageProvider = localizedMessageProvider;
@@ -29,7 +31,7 @@ public ImcmsDatabaseCreator(Reader initScriptReader, LocalizedMessageProvider lo
 
     public void createDatabase(Database database, final org.apache.ddlutils.model.Database wantedDdl) {
         database.execute(new CompositeDatabaseCommand(
-                new DatabaseCommand[] {
+                new DatabaseCommand[]{
                         new DdlUtilsPlatformCommand() {
                             protected Object executePlatform(DatabaseConnection databaseConnection, Platform platform) {
                                 CreationParameters params = new CreationParameters();
@@ -38,7 +40,7 @@ protected Object executePlatform(DatabaseConnection databaseConnection, Platform
                                 String sql = platform.getCreateTablesSql(wantedDdl, params, false, false);
                                 LOG.trace(sql);
                                 platform.evaluateBatch(sql, false);
-                                return null ;
+                                return null;
                             }
                         },
                         new DdlUtilsPlatformCommand() {
@@ -46,14 +48,14 @@ protected Object executePlatform(DatabaseConnection databaseConnection,
                                                              Platform platform) {
                                 String sql;
                                 try {
-                                    sql = IOUtils.toString(initScriptReader) ;
-                                } catch ( IOException e ) {
+                                    sql = IOUtils.toString(initScriptReader);
+                                } catch (IOException e) {
                                     throw new RuntimeException(e);
                                 }
                                 sql = massageSql(platform, sql);
                                 LOG.trace(sql);
-                                platform.evaluateBatch(sql, false) ;
-                                return null ;
+                                platform.evaluateBatch(sql, false);
+                                return null;
                             }
                         },
                 }
@@ -65,14 +67,15 @@ private String massageSql(Platform platform, String sql) {
         sql = Pattern.compile(
                 "^-- " + platformName + " ", Pattern.MULTILINE).matcher(sql).replaceAll("");
         sql = Pattern.compile("^-- \\w+ (.*?)\n", Pattern.MULTILINE).matcher(sql).replaceAll("");
-        String language = Locale.getDefault().getISO3Language() ;
-        if ( StringUtils.isBlank(language)) {
-            language = "eng" ;
+        String language = Locale.getDefault().getISO3Language();
+        if (StringUtils.isBlank(language) || !localizedMessageProvider.supportsLanguage(language)) {
+            language = Imcms.getDefaultLanguage();
         }
+
         sql = sql.replaceAll("@language@", language);
-        sql = sql.replaceAll("@headline@", localizedMessageProvider.get("start_document/headline").toLocalizedString(language)) ;
-        sql = sql.replaceAll("@text1@", localizedMessageProvider.get("start_document/text1").toLocalizedString(language)) ;
-        sql = sql.replaceAll("@text2@", localizedMessageProvider.get("start_document/text2").toLocalizedString(language)) ;
+        sql = sql.replaceAll("@headline@", localizedMessageProvider.get("start_document/headline").toLocalizedString(language));
+        sql = sql.replaceAll("@text1@", localizedMessageProvider.get("start_document/text1").toLocalizedString(language));
+        sql = sql.replaceAll("@text2@", localizedMessageProvider.get("start_document/text2").toLocalizedString(language));
         return sql;
     }
 
diff --git a/server/src/com/imcode/imcms/db/IntegerListResultSetHandler.java b/server/src/com/imcode/imcms/db/IntegerListResultSetHandler.java
new file mode 100644
index 0000000000..10e74ec15f
--- /dev/null
+++ b/server/src/com/imcode/imcms/db/IntegerListResultSetHandler.java
@@ -0,0 +1,28 @@
+package com.imcode.imcms.db;
+
+import org.apache.commons.dbutils.ResultSetHandler;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Serhii Maksymchuk from Ubrainians for imCode
+ * 13.03.18.
+ */
+public class IntegerListResultSetHandler implements ResultSetHandler<List<Integer>> {
+    @Override
+    public List<Integer> handle(ResultSet resultSet) throws SQLException {
+        final int columnCount = resultSet.getMetaData().getColumnCount();
+        final List<Integer> results = new ArrayList<>();
+
+        while (resultSet.next()) {
+            for (int i = 1; i <= columnCount; i++) {
+                int result = resultSet.getInt(i);
+                results.add(result);
+            }
+        }
+        return results;
+    }
+}
diff --git a/server/src/com/imcode/imcms/db/ScriptBasedUpgrade.java b/server/src/com/imcode/imcms/db/ScriptBasedUpgrade.java
new file mode 100644
index 0000000000..e9c8220902
--- /dev/null
+++ b/server/src/com/imcode/imcms/db/ScriptBasedUpgrade.java
@@ -0,0 +1,209 @@
+package com.imcode.imcms.db;
+
+import com.imcode.db.DatabaseConnection;
+import com.imcode.db.DatabaseException;
+import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
+import com.imcode.db.commands.SqlUpdateCommand;
+import com.imcode.db.commands.TransactionDatabaseCommand;
+import imcode.server.Imcms;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.model.Database;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+/**
+ * Extends database upgrade functionality with script based option.
+ */
+public class ScriptBasedUpgrade extends DatabaseTypeSpecificUpgrade {
+
+    private final static Logger LOG = LogManager.getLogger(ScriptBasedUpgrade.class);
+
+    private DatabaseVersion currentVersion;
+
+    public ScriptBasedUpgrade(Database ddl, DatabaseVersion currentVersion) {
+        super(ddl);
+        this.currentVersion = currentVersion;
+    }
+
+    public static void setDatabaseVersion(com.imcode.db.Database database, DatabaseVersion newVersion) {
+        final int majorVersion = newVersion.getMajorVersion();
+        final int minorVersion = newVersion.getMinorVersion();
+
+        Integer rowsUpdated;
+        Object[][] insertParameters;
+
+        try {
+            final int clientVersion = newVersion.getClientVersion();
+
+            rowsUpdated = (Integer) database.execute(new SqlUpdateCommand(
+                    "UPDATE database_version SET major = ?, minor = ?, client = ?",
+                    new Object[]{
+                            majorVersion,
+                            minorVersion,
+                            clientVersion
+                    }));
+
+            insertParameters = new Object[][]{
+                    {"major", majorVersion},
+                    {"minor", minorVersion},
+                    {"client", clientVersion}
+            };
+
+        } catch (DatabaseException e) {
+            // in case if we have old DB schema with two columns in version table
+            rowsUpdated = (Integer) database.execute(new SqlUpdateCommand(
+                    "UPDATE database_version SET major = ?, minor = ?",
+                    new Object[]{
+                            majorVersion,
+                            minorVersion
+                    }));
+
+            insertParameters = new Object[][]{
+                    {"major", majorVersion},
+                    {"minor", minorVersion}
+            };
+        }
+
+        if (0 == rowsUpdated) {
+            database.execute(new InsertIntoTableDatabaseCommand("database_version", insertParameters));
+        }
+    }
+
+    @Override
+    public void upgradeMssql(com.imcode.db.Database database) throws DatabaseException {
+        upgrade(database, "mssql");
+    }
+
+    @Override
+    public void upgradeMysql(com.imcode.db.Database database) throws DatabaseException {
+        upgrade(database, "mysql");
+    }
+
+    @Override
+    public void upgradeOther(com.imcode.db.Database database) throws DatabaseException {
+        String msg = String.format("Database schema upgrade is not implemented for platform %s.", database);
+        LOG.error(msg);
+        throw new NotImplementedException(msg);
+    }
+
+    /**
+     * @param database
+     * @param vendorName used to select upgrade scripts from schema upgrade configuration file.
+     * @throws DatabaseException
+     */
+    private void upgrade(final com.imcode.db.Database database, final String vendorName) throws DatabaseException {
+        LOG.info("Running script-based schema upgrade");
+
+        try {
+            DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = dbFactory.newDocumentBuilder();
+            Document doc = builder.parse(new File(Imcms.getPath(), "WEB-INF/sql/diff/schema-upgrade.xml"));
+
+            XPathFactory xpathFactory = XPathFactory.newInstance();
+            XPath xpath = xpathFactory.newXPath();
+
+            xpath.setXPathFunctionResolver(new XPathFunctionResolver() {
+                final QName dbVersionCompareQName = new QName("imcms", "db-version-compare");
+                final XPathFunction dbVersionCompare = new XPathFunction() {
+                    @Override
+                    public Integer evaluate(List args) throws XPathFunctionException {
+                        String[] left = ((String) args.get(0)).split("\\.");
+                        String[] right = ((String) args.get(1)).split("\\.");
+
+                        return new DatabaseVersion(left).compareTo(new DatabaseVersion(right));
+                    }
+                };
+
+                @Override
+                public XPathFunction resolveFunction(QName qname, int arity) {
+                    return qname.equals(dbVersionCompareQName) && arity == 2 ? dbVersionCompare : null;
+                }
+            });
+
+            final NodeList scriptList = (NodeList) xpath.evaluate(
+                    String.format("/schema-upgrade/diff[imcms:db-version-compare(string(@version), '%s') > 0]/vendor[@name = '%s']/script",
+                            currentVersion, vendorName), doc, XPathConstants.NODESET);
+
+            final LinkedHashMap<String, Element> valueToElement = new LinkedHashMap<>();
+
+            for (int i = 0; i < scriptList.getLength(); i++) {
+                final Element item = (Element) scriptList.item(i);
+                final NamedNodeMap itemAttributes = item.getAttributes();
+
+                if (itemAttributes != null && itemAttributes.getLength() > 0) {
+                    final String nodeValue = itemAttributes.item(0).getNodeValue();
+                    valueToElement.put(nodeValue, item);
+                }
+            }
+
+            final LinkedHashSet<Element> elements = new LinkedHashSet<>(valueToElement.values());
+            //todo: sort elements with DB version comparing if needs, but I hope it is not required
+
+            final int updatesCount = elements.size();
+
+            if (updatesCount == 0) {
+                LOG.info(String.format
+                        ("No schema upgrade required for vendor %s. Current version is %s.", vendorName, currentVersion));
+                return;
+            }
+
+            database.execute(new TransactionDatabaseCommand() {
+                public Object executeInTransaction(DatabaseConnection connection) throws DatabaseException {
+                    File scriptFile = null;
+                    try {
+                        Element scriptElement = null;
+                        for (Element element : elements) {
+                            scriptElement = element;
+                            String script = scriptElement.getAttribute("location");
+                            scriptFile = new File(Imcms.getPath(), "WEB-INF/sql/diff/" + script);
+                            FileInputStream fs = new FileInputStream(scriptFile);
+                            InputStreamReader reader = new InputStreamReader(fs);
+                            String sql = IOUtils.toString(reader);
+                            reader.close();
+                            Platform platform = DatabaseUtils.getPlatform(connection);
+                            platform.evaluateBatch(sql, false);
+                        }
+
+                        if (scriptElement != null) {
+                            Element diffElement = (Element) scriptElement.getParentNode().getParentNode();
+                            String version = diffElement.getAttribute("version");
+                            String[] st = version.split("\\.");
+                            DatabaseVersion dv = new DatabaseVersion(st);
+                            setDatabaseVersion(database, dv);
+
+                            currentVersion = dv;
+                        }
+                    } catch (Exception ex) {
+                        LOG.fatal("Failed to run script based upgrade.", ex);
+                        throw new DatabaseException("Failed to run the script " + scriptFile.getName(), ex);
+                    }
+
+                    return null;
+                }
+            });
+
+            LOG.info("Database upgraded to version " + currentVersion);
+        } catch (Exception ex) {
+            String errMsg = "Failed to run script based upgrade.";
+            LOG.fatal(errMsg, ex);
+            throw new DatabaseException(errMsg, ex);
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/db/SingleConnectionDataSource.java b/server/src/com/imcode/imcms/db/SingleConnectionDataSource.java
index 3bf416be9e..68d77a5237 100644
--- a/server/src/com/imcode/imcms/db/SingleConnectionDataSource.java
+++ b/server/src/com/imcode/imcms/db/SingleConnectionDataSource.java
@@ -1,11 +1,14 @@
 package com.imcode.imcms.db;
 
 import com.imcode.db.jdbc.ConnectionWrapper;
+import org.apache.commons.lang.NotImplementedException;
 
 import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.io.PrintWriter;
+import java.sql.*;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
 
 public class SingleConnectionDataSource implements DataSource {
 
@@ -20,24 +23,110 @@ public Connection getConnection() throws SQLException {
             public void close() throws SQLException {
 
             }
+
+            public <T> T unwrap(Class<T> iface) throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public boolean isWrapperFor(Class<?> iface) throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public Clob createClob() throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public Blob createBlob() throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public NClob createNClob() throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public SQLXML createSQLXML() throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public boolean isValid(int timeout) throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public void setClientInfo(String name, String value) throws SQLClientInfoException {
+                throw new NotImplementedException();
+            }
+
+            public String getClientInfo(String name) throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public Properties getClientInfo() throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public void setClientInfo(Properties properties) throws SQLClientInfoException {
+                throw new NotImplementedException();
+            }
+
+            public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+                throw new NotImplementedException();
+            }
+
+            public String getSchema() throws SQLException {
+                return null;
+            }
+
+            public void setSchema(String schema) throws SQLException {
+
+            }
+
+            public void abort(Executor executor) throws SQLException {
+
+            }
+
+            public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+
+            }
+
+            public int getNetworkTimeout() throws SQLException {
+                return 0;
+            }
         };
+
+
     }
 
     public Connection getConnection(String username, String password) throws SQLException {
-        return null ;
+        return null;
     }
 
     public PrintWriter getLogWriter() throws SQLException {
-        return null ;
+        return null;
     }
 
     public void setLogWriter(PrintWriter out) throws SQLException {
     }
 
+    public int getLoginTimeout() throws SQLException {
+        return 0;
+    }
+
     public void setLoginTimeout(int seconds) throws SQLException {
     }
 
-    public int getLoginTimeout() throws SQLException {
-        return 0;
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return null;
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        throw new NotImplementedException();
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        throw new NotImplementedException();
     }
 }
diff --git a/server/src/com/imcode/imcms/db/StartupDatabaseUpgrade.java b/server/src/com/imcode/imcms/db/StartupDatabaseUpgrade.java
index afd38bf1a3..8ad4481410 100644
--- a/server/src/com/imcode/imcms/db/StartupDatabaseUpgrade.java
+++ b/server/src/com/imcode/imcms/db/StartupDatabaseUpgrade.java
@@ -1,31 +1,26 @@
 package com.imcode.imcms.db;
 
-import com.imcode.db.Database;
-import com.imcode.db.DatabaseConnection;
-import com.imcode.db.DatabaseException;
-import com.imcode.db.SingleConnectionDatabase;
-import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
+import com.imcode.db.*;
 import com.imcode.db.commands.SqlQueryCommand;
-import com.imcode.db.commands.SqlUpdateCommand;
 import com.imcode.db.commands.TransactionDatabaseCommand;
 import com.imcode.db.handlers.RowTransformer;
 import com.imcode.db.handlers.SingleObjectHandler;
+import imcode.server.Imcms;
 import org.apache.ddlutils.platform.SqlBuilder;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
+import java.io.File;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.io.File;
-
-import imcode.server.Imcms;
 
 public class StartupDatabaseUpgrade extends ImcmsDatabaseUpgrade {
 
     private static final String SQL_STATE__MISSING_TABLE = "42S02";
 
-    private final static Logger LOG = Logger.getLogger(StartupDatabaseUpgrade.class);
+    private final static Logger LOG = LogManager.getLogger(StartupDatabaseUpgrade.class);
 
-    DatabaseVersionUpgradePair[] upgrades = new DatabaseVersionUpgradePair[] {
+    DatabaseVersionUpgradePair[] upgrades = new DatabaseVersionUpgradePair[]{
             new DatabaseVersionUpgradePair(4, 0, new CreateTableUpgrade(wantedDdl, "database_version")),
             new DatabaseVersionUpgradePair(4, 1, new UnicodeUpgrade(wantedDdl)),
             new DatabaseVersionUpgradePair(4, 2, new CompositeUpgrade(
@@ -35,31 +30,15 @@ public class StartupDatabaseUpgrade extends ImcmsDatabaseUpgrade {
             new DatabaseVersionUpgradePair(4, 3, new CreateTableUpgrade(wantedDdl, "document_properties")),
             new DatabaseVersionUpgradePair(4, 4, new TemplateNamesUpgrade(new File(Imcms.getPath(), "WEB-INF/templates/text"))),
             new DatabaseVersionUpgradePair(4, 5, new CompositeUpgrade(
-                   new CreateTableUpgrade(wantedDdl, "texts_history"),
-                   new CreateTableUpgrade(wantedDdl, "images_history"))),
+                    new CreateTableUpgrade(wantedDdl, "texts_history"),
+                    new CreateTableUpgrade(wantedDdl, "images_history"))),
             new DatabaseVersionUpgradePair(4, 6, new CompositeUpgrade(
-                   new CreateTableUpgrade(wantedDdl, "menus_history"),
-                   new CreateTableUpgrade(wantedDdl, "childs_history"))),
-            new DatabaseVersionUpgradePair(4,7, new CreateTableUpgrade(wantedDdl, "document_search_log")),
-            new DatabaseVersionUpgradePair(4,8, new CreateTableUpgrade(wantedDdl, "profiles")),
-
-            new DatabaseVersionUpgradePair(4,9, new CompositeUpgrade(
-                new ColumnSizeUpgrade(wantedDdl, "classification", "code", 128),                    
-                new ColumnSizeUpgrade(wantedDdl, "users", "login_name", 128),
-                new ColumnSizeUpgrade(wantedDdl, "users", "first_name", 64),
-                new ColumnSizeUpgrade(wantedDdl, "users", "last_name", 64),
-                new ColumnSizeUpgrade(wantedDdl, "users", "title", 64),
-                new ColumnSizeUpgrade(wantedDdl, "users", "company", 64),
-                new ColumnSizeUpgrade(wantedDdl, "users", "address", 128),
-                new ColumnSizeUpgrade(wantedDdl, "users", "city", 64),
-                new ColumnSizeUpgrade(wantedDdl, "users", "zip", 64),
-                new ColumnSizeUpgrade(wantedDdl, "users", "country", 64),
-                new ColumnSizeUpgrade(wantedDdl, "users", "county_council", 128),
-                new ColumnSizeUpgrade(wantedDdl, "users", "email", 128))
-            ),
-            new DatabaseVersionUpgradePair(4,10, new AddVarcharColumnUpgrade(wantedDdl, "users", "language", "session_id", 128, false)),
+                    new CreateTableUpgrade(wantedDdl, "menus_history"),
+                    new CreateTableUpgrade(wantedDdl, "childs_history"))),
+            new DatabaseVersionUpgradePair(4, 7, new CreateTableUpgrade(wantedDdl, "document_search_log")),
+            new DatabaseVersionUpgradePair(4, 8, new CreateTableUpgrade(wantedDdl, "profiles")),
     };
-    private ImcmsDatabaseCreator imcmsDatabaseCreator ;
+    private ImcmsDatabaseCreator imcmsDatabaseCreator;
 
     public StartupDatabaseUpgrade(org.apache.ddlutils.model.Database ddl,
                                   ImcmsDatabaseCreator imcmsDatabaseCreator) {
@@ -69,62 +48,64 @@ public StartupDatabaseUpgrade(org.apache.ddlutils.model.Database ddl,
 
     public void upgrade(Database database) throws DatabaseException {
         DatabaseVersion databaseVersion = getDatabaseVersion(database);
-        if ( null == databaseVersion ) {
+        if (null == databaseVersion) {
             int tableCount = (Integer) database.execute(new DdlUtilsSqlBuilderCommand() {
                 protected Object executeSqlBuilder(DatabaseConnection databaseConnection,
                                                    SqlBuilder sqlBuilder) {
                     org.apache.ddlutils.model.Database database = sqlBuilder.getPlatform().readModelFromDatabase(databaseConnection.getConnection(), null);
-                    return new Integer(database.getTableCount());
+                    return database.getTableCount();
                 }
             });
-            if ( 0 == tableCount ) {
+            if (0 == tableCount) {
                 createDatabaseAndSetVersion(database, wantedDdl);
                 return;
             }
-            databaseVersion = new DatabaseVersion(0,0);
+            databaseVersion = new DatabaseVersion(0, 0, 0);
         }
         upgradeDatabase(databaseVersion, database);
     }
 
     private void upgradeDatabase(DatabaseVersion databaseVersion, Database database) {
-        LOG.info("Database is version "+databaseVersion) ;
-        if (getLastDatabaseVersion().compareTo(databaseVersion) > 0 ) {
-            for ( final DatabaseVersionUpgradePair versionUpgradePair : upgrades ) {
-                final DatabaseVersion upgradeVersion = versionUpgradePair.getVersion();
-                if ( upgradeVersion.compareTo(databaseVersion) > 0 ) {
-                    LOG.info("Upgrading database to version "+upgradeVersion);
-                    database.execute(new TransactionDatabaseCommand() {
-                        public Object executeInTransaction(DatabaseConnection connection) throws DatabaseException {
-                            SingleConnectionDatabase database = new SingleConnectionDatabase(connection);
-                            versionUpgradePair.getUpgrade().upgrade(database);
-                            setDatabaseVersion(database, upgradeVersion);
-                            return null;
-                        }
-                    });
-                    databaseVersion = upgradeVersion ;
-                }
+        LOG.info("The current database version is " + databaseVersion);
+
+        for (final DatabaseVersionUpgradePair versionUpgradePair : upgrades) {
+            final DatabaseVersion upgradeVersion = versionUpgradePair.getVersion();
+            if (upgradeVersion.compareTo(databaseVersion) > 0) {
+                LOG.info("Upgrading database to version " + upgradeVersion);
+                database.execute(new TransactionDatabaseCommand() {
+                    public Object executeInTransaction(DatabaseConnection connection) throws DatabaseException {
+                        SingleConnectionDatabase database = new SingleConnectionDatabase(connection);
+                        versionUpgradePair.getUpgrade().upgrade(database);
+                        ScriptBasedUpgrade.setDatabaseVersion(database, upgradeVersion);
+                        return null;
+                    }
+                });
+                databaseVersion = upgradeVersion;
             }
-            LOG.info("Database upgraded to version "+databaseVersion);
         }
+
+        runScriptBasedUpgrade(databaseVersion, database);
     }
 
-    private void setDatabaseVersion(Database database, DatabaseVersion upgradeVersion) {
-        Integer rowsUpdated = (Integer) database.execute(new SqlUpdateCommand("UPDATE database_version SET major = ?, minor = ?",
-                                                                              new Object[] {
-                                                                                      upgradeVersion.getMajorVersion(),
-                                                                                      upgradeVersion.getMinorVersion() }));
-        if (0 == rowsUpdated) {
-            database.execute(new InsertIntoTableDatabaseCommand("database_version", new Object[][] {
-                    { "major", upgradeVersion.getMajorVersion() },
-                    { "minor", upgradeVersion.getMinorVersion() },
-            })) ;
-        }
+    private void runScriptBasedUpgrade(final DatabaseVersion currentVersion, Database database) {
+        database.execute(new DatabaseCommand() {
+            public Object executeOn(DatabaseConnection connection) throws DatabaseException {
+                SingleConnectionDatabase database = new SingleConnectionDatabase(connection);
+                ScriptBasedUpgrade upgrade = new ScriptBasedUpgrade(wantedDdl, currentVersion);
+
+                upgrade.upgrade(database);
+
+                return null;
+            }
+        });
     }
 
     private void createDatabaseAndSetVersion(Database database, org.apache.ddlutils.model.Database wantedDdl) {
         imcmsDatabaseCreator.createDatabase(database, wantedDdl);
         DatabaseVersion lastDatabaseVersion = getLastDatabaseVersion();
-        setDatabaseVersion(database, lastDatabaseVersion);
+        ScriptBasedUpgrade.setDatabaseVersion(database, lastDatabaseVersion);
+
+        runScriptBasedUpgrade(lastDatabaseVersion, database);
     }
 
     private DatabaseVersion getLastDatabaseVersion() {
@@ -132,11 +113,17 @@ private DatabaseVersion getLastDatabaseVersion() {
     }
 
     private DatabaseVersion getDatabaseVersion(Database database) {
-        SqlQueryCommand sqlQueryCommand = new SqlQueryCommand("SELECT major, minor FROM database_version", new Object[0], new SingleObjectHandler(new RowTransformer() {
+        SqlQueryCommand sqlQueryCommand = new SqlQueryCommand("SELECT * FROM database_version", new Object[0], new SingleObjectHandler(new RowTransformer() {
             public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
                 int major = resultSet.getInt("major");
                 int minor = resultSet.getInt("minor");
-                return new DatabaseVersion(major, minor);
+                int client = 0;
+                try {
+                    client = resultSet.getInt("client");
+                } catch (SQLException ignore) {
+                    // ignore because in this case we have old DB version where no any "client" column, should be 0
+                }
+                return new DatabaseVersion(major, minor, client);
             }
 
             public Class getClassOfCreatedObjects() {
@@ -145,11 +132,11 @@ public Class getClassOfCreatedObjects() {
         }));
         try {
             return (DatabaseVersion) database.execute(sqlQueryCommand);
-        } catch ( DatabaseException dbe ) {
-            for ( Throwable t = dbe; null != t; t = t.getCause() ) {
-                if ( t instanceof SQLException ) {
-                    for ( SQLException se = (SQLException) t; null != se; se = se.getNextException() ) {
-                        if ( SQL_STATE__MISSING_TABLE.equals(se.getSQLState()) ) {
+        } catch (DatabaseException dbe) {
+            for (Throwable t = dbe; null != t; t = t.getCause()) {
+                if (t instanceof SQLException) {
+                    for (SQLException se = (SQLException) t; null != se; se = se.getNextException()) {
+                        if (SQL_STATE__MISSING_TABLE.equals(se.getSQLState())) {
                             return null;
                         }
                     }
diff --git a/server/src/com/imcode/imcms/db/StringArrayArrayResultSetHandler.java b/server/src/com/imcode/imcms/db/StringArrayArrayResultSetHandler.java
index 05c418f947..53340eaef7 100644
--- a/server/src/com/imcode/imcms/db/StringArrayArrayResultSetHandler.java
+++ b/server/src/com/imcode/imcms/db/StringArrayArrayResultSetHandler.java
@@ -8,19 +8,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class StringArrayArrayResultSetHandler implements ResultSetHandler {
+public class StringArrayArrayResultSetHandler implements ResultSetHandler<String[][]> {
 
-    public Object handle( ResultSet resultSet ) throws SQLException {
+    public String[][] handle(ResultSet resultSet) throws SQLException {
         ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
         int columnCount = resultSetMetaData.getColumnCount();
-        List results = new ArrayList();
-        while ( resultSet.next() ) {
+        List<String[]> results = new ArrayList<>();
+        while (resultSet.next()) {
             String[] row = new String[columnCount];
-            for ( int i = 0; i < columnCount; i++ ) {
-                row[i] = resultSet.getString( i + 1 );
+            for (int i = 0; i < columnCount; i++) {
+                row[i] = resultSet.getString(i + 1);
             }
-            results.add( row );
+            results.add(row);
         }
-        return (String[][])results.toArray( new String[results.size()][] );
+        return results.toArray(new String[results.size()][]);
     }
 }
diff --git a/server/src/com/imcode/imcms/db/StringArrayResultSetHandler.java b/server/src/com/imcode/imcms/db/StringArrayResultSetHandler.java
index ed57838e9d..63b51830da 100644
--- a/server/src/com/imcode/imcms/db/StringArrayResultSetHandler.java
+++ b/server/src/com/imcode/imcms/db/StringArrayResultSetHandler.java
@@ -8,18 +8,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class StringArrayResultSetHandler implements ResultSetHandler {
+public class StringArrayResultSetHandler implements ResultSetHandler<String[]> {
 
-    public Object handle( ResultSet resultSet ) throws SQLException {
+    public String[] handle(ResultSet resultSet) throws SQLException {
         ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
         int columnCount = resultSetMetaData.getColumnCount();
-        List results = new ArrayList();
-        while ( resultSet.next() ) {
-            for ( int i = 1; i <= columnCount; i++ ) {
-                String s = resultSet.getString( i );
-                results.add( s );
+        List<String> results = new ArrayList<>();
+        while (resultSet.next()) {
+            for (int i = 1; i <= columnCount; i++) {
+                String s = resultSet.getString(i);
+                results.add(s);
             }
         }
-        return (String[])results.toArray( new String[results.size()] );
+        return results.toArray(new String[results.size()]);
     }
 }
diff --git a/server/src/com/imcode/imcms/db/StringFromRowFactory.java b/server/src/com/imcode/imcms/db/StringFromRowFactory.java
index bd3c350910..89dc94f723 100644
--- a/server/src/com/imcode/imcms/db/StringFromRowFactory.java
+++ b/server/src/com/imcode/imcms/db/StringFromRowFactory.java
@@ -1,27 +1,27 @@
 package com.imcode.imcms.db;
 
-import com.imcode.db.handlers.ObjectFromRowFactory;
+import com.imcode.db.handlers.RowTransformer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public class StringFromRowFactory implements ObjectFromRowFactory {
+public class StringFromRowFactory implements RowTransformer<String> {
 
     private final int columnIndex;
 
     public StringFromRowFactory() {
-        this(1) ;
+        this(1);
     }
 
     public StringFromRowFactory(int columnIndex) {
-        this.columnIndex = columnIndex ;
+        this.columnIndex = columnIndex;
     }
 
-    public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
-        return resultSet.getString(columnIndex) ;
+    public String createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
+        return resultSet.getString(columnIndex);
     }
 
-    public Class getClassOfCreatedObjects() {
+    public Class<String> getClassOfCreatedObjects() {
         return String.class;
     }
 }
diff --git a/server/src/com/imcode/imcms/db/StringListResultSetHandler.java b/server/src/com/imcode/imcms/db/StringListResultSetHandler.java
new file mode 100644
index 0000000000..68d6bda483
--- /dev/null
+++ b/server/src/com/imcode/imcms/db/StringListResultSetHandler.java
@@ -0,0 +1,26 @@
+package com.imcode.imcms.db;
+
+import org.apache.commons.dbutils.ResultSetHandler;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class StringListResultSetHandler implements ResultSetHandler<List<String>> {
+
+    @Override
+    public List<String> handle(ResultSet resultSet) throws SQLException {
+        final int columnCount = resultSet.getMetaData().getColumnCount();
+        final List<String> results = new ArrayList<>();
+
+        while (resultSet.next()) {
+            for (int i = 1; i <= columnCount; i++) {
+                String resultString = resultSet.getString(i);
+                results.add(resultString);
+            }
+        }
+        return results;
+    }
+
+}
diff --git a/server/src/com/imcode/imcms/db/TemplateNamesUpgrade.java b/server/src/com/imcode/imcms/db/TemplateNamesUpgrade.java
index 6eee312ad0..c7adb131f5 100644
--- a/server/src/com/imcode/imcms/db/TemplateNamesUpgrade.java
+++ b/server/src/com/imcode/imcms/db/TemplateNamesUpgrade.java
@@ -22,31 +22,31 @@ public TemplateNamesUpgrade(File templatesDirectory) {
 
     public void upgrade(Database database) throws DatabaseException {
         if (!templatesDirectory.isDirectory()) {
-            throw new DatabaseException("Templates directory does not exist: "+templatesDirectory, null);
+            throw new DatabaseException("Templates directory does not exist: " + templatesDirectory, null);
         }
         database.execute(new SqlQueryDatabaseCommand("SELECT template_id, simple_name FROM templates", null, new ResultSetHandler() {
             public Object handle(ResultSet rs) throws SQLException {
                 while (rs.next()) {
                     int templateId = rs.getInt("template_id");
                     String templateName = rs.getString("simple_name");
-                    File templateFile = new File(templatesDirectory, templateId+".html");
+                    File templateFile = new File(templatesDirectory, templateId + ".html");
                     File newTemplateFile = new File(templatesDirectory, templateName + ".html");
                     if (templateFile.exists() && !newTemplateFile.exists()) {
-                        templateFile.renameTo(newTemplateFile) ;
+                        templateFile.renameTo(newTemplateFile);
                     }
                 }
                 return null;
             }
-        })) ;
+        }));
 
         DatabasePlatform dp = DatabasePlatform.getInstance(database);
         dp.update("DELETE FROM templates_cref WHERE group_id NOT IN (SELECT group_id FROM templategroups)");
         SimpleColumn templateNameColumn = new SimpleColumn("template_name", Type.VARCHAR, 255, SimpleColumn.Required.PRIMARY_KEY);
-        dp.alterColumn("templates_cref", "template_id", templateNameColumn) ;
+        dp.alterColumn("templates_cref", "template_id", templateNameColumn);
         updateTemplateName(dp, "templates_cref", "template_name");
         templateNameColumn.setRequired(SimpleColumn.Required.NOT_NULL);
 
-        dp.alterColumn("text_docs", "template_id", templateNameColumn) ;
+        dp.alterColumn("text_docs", "template_id", templateNameColumn);
         updateTemplateName(dp, "text_docs", "template_name");
 
         templateNameColumn.setRequired(SimpleColumn.Required.NULL);
@@ -60,13 +60,13 @@ public Object handle(ResultSet rs) throws SQLException {
 
     private void alterTemplateNameColumn(DatabasePlatform dp, String tableName, String columnName,
                                          SimpleColumn templateNameColumn) {
-        templateNameColumn.setName(columnName) ;
-        dp.alterColumn(tableName, columnName, templateNameColumn) ;
+        templateNameColumn.setName(columnName);
+        dp.alterColumn(tableName, columnName, templateNameColumn);
         updateTemplateName(dp, tableName, columnName);
     }
 
     private void updateTemplateName(DatabasePlatform dp, String tableName, String columnName) {
-        dp.update("UPDATE "+tableName+" SET " + columnName + " = (SELECT simple_name FROM templates WHERE template_id = " + tableName + "."+columnName +")");
+        dp.update("UPDATE " + tableName + " SET " + columnName + " = (SELECT simple_name FROM templates WHERE template_id = " + tableName + "." + columnName + ")");
     }
 
 }
diff --git a/server/src/com/imcode/imcms/db/UnicodeUpgrade.java b/server/src/com/imcode/imcms/db/UnicodeUpgrade.java
index a7cc7fa714..e5e642e274 100644
--- a/server/src/com/imcode/imcms/db/UnicodeUpgrade.java
+++ b/server/src/com/imcode/imcms/db/UnicodeUpgrade.java
@@ -5,23 +5,25 @@
 import com.imcode.db.DatabaseException;
 import com.imcode.db.commands.SqlUpdateCommand;
 import com.imcode.imcms.db.refactoring.DatabaseNotSupportedException;
-import org.apache.ddlutils.alteration.*;
-import org.apache.ddlutils.model.Table;
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.alteration.ColumnOrderChange;
+import org.apache.ddlutils.alteration.ModelChange;
 import org.apache.ddlutils.model.Column;
-import org.apache.ddlutils.platform.SqlBuilder;
+import org.apache.ddlutils.model.Table;
 import org.apache.ddlutils.platform.CreationParameters;
-import org.apache.ddlutils.Platform;
-import org.apache.log4j.Logger;
+import org.apache.ddlutils.platform.SqlBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 class UnicodeUpgrade extends DatabaseTypeSpecificUpgrade {
 
-    private final static Logger LOG = Logger.getLogger(UnicodeUpgrade.class);
-    
+    private final static Logger LOG = LogManager.getLogger(UnicodeUpgrade.class);
+
     protected UnicodeUpgrade(org.apache.ddlutils.model.Database ddl) {
         super(ddl);
     }
@@ -39,23 +41,23 @@ private void rebuildTextTables(Database database) {
             protected Object executeSqlBuilder(DatabaseConnection databaseConnection,
                                                SqlBuilder sqlBuilder) throws IOException {
                 org.apache.ddlutils.model.Database sourceDdl = sqlBuilder.getPlatform().readModelFromDatabase(databaseConnection.getConnection(), null);
-                List<ModelChange> changes = new ArrayList() ;
-                for ( Table sourceTable : sourceDdl.getTables() ) {
+                List<ModelChange> changes = new ArrayList();
+                for (Table sourceTable : sourceDdl.getTables()) {
                     if (null == wantedDdl.findTable(sourceTable.getName())) {
                         continue;
                     }
-                    for ( Column column : sourceTable.getColumns() ) {
+                    for (Column column : sourceTable.getColumns()) {
                         if (column.isOfTextType()) {
-                            LOG.debug("Rebuilding table "+sourceTable) ;
-                            changes.add(new ColumnOrderChange(sourceTable, Collections.EMPTY_MAP)) ;
-                            break ;
+                            LOG.debug("Rebuilding table " + sourceTable);
+                            changes.add(new ColumnOrderChange(sourceTable, Collections.EMPTY_MAP));
+                            break;
                         }
                     }
                 }
                 sqlBuilder.processChanges(sourceDdl, sourceDdl, changes, new CreationParameters());
-                return null ;
+                return null;
             }
-        }) ;
+        });
     }
 
     public void upgradeMysql(Database database) throws DatabaseException {
@@ -64,7 +66,7 @@ protected Object executePlatform(DatabaseConnection databaseConnection, Platform
                 return platform.readModelFromDatabase(null).getTables();
             }
         });
-        for ( Table table : tables ) {
+        for (Table table : tables) {
             database.execute(new SqlUpdateCommand("ALTER TABLE " + table.getName() + " CONVERT TO CHARACTER SET UTF8", new Object[0]));
         }
     }
diff --git a/server/src/com/imcode/imcms/db/UpgradeException.java b/server/src/com/imcode/imcms/db/UpgradeException.java
index a7a24cc186..c6431df57b 100644
--- a/server/src/com/imcode/imcms/db/UpgradeException.java
+++ b/server/src/com/imcode/imcms/db/UpgradeException.java
@@ -3,7 +3,7 @@
 public class UpgradeException extends Exception {
 
     public UpgradeException(Exception re) {
-        super(re) ;
+        super(re);
     }
 
     protected UpgradeException() {
diff --git a/server/src/com/imcode/imcms/db/refactoring/DatabasePlatform.java b/server/src/com/imcode/imcms/db/refactoring/DatabasePlatform.java
index 8f16c06a46..9941f37010 100644
--- a/server/src/com/imcode/imcms/db/refactoring/DatabasePlatform.java
+++ b/server/src/com/imcode/imcms/db/refactoring/DatabasePlatform.java
@@ -10,31 +10,46 @@
 import org.apache.ddlutils.Platform;
 import org.apache.ddlutils.platform.mssql.MSSqlPlatform;
 import org.apache.ddlutils.platform.mysql.MySqlPlatform;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.ArrayList;
-import java.sql.SQLException;
 
 public abstract class DatabasePlatform {
 
-    private final static Logger LOG = Logger.getLogger(DatabasePlatform.class);
-    protected final Database database;
+	private final static Logger LOG = LogManager.getLogger(DatabasePlatform.class);
     private static final String OBJECT_DOES_NOT_EXIST = "42S02";
+    protected final Database database;
 
     protected DatabasePlatform(Database database) {
         this.database = database;
     }
 
+    public static DatabasePlatform getInstance(final Database database) {
+        return (DatabasePlatform) database.execute(new DdlUtilsPlatformCommand() {
+            protected Object executePlatform(DatabaseConnection databaseConnection, Platform platform) {
+                if (platform instanceof MySqlPlatform) {
+                    return new MysqlDatabasePlatform(database);
+                } else if (platform instanceof MSSqlPlatform) {
+                    return new MssqlDatabasePlatform(database);
+                } else {
+                    throw new DatabaseNotSupportedException();
+                }
+            }
+        });
+    }
+
     public void dropTable(String tableName) {
         dropForeignKeys(tableName);
-        update("DROP TABLE "+tableName);
+        update("DROP TABLE " + tableName);
     }
 
     public void update(String sql) {
         LOG.trace(sql);
-        database.execute(new SqlUpdateCommand(sql, null)) ;
+        database.execute(new SqlUpdateCommand(sql, null));
     }
 
     public void dropForeignKeys(final String tableName) {
@@ -42,40 +57,26 @@ public void dropForeignKeys(final String tableName) {
             protected Object executePlatform(DatabaseConnection databaseConnection, Platform platform) {
                 org.apache.ddlutils.model.Database actualDdl = platform.readModelFromDatabase(null);
                 org.apache.ddlutils.model.Table table = actualDdl.findTable(tableName);
-                for ( org.apache.ddlutils.model.ForeignKey foreignKey : table.getForeignKeys() ) {
-                    dropForeignKey(new DdlUtilsForeignKey(tableName, foreignKey)) ;
+                for (org.apache.ddlutils.model.ForeignKey foreignKey : table.getForeignKeys()) {
+                    dropForeignKey(new DdlUtilsForeignKey(tableName, foreignKey));
                 }
                 return null;
             }
-        }) ;
+        });
     }
 
-    public abstract void dropForeignKey(ForeignKey foreignKey) ;
-
-    public abstract void alterColumn(Table table, String columnName, Column column) ;
+    public abstract void dropForeignKey(ForeignKey foreignKey);
 
-    public static DatabasePlatform getInstance(final Database database) {
-        return (DatabasePlatform) database.execute(new DdlUtilsPlatformCommand() {
-            protected Object executePlatform(DatabaseConnection databaseConnection, Platform platform) {
-                if (platform instanceof MySqlPlatform ) {
-                    return new MysqlDatabasePlatform(database);
-                } else if (platform instanceof MSSqlPlatform ) {
-                    return new MssqlDatabasePlatform(database);
-                } else {
-                    throw new DatabaseNotSupportedException();
-                }
-            }
-        });
-    }
+    public abstract void alterColumn(Table table, String columnName, Column column);
 
     public void addForeignKeys(Collection<ForeignKey> foreignKeys) {
-        for ( ForeignKey foreignKey : foreignKeys ) {
+        for (ForeignKey foreignKey : foreignKeys) {
             addForeignKey(foreignKey);
         }
     }
 
     public void addForeignKey(ForeignKey foreignKey) {
-        update("ALTER TABLE "+foreignKey.getLocalTableName()+" ADD "+createForeignKeyDefinition(foreignKey));
+        update("ALTER TABLE " + foreignKey.getLocalTableName() + " ADD " + createForeignKeyDefinition(foreignKey));
     }
 
     public void alterColumn(String tableName, String columnName, Column column) {
@@ -95,17 +96,17 @@ protected Object executePlatform(DatabaseConnection databaseConnection, Platform
     }
 
     protected void dropForeignKeys(Iterable<ForeignKey> foreignKeys) {
-        for ( ForeignKey foreignKey : foreignKeys ) {
+        for (ForeignKey foreignKey : foreignKeys) {
             dropForeignKey(foreignKey);
         }
     }
 
     public void dropDatabase(String databaseName) {
         try {
-            update("DROP DATABASE "+databaseName) ;
-        } catch ( DatabaseException e ) {
+            update("DROP DATABASE " + databaseName);
+        } catch (DatabaseException e) {
             String sqlState = getSqlState(e);
-            if ( !OBJECT_DOES_NOT_EXIST.equals(sqlState) ) {
+            if (!OBJECT_DOES_NOT_EXIST.equals(sqlState)) {
                 throw e;
             }
         }
@@ -113,8 +114,8 @@ public void dropDatabase(String databaseName) {
 
     private String getSqlState(DatabaseException e) {
         for (Throwable t = e; null != t; t = t.getCause()) {
-            if (t instanceof SQLException ) {
-                for (SQLException se = (SQLException) t; null != se; se=se.getNextException()) {
+            if (t instanceof SQLException) {
+                for (SQLException se = (SQLException) t; null != se; se = se.getNextException()) {
                     if (null != se.getSQLState()) {
                         return se.getSQLState();
                     }
@@ -125,7 +126,7 @@ private String getSqlState(DatabaseException e) {
     }
 
     public void createDatabase(String databaseName) {
-        update("CREATE DATABASE "+databaseName);
+        update("CREATE DATABASE " + databaseName);
     }
 
     public void createTable(Table table) {
@@ -133,62 +134,62 @@ public void createTable(Table table) {
     }
 
     protected String createTableDefinition(Table table) {
-        return "CREATE TABLE "+table.getName()+" ( "+createTableDefinitionContent(table) +" )";
+        return "CREATE TABLE " + table.getName() + " ( " + createTableDefinitionContent(table) + " )";
     }
 
     private String createTableDefinitionContent(Table table) {
-        List<String> tableDefinition = new ArrayList<String>();
+        List<String> tableDefinition = new ArrayList<>();
         tableDefinition.add(createColumnDefinitions(table.getColumns()));
-        List<String> primaryKeyColumnNames = new ArrayList<String>();
-        for ( Column column : table.getColumns() ) {
+        List<String> primaryKeyColumnNames = new ArrayList<>();
+        for (Column column : table.getColumns()) {
             if (column.isPrimaryKey()) {
-                primaryKeyColumnNames.add(column.getName()) ;
+                primaryKeyColumnNames.add(column.getName());
             }
         }
         if (!primaryKeyColumnNames.isEmpty()) {
             tableDefinition.add(createPrimaryKeyDefinition(primaryKeyColumnNames));
         }
-        for ( ForeignKey foreignKey : table.getForeignKeys() ) {
+        for (ForeignKey foreignKey : table.getForeignKeys()) {
             tableDefinition.add(createForeignKeyDefinition(foreignKey));
         }
         return StringUtils.join(tableDefinition.iterator(), ", ");
     }
 
     private String createPrimaryKeyDefinition(List<String> primaryKeyColumnNames) {
-        return "PRIMARY KEY ( "+ StringUtils.join(primaryKeyColumnNames.iterator(), ", ")+" )";
+        return "PRIMARY KEY ( " + StringUtils.join(primaryKeyColumnNames.iterator(), ", ") + " )";
     }
 
     protected String createForeignKeyDefinition(ForeignKey foreignKey) {
         String name = foreignKey.getName();
         if (null == name) {
-            name = "FK__"+foreignKey.getLocalTableName()+"__"+foreignKey.getForeignTableName();
+            name = "FK__" + foreignKey.getLocalTableName() + "__" + foreignKey.getForeignTableName();
         }
-        return "CONSTRAINT "+name
-               +" FOREIGN KEY ( "
-               + StringUtils.join(foreignKey.getLocalColumnNames().iterator(), ", ")
-               +" ) REFERENCES "+foreignKey.getForeignTableName()+" ( "
-               +StringUtils.join(foreignKey.getForeignColumnNames().iterator(), ", ")
-               +" )";
+        return "CONSTRAINT " + name
+                + " FOREIGN KEY ( "
+                + StringUtils.join(foreignKey.getLocalColumnNames().iterator(), ", ")
+                + " ) REFERENCES " + foreignKey.getForeignTableName() + " ( "
+                + StringUtils.join(foreignKey.getForeignColumnNames().iterator(), ", ")
+                + " )";
     }
 
     private String createColumnDefinitions(Collection<Column> columns) {
-        List<String> columnDefinitions =  new ArrayList<String>();
-        for ( Column column : columns ) {
+        List<String> columnDefinitions = new ArrayList<>();
+        for (Column column : columns) {
             columnDefinitions.add(createColumnDefinition(column));
         }
         return StringUtils.join(columnDefinitions.iterator(), ", ");
     }
 
-    protected abstract String createColumnDefinition(Column column) ;
+    protected abstract String createColumnDefinition(Column column);
 
     protected String getTypeString(Column column) {
         String typeString = null;
-        switch ( column.getType() ) {
+        switch (column.getType()) {
             case INTEGER:
                 typeString = "INTEGER";
                 break;
             case VARCHAR:
-                typeString = 0 != column.getSize() ? "VARCHAR("+column.getSize()+")" : "TEXT";
+                typeString = 0 != column.getSize() ? "VARCHAR(" + column.getSize() + ")" : "TEXT";
                 break;
             case DATETIME:
                 typeString = "DATETIME";
diff --git a/server/src/com/imcode/imcms/db/refactoring/MssqlDatabasePlatform.java b/server/src/com/imcode/imcms/db/refactoring/MssqlDatabasePlatform.java
index 0c13bddcd3..9cb6029029 100644
--- a/server/src/com/imcode/imcms/db/refactoring/MssqlDatabasePlatform.java
+++ b/server/src/com/imcode/imcms/db/refactoring/MssqlDatabasePlatform.java
@@ -1,15 +1,20 @@
 package com.imcode.imcms.db.refactoring;
 
 import com.imcode.db.Database;
-import com.imcode.imcms.db.refactoring.model.*;
+import com.imcode.imcms.db.refactoring.model.Column;
+import com.imcode.imcms.db.refactoring.model.ForeignKey;
+import com.imcode.imcms.db.refactoring.model.ForeignKeyHasLocalColumnName;
+import com.imcode.imcms.db.refactoring.model.Table;
+import com.imcode.imcms.db.refactoring.model.TableWrapper;
+import com.imcode.imcms.db.refactoring.model.Type;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.functors.NotPredicate;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 
 public class MssqlDatabasePlatform extends DatabasePlatform {
 
@@ -18,12 +23,12 @@ public MssqlDatabasePlatform(Database database) {
     }
 
     public void dropForeignKey(ForeignKey foreignKey) {
-        update("ALTER TABLE "+foreignKey.getLocalTableName()+" DROP CONSTRAINT "+foreignKey.getName());
+        update("ALTER TABLE " + foreignKey.getLocalTableName() + " DROP CONSTRAINT " + foreignKey.getName());
     }
 
     public void alterColumn(Table table, final String columnName, final Column column) {
         final String tableName = table.getName();
-        final String temporaryTableName = tableName+"_tmp";
+        final String temporaryTableName = tableName + "_tmp";
         TableWrapper newTable = new TableWrapper(table) {
             public String getName() {
                 return temporaryTableName;
@@ -33,7 +38,7 @@ public Collection<Column> getColumns() {
                 return CollectionUtils.collect(super.getColumns(), new Transformer() {
                     public Object transform(Object input) {
                         Column c = (Column) input;
-                        if ( columnName.equals(c.getName()) ) {
+                        if (columnName.equals(c.getName())) {
                             return column;
                         } else {
                             return c;
@@ -43,7 +48,7 @@ public Object transform(Object input) {
             }
 
             public Collection<ForeignKey> getForeignKeys() {
-                return CollectionUtils.select(super.getForeignKeys(), new NotPredicate(new ForeignKeyHasLocalColumnName(columnName))) ;
+                return CollectionUtils.select(super.getForeignKeys(), new NotPredicate(new ForeignKeyHasLocalColumnName(columnName)));
             }
 
         };
@@ -55,18 +60,18 @@ public Collection<ForeignKey> getForeignKeys() {
     }
 
     private void renameTable(String oldName, String newName) {
-        update("sp_rename '"+oldName+"', '"+newName+"'");
+        update("sp_rename '" + oldName + "', '" + newName + "'");
     }
 
     public void copyTable(String tableName, String temporaryTableName) {
-        update("INSERT INTO "+temporaryTableName+" SELECT * FROM "+tableName);
+        update("INSERT INTO " + temporaryTableName + " SELECT * FROM " + tableName);
     }
 
     protected String createColumnDefinition(Column column) {
-        List<String> columnDefinition = new ArrayList<String>();
+        List<String> columnDefinition = new ArrayList<>();
         columnDefinition.add(column.getName());
         columnDefinition.add(getTypeString(column));
-        columnDefinition.add(column.isNullable() ? "NULL" : "NOT NULL") ;
+        columnDefinition.add(column.isNullable() ? "NULL" : "NOT NULL");
         if (column.isAutoIncremented()) {
             columnDefinition.add("IDENTITY");
         }
@@ -76,7 +81,7 @@ protected String createColumnDefinition(Column column) {
     protected String getTypeString(Column column) {
         String typeString = super.getTypeString(column);
         if (column.getType() == Type.VARCHAR) {
-            typeString = "N"+typeString;
+            typeString = "N" + typeString;
         }
         return typeString;
     }
diff --git a/server/src/com/imcode/imcms/db/refactoring/MysqlDatabasePlatform.java b/server/src/com/imcode/imcms/db/refactoring/MysqlDatabasePlatform.java
index 1859cef741..8f3aa391f6 100644
--- a/server/src/com/imcode/imcms/db/refactoring/MysqlDatabasePlatform.java
+++ b/server/src/com/imcode/imcms/db/refactoring/MysqlDatabasePlatform.java
@@ -25,18 +25,18 @@ public void alterColumn(Table table, final String columnName, final Column colum
         List<ForeignKey> foreignKeysWithLocalColumnName = new ArrayList();
         CollectionUtils.select(table.getForeignKeys(), new ForeignKeyHasLocalColumnName(columnName), foreignKeysWithLocalColumnName);
         dropForeignKeys(foreignKeysWithLocalColumnName);
-        update("ALTER TABLE "+table.getName() +" CHANGE COLUMN "+columnName+" "+createColumnDefinition(column));
+        update("ALTER TABLE " + table.getName() + " CHANGE COLUMN " + columnName + " " + createColumnDefinition(column));
     }
 
     protected String createColumnDefinition(Column column) {
         List<String> columnDefinition = new ArrayList();
         columnDefinition.add(column.getName());
         columnDefinition.add(getTypeString(column));
-        columnDefinition.add(column.isNullable() ? "NULL" : "NOT NULL") ;
+        columnDefinition.add(column.isNullable() ? "NULL" : "NOT NULL");
         if (column.hasDefault()) {
-            columnDefinition.add("DEFAULT "+column.getDefaultValue()) ;
+            columnDefinition.add("DEFAULT " + column.getDefaultValue());
         } else if (column.isAutoIncremented()) {
-            columnDefinition.add("AUTO_INCREMENT") ;
+            columnDefinition.add("AUTO_INCREMENT");
         }
         return StringUtils.join(columnDefinition.iterator(), " ");
     }
@@ -46,6 +46,6 @@ public void createTable(Table table) {
     }
 
     protected String createTableDefinition(Table table) {
-        return super.createTableDefinition(table)+" ENGINE=InnoDB DEFAULT CHARSET=utf8";
+        return super.createTableDefinition(table) + " ENGINE=InnoDB DEFAULT CHARSET=utf8";
     }
 }
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/AbstractForeignKey.java b/server/src/com/imcode/imcms/db/refactoring/model/AbstractForeignKey.java
index c6591c50c9..47d99ff7bf 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/AbstractForeignKey.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/AbstractForeignKey.java
@@ -1,21 +1,21 @@
 package com.imcode.imcms.db.refactoring.model;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public abstract class AbstractForeignKey implements ForeignKey {
 
     public List<String> getLocalColumnNames() {
-        List<String> localColumnNames = new ArrayList<String>();
-        for ( Reference reference : getReferences() ) {
+        List<String> localColumnNames = new ArrayList<>();
+        for (Reference reference : getReferences()) {
             localColumnNames.add(reference.getLocalColumnName());
         }
         return localColumnNames;
     }
 
     public List<String> getForeignColumnNames() {
-        List<String> foreignColumnNames = new ArrayList<String>();
-        for ( Reference reference : getReferences() ) {
+        List<String> foreignColumnNames = new ArrayList<>();
+        for (Reference reference : getReferences()) {
             foreignColumnNames.add(reference.getForeignColumnName());
         }
         return foreignColumnNames;
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsColumn.java b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsColumn.java
index fe76b61619..c390216cf5 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsColumn.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsColumn.java
@@ -29,7 +29,7 @@ public boolean isPrimaryKey() {
     }
 
     public Type getType() {
-        if ( column.isOfNumericType() ) {
+        if (column.isOfNumericType()) {
             return Type.INTEGER;
         } else if (column.isOfTextType()) {
             return Type.VARCHAR;
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsDatabaseModel.java b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsDatabaseModel.java
index 6062e053ee..4746e28adb 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsDatabaseModel.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsDatabaseModel.java
@@ -7,7 +7,7 @@ public class DdlUtilsDatabaseModel implements DatabaseModel {
     private Database model;
 
     public DdlUtilsDatabaseModel(Database model) {
-        this.model = model ;
+        this.model = model;
     }
 
     public Table getTable(String tableName) {
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsForeignKey.java b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsForeignKey.java
index 9e296456a6..c810df2fd8 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsForeignKey.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsForeignKey.java
@@ -3,10 +3,10 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Transformer;
 
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
 
-public class DdlUtilsForeignKey extends AbstractForeignKey{
+public class DdlUtilsForeignKey extends AbstractForeignKey {
 
     private final String localTableName;
     private final org.apache.ddlutils.model.ForeignKey foreignKey;
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsTable.java b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsTable.java
index 3d7759b951..4bdf163543 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsTable.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/DdlUtilsTable.java
@@ -1,8 +1,8 @@
 package com.imcode.imcms.db.refactoring.model;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 public class DdlUtilsTable implements Table {
 
@@ -21,16 +21,16 @@ public Collection<Column> getColumns() {
     }
 
     public Collection<ForeignKey> getForeignKeys() {
-        List<ForeignKey> foreignKeys = new ArrayList<ForeignKey>();
-        for ( org.apache.ddlutils.model.ForeignKey foreignKey : table.getForeignKeys() ) {
+        List<ForeignKey> foreignKeys = new ArrayList<>();
+        for (org.apache.ddlutils.model.ForeignKey foreignKey : table.getForeignKeys()) {
             foreignKeys.add(new DdlUtilsForeignKey(getName(), foreignKey));
         }
         return foreignKeys;
     }
 
     private List<Column> wrapColumns(org.apache.ddlutils.model.Column[] ddlutilsColumns) {
-        List<Column> columns = new ArrayList<Column>();
-        for ( org.apache.ddlutils.model.Column column : ddlutilsColumns ) {
+        List<Column> columns = new ArrayList<>();
+        for (org.apache.ddlutils.model.Column column : ddlutilsColumns) {
             columns.add(new DdlUtilsColumn(column));
         }
         return columns;
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/ForeignKey.java b/server/src/com/imcode/imcms/db/refactoring/model/ForeignKey.java
index ccb6f85817..a442a188ae 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/ForeignKey.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/ForeignKey.java
@@ -5,6 +5,7 @@
 public interface ForeignKey {
 
     String getLocalTableName();
+
     String getName();
 
     List<Reference> getReferences();
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/ForeignKeyHasLocalColumnName.java b/server/src/com/imcode/imcms/db/refactoring/model/ForeignKeyHasLocalColumnName.java
index 9f749fe861..89ae8059f9 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/ForeignKeyHasLocalColumnName.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/ForeignKeyHasLocalColumnName.java
@@ -12,7 +12,7 @@ public ForeignKeyHasLocalColumnName(String columnName) {
 
     public boolean evaluate(Object object) {
         ForeignKey foreignKey = (ForeignKey) object;
-        for ( Reference reference : foreignKey.getReferences() ) {
+        for (Reference reference : foreignKey.getReferences()) {
             if (columnName.equals(reference.getLocalColumnName())) {
                 return true;
             }
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/SimpleColumn.java b/server/src/com/imcode/imcms/db/refactoring/model/SimpleColumn.java
index 4371a09d09..508f391bdc 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/SimpleColumn.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/SimpleColumn.java
@@ -13,7 +13,7 @@ public SimpleColumn(String name, Type type, int size, Required required) {
         this.name = name;
         this.type = type;
         this.size = size;
-        this.required =required;
+        this.required = required;
     }
 
     public boolean isNullable() {
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/Table.java b/server/src/com/imcode/imcms/db/refactoring/model/Table.java
index 09daeccdb6..901c358e13 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/Table.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/Table.java
@@ -7,6 +7,6 @@ public interface Table {
     String getName();
 
     Collection<Column> getColumns();
-    
+
     Collection<ForeignKey> getForeignKeys();
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/db/refactoring/model/TableWrapper.java b/server/src/com/imcode/imcms/db/refactoring/model/TableWrapper.java
index 7976b52818..34dc5b9aab 100644
--- a/server/src/com/imcode/imcms/db/refactoring/model/TableWrapper.java
+++ b/server/src/com/imcode/imcms/db/refactoring/model/TableWrapper.java
@@ -4,7 +4,7 @@
 
 public class TableWrapper implements Table {
 
-    private Table wrappedTable ;
+    private Table wrappedTable;
 
     public TableWrapper(Table wrappedTable) {
         this.wrappedTable = wrappedTable;
diff --git a/server/src/com/imcode/imcms/domain/component/AuthenticationDataStorage.java b/server/src/com/imcode/imcms/domain/component/AuthenticationDataStorage.java
new file mode 100644
index 0000000000..f0f8d5b5be
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/component/AuthenticationDataStorage.java
@@ -0,0 +1,7 @@
+package com.imcode.imcms.domain.component;
+
+public interface AuthenticationDataStorage {
+
+    void storeAuthenticationData(String sessionId, String nextUrl);
+
+}
diff --git a/server/src/com/imcode/imcms/domain/component/AuthenticationResultHolder.java b/server/src/com/imcode/imcms/domain/component/AuthenticationResultHolder.java
new file mode 100644
index 0000000000..d5a8b9d3e7
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/component/AuthenticationResultHolder.java
@@ -0,0 +1,34 @@
+package com.imcode.imcms.domain.component;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AuthenticationResultHolder {
+
+    @JsonProperty("token_type")
+    protected String tokenType;
+
+    @JsonProperty("access_token")
+    protected String accessToken;
+
+    @JsonProperty("expires_in")
+    protected long expiresIn;
+
+    @JsonIgnore
+    private Date createdDate = new Date();
+
+    @JsonIgnore
+    public Date getExpiresOn() {
+        final Date now = new Date();
+        now.setTime(createdDate.getTime() + (expiresIn * 1000));
+        return now;
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/component/AzureAuthenticationProvider.java b/server/src/com/imcode/imcms/domain/component/AzureAuthenticationProvider.java
new file mode 100644
index 0000000000..bb4aba42c9
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/component/AzureAuthenticationProvider.java
@@ -0,0 +1,340 @@
+package com.imcode.imcms.domain.component;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.imcode.imcms.domain.dto.AzureActiveDirectoryGroupDTO;
+import com.imcode.imcms.domain.dto.AzureActiveDirectoryGroupsHolderDTO;
+import com.imcode.imcms.domain.dto.AzureActiveDirectoryUserDTO;
+import com.imcode.imcms.domain.dto.ExternalRole;
+import com.imcode.imcms.model.AuthenticationProvider;
+import com.imcode.imcms.model.ExternalUser;
+import com.imcode.imcms.util.AuthHelper;
+import com.microsoft.aad.adal4j.AuthenticationContext;
+import com.microsoft.aad.adal4j.AuthenticationResult;
+import com.microsoft.aad.adal4j.ClientCredential;
+import com.nimbusds.jwt.JWTParser;
+import com.nimbusds.oauth2.sdk.AuthorizationCode;
+import com.nimbusds.oauth2.sdk.ErrorObject;
+import com.nimbusds.openid.connect.sdk.AuthenticationErrorResponse;
+import com.nimbusds.openid.connect.sdk.AuthenticationResponse;
+import com.nimbusds.openid.connect.sdk.AuthenticationResponseParser;
+import com.nimbusds.openid.connect.sdk.AuthenticationSuccessResponse;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.SneakyThrows;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.apache.commons.collections4.map.LRUMap;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.naming.ServiceUnavailableException;
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Authentication provider for Azure Active Directory
+ */
+@EqualsAndHashCode(callSuper = true)
+public class AzureAuthenticationProvider extends AuthenticationProvider
+        implements AuthenticationDataStorage {
+
+    public static final String EXTERNAL_AUTHENTICATOR_AZURE_AD = "aad";
+    public static final String EXTERNAL_USER_AND_ROLE_AZURE_AD = "aad";
+    /**
+     * Session id to state data
+     */
+    private static final Map<String, StateHolder> STATES = new LRUMap<>(512);
+    private static final String STATE = "state";
+    private static final String FAILED_TO_VALIDATE_MESSAGE = "Failed to validate data received from Authorization service - ";
+    private static final long STATE_TTL = TimeUnit.HOURS.toSeconds(1);
+    private final String tenant;
+    private final String clientId;
+    private final String secretKey;
+    private final String authority = "https://login.microsoftonline.com/";
+    private AuthenticationResultHolder applicationAccessToken = new NullAuthenticationResultHolder();
+
+    public AzureAuthenticationProvider(Properties properties) {
+        super(
+                "https://login.microsoftonline.com/",
+                EXTERNAL_AUTHENTICATOR_AZURE_AD,
+                "Azure Active Directory",
+                "/imcms/images/external_identifiers/azure-active-directory.svg"
+        );
+        tenant = properties.getProperty("aad.tenant.id");
+        clientId = properties.getProperty("aad.client.id");
+        secretKey = properties.getProperty("aad.secret.key");
+        Objects.requireNonNull(tenant, "Azure Active Directory tenant is null!");
+        Objects.requireNonNull(clientId, "Azure Active Directory client id is null!");
+        Objects.requireNonNull(secretKey, "Azure Active Directory secret directory is null!");
+    }
+
+    @Override
+    public void updateAuthData(HttpServletRequest request) {
+        if (AuthHelper.isAuthDataExpired(AuthHelper.getAuthenticationResult(request))) {
+            updateAuthDataUsingRefreshToken(request);
+        }
+    }
+
+    private void updateAuthDataUsingRefreshToken(HttpServletRequest request) {
+        final AuthenticationResult authData = getAccessTokenFromRefreshToken(
+                AuthHelper.getAuthenticationResult(request).getRefreshToken()
+        );
+        AuthHelper.setAuthenticationResult(request, authData);
+    }
+
+    @SneakyThrows
+    private AuthenticationResult getAccessTokenFromRefreshToken(String refreshToken) {
+        final ExecutorService service = Executors.newSingleThreadExecutor();
+        try {
+            final AuthenticationContext context = new AuthenticationContext(
+                    authority + tenant + "/", true, service
+            );
+            final Future<AuthenticationResult> future = context.acquireTokenByRefreshToken(
+                    refreshToken, new ClientCredential(clientId, secretKey), null, null
+            );
+            return Optional.ofNullable(future.get())
+                    .orElseThrow(() -> new ServiceUnavailableException("authentication result was null"));
+        } finally {
+            service.shutdown();
+        }
+    }
+
+    @Override
+    public void storeAuthenticationData(String sessionId, String nextUrl) {
+        // use state parameter to validate response from Authorization server
+        final String state = UUID.randomUUID().toString();
+        // use nonce parameter to validate idToken
+        final String nonce = UUID.randomUUID().toString();
+        STATES.put(sessionId, new StateHolder(state, nonce, nextUrl));
+    }
+
+    @Override
+    public String buildAuthenticationURL(String redirectURL, String sessionId, String nextUrl) {
+        storeAuthenticationData(sessionId, nextUrl);
+        final StateHolder stateHolder = STATES.get(sessionId);
+        String encodedURL;
+        try {
+            encodedURL = URLEncoder.encode(redirectURL, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            encodedURL = redirectURL; // stupid situation
+        }
+        return authority + tenant
+                + "/oauth2/authorize?response_type=code&scope=directory.read.all&response_mode=form_post"
+                + "&redirect_uri=" + encodedURL
+                + "&client_id=" + clientId
+                + "&resource=https%3a%2f%2fgraph.microsoft.com"
+                + "&state=" + stateHolder.state
+                + "&nonce=" + stateHolder.nonce;
+    }
+
+    @Override
+    public ExternalUser getUser(HttpServletRequest request) {
+        final AuthenticationResult result = AuthHelper.getAuthenticationResult(request);
+        if (result == null) {
+            throw new RuntimeException("AuthenticationResult not found in session.");
+        }
+        return getUserFromGraph(result.getAccessToken()).toDomainObject();
+    }
+
+    private AzureActiveDirectoryUserDTO getUserFromGraph(String accessToken) {
+        final AzureActiveDirectoryUserDTO userDTO = getObjectFromGraph(
+                "me", accessToken, AzureActiveDirectoryUserDTO.class
+        );
+        final List<AzureActiveDirectoryGroupDTO> userGroups = getObjectFromGraph(
+                "me/memberOf", accessToken, AzureActiveDirectoryGroupsHolderDTO.class
+        ).getGroups();
+
+        userDTO.setUserGroups(new HashSet<>(userGroups));
+
+        return userDTO;
+    }
+
+    @SneakyThrows
+    private <T> T getObjectFromGraph(String resourceName, String accessToken, Class<T> result) {
+        final URL url = new URL("https://graph.microsoft.com/v1.0/" + resourceName);
+        final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("GET");
+        conn.setRequestProperty("Authorization", "Bearer " + accessToken);
+        conn.setRequestProperty("Accept", "application/json");
+        return new ObjectMapper().readValue(conn.getInputStream(), result);
+    }
+
+    @Override
+    @SneakyThrows
+    public String processAuthentication(HttpServletRequest request) {
+        final String currentUri = request.getRequestURL().toString();
+        final String queryStr = request.getQueryString();
+        final String fullUrl = currentUri + (queryStr != null ? "?" + queryStr : "");
+        final Map<String, String> params = extractRequestParams(request.getParameterMap());
+        final String sessionId = request.getSession().getId();
+        eliminateExpiredStates();
+        // validate that state in response equals to state in request
+        final StateHolder stateData = validateState(sessionId, params.get(STATE));
+        final AuthenticationResponse authResponse = AuthenticationResponseParser.parse(new URI(fullUrl), params);
+        if (AuthHelper.isAuthenticationSuccessful(authResponse)) {
+            final AuthenticationSuccessResponse oidcResponse = (AuthenticationSuccessResponse) authResponse;
+            // validate that OIDC Auth Response matches Code Flow (contains only requested artifacts)
+            validateAuthRespMatchesCodeFlow(oidcResponse);
+            final AuthenticationResult authData = getAccessToken(oidcResponse.getAuthorizationCode(), currentUri);
+            // validate nonce to prevent reply attacks (code maybe substituted to one with broader access)
+            validateNonce(stateData, getClaimValueFromIdToken(authData.getIdToken(), "nonce"));
+            AuthHelper.setAuthenticationResult(request, authData);
+            return stateData.nextUrl;
+        }
+        final AuthenticationErrorResponse oidcResponse = (AuthenticationErrorResponse) authResponse;
+        final ErrorObject oidcError = oidcResponse.getErrorObject();
+        throw new RuntimeException(String.format(
+                "Request for auth code failed: %s - %s",
+                oidcError.getCode(),
+                oidcError.getDescription()
+        ));
+    }
+
+    private Map<String, String> extractRequestParams(Map<String, String[]> parameterMap) {
+        final Map<String, String> params = new HashMap<>();
+        for (String key : parameterMap.keySet()) {
+            params.put(key, parameterMap.get(key)[0]);
+        }
+        return params;
+    }
+
+    private void validateNonce(StateHolder stateData, String nonce) {
+        if (StringUtils.isEmpty(nonce) || !nonce.equals(stateData.getNonce())) {
+            throw new RuntimeException(FAILED_TO_VALIDATE_MESSAGE + "could not validate nonce");
+        }
+    }
+
+    private String getClaimValueFromIdToken(String idToken, String claimKey) throws ParseException {
+        return (String) JWTParser.parse(idToken).getJWTClaimsSet().getClaim(claimKey);
+    }
+
+    private StateHolder validateState(String sessionId, String state) {
+        return extractState(sessionId, state).orElseThrow(
+                () -> new RuntimeException(FAILED_TO_VALIDATE_MESSAGE + "could not validate state")
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    private Optional<StateHolder> extractState(String sessionId, String state) {
+        final StateHolder stateHolder = STATES.remove(sessionId);
+        if ((stateHolder == null) || (StringUtils.isEmpty(state)) || (!state.equals(stateHolder.state))) {
+            return Optional.empty();
+        }
+        return Optional.of(stateHolder);
+    }
+
+    private void eliminateExpiredStates() {
+        final Iterator<Map.Entry<String, StateHolder>> it = STATES.entrySet().iterator();
+        final Date currTime = new Date();
+        while (it.hasNext()) {
+            final long expirationTime = it.next().getValue().getExpirationDate().getTime();
+            final long diffInSeconds = TimeUnit.MILLISECONDS.toSeconds(currTime.getTime() - expirationTime);
+            if (diffInSeconds > STATE_TTL) {
+                it.remove();
+            }
+        }
+    }
+
+    private void validateAuthRespMatchesCodeFlow(AuthenticationSuccessResponse oidcResponse) {
+        if ((oidcResponse.getIDToken() != null)
+                || (oidcResponse.getAccessToken() != null)
+                || (oidcResponse.getAuthorizationCode() == null)) {
+            throw new RuntimeException(FAILED_TO_VALIDATE_MESSAGE + "unexpected set of artifacts received");
+        }
+    }
+
+    private AuthenticationResult getAccessToken(AuthorizationCode authorizationCode, String currentUri)
+            throws Exception {
+        final String authCode = authorizationCode.getValue();
+        final ClientCredential credential = new ClientCredential(clientId, secretKey);
+        final ExecutorService service = Executors.newSingleThreadExecutor();
+        try {
+            final AuthenticationContext context = new AuthenticationContext(
+                    authority + tenant + "/", true, service
+            );
+            final Future<AuthenticationResult> future = context.acquireTokenByAuthorizationCode(
+                    authCode, new URI(currentUri), credential, null
+            );
+            final AuthenticationResult result = future.get();
+            if (result == null) {
+                throw new ServiceUnavailableException("authentication result was null");
+            }
+            return result;
+        } finally {
+            service.shutdown();
+        }
+    }
+
+    @Override
+    public List<ExternalRole> getRoles() {
+        final AuthenticationResultHolder token = getApplicationAccessToken();
+        final List<AzureActiveDirectoryGroupDTO> groups = getObjectFromGraph(
+                "groups", token.getAccessToken(), AzureActiveDirectoryGroupsHolderDTO.class
+        ).getGroups();
+        return new ArrayList<>(groups);
+    }
+
+    private AuthenticationResultHolder getApplicationAccessToken() {
+        if (applicationAccessToken.getExpiresOn().before(new Date())) {
+            applicationAccessToken = getNewApplicationAccessToken();
+        }
+        return applicationAccessToken;
+    }
+
+    @SneakyThrows
+    private AuthenticationResultHolder getNewApplicationAccessToken() {
+        final String spec = authority + tenant + "/oauth2/v2.0/token";
+        final String params = "client_id=" + URLEncoder.encode(clientId, StandardCharsets.UTF_8.name())
+                + "&client_secret=" + URLEncoder.encode(secretKey, StandardCharsets.UTF_8.name())
+                + "&scope=" + URLEncoder.encode("https://graph.microsoft.com/.default", StandardCharsets.UTF_8.name())
+                + "&grant_type=client_credentials";
+        final OkHttpClient client = new OkHttpClient();
+        final MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
+        final RequestBody body = RequestBody.create(mediaType, params);
+        final Request request = new Request.Builder()
+                .url(spec)
+                .post(body)
+                .addHeader("Content-Type", "application/x-www-form-urlencoded")
+                .addHeader("Cache-Control", "no-cache")
+                .build();
+        final String result = Objects.requireNonNull(client.newCall(request).execute().body()).string();
+        return new ObjectMapper().readValue(result, AuthenticationResultHolder.class);
+    }
+
+    @Data
+    private class StateHolder {
+        private final String state;
+        private final String nonce;
+        private final String nextUrl;
+        private final Date expirationDate;
+
+        StateHolder(String state, String nonce, String nextUrl) {
+            this.state = state;
+            this.nonce = nonce;
+            this.nextUrl = nextUrl;
+            this.expirationDate = new Date();
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/component/NullAuthenticationResultHolder.java b/server/src/com/imcode/imcms/domain/component/NullAuthenticationResultHolder.java
new file mode 100644
index 0000000000..df240d952f
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/component/NullAuthenticationResultHolder.java
@@ -0,0 +1,7 @@
+package com.imcode.imcms.domain.component;
+
+public class NullAuthenticationResultHolder extends AuthenticationResultHolder {
+    {
+        expiresIn = 0;
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryGroupDTO.java b/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryGroupDTO.java
new file mode 100644
index 0000000000..4a83198346
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryGroupDTO.java
@@ -0,0 +1,39 @@
+package com.imcode.imcms.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import static com.imcode.imcms.domain.component.AzureAuthenticationProvider.EXTERNAL_USER_AND_ROLE_AZURE_AD;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AzureActiveDirectoryGroupDTO extends ExternalRole {
+
+    private String createdDateTime;
+    private String description;
+    private String displayName;
+    private String mail;
+    private String mailNickname;
+    private String onPremisesLastSyncDateTime;
+    private String onPremisesSecurityIdentifier;
+    private String visibility;
+    private String deletedDateTime;
+    private String classification;
+    private String preferredDataLocation;
+    private String renewedDateTime;
+    private String[] groupTypes;
+    private String[] proxyAddresses;
+    private String[] creationOptions;
+    private String[] onPremisesProvisioningErrors;
+    private String[] resourceBehaviorOptions;
+    private String[] resourceProvisioningOptions;
+    private boolean mailEnabled;
+    private boolean securityEnabled;
+    private boolean onPremisesSyncEnabled;
+
+    {
+        providerId = EXTERNAL_USER_AND_ROLE_AZURE_AD;
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryGroupsHolderDTO.java b/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryGroupsHolderDTO.java
new file mode 100644
index 0000000000..62dad32553
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryGroupsHolderDTO.java
@@ -0,0 +1,18 @@
+package com.imcode.imcms.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AzureActiveDirectoryGroupsHolderDTO {
+
+    private AzureActiveDirectoryGroupDTO[] value;
+
+    public List<AzureActiveDirectoryGroupDTO> getGroups() {
+        return Arrays.asList(value);
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryUserDTO.java b/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryUserDTO.java
new file mode 100644
index 0000000000..7a4c5f3ec5
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/AzureActiveDirectoryUserDTO.java
@@ -0,0 +1,55 @@
+package com.imcode.imcms.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.imcode.imcms.model.ExternalUser;
+import imcode.server.ImcmsConstants;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.imcode.imcms.domain.component.AzureAuthenticationProvider.EXTERNAL_AUTHENTICATOR_AZURE_AD;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AzureActiveDirectoryUserDTO {
+    /**
+     * In UUID form
+     */
+    private String id;
+    /**
+     * Full name
+     */
+    private String displayName;
+    /**
+     * First name
+     */
+    private String givenName;
+    /**
+     * Second name
+     */
+    private String surname;
+    private String jobTitle;
+    private String mail;
+    private String mobilePhone;
+    private String officeLocation;
+    private String preferredLanguage;
+    private String userPrincipalName;
+    private String[] businessPhones;
+    private Set<AzureActiveDirectoryGroupDTO> userGroups;
+
+    public ExternalUser toDomainObject() {
+        final ExternalUser user = new ExternalUser(EXTERNAL_AUTHENTICATOR_AZURE_AD);
+
+        user.setLoginName(id);
+        user.setFirstName(StringUtils.defaultString(givenName));
+        user.setLastName(StringUtils.defaultString(surname));
+        user.setPassword("");
+        user.setEmailAddress(StringUtils.defaultString(mail));
+        user.setLanguageIso639_2(ImcmsConstants.ENG_CODE_ISO_639_2);
+        user.setExternalRoles(new HashSet<>(userGroups));
+
+        return user;
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/ExternalRole.java b/server/src/com/imcode/imcms/domain/dto/ExternalRole.java
new file mode 100644
index 0000000000..23b4eb8259
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/ExternalRole.java
@@ -0,0 +1,16 @@
+package com.imcode.imcms.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class ExternalRole implements Serializable {
+    protected String providerId;
+    private String id;
+
+    public ExternalRole() {
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/ExternalToLocalRoleLink.java b/server/src/com/imcode/imcms/domain/dto/ExternalToLocalRoleLink.java
new file mode 100644
index 0000000000..8ab1688a8b
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/ExternalToLocalRoleLink.java
@@ -0,0 +1,36 @@
+package com.imcode.imcms.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ExternalToLocalRoleLink {
+
+    protected Integer id;
+    protected String providerId;
+    protected String externalRoleId;
+    protected Integer localRoleId;
+
+    public ExternalToLocalRoleLink(ExternalToLocalRoleLink from) {
+        setId(from.getId());
+        setProviderId(from.getProviderId());
+        setExternalRoleId(from.getExternalRoleId());
+        setLocalRoleId(from.getLocalRoleId());
+    }
+
+    public ExternalToLocalRoleLink(ExternalRole externalRole, Integer localRoleId) {
+        this(externalRole.getProviderId(), externalRole.getId(), localRoleId);
+    }
+
+    public ExternalToLocalRoleLink(String providerId, String externalRoleId, Integer localRoleId) {
+        this(null, providerId, externalRoleId, localRoleId);
+    }
+
+    public ExternalToLocalRoleLink(Integer id, String providerId, String externalRoleId, Integer localRoleId) {
+        this.id = id;
+        this.providerId = providerId;
+        this.externalRoleId = externalRoleId;
+        this.localRoleId = localRoleId;
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/export/AbstractDocumentSerializer.java b/server/src/com/imcode/imcms/domain/dto/export/AbstractDocumentSerializer.java
new file mode 100644
index 0000000000..cadcf206a3
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/export/AbstractDocumentSerializer.java
@@ -0,0 +1,179 @@
+package com.imcode.imcms.domain.dto.export;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+import com.imcode.imcms.mapping.CategoryMapper;
+import imcode.server.Imcms;
+import imcode.server.document.CategoryDomainObject;
+import imcode.server.document.CategoryTypeDomainObject;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.RoleIdToDocumentPermissionSetTypeMappings;
+import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
+import imcode.server.user.RoleDomainObject;
+import imcode.server.user.RoleGetter;
+import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+
+public abstract class AbstractDocumentSerializer<T extends DocumentDomainObject> extends StdSerializer<T> {
+	protected final SimpleDateFormat dateTimeFormat = new SimpleDateFormat(StdDateFormat.DATE_FORMAT_STR_ISO8601);
+
+	public AbstractDocumentSerializer() {
+		this(null);
+	}
+
+	protected AbstractDocumentSerializer(Class<T> t) {
+		super(t);
+	}
+
+	protected abstract void serializeContent(T value, JsonGenerator gen, SerializerProvider provider) throws IOException;
+
+	protected void writeNullable(String name, String value, JsonGenerator gen) throws IOException {
+		if (StringUtils.isNotBlank(value)) {
+			gen.writeStringField(name, value);
+		}
+	}
+
+	@Override
+	public void serialize(T value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final ImcmsAuthenticatorAndUserAndRoleMapper userMapper = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
+
+		gen.writeStartObject();
+		gen.writeNumberField("id", value.getId());
+		gen.writeStringField("type", value.getDocumentType().getName().toLocalizedString("eng"));
+		gen.writeStringField("default_language", Imcms.getDefaultLanguage());
+		writeNullable("headline", value.getHeadline(), gen);
+		writeNullable("menu_text", value.getMenuText(), gen);
+		writeNullable("menu_image", value.getMenuImage(), gen);
+		writeNullable("alias", value.getAlias(), gen);
+		gen.writeBooleanField("search_disabled", value.isSearchDisabled());
+		gen.writeBooleanField("linkable_for_unauthorized_users", value.isLinkedForUnauthorizedUsers());
+		gen.writeBooleanField("linkable_by_other_users", value.isLinkableByOtherUsers());
+		gen.writeStringField("target", value.getTarget());
+
+		gen.writeStringField("creator", Utility.formatUser(userMapper.getUser(value.getCreatorId())));
+
+		final Integer publisherId = value.getPublisherId();
+		if (publisherId != null)
+			gen.writeStringField("publisher", Utility.formatUser(userMapper.getUser(publisherId)));
+
+		final Date createdAt = value.getCreatedDatetime();
+		if (createdAt != null)
+			gen.writeStringField("created_at", dateTimeFormat.format(createdAt));
+
+		final Date changedAt = value.getModifiedDatetime();
+		if (changedAt != null)
+			gen.writeStringField("changed_at", dateTimeFormat.format(changedAt));
+
+		final Date archivedAt = value.getArchivedDatetime();
+		if (archivedAt != null)
+			gen.writeStringField("archived_at", dateTimeFormat.format(archivedAt));
+
+		final Date expireAt = value.getPublicationEndDatetime();
+		if (expireAt != null)
+			gen.writeStringField("expires_at", dateTimeFormat.format(expireAt));
+
+		final Date publishedAt = value.getPublicationStartDatetime();
+		if (publishedAt != null)
+			gen.writeStringField("published_at", dateTimeFormat.format(publishedAt));
+
+		writeCategories(value, gen, provider);
+		writeKeywords(value, gen, provider);
+		writeRolePermissions(value, gen, provider);
+		writeProperties(value, gen, provider);
+
+		serializeContent(value, gen, provider);
+
+		gen.writeEndObject();
+	}
+
+	private void writeCategories(T value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final Set<Integer> categoryIds = value.getCategoryIds();
+
+		if (categoryIds.isEmpty()) return;
+
+		final CategoryMapper categoryMapper = Imcms.getServices().getCategoryMapper();
+		gen.writeArrayFieldStart("categories");
+
+		for (Integer categoryId : categoryIds) {
+			final CategoryDomainObject category = categoryMapper.getCategoryById(categoryId);
+			gen.writeStartObject();
+
+			gen.writeStringField("name", category.getName());
+			writeNullable("description", category.getDescription(), gen);
+			writeNullable("image_url", category.getImageUrl(), gen);
+
+			final CategoryTypeDomainObject type = category.getType();
+			gen.writeObjectFieldStart("category_type");
+
+			gen.writeStringField("name", type.getName());
+			gen.writeBooleanField("multiselect", type.getMaxChoices() != 0);
+			gen.writeBooleanField("inherited", type.isInherited());
+
+			gen.writeEndObject();
+
+			gen.writeEndObject();
+		}
+		gen.writeEndArray();
+	}
+
+	private void writeKeywords(T value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final Set<String> keywords = value.getKeywords();
+
+		if (keywords.isEmpty()) return;
+
+		gen.writeArrayFieldStart("keywords");
+		for (String keyword : keywords) {
+			gen.writeString(keyword);
+		}
+		gen.writeEndArray();
+	}
+
+	private void writeRolePermissions(T value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final RoleIdToDocumentPermissionSetTypeMappings r2pMappings = value.getRoleIdsMappedToDocumentPermissionSetTypes();
+		if (r2pMappings == null || r2pMappings.getMappings().length == 0) {
+			return;
+		}
+
+		final RoleGetter roleGetter = Imcms.getServices().getRoleGetter();
+		gen.writeArrayFieldStart("roles");
+
+		for (RoleIdToDocumentPermissionSetTypeMappings.Mapping mapping : r2pMappings.getMappings()) {
+			final RoleDomainObject role = roleGetter.getRole(mapping.getRoleId());
+			gen.writeStartObject();
+
+			gen.writeStringField("name", role.getName());
+			gen.writeStringField("permission", mapping.getDocumentPermissionSetType().name());
+
+			gen.writeEndObject();
+		}
+
+		gen.writeEndArray();
+	}
+
+	private void writeProperties(T value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final Map<String, String> properties = value.getProperties();
+
+		if (properties.isEmpty()) return;
+
+		gen.writeArrayFieldStart("properties");
+
+		for (Map.Entry<String, String> entry : properties.entrySet()) {
+			gen.writeStartObject();
+
+			gen.writeStringField("key", entry.getKey());
+			gen.writeStringField("value", entry.getValue());
+
+			gen.writeEndObject();
+		}
+
+		gen.writeEndArray();
+	}
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/export/DocumentExportHistory.java b/server/src/com/imcode/imcms/domain/dto/export/DocumentExportHistory.java
new file mode 100644
index 0000000000..e008069323
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/export/DocumentExportHistory.java
@@ -0,0 +1,52 @@
+package com.imcode.imcms.domain.dto.export;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang.math.IntRange;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DocumentExportHistory {
+	private Integer start;
+	private Integer end;
+	private Integer[] documentList;
+	private Map<Integer, ExportStatus> documents = new HashMap<>();
+
+	public DocumentExportHistory(IntRange range) {
+		this.start = range.getMinimumInteger();
+		this.end = range.getMaximumInteger();
+	}
+
+	public DocumentExportHistory(Integer[] documentList) {
+		this.documentList = documentList;
+	}
+
+	@JsonIgnore
+	public IntRange getRange() {
+		return new IntRange(start, end);
+	}
+
+	public Integer[] getDocumentList() {
+		return documentList;
+	}
+
+	public ExportStatus getStatus(Integer id) {
+		return documents.get(id);
+	}
+
+	public void add(Integer id, ExportStatus status) {
+		documents.put(id, status);
+	}
+
+	public enum ExportStatus {
+		SUCCESS,
+		SKIPPED,
+		FAILED;
+	}
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/export/DocumentExportService.java b/server/src/com/imcode/imcms/domain/dto/export/DocumentExportService.java
new file mode 100644
index 0000000000..e72cc1e3a2
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/export/DocumentExportService.java
@@ -0,0 +1,192 @@
+package com.imcode.imcms.domain.dto.export;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.imcode.imcms.mapping.DocumentMapper;
+import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.DocumentTypeDomainObject;
+import imcode.server.document.FileDocumentDomainObject;
+import imcode.server.document.textdocument.ImageDomainObject;
+import imcode.server.document.textdocument.ImageSource;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
+import imcode.server.user.UserDomainObject;
+import imcode.util.io.InputStreamSource;
+import lombok.SneakyThrows;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.lang.math.IntRange;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipOutputStream;
+
+@Log4j2
+public class DocumentExportService {
+	private static final String SUMMARY_FILENAME = "summary.json";
+	private static final String EXPORT_ZIP_FILENAME = "export.zip";
+	private static final String DOCUMENTS_ZIP_PREFIX = "documents/";
+	private static final String IMAGES_ZIP_PREFIX = "images/";
+	private static final String FILES_ZIP_PREFIX = "files/";
+
+	private final Path exportFolder;
+	private final ImcmsServices imcmsServices;
+	private final ObjectMapper mapper = new ObjectMapper()
+			.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET)
+			.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
+			.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+			.setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
+			.enable(SerializationFeature.INDENT_OUTPUT)
+			.setDefaultPrettyPrinter(new DefaultPrettyPrinter());
+
+	private final List<String> exportedImages = new ArrayList<>();
+	private final List<String> exportedFiles = new ArrayList<>();
+
+	@SneakyThrows
+	public DocumentExportService(ImcmsServices imcmsServices) {
+		this.exportFolder = Paths.get(Imcms.getPath().getAbsolutePath(), "/WEB-INF/export/");
+		this.imcmsServices = imcmsServices;
+
+		if (!Files.exists(exportFolder)) {
+			Files.createDirectories(exportFolder);
+		}
+	}
+
+	public void exportDocuments(int start, int end, boolean skipExported, boolean exportImages, boolean exportFiles, UserDomainObject user) {
+		final DocumentMapper documentMapper = imcmsServices.getDocumentMapper();
+		final IntRange range = new IntRange(start, end);
+		final DocumentExportHistory history = new DocumentExportHistory(range);
+		final Iterator iterator = documentMapper.getDocumentsIteratorInRange(range);
+
+		exportDocuments(iterator, skipExported, exportImages, exportFiles, history, user);
+	}
+
+	public void exportDocuments(Integer[] ids, boolean skipExported, boolean exportImages, boolean exportFiles, UserDomainObject user) {
+		final DocumentMapper documentMapper = imcmsServices.getDocumentMapper();
+		final DocumentExportHistory history = new DocumentExportHistory(ids);
+		final Iterator iterator = documentMapper.getDocumentsIteratorIn(ids);
+
+		exportDocuments(iterator, skipExported, exportImages, exportFiles, history, user);
+	}
+
+	private void exportDocuments(Iterator iterator, boolean skipExported, boolean exportImages, boolean exportFiles, DocumentExportHistory history, UserDomainObject user) {
+		final DocumentMapper documentMapper = imcmsServices.getDocumentMapper();
+
+		try (final OutputStream fileOutputStream = Files.newOutputStream(exportFolder.resolve(EXPORT_ZIP_FILENAME));
+		     final ZipOutputStream zip = new ZipOutputStream(fileOutputStream);) {
+
+			while (iterator.hasNext()) {
+				final DocumentDomainObject document = (DocumentDomainObject) iterator.next();
+				final Integer docId = document.getId();
+				final String type = document.getDocumentType().getName().toLocalizedString("eng");
+				DocumentExportHistory.ExportStatus status;
+
+				try {
+					if (!document.isPublished() || !document.isExportAllowed() || (document.isExported() && skipExported)) {
+						status = DocumentExportHistory.ExportStatus.SKIPPED;
+					} else {
+						exportDocument(document, zip, type);
+						if (exportImages) exportImages(document, zip);
+						if (exportFiles) exportFiles(document, zip);
+
+						documentMapper.markDocumentAsExported(docId, user);
+						status = DocumentExportHistory.ExportStatus.SUCCESS;
+					}
+
+				} catch (IOException e) {
+					status = DocumentExportHistory.ExportStatus.FAILED;
+					log.error(String.format("Cannot export document with id = %s, type = %s", docId, type), e);
+				}
+
+				history.add(docId, status);
+				log.info(String.format("Document with 'id = %s', 'type = %s', 'exported with status = %s'", docId, type, status));
+			}
+
+			writeHistoryToSummaryFile(history);
+		} catch (IOException e) {
+			log.error("Documents export failed", e);
+			throw new RuntimeException("Documents export failed", e);
+		} finally {
+			exportedImages.clear();
+			exportedFiles.clear();
+		}
+	}
+
+	private void exportDocument(DocumentDomainObject document, ZipOutputStream zip, String type) throws IOException {
+		final ZipArchiveEntry zipEntry = new ZipArchiveEntry(document.getId() + ".json");
+		zipEntry.setComment(type);
+		zip.putNextEntry(zipEntry);
+		mapper.writeValue(zip, document);
+	}
+
+	private void exportImages(DocumentDomainObject document, ZipOutputStream zip) throws IOException {
+		if (!document.getDocumentType().equals(DocumentTypeDomainObject.TEXT)) return;
+
+		for (Map.Entry<Integer, ImageDomainObject> entry : ((TextDocumentDomainObject) document).getImages().entrySet()) {
+			final ImageDomainObject image = entry.getValue();
+			final ImageSource imageSource = image.getSource();
+			final String path = imageSource.toStorageString();
+
+			if (StringUtils.isNotBlank(path) && !exportedImages.contains(path)) {
+				final ZipArchiveEntry zipEntry = new ZipArchiveEntry(IMAGES_ZIP_PREFIX + path);
+				zip.putNextEntry(zipEntry);
+
+				writeFileToZip(zip, imageSource.getInputStreamSource());
+				exportedImages.add(path);
+			}
+		}
+	}
+
+	private void exportFiles(DocumentDomainObject document, ZipOutputStream zip) throws IOException {
+		if (!document.getDocumentType().equals(DocumentTypeDomainObject.FILE)) return;
+
+		final Map files = ((FileDocumentDomainObject) document).getFiles();
+		for (Object key : files.keySet()) {
+			final FileDocumentDomainObject.FileDocumentFile file = (FileDocumentDomainObject.FileDocumentFile) files.get(key);
+			final String filename = file.getFilename();
+
+			if (StringUtils.isNotBlank(filename) && !exportedFiles.contains(filename)) {
+				final ZipArchiveEntry zipEntry = new ZipArchiveEntry(FILES_ZIP_PREFIX + filename);
+
+				zip.putNextEntry(zipEntry);
+				writeFileToZip(zip, file.getInputStreamSource());
+				exportedFiles.add(filename);
+			}
+		}
+	}
+
+	private void writeFileToZip(ZipOutputStream zip, InputStreamSource source) throws IOException {
+		final InputStream inputStream = source.getInputStream();
+		byte[] bytes = new byte[1024];
+		int length;
+		while ((length = inputStream.read(bytes)) >= 0) {
+			zip.write(bytes, 0, length);
+		}
+		inputStream.close();
+	}
+
+	private void writeHistoryToSummaryFile(DocumentExportHistory history) throws IOException {
+		mapper.writeValue(exportFolder.resolve(SUMMARY_FILENAME).toFile(), history);
+	}
+
+	public Path getExportZipPath() {
+		return exportFolder.resolve(EXPORT_ZIP_FILENAME);
+	}
+
+	public DocumentExportHistory getDocumentExportHistory() throws IOException {
+		return mapper.readValue(exportFolder.resolve(SUMMARY_FILENAME).toFile(), DocumentExportHistory.class);
+	}
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/export/FileDocumentSerializer.java b/server/src/com/imcode/imcms/domain/dto/export/FileDocumentSerializer.java
new file mode 100644
index 0000000000..8855ad1b94
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/export/FileDocumentSerializer.java
@@ -0,0 +1,40 @@
+package com.imcode.imcms.domain.dto.export;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import imcode.server.document.FileDocumentDomainObject;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class FileDocumentSerializer extends AbstractDocumentSerializer<FileDocumentDomainObject> {
+	@Override
+	protected void serializeContent(FileDocumentDomainObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		writeFiles(value, gen, provider);
+	}
+
+	private void writeFiles(FileDocumentDomainObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final Map files = value.getFiles();
+		if (files.isEmpty()) return;
+
+		gen.writeArrayFieldStart("files");
+
+		for (Object key : files.keySet()) {
+			final String fileId = (String) key;
+			final FileDocumentDomainObject.FileDocumentFile documentFile = (FileDocumentDomainObject.FileDocumentFile) files.get(key);
+			gen.writeStartObject();
+
+			gen.writeStringField("id", documentFile.getId());
+			gen.writeStringField("variant_name", fileId);
+			gen.writeStringField("filename", documentFile.getFilename());
+			gen.writeStringField("mime", documentFile.getMimeType());
+			gen.writeBooleanField("created_as_image", documentFile.isCreatedAsImage());
+			gen.writeNumberField("size", documentFile.getInputStreamSource().getSize());
+			gen.writeBooleanField("default", fileId.equals(value.getDefaultFileId()));
+
+			gen.writeEndObject();
+		}
+
+		gen.writeEndArray();
+	}
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/export/TextDocumentSerializer.java b/server/src/com/imcode/imcms/domain/dto/export/TextDocumentSerializer.java
new file mode 100644
index 0000000000..40253d9d62
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/export/TextDocumentSerializer.java
@@ -0,0 +1,161 @@
+package com.imcode.imcms.domain.dto.export;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import imcode.server.document.textdocument.*;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TextDocumentSerializer extends AbstractDocumentSerializer<TextDocumentDomainObject> {
+
+	@Override
+	protected void serializeContent(TextDocumentDomainObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		gen.writeStringField("template", value.getTemplateName());
+		writeTexts(value, gen, provider);
+		writeImages(value, gen, provider);
+		writeMenus(value, gen, provider);
+	}
+
+	private void writeTexts(TextDocumentDomainObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final Map<Integer, TextDomainObject> texts = value.getTexts();
+
+		if (texts.isEmpty()) return;
+
+		gen.writeArrayFieldStart("texts");
+		for (Map.Entry<Integer, TextDomainObject> textEntry : texts.entrySet()) {
+			gen.writeStartObject();
+
+			gen.writeNumberField("index", textEntry.getKey());
+			gen.writeStringField("type", TextDomainObject.TEXT_TYPE_PLAIN == textEntry.getValue().getType() ? "TEXT" : "HTML");
+			gen.writeStringField("text", textEntry.getValue().getText());
+
+			gen.writeEndObject();
+		}
+		gen.writeEndArray();
+	}
+
+	private void writeImages(TextDocumentDomainObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final Map<Integer, ImageDomainObject> images = value.getImages();
+
+		if (images.isEmpty()) return;
+
+		gen.writeArrayFieldStart("images");
+
+		for (Map.Entry<Integer, ImageDomainObject> imageEntry : images.entrySet()) {
+			final Integer index = imageEntry.getKey();
+			final ImageDomainObject image = imageEntry.getValue();
+			final ImageSource imageSource = image.getSource();
+
+			if (StringUtils.isNotBlank(imageSource.toStorageString())) {
+				gen.writeStartObject();
+
+				//name in db
+				gen.writeNumberField("index", index);
+				gen.writeStringField("name", image.getName());
+				gen.writeStringField("generated_filename", image.getGeneratedFilename());
+
+				gen.writeNumberField("width", image.getWidth());
+				gen.writeNumberField("height", image.getHeight());
+				gen.writeNumberField("border", image.getBorder());
+				gen.writeNumberField("vertical_space", image.getVerticalSpace());
+				gen.writeNumberField("horizontal_space", image.getHorizontalSpace());
+				gen.writeStringField("target", image.getTarget());
+				gen.writeStringField("align", image.getAlign());
+				gen.writeStringField("alt_text", image.getAlternateText());
+				gen.writeStringField("low_resolution_url", image.getLowResolutionUrl());
+				gen.writeStringField("image_url", imageSource.toStorageString());
+				gen.writeStringField("link_url", image.getLinkUrl());
+				gen.writeNumberField("type", imageSource.getTypeId());
+				gen.writeStringField("format", (image.getFormat() != null ? image.getFormat().getFormat() : null));
+				gen.writeNumberField("rotate_angle", image.getRotateDirection().getAngle());
+
+				final ImageDomainObject.CropRegion region = image.getCropRegion();
+				gen.writeNumberField("crop_x1", region.getCropX1());
+				gen.writeNumberField("crop_y1", region.getCropY1());
+				gen.writeNumberField("crop_x2", region.getCropX2());
+				gen.writeNumberField("crop_y2", region.getCropY2());
+				gen.writeNumberField("resize", (image.getResize() != null ? image.getResize().getOrdinal() : 0));
+
+				gen.writeEndObject();
+			}
+		}
+		gen.writeEndArray();
+	}
+
+	private void writeMenus(TextDocumentDomainObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		final Map<Integer, MenuDomainObject> menus = value.getMenus();
+
+		if (menus.isEmpty()) return;
+
+		gen.writeArrayFieldStart("menus");
+		for (Map.Entry<Integer, MenuDomainObject> menuEntry : menus.entrySet()) {
+			final MenuDomainObject menu = menuEntry.getValue();
+			gen.writeStartObject();
+
+			gen.writeNumberField("index", menuEntry.getKey());
+
+			final int sortOrderInt = menu.getSortOrder();
+			gen.writeStringField("type_sort", getTypeOrderName(sortOrderInt));
+			gen.writeArrayFieldStart("menu_items");
+
+			final MenuItemDomainObject[] menuItems = menu.getMenuItems();
+			final Map<Integer, String> sortOrderMap = getSortOrder(sortOrderInt, menuItems);
+
+			for (MenuItemDomainObject menuItem : menuItems) {
+				gen.writeStartObject();
+
+				final int documentId = menuItem.getDocumentId();
+
+				gen.writeNumberField("document_id", documentId);
+				gen.writeStringField("sort_order", sortOrderMap.get(documentId));
+
+				gen.writeEndObject();
+			}
+
+			gen.writeEndArray();
+			gen.writeEndObject();
+		}
+		gen.writeEndArray();
+	}
+
+	private String getTypeOrderName(int menuTypeOrder) {
+		switch (menuTypeOrder) {
+			case 2:
+				return "MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED";
+			case 3:
+				return "MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED";
+			case 4:
+				return "MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER";
+			case 5:
+				return "MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED";
+			default:
+				return "MENU_SORT_ORDER__BY_HEADLINE";
+		}
+	}
+
+	private Map<Integer, String> getSortOrder(int menuTypeOrder, MenuItemDomainObject[] menuItems) {
+		final HashMap<Integer, String> documentIdToSortOrderMap = new HashMap<>();
+
+		for (int i = 0; i < menuItems.length; i++) {
+			final MenuItemDomainObject menuItem = menuItems[i];
+			final int documentId = menuItem.getDocumentId();
+
+			String sortOrder;
+			if (menuTypeOrder == 2) {
+				sortOrder = String.valueOf(menuItem.getSortKey() == null ? i : menuItem.getSortKey());
+			} else if (menuTypeOrder == 4) {
+				sortOrder = StringUtils.defaultIfBlank(menuItem.getTreeSortKey().toString(), String.valueOf(i));
+			} else {
+				sortOrder = String.valueOf(i);
+
+			}
+
+			documentIdToSortOrderMap.put(documentId, sortOrder);
+		}
+
+		return documentIdToSortOrderMap;
+	}
+}
diff --git a/server/src/com/imcode/imcms/domain/dto/export/URLDocumentSerializer.java b/server/src/com/imcode/imcms/domain/dto/export/URLDocumentSerializer.java
new file mode 100644
index 0000000000..214be06c8e
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/dto/export/URLDocumentSerializer.java
@@ -0,0 +1,15 @@
+package com.imcode.imcms.domain.dto.export;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import imcode.server.document.UrlDocumentDomainObject;
+
+import java.io.IOException;
+
+public class URLDocumentSerializer extends AbstractDocumentSerializer<UrlDocumentDomainObject> {
+	@Override
+	protected void serializeContent(UrlDocumentDomainObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		gen.writeStringField("url", value.getUrl());
+	}
+
+}
diff --git a/server/src/com/imcode/imcms/domain/exception/ExternalIdentifierNotEnabledException.java b/server/src/com/imcode/imcms/domain/exception/ExternalIdentifierNotEnabledException.java
new file mode 100644
index 0000000000..c50fe1c22b
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/exception/ExternalIdentifierNotEnabledException.java
@@ -0,0 +1,10 @@
+package com.imcode.imcms.domain.exception;
+
+public class ExternalIdentifierNotEnabledException extends RuntimeException {
+
+    private static final long serialVersionUID = 6792272920243591023L;
+
+    public ExternalIdentifierNotEnabledException(String identifierId) {
+        super("External identifier with " + identifierId + " ID not enabled.");
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/factory/AuthenticationProvidersFactory.java b/server/src/com/imcode/imcms/domain/factory/AuthenticationProvidersFactory.java
new file mode 100644
index 0000000000..35a3347607
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/factory/AuthenticationProvidersFactory.java
@@ -0,0 +1,47 @@
+package com.imcode.imcms.domain.factory;
+
+import com.imcode.imcms.domain.component.AzureAuthenticationProvider;
+import com.imcode.imcms.domain.exception.ExternalIdentifierNotEnabledException;
+import com.imcode.imcms.model.AuthenticationProvider;
+import imcode.server.DefaultImcmsServices;
+
+import java.util.*;
+
+import static com.imcode.imcms.domain.component.AzureAuthenticationProvider.EXTERNAL_AUTHENTICATOR_AZURE_AD;
+
+public class AuthenticationProvidersFactory {
+
+    private final Properties properties;
+    private final Map<String, AuthenticationProvider> idToProvider = new HashMap<>();
+
+    public AuthenticationProvidersFactory(Properties imcmsProperties) {
+        properties = imcmsProperties;
+    }
+
+    public List<AuthenticationProvider> getProviders() {
+        final List<AuthenticationProvider> providers = new ArrayList<>();
+        final String externalAuthenticator = properties.getProperty("ExternalAuthenticator", "");
+
+		//ldap causes errors because there are no such provider...
+        if (!externalAuthenticator.isEmpty() && !externalAuthenticator.equalsIgnoreCase(DefaultImcmsServices.EXTERNAL_AUTHENTICATOR_LDAP)) {
+            providers.add(getProvider(externalAuthenticator));
+        }
+        return providers;
+    }
+
+    public AuthenticationProvider getProvider(String identifierId) {
+        identifierId = identifierId.toLowerCase();
+        final AuthenticationProvider authenticationProvider = idToProvider.get(identifierId);
+
+        if (authenticationProvider != null) return authenticationProvider;
+
+        switch (identifierId) {
+            case EXTERNAL_AUTHENTICATOR_AZURE_AD:
+                final AzureAuthenticationProvider provider = new AzureAuthenticationProvider(properties);
+                idToProvider.put(EXTERNAL_AUTHENTICATOR_AZURE_AD, provider);
+                return provider;
+        }
+
+        throw new ExternalIdentifierNotEnabledException(identifierId);
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/repository/ExternalToLocalRoleLinkComponent.java b/server/src/com/imcode/imcms/domain/repository/ExternalToLocalRoleLinkComponent.java
new file mode 100644
index 0000000000..b50198145a
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/repository/ExternalToLocalRoleLinkComponent.java
@@ -0,0 +1,129 @@
+package com.imcode.imcms.domain.repository;
+
+import com.imcode.imcms.domain.dto.ExternalRole;
+import com.imcode.imcms.model.ExternalToLocalRoleLinkModel;
+import imcode.server.Imcms;
+import imcode.server.user.RoleDomainObject;
+import imcode.server.user.RoleId;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ExternalToLocalRoleLinkComponent {
+
+    private final static Logger log = LogManager.getLogger(ExternalToLocalRoleLinkComponent.class);
+    private final Connection connection;
+
+
+    public ExternalToLocalRoleLinkComponent(DataSource dataSource) throws SQLException {
+        this.connection = dataSource.getConnection();
+    }
+
+    public Set<ExternalToLocalRoleLinkModel> findByProviderIdAndExternalRoleId(ExternalRole externalRole) throws SQLException {
+        final String sql = "SELECT * from external_to_local_roles_links WHERE provider_id =? AND external_role_id =?";
+        ResultSet resultSet = null;
+        Set<ExternalToLocalRoleLinkModel> externalRoleLinkModels = new HashSet<>();
+
+        try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+            connection.setAutoCommit(false);
+            preparedStatement.setString(1, externalRole.getProviderId());
+            preparedStatement.setString(2, externalRole.getId());
+            resultSet = preparedStatement.executeQuery();
+            connection.commit();
+
+            while (resultSet.next()) {
+                externalRoleLinkModels.add(new ExternalToLocalRoleLinkModel(resultSet.getInt(1),
+                        resultSet.getString(2),
+                        resultSet.getString(3),
+                        Imcms.getServices()
+                                .getImcmsAuthenticatorAndUserAndRoleMapper()
+                                .getRoleById(resultSet.getInt(4))
+                ));
+            }
+
+        } catch (SQLException s) {
+            connection.rollback();
+            log.error(String.format("%s with provideId %s and Id %s", s.getMessage(),
+                    externalRole.getProviderId(), externalRole.getId()));
+        } finally {
+            connection.setAutoCommit(true);
+            if (resultSet != null) resultSet.close();
+        }
+
+        return externalRoleLinkModels;
+    }
+
+    public void delete(ExternalToLocalRoleLinkModel roleLinkModel) throws SQLException {
+
+        final String sql = "DELETE FROM external_to_local_roles_links WHERE id=?";
+        try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+            preparedStatement.setInt(1, roleLinkModel.getId());
+            preparedStatement.executeUpdate();
+            connection.commit();
+        } catch (SQLException s) {
+            connection.rollback();
+            log.error(String.format("%s delete not complete with id %d", s.getMessage(), roleLinkModel.getId()));
+        } finally {
+            connection.setAutoCommit(true);
+        }
+    }
+
+    public List<RoleDomainObject> findRolesByExternalRoleId(String id) throws SQLException {
+        String sql = "SELECT linked_local_role_id from external_to_local_roles_links WHERE external_role_id = ?";
+        ResultSet resultSet = null;
+        List<RoleDomainObject> roles = new ArrayList<>();
+        try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+            connection.setAutoCommit(false);
+            preparedStatement.setString(1, id);
+            resultSet = preparedStatement.executeQuery();
+            connection.commit();
+            while (resultSet.next()) {
+                roles.add(Imcms.getServices()
+                        .getImcmsAuthenticatorAndUserAndRoleMapper()
+                        .getRoleById(resultSet.getInt(1)));
+            }
+        } catch (SQLException s) {
+            connection.rollback();
+            log.error(String.format("%s dont not find roleId %s", s.getMessage(), id));
+        } finally {
+            connection.setAutoCommit(true);
+            if (resultSet != null) resultSet.close();
+        }
+
+        return roles;
+    }
+
+    public void save(ExternalToLocalRoleLinkModel linkRole) throws SQLException {
+        String sql = "INSERT INTO external_to_local_roles_links (provider_id, external_role_id, linked_local_role_id) values (?,?,?)";
+        boolean externalHasCurrentRole = findRolesByExternalRoleId(linkRole.getExternalRoleId()).stream()
+                .map(RoleDomainObject::getId)
+                .map(RoleId::intValue)
+                .anyMatch(id -> linkRole.getLocalRoleId().equals(id));
+        try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+            connection.setAutoCommit(false);
+
+            if (!externalHasCurrentRole) {
+                preparedStatement.setString(1, linkRole.getProviderId());
+                preparedStatement.setString(2, linkRole.getExternalRoleId());
+                preparedStatement.setInt(3, linkRole.getLocalRoleId());
+
+                preparedStatement.executeUpdate();
+                connection.commit();
+            }
+        } catch (SQLException e) {
+            connection.rollback();
+            log.error(String.format("%s save not completed with roleId %d", e.getMessage(), linkRole.getId()));
+        } finally {
+            connection.setAutoCommit(true);
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/services/AuthenticationProviderService.java b/server/src/com/imcode/imcms/domain/services/AuthenticationProviderService.java
new file mode 100644
index 0000000000..01439c4904
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/AuthenticationProviderService.java
@@ -0,0 +1,12 @@
+package com.imcode.imcms.domain.services;
+
+import com.imcode.imcms.model.AuthenticationProvider;
+
+import java.util.List;
+
+public interface AuthenticationProviderService {
+
+    List<AuthenticationProvider> getAuthenticationProviders();
+
+    AuthenticationProvider getAuthenticationProvider(String identifierId);
+}
diff --git a/server/src/com/imcode/imcms/domain/services/ExternalToLocalRoleLinkService.java b/server/src/com/imcode/imcms/domain/services/ExternalToLocalRoleLinkService.java
new file mode 100644
index 0000000000..2ad3dd4190
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/ExternalToLocalRoleLinkService.java
@@ -0,0 +1,16 @@
+package com.imcode.imcms.domain.services;
+
+import com.imcode.imcms.domain.dto.ExternalRole;
+import imcode.server.user.RoleDomainObject;
+
+import java.sql.SQLException;
+import java.util.Set;
+
+public interface ExternalToLocalRoleLinkService {
+
+    void setLinkedRoles(ExternalRole externalRole, Set<Integer> localRolesId) throws SQLException;
+
+    Set<RoleDomainObject> getLinkedLocalRoles(ExternalRole externalRole) throws SQLException;
+
+    Set<RoleDomainObject> toLinkedLocalRoles(Set<ExternalRole> externalRoles) throws SQLException;
+}
diff --git a/server/src/com/imcode/imcms/domain/services/api/DefaultExternalToLocalRoleLinkService.java b/server/src/com/imcode/imcms/domain/services/api/DefaultExternalToLocalRoleLinkService.java
new file mode 100644
index 0000000000..a62c645106
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/api/DefaultExternalToLocalRoleLinkService.java
@@ -0,0 +1,102 @@
+package com.imcode.imcms.domain.services.api;
+
+import com.imcode.imcms.domain.dto.ExternalRole;
+import com.imcode.imcms.domain.dto.ExternalToLocalRoleLink;
+import com.imcode.imcms.domain.repository.ExternalToLocalRoleLinkComponent;
+import com.imcode.imcms.domain.services.ExternalToLocalRoleLinkService;
+import com.imcode.imcms.model.ExternalToLocalRoleLinkModel;
+import imcode.server.Imcms;
+import imcode.server.user.RoleDomainObject;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class DefaultExternalToLocalRoleLinkService implements ExternalToLocalRoleLinkService {
+
+    private final static Logger log = LogManager.getLogger(DefaultExternalToLocalRoleLinkService.class);
+    private final ExternalToLocalRoleLinkComponent externalToLocalRoleLinkComponent;
+
+    public DefaultExternalToLocalRoleLinkService(ExternalToLocalRoleLinkComponent externalToLocalRoleLinkComponent) {
+        this.externalToLocalRoleLinkComponent = externalToLocalRoleLinkComponent;
+    }
+
+    @Override
+    public void setLinkedRoles(ExternalRole externalRole, Set<Integer> localRolesId) throws SQLException {
+
+        final Set<ExternalToLocalRoleLink> linksSent = localRolesId.stream()
+                .map(localRoleId -> new ExternalToLocalRoleLink(externalRole, localRoleId))
+                .collect(Collectors.toSet());
+
+        final Set<ExternalToLocalRoleLinkModel> alreadyLinkedRoles = getLinkedRoles(externalRole);
+
+        for (ExternalToLocalRoleLinkModel alreadyLinkedRole : alreadyLinkedRoles) {
+            if (!linksSent.contains(removeId(alreadyLinkedRole))) {
+                externalToLocalRoleLinkComponent.delete(alreadyLinkedRole);
+            }
+        }
+
+        final Set<ExternalToLocalRoleLink> alreadyLinkedRolesWithoutId = alreadyLinkedRoles.stream()
+                .map(this::removeId)
+                .collect(Collectors.toSet());
+
+        linksSent.stream()
+                .filter(linkSent -> !alreadyLinkedRolesWithoutId.contains(linkSent))
+                .map(from -> {
+                    final ExternalToLocalRoleLinkModel linkModel = new ExternalToLocalRoleLinkModel(from);
+                    linkModel.setRole(Imcms.getServices()
+                            .getImcmsAuthenticatorAndUserAndRoleMapper()
+                            .getRoleById(from.getLocalRoleId()));
+                    return linkModel;
+                })
+                .forEach(linkRole -> {
+                    try {
+                        externalToLocalRoleLinkComponent.save(linkRole);
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
+                });
+
+    }
+
+    private ExternalToLocalRoleLink removeId(ExternalToLocalRoleLinkModel roleLink) {
+        return new ExternalToLocalRoleLink(
+                roleLink.getProviderId(), roleLink.getExternalRoleId(), roleLink.getLocalRoleId()
+        );
+    }
+
+    @Override
+    public Set<RoleDomainObject> getLinkedLocalRoles(ExternalRole externalRole) throws SQLException {
+        return getLinkedRoles(externalRole)
+                .stream()
+                .map(ExternalToLocalRoleLinkModel::getRole)
+                .map(role -> {
+                    RoleDomainObject mapRole = new RoleDomainObject();
+                    mapRole.setId(role.getId());
+                    mapRole.setName(role.getName());
+                    Arrays.asList(role.getPermissions()).forEach(mapRole::addPermission);
+                    return mapRole;
+                })
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public Set<RoleDomainObject> toLinkedLocalRoles(Set<ExternalRole> externalRoles) {
+        return externalRoles.stream()
+                .flatMap(externalRole -> {
+                    try {
+                        return getLinkedLocalRoles(externalRole).stream();
+                    } catch (SQLException e) {
+                        throw new RuntimeException(e.getMessage());
+                    }
+                })
+                .collect(Collectors.toSet());
+    }
+
+    private Set<ExternalToLocalRoleLinkModel> getLinkedRoles(ExternalRole externalRole) throws SQLException {
+        return externalToLocalRoleLinkComponent.findByProviderIdAndExternalRoleId(externalRole);
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/services/api/ImcmsAuthenticationProviderService.java b/server/src/com/imcode/imcms/domain/services/api/ImcmsAuthenticationProviderService.java
new file mode 100644
index 0000000000..6bd0513cd0
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/api/ImcmsAuthenticationProviderService.java
@@ -0,0 +1,26 @@
+package com.imcode.imcms.domain.services.api;
+
+import com.imcode.imcms.domain.factory.AuthenticationProvidersFactory;
+import com.imcode.imcms.domain.services.AuthenticationProviderService;
+import com.imcode.imcms.model.AuthenticationProvider;
+
+import java.util.List;
+
+public class ImcmsAuthenticationProviderService implements AuthenticationProviderService {
+
+    private final AuthenticationProvidersFactory authenticationProvidersFactory;
+
+    public ImcmsAuthenticationProviderService(AuthenticationProvidersFactory authenticationProvidersFactory) {
+        this.authenticationProvidersFactory = authenticationProvidersFactory;
+    }
+
+    @Override
+    public List<AuthenticationProvider> getAuthenticationProviders() {
+        return authenticationProvidersFactory.getProviders();
+    }
+
+    @Override
+    public AuthenticationProvider getAuthenticationProvider(String identifierId) {
+        return authenticationProvidersFactory.getProvider(identifierId);
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/services/api/W3CValidationService.java b/server/src/com/imcode/imcms/domain/services/api/W3CValidationService.java
new file mode 100644
index 0000000000..c07b31a646
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/api/W3CValidationService.java
@@ -0,0 +1,118 @@
+package com.imcode.imcms.domain.services.api;
+
+import imcode.server.Imcms;
+import lombok.extern.log4j.Log4j2;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+@Log4j2
+public class W3CValidationService {
+
+	private static final String CONTENT_WRAPPER = "<!DOCTYPE html>\n"
+			+ "<html lang=\"en\">\n"
+			+ "  <head>\n"
+			+ "    <meta charset=\"UTF-8\">\n"
+			+ "    <title>ImCMS HTML validation</title>\n"
+			+ "    <meta name=\"description\" content=\"ImCMS HTML validation\">\n"
+			+ "  </head>\n"
+			+ "  <body>%s</body>\n"
+			+ "</html>";
+
+	public static boolean isAvailable() {
+		if (!Boolean.parseBoolean(Imcms.getServerProperties().getProperty("w3c.validation"))) return false;
+
+		try (final CloseableHttpClient client = HttpClients.createMinimal()) {
+			final HttpHead httpHead = new HttpHead("https://validator.w3.org/nu/");
+
+			return client.execute(httpHead)
+					.getStatusLine()
+					.getStatusCode() == HttpServletResponse.SC_OK;
+		} catch (IOException e) {
+			log.error(e);
+			return false;
+		}
+	}
+
+	public static JSONObject validate(String htmlToValidate, boolean showResults) {
+		JSONObject jsonObject = new JSONObject();
+		JSONParser jsonParser = new JSONParser();
+
+		try (CloseableHttpClient httpClient = HttpClients.createDefault();) {
+			final HttpPost httpPost = new HttpPost("https://validator.w3.org/nu/?out=json");
+			final StringEntity entity = new StringEntity(String.format(CONTENT_WRAPPER, convertIsoToUtf8(htmlToValidate)));
+
+			httpPost.setEntity(entity);
+			httpPost.setHeader("Content-Type", "text/html; charset=UTF-8");
+
+			final CloseableHttpResponse httpResponse = httpClient.execute(httpPost);
+			final JSONObject jsonResponse = (JSONObject) jsonParser.parse(new InputStreamReader(httpResponse.getEntity().getContent(), StandardCharsets.UTF_8));
+
+			httpResponse.close();
+
+			final List<JSONObject> warnings = new ArrayList<>();
+			final List<JSONObject> errors = new ArrayList<>();
+
+			final JSONArray messages = (JSONArray) jsonResponse.get("messages");
+			for (Object message : messages) {
+				final JSONObject jsonMessage = (JSONObject) message;
+
+				if (jsonMessage.get("type").equals("info")) {
+					warnings.add(jsonMessage);
+				}
+
+				if (jsonMessage.get("type").equals("error")) {
+					errors.add(jsonMessage);
+				}
+			}
+
+			if (!showResults) {
+				jsonResponse.clear();
+			}
+
+			jsonObject.put("isOk", true);
+			jsonObject.put("messages", messages);
+			jsonObject.put("jsonResponse", jsonResponse);
+			jsonObject.put("isValid", messages.isEmpty());
+			jsonObject.put("warnings", warnings);
+			jsonObject.put("errors", errors);
+			jsonObject.put("error", "");
+		} catch (Exception ex) {
+			jsonObject.put("isOk", false);
+			jsonObject.put("isValid", false);
+			jsonObject.put("error", ex.getMessage());
+			log.error(ex);
+		}
+
+		return jsonObject;
+	}
+
+	private static String convertUtf8ToIso(String string) {
+		try {
+			return new String(string.getBytes(Imcms.UTF_8_ENCODING), Imcms.ISO_8859_1_ENCODING);
+		} catch (Exception e) {
+			return string;
+		}
+	}
+
+	private static String convertIsoToUtf8(String string) {
+		try {
+			return new String(string.getBytes(Imcms.ISO_8859_1_ENCODING), Imcms.UTF_8_ENCODING);
+		} catch (Exception e) {
+			return string;
+		}
+	}
+}
diff --git a/server/src/com/imcode/imcms/domain/services/core/ServerSettings.java b/server/src/com/imcode/imcms/domain/services/core/ServerSettings.java
new file mode 100644
index 0000000000..97ab090d21
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/core/ServerSettings.java
@@ -0,0 +1,29 @@
+package com.imcode.imcms.domain.services.core;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by Serhii from Ubrainians for Imcode
+ * on 22.07.16.
+ */
+public class ServerSettings {
+
+    public static final String JDBC_DRIVER = "JdbcDriver";
+    public static final String JDBC_URL = "JdbcUrl";
+    public static final String DB_USER = "User";
+    public static final String DB_PASSWORD = "Password";
+    public static final String DB_MAX_CONNECTIONS = "MaxConnectionCount";
+    public static final String TEMPLATE_PATH = "TemplatePath";
+
+    public static final List<String> NECESSARY_SETTINGS = Arrays.asList(
+            JDBC_DRIVER,
+            JDBC_URL,
+            DB_USER,
+            DB_PASSWORD,
+            DB_MAX_CONNECTIONS,
+            TEMPLATE_PATH
+    );
+
+//    public static final List<String>
+}
diff --git a/server/src/com/imcode/imcms/domain/services/core/ServerSettingsChecker.java b/server/src/com/imcode/imcms/domain/services/core/ServerSettingsChecker.java
new file mode 100644
index 0000000000..9d67aacfd0
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/core/ServerSettingsChecker.java
@@ -0,0 +1,40 @@
+package com.imcode.imcms.domain.services.core;
+
+import imcode.server.Imcms;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Properties;
+
+/**
+ * Created by Serhii from Ubrainians for Imcode
+ * on 22.07.16.
+ */
+public class ServerSettingsChecker {
+
+    private final static Logger LOG = LogManager.getLogger(ServerSettingsChecker.class);
+
+    private static final String EMPTY_PROPERTY_MESSAGE = "Empty '%s' property! Check server settings!";
+
+    public static void check() {
+        LOG.info("Checking necessary server settings on empty values.");
+        Properties serverProperties = Imcms.getServerProperties();
+
+        for (String property : ServerSettings.NECESSARY_SETTINGS) {
+            String value = serverProperties.getProperty(property);
+
+            if (StringUtils.trimToNull(value) == null) {
+                String message = "Necessary property '" + property + "' is not set! Shutting down ImCMS.";
+                LOG.fatal(message);
+                throw new RuntimeException(message);
+            }
+        }
+
+        LOG.info("All necessary properties are set into some values.");
+    }
+
+    public static String getEmptyPropertyMessage(String property) {
+        return String.format(EMPTY_PROPERTY_MESSAGE, property);
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/services/core/SmsService.java b/server/src/com/imcode/imcms/domain/services/core/SmsService.java
new file mode 100644
index 0000000000..db3be4520a
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/core/SmsService.java
@@ -0,0 +1,113 @@
+package com.imcode.imcms.domain.services.core;
+
+import imcode.server.Imcms;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.util.Properties;
+
+public class SmsService {
+    public static final String SMS_GATEWAY_USERNAME = "sms.gateway.username";
+    public static final String SMS_GATEWAY_PASSWORD = "sms.gateway.password";
+    public static final String SMS_GATEWAY_URL = "sms.gateway.url";
+    public static final String SMS_GATEWAY_ORIGIN_ADDRESS = "sms.gateway.originAddress";
+    public static final String SMS_GATEWAY_DEFAULT_COUNTRY_CODE = "sms.gateway.defaultCountryCode";
+
+    private static final Logger log = LogManager.getLogger(SmsService.class);
+
+    private static SmsService instance = null;
+    private final String username;
+    private final String password;
+    private final String gatewayURL;
+    private final String originAddress;
+    private String defaultCountryCode;
+
+    private SmsService() {
+        Properties systemProperties = Imcms.getServerProperties();
+
+        username = systemProperties.getProperty(SMS_GATEWAY_USERNAME, "");
+        password = systemProperties.getProperty(SMS_GATEWAY_PASSWORD, "");
+        gatewayURL = systemProperties.getProperty(SMS_GATEWAY_URL, "");
+        originAddress = systemProperties.getProperty(SMS_GATEWAY_ORIGIN_ADDRESS, "");
+        // Default country code for sweden
+        defaultCountryCode = systemProperties.getProperty(SMS_GATEWAY_DEFAULT_COUNTRY_CODE, "46");
+        if (defaultCountryCode.isEmpty()) {
+            defaultCountryCode = "46";
+        }
+    }
+
+    public static SmsService getInstance() {
+        if (null == instance) {
+            instance = new SmsService();
+        }
+        return instance;
+    }
+
+    public boolean sendSms(String message, String recipient) {
+        try {
+            URIBuilder smsRequestBuilder = new URIBuilder(gatewayURL);
+
+            recipient = recipient.replaceAll("\\D", "");
+            if (recipient.startsWith("0")) {
+                recipient = recipient.replaceFirst("0", defaultCountryCode);
+            }
+
+            smsRequestBuilder.addParameter("destination", recipient);
+            smsRequestBuilder.addParameter("username", username);
+            smsRequestBuilder.addParameter("password", password);
+            smsRequestBuilder.addParameter("message", message);
+
+            addOriginAddressIfPresent(smsRequestBuilder);
+
+            HttpGet getRequest = new HttpGet(smsRequestBuilder.build());
+            HttpClient client = HttpClientBuilder.create().build();
+
+            HttpResponse response = client.execute(getRequest);
+            int responseCode = response.getStatusLine().getStatusCode();
+
+            //0 seems like custom response code
+            if (responseCode == HttpStatus.SC_OK || responseCode == 0) {
+                return true;
+            } else {
+                log.error("Wrong response code: " + response.getStatusLine() + "body" + IOUtils.toString(response.getEntity().getContent(), "UTF-8"));
+            }
+
+            return false;
+        } catch (IOException | URISyntaxException e) {
+            log.error(e);
+            return false;
+        }
+    }
+
+    private void addOriginAddressIfPresent(URIBuilder smsRequestBuilder) throws UnsupportedEncodingException {
+        if (!originAddress.isEmpty()) {
+            int originAddressType;
+
+            if (originAddress.matches("[^a-z]+")) {
+                if (originAddress.length() == 5) {
+                    originAddressType = 0;
+                } else if (originAddress.length() > 5) {
+                    originAddressType = 2;
+                } else {
+                    originAddressType = 1;
+                }
+            } else {
+                originAddressType = 1;
+            }
+
+            smsRequestBuilder.addParameter("originatortype", String.valueOf(originAddressType));
+            smsRequestBuilder.addParameter("originator", URLEncoder.encode(originAddress, "UTF-8"));
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/domain/services/core/TwoFactorAuthService.java b/server/src/com/imcode/imcms/domain/services/core/TwoFactorAuthService.java
new file mode 100644
index 0000000000..8d1fd74393
--- /dev/null
+++ b/server/src/com/imcode/imcms/domain/services/core/TwoFactorAuthService.java
@@ -0,0 +1,145 @@
+package com.imcode.imcms.domain.services.core;
+
+import com.imcode.imcms.api.ContentManagementSystem;
+import com.imcode.imcms.util.l10n.LocalizedMessage;
+import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
+import imcode.server.user.PhoneNumber;
+import imcode.server.user.PhoneNumberType;
+import imcode.server.user.UserDomainObject;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
+
+import static com.imcode.imcms.servlet.VerifyUser.REQUEST_ATTRIBUTE__ERROR;
+import static com.imcode.imcms.servlet.VerifyUser.REQUEST_PARAMETER__PASSWORD;
+import static com.imcode.imcms.servlet.VerifyUser.REQUEST_PARAMETER__USERNAME;
+
+public class TwoFactorAuthService {
+    public static final String PROPERTY_NAME_2FA = "2FA";
+    public static final String REQUEST_PARAMETER_2FA = "two_fa";
+    public static final String SESSION_2FA_ATTEMPTS_COUNT = "2fa_count";
+    public static final String USER_2FA_DISABLED_PROPERTY = "2fa_disabled";
+    private static final String COOKIE_NAME_2FA = REQUEST_PARAMETER_2FA;
+    private static final String COOKIE_MAX_AGE_PROPERTY = "2fa.cookie.lifetime";
+    private static final String USER_2FA_CODE_PROPERTY = "2fa_cookie_code";
+    private static TwoFactorAuthService instance = null;
+    private final int cookieMaxAge;
+    private final ImcmsServices imcmsServices;
+    private final SmsService smsService;
+
+    private final LocalizedMessage ERROR_NO_PHONENUMBER_FOUND = new LocalizedMessage("templates/login/access_denied.html/5");
+    private final LocalizedMessage ERROR_WRONG_CODE = new LocalizedMessage("templates/login/access_denied.html/6");
+    private final LocalizedMessage SMS_AUTHORIZE_CODE_MESSAGE = new LocalizedMessage("sms/authorize_code/message");
+
+    private TwoFactorAuthService() {
+        Properties systemProperties = Imcms.getServerProperties();
+        imcmsServices = Imcms.getServices();
+        smsService = SmsService.getInstance();
+
+        //Default is 10 days
+        final String cookieMaxAgeString = systemProperties.getProperty(COOKIE_MAX_AGE_PROPERTY);
+        cookieMaxAge = StringUtils.isNotBlank(cookieMaxAgeString) ? Integer.parseInt(cookieMaxAgeString) : 864000;
+    }
+
+
+    public static TwoFactorAuthService getInstance() {
+        if (null == instance) {
+            instance = new TwoFactorAuthService();
+        }
+        return instance;
+    }
+
+    private boolean checkCode(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) {
+        boolean checkResult = false;
+        final String twoFactorCode = request.getParameter(REQUEST_PARAMETER_2FA);
+        final String login = (String) request.getSession().getAttribute(REQUEST_PARAMETER__USERNAME);
+
+        if (null != twoFactorCode) {
+            final HttpSession session = request.getSession();
+
+            if (twoFactorCode.equals(request.getSession().getAttribute(REQUEST_PARAMETER_2FA))) {
+                final Map<String, String> userProperties = user.getProperties();
+                String code = userProperties.get(USER_2FA_CODE_PROPERTY);
+                if (null == code) {
+                    code = RandomStringUtils.randomAlphanumeric(6);
+                    userProperties.put(USER_2FA_CODE_PROPERTY, code);
+                    Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().saveUser(user);
+                }
+
+                final String cookieName = COOKIE_NAME_2FA + login + request.getRemoteHost().replaceAll("\\D", "");
+                Cookie cookie2FA = new Cookie(cookieName, code);
+                cookie2FA.setMaxAge(cookieMaxAge);
+
+                response.addCookie(cookie2FA);
+                session.removeAttribute(SESSION_2FA_ATTEMPTS_COUNT);
+                checkResult = true;
+            } else {
+                request.setAttribute(REQUEST_ATTRIBUTE__ERROR, ERROR_WRONG_CODE);
+                Integer attemptsCounter = (Integer) session.getAttribute(SESSION_2FA_ATTEMPTS_COUNT);
+                if (null == attemptsCounter) {
+                    attemptsCounter = 0;
+                }
+                session.setAttribute(SESSION_2FA_ATTEMPTS_COUNT, attemptsCounter + 1);
+            }
+        }
+        return checkResult;
+    }
+
+    private void initCode(UserDomainObject user, HttpServletRequest request, String login, String password) {
+        final HttpSession session = request.getSession();
+
+        final String generatedCode = RandomStringUtils.random(6, false, true);
+        final PhoneNumber foundNumber = (PhoneNumber) user.getPhoneNumbersOfType(PhoneNumberType.MOBILE).stream()
+                .findFirst()
+                .filter(number -> null != ((PhoneNumber) number).getNumber())
+                .orElse(null);
+        if (null != foundNumber) {
+            boolean isSmsSend = smsService.sendSms(SMS_AUTHORIZE_CODE_MESSAGE.toLocalizedString(request) + generatedCode, foundNumber.getNumber());
+
+            if (isSmsSend) {
+                session.setAttribute(REQUEST_PARAMETER__USERNAME, login);
+                session.setAttribute(REQUEST_PARAMETER__PASSWORD, password);
+                session.setAttribute(REQUEST_PARAMETER_2FA, generatedCode);
+            }
+        } else {
+            request.setAttribute(REQUEST_ATTRIBUTE__ERROR, ERROR_NO_PHONENUMBER_FOUND);
+        }
+    }
+
+    public ContentManagementSystem initOrCheck(HttpServletRequest request, HttpServletResponse response, String login, String password) {
+        final HttpSession session = request.getSession();
+        if (null == login && null == password) {
+            login = (String) session.getAttribute(REQUEST_PARAMETER__USERNAME);
+            password = (String) session.getAttribute(REQUEST_PARAMETER__PASSWORD);
+        }
+        UserDomainObject user = imcmsServices.verifyUser(login, password);
+
+        Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().checkUserIpAllowed(user, request);
+
+        if (null != user && !user.isDefaultUser()) {
+            boolean isDisabled = Boolean.parseBoolean(user.getProperties().getOrDefault(USER_2FA_DISABLED_PROPERTY, "false"));
+            String finalLogin = login;
+            boolean isDisabledByCookie = isDisabled || Arrays.stream(request.getCookies())
+                    .filter(cookie -> cookie.getName().equals(COOKIE_NAME_2FA + finalLogin + request.getRemoteHost().replaceAll("\\D", "")))
+                    .findFirst()
+                    .map(Cookie::getValue)
+                    .filter(code -> code.equals(user.getProperties().get(USER_2FA_CODE_PROPERTY)))
+                    .isPresent();
+
+            if (isDisabled || isDisabledByCookie || checkCode(request, response, user)) {
+                return ContentManagementSystem.login(request, response, login, password);
+            } else {
+                initCode(user, request, login, password);
+            }
+        }
+        return null;
+    }
+}
diff --git a/server/src/com/imcode/imcms/flow/CreateDocumentPageFlow.java b/server/src/com/imcode/imcms/flow/CreateDocumentPageFlow.java
index 95632b1a45..d791dd6630 100644
--- a/server/src/com/imcode/imcms/flow/CreateDocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/CreateDocumentPageFlow.java
@@ -11,47 +11,47 @@ public abstract class CreateDocumentPageFlow extends DocumentPageFlow {
 
     protected EditDocumentInformationPageFlow editDocumentInformationPageFlow;
 
-    protected CreateDocumentPageFlow( DocumentDomainObject document,
-                                      DispatchCommand returnCommand, SaveDocumentCommand saveDocumentCommand ) {
+    protected CreateDocumentPageFlow(DocumentDomainObject document,
+                                     DispatchCommand returnCommand, SaveDocumentCommand saveDocumentCommand) {
         super(returnCommand, saveDocumentCommand);
-        editDocumentInformationPageFlow = new EditDocumentInformationPageFlow( document, returnCommand, saveDocumentCommand );
+        editDocumentInformationPageFlow = new EditDocumentInformationPageFlow(document, returnCommand, saveDocumentCommand);
     }
 
-    protected void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        editDocumentInformationPageFlow.dispatchToFirstPage( request, response );
+    protected void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        editDocumentInformationPageFlow.dispatchToFirstPage(request, response);
     }
 
     public DocumentDomainObject getDocument() {
         return editDocumentInformationPageFlow.getDocument();
     }
 
-    protected void dispatchFromPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
-        editDocumentInformationPageFlow.dispatchFromEditPage( request, response, page );
-        if ( !response.isCommitted() ) {
-            dispatchFromEditPage( request, response, page );
+    protected void dispatchFromPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
+        editDocumentInformationPageFlow.dispatchFromEditPage(request, response, page);
+        if (!response.isCommitted()) {
+            dispatchFromEditPage(request, response, page);
         }
     }
 
-    protected void dispatchOk( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
-        if ( EditDocumentInformationPageFlow.PAGE__DOCUMENT_INFORMATION.equals( page ) ) {
-            editDocumentInformationPageFlow.dispatchOkFromEditPage( request, response );
-            if ( !response.isCommitted() ) {
-                dispatchOkFromDocumentInformation( request, response );
+    protected void dispatchOk(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
+        if (EditDocumentInformationPageFlow.PAGE__DOCUMENT_INFORMATION.equals(page)) {
+            editDocumentInformationPageFlow.dispatchOkFromEditPage(request, response);
+            if (!response.isCommitted()) {
+                dispatchOkFromDocumentInformation(request, response);
             }
-            if ( !response.isCommitted() ) {
-                dispatchReturn( request, response );
+            if (!response.isCommitted()) {
+                dispatchReturn(request, response);
             }
         } else {
-            dispatchOkFromEditPage( request, response );
+            dispatchOkFromEditPage(request, response);
         }
     }
 
-    protected abstract void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response,
-                                                  String page ) throws IOException, ServletException;
+    protected abstract void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response,
+                                                 String page) throws IOException, ServletException;
 
-    protected abstract void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException;
+    protected abstract void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
 
-    protected abstract void dispatchOkFromDocumentInformation( HttpServletRequest request,
-                                                               HttpServletResponse response ) throws IOException, ServletException;
+    protected abstract void dispatchOkFromDocumentInformation(HttpServletRequest request,
+                                                              HttpServletResponse response) throws IOException, ServletException;
 
 }
diff --git a/server/src/com/imcode/imcms/flow/CreateDocumentWithEditPageFlow.java b/server/src/com/imcode/imcms/flow/CreateDocumentWithEditPageFlow.java
index 2d1ed4b423..7d72783832 100644
--- a/server/src/com/imcode/imcms/flow/CreateDocumentWithEditPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/CreateDocumentWithEditPageFlow.java
@@ -9,21 +9,21 @@ public class CreateDocumentWithEditPageFlow extends CreateDocumentPageFlow {
 
     private EditDocumentPageFlow editDocumentPageFlow;
 
-    public CreateDocumentWithEditPageFlow( EditDocumentPageFlow editDocumentPageFlow ) {
-        super( editDocumentPageFlow.getDocument(), editDocumentPageFlow.returnCommand, editDocumentPageFlow.saveDocumentCommand );
+    public CreateDocumentWithEditPageFlow(EditDocumentPageFlow editDocumentPageFlow) {
+        super(editDocumentPageFlow.getDocument(), editDocumentPageFlow.returnCommand, editDocumentPageFlow.saveDocumentCommand);
         this.editDocumentPageFlow = editDocumentPageFlow;
     }
 
-    protected void dispatchOkFromDocumentInformation( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        editDocumentPageFlow.dispatchToFirstPage( request, response );
+    protected void dispatchOkFromDocumentInformation(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        editDocumentPageFlow.dispatchToFirstPage(request, response);
     }
 
-    protected void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
-        editDocumentPageFlow.dispatchFromPage( request, response, page );
+    protected void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
+        editDocumentPageFlow.dispatchFromPage(request, response, page);
     }
 
-    protected void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        editDocumentPageFlow.dispatchOkFromEditPage( request, response );
+    protected void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        editDocumentPageFlow.dispatchOkFromEditPage(request, response);
         saveDocumentAndReturn(request, response);
     }
 
diff --git a/server/src/com/imcode/imcms/flow/CreateTextDocumentPageFlow.java b/server/src/com/imcode/imcms/flow/CreateTextDocumentPageFlow.java
index 87c54ccda4..87174b7c62 100644
--- a/server/src/com/imcode/imcms/flow/CreateTextDocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/CreateTextDocumentPageFlow.java
@@ -10,24 +10,34 @@
 
 public class CreateTextDocumentPageFlow extends CreateDocumentPageFlow {
 
-    public CreateTextDocumentPageFlow( TextDocumentDomainObject document,
-                                       SaveDocumentCommand saveNewDocumentCommand,
-                                       DispatchCommand returnCommand ) {
-        super( document, returnCommand, saveNewDocumentCommand );
+    public CreateTextDocumentPageFlow(TextDocumentDomainObject document,
+                                      SaveDocumentCommand saveNewDocumentCommand,
+                                      DispatchCommand returnCommand) {
+        super(document, returnCommand, saveNewDocumentCommand);
     }
 
-    protected void dispatchOkFromDocumentInformation( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        TextDocumentDomainObject textDocument = (TextDocumentDomainObject)getDocument() ;
-        if ( null != request.getParameter( EditDocumentInformationPageFlow.REQUEST_PARAMETER__COPY_HEADLINE_AND_TEXT_TO_TEXTFIELDS ) ) {
-            textDocument.setText( 1, new TextDomainObject( textDocument.getHeadline(), TextDomainObject.TEXT_TYPE_PLAIN ) );
-            textDocument.setText( 2, new TextDomainObject( textDocument.getMenuText(), TextDomainObject.TEXT_TYPE_HTML ) );
+    @Override
+    public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        if (null != request.getParameter(REQUEST_PARAMETER__UNIQUE_ALIAS)) {
+            editDocumentInformationPageFlow.dispatch(request, response);
+            return;
+        }
+
+        super.dispatch(request, response);
+    }
+
+    protected void dispatchOkFromDocumentInformation(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        TextDocumentDomainObject textDocument = (TextDocumentDomainObject) getDocument();
+        if (null != request.getParameter(EditDocumentInformationPageFlow.REQUEST_PARAMETER__COPY_HEADLINE_AND_TEXT_TO_TEXTFIELDS)) {
+            textDocument.setText(1, new TextDomainObject(textDocument.getHeadline(), TextDomainObject.TEXT_TYPE_PLAIN));
+            textDocument.setText(2, new TextDomainObject(textDocument.getMenuText(), TextDomainObject.TEXT_TYPE_HTML));
         }
         saveDocumentAndReturn(request, response);
     }
 
-    protected void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response, String page ) {
+    protected void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response, String page) {
     }
 
-    protected void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException {
+    protected void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException {
     }
 }
diff --git a/server/src/com/imcode/imcms/flow/DispatchCommand.java b/server/src/com/imcode/imcms/flow/DispatchCommand.java
index 3b5748c40e..4653622f76 100644
--- a/server/src/com/imcode/imcms/flow/DispatchCommand.java
+++ b/server/src/com/imcode/imcms/flow/DispatchCommand.java
@@ -7,5 +7,5 @@
 import java.io.Serializable;
 
 public interface DispatchCommand extends Serializable {
-    void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException;
+    void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
 }
diff --git a/server/src/com/imcode/imcms/flow/DocumentPageFlow.java b/server/src/com/imcode/imcms/flow/DocumentPageFlow.java
index 8cef97ff0b..f5a2c189c3 100644
--- a/server/src/com/imcode/imcms/flow/DocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/DocumentPageFlow.java
@@ -2,6 +2,7 @@
 
 import com.imcode.imcms.mapping.DocumentSaveException;
 import com.imcode.imcms.mapping.NoPermissionInternalException;
+import imcode.server.Imcms;
 import imcode.server.document.ConcurrentDocumentModificationException;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.NoPermissionToEditDocumentException;
@@ -11,6 +12,7 @@
 import imcode.util.ShouldHaveCheckedPermissionsEarlierException;
 import imcode.util.Utility;
 import org.apache.commons.lang.UnhandledException;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -20,38 +22,39 @@
 
 public abstract class DocumentPageFlow extends PageFlow {
 
+    public static final String REQUEST_PARAMETER__UNIQUE_ALIAS = "uniqueAlias";
     protected final DocumentPageFlow.SaveDocumentCommand saveDocumentCommand;
 
-    protected DocumentPageFlow( DispatchCommand returnCommand,
-                                SaveDocumentCommand saveDocumentCommand ) {
-        super( returnCommand );
+    protected DocumentPageFlow(DispatchCommand returnCommand,
+                               SaveDocumentCommand saveDocumentCommand) {
+        super(returnCommand);
         this.saveDocumentCommand = saveDocumentCommand;
     }
 
-    public abstract DocumentDomainObject getDocument() ;
+    public static DocumentPageFlow fromRequest(HttpServletRequest request) {
+        return (DocumentPageFlow) HttpSessionUtils.getSessionAttributeWithNameInRequest(request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW);
+    }
+
+    public abstract DocumentDomainObject getDocument();
 
-    private synchronized void saveDocument( HttpServletRequest request ) {
+    private synchronized void saveDocument(HttpServletRequest request) {
         try {
-            saveDocumentCommand.saveDocument( getDocument(), Utility.getLoggedOnUser( request ) );
-        } catch ( NoPermissionToEditDocumentException e ) {
+            saveDocumentCommand.saveDocument(getDocument(), Utility.getLoggedOnUser(request));
+        } catch (NoPermissionToEditDocumentException e) {
             throw new ShouldHaveCheckedPermissionsEarlierException(e);
-        } catch ( NoPermissionToAddDocumentToMenuException e ) {
+        } catch (NoPermissionToAddDocumentToMenuException e) {
             throw new ConcurrentDocumentModificationException(e);
         } catch (DocumentSaveException e) {
             throw new UnhandledException(e);
         }
     }
 
-    protected void saveDocumentAndReturn( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        saveDocument( request );
-        dispatchReturn( request, response );
-    }
-
-    public static DocumentPageFlow fromRequest( HttpServletRequest request ) {
-        return (DocumentPageFlow)HttpSessionUtils.getSessionAttributeWithNameInRequest( request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW );
+    protected void saveDocumentAndReturn(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        saveDocument(request);
+        dispatchReturn(request, response);
     }
 
     public static interface SaveDocumentCommand extends Serializable {
-        void saveDocument( DocumentDomainObject document, UserDomainObject user ) throws NoPermissionInternalException, DocumentSaveException;
+        void saveDocument(DocumentDomainObject document, UserDomainObject user) throws NoPermissionInternalException, DocumentSaveException;
     }
-}
\ No newline at end of file
+}
diff --git a/server/src/com/imcode/imcms/flow/DocumentPermissionSetPage.java b/server/src/com/imcode/imcms/flow/DocumentPermissionSetPage.java
index d0819dbaff..fd10a2373e 100644
--- a/server/src/com/imcode/imcms/flow/DocumentPermissionSetPage.java
+++ b/server/src/com/imcode/imcms/flow/DocumentPermissionSetPage.java
@@ -1,22 +1,19 @@
 package com.imcode.imcms.flow;
 
-import imcode.server.document.*;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.DocumentPermissionSetDomainObject;
+import imcode.server.document.DocumentPermissionSetTypeDomainObject;
+import imcode.server.document.TextDocumentPermissionSetDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import imcode.util.Utility;
 import imcode.util.IntegerSet;
+import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
-
 public class DocumentPermissionSetPage extends OkCancelPage {
 
-    private static final String URL_I15D_PAGE__DOCUMENT_PERMISSION_SET = "/jsp/docadmin/document_permission_set.jsp";
-
-    private DocumentPermissionSetDomainObject documentPermissionSet;
-    private boolean forNew;
-
     public static final String REQUEST_PARAMETER__EDIT_PERMISSIONS = "editPermissions";
     public static final String REQUEST_PARAMETER__EDIT = "edit";
     public static final String REQUEST_PARAMETER__EDIT_DOCUMENT_INFORMATION = "editDocumentInformation";
@@ -28,13 +25,16 @@ public class DocumentPermissionSetPage extends OkCancelPage {
     public static final String REQUEST_PARAMETER__ALLOWED_TEMPLATE_GROUP_IDS = "allowedTemplateGroupIds";
     public static final String REQUEST_PARAMETER__EDIT_TEMPLATES = "editTemplates";
     public static final String REQUEST_PARAMETER__DEFAULT_TEMPLATE_ID = "defaultTemplateId";
+    private static final String URL_I15D_PAGE__DOCUMENT_PERMISSION_SET = "/jsp/docadmin/document_permission_set.jsp";
+    private DocumentPermissionSetDomainObject documentPermissionSet;
+    private boolean forNew;
     private DocumentDomainObject document;
 
     public DocumentPermissionSetPage(DocumentDomainObject document,
                                      DocumentPermissionSetDomainObject documentPermissionSet, boolean forNew,
                                      DispatchCommand okDispatchCommand, DispatchCommand cancelDispatchCommand) {
         super(okDispatchCommand, cancelDispatchCommand);
-        this.document = document ;
+        this.document = document;
         this.documentPermissionSet = documentPermissionSet;
         this.forNew = forNew;
     }
@@ -47,36 +47,37 @@ public DocumentDomainObject getDocument() {
         return document;
     }
 
-    protected void updateFromRequest( HttpServletRequest request ) {
-        documentPermissionSet.setEditPermissions( null != request.getParameter( REQUEST_PARAMETER__EDIT_PERMISSIONS ));
-        documentPermissionSet.setEditDocumentInformation( null != request.getParameter( REQUEST_PARAMETER__EDIT_DOCUMENT_INFORMATION ));
-        if (documentPermissionSet instanceof TextDocumentPermissionSetDomainObject) {
-            TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject)documentPermissionSet ;
-            textDocumentPermissionSet.setEditTexts( Utility.parameterIsSet( request, REQUEST_PARAMETER__EDIT_TEXTS ));
-            textDocumentPermissionSet.setEditImages( Utility.parameterIsSet( request, REQUEST_PARAMETER__EDIT_IMAGES ));
-            textDocumentPermissionSet.setEditIncludes( Utility.parameterIsSet( request, REQUEST_PARAMETER__EDIT_INCLUDES) );
-            textDocumentPermissionSet.setEditMenus( Utility.parameterIsSet( request, REQUEST_PARAMETER__EDIT_MENUS ) );
-            textDocumentPermissionSet.setEditTemplates( Utility.parameterIsSet( request, REQUEST_PARAMETER__EDIT_TEMPLATES ) );
-            textDocumentPermissionSet.setAllowedDocumentTypeIds( new IntegerSet(Utility.getParameterInts(request, REQUEST_PARAMETER__ALLOWED_DOCUMENT_TYPE_IDS)) );
-            int[] allowedTemplateGroupIds = Utility.getParameterInts( request, REQUEST_PARAMETER__ALLOWED_TEMPLATE_GROUP_IDS ) ;
-            textDocumentPermissionSet.setAllowedTemplateGroupIds( new IntegerSet(allowedTemplateGroupIds));
+    protected void updateFromRequest(HttpServletRequest request) {
+        documentPermissionSet.setEditPermissions(null != request.getParameter(REQUEST_PARAMETER__EDIT_PERMISSIONS));
+        documentPermissionSet.setEditDocumentInformation(null != request.getParameter(REQUEST_PARAMETER__EDIT_DOCUMENT_INFORMATION));
+
+        if (document instanceof TextDocumentDomainObject) {
+            TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) documentPermissionSet;
+            textDocumentPermissionSet.setEditTexts(Utility.parameterIsSet(request, REQUEST_PARAMETER__EDIT_TEXTS));
+            textDocumentPermissionSet.setEditImages(Utility.parameterIsSet(request, REQUEST_PARAMETER__EDIT_IMAGES));
+            textDocumentPermissionSet.setEditIncludes(Utility.parameterIsSet(request, REQUEST_PARAMETER__EDIT_INCLUDES));
+            textDocumentPermissionSet.setEditMenus(Utility.parameterIsSet(request, REQUEST_PARAMETER__EDIT_MENUS));
+            textDocumentPermissionSet.setEditTemplates(Utility.parameterIsSet(request, REQUEST_PARAMETER__EDIT_TEMPLATES));
+            textDocumentPermissionSet.setAllowedDocumentTypeIds(new IntegerSet(Utility.getParameterInts(request, REQUEST_PARAMETER__ALLOWED_DOCUMENT_TYPE_IDS)));
+            int[] allowedTemplateGroupIds = Utility.getParameterInts(request, REQUEST_PARAMETER__ALLOWED_TEMPLATE_GROUP_IDS);
+            textDocumentPermissionSet.setAllowedTemplateGroupIds(new IntegerSet(allowedTemplateGroupIds));
             String defaultTemplateIdParameter = request.getParameter(REQUEST_PARAMETER__DEFAULT_TEMPLATE_ID);
             String defaultTemplateId = StringUtils.isNotBlank(defaultTemplateIdParameter) ? defaultTemplateIdParameter : null;
             TextDocumentDomainObject textDocument = (TextDocumentDomainObject) document;
             if (DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(textDocumentPermissionSet.getType())) {
-                textDocument.setDefaultTemplateIdForRestricted1( defaultTemplateId );
+                textDocument.setDefaultTemplateIdForRestricted1(defaultTemplateId);
             } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(textDocumentPermissionSet.getType())) {
-                textDocument.setDefaultTemplateIdForRestricted2( defaultTemplateId );
+                textDocument.setDefaultTemplateIdForRestricted2(defaultTemplateId);
             }
         } else {
-            documentPermissionSet.setEdit( null != request.getParameter( REQUEST_PARAMETER__EDIT ));
+            documentPermissionSet.setEdit(null != request.getParameter(REQUEST_PARAMETER__EDIT));
         }
     }
 
     public String getPath(HttpServletRequest request) {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
         return EditDocumentPageFlow.URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2()
-               + URL_I15D_PAGE__DOCUMENT_PERMISSION_SET;
+                + URL_I15D_PAGE__DOCUMENT_PERMISSION_SET;
     }
 
     public boolean isForNew() {
diff --git a/server/src/com/imcode/imcms/flow/DocumentPermissionsPage.java b/server/src/com/imcode/imcms/flow/DocumentPermissionsPage.java
index bc083885e4..c74b63a122 100644
--- a/server/src/com/imcode/imcms/flow/DocumentPermissionsPage.java
+++ b/server/src/com/imcode/imcms/flow/DocumentPermissionsPage.java
@@ -33,77 +33,77 @@ public class DocumentPermissionsPage extends OkCancelPage {
 
     private DocumentDomainObject document;
 
-    public DocumentPermissionsPage( DocumentDomainObject document, DispatchCommand okCommand,
-                                    DispatchCommand cancelCommand ) {
-        super(okCommand,cancelCommand) ;
+    public DocumentPermissionsPage(DocumentDomainObject document, DispatchCommand okCommand,
+                                   DispatchCommand cancelCommand) {
+        super(okCommand, cancelCommand);
         this.document = document;
     }
 
     public String getPath(HttpServletRequest request) {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
         return EditDocumentPageFlow.URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2()
-               + URL_I15D_PAGE__DOCUMENT_PERMISSIONS;
+                + URL_I15D_PAGE__DOCUMENT_PERMISSIONS;
     }
 
-    protected void dispatchOther( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
+    protected void dispatchOther(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         DocumentPermissionSetDomainObject documentPermissionSet = null;
         boolean forNew = false;
-        UserDomainObject user = Utility.getLoggedOnUser( request ) ;
-        if ( Utility.parameterIsSet( request, "define_set_1" ) && user.canDefineRestrictedOneFor( document ) ) {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        if (Utility.parameterIsSet(request, "define_set_1") && user.canDefineRestrictedOneFor(document)) {
             documentPermissionSet = document.getPermissionSets().getRestricted1();
-        } else if ( Utility.parameterIsSet( request, "define_set_2" ) && user.canDefineRestrictedTwoFor( document ) ) {
+        } else if (Utility.parameterIsSet(request, "define_set_2") && user.canDefineRestrictedTwoFor(document)) {
             documentPermissionSet = document.getPermissionSets().getRestricted2();
-        } else if ( Utility.parameterIsSet( request, "define_new_set_1" ) && user.canDefineRestrictedOneFor( document ) ) {
+        } else if (Utility.parameterIsSet(request, "define_new_set_1") && user.canDefineRestrictedOneFor(document)) {
             documentPermissionSet = document.getPermissionSetsForNewDocuments().getRestricted1();
             forNew = true;
-        } else if ( Utility.parameterIsSet( request, "define_new_set_2" ) && user.canDefineRestrictedTwoFor( document ) ) {
+        } else if (Utility.parameterIsSet(request, "define_new_set_2") && user.canDefineRestrictedTwoFor(document)) {
             documentPermissionSet = document.getPermissionSetsForNewDocuments().getRestricted2();
             forNew = true;
         }
 
-        if ( null != documentPermissionSet ) {
+        if (null != documentPermissionSet) {
             DispatchCommand returnCommand = new DispatchCommand() {
-                public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                    forward( request, response );
+                public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                    forward(request, response);
                 }
             };
-            DocumentPermissionSetPage documentPermissionSetPage = new DocumentPermissionSetPage( this.document, documentPermissionSet, forNew, returnCommand, returnCommand );
+            DocumentPermissionSetPage documentPermissionSetPage = new DocumentPermissionSetPage(this.document, documentPermissionSet, forNew, returnCommand, returnCommand);
             documentPermissionSetPage.forward(request, response);
         } else {
-            forward( request, response );
+            forward(request, response);
         }
     }
 
-    protected void updateFromRequest( HttpServletRequest request ) {
-        document.setRoleIdsMappedToDocumentPermissionSetTypes( getRoleIdsMappedToDocumentPermissionSetTypesFromRequest( request ) );
-        document.setRestrictedOneMorePrivilegedThanRestrictedTwo( Utility.parameterIsSet( request, REQUEST_PARAMETER__RESTRICTED_ONE_MORE_PRIVILEGED_THAN_RESTRICTED_TWO ) );
-        document.setLinkableByOtherUsers( Utility.parameterIsSet( request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS ) );
-        document.setLinkedForUnauthorizedUsers( Utility.parameterIsSet( request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__VISIBLE_IN_MENU_FOR_UNAUTHORIZED_USERS ) );
+    protected void updateFromRequest(HttpServletRequest request) {
+        document.setRoleIdsMappedToDocumentPermissionSetTypes(getRoleIdsMappedToDocumentPermissionSetTypesFromRequest(request));
+        document.setRestrictedOneMorePrivilegedThanRestrictedTwo(Utility.parameterIsSet(request, REQUEST_PARAMETER__RESTRICTED_ONE_MORE_PRIVILEGED_THAN_RESTRICTED_TWO));
+        document.setLinkableByOtherUsers(Utility.parameterIsSet(request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS));
+        document.setLinkedForUnauthorizedUsers(Utility.parameterIsSet(request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__VISIBLE_IN_MENU_FOR_UNAUTHORIZED_USERS));
 
-        if ( document instanceof TextDocumentDomainObject ) {
-            String defaultTemplateIdStr = request.getParameter( REQUEST_PARAMETER__DEFAULT_TEMPLATE_ID );
+        if (document instanceof TextDocumentDomainObject) {
+            String defaultTemplateIdStr = request.getParameter(REQUEST_PARAMETER__DEFAULT_TEMPLATE_ID);
             String templateName = StringUtils.isNotBlank(defaultTemplateIdStr) ? defaultTemplateIdStr : null;
-            ( (TextDocumentDomainObject)document ).setDefaultTemplateId( templateName );
+            ((TextDocumentDomainObject) document).setDefaultTemplateId(templateName);
         }
 
     }
 
-    private RoleIdToDocumentPermissionSetTypeMappings getRoleIdsMappedToDocumentPermissionSetTypesFromRequest( HttpServletRequest request ) {
+    private RoleIdToDocumentPermissionSetTypeMappings getRoleIdsMappedToDocumentPermissionSetTypesFromRequest(HttpServletRequest request) {
         Map parameterMap = request.getParameterMap();
-        Collection rolesWithPermissions = CollectionUtils.collect( CollectionUtils.select( parameterMap.keySet(), new RolePermissionParameterPredicate() ), new RolePermissionParameterToRoleIdTransformer() );
+        Collection rolesWithPermissions = CollectionUtils.collect(CollectionUtils.select(parameterMap.keySet(), new RolePermissionParameterPredicate()), new RolePermissionParameterToRoleIdTransformer());
         RoleIdToDocumentPermissionSetTypeMappings result = new RoleIdToDocumentPermissionSetTypeMappings();
-        for ( Iterator iterator = rolesWithPermissions.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = rolesWithPermissions.iterator(); iterator.hasNext(); ) {
             RoleId roleId = (RoleId) iterator.next();
-            int permissionSetTypeId = Integer.parseInt( request.getParameter( REQUEST_PARAMETER_PREFIX__ROLE_PERMISSION
-                                                                          + roleId.intValue() ) );
+            int permissionSetTypeId = Integer.parseInt(request.getParameter(REQUEST_PARAMETER_PREFIX__ROLE_PERMISSION
+                    + roleId.intValue()));
             DocumentPermissionSetTypeDomainObject documentPermissionSetType = DocumentPermissionSetTypeDomainObject.fromInt(permissionSetTypeId);
-            result.setPermissionSetTypeForRole( roleId, documentPermissionSetType );
+            result.setPermissionSetTypeForRole(roleId, documentPermissionSetType);
         }
-        String[] rolesToGiveReadPermission = request.getParameterValues( REQUEST_PARAMETER__ROLES_WITHOUT_PERMISSIONS );
-        if ( null != request.getParameter( REQUEST_PARAMETER__ADD_ROLES ) && null != rolesToGiveReadPermission ) {
-            for ( int i = 0; i < rolesToGiveReadPermission.length; i++ ) {
-                RoleId roleId = new RoleId( Integer.parseInt( rolesToGiveReadPermission[i] ));
-                result.setPermissionSetTypeForRole( roleId, DocumentPermissionSetTypeDomainObject.READ );
+        String[] rolesToGiveReadPermission = request.getParameterValues(REQUEST_PARAMETER__ROLES_WITHOUT_PERMISSIONS);
+        if (null != request.getParameter(REQUEST_PARAMETER__ADD_ROLES) && null != rolesToGiveReadPermission) {
+            for (int i = 0; i < rolesToGiveReadPermission.length; i++) {
+                RoleId roleId = new RoleId(Integer.parseInt(rolesToGiveReadPermission[i]));
+                result.setPermissionSetTypeForRole(roleId, DocumentPermissionSetTypeDomainObject.READ);
             }
         }
         return result;
@@ -115,16 +115,16 @@ public DocumentDomainObject getDocument() {
 
     private static class RolePermissionParameterPredicate implements Predicate {
 
-        public boolean evaluate( Object object ) {
-            return ( (String)object ).startsWith( REQUEST_PARAMETER_PREFIX__ROLE_PERMISSION );
+        public boolean evaluate(Object object) {
+            return ((String) object).startsWith(REQUEST_PARAMETER_PREFIX__ROLE_PERMISSION);
         }
     }
 
     private static class RolePermissionParameterToRoleIdTransformer implements Transformer {
 
-        public Object transform( Object input ) {
-            int roleId = Integer.parseInt( ( (String)input ).substring( REQUEST_PARAMETER_PREFIX__ROLE_PERMISSION.length() ) );
-            return new RoleId( roleId);
+        public Object transform(Object input) {
+            int roleId = Integer.parseInt(((String) input).substring(REQUEST_PARAMETER_PREFIX__ROLE_PERMISSION.length()));
+            return new RoleId(roleId);
         }
     }
 }
diff --git a/server/src/com/imcode/imcms/flow/EditBrowserDocumentPageFlow.java b/server/src/com/imcode/imcms/flow/EditBrowserDocumentPageFlow.java
index de0e81edae..aa6fc01020 100644
--- a/server/src/com/imcode/imcms/flow/EditBrowserDocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/EditBrowserDocumentPageFlow.java
@@ -1,8 +1,8 @@
 package com.imcode.imcms.flow;
 
+import com.imcode.imcms.mapping.DocumentMapper;
 import imcode.server.Imcms;
 import imcode.server.document.BrowserDocumentDomainObject;
-import com.imcode.imcms.mapping.DocumentMapper;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
 import org.apache.commons.lang.StringUtils;
@@ -23,63 +23,63 @@ public class EditBrowserDocumentPageFlow extends EditDocumentPageFlow {
     public static final String REQUEST_PARAMETER__ADD_BROWSERS_BUTTON = "add_browsers";
     public static final String REQUEST_ATTRIBUTE__ADDED_BROWSERS = "addedBrowsers";
 
-    public EditBrowserDocumentPageFlow( BrowserDocumentDomainObject document,
-                                        DispatchCommand returnCommand,
-                                        SaveDocumentCommand saveDocumentCommand ) {
-        super( document, returnCommand, saveDocumentCommand );
+    public EditBrowserDocumentPageFlow(BrowserDocumentDomainObject document,
+                                       DispatchCommand returnCommand,
+                                       SaveDocumentCommand saveDocumentCommand) {
+        super(document, returnCommand, saveDocumentCommand);
     }
 
-    protected void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
-        Map addedBrowsers = getAddedBrowsersFromRequest( request, Imcms.getServices().getDocumentMapper() );
-        if ( null != request.getParameter( REQUEST_PARAMETER__ADD_BROWSERS_BUTTON ) ) {
-            forwardToBrowserDocumentPageWithBrowsersMap( request, response, addedBrowsers );
+    protected void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
+        Map addedBrowsers = getAddedBrowsersFromRequest(request, Imcms.getServices().getDocumentMapper());
+        if (null != request.getParameter(REQUEST_PARAMETER__ADD_BROWSERS_BUTTON)) {
+            forwardToBrowserDocumentPageWithBrowsersMap(request, response, addedBrowsers);
         }
     }
 
-    protected void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException {
-        Map addedBrowsers = getAddedBrowsersFromRequest( request, Imcms.getServices().getDocumentMapper() );
-        Utility.removeNullValuesFromMap( addedBrowsers );
-        BrowserDocumentDomainObject browserDocument = (BrowserDocumentDomainObject)document;
-        browserDocument.setBrowserDocuments( addedBrowsers );
+    protected void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        Map addedBrowsers = getAddedBrowsersFromRequest(request, Imcms.getServices().getDocumentMapper());
+        Utility.removeNullValuesFromMap(addedBrowsers);
+        BrowserDocumentDomainObject browserDocument = (BrowserDocumentDomainObject) document;
+        browserDocument.setBrowserDocuments(addedBrowsers);
     }
 
-    protected void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        BrowserDocumentDomainObject browserDocument = (BrowserDocumentDomainObject)document;
-        forwardToBrowserDocumentPageWithBrowsersMap( request, response, browserDocument.getBrowserDocumentIdMap() );
+    protected void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        BrowserDocumentDomainObject browserDocument = (BrowserDocumentDomainObject) document;
+        forwardToBrowserDocumentPageWithBrowsersMap(request, response, browserDocument.getBrowserDocumentIdMap());
     }
 
-    public void forwardToBrowserDocumentPageWithBrowsersMap( HttpServletRequest request,
-                                                             HttpServletResponse response, Map browsersMap ) throws ServletException, IOException {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        request.setAttribute( REQUEST_ATTRIBUTE__ADDED_BROWSERS, browsersMap );
-        request.getRequestDispatcher( URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__BROWSERDOC ).forward( request, response );
+    public void forwardToBrowserDocumentPageWithBrowsersMap(HttpServletRequest request,
+                                                            HttpServletResponse response, Map browsersMap) throws ServletException, IOException {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        request.setAttribute(REQUEST_ATTRIBUTE__ADDED_BROWSERS, browsersMap);
+        request.getRequestDispatcher(URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__BROWSERDOC).forward(request, response);
     }
 
-    Map getAddedBrowsersFromRequest( HttpServletRequest request, DocumentMapper documentMapper ) {
+    Map getAddedBrowsersFromRequest(HttpServletRequest request, DocumentMapper documentMapper) {
 
         Map addedBrowsers = new HashMap();
 
-        addedBrowsers.put( BrowserDocumentDomainObject.Browser.DEFAULT, null );
-        String[] addedBrowserIdStrings = request.getParameterValues( REQUEST_PARAMETER__BROWSERS );
+        addedBrowsers.put(BrowserDocumentDomainObject.Browser.DEFAULT, null);
+        String[] addedBrowserIdStrings = request.getParameterValues(REQUEST_PARAMETER__BROWSERS);
 
-        for ( int i = 0; null != addedBrowserIdStrings && i < addedBrowserIdStrings.length; i++ ) {
-            int addedBrowserId = Integer.parseInt( addedBrowserIdStrings[i] );
-            BrowserDocumentDomainObject.Browser browser = documentMapper.getBrowserById( addedBrowserId );
-            addedBrowsers.put( browser, null );
+        for (int i = 0; null != addedBrowserIdStrings && i < addedBrowserIdStrings.length; i++) {
+            int addedBrowserId = Integer.parseInt(addedBrowserIdStrings[i]);
+            BrowserDocumentDomainObject.Browser browser = documentMapper.getBrowserById(addedBrowserId);
+            addedBrowsers.put(browser, null);
         }
 
         Map parameterMap = request.getParameterMap();
-        for ( Iterator iterator = parameterMap.keySet().iterator(); iterator.hasNext(); ) {
-            String parameterName = (String)iterator.next();
-            if ( parameterName.startsWith( REQUEST_PARAMETER_PREFIX__DESTINATION ) ) {
-                int browserId = Integer.parseInt( StringUtils.substringAfter( parameterName, REQUEST_PARAMETER_PREFIX__DESTINATION ) );
-                BrowserDocumentDomainObject.Browser browser = documentMapper.getBrowserById( browserId );
+        for (Iterator iterator = parameterMap.keySet().iterator(); iterator.hasNext(); ) {
+            String parameterName = (String) iterator.next();
+            if (parameterName.startsWith(REQUEST_PARAMETER_PREFIX__DESTINATION)) {
+                int browserId = Integer.parseInt(StringUtils.substringAfter(parameterName, REQUEST_PARAMETER_PREFIX__DESTINATION));
+                BrowserDocumentDomainObject.Browser browser = documentMapper.getBrowserById(browserId);
                 Integer destinationDocumentId = null;
                 try {
-                    destinationDocumentId = Integer.valueOf( request.getParameter( parameterName ) );
-                } catch ( NumberFormatException ignored ) {
+                    destinationDocumentId = Integer.valueOf(request.getParameter(parameterName));
+                } catch (NumberFormatException ignored) {
                 }
-                addedBrowsers.put( browser, destinationDocumentId );
+                addedBrowsers.put(browser, destinationDocumentId);
             }
         }
 
diff --git a/server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow.java b/server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow.java
index 2cbc8394e3..ad12be3216 100644
--- a/server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow.java
@@ -14,14 +14,19 @@
 import imcode.server.document.CategoryTypeDomainObject;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import imcode.util.*;
+import imcode.util.ArraySet;
+import imcode.util.DateConstants;
+import imcode.util.HttpSessionUtils;
+import imcode.util.Utility;
 import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.io.File;
+import java.io.IOException;
+import java.text.Collator;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -29,7 +34,6 @@
 
 public class EditDocumentInformationPageFlow extends EditDocumentPageFlow {
 
-    private final static String URL_I15D_PAGE__DOCINFO = "/jsp/docadmin/document_information.jsp";
     public static final String REQUEST_PARAMETER__HEADLINE = "headline";
     public static final String REQUEST_PARAMETER__MENUTEXT = "menutext";
     public static final String REQUEST_PARAMETER__COPY_HEADLINE_AND_TEXT_TO_TEXTFIELDS = "copy_headline_and_text_to_textfields";
@@ -63,152 +67,22 @@ public class EditDocumentInformationPageFlow extends EditDocumentPageFlow {
     public static final String REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER = "browseForMenuImage";
     public static final String REQUEST_PARAMETER__GO_TO_ALIAS_LIST = "listDocumentAlias";
     public static final String PAGE__DOCUMENT_INFORMATION = "document_information";
-
     public static final String REQUEST_PARAMETER__STATUS__NEW = "new";
     public static final String REQUEST_PARAMETER__STATUS__APPROVED = "approved";
     public static final String REQUEST_PARAMETER__STATUS__DISAPPROVED = "disapproved";
-
-    private static final LocalizedMessage BUTTON_TEXT__SELECT_USER = new LocalizedMessage( "templates/sv/AdminChangeUser.htm/2007" );
-    private static final LocalizedMessage HEADLINE__SELECT_CREATOR = new LocalizedMessage( "server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/select_creator_headline" );
-    private static final LocalizedMessage HEADLINE__SELECT_PUBLISHER = new LocalizedMessage( "server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/select_publisher_headline" );
-    public static final LocalizedMessage ALIAS_ERROR__ALREADY_EXIST   = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/alias_error__already_exist_message");
-    public static final LocalizedMessage ALIAS_ERROR__USED_BY_SYSTEM   = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/alias_error__used_by_system_message");
-
+    public static final LocalizedMessage ALIAS_ERROR__ALREADY_EXIST = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/alias_error__already_exist_message");
+    public static final LocalizedMessage ALIAS_ERROR__USED_BY_SYSTEM = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/alias_error__used_by_system_message");
+    private final static String URL_I15D_PAGE__DOCINFO = "/jsp/docadmin/document_information.jsp";
+    private static final LocalizedMessage BUTTON_TEXT__SELECT_USER = new LocalizedMessage("templates/sv/AdminChangeUser.htm/2007");
+    private static final LocalizedMessage HEADLINE__SELECT_CREATOR = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/select_creator_headline");
+    private static final LocalizedMessage HEADLINE__SELECT_PUBLISHER = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/select_publisher_headline");
     private Set<LocalizedMessage> errors = new HashSet();
 
     private boolean adminButtonsHidden;
 
-    public EditDocumentInformationPageFlow( DocumentDomainObject document, DispatchCommand returnCommand,
-                                            SaveDocumentCommand saveDocumentCommand ) {
-        super( document, returnCommand, saveDocumentCommand );
-    }
-
-    protected void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
-        if ( PAGE__DOCUMENT_INFORMATION.equals( page ) ) {
-            dispatchFromDocumentInformation( request, response );
-        }
-    }
-
-    private void dispatchFromDocumentInformation( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        setDocumentAttributesFromRequestParameters( document, request, errors);
-        if ( null != request.getParameter( REQUEST_PARAMETER__GO_TO_PUBLISHER_BROWSER ) ) {
-            dispatchToPublisherUserBrowser( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__GO_TO_CREATOR_BROWSER ) ) {
-            dispatchToCreatorUserBrowser( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER ) ) {
-            dispatchToImageBrowser( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__GO_TO_ALIAS_LIST ) ) {
-           dispatchToAliasList( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__ADD_CATEGORY ) ) {
-            if ( null != request.getParameter( REQUEST_PARAMETER__CATEGORY_IDS_TO_ADD ) ){
-                String[] categoriesToAdd = request.getParameterValues(REQUEST_PARAMETER__CATEGORY_IDS_TO_ADD);
-                for ( String categoryIdToAdd : categoriesToAdd ) {
-                    document.addCategoryId(Integer.parseInt(categoryIdToAdd));
-                }
-            }
-            dispatchToFirstPage( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__REMOVE_CATEGORY ) ) {
-            if ( null != request.getParameter( REQUEST_PARAMETER__CATEGORY_IDS_TO_REMOVE ) ){
-                String[] categoriesToRemove = request.getParameterValues(REQUEST_PARAMETER__CATEGORY_IDS_TO_REMOVE);
-                for ( String categoryIdToRemove : categoriesToRemove ) {
-                    document.removeCategoryId(Integer.parseInt(categoryIdToRemove));
-                }
-            }
-            dispatchToFirstPage( request, response );
-        }
-    }
-
-    private void dispatchToImageBrowser( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        ImageBrowser imageBrowser = new ImageBrowser();
-        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest( request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW );
-        imageBrowser.setCancelCommand( new DispatchCommand() {
-            public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                request.setAttribute( REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName );
-                dispatchToFirstPage( request, response );
-            }
-        } );
-        imageBrowser.setSelectImageUrlCommand( new ImageBrowser.SelectImageUrlCommand() {
-            public void selectImageUrl( String imageUrl, HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                document.setMenuImage( imageUrl );
-                request.setAttribute( REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName );
-                dispatchToFirstPage( request, response );
-            }
-        } );
-        imageBrowser.forward( request, response );
-    }
-
-    private void dispatchToAliasList( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest( request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW );
-        DispatchCommand cancelCommand = new DispatchCommand() {
-            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-                request.setAttribute(REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName);
-                dispatchToFirstPage(request, response);
-            }
-        };
-        new ListDocumentAliasPage(null, cancelCommand, request ).forward(request, response);
-    }
-
-    private void dispatchToPublisherUserBrowser( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest( request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW );
-        dispatchToUserBrowser( request, response, true, HEADLINE__SELECT_PUBLISHER, new UserFinder.SelectUserCommand() {
-            public void selectUser( UserDomainObject selectedUser, HttpServletRequest request,
-                                    HttpServletResponse response ) throws ServletException, IOException {
-                document.setPublisher( selectedUser );
-                request.setAttribute( REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName );
-                dispatchToFirstPage( request, response );
-            }
-        } );
-    }
-
-    private void dispatchToCreatorUserBrowser( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest( request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW );
-        dispatchToUserBrowser( request, response, false, HEADLINE__SELECT_CREATOR, new UserFinder.SelectUserCommand() {
-            public void selectUser( UserDomainObject selectedUser, HttpServletRequest request,
-                                    HttpServletResponse response ) throws ServletException, IOException {
-                document.setCreator( selectedUser );
-                request.setAttribute( REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName );
-                dispatchToFirstPage( request, response );
-            }
-        } );
-    }
-
-    private void dispatchToUserBrowser( HttpServletRequest request, HttpServletResponse response,
-                                        boolean nullSelectable, LocalizedMessage headline,
-                                        UserFinder.SelectUserCommand selectUserCommand ) throws IOException, ServletException {
-        UserFinder userFinder = UserFinder.getInstance( request );
-        userFinder.setHeadline( headline );
-        userFinder.setSelectButtonText( BUTTON_TEXT__SELECT_USER );
-        userFinder.setUsersAddable( false );
-        userFinder.setNullSelectable( nullSelectable );
-        userFinder.setSelectUserCommand( selectUserCommand );
-        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest( request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW );
-        userFinder.setCancelCommand( new DispatchCommand() {
-            public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                request.setAttribute( REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName );
-                dispatchToFirstPage( request, response );
-            }
-        } );
-        userFinder.forward( request, response );
-    }
-
-    protected void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        dispatchToDocumentInformationPage( request, response );
-    }
-
-    private void dispatchToDocumentInformationPage( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        DocumentInformationPage documentInformationPage = new DocumentInformationPage(getDocument(), adminButtonsHidden, errors);
-        documentInformationPage.forward( request, response );
-    }
-
-    protected void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        dispatchOkFromDocumentInformation( request, response );
-    }
-
-    private void dispatchOkFromDocumentInformation(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        setDocumentAttributesFromRequestParameters( document, request, errors);
-        if (!errors.isEmpty()) {
-            dispatchToDocumentInformationPage(request, response);
-        }
+    public EditDocumentInformationPageFlow(DocumentDomainObject document, DispatchCommand returnCommand,
+                                           SaveDocumentCommand saveDocumentCommand) {
+        super(document, returnCommand, saveDocumentCommand);
     }
 
     private static void setDocumentAttributesFromRequestParameters(DocumentDomainObject document, HttpServletRequest request, Set errors) {
@@ -217,117 +91,126 @@ private static void setDocumentAttributesFromRequestParameters(DocumentDomainObj
         final CategoryMapper categoryMapper = service.getCategoryMapper();
         final DocumentMapper documentMapper = service.getDocumentMapper();
 
-        String headline = request.getParameter( REQUEST_PARAMETER__HEADLINE );
-        document.setHeadline( headline );
+        String headline = request.getParameter(REQUEST_PARAMETER__HEADLINE);
+        document.setHeadline(headline);
 
-        String menuText = request.getParameter( REQUEST_PARAMETER__MENUTEXT );
-        document.setMenuText( menuText );
+        String menuText = request.getParameter(REQUEST_PARAMETER__MENUTEXT);
+        document.setMenuText(menuText);
 
-        String imageUrl = request.getParameter( REQUEST_PARAMETER__IMAGE );
-        document.setMenuImage( imageUrl );
+        String imageUrl = request.getParameter(REQUEST_PARAMETER__IMAGE);
+        document.setMenuImage(imageUrl);
 
-        String status = request.getParameter( REQUEST_PARAMETER__STATUS );
+        String status = request.getParameter(REQUEST_PARAMETER__STATUS);
         Document.PublicationStatus publicationStatus = publicationStatusFromString(status);
-        document.setPublicationStatus( publicationStatus );
+        document.setPublicationStatus(publicationStatus);
 
-        SimpleDateFormat dateFormat = new SimpleDateFormat( DateConstants.DATE_FORMAT_STRING );
-        SimpleDateFormat timeFormat = new SimpleDateFormat( DateConstants.TIME_NO_SECONDS_FORMAT_STRING );
+        SimpleDateFormat dateFormat = new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING);
+        SimpleDateFormat timeFormat = new SimpleDateFormat(DateConstants.TIME_NO_SECONDS_FORMAT_STRING);
 
-        Date publicationStartDatetime = parseDatetimeParameters( request, REQUEST_PARAMETER__PUBLICATION_START_DATE, REQUEST_PARAMETER__PUBLICATION_START_TIME, dateFormat,
-                                                                 timeFormat );
-        Date archivedDatetime = parseDatetimeParameters( request, REQUEST_PARAMETER__ARCHIVED_DATE, REQUEST_PARAMETER__ARCHIVED_TIME, dateFormat,
-                                                         timeFormat );
-        Date publicationEndDatetime = parseDatetimeParameters( request, REQUEST_PARAMETER__PUBLICATION_END_DATE, REQUEST_PARAMETER__PUBLICATION_END_TIME, dateFormat,
-                                                               timeFormat );
+        Date publicationStartDatetime = parseDatetimeParameters(request, REQUEST_PARAMETER__PUBLICATION_START_DATE, REQUEST_PARAMETER__PUBLICATION_START_TIME, dateFormat,
+                timeFormat);
+        Date archivedDatetime = parseDatetimeParameters(request, REQUEST_PARAMETER__ARCHIVED_DATE, REQUEST_PARAMETER__ARCHIVED_TIME, dateFormat,
+                timeFormat);
+        Date publicationEndDatetime = parseDatetimeParameters(request, REQUEST_PARAMETER__PUBLICATION_END_DATE, REQUEST_PARAMETER__PUBLICATION_END_TIME, dateFormat,
+                timeFormat);
 
-        document.setPublicationStartDatetime( publicationStartDatetime );
-        document.setArchivedDatetime( archivedDatetime );
-        document.setPublicationEndDatetime( publicationEndDatetime );
+        document.setPublicationStartDatetime(publicationStartDatetime);
+        document.setArchivedDatetime(archivedDatetime);
+        document.setPublicationEndDatetime(publicationEndDatetime);
 
         document.removeAllSections();
-        String[] sectionIds = request.getParameterValues( REQUEST_PARAMETER__SECTIONS );
-        for ( int i = 0; null != sectionIds && i < sectionIds.length; i++ ) {
-            int sectionId = Integer.parseInt( sectionIds[i] );
-            document.addSectionId( sectionId );
+        String[] sectionIds = request.getParameterValues(REQUEST_PARAMETER__SECTIONS);
+        for (int i = 0; null != sectionIds && i < sectionIds.length; i++) {
+            int sectionId = Integer.parseInt(sectionIds[i]);
+            document.addSectionId(sectionId);
         }
 
-        String languageIso639_2 = request.getParameter( REQUEST_PARAMETER__LANGUAGE );
-        document.setLanguageIso639_2( languageIso639_2 );
+        String languageIso639_2 = request.getParameter(REQUEST_PARAMETER__LANGUAGE);
+        document.setLanguageIso639_2(languageIso639_2);
 
         //*** Remove all categories except multi without picture
-        CategoryTypeDomainObject[] categoryTypes = categoryMapper.getAllCategoryTypes() ;
-        for ( CategoryTypeDomainObject categoryType : categoryTypes ) {
+        CategoryTypeDomainObject[] categoryTypes = categoryMapper.getAllCategoryTypes();
+        for (CategoryTypeDomainObject categoryType : categoryTypes) {
             boolean categoryTypeIsSingleChoice = 1 == categoryType.getMaxChoices();
             boolean shouldRemoveCategoriesOfType = categoryTypeIsSingleChoice || categoryType.hasImages();
-            if ( shouldRemoveCategoriesOfType ) {
+            if (shouldRemoveCategoriesOfType) {
                 Set<Integer> categoryIds = document.getCategoryIds();
                 Set<CategoryDomainObject> categoriesOfType = categoryMapper.getCategoriesOfType(categoryType, categoryIds);
-                for ( CategoryDomainObject category : categoriesOfType ) {
+                for (CategoryDomainObject category : categoriesOfType) {
                     document.removeCategoryId(category.getId());
                 }
             }
         }
 
-        String[] categoryIds = request.getParameterValues( REQUEST_PARAMETER__CATEGORIES );
-        for ( int i = 0; null != categoryIds && i < categoryIds.length; i++ ) {
+        String[] categoryIds = request.getParameterValues(REQUEST_PARAMETER__CATEGORIES);
+        for (int i = 0; null != categoryIds && i < categoryIds.length; i++) {
             try {
-                int categoryId = Integer.parseInt( categoryIds[i] );
-                document.addCategoryId( categoryId );
-            } catch ( NumberFormatException ignored ) {
+                int categoryId = Integer.parseInt(categoryIds[i]);
+                document.addCategoryId(categoryId);
+            } catch (NumberFormatException ignored) {
                 // OK, empty category id
             }
         }
 
-        boolean visibleInMenuForUnauthorizedUsers = "1".equals( request.getParameter( REQUEST_PARAMETER__VISIBLE_IN_MENU_FOR_UNAUTHORIZED_USERS ) );
-        document.setLinkedForUnauthorizedUsers( visibleInMenuForUnauthorizedUsers );
+        boolean visibleInMenuForUnauthorizedUsers = "1".equals(request.getParameter(REQUEST_PARAMETER__VISIBLE_IN_MENU_FOR_UNAUTHORIZED_USERS));
+        document.setLinkedForUnauthorizedUsers(visibleInMenuForUnauthorizedUsers);
 
-        boolean linkableByOtherUsers = "1".equals( request.getParameter( REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS ) );
-        document.setLinkableByOtherUsers( linkableByOtherUsers );
+        boolean linkableByOtherUsers = "1".equals(request.getParameter(REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS));
+        document.setLinkableByOtherUsers(linkableByOtherUsers);
 
-        String keywordsString = request.getParameter( REQUEST_PARAMETER__KEYWORDS );
+        String keywordsString = request.getParameter(REQUEST_PARAMETER__KEYWORDS);
         KeywordsParser keywordsParser = new KeywordsParser();
-        String[] keywords =  keywordsParser.parseKeywords( keywordsString );
-        document.setKeywords( new ArraySet(keywords) );
-        if ( null != request.getParameter(REQUEST_PARAMETER__DOCUMENT_ALIAS) ) {
+        String[] keywords = keywordsParser.parseKeywords(keywordsString);
+        document.setKeywords(new ArraySet(keywords));
+        if (null != request.getParameter(REQUEST_PARAMETER__DOCUMENT_ALIAS)) {
             errors.remove(ALIAS_ERROR__ALREADY_EXIST);
             errors.remove(ALIAS_ERROR__USED_BY_SYSTEM);
             String oldAlias = document.getAlias();
             String newAlias = request.getParameter(REQUEST_PARAMETER__DOCUMENT_ALIAS).trim().replaceAll("[%?]", "");
-            if(oldAlias==null || !newAlias.equals(oldAlias.toLowerCase()) && newAlias.length()>0){
+            if (oldAlias == null || !newAlias.toLowerCase().equals(oldAlias.toLowerCase()) && newAlias.length() > 0) {
                 Set<String> allAlias = documentMapper.getAllDocumentAlias();
-                File path = new File( Imcms.getPath(), newAlias );
-                if (allAlias.contains(newAlias.toLowerCase())) {
-                    errors.add(ALIAS_ERROR__ALREADY_EXIST) ;
+                File path = new File(Imcms.getPath(), newAlias);
+                Collator collator = Collator.getInstance(new Locale(languageIso639_2));
+                collator.setStrength(Collator.PRIMARY);
+                boolean contains = false;
+                for (String alias : allAlias) {
+                    contains = collator.equals(alias.toLowerCase(), newAlias.toLowerCase());
+                    if (contains) {
+                        break;
+                    }
+                }
+                if (contains) {
+                    errors.add(ALIAS_ERROR__ALREADY_EXIST);
                     newAlias = oldAlias;
-                }else if (newAlias.length()>0 && path.exists()) {
-                    errors.add(ALIAS_ERROR__USED_BY_SYSTEM) ;
+                } else if (newAlias.length() > 0 && path.exists()) {
+                    errors.add(ALIAS_ERROR__USED_BY_SYSTEM);
                     newAlias = oldAlias;
                 }
             }
-            if(newAlias!=null && newAlias.length()>0){
+            if (newAlias != null && newAlias.length() > 0) {
                 document.setAlias(newAlias);
-            }else{
+            } else {
                 document.setAlias(null);
             }
         }
 
-        boolean searchDisabled = "1".equals( request.getParameter( REQUEST_PARAMETER__SEARCH_DISABLED ) );
-        document.setSearchDisabled( searchDisabled );
+        boolean searchDisabled = "1".equals(request.getParameter(REQUEST_PARAMETER__SEARCH_DISABLED));
+        document.setSearchDisabled(searchDisabled);
 
-        String target = getTargetFromRequest( request, REQUEST_PARAMETER__TARGET);
-        document.setTarget( target );
+        String target = getTargetFromRequest(request, REQUEST_PARAMETER__TARGET);
+        document.setTarget(target);
 
-        Date createdDatetime = (Date)ObjectUtils.defaultIfNull( parseDatetimeParameters( request, REQUEST_PARAMETER__CREATED_DATE, REQUEST_PARAMETER__CREATED_TIME, dateFormat, timeFormat ), new Date() );
+        Date createdDatetime = (Date) ObjectUtils.defaultIfNull(parseDatetimeParameters(request, REQUEST_PARAMETER__CREATED_DATE, REQUEST_PARAMETER__CREATED_TIME, dateFormat, timeFormat), new Date());
 
-        Date modifiedDatetime = (Date)ObjectUtils.defaultIfNull( parseDatetimeParameters( request, REQUEST_PARAMETER__MODIFIED_DATE, REQUEST_PARAMETER__MODIFIED_TIME, dateFormat, timeFormat ), createdDatetime );
+        Date modifiedDatetime = (Date) ObjectUtils.defaultIfNull(parseDatetimeParameters(request, REQUEST_PARAMETER__MODIFIED_DATE, REQUEST_PARAMETER__MODIFIED_TIME, dateFormat, timeFormat), createdDatetime);
 
-        document.setCreatedDatetime( createdDatetime );
-        document.setModifiedDatetime( modifiedDatetime );
+        document.setCreatedDatetime(createdDatetime);
+        document.setModifiedDatetime(modifiedDatetime);
 
     }
 
     private static Document.PublicationStatus publicationStatusFromString(String status) {
-        Document.PublicationStatus publicationStatus = null ;
+        Document.PublicationStatus publicationStatus = null;
         if (status.equals(REQUEST_PARAMETER__STATUS__NEW)) {
             publicationStatus = Document.PublicationStatus.NEW;
         } else if (status.equals(REQUEST_PARAMETER__STATUS__APPROVED)) {
@@ -339,17 +222,17 @@ private static Document.PublicationStatus publicationStatusFromString(String sta
     }
 
     public static String getTargetFromRequest(HttpServletRequest request, String parameterName) {
-        String[] possibleTargets = request.getParameterValues( parameterName );
+        String[] possibleTargets = request.getParameterValues(parameterName);
         String target = null;
         if (null != possibleTargets) {
-            for ( String possibleTarget : possibleTargets ) {
+            for (String possibleTarget : possibleTargets) {
                 target = possibleTarget;
                 boolean targetIsPredefinedTarget
                         = "_self".equalsIgnoreCase(target)
-                          || "_blank".equalsIgnoreCase(target)
-                          || "_parent".equalsIgnoreCase(target)
-                          || "_top".equalsIgnoreCase(target);
-                if ( targetIsPredefinedTarget ) {
+                        || "_blank".equalsIgnoreCase(target)
+                        || "_parent".equalsIgnoreCase(target)
+                        || "_top".equalsIgnoreCase(target);
+                if (targetIsPredefinedTarget) {
                     break;
                 }
             }
@@ -357,38 +240,192 @@ public static String getTargetFromRequest(HttpServletRequest request, String par
         return target;
     }
 
-    private static Date parseDatetimeParameters( HttpServletRequest req, final String dateParameterName,
-                                                 final String timeParameterName, DateFormat dateformat,
-                                                 DateFormat timeformat ) {
-        String dateStr = req.getParameter( dateParameterName );
-        String timeStr = req.getParameter( timeParameterName );
+    private static Date parseDatetimeParameters(HttpServletRequest req, final String dateParameterName,
+                                                final String timeParameterName, DateFormat dateformat,
+                                                DateFormat timeformat) {
+        String dateStr = req.getParameter(dateParameterName);
+        String timeStr = req.getParameter(timeParameterName);
 
         Date date;
         try {
-            date = dateformat.parse( dateStr );
-        } catch ( ParseException pe ) {
+            date = dateformat.parse(dateStr);
+        } catch (ParseException pe) {
             return null;
-        } catch ( NullPointerException npe ) {
+        } catch (NullPointerException npe) {
             return null;
         }
 
         Date time;
         try {
-            timeformat.setTimeZone( TimeZone.getTimeZone( "GMT" ) );
-            time = timeformat.parse( timeStr );
-        } catch ( ParseException pe ) {
+            timeformat.setTimeZone(TimeZone.getTimeZone("GMT"));
+            time = timeformat.parse(timeStr);
+        } catch (ParseException pe) {
             return date;
-        } catch ( NullPointerException npe ) {
+        } catch (NullPointerException npe) {
             return date;
         }
 
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime( date );
-        calendar.add( Calendar.MILLISECOND, (int)time.getTime() );
+        calendar.setTime(date);
+        calendar.add(Calendar.MILLISECOND, (int) time.getTime());
         return calendar.getTime();
     }
 
-    public void setAdminButtonsHidden( boolean adminButtonsHidden ) {
+    protected void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
+        if (PAGE__DOCUMENT_INFORMATION.equals(page)) {
+            dispatchFromDocumentInformation(request, response);
+        }
+    }
+
+    private void dispatchFromDocumentInformation(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        setDocumentAttributesFromRequestParameters(document, request, errors);
+        if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_PUBLISHER_BROWSER)) {
+            dispatchToPublisherUserBrowser(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_CREATOR_BROWSER)) {
+            dispatchToCreatorUserBrowser(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER)) {
+            dispatchToImageBrowser(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_ALIAS_LIST)) {
+            dispatchToAliasList(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__ADD_CATEGORY)) {
+            if (null != request.getParameter(REQUEST_PARAMETER__CATEGORY_IDS_TO_ADD)) {
+                String[] categoriesToAdd = request.getParameterValues(REQUEST_PARAMETER__CATEGORY_IDS_TO_ADD);
+                for (String categoryIdToAdd : categoriesToAdd) {
+                    document.addCategoryId(Integer.parseInt(categoryIdToAdd));
+                }
+            }
+            dispatchToFirstPage(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__REMOVE_CATEGORY)) {
+            if (null != request.getParameter(REQUEST_PARAMETER__CATEGORY_IDS_TO_REMOVE)) {
+                String[] categoriesToRemove = request.getParameterValues(REQUEST_PARAMETER__CATEGORY_IDS_TO_REMOVE);
+                for (String categoryIdToRemove : categoriesToRemove) {
+                    document.removeCategoryId(Integer.parseInt(categoryIdToRemove));
+                }
+            }
+            dispatchToFirstPage(request, response);
+        }
+    }
+
+    private void dispatchToImageBrowser(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        ImageBrowser imageBrowser = new ImageBrowser();
+        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest(request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW);
+        imageBrowser.setCancelCommand(new DispatchCommand() {
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                request.setAttribute(REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName);
+                dispatchToFirstPage(request, response);
+            }
+        });
+        imageBrowser.setSelectImageUrlCommand(new ImageBrowser.SelectImageUrlCommand() {
+            public void selectImageUrl(String imageUrl, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                document.setMenuImage(imageUrl);
+                request.setAttribute(REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName);
+                dispatchToFirstPage(request, response);
+            }
+        });
+        imageBrowser.forward(request, response);
+    }
+
+    private void dispatchToAliasList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest(request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW);
+        DispatchCommand cancelCommand = new DispatchCommand() {
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                request.setAttribute(REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName);
+                dispatchToFirstPage(request, response);
+            }
+        };
+        new ListDocumentAliasPage(null, cancelCommand, request).forward(request, response);
+    }
+
+    private void dispatchToPublisherUserBrowser(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest(request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW);
+        dispatchToUserBrowser(request, response, true, HEADLINE__SELECT_PUBLISHER, new UserFinder.SelectUserCommand() {
+            public void selectUser(UserDomainObject selectedUser, HttpServletRequest request,
+                                   HttpServletResponse response) throws ServletException, IOException {
+                document.setPublisher(selectedUser);
+                request.setAttribute(REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName);
+                dispatchToFirstPage(request, response);
+            }
+        });
+    }
+
+    private void dispatchToCreatorUserBrowser(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest(request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW);
+        dispatchToUserBrowser(request, response, false, HEADLINE__SELECT_CREATOR, new UserFinder.SelectUserCommand() {
+            public void selectUser(UserDomainObject selectedUser, HttpServletRequest request,
+                                   HttpServletResponse response) throws ServletException, IOException {
+                document.setCreator(selectedUser);
+                request.setAttribute(REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName);
+                dispatchToFirstPage(request, response);
+            }
+        });
+    }
+
+    private void dispatchToUserBrowser(HttpServletRequest request, HttpServletResponse response,
+                                       boolean nullSelectable, LocalizedMessage headline,
+                                       UserFinder.SelectUserCommand selectUserCommand) throws IOException, ServletException {
+        UserFinder userFinder = UserFinder.getInstance(request);
+        userFinder.setHeadline(headline);
+        userFinder.setSelectButtonText(BUTTON_TEXT__SELECT_USER);
+        userFinder.setUsersAddable(false);
+        userFinder.setNullSelectable(nullSelectable);
+        userFinder.setSelectUserCommand(selectUserCommand);
+        final String flowSessionAttributeName = HttpSessionUtils.getSessionAttributeNameFromRequest(request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW);
+        userFinder.setCancelCommand(new DispatchCommand() {
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                request.setAttribute(REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW, flowSessionAttributeName);
+                dispatchToFirstPage(request, response);
+            }
+        });
+        userFinder.forward(request, response);
+    }
+
+    @Override
+    public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        if (null != request.getParameter(REQUEST_PARAMETER__UNIQUE_ALIAS)) {
+            String documentAlias = request.getParameter(EditDocumentInformationPageFlow.REQUEST_PARAMETER__DOCUMENT_ALIAS);
+
+            if (StringUtils.isBlank(documentAlias)) {
+                final String title = request.getParameter(EditDocumentInformationPageFlow.REQUEST_PARAMETER__HEADLINE);
+                documentAlias = StringUtils.defaultString(title)
+                        .trim()
+                        .toLowerCase()
+                        .replaceAll("[äå]", "a")
+                        .replaceAll("ö", "o")
+                        .replaceAll("é", "e")
+                        .replaceAll(" +", "-")
+                        .replaceAll("[^\\w\\-]+", "");
+            }
+
+            request.setAttribute(REQUEST_PARAMETER__UNIQUE_ALIAS, Imcms.getServices().getDocumentMapper().getUniqueAlias(documentAlias));
+            setDocumentAttributesFromRequestParameters(document, request, errors);
+            dispatchToFirstPage(request, response);
+            return;
+        }
+
+        super.dispatch(request, response);
+    }
+
+    protected void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        dispatchToDocumentInformationPage(request, response);
+    }
+
+    private void dispatchToDocumentInformationPage(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        DocumentInformationPage documentInformationPage = new DocumentInformationPage(getDocument(), adminButtonsHidden, errors);
+        documentInformationPage.forward(request, response);
+    }
+
+    protected void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        dispatchOkFromDocumentInformation(request, response);
+    }
+
+    private void dispatchOkFromDocumentInformation(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        setDocumentAttributesFromRequestParameters(document, request, errors);
+        if (!errors.isEmpty()) {
+            dispatchToDocumentInformationPage(request, response);
+        }
+    }
+
+    public void setAdminButtonsHidden(boolean adminButtonsHidden) {
         this.adminButtonsHidden = adminButtonsHidden;
     }
 
@@ -399,20 +436,20 @@ public static class DocumentInformationPage {
         private boolean adminButtonsHidden;
         private Set errors;
 
-        public DocumentInformationPage( DocumentDomainObject document, boolean adminButtonsHidden, Set errors ) {
+        public DocumentInformationPage(DocumentDomainObject document, boolean adminButtonsHidden, Set errors) {
             this.document = document;
             this.adminButtonsHidden = adminButtonsHidden;
             this.errors = errors;
         }
 
-        public void forward( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-            request.setAttribute( REQUEST_ATTRIBUTE__DOCUMENT_INFORMATION_PAGE, this );
-            UserDomainObject user = Utility.getLoggedOnUser( request );
-            request.getRequestDispatcher( URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__DOCINFO ).forward( request, response );
+        public static DocumentInformationPage fromRequest(HttpServletRequest request) {
+            return (DocumentInformationPage) request.getAttribute(REQUEST_ATTRIBUTE__DOCUMENT_INFORMATION_PAGE);
         }
 
-        public static DocumentInformationPage fromRequest( HttpServletRequest request ) {
-            return (DocumentInformationPage)request.getAttribute( REQUEST_ATTRIBUTE__DOCUMENT_INFORMATION_PAGE ) ;
+        public void forward(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+            request.setAttribute(REQUEST_ATTRIBUTE__DOCUMENT_INFORMATION_PAGE, this);
+            UserDomainObject user = Utility.getLoggedOnUser(request);
+            request.getRequestDispatcher(URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__DOCINFO).forward(request, response);
         }
 
         public DocumentDomainObject getDocument() {
diff --git a/server/src/com/imcode/imcms/flow/EditDocumentPageFlow.java b/server/src/com/imcode/imcms/flow/EditDocumentPageFlow.java
index 6ccfd60523..432e94d258 100644
--- a/server/src/com/imcode/imcms/flow/EditDocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/EditDocumentPageFlow.java
@@ -9,34 +9,34 @@
 
 public abstract class EditDocumentPageFlow extends DocumentPageFlow {
 
-    protected DocumentDomainObject document;
     public final static String URL_I15D_PAGE__PREFIX = "/imcms/";
     public static final String PAGE__EDIT = "edit";
+    protected DocumentDomainObject document;
 
-    protected EditDocumentPageFlow( final DocumentDomainObject document, DispatchCommand returnCommand,
-                                    SaveDocumentCommand saveDocumentCommand ) {
-        super( returnCommand, saveDocumentCommand );
-        this.document = document ;
+    protected EditDocumentPageFlow(final DocumentDomainObject document, DispatchCommand returnCommand,
+                                   SaveDocumentCommand saveDocumentCommand) {
+        super(returnCommand, saveDocumentCommand);
+        this.document = document;
     }
 
     public DocumentDomainObject getDocument() {
-        return document ;
+        return document;
     }
 
-    protected void dispatchFromPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
-        dispatchFromEditPage( request, response, page );
+    protected void dispatchFromPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
+        dispatchFromEditPage(request, response, page);
     }
 
-    protected void dispatchOk( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
-        dispatchOkFromEditPage( request, response );
+    protected void dispatchOk(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
+        dispatchOkFromEditPage(request, response);
         if (!response.isCommitted()) {
-            saveDocumentAndReturn( request, response );
+            saveDocumentAndReturn(request, response);
         }
     }
 
-    protected abstract void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response,
-                                                  String page ) throws IOException, ServletException;
+    protected abstract void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response,
+                                                 String page) throws IOException, ServletException;
 
-    protected abstract void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException;
+    protected abstract void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
 
 }
diff --git a/server/src/com/imcode/imcms/flow/EditDocumentPermissionsPageFlow.java b/server/src/com/imcode/imcms/flow/EditDocumentPermissionsPageFlow.java
index 001838ba29..075dccc5a3 100644
--- a/server/src/com/imcode/imcms/flow/EditDocumentPermissionsPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/EditDocumentPermissionsPageFlow.java
@@ -9,31 +9,31 @@
 
 public class EditDocumentPermissionsPageFlow extends EditDocumentPageFlow {
 
-    public EditDocumentPermissionsPageFlow( DocumentDomainObject document, DispatchCommand returnCommand,
-                                            SaveDocumentCommand saveDocumentCommand ) {
-        super( document, returnCommand, saveDocumentCommand );
+    public EditDocumentPermissionsPageFlow(DocumentDomainObject document, DispatchCommand returnCommand,
+                                           SaveDocumentCommand saveDocumentCommand) {
+        super(document, returnCommand, saveDocumentCommand);
     }
 
-    protected void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException {
+    protected void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException {
     }
 
-    protected void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
+    protected void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
     }
 
-    protected void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
+    protected void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         DispatchCommand okCommand = new DispatchCommand() {
-            public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
                 saveDocumentAndReturn(request, response);
             }
         };
 
         DispatchCommand returnCommand = new DispatchCommand() {
-            public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                dispatchReturn( request, response );
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                dispatchReturn(request, response);
             }
         };
-        DocumentPermissionsPage documentPermissionsPage = new DocumentPermissionsPage( document, okCommand, returnCommand );
-        documentPermissionsPage.forward( request, response );
+        DocumentPermissionsPage documentPermissionsPage = new DocumentPermissionsPage(document, okCommand, returnCommand);
+        documentPermissionsPage.forward(request, response);
     }
 
 }
diff --git a/server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow.java b/server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow.java
index 7a5e8f4cd4..e394e1164c 100644
--- a/server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow.java
@@ -22,11 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
 public class EditFileDocumentPageFlow extends EditDocumentPageFlow {
@@ -42,106 +38,108 @@ public class EditFileDocumentPageFlow extends EditDocumentPageFlow {
 
     private static final String URL_I15D_PAGE__FILEDOC = "/jsp/docadmin/file_document.jsp";
 
-    private static final LocalizedMessage ERROR_MESSAGE__UNABLE_TO_AUTODETECT_MIMETYPE = new LocalizedMessage( "server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/unable_to_autodetect_mimetype" );
-    private static final LocalizedMessage ERROR_MESSAGE__NO_FILE_UPLOADED = new LocalizedMessage( "server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/no_file_uploaded" );
+    private static final LocalizedMessage ERROR_MESSAGE__UNABLE_TO_AUTODETECT_MIMETYPE = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/unable_to_autodetect_mimetype");
+    private static final LocalizedMessage ERROR_MESSAGE__NO_FILE_UPLOADED = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/no_file_uploaded");
 
     private MimeTypeRestriction mimeTypeRestriction = new ValidMimeTypeRestriction();
     private ServletContext servletContext;
     private FileDocumentDomainObject.FileDocumentFile unfinishedNewFile;
 
-    public EditFileDocumentPageFlow( FileDocumentDomainObject document, ServletContext servletContext,
-                                     DispatchCommand returnCommand,
-                                     SaveDocumentCommand saveDocumentCommand,
-                                     MimeTypeRestriction mimeTypeRestriction ) {
-        super( document, returnCommand, saveDocumentCommand );
+    public EditFileDocumentPageFlow(FileDocumentDomainObject document, ServletContext servletContext,
+                                    DispatchCommand returnCommand,
+                                    SaveDocumentCommand saveDocumentCommand,
+                                    MimeTypeRestriction mimeTypeRestriction) {
+        super(document, returnCommand, saveDocumentCommand);
         this.servletContext = servletContext;
-        if ( null != mimeTypeRestriction ) {
+        if (null != mimeTypeRestriction) {
             this.mimeTypeRestriction = mimeTypeRestriction;
         }
     }
 
-    protected void dispatchOkFromEditPage( HttpServletRequest r, HttpServletResponse response ) throws IOException, ServletException {
-        MultipartHttpServletRequest request = (MultipartHttpServletRequest)r;
+    protected void dispatchOkFromEditPage(HttpServletRequest r, HttpServletResponse response) throws IOException, ServletException {
+        MultipartHttpServletRequest request = (MultipartHttpServletRequest) r;
 
-        updateFromRequestAndDispatchIfError( request, response );
+        updateFromRequestAndDispatchIfError(request, response);
 
     }
 
-    private void updateFromRequestAndDispatchIfError( MultipartHttpServletRequest request,
-                                                                        HttpServletResponse response ) throws IOException, ServletException {
-        document.setTarget( EditDocumentInformationPageFlow.getTargetFromRequest( request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET));
+    private void updateFromRequestAndDispatchIfError(MultipartHttpServletRequest request,
+                                                     HttpServletResponse response) throws IOException, ServletException {
+        document.setTarget(EditDocumentInformationPageFlow.getTargetFromRequest(request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET));
 
-        final FileDocumentDomainObject fileDocument = (FileDocumentDomainObject)document;
-        String defaultFileId = request.getParameter( REQUEST_PARAMETER__DEFAULT_FILE );
-        if ( null != defaultFileId ) {
-            fileDocument.setDefaultFileId( defaultFileId );
+        final FileDocumentDomainObject fileDocument = (FileDocumentDomainObject) document;
+        String defaultFileId = request.getParameter(REQUEST_PARAMETER__DEFAULT_FILE);
+        if (null != defaultFileId) {
+            fileDocument.setDefaultFileId(defaultFileId);
         }
 
-        String selectedFileId = changeFileIds( request, fileDocument );
+        String selectedFileId = changeFileIds(request, fileDocument);
 
-        FileDocumentDomainObject.FileDocumentFile file = fileDocument.getFile( selectedFileId );
+        FileDocumentDomainObject.FileDocumentFile file = fileDocument.getFile(selectedFileId);
         boolean isNewFile = null == file;
-        if ( isNewFile ) {
+        if (isNewFile) {
             file = getUnfinishedNewFile();
         } else {
-            unfinishedNewFile = null ;
+            unfinishedNewFile = null;
         }
 
-        boolean isChecked = !isNewFile || null != request.getParameter( REQUEST_PARAMETER__SAVE_FILE_BUTTON );
-        if ( isChecked ) {
-            FileItem fileItem = request.getParameterFileItem( REQUEST_PARAMETER__FILE_DOC__FILE );
+        boolean isChecked = !isNewFile || null != request.getParameter(REQUEST_PARAMETER__SAVE_FILE_BUTTON);
+        if (isChecked) {
+            FileItem fileItem = request.getParameterFileItem(REQUEST_PARAMETER__FILE_DOC__FILE);
             boolean fileUploaded = 0 != fileItem.getSize();
-            if ( fileUploaded ) {
+            if (fileUploaded) {
                 String fileItemName = fileItem.getName();
-                if ( StringUtils.isNotBlank( fileItemName ) ) {
-                    file.setFilename( fileItemName );
+                if (StringUtils.isNotBlank(fileItemName)) {
+                    file.setFilename(fileItemName);
                 }
-                file.setInputStreamSource( new FileItemInputStreamSource( fileItem ) );
+                file.setInputStreamSource(new FileItemInputStreamSource(fileItem));
             }
 
-            String mimeType = getMimeTypeFromRequestAndFilename( request, file.getFilename() );
+            String mimeType = getMimeTypeFromRequestAndFilename(request, file.getFilename());
             LocalizedMessage errorMessage = null;
-            if ( null == file.getInputStreamSource() ) {
+            if (null == file.getInputStreamSource()) {
                 errorMessage = ERROR_MESSAGE__NO_FILE_UPLOADED;
-            } else if ( StringUtils.isBlank( mimeType ) ) {
+            } else if (StringUtils.isBlank(mimeType)) {
                 errorMessage = ERROR_MESSAGE__UNABLE_TO_AUTODETECT_MIMETYPE;
-                setFileDocumentMimeTypeIfAllowed( file, FileDocumentDomainObject.MIME_TYPE__UNKNOWN_DEFAULT );
-            } else if ( !mimeTypeRestriction.allows( mimeType ) ) {
+                setFileDocumentMimeTypeIfAllowed(file, FileDocumentDomainObject.MIME_TYPE__UNKNOWN_DEFAULT);
+            } else if (!mimeTypeRestriction.allows(mimeType)) {
                 errorMessage = mimeTypeRestriction.getErrorMessage();
-                String mimeTypeForFilename = getMimeTypeForFilename( file.getFilename() );
-                setFileDocumentMimeTypeIfAllowed( file, mimeTypeForFilename );
+                String mimeTypeForFilename = getMimeTypeForFilename(file.getFilename());
+                setFileDocumentMimeTypeIfAllowed(file, mimeTypeForFilename);
             } else {
-                file.setMimeType( mimeType );
-                if ( isNewFile ) {
-                    String newFileId = (String)Utility.findMatch(new CounterStringFactory(fileDocument.getFiles().size()+1), new UniqueFileIdPredicate( fileDocument ));
-                    selectedFileId = newFileId ;
-                    unfinishedNewFile = null ;
+                file.setMimeType(mimeType);
+                if (isNewFile) {
+                    String newFileId = (String) Utility.findMatch(new CounterStringFactory(fileDocument.getFiles().size() + 1), new UniqueFileIdPredicate(fileDocument));
+                    selectedFileId = newFileId;
+                    unfinishedNewFile = null;
                 }
-                fileDocument.addFile( selectedFileId, file );
+                fileDocument.addFile(selectedFileId, file);
             }
 
-            if ( null != errorMessage ) {
-                FileDocumentEditPage fileDocumentEditPage = createFileDocumentEditPage( selectedFileId );
-                fileDocumentEditPage.setErrorMessage( errorMessage );
-                fileDocumentEditPage.forward( request, response );
+            if (null != errorMessage) {
+                FileDocumentEditPage fileDocumentEditPage = createFileDocumentEditPage(selectedFileId);
+                fileDocumentEditPage.setErrorMessage(errorMessage);
+                fileDocumentEditPage.forward(request, response);
             }
         }
     }
 
-    private String changeFileIds( MultipartHttpServletRequest request,
-                                       final FileDocumentDomainObject fileDocument ) {
-        String selectedFileId = request.getParameter( REQUEST_PARAMETER__FILE_DOC__SELECTED_FILE_ID );
+    private String changeFileIds(MultipartHttpServletRequest request,
+                                 final FileDocumentDomainObject fileDocument) {
+        String selectedFileId = request.getParameter(REQUEST_PARAMETER__FILE_DOC__SELECTED_FILE_ID);
 
         Map fileDocumentFiles = fileDocument.getFiles();
-        for ( Iterator iterator = IteratorUtils.unmodifiableIterator( fileDocumentFiles.keySet().iterator() ); iterator.hasNext(); ) {
-            String fileId = (String)iterator.next();
-            String newFileId = request.getParameter( REQUEST_PARAMETER__FILE_DOC__NEW_FILE_ID_PREFIX
-                                                              + fileId );
-            if (  StringUtils.isNotBlank( newFileId )
-                 && !selectedFileId.equals( newFileId )
-                 && null == fileDocument.getFile( newFileId ) ) {
-                fileDocument.changeFileId( fileId, newFileId );
-                if ( fileId.equals( selectedFileId ) ) {
+        for (Iterator iterator = IteratorUtils.unmodifiableIterator(fileDocumentFiles.keySet().iterator()); iterator.hasNext(); )
+        {
+            String fileId = (String) iterator.next();
+            String newFileId = request.getParameter(REQUEST_PARAMETER__FILE_DOC__NEW_FILE_ID_PREFIX
+                    + fileId);
+            if (StringUtils.isNotBlank(newFileId)
+                    && !selectedFileId.equals(newFileId)
+                    && null == fileDocument.getFile(newFileId))
+            {
+                fileDocument.changeFileId(fileId, newFileId);
+                if (fileId.equals(selectedFileId)) {
                     selectedFileId = newFileId;
                 }
             }
@@ -149,104 +147,113 @@ private String changeFileIds( MultipartHttpServletRequest request,
         return selectedFileId;
     }
 
-    private void setFileDocumentMimeTypeIfAllowed( FileDocumentDomainObject.FileDocumentFile file,
-                                                   String mimeTypeForFilename ) {
-        if ( mimeTypeRestriction.allows( mimeTypeForFilename ) ) {
-            file.setMimeType( mimeTypeForFilename );
+    private void setFileDocumentMimeTypeIfAllowed(FileDocumentDomainObject.FileDocumentFile file,
+                                                  String mimeTypeForFilename) {
+        if (mimeTypeRestriction.allows(mimeTypeForFilename)) {
+            file.setMimeType(mimeTypeForFilename);
         }
     }
 
-    private FileDocumentEditPage createFileDocumentEditPage( String fileId ) {
-        FileDocumentDomainObject.FileDocumentFile file = ( (FileDocumentDomainObject)document ).getFile( fileId );
-        if ( null == file ) {
+    private FileDocumentEditPage createFileDocumentEditPage(String fileId) {
+        FileDocumentDomainObject.FileDocumentFile file = ((FileDocumentDomainObject) document).getFile(fileId);
+        if (null == file) {
             file = getUnfinishedNewFile();
         }
-        return new FileDocumentEditPage( mimeTypeRestriction, fileId, file );
+        return new FileDocumentEditPage(mimeTypeRestriction, fileId, file);
     }
 
     private FileDocumentDomainObject.FileDocumentFile getUnfinishedNewFile() {
-        if ( null == unfinishedNewFile ) {
+        if (null == unfinishedNewFile) {
             unfinishedNewFile = new FileDocumentDomainObject.FileDocumentFile();
         }
         return unfinishedNewFile;
     }
 
-    protected void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        createFileDocumentEditPage( null ).forward( request, response );
+    protected void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        createFileDocumentEditPage(null).forward(request, response);
     }
 
-    protected void dispatchFromEditPage( HttpServletRequest r, HttpServletResponse response, String page ) throws IOException, ServletException {
-        MultipartHttpServletRequest request = (MultipartHttpServletRequest)r;
-        FileDocumentDomainObject fileDocument = (FileDocumentDomainObject)document;
+    protected void dispatchFromEditPage(HttpServletRequest r, HttpServletResponse response, String page) throws IOException, ServletException {
+        MultipartHttpServletRequest request = (MultipartHttpServletRequest) r;
+        FileDocumentDomainObject fileDocument = (FileDocumentDomainObject) document;
 
-        updateFromRequestAndDispatchIfError( request, response );
-        String selectedFileId = null ;
+        updateFromRequestAndDispatchIfError(request, response);
+        String selectedFileId = null;
 
-        if ( !response.isCommitted() ) {
+        if (!response.isCommitted()) {
             Map files = fileDocument.getFiles();
-            for ( Iterator iterator = files.entrySet().iterator() ; iterator.hasNext(); ) {
-                Map.Entry entry = (Map.Entry)iterator.next();
-                String fileId = (String)entry.getKey();
-                FileDocumentDomainObject.FileDocumentFile fileDocumentFile = (FileDocumentDomainObject.FileDocumentFile)entry.getValue();
-
-                if ( null
-                     != request.getParameter( REQUEST_PARAMETER__SELECT_FILE_BUTTON_PREFIX + fileId ) ) {
+            for (Iterator iterator = files.entrySet().iterator(); iterator.hasNext(); ) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                String fileId = (String) entry.getKey();
+                FileDocumentDomainObject.FileDocumentFile fileDocumentFile = (FileDocumentDomainObject.FileDocumentFile) entry.getValue();
+
+                if (null
+                        != request.getParameter(REQUEST_PARAMETER__SELECT_FILE_BUTTON_PREFIX + fileId))
+                {
                     selectedFileId = fileId;
                 }
-                if ( null
-                     != request.getParameter( REQUEST_PARAMETER__DELETE_FILE_BUTTON_PREFIX + fileId )
-                     || null == fileDocumentFile.getInputStreamSource() ) {
-                    unfinishedNewFile = fileDocument.removeFile( fileId );
+                if (null
+                        != request.getParameter(REQUEST_PARAMETER__DELETE_FILE_BUTTON_PREFIX + fileId)
+                        || null == fileDocumentFile.getInputStreamSource())
+                {
+                    unfinishedNewFile = fileDocument.removeFile(fileId);
                 }
             }
-            createFileDocumentEditPage( selectedFileId ).forward( request, response );
+            createFileDocumentEditPage(selectedFileId).forward(request, response);
         }
     }
 
-    private String getMimeTypeFromRequestAndFilename( MultipartHttpServletRequest request, String filename ) {
+    private String getMimeTypeFromRequestAndFilename(MultipartHttpServletRequest request, String filename) {
         final DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-        Set predefinedMimeTypes = new HashSet( Arrays.asList( documentMapper.getAllMimeTypes() ) );
-        String[] mimeTypeParameters = request.getParameterValues( REQUEST_PARAMETER__FILE_DOC__MIME_TYPE );
+        Set predefinedMimeTypes = new HashSet(Arrays.asList(documentMapper.getAllMimeTypes()));
+        String[] mimeTypeParameters = request.getParameterValues(REQUEST_PARAMETER__FILE_DOC__MIME_TYPE);
         String mimeType = null;
-        for ( int i = 0; i < mimeTypeParameters.length; i++ ) {
+        for (int i = 0; i < mimeTypeParameters.length; i++) {
             mimeType = mimeTypeParameters[i].trim().toLowerCase();
-            if ( predefinedMimeTypes.contains( mimeType ) ) {
+            if (predefinedMimeTypes.contains(mimeType)) {
                 break;
             }
-            if ( StringUtils.isBlank( mimeType ) ) {
-                mimeType = getMimeTypeForFilename( filename );
-            } else if ( -1 == mimeType.indexOf( '/' ) ) {
-                mimeType = getMimeTypeIfTreatedAsFilenameExtension( mimeType );
+            if (StringUtils.isBlank(mimeType)) {
+                mimeType = getMimeTypeForFilename(filename);
+            } else if (-1 == mimeType.indexOf('/')) {
+                mimeType = getMimeTypeIfTreatedAsFilenameExtension(mimeType);
             }
         }
         return mimeType;
     }
 
-    private String getMimeTypeForFilename( String filename ) {
-        if ( null == filename ) {
+    private String getMimeTypeForFilename(String filename) {
+        if (null == filename) {
             return null;
         }
-        return servletContext.getMimeType( filename.toLowerCase() );
+        return servletContext.getMimeType(filename.toLowerCase());
     }
 
-    private String getMimeTypeIfTreatedAsFilenameExtension( String mimeType ) {
+    private String getMimeTypeIfTreatedAsFilenameExtension(String mimeType) {
         String filenameExtension = mimeType;
-        if ( '.' != filenameExtension.charAt( 0 ) ) {
+        if ('.' != filenameExtension.charAt(0)) {
             filenameExtension = '.' + filenameExtension;
         }
-        String mimeTypeFromFilenameExtension = servletContext.getMimeType( '_'
-                                                                         + filenameExtension );
-        if ( null == mimeTypeFromFilenameExtension ) {
-            mimeTypeFromFilenameExtension = mimeType ;
+        String mimeTypeFromFilenameExtension = servletContext.getMimeType('_'
+                + filenameExtension);
+        if (null == mimeTypeFromFilenameExtension) {
+            mimeTypeFromFilenameExtension = mimeType;
         }
         return mimeTypeFromFilenameExtension;
     }
 
+    public interface MimeTypeRestriction extends Serializable {
+
+        boolean allows(String mimeType);
+
+        LocalizedMessage getErrorMessage();
+    }
+
     public static class FileItemInputStreamSource implements InputStreamSource {
 
         private final FileItem fileItem;
 
-        public FileItemInputStreamSource( FileItem fileItem ) {
+        public FileItemInputStreamSource(FileItem fileItem) {
             this.fileItem = fileItem;
         }
 
@@ -255,7 +262,7 @@ public InputStream getInputStream() throws IOException {
         }
 
         public long getSize() throws IOException {
-            return fileItem.getSize() ;
+            return fileItem.getSize();
         }
     }
 
@@ -268,35 +275,35 @@ public static class FileDocumentEditPage {
         private String selectedFileId;
         private FileDocumentDomainObject.FileDocumentFile selectedFile;
 
-        public FileDocumentEditPage( MimeTypeRestriction allowedMimeTypes, String fileId,
-                                     FileDocumentDomainObject.FileDocumentFile file ) {
+        public FileDocumentEditPage(MimeTypeRestriction allowedMimeTypes, String fileId,
+                                    FileDocumentDomainObject.FileDocumentFile file) {
             this.pageMimeTypeRestriction = allowedMimeTypes;
             this.selectedFileId = fileId;
             this.selectedFile = file;
         }
 
+        public static FileDocumentEditPage fromRequest(HttpServletRequest request) {
+            return (FileDocumentEditPage) request.getAttribute(REQUEST_ATTRIBUTE__FILE_DOCUMENT_EDIT_PAGE);
+        }
+
         public MimeTypeRestriction getPageMimeTypeRestriction() {
             return pageMimeTypeRestriction;
         }
 
-        public static FileDocumentEditPage fromRequest( HttpServletRequest request ) {
-            return (FileDocumentEditPage)request.getAttribute( REQUEST_ATTRIBUTE__FILE_DOCUMENT_EDIT_PAGE );
+        public void forward(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+            request.setAttribute(REQUEST_ATTRIBUTE__FILE_DOCUMENT_EDIT_PAGE, this);
+            UserDomainObject user = Utility.getLoggedOnUser(request);
+            request.getRequestDispatcher(URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__FILEDOC).forward(request, response);
         }
 
-        public void forward( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-            request.setAttribute( REQUEST_ATTRIBUTE__FILE_DOCUMENT_EDIT_PAGE, this );
-            UserDomainObject user = Utility.getLoggedOnUser( request );
-            request.getRequestDispatcher( URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__FILEDOC ).forward( request, response );
+        public LocalizedMessage getErrorMessage() {
+            return errorMessage;
         }
 
-        public void setErrorMessage( LocalizedMessage localizedErrorMessage ) {
+        public void setErrorMessage(LocalizedMessage localizedErrorMessage) {
             this.errorMessage = localizedErrorMessage;
         }
 
-        public LocalizedMessage getErrorMessage() {
-            return errorMessage;
-        }
-
         public FileDocumentDomainObject.FileDocumentFile getSelectedFile() {
             return selectedFile;
         }
@@ -306,28 +313,21 @@ public String getSelectedFileId() {
         }
     }
 
-    public interface MimeTypeRestriction extends Serializable {
-
-        boolean allows( String mimeType );
-
-        LocalizedMessage getErrorMessage();
-    }
-
     public static class ValidMimeTypeRestriction implements MimeTypeRestriction {
 
+        private static final LocalizedMessage ERROR__INVALID_MIMETYPE = new LocalizedMessage("server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/invalid_mimetype");
         protected LocalizedMessage errorMessage;
-        private static final LocalizedMessage ERROR__INVALID_MIMETYPE = new LocalizedMessage( "server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/invalid_mimetype" );
 
-        public boolean allows( String mimeType ) {
-            if ( StringUtils.isBlank( mimeType ) || !isValidMimeType( mimeType ) ) {
+        public boolean allows(String mimeType) {
+            if (StringUtils.isBlank(mimeType) || !isValidMimeType(mimeType)) {
                 errorMessage = ERROR__INVALID_MIMETYPE;
                 return false;
             }
             return true;
         }
 
-        private boolean isValidMimeType( String mimeType ) {
-            return Pattern.compile( "^(x-[a-z-]+|application|audio|image|message|model|multipart|text|video)/", Pattern.CASE_INSENSITIVE ).matcher( mimeType ).find();
+        private boolean isValidMimeType(String mimeType) {
+            return Pattern.compile("^(x-[a-z-]+|application|audio|image|message|model|multipart|text|video)/", Pattern.CASE_INSENSITIVE).matcher(mimeType).find();
         }
 
         public LocalizedMessage getErrorMessage() {
@@ -339,13 +339,13 @@ public static class ArrayMimeTypeRestriction extends ValidMimeTypeRestriction {
 
         private String[] allowedMimeTypes;
 
-        public ArrayMimeTypeRestriction( String[] allowedMimeTypes, LocalizedMessage errorMessage ) {
-            this.allowedMimeTypes = (String[])ArrayUtils.clone(allowedMimeTypes);
+        public ArrayMimeTypeRestriction(String[] allowedMimeTypes, LocalizedMessage errorMessage) {
+            this.allowedMimeTypes = (String[]) ArrayUtils.clone(allowedMimeTypes);
             this.errorMessage = errorMessage;
         }
 
-        public boolean allows( String mimeType ) {
-            return super.allows( mimeType ) && ArrayUtils.contains( allowedMimeTypes, mimeType );
+        public boolean allows(String mimeType) {
+            return super.allows(mimeType) && ArrayUtils.contains(allowedMimeTypes, mimeType);
         }
 
     }
@@ -354,12 +354,12 @@ private static class UniqueFileIdPredicate implements Predicate {
 
         private final FileDocumentDomainObject fileDocument;
 
-        UniqueFileIdPredicate( FileDocumentDomainObject fileDocument ) {
+        UniqueFileIdPredicate(FileDocumentDomainObject fileDocument) {
             this.fileDocument = fileDocument;
         }
 
-        public boolean evaluate( Object object ) {
-            return null == fileDocument.getFile( (String)object );
+        public boolean evaluate(Object object) {
+            return null == fileDocument.getFile((String) object);
         }
     }
 
diff --git a/server/src/com/imcode/imcms/flow/EditHtmlDocumentPageFlow.java b/server/src/com/imcode/imcms/flow/EditHtmlDocumentPageFlow.java
index 68d011c3f3..82de5b89d6 100644
--- a/server/src/com/imcode/imcms/flow/EditHtmlDocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/EditHtmlDocumentPageFlow.java
@@ -1,6 +1,5 @@
 package com.imcode.imcms.flow;
 
-import imcode.server.Imcms;
 import imcode.server.document.HtmlDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
@@ -12,25 +11,25 @@
 
 public class EditHtmlDocumentPageFlow extends EditDocumentPageFlow {
 
-    private final static String URL_I15D_PAGE__HTMLDOC = "/jsp/docadmin/html_document.jsp";
     public static final String REQUEST_PARAMETER__HTML_DOC__HTML = "html";
+    private final static String URL_I15D_PAGE__HTMLDOC = "/jsp/docadmin/html_document.jsp";
 
-    public EditHtmlDocumentPageFlow( HtmlDocumentDomainObject document, DispatchCommand returnCommand,
-                                     SaveDocumentCommand saveDocumentCommand ) {
-        super( document, returnCommand, saveDocumentCommand );
+    public EditHtmlDocumentPageFlow(HtmlDocumentDomainObject document, DispatchCommand returnCommand,
+                                    SaveDocumentCommand saveDocumentCommand) {
+        super(document, returnCommand, saveDocumentCommand);
     }
 
-    protected void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException {
+    protected void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException {
     }
 
-    protected void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException {
-        HtmlDocumentDomainObject htmlDocument = (HtmlDocumentDomainObject)document;
-        htmlDocument.setHtml( request.getParameter( REQUEST_PARAMETER__HTML_DOC__HTML ) );
+    protected void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        HtmlDocumentDomainObject htmlDocument = (HtmlDocumentDomainObject) document;
+        htmlDocument.setHtml(request.getParameter(REQUEST_PARAMETER__HTML_DOC__HTML));
     }
 
-    protected void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        request.getRequestDispatcher( URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__HTMLDOC ).forward( request, response );
+    protected void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        request.getRequestDispatcher(URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__HTMLDOC).forward(request, response);
     }
 
 }
diff --git a/server/src/com/imcode/imcms/flow/EditUrlDocumentPageFlow.java b/server/src/com/imcode/imcms/flow/EditUrlDocumentPageFlow.java
index 172f318552..5738e2a8bc 100644
--- a/server/src/com/imcode/imcms/flow/EditUrlDocumentPageFlow.java
+++ b/server/src/com/imcode/imcms/flow/EditUrlDocumentPageFlow.java
@@ -11,25 +11,25 @@
 
 public class EditUrlDocumentPageFlow extends EditDocumentPageFlow {
 
-    private final static String URL_I15D_PAGE__URLDOC = "/jsp/docadmin/url_document.jsp";
     public static final String REQUEST_PARAMETER__URL_DOC__URL = "url";
+    private final static String URL_I15D_PAGE__URLDOC = "/jsp/docadmin/url_document.jsp";
 
-    public EditUrlDocumentPageFlow( UrlDocumentDomainObject document, DispatchCommand returnCommand,
-                                    SaveDocumentCommand saveDocumentCommand ) {
-        super( document, returnCommand, saveDocumentCommand );
+    public EditUrlDocumentPageFlow(UrlDocumentDomainObject document, DispatchCommand returnCommand,
+                                   SaveDocumentCommand saveDocumentCommand) {
+        super(document, returnCommand, saveDocumentCommand);
     }
 
-    protected void dispatchFromEditPage( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException {
+    protected void dispatchFromEditPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException {
     }
 
-    protected void dispatchOkFromEditPage( HttpServletRequest request, HttpServletResponse response ) throws IOException {
-            UrlDocumentDomainObject urlDocument = (UrlDocumentDomainObject)document;
-            urlDocument.setUrl( request.getParameter( REQUEST_PARAMETER__URL_DOC__URL ) );
-            urlDocument.setTarget( EditDocumentInformationPageFlow.getTargetFromRequest( request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET) );
+    protected void dispatchOkFromEditPage(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        UrlDocumentDomainObject urlDocument = (UrlDocumentDomainObject) document;
+        urlDocument.setUrl(request.getParameter(REQUEST_PARAMETER__URL_DOC__URL));
+        urlDocument.setTarget(EditDocumentInformationPageFlow.getTargetFromRequest(request, EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET));
     }
 
-    protected void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        request.getRequestDispatcher( URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__URLDOC ).forward( request, response );
+    protected void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        request.getRequestDispatcher(URL_I15D_PAGE__PREFIX + user.getLanguageIso639_2() + URL_I15D_PAGE__URLDOC).forward(request, response);
     }
 }
diff --git a/server/src/com/imcode/imcms/flow/OkCancelPage.java b/server/src/com/imcode/imcms/flow/OkCancelPage.java
index 05481c28aa..e2e1b2c27d 100644
--- a/server/src/com/imcode/imcms/flow/OkCancelPage.java
+++ b/server/src/com/imcode/imcms/flow/OkCancelPage.java
@@ -15,50 +15,50 @@ public abstract class OkCancelPage extends Page {
     protected DispatchCommand okCommand;
     protected DispatchCommand cancelCommand;
 
-    protected OkCancelPage( DispatchCommand okDispatchCommand, DispatchCommand cancelDispatchCommand ) {
+    protected OkCancelPage(DispatchCommand okDispatchCommand, DispatchCommand cancelDispatchCommand) {
         this.okCommand = okDispatchCommand;
         this.cancelCommand = cancelDispatchCommand;
     }
 
-    public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        if ( wasCanceled( request ) ) {
-            dispatchCancel( request, response );
+    public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        if (wasCanceled(request)) {
+            dispatchCancel(request, response);
         } else {
             dispatchNotCanceled(request, response);
         }
     }
 
     protected void dispatchNotCanceled(HttpServletRequest request,
-                                     HttpServletResponse response) throws IOException, ServletException {
-        updateFromRequest( request );
-        if ( wasOk( request ) ) {
-            dispatchOk( request, response );
+                                       HttpServletResponse response) throws IOException, ServletException {
+        updateFromRequest(request);
+        if (wasOk(request)) {
+            dispatchOk(request, response);
         } else {
-            dispatchOther( request, response );
+            dispatchOther(request, response);
         }
     }
 
-    protected void dispatchOk( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        removeFromSession(request) ;
-        okCommand.dispatch( request, response );
+    protected void dispatchOk(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        removeFromSession(request);
+        okCommand.dispatch(request, response);
     }
 
-    protected void dispatchCancel( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        removeFromSession(request) ;
-        cancelCommand.dispatch( request, response );
+    protected void dispatchCancel(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        removeFromSession(request);
+        cancelCommand.dispatch(request, response);
     }
 
-    protected void dispatchOther( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        throw new NotImplementedException( this.getClass() );
+    protected void dispatchOther(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        throw new NotImplementedException(this.getClass());
     }
 
-    protected boolean wasOk( HttpServletRequest request ) {
-        return null != request.getParameter( REQUEST_PARAMETER__OK );
+    protected boolean wasOk(HttpServletRequest request) {
+        return null != request.getParameter(REQUEST_PARAMETER__OK);
     }
 
-    protected boolean wasCanceled( HttpServletRequest request ) {
-        return null != request.getParameter( REQUEST_PARAMETER__CANCEL );
+    protected boolean wasCanceled(HttpServletRequest request) {
+        return null != request.getParameter(REQUEST_PARAMETER__CANCEL);
     }
 
-    protected abstract void updateFromRequest( HttpServletRequest request ) ;
+    protected abstract void updateFromRequest(HttpServletRequest request);
 }
diff --git a/server/src/com/imcode/imcms/flow/Page.java b/server/src/com/imcode/imcms/flow/Page.java
index db5ab5ce58..24d2feb59a 100644
--- a/server/src/com/imcode/imcms/flow/Page.java
+++ b/server/src/com/imcode/imcms/flow/Page.java
@@ -16,37 +16,37 @@ public abstract class Page implements Serializable, HttpSessionAttribute {
 
     private String sessionAttributeName;
 
-    public static String htmlHidden( HttpServletRequest request ) {
+    public static String htmlHidden(HttpServletRequest request) {
         Page page = Page.fromRequest(request);
         if (null == page) {
             return "";
         }
-        return Html.hidden( IN_REQUEST, page.getSessionAttributeName() ) ;
+        return Html.hidden(IN_REQUEST, page.getSessionAttributeName());
     }
 
-    public static <E extends Page> E fromRequest( HttpServletRequest request ) {
-        return (E) HttpSessionUtils.getSessionAttributeWithNameInRequest( request, IN_REQUEST );
+    public static <E extends Page> E fromRequest(HttpServletRequest request) {
+        return (E) HttpSessionUtils.getSessionAttributeWithNameInRequest(request, IN_REQUEST);
     }
 
-    public void forward( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute( this, request, IN_REQUEST );
-        request.getRequestDispatcher( getPath(request) ).forward( request, response );
+    public void forward(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute(this, request, IN_REQUEST);
+        request.getRequestDispatcher(getPath(request)).forward(request, response);
     }
 
     public String getSessionAttributeName() {
-        return sessionAttributeName ;
+        return sessionAttributeName;
     }
 
-    public void setSessionAttributeName( String sessionAttributeName ) {
+    public void setSessionAttributeName(String sessionAttributeName) {
         this.sessionAttributeName = sessionAttributeName;
     }
 
-    protected void removeFromSession( HttpServletRequest request ) {
-        HttpSessionUtils.removeSessionAttribute( request, getSessionAttributeName() ) ;
+    protected void removeFromSession(HttpServletRequest request) {
+        HttpSessionUtils.removeSessionAttribute(request, getSessionAttributeName());
     }
 
-    public abstract void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException ;
+    public abstract void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
 
-    public abstract String getPath( HttpServletRequest request ) ;
+    public abstract String getPath(HttpServletRequest request);
 
 }
diff --git a/server/src/com/imcode/imcms/flow/PageFlow.java b/server/src/com/imcode/imcms/flow/PageFlow.java
index 40399a363f..d9342b320a 100644
--- a/server/src/com/imcode/imcms/flow/PageFlow.java
+++ b/server/src/com/imcode/imcms/flow/PageFlow.java
@@ -1,7 +1,7 @@
 package com.imcode.imcms.flow;
 
-import imcode.util.HttpSessionUtils;
 import imcode.util.HttpSessionAttribute;
+import imcode.util.HttpSessionUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -19,40 +19,40 @@ public abstract class PageFlow implements Serializable, HttpSessionAttribute {
     protected DispatchCommand returnCommand;
     private String sessionAttributeName;
 
-    protected PageFlow( DispatchCommand returnCommand ) {
+    protected PageFlow(DispatchCommand returnCommand) {
         this.returnCommand = returnCommand;
     }
 
     public String getSessionAttributeName() {
-        return sessionAttributeName ;
+        return sessionAttributeName;
     }
 
-    public void setSessionAttributeName( String sessionAttributeName ) {
-        this.sessionAttributeName = sessionAttributeName ;
+    public void setSessionAttributeName(String sessionAttributeName) {
+        this.sessionAttributeName = sessionAttributeName;
     }
 
     public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute( this, request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW );
-        String page = request.getParameter( REQUEST_PARAMETER__PAGE );
-        if ( null != request.getParameter( REQUEST_PARAMETER__CANCEL_BUTTON ) ) {
-            dispatchReturn( request, response );
+        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute(this, request, REQUEST_ATTRIBUTE_OR_PARAMETER__FLOW);
+        String page = request.getParameter(REQUEST_PARAMETER__PAGE);
+        if (null != request.getParameter(REQUEST_PARAMETER__CANCEL_BUTTON)) {
+            dispatchReturn(request, response);
         } else if (null == page) {
-            dispatchToFirstPage( request, response ) ;
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__OK_BUTTON )) {
-            dispatchOk( request, response, page ) ;
+            dispatchToFirstPage(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__OK_BUTTON)) {
+            dispatchOk(request, response, page);
         } else {
-            dispatchFromPage( request, response, page );
+            dispatchFromPage(request, response, page);
         }
     }
 
-    protected void dispatchReturn( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        HttpSessionUtils.removeSessionAttribute(request, getSessionAttributeName()) ;
-        returnCommand.dispatch( request, response );
+    protected void dispatchReturn(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        HttpSessionUtils.removeSessionAttribute(request, getSessionAttributeName());
+        returnCommand.dispatch(request, response);
     }
 
-    protected abstract void dispatchToFirstPage( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException;
+    protected abstract void dispatchToFirstPage(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
 
-    protected abstract void dispatchOk( HttpServletRequest request, HttpServletResponse response, String page ) throws IOException, ServletException;
+    protected abstract void dispatchOk(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException;
 
     protected abstract void dispatchFromPage(HttpServletRequest request, HttpServletResponse response, String page) throws IOException, ServletException;
 
diff --git a/server/src/com/imcode/imcms/flow/RedirectCommand.java b/server/src/com/imcode/imcms/flow/RedirectCommand.java
new file mode 100644
index 0000000000..b9211fb4cf
--- /dev/null
+++ b/server/src/com/imcode/imcms/flow/RedirectCommand.java
@@ -0,0 +1,18 @@
+package com.imcode.imcms.flow;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class RedirectCommand implements DispatchCommand {
+    private final String returnUrl;
+
+    public RedirectCommand(String returnUrl) {
+        this.returnUrl = returnUrl;
+    }
+
+    @Override
+    public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.sendRedirect(returnUrl);
+    }
+}
diff --git a/server/src/com/imcode/imcms/mapping/AbstractDocumentGetter.java b/server/src/com/imcode/imcms/mapping/AbstractDocumentGetter.java
index e326251548..f34f9b2298 100644
--- a/server/src/com/imcode/imcms/mapping/AbstractDocumentGetter.java
+++ b/server/src/com/imcode/imcms/mapping/AbstractDocumentGetter.java
@@ -2,27 +2,29 @@
 
 import imcode.server.document.DocumentDomainObject;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 public class AbstractDocumentGetter implements DocumentGetter {
 
-    public List getDocuments(Collection documentIds) {
-        List documents = new ArrayList(documentIds.size()) ;
-        for ( Iterator iterator = documentIds.iterator(); iterator.hasNext(); ) {
-            Integer documentId = (Integer) iterator.next();
+    public List<DocumentDomainObject> getDocuments(Collection<Integer> documentIds) {
+        List<DocumentDomainObject> documents = new ArrayList<>(documentIds.size());
+        for (Integer documentId : documentIds) {
             DocumentDomainObject document = getDocument(documentId);
             if (null != document) {
-                documents.add(document) ;
+                documents.add(document);
             }
         }
         return documents;
     }
 
     public DocumentDomainObject getDocument(Integer documentId) {
-        List documents = getDocuments(Collections.singletonList(documentId));
+        List<DocumentDomainObject> documents = getDocuments(Collections.singletonList(documentId));
         if (documents.isEmpty()) {
-            return null ;
+            return null;
         }
-        return (DocumentDomainObject) documents.get(0);
+        return documents.get(0);
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/AliasAlreadyExistsInternalException.java b/server/src/com/imcode/imcms/mapping/AliasAlreadyExistsInternalException.java
index bfff4392a5..5f6bbc44cb 100644
--- a/server/src/com/imcode/imcms/mapping/AliasAlreadyExistsInternalException.java
+++ b/server/src/com/imcode/imcms/mapping/AliasAlreadyExistsInternalException.java
@@ -1,7 +1,7 @@
 package com.imcode.imcms.mapping;
 
 public class AliasAlreadyExistsInternalException extends DocumentSaveException {
-    public AliasAlreadyExistsInternalException( String message ) {
-        super( message );
+    public AliasAlreadyExistsInternalException(String message) {
+        super(message);
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/BatchDocumentGetter.java b/server/src/com/imcode/imcms/mapping/BatchDocumentGetter.java
index 802ca7503b..ea3ef787c5 100644
--- a/server/src/com/imcode/imcms/mapping/BatchDocumentGetter.java
+++ b/server/src/com/imcode/imcms/mapping/BatchDocumentGetter.java
@@ -7,7 +7,7 @@
 public class BatchDocumentGetter extends DocumentGetterWrapper {
 
     private final Set documentIds;
-    private Map documentsMap ;
+    private Map documentsMap;
 
     BatchDocumentGetter(Set documentIds, DocumentGetter documentGetter) {
         super(documentGetter);
@@ -18,15 +18,15 @@ public DocumentDomainObject getDocument(Integer documentId) {
         if (null == documentsMap) {
             documentsMap = new HashMap();
             List documents = super.getDocuments(documentIds);
-            for ( Iterator iterator = documents.iterator(); iterator.hasNext(); ) {
+            for (Iterator iterator = documents.iterator(); iterator.hasNext(); ) {
                 DocumentDomainObject document = (DocumentDomainObject) iterator.next();
-                documentsMap.put(new Integer(document.getId()), document) ;
+                documentsMap.put(document.getId(), document);
             }
         }
         DocumentDomainObject document = (DocumentDomainObject) documentsMap.remove(documentId);
         if (null == document) {
-            document = super.getDocument(documentId) ;
+            document = super.getDocument(documentId);
         }
-        return document ;
+        return document;
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/CachingDocumentGetter.java b/server/src/com/imcode/imcms/mapping/CachingDocumentGetter.java
index 04661f866f..4e3b58c368 100644
--- a/server/src/com/imcode/imcms/mapping/CachingDocumentGetter.java
+++ b/server/src/com/imcode/imcms/mapping/CachingDocumentGetter.java
@@ -3,35 +3,46 @@
 import imcode.server.document.DocumentDomainObject;
 import imcode.util.ShouldNotBeThrownException;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 public class CachingDocumentGetter extends DocumentGetterWrapper {
 
-    private Map cache;
+    private Map<Integer, DocumentDomainObject> cache;
 
-    public CachingDocumentGetter(DocumentGetter documentGetter, Map cache) {
+    public CachingDocumentGetter(DocumentGetter documentGetter, Map<Integer, DocumentDomainObject> cache) {
         super(documentGetter);
-        this.cache = cache ;
+        this.cache = cache;
     }
 
-    public DocumentDomainObject getDocument(Integer documentId) {
-        DocumentDomainObject document = (DocumentDomainObject) cache.get(documentId) ;
+    public DocumentDomainObject getDocument(Integer documentId, boolean renewCache) {
+        DocumentDomainObject document = renewCache ? null : cache.get(documentId);
         if (null == document) {
-            document = super.getDocument(documentId) ;
+            document = super.getDocument(documentId);
             if (null == document) {
-                return null ;
+                return null;
             }
-            cache.put(documentId, document) ;
+            cache.put(documentId, document);
         }
         try {
-            return (DocumentDomainObject) document.clone() ;
-        } catch ( CloneNotSupportedException e ) {
+            return (DocumentDomainObject) document.clone();
+        } catch (CloneNotSupportedException e) {
             throw new ShouldNotBeThrownException(e);
         }
     }
 
-    public List getDocuments(Collection documentIds) {
-        return super.getDocuments(documentIds) ;
+    public DocumentDomainObject getDocument(Integer documentId) {
+        return getDocument(documentId, false);
+    }
+
+    public List<DocumentDomainObject> getDocuments(Collection<Integer> documentIds) {
+        List<DocumentDomainObject> list = new ArrayList<>();
+        for (Integer documentId : documentIds) {
+            list.add(getDocument(documentId, false));
+        }
+        return list;
     }
-    
+
 }
diff --git a/server/src/com/imcode/imcms/mapping/CategoryMapper.java b/server/src/com/imcode/imcms/mapping/CategoryMapper.java
index f57188ab58..81b2d9f7f4 100644
--- a/server/src/com/imcode/imcms/mapping/CategoryMapper.java
+++ b/server/src/com/imcode/imcms/mapping/CategoryMapper.java
@@ -2,72 +2,80 @@
 
 import com.imcode.db.Database;
 import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
-import com.imcode.db.commands.UpdateTableWhereColumnEqualsDatabaseCommand;
 import com.imcode.db.commands.SqlQueryCommand;
 import com.imcode.db.commands.SqlUpdateCommand;
+import com.imcode.db.commands.UpdateTableWhereColumnEqualsDatabaseCommand;
+import com.imcode.db.handlers.ObjectArrayHandler;
 import com.imcode.db.handlers.RowTransformer;
 import com.imcode.db.handlers.SingleObjectHandler;
-import com.imcode.db.handlers.ObjectArrayHandler;
 import com.imcode.imcms.api.CategoryAlreadyExistsException;
 import imcode.server.document.CategoryDomainObject;
 import imcode.server.document.CategoryTypeDomainObject;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.MaxCategoryDomainObjectsOfTypeExceededException;
 import imcode.util.Utility;
+import org.apache.commons.collections4.map.LRUMap;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 public class CategoryMapper {
-    private Database database;
-    private static final int UNLIMITED_MAX_CATEGORY_CHOICES = 0;
 
+    public static final String SQL__CATEGORY_TYPE__COLUMNS = "category_types.category_type_id, category_types.name, category_types.max_choices, category_types.inherited, category_types.is_image_archive";
+    static final String SQL__GET_DOCUMENT_CATEGORIES = "SELECT meta_id, category_id"
+            + " FROM document_categories"
+            + " WHERE meta_id ";
+    private static final int CACHE_SIZE = 100;
+    private static final int UNLIMITED_MAX_CATEGORY_CHOICES = 0;
     private static final String SQL__CATEGORY__COLUMNS = "categories.category_id, categories.name, categories.description, categories.image";
-    public static final String SQL__CATEGORY_TYPE__COLUMNS = "category_types.category_type_id, category_types.name, category_types.max_choices, category_types.inherited";
-    public static final String SQL_GET_ALL_CATEGORIES_OF_TYPE = "SELECT "+SQL__CATEGORY__COLUMNS+"\n"
-                                                                + "FROM categories\n"
-                                                                + "JOIN category_types ON categories.category_type_id = category_types.category_type_id\n"
-                                                                + "WHERE categories.category_type_id = ?\n"
-                                                                + "ORDER BY categories.name";
-    public static final String SQL__GET_CATEGORY_BY_NAME_AND_CATEGORY_TYPE_ID = "SELECT " + SQL__CATEGORY__COLUMNS +", "
-                                                                                + SQL__CATEGORY_TYPE__COLUMNS + "\n"
-                                                                                + "FROM categories\n"
-                                                                                + "JOIN category_types\n"
-                                                                                + "ON categories.category_type_id = category_types.category_type_id\n"
-                                                                                + "WHERE categories.name = ?\n"
-                                                                                + "AND category_types.category_type_id = ?";
-
+    public static final String SQL_GET_ALL_CATEGORIES_OF_TYPE = "SELECT " + SQL__CATEGORY__COLUMNS + "\n"
+            + "FROM categories\n"
+            + "JOIN category_types ON categories.category_type_id = category_types.category_type_id\n"
+            + "WHERE categories.category_type_id = ?\n"
+            + "ORDER BY categories.name";
+    public static final String SQL__GET_CATEGORY_BY_NAME_AND_CATEGORY_TYPE_ID = "SELECT " + SQL__CATEGORY__COLUMNS + ", "
+            + SQL__CATEGORY_TYPE__COLUMNS + "\n"
+            + "FROM categories\n"
+            + "JOIN category_types\n"
+            + "ON categories.category_type_id = category_types.category_type_id\n"
+            + "WHERE categories.name = ?\n"
+            + "AND category_types.category_type_id = ?";
     private static final String SQL__GET_ALL_CATEGORY_TYPES = "SELECT " + SQL__CATEGORY_TYPE__COLUMNS + " FROM category_types ORDER BY name";
-    private static final String SQL__GET_CATEGORY_TYPE_BY_NAME = "SELECT "+SQL__CATEGORY_TYPE__COLUMNS +"\n"
-                                                                 + "FROM category_types\n"
-                                                                 + "WHERE category_types.name = ?";
-    private static final String SQL__GET_CATEGORY_TYPE_BY_ID = "select "+SQL__CATEGORY_TYPE__COLUMNS +" from category_types where category_type_id = ? ";
-    private static final String SQL__GET_CATEGORY_BY_ID = "SELECT "+SQL__CATEGORY__COLUMNS+", "+
-                                                          SQL__CATEGORY_TYPE__COLUMNS +"\n"
-                                                          + "FROM categories\n"
-                                                          + "JOIN category_types ON categories.category_type_id = category_types.category_type_id\n"
-                                                          + "WHERE categories.category_id = ?";
-    static final String SQL__GET_DOCUMENT_CATEGORIES = "SELECT meta_id, category_id"
-                                                       + " FROM document_categories"
-                                                       + " WHERE meta_id ";
-    private static final SingleObjectHandler SINGLE_CATEGORY_TYPE_HANDLER = new SingleObjectHandler(new CategoryTypeFromRowFactory());
-    private static final SingleObjectHandler SINGLE_CATEGORY_HANDLER = new SingleObjectHandler(new CategoryFromRowFactory());
-    private static final ObjectArrayHandler CATEGORY_TYPE_ARRAY_HANDLER = new ObjectArrayHandler(new CategoryTypeFromRowFactory());
+    private static final String SQL__GET_CATEGORY_TYPE_BY_NAME = "SELECT " + SQL__CATEGORY_TYPE__COLUMNS + "\n"
+            + "FROM category_types\n"
+            + "WHERE category_types.name = ?";
+    private static final String SQL__GET_CATEGORY_TYPE_BY_ID = "select " + SQL__CATEGORY_TYPE__COLUMNS + " from category_types where category_type_id = ? ";
+    private static final String SQL__GET_CATEGORY_BY_ID = "SELECT " + SQL__CATEGORY__COLUMNS + ", " +
+            SQL__CATEGORY_TYPE__COLUMNS + "\n"
+            + "FROM categories\n"
+            + "JOIN category_types ON categories.category_type_id = category_types.category_type_id\n"
+            + "WHERE categories.category_id = ?";
+    private static final SingleObjectHandler<CategoryTypeDomainObject> SINGLE_CATEGORY_TYPE_HANDLER = new SingleObjectHandler<>(new CategoryTypeFromRowFactory());
+    private static final SingleObjectHandler<CategoryDomainObject> SINGLE_CATEGORY_HANDLER = new SingleObjectHandler<>(new CategoryFromRowFactory());
+    private static final ObjectArrayHandler<CategoryTypeDomainObject> CATEGORY_TYPE_ARRAY_HANDLER = new ObjectArrayHandler<>(new CategoryTypeFromRowFactory());
+    private Database database;
+    private Map<Integer, CategoryDomainObject> categoryCache = Collections.synchronizedMap(new LRUMap<>(CACHE_SIZE));
+    private Map<Integer, CategoryTypeDomainObject> categoryTypeCache = Collections.synchronizedMap(new LRUMap<>(CACHE_SIZE));
+    private Map<String, CategoryTypeDomainObject> categoryTypeByNameCache = Collections.synchronizedMap(new LRUMap<>(CACHE_SIZE));
+    private Map<String, CategoryDomainObject> categoryByTypeAndNameCache = Collections.synchronizedMap(new LRUMap<>(CACHE_SIZE));
 
     public CategoryMapper(Database database) {
-        this.database = database ;
+        this.database = database;
     }
 
     public CategoryDomainObject[] getAllCategoriesOfType(CategoryTypeDomainObject categoryType
     ) {
-        String sqlQuery = SQL_GET_ALL_CATEGORIES_OF_TYPE;
         String[] parameters = new String[]{"" + categoryType.getId()};
-        String[][] sqlResult = (String[][]) database.execute(new SqlQueryCommand(sqlQuery, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        String[][] sqlResult = database.execute(new SqlQueryCommand<>(
+                SQL_GET_ALL_CATEGORIES_OF_TYPE, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER
+        ));
         CategoryDomainObject[] categoryDomainObjects = new CategoryDomainObject[sqlResult.length];
+
         for (int i = 0; i < sqlResult.length; i++) {
             int categoryId = Integer.parseInt(sqlResult[i][0]);
             String categoryName = sqlResult[i][1];
@@ -81,8 +89,7 @@ public CategoryDomainObject[] getAllCategoriesOfType(CategoryTypeDomainObject ca
 
     public boolean isUniqueCategoryTypeName(String categoryTypeName) {
         CategoryTypeDomainObject[] categoryTypes = getAllCategoryTypes();
-        for (int i = 0; i < categoryTypes.length; i++) {
-            CategoryTypeDomainObject categoryType = categoryTypes[i];
+        for (CategoryTypeDomainObject categoryType : categoryTypes) {
             if (categoryType.getName().equalsIgnoreCase(categoryTypeName)) {
                 return false;
             }
@@ -92,85 +99,133 @@ public boolean isUniqueCategoryTypeName(String categoryTypeName) {
 
     public CategoryTypeDomainObject[] getAllCategoryTypes() {
         String[] parameters = new String[0];
-        return (CategoryTypeDomainObject[]) database.execute(new SqlQueryCommand(SQL__GET_ALL_CATEGORY_TYPES, parameters, CATEGORY_TYPE_ARRAY_HANDLER));
+        return database.execute(new SqlQueryCommand<>(SQL__GET_ALL_CATEGORY_TYPES, parameters, CATEGORY_TYPE_ARRAY_HANDLER));
+    }
+
+    private String getCacheKeyByTypeAndName(CategoryTypeDomainObject categoryType, String categoryName) {
+        return categoryType.getId() + "-" + categoryName;
     }
 
     public CategoryDomainObject getCategoryByTypeAndName(CategoryTypeDomainObject categoryType, String categoryName) {
-        String[] parameters = new String[]{categoryName, ""+categoryType.getId()};
-        return (CategoryDomainObject) database.execute(new SqlQueryCommand(SQL__GET_CATEGORY_BY_NAME_AND_CATEGORY_TYPE_ID, parameters, SINGLE_CATEGORY_HANDLER)) ;
+        String cacheKey = getCacheKeyByTypeAndName(categoryType, categoryName);
+        CategoryDomainObject category = categoryByTypeAndNameCache.get(cacheKey);
+
+        if (category == null) {
+            String[] parameters = new String[]{categoryName, "" + categoryType.getId()};
+            category = database.execute(new SqlQueryCommand<>(SQL__GET_CATEGORY_BY_NAME_AND_CATEGORY_TYPE_ID, parameters, SINGLE_CATEGORY_HANDLER));
+            categoryByTypeAndNameCache.put(cacheKey, category);
+        }
+
+        return category;
     }
 
-    public CategoryDomainObject getCategoryById( int categoryId ) {
-        String[] parameters = new String[]{"" + categoryId};
-        return (CategoryDomainObject) database.execute(new SqlQueryCommand(SQL__GET_CATEGORY_BY_ID, parameters, SINGLE_CATEGORY_HANDLER)) ;
+    public CategoryDomainObject getCategoryById(int categoryId) {
+        CategoryDomainObject category = categoryCache.get(categoryId);
+        if (category == null) {
+            String[] parameters = new String[]{"" + categoryId};
+            category = database.execute(new SqlQueryCommand<>(SQL__GET_CATEGORY_BY_ID, parameters, SINGLE_CATEGORY_HANDLER));
+            categoryCache.put(categoryId, category);
+        }
+
+        return category;
     }
 
     public CategoryTypeDomainObject getCategoryTypeByName(String categoryTypeName) {
-        String[] parameters = new String[] { categoryTypeName };
-        return (CategoryTypeDomainObject) database.execute(new SqlQueryCommand(SQL__GET_CATEGORY_TYPE_BY_NAME, parameters, SINGLE_CATEGORY_TYPE_HANDLER));
+        CategoryTypeDomainObject categoryType = categoryTypeByNameCache.get(categoryTypeName);
+        if (categoryType == null) {
+            String[] parameters = new String[]{categoryTypeName};
+            categoryType = database.execute(new SqlQueryCommand<>(SQL__GET_CATEGORY_TYPE_BY_NAME, parameters, SINGLE_CATEGORY_TYPE_HANDLER));
+            categoryTypeByNameCache.put(categoryTypeName, categoryType);
+        }
+
+        return categoryType;
     }
 
     public CategoryTypeDomainObject getCategoryTypeById(int categoryTypeId) {
-        String[] parameters = new String[] { "" + categoryTypeId };
-        return (CategoryTypeDomainObject) database.execute(new SqlQueryCommand(SQL__GET_CATEGORY_TYPE_BY_ID, parameters, SINGLE_CATEGORY_TYPE_HANDLER));
+        CategoryTypeDomainObject categoryType = categoryTypeCache.get(categoryTypeId);
+        if (categoryType == null) {
+            String[] parameters = new String[]{"" + categoryTypeId};
+            categoryType = database.execute(new SqlQueryCommand<>(SQL__GET_CATEGORY_TYPE_BY_ID, parameters, SINGLE_CATEGORY_TYPE_HANDLER));
+            categoryTypeCache.put(categoryTypeId, categoryType);
+        }
+        return categoryType;
     }
 
     public void deleteCategoryTypeFromDb(CategoryTypeDomainObject categoryType) {
         String sqlstr = "delete from category_types where category_type_id = ?";
         String[] params = new String[]{categoryType.getId() + ""};
         database.execute(new SqlUpdateCommand(sqlstr, params));
+
+        invalidateCategoryType(categoryType);
     }
 
     public CategoryTypeDomainObject addCategoryTypeToDb(final CategoryTypeDomainObject categoryType
     ) {
-        Number newId = (Number) database.execute(new InsertIntoTableDatabaseCommand("category_types", getColumnNamesAndValuesForCategoryType(categoryType))) ;
+        Number newId = database.execute(new InsertIntoTableDatabaseCommand(
+                "category_types", getColumnNamesAndValuesForCategoryType(categoryType)
+        ));
         return getCategoryTypeById(newId.intValue());
     }
 
     private Object[][] getColumnNamesAndValuesForCategoryType(CategoryTypeDomainObject categoryType) {
-        return new Object[][] {
-                { "name", categoryType.getName() },
-                { "max_choices", new Integer(categoryType.getMaxChoices()) },
-                { "inherited", new Integer(categoryType.isInherited() ? 1 : 0) },
+        return new Object[][]{
+                {"name", categoryType.getName()},
+                {"max_choices", categoryType.getMaxChoices()},
+                {"inherited", categoryType.isInherited() ? 1 : 0},
+                {"is_image_archive", categoryType.isImageArchive() ? 1 : 0},
         };
     }
 
     public void updateCategoryType(CategoryTypeDomainObject categoryType) {
-        database.execute(new UpdateTableWhereColumnEqualsDatabaseCommand("category_types", "category_type_id", new Integer(categoryType.getId()), getColumnNamesAndValuesForCategoryType(categoryType))) ;
+        database.execute(new UpdateTableWhereColumnEqualsDatabaseCommand(
+                "category_types",
+                "category_type_id",
+                categoryType.getId(),
+                getColumnNamesAndValuesForCategoryType(categoryType)
+        ));
+        invalidateCategoryType(categoryType);
     }
 
-    public CategoryDomainObject addCategory(CategoryDomainObject category) throws CategoryAlreadyExistsException {
-        Number newId = (Number) database.execute(new InsertIntoTableDatabaseCommand("categories", getColumnNamesAndValuesForCategory(category))) ;
+    public CategoryDomainObject addCategory(CategoryDomainObject category) {
+        Number newId = database.execute(new InsertIntoTableDatabaseCommand(
+                "categories", getColumnNamesAndValuesForCategory(category)
+        ));
         int categoryId = newId.intValue();
         category.setId(categoryId);
         return getCategoryById(categoryId);
     }
 
     private Object[][] getColumnNamesAndValuesForCategory(CategoryDomainObject category) {
-        return new Object[][] {
-                { "category_type_id", new Integer(category.getType().getId()) },
-                { "name", category.getName() },
-                { "description", category.getDescription() },
-                { "image", category.getImageUrl() }
+        return new Object[][]{
+                {"category_type_id", category.getType().getId()},
+                {"name", category.getName()},
+                {"description", category.getDescription()},
+                {"image", category.getImageUrl()}
         };
     }
 
     public void updateCategory(CategoryDomainObject category) {
-        database.execute(new UpdateTableWhereColumnEqualsDatabaseCommand("categories", "category_id", new Integer(category.getId()), getColumnNamesAndValuesForCategory(category))) ;
+        database.execute(new UpdateTableWhereColumnEqualsDatabaseCommand(
+                "categories",
+                "category_id",
+                category.getId(),
+                getColumnNamesAndValuesForCategory(category)
+        ));
+        invalidateCategory(category);
     }
 
     public void deleteCategoryFromDb(CategoryDomainObject category) {
         String sqlstr = "delete from categories where category_id = ?";
         String[] params = new String[]{category.getId() + ""};
         database.execute(new SqlUpdateCommand(sqlstr, params));
+        invalidateCategory(category);
     }
 
     void updateDocumentCategories(DocumentDomainObject document) {
-        Set categoryIds = document.getCategoryIds();
+        Set<Integer> categoryIds = document.getCategoryIds();
         removeAllCategoriesFromDocument(document);
-        for ( Iterator iterator = categoryIds.iterator(); iterator.hasNext(); ) {
-            Integer categoryId = (Integer) iterator.next();
-            addCategoryToDocument(categoryId.intValue(), document);
+        for (Integer categoryId : categoryIds) {
+            addCategoryToDocument(categoryId, document);
         }
     }
 
@@ -184,7 +239,7 @@ public String[] getAllDocumentsOfOneCategory(CategoryDomainObject category) {
         String sqlstr = "select meta_id from document_categories where category_id = ? ";
         String[] params = new String[]{category.getId() + ""};
 
-        return (String[]) database.execute(new SqlQueryCommand(sqlstr, params, Utility.STRING_ARRAY_HANDLER));
+        return database.execute(new SqlQueryCommand<>(sqlstr, params, Utility.STRING_ARRAY_HANDLER));
     }
 
     private void removeAllCategoriesFromDocument(DocumentDomainObject document) {
@@ -201,15 +256,14 @@ public void deleteOneCategoryFromDocument(DocumentDomainObject document, Categor
     void checkMaxDocumentCategoriesOfType(DocumentDomainObject document)
             throws MaxCategoryDomainObjectsOfTypeExceededException {
         CategoryTypeDomainObject[] categoryTypes = getAllCategoryTypes();
-        for (int i = 0; i < categoryTypes.length; i++) {
-            CategoryTypeDomainObject categoryType = categoryTypes[i];
+        for (CategoryTypeDomainObject categoryType : categoryTypes) {
             int maxChoices = categoryType.getMaxChoices();
             Set documentCategoriesOfType = getCategoriesOfType(categoryType, document.getCategoryIds());
             if (UNLIMITED_MAX_CATEGORY_CHOICES != maxChoices && documentCategoriesOfType.size() > maxChoices) {
                 throw new MaxCategoryDomainObjectsOfTypeExceededException("Document may have at most " + maxChoices
-                                                                          + " categories of type '"
-                                                                          + categoryType.getName()
-                                                                          + "'");
+                        + " categories of type '"
+                        + categoryType.getName()
+                        + "'");
             }
         }
     }
@@ -219,9 +273,9 @@ public void saveCategory(CategoryDomainObject category) throws CategoryAlreadyEx
             CategoryDomainObject categoryInDb = getCategoryByTypeAndName(category.getType(), category.getName());
             if (null != categoryInDb) {
                 throw new CategoryAlreadyExistsException("A category with name \"" + category.getName()
-                                                         + "\" already exists in category type \""
-                                                         + category.getType().getName()
-                                                         + "\".");
+                        + "\" already exists in category type \""
+                        + category.getType().getName()
+                        + "\".");
             }
             addCategory(category);
         } else {
@@ -229,70 +283,79 @@ public void saveCategory(CategoryDomainObject category) throws CategoryAlreadyEx
         }
     }
 
-    public Set getCategories(Collection categoryIds) {
-        Set categories = new HashSet() ;
-        for ( Iterator iterator = categoryIds.iterator(); iterator.hasNext(); ) {
-            Integer categoryId = (Integer) iterator.next();
-            CategoryDomainObject category = getCategoryById(categoryId.intValue()) ;
+    public Set<CategoryDomainObject> getCategories(Collection<Integer> categoryIds) {
+        Set<CategoryDomainObject> categories = new HashSet<>();
+        for (Integer categoryId : categoryIds) {
+            CategoryDomainObject category = getCategoryById(categoryId);
             if (null != category) {
-                categories.add(category) ;
+                categories.add(category);
             }
         }
         return categories;
     }
 
-    public Set getCategoriesOfType(CategoryTypeDomainObject categoryType, Set categoryIds) {
-        Set categories = getCategories(categoryIds) ;
-        Set categoriesOfType = new HashSet();
-        for ( Iterator iterator = categories.iterator(); iterator.hasNext(); ) {
-            CategoryDomainObject category = (CategoryDomainObject) iterator.next();
-            if ( categoryType.equals( category.getType() ) ) {
-                categoriesOfType.add( category );
+    public Set<CategoryDomainObject> getCategoriesOfType(CategoryTypeDomainObject categoryType, Set<Integer> categoryIds) {
+        Set<CategoryDomainObject> categories = getCategories(categoryIds);
+        Set<CategoryDomainObject> categoriesOfType = new HashSet<>();
+        for (CategoryDomainObject category : categories) {
+            if (categoryType.equals(category.getType())) {
+                categoriesOfType.add(category);
             }
         }
-        return categoriesOfType ;
+        return categoriesOfType;
+    }
+
+    private void invalidateCategory(CategoryDomainObject category) {
+        categoryCache.remove(category.getId());
+        categoryByTypeAndNameCache.remove(getCacheKeyByTypeAndName(category.getType(), category.getName()));
+    }
+
+    private void invalidateCategoryType(CategoryTypeDomainObject categoryType) {
+        categoryTypeCache.remove(categoryType.getId());
+        categoryTypeByNameCache.remove(categoryType.getName());
     }
 
-    private static class CategoryTypeFromRowFactory implements RowTransformer {
+    private static class CategoryTypeFromRowFactory implements RowTransformer<CategoryTypeDomainObject> {
 
         private final int offset;
 
         CategoryTypeFromRowFactory() {
-            this(0) ;
+            this(0);
         }
 
         CategoryTypeFromRowFactory(int offset) {
             this.offset = offset;
         }
 
-        public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
-            int id = resultSet.getInt(offset+1);
-            String name = resultSet.getString(offset+2);
-            int maxChoices = resultSet.getInt(offset+3);
-            boolean inherited = 0 != resultSet.getInt(offset+4);
-            return new CategoryTypeDomainObject(id, name, maxChoices, inherited) ;
+        public CategoryTypeDomainObject createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
+            int id = resultSet.getInt(offset + 1);
+            String name = resultSet.getString(offset + 2);
+            int maxChoices = resultSet.getInt(offset + 3);
+            boolean inherited = 0 != resultSet.getInt(offset + 4);
+            boolean imageArchive = 0 != resultSet.getInt(offset + 5);
+            return new CategoryTypeDomainObject(id, name, maxChoices, inherited, imageArchive);
         }
 
-        public Class getClassOfCreatedObjects() {
+        public Class<CategoryTypeDomainObject> getClassOfCreatedObjects() {
             return CategoryTypeDomainObject.class;
         }
     }
 
-    private static class CategoryFromRowFactory implements RowTransformer {
+    private static class CategoryFromRowFactory implements RowTransformer<CategoryDomainObject> {
 
-        public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
+        public CategoryDomainObject createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
             int categoryId = resultSet.getInt(1);
             String categoryName = resultSet.getString(2);
             String categoryDescription = resultSet.getString(3);
             String categoryImage = resultSet.getString(4);
 
-            CategoryTypeDomainObject categoryType = (CategoryTypeDomainObject) new CategoryTypeFromRowFactory(4).createObjectFromResultSetRow(resultSet) ;
+            CategoryTypeDomainObject categoryType = new CategoryTypeFromRowFactory(4).createObjectFromResultSetRow(resultSet);
 
             return new CategoryDomainObject(categoryId, categoryName, categoryDescription, categoryImage, categoryType);
         }
 
-        public Class getClassOfCreatedObjects() {
-            return CategoryDomainObject.class ;
+        public Class<CategoryDomainObject> getClassOfCreatedObjects() {
+            return CategoryDomainObject.class;
         }
     }
 
diff --git a/server/src/com/imcode/imcms/mapping/DatabaseDocumentGetter.java b/server/src/com/imcode/imcms/mapping/DatabaseDocumentGetter.java
index 1ce4772c17..927ad4e109 100644
--- a/server/src/com/imcode/imcms/mapping/DatabaseDocumentGetter.java
+++ b/server/src/com/imcode/imcms/mapping/DatabaseDocumentGetter.java
@@ -14,63 +14,65 @@
 
 public class DatabaseDocumentGetter extends AbstractDocumentGetter {
 
+    public static final String SQL_GET_DOCUMENTS = "SELECT meta_id,\n"
+            + "doc_type,\n"
+            + "meta_headline,\n"
+            + "meta_text,\n"
+            + "meta_image,\n"
+            + "owner_id,\n"
+            + "permissions,\n"
+            + "shared,\n"
+            + "show_meta,\n"
+            + "lang_prefix,\n"
+            + "date_created,\n"
+            + "date_modified,\n"
+            + "disable_search,\n"
+            + "target,\n"
+            + "archived_datetime,\n"
+            + "publisher_id,\n"
+            + "status,\n"
+            + "publication_start_datetime,\n"
+            + "publication_end_datetime,\n"
+		    + "export_allowed,\n"
+		    + "exported\n"
+            + "FROM meta\n"
+            + "WHERE meta_id ";
+    static final String SQL_SELECT_PERMISSION_DATA__PREFIX = "SELECT meta_id, set_id, permission_data FROM ";
     private Database database;
     private ImcmsServices services;
-    public static final String SQL_GET_DOCUMENTS = "SELECT meta_id,\n"
-                                                   + "doc_type,\n"
-                                                   + "meta_headline,\n"
-                                                   + "meta_text,\n"
-                                                   + "meta_image,\n"
-                                                   + "owner_id,\n"
-                                                   + "permissions,\n"
-                                                   + "shared,\n"
-                                                   + "show_meta,\n"
-                                                   + "lang_prefix,\n"
-                                                   + "date_created,\n"
-                                                   + "date_modified,\n"
-                                                   + "disable_search,\n"
-                                                   + "target,\n"
-                                                   + "archived_datetime,\n"
-                                                   + "publisher_id,\n"
-                                                   + "status,\n"
-                                                   + "publication_start_datetime,\n"
-                                                   + "publication_end_datetime\n"
-                                                   + "FROM meta\n"
-                                                   + "WHERE meta_id ";
-    static final String SQL_SELECT_PERMISSON_DATA__PREFIX = "SELECT meta_id, set_id, permission_data FROM ";
 
     public DatabaseDocumentGetter(Database database, ImcmsServices services) {
         this.database = database;
         this.services = services;
     }
 
-    public List getDocuments(final Collection documentIds) {
+    public List<DocumentDomainObject> getDocuments(final Collection<Integer> documentIds) {
         if (documentIds.isEmpty()) {
-            return Collections.EMPTY_LIST ;
+            return Collections.emptyList();
         }
-        LinkedHashMap documentMap = new LinkedHashMap();
-        DocumentInitializer.executeWithAppendedIntegerInClause(database, SQL_GET_DOCUMENTS, documentIds, new CollectionHandler(new DocumentMapSet(documentMap), new DocumentFromRowFactory()));
+        LinkedHashMap<Integer, DocumentDomainObject> documentMap = new LinkedHashMap<>();
+        DocumentInitializer.executeWithAppendedIntegerInClause(database, SQL_GET_DOCUMENTS, documentIds, new CollectionHandler<>(new DocumentMapSet(documentMap), new DocumentFromRowFactory()));
 
         DocumentList documentList = new DocumentList(documentMap);
 
         DocumentInitializer initializer = new DocumentInitializer(services.getDocumentMapper());
         initializer.initDocuments(documentList);
 
-        LinkedHashMap retMap = new LinkedHashMap();
-        
-        for (Iterator it = documentIds.iterator(); it.hasNext();) {
-            Integer id = (Integer)it.next();
+        LinkedHashMap<Integer, DocumentDomainObject> retMap = new LinkedHashMap<>();
+
+        for (Object documentId : documentIds) {
+            Integer id = (Integer) documentId;
             retMap.put(id, documentMap.get(id));
         }
 
         return new DocumentList(retMap);
     }
 
-    private class DocumentMapSet extends AbstractSet {
+    private class DocumentMapSet extends AbstractSet<DocumentDomainObject> {
 
-        private Map map ;
+        private Map<Integer, DocumentDomainObject> map;
 
-        DocumentMapSet(Map map) {
+        DocumentMapSet(Map<Integer, DocumentDomainObject> map) {
             this.map = map;
         }
 
@@ -78,30 +80,20 @@ public int size() {
             return map.size();
         }
 
-        public boolean add(Object o) {
-            DocumentDomainObject document = (DocumentDomainObject) o ;
-            return null == map.put(new Integer(document.getId()), document) ;
+        public boolean add(DocumentDomainObject document) {
+            return null == map.put(document.getId(), document);
         }
 
-        public Iterator iterator() {
-            return map.values().iterator() ;
+        @Override
+        public Iterator<DocumentDomainObject> iterator() {
+            return map.values().iterator();
         }
 
     }
 
-    private Document.PublicationStatus publicationStatusFromInt(int publicationStatusInt) {
-        Document.PublicationStatus publicationStatus = Document.PublicationStatus.NEW;
-        if ( Document.STATUS_PUBLICATION_APPROVED == publicationStatusInt ) {
-            publicationStatus = Document.PublicationStatus.APPROVED;
-        } else if ( Document.STATUS_PUBLICATION_DISAPPROVED == publicationStatusInt ) {
-            publicationStatus = Document.PublicationStatus.DISAPPROVED;
-        }
-        return publicationStatus;
-    }
-
-    private class DocumentFromRowFactory implements RowTransformer {
+    private class DocumentFromRowFactory implements RowTransformer<DocumentDomainObject> {
 
-        public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
+        public DocumentDomainObject createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
             final int documentTypeId = resultSet.getInt(2);
             DocumentDomainObject document = DocumentDomainObject.fromDocumentTypeId(documentTypeId);
 
@@ -124,17 +116,19 @@ public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLExcept
             document.setTarget(resultSet.getString(14));
             document.setArchivedDatetime(resultSet.getTimestamp(15));
             Number publisherId = (Number) resultSet.getObject(16);
-            document.setPublisherId(publisherId == null ? null : new Integer(publisherId.intValue()));
+            document.setPublisherId(publisherId == null ? null : publisherId.intValue());
             int publicationStatusInt = resultSet.getInt(17);
-            Document.PublicationStatus publicationStatus = publicationStatusFromInt(publicationStatusInt);
+            Document.PublicationStatus publicationStatus = Document.PublicationStatus.fromInt(publicationStatusInt);
             document.setPublicationStatus(publicationStatus);
             document.setPublicationStartDatetime(resultSet.getTimestamp(18));
             document.setPublicationEndDatetime(resultSet.getTimestamp(19));
+			document.setExportAllowed(resultSet.getBoolean(20));
+			document.setExported(resultSet.getBoolean(21));
 
             return document;
         }
 
-        public Class getClassOfCreatedObjects() {
+        public Class<DocumentDomainObject> getClassOfCreatedObjects() {
             return DocumentDomainObject.class;
         }
     }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentCreatingVisitor.java b/server/src/com/imcode/imcms/mapping/DocumentCreatingVisitor.java
index f8dc74c819..c6740c4801 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentCreatingVisitor.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentCreatingVisitor.java
@@ -3,47 +3,48 @@
 import com.imcode.db.Database;
 import com.imcode.db.commands.SqlUpdateCommand;
 import imcode.server.ImcmsServices;
-import imcode.server.document.*;
+import imcode.server.document.HtmlDocumentDomainObject;
+import imcode.server.document.UrlDocumentDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 
 public class DocumentCreatingVisitor extends DocumentStoringVisitor {
-	
-	private UserDomainObject currentUser;
+
+    private UserDomainObject currentUser;
 
     public DocumentCreatingVisitor(Database database, ImcmsServices services) {
         this(database, services, null);
     }
-    
+
     public DocumentCreatingVisitor(Database database, ImcmsServices services, UserDomainObject currentUser) {
         super(database, services);
-        this.currentUser = currentUser;        
+        this.currentUser = currentUser;
     }
-    
 
-    public void visitHtmlDocument( HtmlDocumentDomainObject document ) {
+
+    public void visitHtmlDocument(HtmlDocumentDomainObject document) {
         String[] htmlDocumentColumns = {"meta_id", "frame_set"};
 
-        String sqlUrlDocsInsertStr = makeSqlInsertString( "frameset_docs", htmlDocumentColumns );
+        String sqlUrlDocsInsertStr = makeSqlInsertString("frameset_docs", htmlDocumentColumns);
 
-        final Object[] parameters = new String[] {
-                                             "" + document.getId(), document.getHtml()
-                                             };
+        final Object[] parameters = new String[]{
+                "" + document.getId(), document.getHtml()
+        };
         database.execute(new SqlUpdateCommand(sqlUrlDocsInsertStr, parameters));
     }
 
-    public void visitUrlDocument( UrlDocumentDomainObject document ) {
+    public void visitUrlDocument(UrlDocumentDomainObject document) {
         String[] urlDocumentColumns = {"meta_id", "frame_name", "target", "url_ref", "url_txt", "lang_prefix"};
 
-        String sqlUrlDocsInsertStr = DocumentStoringVisitor.makeSqlInsertString( "url_docs", urlDocumentColumns );
+        String sqlUrlDocsInsertStr = DocumentStoringVisitor.makeSqlInsertString("url_docs", urlDocumentColumns);
 
-        final Object[] parameters = new String[] {
-                                             "" + document.getId(), "", "", document.getUrl(), "", ""
-                                             };
+        final Object[] parameters = new String[]{
+                "" + document.getId(), "", "", document.getUrl(), "", ""
+        };
         database.execute(new SqlUpdateCommand(sqlUrlDocsInsertStr, parameters));
     }
 
-    public void visitTextDocument( final TextDocumentDomainObject textDocument ) {
+    public void visitTextDocument(final TextDocumentDomainObject textDocument) {
         String sqlTextDocsInsertStr = "INSERT INTO text_docs (meta_id, template_name, group_id, default_template, default_template_1, default_template_2) VALUES (?,?,?,?,?,?)";
         String templateName = textDocument.getTemplateName();
         String defaultTemplate = textDocument.getDefaultTemplateName();
@@ -51,18 +52,18 @@ public void visitTextDocument( final TextDocumentDomainObject textDocument ) {
         String defaultTemplateForRestricted2 = textDocument.getDefaultTemplateNameForRestricted2();
         int templateGroupId = textDocument.getTemplateGroupId();
         int textDocumentId = textDocument.getId();
-        final Object[] parameters = new String[] {
+        final Object[] parameters = new String[]{
                 "" + textDocumentId,
                 "" + templateName,
                 "" + templateGroupId,
                 null != defaultTemplate ? "" + defaultTemplate : null,
                 null != defaultTemplateForRestricted1 ? "" + defaultTemplateForRestricted1 : null,
                 null != defaultTemplateForRestricted2 ? "" + defaultTemplateForRestricted2 : null,
-                };
+        };
         database.execute(new SqlUpdateCommand(sqlTextDocsInsertStr, parameters));
-        updateTextDocumentTexts( textDocument, null, currentUser);
-        updateTextDocumentImages( textDocument, null, null);
-        updateTextDocumentIncludes( textDocument );
-        updateTextDocumentMenus( textDocument, null, null);
+        updateTextDocumentTexts(textDocument, null, currentUser);
+        updateTextDocumentImages(textDocument, null, null);
+        updateTextDocumentIncludes(textDocument);
+        updateTextDocumentMenus(textDocument, null, null);
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentGetter.java b/server/src/com/imcode/imcms/mapping/DocumentGetter.java
index 3e9cce7988..d187d67881 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentGetter.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentGetter.java
@@ -2,13 +2,15 @@
 
 import imcode.server.document.DocumentDomainObject;
 
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 
 public interface DocumentGetter {
-    
-    /** Return a list of documents <em>in the same order</em> as the documentIds */ 
-    List getDocuments(Collection documentIds);
+
+    /**
+     * Return a list of documents <em>in the same order</em> as the documentIds
+     */
+    List<DocumentDomainObject> getDocuments(Collection<Integer> documentIds);
 
     DocumentDomainObject getDocument(Integer documentId);
 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentGetterWrapper.java b/server/src/com/imcode/imcms/mapping/DocumentGetterWrapper.java
index 39763072b4..3d0cb7ccd9 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentGetterWrapper.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentGetterWrapper.java
@@ -2,22 +2,22 @@
 
 import imcode.server.document.DocumentDomainObject;
 
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 
 public class DocumentGetterWrapper implements DocumentGetter {
 
-    private DocumentGetter documentGetter ;
+    private DocumentGetter documentGetter;
 
     public DocumentGetterWrapper(DocumentGetter documentGetter) {
         this.documentGetter = documentGetter;
     }
 
-    public List getDocuments(Collection documentIds) {
-        return documentGetter.getDocuments(documentIds) ;
+    public List<DocumentDomainObject> getDocuments(Collection<Integer> documentIds) {
+        return documentGetter.getDocuments(documentIds);
     }
 
     public DocumentDomainObject getDocument(Integer documentId) {
-        return documentGetter.getDocument(documentId) ;
+        return documentGetter.getDocument(documentId);
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentInitializer.java b/server/src/com/imcode/imcms/mapping/DocumentInitializer.java
index a7a56deea8..1b3555ba26 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentInitializer.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentInitializer.java
@@ -4,80 +4,61 @@
 import com.imcode.db.commands.SqlQueryCommand;
 import com.imcode.util.CountingIterator;
 import imcode.server.ImcmsConstants;
-import imcode.server.document.*;
+import imcode.server.document.CopyableHashSet;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.DocumentPermissionSetDomainObject;
+import imcode.server.document.DocumentPermissionSetTypeDomainObject;
+import imcode.server.document.DocumentPermissionSets;
+import imcode.server.document.RoleIdToDocumentPermissionSetTypeMappings;
+import imcode.server.document.TextDocumentPermissionSetDomainObject;
 import imcode.server.document.textdocument.CopyableHashMap;
 import imcode.server.user.RoleId;
 import imcode.util.LazilyLoadedObject;
 import imcode.util.Utility;
-import org.apache.commons.collections.MultiHashMap;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.commons.dbutils.ResultSetHandler;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 public class DocumentInitializer {
+    public static final String SQL_GET_SECTION_IDS_FOR_DOCUMENT = "SELECT ms.meta_id, ms.section_id\n"
+            + "FROM meta_section ms\n"
+            + "WHERE ms.meta_id ";
+    /**
+     * Permission to create child documents. *
+     */
+    public final static int PERM_CREATE_DOCUMENT = 8;
     private static final String SQL_GET_KEYWORDS = "SELECT mc.meta_id, c.code FROM classification c JOIN meta_classification mc ON mc.class_id = c.class_id WHERE mc.meta_id ";
     private static final String SQL_GET_DOCUMENT_PROPERTIES = "SELECT key_name, value FROM document_properties WHERE meta_id=?";
-
     private final DocumentMapper documentMapper;
-    public static final String SQL_GET_SECTION_IDS_FOR_DOCUMENT = "SELECT ms.meta_id, ms.section_id\n"
-                                                                  + "FROM meta_section ms\n"
-                                                                  + "WHERE ms.meta_id ";
-    /** Permission to create child documents. * */
-    public final static int PERM_CREATE_DOCUMENT = 8;
+    private MultiValuedMap<Integer, Integer> documentsSectionIds;
+    private MultiValuedMap<Integer, String> documentsKeywords;
+    private MultiValuedMap<Integer, Integer> documentsCategoryIds;
+    private HashMap<Integer, Map<String, String>> documentsProperties;
+    private HashMap<Integer, RoleIdToDocumentPermissionSetTypeMappings> documentsRolePermissionMappings;
+    private HashMap<Integer, DocumentPermissionSets> documentsPermissionSets;
+    private HashMap<Integer, DocumentPermissionSets> documentsPermissionSetsForNew;
     private Database database;
 
-    MultiHashMap documentsSectionIds ;
-    MultiHashMap documentsKeywords ;
-    MultiHashMap documentsCategoryIds ;
-    HashMap documentsProperties ;
-    HashMap documentsRolePermissionMappings ;
-    HashMap documentsPermissionSets ;
-    HashMap documentsPermissionSetsForNew ;
-
     public DocumentInitializer(DocumentMapper documentMapper) {
         this.documentMapper = documentMapper;
         this.database = documentMapper.getDatabase();
     }
 
-    void initDocuments(DocumentList documentList) {
-        Set documentIds = documentList.getMap().keySet();
-
-        DocumentInitializingVisitor documentInitializingVisitor = new DocumentInitializingVisitor(documentMapper, documentIds, documentMapper);
-        for ( Iterator iterator = documentList.iterator(); iterator.hasNext(); ) {
-            final DocumentDomainObject document = (DocumentDomainObject) iterator.next();
-            final Integer documentId = new Integer(document.getId()) ;
-
-            final LazilyLoadedObject permissionSets = new LazilyLoadedObject(new DocumentPermissionSetsLoader(documentIds, false, documentId));
-            LazilyLoadedObject permissionSetsForNew = new LazilyLoadedObject(new DocumentPermissionSetsLoader(documentIds, true, documentId));
-            LazilyLoadedObject rolePermissionMappings = new LazilyLoadedObject(new DocumentRolePermissionsLoader(documentIds, documentId));
-            LazilyLoadedObject sectionIds = new LazilyLoadedObject(new DocumentSectionIdsLoader(documentIds, documentId));
-            LazilyLoadedObject keywords = new LazilyLoadedObject(new DocumentKeywordsLoader(documentIds, documentId));
-            LazilyLoadedObject categoryIds = new LazilyLoadedObject(new DocumentCategoryIdsLoader(documentIds, documentId));
-            LazilyLoadedObject properties = new LazilyLoadedObject(new DocumentPropertiesLoader(documentIds, documentId));
-
-            document.setLazilyLoadedPermissionSets(permissionSets);
-            document.setLazilyLoadedPermissionSetsForNew(permissionSetsForNew);
-            document.setLazilyLoadedRoleIdsMappedToDocumentPermissionSetTypes(rolePermissionMappings);
-            document.setLazilyLoadedSectionIds(sectionIds);
-            document.setLazilyLoadedKeywords(keywords);
-            document.setLazilyLoadedCategoryIds(categoryIds);
-            document.setLazilyLoadedProperties(properties);
-
-            document.accept(documentInitializingVisitor);
-        }
-    }
-
-
-    private static Integer[] appendInClause(StringBuffer sql, Collection documentIds) {
+    private static Integer[] appendInClause(StringBuffer sql, Collection<Integer> documentIds) {
         sql.append("IN (");
         Integer[] documentIdsArray = new Integer[documentIds.size()];
-        for ( CountingIterator iterator = new CountingIterator(documentIds.iterator()); iterator.hasNext(); ) {
-            Integer documentId = (Integer) iterator.next();
-            documentIdsArray[iterator.getCount() - 1] = new Integer(documentId.intValue());
+        for (CountingIterator<Integer> iterator = new CountingIterator<>(documentIds.iterator()); iterator.hasNext(); )
+        {
+            Integer documentId = iterator.next();
+            documentIdsArray[iterator.getCount() - 1] = documentId;
             sql.append('?');
-            if ( iterator.hasNext() ) {
+            if (iterator.hasNext()) {
                 sql.append(',');
             }
         }
@@ -85,297 +66,303 @@ private static Integer[] appendInClause(StringBuffer sql, Collection documentIds
         return documentIdsArray;
     }
 
-    private class DocumentSectionIdsLoader implements LazilyLoadedObject.Loader {
+    static <T> void executeWithAppendedIntegerInClause(Database database, String sqlString, Collection<Integer> documentIds,
+                                                       ResultSetHandler<T> resultSetHandler
+    ) {
+        if (documentIds.isEmpty()) {
+            throw new IllegalArgumentException("documentIds is empty");
+        }
+        StringBuffer sql = new StringBuffer(sqlString);
+        Integer[] parameters = appendInClause(sql, documentIds);
+        database.execute(new SqlQueryCommand<>(sql.toString(), parameters, resultSetHandler));
+    }
+
+    void initDocuments(DocumentList documentList) {
+        Set<Integer> documentIds = documentList.getMap().keySet();
 
-        private final Collection documentIds;
+        DocumentInitializingVisitor documentInitializingVisitor = new DocumentInitializingVisitor(documentMapper, documentIds, documentMapper);
+        for (final DocumentDomainObject document : documentList) {
+            final Integer documentId = document.getId();
+
+            document.setLazilyLoadedPermissionSets(new LazilyLoadedObject<>(new DocumentPermissionSetsLoader(documentIds, false, documentId)));
+            document.setLazilyLoadedPermissionSetsForNew(new LazilyLoadedObject<>(new DocumentPermissionSetsLoader(documentIds, true, documentId)));
+            document.setLazilyLoadedRoleIdsMappedToDocumentPermissionSetTypes(new LazilyLoadedObject<>(new DocumentRolePermissionsLoader(documentIds, documentId)));
+            document.setLazilyLoadedSectionIds(new LazilyLoadedObject<>(new DocumentSectionIdsLoader(documentIds, documentId)));
+            document.setLazilyLoadedKeywords(new LazilyLoadedObject<>(new DocumentKeywordsLoader(documentIds, documentId)));
+            document.setLazilyLoadedCategoryIds(new LazilyLoadedObject<>(new DocumentCategoryIdsLoader(documentIds, documentId)));
+            document.setLazilyLoadedProperties(new LazilyLoadedObject<>(new DocumentPropertiesLoader(documentIds, documentId)));
+
+            document.accept(documentInitializingVisitor);
+        }
+    }
+
+    private class DocumentSectionIdsLoader implements LazilyLoadedObject.Loader<CopyableHashSet<Integer>> {
+
+        private final Collection<Integer> documentIds;
         private final Integer documentId;
 
-        DocumentSectionIdsLoader(Collection documentIds, Integer documentId
+        DocumentSectionIdsLoader(Collection<Integer> documentIds, Integer documentId
         ) {
             this.documentIds = documentIds;
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public CopyableHashSet<Integer> load() {
             initDocumentsSectionIds(documentIds);
-            Collection sectionIds = (Collection) documentsSectionIds.get(documentId);
-            if ( null == sectionIds ) {
-                sectionIds = Collections.EMPTY_SET;
+            Collection<Integer> sectionIds = documentsSectionIds.get(documentId);
+            if (null == sectionIds) {
+                sectionIds = Collections.emptyList();
             }
-            return new CopyableHashSet(sectionIds);
+            return new CopyableHashSet<>(sectionIds);
         }
 
-        private void initDocumentsSectionIds(final Collection documentIds) {
-            if ( null != documentsSectionIds ) {
-                return ;
+        private void initDocumentsSectionIds(final Collection<Integer> documentIds) {
+            if (null != documentsSectionIds) {
+                return;
             }
-            documentsSectionIds = new MultiHashMap();
-            executeWithAppendedIntegerInClause(DocumentInitializer.this.database, SQL_GET_SECTION_IDS_FOR_DOCUMENT, documentIds, new ResultSetHandler() {
-                public Object handle(ResultSet rs) throws SQLException {
-                    while ( rs.next() ) {
-                        int documentId = rs.getInt(1);
-                        int sectionId = rs.getInt(2);
-                        documentsSectionIds.put(new Integer(documentId), new Integer(sectionId));
-                    }
-                    return null;
+            documentsSectionIds = new ArrayListValuedHashMap<>();
+            executeWithAppendedIntegerInClause(DocumentInitializer.this.database, SQL_GET_SECTION_IDS_FOR_DOCUMENT, documentIds, rs -> {
+                while (rs.next()) {
+                    int documentId = rs.getInt(1);
+                    int sectionId = rs.getInt(2);
+                    documentsSectionIds.put(documentId, sectionId);
                 }
+                return null;
             });
         }
 
     }
 
-    private class DocumentKeywordsLoader implements LazilyLoadedObject.Loader {
+    private class DocumentKeywordsLoader implements LazilyLoadedObject.Loader<CopyableHashSet<String>> {
 
-        private final Collection documentIds;
+        private final Collection<Integer> documentIds;
         private final Integer documentId;
 
-        DocumentKeywordsLoader(Collection documentIds, Integer documentId) {
+        DocumentKeywordsLoader(Collection<Integer> documentIds, Integer documentId) {
             this.documentIds = documentIds;
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
-                initDocumentsKeywords(documentIds);
-            Collection documentKeywords = (Collection) documentsKeywords.get(documentId);
-            if ( null == documentKeywords ) {
-                documentKeywords = Collections.EMPTY_SET;
+        public CopyableHashSet<String> load() {
+            initDocumentsKeywords(documentIds);
+            Collection<String> documentKeywords = documentsKeywords.get(documentId);
+            if (null == documentKeywords) {
+                documentKeywords = Collections.emptyList();
             }
-            return new CopyableHashSet(documentKeywords);
+            return new CopyableHashSet<>(documentKeywords);
         }
 
-        private void initDocumentsKeywords(Collection documentIds) {
-            if ( null != documentsKeywords ) {
-                return ;
+        private void initDocumentsKeywords(Collection<Integer> documentIds) {
+            if (null != documentsKeywords) {
+                return;
             }
-            documentsKeywords = new MultiHashMap();
-            executeWithAppendedIntegerInClause(DocumentInitializer.this.database, SQL_GET_KEYWORDS, documentIds, new ResultSetHandler() {
-                public Object handle(ResultSet rs) throws SQLException {
-                    while ( rs.next() ) {
-                        int documentId = rs.getInt(1);
-                        String keyword = rs.getString(2);
-                        documentsKeywords.put(new Integer(documentId), keyword);
-                    }
-                    return null;
+            documentsKeywords = new ArrayListValuedHashMap<>();
+            executeWithAppendedIntegerInClause(DocumentInitializer.this.database, SQL_GET_KEYWORDS, documentIds, rs -> {
+                while (rs.next()) {
+                    int documentId = rs.getInt(1);
+                    String keyword = rs.getString(2);
+                    documentsKeywords.put(documentId, keyword);
                 }
+                return null;
             });
         }
     }
 
-    private class DocumentPropertiesLoader implements LazilyLoadedObject.Loader {
+    private class DocumentPropertiesLoader implements LazilyLoadedObject.Loader<CopyableHashMap<String, String>> {
 
         private final Collection documentIds;
-        private final Integer documentId ;
+        private final Integer documentId;
 
         DocumentPropertiesLoader(Collection documentIds, Integer documentId) {
             this.documentIds = documentIds;
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public CopyableHashMap<String, String> load() {
             initDocumentsProperties(documentIds);
-            Map documentProperties = (HashMap) documentsProperties.get(documentId);
-            if ( null == documentProperties ) {
-                documentProperties = new HashMap();
+            Map<String, String> documentProperties = documentsProperties.get(documentId);
+            if (null == documentProperties) {
+                documentProperties = new HashMap<>();
             }
-            return new CopyableHashMap(documentProperties);
+            return new CopyableHashMap<>(documentProperties);
         }
 
         private void initDocumentsProperties(Collection documentIds) {
-            if ( null != documentsProperties ) {
-                return ;
+            if (null != documentsProperties) {
+                return;
             }
-            documentsProperties = new HashMap();
-            StringBuffer sql = new StringBuffer(SQL_GET_DOCUMENT_PROPERTIES);
-            for ( Iterator iterator = documentIds.iterator(); iterator.hasNext(); ) {
-                final Integer documentId = (Integer) iterator.next();
-                database.execute(new SqlQueryCommand(sql.toString(), new String[] {documentId+""}, new ResultSetHandler() {
-                    public Object handle(ResultSet rs) throws SQLException {
-                        Map properties = new HashMap(rs.getFetchSize());
-                        while ( rs.next() ) {
-                            String keyName = rs.getString(1);
-                            String value = rs.getString(2);
-                            properties.put(keyName, value);
-                        }
-                        documentsProperties.put(documentId, properties);
-                        return null;
+            documentsProperties = new HashMap<>();
+            StringBuilder sql = new StringBuilder(SQL_GET_DOCUMENT_PROPERTIES);
+            for (Object documentId1 : documentIds) {
+                final Integer documentId = (Integer) documentId1;
+                database.execute(new SqlQueryCommand<>(sql.toString(), new String[]{documentId + ""}, rs -> {
+                    Map<String, String> properties = new HashMap<>(rs.getFetchSize());
+                    while (rs.next()) {
+                        String keyName = rs.getString(1);
+                        String value = rs.getString(2);
+                        properties.put(keyName, value);
                     }
+                    documentsProperties.put(documentId, properties);
+                    return null;
                 }));
             }
         }
 
     }
 
+    private class DocumentCategoryIdsLoader implements LazilyLoadedObject.Loader<CopyableHashSet<Integer>> {
 
-    private class DocumentCategoryIdsLoader implements LazilyLoadedObject.Loader {
-
-        private final Collection documentIds;
+        private final Collection<Integer> documentIds;
         private final Integer documentId;
 
-        DocumentCategoryIdsLoader(Collection documentIds, Integer documentId) {
+        DocumentCategoryIdsLoader(Collection<Integer> documentIds, Integer documentId) {
             this.documentIds = documentIds;
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public CopyableHashSet<Integer> load() {
             initDocumentsCategoryIds(documentIds);
-            Collection documentCategoryIds = documentsCategoryIds.getCollection(documentId);
-            if ( null == documentCategoryIds ) {
-                documentCategoryIds = Collections.EMPTY_SET;
+            Collection<Integer> documentCategoryIds = documentsCategoryIds.get(documentId);
+            if (null == documentCategoryIds) {
+                documentCategoryIds = Collections.emptyList();
             }
-            return new CopyableHashSet(documentCategoryIds);
+            return new CopyableHashSet<>(documentCategoryIds);
         }
 
-        private void initDocumentsCategoryIds(Collection documentIds) {
+        private void initDocumentsCategoryIds(Collection<Integer> documentIds) {
             if (null != documentsCategoryIds) {
-                return ;
+                return;
             }
-            documentsCategoryIds = new MultiHashMap();
-            executeWithAppendedIntegerInClause(DocumentInitializer.this.database, CategoryMapper.SQL__GET_DOCUMENT_CATEGORIES, documentIds, new ResultSetHandler() {
-                public Object handle(ResultSet rs) throws SQLException {
-                    while ( rs.next() ) {
-                        int documentId = rs.getInt(1);
-                        int categoryId = rs.getInt(2);
-                        documentsCategoryIds.put(new Integer(documentId), new Integer(categoryId));
-                    }
-                    return null;
+            documentsCategoryIds = new ArrayListValuedHashMap<>();
+            executeWithAppendedIntegerInClause(DocumentInitializer.this.database, CategoryMapper.SQL__GET_DOCUMENT_CATEGORIES, documentIds, rs -> {
+                while (rs.next()) {
+                    int documentId = rs.getInt(1);
+                    int categoryId = rs.getInt(2);
+                    documentsCategoryIds.put(documentId, categoryId);
                 }
+                return null;
             });
         }
 
     }
 
-    static void executeWithAppendedIntegerInClause(Database database, String sqlString, Collection documentIds,
-                                                   ResultSetHandler resultSetHandler
-    ) {
-        if (documentIds.isEmpty()) {
-            throw new IllegalArgumentException("documentIds is empty") ;
-        }
-        StringBuffer sql = new StringBuffer(sqlString);
-        Integer[] parameters = appendInClause(sql, documentIds);
-        database.execute(new SqlQueryCommand(sql.toString(), parameters, resultSetHandler));
-    }
+    private class DocumentRolePermissionsLoader implements LazilyLoadedObject.Loader<RoleIdToDocumentPermissionSetTypeMappings> {
 
-    private class DocumentRolePermissionsLoader implements LazilyLoadedObject.Loader {
-
-        private final Collection documentIds;
+        private final Collection<Integer> documentIds;
         private final Integer documentId;
 
-        DocumentRolePermissionsLoader(Collection documentIds,
+        DocumentRolePermissionsLoader(Collection<Integer> documentIds,
                                       Integer documentId) {
             this.documentIds = documentIds;
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public RoleIdToDocumentPermissionSetTypeMappings load() {
             initDocumentsRolePermissionMappings(documentIds);
-            RoleIdToDocumentPermissionSetTypeMappings rolePermissionMappings = (RoleIdToDocumentPermissionSetTypeMappings) documentsRolePermissionMappings.get(documentId);
-            if ( null == rolePermissionMappings ) {
+            RoleIdToDocumentPermissionSetTypeMappings rolePermissionMappings = documentsRolePermissionMappings.get(documentId);
+            if (null == rolePermissionMappings) {
                 rolePermissionMappings = new RoleIdToDocumentPermissionSetTypeMappings();
             }
             return rolePermissionMappings;
         }
 
-        public void initDocumentsRolePermissionMappings(Collection documentIds) {
-            if ( null != documentsRolePermissionMappings ) {
+        public void initDocumentsRolePermissionMappings(Collection<Integer> documentIds) {
+            if (null != documentsRolePermissionMappings) {
                 return;
             }
-            documentsRolePermissionMappings = new HashMap();
+            documentsRolePermissionMappings = new HashMap<>();
 
             executeWithAppendedIntegerInClause(database, "SELECT "
-                                                         + "meta_id, role_id, set_id\n"
-                                                         + "FROM  roles_rights\n"
-                                                         + "WHERE meta_id ", documentIds, new ResultSetHandler() {
-                public Object handle(ResultSet rs) throws SQLException {
-                    while ( rs.next() ) {
-                        Integer documentId = new Integer(rs.getInt(1));
-                        int roleId = rs.getInt(2);
-                        int setId = rs.getInt(3);
-                        RoleIdToDocumentPermissionSetTypeMappings rolePermissionMappings = (RoleIdToDocumentPermissionSetTypeMappings) documentsRolePermissionMappings.get(documentId);
-                        if ( null == rolePermissionMappings ) {
-                            rolePermissionMappings = new RoleIdToDocumentPermissionSetTypeMappings();
-                            documentsRolePermissionMappings.put(documentId, rolePermissionMappings);
-                        }
-                        rolePermissionMappings.setPermissionSetTypeForRole(new RoleId(roleId), DocumentPermissionSetTypeDomainObject.fromInt(setId));
+                    + "meta_id, role_id, set_id\n"
+                    + "FROM  roles_rights\n"
+                    + "WHERE meta_id ", documentIds, rs -> {
+                while (rs.next()) {
+                    Integer documentId = rs.getInt(1);
+                    int roleId = rs.getInt(2);
+                    int setId = rs.getInt(3);
+                    RoleIdToDocumentPermissionSetTypeMappings rolePermissionMappings = documentsRolePermissionMappings.get(documentId);
+                    if (null == rolePermissionMappings) {
+                        rolePermissionMappings = new RoleIdToDocumentPermissionSetTypeMappings();
+                        documentsRolePermissionMappings.put(documentId, rolePermissionMappings);
                     }
-                    return null;
+                    rolePermissionMappings.setPermissionSetTypeForRole(new RoleId(roleId), DocumentPermissionSetTypeDomainObject.fromInt(setId));
                 }
+                return null;
             });
 
         }
     }
 
-    private class DocumentPermissionSetsLoader implements LazilyLoadedObject.Loader {
+    private class DocumentPermissionSetsLoader implements LazilyLoadedObject.Loader<DocumentPermissionSets> {
 
         private final Integer documentId;
-        private final Collection documentIds;
+        private final Collection<Integer> documentIds;
         private boolean forNew;
 
-        DocumentPermissionSetsLoader(Collection documentIds,
+        DocumentPermissionSetsLoader(Collection<Integer> documentIds,
                                      boolean forNew, Integer documentId) {
             this.documentIds = documentIds;
-            this.forNew = forNew ;
+            this.forNew = forNew;
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public DocumentPermissionSets load() {
             if (null == documentsPermissionSets) {
-                documentsPermissionSets = new HashMap();
+                documentsPermissionSets = new HashMap<>();
                 initDocumentsPermissionSets(documentIds, documentsPermissionSets, false);
             }
-            if (null == documentsPermissionSetsForNew ) {
-                documentsPermissionSetsForNew = new HashMap();
+            if (null == documentsPermissionSetsForNew) {
+                documentsPermissionSetsForNew = new HashMap<>();
                 initDocumentsPermissionSets(documentIds, documentsPermissionSetsForNew, true);
             }
-            Map map = forNew ? documentsPermissionSetsForNew : documentsPermissionSets ;
-            DocumentPermissionSets documentPermissionSets = (DocumentPermissionSets) map.get(documentId) ;
+            Map map = forNew ? documentsPermissionSetsForNew : documentsPermissionSets;
+            DocumentPermissionSets documentPermissionSets = (DocumentPermissionSets) map.get(documentId);
             if (null == documentPermissionSets) {
                 documentPermissionSets = new DocumentPermissionSets();
             }
-            return documentPermissionSets ;
+            return documentPermissionSets;
         }
 
-        public void initDocumentsPermissionSets(final Collection documentIds, final Map documentsPermissionSets,
+        public void initDocumentsPermissionSets(final Collection<Integer> documentIds, final Map<Integer, DocumentPermissionSets> documentsPermissionSets,
                                                 boolean forNew) {
 
             executeWithAppendedIntegerInClause(DocumentInitializer.this.database,
-                                               "SELECT d.meta_id, d.set_id, d.permission_id, de.permission_id, de.permission_data\n"
-                                               + "FROM "+(forNew ? "new_": "")+"doc_permission_sets d\n"
-                                               + "LEFT JOIN "+(forNew ? "new_": "")+"doc_permission_sets_ex de ON d.meta_id = de.meta_id AND d.set_id = de.set_id\n"
-                                               + "WHERE d.meta_id ", documentIds, new ResultSetHandler() {
-                public Object handle(ResultSet resultSet) throws SQLException {
-                    while ( resultSet.next() ) {
-                        Integer documentId = new Integer(resultSet.getInt(1));
-                        int setId = resultSet.getInt(2);
-                        int permissionSetBits = resultSet.getInt(3);
-                        Integer permissionId = Utility.getInteger(resultSet.getObject(4));
-                        Integer permissionData = Utility.getInteger(resultSet.getObject(5));
-
-                        DocumentPermissionSets permissionSets = (DocumentPermissionSets) documentsPermissionSets.get(documentId);
-                        if ( null == permissionSets ) {
-                            permissionSets = new DocumentPermissionSets();
-                            documentsPermissionSets.put(documentId, permissionSets);
-                        }
-
-                        DocumentPermissionSetDomainObject restricted = permissionSets.getRestricted(setId);
-                        if ( 0 != permissionSetBits && restricted.isEmpty() ) {
-                            restricted.setFromBits(permissionSetBits);
+                    "SELECT d.meta_id, d.set_id, d.permission_id, de.permission_id, de.permission_data\n"
+                            + "FROM " + (forNew ? "new_" : "") + "doc_permission_sets d\n"
+                            + "LEFT JOIN " + (forNew ? "new_" : "") + "doc_permission_sets_ex de ON d.meta_id = de.meta_id AND d.set_id = de.set_id\n"
+                            + "WHERE d.meta_id ", documentIds, resultSet -> {
+                        while (resultSet.next()) {
+                            Integer documentId = resultSet.getInt(1);
+                            int setId = resultSet.getInt(2);
+                            int permissionSetBits = resultSet.getInt(3);
+                            Integer permissionId = Utility.getInteger(resultSet.getObject(4));
+                            Integer permissionData = Utility.getInteger(resultSet.getObject(5));
+
+                            DocumentPermissionSets permissionSets = documentsPermissionSets.get(documentId);
+                            if (null == permissionSets) {
+                                permissionSets = new DocumentPermissionSets();
+                                documentsPermissionSets.put(documentId, permissionSets);
+                            }
+
+                            DocumentPermissionSetDomainObject restricted = permissionSets.getRestricted(setId);
+                            if (0 != permissionSetBits && restricted.isEmpty()) {
+                                restricted.setFromBits(permissionSetBits);
+                            }
+                            setPermissionData(restricted, permissionId, permissionData);
                         }
-                        setPermissionData(restricted, permissionId, permissionData);
-                    }
-                    return null;
-                }
-            });
+                        return null;
+                    });
         }
 
         private void setPermissionData(DocumentPermissionSetDomainObject permissionSet, Integer permissionId, Integer permissionData) {
             if (null != permissionId) {
-                TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) permissionSet ;
-                switch(permissionId.intValue()) {
+                TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) permissionSet;
+                switch (permissionId) {
                     case PERM_CREATE_DOCUMENT:
-                        textDocumentPermissionSet.addAllowedDocumentTypeId(permissionData.intValue());
+                        textDocumentPermissionSet.addAllowedDocumentTypeId(permissionData);
                         break;
                     case ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEMPLATE:
-                        textDocumentPermissionSet.addAllowedTemplateGroupId(permissionData.intValue());
+                        textDocumentPermissionSet.addAllowedTemplateGroupId(permissionData);
                         break;
                     default:
                 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentInitializingVisitor.java b/server/src/com/imcode/imcms/mapping/DocumentInitializingVisitor.java
index 928a3ba3e3..ee28dedd48 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentInitializingVisitor.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentInitializingVisitor.java
@@ -3,27 +3,27 @@
 import com.imcode.db.Database;
 import com.imcode.db.DatabaseException;
 import com.imcode.db.commands.SqlQueryCommand;
-import imcode.server.document.*;
+import imcode.server.document.BrowserDocumentDomainObject;
+import imcode.server.document.DocumentVisitor;
+import imcode.server.document.FileDocumentDomainObject;
+import imcode.server.document.HtmlDocumentDomainObject;
+import imcode.server.document.UrlDocumentDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
-import imcode.util.io.FileInputStreamSource;
 import imcode.util.Utility;
-import org.apache.commons.dbutils.ResultSetHandler;
+import imcode.util.io.FileInputStreamSource;
 import org.apache.commons.lang.UnhandledException;
 
 import java.io.File;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Collection;
 
 class DocumentInitializingVisitor extends DocumentVisitor {
 
-    private DocumentMapper documentMapper;
-    private final Database database;
     private static final String SQL__SELECT_FILE_DOCUMENT_FILES = "SELECT variant_name, filename, mime, created_as_image, default_variant FROM fileupload_docs WHERE meta_id = ? ORDER BY default_variant DESC, variant_name";
-
+    private final Database database;
+    private DocumentMapper documentMapper;
     private TextDocumentInitializer textDocumentInitializer;
-    
-    DocumentInitializingVisitor(DocumentGetter documentGetter, Collection documentIds,
+
+    DocumentInitializingVisitor(DocumentGetter documentGetter, Collection<Integer> documentIds,
                                 DocumentMapper documentMapper) {
         this.database = documentMapper.getDatabase();
         this.documentMapper = documentMapper;
@@ -33,14 +33,13 @@ class DocumentInitializingVisitor extends DocumentVisitor {
     public void visitBrowserDocument(BrowserDocumentDomainObject document) {
         String[][] sqlResult;
         try {
-            String[] parameters = new String[] { "" + document.getId() };
+            String[] parameters = new String[]{"" + document.getId()};
             String sqlStr = "SELECT to_meta_id, browser_id FROM browser_docs WHERE meta_id = ?";
-            sqlResult = (String[][]) database.execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
-        } catch ( DatabaseException e ) {
+            sqlResult = database.execute(new SqlQueryCommand<>(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
-        for ( int i = 0; i < sqlResult.length; i++ ) {
-            String[] sqlRow = sqlResult[i];
+        for (String[] sqlRow : sqlResult) {
             int toMetaId = Integer.parseInt(sqlRow[0]);
             int browserId = Integer.parseInt(sqlRow[1]);
             BrowserDocumentDomainObject.Browser browser = documentMapper.getBrowserById(browserId);
@@ -49,44 +48,42 @@ public void visitBrowserDocument(BrowserDocumentDomainObject document) {
     }
 
     public void visitFileDocument(final FileDocumentDomainObject document) {
-        Object[] parameters = new String[] {
-                "" + document.getId() };
-        database.execute(new SqlQueryCommand(SQL__SELECT_FILE_DOCUMENT_FILES, parameters, new ResultSetHandler() {
-            public Object handle(ResultSet resultSet) throws SQLException {
-                while ( resultSet.next() ) {
-                    String fileId = resultSet.getString(1);
-                    FileDocumentDomainObject.FileDocumentFile file = new FileDocumentDomainObject.FileDocumentFile();
-                    file.setFilename(resultSet.getString(2));
-                    file.setMimeType(resultSet.getString(3));
-                    file.setCreatedAsImage(0 != resultSet.getInt(4));
-                    File fileForFileDocument = DocumentStoringVisitor.getFileForFileDocumentFile(document.getId(), fileId);
-                    if ( !fileForFileDocument.exists() ) {
-                        File oldlyNamedFileForFileDocument = new File(fileForFileDocument.getParentFile(),
-                                                                      fileForFileDocument.getName()
-                                                                      + "_se");
-                        if ( oldlyNamedFileForFileDocument.exists() ) {
-                            fileForFileDocument = oldlyNamedFileForFileDocument;
-                        }
-                    }
-                    file.setInputStreamSource(new FileInputStreamSource(fileForFileDocument));
-                    document.addFile(fileId, file);
-                    boolean isDefaultFile = 0 != resultSet.getInt(5);
-                    if ( isDefaultFile ) {
-                        document.setDefaultFileId(fileId);
+        Object[] parameters = new String[]{
+                "" + document.getId()};
+        database.execute(new SqlQueryCommand<>(SQL__SELECT_FILE_DOCUMENT_FILES, parameters, resultSet -> {
+            while (resultSet.next()) {
+                String fileId = resultSet.getString(1);
+                FileDocumentDomainObject.FileDocumentFile file = new FileDocumentDomainObject.FileDocumentFile();
+                file.setFilename(resultSet.getString(2));
+                file.setMimeType(resultSet.getString(3));
+                file.setCreatedAsImage(0 != resultSet.getInt(4));
+                File fileForFileDocument = DocumentStoringVisitor.getFileForFileDocumentFile(document.getId(), fileId);
+                if (!fileForFileDocument.exists()) {
+                    File oldlyNamedFileForFileDocument = new File(fileForFileDocument.getParentFile(),
+                            fileForFileDocument.getName()
+                                    + "_se");
+                    if (oldlyNamedFileForFileDocument.exists()) {
+                        fileForFileDocument = oldlyNamedFileForFileDocument;
                     }
                 }
-                return null;
+                file.setInputStreamSource(new FileInputStreamSource(fileForFileDocument));
+                document.addFile(fileId, file);
+                boolean isDefaultFile = 0 != resultSet.getInt(5);
+                if (isDefaultFile) {
+                    document.setDefaultFileId(fileId);
+                }
             }
+            return null;
         }));
     }
 
     public void visitHtmlDocument(HtmlDocumentDomainObject htmlDocument) {
         String html;
         try {
-            String[] parameters = new String[] { "" + htmlDocument.getId() };
+            String[] parameters = new String[]{"" + htmlDocument.getId()};
             String sqlStr = "SELECT frame_set FROM frameset_docs WHERE meta_id = ?";
-            html = (String) database.execute(new SqlQueryCommand(sqlStr, parameters, Utility.SINGLE_STRING_HANDLER));
-        } catch ( DatabaseException e ) {
+            html = database.execute(new SqlQueryCommand<>(sqlStr, parameters, Utility.SINGLE_STRING_HANDLER));
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
         htmlDocument.setHtml(html);
@@ -95,16 +92,16 @@ public void visitHtmlDocument(HtmlDocumentDomainObject htmlDocument) {
     public void visitUrlDocument(UrlDocumentDomainObject document) {
         String url;
         try {
-            String[] parameters = new String[] { "" + document.getId() };
-            url = (String) database.execute(new SqlQueryCommand("SELECT url_ref FROM url_docs WHERE meta_id = ?", parameters, Utility.SINGLE_STRING_HANDLER));
-        } catch ( DatabaseException e ) {
+            String[] parameters = new String[]{"" + document.getId()};
+            url = database.execute(new SqlQueryCommand<>("SELECT url_ref FROM url_docs WHERE meta_id = ?", parameters, Utility.SINGLE_STRING_HANDLER));
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
         document.setUrl(url);
     }
 
     public void visitTextDocument(final TextDocumentDomainObject document) {
-        textDocumentInitializer.initialize(document) ;
+        textDocumentInitializer.initialize(document);
     }
 
 
diff --git a/server/src/com/imcode/imcms/mapping/DocumentList.java b/server/src/com/imcode/imcms/mapping/DocumentList.java
index 6dcd2647dc..9c0e964f1d 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentList.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentList.java
@@ -2,18 +2,23 @@
 
 import imcode.server.document.DocumentDomainObject;
 
-import java.util.*;
 import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 class DocumentList extends AbstractList<DocumentDomainObject> implements Serializable {
 
     private List<DocumentDomainObject> list;
     private Map<Integer, DocumentDomainObject> map;
 
-    DocumentList(Map documentMap) {
+    DocumentList(Map<Integer, DocumentDomainObject> documentMap) {
         map = Collections.synchronizedMap(documentMap);
-        list = new ArrayList(documentMap.size());
-        for ( Object result : map.values() ) {
+        list = new ArrayList<>(documentMap.size());
+
+        for (Object result : map.values()) {
             DocumentDomainObject document = (DocumentDomainObject) result;
             list.add(document);
         }
@@ -22,16 +27,16 @@ class DocumentList extends AbstractList<DocumentDomainObject> implements Seriali
     public synchronized DocumentDomainObject remove(int index) {
         DocumentDomainObject document = list.remove(index);
         document.loadAllLazilyLoaded();
-        map.remove(new Integer(document.getId()));
+        map.remove(document.getId());
         return document;
     }
 
     public synchronized DocumentDomainObject set(int index, DocumentDomainObject document) {
         DocumentDomainObject previousDocument = list.set(index, document);
-        if ( null != previousDocument ) {
-            map.remove(new Integer(previousDocument.getId()));
+        if (null != previousDocument) {
+            map.remove(previousDocument.getId());
         }
-        map.put(new Integer(document.getId()), document);
+        map.put(document.getId(), document);
         return previousDocument;
     }
 
@@ -40,7 +45,7 @@ public synchronized DocumentDomainObject get(int index) {
     }
 
     public synchronized boolean add(DocumentDomainObject document) {
-        map.put(new Integer(document.getId()), document);
+        map.put(document.getId(), document);
         return list.add(document);
     }
 
@@ -48,7 +53,7 @@ public synchronized int size() {
         return list.size();
     }
 
-    public synchronized Map getMap() {
+    public synchronized Map<Integer, DocumentDomainObject> getMap() {
         return map;
     }
 
@@ -57,9 +62,9 @@ public synchronized boolean contains(Object o) {
         if (o instanceof Integer) {
             documentId = (Integer) o;
         } else {
-            DocumentDomainObject document = (DocumentDomainObject) o ;
+            DocumentDomainObject document = (DocumentDomainObject) o;
             documentId = document.getId();
         }
-        return map.containsKey(documentId) ;
+        return map.containsKey(documentId);
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentMapper.java b/server/src/com/imcode/imcms/mapping/DocumentMapper.java
index a1b5d52f1c..93016dba95 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentMapper.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentMapper.java
@@ -5,11 +5,12 @@
 import com.imcode.db.commands.CompositeDatabaseCommand;
 import com.imcode.db.commands.DeleteWhereColumnsEqualDatabaseCommand;
 import com.imcode.db.commands.SqlQueryCommand;
-import com.imcode.db.commands.SqlUpdateDatabaseCommand;
+import com.imcode.db.commands.SqlUpdateCommand;
 import com.imcode.db.handlers.CollectionHandler;
 import com.imcode.db.handlers.RowTransformer;
 import com.imcode.imcms.api.Document;
 import com.imcode.imcms.flow.DocumentPageFlow;
+import com.imcode.imcms.servlet.ImageCacheManager;
 import imcode.server.Config;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
@@ -24,11 +25,13 @@
 import imcode.util.SystemClock;
 import imcode.util.Utility;
 import imcode.util.io.FileUtility;
-import org.apache.commons.collections.map.LRUMap;
-import org.apache.commons.lang.StringUtils;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.collections4.map.LRUMap;
 import org.apache.commons.lang.UnhandledException;
 import org.apache.commons.lang.math.IntRange;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.oro.text.perl.Perl5Util;
 
 import java.io.File;
@@ -36,33 +39,35 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.stream.Collectors;
 
+@Log4j2
 public class DocumentMapper implements DocumentGetter {
 
     private static final String SQL_GET_ALL_SECTIONS = "SELECT section_id, section_name FROM sections";
     private static final String SQL_GET_DOCUMENT_ID_FROM_PROPERTIES = "SELECT meta_id FROM document_properties WHERE key_name=? AND value=?";
 
     private final static String COPY_HEADLINE_SUFFIX_TEMPLATE = "copy_prefix.html";
-
+    private static final SectionNameComparator SECTION_NAME_COMPARATOR = new SectionNameComparator();
     private Database database;
     private DocumentPermissionSetMapper documentPermissionSetMapper;
     private DocumentIndex documentIndex;
-    private Map documentCache ;
+    private Map<String, String[]> aliasCache;
+    private Map<Integer, DocumentDomainObject> documentCache;
     private Clock clock = new SystemClock();
     private ImcmsServices imcmsServices;
-    private DocumentGetter documentGetter ;
-    private DocumentSaver documentSaver ;
+    private CachingDocumentGetter documentGetter;
+    private DocumentSaver documentSaver;
     private CategoryMapper categoryMapper;
-
     private LazilyLoadedObject sections;
-    private static final SectionNameComparator SECTION_NAME_COMPARATOR = new SectionNameComparator();
 
     public DocumentMapper(ImcmsServices services, Database database) {
         this.imcmsServices = services;
         this.database = database;
         Config config = services.getConfig();
         int documentCacheMaxSize = config.getDocumentCacheMaxSize();
-        documentCache = Collections.synchronizedMap(new LRUMap(documentCacheMaxSize)) ;
+        documentCache = Collections.synchronizedMap(new LRUMap<>(documentCacheMaxSize));
+        aliasCache = Collections.synchronizedMap(new LRUMap<>(documentCacheMaxSize));
         setDocumentGetter(new FragmentingDocumentGetter(new DatabaseDocumentGetter(database, services)));
         this.documentPermissionSetMapper = new DocumentPermissionSetMapper(database);
         this.categoryMapper = new CategoryMapper(database);
@@ -70,29 +75,45 @@ public DocumentMapper(ImcmsServices services, Database database) {
         initSections();
     }
 
-    public void initSections() {
-        sections = new LazilyLoadedObject(new SectionsSetLoader());
+    static void deleteFileDocumentFilesAccordingToFileFilter(FileFilter fileFilter) {
+        File filePath = Imcms.getServices().getConfig().getFilePath();
+        File[] filesToDelete = filePath.listFiles(fileFilter);
+        if (filesToDelete == null) {
+            return;
+        }
+
+        for (File aFilesToDelete : filesToDelete) {
+            aFilesToDelete.delete();
+        }
     }
 
-    public void setDocumentGetter(DocumentGetter documentGetter) {
-        this.documentGetter = new CachingDocumentGetter(documentGetter, documentCache);
+    static void deleteAllFileDocumentFiles(FileDocumentDomainObject fileDocument) {
+        deleteFileDocumentFilesAccordingToFileFilter(new FileDocumentFileFilter(fileDocument));
+    }
+
+    static void deleteOtherFileDocumentFiles(final FileDocumentDomainObject fileDocument) {
+        deleteFileDocumentFilesAccordingToFileFilter(new SuperfluousFileDocumentFilesFileFilter(fileDocument));
+    }
+
+    public void initSections() {
+        sections = new LazilyLoadedObject(new SectionsSetLoader());
     }
 
     public DocumentSaver getDocumentSaver() {
-        return documentSaver ;
+        return documentSaver;
     }
 
     public DocumentDomainObject createDocumentOfTypeFromParent(int documentTypeId, final DocumentDomainObject parent, UserDomainObject user) {
         DocumentDomainObject newDocument;
         try {
-            if ( DocumentTypeDomainObject.TEXT_ID == documentTypeId) {
+            if (DocumentTypeDomainObject.TEXT_ID == documentTypeId) {
                 newDocument = (DocumentDomainObject) parent.clone();
                 TextDocumentDomainObject newTextDocument = (TextDocumentDomainObject) newDocument;
                 newTextDocument.removeAllTexts();
                 newTextDocument.removeAllImages();
                 newTextDocument.removeAllIncludes();
                 newTextDocument.removeAllMenus();
-                setTemplateForNewTextDocument( newTextDocument, user, parent );
+                setTemplateForNewTextDocument(newTextDocument, user, parent);
             } else {
                 newDocument = DocumentDomainObject.fromDocumentTypeId(documentTypeId);
                 newDocument.setAttributes((DocumentDomainObject.Attributes) parent.getAttributes().clone());
@@ -100,34 +121,34 @@ public DocumentDomainObject createDocumentOfTypeFromParent(int documentTypeId, f
         } catch (CloneNotSupportedException e) {
             throw new UnhandledException(e);
         }
-        newDocument.setId( 0 );
-        newDocument.setHeadline( "" );
-        newDocument.setMenuText( "" );
-        newDocument.setMenuImage( "" );
+        newDocument.setId(0);
+        newDocument.setHeadline("");
+        newDocument.setMenuText("");
+        newDocument.setMenuImage("");
         newDocument.setProperties(new HashMap());
-        makeDocumentLookNew( newDocument, user );
-        removeNonInheritedCategories(newDocument) ;
+        makeDocumentLookNew(newDocument, user);
+        removeNonInheritedCategories(newDocument);
         return newDocument;
     }
 
-    void setTemplateForNewTextDocument( TextDocumentDomainObject newTextDocument, UserDomainObject user,
-                                        final DocumentDomainObject parent ) {
-        DocumentPermissionSetTypeDomainObject documentPermissionSetType = user.getDocumentPermissionSetTypeFor( parent );
+    void setTemplateForNewTextDocument(TextDocumentDomainObject newTextDocument, UserDomainObject user,
+                                       final DocumentDomainObject parent) {
+        DocumentPermissionSetTypeDomainObject documentPermissionSetType = user.getDocumentPermissionSetTypeFor(parent);
         String templateName = null;
-        if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(documentPermissionSetType) ) {
+        if (DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(documentPermissionSetType)) {
             templateName = newTextDocument.getDefaultTemplateNameForRestricted1();
-        } else if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(documentPermissionSetType) ) {
+        } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(documentPermissionSetType)) {
             templateName = newTextDocument.getDefaultTemplateNameForRestricted2();
         }
-        if ( null == templateName && parent instanceof TextDocumentDomainObject ) {
-            templateName = ( (TextDocumentDomainObject)parent ).getDefaultTemplateName();
+        if (null == templateName && parent instanceof TextDocumentDomainObject) {
+            templateName = ((TextDocumentDomainObject) parent).getDefaultTemplateName();
         }
-        if ( null != templateName ) {
-            newTextDocument.setTemplateName( templateName );
+        if (null != templateName) {
+            newTextDocument.setTemplateName(templateName);
         }
     }
 
-    void makeDocumentLookNew( DocumentDomainObject document, UserDomainObject user ) {
+    void makeDocumentLookNew(DocumentDomainObject document, UserDomainObject user) {
         Date now = new Date();
         document.setCreator(user);
         setCreatedAndModifiedDatetimes(document, now);
@@ -137,23 +158,6 @@ void makeDocumentLookNew( DocumentDomainObject document, UserDomainObject user )
         document.setPublicationStatus(Document.PublicationStatus.NEW);
     }
 
-    public SectionDomainObject[] getAllSections() {
-        String[] parameters = new String[0];
-        String[][] sqlRows = (String[][]) getDatabase().execute(new SqlQueryCommand(SQL_GET_ALL_SECTIONS, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
-        SectionDomainObject[] allSections = new SectionDomainObject[sqlRows.length];
-        for (int i = 0; i < sqlRows.length; i++) {
-            int sectionId = Integer.parseInt(sqlRows[i][0]);
-            String sectionName = sqlRows[i][1];
-            allSections[i] = new SectionDomainObject(sectionId, sectionName);
-        }
-        Arrays.sort(allSections, SECTION_NAME_COMPARATOR);
-        return allSections;
-    }
-
-    public DocumentDomainObject getDocument(int documentId) {
-        return getDocument(new Integer(documentId)) ;
-    }
-
     public DocumentReference getDocumentReference(DocumentDomainObject document) {
         return getDocumentReference(document.getId());
     }
@@ -164,12 +168,12 @@ public DocumentReference getDocumentReference(int childId) {
 
     public SectionDomainObject getSectionById(int sectionId) {
         SectionsSet sectionsSet = (SectionsSet) sections.get();
-        return sectionsSet.getSectionById(sectionId) ;
+        return sectionsSet.getSectionById(sectionId);
     }
 
     public SectionDomainObject getSectionByName(String name) {
         SectionsSet sectionsSet = (SectionsSet) sections.get();
-        return sectionsSet.getSectionByName(name) ;
+        return sectionsSet.getSectionByName(name);
     }
 
     public void saveNewDocument(DocumentDomainObject document, UserDomainObject user, boolean copying)
@@ -180,8 +184,7 @@ public void saveNewDocument(DocumentDomainObject document, UserDomainObject user
     }
 
     public void saveDocument(DocumentDomainObject document,
-                             final UserDomainObject user) throws DocumentSaveException , NoPermissionToAddDocumentToMenuException, NoPermissionToEditDocumentException
-    {
+                             final UserDomainObject user) throws DocumentSaveException, NoPermissionToAddDocumentToMenuException, NoPermissionToEditDocumentException {
 
         DocumentDomainObject oldDocument = getDocument(document.getId());
 
@@ -191,50 +194,60 @@ public void saveDocument(DocumentDomainObject document,
 
     public void invalidateDocument(DocumentDomainObject document) {
         documentIndex.indexDocument(document);
-        documentCache.remove(new Integer(document.getId()));
+        documentCache.remove(document.getId());
+        if (StringUtils.isNotBlank(document.getAlias())) {
+            aliasCache.remove(document.getAlias());
+        }
     }
 
     public DocumentIndex getDocumentIndex() {
         return documentIndex;
     }
 
+    public void setDocumentIndex(DocumentIndex documentIndex) {
+        this.documentIndex = documentIndex;
+    }
+
+    public SectionDomainObject[] getAllSections() {
+        String[] parameters = new String[0];
+        String[][] sqlRows = getDatabase().execute(new SqlQueryCommand<>(SQL_GET_ALL_SECTIONS, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        SectionDomainObject[] allSections = new SectionDomainObject[sqlRows.length];
+        for (int i = 0; i < sqlRows.length; i++) {
+            int sectionId = Integer.parseInt(sqlRows[i][0]);
+            String sectionName = sqlRows[i][1];
+            allSections[i] = new SectionDomainObject(sectionId, sectionName);
+        }
+        Arrays.sort(allSections, SECTION_NAME_COMPARATOR);
+        return allSections;
+    }
+
     public String[][] getParentDocumentAndMenuIdsForDocument(DocumentDomainObject document) {
         String sqlStr = "SELECT meta_id,menu_index FROM childs, menus WHERE menus.menu_id = childs.menu_id AND to_meta_id = ?";
         String[] parameters = new String[]{"" + document.getId()};
-        return (String[][]) getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        return getDatabase().execute(new SqlQueryCommand<>(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
     }
 
     public String[][] getAllMimeTypesWithDescriptions(UserDomainObject user) {
         String sqlStr = "SELECT mime, mime_name FROM mime_types WHERE lang_prefix = ? AND mime_id > 0 ORDER BY mime_id";
         String[] parameters = new String[]{user.getLanguageIso639_2()};
-        return (String[][]) getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        return getDatabase().execute(new SqlQueryCommand<>(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
     }
 
     public String[] getAllMimeTypes() {
         String sqlStr = "SELECT mime FROM mime_types WHERE mime_id > 0 ORDER BY mime_id";
         String[] params = new String[]{};
-        return (String[]) getDatabase().execute(new SqlQueryCommand(sqlStr, params, Utility.STRING_ARRAY_HANDLER));
+        return getDatabase().execute(new SqlQueryCommand<>(sqlStr, params, Utility.STRING_ARRAY_HANDLER));
     }
 
     public BrowserDocumentDomainObject.Browser[] getAllBrowsers() {
         String sqlStr = "SELECT browser_id, name, value FROM browsers WHERE browser_id != 0";
         String[] parameters = new String[0];
-        String[][] sqlResult = (String[][]) getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
-        List browsers = new ArrayList();
-        for (int i = 0; i < sqlResult.length; i++) {
-            browsers.add(createBrowserFromSqlRow(sqlResult[i]));
+        String[][] sqlResult = getDatabase().execute(new SqlQueryCommand<>(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        List<BrowserDocumentDomainObject.Browser> browsers = new ArrayList<>();
+        for (String[] aSqlResult : sqlResult) {
+            browsers.add(createBrowserFromSqlRow(aSqlResult));
         }
-        return (BrowserDocumentDomainObject.Browser[]) browsers.toArray(new BrowserDocumentDomainObject.Browser[browsers.size()]);
-    }
-
-    public BrowserDocumentDomainObject.Browser getBrowserById(int browserIdToGet) {
-        if (browserIdToGet == BrowserDocumentDomainObject.Browser.DEFAULT.getId()) {
-            return BrowserDocumentDomainObject.Browser.DEFAULT;
-        }
-        String sqlStr = "SELECT browser_id, name, value FROM browsers WHERE browser_id = ?";
-        String[] params = new String[]{"" + browserIdToGet};
-        String[] sqlRow = (String[]) getDatabase().execute(new SqlQueryCommand(sqlStr, params, Utility.STRING_ARRAY_HANDLER));
-        return createBrowserFromSqlRow(sqlRow);
+        return browsers.toArray(new BrowserDocumentDomainObject.Browser[browsers.size()]);
     }
 
     protected BrowserDocumentDomainObject.Browser createBrowserFromSqlRow(String[] sqlRow) {
@@ -249,52 +262,72 @@ public void deleteDocument(final DocumentDomainObject document, UserDomainObject
         getDatabase().execute(deleteDocumentCommand);
         document.accept(new DocumentDeletingVisitor());
         documentIndex.removeDocument(document);
-        documentCache.remove(new Integer(document.getId()));
+        documentCache.remove(document.getId());
+        if (StringUtils.isNotBlank(document.getAlias())) {
+            aliasCache.remove(document.getAlias());
+        }
+    }
+
+    public BrowserDocumentDomainObject.Browser getBrowserById(int browserIdToGet) {
+        if (browserIdToGet == BrowserDocumentDomainObject.Browser.DEFAULT.getId()) {
+            return BrowserDocumentDomainObject.Browser.DEFAULT;
+        }
+        String sqlStr = "SELECT browser_id, name, value FROM browsers WHERE browser_id = ?";
+        String[] params = new String[]{"" + browserIdToGet};
+        String[] sqlRow = getDatabase().execute(new SqlQueryCommand<>(sqlStr, params, Utility.STRING_ARRAY_HANDLER));
+        return createBrowserFromSqlRow(sqlRow);
     }
 
     private DatabaseCommand createDeleteDocumentCommand(final DocumentDomainObject document) {
+        if (document instanceof TextDocumentDomainObject) {
+            TextDocumentDomainObject textDoc = (TextDocumentDomainObject) document;
+
+            for (int imageIndex : textDoc.getImages().keySet()) {
+                ImageCacheManager.clearCacheEntries(textDoc.getId(), imageIndex);
+            }
+        }
+
         final String metaIdStr = "" + document.getId();
         final String metaIdColumn = "meta_id";
         return new CompositeDatabaseCommand(new DatabaseCommand[]{
-            new DeleteWhereColumnsEqualDatabaseCommand("document_categories", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("meta_classification", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("childs", "to_meta_id", metaIdStr),
-            new SqlUpdateDatabaseCommand("DELETE FROM childs WHERE menu_id IN (SELECT menu_id FROM menus WHERE meta_id = ?)", new String[]{metaIdStr}),
-            new DeleteWhereColumnsEqualDatabaseCommand("menus", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("text_docs", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("texts", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("images", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("roles_rights", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("user_rights", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("url_docs", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("browser_docs", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("fileupload_docs", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("frameset_docs", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("new_doc_permission_sets_ex", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("new_doc_permission_sets", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("doc_permission_sets_ex", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("doc_permission_sets", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("includes", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("includes", "included_meta_id", metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("texts_history", metaIdColumn, metaIdStr ),
-            new DeleteWhereColumnsEqualDatabaseCommand("images_history", metaIdColumn, metaIdStr ),
-            new DeleteWhereColumnsEqualDatabaseCommand("childs_history", "to_meta_id", metaIdStr ),
-            new SqlUpdateDatabaseCommand("DELETE FROM childs_history WHERE menu_id IN (SELECT menu_id FROM menus_history WHERE meta_id = ?)", new String[] {metaIdStr} ),
-            new DeleteWhereColumnsEqualDatabaseCommand("menus_history", metaIdColumn, metaIdStr ),
-            new DeleteWhereColumnsEqualDatabaseCommand("document_properties", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("meta_section", metaIdColumn, metaIdStr),
-            new DeleteWhereColumnsEqualDatabaseCommand("meta", metaIdColumn, metaIdStr)
+                new DeleteWhereColumnsEqualDatabaseCommand("document_categories", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("meta_classification", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("childs", "to_meta_id", metaIdStr),
+                new SqlUpdateCommand("DELETE FROM childs WHERE menu_id IN (SELECT menu_id FROM menus WHERE meta_id = ?)", new String[]{metaIdStr}),
+                new DeleteWhereColumnsEqualDatabaseCommand("menus", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("text_docs", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("texts", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("images", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("roles_rights", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("user_rights", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("url_docs", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("browser_docs", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("fileupload_docs", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("frameset_docs", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("new_doc_permission_sets_ex", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("new_doc_permission_sets", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("doc_permission_sets_ex", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("doc_permission_sets", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("includes", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("includes", "included_meta_id", metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("texts_history", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("images_history", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("childs_history", "to_meta_id", metaIdStr),
+                new SqlUpdateCommand("DELETE FROM childs_history WHERE menu_id IN (SELECT menu_id FROM menus_history WHERE meta_id = ?)", new String[]{metaIdStr}),
+                new DeleteWhereColumnsEqualDatabaseCommand("menus_history", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("document_properties", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("meta_section", metaIdColumn, metaIdStr),
+                new DeleteWhereColumnsEqualDatabaseCommand("meta", metaIdColumn, metaIdStr)
         });
     }
 
     public Map getAllDocumentTypeIdsAndNamesInUsersLanguage(UserDomainObject user) {
         String[] parameters = new String[]{
-            user.getLanguageIso639_2()
+                user.getLanguageIso639_2()
         };
-        String[][] rows = (String[][]) getDatabase().execute(new SqlQueryCommand("SELECT doc_type, type FROM doc_types WHERE lang_prefix = ? ORDER BY doc_type", parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
-        Map allDocumentTypeIdsAndNamesInUsersLanguage = new TreeMap();
-        for (int i = 0; i < rows.length; i++) {
-            String[] row = rows[i];
+        String[][] rows = getDatabase().execute(new SqlQueryCommand<>("SELECT doc_type, type FROM doc_types WHERE lang_prefix = ? ORDER BY doc_type", parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        Map<Integer, String> allDocumentTypeIdsAndNamesInUsersLanguage = new TreeMap<>();
+        for (String[] row : rows) {
             Integer documentTypeId = Integer.valueOf(row[0]);
             String documentTypeNameInUsersLanguage = row[1];
             allDocumentTypeIdsAndNamesInUsersLanguage.put(documentTypeId, documentTypeNameInUsersLanguage);
@@ -302,10 +335,30 @@ public Map getAllDocumentTypeIdsAndNamesInUsersLanguage(UserDomainObject user) {
         return allDocumentTypeIdsAndNamesInUsersLanguage;
     }
 
+    public Iterator getDocumentsIterator(final IntRange range) {
+        return getDocumentsIteratorInRange(range);
+    }
+
+    public Iterator getDocumentsIteratorInRange(final IntRange idRange) {
+        return new DocumentsIterator(getDocumentIdsInRange(idRange));
+    }
+
+    public Iterator getDocumentsIteratorByTypeInRange(final IntRange idRange, final DocumentTypeDomainObject type) {
+        return new DocumentsIterator(getDocumentIdsByTypeInRange(idRange, type));
+    }
+
+    public Iterator getDocumentsIteratorIn(final Integer[] documentIds){
+        return new DocumentsIterator(getDocumentIdsIn(documentIds));
+    }
+
+    public Iterator getDocumentsIteratorByTypeIn(final Integer[] documentIds, final DocumentTypeDomainObject type){
+        return new DocumentsIterator(getDocumentIdsByTypeIn(documentIds, type));
+    }
+
     public TextDocumentMenuIndexPair[] getDocumentMenuPairsContainingDocument(DocumentDomainObject document) {
         String sqlSelectMenus = "SELECT meta_id, menu_index FROM menus, childs WHERE menus.menu_id = childs.menu_id AND childs.to_meta_id = ? ORDER BY meta_id, menu_index";
         String[] parameters = new String[]{"" + document.getId()};
-        String[][] sqlRows = (String[][]) getDatabase().execute(new SqlQueryCommand(sqlSelectMenus, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        String[][] sqlRows = getDatabase().execute(new SqlQueryCommand<>(sqlSelectMenus, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
         TextDocumentMenuIndexPair[] documentMenuPairs = new TextDocumentMenuIndexPair[sqlRows.length];
         for (int i = 0; i < sqlRows.length; i++) {
             String[] sqlRow = sqlRows[i];
@@ -317,17 +370,46 @@ public TextDocumentMenuIndexPair[] getDocumentMenuPairsContainingDocument(Docume
         return documentMenuPairs;
     }
 
-    public Iterator getDocumentsIterator(final IntRange idRange) {
-        return new DocumentsIterator(getDocumentIds(idRange));
+    private int[] getDocumentIdsInRange(IntRange idRange) {
+        String sqlSelectIds = "SELECT meta_id FROM meta WHERE meta_id >= ? AND meta_id <= ? ORDER BY meta_id";
+        String[] params = new String[]{
+                "" + idRange.getMinimumInteger(),
+                "" + idRange.getMaximumInteger()
+        };
+
+        return getDocumentIds(sqlSelectIds, params);
     }
 
-    private int[] getDocumentIds(IntRange idRange) {
-        String sqlSelectIds = "SELECT meta_id FROM meta WHERE meta_id >= ? AND meta_id <= ? ORDER BY meta_id";
+    private int[] getDocumentIdsByTypeInRange(IntRange idRange, DocumentTypeDomainObject type) {
+        String sqlSelectIds = "SELECT meta_id FROM meta WHERE meta_id >= ? AND meta_id <= ? AND doc_type = ? ORDER BY meta_id";
         String[] params = new String[]{
-            "" + idRange.getMinimumInteger(),
-            "" + idRange.getMaximumInteger()
+                String.valueOf(idRange.getMinimumInteger()),
+                String.valueOf(idRange.getMaximumInteger()),
+                String.valueOf(type.getId())
         };
-        String[] documentIdStrings = (String[]) getDatabase().execute(new SqlQueryCommand(sqlSelectIds, params, Utility.STRING_ARRAY_HANDLER));
+
+        return getDocumentIds(sqlSelectIds, params);
+    }
+
+    private int[] getDocumentIdsIn(Integer[] ids){
+        String[] placeholders = new String[ids.length];
+        Arrays.fill(placeholders, "?");
+        String sqlSelectIds = "SELECT meta_id FROM meta WHERE meta_id in (" + String.join(", ", placeholders) + ") ORDER BY meta_id";
+
+        return getDocumentIds(sqlSelectIds, ids);
+    }
+
+    private int[] getDocumentIdsByTypeIn(Integer[] ids, DocumentTypeDomainObject type){
+        String[] placeholders = new String[ids.length];
+        Arrays.fill(placeholders, "?");
+        String sqlSelectIds = "SELECT meta_id FROM meta WHERE meta_id in (" + String.join(", ", placeholders) + ") AND doc_type = ? ORDER BY meta_id";
+        Integer[] params = ArrayUtils.add(ids, type.getId());
+
+        return getDocumentIds(sqlSelectIds, params);
+    }
+
+    private int[] getDocumentIds(String sqlSelectIds, Object[] params) {
+        String[] documentIdStrings = getDatabase().execute(new SqlQueryCommand<>(sqlSelectIds, params, Utility.STRING_ARRAY_HANDLER));
         int[] documentIds = new int[documentIdStrings.length];
         for (int i = 0; i < documentIdStrings.length; i++) {
             documentIds[i] = Integer.parseInt(documentIdStrings[i]);
@@ -337,7 +419,17 @@ private int[] getDocumentIds(IntRange idRange) {
 
     public int[] getAllDocumentIds() {
         String[] params = new String[0];
-        String[] documentIdStrings = (String[]) getDatabase().execute(new SqlQueryCommand("SELECT meta_id FROM meta ORDER BY meta_id", params, Utility.STRING_ARRAY_HANDLER));
+        String[] documentIdStrings = getDatabase().execute(new SqlQueryCommand<>("SELECT meta_id FROM meta ORDER BY meta_id", params, Utility.STRING_ARRAY_HANDLER));
+        int[] documentIds = new int[documentIdStrings.length];
+        for (int i = 0; i < documentIdStrings.length; i++) {
+            documentIds[i] = Integer.parseInt(documentIdStrings[i]);
+        }
+        return documentIds;
+    }
+
+    public int[] getAllDocumentIdsForIndexing() {
+        String[] params = new String[0];
+        String[] documentIdStrings = getDatabase().execute(new SqlQueryCommand<>("SELECT meta_id FROM meta ORDER BY doc_type ASC, date_modified DESC", params, Utility.STRING_ARRAY_HANDLER));
         int[] documentIds = new int[documentIdStrings.length];
         for (int i = 0; i < documentIdStrings.length; i++) {
             documentIds[i] = Integer.parseInt(documentIdStrings[i]);
@@ -345,11 +437,21 @@ public int[] getAllDocumentIds() {
         return documentIds;
     }
 
+    public Set<Integer> getDocumentIdsForIndexing() {
+        final String getDocIdsSQL = "SELECT meta_id FROM meta ORDER BY doc_type ASC, date_modified DESC";
+
+        final SqlQueryCommand<List<Integer>> databaseCommand = new SqlQueryCommand<>(
+                getDocIdsSQL, new String[0], Utility.INTEGER_LIST_HANDLER
+        );
+
+        return new HashSet<>(getDatabase().execute(databaseCommand));
+    }
+
     public Set<String> getAllDocumentAlias() {
-        Set<String> allDocumentAlias = new HashSet<String>();
-        String[] allAlias = (String[]) getDatabase().execute(new SqlQueryCommand("SELECT value FROM document_properties where key_name = ? ORDER BY value", new String[] { DocumentDomainObject.DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_ALIAS}, Utility.STRING_ARRAY_HANDLER));
-        for (int i = 0; i < allAlias.length; i ++) {
-            allDocumentAlias.add(allAlias[i].toLowerCase()) ;
+        Set<String> allDocumentAlias = new HashSet<>();
+        String[] allAlias = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM document_properties where key_name = ? ORDER BY value", new String[]{DocumentDomainObject.DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_ALIAS}, Utility.STRING_ARRAY_HANDLER));
+        for (String allAlia : allAlias) {
+            allDocumentAlias.add(allAlia.toLowerCase());
         }
         return allDocumentAlias;
     }
@@ -358,15 +460,20 @@ public DocumentDomainObject getDocument(String documentIdString) {
         DocumentDomainObject document = null;
 
         if (null != documentIdString) {
-            if ( NumberUtils.isDigits( documentIdString ) ) {
+            if (NumberUtils.isDigits(documentIdString)) {
                 document = getDocument(new Integer(documentIdString));
-            }else{
-                String[] documentIds = (String[]) getDatabase().execute(
-                        new SqlQueryCommand(SQL_GET_DOCUMENT_ID_FROM_PROPERTIES,
-                                new String[] { DocumentDomainObject.DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_ALIAS, documentIdString.toLowerCase() },
-                                Utility.STRING_ARRAY_HANDLER));
+            } else {
+                String documentIdStringLower = documentIdString.toLowerCase();
+                String[] documentIds = aliasCache.get(documentIdStringLower);
+                if (documentIds == null || documentIds.length == 0) {
+                    documentIds = getDatabase().execute(
+                            new SqlQueryCommand<>(SQL_GET_DOCUMENT_ID_FROM_PROPERTIES,
+                                    new String[]{DocumentDomainObject.DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_ALIAS, documentIdStringLower},
+                                    Utility.STRING_ARRAY_HANDLER));
+                    aliasCache.put(documentIdStringLower, documentIds);
+                }
 
-                if(documentIds.length > 0 && NumberUtils.isDigits(documentIds[0])) {
+                if (documentIds.length > 0 && NumberUtils.isDigits(documentIds[0])) {
                     document = getDocument(new Integer(documentIds[0]));
                 }
             }
@@ -374,34 +481,22 @@ public DocumentDomainObject getDocument(String documentIdString) {
         return document;
     }
 
-    static void deleteFileDocumentFilesAccordingToFileFilter(FileFilter fileFilter) {
-        File filePath = Imcms.getServices().getConfig().getFilePath();
-        File[] filesToDelete = filePath.listFiles(fileFilter);
-        for (int i = 0; i < filesToDelete.length; i++) {
-            filesToDelete[i].delete();
-        }
-    }
-
-    static void deleteAllFileDocumentFiles(FileDocumentDomainObject fileDocument) {
-        deleteFileDocumentFilesAccordingToFileFilter(new FileDocumentFileFilter(fileDocument));
-    }
-
     public DocumentPermissionSetMapper getDocumentPermissionSetMapper() {
         return documentPermissionSetMapper;
     }
 
-    static void deleteOtherFileDocumentFiles(final FileDocumentDomainObject fileDocument) {
-        deleteFileDocumentFilesAccordingToFileFilter(new SuperfluousFileDocumentFilesFileFilter(fileDocument));
+    public void setDocumentPermissionSetMapper(DocumentPermissionSetMapper documentPermissionSetMapper) {
+        this.documentPermissionSetMapper = documentPermissionSetMapper;
     }
 
     public int getLowestDocumentId() {
         String[] params = new String[0];
-        return Integer.parseInt((String) getDatabase().execute(new SqlQueryCommand("SELECT MIN(meta_id) FROM meta", params, Utility.SINGLE_STRING_HANDLER)));
+        return Integer.parseInt(getDatabase().execute(new SqlQueryCommand<>("SELECT MIN(meta_id) FROM meta", params, Utility.SINGLE_STRING_HANDLER)));
     }
 
     public int getHighestDocumentId() {
         String[] params = new String[0];
-        return Integer.parseInt((String) getDatabase().execute(new SqlQueryCommand("SELECT MAX(meta_id) FROM meta", params, Utility.SINGLE_STRING_HANDLER)));
+        return Integer.parseInt(getDatabase().execute(new SqlQueryCommand<>("SELECT MAX(meta_id) FROM meta", params, Utility.SINGLE_STRING_HANDLER)));
     }
 
     public void copyDocument(DocumentDomainObject document,
@@ -416,7 +511,7 @@ public void copyDocument(DocumentDomainObject document,
     public List getDocumentsWithPermissionsForRole(RoleDomainObject role) {
         String sqlStr = "SELECT meta_id FROM roles_rights WHERE role_id = ? ORDER BY meta_id";
         final Object[] parameters = new String[]{"" + role.getId()};
-        String[] documentIdStrings = (String[]) getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_HANDLER));
+        String[] documentIdStrings = getDatabase().execute(new SqlQueryCommand<>(sqlStr, parameters, Utility.STRING_ARRAY_HANDLER));
         final int[] documentIds = Utility.convertStringArrayToIntArray(documentIdStrings);
         return new AbstractList() {
             public Object get(int index) {
@@ -429,8 +524,43 @@ public int size() {
         };
     }
 
+	public void markDocumentAsExported(int docId, final UserDomainObject user){
+		log.info("Marking document as exported");
+		final DocumentDomainObject document = getDocument(docId);
+
+		try {
+			document.setExported(true);
+			saveDocument(document, user);
+
+			log.info(String.format("Document marked as exported, id: %d", docId));
+		} catch (DocumentSaveException e) {
+			log.error(String.format("Failed to save document, id: %d", docId));
+		}
+	}
+
+	public void updateExportStatus(int docId, boolean exported, final UserDomainObject user){
+		log.info("Changing document export status!");
+
+		final DocumentDomainObject document = getDocument(docId);
+		final Integer id = document.getId();
+		final String type = document.getDocumentType().getName().toLocalizedString("eng");
+
+		try {
+			document.setExportAllowed(exported);
+			saveDocument(document, user);
+
+			log.info(String.format("Document 'id = %s', 'type = %s' changed export status to = %s", id, type, document.isExportAllowed()));
+		} catch (DocumentSaveException e) {
+			log.error(String.format("Cannot save document with id = %s, type = %s", id, type), e);
+		}
+	}
+
     public DocumentDomainObject getDocument(Integer documentId) {
-        return documentGetter.getDocument(documentId);
+        return getDocument(documentId, false);
+    }
+
+    public DocumentDomainObject getDocument(Integer documentId, boolean renewCache) {
+        return documentGetter.getDocument(documentId, renewCache);
     }
 
     public CategoryMapper getCategoryMapper() {
@@ -445,6 +575,10 @@ public Clock getClock() {
         return clock;
     }
 
+    public void setClock(Clock clock) {
+        this.clock = clock;
+    }
+
     public ImcmsServices getImcmsServices() {
         return imcmsServices;
     }
@@ -456,49 +590,107 @@ void setCreatedAndModifiedDatetimes(DocumentDomainObject document, Date now) {
     }
 
     String[] getAllKeywords() {
-        String[] params = new String[0];
-        return (String[]) getDatabase().execute(new SqlQueryCommand("SELECT code FROM classification", params, Utility.STRING_ARRAY_HANDLER));
+        return getAllKeywords(getDatabase());
     }
 
-    public void setClock(Clock clock) {
-        this.clock = clock;
-    }
-
-    public void setDocumentPermissionSetMapper(DocumentPermissionSetMapper documentPermissionSetMapper) {
-        this.documentPermissionSetMapper = documentPermissionSetMapper;
+    String[] getAllKeywords(Database database) {
+        String[] params = new String[0];
+        return database.execute(new SqlQueryCommand<>("SELECT code FROM classification", params, Utility.STRING_ARRAY_HANDLER));
     }
 
-    public void setDocumentIndex(DocumentIndex documentIndex) {
-        this.documentIndex = documentIndex;
+    public List<DocumentDomainObject> getDocuments(Collection documentIds) {
+        return documentGetter.getDocuments(documentIds);
     }
 
-    public List getDocuments(Collection documentIds) {
-        return documentGetter.getDocuments(documentIds) ;
-    }
+	public List<DocumentDomainObject> getDocuments(IntRange idRange){
+		return documentGetter.getDocuments(Arrays.stream(getDocumentIdsInRange(idRange)).boxed().collect(Collectors.toList()));
+	}
 
-    public Set getSections(Collection sectionIds) {
-        Set sections = new HashSet() ;
-        for ( Iterator iterator = sectionIds.iterator(); iterator.hasNext(); ) {
-            Integer sectionId = (Integer) iterator.next();
-            sections.add(getSectionById(sectionId.intValue())) ;
+    public Set<SectionDomainObject> getSections(Collection<Integer> sectionIds) {
+        Set<SectionDomainObject> sections = new HashSet<>();
+        for (Integer sectionId : sectionIds) {
+            sections.add(getSectionById(sectionId));
         }
-        return sections ;
+        return sections;
     }
 
     public DocumentGetter getDocumentGetter() {
         return documentGetter;
     }
 
+    public void setDocumentGetter(DocumentGetter documentGetter) {
+        this.documentGetter = new CachingDocumentGetter(documentGetter, documentCache);
+    }
+
     private void removeNonInheritedCategories(DocumentDomainObject document) {
-        Set categories = getCategoryMapper().getCategories(document.getCategoryIds());
-        for ( Iterator iterator = categories.iterator(); iterator.hasNext(); ) {
-            CategoryDomainObject category = (CategoryDomainObject)iterator.next();
+        Set<CategoryDomainObject> categories = getCategoryMapper().getCategories(document.getCategoryIds());
+        for (CategoryDomainObject category : categories) {
             if (!category.getType().isInherited()) {
                 document.removeCategoryId(category.getId());
             }
         }
     }
 
+    /**
+     * Removes all image cache entries.
+     */
+    public void clearImageCache() {
+        ImageCacheManager.clearAllCacheEntries();
+    }
+
+    /**
+     * Removes all image cache entries that have been created for a document that is identified
+     * with {@code metaId}.
+     * <p>
+     * If a document contains 3 image fields (1, 2, 3), then the cache entries for these 3 images will be removed.
+     *
+     * @param metaId the ID of a text document
+     */
+    public void clearImageCache(int metaId) {
+        ImageCacheManager.clearCacheEntries(metaId);
+    }
+
+    /**
+     * Removes a specific image cache entry that is identified with a document ID ({@code metaId}) and an image field
+     * number ({@code no}).
+     *
+     * @param metaId the ID of a text document
+     * @param no     the ID of an image field
+     */
+    public void clearImageCache(int metaId, int no) {
+        ImageCacheManager.clearCacheEntries(metaId, no);
+    }
+
+    /**
+     * Removes a specific image cache entry that is identified with a document ID ({@code metaId}) and a
+     * file ID ({@code fileNo}).
+     *
+     * @param metaId the ID of a text document
+     * @param fileNo the file ID of a {@link FileDocumentDomainObject}
+     */
+    public void clearImageCache(int metaId, String fileNo) {
+        ImageCacheManager.clearCacheEntries(metaId, fileNo);
+    }
+
+    public boolean existsByAlias(String alias) {
+        final String script = "SELECT DISTINCT COUNT(*) FROM document_properties WHERE key_name = 'imcms.document.alias' AND LOWER(value) = LOWER(?)";
+
+        final int count = Integer.parseInt(getDatabase().execute(new SqlQueryCommand<>(script, new Object[]{StringUtils.defaultString(alias)}, Utility.SINGLE_STRING_HANDLER)));
+
+        return count != 0;
+    }
+
+    public String getUniqueAlias(String alias){
+        if (!existsByAlias(alias)) {
+            return alias;
+        }
+
+        int i = 1;
+        while (existsByAlias(alias + "-" + i++)) ;
+
+        return alias + "-" + (i - 1);
+    }
+
     public static class TextDocumentMenuIndexPair {
 
         private TextDocumentDomainObject document;
@@ -518,28 +710,9 @@ public int getMenuIndex() {
         }
     }
 
-    private class DocumentsIterator implements Iterator {
-
-        int[] documentIds;
-        int index;
-
-        DocumentsIterator(int[] documentIds) {
-            this.documentIds = (int[]) documentIds.clone();
-        }
-
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean hasNext() {
-            return index < documentIds.length;
-        }
-
-        public Object next() {
-            if (!hasNext()) {
-                throw new NoSuchElementException();
-            }
-            return getDocument(documentIds[index++]);
+    private static class SectionNameComparator implements Comparator<SectionDomainObject> {
+        public int compare(SectionDomainObject section1, SectionDomainObject section2) {
+            return section1.getName().compareToIgnoreCase(section2.getName());
         }
     }
 
@@ -584,65 +757,82 @@ public boolean accept(File file, int fileDocumentId, String fileId) {
             boolean correctFileForFileDocumentFile = file.equals(DocumentSavingVisitor.getFileForFileDocumentFile(fileDocumentId, fileId));
             boolean fileDocumentHasFile = null != fileDocument.getFile(fileId);
             return super.accept(file, fileDocumentId, fileId)
-                   && (!correctFileForFileDocumentFile || !fileDocumentHasFile);
-        }
-    }
-
-    private static class SectionNameComparator implements Comparator {
-
-        public int compare(Object o1, Object o2) {
-            SectionDomainObject section1 = (SectionDomainObject) o1;
-            SectionDomainObject section2 = (SectionDomainObject) o2;
-            return section1.getName().compareToIgnoreCase(section2.getName());
+                    && (!correctFileForFileDocumentFile || !fileDocumentHasFile);
         }
     }
 
-    private static class SectionsSet extends AbstractSet implements LazilyLoadedObject.Copyable {
+    private static class SectionsSet extends AbstractSet<SectionDomainObject> implements LazilyLoadedObject.Copyable {
 
-        private Map byId = new HashMap() ;
-        private Map byName = new HashMap() ;
+        private Map<Integer, SectionDomainObject> byId = new HashMap<>();
+        private Map<String, SectionDomainObject> byName = new HashMap<>();
 
-        public boolean add(Object o) {
-            SectionDomainObject section = (SectionDomainObject) o ;
-            byName.put(section.getName().toLowerCase(), section) ;
-            return null == byId.put(new Integer(section.getId()), section) ;
+        public boolean add(SectionDomainObject section) {
+            byName.put(section.getName().toLowerCase(), section);
+            return null == byId.put(section.getId(), section);
         }
 
         public int size() {
-            return byId.size() ;
+            return byId.size();
         }
 
-        public Iterator iterator() {
-            return byId.values().iterator() ;
+        public Iterator<SectionDomainObject> iterator() {
+            return byId.values().iterator();
         }
 
         public SectionDomainObject getSectionById(int sectionId) {
-            return (SectionDomainObject) byId.get(new Integer(sectionId)) ;
+            return byId.get(sectionId);
         }
 
         public SectionDomainObject getSectionByName(String name) {
-            return (SectionDomainObject) byName.get(name.toLowerCase()) ;
+            return byName.get(name.toLowerCase());
         }
 
         public LazilyLoadedObject.Copyable copy() {
-            return this ;
+            return this;
+        }
+    }
+
+    private class DocumentsIterator implements Iterator {
+
+        int[] documentIds;
+        int index;
+
+        DocumentsIterator(int[] documentIds) {
+            this.documentIds = documentIds.clone();
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+
+        public boolean hasNext() {
+            return index < documentIds.length;
+        }
+
+        public Object next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+            return getDocument(documentIds[index++]);
         }
     }
 
     private class SectionsSetLoader implements LazilyLoadedObject.Loader {
 
         public LazilyLoadedObject.Copyable load() {
-            return (SectionsSet) getDatabase().execute(new SqlQueryCommand("SELECT section_id, section_name FROM sections", null, new CollectionHandler(new SectionsSet(), new RowTransformer() {
-                public Object createObjectFromResultSetRow(ResultSet rs) throws SQLException {
+            final RowTransformer<SectionDomainObject> rowTransformer = new RowTransformer<SectionDomainObject>() {
+                public SectionDomainObject createObjectFromResultSetRow(ResultSet rs) throws SQLException {
                     int sectionId = rs.getInt(1);
                     String sectionName = rs.getString(2);
                     return new SectionDomainObject(sectionId, sectionName);
                 }
 
-                public Class getClassOfCreatedObjects() {
+                public Class<SectionDomainObject> getClassOfCreatedObjects() {
                     return SectionDomainObject.class;
                 }
-            }))) ;
+            };
+            final CollectionHandler<SectionDomainObject, SectionsSet> collectionHandler = new CollectionHandler<>(new SectionsSet(), rowTransformer);
+            return getDatabase().execute(new SqlQueryCommand<>("SELECT section_id, section_name FROM sections", null, collectionHandler));
         }
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentMenusMap.java b/server/src/com/imcode/imcms/mapping/DocumentMenusMap.java
index f5213571b3..2e143ff402 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentMenusMap.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentMenusMap.java
@@ -1,82 +1,23 @@
 package com.imcode.imcms.mapping;
 
-import imcode.util.LazilyLoadedObject;
-import imcode.util.ShouldNotBeThrownException;
 import imcode.server.document.textdocument.MenuDomainObject;
+import imcode.util.LazilyLoadedObject;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
 
-public class DocumentMenusMap extends AbstractMap implements LazilyLoadedObject.Copyable<DocumentMenusMap> {
-    private final HashMap menusMap = new HashMap();
+public class DocumentMenusMap extends HashMap<Integer, MenuDomainObject> implements LazilyLoadedObject.Copyable<DocumentMenusMap> {
 
     public DocumentMenusMap copy() {
-        DocumentMenusMap menusClone = new DocumentMenusMap() ;
-        for ( Iterator iterator = entrySet().iterator(); iterator.hasNext(); ) {
-            Entry entry = (Entry)iterator.next();
-            Integer menuIndex = (Integer)entry.getKey();
-            MenuDomainObject menu = (MenuDomainObject)entry.getValue();
-            try {
-                menusClone.put(menuIndex, menu.clone()) ;
-            } catch ( CloneNotSupportedException e ) {
-                throw new ShouldNotBeThrownException(e) ;
-            }
+        DocumentMenusMap menusClone = new DocumentMenusMap();
+        final Iterator<Entry<Integer, MenuDomainObject>> iterator;
+
+        for (iterator = entrySet().iterator(); iterator.hasNext(); ) {
+            final Entry<Integer, MenuDomainObject> entry = iterator.next();
+            Integer menuIndex = entry.getKey();
+            MenuDomainObject menu = entry.getValue();
+            menusClone.put(menuIndex, menu.clone());
         }
-        return menusClone ;
-    }
-
-    public void clear() {
-        menusMap.clear();
-    }
-
-    public boolean containsKey(Object key) {
-        return menusMap.containsKey(key);
-    }
-
-    public boolean containsValue(Object value) {
-        return menusMap.containsValue(value);
-    }
-
-    public Set entrySet() {
-        return menusMap.entrySet();
-    }
-
-    public Object get(Object key) {
-        return menusMap.get(key);
-    }
-
-    public boolean isEmpty() {
-        return menusMap.isEmpty();
-    }
-
-    public Set keySet() {
-        return menusMap.keySet();
-    }
-
-    public Object put(Object key, Object value) {
-        return menusMap.put(key, value);
-    }
-
-    public void putAll(Map m) {
-        menusMap.putAll(m);
-    }
-
-    public Object remove(Object key) {
-        return menusMap.remove(key);
-    }
-
-    public int size() {
-        return menusMap.size();
-    }
-
-    public Collection values() {
-        return menusMap.values();
-    }
-
-    public boolean equals(Object o) {
-        return super.equals(o);
-    }
-
-    public int hashCode() {
-        return super.hashCode();
+        return menusClone;
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentPermissionSetMapper.java b/server/src/com/imcode/imcms/mapping/DocumentPermissionSetMapper.java
index 3c19ed7149..9f58be520f 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentPermissionSetMapper.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentPermissionSetMapper.java
@@ -1,11 +1,11 @@
 package com.imcode.imcms.mapping;
 
 import com.imcode.db.Database;
-import com.imcode.db.DatabaseConnection;
 import com.imcode.db.DatabaseException;
-import com.imcode.db.commands.TransactionDatabaseCommand;
 import com.imcode.db.commands.SqlUpdateCommand;
-import imcode.server.document.*;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.DocumentPermissionSetDomainObject;
+import imcode.server.document.TextDocumentPermissionSetDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 
@@ -13,9 +13,9 @@
 
 public class DocumentPermissionSetMapper {
 
-    private Database database;
     public static final String TABLE_NEW_DOC_PERMISSION_SETS = "new_doc_permission_sets";
     public static final String TABLE_DOC_PERMISSION_SETS = "doc_permission_sets";
+    private Database database;
 
     public DocumentPermissionSetMapper(Database database) {
         this.database = database;
@@ -24,11 +24,11 @@ public DocumentPermissionSetMapper(Database database) {
 
     public void saveRestrictedDocumentPermissionSets(DocumentDomainObject document, UserDomainObject user,
                                                      DocumentDomainObject oldDocument) {
-        if ( null == oldDocument || user.canDefineRestrictedOneFor(oldDocument) ) {
+        if (null == oldDocument || user.canDefineRestrictedOneFor(oldDocument)) {
             saveRestrictedDocumentPermissionSet(document, document.getPermissionSets().getRestricted1(), false);
             saveRestrictedDocumentPermissionSet(document, document.getPermissionSetsForNewDocuments().getRestricted1(), true);
         }
-        if ( null == oldDocument || user.canDefineRestrictedTwoFor(oldDocument) ) {
+        if (null == oldDocument || user.canDefineRestrictedTwoFor(oldDocument)) {
             saveRestrictedDocumentPermissionSet(document, document.getPermissionSets().getRestricted2(), false);
             saveRestrictedDocumentPermissionSet(document, document.getPermissionSetsForNewDocuments().getRestricted2(), true);
         }
@@ -39,12 +39,12 @@ void saveRestrictedDocumentPermissionSet(final DocumentDomainObject document,
                                              final DocumentPermissionSetDomainObject documentPermissionSet,
                                              final boolean forNewDocuments) {
 
-        List permissionPairs = new ArrayList(Arrays.asList(new PermissionPair[] {
+        List permissionPairs = new ArrayList(Arrays.asList(new PermissionPair[]{
                 new PermissionPair(DocumentPermissionSetDomainObject.EDIT_DOCINFO_PERMISSION_ID, documentPermissionSet.getEditDocumentInformation()),
                 new PermissionPair(DocumentPermissionSetDomainObject.EDIT_PERMISSIONS_PERMISSION_ID, documentPermissionSet.getEditPermissions()),
         }));
 
-        if ( document instanceof TextDocumentDomainObject ) {
+        if (document instanceof TextDocumentDomainObject) {
             TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) documentPermissionSet;
             permissionPairs.add(new PermissionPair(TextDocumentPermissionSetDomainObject.EDIT_TEXT_DOCUMENT_TEXTS_PERMISSION_ID, textDocumentPermissionSet.getEditTexts()));
             permissionPairs.add(new PermissionPair(TextDocumentPermissionSetDomainObject.EDIT_TEXT_DOCUMENT_IMAGES_PERMISSION_ID, textDocumentPermissionSet.getEditImages()));
@@ -56,31 +56,25 @@ void saveRestrictedDocumentPermissionSet(final DocumentDomainObject document,
         }
 
         int permissionBits = 0;
-        for ( Iterator iterator = permissionPairs.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = permissionPairs.iterator(); iterator.hasNext(); ) {
             PermissionPair permissionPair = (PermissionPair) iterator.next();
-            if ( permissionPair.hasPermission ) {
+            if (permissionPair.hasPermission) {
                 permissionBits |= permissionPair.bit;
             }
         }
 
         final int permissionBits1 = permissionBits;
-        database.execute(new TransactionDatabaseCommand() {
-            public Object executeInTransaction(DatabaseConnection connection) throws DatabaseException {
-                sqlDeleteFromExtendedPermissionsTable(document, documentPermissionSet, forNewDocuments, connection);
-                String tableName = forNewDocuments ? TABLE_NEW_DOC_PERMISSION_SETS : TABLE_DOC_PERMISSION_SETS;
-                connection.executeUpdate("DELETE FROM " + tableName + "\n"
-                                         + "WHERE meta_id = ?\n"
-                                         + "AND  set_id = ?",
-                                         new String[] { "" + document.getId(), "" + documentPermissionSet.getType() });
-                connection.executeUpdate("INSERT INTO " + tableName + " (meta_id, set_id, permission_id)\n"
-                                         + "VALUES (?,?,?)", new String[] { "" + document.getId(),
-                        "" + documentPermissionSet.getType(),
-                        "" + permissionBits1 });
-                return null;
-            }
-        });
-
-        if ( document instanceof TextDocumentDomainObject ) {
+        sqlDeleteFromExtendedPermissionsTable(document, documentPermissionSet, forNewDocuments);
+        String tableName = forNewDocuments ? TABLE_NEW_DOC_PERMISSION_SETS : TABLE_DOC_PERMISSION_SETS;
+        database.execute(new SqlUpdateCommand("DELETE FROM " + tableName + "\n"
+                + "WHERE meta_id = ?\n"
+                + "AND  set_id = ?",
+                new String[]{"" + document.getId(), "" + documentPermissionSet.getType()}));
+        database.execute(new SqlUpdateCommand("INSERT INTO " + tableName + " (meta_id, set_id, permission_id)\n"
+                + "VALUES (?,?,?)",
+                new String[]{"" + document.getId(), "" + documentPermissionSet.getType(), "" + permissionBits1}));
+
+        if (document instanceof TextDocumentDomainObject) {
             TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) documentPermissionSet;
             sqlSaveAllowedTemplateGroups(document, textDocumentPermissionSet, forNewDocuments);
             sqlSaveAllowedDocumentTypes(document, textDocumentPermissionSet, forNewDocuments);
@@ -93,14 +87,14 @@ private void sqlSaveAllowedTemplateGroups(DocumentDomainObject document,
         String table = getExtendedPermissionsTable(forNewDocuments);
         Set allowedTemplateGroupIds = textDocumentPermissionSet.getAllowedTemplateGroupIds();
         String sqlInsertAllowedTemplateGroupId = "INSERT INTO " + table + " VALUES(?,?,"
-                                                 + TextDocumentPermissionSetDomainObject.EDIT_TEXT_DOCUMENT_TEMPLATE_PERMISSION_ID
-                                                 + ",?)";
-        for ( Iterator iterator = allowedTemplateGroupIds.iterator(); iterator.hasNext(); ) {
+                + TextDocumentPermissionSetDomainObject.EDIT_TEXT_DOCUMENT_TEMPLATE_PERMISSION_ID
+                + ",?)";
+        for (Iterator iterator = allowedTemplateGroupIds.iterator(); iterator.hasNext(); ) {
             Integer allowedTemplateGroupId = (Integer) iterator.next();
-            final Object[] parameters = new String[] {
+            final Object[] parameters = new String[]{
                     "" + document.getId(), "" + textDocumentPermissionSet.getType(),
                     ""
-                    + allowedTemplateGroupId.intValue()
+                            + allowedTemplateGroupId
             };
             database.execute(new SqlUpdateCommand(sqlInsertAllowedTemplateGroupId, parameters));
         }
@@ -108,14 +102,13 @@ private void sqlSaveAllowedTemplateGroups(DocumentDomainObject document,
 
     private void sqlDeleteFromExtendedPermissionsTable(DocumentDomainObject document,
                                                        DocumentPermissionSetDomainObject documentPermissionSet,
-                                                       boolean forNewDocuments,
-                                                       DatabaseConnection connection) throws DatabaseException {
+                                                       boolean forNewDocuments) throws DatabaseException {
         String table = getExtendedPermissionsTable(forNewDocuments);
         String sqlDelete = "DELETE FROM " + table
-                           + " WHERE meta_id = ? AND set_id = ?";
-        connection.executeUpdate(sqlDelete, new String[] {
+                + " WHERE meta_id = ? AND set_id = ?";
+        database.execute(new SqlUpdateCommand(sqlDelete, new String[]{
                 "" + document.getId(), "" + documentPermissionSet.getType()
-        });
+        }));
     }
 
     private void sqlSaveAllowedDocumentTypes(DocumentDomainObject document,
@@ -124,14 +117,14 @@ private void sqlSaveAllowedDocumentTypes(DocumentDomainObject document,
         String table = getExtendedPermissionsTable(forNewDocuments);
         Set allowedDocumentTypeIds = textDocumentPermissionSet.getAllowedDocumentTypeIds();
         String sqlInsertCreatableDocumentTypeId = "INSERT INTO " + table + " VALUES(?,?,"
-                                                  + DocumentInitializer.PERM_CREATE_DOCUMENT
-                                                  + ",?)";
-        for ( Iterator iterator = allowedDocumentTypeIds.iterator(); iterator.hasNext(); ) {
+                + DocumentInitializer.PERM_CREATE_DOCUMENT
+                + ",?)";
+        for (Iterator iterator = allowedDocumentTypeIds.iterator(); iterator.hasNext(); ) {
             Integer allowedDocumentTypeId = (Integer) iterator.next();
-            final Object[] parameters = new String[] {
+            final Object[] parameters = new String[]{
                     "" + document.getId(), "" + textDocumentPermissionSet.getType(),
                     ""
-                    + allowedDocumentTypeId.intValue()
+                            + allowedDocumentTypeId
             };
             database.execute(new SqlUpdateCommand(sqlInsertCreatableDocumentTypeId, parameters));
         }
@@ -139,7 +132,7 @@ private void sqlSaveAllowedDocumentTypes(DocumentDomainObject document,
 
     private String getExtendedPermissionsTable(boolean forNewDocuments) {
         String table = "doc_permission_sets_ex";
-        if ( forNewDocuments ) {
+        if (forNewDocuments) {
             table = "new_" + table;
         }
         return table;
diff --git a/server/src/com/imcode/imcms/mapping/DocumentSaver.java b/server/src/com/imcode/imcms/mapping/DocumentSaver.java
index 5e2c2444a6..ec45633e18 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentSaver.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentSaver.java
@@ -1,14 +1,13 @@
 package com.imcode.imcms.mapping;
 
-import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
-import com.imcode.db.commands.SqlQueryCommand;
-import com.imcode.db.commands.SqlUpdateCommand;
-import com.imcode.db.commands.SqlUpdateDatabaseCommand;
 import com.imcode.db.Database;
+import com.imcode.db.DatabaseConnection;
+import com.imcode.db.DatabaseException;
+import com.imcode.db.SingleConnectionDatabase;
+import com.imcode.db.commands.*;
 import com.imcode.imcms.api.Document;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.DocumentPermissionSetTypeDomainObject;
-import imcode.server.document.NoPermissionToEditDocumentException;
 import imcode.server.document.RoleIdToDocumentPermissionSetTypeMappings;
 import imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
@@ -18,28 +17,62 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.*;
 
 class DocumentSaver {
 
-    private final DocumentMapper documentMapper ;
-
-    private static final int META_HEADLINE_MAX_LENGTH = 255;
-    private static final int META_TEXT_MAX_LENGTH = 1000;
     public static final String SQL_DELETE_ROLE_DOCUMENT_PERMISSION_SET_ID = "DELETE FROM roles_rights WHERE role_id = ? AND meta_id = ?";
     public static final String SQL_SET_ROLE_DOCUMENT_PERMISSION_SET_ID = "INSERT INTO roles_rights (role_id, meta_id, set_id) VALUES(?,?,?)";
+    private static final int META_HEADLINE_MAX_LENGTH = 255;
+    private static final int META_TEXT_MAX_LENGTH = 1000;
+    private final DocumentMapper documentMapper;
+
+    Logger log = LogManager.getLogger(DocumentSaver.class);
 
     DocumentSaver(DocumentMapper documentMapper) {
         this.documentMapper = documentMapper;
     }
 
-    void saveDocument(DocumentDomainObject document, DocumentDomainObject oldDocument,
+    static void makeBooleanSqlUpdateClause(String columnName, boolean bool, List sqlUpdateColumns,
+                                           List sqlUpdateValues) {
+        sqlUpdateColumns.add(columnName + " = ?");
+        sqlUpdateValues.add(bool ? "1" : "0");
+    }
+
+    static void makeDateSqlUpdateClause(String columnName, Date date, List sqlUpdateColumns,
+                                        List sqlUpdateValues) {
+        makeStringSqlUpdateClause(columnName, Utility.makeSqlStringFromDate(date), sqlUpdateColumns, sqlUpdateValues);
+    }
+
+    static void makeIntSqlUpdateClause(String columnName, Integer integer, ArrayList sqlUpdateColumns,
+                                       ArrayList sqlUpdateValues) {
+        if (null != integer) {
+            sqlUpdateColumns.add(columnName + " = ?");
+            sqlUpdateValues.add("" + integer);
+        } else {
+            sqlUpdateColumns.add(columnName + " = NULL");
+        }
+    }
+
+    static void makeStringSqlUpdateClause(String columnName, String value, List sqlUpdateColumns,
+                                          List sqlUpdateValues) {
+        if (null != value) {
+            sqlUpdateColumns.add(columnName + " = ?");
+            sqlUpdateValues.add(value);
+        } else {
+            sqlUpdateColumns.add(columnName + " = NULL");
+        }
+    }
+
+    void saveDocument(final DocumentDomainObject document, final DocumentDomainObject oldDocument,
                       final UserDomainObject user) throws NoPermissionInternalException, DocumentSaveException {
         checkDocumentForSave(document);
 
         document.loadAllLazilyLoaded();
-        
+
         try {
             Date lastModifiedDatetime = Utility.truncateDateToMinutePrecision(document.getActualModifiedDatetime());
             Date modifiedDatetime = Utility.truncateDateToMinutePrecision(document.getModifiedDatetime());
@@ -47,26 +80,42 @@ void saveDocument(DocumentDomainObject document, DocumentDomainObject oldDocumen
             if (modifiedDatetimeUnchanged) {
                 document.setModifiedDatetime(documentMapper.getClock().getCurrentDate());
             }
+            document.setProperty(DocumentDomainObject.DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_MODIFIED_BY, "" + user.getId());
 
-            sqlUpdateMeta(document);
+            getDatabase().execute(new TransactionDatabaseCommand() {
+                public Object executeInTransaction(DatabaseConnection connection) throws DatabaseException {
+                    final SingleConnectionDatabase database = new SingleConnectionDatabase(connection);
 
-            updateDocumentSectionsCategoriesKeywords(document);
+                    sqlUpdateMeta(document, database);
 
-            updateDocumentProperties(document);
+                    updateDocumentSectionsCategoriesKeywords(document, oldDocument, database);
 
-            if (user.canEditPermissionsFor(oldDocument)) {
-                updateDocumentRolePermissions(document, user, oldDocument);
+                    updateDocumentProperties(document, oldDocument, database);
 
-                documentMapper.getDocumentPermissionSetMapper().saveRestrictedDocumentPermissionSets(document, user, oldDocument);
-            }
+                    if (user.canEditPermissionsFor(oldDocument)) {
+                        updateDocumentRolePermissions(document, user, oldDocument, database);
+
+                        new DocumentPermissionSetMapper(database).saveRestrictedDocumentPermissionSets(document, user, oldDocument);
+                    }
+
+                    return null;
+                }
+            });
 
             document.accept(new DocumentSavingVisitor(oldDocument, getDatabase(), documentMapper.getImcmsServices(), user));
+
+        } catch (Exception e) {
+            log.error("Exception while saving a document", e);
         } finally {
             documentMapper.invalidateDocument(document);
         }
     }
 
     private void sqlUpdateMeta(DocumentDomainObject document) {
+        sqlUpdateMeta(document, getDatabase());
+    }
+
+    private void sqlUpdateMeta(DocumentDomainObject document, Database database) {
         String headline = document.getHeadline();
         String text = document.getMenuText();
 
@@ -91,29 +140,39 @@ private void sqlUpdateMeta(DocumentDomainObject document) {
         makeBooleanSqlUpdateClause("shared", document.isLinkableByOtherUsers(), sqlUpdateColumns, sqlUpdateValues);
         makeBooleanSqlUpdateClause("show_meta", document.isLinkedForUnauthorizedUsers(), sqlUpdateColumns, sqlUpdateValues);
         makeBooleanSqlUpdateClause("permissions", document.isRestrictedOneMorePrivilegedThanRestrictedTwo(), sqlUpdateColumns, sqlUpdateValues);
+	    makeBooleanSqlUpdateClause("export_allowed", document.isExportAllowed(), sqlUpdateColumns, sqlUpdateValues);
+	    makeBooleanSqlUpdateClause("exported", document.isExported(), sqlUpdateColumns, sqlUpdateValues);
         makeIntSqlUpdateClause("publisher_id", document.getPublisherId(), sqlUpdateColumns,
-                                                                                 sqlUpdateValues);
-        makeIntSqlUpdateClause("owner_id", new Integer(document.getCreatorId()), sqlUpdateColumns,
-                                   sqlUpdateValues);
+                sqlUpdateValues);
+        makeIntSqlUpdateClause("owner_id", document.getCreatorId(), sqlUpdateColumns,
+                sqlUpdateValues);
         Document.PublicationStatus publicationStatus = document.getPublicationStatus();
-        int publicationStatusInt = convertPublicationStatusToInt(publicationStatus);
-        makeIntSqlUpdateClause("status", new Integer(publicationStatusInt), sqlUpdateColumns, sqlUpdateValues);
+        makeIntSqlUpdateClause("status", publicationStatus.hashCode(), sqlUpdateColumns, sqlUpdateValues);
 
         sqlStr.append(StringUtils.join(sqlUpdateColumns.iterator(), ","));
         sqlStr.append(" where meta_id = ?");
         sqlUpdateValues.add("" + document.getId());
-        String[] params = (String[]) sqlUpdateValues.toArray(new String[sqlUpdateValues.size()]);
-        getDatabase().execute(new SqlUpdateCommand(sqlStr.toString(), params));
+        String[] params = (String[]) sqlUpdateValues.toArray(new String[0]);
+        database.execute(new SqlUpdateCommand(sqlStr.toString(), params));
     }
 
-    static int convertPublicationStatusToInt(Document.PublicationStatus publicationStatus) {
-        int publicationStatusInt = Document.STATUS_NEW;
-        if ( Document.PublicationStatus.APPROVED.equals(publicationStatus) ) {
-            publicationStatusInt = Document.STATUS_PUBLICATION_APPROVED ;
-        } else if ( Document.PublicationStatus.DISAPPROVED.equals(publicationStatus) ) {
-            publicationStatusInt = Document.STATUS_PUBLICATION_DISAPPROVED ;
-        }
-        return publicationStatusInt;
+    private void updateDocumentSectionsCategoriesKeywords(DocumentDomainObject document, DocumentDomainObject oldDocument, Database database) {
+        if(!oldDocument.getSectionIds().equals(document.getSectionIds()))
+            updateDocumentSections(document.getId(), document.getSectionIds(), database);
+
+        if(!oldDocument.getCategoryIds().equals(document.getCategoryIds()))
+            new CategoryMapper(database).updateDocumentCategories(document);
+
+        if(!oldDocument.getKeywords().equals(document.getKeywords()))
+            updateDocumentKeywords(document, database);
+    }
+
+    private void updateDocumentSectionsCategoriesKeywords(DocumentDomainObject document, Database database) {
+        updateDocumentSections(document.getId(), document.getSectionIds(), database);
+
+        new CategoryMapper(database).updateDocumentCategories(document);
+
+        updateDocumentKeywords(document, database);
     }
 
     private void updateDocumentSectionsCategoriesKeywords(DocumentDomainObject document) {
@@ -168,95 +227,69 @@ private void checkDocumentForSave(DocumentDomainObject document) throws NoPermis
 
     void updateDocumentRolePermissions(DocumentDomainObject document, UserDomainObject user,
                                        DocumentDomainObject oldDocument) {
+        updateDocumentRolePermissions(document, user, oldDocument, getDatabase());
+    }
+
+    void updateDocumentRolePermissions(DocumentDomainObject document, UserDomainObject user,
+                                       DocumentDomainObject oldDocument, Database database) {
         RoleIdToDocumentPermissionSetTypeMappings mappings = new RoleIdToDocumentPermissionSetTypeMappings();
 
         if (null != oldDocument) {
             RoleIdToDocumentPermissionSetTypeMappings.Mapping[] oldDocumentMappings = oldDocument.getRoleIdsMappedToDocumentPermissionSetTypes().getMappings();
-            for ( int i = 0; i < oldDocumentMappings.length; i++ ) {
+            for (int i = 0; i < oldDocumentMappings.length; i++) {
                 RoleIdToDocumentPermissionSetTypeMappings.Mapping mapping = oldDocumentMappings[i];
                 mappings.setPermissionSetTypeForRole(mapping.getRoleId(), DocumentPermissionSetTypeDomainObject.NONE);
             }
         }
 
-        RoleIdToDocumentPermissionSetTypeMappings.Mapping[] documentMappings = document.getRoleIdsMappedToDocumentPermissionSetTypes().getMappings() ;
-        for ( int i = 0; i < documentMappings.length; i++ ) {
+        RoleIdToDocumentPermissionSetTypeMappings.Mapping[] documentMappings = document.getRoleIdsMappedToDocumentPermissionSetTypes().getMappings();
+        for (int i = 0; i < documentMappings.length; i++) {
             RoleIdToDocumentPermissionSetTypeMappings.Mapping mapping = documentMappings[i];
             mappings.setPermissionSetTypeForRole(mapping.getRoleId(), mapping.getDocumentPermissionSetType());
         }
 
         RoleIdToDocumentPermissionSetTypeMappings.Mapping[] mappingsArray = mappings.getMappings();
-        for ( int i = 0; i < mappingsArray.length; i++ ) {
+        for (int i = 0; i < mappingsArray.length; i++) {
             RoleIdToDocumentPermissionSetTypeMappings.Mapping mapping = mappingsArray[i];
             RoleId roleId = mapping.getRoleId();
             DocumentPermissionSetTypeDomainObject documentPermissionSetType = mapping.getDocumentPermissionSetType();
 
             if (null == oldDocument
-                || user.canSetDocumentPermissionSetTypeForRoleIdOnDocument(documentPermissionSetType, roleId, oldDocument)) {
+                    || user.canSetDocumentPermissionSetTypeForRoleIdOnDocument(documentPermissionSetType, roleId, oldDocument)) {
                 String[] params1 = new String[]{"" + roleId,
-                                                "" + document.getId()};
-                getDatabase().execute(new SqlUpdateCommand(SQL_DELETE_ROLE_DOCUMENT_PERMISSION_SET_ID, params1));
-                if ( !DocumentPermissionSetTypeDomainObject.NONE.equals(documentPermissionSetType) ) {
+                        "" + document.getId()};
+                database.execute(new SqlUpdateCommand(SQL_DELETE_ROLE_DOCUMENT_PERMISSION_SET_ID, params1));
+                if (!DocumentPermissionSetTypeDomainObject.NONE.equals(documentPermissionSetType)) {
                     String[] params = new String[]{
-                        "" + roleId.intValue(), "" + document.getId(), "" + documentPermissionSetType };
-                    getDatabase().execute(new SqlUpdateCommand(SQL_SET_ROLE_DOCUMENT_PERMISSION_SET_ID, params));
+                            "" + roleId.intValue(), "" + document.getId(), "" + documentPermissionSetType};
+                    database.execute(new SqlUpdateCommand(SQL_SET_ROLE_DOCUMENT_PERMISSION_SET_ID, params));
                 }
             }
         }
     }
 
-    static void makeBooleanSqlUpdateClause(String columnName, boolean bool, List sqlUpdateColumns,
-                                           List sqlUpdateValues) {
-        sqlUpdateColumns.add(columnName + " = ?");
-        sqlUpdateValues.add(bool ? "1" : "0");
-    }
-
-    static void makeDateSqlUpdateClause(String columnName, Date date, List sqlUpdateColumns,
-                                        List sqlUpdateValues) {
-        makeStringSqlUpdateClause(columnName, Utility.makeSqlStringFromDate(date), sqlUpdateColumns, sqlUpdateValues);
-    }
-
-    static void makeIntSqlUpdateClause(String columnName, Integer integer, ArrayList sqlUpdateColumns,
-                                       ArrayList sqlUpdateValues) {
-        if (null != integer) {
-            sqlUpdateColumns.add(columnName + " = ?");
-            sqlUpdateValues.add("" + integer);
-        } else {
-            sqlUpdateColumns.add(columnName + " = NULL");
-        }
-    }
-
-    static void makeStringSqlUpdateClause(String columnName, String value, List sqlUpdateColumns,
-                                          List sqlUpdateValues) {
-        if (null != value) {
-            sqlUpdateColumns.add(columnName + " = ?");
-            sqlUpdateValues.add(value);
-        } else {
-            sqlUpdateColumns.add(columnName + " = NULL");
-        }
-    }
-
     private int sqlInsertIntoMeta(DocumentDomainObject document) {
 
-        final Number documentId = (Number) getDatabase().execute(new InsertIntoTableDatabaseCommand("meta", new String[][]{
-            { "doc_type", document.getDocumentTypeId() + ""},
-            { "meta_headline", document.getHeadline()},
-            { "meta_text", document.getMenuText()},
-            { "meta_image", document.getMenuImage()},
-            { "owner_id", document.getCreatorId() + ""},
-            { "permissions", makeSqlStringFromBoolean(document.isRestrictedOneMorePrivilegedThanRestrictedTwo())},
-            { "shared", makeSqlStringFromBoolean(document.isLinkableByOtherUsers())},
-            { "show_meta", makeSqlStringFromBoolean(document.isLinkedForUnauthorizedUsers())},
-            { "lang_prefix", document.getLanguageIso639_2()},
-            { "date_created", Utility.makeSqlStringFromDate(document.getCreatedDatetime()) },
-            { "date_modified", Utility.makeSqlStringFromDate(document.getModifiedDatetime())},
-            { "disable_search", makeSqlStringFromBoolean(document.isSearchDisabled())},
-            { "target", document.getTarget()},
-            { "activate", "1"},
-            { "archived_datetime", Utility.makeSqlStringFromDate(document.getArchivedDatetime())},
-            { "publisher_id", null != document.getPublisherId() ? document.getPublisherId() + "" : null},
-            { "status", "" + document.getPublicationStatus()},
-            { "publication_start_datetime", Utility.makeSqlStringFromDate(document.getPublicationStartDatetime())},
-            { "publication_end_datetime", Utility.makeSqlStringFromDate(document.getPublicationEndDatetime())}
+        final Number documentId = getDatabase().execute(new InsertIntoTableDatabaseCommand("meta", new String[][]{
+                {"doc_type", document.getDocumentTypeId() + ""},
+                {"meta_headline", document.getHeadline()},
+                {"meta_text", document.getMenuText()},
+                {"meta_image", document.getMenuImage()},
+                {"owner_id", document.getCreatorId() + ""},
+                {"permissions", makeSqlStringFromBoolean(document.isRestrictedOneMorePrivilegedThanRestrictedTwo())},
+                {"shared", makeSqlStringFromBoolean(document.isLinkableByOtherUsers())},
+                {"show_meta", makeSqlStringFromBoolean(document.isLinkedForUnauthorizedUsers())},
+                {"lang_prefix", document.getLanguageIso639_2()},
+                {"date_created", Utility.makeSqlStringFromDate(document.getCreatedDatetime())},
+                {"date_modified", Utility.makeSqlStringFromDate(document.getModifiedDatetime())},
+                {"disable_search", makeSqlStringFromBoolean(document.isSearchDisabled())},
+                {"target", document.getTarget()},
+                {"activate", "1"},
+                {"archived_datetime", Utility.makeSqlStringFromDate(document.getArchivedDatetime())},
+                {"publisher_id", null != document.getPublisherId() ? document.getPublisherId() + "" : null},
+                {"status", "" + document.getPublicationStatus()},
+                {"publication_start_datetime", Utility.makeSqlStringFromDate(document.getPublicationStartDatetime())},
+                {"publication_end_datetime", Utility.makeSqlStringFromDate(document.getPublicationEndDatetime())}
         }));
         return documentId.intValue();
     }
@@ -272,9 +305,9 @@ Set getDocumentsAddedWithoutPermission(TextDocumentDomainObject textDocument,
         List documents = documentGetter.getDocuments(documentIdsAdded);
         Collection documentsAddedWithoutPermission = CollectionUtils.select(documents, new Predicate() {
             public boolean evaluate(Object object) {
-                return !user.canAddDocumentToAnyMenu((DocumentDomainObject) object) ;
+                return !user.canAddDocumentToAnyMenu((DocumentDomainObject) object);
             }
-        }) ;
+        });
         return new HashSet(documentsAddedWithoutPermission);
     }
 
@@ -284,17 +317,17 @@ private Set getDocumentIdsAdded(TextDocumentDomainObject textDocument, TextDocum
         if (null != oldTextDocument) {
             documentIdsAdded = getChildDocumentIdsDifference(textDocument, oldTextDocument);
         } else {
-            documentIdsAdded = textDocument.getChildDocumentIds() ;
+            documentIdsAdded = textDocument.getChildDocumentIds();
         }
         return documentIdsAdded;
     }
 
     private Set getChildDocumentIdsDifference(TextDocumentDomainObject minuend, TextDocumentDomainObject subtrahend) {
-        Set minuendChildDocumentIds = minuend.getChildDocumentIds() ;
-        Set subtrahendChildDocumentIds = subtrahend.getChildDocumentIds() ;
-        Set result = new HashSet(minuendChildDocumentIds) ;
-        result.removeAll(subtrahendChildDocumentIds) ;
-        return result ;
+        Set minuendChildDocumentIds = minuend.getChildDocumentIds();
+        Set subtrahendChildDocumentIds = subtrahend.getChildDocumentIds();
+        Set result = new HashSet(minuendChildDocumentIds);
+        result.removeAll(subtrahendChildDocumentIds);
+        return result;
     }
 
     void updateDocumentKeywords(DocumentDomainObject document) {
@@ -302,7 +335,7 @@ void updateDocumentKeywords(DocumentDomainObject document) {
         Set keywords = document.getKeywords();
         Set allKeywords = new HashSet(Arrays.asList(documentMapper.getAllKeywords()));
         deleteKeywordsFromDocument(meta_id);
-        for ( Iterator iterator = keywords.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = keywords.iterator(); iterator.hasNext(); ) {
             String keyword = (String) iterator.next();
             final boolean keywordExists = allKeywords.contains(keyword);
             if (!keywordExists) {
@@ -313,72 +346,141 @@ void updateDocumentKeywords(DocumentDomainObject document) {
         deleteUnusedKeywords();
     }
 
-    void updateDocumentProperties( DocumentDomainObject document ) {
+    void updateDocumentKeywords(DocumentDomainObject document, Database database) {
+        int meta_id = document.getId();
+        Set keywords = document.getKeywords();
+        Set allKeywords = new HashSet(Arrays.asList(documentMapper.getAllKeywords(database)));
+        deleteKeywordsFromDocument(meta_id, database);
+        for (Iterator iterator = keywords.iterator(); iterator.hasNext(); ) {
+            String keyword = (String) iterator.next();
+            final boolean keywordExists = allKeywords.contains(keyword);
+            if (!keywordExists) {
+                addKeyword(keyword, database);
+            }
+            addExistingKeywordToDocument(meta_id, keyword, database);
+        }
+        deleteUnusedKeywords(database);
+    }
+
+    void updateDocumentProperties(DocumentDomainObject document) {
         int meta_id = document.getId();
-        Map properties = (Map) document.getProperties();
-        deletePropertiesFromDocumnet(meta_id);
-        for (Iterator iterator = properties.keySet().iterator(); iterator.hasNext();) {
+        Map properties = document.getProperties();
+        deletePropertiesFromDocument(meta_id);
+        for (Iterator iterator = properties.keySet().iterator(); iterator.hasNext(); ) {
             String key = (String) iterator.next();
-            String[] params = new String[] {meta_id+"", key, (String) properties.get(key) } ;
+            String[] params = new String[]{meta_id + "", key, (String) properties.get(key)};
             getDatabase().execute(new SqlUpdateCommand("INSERT INTO document_properties (meta_id, key_name, value) VALUES(?,?,?)", params));
         }
     }
 
-    private void deletePropertiesFromDocumnet(int meta_id) {
-        String[] params = new String[] {meta_id + ""} ;
-        getDatabase().execute(new SqlUpdateCommand("DELETE FROM document_properties WHERE meta_id = ?", params));
+    void updateDocumentProperties(DocumentDomainObject document, Database database) {
+        int meta_id = document.getId();
+        Map properties = document.getProperties();
+        deletePropertiesFromDocument(meta_id, database);
+        for (Iterator iterator = properties.keySet().iterator(); iterator.hasNext(); ) {
+            String key = (String) iterator.next();
+            String[] params = new String[]{meta_id + "", key, (String) properties.get(key)};
+            database.execute(new SqlUpdateCommand("INSERT INTO document_properties (meta_id, key_name, value) VALUES(?,?,?)", params));
+        }
+    }
+
+    void updateDocumentProperties(DocumentDomainObject document, DocumentDomainObject oldDocument, Database database) {
+        if(!oldDocument.getProperties().equals(document.getProperties()))
+            updateDocumentProperties(document, database);
+    }
+
+    private void deletePropertiesFromDocument(int meta_id) {
+        deletePropertiesFromDocument(meta_id, getDatabase());
+    }
+
+    private void deletePropertiesFromDocument(int meta_id, Database database) {
+        String[] params = new String[]{meta_id + ""};
+        database.execute(new SqlUpdateCommand("DELETE FROM document_properties WHERE meta_id = ?", params));
     }
 
     void updateDocumentSections(int metaId,
                                 Set sectionIds) {
         removeAllSectionsFromDocument(metaId);
-        for ( Iterator iterator = sectionIds.iterator(); iterator.hasNext(); ) {
-            Integer sectionId = (Integer) iterator.next();
+        for (Object sectionId1 : sectionIds) {
+            Integer sectionId = (Integer) sectionId1;
             addSectionIdToDocument(metaId, sectionId);
         }
     }
 
+    void updateDocumentSections(int metaId,
+                                Set sectionIds, Database database) {
+        removeAllSectionsFromDocument(metaId, database);
+        for (Object sectionId1 : sectionIds) {
+            Integer sectionId = (Integer) sectionId1;
+            addSectionIdToDocument(metaId, sectionId, database);
+        }
+    }
+
     private void addSectionIdToDocument(int metaId, Integer sectionId) {
-        Integer[] params = new Integer[]{new Integer(metaId), sectionId };
-        getDatabase().execute(new SqlUpdateDatabaseCommand("INSERT INTO meta_section VALUES(?,?)", params));
+        addSectionIdToDocument(metaId, sectionId, getDatabase());
+    }
+
+    private void addSectionIdToDocument(int metaId, Integer sectionId, Database database) {
+        Integer[] params = new Integer[]{metaId, sectionId};
+        database.execute(new SqlUpdateDatabaseCommand("INSERT INTO meta_section VALUES(?,?)", params));
     }
 
     private void deleteKeywordsFromDocument(int meta_id) {
+        deleteKeywordsFromDocument(meta_id, getDatabase());
+    }
+
+    private void deleteKeywordsFromDocument(int meta_id, Database database) {
         String sqlDeleteKeywordsFromDocument = "DELETE FROM meta_classification WHERE meta_id = ?";
         String[] params = new String[]{"" + meta_id};
-        getDatabase().execute(new SqlUpdateCommand(sqlDeleteKeywordsFromDocument, params));
+        database.execute(new SqlUpdateCommand(sqlDeleteKeywordsFromDocument, params));
     }
 
     private void deleteUnusedKeywords() {
+        deleteUnusedKeywords(getDatabase());
+    }
+
+    private void deleteUnusedKeywords(Database database) {
         String[] params = new String[0];
-        getDatabase().execute(new SqlUpdateCommand("DELETE FROM classification WHERE class_id NOT IN (SELECT class_id FROM meta_classification)", params));
+        database.execute(new SqlUpdateCommand("DELETE FROM classification WHERE class_id NOT IN (SELECT class_id FROM meta_classification)", params));
     }
 
     private void addKeyword(String keyword) {
+        addKeyword(keyword, getDatabase());
+    }
+
+    private void addKeyword(String keyword, Database database) {
         String[] params = new String[]{keyword};
-        getDatabase().execute(new SqlUpdateCommand("INSERT INTO classification (code) VALUES(?)", params));
+        database.execute(new SqlUpdateCommand("INSERT INTO classification (code) VALUES(?)", params));
     }
 
     private void removeAllSectionsFromDocument(int metaId) {
+        removeAllSectionsFromDocument(metaId, getDatabase());
+    }
+
+    private void removeAllSectionsFromDocument(int metaId, Database database) {
         String[] params = new String[]{"" + metaId};
-        getDatabase().execute(new SqlUpdateCommand("DELETE FROM meta_section WHERE meta_id = ?", params));
+        database.execute(new SqlUpdateCommand("DELETE FROM meta_section WHERE meta_id = ?", params));
     }
 
     private void addExistingKeywordToDocument(int meta_id, String keyword) {
+        addExistingKeywordToDocument(meta_id, keyword, getDatabase());
+    }
+
+    private void addExistingKeywordToDocument(int meta_id, String keyword, Database database) {
         String[] params1 = new String[]{
-            keyword
+                keyword
         };
-        int keywordId = Integer.parseInt((String) getDatabase().execute(new SqlQueryCommand("SELECT class_id FROM classification WHERE code = ?", params1, Utility.SINGLE_STRING_HANDLER)));
+        int keywordId = Integer.parseInt(getDatabase().execute(new SqlQueryCommand<>("SELECT class_id FROM classification WHERE code = ?", params1, Utility.SINGLE_STRING_HANDLER)));
         String[] params = new String[]{"" + meta_id, "" + keywordId};
-        getDatabase().execute(new SqlUpdateCommand("INSERT INTO meta_classification (meta_id, class_id) VALUES(?,?)", params));
+        database.execute(new SqlUpdateCommand("INSERT INTO meta_classification (meta_id, class_id) VALUES(?,?)", params));
     }
 
     public void checkIfAliasAlreadyExist(DocumentDomainObject document) throws AliasAlreadyExistsInternalException {
-        Set<String> allAlias = documentMapper.getAllDocumentAlias() ;
+        Set<String> allAlias = documentMapper.getAllDocumentAlias();
         String alias = document.getAlias();
-        if(allAlias.contains(alias) && !documentMapper.getDocument(alias).equals(document) ) {
+        if (allAlias.contains(alias) && !documentMapper.getDocument(alias).equals(document)) {
             throw new AliasAlreadyExistsInternalException("A document with alias '" + document.getAlias()
-                                                                         + "' already exists");
+                    + "' already exists");
         }
     }
 
diff --git a/server/src/com/imcode/imcms/mapping/DocumentSavingVisitor.java b/server/src/com/imcode/imcms/mapping/DocumentSavingVisitor.java
index c0ad86bc79..5d5ecaae8d 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentSavingVisitor.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentSavingVisitor.java
@@ -3,9 +3,11 @@
 import com.imcode.db.Database;
 import com.imcode.db.commands.SqlUpdateCommand;
 import imcode.server.ImcmsServices;
-import imcode.server.user.UserDomainObject;
-import imcode.server.document.*;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.HtmlDocumentDomainObject;
+import imcode.server.document.UrlDocumentDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
+import imcode.server.user.UserDomainObject;
 
 public class DocumentSavingVisitor extends DocumentStoringVisitor {
 
@@ -14,26 +16,26 @@ public class DocumentSavingVisitor extends DocumentStoringVisitor {
 
     public DocumentSavingVisitor(DocumentDomainObject documentInDatabase, Database database,
                                  ImcmsServices services, UserDomainObject user) {
-        super(database, services );
+        super(database, services);
         oldDocument = documentInDatabase;
         savingUser = user;
     }
 
-    public void visitHtmlDocument( HtmlDocumentDomainObject htmlDocument ) {
+    public void visitHtmlDocument(HtmlDocumentDomainObject htmlDocument) {
         String sqlStr = "UPDATE frameset_docs SET frame_set = ? WHERE meta_id = ?";
         final Object[] parameters = new String[]{htmlDocument.getHtml(), "" + htmlDocument.getId()};
         database.execute(new SqlUpdateCommand(sqlStr, parameters));
     }
 
-    public void visitUrlDocument( UrlDocumentDomainObject urlDocument ) {
+    public void visitUrlDocument(UrlDocumentDomainObject urlDocument) {
         String sqlStr = "UPDATE url_docs SET url_ref = ? WHERE meta_id = ?";
         final Object[] parameters = new String[]{urlDocument.getUrl(), "" + urlDocument.getId()};
         database.execute(new SqlUpdateCommand(sqlStr, parameters));
     }
 
-    public void visitTextDocument( final TextDocumentDomainObject textDocument ) {
+    public void visitTextDocument(final TextDocumentDomainObject textDocument) {
         String sqlStr = "UPDATE text_docs SET template_name = ?, group_id = ?,\n"
-                        + "default_template = ?, default_template_1 = ?, default_template_2 = ? WHERE meta_id = ?";
+                + "default_template = ?, default_template_1 = ?, default_template_2 = ? WHERE meta_id = ?";
         String defaultTemplateId = textDocument.getDefaultTemplateName();
         String defaultTemplateIdForRestricted1 = textDocument.getDefaultTemplateNameForRestricted1();
         String defaultTemplateIdForRestricted2 = textDocument.getDefaultTemplateNameForRestricted2();
@@ -42,23 +44,23 @@ public void visitTextDocument( final TextDocumentDomainObject textDocument ) {
         int templateGroupId = textDocument.getTemplateGroupId();
 
         final Object[] parameters = new String[]{
-            "" + templateId,
-            "" + templateGroupId,
-            (null != defaultTemplateId ? "" + defaultTemplateId : null),
-            null != defaultTemplateIdForRestricted1 ? "" + defaultTemplateIdForRestricted1 : null,
-            null != defaultTemplateIdForRestricted2 ? "" + defaultTemplateIdForRestricted2 : null,
-            "" + textDocument.getId()
+                "" + templateId,
+                "" + templateGroupId,
+                (null != defaultTemplateId ? "" + defaultTemplateId : null),
+                null != defaultTemplateIdForRestricted1 ? "" + defaultTemplateIdForRestricted1 : null,
+                null != defaultTemplateIdForRestricted2 ? "" + defaultTemplateIdForRestricted2 : null,
+                "" + textDocument.getId()
         };
         database.execute(new SqlUpdateCommand(sqlStr, parameters));
 
-        updateTextDocumentTexts( textDocument, (TextDocumentDomainObject)oldDocument, savingUser);
-        updateTextDocumentImages( textDocument, (TextDocumentDomainObject)oldDocument, savingUser);
-        updateTextDocumentIncludes( textDocument );
+        updateTextDocumentTexts(textDocument, (TextDocumentDomainObject) oldDocument, savingUser);
+        updateTextDocumentImages(textDocument, (TextDocumentDomainObject) oldDocument, savingUser);
+        updateTextDocumentIncludes(textDocument);
 
-        boolean menusChanged = !textDocument.getMenus().equals( ( (TextDocumentDomainObject)oldDocument ).getMenus() );
+        boolean menusChanged = !textDocument.getMenus().equals(((TextDocumentDomainObject) oldDocument).getMenus());
 
-        if ( menusChanged ) {
-            updateTextDocumentMenus( textDocument, (TextDocumentDomainObject) oldDocument, savingUser);
+        if (menusChanged) {
+            updateTextDocumentMenus(textDocument, (TextDocumentDomainObject) oldDocument, savingUser);
         }
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/DocumentStoringVisitor.java b/server/src/com/imcode/imcms/mapping/DocumentStoringVisitor.java
index 70c134908d..8f037a75cd 100644
--- a/server/src/com/imcode/imcms/mapping/DocumentStoringVisitor.java
+++ b/server/src/com/imcode/imcms/mapping/DocumentStoringVisitor.java
@@ -1,19 +1,31 @@
 package com.imcode.imcms.mapping;
 
+import com.imcode.db.Database;
+import com.imcode.db.DatabaseConnection;
+import com.imcode.db.SingleConnectionDatabase;
+import com.imcode.db.commands.SqlQueryCommand;
+import com.imcode.db.commands.SqlUpdateCommand;
+import com.imcode.db.commands.TransactionDatabaseCommand;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.document.BrowserDocumentDomainObject;
 import imcode.server.document.DocumentVisitor;
 import imcode.server.document.FileDocumentDomainObject;
 import imcode.server.document.textdocument.ImageDomainObject;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
 import imcode.server.document.textdocument.ImageSource;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.document.textdocument.TextDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.DateConstants;
+import imcode.util.image.Format;
+import imcode.util.image.Resize;
 import imcode.util.io.FileInputStreamSource;
 import imcode.util.io.FileUtility;
 import imcode.util.io.InputStreamSource;
+import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.UnhandledException;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -34,39 +46,114 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.commons.dbutils.handlers.ScalarHandler;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.UnhandledException;
-
-import com.imcode.db.Database;
-import com.imcode.db.DatabaseConnection;
-import com.imcode.db.SingleConnectionDatabase;
-import com.imcode.db.commands.SqlQueryCommand;
-import com.imcode.db.commands.SqlUpdateCommand;
-import com.imcode.db.commands.TransactionDatabaseCommand;
-
 public class DocumentStoringVisitor extends DocumentVisitor {
-	
-	private final ResultSetHandler singleStringHandler = new ResultSetHandler() {
-		public Object handle(ResultSet rs) throws SQLException {
-			return rs.next() ? rs.getString(1) : null;
-		}
-	};
-
-    protected Database database ;
-    protected ImcmsServices services;
 
     private static final int FILE_BUFFER_LENGTH = 2048;
     private static final int DB_FIELD_MAX_LENGTH__FILENAME = 255;
+    private final ResultSetHandler singleStringHandler = new ResultSetHandler() {
+        public Object handle(ResultSet rs) throws SQLException {
+            return rs.next() ? rs.getString(1) : null;
+        }
+    };
+    protected Database database;
+    protected ImcmsServices services;
 
     public DocumentStoringVisitor(Database database, ImcmsServices services) {
-        this.database = database ;
-        this.services = services ;
+        this.database = database;
+        this.services = services;
     }
 
-    protected void saveFileDocumentFile( int fileDocumentId, FileDocumentDomainObject.FileDocumentFile fileDocumentFile,
-                                         String fileId ) {
+    public static File getFileForFileDocumentFile(int fileDocumentId, String fileId) {
+        File filePath = Imcms.getServices().getConfig().getFilePath();
+        String filename = "" + fileDocumentId;
+        if (StringUtils.isNotBlank(fileId)) {
+            filename += "." + FileUtility.escapeFilename(fileId);
+        }
+        return new File(filePath, filename);
+    }
+
+    static String makeSqlInsertString(String tableName, String[] columnNames) {
+        return "INSERT INTO " + tableName + " (" + StringUtils.join(columnNames, ",") + ")"
+                + "VALUES(?" + StringUtils.repeat(",?", columnNames.length - 1) + ")";
+    }
+
+    public static void saveDocumentImage(int meta_id, int img_no, ImageDomainObject image) {
+        String sqlStr = "update images\n"
+                + "set imgurl       = ?, \n"
+                + "width            = ?, \n"
+                + "height           = ?, \n"
+                + "border           = ?, \n"
+                + "v_space          = ?, \n"
+                + "h_space          = ?, \n"
+                + "image_name       = ?, \n"
+                + "target           = ?, \n"
+                + "align            = ?, \n"
+                + "alt_text         = ?, \n"
+                + "low_scr          = ?, \n"
+                + "linkurl          = ?, \n"
+                + "type             = ?, \n"
+                + "archive_image_id = ?, \n"
+                + "format      		= ?, \n"
+                + "crop_x1     		= ?, \n"
+                + "crop_y1     		= ?, \n"
+                + "crop_x2     		= ?, \n"
+                + "crop_y2     		= ?, \n"
+                + "rotate_angle     = ?, \n"
+                + "gen_file         = ?, \n"
+                + "resize           = ?  \n"
+                + "where meta_id = ? \n"
+                + "and name = ? \n";
+
+        int rowUpdateCount = sqlImageUpdateQuery(sqlStr, image, meta_id, img_no);
+        if (0 == rowUpdateCount) {
+            sqlStr = "insert into images (imgurl, width, height, border, v_space, h_space, image_name, target, align, alt_text, low_scr, linkurl, type, archive_image_id, format, crop_x1, crop_y1, crop_x2, crop_y2, rotate_angle, gen_file, resize, meta_id, name)"
+                    + " values(?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+            sqlImageUpdateQuery(sqlStr, image, meta_id, img_no);
+        }
+    }
+
+    private static int sqlImageUpdateQuery(String sqlStr, ImageDomainObject image, int meta_id, int img_no) {
+        final Object[] parameters = getSqlImageParameters(image, meta_id, img_no);
+        return ((Number) Imcms.getServices().getDatabase().execute(new SqlUpdateCommand(sqlStr, parameters))).intValue();
+    }
+
+    private static Object[] getSqlImageParameters(ImageDomainObject image, int meta_id, int img_no) {
+        ImageSource imageSource = image.getSource();
+        Format format = image.getFormat();
+        CropRegion region = image.getCropRegion();
+        Resize resize = image.getResize();
+
+        return new Object[]{
+                imageSource.toStorageString(),
+                image.getWidth(),
+                image.getHeight(),
+                image.getBorder(),
+                image.getVerticalSpace(),
+                image.getHorizontalSpace(),
+                image.getName(),
+                image.getTarget(),
+                image.getAlign(),
+                image.getAlternateText(),
+                image.getLowResolutionUrl(),
+                image.getLinkUrl(),
+                imageSource.getTypeId(),
+                image.getArchiveImageId(),
+                (format != null ? format.getOrdinal() : 0),
+                (region.isValid() ? region.getCropX1() : -1),
+                (region.isValid() ? region.getCropY1() : -1),
+                (region.isValid() ? region.getCropX2() : -1),
+                (region.isValid() ? region.getCropY2() : -1),
+                image.getRotateDirection().getAngle(),
+                image.getGeneratedFilename(),
+                (resize != null ? resize.getOrdinal() : 0),
+                meta_id,
+                img_no,
+        };
+    }
+
+    protected void saveFileDocumentFile(int fileDocumentId, FileDocumentDomainObject.FileDocumentFile fileDocumentFile,
+                                        String fileId) {
         try {
             InputStreamSource inputStreamSource = fileDocumentFile.getInputStreamSource();
             InputStream in;
@@ -80,18 +167,18 @@ protected void saveFileDocumentFile( int fileDocumentId, FileDocumentDomainObjec
                 return;
             }
 
-            File file = getFileForFileDocumentFile( fileDocumentId, fileId );
+            File file = getFileForFileDocumentFile(fileDocumentId, fileId);
 
             FileInputStreamSource fileInputStreamSource = new FileInputStreamSource(file);
-            boolean sameFileOnDisk = file.exists() && inputStreamSource.equals(fileInputStreamSource) ;
-            if ( sameFileOnDisk ) {
+            boolean sameFileOnDisk = file.exists() && inputStreamSource.equals(fileInputStreamSource);
+            if (sameFileOnDisk) {
                 return;
             }
 
             byte[] buffer = new byte[FILE_BUFFER_LENGTH];
             final OutputStream out = new FileOutputStream(file);
             try {
-                for (int bytesRead; -1 != (bytesRead = in.read(buffer));) {
+                for (int bytesRead; -1 != (bytesRead = in.read(buffer)); ) {
                     out.write(buffer, 0, bytesRead);
                 }
             } finally {
@@ -104,77 +191,62 @@ protected void saveFileDocumentFile( int fileDocumentId, FileDocumentDomainObjec
         }
     }
 
-    public static File getFileForFileDocumentFile( int fileDocumentId, String fileId ) {
-        File filePath = Imcms.getServices().getConfig().getFilePath();
-        String filename = "" + fileDocumentId ;
-        if (StringUtils.isNotBlank( fileId )) {
-            filename += "."+FileUtility.escapeFilename(fileId) ;
-        }
-        return new File(filePath, filename);
-    }
-
-    static String makeSqlInsertString(String tableName, String[] columnNames) {
-        return "INSERT INTO " + tableName + " (" + StringUtils.join(columnNames, ",") + ")"
-                + "VALUES(?" + StringUtils.repeat(",?", columnNames.length - 1) + ")";
-    }
-
     void updateTextDocumentTexts(TextDocumentDomainObject textDocument, TextDocumentDomainObject oldTextDocument, UserDomainObject user) {
         Map<Integer, TextDomainObject> texts = textDocument.getTexts();
         Map<Integer, Boolean> modifiedTextIndexes = textDocument.getModifiedTextIndexes();
         boolean useModifiedTextIndexes = modifiedTextIndexes.size() > 0;
-        
+
         Set<Integer> indexes = useModifiedTextIndexes
-        		? modifiedTextIndexes.keySet()
-        		: texts.keySet();		        
-        
-        for (Integer textIndex: indexes) {
-            TextDomainObject text = texts.get(textIndex);  
+                ? modifiedTextIndexes.keySet()
+                : texts.keySet();
+
+        for (Integer textIndex : indexes) {
+            TextDomainObject text = texts.get(textIndex);
             boolean saveText = false;
             boolean saveTextHistory = !(useModifiedTextIndexes && !modifiedTextIndexes.get(textIndex));
-            
-            if (oldTextDocument == null) {            	
-            	saveText = true;
+
+            if (oldTextDocument == null) {
+                saveText = true;
             } else {
-            	TextDomainObject oldText = oldTextDocument.getText(textIndex.intValue());
-         		String oldTextValue = oldText == null ? null : oldText.toString();            	
-            	
-         		// If this is first time insertion then ignore modified flag
-         		if (oldTextValue == null) {
-         			saveText = true;
-         		} else {    	         	                		
-         			String lastHistoryTextValue = getLastHistoryTextValue(
-         					textDocument.getId(), textIndex, text.getType());
-         			
-         			// Legacy logic support: copy old text to history if it does not yet exists  
-         			if (saveTextHistory && !oldTextValue.equals(lastHistoryTextValue)) {
-         				sqlInsertTextHistory(oldTextDocument, textIndex, oldText, user);
-         			}
-	        		
-	         		if (!text.getText().equals(oldTextValue)) {	         			
-	         			saveText = true;
-	         		}          		
-            	}
+                TextDomainObject oldText = oldTextDocument.getText(textIndex);
+                String oldTextValue = oldText == null ? null : oldText.toString();
+
+                // If this is first time insertion then ignore modified flag
+                if (oldTextValue == null) {
+                    saveText = true;
+                } else {
+                    String lastHistoryTextValue = getLastHistoryTextValue(
+                            textDocument.getId(), textIndex, text.getType());
+
+                    // Legacy logic support: copy old text to history if it does not yet exists
+                    if (saveTextHistory && !oldTextValue.equals(lastHistoryTextValue)) {
+                        sqlInsertTextHistory(oldTextDocument, textIndex, oldText, user);
+                    }
+
+                    if (!text.getText().equals(oldTextValue) || text.getType() != oldText.getType()) {
+                        saveText = true;
+                    }
+                }
             }
-            
+
             if (saveText) {
-            	if (saveTextHistory) {
-            		sqlInsertTextHistory(textDocument, textIndex, text, user);      
-            	}
-            	
-            	sqlDeleteText(textDocument, textIndex, text);
-            	sqlInsertText(textDocument, textIndex, text);           	
+                if (saveTextHistory) {
+                    sqlInsertTextHistory(textDocument, textIndex, text, user);
+                }
+
+                sqlDeleteText(textDocument, textIndex);
+                sqlInsertText(textDocument, textIndex, text);
             }
         }
     }
-    
-    
+
     private String getLastHistoryTextValue(int metaId, int name, int type) {
-    	String sql = "SELECT text FROM texts_history WHERE counter = (" +
-    			"SELECT MAX(counter) FROM texts_history WHERE meta_id = ? AND name = ? AND type = ?)";
-    	
-    	Object[] parameters = new Object[] {metaId, name, type};
-    	
-    	return (String)database.execute(new SqlQueryCommand(sql, parameters, singleStringHandler));
+        String sql = "SELECT text FROM texts_history WHERE counter = (" +
+                "SELECT MAX(counter) FROM texts_history WHERE meta_id = ? AND name = ? AND type = ?)";
+
+        Object[] parameters = new Object[]{metaId, name, type};
+
+        return (String) database.execute(new SqlQueryCommand(sql, parameters, singleStringHandler));
     }
 
     void updateTextDocumentImages(TextDocumentDomainObject textDocument, TextDocumentDomainObject oldTextDocument, UserDomainObject user) {
@@ -182,25 +254,25 @@ void updateTextDocumentImages(TextDocumentDomainObject textDocument, TextDocumen
         String sqlDeleteImages = "DELETE FROM images WHERE meta_id = ?";
         final Object[] parameters = new String[]{"" + textDocument.getId()};
         database.execute(new SqlUpdateCommand(sqlDeleteImages, parameters));
-        for (Iterator iterator = images.keySet().iterator(); iterator.hasNext();) {
+        for (Iterator iterator = images.keySet().iterator(); iterator.hasNext(); ) {
             Integer imageIndex = (Integer) iterator.next();
-            ImageDomainObject image = (ImageDomainObject) images.get(imageIndex.intValue());
-            if(oldTextDocument != null && oldTextDocument.getImage(imageIndex.intValue())!=null && !oldTextDocument.getImage(imageIndex.intValue()).getSource().toStorageString().equals("") &&  !image.equals(oldTextDocument.getImage(imageIndex.intValue()))){
-                sqlInsertImageHistory(oldTextDocument, imageIndex.intValue(), user);
+            ImageDomainObject image = (ImageDomainObject) images.get(imageIndex);
+            if (oldTextDocument != null && oldTextDocument.getImage(imageIndex) != null && !oldTextDocument.getImage(imageIndex).getSource().toStorageString().equals("") && !image.equals(oldTextDocument.getImage(imageIndex))) {
+                sqlInsertImageHistory(oldTextDocument, imageIndex, user);
             }
-            saveDocumentImage(textDocument.getId(), imageIndex.intValue(), image);
+            saveDocumentImage(textDocument.getId(), imageIndex, image);
         }
     }
 
     private void sqlInsertImageHistory(TextDocumentDomainObject textDocument, Integer imageIndex, UserDomainObject user) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat( DateConstants.DATETIME_FORMAT_STRING);
-        String[] columnNames = new String[] {"imgurl", "width", "height", "border", "v_space", "h_space", "image_name", "target", "align", "alt_text", "low_scr", "linkurl", "type", "meta_id", "name", "modified_datetime", "user_id" };
-        ImageDomainObject image = textDocument.getImage(imageIndex.intValue());
-        final String[] parameters = getSqlImageParameters(image, textDocument.getId(), imageIndex.intValue());
-        List <String> param =  new ArrayList <String>( Arrays.asList(parameters) ) ;
+        SimpleDateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
+        String[] columnNames = new String[]{"imgurl", "width", "height", "border", "v_space", "h_space", "image_name", "target", "align", "alt_text", "low_scr", "linkurl", "type", "archive_image_id", "format", "crop_x1", "crop_y1", "crop_x2", "crop_y2", "rotate_angle", "gen_file", "resize", "meta_id", "name", "modified_datetime", "user_id"};
+        ImageDomainObject image = textDocument.getImage(imageIndex);
+        final Object[] parameters = getSqlImageParameters(image, textDocument.getId(), imageIndex);
+        List<Object> param = new ArrayList<>(Arrays.asList(parameters));
         param.add(dateFormat.format(new Date()));
-        param.add(""+user.getId());
-        database.execute(new SqlUpdateCommand(makeSqlInsertString("images_history", columnNames), param.toArray(new String[param.size()])));
+        param.add(user.getId());
+        database.execute(new SqlUpdateCommand(makeSqlInsertString("images_history", columnNames), param.toArray(new Object[param.size()])));
     }
 
     void updateTextDocumentIncludes(TextDocumentDomainObject textDocument) {
@@ -208,32 +280,31 @@ void updateTextDocumentIncludes(TextDocumentDomainObject textDocument) {
         String sqlDeleteDocumentIncludes = "DELETE FROM includes WHERE meta_id = ?";
         final Object[] parameters = new String[]{"" + textDocument.getId()};
         database.execute(new SqlUpdateCommand(sqlDeleteDocumentIncludes, parameters));
-        for (Iterator iterator = includes.keySet().iterator(); iterator.hasNext();) {
+        for (Iterator iterator = includes.keySet().iterator(); iterator.hasNext(); ) {
             Integer includeIndex = (Integer) iterator.next();
             Integer includedDocumentId = (Integer) includes.get(includeIndex);
             sqlInsertTextDocumentInclude(textDocument, includeIndex, includedDocumentId);
         }
     }
 
-    private void sqlDeleteText(TextDocumentDomainObject textDocument, Integer textIndex, TextDomainObject text) {
-    	Object[] parameters = new String[] {"" + textDocument.getId(), 
-        		"" + textIndex, "" + text.getType()};
-    	
+    private void sqlDeleteText(TextDocumentDomainObject textDocument, Integer textIndex) {
+        Object[] parameters = new String[]{"" + textDocument.getId(), "" + textIndex};
+
         database.execute(new SqlUpdateCommand(
-        		"DELETE FROM texts WHERE meta_id = ? AND name = ? AND type = ?", parameters));
+                "DELETE FROM texts WHERE meta_id = ? AND name = ?", parameters));
     }
-    
+
     private void sqlInsertText(TextDocumentDomainObject textDocument, Integer textIndex, TextDomainObject text) {
         final Object[] parameters = new String[]{
-            "" + textDocument.getId(), "" + textIndex, text.getText(), "" + text.getType()
+                "" + textDocument.getId(), "" + textIndex, text.getText(), "" + text.getType()
         };
         database.execute(new SqlUpdateCommand("INSERT INTO texts (meta_id, name, text, type) VALUES(?,?,?,?)", parameters));
     }
 
     private void sqlInsertTextHistory(TextDocumentDomainObject textDocument, Integer textIndex, TextDomainObject text, UserDomainObject user) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat( DateConstants.DATETIME_FORMAT_STRING);
+        SimpleDateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
         final Object[] parameters = new String[]{
-            "" + textDocument.getId(), "" + textIndex, text.getText(), "" + text.getType(), dateFormat.format(new Date()), ""+user.getId()
+                "" + textDocument.getId(), "" + textIndex, text.getText(), "" + text.getType(), dateFormat.format(new Date()), "" + user.getId()
         };
         database.execute(new SqlUpdateCommand("INSERT INTO texts_history (meta_id, name, text, type, modified_datetime, user_id) VALUES(?,?,?,?,?,?)", parameters));
     }
@@ -241,87 +312,34 @@ private void sqlInsertTextHistory(TextDocumentDomainObject textDocument, Integer
     private void sqlInsertTextDocumentInclude(TextDocumentDomainObject textDocument, Integer includeIndex,
                                               Integer includedDocumentId) {
         final Object[] parameters = new String[]{
-            "" + textDocument.getId(), "" + includeIndex, "" + includedDocumentId
+                "" + textDocument.getId(), "" + includeIndex, "" + includedDocumentId
         };
         database.execute(new SqlUpdateCommand("INSERT INTO includes (meta_id, include_id, included_meta_id) VALUES(?,?,?)", parameters));
     }
 
-    public static void saveDocumentImage(int meta_id, int img_no, ImageDomainObject image) {
-        String sqlStr = "update images\n"
-                + "set imgurl  = ?, \n"
-                + "width       = ?, \n"
-                + "height      = ?, \n"
-                + "border      = ?, \n"
-                + "v_space     = ?, \n"
-                + "h_space     = ?, \n"
-                + "image_name  = ?, \n"
-                + "target      = ?, \n"
-                + "align       = ?, \n"
-                + "alt_text    = ?, \n"
-                + "low_scr     = ?, \n"
-                + "linkurl     = ?, \n"
-                + "type        = ?  \n"
-                + "where meta_id = ? \n"
-                + "and name = ? \n";
-
-        int rowUpdateCount = sqlImageUpdateQuery(sqlStr, image, meta_id, img_no);
-        if (0 == rowUpdateCount) {
-            sqlStr = "insert into images (imgurl, width, height, border, v_space, h_space, image_name, target, align, alt_text, low_scr, linkurl, type, meta_id, name)"
-                    + " values(?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?)";
-
-            sqlImageUpdateQuery(sqlStr, image, meta_id, img_no);
-        }
-    }
-
-    private static int sqlImageUpdateQuery(String sqlStr, ImageDomainObject image, int meta_id, int img_no) {
-        final String[] parameters = getSqlImageParameters(image, meta_id, img_no);
-        return ((Number)Imcms.getServices().getDatabase().execute(new SqlUpdateCommand(sqlStr, parameters))).intValue();
-    }
-
-    private static String[] getSqlImageParameters(ImageDomainObject image, int meta_id, int img_no) {
-        ImageSource imageSource = image.getSource();
-        return new String[] {
-            imageSource.toStorageString(),
-            "" + image.getWidth(),
-            "" + image.getHeight(),
-            "" + image.getBorder(),
-            "" + image.getVerticalSpace(),
-            "" + image.getHorizontalSpace(),
-            image.getName(),
-            image.getTarget(),
-            image.getAlign(),
-            image.getAlternateText(),
-            image.getLowResolutionUrl(),
-            image.getLinkUrl(),
-            "" + imageSource.getTypeId(),
-            "" + meta_id,
-            "" + img_no,
-        };
-    }
-
-    public void visitFileDocument( FileDocumentDomainObject fileDocument ) {
+    public void visitFileDocument(FileDocumentDomainObject fileDocument) {
         Map fileDocumentFiles = fileDocument.getFiles();
 
         String sqlDelete = "DELETE FROM fileupload_docs WHERE meta_id = ?";
         final Object[] parameters1 = new String[]{"" + fileDocument.getId()};
         database.execute(new SqlUpdateCommand(sqlDelete, parameters1));
 
-        for ( Iterator iterator = fileDocumentFiles.entrySet().iterator(); iterator.hasNext(); ) {
-            Map.Entry entry = (Map.Entry)iterator.next();
-            String fileId = (String)entry.getKey();
-            FileDocumentDomainObject.FileDocumentFile fileDocumentFile = (FileDocumentDomainObject.FileDocumentFile)entry.getValue();
+        for (Iterator iterator = fileDocumentFiles.entrySet().iterator(); iterator.hasNext(); ) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            String fileId = (String) entry.getKey();
+            FileDocumentDomainObject.FileDocumentFile fileDocumentFile = (FileDocumentDomainObject.FileDocumentFile) entry.getValue();
 
             String filename = fileDocumentFile.getFilename();
-            if ( filename.length() > DB_FIELD_MAX_LENGTH__FILENAME ) {
-                filename = truncateFilename( filename, DB_FIELD_MAX_LENGTH__FILENAME );
+            if (filename.length() > DB_FIELD_MAX_LENGTH__FILENAME) {
+                filename = truncateFilename(filename, DB_FIELD_MAX_LENGTH__FILENAME);
             }
             String sqlInsert = "INSERT INTO fileupload_docs (meta_id, variant_name, filename, mime, created_as_image, default_variant) VALUES(?,?,?,?,?,?)";
-            boolean isDefaultFile = fileId.equals( fileDocument.getDefaultFileId());
-            final Object[] parameters = new String[]{""+ fileDocument.getId(), fileId, filename, fileDocumentFile.getMimeType(), fileDocumentFile.isCreatedAsImage() ? "1" : "0", isDefaultFile ? "1" : "0"};
+            boolean isDefaultFile = fileId.equals(fileDocument.getDefaultFileId());
+            final Object[] parameters = new String[]{"" + fileDocument.getId(), fileId, filename, fileDocumentFile.getMimeType(), fileDocumentFile.isCreatedAsImage() ? "1" : "0", isDefaultFile ? "1" : "0"};
             database.execute(new SqlUpdateCommand(sqlInsert, parameters));
-            saveFileDocumentFile( fileDocument.getId(), fileDocumentFile, fileId );
+            saveFileDocumentFile(fileDocument.getId(), fileDocumentFile, fileId);
         }
-        DocumentMapper.deleteOtherFileDocumentFiles( fileDocument ) ;
+        DocumentMapper.deleteOtherFileDocumentFiles(fileDocument);
     }
 
     private String truncateFilename(String filename, int length) {
@@ -345,40 +363,40 @@ private String getExtensionsFromFilename(String filename) {
         return extensions;
     }
 
-    public void visitBrowserDocument( BrowserDocumentDomainObject browserDocument ) {
-        deleteBrowserDocument( browserDocument );
-        saveNewBrowserDocument( browserDocument );
+    public void visitBrowserDocument(BrowserDocumentDomainObject browserDocument) {
+        deleteBrowserDocument(browserDocument);
+        saveNewBrowserDocument(browserDocument);
     }
 
-    private void deleteBrowserDocument( BrowserDocumentDomainObject browserDocument ) {
+    private void deleteBrowserDocument(BrowserDocumentDomainObject browserDocument) {
         String sqlStr = "DELETE FROM browser_docs WHERE meta_id = ?";
         final Object[] parameters = new String[]{"" + browserDocument.getId()};
         database.execute(new SqlUpdateCommand(sqlStr, parameters));
     }
 
-    public void saveNewBrowserDocument( BrowserDocumentDomainObject document ) {
+    public void saveNewBrowserDocument(BrowserDocumentDomainObject document) {
         String[] browserDocumentColumns = {"meta_id", "to_meta_id", "browser_id"};
 
-        String sqlBrowserDocsInsertStr = makeSqlInsertString( "browser_docs", browserDocumentColumns );
+        String sqlBrowserDocsInsertStr = makeSqlInsertString("browser_docs", browserDocumentColumns);
 
         Map browserDocumentMap = document.getBrowserDocumentIdMap();
-        for ( Iterator iterator = browserDocumentMap.keySet().iterator(); iterator.hasNext(); ) {
-            BrowserDocumentDomainObject.Browser browser = (BrowserDocumentDomainObject.Browser)iterator.next();
-            Integer metaIdForBrowser = (Integer)browserDocumentMap.get( browser );
+        for (Iterator iterator = browserDocumentMap.keySet().iterator(); iterator.hasNext(); ) {
+            BrowserDocumentDomainObject.Browser browser = (BrowserDocumentDomainObject.Browser) iterator.next();
+            Integer metaIdForBrowser = (Integer) browserDocumentMap.get(browser);
             final Object[] parameters = new String[]{
-                "" + document.getId(), "" + metaIdForBrowser, "" + browser.getId()
+                    "" + document.getId(), "" + metaIdForBrowser, "" + browser.getId()
             };
             database.execute(new SqlUpdateCommand(sqlBrowserDocsInsertStr, parameters));
         }
     }
 
     protected void updateTextDocumentMenus(final TextDocumentDomainObject textDocument, final TextDocumentDomainObject oldTextDocument, final UserDomainObject savingUser) {
-        database.execute( new TransactionDatabaseCommand() {
-            public Object executeInTransaction( DatabaseConnection connection ) {
-                MenuSaver menuSaver = new MenuSaver(new SingleConnectionDatabase(connection)) ;
+        database.execute(new TransactionDatabaseCommand() {
+            public Object executeInTransaction(DatabaseConnection connection) {
+                MenuSaver menuSaver = new MenuSaver(new SingleConnectionDatabase(connection));
                 menuSaver.updateTextDocumentMenus(textDocument, services, oldTextDocument, savingUser);
-                return null ;
+                return null;
             }
-        } );
+        });
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/FragmentingDocumentGetter.java b/server/src/com/imcode/imcms/mapping/FragmentingDocumentGetter.java
index f259007218..02df43c659 100644
--- a/server/src/com/imcode/imcms/mapping/FragmentingDocumentGetter.java
+++ b/server/src/com/imcode/imcms/mapping/FragmentingDocumentGetter.java
@@ -1,20 +1,20 @@
 package com.imcode.imcms.mapping;
 
 import imcode.util.CompositeList;
+import org.apache.commons.lang.time.StopWatch;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.util.List;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.ArrayList;
-
-import org.apache.commons.lang.time.StopWatch;
-import org.apache.log4j.Logger;
+import java.util.List;
 
 public class FragmentingDocumentGetter extends DocumentGetterWrapper {
 
     private static final int DOCUMENTS_PER_FRAGMENT = 50;
 
-    private final static Logger log = Logger.getLogger(FragmentingDocumentGetter.class);
+    private final static Logger log = LogManager.getLogger(FragmentingDocumentGetter.class);
 
     public FragmentingDocumentGetter(DocumentGetter documentGetter) {
         super(documentGetter);
@@ -22,22 +22,22 @@ public FragmentingDocumentGetter(DocumentGetter documentGetter) {
 
     public List getDocuments(final Collection documentIds) {
         if (documentIds.isEmpty()) {
-            return Collections.EMPTY_LIST ;
+            return Collections.EMPTY_LIST;
         }
-        List documentIdList = new ArrayList(documentIds) ;
+        List documentIdList = new ArrayList(documentIds);
         CompositeList compositeDocumentList = new CompositeList();
-        for (int i = 0; i < documentIds.size(); i += DOCUMENTS_PER_FRAGMENT ) {
-            int toIndex = Math.min(documentIds.size(), i+DOCUMENTS_PER_FRAGMENT) ;
+        for (int i = 0; i < documentIds.size(); i += DOCUMENTS_PER_FRAGMENT) {
+            int toIndex = Math.min(documentIds.size(), i + DOCUMENTS_PER_FRAGMENT);
             List documentIdSubList = documentIdList.subList(i, toIndex);
             StopWatch stopWatch = new StopWatch();
             stopWatch.start();
             List documentList = super.getDocuments(documentIdSubList);
             stopWatch.stop();
             if (log.isTraceEnabled()) {
-                log.trace("Got "+documentList.size()+" documents in "+stopWatch.getTime()+"ms.") ;
+                log.trace("Got " + documentList.size() + " documents in " + stopWatch.getTime() + "ms.");
             }
             compositeDocumentList.addList(documentList);
         }
-        return compositeDocumentList ;
+        return compositeDocumentList;
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/ImageCacheMapper.java b/server/src/com/imcode/imcms/mapping/ImageCacheMapper.java
new file mode 100644
index 0000000000..05635202d8
--- /dev/null
+++ b/server/src/com/imcode/imcms/mapping/ImageCacheMapper.java
@@ -0,0 +1,214 @@
+package com.imcode.imcms.mapping;
+
+import com.imcode.db.Database;
+import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
+import com.imcode.db.commands.SqlQueryCommand;
+import com.imcode.db.commands.SqlUpdateCommand;
+import imcode.server.DatabaseVendor;
+import imcode.server.Imcms;
+import imcode.server.document.textdocument.ImageCacheDomainObject;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.util.image.Format;
+import imcode.util.image.Resize;
+import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
+public class ImageCacheMapper {
+    private static final Logger log = LogManager.getLogger(ImageCacheMapper.class);
+    private static final String SQL__UPDATE_FREQUENCY = "UPDATE images_cache SET frequency = frequency + 1 WHERE " +
+            "id = ? AND frequency < ?";
+    private Database database;
+
+    public ImageCacheMapper(Database database) {
+        this.database = database;
+    }
+
+    private static String getDeleteImagesCacheSQL(Collection<String> cacheIds) {
+        if (cacheIds == null) {
+            return "DELETE FROM images_cache";
+        }
+
+        StringBuilder builder = new StringBuilder("DELETE FROM images_cache WHERE id IN (");
+        joinIds(builder, cacheIds);
+        builder.append(')');
+
+        return builder.toString();
+    }
+
+    private static void joinIds(StringBuilder builder, Collection<String> ids) {
+        Iterator<String> it = ids.iterator();
+        while (it.hasNext()) {
+            builder.append('\'');
+            builder.append(it.next());
+            builder.append('\'');
+
+            if (it.hasNext()) {
+                builder.append(',');
+            }
+        }
+    }
+
+    private static Object[][] getColumnNamesAndValues(ImageCacheDomainObject cache) {
+        Format format = cache.getFormat();
+        Resize resize = cache.getResize();
+
+        CropRegion region = cache.getCropRegion();
+        boolean valid = region.isValid();
+
+        return new Object[][]{
+                {"id", cache.getId()},
+                {"resource", cache.getResource()},
+                {"cache_type", cache.getType()},
+                {"file_size", cache.getFileSize()},
+                {"frequency", cache.getFrequency()},
+                {"format", (format != null ? format.getOrdinal() : 0)},
+                {"width", cache.getWidth()},
+                {"height", cache.getHeight()},
+                {"resize", (resize != null ? resize.getOrdinal() : null)},
+                {"crop_x1", (valid ? region.getCropX1() : -1)},
+                {"crop_y1", (valid ? region.getCropY1() : -1)},
+                {"crop_x2", (valid ? region.getCropX2() : -1)},
+                {"crop_y2", (valid ? region.getCropY2() : -1)},
+                {"rotate_angle", cache.getRotateDirection().getAngle()},
+                {"created_dt", cache.getCreatedDate()},
+                {"meta_id", cache.getMetaId()},
+                {"no", cache.getNo()},
+                {"file_no", cache.getFileNo()}
+        };
+    }
+
+    public List<String> getImagesCacheIds(Integer metaId, Integer no, String fileNo) {
+        StringBuilder builder = new StringBuilder("SELECT id FROM images_cache");
+
+        List<String> restrictions = new ArrayList<>(3);
+        List<Object> params = new ArrayList<>(3);
+
+        if (metaId != null) {
+            restrictions.add("meta_id = ?");
+            params.add(metaId);
+        }
+        if (no != null) {
+            restrictions.add("no = ?");
+            params.add(no);
+        }
+        if (fileNo != null) {
+            restrictions.add("file_no = ?");
+            params.add(fileNo);
+        }
+
+        if (!restrictions.isEmpty()) {
+            builder.append(" WHERE ");
+
+            builder.append(StringUtils.join(restrictions.iterator(), " AND "));
+        }
+
+        IdResultSetHandler handler = new IdResultSetHandler();
+
+        return (List<String>) database.execute(new SqlQueryCommand(builder.toString(), params.toArray(), handler));
+    }
+
+    public void deleteAllImagesCache() {
+        String sql = getDeleteImagesCacheSQL(null);
+
+        database.execute(new SqlUpdateCommand(sql, null));
+    }
+
+    public void deleteImagesCache(Collection<String> ids) {
+        if (ids.isEmpty()) {
+            return;
+        }
+
+        String sql = getDeleteImagesCacheSQL(ids);
+
+        database.execute(new SqlUpdateCommand(sql, null));
+    }
+
+    public long getCacheFileSizeTotal() {
+        String totalSql = "SELECT sum(ic.file_size) FROM images_cache ic";
+
+        return (Long) database.execute(new SqlQueryCommand(totalSql, null, new ResultSetHandler() {
+            public Object handle(ResultSet rs) throws SQLException {
+                rs.next();
+
+                return rs.getLong(1);
+            }
+        }));
+    }
+
+    public List<String> deleteCacheLFUEntries() {
+        String countSql = "SELECT COUNT(ic.id) FROM images_cache ic";
+
+        long count = (Long) database.execute(new SqlQueryCommand(countSql, null, new ResultSetHandler() {
+            public Object handle(ResultSet rs) throws SQLException {
+                rs.next();
+
+                return rs.getLong(1);
+            }
+        }));
+
+        int deleteCount = (int) Math.ceil(count * 0.1);
+        if (deleteCount < 1) {
+            return Collections.emptyList();
+        }
+
+        DatabaseVendor vendor = Imcms.getServices().getConfig().getDatabaseVendor();
+        boolean mssql = (vendor == DatabaseVendor.MSSQL);
+
+        StringBuilder idsSql = new StringBuilder("SELECT ");
+
+        if (mssql) {
+            idsSql.append("TOP ");
+            idsSql.append(deleteCount);
+            idsSql.append(' ');
+        }
+        idsSql.append("id FROM images_cache ORDER BY frequency ASC ");
+
+        if (!mssql) {
+            idsSql.append("LIMIT ?");
+        }
+
+        Object[] params = null;
+        if (!mssql) {
+            params = new Object[]{deleteCount};
+        }
+
+        IdResultSetHandler idsHandler = new IdResultSetHandler();
+
+        List<String> cacheIds = (List<String>) database.execute(new SqlQueryCommand(idsSql.toString(), params, idsHandler));
+        deleteImagesCache(cacheIds);
+
+        return cacheIds;
+    }
+
+    public void addImageCache(ImageCacheDomainObject imageCache) {
+        String deleteSQL = "DELETE FROM images_cache WHERE id = ?";
+        String id = imageCache.getId();
+
+        database.execute(new SqlUpdateCommand(deleteSQL, new Object[]{id}));
+
+        database.execute(new InsertIntoTableDatabaseCommand("images_cache", getColumnNamesAndValues(imageCache)));
+    }
+
+    public void incrementFrequency(String cacheId) {
+        database.execute(new SqlUpdateCommand(SQL__UPDATE_FREQUENCY, new Object[]{cacheId, Integer.MAX_VALUE}));
+    }
+
+    private static class IdResultSetHandler implements ResultSetHandler {
+        @Override
+        public Object handle(ResultSet rs) throws SQLException {
+            List<String> ids = new ArrayList<>();
+
+            while (rs.next()) {
+                ids.add(rs.getString(1));
+            }
+
+            return ids;
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/mapping/MapDocumentGetter.java b/server/src/com/imcode/imcms/mapping/MapDocumentGetter.java
index f033517642..a019bfa3d8 100644
--- a/server/src/com/imcode/imcms/mapping/MapDocumentGetter.java
+++ b/server/src/com/imcode/imcms/mapping/MapDocumentGetter.java
@@ -1,32 +1,31 @@
 package com.imcode.imcms.mapping;
 
 import imcode.server.document.DocumentDomainObject;
+import org.apache.commons.lang.UnhandledException;
 
-import java.util.Map;
 import java.util.HashMap;
-
-import org.apache.commons.lang.UnhandledException;
+import java.util.Map;
 
 public class MapDocumentGetter extends AbstractDocumentGetter {
 
-    Map documentsMap = new HashMap() ;
+    Map documentsMap = new HashMap();
 
     public MapDocumentGetter(DocumentDomainObject[] documents) {
-        for ( int i = 0; null != documents && i < documents.length; i++ ) {
+        for (int i = 0; null != documents && i < documents.length; i++) {
             DocumentDomainObject document = documents[i];
-            documentsMap.put(new Integer(document.getId()), document) ;
+            documentsMap.put(document.getId(), document);
         }
     }
 
     public DocumentDomainObject getDocument(Integer documentId) {
-        DocumentDomainObject document = (DocumentDomainObject) documentsMap.get(documentId) ;
+        DocumentDomainObject document = (DocumentDomainObject) documentsMap.get(documentId);
         if (null != document) {
             try {
-                return (DocumentDomainObject) document.clone() ;
-            } catch ( CloneNotSupportedException e ) {
+                return (DocumentDomainObject) document.clone();
+            } catch (CloneNotSupportedException e) {
                 throw new UnhandledException(e);
             }
         }
-        return null ;
+        return null;
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/Mapper.java b/server/src/com/imcode/imcms/mapping/Mapper.java
index f11b890e9e..b65d78eb4f 100644
--- a/server/src/com/imcode/imcms/mapping/Mapper.java
+++ b/server/src/com/imcode/imcms/mapping/Mapper.java
@@ -1,19 +1,19 @@
 package com.imcode.imcms.mapping;
 
 import com.imcode.db.Database;
-import com.imcode.db.commands.SqlQueryCommand;
 import com.imcode.db.commands.DeleteWhereColumnsEqualDatabaseCommand;
-import com.imcode.db.commands.UpdateTableWhereColumnEqualsDatabaseCommand;
 import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
+import com.imcode.db.commands.SqlQueryCommand;
+import com.imcode.db.commands.UpdateTableWhereColumnEqualsDatabaseCommand;
+import com.imcode.db.handlers.CollectionHandler;
 import com.imcode.db.handlers.RowTransformer;
 import com.imcode.db.handlers.SingleObjectHandler;
-import com.imcode.db.handlers.CollectionHandler;
 import org.apache.commons.lang.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class Mapper<E extends Mapper.MapperObject> {
 
@@ -24,7 +24,7 @@ protected Mapper(Database database) {
     }
 
     public E get(Object id) {
-        return (E) database.execute(new SqlQueryCommand(getSelectSql()+" WHERE "+getIdColumnName()+" = ?", new Object[] { id } , new SingleObjectHandler(getRowTransformer())));
+        return (E) database.execute(new SqlQueryCommand(getSelectSql() + " WHERE " + getIdColumnName() + " = ?", new Object[]{id}, new SingleObjectHandler(getRowTransformer())));
     }
 
     public List<E> getAll() {
@@ -34,10 +34,10 @@ public List<E> getAll() {
     protected List<E> getAll(String where, String orderBy) {
         String selectSql = getSelectSql();
         if (null != where) {
-            selectSql += " WHERE "+where;
+            selectSql += " WHERE " + where;
         }
         if (null != orderBy) {
-            selectSql += " ORDER BY "+orderBy;
+            selectSql += " ORDER BY " + orderBy;
         }
         return (List<E>) database.execute(new SqlQueryCommand(selectSql, null, new CollectionHandler(new ArrayList(), getRowTransformer())));
     }
@@ -76,11 +76,15 @@ public Class getClassOfCreatedObjects() {
         };
     }
 
-    protected abstract String getTableName() ;
-    protected abstract String getIdColumnName() ;
-    protected abstract List<String> getDataColumnNames() ;
+    protected abstract String getTableName();
+
+    protected abstract String getIdColumnName();
+
+    protected abstract List<String> getDataColumnNames();
+
     protected abstract E convertRow(ResultSet rs) throws SQLException;
-    protected abstract Object[][] getDataValues(E e) ;
+
+    protected abstract Object[][] getDataValues(E e);
 
     protected String getDefaultOrderBy() {
         return null;
diff --git a/server/src/com/imcode/imcms/mapping/MenuSaver.java b/server/src/com/imcode/imcms/mapping/MenuSaver.java
index d0a799e2eb..861dcc84b6 100644
--- a/server/src/com/imcode/imcms/mapping/MenuSaver.java
+++ b/server/src/com/imcode/imcms/mapping/MenuSaver.java
@@ -1,43 +1,42 @@
 package com.imcode.imcms.mapping;
 
 import com.imcode.db.Database;
-import com.imcode.db.commands.SqlUpdateDatabaseCommand;
 import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
-import imcode.server.document.textdocument.TextDocumentDomainObject;
+import com.imcode.db.commands.SqlUpdateDatabaseCommand;
+import imcode.server.ImcmsServices;
 import imcode.server.document.textdocument.MenuDomainObject;
 import imcode.server.document.textdocument.MenuItemDomainObject;
-import imcode.server.ImcmsServices;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.DateConstants;
-
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.lang.StringUtils;
 
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+
 public class MenuSaver {
 
     private Database database;
 
     public MenuSaver(Database database) {
-        this.database = database ;
+        this.database = database;
     }
 
     void updateTextDocumentMenus(TextDocumentDomainObject textDocument, ImcmsServices services, TextDocumentDomainObject oldTextDocument, UserDomainObject savingUser) {
         Map menuMap = textDocument.getMenus();
-        for ( Iterator iterator = menuMap.entrySet().iterator(); iterator.hasNext();) {
+        for (Iterator iterator = menuMap.entrySet().iterator(); iterator.hasNext(); ) {
             Map.Entry entry = (Map.Entry) iterator.next();
             Integer menuIndex = (Integer) entry.getKey();
             MenuDomainObject menu = (MenuDomainObject) entry.getValue();
-            if(oldTextDocument != null) {
-                MenuDomainObject oldMenu = oldTextDocument.getMenu(menuIndex.intValue());
-                if(oldMenu != null && oldMenu.getMenuItemsUnsorted().size()>0 && !oldMenu.equals(menu)) {
-                   updateTextDocumentMenuHistory(oldTextDocument, menuIndex, oldMenu, savingUser, services );
+            if (oldTextDocument != null) {
+                MenuDomainObject oldMenu = oldTextDocument.getMenu(menuIndex);
+                if (oldMenu != null && oldMenu.getMenuItemsUnsorted().size() > 0 && !oldMenu.equals(menu)) {
+                    updateTextDocumentMenuHistory(oldTextDocument, menuIndex, oldMenu, savingUser, services);
                 }
             }
             updateTextDocumentMenu(textDocument, menuIndex, menu, services);
@@ -50,18 +49,18 @@ private void updateTextDocumentMenuHistory(TextDocumentDomainObject oldTextDocum
     }
 
     private void insertTextDocumentMenuHistory(TextDocumentDomainObject oldTextDocument, Integer menuIndex, MenuDomainObject oldMenu, UserDomainObject savingUser, ImcmsServices services) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat( DateConstants.DATETIME_FORMAT_STRING);
-        database.execute(new InsertIntoTableDatabaseCommand("menus_history", new Object[][] {
-                { "menu_id", new Integer(oldMenu.getId())},
-                { "meta_id", new Integer(oldTextDocument.getId())},
-                { "menu_index", new Integer(menuIndex) },
-                { "sort_order", new Integer(oldMenu.getSortOrder()) },
-                { "modified_datetime", dateFormat.format(new Date()) },
-                { "user_id", new Integer(savingUser.getId()) }
+        SimpleDateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
+        database.execute(new InsertIntoTableDatabaseCommand("menus_history", new Object[][]{
+                {"menu_id", oldMenu.getId()},
+                {"meta_id", oldTextDocument.getId()},
+                {"menu_index", menuIndex},
+                {"sort_order", oldMenu.getSortOrder()},
+                {"modified_datetime", dateFormat.format(new Date())},
+                {"user_id", savingUser.getId()}
         }));
 
         Collection menuItems = oldMenu.getMenuItemsUnsorted();
-        for ( Iterator iterator = menuItems.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = menuItems.iterator(); iterator.hasNext(); ) {
             MenuItemDomainObject menuItem = (MenuItemDomainObject) iterator.next();
             sqlInsertMenuItemHistory(oldMenu, menuItem);
         }
@@ -69,30 +68,30 @@ private void insertTextDocumentMenuHistory(TextDocumentDomainObject oldTextDocum
 
     private void sqlInsertMenuItemHistory(MenuDomainObject oldMenu, MenuItemDomainObject menuItem) {
 
-        database.execute(new InsertIntoTableDatabaseCommand("childs_history", new Object[][] {
-                { "menu_id", new Integer(oldMenu.getId())},
-                { "to_meta_id", new Integer(menuItem.getDocumentReference().getDocumentId())},
-                { "manual_sort_order", new Integer(menuItem.getSortKey()) },
-                { "tree_sort_index", menuItem.getTreeSortKey().toString() }
+        database.execute(new InsertIntoTableDatabaseCommand("childs_history", new Object[][]{
+                {"menu_id", oldMenu.getId()},
+                {"to_meta_id", menuItem.getDocumentReference().getDocumentId()},
+                {"manual_sort_order", menuItem.getSortKey()},
+                {"tree_sort_index", menuItem.getTreeSortKey().toString()}
         }));
     }
 
-    private void deleteUnusedMenus( TextDocumentDomainObject textDocument ) {
+    private void deleteUnusedMenus(TextDocumentDomainObject textDocument) {
         Collection menus = textDocument.getMenus().values();
         if (!menus.isEmpty()) {
             Collection menuIds = CollectionUtils.collect(menus, new Transformer() {
                 public Object transform(Object input) {
-                    return new Integer(((MenuDomainObject) input).getId());
+                    return ((MenuDomainObject) input).getId();
                 }
             });
             String sqlInMenuIds = StringUtils.join(menuIds.iterator(), ",");
 
             String whereClause = "menu_id NOT IN (" + sqlInMenuIds + ")";
             String sqlDeleteUnusedMenuItems = "DELETE FROM childs WHERE menu_id IN (SELECT menu_id FROM menus WHERE meta_id = ?) AND "
-                                              + whereClause;
-            database.execute( new SqlUpdateDatabaseCommand(sqlDeleteUnusedMenuItems, new String[]{"" + textDocument.getId()} ));
+                    + whereClause;
+            database.execute(new SqlUpdateDatabaseCommand(sqlDeleteUnusedMenuItems, new String[]{"" + textDocument.getId()}));
             String sqlDeleteUnusedMenus = "DELETE FROM menus WHERE meta_id = ? AND " + whereClause;
-            database.execute( new SqlUpdateDatabaseCommand(sqlDeleteUnusedMenus, new String[]{"" + textDocument.getId()}));
+            database.execute(new SqlUpdateDatabaseCommand(sqlDeleteUnusedMenus, new String[]{"" + textDocument.getId()}));
         }
     }
 
@@ -104,7 +103,7 @@ private void updateTextDocumentMenu(TextDocumentDomainObject textDocument, Integ
 
     private void insertTextDocumentMenu(TextDocumentDomainObject textDocument, Integer menuIndex,
                                         MenuDomainObject menu, ImcmsServices services) {
-        sqlInsertMenu(textDocument, menuIndex.intValue(), menu);
+        sqlInsertMenu(textDocument, menuIndex, menu);
         insertTextDocumentMenuItems(menu, services);
     }
 
@@ -112,43 +111,43 @@ private void deleteTextDocumentMenu(TextDocumentDomainObject textDocument,
                                         Integer menuIndex) {
         deleteTextDocumentMenuItems(textDocument, menuIndex);
         String sqlDeleteMenu = "DELETE FROM menus WHERE meta_id = ? AND menu_index = ?";
-        database.execute(new SqlUpdateDatabaseCommand(sqlDeleteMenu, new String[]{"" + textDocument.getId(), "" + menuIndex} ));
+        database.execute(new SqlUpdateDatabaseCommand(sqlDeleteMenu, new String[]{"" + textDocument.getId(), "" + menuIndex}));
     }
 
     private void deleteTextDocumentMenuItems(TextDocumentDomainObject textDocument,
                                              Integer menuIndex) {
         String sqlDeleteMenuItems = "DELETE FROM childs WHERE menu_id IN (SELECT menu_id FROM menus WHERE meta_id = ? AND menu_index = ?)";
-        database.execute( new SqlUpdateDatabaseCommand(sqlDeleteMenuItems, new String[]{"" + textDocument.getId(),
-                "" + menuIndex}) );
+        database.execute(new SqlUpdateDatabaseCommand(sqlDeleteMenuItems, new String[]{"" + textDocument.getId(),
+                "" + menuIndex}));
     }
 
     private void insertTextDocumentMenuItems(MenuDomainObject menu, ImcmsServices services) {
         Collection menuItems = menu.getMenuItemsUnsorted();
-        for ( Iterator iterator = menuItems.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = menuItems.iterator(); iterator.hasNext(); ) {
             MenuItemDomainObject menuItem = (MenuItemDomainObject) iterator.next();
             sqlInsertMenuItem(menu, menuItem);
         }
     }
 
-    private void sqlInsertMenuItem( MenuDomainObject menu, MenuItemDomainObject menuItem ) {
+    private void sqlInsertMenuItem(MenuDomainObject menu, MenuItemDomainObject menuItem) {
         String sqlInsertMenuItem = "INSERT INTO childs (menu_id, to_meta_id, manual_sort_order, tree_sort_index) VALUES(?,?,?,?)";
         String[] parameters = new String[]{
                 "" + menu.getId(),
                 "" + menuItem.getDocumentReference().getDocumentId(),
-                "" + menuItem.getSortKey().intValue(),
+                "" + menuItem.getSortKey(),
                 "" + menuItem.getTreeSortKey()
         };
-        database.execute( new SqlUpdateDatabaseCommand(sqlInsertMenuItem, parameters));
+        database.execute(new SqlUpdateDatabaseCommand(sqlInsertMenuItem, parameters));
     }
 
     private void sqlInsertMenu(TextDocumentDomainObject textDocument, int menuIndex,
                                MenuDomainObject menu) {
-        Number menuId = (Number) database.execute(new InsertIntoTableDatabaseCommand("menus", new Object[][] {
-                { "meta_id", new Integer(textDocument.getId())},
-                { "menu_index", new Integer(menuIndex) },
-                { "sort_order", new Integer(menu.getSortOrder()) }
+        Number menuId = (Number) database.execute(new InsertIntoTableDatabaseCommand("menus", new Object[][]{
+                {"meta_id", textDocument.getId()},
+                {"menu_index", menuIndex},
+                {"sort_order", menu.getSortOrder()}
         }));
-        menu.setId( menuId.intValue() );
+        menu.setId(menuId.intValue());
     }
 
 
diff --git a/server/src/com/imcode/imcms/mapping/MockDocumentIndex.java b/server/src/com/imcode/imcms/mapping/MockDocumentIndex.java
deleted file mode 100644
index 59e73a1907..0000000000
--- a/server/src/com/imcode/imcms/mapping/MockDocumentIndex.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.imcode.imcms.mapping;
-
-import imcode.server.document.DocumentDomainObject;
-import imcode.server.document.index.DocumentIndex;
-import imcode.server.document.index.IndexException;
-import imcode.server.document.index.DocumentQuery;
-import imcode.server.user.UserDomainObject;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-
-import java.util.List;
-import java.util.Arrays;
-
-public class MockDocumentIndex implements DocumentIndex {
-    private boolean indexDocumentCalled;
-    private boolean removeDocumentCalled;
-
-    public void indexDocument( DocumentDomainObject document ) throws IndexException {
-        this.indexDocumentCalled = true ;
-    }
-
-    public void removeDocument( DocumentDomainObject document ) throws IndexException {
-        this.removeDocumentCalled = true ;
-    }
-
-    public List search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
-        return Arrays.asList(new DocumentDomainObject[0]);
-    }
-
-    public void rebuild() {
-    }
-
-    public boolean isRemoveDocumentCalled() {
-        return removeDocumentCalled;
-    }
-
-    public boolean isIndexDocumentCalled() {
-        return indexDocumentCalled;
-    }
-}
diff --git a/server/src/com/imcode/imcms/mapping/ProfileMapper.java b/server/src/com/imcode/imcms/mapping/ProfileMapper.java
index 36801f68ee..f07071f8cb 100644
--- a/server/src/com/imcode/imcms/mapping/ProfileMapper.java
+++ b/server/src/com/imcode/imcms/mapping/ProfileMapper.java
@@ -8,7 +8,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class ProfileMapper extends Mapper<Profile>{
+public class ProfileMapper extends Mapper<Profile> {
 
     public ProfileMapper(Database database) {
         super(database);
@@ -35,9 +35,9 @@ protected Profile convertRow(ResultSet rs) throws SQLException {
     }
 
     protected Object[][] getDataValues(Profile profile) {
-        return new Object[][] {
-                { "name", profile.getName() },
-                { "document_name", profile.getDocumentName() },
+        return new Object[][]{
+                {"name", profile.getName()},
+                {"document_name", profile.getDocumentName()},
         };
     }
 
diff --git a/server/src/com/imcode/imcms/mapping/SectionFromIdTransformer.java b/server/src/com/imcode/imcms/mapping/SectionFromIdTransformer.java
index c554924516..7bc11e02a9 100644
--- a/server/src/com/imcode/imcms/mapping/SectionFromIdTransformer.java
+++ b/server/src/com/imcode/imcms/mapping/SectionFromIdTransformer.java
@@ -1,17 +1,17 @@
 package com.imcode.imcms.mapping;
 
-import org.apache.commons.collections.Transformer;
 import imcode.server.ImcmsServices;
+import org.apache.commons.collections.Transformer;
 
 public class SectionFromIdTransformer implements Transformer {
 
     private ImcmsServices services;
 
     public SectionFromIdTransformer(ImcmsServices services) {
-        this.services = services ;
+        this.services = services;
     }
 
     public Object transform(Object input) {
-        return services.getDocumentMapper().getSectionById(((Integer)input).intValue()) ;
+        return services.getDocumentMapper().getSectionById((Integer) input);
     }
 }
diff --git a/server/src/com/imcode/imcms/mapping/TestTextDocumentInitializer.java b/server/src/com/imcode/imcms/mapping/TestTextDocumentInitializer.java
deleted file mode 100644
index 28f7075001..0000000000
--- a/server/src/com/imcode/imcms/mapping/TestTextDocumentInitializer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.imcode.imcms.mapping;
-
-import com.imcode.db.mock.MockDatabase;
-import com.imcode.db.mock.MockResultSet;
-import imcode.server.document.DocumentDomainObject;
-import imcode.server.document.textdocument.MenuDomainObject;
-import imcode.server.document.textdocument.TextDocumentDomainObject;
-import junit.framework.TestCase;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class TestTextDocumentInitializer extends TestCase {
-
-    public void testInitDocumentsMenuItems() throws Exception {
-        List documentIds = Arrays.asList(new Integer[] {
-                new Integer(1001),
-                new Integer(1002),
-        });
-        MockDatabase database = new MockDatabase();
-        database.addExpectedSqlCall(new MockDatabase.StartsWithSqlCallPredicate(TextDocumentInitializer.SQL_GET_MENU_ITEMS),
-                                    new MockResultSet(new Object[][] { 
-                                            { new Integer(1001), new Integer(1), new Integer(1), new Integer(1), new Integer(1002), new Integer(500), ""},
-                                            { new Integer(1001), new Integer(1), new Integer(1), new Integer(1), new Integer(1003), new Integer(510), ""},
-                                            { new Integer(1001), new Integer(1), new Integer(1), new Integer(1), new Integer(1005), new Integer(500), ""},
-                                            { new Integer(1001), new Integer(2), new Integer(2), new Integer(1), new Integer(1002), new Integer(500), ""},
-                                    }));
-
-        MapDocumentGetter documentGetter = new MapDocumentGetter(new DocumentDomainObject[] {
-                new TextDocumentDomainObject(1001),
-                new TextDocumentDomainObject(1002),
-                new TextDocumentDomainObject(1003),
-                new TextDocumentDomainObject(1004),
-        });
-        TextDocumentInitializer initializer = new TextDocumentInitializer(database, documentGetter, documentIds);
-        TextDocumentDomainObject textDocument = (TextDocumentDomainObject) documentGetter.getDocument(new Integer(1001));
-        initializer.initialize(textDocument);
-        assertEquals(2, textDocument.getMenus().size()) ;
-
-        MenuDomainObject menu1 = textDocument.getMenu(1) ;
-        assertEquals(2, menu1.getMenuItems().length) ;
-
-        MenuDomainObject menu2 = textDocument.getMenu(2) ;
-        assertEquals(1, menu2.getMenuItems().length) ;
-        
-    }
-}
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/mapping/TextDocumentInitializer.java b/server/src/com/imcode/imcms/mapping/TextDocumentInitializer.java
index bdee953631..8ef8ac8298 100644
--- a/server/src/com/imcode/imcms/mapping/TextDocumentInitializer.java
+++ b/server/src/com/imcode/imcms/mapping/TextDocumentInitializer.java
@@ -5,51 +5,48 @@
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.GetterDocumentReference;
 import imcode.server.document.textdocument.*;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.server.document.textdocument.ImageDomainObject.RotateDirection;
+import imcode.server.document.textdocument.TextDocumentDomainObject.TemplateNames;
 import imcode.util.LazilyLoadedObject;
 import imcode.util.Utility;
-import org.apache.commons.dbutils.ResultSetHandler;
+import imcode.util.image.Format;
+import imcode.util.image.Resize;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class TextDocumentInitializer {
 
-    private final static Logger LOG = Logger.getLogger(TextDocumentInitializer.class);
-
-    private final Collection documentIds;
+    static final String SQL_GET_MENU_ITEMS = "SELECT meta_id, menus.menu_id, menu_index, sort_order, to_meta_id, manual_sort_order, tree_sort_index FROM menus,childs WHERE menus.menu_id = childs.menu_id AND meta_id ";
+    private final static Logger LOG = LogManager.getLogger(TextDocumentInitializer.class);
+    private final Collection<Integer> documentIds;
     private final Database database;
     private final DocumentGetter documentGetter;
-    private Map documentsMenuItems;
-    private Map documentsImages;
-    private Map documentsIncludes;
-    private Map documentsTexts;
-    private Map documentsTemplateIds;
-
-    static final String SQL_GET_MENU_ITEMS = "SELECT meta_id, menus.menu_id, menu_index, sort_order, to_meta_id, manual_sort_order, tree_sort_index FROM menus,childs WHERE menus.menu_id = childs.menu_id AND meta_id ";
+    private Map<Integer, DocumentMenusMap> documentsMenuItems;
+    private Map<Integer, CopyableHashMap<Integer, ImageDomainObject>> documentsImages;
+    private Map<Integer, CopyableHashMap<Integer, Integer>> documentsIncludes;
+    private Map<Integer, CopyableHashMap<Integer, TextDomainObject>> documentsTexts;
+    private Map<Integer, TemplateNames> documentsTemplateIds;
 
-    public TextDocumentInitializer(Database database, DocumentGetter documentGetter, Collection documentIds) {
+    public TextDocumentInitializer(Database database, DocumentGetter documentGetter, Collection<Integer> documentIds) {
         this.database = database;
         this.documentGetter = documentGetter;
         this.documentIds = documentIds;
     }
 
     public void initialize(TextDocumentDomainObject document) {
-        Integer documentId = new Integer(document.getId()) ;
-        document.setLazilyLoadedMenus(new LazilyLoadedObject(new MenusLoader(documentId)));
-        document.setLazilyLoadedTexts(new LazilyLoadedObject(new TextsLoader(documentId)));
-        document.setLazilyLoadedImages(new LazilyLoadedObject(new ImagesLoader(documentId)));
-        document.setLazilyLoadedIncludes(new LazilyLoadedObject(new IncludesLoader(documentId)));
-        document.setLazilyLoadedTemplateIds(new LazilyLoadedObject(new TemplateIdsLoader(documentId)));
+        Integer documentId = document.getId();
+        document.setLazilyLoadedMenus(new LazilyLoadedObject<>(new MenusLoader(documentId)));
+        document.setLazilyLoadedTexts(new LazilyLoadedObject<>(new TextsLoader(documentId)));
+        document.setLazilyLoadedImages(new LazilyLoadedObject<>(new ImagesLoader(documentId)));
+        document.setLazilyLoadedIncludes(new LazilyLoadedObject<>(new IncludesLoader(documentId)));
+        document.setLazilyLoadedTemplateIds(new LazilyLoadedObject<>(new TemplateIdsLoader(documentId)));
     }
 
-    private class MenusLoader implements LazilyLoadedObject.Loader {
+    private class MenusLoader implements LazilyLoadedObject.Loader<DocumentMenusMap> {
 
         private final Integer documentId;
 
@@ -57,53 +54,51 @@ private class MenusLoader implements LazilyLoadedObject.Loader {
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public DocumentMenusMap load() {
             initDocumentsMenuItems();
-            DocumentMenusMap menusMap = (DocumentMenusMap) documentsMenuItems.get(documentId);
-            if ( null == menusMap ) {
+            DocumentMenusMap menusMap = documentsMenuItems.get(documentId);
+            if (null == menusMap) {
                 menusMap = new DocumentMenusMap();
             }
             return menusMap;
         }
 
         void initDocumentsMenuItems() {
-            if ( null == documentsMenuItems ) {
-                documentsMenuItems = new HashMap();
-                final Set destinationDocumentIds = new HashSet();
+            if (null == documentsMenuItems) {
+                documentsMenuItems = new HashMap<>();
+                final Set<Integer> destinationDocumentIds = new HashSet<>();
                 final BatchDocumentGetter batchDocumentGetter = new BatchDocumentGetter(destinationDocumentIds, documentGetter);
-                DocumentInitializer.executeWithAppendedIntegerInClause(database, SQL_GET_MENU_ITEMS, documentIds, new ResultSetHandler() {
-                    public Object handle(ResultSet rs) throws SQLException {
-                        while ( rs.next() ) {
-                            int documentId = rs.getInt(1);
-                            int menuId = rs.getInt(2);
-                            int menuIndex = rs.getInt(3);
-                            int menuSortOrder = rs.getInt(4);
-                            Integer destinationDocumentId = new Integer(rs.getInt(5));
-                            Integer sortKey = Utility.getInteger(rs.getObject(6));
-
-                            destinationDocumentIds.add(destinationDocumentId);
-                            Map documentMenus = (Map) documentsMenuItems.get(new Integer(documentId));
-                            if ( null == documentMenus ) {
-                                documentMenus = new DocumentMenusMap();
-                                documentsMenuItems.put(new Integer(documentId), documentMenus);
-                            }
+                DocumentInitializer.executeWithAppendedIntegerInClause(database, SQL_GET_MENU_ITEMS, documentIds, rs -> {
+                    while (rs.next()) {
+                        int documentId = rs.getInt(1);
+                        int menuId = rs.getInt(2);
+                        int menuIndex = rs.getInt(3);
+                        int menuSortOrder = rs.getInt(4);
+                        Integer destinationDocumentId = rs.getInt(5);
+                        Integer sortKey = Utility.getInteger(rs.getObject(6));
+
+                        destinationDocumentIds.add(destinationDocumentId);
+                        DocumentMenusMap documentMenus = documentsMenuItems.get(documentId);
+                        if (null == documentMenus) {
+                            documentMenus = new DocumentMenusMap();
+                            documentsMenuItems.put(documentId, documentMenus);
+                        }
 
-                            MenuDomainObject menu = (MenuDomainObject) documentMenus.get(new Integer(menuIndex));
-                            if ( null == menu ) {
-                                menu = new MenuDomainObject(menuId, menuSortOrder);
-                                documentMenus.put(new Integer(menuIndex), menu);
-                            }
-                            MenuItemDomainObject menuItem = new MenuItemDomainObject(new GetterDocumentReference(destinationDocumentId.intValue(), batchDocumentGetter), sortKey, new TreeSortKeyDomainObject(rs.getString(7)));
-                            menu.addMenuItemUnchecked(menuItem);
+                        MenuDomainObject menu = documentMenus.get(menuIndex);
+                        if (null == menu) {
+                            menu = new MenuDomainObject(menuId, menuSortOrder);
+                            documentMenus.put(menuIndex, menu);
                         }
-                        return null;
+                        MenuItemDomainObject menuItem = new MenuItemDomainObject(new GetterDocumentReference(destinationDocumentId, batchDocumentGetter), sortKey, new TreeSortKeyDomainObject(rs.getString(7)));
+                        menu.addMenuItemUnchecked(menuItem);
                     }
+                    return null;
                 });
             }
         }
     }
 
-    private class IncludesLoader implements LazilyLoadedObject.Loader {
+    private class IncludesLoader implements LazilyLoadedObject.Loader<CopyableHashMap<Integer, Integer>> {
 
         private final Integer documentId;
 
@@ -111,41 +106,38 @@ private class IncludesLoader implements LazilyLoadedObject.Loader {
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public CopyableHashMap<Integer, Integer> load() {
             initDocumentsIncludes();
-            CopyableHashMap documentIncludesMap = (CopyableHashMap) documentsIncludes.get(documentId);
-            if ( null == documentIncludesMap ) {
-                documentIncludesMap = new CopyableHashMap();
+            CopyableHashMap<Integer, Integer> documentIncludesMap = documentsIncludes.get(documentId);
+            if (null == documentIncludesMap) {
+                documentIncludesMap = new CopyableHashMap<>();
             }
             return documentIncludesMap;
         }
 
         private void initDocumentsIncludes() {
-            if ( null == documentsIncludes ) {
-                documentsIncludes = new HashMap();
-                DocumentInitializer.executeWithAppendedIntegerInClause(database, "SELECT meta_id, include_id, included_meta_id FROM includes WHERE meta_id ", documentIds, new ResultSetHandler() {
-                    public Object handle(ResultSet rs) throws SQLException {
-                        while ( rs.next() ) {
-                            Integer documentId = new Integer(rs.getInt(1));
-                            Integer includeIndex = new Integer(rs.getInt(2));
-                            Integer includedDocumentId = new Integer(rs.getInt(3));
-
-                            CopyableHashMap documentIncludesMap = (CopyableHashMap) documentsIncludes.get(documentId);
-                            if ( null == documentIncludesMap ) {
-                                documentIncludesMap = new CopyableHashMap();
-                                documentsIncludes.put(documentId, documentIncludesMap);
-                            }
-                            documentIncludesMap.put(includeIndex, includedDocumentId);
+            if (null == documentsIncludes) {
+                documentsIncludes = new HashMap<>();
+                DocumentInitializer.executeWithAppendedIntegerInClause(database, "SELECT meta_id, include_id, included_meta_id FROM includes WHERE meta_id ", documentIds, rs -> {
+                    while (rs.next()) {
+                        Integer documentId = rs.getInt(1);
+                        Integer includeIndex = rs.getInt(2);
+                        Integer includedDocumentId = rs.getInt(3);
+
+                        CopyableHashMap<Integer, Integer> documentIncludesMap = documentsIncludes.get(documentId);
+                        if (null == documentIncludesMap) {
+                            documentIncludesMap = new CopyableHashMap<>();
+                            documentsIncludes.put(documentId, documentIncludesMap);
                         }
-                        return null;
+                        documentIncludesMap.put(includeIndex, includedDocumentId);
                     }
+                    return null;
                 });
             }
         }
-
     }
 
-    private class ImagesLoader implements LazilyLoadedObject.Loader {
+    private class ImagesLoader implements LazilyLoadedObject.Loader<CopyableHashMap<Integer, ImageDomainObject>> {
 
         private final Integer documentId;
 
@@ -153,75 +145,87 @@ private class ImagesLoader implements LazilyLoadedObject.Loader {
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public CopyableHashMap<Integer, ImageDomainObject> load() {
             initDocumentsImages();
-            CopyableHashMap documentImagesMap = (CopyableHashMap) documentsImages.get(documentId);
-            if ( null == documentImagesMap ) {
-                documentImagesMap = new CopyableHashMap();
+            CopyableHashMap<Integer, ImageDomainObject> documentImagesMap = documentsImages.get(documentId);
+            if (null == documentImagesMap) {
+                documentImagesMap = new CopyableHashMap<>();
             }
             return documentImagesMap;
         }
 
         private void initDocumentsImages() {
-            if ( null == documentsImages ) {
-                documentsImages = new HashMap();
+            if (null == documentsImages) {
+                documentsImages = new HashMap<>();
                 DocumentInitializer.executeWithAppendedIntegerInClause(database, "SELECT meta_id,name,image_name,imgurl,"
-                                                                                 + "width,height,border,v_space,h_space,"
-                                                                                 + "target,align,alt_text,low_scr,linkurl,type "
-                                                                                 + "FROM images WHERE meta_id ", documentIds, new ResultSetHandler() {
-                    public Object handle(ResultSet rs) throws SQLException {
-                        while ( rs.next() ) {
-                            Integer documentId = new Integer(rs.getInt(1));
-                            Map imageMap = (Map) documentsImages.get(documentId);
-                            if ( null == imageMap ) {
-                                imageMap = new CopyableHashMap();
-                                documentsImages.put(documentId, imageMap);
-                            }
-                            Integer imageIndex = new Integer(rs.getInt(2));
-                            ImageDomainObject image = new ImageDomainObject();
-
-                            image.setName(rs.getString(3));
-                            String imageSource = rs.getString(4);
-                            image.setWidth(rs.getInt(5));
-                            image.setHeight(rs.getInt(6));
-                            image.setBorder(rs.getInt(7));
-                            image.setVerticalSpace(rs.getInt(8));
-                            image.setHorizontalSpace(rs.getInt(9));
-                            image.setTarget(rs.getString(10));
-                            image.setAlign(rs.getString(11));
-                            image.setAlternateText(rs.getString(12));
-                            image.setLowResolutionUrl(rs.getString(13));
-                            image.setLinkUrl(rs.getString(14));
-                            int imageType = rs.getInt(15);
-
-                            if ( StringUtils.isNotBlank(imageSource) ) {
-                                if ( ImageSource.IMAGE_TYPE_ID__FILE_DOCUMENT == imageType ) {
-                                    try {
-                                        int fileDocumentId = Integer.parseInt(imageSource);
-                                        DocumentDomainObject document = documentGetter.getDocument(new Integer(fileDocumentId));
-                                        if ( null != document ) {
-                                            image.setSource(new FileDocumentImageSource(new DirectDocumentReference(document)));
-                                        }
-                                    } catch ( NumberFormatException nfe ) {
-                                        LOG.warn("Non-numeric document-id \"" + imageSource + "\" for image in database.");
-                                    } catch ( ClassCastException cce ) {
-                                        LOG.warn("Non-file-document-id \"" + imageSource + "\" for image in database.");
+                        + "width,height,border,v_space,h_space,"
+                        + "target,align,alt_text,low_scr,linkurl,type,archive_image_id, "
+                        + "format, crop_x1, crop_y1, crop_x2, crop_y2, rotate_angle, gen_file,"
+                        + "resize "
+                        + "FROM images WHERE meta_id ", documentIds, rs -> {
+                    while (rs.next()) {
+                        Integer documentId = rs.getInt(1);
+                        CopyableHashMap<Integer, ImageDomainObject> imageMap = documentsImages.get(documentId);
+                        if (null == imageMap) {
+                            imageMap = new CopyableHashMap<>();
+                            documentsImages.put(documentId, imageMap);
+                        }
+                        Integer imageIndex = rs.getInt(2);
+                        ImageDomainObject image = new ImageDomainObject();
+
+                        image.setImageIndex(imageIndex);
+                        image.setName(rs.getString(3));
+                        String imageSource = rs.getString(4);
+                        image.setWidth(rs.getInt(5));
+                        image.setHeight(rs.getInt(6));
+                        image.setBorder(rs.getInt(7));
+                        image.setVerticalSpace(rs.getInt(8));
+                        image.setHorizontalSpace(rs.getInt(9));
+                        image.setTarget(rs.getString(10));
+                        image.setAlign(rs.getString(11));
+                        image.setAlternateText(rs.getString(12));
+                        image.setLowResolutionUrl(rs.getString(13));
+                        image.setLinkUrl(rs.getString(14));
+                        int imageType = rs.getInt(15);
+                        image.setArchiveImageId((Long) rs.getObject(16));
+                        image.setFormat(Format.findFormat(rs.getShort(17)));
+
+                        CropRegion region = new CropRegion(rs.getInt(18), rs.getInt(19), rs.getInt(20), rs.getInt(21));
+                        image.setCropRegion(region);
+
+                        image.setRotateDirection(RotateDirection.getByAngleDefaultIfNull(rs.getShort(22)));
+                        image.setGeneratedFilename(rs.getString(23));
+                        image.setResize(Resize.getByOrdinal(rs.getInt(24)));
+
+                        if (StringUtils.isNotBlank(imageSource)) {
+                            if (ImageSource.IMAGE_TYPE_ID__FILE_DOCUMENT == imageType) {
+                                try {
+                                    int fileDocumentId = Integer.parseInt(imageSource);
+                                    DocumentDomainObject document = documentGetter.getDocument(fileDocumentId);
+                                    if (null != document) {
+                                        image.setSource(new FileDocumentImageSource(new DirectDocumentReference(document)));
                                     }
-                                } else if ( ImageSource.IMAGE_TYPE_ID__IMAGES_PATH_RELATIVE_PATH == imageType ) {
-                                    image.setSource(new ImagesPathRelativePathImageSource(imageSource));
+                                } catch (NumberFormatException nfe) {
+                                    LOG.warn("Non-numeric document-id \"" + imageSource + "\" for image in database.");
+                                } catch (ClassCastException cce) {
+                                    LOG.warn("Non-file-document-id \"" + imageSource + "\" for image in database.");
                                 }
+                            } else if (ImageSource.IMAGE_TYPE_ID__IMAGES_PATH_RELATIVE_PATH == imageType) {
+                                image.setSource(new ImagesPathRelativePathImageSource(imageSource));
+                            } else if (ImageSource.IMAGE_TYPE_ID__IMAGE_ARCHIVE == imageType) {
+                                image.setSource(new ImageArchiveImageSource(imageSource));
                             }
-                            imageMap.put(imageIndex, image);
                         }
-                        return null;
+                        imageMap.put(imageIndex, image);
                     }
+                    return null;
                 });
             }
 
         }
     }
 
-    private class TextsLoader implements LazilyLoadedObject.Loader {
+    private class TextsLoader implements LazilyLoadedObject.Loader<CopyableHashMap<Integer, TextDomainObject>> {
 
         private final Integer documentId;
 
@@ -229,41 +233,39 @@ private class TextsLoader implements LazilyLoadedObject.Loader {
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public CopyableHashMap<Integer, TextDomainObject> load() {
             initDocumentsTexts();
-            CopyableHashMap documentTexts = (CopyableHashMap) documentsTexts.get(documentId);
-            if ( null == documentTexts ) {
-                documentTexts = new CopyableHashMap();
+            CopyableHashMap<Integer, TextDomainObject> documentTexts = documentsTexts.get(documentId);
+            if (null == documentTexts) {
+                documentTexts = new CopyableHashMap<>();
             }
             return documentTexts;
         }
 
         private void initDocumentsTexts() {
-            if ( null == documentsTexts ) {
-                documentsTexts = new HashMap();
-                DocumentInitializer.executeWithAppendedIntegerInClause(database, "SELECT meta_id, name, text, type FROM texts WHERE meta_id ", documentIds, new ResultSetHandler() {
-                    public Object handle(ResultSet rs) throws SQLException {
-                        while ( rs.next() ) {
-                            Integer documentId = new Integer(rs.getInt(1));
-                            Integer textIndex = new Integer(rs.getInt(2));
-                            String text = rs.getString(3);
-                            int textType = rs.getInt(4);
-                            CopyableHashMap documentTextsMap = (CopyableHashMap) documentsTexts.get(documentId);
-                            if ( null == documentTextsMap ) {
-                                documentTextsMap = new CopyableHashMap();
-                                documentsTexts.put(documentId, documentTextsMap);
-                            }
-                            documentTextsMap.put(textIndex, new TextDomainObject(text, textType));
+            if (null == documentsTexts) {
+                documentsTexts = new HashMap<>();
+                DocumentInitializer.executeWithAppendedIntegerInClause(database, "SELECT meta_id, name, text, type FROM texts WHERE meta_id ", documentIds, rs -> {
+                    while (rs.next()) {
+                        Integer documentId = rs.getInt(1);
+                        Integer textIndex = rs.getInt(2);
+                        String text = rs.getString(3);
+                        int textType = rs.getInt(4);
+                        CopyableHashMap<Integer, TextDomainObject> documentTextsMap = documentsTexts.get(documentId);
+                        if (null == documentTextsMap) {
+                            documentTextsMap = new CopyableHashMap<>();
+                            documentsTexts.put(documentId, documentTextsMap);
                         }
-                        return null;
+                        documentTextsMap.put(textIndex, new TextDomainObject(text, textType));
                     }
+                    return null;
                 });
             }
         }
 
     }
 
-    private class TemplateIdsLoader implements LazilyLoadedObject.Loader {
+    private class TemplateIdsLoader implements LazilyLoadedObject.Loader<TemplateNames> {
 
         private final Integer documentId;
 
@@ -271,34 +273,32 @@ private class TemplateIdsLoader implements LazilyLoadedObject.Loader {
             this.documentId = documentId;
         }
 
-        public LazilyLoadedObject.Copyable load() {
+        public TemplateNames load() {
             initDocumentsTemplateIds();
-            TextDocumentDomainObject.TemplateNames templateNames = (TextDocumentDomainObject.TemplateNames) documentsTemplateIds.get(documentId) ;
-            if (null == templateNames ) {
-                templateNames = new TextDocumentDomainObject.TemplateNames();
+            TemplateNames templateNames = documentsTemplateIds.get(documentId);
+            if (null == templateNames) {
+                templateNames = new TemplateNames();
             }
-            return templateNames ;
+            return templateNames;
         }
 
         private void initDocumentsTemplateIds() {
-            if ( null == documentsTemplateIds ) {
-                documentsTemplateIds = new HashMap();
-                DocumentInitializer.executeWithAppendedIntegerInClause(database, "SELECT meta_id, template_name, group_id, default_template, default_template_1, default_template_2 FROM text_docs WHERE meta_id ", documentIds, new ResultSetHandler() {
-                    public Object handle(ResultSet rs) throws SQLException {
-                        while ( rs.next() ) {
-                            Integer documentId = new Integer(rs.getInt("meta_id"));
-                            TextDocumentDomainObject.TemplateNames templateNames = new TextDocumentDomainObject.TemplateNames();
-                            templateNames.setTemplateName(rs.getString("template_name"));
-                            templateNames.setTemplateGroupId(rs.getInt(3));
-                            templateNames.setDefaultTemplateName(rs.getString("default_template"));
-                            String defaultTemplateIdForR1 = rs.getString("default_template_1");
-                            String defaultTemplateIdForR2 = rs.getString("default_template_2");
-                            templateNames.setDefaultTemplateNameForRestricted1(defaultTemplateIdForR1);
-                            templateNames.setDefaultTemplateNameForRestricted2(defaultTemplateIdForR2);
-                            documentsTemplateIds.put(documentId, templateNames);
-                        }
-                        return null;
+            if (null == documentsTemplateIds) {
+                documentsTemplateIds = new HashMap<>();
+                DocumentInitializer.executeWithAppendedIntegerInClause(database, "SELECT meta_id, template_name, group_id, default_template, default_template_1, default_template_2 FROM text_docs WHERE meta_id ", documentIds, rs -> {
+                    while (rs.next()) {
+                        Integer documentId = rs.getInt("meta_id");
+                        TemplateNames templateNames = new TemplateNames();
+                        templateNames.setTemplateName(rs.getString("template_name"));
+                        templateNames.setTemplateGroupId(rs.getInt(3));
+                        templateNames.setDefaultTemplateName(rs.getString("default_template"));
+                        String defaultTemplateIdForR1 = rs.getString("default_template_1");
+                        String defaultTemplateIdForR2 = rs.getString("default_template_2");
+                        templateNames.setDefaultTemplateNameForRestricted1(defaultTemplateIdForR1);
+                        templateNames.setDefaultTemplateNameForRestricted2(defaultTemplateIdForR2);
+                        documentsTemplateIds.put(documentId, templateNames);
                     }
+                    return null;
                 });
             }
         }
diff --git a/server/src/com/imcode/imcms/model/AuthenticationProvider.java b/server/src/com/imcode/imcms/model/AuthenticationProvider.java
new file mode 100644
index 0000000000..3f4dc067e3
--- /dev/null
+++ b/server/src/com/imcode/imcms/model/AuthenticationProvider.java
@@ -0,0 +1,43 @@
+package com.imcode.imcms.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.imcode.imcms.domain.dto.ExternalRole;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@EqualsAndHashCode
+public abstract class AuthenticationProvider {
+    @Getter
+    protected final String authenticationURL;
+    @Getter
+    protected final String providerId;
+    @Getter
+    protected final String providerName;
+    @Getter
+    protected final String iconPath;
+
+    public AuthenticationProvider(String authenticationURL, String providerId, String providerName, String iconPath) {
+        this.authenticationURL = authenticationURL;
+        this.providerId = providerId;
+        this.providerName = providerName;
+        this.iconPath = iconPath;
+    }
+
+    public abstract String buildAuthenticationURL(String redirectURL, String sessionId, String nextUrl);
+
+    /**
+     * Returns URI user should be redirected to
+     */
+    public abstract String processAuthentication(HttpServletRequest request);
+
+    @JsonIgnore
+    public abstract ExternalUser getUser(HttpServletRequest request);
+
+    public abstract void updateAuthData(HttpServletRequest request);
+
+    @JsonIgnore
+    public abstract List<ExternalRole> getRoles();
+}
diff --git a/server/src/com/imcode/imcms/model/ExternalToLocalRoleLinkModel.java b/server/src/com/imcode/imcms/model/ExternalToLocalRoleLinkModel.java
new file mode 100644
index 0000000000..848ec81598
--- /dev/null
+++ b/server/src/com/imcode/imcms/model/ExternalToLocalRoleLinkModel.java
@@ -0,0 +1,52 @@
+package com.imcode.imcms.model;
+
+import com.imcode.imcms.domain.dto.ExternalRole;
+import com.imcode.imcms.domain.dto.ExternalToLocalRoleLink;
+import imcode.server.user.RoleDomainObject;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ExternalToLocalRoleLinkModel extends ExternalToLocalRoleLink {
+
+    private RoleDomainObject role;
+
+    public ExternalToLocalRoleLinkModel(ExternalToLocalRoleLink from) {
+        super(from);
+    }
+
+    public ExternalToLocalRoleLinkModel(ExternalRole externalRole, RoleDomainObject localRole) {
+        this(externalRole.getProviderId(), externalRole.getId(), localRole);
+    }
+
+    public ExternalToLocalRoleLinkModel(String providerId, String externalRoleId, RoleDomainObject localRole) {
+        this(null, providerId, externalRoleId, localRole);
+    }
+
+    public ExternalToLocalRoleLinkModel(Integer id, String providerId, String externalRoleId, RoleDomainObject localRole) {
+        super(id, providerId, externalRoleId, localRole.getId().intValue());
+        this.role = localRole;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getProviderId() {
+        return providerId;
+    }
+
+    public String getExternalRoleId() {
+        return externalRoleId;
+    }
+
+    public Integer getLocalRoleId() {
+        return localRoleId;
+    }
+
+    public RoleDomainObject getRole() {
+        return role;
+    }
+
+}
diff --git a/server/src/com/imcode/imcms/model/ExternalUser.java b/server/src/com/imcode/imcms/model/ExternalUser.java
new file mode 100644
index 0000000000..4bd2b57f66
--- /dev/null
+++ b/server/src/com/imcode/imcms/model/ExternalUser.java
@@ -0,0 +1,29 @@
+package com.imcode.imcms.model;
+
+import com.imcode.imcms.domain.dto.ExternalRole;
+import imcode.server.user.UserDomainObject;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Set;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExternalUser extends UserDomainObject {
+
+    /**
+     * in UUID form
+     */
+
+    private String externalId;
+
+    private Set<ExternalRole> externalRoles;
+
+    {
+        setImcmsExternal(true);
+    }
+
+    public ExternalUser(String externalProviderId) {
+        setExternalProviderId(externalProviderId);
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/AdminManagerSearchPage.java b/server/src/com/imcode/imcms/servlet/AdminManagerSearchPage.java
index 29c3a1b6b2..2e60a5cb4a 100644
--- a/server/src/com/imcode/imcms/servlet/AdminManagerSearchPage.java
+++ b/server/src/com/imcode/imcms/servlet/AdminManagerSearchPage.java
@@ -4,21 +4,21 @@
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import java.io.IOException;
 
 public class AdminManagerSearchPage extends SearchDocumentsPage {
 
     private AdminManager.AdminManagerPage adminManagerPage;
 
-    public AdminManagerSearchPage( AdminManager.AdminManagerPage adminManagerPage ) {
+    public AdminManagerSearchPage(AdminManager.AdminManagerPage adminManagerPage) {
         this.adminManagerPage = adminManagerPage;
     }
 
     public String getPath(HttpServletRequest request) {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
         return "/imcms/" + user.getLanguageIso639_2() + "/jsp/admin/admin_manager.jsp";
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/AjaxServlet.java b/server/src/com/imcode/imcms/servlet/AjaxServlet.java
new file mode 100644
index 0000000000..6138175a61
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/AjaxServlet.java
@@ -0,0 +1,37 @@
+package com.imcode.imcms.servlet;
+
+import org.apache.commons.lang.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Tommy Ullberg, imCode
+ * Mail: tommy@imcode.com
+ * Date: 2010-dec-14
+ * Time: 09:52:17
+ */
+public class AjaxServlet extends HttpServlet {
+
+    public static String getPath(String contextPath) {
+        return contextPath + "/servlet/AjaxServlet";
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        handleRequest(request, response);
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        handleRequest(request, response);
+    }
+
+    protected void handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String action = StringUtils.defaultString(request.getParameter("action"));
+		request.getRequestDispatcher("/WEB-INF/imcms/jsp/ajax_data.jsp").forward(request, response);
+    }
+
+}
diff --git a/server/src/com/imcode/imcms/servlet/AuthenticationProvidersServlet.java b/server/src/com/imcode/imcms/servlet/AuthenticationProvidersServlet.java
new file mode 100644
index 0000000000..b73bc7a205
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/AuthenticationProvidersServlet.java
@@ -0,0 +1,22 @@
+package com.imcode.imcms.servlet;
+
+import imcode.server.Imcms;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class AuthenticationProvidersServlet extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Imcms.getServices()
+                .getAuthenticationProviderService().getAuthenticationProviders();
+
+
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/BackDoc.java b/server/src/com/imcode/imcms/servlet/BackDoc.java
index 185471b727..78118ecc0d 100644
--- a/server/src/com/imcode/imcms/servlet/BackDoc.java
+++ b/server/src/com/imcode/imcms/servlet/BackDoc.java
@@ -1,5 +1,6 @@
 package com.imcode.imcms.servlet;
 
+import com.imcode.imcms.mapping.DocumentMapper;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.document.DocumentDomainObject;
@@ -13,57 +14,55 @@
 import java.io.IOException;
 import java.util.Stack;
 
-import com.imcode.imcms.mapping.DocumentMapper;
-
 public class BackDoc extends HttpServlet {
 
-    /**
-     * doGet()
-     */
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public static DocumentDomainObject getNextToLastTextDocumentFromHistory(Stack history, ImcmsServices imcref) {
 
-        ImcmsServices imcref = Imcms.getServices();
-        Utility.setDefaultHtmlContentType( res );
+        DocumentMapper documentMapper = imcref.getDocumentMapper();
+        DocumentDomainObject document = documentMapper.getDocument((Integer) history.pop()); // remove top document from stack ( this is current text document )
 
-        Stack history = (Stack)req.getSession().getAttribute( "history" );
-        DocumentDomainObject lastTextDocument = getNextToLastTextDocumentFromHistory( history, imcref );
+        if (null != history && !history.empty()) {
 
-        if (null != lastTextDocument ) {
-            req.getSession().setAttribute( "history", history );
-            redirectToDocumentId( req, res, lastTextDocument.getId() );
-        } else {
-            redirectToDocumentId( req, res, imcref.getSystemData().getStartDocument() );
+            while (!history.empty()) {
+                document = documentMapper.getDocument((Integer) history.pop());
+                if (isTextDocument(document)) {
+                    break;
+                }
+            }
         }
+        return document;
     }
 
-    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-        doGet(req,res);
-    }
-
-    private void redirectToDocumentId( HttpServletRequest request, HttpServletResponse response, int meta_id ) throws IOException {
-        DocumentDomainObject document = Imcms.getServices().getDocumentMapper().getDocument( meta_id ) ;
-        response.sendRedirect( Utility.getAbsolutePathToDocument( request, document ) );
+    private static boolean isTextDocument(DocumentDomainObject document) {
+        return DocumentTypeDomainObject.TEXT == document.getDocumentType();
     }
 
-    public static DocumentDomainObject getNextToLastTextDocumentFromHistory( Stack history, ImcmsServices imcref ) {
+    /**
+     * doGet()
+     */
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
-        DocumentMapper documentMapper = imcref.getDocumentMapper();
-        DocumentDomainObject document = documentMapper.getDocument((Integer) history.pop() ); // remove top document from stack ( this is current text document )
+        ImcmsServices imcref = Imcms.getServices();
+        Utility.setDefaultHtmlContentType(res);
 
-        if ( null != history && !history.empty() ) {
+        Stack history = (Stack) req.getSession().getAttribute("history");
+        DocumentDomainObject lastTextDocument = getNextToLastTextDocumentFromHistory(history, imcref);
 
-            while ( !history.empty() ) {
-                document = documentMapper.getDocument( (Integer)history.pop() );
-                if ( isTextDocument( document ) ) {
-                    break;
-                }
-            }
+        if (null != lastTextDocument) {
+            req.getSession().setAttribute("history", history);
+            redirectToDocumentId(req, res, lastTextDocument.getId());
+        } else {
+            redirectToDocumentId(req, res, imcref.getSystemData().getStartDocument());
         }
-        return document;
     }
 
-    private static boolean isTextDocument(DocumentDomainObject document) {
-        return DocumentTypeDomainObject.TEXT == document.getDocumentType();
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+
+    private void redirectToDocumentId(HttpServletRequest request, HttpServletResponse response, int meta_id) throws IOException {
+        DocumentDomainObject document = Imcms.getServices().getDocumentMapper().getDocument(meta_id);
+        response.sendRedirect(Utility.getAbsolutePathToDocument(request, document));
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/ClearImageCache.java b/server/src/com/imcode/imcms/servlet/ClearImageCache.java
new file mode 100644
index 0000000000..d6fa0f6a10
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/ClearImageCache.java
@@ -0,0 +1,96 @@
+package com.imcode.imcms.servlet;
+
+import com.imcode.imcms.api.ContentManagementSystem;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+public class ClearImageCache extends HttpServlet {
+    private static final long serialVersionUID = -1300585302771072394L;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        ContentManagementSystem cms = ContentManagementSystem.fromRequest(request);
+
+        if (!cms.getCurrentUser().isSuperAdmin()) {
+            response.sendError(HttpServletResponse.SC_FORBIDDEN);
+
+            return;
+        }
+
+        boolean all = BooleanUtils.toBoolean(request.getParameter("all"));
+
+        Integer metaId = null;
+        Integer no = null;
+        String fileNo = null;
+
+        try {
+            metaId = Integer.parseInt(StringUtils.trimToNull(request.getParameter("meta_id")));
+        } catch (NumberFormatException ex) {
+        }
+
+        try {
+            no = Integer.parseInt(StringUtils.trimToNull(request.getParameter("no")));
+        } catch (NumberFormatException ex) {
+        }
+
+        try {
+            fileNo = StringUtils.trimToNull(request.getParameter("file_no"));
+        } catch (NumberFormatException ex) {
+        }
+
+
+        String message;
+
+        if (!all && metaId == null) {
+            message = "Invalid parameters";
+
+        } else if (all && metaId != null) {
+            message = "Specify one of: all or meta_id";
+
+        } else if (all) {
+            message = "Deleted all";
+
+            ImageCacheManager.clearAllCacheEntries();
+        } else {
+            message = "Deleted meta_id=" + metaId;
+
+            if (no != null) {
+                message += ", " + "no=" + no;
+                ImageCacheManager.clearCacheEntries(metaId, no);
+
+            } else if (fileNo != null) {
+                message += ", " + "file_no=" + fileNo;
+                ImageCacheManager.clearCacheEntries(metaId, fileNo);
+
+            } else {
+                ImageCacheManager.clearCacheEntries(metaId);
+
+            }
+        }
+
+        byte[] data = message.getBytes(StandardCharsets.UTF_8);
+
+        response.setContentType("text/plain");
+        response.setCharacterEncoding("UTF-8");
+        response.setContentLength(data.length);
+
+        OutputStream output = null;
+        try {
+            output = response.getOutputStream();
+
+            output.write(data);
+            output.flush();
+        } finally {
+            IOUtils.closeQuietly(output);
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/ContextListener.java b/server/src/com/imcode/imcms/servlet/ContextListener.java
index a92e91ccb5..f1d2ad44e3 100644
--- a/server/src/com/imcode/imcms/servlet/ContextListener.java
+++ b/server/src/com/imcode/imcms/servlet/ContextListener.java
@@ -1,83 +1,102 @@
 package com.imcode.imcms.servlet;
 
+import com.imcode.imcms.domain.services.core.ServerSettingsChecker;
 import imcode.server.Imcms;
 import imcode.util.Prefs;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-import org.apache.commons.logging.LogFactory;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.regex.Matcher;
 
 public class ContextListener implements ServletContextListener {
 
-    public void contextInitialized(ServletContextEvent servletContextEvent) {
+    /**
+     * Became accessible only after {@link #configureLogging} method calling
+     */
+    private static Logger log;
+	private static final String WEB_APP_PATH_REGEX = "(?i)\\$\\{\\s*WEB_APP_PATH\\s*}";
+
+	public void contextInitialized(ServletContextEvent servletContextEvent) {
         ServletContext servletContext = servletContextEvent.getServletContext();
         final File realPathToWebApp = new File(servletContext.getRealPath("/"));
 
         File configPath = new File(realPathToWebApp, "WEB-INF/conf");
         Prefs.setConfigPath(configPath);
 
-        configureLogging(servletContext, realPathToWebApp, configPath);
+        configureLogging(realPathToWebApp, configPath);
+        ServerSettingsChecker.check();
+        logPlatformInfo(servletContext.getServerInfo());
 
-        Logger log = Logger.getLogger(ContextListener.class);
         try {
             Imcms.setPath(realPathToWebApp);
             log.info("imCMS initialized.");
         } catch (RuntimeException e) {
-            log.fatal("Failed to initialize imCMS.",e);
+            log.fatal("Failed to initialize imCMS.", e);
         }
     }
 
     public void contextDestroyed(ServletContextEvent servletContextEvent) {
-        Logger log = Logger.getLogger(ContextListener.class);
         log.debug("Stopping imCMS.");
+
         try {
             Imcms.stop();
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.error("Stopping imCMS failed.", e);
         }
+
         log.debug("Shutting down logging.");
+
         try {
             LogManager.shutdown();
         } catch (Exception e) {
-            System.err.println(e);
-        }
-        try {
-            LogFactory.releaseAll();
-        } catch (Exception e) {
-            System.err.println(e);
+            e.printStackTrace();
         }
     }
 
-    private void configureLogging(ServletContext servletContext, File root, File configPath) {
-        System.setProperty("com.imcode.imcms.path", root.toString());
-        File configFile = new File(configPath, "log4j.xml");
-        DOMConfigurator.configure(configFile.toString());
-        Logger log = Logger.getLogger(ContextListener.class);
+    private void configureLogging(File root, File configPath) {
+	    File configFile = new File(configPath, "log4j2.xml");
+	    updateLog4jConfigFile(root, configFile);
+
+	    Configurator.reconfigure(configFile.toURI());
+        log = LogManager.getLogger(ContextListener.class);
         log.info("Logging started");
-        logPlatformInfo(servletContext, log);
     }
 
-    private void logPlatformInfo(ServletContext application, Logger log) {
-
-        log.info("Servlet Engine: " + application.getServerInfo());
-        String[] systemPropertyNames = new String[] {
-                "java.version",
-                "java.vendor",
-                "java.class.path",
-                "os.name",
-                "os.arch",
-                "os.version",
-        };
-        for ( int i = 0; i < systemPropertyNames.length; i++ ) {
-            String systemPropertyName = systemPropertyNames[i];
-            log.info(systemPropertyName + ": " + System.getProperty(systemPropertyName));
+	private void updateLog4jConfigFile(File webappRealPath, File log4jConfig) {
+		try {
+			final String webappRootPath = webappRealPath.getCanonicalPath().replaceAll("\\\\", "/");
+			final String log4jConfigData = FileUtils
+					.readFileToString(log4jConfig, StandardCharsets.UTF_8)
+					.replaceAll(WEB_APP_PATH_REGEX, Matcher.quoteReplacement(webappRootPath));
+
+			FileUtils.write(log4jConfig, log4jConfigData);
+		} catch (IOException e) {
+			throw new RuntimeException("Cannot update log4j configuration file", e);
+		}
+	}
+
+    private void logPlatformInfo(String serverInfo) {
+        log.info("Servlet Engine: " + serverInfo);
+        log.info("System properties:");
+
+        for (String name : System.getProperties().stringPropertyNames()) {
+            log.info(name + ": " + System.getProperty(name));
         }
 
+        log.info("Environment:");
+
+        for (Map.Entry<String, String> entry : System.getenv().entrySet()) {
+            log.info(entry.getKey() + ": " + entry.getValue());
+        }
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/DocumentFinder.java b/server/src/com/imcode/imcms/servlet/DocumentFinder.java
index 2a53c8118a..5a919a0a96 100644
--- a/server/src/com/imcode/imcms/servlet/DocumentFinder.java
+++ b/server/src/com/imcode/imcms/servlet/DocumentFinder.java
@@ -11,28 +11,30 @@
 import imcode.server.document.index.SimpleDocumentQuery;
 import imcode.util.Utility;
 import org.apache.commons.collections.SetUtils;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static org.apache.lucene.search.BooleanClause.Occur;
+
 public class DocumentFinder extends WebComponent {
 
     private Handler<Integer> selectDocumentCommand;
     private Query restrictingQuery;
     private QueryParser queryParser = new DefaultQueryParser();
-    private Set extraSearchResultColumns = SetUtils.orderedSet( new HashSet() ) ;
-    private DocumentFinderPage page ;
-    private Comparator documentComparator ;
+    private Set extraSearchResultColumns = SetUtils.orderedSet(new HashSet());
+    private DocumentFinderPage page;
+    private Comparator<DocumentDomainObject> documentComparator;
     private boolean logged;
 
     public DocumentFinder() {
@@ -40,67 +42,71 @@ public DocumentFinder() {
     }
 
     public DocumentFinder(DocumentFinderPage page) {
-        this.page = page ;
+        this.page = page;
         page.setDocumentFinder(this);
     }
 
-    public void selectDocument(DocumentDomainObject selectedDocument) throws IOException, ServletException {
-        selectDocumentCommand.handle( selectedDocument.getId() );
+    public void selectDocument(DocumentDomainObject selectedDocument) {
+        selectDocumentCommand.handle(selectedDocument.getId());
     }
 
-    public void forward( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
+    public void forward(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         forwardWithPage(request, response, page);
     }
 
     void forwardWithPage(HttpServletRequest request, HttpServletResponse response, DocumentFinderPage page) throws IOException, ServletException {
         ImcmsServices service = Imcms.getServices();
         DocumentIndex index = service.getDocumentMapper().getDocumentIndex();
-        final BooleanQuery booleanQuery = new BooleanQuery();
-        if ( null != page.getQuery() ) {
-            booleanQuery.add( page.getQuery(), true, false );
+        final BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+
+        if (null != page.getQuery()) {
+            booleanQueryBuilder.add(page.getQuery(), Occur.MUST);
         }
-        if ( null != restrictingQuery ) {
-            booleanQuery.add( restrictingQuery, true, false );
+        if (null != restrictingQuery) {
+            booleanQueryBuilder.add(restrictingQuery, Occur.MUST);
         }
-        if ( booleanQuery.getClauses().length > 0 ) {
-            List documentsFound = index.search(new SimpleDocumentQuery(booleanQuery, null, logged), Utility.getLoggedOnUser( request ) );
+
+        final BooleanQuery booleanQuery = booleanQueryBuilder.build();
+
+        if (booleanQuery.iterator().hasNext()) {
+            List<DocumentDomainObject> documentsFound = index.search(new SimpleDocumentQuery(booleanQuery, null, logged), Utility.getLoggedOnUser(request));
             if (null != documentComparator) {
-                Collections.sort(documentsFound, documentComparator) ;
+                documentsFound.sort(documentComparator);
             }
-            page.setDocumentsFound( documentsFound );
+            page.setDocumentsFound(documentsFound);
         }
-        page.forward( request, response );
+        page.forward(request, response);
     }
 
     public boolean isDocumentsSelectable() {
         return null != selectDocumentCommand;
     }
 
-    public void setSelectDocumentCommand( Handler<Integer> selectDocumentCommand ) {
+    public void setSelectDocumentCommand(Handler<Integer> selectDocumentCommand) {
         this.selectDocumentCommand = selectDocumentCommand;
     }
 
-    public void setRestrictingQuery( Query restrictingQuery ) {
+    public void setRestrictingQuery(Query restrictingQuery) {
         this.restrictingQuery = restrictingQuery;
     }
 
-    public void setQueryParser( QueryParser queryParser ) {
+    public void setQueryParser(QueryParser queryParser) {
         this.queryParser = queryParser;
     }
 
-    public Query parse( String queryString ) throws ParseException {
-        return queryParser.parse( queryString );
+    public Query parse(String queryString) throws ParseException {
+        return queryParser.parse(queryString);
     }
 
-    public void addExtraSearchResultColumn( SearchResultColumn searchResultColumn ) {
-        extraSearchResultColumns.add(searchResultColumn) ;
+    public void addExtraSearchResultColumn(SearchResultColumn searchResultColumn) {
+        extraSearchResultColumns.add(searchResultColumn);
     }
 
     public SearchResultColumn[] getExtraSearchResultColumns() {
-        return (SearchResultColumn[])extraSearchResultColumns.toArray( new SearchResultColumn[extraSearchResultColumns.size()] );
+        return (SearchResultColumn[]) extraSearchResultColumns.toArray(new SearchResultColumn[extraSearchResultColumns.size()]);
     }
 
-    public void setDocumentComparator( Comparator documentComparator ) {
+    public void setDocumentComparator(Comparator<DocumentDomainObject> documentComparator) {
         this.documentComparator = documentComparator;
     }
 
@@ -114,7 +120,7 @@ public void setLogged(boolean logged) {
 
     public interface SearchResultColumn extends Serializable {
 
-        String render( DocumentDomainObject document, HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException;
+        String render(DocumentDomainObject document, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
 
         LocalizedMessage getName();
     }
diff --git a/server/src/com/imcode/imcms/servlet/DocumentFinderPage.java b/server/src/com/imcode/imcms/servlet/DocumentFinderPage.java
index fe0def92b1..8b57fd3f20 100644
--- a/server/src/com/imcode/imcms/servlet/DocumentFinderPage.java
+++ b/server/src/com/imcode/imcms/servlet/DocumentFinderPage.java
@@ -2,11 +2,11 @@
 
 import org.apache.lucene.search.Query;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.util.List;
 import java.io.IOException;
+import java.util.List;
 
 public interface DocumentFinderPage {
 
@@ -14,7 +14,7 @@ public interface DocumentFinderPage {
 
     void setDocumentsFound(List documentsFound);
 
-    void forward(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException ;
+    void forward(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException;
 
     void setDocumentFinder(DocumentFinder documentFinder);
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/servlet/EncodingFilter.java b/server/src/com/imcode/imcms/servlet/EncodingFilter.java
new file mode 100644
index 0000000000..842c021b4b
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/EncodingFilter.java
@@ -0,0 +1,27 @@
+package com.imcode.imcms.servlet;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+public class EncodingFilter implements Filter {
+	private String encoding = "UTF-8";
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		final String encodingParam = filterConfig.getInitParameter("encoding");
+		if (encodingParam != null) {
+			encoding = encodingParam;
+		}
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		request.setCharacterEncoding(encoding);
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void destroy() {
+
+	}
+}
diff --git a/server/src/com/imcode/imcms/servlet/GetDoc.java b/server/src/com/imcode/imcms/servlet/GetDoc.java
index 2842c54d69..320ab7c609 100644
--- a/server/src/com/imcode/imcms/servlet/GetDoc.java
+++ b/server/src/com/imcode/imcms/servlet/GetDoc.java
@@ -1,54 +1,48 @@
 package com.imcode.imcms.servlet;
 
-import com.imcode.imcms.mapping.DocumentMapper;
 import com.imcode.db.commands.SqlQueryCommand;
-import imcode.server.*;
+import com.imcode.imcms.mapping.DocumentMapper;
+import imcode.server.DocumentRequest;
+import imcode.server.Imcms;
+import imcode.server.ImcmsConstants;
+import imcode.server.ImcmsServices;
 import imcode.server.document.*;
+import imcode.server.kerberos.KerberosLoginResult;
+import imcode.server.kerberos.KerberosLoginStatus;
 import imcode.server.parser.ParserParameters;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
-import org.apache.oro.text.perl.Perl5Util;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.time.StopWatch;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.oro.text.perl.Perl5Util;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.*;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.SocketException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
 
 public class GetDoc extends HttpServlet {
 
-    private final static Logger TRACK_LOG = Logger.getLogger(ImcmsConstants.ACCESS_LOG);
-    private final static Logger LOG = Logger.getLogger(GetDoc.class.getName());
+    public static final String REQUEST_PARAMETER__FILE_ID = "file_id";
+    private final static Logger TRACK_LOG = LogManager.getLogger(ImcmsConstants.ACCESS_LOG);
+    private final static Logger LOG = LogManager.getLogger(GetDoc.class.getName());
     private final static String NO_ACTIVE_DOCUMENT_URL = "no_active_document.html";
-
     private static final String HTTP_HEADER_REFERRER = "Referer";// Note, intended misspelling of "Referrer", according to the HTTP spec.
-    public static final String REQUEST_PARAMETER__FILE_ID = "file_id";
-
-    public void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
-        doGet(req, res);
-    }
-
-    /** doGet() */
-    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-        String documentId = req.getParameter("meta_id");
-        viewDoc(documentId, req, res);
-    }
 
     public static void viewDoc(String documentId, HttpServletRequest req,
-                         HttpServletResponse res) throws IOException, ServletException {
+                               HttpServletResponse res) throws IOException, ServletException {
         ImcmsServices imcref = Imcms.getServices();
         DocumentMapper documentMapper = imcref.getDocumentMapper();
-        DocumentDomainObject document = documentMapper.getDocument( documentId );
+        DocumentDomainObject document = documentMapper.getDocument(documentId);
         if (null == document) {
             res.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
@@ -58,8 +52,7 @@ public static void viewDoc(String documentId, HttpServletRequest req,
     }
 
     public static void viewDoc(DocumentDomainObject document, HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
-        NDC.push("" + document.getId());
-        try {
+        try(CloseableThreadContext.Instance ignored=CloseableThreadContext.push("" + document.getId());) {
             StopWatch stopWatch = new StopWatch();
             stopWatch.start();
 
@@ -67,8 +60,6 @@ public static void viewDoc(DocumentDomainObject document, HttpServletRequest req
             stopWatch.stop();
             long renderTime = stopWatch.getTime();
             LOG.trace("Rendering document " + document.getId() + " took " + renderTime + "ms.");
-        } finally {
-            NDC.pop();
         }
     }
 
@@ -77,29 +68,29 @@ private static void privateGetDoc(DocumentDomainObject document, HttpServletResp
         ImcmsServices imcref = Imcms.getServices();
 
         HttpSession session = req.getSession(true);
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
         DocumentMapper documentMapper = imcref.getDocumentMapper();
 
-        if ( null == document ) {
+        if (null == document) {
             res.sendError(HttpServletResponse.SC_NOT_FOUND);
-            return ;
+            return;
         }
 
         Stack history = (Stack) req.getSession().getAttribute("history");
-        if ( history == null ) {
+        if (history == null) {
             history = new Stack();
             req.getSession().setAttribute("history", history);
         }
 
-        Integer meta_int = new Integer(document.getId());
-        if ( isTextDocument(document) && ( history.empty() || !history.peek().equals(meta_int))) {
+        Integer meta_int = document.getId();
+        if (isTextDocument(document) && (history.empty() || !history.peek().equals(meta_int))) {
             history.push(meta_int);
         }
 
         String referrer = req.getHeader(HTTP_HEADER_REFERRER);
         DocumentDomainObject referringDocument = null;
         Perl5Util perlrx = new Perl5Util();
-        if ( null != referrer && perlrx.match("/meta_id=(\\d+)/", referrer) ) {
+        if (null != referrer && perlrx.match("/meta_id=(\\d+)/", referrer)) {
             int referring_meta_id = Integer.parseInt(perlrx.group(1));
             referringDocument = documentMapper.getDocument(referring_meta_id);
         }
@@ -110,108 +101,118 @@ private static void privateGetDoc(DocumentDomainObject document, HttpServletResp
         Cookie[] cookies = req.getCookies();
         HashMap cookieHash = new HashMap();
 
-        for ( int i = 0; cookies != null && i < cookies.length; ++i ) {
+        for (int i = 0; cookies != null && i < cookies.length; ++i) {
             Cookie currentCookie = cookies[i];
             cookieHash.put(currentCookie.getName(), currentCookie.getValue());
         }
 
-        Revisits revisits = new Revisits();
-
-        if ( cookieHash.get("imVisits") == null ) {
-            Date now = new Date();
-            long lNow = now.getTime();
-            String sNow = "" + lNow;
-            Cookie resCookie = new Cookie("imVisits", session.getId() + sNow);
-            resCookie.setMaxAge(31500000);
-            resCookie.setPath("/");
-            res.addCookie(resCookie);
-            revisits.setRevisitsId(session.getId());
-            revisits.setRevisitsDate(sNow);
-        } else {
-            revisits.setRevisitsId(cookieHash.get("imVisits").toString());
-        }
-        documentRequest.setRevisits(revisits);
+        if (!user.canAccess(document)) {
+            if (imcref.getConfig().isSsoEnabled() && user.isDefaultUser()) {
+                KerberosLoginResult loginResult = imcref.getKerberosLoginService().login(req, res);
+
+                if (loginResult.getStatus() == KerberosLoginStatus.SUCCESS) {
+                    privateGetDoc(document, res, req);
+                }
+
+                return;
+            }
 
-        if ( !user.canAccess(document) ) {
             Utility.forwardToLogin(req, res);
             return;
         }
 
-        if ( !document.isPublished() && !user.canEdit(document) ) {
+        if (!document.isPublished() && !user.canEdit(document)) {
             res.setStatus(HttpServletResponse.SC_FORBIDDEN);
             Utility.setDefaultHtmlContentType(res);
-            imcref.getAdminTemplate(NO_ACTIVE_DOCUMENT_URL, user, null);
+            String tempstring = imcref.getAdminTemplate(NO_ACTIVE_DOCUMENT_URL, user, null);
+
+            byte[] tempbytes = tempstring.getBytes(Imcms.DEFAULT_ENCODING);
+            res.setContentLength(tempbytes.length);
+            res.getOutputStream().write(tempbytes);
+
             return;
         }
 
-        if ( document instanceof UrlDocumentDomainObject ) {
-            String url_ref = ( (UrlDocumentDomainObject) document ).getUrl();
+        if (document instanceof UrlDocumentDomainObject) {
+            String url_ref = ((UrlDocumentDomainObject) document).getUrl();
             res.sendRedirect(url_ref);
             // Log to accesslog
             TRACK_LOG.info(documentRequest);
-            return ;
-        } else if ( document instanceof BrowserDocumentDomainObject ) {
+            return;
+        } else if (document instanceof BrowserDocumentDomainObject) {
 
             String br_id = req.getHeader("User-Agent");
-            if ( br_id == null ) {
+            if (br_id == null) {
                 br_id = "";
             }
-            final Object[] parameters = new String[] { "" + document.getId(), br_id };
+            final Object[] parameters = new String[]{"" + document.getId(), br_id};
             String destinationMetaId = (String) imcref.getDatabase().execute(new SqlQueryCommand("select to_meta_id\n"
-                                                                                                 + "from browser_docs\n"
-                                                                                                 + "join browsers on browsers.browser_id = browser_docs.browser_id\n"
-                                                                                                 + "where meta_id = ? and ? like user_agent order by value desc", parameters, Utility.SINGLE_STRING_HANDLER));
+                    + "from browser_docs\n"
+                    + "join browsers on browsers.browser_id = browser_docs.browser_id\n"
+                    + "where meta_id = ? and ? like user_agent order by value desc", parameters, Utility.SINGLE_STRING_HANDLER));
             int toMetaId;
-            if ( destinationMetaId != null && !"".equals(destinationMetaId) ) {
+            if (destinationMetaId != null && !"".equals(destinationMetaId)) {
                 toMetaId = Integer.parseInt(destinationMetaId);
             } else {
-                Map browserDocumentIdMap = ( (BrowserDocumentDomainObject) document ).getBrowserDocumentIdMap();
-                toMetaId = ( (Integer) browserDocumentIdMap.get(BrowserDocumentDomainObject.Browser.DEFAULT) ).intValue();
+                Map browserDocumentIdMap = ((BrowserDocumentDomainObject) document).getBrowserDocumentIdMap();
+                toMetaId = (Integer) browserDocumentIdMap.get(BrowserDocumentDomainObject.Browser.DEFAULT);
             }
 
             res.sendRedirect("GetDoc?meta_id=" + toMetaId);
             // Log to accesslog
             TRACK_LOG.info(documentRequest);
-            return ;
-        } else if ( document instanceof HtmlDocumentDomainObject ) {
+            return;
+        } else if (document instanceof HtmlDocumentDomainObject) {
             Utility.setDefaultHtmlContentType(res);
-            String htmlDocumentData = ((HtmlDocumentDomainObject)document).getHtml();
+            String htmlDocumentData = ((HtmlDocumentDomainObject) document).getHtml();
             TRACK_LOG.info(documentRequest);
             res.getWriter().write(htmlDocumentData);
-        } else if ( document instanceof FileDocumentDomainObject ) {
+        } else if (document instanceof FileDocumentDomainObject) {
             String fileId = req.getParameter(REQUEST_PARAMETER__FILE_ID);
             FileDocumentDomainObject fileDocument = (FileDocumentDomainObject) document;
             FileDocumentDomainObject.FileDocumentFile file = fileDocument.getFileOrDefault(fileId);
             String filename = file.getFilename();
             String mimetype = file.getMimeType();
             InputStream fr;
+
             try {
                 fr = new BufferedInputStream(file.getInputStreamSource().getInputStream());
-            } catch ( IOException ex ) {
+            } catch (IOException ex) {
                 res.sendError(HttpServletResponse.SC_NOT_FOUND);
-                return ;
+                return;
             }
+
+            // Workaround for #11619 - Android device refuses to download a file from build-in browser.
+            // Might not help if user agent is changed manually and does not contain "android".
+            String browserId = req.getHeader("User-Agent");
+            boolean attachment = req.getParameter("download") != null
+                    || (browserId != null && browserId.toLowerCase().contains("android"));
+
             int len = fr.available();
-            ServletOutputStream out = res.getOutputStream();
-            res.setContentLength(len);
-            res.setContentType(mimetype);
-            String content_disposition = ( null != req.getParameter("download") ? "attachment" : "inline" )
-                                         + "; filename=\""
-                                         + filename
-                                         + "\"";
-            res.setHeader("Content-Disposition", content_disposition);
+            String content_disposition = (attachment ? "attachment" : "inline")
+                    + "; filename=\""
+                    + filename
+                    + "\"";
+
+            ServletOutputStream out = null;
+
             try {
-                int bytes_read;
-                byte[] buffer = new byte[32768];
-                while ( -1 != ( bytes_read = fr.read(buffer) ) ) {
-                    out.write(buffer, 0, bytes_read);
+                out = res.getOutputStream();
+
+                res.setContentLength(len);
+                res.setContentType(mimetype);
+                res.setHeader("Content-Disposition", content_disposition);
+
+                try {
+                    IOUtils.copy(fr, out);
+                } catch (SocketException ex) {
+                    LOG.debug("Exception occurred", ex);
                 }
-            } catch ( SocketException ex ) {
-                LOG.debug("Exception occured", ex);
+            } finally {
+                IOUtils.closeQuietly(fr);
+                IOUtils.closeQuietly(out);
             }
-            fr.close();
-            out.flush();
-            out.close();
+
             // Log to accesslog
             TRACK_LOG.info(documentRequest);
         } else {
@@ -231,4 +232,15 @@ private static boolean isTextDocument(DocumentDomainObject document) {
         return DocumentTypeDomainObject.TEXT == document.getDocumentType();
     }
 
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
+        doGet(req, res);
+    }
+
+    /**
+     * doGet()
+     */
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        String documentId = req.getParameter("meta_id");
+        viewDoc(documentId, req, res);
+    }
 }
diff --git a/server/src/com/imcode/imcms/servlet/Help.java b/server/src/com/imcode/imcms/servlet/Help.java
deleted file mode 100644
index f93775e3cd..0000000000
--- a/server/src/com/imcode/imcms/servlet/Help.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.imcode.imcms.servlet;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.log4j.Logger;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.util.Properties;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class Help extends HttpServlet{
-
-    private final static Logger log = Logger.getLogger( GetDoc.class.getName() );
-
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws IOException, ServletException {
-        doGet( req, res );
-    }
-
-    /**
-     * doGet()
-     */
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-
-        String helpDocName = req.getParameter("name");
-        String lang = req.getParameter("lang") ;
-        Properties helpProp ;
-        int helpdoc;
-
-        try{
-            helpProp = loadProperties("/WEB-INF/help/helpdoc_" + lang + ".properties");
-
-            try{
-                helpdoc = Integer.parseInt(helpProp.getProperty(helpDocName));
-                res.sendRedirect( helpdoc + "" );
-            }catch(NumberFormatException e) {
-                log.error("Help link error, help doc name: " + helpDocName + ",  no corresponding meta_id found.");
-                res.sendError(HttpStatus.SC_NOT_FOUND);
-            }
-        }catch(NullPointerException e ) {
-            log.error("Help link error, help doc name: " + helpDocName +  ", 'lang' parameter is wrong.");
-            res.sendError(HttpStatus.SC_NOT_FOUND);
-        }
-
-    }
-
-    private Properties loadProperties( String path ) throws IOException {
-        final InputStream resourceAsStream = getServletConfig().getServletContext().getResourceAsStream(path);
-        Properties properties = new Properties();
-        properties.load(resourceAsStream);
-        return properties;
-    }
-}
diff --git a/server/src/com/imcode/imcms/servlet/ImageCacheManager.java b/server/src/com/imcode/imcms/servlet/ImageCacheManager.java
new file mode 100644
index 0000000000..e251df2cb7
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/ImageCacheManager.java
@@ -0,0 +1,245 @@
+package com.imcode.imcms.servlet;
+
+import com.imcode.imcms.mapping.DocumentMapper;
+import com.imcode.imcms.mapping.ImageCacheMapper;
+import imcode.server.Imcms;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.textdocument.*;
+import imcode.util.ImcmsImageUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+
+public class ImageCacheManager {
+    private static final Logger log = LogManager.getLogger(ImageCacheManager.class);
+
+    private static final int CACHE_BUCKETS_COUNT = 40;
+
+    private static final File IMAGE_CACHE_PATH = Imcms.getServices().getConfig().getImageCachePath();
+    private static final long MAX_CACHE_SIZE = Imcms.getServices().getConfig().getImageCacheMaxSize();
+
+    private static final ExecutorService service = Executors.newSingleThreadExecutor();
+
+    public static File getCacheFile(ImageCacheDomainObject imageCache) {
+        // disk based hash buckets
+        String cacheId = imageCache.getId();
+        int bucket = getBucket(cacheId);
+
+        String entryPath = String.format("%d/%s", bucket, cacheId);
+
+        File imageFile = new File(IMAGE_CACHE_PATH, entryPath);
+        if (!imageFile.exists()) {
+            return null;
+        }
+
+        service.submit(() -> Imcms.getServices().getImageCacheMapper().incrementFrequency(imageCache.getId()));
+
+        return imageFile;
+    }
+
+    public static File storeImage(ImageCacheDomainObject imageCache, File imageFile) {
+        ImageCacheMapper imageCacheMapper = Imcms.getServices().getImageCacheMapper();
+
+        imageCache.setFrequency(1);
+
+        // clear 10% of text images cache, if too many entries
+        if (imageCacheMapper.getCacheFileSizeTotal() >= MAX_CACHE_SIZE) {
+            List<String> cacheIds = imageCacheMapper.deleteCacheLFUEntries();
+            deleteCacheFiles(cacheIds);
+        }
+
+        File cacheFile = processImage(imageCache, imageFile);
+        if (cacheFile == null) {
+            return null;
+        }
+
+        imageCache.setFileSize((int) cacheFile.length());
+        imageCacheMapper.addImageCache(imageCache);
+
+        return cacheFile;
+    }
+
+    public static void clearAllCacheEntries() {
+        clearCacheEntries(null, null, null);
+    }
+
+    public static void clearCacheEntries(int metaId) {
+        clearCacheEntries(metaId, null, null);
+    }
+
+    public static void clearCacheEntries(int metaId, int no) {
+        clearCacheEntries(metaId, no, null);
+    }
+
+    public static void clearCacheEntries(int metaId, String fileNo) {
+        if (fileNo == null) {
+            throw new IllegalArgumentException("fileNo can't be null");
+        }
+
+        clearCacheEntries(metaId, null, fileNo);
+    }
+
+    private static void clearCacheEntries(Integer metaId, Integer no, String fileNo) {
+        ImageCacheMapper mapper = Imcms.getServices().getImageCacheMapper();
+
+        if (metaId != null || no != null || fileNo != null) {
+            List<String> ids = mapper.getImagesCacheIds(metaId, no, fileNo);
+
+            deleteCacheFiles(ids);
+            mapper.deleteImagesCache(ids);
+        } else {
+            deleteAllCacheFiles();
+            mapper.deleteAllImagesCache();
+        }
+
+        deleteGeneratedFiles(metaId, no, fileNo);
+    }
+
+    private static void deleteGeneratedFiles(Integer metaId, Integer no, String fileNo) {
+        DocumentMapper docMapper = Imcms.getServices().getDocumentMapper();
+
+        int[] docIdsArr = docMapper.getAllDocumentIds();
+        List<Integer> docIds = new ArrayList<>(docIdsArr.length);
+
+
+        for (int docId : docIdsArr) {
+            docIds.add(docId);
+        }
+
+        List<DocumentDomainObject> docs = docMapper.getDocuments(docIds);
+
+        for (DocumentDomainObject doc : docs) {
+            if (!(doc instanceof TextDocumentDomainObject)) {
+                continue;
+            }
+
+            TextDocumentDomainObject textDoc = (TextDocumentDomainObject) doc;
+
+            if (metaId != null && !metaId.equals(textDoc.getId())) {
+                continue;
+            }
+
+            for (Entry<Integer, ImageDomainObject> entry : textDoc.getImages().entrySet()) {
+                int imageIndex = entry.getKey();
+                ImageDomainObject image = entry.getValue();
+
+                if (StringUtils.isEmpty(image.getGeneratedFilename())) {
+                    continue;
+                }
+
+                if (no != null && !no.equals(imageIndex)) {
+                    continue;
+                }
+
+                if (fileNo != null) {
+                    ImageSource source = image.getSource();
+
+                    if (!(source instanceof FileDocumentImageSource)) {
+                        continue;
+                    }
+
+                    String fileId = ((FileDocumentImageSource) source).getFileDocument().getDefaultFileId();
+
+                    if (!fileNo.equals(fileId)) {
+                        continue;
+                    }
+                }
+
+                File generatedFile = image.getGeneratedFile();
+                generatedFile.delete();
+            }
+        }
+    }
+
+    public static void deleteCacheFiles(Collection<String> cacheIds) {
+        for (String cacheId : cacheIds) {
+            int bucket = getBucket(cacheId);
+
+            File entryFile = new File(IMAGE_CACHE_PATH, String.format("%d/%s", bucket, cacheId));
+            entryFile.delete();
+        }
+    }
+
+    public static void destroy(){
+        service.shutdownNow();
+    }
+
+    private static void deleteAllCacheFiles() {
+        File[] dirs = IMAGE_CACHE_PATH.listFiles();
+        if (dirs == null) {
+            return;
+        }
+
+        for (File dir : dirs) {
+            if (!dir.isDirectory()) {
+                continue;
+            }
+
+            File[] entries = dir.listFiles();
+            if (entries == null) {
+                continue;
+            }
+
+            for (File entry : entries) {
+                if (entry.isFile()) {
+                    entry.delete();
+                }
+            }
+        }
+    }
+
+    private static File processImage(ImageCacheDomainObject imageCache, File imageFile) {
+        File bucketsRootFile = IMAGE_CACHE_PATH;
+
+        int bucket = getBucket(imageCache.getId());
+        File bucketFile = new File(bucketsRootFile, Integer.toString(bucket));
+        if (!bucketFile.exists()) {
+            bucketFile.mkdirs();
+        }
+
+        File cacheFile = new File(bucketFile, imageCache.getId());
+
+        try {
+            boolean result = ImcmsImageUtils.generateImage(imageFile, cacheFile, imageCache.getFormat(),
+                    imageCache.getWidth(), imageCache.getHeight(), imageCache.getResize(),
+                    imageCache.getCropRegion(), imageCache.getRotateDirection());
+
+            if (!result && cacheFile.exists()) {
+                cacheFile.delete();
+            }
+
+            return cacheFile;
+        } catch (Exception ex) {
+            log.warn(ex.getMessage(), ex);
+
+            if (cacheFile.exists()) {
+                cacheFile.delete();
+            }
+        }
+
+        return null;
+    }
+
+    private static int getBucket(String cacheId) {
+        return Math.abs(hashCode(cacheId)) % CACHE_BUCKETS_COUNT;
+    }
+
+    private static int hashCode(String value) {
+        int hash = 0;
+
+        for (int i = 0, len = value.length(); i < len; i++) {
+            hash = hash * 31 + value.charAt(i);
+        }
+
+        return hash;
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/ImageHandling.java b/server/src/com/imcode/imcms/servlet/ImageHandling.java
new file mode 100644
index 0000000000..8e57c897df
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/ImageHandling.java
@@ -0,0 +1,473 @@
+package com.imcode.imcms.servlet;
+
+import com.imcode.imcms.mapping.DocumentStoringVisitor;
+import imcode.server.Imcms;
+import imcode.server.document.FileDocumentDomainObject.FileDocumentFile;
+import imcode.server.document.textdocument.ImageCacheDomainObject;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.server.document.textdocument.ImageDomainObject.RotateDirection;
+import imcode.util.ImcmsImageUtils;
+import imcode.util.image.Format;
+import imcode.util.image.ImageInfo;
+import imcode.util.image.ImageOp;
+import imcode.util.image.Resize;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class ImageHandling extends HttpServlet {
+    public static final int IMAGE_MAX_DIMENSION = 4096;
+    private static final long serialVersionUID = 6075455980496678862L;
+    private static final Logger log = LogManager.getLogger(ImageHandling.class);
+    private static final Pattern FILENAME_PATTERN = Pattern.compile("/imagehandling/([^/]+?)/?$");
+    private static final Pattern DOT_OR_COLON_PATTERN = Pattern.compile("\\.{2,}|:+");
+    private static final Pattern ABSOLUTE_PATH_PATTERN = Pattern.compile("^(\\\\|/)+");
+    private static final String USER_AGENT = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/2.0.0.9";
+    private static final HttpClient HTTP_CLIENT = new HttpClient(new MultiThreadedHttpConnectionManager());
+    private static final List<String> ALLOWED_PATHS = new ArrayList<>();
+
+    static {
+        File rootFile = Imcms.getPath();
+        String cacheAllowedPaths = Imcms.getServices().getConfig().getImageCacheAllowedPaths();
+
+        String[] paths = StringUtils.split(cacheAllowedPaths, ';');
+        for (String path : paths) {
+            path = path.trim();
+
+            if (!StringUtils.isEmpty(path)) {
+                try {
+                    File file = new File(rootFile, path);
+
+                    ALLOWED_PATHS.add(file.getCanonicalPath());
+                } catch (IOException ex) {
+                    log.error(ex.getMessage(), ex);
+                }
+            }
+        }
+    }
+
+    private static void writeImageToResponse(String cacheId, File cacheFile, Format format, String desiredFilename,
+                                             String path, String etag, HttpServletResponse response) {
+
+        if (etag != null) {
+            response.addHeader("ETag", etag);
+        }
+
+        String extension = null;
+
+        if (desiredFilename == null) {
+            String pathname = cacheId;
+
+            if (path != null) {
+                String basename = FilenameUtils.getBaseName(path);
+
+                if (!basename.isEmpty()) {
+                    pathname = basename;
+                }
+            }
+
+            desiredFilename = pathname;
+
+            if (format != null) {
+                extension = format.getExtension();
+            } else if (path != null) {
+                extension = FilenameUtils.getExtension(path);
+            }
+
+            if (extension != null && !extension.isEmpty()) {
+                desiredFilename += "." + extension;
+            }
+        }
+
+        final String contentType = (format == null)
+                ? ((extension != null && !extension.isEmpty()) ? ("image/" + extension) : "image/png")
+                : format.getMimeType();
+
+        response.setContentType(contentType);
+        response.setContentLength((int) cacheFile.length());
+
+        // replace " with \"
+        desiredFilename = StringUtils.replace(desiredFilename, "\"", "\\\"");
+
+        response.addHeader("Content-Disposition", String.format("inline; filename=\"%s\"", desiredFilename));
+
+        InputStream input = null;
+        OutputStream output = null;
+        try {
+            input = new FileInputStream(cacheFile);
+            output = new BufferedOutputStream(response.getOutputStream());
+
+            IOUtils.copy(input, output);
+            output.flush();
+        } catch (IOException ex) {
+        } finally {
+            IOUtils.closeQuietly(input);
+            IOUtils.closeQuietly(output);
+        }
+    }
+
+    static ImageCacheDomainObject createImageCacheObject(String path, int fileId, String fileNo,
+                                                         Format format, int width, int height, Resize resize, CropRegion cropRegion, RotateDirection rotateDirection,
+                                                         Integer metaId, Integer no) {
+        ImageCacheDomainObject imageCache = new ImageCacheDomainObject();
+
+        if (path != null) {
+            imageCache.setResource(path);
+            imageCache.setType(ImageCacheDomainObject.TYPE_PATH);
+        } else if (fileId > 0) {
+            String res = Integer.toString(fileId);
+            if (fileNo != null) {
+                res += "/" + fileNo;
+            }
+            imageCache.setResource(res);
+            imageCache.setType(ImageCacheDomainObject.TYPE_FILE_DOCUMENT);
+        } else {
+            throw new RuntimeException("path or fileId must be valid");
+        }
+
+        imageCache.setFormat(format);
+        imageCache.setWidth(width);
+        imageCache.setHeight(height);
+        imageCache.setResize(resize);
+        imageCache.setCropRegion(cropRegion);
+        imageCache.setRotateDirection(rotateDirection);
+        imageCache.generateId();
+
+        imageCache.setMetaId(metaId);
+        imageCache.setNo(no);
+        imageCache.setFileNo(fileNo);
+
+        return imageCache;
+    }
+
+    static SourceFile getLocalFile(String filepath) {
+        File root = Imcms.getPath();
+        File localFile = new File(root, sanitiseFilepath(filepath));
+
+        if (!localFile.exists()) {
+            return null;
+        }
+
+        for (String allowedPath : ALLOWED_PATHS) {
+            try {
+                boolean isPathContainSymlink = !localFile.getAbsolutePath().equals(localFile.getCanonicalPath());
+                String localFilePath = isPathContainSymlink ? localFile.getAbsolutePath() : localFile.getCanonicalPath();
+                if (localFilePath.startsWith(allowedPath)) {
+                    return new SourceFile(localFile, false);
+                }
+            } catch (IOException ex) {
+            }
+        }
+
+        return null;
+    }
+
+    @Deprecated
+    // Need to protect from SSRF attacks, hard check the data we receive
+    private static SourceFile getExternalFile(String url) {
+        GetMethod fileGet = new GetMethod(url);
+        fileGet.addRequestHeader("User-Agent", USER_AGENT);
+
+        try {
+            int responseCode = HTTP_CLIENT.executeMethod(fileGet);
+
+            if (responseCode != HttpStatus.SC_OK) {
+                drainInput(fileGet.getResponseBodyAsStream());
+                return null;
+            }
+
+            File file = File.createTempFile("external_file", ".tmp");
+            InputStream input = null;
+            OutputStream output = null;
+            try {
+                input = fileGet.getResponseBodyAsStream();
+                output = new BufferedOutputStream(new FileOutputStream(file));
+
+                IOUtils.copy(input, output);
+                output.close();
+
+                return new SourceFile(file, true);
+
+            } catch (Exception ex) {
+                log.warn(ex.getMessage(), ex);
+
+                file.delete();
+
+            } finally {
+                IOUtils.closeQuietly(output);
+                IOUtils.closeQuietly(input);
+
+            }
+
+        } catch (Exception ex) {
+            log.warn(ex.getMessage(), ex);
+
+        } finally {
+            fileGet.releaseConnection();
+
+        }
+
+        return null;
+    }
+
+    static SourceFile getFileDocument(int metaId, String fileNo) {
+        File file = DocumentStoringVisitor.getFileForFileDocumentFile(metaId, fileNo);
+        if (!file.exists()) {
+            return null;
+        }
+
+        return new SourceFile(file, false);
+    }
+
+    private static void drainInput(InputStream input) throws IOException {
+        try {
+            byte[] buffer = new byte[4 * 1024];
+
+            while (input.read(buffer) > -1) {
+            }
+        } finally {
+            IOUtils.closeQuietly(input);
+        }
+    }
+
+    private static String getDesiredFilename(HttpServletRequest request) {
+        Matcher matcher = FILENAME_PATTERN.matcher(request.getRequestURI());
+        if (matcher.find()) {
+            try {
+                return URLDecoder.decode(matcher.group(1), Imcms.UTF_8_ENCODING);
+            } catch (UnsupportedEncodingException ex) {
+            }
+        }
+
+        return null;
+    }
+
+    private static String sanitiseFilepath(String filepath) {
+        Matcher matcher = DOT_OR_COLON_PATTERN.matcher(filepath);
+        filepath = matcher.replaceAll(".");
+        matcher = ABSOLUTE_PATH_PATTERN.matcher(filepath);
+
+        return matcher.replaceFirst("");
+    }
+
+    private static void sendNotFound(HttpServletResponse response) throws IOException {
+        response.sendError(HttpServletResponse.SC_NOT_FOUND);
+    }
+
+    private void handleRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String desiredFilename = getDesiredFilename(request);
+
+        String path = StringUtils.trimToNull(request.getParameter("path"));
+        int fileId = NumberUtils.toInt(request.getParameter("file_id"));
+        String fileNo = StringUtils.trimToNull(request.getParameter("file_no"));
+
+        if (fileId <= 0) {
+            fileNo = null;
+        }
+        if (fileNo != null && fileNo.length() > FileDocumentFile.ID_LENGTH) {
+            response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
+            return;
+        }
+
+        Integer metaId = null;
+        Integer no = null;
+        try {
+            String metaIdStr = StringUtils.trimToNull(request.getParameter("meta_id"));
+            metaId = Integer.parseInt(metaIdStr);
+
+            String noStr = StringUtils.trimToNull(request.getParameter("no"));
+            no = Integer.parseInt(noStr);
+        } catch (NumberFormatException ex) {
+        }
+
+        if (path != null) {
+            fileId = 0;
+        }
+        if (fileId > 0 && metaId == null) {
+            metaId = fileId;
+        }
+
+        String formatParam = StringUtils.trimToEmpty(request.getParameter("format")).toLowerCase();
+        Format format = Format.findFormatByExtension(formatParam);
+        String resizeParam = StringUtils.trimToNull(request.getParameter("resize"));
+        Resize resize = Resize.getByName(resizeParam);
+
+        int width = NumberUtils.toInt(request.getParameter("width"));
+        int height = NumberUtils.toInt(request.getParameter("height"));
+
+        // cutting dimensions to prevent generating too big images
+        width = Math.min(IMAGE_MAX_DIMENSION, width);
+        height = Math.min(IMAGE_MAX_DIMENSION, height);
+
+        width = Math.max(width, 0);
+        height = Math.max(height, 0);
+
+        if ((path == null && fileId <= 0) || (format != null && !format.isWritable())) {
+            sendNotFound(response);
+            return;
+        }
+
+        int cropX1 = NumberUtils.toInt(request.getParameter("crop_x1"), -1);
+        int cropY1 = NumberUtils.toInt(request.getParameter("crop_y1"), -1);
+        int cropX2 = NumberUtils.toInt(request.getParameter("crop_x2"), -1);
+        int cropY2 = NumberUtils.toInt(request.getParameter("crop_y2"), -1);
+
+        CropRegion cropRegion = new CropRegion(cropX1, cropY1, cropX2, cropY2);
+
+        int rotateAngle = NumberUtils.toInt(request.getParameter("rangle"));
+        RotateDirection rotateDirection = RotateDirection.getByAngleDefaultIfNull(rotateAngle);
+
+        ImageCacheDomainObject imageCache = createImageCacheObject(path, fileId, fileNo, format, width,
+                height, resize, cropRegion, rotateDirection, metaId, no);
+        String cacheId = imageCache.getId();
+
+        File localImageFile = null;
+        if (path != null || fileId > 0) {
+            // Special case for local image file, so we could check for file modification.
+            SourceFile source;
+            if (path != null) {
+                source = getLocalFile(path);
+            } else {
+                source = getFileDocument(fileId, fileNo);
+            }
+
+            if (source != null) {
+                localImageFile = source.getSourceFile();
+            }
+        }
+
+        String etag = ImcmsImageUtils.getImageETag(path, localImageFile, fileId, fileNo,
+                format, width, height, cropRegion, rotateDirection);
+
+        // Try to reuse an existing cache file
+        File cacheFile = ImageCacheManager.getCacheFile(imageCache);
+
+        if (cacheFile != null) {
+            // No need to send the cache file contents if it hasn't changed
+            // based on the Etag header that we send.
+            String ifNoneMatch = request.getHeader("If-None-Match");
+            if (etag.equals(ifNoneMatch)) {
+                response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+                return;
+            }
+
+            boolean useCacheFile = true;
+
+            if (path != null || fileId > 0) {
+                if (localImageFile == null || localImageFile.lastModified() > cacheFile.lastModified()) {
+                    // Don't use the cache file if the local image is missing or has been modified.
+                    useCacheFile = false;
+                }
+            }
+
+            if (useCacheFile) {
+                writeImageToResponse(cacheId, cacheFile, format, desiredFilename, path, etag, response);
+                return;
+            }
+        }
+
+        // The requested image hasn't been cached. Retrieve and generate a new cache file for it.
+        SourceFile source;
+        if (path != null) {
+            source = getLocalFile(path);
+        } else {
+            source = getFileDocument(fileId, fileNo);
+        }
+
+        if (source == null) {
+            sendNotFound(response);
+            return;
+        }
+
+        try {
+            if (format == null) {
+                ImageInfo imageInfo = ImageOp.getImageInfo(Imcms.getServices().getConfig(), source.getSourceFile());
+
+                if (imageInfo == null) {
+                    log.error("Failed to determine image info for file: " + source.getSourceFile());
+                    sendNotFound(response);
+                    return;
+                }
+
+                format = imageInfo.getFormat();
+
+                if (!format.isWritable()) {
+                    sendNotFound(response);
+                    return;
+                }
+            }
+
+            cacheFile = ImageCacheManager.storeImage(imageCache, source.getSourceFile());
+            if (cacheFile == null) {
+                log.error("Failed to generate/store cache file for image: " + source.getSourceFile());
+                sendNotFound(response);
+                return;
+            }
+
+            writeImageToResponse(cacheId, cacheFile, format, desiredFilename, path, etag, response);
+
+        } finally {
+            if (source.isDeleteAfterUse()) {
+                source.getSourceFile().delete();
+            }
+        }
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        handleRequest(request, response);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        handleRequest(request, response);
+    }
+
+    @Override
+    public void destroy(){
+        super.destroy();
+        ImageCacheManager.destroy();
+    }
+
+
+    static class SourceFile implements Serializable {
+        private static final long serialVersionUID = 6075456980496678862L;
+        private final File sourceFile;
+        private final boolean deleteAfterUse;
+
+
+        public SourceFile(File sourceFile, boolean deleteAfterUse) {
+            this.sourceFile = sourceFile;
+            this.deleteAfterUse = deleteAfterUse;
+        }
+
+
+        public boolean isDeleteAfterUse() {
+            return deleteAfterUse;
+        }
+
+        public File getSourceFile() {
+            return sourceFile;
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/ImagePreview.java b/server/src/com/imcode/imcms/servlet/ImagePreview.java
new file mode 100644
index 0000000000..62b6b87995
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/ImagePreview.java
@@ -0,0 +1,160 @@
+package com.imcode.imcms.servlet;
+
+import imcode.server.Imcms;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.server.document.textdocument.ImageDomainObject.RotateDirection;
+import imcode.server.user.UserDomainObject;
+import imcode.util.ImcmsImageUtils;
+import imcode.util.Utility;
+import imcode.util.image.Format;
+import imcode.util.image.Resize;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.oro.text.perl.Perl5Util;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ImagePreview extends HttpServlet {
+    private static final long serialVersionUID = -5206637712530904625L;
+
+    private static final Logger log = LogManager.getLogger(ImagePreview.class);
+
+    private static CropRegion getCropRegion(HttpServletRequest request) {
+        int cropX1 = NumberUtils.toInt(request.getParameter("crop_x1"), -1);
+        int cropY1 = NumberUtils.toInt(request.getParameter("crop_y1"), -1);
+        int cropX2 = NumberUtils.toInt(request.getParameter("crop_x2"), -1);
+        int cropY2 = NumberUtils.toInt(request.getParameter("crop_y2"), -1);
+
+        return new CropRegion(cropX1, cropY1, cropX2, cropY2);
+    }
+
+    private static boolean hasAccess(HttpServletRequest request) {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+
+        return (user != null && !user.isDefaultUser());
+    }
+
+    private static void send404(HttpServletResponse response) throws IOException {
+        response.sendError(HttpServletResponse.SC_NOT_FOUND);
+    }
+
+    protected void handleRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        if (!hasAccess(request)) {
+            response.sendError(HttpServletResponse.SC_FORBIDDEN);
+            return;
+        }
+
+        String path = StringUtils.trimToNull(request.getParameter("path"));
+        if (path == null || path.contains("../")) {
+            log.error("No path specified");
+            send404(response);
+
+            return;
+        }
+
+        File root = Imcms.getPath();
+        File imageFile = new File(root, path);
+        boolean isPathContainSymlink = !imageFile.getAbsolutePath().equals(imageFile.getCanonicalPath());
+
+        imageFile = isPathContainSymlink ? imageFile.getAbsoluteFile() : imageFile.getCanonicalFile();
+
+        if (!imageFile.getAbsolutePath().startsWith(root.getCanonicalPath())) {
+            response.sendError(HttpServletResponse.SC_FORBIDDEN);
+            return;
+
+        } else if (!imageFile.exists()) {
+            log.error("Source image doesn't exist: " + imageFile);
+            send404(response);
+
+            return;
+        }
+
+        String formatParam = StringUtils.trimToEmpty(request.getParameter("format")).toLowerCase();
+        if ("".equals(formatParam)) {
+            Perl5Util re = new Perl5Util();
+            if (re.match("/\\.([\\w]{3,4})$/i", path)) {
+                formatParam = re.group(1).toLowerCase();
+            }
+        }
+        Format format = Format.findFormatByExtension(formatParam);
+
+        if (format != null && !format.isWritable()) {
+            log.error("Format is not writable: " + format);
+            send404(response);
+
+            return;
+        }
+
+        int width = NumberUtils.toInt(request.getParameter("width"));
+        width = Math.max(width, 0);
+        int height = NumberUtils.toInt(request.getParameter("height"));
+        height = Math.max(height, 0);
+
+        Resize resize = Resize.getByName(request.getParameter("resize"));
+
+        CropRegion cropRegion = getCropRegion(request);
+
+        int rotateAngle = NumberUtils.toInt(request.getParameter("rangle"));
+        RotateDirection rotateDirection = RotateDirection.getByAngleDefaultIfNull(rotateAngle);
+
+        String etag = ImcmsImageUtils.getImageETag(path, imageFile, 0, null,
+                format, width, height, cropRegion, rotateDirection);
+        String ifNoneMatch = request.getHeader("If-None-Match");
+
+        if (etag.equals(ifNoneMatch)) {
+            response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+            return;
+        }
+
+        InputStream inputStream = null;
+        File tempFile = File.createTempFile("image_preview", ".tmp");
+
+        try {
+            boolean result = ImcmsImageUtils.generateImage(imageFile, tempFile, format,
+                    width, height, resize, cropRegion, rotateDirection);
+
+            if (result) {
+                String contentType = (format != null ? format.getMimeType() : "application/octet-stream");
+                response.setHeader("Content-Disposition", "attachment; filename=\"" + imageFile.getName() + "\"");
+                response.addHeader("ETag", etag);
+                response.setStatus(HttpServletResponse.SC_OK);
+                response.setContentType(contentType);
+                response.setContentLength((int) tempFile.length());
+
+                inputStream = new FileInputStream(tempFile);
+
+                IOUtils.copy(inputStream, response.getOutputStream());
+
+            } else {
+                send404(response);
+            }
+
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+
+            tempFile.delete();
+        }
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        handleRequest(req, resp);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        handleRequest(req, resp);
+    }
+}
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/servlet/ImcmsMultipleUserLoginFilter.java b/server/src/com/imcode/imcms/servlet/ImcmsMultipleUserLoginFilter.java
index e78241d378..f57c7e4841 100644
--- a/server/src/com/imcode/imcms/servlet/ImcmsMultipleUserLoginFilter.java
+++ b/server/src/com/imcode/imcms/servlet/ImcmsMultipleUserLoginFilter.java
@@ -1,5 +1,6 @@
 package com.imcode.imcms.servlet;
 
+import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.user.UserDomainObject;
@@ -11,8 +12,6 @@
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 
-import com.imcode.imcms.util.l10n.LocalizedMessage;
-
 public class ImcmsMultipleUserLoginFilter implements Filter {
 
     public final static String TOO_MANY_SESSIONS = "TooManySessions";
@@ -21,26 +20,29 @@ public class ImcmsMultipleUserLoginFilter implements Filter {
             = new LocalizedMessage("templates/login/TooManySessions");
 
     public void init(FilterConfig config)
-    throws ServletException {}
+            throws ServletException {
+    }
+
+    public void destroy() {
+    }
 
-    public void destroy() {}
-    
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-    throws IOException, ServletException {       
-    	req.setCharacterEncoding(Imcms.DEFAULT_ENCODING);
-    	
-        HttpServletRequest request = (HttpServletRequest)req;
-        HttpServletResponse response = (HttpServletResponse)res;
+            throws IOException, ServletException {
+        req.setCharacterEncoding(Imcms.DEFAULT_ENCODING);
+
+        HttpServletRequest request = (HttpServletRequest) req;
+        HttpServletResponse response = (HttpServletResponse) res;
         HttpSession session = request.getSession();
         ImcmsServices service = Imcms.getServices();
 
-        UserDomainObject user = Utility.getLoggedOnUser(request) ;
+        UserDomainObject user = Utility.getLoggedOnUser(request);
 
         // In case system denies multiple login for same user
         // invalidate current session if it does not match to
         // last user's session and redirect user to the login page.
         if (user != null && !user.isDefaultUser()
-                && service.getConfig().isDenyMultipleUserLogin()) {
+                && service.getConfig().isDenyMultipleUserLogin())
+        {
 
             String sessionId = session.getId();
             String lastUserSessionId = service
@@ -48,7 +50,8 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
                     .getUserSessionId(user);
 
             if (lastUserSessionId != null
-                    && !lastUserSessionId.equals(sessionId)) {
+                    && !lastUserSessionId.equals(sessionId))
+            {
 
                 session.invalidate();
 
diff --git a/server/src/com/imcode/imcms/servlet/ImcmsSetupFilter.java b/server/src/com/imcode/imcms/servlet/ImcmsSetupFilter.java
index 3b5fae8cd7..ee81e96ecf 100644
--- a/server/src/com/imcode/imcms/servlet/ImcmsSetupFilter.java
+++ b/server/src/com/imcode/imcms/servlet/ImcmsSetupFilter.java
@@ -3,28 +3,48 @@
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.document.DocumentDomainObject;
+import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
+import imcode.server.user.MissingLoginDataException;
 import imcode.server.user.UserDomainObject;
-import imcode.util.Utility;
 import imcode.util.FallbackDecoder;
+import imcode.util.Utility;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.NDC;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.*;
+import javax.servlet.http.*;
 import javax.servlet.jsp.jstl.core.Config;
 import javax.servlet.jsp.jstl.fmt.LocalizationContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.Collections;
 import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class ImcmsSetupFilter implements Filter {
 
     public static final String JSESSIONID_COOKIE_NAME = "JSESSIONID";
+    private static final Logger log = LogManager.getLogger(ImcmsSetupFilter.class);
 
-    public void doFilter( ServletRequest r, ServletResponse response, FilterChain chain ) throws IOException, ServletException {
+    private final ExecutorService incrementSessionCounterExecutor = Executors.newSingleThreadExecutor();
+
+    public static String getDocumentIdString(ImcmsServices service, String path) {
+        String documentPathPrefix = service.getConfig().getDocumentPathPrefix();
+        String documentIdString = null;
+        if (StringUtils.isNotBlank(documentPathPrefix) && path.startsWith(documentPathPrefix)) {
+            documentIdString = path.substring(documentPathPrefix.length());
+            if (documentIdString.endsWith("/")) {
+                documentIdString = documentIdString.substring(0, documentIdString.length() - 1);
+            }
+        }
+        return documentIdString;
+    }
+
+    public void doFilter(ServletRequest r, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         r.setCharacterEncoding(Imcms.DEFAULT_ENCODING);
 
         HttpServletRequest request = (HttpServletRequest) r;
@@ -32,86 +52,151 @@ public void doFilter( ServletRequest r, ServletResponse response, FilterChain ch
         HttpSession session = request.getSession();
 
         ImcmsServices service = Imcms.getServices();
-        if ( session.isNew() ) {
-            service.incrementSessionCounter();
-            setDomainSessionCookie( response, session );
+        if (session.isNew()) {
+            incrementSessionCounterExecutor.submit(service::incrementSessionCounter);
+            setDomainSessionCookie(response, session);
         }
 
         String workaroundUriEncoding = service.getConfig().getWorkaroundUriEncoding();
         FallbackDecoder fallbackDecoder = new FallbackDecoder(Charset.forName(Imcms.DEFAULT_ENCODING),
-                                                              null != workaroundUriEncoding ? Charset.forName(workaroundUriEncoding) : Charset.defaultCharset());
-        if ( null != workaroundUriEncoding ) {
+                null != workaroundUriEncoding ? Charset.forName(workaroundUriEncoding) : Charset.defaultCharset());
+        if (null != workaroundUriEncoding) {
             request = new UriEncodingWorkaroundWrapper(request, fallbackDecoder);
         }
 
-        UserDomainObject user = Utility.getLoggedOnUser(request) ;
-        if ( null == user ) {
-            user = service.verifyUserByIpOrDefault(request.getRemoteAddr()) ;
-            assert user.isActive() ;
-            Utility.makeUserLoggedIn(request, user);
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+
+        if (null == user) {
+            user = service.verifyUserByIpOrDefault(request.getRemoteAddr());
+            assert user.isActive();
+            final ImcmsAuthenticatorAndUserAndRoleMapper userAndRoleMapper =
+                    service.getImcmsAuthenticatorAndUserAndRoleMapper();
+            try {
+                userAndRoleMapper.checkUserIpAllowed(user, request);
+
+            } catch (UserIpIsNotAllowedException e) {
+                userAndRoleMapper.forwardDeniedUserToMessagePage(user, request, response);
+                return;
+            }
+
+            Utility.makeUserLoggedIn(request, (HttpServletResponse) response, user);
+        } else {
+
+			//ldap causes errors because there are no such provider...
+	        if (user.isImcmsExternal() && StringUtils.isNotBlank(user.getExternalProviderId())) {
+                service.getAuthenticationProviderService()
+                        .getAuthenticationProvider(user.getExternalProviderId())
+                        .updateAuthData(request);
+            }
+
         }
 
+
+
         ResourceBundle resourceBundle = Utility.getResourceBundle(request);
         Config.set(request, Config.FMT_LOCALIZATION_CONTEXT, new LocalizationContext(resourceBundle));
-        
-        Utility.initRequestWithApi(request, user);
 
-        NDC.setMaxDepth( 0 );
-        String contextPath = request.getContextPath();
-        if ( !"".equals( contextPath ) ) {
-            NDC.push( contextPath );
-        }
-        NDC.push( StringUtils.substringAfterLast( request.getRequestURI(), "/" ) );
+        Utility.initRequestWithApi(request, user);
 
-        handleDocumentUri(chain, request, response, service, fallbackDecoder);
-        NDC.setMaxDepth( 0 );
+	    try (CloseableThreadContext.Instance contextStack = CloseableThreadContext.pushAll(Collections.emptyList())) {
+		    String contextPath = request.getContextPath();
+		    if (!"".equals(contextPath)) {
+			    contextStack.push(contextPath);
+		    }
+		    contextStack.push(StringUtils.substringAfterLast(request.getRequestURI(), "/"));
+		    handleDocumentUri(chain, request, response, service, fallbackDecoder);
+		    contextStack.pushAll(Collections.emptyList());
+	    }
     }
 
     private void handleDocumentUri(FilterChain chain, HttpServletRequest request, ServletResponse response,
                                    ImcmsServices service, FallbackDecoder fallbackDecoder) throws ServletException, IOException {
-        String path = Utility.fallbackUrlDecode(request.getRequestURI(), fallbackDecoder) ;
-        path = StringUtils.substringAfter( path, request.getContextPath() ) ;
+        String path = Utility.fallbackUrlDecode(request.getRequestURI(), fallbackDecoder);
+        path = StringUtils.substringAfter(path, request.getContextPath());
         String documentIdString = getDocumentIdString(service, path);
         ServletContext servletContext = request.getSession().getServletContext();
-        if ( null == servletContext.getResourcePaths(path) ) {
+        Set resources = servletContext.getResourcePaths(path);
+        if (null == resources || 0 == resources.size()) {
             DocumentDomainObject document = service.getDocumentMapper().getDocument(documentIdString);
             if (null != document) {
                 try {
-                    GetDoc.viewDoc( document, request, (HttpServletResponse)response );
-                    return ;
-                } catch( NumberFormatException nfe ) {}
+                    GetDoc.viewDoc(document, request, (HttpServletResponse) response);
+                    return;
+                } catch (NumberFormatException nfe) {
+                }
             }
         }
-        chain.doFilter( request, response );
-    }
+        try {
+            chain.doFilter(request, response);
+
+        } catch (MissingLoginDataException e) {
+            log.error("Null login data received. User redirected to missingLoginData.jsp.", e);
+            throw new MissingLoginDataException(e);
+        } catch (Exception e) {
+            final Throwable cause = e.getCause();
+
+            if (cause != null && ("Broken pipe".equals(cause.getMessage()))) {
+                // seems that user aborted request by himself, so don't worry
+                return;
+            }
 
-    public static String getDocumentIdString(ImcmsServices service, String path) {
-        String documentPathPrefix = service.getConfig().getDocumentPathPrefix() ;
-        String documentIdString = null ;
-        if ( StringUtils.isNotBlank( documentPathPrefix ) && path.startsWith( documentPathPrefix )) {
-            documentIdString = path.substring( documentPathPrefix.length());
-            if (documentIdString.endsWith( "/" ) ) {
-                documentIdString = documentIdString.substring(0,documentIdString.length()-1);
+            log.error("Received error: ", e);
+
+            // try to go to the same URL once more with some fixes
+            try {
+                ServletRequest newRequest = new HttpServletRequestWrapper(request) {
+                    @Override
+                    public String getParameter(String name) {
+                        String parameter = super.getParameter(name);
+                        return checkParam(parameter);
+                    }
+
+                    @Override
+                    public String[] getParameterValues(String paramName) {
+                        String[] values = super.getParameterValues(paramName);
+
+                        if (values != null) {
+                            for (int index = 0; index < values.length; index++) {
+                                values[index] = checkParam(values[index]);
+                            }
+                        }
+
+                        return values;
+                    }
+
+                    private String checkParam(String parameter) {
+                        if (parameter != null && parameter.contains(",")) {
+                            parameter = parameter.split(",")[0];
+                        }
+                        return parameter;
+                    }
+                };
+                chain.doFilter(newRequest, response);
+            } catch (IllegalStateException ignore) {
+            } catch (NullPointerException ignore) {
+            } catch (Exception e1) {
+                log.error(e1.getMessage(), e1);
+                Utility.invokeInternalErrorServletWith(request, (HttpServletResponse) response, e);
             }
         }
-        return documentIdString;
     }
 
-    private void setDomainSessionCookie( ServletResponse response, HttpSession session ) {
+    private void setDomainSessionCookie(ServletResponse response, HttpSession session) {
 
         String domain = Imcms.getServices().getConfig().getSessionCookieDomain();
         if (StringUtils.isNotBlank(domain)) {
-            Cookie cookie = new Cookie( JSESSIONID_COOKIE_NAME, session.getId());
-            cookie.setDomain( domain );
-            cookie.setPath( "/" );
-            ((HttpServletResponse)response).addCookie( cookie );
+            Cookie cookie = new Cookie(JSESSIONID_COOKIE_NAME, session.getId());
+            cookie.setDomain(domain);
+            cookie.setPath("/");
+            ((HttpServletResponse) response).addCookie(cookie);
         }
     }
 
-    public void init( FilterConfig config ) throws ServletException {
+    public void init(FilterConfig config) throws ServletException {
     }
 
     public void destroy() {
+        incrementSessionCounterExecutor.shutdownNow();
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/InternalError.java b/server/src/com/imcode/imcms/servlet/InternalError.java
new file mode 100644
index 0000000000..1a28c71b26
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/InternalError.java
@@ -0,0 +1,234 @@
+package com.imcode.imcms.servlet;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.imcode.db.Database;
+import com.imcode.db.commands.SqlQueryCommand;
+import imcode.server.Imcms;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.jstl.core.Config;
+import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+import java.io.IOException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ResourceBundle;
+
+/**
+ * Created by ruslan on 04.10.16.
+ */
+public class InternalError extends HttpServlet {
+
+    private final static Logger LOGGER = LogManager.getLogger(InternalError.class);
+
+    private final String DEFAULT_RESPONSE = "N/A";
+
+    @Override
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Throwable exceptionFromRequest = (Throwable) request.getAttribute("javax.servlet.error.exception");
+
+        if (exceptionFromRequest != null) {
+            LOGGER.warn("Exception was occurred. ", exceptionFromRequest);
+        }
+
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+
+        try {
+            String responseJson = sendError(exceptionFromRequest, request, user.getId());
+
+            String errorId = logError(responseJson, exceptionFromRequest, user.getId());
+            request.setAttribute("error-id", errorId);
+        } catch (Exception e) {
+            LOGGER.error("Exception when sending an error to ICM", e);
+
+            logError(exceptionFromRequest, "0", user.getId());
+            request.setAttribute("error-id", 0);
+        }
+
+        request.setAttribute("javax.servlet.error.exception", null);
+
+        ResourceBundle resourceBundle = Utility.getResourceBundle(request);
+        Config.set(request, Config.FMT_LOCALIZATION_CONTEXT, new LocalizationContext(resourceBundle));
+
+        request.getRequestDispatcher("/imcms/500.jsp").forward(request, response);
+    }
+
+    private String sendError(Throwable throwable, HttpServletRequest request, Integer userId) throws Exception {
+        final Database database = Imcms.getServices().getDatabase();
+
+        final Throwable causeThrowable = throwable.getCause();
+        final String cause = (causeThrowable == null)
+                ? throwable.getClass().getName()
+                : ExceptionUtils.getRootCauseMessage(throwable);
+        final String messageString = throwable.getMessage();
+        final String message = (messageString == null) ? throwable.getClass().getSimpleName() : messageString;
+        final String stackTrace = ExceptionUtils.getStackTrace(throwable);
+        final Long hash = generateHash(message, cause, stackTrace);
+
+        final String errorUrl = StringUtils.defaultString(request.getHeader("referer"), DEFAULT_RESPONSE);
+        final String userAgent = request.getHeader("user-agent");
+        final String headerAccept = request.getHeader("accept");
+        final String headerAcceptEncoding = request.getHeader("accept-encoding");
+        final String headerAcceptLanguage = request.getHeader("accept-language");
+
+        request.setAttribute("message", StringEscapeUtils.escapeHtml(message));
+        request.setAttribute("cause", StringEscapeUtils.escapeHtml(cause));
+        request.setAttribute("stack-trace", StringEscapeUtils.escapeHtml(stackTrace));
+        request.setAttribute("error-url", StringUtils.defaultString(errorUrl, "unknown"));
+
+        final String serverName = request.getServerName();
+        final String jdbcUrl = Imcms.getServerProperties().getProperty("JdbcUrl");
+
+        final String dbName = StringUtils.substringAfterLast(StringUtils.substringBefore(jdbcUrl, "?"), "/");
+
+        String imcmsVersion;
+        try {
+            imcmsVersion = Version.getImcmsVersion(getServletContext());
+        } catch (Exception e) {
+            imcmsVersion = DEFAULT_RESPONSE;
+        }
+
+        final String databaseVersion = (String) database.execute(
+                new SqlQueryCommand(
+                        "SELECT CONCAT(major, '.', minor, '.', client) FROM database_version",
+                        null,
+                        Utility.SINGLE_STRING_HANDLER
+                )
+        );
+
+        String errorLoggerUrl = Imcms.getServerProperties().getProperty("ErrorLoggerUrl");
+        if (errorLoggerUrl == null || errorLoggerUrl.isEmpty()) {
+            errorLoggerUrl = Imcms.ERROR_LOGGER_URL;
+        }
+
+        final List<NameValuePair> params = Form.form()
+
+                .add("hash", hash.toString())
+                .add("message", message)
+                .add("cause", cause)
+                .add("stack-trace", stackTrace)
+
+                .add("error-url", errorUrl)
+                .add("user-agent", userAgent)
+                .add("header-accept", headerAccept)
+                .add("header-accept-encoding", headerAcceptEncoding)
+                .add("header-accept-language", headerAcceptLanguage)
+
+                .add("server-name", serverName)
+                .add("database-name", dbName)
+                .add("imcms-version", imcmsVersion)
+                .add("database-version", databaseVersion)
+
+                .add("user-id", userId.toString())
+
+                .build();
+
+        final HttpPost httpPost = new HttpPost(errorLoggerUrl);
+        httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+        return EntityUtils.toString(createHttpClient().execute(httpPost).getEntity());
+    }
+
+    private String logError(String response, Throwable exception, int userId) throws IOException {
+        HashMap<String, Object> responseMap = new ObjectMapper().readValue(response, HashMap.class);
+        String errorId = (String) responseMap.get("error_id");
+        String state = (String) responseMap.get("state");
+        if (state.equals("new")) {
+            logError(exception, errorId, userId);
+        } else {
+            LOGGER.info("Error with id " + errorId + " is already reported");
+        }
+        return errorId;
+    }
+
+    private void logError(Throwable exception, String errorId, int userId) {
+        LOGGER.error("Internal error has occurred: {errorId =" + errorId + "; " + " userId =" + userId + "};", exception);
+    }
+
+    private Long generateHash(String persistenceMessage,
+                              String persistenceCause,
+                              String persistenceStackTrace) {
+        long hashCode = persistenceMessage.hashCode();
+        hashCode += persistenceCause.hashCode();
+        hashCode += persistenceStackTrace.hashCode();
+        return hashCode;
+    }
+
+    private HttpClient createHttpClient() throws Exception {
+
+        HttpClientBuilder builder = HttpClientBuilder.create();
+
+        SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+            public boolean isTrusted(X509Certificate[] x509Certificates, String str) throws CertificateException {
+                return true;
+            }
+        }).build();
+        builder.setSslcontext(sslContext);
+
+        HostnameVerifier hostnameVerifier = SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER;
+
+        SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
+        Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
+                .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                .register("https", sslSocketFactory)
+                .build();
+
+        PoolingHttpClientConnectionManager connMgr = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+        builder.setConnectionManager(connMgr);
+
+        return builder.build();
+
+    }
+
+    private static class Form {
+
+        private List<NameValuePair> params = new LinkedList<>();
+
+        private Form() {
+        }
+
+        public static Form form() {
+            return new Form();
+        }
+
+        public Form add(String name, String value) {
+            params.add(new BasicNameValuePair(name, value));
+            return this;
+        }
+
+        public List<NameValuePair> build() {
+            return params;
+        }
+
+    }
+
+}
diff --git a/server/src/com/imcode/imcms/servlet/LogOut.java b/server/src/com/imcode/imcms/servlet/LogOut.java
index 21d713232b..a0077854b9 100644
--- a/server/src/com/imcode/imcms/servlet/LogOut.java
+++ b/server/src/com/imcode/imcms/servlet/LogOut.java
@@ -10,12 +10,8 @@
 
 public class LogOut extends HttpServlet {
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-        String language = Utility.getLoggedOnUser(req).getLanguageIso639_2();
-
-        req.setAttribute("language", language);
-        req.getRequestDispatcher("/login/logged_out.jsp").forward(req, res);
-
-        Utility.makeUserLoggedOut(req);
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Utility.makeUserLoggedOut(request);
+        new VerifyUser.GoToLoginSuccessfulPageCommand().dispatch(request, response);
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/LoginPasswordManager.java b/server/src/com/imcode/imcms/servlet/LoginPasswordManager.java
new file mode 100644
index 0000000000..0cb3f11ba0
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/LoginPasswordManager.java
@@ -0,0 +1,91 @@
+package com.imcode.imcms.servlet;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import java.security.SecureRandom;
+import java.security.spec.KeySpec;
+
+/**
+ * Provides functionality for passwords encryption and validation.
+ *
+ * @since 4.0.7
+ */
+public class LoginPasswordManager {
+
+    private static final int SALT_LENGTH = 16;
+
+    private static final String KEY_ALGORITHM = "PBKDF2WithHmacSHA1";
+    private static Logger logger = LogManager.getLogger(LoginPasswordManager.class);
+    private byte[] sharedSalt;
+
+    /**
+     * Creates new instance of UserLoginPasswordManager without shared salt.
+     */
+    public LoginPasswordManager() {
+        this(null);
+    }
+
+    /**
+     * @param sharedSalt a salt used in all passwords encryption additionally to random salt.
+     */
+    public LoginPasswordManager(String sharedSalt) {
+        this.sharedSalt = sharedSalt == null ? new byte[0] : sharedSalt.getBytes();
+    }
+
+    /**
+     * @param password plain text password
+     * @return encrypted password as a hex string
+     */
+    public String encryptPassword(String password) {
+        SecureRandom sr = new SecureRandom();
+        byte randomSalt[] = sr.generateSeed(SALT_LENGTH);
+
+        return encryptPassword(password, randomSalt);
+    }
+
+    /**
+     * Validates password against hash generated by {@link #encryptPassword} method.
+     *
+     * @param password          plain text password
+     * @param encryptedPassword encrypted password as a hex string
+     * @return if password is valid
+     */
+    public boolean validatePassword(String password, String encryptedPassword) {
+        try {
+            byte[] randomSaltFollowedByHash = Hex.decodeHex(encryptedPassword.toCharArray());
+            byte[] randomSalt = ArrayUtils.subarray(randomSaltFollowedByHash, 0, SALT_LENGTH);
+
+            return encryptPassword(password, randomSalt).equals(encryptedPassword);
+        } catch (DecoderException e) {
+            logger.error(e);
+            return false;
+        }
+    }
+
+    /**
+     * Encrypts password using salt compound from sharedSalt and randomSalt.
+     *
+     * @param password   plain text password.
+     * @param randomSalt randomly generated salt.
+     * @return random salt followed by encrypted password as a hex string.
+     */
+    private String encryptPassword(String password, byte[] randomSalt) {
+        try {
+            byte[] salt = ArrayUtils.addAll(sharedSalt, randomSalt);
+            KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 2048, 160);
+            SecretKeyFactory f = SecretKeyFactory.getInstance(KEY_ALGORITHM);
+            byte[] hash = f.generateSecret(spec).getEncoded();
+            byte[] randomSaltFollowedByHash = ArrayUtils.addAll(randomSalt, hash);
+
+            return Hex.encodeHexString(randomSaltFollowedByHash);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/MenuRss.java b/server/src/com/imcode/imcms/servlet/MenuRss.java
index e1e1936ccc..fe3c657045 100644
--- a/server/src/com/imcode/imcms/servlet/MenuRss.java
+++ b/server/src/com/imcode/imcms/servlet/MenuRss.java
@@ -9,7 +9,8 @@
 import com.imcode.imcms.util.rss.imcms.DocumentMenuChannel;
 import imcode.util.Utility;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.w3c.dom.Document;
 
 import javax.servlet.ServletException;
@@ -20,7 +21,8 @@
 
 public class MenuRss extends HttpServlet {
 
-    private final static Logger LOG = Logger.getLogger(MenuRss.class);
+    private final static Logger LOG = LogManager.getLogger(MenuRss.class);
+
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response) throws ServletException, IOException {
         try {
@@ -30,7 +32,7 @@ protected void doGet(HttpServletRequest request,
 
             DocumentService documentService = cms.getDocumentService();
             TextDocument document = documentService.getTextDocument(documentId);
-            if ( null == document ) {
+            if (null == document) {
                 response.sendError(HttpServletResponse.SC_NOT_FOUND);
             } else {
                 final RssDocumentFactory rssDocumentFactory = new Rss20DocumentFactory();
@@ -38,13 +40,13 @@ protected void doGet(HttpServletRequest request,
                 Document xmlDocument = rssDocumentFactory.createRssDocument(documentMenuChannel);
                 Utility.outputXmlDocument(response, xmlDocument);
             }
-        } catch ( NoPermissionException e ) {
-            LOG.debug("Forbidden.",e);
+        } catch (NoPermissionException e) {
+            LOG.debug("Forbidden.", e);
             response.sendError(HttpServletResponse.SC_FORBIDDEN);
-        } catch ( ClassCastException nfe ) {
-            LOG.debug("Forbidden.",nfe);
+        } catch (ClassCastException nfe) {
+            LOG.debug("Forbidden.", nfe);
             response.sendError(HttpServletResponse.SC_FORBIDDEN);
-        } catch ( NumberFormatException nfe ) {
+        } catch (NumberFormatException nfe) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
         }
     }
diff --git a/server/src/com/imcode/imcms/servlet/PasswordMailReminder.java b/server/src/com/imcode/imcms/servlet/PasswordMailReminder.java
deleted file mode 100644
index 4942ed737a..0000000000
--- a/server/src/com/imcode/imcms/servlet/PasswordMailReminder.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package com.imcode.imcms.servlet;
-
-import com.imcode.db.commands.SqlQueryCommand;
-import imcode.server.Imcms;
-import imcode.server.ImcmsServices;
-import imcode.server.SystemData;
-import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
-import imcode.server.user.UserDomainObject;
-import imcode.util.Utility;
-import imcode.util.net.SMTP;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class PasswordMailReminder extends HttpServlet {
-
-    /* filnames for templates */
-    private final static String USER_DONT_EXIST = "password_no_user.txt";
-    private final static String USER_HAS_NO_EMAIL = "password_no_email.txt";
-    private final static String USER_HAS_NOT_RIGHT = "password_no_right.txt";
-    private final static String SENT_USER_PASSWORD = "password_sent.txt";
-    private final static String USER_MAIL_BODY = "password_user_mail.txt";
-
-    /* filnames for errors */
-    private final static String ERROR_STRING = "password_error_input.txt";
-
-    /* returning document */
-    private final static String RETURNING_DOCUMENT_SENT = "password_sent.html";
-    private final static String RETURNING_DOCUMENT_NOT_SENT = "password_not_sent.html";
-    private final static String RETURNING_DOCUMENT_INPUT = "password_submit.html";
-
-    private final static int PASSWORD_PERMISSION_ID = 1;
-
-    /**
-     * showing input document whit out error
-     */
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-
-        /* server info */
-
-        ImcmsServices imcref = Imcms.getServices();
-
-        Utility.setDefaultHtmlContentType( res );
-        ServletOutputStream out = res.getOutputStream();
-
-        List tags = new ArrayList();
-
-        tags.add( "#errorininput#" );
-        tags.add( "" );
-
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        String returnString = imcref.getAdminTemplate(RETURNING_DOCUMENT_INPUT, user, tags );
-        out.print( returnString );
-    }
-
-    /**
-     * proces submit
-     */
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-
-        /* server info */
-
-        ImcmsServices imcref = Imcms.getServices();
-        ImcmsAuthenticatorAndUserAndRoleMapper userMapper = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
-
-        /* mailserver info */
-        SystemData sysData = imcref.getSystemData();
-        String eMailServerMaster = sysData.getServerMasterAddress();
-
-        String emptyString = "";
-
-        /* user info */
-        String firstName = emptyString;
-        String lastName = emptyString;
-        String password = emptyString;
-        String userEmail = emptyString;
-        String userName = emptyString;
-
-        List tags = new ArrayList();
-
-        /* condition variabels */
-
-        String postedLoginName = req.getParameter("login_name");
-
-        boolean validLoginName = !( !( postedLoginName != null ) || postedLoginName.length() == 0 );
-
-        String returnString;
-        if ( validLoginName ) {
-
-            final Object[] parameters = new String[]{
-            "" + PASSWORD_PERMISSION_ID, postedLoginName, postedLoginName
-            };
-            String[] queryResult = (String[]) imcref.getDatabase().execute(new SqlQueryCommand(
-                    "select login_password, first_name, last_name, email, min(permissions & ?), lang_prefix, login_name \n"
-                    + "from users u \n"
-                    + "join lang_prefixes lp \n"
-                    + "    on u.language = lp.lang_prefix\n"
-                    + "join user_roles_crossref urc \n"
-                    + "    on u.user_id = urc.user_id left \n"
-                    + "join roles r \n"
-                    + "    on r.role_id = urc.role_id\n"
-                    + "where login_name = ?\n"
-                    + "or email = ?\n"
-                    + "group by login_password, first_name, last_name, email, lang_prefix, login_name", parameters, Utility.STRING_ARRAY_HANDLER));
-
-            String returnFileBody;
-            String serverMasterMailBody;
-            boolean sendMailToUser = false;
-            if ( queryResult != null && queryResult.length > 0 ) {
-
-                firstName = queryResult[1];
-                lastName = queryResult[2];
-                userEmail = queryResult[3];
-                userName = queryResult[6];
-
-                boolean userHasOnlyRolesWithPermissionToGetPasswordSentByMail = !"0".equals(queryResult[4]);
-
-                if ( userHasOnlyRolesWithPermissionToGetPasswordSentByMail ) {
-
-                    if ( userEmail != null && Utility.isValidEmail(userEmail) ) {
-                        sendMailToUser = true;
-                        password = queryResult[0];
-
-                        returnFileBody = RETURNING_DOCUMENT_SENT;
-                        serverMasterMailBody = SENT_USER_PASSWORD;
-
-                    } else {
-                        returnFileBody = RETURNING_DOCUMENT_NOT_SENT;
-                        serverMasterMailBody = USER_HAS_NO_EMAIL;
-                    }
-
-                } else {
-                    returnFileBody = RETURNING_DOCUMENT_NOT_SENT;
-                    serverMasterMailBody = USER_HAS_NOT_RIGHT;
-                }
-
-            } else {
-                returnFileBody = RETURNING_DOCUMENT_NOT_SENT;
-                serverMasterMailBody = USER_DONT_EXIST;
-            }
-
-            UserDomainObject user = imcref.getImcmsAuthenticatorAndUserAndRoleMapper().getUser( userName );
-            if (user == null ) {
-                user = userMapper.getDefaultUser() ;
-            }
-            user.setCurrentContextPath( req.getContextPath() );
-
-            /* send mail */
-            //			try {
-            SMTP smtp = imcref.getSMTP();
-            String host = req.getServerName();
-
-            if ( sendMailToUser ) {
-                List mailTags = new ArrayList();
-
-                mailTags.add( "#firstname#" );
-                mailTags.add( firstName );
-                mailTags.add( "#lastname#" );
-                mailTags.add( lastName );
-                mailTags.add( "#username#" );
-                mailTags.add( userName );
-                mailTags.add( "#password#" );
-                mailTags.add( password );
-                mailTags.add( "#host#" );
-                mailTags.add( host );
-
-                String userMessage = imcref.getAdminTemplate( USER_MAIL_BODY, user, mailTags );
-                String[] subjectAndBody = getSubjectAndBody(userMessage);
-                smtp.sendMail( new SMTP.Mail( eMailServerMaster, new String[] { userEmail }, subjectAndBody[0], subjectAndBody[1] ) );
-
-            }
-
-            List parsVector = new ArrayList();
-
-            parsVector.add( "#username#" );
-            parsVector.add( userName );
-            parsVector.add( "#email#" );
-            parsVector.add( userEmail );
-            parsVector.add( "#host#" );
-            parsVector.add( host );
-
-            String serverMasterMessage = imcref.getAdminTemplate( serverMasterMailBody, userMapper.getDefaultUser(), parsVector );
-
-            String[] subjectAndBody = getSubjectAndBody(serverMasterMessage);
-            smtp.sendMail( new SMTP.Mail( eMailServerMaster, new String[] { eMailServerMaster }, subjectAndBody[0], subjectAndBody[1] ) ) ;
-
-            returnString = imcref.getAdminTemplate( returnFileBody, user, null );
-
-        } else {
-            UserDomainObject user = Utility.getLoggedOnUser( req );
-            String errorString = imcref.getAdminTemplate( ERROR_STRING, user, null );
-
-            tags.add( "#errorininput#" );
-            tags.add( errorString );
-            returnString = imcref.getAdminTemplate( RETURNING_DOCUMENT_INPUT, user, tags );
-        }
-
-        Utility.setDefaultHtmlContentType( res );
-        ServletOutputStream out = res.getOutputStream();
-
-        out.print( returnString );
-
-    }
-
-    private String[] getSubjectAndBody(String userMessage) {
-        Pattern pattern = Pattern.compile("^Subject: (.*)\n\n");
-        Matcher matcher = pattern.matcher(userMessage);
-        String[] subjectAndBody = new String[2];
-        subjectAndBody[1] = matcher.replaceFirst("");
-        subjectAndBody[0] = matcher.group(1);
-        return subjectAndBody;
-    }
-
-}
diff --git a/server/src/com/imcode/imcms/servlet/PasswordReset.java b/server/src/com/imcode/imcms/servlet/PasswordReset.java
new file mode 100644
index 0000000000..b8afbf2feb
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/PasswordReset.java
@@ -0,0 +1,299 @@
+package com.imcode.imcms.servlet;
+
+
+import com.imcode.imcms.api.P;
+import com.imcode.imcms.servlet.superadmin.UserEditorPage;
+import com.imcode.imcms.util.l10n.LocalizedMessage;
+import com.imcode.imcms.util.l10n.LocalizedMessageFormat;
+import imcode.server.Imcms;
+import imcode.server.SystemData;
+import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import imcode.util.net.SMTP;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class PasswordReset extends HttpServlet {
+
+    // Request parameters associated with ops.
+    public static final String
+            REQUEST_PARAM_OP = "op",
+            REQUEST_PARAM_RESET_ID = "id",
+            REQUEST_USER_IDENTITY = "uid",
+            REQUEST_PARAM_PASSWORD = "password",
+            REQUEST_PARAM_PASSWORD_CHECK = "password_check";
+    // Attribute is bounded to List<String> of error messages.
+    public static final String REQUEST_ATTR_VALIDATION_ERRORS = "validation_errors";
+    private static final Logger logger = LogManager.getLogger(PasswordReset.class);
+    // Views
+    private static final String
+            identity_form_view = "identity_form.jsp",
+            email_sent_confirmation_view = "email_sent_confirmation.jsp",
+            password_reset_form_view = "password_reset_form.jsp",
+            password_changed_confirmation_view = "password_changed_confirmation.jsp";
+    private final LocalizedMessage validationErrorMissingUserId = new LocalizedMessage("passwordreset.error.missing_identity");
+    private ExecutorService emailSender = Executors.newSingleThreadExecutor();
+
+    private static void render(HttpServletRequest request, HttpServletResponse response, String view)
+            throws IOException, ServletException {
+
+        if (view == null) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        } else {
+            request.getRequestDispatcher("/WEB-INF/passwordreset/" + view).forward(request, response);
+        }
+    }
+
+    private static UserDomainObject getUserByPasswordResetId(HttpServletRequest request) {
+        String resetId = StringUtils.trimToEmpty(request.getParameter(REQUEST_PARAM_RESET_ID));
+
+        return Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().getUserByPasswordResetId(resetId);
+    }
+
+    /**
+     * Forwards request to password reset or password edit view.
+     * <p>
+     * Password reset request does not expect any parameters.
+     * Password edit request required valid reset-id parameter.
+     * <p>
+     * Forwards to 404 if request parameters do not met requirements.
+     *
+     * @param request
+     * @param response
+     * @throws ServletException
+     * @throws IOException
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Op op = getOp(request);
+        String view = op == Op.REQUEST_RESET
+                ? identity_form_view
+                : op == Op.RESET && getUserByPasswordResetId(request) != null
+                ? password_reset_form_view
+                : null;
+
+        render(request, response, view);
+    }
+
+    /**
+     * Handles password recovery email sending and new password saving.
+     *
+     * @param request
+     * @param response
+     * @throws ServletException
+     * @throws IOException
+     */
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Op op = getOp(request);
+        String view = null;
+
+        if (op == Op.SEND_RESET_URL) {
+            String identity = StringUtils.trimToEmpty(request.getParameter(REQUEST_USER_IDENTITY));
+
+            if (identity.isEmpty()) {
+                setValidationErrors(request, validationErrorMissingUserId.toLocalizedString(request));
+                view = identity_form_view;
+            } else {
+                P.P2<UserDomainObject, String> userAndEmail = createPasswordReset(identity);
+                if (userAndEmail != null) {
+                    String url = String.format("%s?%s=%s&%s=%s",
+                            request.getRequestURL(),
+                            REQUEST_PARAM_OP, Op.RESET.toString().toLowerCase(),
+                            REQUEST_PARAM_RESET_ID, userAndEmail._1().getPasswordReset().getId());
+
+                    asyncSendPasswordResetURL(userAndEmail, request.getServerName(), url);
+                }
+
+                view = email_sent_confirmation_view;
+            }
+        } else if (op == Op.SAVE_NEW_PASSWORD) {
+            UserDomainObject user = getUserByPasswordResetId(request);
+
+            if (user != null) {
+                String password = StringUtils.trimToEmpty(request.getParameter(REQUEST_PARAM_PASSWORD));
+                String passwordCheck = StringUtils.trimToEmpty(request.getParameter(REQUEST_PARAM_PASSWORD_CHECK));
+
+                LocalizedMessage errorMsg = UserEditorPage.validatePassword(user.getLoginName(), password, passwordCheck);
+
+                if (errorMsg != null) {
+                    setValidationErrors(request, errorMsg.toLocalizedString(user));
+                    view = password_reset_form_view;
+                } else {
+                    user.setPassword(password);
+                    Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().saveUser(user);
+                    view = password_changed_confirmation_view;
+                }
+            }
+        }
+
+        render(request, response, view);
+    }
+
+    private Op getOp(HttpServletRequest request) {
+        String opValue = StringUtils.trimToEmpty(request.getParameter(REQUEST_PARAM_OP)).toUpperCase();
+
+        try {
+            return opValue.isEmpty() ? Op.REQUEST_RESET : Op.valueOf(opValue);
+        } catch (Exception e) {
+            return Op.UNDEFINED;
+        }
+    }
+
+    private void setValidationErrors(HttpServletRequest request, String first, String... rest) {
+        List<String> errors = new LinkedList<>();
+
+        errors.add(first);
+
+        Collections.addAll(errors, rest);
+
+        request.setAttribute(REQUEST_ATTR_VALIDATION_ERRORS, errors);
+    }
+
+    private P.P2<UserDomainObject, String> createPasswordReset(String identity) {
+        P.P2<UserDomainObject, String> result = null;
+        ImcmsAuthenticatorAndUserAndRoleMapper urm = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
+        Map<Integer, P.P2<UserDomainObject, String>> idToUser = new HashMap<>();
+        boolean identityIsValidEmail = Utility.isValidEmail(identity);
+        UserDomainObject userByLogin = identityIsValidEmail
+                ? urm.getUserByLoginIgnoreCase(identity)
+                : urm.getUser(identity);
+
+        if (userByLogin != null) {
+            if (identityIsValidEmail) {
+                idToUser.put(userByLogin.getId(), P.of(userByLogin, identity));
+            } else {
+                String email = userByLogin.getEmailAddress().trim();
+                if (Utility.isValidEmail(email)) {
+                    idToUser.put(userByLogin.getId(), P.of(userByLogin, email));
+                    // check if user's e-mail is valid and unique
+                    // i.e not used by different user as a login or an e-mail.
+                    UserDomainObject userByLogin2 = urm.getUserByLoginIgnoreCase(email);
+                    if (userByLogin2 != null) {
+                        idToUser.put(userByLogin2.getId(), P.of(userByLogin2, email));
+                    }
+
+                    for (UserDomainObject user : urm.getUsersByEmail(email)) {
+                        idToUser.put(user.getId(), P.of(user, email));
+                    }
+                }
+            }
+        }
+
+        if (identityIsValidEmail) {
+            // find all users who use the same e-mail
+            for (UserDomainObject user : urm.getUsersByEmail(identity)) {
+                idToUser.put(user.getId(), P.of(user, identity));
+            }
+        }
+
+        int usersCount = idToUser.size();
+
+        if (usersCount == 0) {
+            logger.warn(String.format("Can't create password reset. No user with identity '%s' were found or e-mail address is invalid.", identity));
+        } else if (usersCount == 1) {
+            P.P2<UserDomainObject, String> userAndEmail = idToUser.values().iterator().next();
+            UserDomainObject user = userAndEmail._1();
+
+            try {
+                result = P.of(urm.createPasswordReset(user.getId()), userAndEmail._2());
+            } catch (Exception e) {
+                logger.error(String.format("Failed to create password reset for user %s.", user), e);
+            }
+        } else {
+            int usersToDisplay = Math.min(usersCount, 5);
+            int index = 1;
+            StringBuilder sb = new StringBuilder("[");
+
+            for (P.P2<UserDomainObject, String> userAndEmail : idToUser.values()) {
+                UserDomainObject user = userAndEmail._1();
+                sb.append(String.format("User(login: '%s', email: '%s')", user.getLoginName(), user.getEmailAddress()));
+
+                if (index < usersToDisplay) {
+                    sb.append(", ");
+                } else {
+                    if (usersToDisplay < usersCount) {
+                        sb.append(", ...");
+                    }
+
+                    sb.append("]");
+                    break;
+                }
+
+                index += 1;
+            }
+
+            logger.warn(String.format(
+                    "Can't create password reset. More than one (%s) user with identity '%s' were found: %s.",
+                    usersCount, identity, sb));
+        }
+
+        return result;
+    }
+
+    private void asyncSendPasswordResetURL(final P.P2<UserDomainObject, String> userAndEmail, final String serverName, final String url) {
+        emailSender.submit(new Runnable() {
+            public void run() {
+                UserDomainObject user = userAndEmail._1();
+                String emailAddress = userAndEmail._2();
+
+                try {
+                    logger.debug(String.format(
+                            "Sending password reset URL to the user %s, using e-mail address %s.", user, emailAddress));
+
+                    String subject = new LocalizedMessageFormat("passwordreset.password_reset_email.subject", serverName).toLocalizedString(user);
+                    String body = new LocalizedMessageFormat("passwordreset.password_reset_email.body", serverName, url).toLocalizedString(user);
+
+                    SystemData sysData = Imcms.getServices().getSystemData();
+                    String eMailServerMaster = sysData.getServerMasterAddress();
+                    SMTP smtp = Imcms.getServices().getSMTP();
+
+                    smtp.sendMail(new SMTP.Mail(eMailServerMaster, new String[]{emailAddress}, subject, body));
+
+//                        Email email = new SimpleEmail();
+//                        email.setDebug(true);
+//                        email.setHostName("smtp.gmail.com");
+//                        email.setSmtpPort(587);
+//                        email.setDebug(true);
+//                        email.setAuthenticator(new DefaultAuthenticator("@gmail.com", ""));
+//                        email.setTLS(true);
+//                        email.setFrom("admin@imcode.com");
+//                        email.setSubject(subject);
+//                        email.setMsg(body);
+//                        email.addTo("@gmail.com");
+//                        email.send();
+                } catch (Exception e) {
+                    logger.error(String.format(
+                            "Failed to send password reset URL to the user %s, using e-mail address %s.",
+                            user, emailAddress),
+                            e);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        emailSender.shutdownNow();
+    }
+
+
+    // Ops
+    public enum Op {
+        REQUEST_RESET,
+        SEND_RESET_URL,
+        RESET,
+        SAVE_NEW_PASSWORD,
+        UNDEFINED
+    }
+}
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/servlet/ProcessAuthResponseServlet.java b/server/src/com/imcode/imcms/servlet/ProcessAuthResponseServlet.java
new file mode 100644
index 0000000000..518fc26d42
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/ProcessAuthResponseServlet.java
@@ -0,0 +1,39 @@
+package com.imcode.imcms.servlet;
+
+import com.imcode.imcms.api.ContentManagementSystem;
+import com.imcode.imcms.model.AuthenticationProvider;
+import com.imcode.imcms.model.ExternalUser;
+import imcode.server.Imcms;
+import imcode.util.Utility;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class ProcessAuthResponseServlet extends HttpServlet {
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        final String identifierId = request.getPathInfo().replaceAll("/", "").trim();
+
+        final AuthenticationProvider provider =
+                Imcms.getServices().getAuthenticationProviderService().getAuthenticationProvider(identifierId);
+
+        String nextURL = provider.processAuthentication(request);
+        nextURL = (StringUtils.isBlank(nextURL) ? (request.getContextPath() + "/") : nextURL);
+
+        final ExternalUser user = ContentManagementSystem.fromRequest(request)
+                .getUserService()
+                .saveExternalUser(provider.getUser(request));
+
+        Utility.makeUserLoggedIn(request, response, user);
+        response.sendRedirect(nextURL);
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/ReDirecter.java b/server/src/com/imcode/imcms/servlet/ReDirecter.java
index bc65a06c05..12f78641ec 100644
--- a/server/src/com/imcode/imcms/servlet/ReDirecter.java
+++ b/server/src/com/imcode/imcms/servlet/ReDirecter.java
@@ -5,20 +5,19 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.StringTokenizer;
 
 public class ReDirecter extends HttpServlet {
 
     private final static int METAID_OFFSET = 2;
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws IOException, ServletException {
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
 
-        String[] pathElements = req.getPathInfo().split("/") ;
+        String[] pathElements = req.getPathInfo().split("/");
 
-        if ( pathElements.length > METAID_OFFSET ) {
-            res.sendRedirect( req.getContextPath() + "/servlet/GetDoc?meta_id=" + pathElements[METAID_OFFSET] );
+        if (pathElements.length > METAID_OFFSET) {
+            res.sendRedirect(req.getContextPath() + "/servlet/GetDoc?meta_id=" + pathElements[METAID_OFFSET]);
         } else {
-            res.sendRedirect( req.getContextPath() + "/servlet/StartDoc" );
+            res.sendRedirect(req.getContextPath() + "/servlet/StartDoc");
         }
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/RebuildIndex.java b/server/src/com/imcode/imcms/servlet/RebuildIndex.java
index e1fe408c09..f3ec8c5774 100644
--- a/server/src/com/imcode/imcms/servlet/RebuildIndex.java
+++ b/server/src/com/imcode/imcms/servlet/RebuildIndex.java
@@ -12,16 +12,16 @@
 
 public class RebuildIndex extends HttpServlet {
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
 
-        if ( !user.isSuperAdmin() ) {
-            res.sendError( HttpServletResponse.SC_FORBIDDEN );
+        if (!user.isSuperAdmin()) {
+            res.sendError(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
 
-        Imcms.getServices().getDocumentMapper().getDocumentIndex().rebuild() ;
-        res.getOutputStream().println( "Started rebuild of index." );
+        Imcms.getServices().getDocumentMapper().getDocumentIndex().rebuild();
+        res.getOutputStream().println("Started rebuild of index.");
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/RequestExternalIdentifierToLoginServlet.java b/server/src/com/imcode/imcms/servlet/RequestExternalIdentifierToLoginServlet.java
new file mode 100644
index 0000000000..606767196a
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/RequestExternalIdentifierToLoginServlet.java
@@ -0,0 +1,52 @@
+package com.imcode.imcms.servlet;
+
+import com.imcode.imcms.model.AuthenticationProvider;
+import imcode.server.Imcms;
+import lombok.SneakyThrows;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.net.URL;
+
+import static com.imcode.imcms.servlet.VerifyUser.REQUEST_PARAMETER__NEXT_URL;
+
+
+public class RequestExternalIdentifierToLoginServlet extends HttpServlet {
+
+    private static final String EXTERNAL_IDENTIFIERS_PATH = "/external-identifiers/";
+    private static final String EXTERNAL_IDENTIFIER_REDIRECT_URI = "logged-in";
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        final HttpSession session = request.getSession();
+        final String identifierId = request.getPathInfo().replaceAll("/", "").trim();
+        final String nextUrl = request.getParameter(REQUEST_PARAMETER__NEXT_URL);
+        final AuthenticationProvider provider =
+                Imcms.getServices().getAuthenticationProviderService().getAuthenticationProvider(identifierId);
+
+        response.sendRedirect(provider.buildAuthenticationURL(getRedirectURL(identifierId, request), session.getId(), nextUrl));
+    }
+
+    @SneakyThrows
+    private String getRedirectURL(String identifierId, HttpServletRequest request) {
+
+        final URL url = new URL(request.getRequestURL().toString());
+        final String protocol = url.getProtocol();
+        final String host = url.getHost();
+        final int port = url.getPort();
+
+        final String protocolHostPort = (port == -1)// if the port is not explicitly specified in the input, it will be -1.
+                ? String.format("%s://%s", protocol, host)
+                : String.format("%s://%s:%d", protocol, host, port);
+
+        return protocolHostPort + request.getContextPath() + "/api" + EXTERNAL_IDENTIFIERS_PATH
+                + EXTERNAL_IDENTIFIER_REDIRECT_URI + "/" + identifierId;
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/Restart.java b/server/src/com/imcode/imcms/servlet/Restart.java
index 583d67e00c..e067e2ab2f 100644
--- a/server/src/com/imcode/imcms/servlet/Restart.java
+++ b/server/src/com/imcode/imcms/servlet/Restart.java
@@ -12,16 +12,16 @@
 
 public class Restart extends HttpServlet {
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
 
-        if ( !user.isSuperAdmin() ) {
-            res.sendError( HttpServletResponse.SC_FORBIDDEN );
+        if (!user.isSuperAdmin()) {
+            res.sendError(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
 
-        Imcms.restart() ;
-        res.getOutputStream().println( "Restart complete." );
+        Imcms.restart();
+        res.getOutputStream().println("Restart complete.");
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/RoleIpRange.java b/server/src/com/imcode/imcms/servlet/RoleIpRange.java
new file mode 100644
index 0000000000..7d1a9e1c80
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/RoleIpRange.java
@@ -0,0 +1,43 @@
+package com.imcode.imcms.servlet;
+
+/**
+ * Class describes DB entity for white list of IP ranges per role
+ *
+ * @author Serhii Maksymchuk from Ubrainians for imCode
+ * 22.11.17.
+ */
+public final class RoleIpRange {
+    private final int id;
+    private final boolean isAdmin;
+    private final String ipFrom;
+    private final String ipTo;
+    private final String description;
+
+    public RoleIpRange(int id, boolean isAdmin, String ipFrom, String ipTo, String description) {
+        this.id = id;
+        this.isAdmin = isAdmin;
+        this.ipFrom = ipFrom;
+        this.ipTo = ipTo;
+        this.description = description;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public boolean isAdmin() {
+        return isAdmin;
+    }
+
+    public String getIpFrom() {
+        return ipFrom;
+    }
+
+    public String getIpTo() {
+        return ipTo;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/SearchDocuments.java b/server/src/com/imcode/imcms/servlet/SearchDocuments.java
index 97967a4915..1a63e06b90 100644
--- a/server/src/com/imcode/imcms/servlet/SearchDocuments.java
+++ b/server/src/com/imcode/imcms/servlet/SearchDocuments.java
@@ -1,7 +1,7 @@
 package com.imcode.imcms.servlet;
 
-import com.imcode.imcms.flow.Page;
 import com.imcode.imcms.flow.DispatchCommand;
+import com.imcode.imcms.flow.Page;
 import com.imcode.imcms.servlet.superadmin.AdminManager;
 
 import javax.servlet.ServletException;
@@ -12,27 +12,27 @@
 
 public class SearchDocuments extends HttpServlet {
 
-    public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-        if (null != Page.fromRequest( request )) {
-            request.getRequestDispatcher( "/servlet/PageDispatcher" ).forward( request, response );
+        if (null != Page.fromRequest(request)) {
+            request.getRequestDispatcher("/servlet/PageDispatcher").forward(request, response);
         } else {
-            SearchDocumentsPage searchDocumentsPage = new SearchDocumentsPage() ;
+            SearchDocumentsPage searchDocumentsPage = new SearchDocumentsPage();
             DocumentFinder documentFinder = new DocumentFinder(searchDocumentsPage);
             documentFinder.setLogged(true);
-            documentFinder.addExtraSearchResultColumn( new AdminManager.DatesSummarySearchResultColumn());
-            documentFinder.setCancelCommand( new DispatchCommand() {
-                public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                    request.getRequestDispatcher( "BackDoc" ).forward( request, response );
+            documentFinder.addExtraSearchResultColumn(new AdminManager.DatesSummarySearchResultColumn());
+            documentFinder.setCancelCommand(new DispatchCommand() {
+                public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                    request.getRequestDispatcher("BackDoc").forward(request, response);
                 }
-            } );
-            searchDocumentsPage.updateFromRequest( request );
+            });
+            searchDocumentsPage.updateFromRequest(request);
             documentFinder.forward(request, response);
         }
     }
 
-    public void doPost( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        doGet( request, response );
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
     }
 
 } // End class
diff --git a/server/src/com/imcode/imcms/servlet/SearchDocumentsPage.java b/server/src/com/imcode/imcms/servlet/SearchDocumentsPage.java
index e935b3d5fe..3a8ff19fd6 100644
--- a/server/src/com/imcode/imcms/servlet/SearchDocumentsPage.java
+++ b/server/src/com/imcode/imcms/servlet/SearchDocumentsPage.java
@@ -19,14 +19,16 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang.time.DateUtils;
-import org.apache.log4j.Logger;
-import org.apache.lucene.document.DateField;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.document.DateTools;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RangeQuery;
 import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.util.BytesRef;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -36,6 +38,8 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static org.apache.lucene.search.BooleanClause.Occur;
+
 public class SearchDocumentsPage extends OkCancelPage implements DocumentFinderPage {
 
     public static final String REQUEST_PARAMETER__SECTION_ID = "section_id";
@@ -53,10 +57,16 @@ public class SearchDocumentsPage extends OkCancelPage implements DocumentFinderP
     public static final String REQUEST_PARAMETER__SORT_ORDER = "sort_order";
     public static final String REQUEST_PARAMETER__PHASE = "phase";
     public static final String REQUEST_PARAMETER__DOCUMENT_TYPE_ID = "document_type_id";
-
+    public static final String USER_DOCUMENTS_RESTRICTION__NONE = "";
+    public static final String USER_DOCUMENTS_RESTRICTION__DOCUMENTS_CREATED_BY_USER = "created";
+    public static final String USER_DOCUMENTS_RESTRICTION__DOCUMENTS_PUBLISHED_BY_USER = "published";
+    public static final String DATE_TYPE__PUBLICATION_START = "publication_start";
+    public static final String DATE_TYPE__PUBLICATION_END = "publication_end";
+    public static final String DATE_TYPE__CREATED = "created";
+    public static final String DATE_TYPE__ARCHIVED = "archived";
+    public static final String DATE_TYPE__MODIFIED = "modified";
     private static final int DEFAULT_DOCUMENTS_PER_PAGE = 10;
-    private final static Logger log = Logger.getLogger( SearchDocumentsPage.class.getName() );
-
+    private final static Logger log = LogManager.getLogger(SearchDocumentsPage.class.getName());
     private String queryString;
     private Set sections = new HashSet();
     private String[] phases;
@@ -66,262 +76,253 @@ public class SearchDocumentsPage extends OkCancelPage implements DocumentFinderP
     private Date startDate;
     private Date endDate;
     private String sortOrder;
-
     private List documentsFound;
     private int firstDocumentIndex;
     private int documentsPerPage = DEFAULT_DOCUMENTS_PER_PAGE;
     private DocumentDomainObject selectedDocument;
     private Query query;
-
     private DocumentFinder documentFinder;
 
-    public static final String USER_DOCUMENTS_RESTRICTION__NONE = "";
-    public static final String USER_DOCUMENTS_RESTRICTION__DOCUMENTS_CREATED_BY_USER = "created";
-    public static final String USER_DOCUMENTS_RESTRICTION__DOCUMENTS_PUBLISHED_BY_USER = "published";
-
-    public static final String DATE_TYPE__PUBLICATION_START = "publication_start";
-    public static final String DATE_TYPE__PUBLICATION_END = "publication_end" ;
-    public static final String DATE_TYPE__CREATED = "created";
-    public static final String DATE_TYPE__ARCHIVED = "archived";
-    public static final String DATE_TYPE__MODIFIED = "modified";
-
     public SearchDocumentsPage() {
-        super( null, null );
+        super(null, null);
     }
 
-    public void updateFromRequest( HttpServletRequest request ) {
+    public void updateFromRequest(HttpServletRequest request) {
 
         DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
 
-        if ( documentFinder.isDocumentsSelectable() ) {
+        if (documentFinder.isDocumentsSelectable()) {
             try {
-                selectedDocument = documentMapper.getDocument( Integer.parseInt( request.getParameter( REQUEST_PARAMETER__SELECTED_DOCUMENT_ID ) ) );
-            } catch ( NumberFormatException nfe ) {
+                selectedDocument = documentMapper.getDocument(Integer.parseInt(request.getParameter(REQUEST_PARAMETER__SELECTED_DOCUMENT_ID)));
+            } catch (NumberFormatException nfe) {
             }
         }
 
-        firstDocumentIndex = Math.max( 0, NumberUtils.stringToInt( request.getParameter( REQUEST_PARAMETER__FIRST_DOCUMENT_INDEX ) ) );
+        firstDocumentIndex = Math.max(0, NumberUtils.stringToInt(request.getParameter(REQUEST_PARAMETER__FIRST_DOCUMENT_INDEX)));
 
-        boolean gotNewFirstDocumentIndex = Utility.parameterIsSet( request, REQUEST_PARAMETER__FIRST_DOCUMENT_INDEX );
-        boolean notBrowsingResultList = !gotNewFirstDocumentIndex || documentsFound == null ;
-        if ( notBrowsingResultList ) {
+        boolean gotNewFirstDocumentIndex = Utility.parameterIsSet(request, REQUEST_PARAMETER__FIRST_DOCUMENT_INDEX);
+        boolean notBrowsingResultList = !gotNewFirstDocumentIndex || documentsFound == null;
+        if (notBrowsingResultList) {
             try {
                 sections.clear();
-                int[] sectionIds = Utility.getParameterInts( request, REQUEST_PARAMETER__SECTION_ID );
-                for ( int i = 0; i < sectionIds.length; i++ ) {
+                int[] sectionIds = Utility.getParameterInts(request, REQUEST_PARAMETER__SECTION_ID);
+                for (int i = 0; i < sectionIds.length; i++) {
                     int sectionId = sectionIds[i];
-                    SectionDomainObject section = documentMapper.getSectionById( sectionId );
-                    sections.add( section );
+                    SectionDomainObject section = documentMapper.getSectionById(sectionId);
+                    sections.add(section);
                 }
-            } catch ( NumberFormatException nfe ) {
+            } catch (NumberFormatException nfe) {
             }
 
-            phases = Utility.getParameterValues( request, REQUEST_PARAMETER__PHASE );
+            phases = Utility.getParameterValues(request, REQUEST_PARAMETER__PHASE);
 
             documentTypeIds = Utility.getParameterInts(request, REQUEST_PARAMETER__DOCUMENT_TYPE_ID);
         }
 
-        String userDocumentsRestrictionParameter = request.getParameter( REQUEST_PARAMETER__USER_RESTRICTION );
-        if ( null != userDocumentsRestrictionParameter ) {
+        String userDocumentsRestrictionParameter = request.getParameter(REQUEST_PARAMETER__USER_RESTRICTION);
+        if (null != userDocumentsRestrictionParameter) {
             userDocumentsRestriction = userDocumentsRestrictionParameter;
         }
 
-        String dateTypeRestrictionParameter = request.getParameter( REQUEST_PARAMETER__DATE_TYPE );
-        if ( null != dateTypeRestrictionParameter ) {
+        String dateTypeRestrictionParameter = request.getParameter(REQUEST_PARAMETER__DATE_TYPE);
+        if (null != dateTypeRestrictionParameter) {
             dateTypeRestriction = dateTypeRestrictionParameter;
         }
 
         DateFormat dateFormat = createDateFormat();
-        String startDateParameter = request.getParameter( REQUEST_PARAMETER__START_DATE );
-        if ( null != startDateParameter ) {
+        String startDateParameter = request.getParameter(REQUEST_PARAMETER__START_DATE);
+        if (null != startDateParameter) {
             try {
-                startDate = dateFormat.parse( startDateParameter );
-            } catch ( java.text.ParseException pe ) {
+                startDate = dateFormat.parse(startDateParameter);
+            } catch (java.text.ParseException pe) {
                 startDate = null;
             }
         }
-        String endDateParameter = request.getParameter( REQUEST_PARAMETER__END_DATE );
-        if ( null != endDateParameter ) {
+        String endDateParameter = request.getParameter(REQUEST_PARAMETER__END_DATE);
+        if (null != endDateParameter) {
             try {
-                endDate = dateFormat.parse( endDateParameter );
-            } catch ( java.text.ParseException ignored ) {
+                endDate = dateFormat.parse(endDateParameter);
+            } catch (java.text.ParseException ignored) {
                 endDate = null;
             }
         }
 
-        String sortOrderParameter = request.getParameter( REQUEST_PARAMETER__SORT_ORDER );
-        if ( null != sortOrderParameter ) {
-            sortOrder = sortOrderParameter ;
-            Comparator documentComparator = AdminManager.getComparator( sortOrder );
-            documentFinder.setDocumentComparator( documentComparator );
+        String sortOrderParameter = request.getParameter(REQUEST_PARAMETER__SORT_ORDER);
+        if (null != sortOrderParameter) {
+            sortOrder = sortOrderParameter;
+            Comparator documentComparator = AdminManager.getComparator(sortOrder);
+            documentFinder.setDocumentComparator(documentComparator);
         }
 
         try {
-            documentsPerPage = Integer.parseInt( request.getParameter( REQUEST_PARAMETER__DOCUMENTS_PER_PAGE ) );
-        } catch ( NumberFormatException ignored ) {}
-        if ( documentsPerPage <= 0 ) {
+            documentsPerPage = Integer.parseInt(request.getParameter(REQUEST_PARAMETER__DOCUMENTS_PER_PAGE));
+        } catch (NumberFormatException ignored) {
+        }
+        if (documentsPerPage <= 0) {
             documentsPerPage = DEFAULT_DOCUMENTS_PER_PAGE;
         }
-        queryString = StringUtils.defaultString( request.getParameter( REQUEST_PARAMETER__QUERY_STRING ) );
+        queryString = StringUtils.defaultString(request.getParameter(REQUEST_PARAMETER__QUERY_STRING));
 
-        query = createQuery( documentFinder, Utility.getLoggedOnUser( request ) );
+        query = createQuery(documentFinder, Utility.getLoggedOnUser(request));
     }
 
     private SimpleDateFormat createDateFormat() {
-        return new SimpleDateFormat( DateConstants.DATE_FORMAT_STRING );
+        return new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING);
     }
 
-    private Query createQuery( DocumentFinder documentFinder, UserDomainObject user ) {
+    private Query createQuery(DocumentFinder documentFinder, UserDomainObject user) {
 
-        BooleanQuery newQuery = new BooleanQuery();
-        if ( StringUtils.isNotBlank( queryString ) ) {
+        final BooleanQuery.Builder newQueryBuilder = new BooleanQuery.Builder();
+        if (StringUtils.isNotBlank(queryString)) {
             try {
-                Query textQuery = documentFinder.parse( queryString );
-                newQuery.add( textQuery, true, false );
-            } catch ( ParseException e ) {
-                log.debug( e.getMessage() + " in search-string " + queryString, e );
+                final Query textQuery = documentFinder.parse(queryString);
+                newQueryBuilder.add(textQuery, Occur.MUST);
+            } catch (ParseException e) {
+                log.debug(e.getMessage() + " in search-string " + queryString, e);
             }
         }
 
-        if ( !sections.isEmpty() ) {
-            BooleanQuery sectionQueries = new BooleanQuery();
-            for ( Iterator iterator = sections.iterator(); iterator.hasNext(); ) {
-                SectionDomainObject section = (SectionDomainObject)iterator.next();
-                sectionQueries.add( new TermQuery( new Term( DocumentIndex.FIELD__SECTION, section.getName().toLowerCase() ) ), false, false );
+        if (!sections.isEmpty()) {
+            final BooleanQuery.Builder sectionQueriesBuilder = new BooleanQuery.Builder();
+            for (Object sectionObject : sections) {
+                final SectionDomainObject section = (SectionDomainObject) sectionObject;
+                sectionQueriesBuilder.add(new TermQuery(new Term(DocumentIndex.FIELD__SECTION, section.getName().toLowerCase())), Occur.SHOULD);
             }
-            newQuery.add( sectionQueries, true, false );
+            newQueryBuilder.add(sectionQueriesBuilder.build(), Occur.MUST);
         }
 
-        if ( null != phases && phases.length > 0 ) {
-            BooleanQuery phaseQueries = new BooleanQuery();
-            for ( int i = 0; i < phases.length; i++ ) {
-                String phase = phases[i];
-                Query phaseQuery = new TermQuery( new Term( DocumentIndex.FIELD__PHASE, phase ) );
-                phaseQueries.add( phaseQuery, false, false );
+        if (null != phases && phases.length > 0) {
+            final BooleanQuery.Builder phaseQueriesBuilder = new BooleanQuery.Builder();
+            for (String phase : phases) {
+                final Query phaseQuery = new TermQuery(new Term(DocumentIndex.FIELD__PHASE, phase));
+                phaseQueriesBuilder.add(phaseQuery, Occur.SHOULD);
             }
-            newQuery.add( phaseQueries, true, false );
+            newQueryBuilder.add(phaseQueriesBuilder.build(), Occur.MUST);
         }
 
-        if ( null != documentTypeIds && documentTypeIds.length > 0 ) {
-            BooleanQuery documentTypeQueries = new BooleanQuery();
-            for ( int i = 0; i < documentTypeIds.length; i++ ) {
-                int documentTypeId = documentTypeIds[i];
-                Query documentTypeQuery = new TermQuery( new Term(DocumentIndex.FIELD__DOC_TYPE_ID, ""+documentTypeId)) ;
-                documentTypeQueries.add( documentTypeQuery, false, false );
+        if (null != documentTypeIds && documentTypeIds.length > 0) {
+            final BooleanQuery.Builder documentTypeQueriesBuilder = new BooleanQuery.Builder();
+            for (int documentTypeId : documentTypeIds) {
+                final Query documentTypeQuery = new TermQuery(new Term(DocumentIndex.FIELD__DOC_TYPE_ID, "" + documentTypeId));
+                documentTypeQueriesBuilder.add(documentTypeQuery, Occur.SHOULD);
             }
-            newQuery.add( documentTypeQueries, true, false ) ;
+            newQueryBuilder.add(documentTypeQueriesBuilder.build(), Occur.MUST);
         }
 
-        if ( USER_DOCUMENTS_RESTRICTION__DOCUMENTS_CREATED_BY_USER.equals( userDocumentsRestriction ) ) {
-            Query createdByUserQuery = new TermQuery( new Term( DocumentIndex.FIELD__CREATOR_ID, "" + user.getId() ) );
-            newQuery.add( createdByUserQuery, true, false );
+        if (USER_DOCUMENTS_RESTRICTION__DOCUMENTS_CREATED_BY_USER.equals(userDocumentsRestriction)) {
+            final Query createdByUserQuery = new TermQuery(new Term(DocumentIndex.FIELD__CREATOR_ID, "" + user.getId()));
+            newQueryBuilder.add(createdByUserQuery, Occur.MUST);
         }
 
-        if ( USER_DOCUMENTS_RESTRICTION__DOCUMENTS_PUBLISHED_BY_USER.equals( userDocumentsRestriction ) ) {
-            Query publishedByUserQuery = new TermQuery( new Term( DocumentIndex.FIELD__PUBLISHER_ID, "" + user.getId() ) );
-            newQuery.add( publishedByUserQuery, true, false );
+        if (USER_DOCUMENTS_RESTRICTION__DOCUMENTS_PUBLISHED_BY_USER.equals(userDocumentsRestriction)) {
+            final Query publishedByUserQuery = new TermQuery(new Term(DocumentIndex.FIELD__PUBLISHER_ID, "" + user.getId()));
+            newQueryBuilder.add(publishedByUserQuery, Occur.MUST);
         }
 
-        if ( null != startDate || null != endDate ) {
-            Date luceneMinDate = new Date( 0 );
-            Date luceneMaxDate = new Date( 1000L * 365 * 24 * 60 * 60 * 1000 );
-            Date calculatedStartDate = null == startDate ? luceneMinDate : startDate;
-            Date calculatedEndDate = null == endDate ? luceneMaxDate : new Date( endDate.getTime() + DateUtils.MILLIS_IN_DAY );
+        if (null != startDate || null != endDate) {
+            final Date luceneMinDate = new Date(0);
+            final Date luceneMaxDate = new Date(1000L * 365 * 24 * 60 * 60 * 1000);
+            final Date calculatedStartDate = null == startDate ? luceneMinDate : startDate;
+            final Date calculatedEndDate = null == endDate ? luceneMaxDate : new Date(endDate.getTime() + DateUtils.MILLIS_IN_DAY);
 
             String dateField;
-            if ( DATE_TYPE__PUBLICATION_END.equals( dateTypeRestriction ) ) {
+            if (DATE_TYPE__PUBLICATION_END.equals(dateTypeRestriction)) {
                 dateField = DocumentIndex.FIELD__PUBLICATION_END_DATETIME;
-            } else if ( DATE_TYPE__ARCHIVED.equals( dateTypeRestriction ) ) {
+            } else if (DATE_TYPE__ARCHIVED.equals(dateTypeRestriction)) {
                 dateField = DocumentIndex.FIELD__ARCHIVED_DATETIME;
-            } else if ( DATE_TYPE__CREATED.equals( dateTypeRestriction ) ) {
+            } else if (DATE_TYPE__CREATED.equals(dateTypeRestriction)) {
                 dateField = DocumentIndex.FIELD__CREATED_DATETIME;
-            } else if ( DATE_TYPE__MODIFIED.equals( dateTypeRestriction ) ) {
+            } else if (DATE_TYPE__MODIFIED.equals(dateTypeRestriction)) {
                 dateField = DocumentIndex.FIELD__MODIFIED_DATETIME;
             } else {
                 dateField = DocumentIndex.FIELD__PUBLICATION_START_DATETIME;
             }
 
-            Term lowerTerm = new Term( dateField, DateField.dateToString( calculatedStartDate ) );
-            Term upperTerm = new Term( dateField, DateField.dateToString( calculatedEndDate ) );
-            Query publicationStartedQuery = new RangeQuery( lowerTerm, upperTerm, true );
-            newQuery.add( publicationStartedQuery, true, false );
+            final TermRangeQuery publicationStartedQuery = new TermRangeQuery(
+                    dateField,
+                    new BytesRef(DateTools.dateToString(calculatedStartDate, DateTools.Resolution.MINUTE)),
+                    new BytesRef(DateTools.dateToString(calculatedEndDate, DateTools.Resolution.MINUTE)),
+                    true, true);
+            newQueryBuilder.add(publicationStartedQuery, Occur.MUST);
         }
 
-        if ( 0 == newQuery.getClauses().length ) {
+        final BooleanQuery booleanQuery = newQueryBuilder.build();
+        if (booleanQuery.clauses().isEmpty()) {
             return null;
         }
-        return newQuery;
+
+        return booleanQuery;
     }
 
-    protected boolean wasCanceled( HttpServletRequest request ) {
-        return documentFinder.isCancelable() && super.wasCanceled( request );
+    protected boolean wasCanceled(HttpServletRequest request) {
+        return documentFinder.isCancelable() && super.wasCanceled(request);
     }
 
-    protected void dispatchCancel( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        documentFinder.cancel( request, response );
+    protected void dispatchCancel(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        documentFinder.cancel(request, response);
     }
 
-    protected void dispatchOther( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
+    protected void dispatchOther(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         DocumentDomainObject documentSelectedForEditing = null;
         try {
             DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-            documentSelectedForEditing = documentMapper.getDocument( Integer.parseInt( request.getParameter( REQUEST_PARAMETER__TO_EDIT_DOCUMENT_ID ) ) );
-        } catch ( NumberFormatException nfe ) {
+            documentSelectedForEditing = documentMapper.getDocument(Integer.parseInt(request.getParameter(REQUEST_PARAMETER__TO_EDIT_DOCUMENT_ID)));
+        } catch (NumberFormatException nfe) {
         }
 
-        if ( null != documentSelectedForEditing ) {
-            goToEditDocumentInformation( request, response, documentSelectedForEditing );
-        } else if ( null != getSelectedDocument() ) {
-            documentFinder.selectDocument( getSelectedDocument());
+        if (null != documentSelectedForEditing) {
+            goToEditDocumentInformation(request, response, documentSelectedForEditing);
+        } else if (null != getSelectedDocument()) {
+            documentFinder.selectDocument(getSelectedDocument());
             documentFinder.dispatchReturn(request, response);
         } else {
-            documentFinder.forwardWithPage( request, response, this );
+            documentFinder.forwardWithPage(request, response, this);
         }
     }
 
-    private void goToEditDocumentInformation( HttpServletRequest request, HttpServletResponse response,
-                                              DocumentDomainObject documentSelectedForEditing ) throws IOException, ServletException {
+    private void goToEditDocumentInformation(HttpServletRequest request, HttpServletResponse response,
+                                             DocumentDomainObject documentSelectedForEditing) throws IOException, ServletException {
         DispatchCommand returnCommand = new DispatchCommand() {
-            public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                documentFinder.forwardWithPage( request, response, SearchDocumentsPage.this );
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                documentFinder.forwardWithPage(request, response, SearchDocumentsPage.this);
             }
         };
-        EditDocumentInformationPageFlow editDocumentInformationPageFlow = new EditDocumentInformationPageFlow( documentSelectedForEditing, returnCommand, new DocumentMapper.SaveEditedDocumentCommand() );
-        editDocumentInformationPageFlow.setAdminButtonsHidden( true );
-        editDocumentInformationPageFlow.dispatch( request, response );
+        EditDocumentInformationPageFlow editDocumentInformationPageFlow = new EditDocumentInformationPageFlow(documentSelectedForEditing, returnCommand, new DocumentMapper.SaveEditedDocumentCommand());
+        editDocumentInformationPageFlow.setAdminButtonsHidden(true);
+        editDocumentInformationPageFlow.dispatch(request, response);
     }
 
-    public String getParameterStringWithParameter( HttpServletRequest request,
-                                                   String parameterName, String parameterValue ) {
-        MultiMap parameters = getParameterMap( request );
-        parameters.put( parameterName, parameterValue );
-        return Utility.createQueryStringFromParameterMultiMap( parameters );
+    public String getParameterStringWithParameter(HttpServletRequest request,
+                                                  String parameterName, String parameterValue) {
+        MultiMap parameters = getParameterMap(request);
+        parameters.put(parameterName, parameterValue);
+        return Utility.createQueryStringFromParameterMultiMap(parameters);
     }
 
-    private MultiMap getParameterMap( HttpServletRequest request ) {
+    private MultiMap getParameterMap(HttpServletRequest request) {
         MultiMap parameters = new MultiHashMap();
         Page page = Page.fromRequest(request);
         String pageSessionNameFromRequest = page.getSessionAttributeName();
-        if ( null != pageSessionNameFromRequest ) {
-            parameters.put( Page.IN_REQUEST, pageSessionNameFromRequest );
+        if (null != pageSessionNameFromRequest) {
+            parameters.put(Page.IN_REQUEST, pageSessionNameFromRequest);
         }
         return parameters;
     }
 
     public String getPath(HttpServletRequest request) {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
         return "/imcms/" + user.getLanguageIso639_2() + "/jsp/search_documents.jsp";
     }
 
     public Set getSections() {
-        return Collections.unmodifiableSet( sections );
+        return Collections.unmodifiableSet(sections);
     }
 
     public List getDocumentsFound() {
         return documentsFound;
     }
 
-    public void setDocumentsFound( List documentsFound ) {
+    public void setDocumentsFound(List documentsFound) {
         this.documentsFound = documentsFound;
     }
 
@@ -349,7 +350,7 @@ public DocumentFinder getDocumentFinder() {
         return documentFinder;
     }
 
-    public void setDocumentFinder( DocumentFinder documentFinder ) {
+    public void setDocumentFinder(DocumentFinder documentFinder) {
         this.documentFinder = documentFinder;
     }
 
@@ -358,17 +359,17 @@ public String[] getPhases() {
     }
 
     public String getFormattedStartDate() {
-        return formatDate( startDate );
+        return formatDate(startDate);
     }
 
     public String getFormattedEndDate() {
-        return formatDate( endDate );
+        return formatDate(endDate);
     }
 
-    private String formatDate( Date date ) {
+    private String formatDate(Date date) {
         DateFormat dateFormat = createDateFormat();
-        if ( null != date ) {
-            return dateFormat.format( date );
+        if (null != date) {
+            return dateFormat.format(date);
         } else {
             return "";
         }
@@ -389,7 +390,8 @@ public String getUserDocumentsRestriction() {
     public int[] getDocumentTypeIds() {
         return documentTypeIds;
     }
-    public JSCalendar getJSCalender (HttpServletRequest request) {
-        return new JSCalendar( Utility.getLoggedOnUser(request).getLanguageIso639_2(), request ) ;
+
+    public JSCalendar getJSCalender(HttpServletRequest request) {
+        return new JSCalendar(Utility.getLoggedOnUser(request).getLanguageIso639_2(), request);
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/SessionsInfo.java b/server/src/com/imcode/imcms/servlet/SessionsInfo.java
new file mode 100644
index 0000000000..460d76b5f3
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/SessionsInfo.java
@@ -0,0 +1,26 @@
+package com.imcode.imcms.servlet;
+
+import com.google.gson.Gson;
+import imcode.util.Utility;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+public class SessionsInfo extends HttpServlet {
+
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        final Gson gson = new Gson();
+        String jsonResponse = gson.toJson(Utility.getActiveSessions());
+
+        res.setContentType("application/json");
+        res.setCharacterEncoding("utf-8");
+
+        PrintWriter out = res.getWriter();
+        out.print(jsonResponse);
+    }
+}
+
diff --git a/server/src/com/imcode/imcms/servlet/StartDoc.java b/server/src/com/imcode/imcms/servlet/StartDoc.java
index a529c3ee64..5b18bb5cb4 100644
--- a/server/src/com/imcode/imcms/servlet/StartDoc.java
+++ b/server/src/com/imcode/imcms/servlet/StartDoc.java
@@ -10,12 +10,12 @@
 
 public class StartDoc extends HttpServlet {
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         int meta_id = Imcms.getServices().getSystemData().getStartDocument();
-        req.getRequestDispatcher( "/servlet/GetDoc?meta_id="+meta_id ).forward( req, res );
+        req.getRequestDispatcher("/servlet/GetDoc?meta_id=" + meta_id).forward(req, res);
     }
 
-    protected void doPost( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        doGet( request, response );
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/SuperAdminFilter.java b/server/src/com/imcode/imcms/servlet/SuperAdminFilter.java
index ed31344a57..24da067a4a 100644
--- a/server/src/com/imcode/imcms/servlet/SuperAdminFilter.java
+++ b/server/src/com/imcode/imcms/servlet/SuperAdminFilter.java
@@ -15,7 +15,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
                          FilterChain filterChain) throws IOException, ServletException {
         ContentManagementSystem cms = ContentManagementSystem.fromRequest(servletRequest);
         if (!cms.getCurrentUser().isSuperAdmin()) {
-            (( HttpServletResponse)servletResponse).setStatus(HttpServletResponse.SC_FORBIDDEN);
+            ((HttpServletResponse) servletResponse).setStatus(HttpServletResponse.SC_FORBIDDEN);
             servletResponse.getWriter().write("You need to be superadmin to access this resource.");
             return;
         }
diff --git a/server/src/com/imcode/imcms/servlet/UriEncodingWorkaroundWrapper.java b/server/src/com/imcode/imcms/servlet/UriEncodingWorkaroundWrapper.java
index 15e6abf13b..9345fd5171 100644
--- a/server/src/com/imcode/imcms/servlet/UriEncodingWorkaroundWrapper.java
+++ b/server/src/com/imcode/imcms/servlet/UriEncodingWorkaroundWrapper.java
@@ -10,56 +10,57 @@
 class UriEncodingWorkaroundWrapper extends HttpServletRequestWrapper {
 
     private FallbackDecoder decoder;
-    private boolean redecodeParameters ;
+    private boolean redecodeParameters;
+
     UriEncodingWorkaroundWrapper(HttpServletRequest request, FallbackDecoder fallbackDecoder) {
         super(request);
         decoder = fallbackDecoder;
         String method = getMethod();
-        redecodeParameters = "GET".equals(method) || "HEAD".equals(method) ;
+        redecodeParameters = "GET".equals(method) || "HEAD".equals(method);
     }
 
     public String getPathInfo() {
         String pathInfo = super.getPathInfo();
-        return redecode(pathInfo, "path-info "+pathInfo);
+        return redecode(pathInfo, "path-info " + pathInfo);
     }
 
     public String getParameter(String parameterName) {
         String parameterValue = super.getParameter(parameterName);
-        return redecodeParameters ? redecode(parameterValue, "parameter "+parameterName) : parameterValue;
+        return redecodeParameters ? redecode(parameterValue, "parameter " + parameterName) : parameterValue;
     }
 
     public String[] getParameterValues(String parameterName) {
         String[] parameterValues = super.getParameterValues(parameterName);
-        return redecodeParameters ? redecode(parameterValues, "parameter "+parameterName) : parameterValues;
+        return redecodeParameters ? redecode(parameterValues, "parameter " + parameterName) : parameterValues;
     }
 
     public Map getParameterMap() {
         Map<String, String[]> parameterMap = super.getParameterMap();
         if (redecodeParameters) {
-            Map<String, String[]> result = new HashMap<String, String[]>();
-            for ( Map.Entry<String, String[]> entry : parameterMap.entrySet() ) {
-                result.put(entry.getKey(), redecode(entry.getValue(), entry.getKey())) ;
+            Map<String, String[]> result = new HashMap<>();
+            for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
+                result.put(entry.getKey(), redecode(entry.getValue(), entry.getKey()));
             }
-            parameterMap = result ;
+            parameterMap = result;
         }
-        return parameterMap ;
+        return parameterMap;
     }
 
     private String[] redecode(String[] parameterValues, String parameterName) {
-        if (null == parameterValues ) {
-            return null ;
+        if (null == parameterValues) {
+            return null;
         }
         String[] result = new String[parameterValues.length];
-        for ( int i = 0; i < parameterValues.length; i++ ) {
+        for (int i = 0; i < parameterValues.length; i++) {
             result[i] = redecode(parameterValues[i], parameterName);
         }
         return result;
     }
 
     private String redecode(String parameterValue, String parameterName) {
-        if (null == parameterValue ) {
-            return null ;
+        if (null == parameterValue) {
+            return null;
         }
-        return decoder.decodeBytes(decoder.getFallbackCharset().encode(parameterValue).array(), parameterName) ;
+        return decoder.decodeBytes(decoder.getFallbackCharset().encode(parameterValue).array(), parameterName);
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/UserIpIsNotAllowedException.java b/server/src/com/imcode/imcms/servlet/UserIpIsNotAllowedException.java
new file mode 100644
index 0000000000..1c40f031ce
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/UserIpIsNotAllowedException.java
@@ -0,0 +1,26 @@
+package com.imcode.imcms.servlet;
+
+import imcode.server.user.UserDomainObject;
+
+import javax.servlet.ServletRequest;
+
+/**
+ * Exception throws when user with role have no IP in white list.
+ *
+ * @author Serhii Maksymchuk from Ubrainians for imCode
+ * 23.11.17.
+ */
+public class UserIpIsNotAllowedException extends RuntimeException {
+
+    private final UserDomainObject user;
+
+    public UserIpIsNotAllowedException(UserDomainObject user, ServletRequest request) {
+        super("Access denied: user " + user.getLoginName() + " with " + (user.isSuperAdmin() ? "super" : "non")
+                + "-admin role and with IP " + request.getRemoteAddr() + " is not in white list.");
+        this.user = user;
+    }
+
+    public UserDomainObject getUser() {
+        return user;
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/VerifyUser.java b/server/src/com/imcode/imcms/servlet/VerifyUser.java
index 934901ff1d..05967a1a78 100644
--- a/server/src/com/imcode/imcms/servlet/VerifyUser.java
+++ b/server/src/com/imcode/imcms/servlet/VerifyUser.java
@@ -2,13 +2,19 @@
 
 import com.imcode.imcms.api.ContentManagementSystem;
 import com.imcode.imcms.api.User;
+import com.imcode.imcms.domain.services.core.TwoFactorAuthService;
 import com.imcode.imcms.flow.DispatchCommand;
 import com.imcode.imcms.servlet.superadmin.AdminUser;
 import com.imcode.imcms.servlet.superadmin.UserEditorPage;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
+import imcode.server.AuthenticationMethodConfiguration;
 import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
+import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -16,36 +22,70 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import static com.imcode.imcms.domain.services.core.TwoFactorAuthService.*;
 
 public class VerifyUser extends HttpServlet {
 
-    private static final String SESSION_ATTRIBUTE__NEXT_URL = "next_url";
+    public static final String SESSION_ATTRIBUTE__NEXT_URL = "next_url";
     public static final String REQUEST_PARAMETER__NEXT_URL = SESSION_ATTRIBUTE__NEXT_URL;
     public static final String REQUEST_PARAMETER__NEXT_META = "next_meta";
-    private static final String SESSION_ATTRIBUTE__NEXT_META = "next_meta";
-    private static final String SESSION_ATTRIBUTE__LOGIN_TARGET = "login.target";
+    public static final String SESSION_ATTRIBUTE__NEXT_META = "next_meta";
     public static final String REQUEST_PARAMETER__EDIT_USER = "edit_user";
     public static final String REQUEST_PARAMETER__USERNAME = "name";
     public static final String REQUEST_PARAMETER__PASSWORD = "passwd";
     public static final String REQUEST_ATTRIBUTE__ERROR = "error";
+    public static final String DEFAULT_START_PAGE_URL = "/servlet/StartDoc";
 
+    private static final Logger log = LogManager.getLogger(VerifyUser.class);
+    private static final String SESSION_ATTRIBUTE__LOGIN_TARGET = "login.target";
     private final static LocalizedMessage ERROR__LOGIN_FAILED = new LocalizedMessage("templates/login/access_denied.html/4");
-    
+
     public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         doPost(req, res);
     }
 
     public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        ContentManagementSystem cms = null;
+
         Utility.setDefaultHtmlContentType(res);
+        final ImcmsServices services = Imcms.getServices();
+        final Map<String, AuthenticationMethodConfiguration> loginConfiguration = services.getConfig().getAuthenticationConfiguration();
 
         String name = req.getParameter(REQUEST_PARAMETER__USERNAME);
         String passwd = req.getParameter(REQUEST_PARAMETER__PASSWORD);
 
-        ContentManagementSystem cms = ContentManagementSystem.login(req, name, passwd);
 
-        if ( null != cms ) {
-            User currentUser = cms.getCurrentUser();
-            if ( req.getParameter(REQUEST_PARAMETER__EDIT_USER) != null && !currentUser.isDefaultUser() ) {
+        final ImcmsAuthenticatorAndUserAndRoleMapper userAndRoleMapper = services.getImcmsAuthenticatorAndUserAndRoleMapper();
+        try {
+            final boolean is2FA = loginConfiguration.containsKey(PROPERTY_NAME_2FA);
+            if (is2FA) {
+                cms = TwoFactorAuthService.getInstance().initOrCheck(req, res, name, passwd);
+                Integer attemptsCounter = (Integer) req.getSession().getAttribute(SESSION_2FA_ATTEMPTS_COUNT);
+                final boolean cancelVerification = Boolean.parseBoolean(req.getParameter("cancelVerification"));
+                if (null != attemptsCounter && attemptsCounter > 3 || cancelVerification) {
+                    HttpSession session = req.getSession();
+                    session.removeAttribute(REQUEST_PARAMETER__USERNAME);
+                    session.removeAttribute(REQUEST_PARAMETER__PASSWORD);
+                    session.removeAttribute(SESSION_2FA_ATTEMPTS_COUNT);
+                    session.removeAttribute(REQUEST_PARAMETER_2FA);
+                    req.removeAttribute(REQUEST_ATTRIBUTE__ERROR);
+                }
+            } else {
+                cms = ContentManagementSystem.login(req, res, name, passwd);
+            }
+
+        } catch (UserIpIsNotAllowedException e) {
+            userAndRoleMapper.forwardDeniedUserToMessagePage(e.getUser(), req, res);
+            return;
+        }
+
+        if (null != cms) {
+            final User currentUser = cms.getCurrentUser();
+            if (req.getParameter(REQUEST_PARAMETER__EDIT_USER) != null && !currentUser.isDefaultUser()) {
                 goToEditUserPage(currentUser, res, req);
             } else {
                 goToLoginSuccessfulPage(req, res);
@@ -56,9 +96,11 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
     }
 
     private void goToLoginFailedPage(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
-        req.setAttribute(REQUEST_ATTRIBUTE__ERROR, ERROR__LOGIN_FAILED);
+        if (!(null != req.getSession().getAttribute(REQUEST_PARAMETER_2FA)) && null == req.getAttribute(REQUEST_ATTRIBUTE__ERROR)) {
+            req.setAttribute(REQUEST_ATTRIBUTE__ERROR, ERROR__LOGIN_FAILED);
+        }
         req.getRequestDispatcher("/imcms/" + Utility.getLoggedOnUser(req).getLanguageIso639_2()
-                                 + "/login/index.jsp").forward(req, res);
+                + "/login/index.jsp").forward(req, res);
     }
 
     private void goToLoginSuccessfulPage(HttpServletRequest req,
@@ -68,31 +110,50 @@ private void goToLoginSuccessfulPage(HttpServletRequest req,
     }
 
     private void goToEditUserPage(User user, HttpServletResponse res, HttpServletRequest req) throws IOException, ServletException {
-        UserDomainObject internalUser = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().getUser(user.getId()) ;
-        DispatchCommand returnCommand = new GoToLoginSuccessfulPageCommand();
-        UserEditorPage userEditorPage = new UserEditorPage(internalUser, new AdminUser.SaveUserAndReturnCommand(internalUser, returnCommand), returnCommand);
+        final UserDomainObject internalUser = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().getUser(user.getId());
+        final DispatchCommand returnCommand = new GoToLoginSuccessfulPageCommand();
+        final UserEditorPage userEditorPage = new UserEditorPage(internalUser, new AdminUser.SaveUserAndReturnCommand(internalUser, returnCommand), returnCommand);
         userEditorPage.forward(req, res);
     }
 
-    private static class GoToLoginSuccessfulPageCommand implements DispatchCommand {
-        public void dispatch(HttpServletRequest request,
-                             HttpServletResponse response) throws IOException, ServletException {
-            String nexturl = "StartDoc";
-            HttpSession session = request.getSession(true);
-            if ( session.getAttribute(SESSION_ATTRIBUTE__NEXT_META) != null ) {
-                nexturl = "GetDoc?meta_id=" + session.getAttribute(SESSION_ATTRIBUTE__NEXT_META);
+    public static class GoToLoginSuccessfulPageCommand implements DispatchCommand {
+        public void dispatch(final HttpServletRequest request,
+                             final HttpServletResponse response) throws IOException, ServletException {
+            String nexturl = DEFAULT_START_PAGE_URL;
+            final HttpSession session = request.getSession(true);
+            if (session.getAttribute(SESSION_ATTRIBUTE__NEXT_META) != null) {
+                nexturl = "/servlet/GetDoc?meta_id=" + session.getAttribute(SESSION_ATTRIBUTE__NEXT_META);
                 session.removeAttribute(SESSION_ATTRIBUTE__NEXT_META);
-            } else if ( session.getAttribute(SESSION_ATTRIBUTE__NEXT_URL) != null ) {
+            } else if (session.getAttribute(SESSION_ATTRIBUTE__NEXT_URL) != null) {
                 nexturl = (String) session.getAttribute(SESSION_ATTRIBUTE__NEXT_URL);
                 session.removeAttribute(SESSION_ATTRIBUTE__NEXT_URL);
-            } else if ( request.getParameter(REQUEST_PARAMETER__NEXT_URL) != null ) {
+            } else if (request.getParameter(REQUEST_PARAMETER__NEXT_URL) != null) {
                 nexturl = request.getParameter(REQUEST_PARAMETER__NEXT_URL);
-            } else if ( request.getParameter(REQUEST_PARAMETER__NEXT_META) != null ) {
-                nexturl = "GetDoc?meta_id=" + request.getParameter(REQUEST_PARAMETER__NEXT_META);
-            } else if ( session.getAttribute(SESSION_ATTRIBUTE__LOGIN_TARGET) != null ) {
+            } else if (request.getParameter(REQUEST_PARAMETER__NEXT_META) != null) {
+                nexturl = "/servlet/GetDoc?meta_id=" + request.getParameter(REQUEST_PARAMETER__NEXT_META);
+            } else if (session.getAttribute(SESSION_ATTRIBUTE__LOGIN_TARGET) != null) {
                 nexturl = (String) session.getAttribute(SESSION_ATTRIBUTE__LOGIN_TARGET);
                 session.removeAttribute(SESSION_ATTRIBUTE__LOGIN_TARGET);
             }
+
+            try {
+                if (nexturl.startsWith("/") && !nexturl.contains("//")) {
+                    nexturl = request.getContextPath() + nexturl;
+                } else {
+                    final URI uri = new URI(request.getRequestURL().toString());
+                    final String host = uri.getHost();
+                    if (!nexturl.contains(host)) {
+                        Utility.redirectToStartDocument(request, response);
+                        return;
+                    }
+                }
+            } catch (URISyntaxException e) {
+                e.printStackTrace();
+                log.error("GoToLoginSuccessfulPage URI not correct as " + request.getRequestURL().toString());
+                Utility.redirectToStartDocument(request, response);
+                return;
+            }
+
             response.sendRedirect(nexturl);
         }
     }
diff --git a/server/src/com/imcode/imcms/servlet/Version.java b/server/src/com/imcode/imcms/servlet/Version.java
index 4477f45746..7a2e209b64 100644
--- a/server/src/com/imcode/imcms/servlet/Version.java
+++ b/server/src/com/imcode/imcms/servlet/Version.java
@@ -4,8 +4,11 @@
 import com.imcode.db.DatabaseConnection;
 import com.imcode.db.DatabaseException;
 import imcode.server.Imcms;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
 import org.apache.commons.io.IOUtils;
 
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -20,48 +23,50 @@ public class Version extends HttpServlet {
 
     private final static String VERSION_FILE = "/WEB-INF/version.txt";
 
-    public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException {
-
-        String imcmsVersion = getImcmsVersion();
-        String serverInfo = getServletContext().getServerInfo();
-        String databaseProductNameAndVersion = getDatabaseProductNameAndVersion();
-        String javaVersion = getJavaVersion();
-
-        res.setContentType("text/plain");
-        PrintWriter out = res.getWriter();
-        out.println(imcmsVersion);
-        out.println(javaVersion);
-        out.println(serverInfo);
-        out.println(databaseProductNameAndVersion);
+    public static String getJavaVersion() {
+        return System.getProperty("java.vm.vendor") + " " + System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version");
     }
 
-    private String getJavaVersion() {
-        return System.getProperty("java.vm.vendor")+" "+System.getProperty("java.vm.name")+" "+System.getProperty("java.vm.version");
-    }
-
-    private String getImcmsVersion() {
+    public static String getImcmsVersion(ServletContext servletContext) {
         try {
-            Reader in = new InputStreamReader(getServletContext().getResourceAsStream(VERSION_FILE));
-            try {
-                return "imCMS "+IOUtils.toString(in).trim();
-            } finally {
-                in.close();
+            try (Reader in = new InputStreamReader(servletContext.getResourceAsStream(VERSION_FILE))) {
+                return "imCMS " + IOUtils.toString(in).trim();
             }
-        } catch ( Exception npe ) {
+        } catch (Exception npe) {
             return "imCMS";
         }
     }
 
-    private String getDatabaseProductNameAndVersion() {
+    public static String getDatabaseProductNameAndVersion() {
         return (String) Imcms.getServices().getDatabase().execute(new DatabaseCommand() {
             public Object executeOn(DatabaseConnection connection) throws DatabaseException {
                 try {
                     DatabaseMetaData metaData = connection.getConnection().getMetaData();
                     return metaData.getDatabaseProductName() + " " + metaData.getDatabaseProductVersion();
-                } catch ( SQLException e ) {
+                } catch (SQLException e) {
                     throw DatabaseException.fromSQLException("", e);
                 }
             }
         });
     }
+
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException {
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if(!user.isSuperAdmin()){
+           res.sendError(HttpServletResponse.SC_FORBIDDEN);
+        }
+
+        String imcmsVersion = getImcmsVersion(getServletContext());
+        String serverInfo = getServletContext().getServerInfo();
+        String databaseProductNameAndVersion = getDatabaseProductNameAndVersion();
+        String javaVersion = getJavaVersion();
+
+        res.setHeader("Cache-Control", "no-store");
+        res.setContentType("text/plain");
+        PrintWriter out = res.getWriter();
+        out.println(imcmsVersion);
+        out.println(javaVersion);
+        out.println(serverInfo);
+        out.println(databaseProductNameAndVersion);
+    }
 }
diff --git a/server/src/com/imcode/imcms/servlet/W3CValidationServlet.java b/server/src/com/imcode/imcms/servlet/W3CValidationServlet.java
new file mode 100644
index 0000000000..260ad98092
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/W3CValidationServlet.java
@@ -0,0 +1,28 @@
+package com.imcode.imcms.servlet;
+
+import com.imcode.imcms.domain.services.api.W3CValidationService;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class W3CValidationServlet extends HttpServlet {
+
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		if (!W3CValidationService.isAvailable()) {
+			resp.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+		}
+
+		final String htmlToValidate = req.getParameter("htmlToValidate");
+		final boolean showResults = "true".equals(req.getParameter("showResults"));
+
+		resp.getWriter()
+				.write(W3CValidationService
+						.validate(htmlToValidate, showResults)
+						.toJSONString()
+				);
+	}
+}
diff --git a/server/src/com/imcode/imcms/servlet/WebComponent.java b/server/src/com/imcode/imcms/servlet/WebComponent.java
index a3732970d8..05f539045f 100644
--- a/server/src/com/imcode/imcms/servlet/WebComponent.java
+++ b/server/src/com/imcode/imcms/servlet/WebComponent.java
@@ -12,15 +12,15 @@ public class WebComponent implements Serializable {
 
     private DispatchCommand cancelCommand;
 
-    public void cancel( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        cancelCommand.dispatch(request,response) ;
+    public void cancel(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        cancelCommand.dispatch(request, response);
     }
 
     public boolean isCancelable() {
         return null != cancelCommand;
     }
 
-    public void setCancelCommand( DispatchCommand cancelCommand ) {
+    public void setCancelCommand(DispatchCommand cancelCommand) {
         this.cancelCommand = cancelCommand;
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/XmlDoc.java b/server/src/com/imcode/imcms/servlet/XmlDoc.java
index e3506c4650..b152819a55 100644
--- a/server/src/com/imcode/imcms/servlet/XmlDoc.java
+++ b/server/src/com/imcode/imcms/servlet/XmlDoc.java
@@ -1,10 +1,20 @@
 package com.imcode.imcms.servlet;
 
+import com.imcode.imcms.api.LuceneParsedQuery;
+import com.imcode.imcms.mapping.DocumentMapper;
 import imcode.server.Imcms;
-import imcode.server.user.UserDomainObject;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.XmlDocumentBuilder;
+import imcode.server.document.index.DocumentIndex;
+import imcode.server.document.index.SimpleDocumentQuery;
+import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.IntRange;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.search.Query;
 import org.w3c.dom.Document;
 
 import javax.servlet.ServletException;
@@ -12,28 +22,57 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-
-import com.imcode.imcms.mapping.DocumentMapper;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 public class XmlDoc extends HttpServlet {
+    private final static Logger LOG = LogManager.getLogger(XmlDoc.class.getName());
 
-    public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        int documentId = Integer.parseInt( request.getParameter( "meta_id" ) );
-
-        DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-        DocumentDomainObject document = documentMapper.getDocument( documentId );
+    public void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
         UserDomainObject currentUser = Utility.getLoggedOnUser(request);
+        DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
+        String metaId = request.getParameter("meta_id");
+        Iterator documentsIterator;
+        if (metaId != null) {
+            int index = metaId.indexOf('-');
+            IntRange idRange;
+            if (index > 0) {
+                String startMetaId = metaId.substring(0, index);
+                String endMetaId = metaId.substring(index + 1);
+                idRange = new IntRange(Integer.parseInt(startMetaId), Integer.parseInt(endMetaId));
+            } else {
+                int documentId = Integer.parseInt(metaId);
+                idRange = new IntRange(documentId, documentId);
+            }
 
-        if ( null == document ) {
-            response.sendError( HttpServletResponse.SC_NOT_FOUND ) ;
-        } else if (!currentUser.canAccess(document) || !document.isPublished() && !currentUser.canEdit(document) ) {
-            response.sendError( HttpServletResponse.SC_FORBIDDEN ) ;
+            documentsIterator = documentMapper.getDocumentsIterator(idRange);
         } else {
-            XmlDocumentBuilder xmlDocumentBuilder = new XmlDocumentBuilder(currentUser);
-            xmlDocumentBuilder.addDocument( document);
-            Document xmlDocument = xmlDocumentBuilder.getXmlDocument() ;
-            Utility.outputXmlDocument( response, xmlDocument );
+            String q = StringUtils.defaultString(request.getParameter("q"));
+            try {
+                Query query = LuceneParsedQuery.parse(q);
+                DocumentIndex documentIndex = documentMapper.getDocumentIndex();
+                List documents = documentIndex.search(new SimpleDocumentQuery(query), currentUser);
+                documentsIterator = documents.iterator();
+            } catch (ParseException pe) {
+                LOG.debug("Bad query: " + q, pe);
+                documentsIterator = new ArrayList().iterator();
+            }
+        }
+
+        XmlDocumentBuilder xmlDocumentBuilder = new XmlDocumentBuilder(currentUser);
+
+        while (documentsIterator.hasNext()) {
+            DocumentDomainObject document = (DocumentDomainObject) documentsIterator.next();
+
+            if (document != null) {
+                xmlDocumentBuilder.addDocument(document);
+            }
         }
+
+        Document xmlDocument = xmlDocumentBuilder.getXmlDocument();
+        Utility.outputXmlDocument(response, xmlDocument);
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/XssFilter.java b/server/src/com/imcode/imcms/servlet/XssFilter.java
new file mode 100644
index 0000000000..87e635ed59
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/XssFilter.java
@@ -0,0 +1,80 @@
+package com.imcode.imcms.servlet;
+
+import com.google.common.html.HtmlEscapers;
+import imcode.server.Imcms;
+import org.apache.commons.lang.StringEscapeUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.Enumeration;
+
+public final class XssFilter implements Filter {
+
+    public final boolean include = Boolean.parseBoolean(Imcms.getServerProperties().getProperty("xss-include"));
+
+    public void doFilter(ServletRequest request, ServletResponse response,
+                         FilterChain chain) throws IOException, ServletException {
+        if(!include) {
+            chain.doFilter(request, response);
+            return;
+        }
+
+        Enumeration<String> parameterNames =  request.getParameterNames();
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+        HttpServletResponse servletResponse = (HttpServletResponse) response;
+
+        if (parameterNames.hasMoreElements() && httpRequest.getMethod().equals("GET")) {
+            String url = completeUrl(httpRequest, parameterNames, false);
+            String newUrl = completeUrl(httpRequest, request.getParameterNames(), true);
+
+            if (!url.equals(newUrl)) {
+                servletResponse.sendRedirect(newUrl);
+                return;
+            }
+        }
+
+        chain.doFilter(request, response);
+    }
+
+    public void destroy() {
+    }
+
+    public void init(FilterConfig filterConfig) {
+    }
+
+    private String completeUrl(HttpServletRequest request, Enumeration<String> parameterNames, boolean encode) throws UnsupportedEncodingException {
+
+        final StringBuffer requestURL = request.getRequestURL();
+
+        while (parameterNames.hasMoreElements()) {
+
+            String paramName = parameterNames.nextElement();
+            String value;
+            if(encode){
+                value = Arrays.stream(request.getParameterValues(paramName))
+                        .filter(org.apache.commons.lang3.StringUtils::isNotBlank)
+		                .map(StringEscapeUtils::unescapeHtml)
+		                //StringEscapeUtils::escapeHtml brakes UTF-8 characters..
+		                .map(s -> HtmlEscapers.htmlEscaper().escape(s))
+                        .findFirst().orElse("");
+            }else{
+                value = request.getParameter(paramName);
+            }
+
+            requestURL.append(handleParameterForRequest(requestURL, paramName, URLEncoder.encode(value,"UTF-8")));
+        }
+
+        return requestURL.toString();
+    }
+
+    private String handleParameterForRequest(StringBuffer requestURL, String paramName, String value) {
+        return (requestURL.toString().contains("?"))
+                ? String.format("&%s=%s", paramName, value)
+                : String.format("?%s=%s", paramName, value);
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/XssHttpServletWrapper.java b/server/src/com/imcode/imcms/servlet/XssHttpServletWrapper.java
new file mode 100644
index 0000000000..64c8993f34
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/XssHttpServletWrapper.java
@@ -0,0 +1,41 @@
+package com.imcode.imcms.servlet;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+public class XssHttpServletWrapper extends HttpServletRequestWrapper {
+
+    private String newUrl;
+    @Getter
+    @Setter
+    private boolean isVisit;
+
+    public XssHttpServletWrapper(HttpServletRequest request, String newUrl) {
+        super(request);
+        this.newUrl = newUrl;
+    }
+
+    @Override
+    public ServletRequest getRequest() {
+        return super.getRequest();
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        return super.getParameterValues(name);
+    }
+
+    public String getNewUrl() {
+        return newUrl;
+    }
+
+    @Override
+    public StringBuffer getRequestURL() {
+        return StringUtils.isNotBlank(newUrl) ? new StringBuffer(newUrl) : super.getRequestURL();
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/admin/AdminDoc.java b/server/src/com/imcode/imcms/servlet/admin/AdminDoc.java
index 988227988d..b7924c35b1 100644
--- a/server/src/com/imcode/imcms/servlet/admin/AdminDoc.java
+++ b/server/src/com/imcode/imcms/servlet/admin/AdminDoc.java
@@ -7,11 +7,7 @@
 import imcode.server.Imcms;
 import imcode.server.ImcmsConstants;
 import imcode.server.ImcmsServices;
-import imcode.server.document.BrowserDocumentDomainObject;
-import imcode.server.document.DocumentDomainObject;
-import imcode.server.document.FileDocumentDomainObject;
-import imcode.server.document.HtmlDocumentDomainObject;
-import imcode.server.document.UrlDocumentDomainObject;
+import imcode.server.document.*;
 import imcode.server.parser.ParserParameters;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Html;
@@ -31,128 +27,132 @@
 
 public class AdminDoc extends HttpServlet {
 
-    private static final String PARAMETER__META_ID = "meta_id";
     public static final String PARAMETER__DISPATCH_FLAGS = "flags";
-
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws IOException, ServletException {
-        doPost( req, res );
-    }
-
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-
-        int metaId = Integer.parseInt( req.getParameter( PARAMETER__META_ID ) );
-        int flags = Integer.parseInt( (String)ObjectUtils.defaultIfNull( req.getParameter( PARAMETER__DISPATCH_FLAGS ), "0" ) );
-
-        DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-        DocumentDomainObject document = documentMapper.getDocument( metaId );
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.canEdit( document )) {
-            flags = 0;
-        }
-
-        PageFlow pageFlow = createFlow( document, flags, user );
-
-        if ( null != pageFlow && user.canEdit( document )) {
-            pageFlow.dispatch( req, res );
-        } else {
-            Utility.setDefaultHtmlContentType( res );
-            int meta_id = Integer.parseInt( req.getParameter( "meta_id" ) );
-
-            adminDoc( meta_id, user, req, res, getServletContext() );
-        }
-    }
-
-    private PageFlow createFlow( DocumentDomainObject document, int flags, UserDomainObject user ) {
-        RedirectToDocumentCommand returnCommand = new RedirectToDocumentCommand( document );
-        DocumentMapper.SaveEditedDocumentCommand saveDocumentCommand = new DocumentMapper.SaveEditedDocumentCommand();
-
-        PageFlow pageFlow = null;
-        if ( ImcmsConstants.DISPATCH_FLAG__DOCINFO_PAGE == flags && user.canEditDocumentInformationFor( document ) ) {
-            pageFlow = new EditDocumentInformationPageFlow( document, returnCommand, saveDocumentCommand );
-        } else if ( ImcmsConstants.DISPATCH_FLAG__DOCUMENT_PERMISSIONS_PAGE == flags && user.canEditPermissionsFor( document ) ) {
-            pageFlow = new EditDocumentPermissionsPageFlow( document, returnCommand, saveDocumentCommand );
-        } else if ( document instanceof BrowserDocumentDomainObject
-                    && ImcmsConstants.DISPATCH_FLAG__EDIT_BROWSER_DOCUMENT == flags ) {
-            pageFlow = new EditBrowserDocumentPageFlow( (BrowserDocumentDomainObject)document, returnCommand, saveDocumentCommand );
-        } else if ( document instanceof HtmlDocumentDomainObject
-                    && ImcmsConstants.DISPATCH_FLAG__EDIT_HTML_DOCUMENT == flags ) {
-            pageFlow = new EditHtmlDocumentPageFlow( (HtmlDocumentDomainObject)document, returnCommand, saveDocumentCommand );
-        } else if ( document instanceof UrlDocumentDomainObject
-                    && ImcmsConstants.DISPATCH_FLAG__EDIT_URL_DOCUMENT == flags ) {
-            pageFlow = new EditUrlDocumentPageFlow( (UrlDocumentDomainObject)document, returnCommand, saveDocumentCommand );
-        } else if ( document instanceof FileDocumentDomainObject
-                    && ImcmsConstants.DISPATCH_FLAG__EDIT_FILE_DOCUMENT == flags ) {
-            pageFlow = new EditFileDocumentPageFlow( (FileDocumentDomainObject)document, getServletContext(), returnCommand, saveDocumentCommand, null );
-        }
-        return pageFlow;
-    }
+    private static final String PARAMETER__META_ID = "meta_id";
 
     public static void adminDoc(int meta_id, UserDomainObject user, HttpServletRequest req,
                                 HttpServletResponse res, ServletContext servletContext) throws IOException, ServletException {
         final ImcmsServices imcref = Imcms.getServices();
 
         HttpSession session = req.getSession();
-        Stack history = (Stack)session.getAttribute( "history" );
-        if ( history == null ) {
+        Stack history = (Stack) session.getAttribute("history");
+        if (history == null) {
             history = new Stack();
-            session.setAttribute( "history", history );
+            session.setAttribute("history", history);
         }
-        Integer meta_int = new Integer( meta_id );
-        if ( history.empty() || !history.peek().equals( meta_int ) ) {
-            history.push( meta_int );
+        Integer meta_int = meta_id;
+        if (history.empty() || !history.peek().equals(meta_int)) {
+            history.push(meta_int);
         }
 
-        DocumentDomainObject document = imcref.getDocumentMapper().getDocument( meta_id );
-        if ( null == document ) {
+        DocumentDomainObject document = imcref.getDocumentMapper().getDocument(meta_id);
+        if (null == document) {
             res.sendError(HttpServletResponse.SC_NOT_FOUND);
-            return ;
+            return;
         }
 
         int doc_type = document.getDocumentTypeId();
 
-        Integer userflags = (Integer)session.getAttribute( PARAMETER__DISPATCH_FLAGS );		// Get the flags from the user-object
+        Integer userflags = (Integer) session.getAttribute(PARAMETER__DISPATCH_FLAGS);        // Get the flags from the user-object
         session.removeAttribute(PARAMETER__DISPATCH_FLAGS);
-        int flags = userflags == null ? 0 : userflags.intValue();	// Are there flags? Set to 0 if not.
+        int flags = userflags == null ? 0 : userflags;    // Are there flags? Set to 0 if not.
 
 
         try {
-            flags = Integer.parseInt( req.getParameter( PARAMETER__DISPATCH_FLAGS ) );	// Check if we have a "flags" in the request too. In that case it takes precedence.
-        } catch ( NumberFormatException ex ) {
-            if ( flags == 0 ) {
-                if ( doc_type != 1 && doc_type != 2 ) {
-                    List vec = new ArrayList( 4 );
-                    vec.add( "#adminMode#" );
-                    vec.add( Html.getAdminButtons( user, document, req, res ) );
-                    vec.add( "#doc_type_description#" );
-                    vec.add( imcref.getAdminTemplate( "adminbuttons/adminbuttons" + doc_type + "_description.html", user, null ) );
+            flags = Integer.parseInt(req.getParameter(PARAMETER__DISPATCH_FLAGS));    // Check if we have a "flags" in the request too. In that case it takes precedence.
+        } catch (NumberFormatException ex) {
+            if (flags == 0) {
+                if (doc_type != 1 && doc_type != 2) {
+                    List vec = new ArrayList(4);
+                    vec.add("#adminMode#");
+                    vec.add(Html.getAdminButtons(user, document, req, res));
+                    vec.add("#doc_type_description#");
+                    vec.add(imcref.getAdminTemplate("adminbuttons/adminbuttons" + doc_type + "_description.html", user, null));
                     Utility.setDefaultHtmlContentType(res);
-                    res.getWriter().write(imcref.getAdminTemplate( "docinfo.html", user, vec ));
-                    return ;
+                    res.getWriter().write(imcref.getAdminTemplate("docinfo.html", user, vec));
+                    return;
                 }
             }
         }
 
-        if ( !user.canEdit( document ) ) {
-            GetDoc.viewDoc( ""+meta_id, req, res );
-            return ;
+        if (!user.canEdit(document)) {
+            GetDoc.viewDoc("" + meta_id, req, res);
+            return;
+        }
+
+        DocumentRequest documentRequest = new DocumentRequest(imcref, user, document, null, req, res);
+        final ParserParameters parserParameters = new ParserParameters(documentRequest);
+        parserParameters.setFlags(flags);
+        imcref.parsePage(parserParameters, res.getWriter());
+    }
+
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
+        doPost(req, res);
+    }
+
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+
+        int metaId = Integer.parseInt(req.getParameter(PARAMETER__META_ID));
+        int flags = Integer.parseInt((String) ObjectUtils.defaultIfNull(req.getParameter(PARAMETER__DISPATCH_FLAGS), "0"));
+
+        DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
+        DocumentDomainObject document = documentMapper.getDocument(metaId);
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.canEdit(document)) {
+            flags = 0;
+        }
+
+        PageFlow pageFlow = createFlow(document, flags, user);
+
+        if (null != pageFlow && user.canEdit(document)) {
+            pageFlow.dispatch(req, res);
+        } else {
+            Utility.setDefaultHtmlContentType(res);
+            int meta_id = Integer.parseInt(req.getParameter("meta_id"));
+
+            adminDoc(meta_id, user, req, res, getServletContext());
         }
+    }
 
-        DocumentRequest documentRequest = new DocumentRequest( imcref, user, document, null, req, res );
-        final ParserParameters parserParameters = new ParserParameters( documentRequest );
-        parserParameters.setFlags( flags );
-        imcref.parsePage( parserParameters, res.getWriter());
+    private PageFlow createFlow(DocumentDomainObject document, int flags, UserDomainObject user) {
+        RedirectToDocumentCommand returnCommand = new RedirectToDocumentCommand(document);
+        DocumentMapper.SaveEditedDocumentCommand saveDocumentCommand = new DocumentMapper.SaveEditedDocumentCommand();
+
+        PageFlow pageFlow = null;
+        if (ImcmsConstants.DISPATCH_FLAG__DOCINFO_PAGE == flags && user.canEditDocumentInformationFor(document)) {
+            pageFlow = new EditDocumentInformationPageFlow(document, returnCommand, saveDocumentCommand);
+        } else if (ImcmsConstants.DISPATCH_FLAG__DOCUMENT_PERMISSIONS_PAGE == flags && user.canEditPermissionsFor(document)) {
+            pageFlow = new EditDocumentPermissionsPageFlow(document, returnCommand, saveDocumentCommand);
+        } else if (document instanceof BrowserDocumentDomainObject
+                && ImcmsConstants.DISPATCH_FLAG__EDIT_BROWSER_DOCUMENT == flags)
+        {
+            pageFlow = new EditBrowserDocumentPageFlow((BrowserDocumentDomainObject) document, returnCommand, saveDocumentCommand);
+        } else if (document instanceof HtmlDocumentDomainObject
+                && ImcmsConstants.DISPATCH_FLAG__EDIT_HTML_DOCUMENT == flags)
+        {
+            pageFlow = new EditHtmlDocumentPageFlow((HtmlDocumentDomainObject) document, returnCommand, saveDocumentCommand);
+        } else if (document instanceof UrlDocumentDomainObject
+                && ImcmsConstants.DISPATCH_FLAG__EDIT_URL_DOCUMENT == flags)
+        {
+            pageFlow = new EditUrlDocumentPageFlow((UrlDocumentDomainObject) document, returnCommand, saveDocumentCommand);
+        } else if (document instanceof FileDocumentDomainObject
+                && ImcmsConstants.DISPATCH_FLAG__EDIT_FILE_DOCUMENT == flags)
+        {
+            pageFlow = new EditFileDocumentPageFlow((FileDocumentDomainObject) document, getServletContext(), returnCommand, saveDocumentCommand, null);
+        }
+        return pageFlow;
     }
 
     private static class RedirectToDocumentCommand implements DispatchCommand {
 
         private final DocumentDomainObject document;
 
-        RedirectToDocumentCommand( DocumentDomainObject document ) {
+        RedirectToDocumentCommand(DocumentDomainObject document) {
             this.document = document;
         }
 
-        public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException {
-            response.sendRedirect( "AdminDoc?meta_id=" + document.getId() );
+        public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException {
+            response.sendRedirect("AdminDoc?meta_id=" + document.getId());
         }
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/admin/ChangeImage.java b/server/src/com/imcode/imcms/servlet/admin/ChangeImage.java
index 4867c480ab..4a4c7a0900 100644
--- a/server/src/com/imcode/imcms/servlet/admin/ChangeImage.java
+++ b/server/src/com/imcode/imcms/servlet/admin/ChangeImage.java
@@ -6,16 +6,20 @@
 import com.imcode.imcms.util.l10n.LocalizedMessage;
 import com.imcode.imcms.util.l10n.LocalizedMessageFormat;
 import imcode.server.Imcms;
-import imcode.server.ImcmsServices;
 import imcode.server.ImcmsConstants;
-import imcode.server.document.textdocument.*;
-import imcode.server.document.NoPermissionToEditDocumentException;
+import imcode.server.ImcmsServices;
 import imcode.server.document.ConcurrentDocumentModificationException;
+import imcode.server.document.NoPermissionToEditDocumentException;
+import imcode.server.document.textdocument.ImageDomainObject;
+import imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import imcode.util.Utility;
+import imcode.util.ImcmsImageUtils;
 import imcode.util.ShouldHaveCheckedPermissionsEarlierException;
 import imcode.util.ShouldNotBeThrownException;
+import imcode.util.Utility;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -27,6 +31,11 @@ public class ChangeImage extends HttpServlet {
 
     public static final String REQUEST_PARAMETER__IMAGE_INDEX = "img";
     public static final String REQUEST_PARAMETER__LABEL = "label";
+    public static final String REQUEST_PARAMETER__LINKABLE = "linkable";
+    public static final String REQUEST_PARAMETER__WIDTH = "width";
+    public static final String REQUEST_PARAMETER__HEIGHT = "height";
+    public static final String REQUEST_PARAMETER__MAX_WIDTH = "max-width";
+    public static final String REQUEST_PARAMETER__MAX_HEIGHT = "max-height";
 
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         final ImcmsServices imcref = Imcms.getServices();
@@ -35,43 +44,66 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
         final int imageIndex = Integer.parseInt(request.getParameter(REQUEST_PARAMETER__IMAGE_INDEX));
         final ImageDomainObject image = document.getImage(imageIndex);
         final UserDomainObject user = Utility.getLoggedOnUser(request);
+        int forcedWidth = NumberUtils.toInt(request.getParameter(REQUEST_PARAMETER__WIDTH));
+        int forcedHeight = NumberUtils.toInt(request.getParameter(REQUEST_PARAMETER__HEIGHT));
+        forcedWidth = Math.max(forcedWidth, 0);
+        forcedHeight = Math.max(forcedHeight, 0);
+
+        int maxWidth = NumberUtils.toInt(request.getParameter(REQUEST_PARAMETER__MAX_WIDTH));
+        int maxHeight = NumberUtils.toInt(request.getParameter(REQUEST_PARAMETER__MAX_HEIGHT));
+        maxWidth = Math.max(maxWidth, 0);
+        maxHeight = Math.max(maxHeight, 0);
 
         // Check if user has image rights
-        if ( !ImageEditPage.userHasImagePermissionsOnDocument(user, document) ) {
+        if (!ImageEditPage.userHasImagePermissionsOnDocument(user, document)) {
             Utility.redirectToStartDocument(request, response);
             return;
         }
 
-        DispatchCommand returnCommand = new DispatchCommand() {
-            public void dispatch(HttpServletRequest request,
-                                 HttpServletResponse response) throws IOException {
-                response.sendRedirect("AdminDoc?meta_id=" + document.getId() + "&flags="
-                                      + ImcmsConstants.DISPATCH_FLAG__EDIT_TEXT_DOCUMENT_IMAGES);
+        final String returnURL = request.getParameter(ImcmsConstants.REQUEST_PARAM__RETURN_URL);
+        DispatchCommand returnCommand =
+                new DispatchCommand() {
+                    public void dispatch(HttpServletRequest request,
+                                         HttpServletResponse response) throws IOException {
+                        String redirectURL = returnURL == null
+                                ? "AdminDoc?meta_id=" + document.getId() + "&flags="
+                                + ImcmsConstants.DISPATCH_FLAG__EDIT_TEXT_DOCUMENT_IMAGES
+                                : returnURL;
+
+                        response.sendRedirect(redirectURL);
+                    }
+                };
 
-            }
-        };
         Handler<ImageDomainObject> imageCommand = new Handler<ImageDomainObject>() {
             public void handle(ImageDomainObject image) {
+                image.generateFilename();
+                ImcmsImageUtils.generateImage(image, false);
+
                 ImcmsServices services = Imcms.getServices();
                 document.setImage(imageIndex, image);
                 try {
                     services.getDocumentMapper().saveDocument(document, user);
-                } catch ( NoPermissionToEditDocumentException e ) {
+                } catch (NoPermissionToEditDocumentException e) {
                     throw new ShouldHaveCheckedPermissionsEarlierException(e);
-                } catch ( NoPermissionToAddDocumentToMenuException e ) {
+                } catch (NoPermissionToAddDocumentToMenuException e) {
                     throw new ConcurrentDocumentModificationException(e);
-                } catch ( DocumentSaveException e ) {
+                } catch (DocumentSaveException e) {
                     throw new ShouldNotBeThrownException(e);
                 }
                 services.updateMainLog("ImageRef " + imageIndex + " =" + image.getUrlPathRelativeToContextPath() +
-                                       " in  " + "[" + document.getId() + "] modified by user: [" +
-                                       user.getFullName() + "]");
+                        " in  " + "[" + document.getId() + "] modified by user: [" +
+                        user.getFullName() + "]");
 
             }
 
         };
-        LocalizedMessage heading = new LocalizedMessageFormat("image/edit_image_on_page", imageIndex, document.getId());
-        ImageEditPage imageEditPage = new ImageEditPage(document, image, heading, StringUtils.defaultString(request.getParameter(REQUEST_PARAMETER__LABEL)), getServletContext(), imageCommand, returnCommand, true);
+
+        boolean linkable = !("false".equals(request.getParameter(REQUEST_PARAMETER__LINKABLE)));
+
+        LocalizedMessage heading = new LocalizedMessageFormat("image/edit_image_on_page", String.valueOf(imageIndex), String.valueOf(document.getId()));
+        ImageEditPage imageEditPage = new ImageEditPage(document, image, imageIndex, heading,
+                StringUtils.defaultString(request.getParameter(REQUEST_PARAMETER__LABEL)), getServletContext(), imageCommand,
+                returnCommand, linkable, forcedWidth, forcedHeight, maxWidth, maxHeight, returnURL);
         imageEditPage.forward(request, response);
 
     }
diff --git a/server/src/com/imcode/imcms/servlet/admin/ChangeMenu.java b/server/src/com/imcode/imcms/servlet/admin/ChangeMenu.java
index 5920eb48b6..ef79b53160 100644
--- a/server/src/com/imcode/imcms/servlet/admin/ChangeMenu.java
+++ b/server/src/com/imcode/imcms/servlet/admin/ChangeMenu.java
@@ -1,6 +1,8 @@
 package com.imcode.imcms.servlet.admin;
 
 import com.imcode.imcms.flow.DispatchCommand;
+import com.imcode.imcms.flow.Page;
+import com.imcode.imcms.flow.RedirectCommand;
 import com.imcode.imcms.mapping.DocumentMapper;
 import com.imcode.imcms.mapping.DocumentSaveException;
 import imcode.server.Imcms;
@@ -10,8 +12,9 @@
 import imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import imcode.util.Utility;
 import imcode.util.ShouldNotBeThrownException;
+import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
 
 import javax.servlet.ServletException;
@@ -25,36 +28,36 @@ public class ChangeMenu extends HttpServlet {
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response) throws ServletException, IOException {
 
-        int menuIndex = Integer.parseInt(request.getParameter( "menuIndex" )) ;
-        final int documentId = Integer.parseInt(request.getParameter("documentId")) ;
+        int menuIndex = Integer.parseInt(request.getParameter("menuIndex"));
+        final int documentId = Integer.parseInt(request.getParameter("documentId"));
 
         final DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
         final TextDocumentDomainObject document = (TextDocumentDomainObject) documentMapper.getDocument(documentId);
 
         final UserDomainObject user = Utility.getLoggedOnUser(request);
         TextDocumentPermissionSetDomainObject permissionSetFor = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(document);
-        if ( !permissionSetFor.getEditMenus() ) {
-            AdminDoc.adminDoc( documentId, user, request, response, getServletContext() );
-            return ;
+        if (!permissionSetFor.getEditMenus()) {
+            AdminDoc.adminDoc(documentId, user, request, response, getServletContext());
+            return;
         }
+        String returnUrl = StringUtils.defaultString(request.getParameter(ImcmsConstants.REQUEST_PARAM__RETURN_URL));
+
+        final DispatchCommand cancelCommand = (returnUrl.isEmpty())
+                ? new RedirectToMenuEditDispatchCommand(document, menuIndex)
+                : new RedirectCommand(returnUrl);
 
-        final DispatchCommand cancelCommand = new RedirectToMenuEditDispatchCommand(document, menuIndex);
-        DispatchCommand saveCommand = new DispatchCommand() {
-            public void dispatch(HttpServletRequest request,
-                                 HttpServletResponse response) throws IOException, ServletException {
-                try {
-                    documentMapper.saveDocument(document, user);
-                    cancelCommand.dispatch(request, response);
-                } catch ( NoPermissionToAddDocumentToMenuException e ) {
-                    throw new UnhandledException(e);
-                } catch ( NoPermissionToEditDocumentException e ) {
-                    throw new UnhandledException(e);
-                } catch (DocumentSaveException e) {
-                    throw new ShouldNotBeThrownException(e);
-                }
+        DispatchCommand saveCommand = (DispatchCommand) (request1, response1) -> {
+            try {
+                documentMapper.saveDocument(document, user);
+                cancelCommand.dispatch(request1, response1);
+            } catch (NoPermissionToAddDocumentToMenuException | NoPermissionToEditDocumentException e) {
+                throw new UnhandledException(e);
+            } catch (DocumentSaveException e) {
+                throw new ShouldNotBeThrownException(e);
             }
         };
-        MenuEditPage menuEditPage = new MenuEditPage(saveCommand, cancelCommand, document, menuIndex, getServletContext());
+        MenuEditPage menuEditPage = new MenuEditPage(saveCommand, cancelCommand, document, menuIndex, getServletContext(), returnUrl);
+        request.setAttribute(Page.IN_REQUEST, menuEditPage);
         menuEditPage.forward(request, response);
     }
 
@@ -63,14 +66,14 @@ private static class RedirectToMenuEditDispatchCommand implements DispatchComman
         private TextDocumentDomainObject parentDocument;
         private int parentMenuIndex;
 
-        RedirectToMenuEditDispatchCommand( TextDocumentDomainObject parentDocument, int parentMenuIndex ) {
+        RedirectToMenuEditDispatchCommand(TextDocumentDomainObject parentDocument, int parentMenuIndex) {
             this.parentDocument = parentDocument;
             this.parentMenuIndex = parentMenuIndex;
         }
 
-        public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-            response.sendRedirect( "AdminDoc?meta_id=" + parentDocument.getId() + "&flags="
-                                   + ImcmsConstants.DISPATCH_FLAG__EDIT_MENU + "&editmenu=" + parentMenuIndex );
+        public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+            response.sendRedirect("AdminDoc?meta_id=" + parentDocument.getId() + "&flags="
+                    + ImcmsConstants.DISPATCH_FLAG__EDIT_MENU + "&editmenu=" + parentMenuIndex);
         }
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/admin/ChangeText.java b/server/src/com/imcode/imcms/servlet/admin/ChangeText.java
index d8ab823f22..63f2bff1d7 100644
--- a/server/src/com/imcode/imcms/servlet/admin/ChangeText.java
+++ b/server/src/com/imcode/imcms/servlet/admin/ChangeText.java
@@ -1,11 +1,14 @@
 package com.imcode.imcms.servlet.admin;
 
+import com.imcode.imcms.mapping.DocumentMapper;
 import imcode.server.Imcms;
-import imcode.server.document.*;
+import imcode.server.ImcmsConstants;
+import imcode.server.document.TextDocumentPermissionSetDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.document.textdocument.TextDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -13,8 +16,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import com.imcode.imcms.mapping.DocumentMapper;
-
 /**
  * Edit textdocument in a document.
  */
@@ -23,31 +24,35 @@ public class ChangeText extends HttpServlet {
 
     private static final String JSP__CHANGE_TEXT = "change_text.jsp";
 
-    public void doGet( HttpServletRequest request, HttpServletResponse res ) throws ServletException, IOException {
-        Utility.setDefaultHtmlContentType( res );
+    public void doGet(HttpServletRequest request, HttpServletResponse res) throws ServletException, IOException {
+        Utility.setDefaultHtmlContentType(res);
 
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
         DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-        int documentId = Integer.parseInt( request.getParameter( "meta_id" ) );
-        TextDocumentDomainObject textDocument = (TextDocumentDomainObject)documentMapper.getDocument( documentId );
+        int documentId = Integer.parseInt(request.getParameter("meta_id"));
+        TextDocumentDomainObject textDocument = (TextDocumentDomainObject) documentMapper.getDocument(documentId);
 
-        TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor( textDocument );
+        TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(textDocument);
 
-        if ( !textDocumentPermissionSet.getEditTexts() ) {	// Checking to see if user may edit this
-            AdminDoc.adminDoc( documentId, user, request, res, getServletContext() );
+        if (!textDocumentPermissionSet.getEditTexts()) {    // Checking to see if user may edit this
+            AdminDoc.adminDoc(documentId, user, request, res, getServletContext());
             return;
         }
 
-        int textIndex = Integer.parseInt( request.getParameter( "txt" ) );
-        String label = null == request.getParameter( "label" ) ? "" : request.getParameter( "label" );
+        int textIndex = Integer.parseInt(request.getParameter("txt"));
+        String label = null == request.getParameter("label") ? "" : request.getParameter("label");
 
-        TextDomainObject text = textDocument.getText( textIndex );
-        if ( null == text ) {
-            text = new TextDomainObject( "", TextDomainObject.TEXT_TYPE_HTML );
+        TextDomainObject text = textDocument.getText(textIndex);
+        if (null == text) {
+            text = new TextDomainObject("", TextDomainObject.TEXT_TYPE_HTML);
         }
-        String formatsParameter = request.getParameter("formats");
-        TextEditPage page = new TextEditPage( documentId, textIndex, text, label );
-        page.forward( request, res, user );
+
+        String[] formats = request.getParameterValues("format");
+        String rows = StringUtils.defaultString(request.getParameter("rows"));
+        String width = StringUtils.defaultString(request.getParameter("width"));
+        String returnUrl = StringUtils.defaultString(request.getParameter(ImcmsConstants.REQUEST_PARAM__RETURN_URL));
+        TextEditPage page = new TextEditPage(documentId, textIndex, text, label, formats, rows, width, returnUrl);
+        page.forward(request, res, user);
 
     }
 
@@ -58,18 +63,20 @@ public static class TextEditPage {
         private int textIndex;
         private String label;
         private TextDomainObject text;
+        private String[] formats;
+        private String rows;
+        private String width;
+        private String returnUrl;
 
-        public enum Format {
-            NONE,
-            TEXT,
-            EDITOR
-        }
-        
-        public TextEditPage( int documentId, int textIndex, TextDomainObject text, String label ) {
+        public TextEditPage(int documentId, int textIndex, TextDomainObject text, String label, String[] formats, String rows, String width, String returnUrl) {
             this.documentId = documentId;
             this.text = text;
             this.textIndex = textIndex;
             this.label = label;
+            this.formats = formats;
+            this.rows = rows;
+            this.width = width;
+            this.returnUrl = returnUrl;
         }
 
         public int getDocumentId() {
@@ -92,10 +99,32 @@ public int getType() {
             return text.getType();
         }
 
-        public void forward( HttpServletRequest request, HttpServletResponse response, UserDomainObject user ) throws IOException, ServletException {
-            request.setAttribute( REQUEST_ATTRIBUTE__PAGE, this );
+        public String[] getFormats() {
+            return formats;
+        }
+
+        public String getRows() {
+            return rows;
+        }
+
+        public String getWidth() {
+            return width;
+        }
+
+        public String getReturnUrl() {
+            return returnUrl;
+        }
+
+        public void forward(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) throws IOException, ServletException {
+            request.setAttribute(REQUEST_ATTRIBUTE__PAGE, this);
             String forwardPath = "/imcms/" + user.getLanguageIso639_2() + "/jsp/" + JSP__CHANGE_TEXT;
-            request.getRequestDispatcher( forwardPath ).forward( request, response );
+            request.getRequestDispatcher(forwardPath).forward(request, response);
+        }
+
+        public enum Format {
+            NONE,
+            TEXT,
+            EDITOR
         }
 
     }
diff --git a/server/src/com/imcode/imcms/servlet/admin/DocumentCreator.java b/server/src/com/imcode/imcms/servlet/admin/DocumentCreator.java
index 954baf35e8..43b3aa29ef 100644
--- a/server/src/com/imcode/imcms/servlet/admin/DocumentCreator.java
+++ b/server/src/com/imcode/imcms/servlet/admin/DocumentCreator.java
@@ -2,68 +2,66 @@
 
 import com.imcode.imcms.flow.*;
 import com.imcode.imcms.mapping.DocumentMapper;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
 import imcode.server.document.*;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import imcode.server.ImcmsServices;
-import imcode.server.Imcms;
 import imcode.util.Utility;
 
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class DocumentCreator {
 
-    ServletContext servletContext ;
+    ServletContext servletContext;
+    TemplateDomainObject template;
     private DocumentPageFlow.SaveDocumentCommand saveDocumentCommand;
     private DispatchCommand returnCommand;
-    TemplateDomainObject template ;
 
-    public DocumentCreator( DocumentPageFlow.SaveDocumentCommand saveDocumentCommand,
-                            DispatchCommand returnCommand, ServletContext servletContext ) {
-        this.servletContext = servletContext ;
+    public DocumentCreator(DocumentPageFlow.SaveDocumentCommand saveDocumentCommand,
+                           DispatchCommand returnCommand, ServletContext servletContext) {
+        this.servletContext = servletContext;
         this.saveDocumentCommand = saveDocumentCommand;
         this.returnCommand = returnCommand;
     }
 
-    public void createDocumentAndDispatchToCreatePageFlow( int documentTypeId,
-                                                           DocumentDomainObject parentDocument,
-                                                           HttpServletRequest request,
-                                                           HttpServletResponse response ) throws IOException, ServletException, NoPermissionToCreateDocumentException {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+    public void createDocumentAndDispatchToCreatePageFlow(int documentTypeId,
+                                                          DocumentDomainObject parentDocument,
+                                                          HttpServletRequest request,
+                                                          HttpServletResponse response) throws IOException, ServletException, NoPermissionToCreateDocumentException {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
         if (!user.canCreateDocumentOfTypeIdFromParent(documentTypeId, parentDocument)) {
             throw new NoPermissionToCreateDocumentException("User can't create documents from document " + parentDocument.getId());
         }
         ImcmsServices services = Imcms.getServices();
         DocumentMapper documentMapper = services.getDocumentMapper();
-        DocumentDomainObject document = documentMapper.createDocumentOfTypeFromParent( documentTypeId, parentDocument, user );
+        DocumentDomainObject document = documentMapper.createDocumentOfTypeFromParent(documentTypeId, parentDocument, user);
         PageFlow pageFlow;
-        if ( document instanceof TextDocumentDomainObject ) {
-            TextDocumentDomainObject textDocument = (TextDocumentDomainObject)document;
-            if ( null != template ) {
-                textDocument.setTemplateName( template.getName() );
+        if (document instanceof TextDocumentDomainObject) {
+            TextDocumentDomainObject textDocument = (TextDocumentDomainObject) document;
+            if (null != template) {
+                textDocument.setTemplateName(template.getName());
             }
-            pageFlow = new CreateTextDocumentPageFlow( textDocument, saveDocumentCommand, returnCommand );
-        } else if ( document instanceof UrlDocumentDomainObject ) {
-            pageFlow = new CreateDocumentWithEditPageFlow( new EditUrlDocumentPageFlow( (UrlDocumentDomainObject)document, returnCommand, saveDocumentCommand ) );
-        } else if ( document instanceof HtmlDocumentDomainObject ) {
-            pageFlow = new CreateDocumentWithEditPageFlow( new EditHtmlDocumentPageFlow( (HtmlDocumentDomainObject)document, returnCommand, saveDocumentCommand ) );
-        } else if ( document instanceof FileDocumentDomainObject ) {
-            pageFlow = new CreateDocumentWithEditPageFlow( new EditFileDocumentPageFlow( (FileDocumentDomainObject)document, servletContext, returnCommand, saveDocumentCommand, null ) );
-        } else if ( document instanceof BrowserDocumentDomainObject ) {
-            pageFlow = new CreateDocumentWithEditPageFlow( new EditBrowserDocumentPageFlow( (BrowserDocumentDomainObject)document, returnCommand, saveDocumentCommand ) );
+            pageFlow = new CreateTextDocumentPageFlow(textDocument, saveDocumentCommand, returnCommand);
+        } else if (document instanceof UrlDocumentDomainObject) {
+            pageFlow = new CreateDocumentWithEditPageFlow(new EditUrlDocumentPageFlow((UrlDocumentDomainObject) document, returnCommand, saveDocumentCommand));
+        } else if (document instanceof HtmlDocumentDomainObject) {
+            pageFlow = new CreateDocumentWithEditPageFlow(new EditHtmlDocumentPageFlow((HtmlDocumentDomainObject) document, returnCommand, saveDocumentCommand));
+        } else if (document instanceof FileDocumentDomainObject) {
+            pageFlow = new CreateDocumentWithEditPageFlow(new EditFileDocumentPageFlow((FileDocumentDomainObject) document, servletContext, returnCommand, saveDocumentCommand, null));
+        } else if (document instanceof BrowserDocumentDomainObject) {
+            pageFlow = new CreateDocumentWithEditPageFlow(new EditBrowserDocumentPageFlow((BrowserDocumentDomainObject) document, returnCommand, saveDocumentCommand));
         } else {
-            return ;
+            return;
         }
-        pageFlow.dispatch( request, response );
+        pageFlow.dispatch(request, response);
     }
 
-    public void setTemplate( TemplateDomainObject template ) {
+    public void setTemplate(TemplateDomainObject template) {
         this.template = template;
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/admin/DocumentPageFlowDispatcher.java b/server/src/com/imcode/imcms/servlet/admin/DocumentPageFlowDispatcher.java
index bae4108bfc..0b66af462b 100644
--- a/server/src/com/imcode/imcms/servlet/admin/DocumentPageFlowDispatcher.java
+++ b/server/src/com/imcode/imcms/servlet/admin/DocumentPageFlowDispatcher.java
@@ -16,28 +16,28 @@
 
 public class DocumentPageFlowDispatcher extends HttpServlet {
 
-    public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        doPost( request, response );
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doPost(request, response);
     }
 
-    public void doPost( HttpServletRequest r, HttpServletResponse response ) throws ServletException, IOException {
-        r.setCharacterEncoding( Imcms.DEFAULT_ENCODING );
-        MultipartHttpServletRequest request = new MultipartHttpServletRequest( r );
+    public void doPost(HttpServletRequest r, HttpServletResponse response) throws ServletException, IOException {
+        r.setCharacterEncoding(Imcms.DEFAULT_ENCODING);
+        MultipartHttpServletRequest request = new MultipartHttpServletRequest(r);
 
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
 
-        DocumentPageFlow pageFlow = DocumentPageFlow.fromRequest( request );
-        if ( null != pageFlow ) {
+        DocumentPageFlow pageFlow = DocumentPageFlow.fromRequest(request);
+        if (null != pageFlow) {
             DocumentDomainObject document = pageFlow.getDocument();
-            if ( null != document && user.canEdit( document ) ) {
-                pageFlow.dispatch( request, response );
+            if (null != document && user.canEdit(document)) {
+                pageFlow.dispatch(request, response);
 
-                if ( !response.isCommitted() ) {
-                    throw new NotImplementedException( pageFlow.getClass() );
+                if (!response.isCommitted()) {
+                    throw new NotImplementedException(pageFlow.getClass());
                 }
             }
         } else {
-            Utility.redirectToStartDocument( request, response );
+            Utility.redirectToStartDocument(request, response);
         }
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/admin/EditImage.java b/server/src/com/imcode/imcms/servlet/admin/EditImage.java
index aa8f4ec8e5..6455ad00c2 100644
--- a/server/src/com/imcode/imcms/servlet/admin/EditImage.java
+++ b/server/src/com/imcode/imcms/servlet/admin/EditImage.java
@@ -1,45 +1,58 @@
 package com.imcode.imcms.servlet.admin;
 
+import com.imcode.imcms.flow.DispatchCommand;
 import imcode.server.document.textdocument.ImageDomainObject;
+import org.apache.commons.lang.math.NumberUtils;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import java.io.IOException;
 
-import com.imcode.imcms.flow.DispatchCommand;
-
 public class EditImage extends HttpServlet {
 
-    private static final String REQUEST_ATTRIBUTE__IMAGE = EditImage.class+".image";
     public static final String REQUEST_PARAMETER__RETURN = "return";
+    public static final String REQUEST_PARAMETER__META_ID = "meta_id";
+    private static final String REQUEST_ATTRIBUTE__IMAGE = EditImage.class + ".image";
+    private static final String REQUEST_ATTRIBUTE__META_ID = EditImage.class + ".metaId";
+
+    public static String linkTo(HttpServletRequest request, String returnPath) {
+        return request.getContextPath() + "/servlet/EditImage?" + REQUEST_PARAMETER__RETURN + "=" + returnPath;
+    }
+
+    public static ImageDomainObject getImage(HttpServletRequest request) {
+        return (ImageDomainObject) request.getAttribute(REQUEST_ATTRIBUTE__IMAGE);
+    }
+
+    public static Integer getMetaId(HttpServletRequest request) {
+        return (Integer) request.getAttribute(REQUEST_ATTRIBUTE__META_ID);
+    }
 
     public void doGet(final HttpServletRequest request,
                       HttpServletResponse response) throws ServletException, IOException {
 
+        final int metaId = NumberUtils.toInt(request.getParameter(REQUEST_PARAMETER__META_ID));
         final String returnPath = request.getParameter(REQUEST_PARAMETER__RETURN);
         final ImageRetrievalCommand imageCommand = new ImageRetrievalCommand();
         DispatchCommand returnCommand = new DispatchCommand() {
             public void dispatch(HttpServletRequest request,
                                  HttpServletResponse response) throws IOException, ServletException {
-                request.setAttribute(REQUEST_ATTRIBUTE__IMAGE, imageCommand.getImage());
+                ImageDomainObject image = imageCommand.getImage();
+
+                request.setAttribute(REQUEST_ATTRIBUTE__IMAGE, image);
+                if (metaId > 0) {
+                    request.setAttribute(REQUEST_ATTRIBUTE__META_ID, metaId);
+                }
+
                 request.getRequestDispatcher(returnPath).forward(request, response);
             }
         };
-        ImageEditPage imageEditPage = new ImageEditPage(null, null, null, "", getServletContext(), imageCommand, returnCommand, false);
+        ImageEditPage imageEditPage = new ImageEditPage(null, null, null, null, "", getServletContext(), imageCommand, returnCommand, false, 0, 0, 0, 0, null);
         imageEditPage.updateFromRequest(request);
         imageEditPage.forward(request, response);
     }
 
-    public static String linkTo(HttpServletRequest request, String returnPath) {
-        return request.getContextPath()+"/servlet/EditImage?"+REQUEST_PARAMETER__RETURN+"="+returnPath ;
-    }
-    
-    public static ImageDomainObject getImage(HttpServletRequest request) {
-        return (ImageDomainObject) request.getAttribute(REQUEST_ATTRIBUTE__IMAGE);
-    }
-
     private static class ImageRetrievalCommand implements Handler<ImageDomainObject> {
 
         private ImageDomainObject image;
diff --git a/server/src/com/imcode/imcms/servlet/admin/EditLink.java b/server/src/com/imcode/imcms/servlet/admin/EditLink.java
index a4be2e23cc..a140d7f701 100644
--- a/server/src/com/imcode/imcms/servlet/admin/EditLink.java
+++ b/server/src/com/imcode/imcms/servlet/admin/EditLink.java
@@ -1,8 +1,7 @@
 package com.imcode.imcms.servlet.admin;
 
-import com.imcode.imcms.servlet.DocumentFinder;
 import com.imcode.imcms.flow.DispatchCommand;
-import imcode.server.document.DocumentDomainObject;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -10,27 +9,34 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import org.apache.commons.lang.StringUtils;
-
 public class EditLink extends HttpServlet {
 
-    private static final String REQUEST_ATTRIBUTE__DOCUMENT_ID = EditLink.class.getName()+".documentId";
-    public enum Parameter {
-        RETURN,
-        HREF,
-        TITLE,
-        TARGET,
-        USE_TARGET,
+    public final static String[] OTHER_PARAMETERS = {
+            "id", "name", "charset", "coords", "hreflang", "rel", "rev", "shape", "accesskey", "dir", "lang", "tabindex", "xml:lang",
+            "onclick", "ondblclick", "onblur", "onfocus", "onmouseover", "onmouseout", "onmouseup", "onmousedown", "onmousemove", "onkeyup", "onkeydown", "onkeypress"
+    };
+    private static final String REQUEST_ATTRIBUTE__DOCUMENT_ID = EditLink.class.getName() + ".documentId";
+
+    public static String linkTo(HttpServletRequest request, String returnPath) {
+        return request.getContextPath() + "/servlet/EditLink?" + Parameter.RETURN + "=" + returnPath;
+    }
+
+    public static Link getLink(HttpServletRequest request) {
+        return (Link) request.getAttribute(REQUEST_ATTRIBUTE__DOCUMENT_ID);
     }
 
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response) throws ServletException, IOException {
 
-        final String returnPath = getStringParameter(request, Parameter.RETURN) ;
+        final String returnPath = getStringParameter(request, Parameter.RETURN);
 
-        Link link = new LinkEditPage.SimpleLink(getStringParameter(request, Parameter.HREF),
-                                                getStringParameter(request, Parameter.TITLE),
-                                                getStringParameter(request, Parameter.TARGET)) ;
+        Link link = new LinkEditPage.SimpleLink(getIntParameter(request, Parameter.TYPE, 1),
+                getStringParameter(request, Parameter.HREF),
+                getStringParameter(request, Parameter.TITLE),
+                getStringParameter(request, Parameter.TARGET),
+                getStringParameter(request, Parameter.CLASS),
+                getStringParameter(request, Parameter.STYLE),
+                getStringParameter(request, Parameter.OTHER));
         final LinkRetrievalCommand linkRetrievalCommand = new LinkRetrievalCommand();
         LinkEditPage linkEditPage = new LinkEditPage(new DispatchCommand() {
             public void dispatch(HttpServletRequest request,
@@ -47,21 +53,43 @@ private String getStringParameter(HttpServletRequest request, Parameter paramete
         return StringUtils.defaultString(request.getParameter(parameter.toString()));
     }
 
-    public static String linkTo(HttpServletRequest request, String returnPath) {
-        return request.getContextPath()+"/servlet/EditLink?"+Parameter.RETURN+"="+returnPath ;
+    private int getIntParameter(HttpServletRequest request, Parameter parameter, int defVal) {
+        try {
+            if (null != request.getParameter(parameter.toString())) {
+                return Integer.parseInt(request.getParameter(parameter.toString()));
+            }
+        } catch (Exception e) {
+        }
+        return defVal;
     }
 
-    public static Link getLink(HttpServletRequest request) {
-        return (Link) request.getAttribute(REQUEST_ATTRIBUTE__DOCUMENT_ID);
+    public enum Parameter {
+        RETURN,
+        TYPE,
+        HREF,
+        TITLE,
+        TARGET,
+        USE_TARGET,
+        CLASS,
+        STYLE,
+        OTHER,
     }
 
     public interface Link {
 
-        String getHref() ;
+        int getType();
+
+        String getHref();
+
+        String getTitle();
+
+        String getTarget();
+
+        String getCssClass();
 
-        String getTitle() ;
+        String getCssStyle();
 
-        String getTarget() ;
+        String getOtherParams();
 
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/admin/GetExistingDoc.java b/server/src/com/imcode/imcms/servlet/admin/GetExistingDoc.java
index 33818544a5..51539206e3 100644
--- a/server/src/com/imcode/imcms/servlet/admin/GetExistingDoc.java
+++ b/server/src/com/imcode/imcms/servlet/admin/GetExistingDoc.java
@@ -1,29 +1,36 @@
 package com.imcode.imcms.servlet.admin;
 
+import com.imcode.imcms.flow.Page;
 import com.imcode.imcms.mapping.DocumentMapper;
 import com.imcode.imcms.mapping.DocumentSaveException;
-import com.imcode.imcms.flow.Page;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.server.Imcms;
 import imcode.server.ImcmsConstants;
 import imcode.server.ImcmsServices;
-import imcode.server.document.*;
+import imcode.server.document.DirectDocumentReference;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.TextDocumentPermissionSetDomainObject;
 import imcode.server.document.index.DefaultQueryParser;
 import imcode.server.document.index.DocumentIndex;
 import imcode.server.document.index.SimpleDocumentQuery;
 import imcode.server.document.textdocument.MenuItemDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import imcode.util.*;
+import imcode.util.DateConstants;
+import imcode.util.Html;
+import imcode.util.Parser;
+import imcode.util.Utility;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
-import org.apache.lucene.document.DateField;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.document.DateTools;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RangeQuery;
 import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.util.BytesRef;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -36,174 +43,200 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static org.apache.lucene.search.BooleanClause.Occur;
+
 public class GetExistingDoc extends HttpServlet {
 
-    private final static Logger LOG = Logger.getLogger( GetExistingDoc.class.getName() );
+    private final static Logger LOG = LogManager.getLogger(GetExistingDoc.class.getName());
     private static final String ONE_SEARCH_HIT = "existing_doc_hit.html";
     private static final String SEARCH_RESULTS = "existing_doc_res.html";
     private static final String ADMIN_TEMPLATE_EXISTING_DOC = "existing_doc.html";
 
-    private static final String SORT_BY_LANGUAGE_KEY_PREFIX = "templates/sv/existing_doc.html/sort_by/" ;
+    private static final String SORT_BY_LANGUAGE_KEY_PREFIX = "templates/sv/existing_doc.html/sort_by/";
 
     private static final Object[][] SORT_ORDERS_ARRAY = new Object[][]{
-        {"meta_headline", new LocalizedMessage( SORT_BY_LANGUAGE_KEY_PREFIX+"headline") },
-        {"meta_id", new LocalizedMessage( SORT_BY_LANGUAGE_KEY_PREFIX+"id") },
-        {"doc_type", new LocalizedMessage( SORT_BY_LANGUAGE_KEY_PREFIX+"type") },
-        {"date_modified", new LocalizedMessage( SORT_BY_LANGUAGE_KEY_PREFIX+"modified_datetime") },
-        {"date_created", new LocalizedMessage( SORT_BY_LANGUAGE_KEY_PREFIX+"created_datetime") },
-        {"archived_datetime", new LocalizedMessage( SORT_BY_LANGUAGE_KEY_PREFIX+"archived_datetime") },
-        {"publication_start_datetime", new LocalizedMessage( SORT_BY_LANGUAGE_KEY_PREFIX+"published_datetime") },
+            {"meta_headline", new LocalizedMessage(SORT_BY_LANGUAGE_KEY_PREFIX + "headline")},
+            {"meta_id", new LocalizedMessage(SORT_BY_LANGUAGE_KEY_PREFIX + "id")},
+            {"doc_type", new LocalizedMessage(SORT_BY_LANGUAGE_KEY_PREFIX + "type")},
+            {"date_modified", new LocalizedMessage(SORT_BY_LANGUAGE_KEY_PREFIX + "modified_datetime")},
+            {"date_created", new LocalizedMessage(SORT_BY_LANGUAGE_KEY_PREFIX + "created_datetime")},
+            {"archived_datetime", new LocalizedMessage(SORT_BY_LANGUAGE_KEY_PREFIX + "archived_datetime")},
+            {"publication_start_datetime", new LocalizedMessage(SORT_BY_LANGUAGE_KEY_PREFIX + "published_datetime")},
     };
-    static final Map SORT_ORDERS_MAP = Utility.getMapViewOfObjectPairArray( SORT_ORDERS_ARRAY) ;
+    static final Map SORT_ORDERS_MAP = Utility.getMapViewOfObjectPairArray(SORT_ORDERS_ARRAY);
+
+    /**
+     * Local helpmehtod
+     * Takes an array as argument and creates an hashtable the information.
+     * Expects that the first element will be the key and the next element in the
+     * array will be the value.
+     */
+
+    private static Map convertToMap(String[][] arr) {
+
+        Map h = new HashMap();
+        for (String[] anArr : arr) {
+            h.put(anArr[0], anArr[1]);
+        }
+        return h;
+    }
+
+    /**
+     * Local helpmehtod
+     * Parses all the searchhits and returns an StringBuffer
+     */
+
+    private static StringBuffer parseSearchResults(String oneRecHtmlSrc,
+                                                   List<DocumentDomainObject> searchResultDocuments, Map docTypesHash, UserDomainObject user, HttpServletRequest request) {
+        StringBuffer searchResults = new StringBuffer(1024);
+
+        for (DocumentDomainObject document : searchResultDocuments) {
+
+            DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
+            String alias = document.getAlias();
+            int meta_id = document.getId();
+            String[] data = {
+                    "#alias#", alias,
+                    "#meta_id#", meta_id + "",
+                    "#page_name#", document.getName(),
+                    "#status#", Html.getStatusIconTemplate(document, user),
+                    "#doc_type#", (String) docTypesHash.get("" + document.getDocumentTypeId()),
+                    "#meta_headline#", document.getHeadline(),
+                    "#meta_text#", document.getMenuText(),
+                    "#date_created#", formatDate(dateFormat, document.getCreatedDatetime()),
+                    "#date_modified#", formatDate(dateFormat, document.getModifiedDatetime()),
+                    "#date_activated#", formatDate(dateFormat, document.getPublicationStartDatetime()),
+                    "#date_archived#", formatDate(dateFormat, document.getArchivedDatetime()),
+                    "#archive#", document.isArchived() ? "1" : "0",
+            };
+
+            searchResults.append(Parser.parseDoc(oneRecHtmlSrc, data));
+        }
+        return searchResults;
+    }
 
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    private static String formatDate(DateFormat dateFormat, Date datetime) {
+        return null != datetime ? dateFormat.format(datetime) : "&nbsp;";
+    }
+
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         ImcmsServices imcref = Imcms.getServices();
 
-        Utility.setDefaultHtmlContentType( res );
+        Utility.setDefaultHtmlContentType(res);
         Writer out = res.getWriter();
 
         DocumentMapper documentMapper = imcref.getDocumentMapper();
-        TextDocumentDomainObject parentDocument = (TextDocumentDomainObject)documentMapper.getDocument( Integer.parseInt( req.getParameter( "meta_id_value" ) ) );
+        TextDocumentDomainObject parentDocument = (TextDocumentDomainObject) documentMapper.getDocument(Integer.parseInt(req.getParameter("meta_id_value")));
 
         // Lets get the doc_menu_number
-        int menuIndex = Integer.parseInt( req.getParameter( "doc_menu_no" ) );
+        int menuIndex = Integer.parseInt(req.getParameter("doc_menu_no"));
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
         MenuEditPage menuEditPage = (MenuEditPage) Page.fromRequest(req);
-        if ( req.getParameter( "cancel" ) != null || req.getParameter( "cancel.x" ) != null ) {
+        if (req.getParameter("cancel") != null || req.getParameter("cancel.x") != null) {
             menuEditPage.forward(req, res);
-        } else if ( req.getParameter( "search" ) != null || req.getParameter( "search.x" ) != null ) {
+        } else if (req.getParameter("search") != null || req.getParameter("search.x") != null) {
             // SEARCH
             // Lets do a search among existing documents.
             // Lets collect the parameters and build a sql searchstring
             final DocumentIndex index = documentMapper.getDocumentIndex();
-            BooleanQuery query = new BooleanQuery();
-            String searchString = req.getParameter( "searchstring" );
-            String searchPrep = req.getParameter( "search_prep" );
+            final BooleanQuery.Builder queryBuilder = new BooleanQuery.Builder();
+            String searchString = req.getParameter("searchstring");
+            String searchPrep = req.getParameter("search_prep");
             try {
-                if ( "or".equalsIgnoreCase( searchPrep ) ) {
-                    addStringToQuery(searchString, query );
+                if ("or".equalsIgnoreCase(searchPrep)) {
+                    addStringToQuery(searchString, queryBuilder);
                 } else {
-                    String[] searchStrings = searchString.split( "\\s+" );
-                    for ( String string : searchStrings ) {
-                        addStringToQuery(string, query);
+                    String[] searchStrings = searchString.split("\\s+");
+                    for (String string : searchStrings) {
+                        addStringToQuery(string, queryBuilder);
                     }
                 }
-            } catch ( org.apache.lucene.queryParser.ParseException pe ) {
-                LOG.debug( "Bad query: " + searchString, pe );
+            } catch (org.apache.lucene.queryparser.classic.ParseException pe) {
+                LOG.debug("Bad query: " + searchString, pe);
             }
 
-            String[] docTypes = req.getParameterValues( "doc_type" );
-            addDocTypesToQuery( docTypes, query );
+            String[] docTypes = req.getParameterValues("doc_type");
+            addDocTypesToQuery(docTypes, queryBuilder);
 
-            DateFormat dateFormat = new SimpleDateFormat( DateConstants.DATE_FORMAT_STRING );
+            DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING);
             Date startDate = null;
             try {
-                String startDateString = req.getParameter( "start_date" );
-                startDate = dateFormat.parse( startDateString );
-            } catch ( ParseException ignored ) {
+                String startDateString = req.getParameter("start_date");
+                startDate = dateFormat.parse(startDateString);
+            } catch (ParseException ignored) {
             }
             Date endDate = null;
             try {
-                String endDateString = req.getParameter( "end_date" );
-                endDate = dateFormat.parse( endDateString );
-            } catch ( ParseException ignored ) {
+                String endDateString = req.getParameter("end_date");
+                endDate = dateFormat.parse(endDateString);
+            } catch (ParseException ignored) {
             }
 
-            addDateRangesToQuery( startDate, endDate, req, query );
+            addDateRangesToQuery(startDate, endDate, req, queryBuilder);
 
-            String sortBy = req.getParameter( "sortBy" );
+            String sortBy = req.getParameter("sortBy");
 
             // Lets get the language prefix
             String langPrefix = user.getLanguageIso639_2();
 
             // Lets fix the sortby list, first get the displaytexts from the database
-            Set sortOrderSet = SORT_ORDERS_MAP.keySet() ;
-            if ( !sortOrderSet.contains( sortBy ) ) {
+            Set sortOrderSet = SORT_ORDERS_MAP.keySet();
+            if (!sortOrderSet.contains(sortBy)) {
                 sortBy = "meta_id";
             }
 
             List sortOrderV = new ArrayList();
-            for ( int i = 0; i < SORT_ORDERS_ARRAY.length; i++ ) {
-                sortOrderV.add( SORT_ORDERS_ARRAY[i][0] );
-                sortOrderV.add( ((LocalizedMessage)SORT_ORDERS_ARRAY[i][1]).toLocalizedString( user ) );
+            for (int i = 0; i < SORT_ORDERS_ARRAY.length; i++) {
+                sortOrderV.add(SORT_ORDERS_ARRAY[i][0]);
+                sortOrderV.add(((LocalizedMessage) SORT_ORDERS_ARRAY[i][1]).toLocalizedString(user));
             }
 
-            LOG.debug( "Query: " + query );
-            List searchResultDocuments = index.search( new SimpleDocumentQuery(query), user );
+            LOG.debug("Query: " + queryBuilder);
+            List searchResultDocuments = index.search(new SimpleDocumentQuery(queryBuilder.build()), user);
 
-            if ( 0 == searchResultDocuments.size() ) {
-                if ( StringUtils.isNumeric(searchString) ) {
-                    int documentId = Integer.parseInt(searchString) ;
+            if (0 == searchResultDocuments.size()) {
+                if (StringUtils.isNumeric(searchString)) {
+                    int documentId = Integer.parseInt(searchString);
                     DocumentDomainObject document = documentMapper.getDocument(documentId);
                     if (canAddToMenu(user, parentDocument, document)) {
                         addDocumentToMenu(document, parentDocument, user, menuEditPage);
-                        redirectBackToMenu( req, res, menuEditPage );
-                        return ;
+                        redirectBackToMenu(req, res, menuEditPage);
+                        return;
                     }
                 }
-            } else if ( 1 == searchResultDocuments.size() ) {
+            } else if (1 == searchResultDocuments.size()) {
                 DocumentDomainObject onlyDocumentFound = (DocumentDomainObject) searchResultDocuments.get(0);
-                if ( searchString.equals( "" + onlyDocumentFound.getId() ) && canAddToMenu(user, parentDocument, onlyDocumentFound) ) {
-                    addDocumentToMenu( onlyDocumentFound, parentDocument, user, menuEditPage);
-                    redirectBackToMenu( req, res, menuEditPage );
+                if (searchString.equals("" + onlyDocumentFound.getId()) && canAddToMenu(user, parentDocument, onlyDocumentFound)) {
+                    addDocumentToMenu(onlyDocumentFound, parentDocument, user, menuEditPage);
+                    redirectBackToMenu(req, res, menuEditPage);
                     return;
                 }
             }
-            createSearchResultsPage( imcref, user, langPrefix, searchResultDocuments, parentDocument, menuIndex, req, startDate,
-                                     dateFormat, endDate, docTypes, sortBy, sortOrderV, out, menuEditPage);
+            createSearchResultsPage(imcref, user, langPrefix, searchResultDocuments, parentDocument, menuIndex, req, startDate,
+                    dateFormat, endDate, docTypes, sortBy, sortOrderV, out, menuEditPage);
 
         } else {
-            addDocumentsFromRequestToMenu( user, req, imcref, parentDocument, menuEditPage);
-            redirectBackToMenu( req, res, menuEditPage );
+            addDocumentsFromRequestToMenu(user, req, imcref, parentDocument, menuEditPage);
+            redirectBackToMenu(req, res, menuEditPage);
         }
     }
 
-    private class DocumentDomainObjectComparator implements Comparator {
-
-        private String sortBy;
-
-        private DocumentDomainObjectComparator( String sortBy ) {
-            this.sortBy = sortBy;
-        }
-
-        public int compare( Object o1, Object o2 ) {
-            DocumentDomainObject d1 = (DocumentDomainObject)o1;
-            DocumentDomainObject d2 = (DocumentDomainObject)o2;
-            if ( "meta_headline".equalsIgnoreCase( sortBy ) ) {
-                return d1.getHeadline().compareToIgnoreCase( d2.getHeadline() );
-            } else if ( "doc_type".equalsIgnoreCase( sortBy ) ) {
-                return d1.getDocumentTypeId() - d2.getDocumentTypeId();
-            } else if ( "date_modified".equalsIgnoreCase( sortBy ) ) {
-                return Utility.compareDatesWithNullFirst( d1.getModifiedDatetime(), d2.getModifiedDatetime() );
-            } else if ( "date_created".equalsIgnoreCase( sortBy ) ) {
-                return Utility.compareDatesWithNullFirst( d1.getCreatedDatetime(), d2.getCreatedDatetime() );
-            } else if ( "date_archived".equalsIgnoreCase( sortBy ) ) {
-                return Utility.compareDatesWithNullFirst( d1.getArchivedDatetime(), d2.getArchivedDatetime() );
-            } else if ( "date_activated".equalsIgnoreCase( sortBy ) ) {
-                return Utility.compareDatesWithNullFirst( d1.getPublicationStartDatetime(), d2.getPublicationStartDatetime() );
-            } else {
-                return d1.getId() - d2.getId();
-            }
-        }
-
-    }
-
     private void addDocumentsFromRequestToMenu(UserDomainObject user, HttpServletRequest req,
                                                ImcmsServices imcref, TextDocumentDomainObject parentDocument,
                                                MenuEditPage menuEditPage) {
-        req.getSession().setAttribute( "flags", new Integer( ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_MENUS ) );
+        req.getSession().setAttribute("flags", ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_MENUS);
 
         // get the seleced existing docs
-        String[] values = req.getParameterValues( "existing_meta_id" );
-        if ( values == null ) {
+        String[] values = req.getParameterValues("existing_meta_id");
+        if (values == null) {
             values = new String[0];
         }
 
         DocumentMapper documentMapper = imcref.getDocumentMapper();
 
         // Lets loop through all the selected existsing meta ids and add them to the current menu
-        for ( String value : values ) {
+        for (String value : values) {
             int existingDocumentId = Integer.parseInt(value);
 
             DocumentDomainObject existingDocument = documentMapper.getDocument(existingDocumentId);
@@ -213,7 +246,7 @@ private void addDocumentsFromRequestToMenu(UserDomainObject user, HttpServletReq
         }
         try {
             menuEditPage.save(user);
-        } catch ( DocumentSaveException e ) {
+        } catch (DocumentSaveException e) {
             throw new UnhandledException(e);
         }
     }
@@ -226,16 +259,16 @@ private void redirectBackToMenu(HttpServletRequest req, HttpServletResponse res,
     private void addDocumentToMenu(DocumentDomainObject document, TextDocumentDomainObject parentDocument,
                                    UserDomainObject user, MenuEditPage menuEditPage) {
         boolean canAddToMenu = canAddToMenu(user, parentDocument, document);
-        if ( canAddToMenu ) {
-            menuEditPage.getMenu().addMenuItem( new MenuItemDomainObject(new DirectDocumentReference(document)) );
+        if (canAddToMenu) {
+            menuEditPage.getMenu().addMenuItem(new MenuItemDomainObject(new DirectDocumentReference(document)));
         }
     }
 
     private boolean canAddToMenu(UserDomainObject user, TextDocumentDomainObject parentDocument,
                                  DocumentDomainObject document) {
-        Set allowedDocumentTypeIds = ( (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(parentDocument) ).getAllowedDocumentTypeIds() ;
-        boolean sharePermission = user.canAddDocumentToAnyMenu( document );
-        return sharePermission && (allowedDocumentTypeIds.isEmpty() || allowedDocumentTypeIds.contains(new Integer(document.getDocumentTypeId())));
+        Set allowedDocumentTypeIds = ((TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(parentDocument)).getAllowedDocumentTypeIds();
+        boolean sharePermission = user.canAddDocumentToAnyMenu(document);
+        return sharePermission && (allowedDocumentTypeIds.isEmpty() || allowedDocumentTypeIds.contains(document.getDocumentTypeId()));
     }
 
     private void createSearchResultsPage(ImcmsServices imcref, UserDomainObject user,
@@ -244,17 +277,17 @@ private void createSearchResultsPage(ImcmsServices imcref, UserDomainObject user
                                          int doc_menu_no, HttpServletRequest req, Date startDate,
                                          DateFormat dateFormat, Date endDate, String[] docTypes, String sortBy,
                                          List sortOrderV, Writer out, MenuEditPage page) throws IOException {
-        Comparator searchResultsComparator = new DocumentDomainObjectComparator( sortBy );
-        Collections.sort( searchResultDocuments, searchResultsComparator );
+        Comparator searchResultsComparator = new DocumentDomainObjectComparator(sortBy);
+        Collections.sort(searchResultDocuments, searchResultsComparator);
 
         List outVector = new ArrayList();
 
         // Lets get the resultpage fragment used for an result
-        String oneRecHtmlSrc = imcref.getAdminTemplate( ONE_SEARCH_HIT, user, null );
+        String oneRecHtmlSrc = imcref.getAdminTemplate(ONE_SEARCH_HIT, user, null);
 
         // Lets get all document types and put them in a hashTable
-        String[][] allDocTypesArray = imcref.getAllDocumentTypes( langPrefix );
-        Map allDocTypesHash = convertToMap( allDocTypesArray );
+        String[][] allDocTypesArray = imcref.getAllDocumentTypes(langPrefix);
+        Map allDocTypesHash = convertToMap(allDocTypesArray);
 
         // Lets parse the searchresults
         StringBuffer searchResults = parseSearchResults(oneRecHtmlSrc, searchResultDocuments, allDocTypesHash, user, req);
@@ -262,46 +295,46 @@ private void createSearchResultsPage(ImcmsServices imcref, UserDomainObject user
         // Lets get the surrounding resultpage fragment used for all the result
         // and parse all the results into this summarize html template for all the results
         List tmpV = new ArrayList();
-        tmpV.add( "#searchResults#" );
-        tmpV.add( searchResults.toString() );
-        searchResults.replace( 0, searchResults.length(), imcref.getAdminTemplate( SEARCH_RESULTS, user, tmpV ) );
+        tmpV.add("#searchResults#");
+        tmpV.add(searchResults.toString());
+        searchResults.replace(0, searchResults.length(), imcref.getAdminTemplate(SEARCH_RESULTS, user, tmpV));
 
         // Lets parse out hidden fields
-        outVector.add( "#meta_id#" );
-        outVector.add( "" + parentDocument.getId() );
-        outVector.add( "#doc_menu_no#" );
-        outVector.add( "" + doc_menu_no );
-        outVector.add( "#page#" );
-        outVector.add( page.getSessionAttributeName() );
+        outVector.add("#meta_id#");
+        outVector.add("" + parentDocument.getId());
+        outVector.add("#doc_menu_no#");
+        outVector.add("" + doc_menu_no);
+        outVector.add("#page#");
+        outVector.add(page.getSessionAttributeName());
 
         // Lets get the searchstring and add it to the page
-        outVector.add( "#searchstring#" );
-        String searchStr = req.getParameter( "searchstring" ) == null ? "" : req.getParameter( "searchstring" );
-        outVector.add( searchStr );
+        outVector.add("#searchstring#");
+        String searchStr = req.getParameter("searchstring") == null ? "" : req.getParameter("searchstring");
+        outVector.add(searchStr);
 
-        outVector.add( "#start_date#" );
-        if ( startDate == null ) {
-            outVector.add( "" );
+        outVector.add("#start_date#");
+        if (startDate == null) {
+            outVector.add("");
         } else {
-            outVector.add( dateFormat.format( startDate ) );
+            outVector.add(dateFormat.format(startDate));
         }
 
-        outVector.add( "#end_date#" );
-        outVector.add( dateFormat.format( endDate ) );
+        outVector.add("#end_date#");
+        outVector.add(dateFormat.format(endDate));
 
-        if ( docTypes != null ) {
+        if (docTypes != null) {
             // Lets take care of the document types. Get those who were selected
             // and select those again in the page to send back to the user.
             // First, put them in an hashtable for easy access.
-            Map selectedDocTypes = new HashMap( docTypes.length );
-            for ( String docType : docTypes ) {
+            Map selectedDocTypes = new HashMap(docTypes.length);
+            for (String docType : docTypes) {
                 selectedDocTypes.put(docType, docType);
             }
 
             // Lets get all possible values of for the documenttypes from database
-            for ( String[] docType : allDocTypesArray ) {
+            for (String[] docType : allDocTypesArray) {
                 outVector.add("#checked_" + docType[0] + "#");
-                if ( selectedDocTypes.containsKey(docType[0]) ) {
+                if (selectedDocTypes.containsKey(docType[0])) {
                     outVector.add("checked");
                 } else {
                     outVector.add("");
@@ -312,22 +345,20 @@ private void createSearchResultsPage(ImcmsServices imcref, UserDomainObject user
 
         // Lets take care of the created, changed boxes.
         // first, getallchecked values and put them in a hashtable
-        String[] includeDocs = req.getParameterValues( "include_doc" );
-        if ( includeDocs == null ) {
+        String[] includeDocs = req.getParameterValues("include_doc");
+        if (includeDocs == null) {
             includeDocs = new String[0];
         }
 
-        Set selectedIncludeDocs = new HashSet( includeDocs.length );
-        for ( String includeDoc : includeDocs ) {
-            selectedIncludeDocs.add(includeDoc);
-        }
+        Set selectedIncludeDocs = new HashSet(includeDocs.length);
+        Collections.addAll(selectedIncludeDocs, includeDocs);
 
         // Lets create an array with all possible values.
         // in this case just changed resp. created
         String[] allPossibleIncludeDocsValues = {"created", "changed"};
-        for ( String allPossibleIncludeDocsValue : allPossibleIncludeDocsValues ) {
+        for (String allPossibleIncludeDocsValue : allPossibleIncludeDocsValues) {
             outVector.add("#include_check_" + allPossibleIncludeDocsValue + "#");
-            if ( selectedIncludeDocs.contains(allPossibleIncludeDocsValue) ) {
+            if (selectedIncludeDocs.contains(allPossibleIncludeDocsValue)) {
                 outVector.add("checked");
             } else {
                 outVector.add("");
@@ -336,139 +367,108 @@ private void createSearchResultsPage(ImcmsServices imcref, UserDomainObject user
 
         // Lets take care of the search_prep condition, eg and / or
         // first, getallchecked values and put them in a hashtable
-        String[] searchPrepArr = req.getParameterValues( "search_prep" );
-        if ( searchPrepArr == null ) {
+        String[] searchPrepArr = req.getParameterValues("search_prep");
+        if (searchPrepArr == null) {
             searchPrepArr = new String[0];
         }
 
-        Map selectedsearchPrep = new HashMap( searchPrepArr.length );
-        for ( String aSearchPrepArr : searchPrepArr ) {
+        Map selectedsearchPrep = new HashMap(searchPrepArr.length);
+        for (String aSearchPrepArr : searchPrepArr) {
             selectedsearchPrep.put(aSearchPrepArr, aSearchPrepArr);
         }
         // Lets create an array with all possible values.
         // in this case just changed resp. created
         String[] allPossibleSearchPreps = {"and", "or"};
-        for ( String allPossibleSearchPrep : allPossibleSearchPreps ) {
+        for (String allPossibleSearchPrep : allPossibleSearchPreps) {
             outVector.add("#search_prep_check_" + allPossibleSearchPrep + "#");
-            if ( selectedsearchPrep.containsKey(allPossibleSearchPrep) ) {
+            if (selectedsearchPrep.containsKey(allPossibleSearchPrep)) {
                 outVector.add("checked");
             } else {
                 outVector.add("");
             }
         }
 
-        String sortOrderStr = Html.createOptionList( sortOrderV, sortBy );
-        outVector.add( "#sortBy#" );
-        outVector.add( sortOrderStr );
+        String sortOrderStr = Html.createOptionList(sortOrderV, sortBy);
+        outVector.add("#sortBy#");
+        outVector.add(sortOrderStr);
 
-        outVector.add( "#searchResults#" );
-        outVector.add( searchResults.toString() );
+        outVector.add("#searchResults#");
+        outVector.add(searchResults.toString());
 
         // Send page to browser
         // htmlOut = imcref.replaceTagsInStringWithData( htmlOut, outVector);
-        String htmlOut = imcref.getAdminTemplate( ADMIN_TEMPLATE_EXISTING_DOC, user, outVector );
-        out.write( htmlOut );
+        String htmlOut = imcref.getAdminTemplate(ADMIN_TEMPLATE_EXISTING_DOC, user, outVector);
+        out.write(htmlOut);
     }
 
-    private void addDocTypesToQuery( String[] docTypes, BooleanQuery query ) {
-        BooleanQuery docTypesQuery = new BooleanQuery();
-        for ( int i = 0; null != docTypes && i < docTypes.length; i++ ) {
+    private void addDocTypesToQuery(String[] docTypes, BooleanQuery.Builder queryBuilder) {
+        final BooleanQuery.Builder docTypesQueryBuilder = new BooleanQuery.Builder();
+        for (int i = 0; null != docTypes && i < docTypes.length; i++) {
             String docType = docTypes[i];
-            docTypesQuery.add( new TermQuery( new Term( "doc_type_id", docType ) ), false, false );
+            docTypesQueryBuilder.add(new TermQuery(new Term("doc_type_id", docType)), Occur.SHOULD);
         }
-        query.add( docTypesQuery, true, false );
+        queryBuilder.add(docTypesQueryBuilder.build(), Occur.MUST);
     }
 
-    private void addDateRangesToQuery( Date startDate, Date endDate, HttpServletRequest req, BooleanQuery query ) {
-        if ( null != startDate || null != endDate ) {
-            String[] wantedDateFields = req.getParameterValues( "include_doc" );
-            for ( int i = 0; null != wantedDateFields && i < wantedDateFields.length; i++ ) {
+    private void addDateRangesToQuery(Date startDate, Date endDate, HttpServletRequest req, BooleanQuery.Builder queryBuilder) {
+        if (null != startDate || null != endDate) {
+            String[] wantedDateFields = req.getParameterValues("include_doc");
+            for (int i = 0; null != wantedDateFields && i < wantedDateFields.length; i++) {
                 String wantedDateField = wantedDateFields[i];
                 String wantedIndexDateField;
-                if ( "created".equalsIgnoreCase( wantedDateField ) ) {
+                if ("created".equalsIgnoreCase(wantedDateField)) {
                     wantedIndexDateField = "created_datetime";
-                } else if ( "changed".equalsIgnoreCase( wantedDateField ) ) {
+                } else if ("changed".equalsIgnoreCase(wantedDateField)) {
                     wantedIndexDateField = "modified_datetime";
                 } else {
                     continue;
                 }
-                Term startDateTerm = null != startDate
-                                     ? new Term( wantedIndexDateField, DateField.dateToString( startDate ) ) : null;
-                Term endDateTerm = null != endDate
-                                   ? new Term( wantedIndexDateField,
-                                               DateField.dateToString( addOneDayToDate( endDate ) ) )
-                                   : null;
-                RangeQuery dateRangeQuery = new RangeQuery( startDateTerm, endDateTerm, true );
-                query.add( dateRangeQuery, true, false );
-            }
-        }
-    }
-
-    private Date addOneDayToDate( Date date ) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime( date );
-        calendar.add( Calendar.DATE, 1 );
-        return calendar.getTime();
-    }
-
-    private void addStringToQuery(String string, BooleanQuery query)
-            throws org.apache.lucene.queryParser.ParseException {
-        Query textQuery = new DefaultQueryParser().parse( string );
-        query.add( textQuery, true, false );
-    }
 
-    /**
-     * Local helpmehtod
-     * Takes an array as argument and creates an hashtable the information.
-     * Expects that the first element will be the key and the next element in the
-     * array will be the value.
-     */
+                final BytesRef startDateRef = startDate == null ? null : new BytesRef(DateTools.dateToString(startDate, DateTools.Resolution.MINUTE));
+                final BytesRef endDateRef = endDate == null ? null : new BytesRef(DateTools.dateToString(endDate, DateTools.Resolution.MINUTE));
 
-    private static Map convertToMap( String[][] arr ) {
+                final TermRangeQuery dateRangeQuery = new TermRangeQuery(wantedIndexDateField,
+                        startDateRef,
+                        endDateRef,
+                        true, true);
 
-        Map h = new HashMap();
-        for ( String[] anArr : arr ) {
-            h.put(anArr[0], anArr[1]);
+                queryBuilder.add(dateRangeQuery, Occur.MUST);
+            }
         }
-        return h;
     }
 
-    /**
-     * Local helpmehtod
-     * Parses all the searchhits and returns an StringBuffer
-     */
+    private void addStringToQuery(String string, BooleanQuery.Builder queryBuilder)
+            throws org.apache.lucene.queryparser.classic.ParseException {
+        final Query textQuery = new DefaultQueryParser().parse(string);
+        queryBuilder.add(textQuery, Occur.MUST);
+    }
 
-    private static StringBuffer parseSearchResults(String oneRecHtmlSrc,
-                                                   List<DocumentDomainObject> searchResultDocuments, Map docTypesHash, UserDomainObject user, HttpServletRequest request) {
-        StringBuffer searchResults = new StringBuffer( 1024 );
+    private class DocumentDomainObjectComparator implements Comparator {
 
-        for ( DocumentDomainObject document : searchResultDocuments ) {
+        private String sortBy;
 
-            DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
-            String alias = document.getAlias();
-            int meta_id = document.getId();
-            String[] data = {
-                    "#alias#", alias  ,
-                    "#meta_id#", meta_id+"",
-                    "#page_name#", document.getName() ,
-                    "#status#", Html.getStatusIconTemplate(document, user),
-                    "#doc_type#", (String) docTypesHash.get("" + document.getDocumentTypeId()),
-                    "#meta_headline#", document.getHeadline() ,
-                    "#meta_text#", document.getMenuText(),
-                    "#date_created#", formatDate(dateFormat, document.getCreatedDatetime()),
-                    "#date_modified#", formatDate(dateFormat, document.getModifiedDatetime()),
-                    "#date_activated#", formatDate(dateFormat, document.getPublicationStartDatetime()),
-                    "#date_archived#", formatDate(dateFormat, document.getArchivedDatetime()),
-                    "#archive#", document.isArchived() ? "1" : "0",
-            };
+        private DocumentDomainObjectComparator(String sortBy) {
+            this.sortBy = sortBy;
+        }
 
-            searchResults.append(Parser.parseDoc(oneRecHtmlSrc, data));
+        public int compare(Object o1, Object o2) {
+            DocumentDomainObject d1 = (DocumentDomainObject) o1;
+            DocumentDomainObject d2 = (DocumentDomainObject) o2;
+            if ("meta_headline".equalsIgnoreCase(sortBy)) {
+                return d1.getHeadline().compareToIgnoreCase(d2.getHeadline());
+            } else if ("doc_type".equalsIgnoreCase(sortBy)) {
+                return d1.getDocumentTypeId() - d2.getDocumentTypeId();
+            } else if ("date_modified".equalsIgnoreCase(sortBy)) {
+                return -1 * Utility.compareDatesWithNullFirst(d1.getModifiedDatetime(), d2.getModifiedDatetime());
+            } else if ("date_created".equalsIgnoreCase(sortBy)) {
+                return -1 * Utility.compareDatesWithNullFirst(d1.getCreatedDatetime(), d2.getCreatedDatetime());
+            } else if ("date_activated".equalsIgnoreCase(sortBy)) {
+                return Utility.compareDatesWithNullFirst(d1.getPublicationStartDatetime(), d2.getPublicationStartDatetime());
+            } else {
+                return d1.getId() - d2.getId();
+            }
         }
-        return searchResults;
-    }
 
-    private static String formatDate( DateFormat dateFormat, Date datetime ) {
-        return null != datetime ? dateFormat.format( datetime ) : "&nbsp;";
     }
 
 } // End class
diff --git a/server/src/com/imcode/imcms/servlet/admin/Handler.java b/server/src/com/imcode/imcms/servlet/admin/Handler.java
index 5f12fc0563..46e0cf8eff 100644
--- a/server/src/com/imcode/imcms/servlet/admin/Handler.java
+++ b/server/src/com/imcode/imcms/servlet/admin/Handler.java
@@ -3,5 +3,5 @@
 import java.io.Serializable;
 
 public interface Handler<E> extends Serializable {
-    void handle(E e) ;
+    void handle(E e);
 }
diff --git a/server/src/com/imcode/imcms/servlet/admin/ImageBrowse.java b/server/src/com/imcode/imcms/servlet/admin/ImageBrowse.java
index 0037ad6f9b..9d3a99a10d 100644
--- a/server/src/com/imcode/imcms/servlet/admin/ImageBrowse.java
+++ b/server/src/com/imcode/imcms/servlet/admin/ImageBrowse.java
@@ -1,16 +1,20 @@
 package com.imcode.imcms.servlet.admin;
 
-import com.imcode.util.HumanReadable;
-import com.imcode.util.MultipartHttpServletRequest;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
+import com.imcode.util.MultipartHttpServletRequest;
 import imcode.server.Imcms;
 import imcode.server.user.UserDomainObject;
 import imcode.util.*;
+import imcode.util.image.Format;
+import imcode.util.image.ImageInfo;
+import imcode.util.image.ImageOp;
 import imcode.util.io.FileUtility;
 import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -18,99 +22,200 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Browse images in image-directory.
  */
 public class ImageBrowse extends HttpServlet {
 
-    private final static Logger LOG = Logger.getLogger( ImageBrowse.class.getName() );
-
-    private static final String JSP__IMAGE_BROWSE = "ImageBrowse.jsp";
     public static final String REQUEST_PARAMETER__OK_BUTTON = "ImageBrowse.button.ok";
     public static final String REQUEST_PARAMETER__PREVIEW_BUTTON = "ImageBrowse.button.preview";
     public static final String REQUEST_PARAMETER__CANCEL_BUTTON = "ImageBrowse.button.cancel";
     public static final String REQUEST_PARAMETER__CHANGE_DIRECTORY_BUTTON = "ImageBrowse.button.change";
     public static final String REQUEST_PARAMETER__IMAGE_URL = "imglist";
     public static final String REQUEST_PARAMETER__IMAGE_DIRECTORY = "dirlist";
+    public static final String REQUEST_PARAMETER__IMAGE_DIRECTORY_SESSION = "ImageBrowse_dirlist";
     public static final String REQUEST_PARAMETER__LABEL = "label";
     public static final String REQUEST_PARAMETER__UPLOAD_BUTTON = "upload";
     public static final String REQUEST_PARAMETER__FILE = "file";
+    private final static Logger LOG = LogManager.getLogger(ImageBrowse.class.getName());
+    private static final String JSP__IMAGE_BROWSE = "ImageBrowse.jsp";
+    private static final LocalizedMessage ERROR_MESSAGE__FILE_EXISTS = new LocalizedMessage("error/servlet/images/image_file_exists");
 
-    private static final LocalizedMessage ERROR_MESSAGE__FILE_EXISTS = new LocalizedMessage( "error/servlet/images/image_file_exists" );
-
-    public void doPost( HttpServletRequest req, HttpServletResponse response ) throws IOException, ServletException {
-        MultipartHttpServletRequest request = new MultipartHttpServletRequest( req );
-        ImageBrowser imageBrowser = (ImageBrowser)HttpSessionUtils.getSessionAttributeWithNameInRequest( request, ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER );
-        String imageUrl = request.getParameter( REQUEST_PARAMETER__IMAGE_URL );
+    public static void verifyImage(String imageUrl, ImageBrowser imageBrowser,
+                                   HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        File imagesRoot = Imcms.getServices().getConfig().getImagePath();
+        File selectedImage = null;
+        File image = new File(imagesRoot, imageUrl);
+        if (FileUtility.directoryIsAncestorOfOrEqualTo(imagesRoot, image.getParentFile())) {
+            selectedImage = image;
+        }
 
-        if ( null != request.getParameter( REQUEST_PARAMETER__CANCEL_BUTTON ) ) {
-            imageBrowser.cancel( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__OK_BUTTON )
-                    && null != imageUrl ) {
-            imageBrowser.selectImageUrl( imageUrl, request, response );
-        } else {
-            browse( imageUrl, request, response );
+        if (selectedImage != null) {
+            ImageInfo info = ImageOp.getImageInfo(Imcms.getServices().getConfig(), image);
+            if (info == null) {
+                browse(imageUrl, true, request, response);
+            } else {
+                imageBrowser.selectImageUrl(imageUrl, request, response);
+            }
         }
     }
 
-    public static void browse( String imageUrl, HttpServletRequest request,
-                               HttpServletResponse response ) throws ServletException, IOException {
+    public static void browse(String imageUrl, boolean fileNotImageError, HttpServletRequest request,
+                              HttpServletResponse response) throws ServletException, IOException {
         File imagesRoot = Imcms.getServices().getConfig().getImagePath();
         boolean changeDirectoryButtonWasPressed = null
-                                                  != request.getParameter( REQUEST_PARAMETER__CHANGE_DIRECTORY_BUTTON );
+                != request.getParameter(REQUEST_PARAMETER__CHANGE_DIRECTORY_BUTTON);
         File selectedImage = null;
-        if ( null != imageUrl && !changeDirectoryButtonWasPressed ) {
-            File image = new File( imagesRoot, imageUrl );
-            if ( FileUtility.directoryIsAncestorOfOrEqualTo( imagesRoot, image.getParentFile() ) ) {
+        if (null != imageUrl && !changeDirectoryButtonWasPressed) {
+            File image = new File(imagesRoot, imageUrl);
+            if (FileUtility.directoryIsAncestorOfOrEqualTo(imagesRoot, image.getParentFile())) {
                 selectedImage = image;
             }
         }
 
-        String imageDirectoryString = request.getParameter( REQUEST_PARAMETER__IMAGE_DIRECTORY );
-        File selectedDirectory = null != selectedImage ? selectedImage.getParentFile() : imagesRoot;
-        if ( null != imageDirectoryString ) {
-            File imageDirectory = new File( imagesRoot.getParentFile(), imageDirectoryString );
-            if ( FileUtility.directoryIsAncestorOfOrEqualTo( imagesRoot, imageDirectory ) ) {
+        String imageDirectoryString = request.getParameter(REQUEST_PARAMETER__IMAGE_DIRECTORY);
+        File lastVisitedDirectory = null;
+        try {
+            lastVisitedDirectory = (null != request.getSession().getAttribute(REQUEST_PARAMETER__IMAGE_DIRECTORY_SESSION)) ?
+                    (File) request.getSession().getAttribute(REQUEST_PARAMETER__IMAGE_DIRECTORY_SESSION) :
+                    null;
+        } catch (Exception ignore) {
+        }
+        File selectedDirectory =
+                (null != selectedImage) ?
+                        selectedImage.getParentFile() :
+                        (null != lastVisitedDirectory) ?
+                                lastVisitedDirectory :
+                                imagesRoot;
+        if (null != imageDirectoryString) {
+            File imageDirectory = new File(imagesRoot.getParentFile(), imageDirectoryString);
+            if (FileUtility.directoryIsAncestorOfOrEqualTo(imagesRoot, imageDirectory)) {
                 selectedDirectory = imageDirectory;
+                request.getSession().setAttribute(REQUEST_PARAMETER__IMAGE_DIRECTORY_SESSION, selectedDirectory);
             }
         }
 
-        ImageBrowserPage page = new ImageBrowserPage( selectedDirectory, selectedImage );
-        if ( null != request.getParameter( REQUEST_PARAMETER__UPLOAD_BUTTON ) ) {
-            upload( request, selectedDirectory, page );
+        ImageBrowserPage page = new ImageBrowserPage(selectedDirectory, selectedImage);
+        if (null != request.getParameter(REQUEST_PARAMETER__UPLOAD_BUTTON)) {
+            upload(request, selectedDirectory, page);
+        }
+
+        if (fileNotImageError) {
+            page.setErrorMessage(ImageEditPage.ERROR_MESSAGE__FILE_NOT_IMAGE);
         }
 
-        page.setLabel( StringUtils.defaultString( request.getParameter( REQUEST_PARAMETER__LABEL ) ) );
-        page.forward(request,response) ;
+        page.setLabel(StringUtils.defaultString(request.getParameter(REQUEST_PARAMETER__LABEL)));
+        page.forward(request, response);
     }
 
-    private static void upload( HttpServletRequest request, File selectedDirectory, ImageBrowserPage page ) throws IOException {
+    private static void upload(HttpServletRequest request, File selectedDirectory, ImageBrowserPage page) throws IOException {
         File imagesRoot = Imcms.getServices().getConfig().getImagePath();
-        FileItem fileItem = ( (MultipartHttpServletRequest)request ).getParameterFileItem( REQUEST_PARAMETER__FILE );
-        if ( null != fileItem ) {
-            File destinationFile = new File( selectedDirectory, fileItem.getName() );
-            boolean underImagesRoot = FileUtility.directoryIsAncestorOfOrEqualTo( imagesRoot, destinationFile.getParentFile() );
-            boolean hasImageExtension = new ImageExtensionFilenameFilter().accept( destinationFile, destinationFile.getName() );
+        FileItem fileItem = ((MultipartHttpServletRequest) request).getParameterFileItem(REQUEST_PARAMETER__FILE);
+        if (null != fileItem) {
+//            LOG.info("Filename: " + fileItem.getName() + " normalized?: " +  Normalizer.isNormalized(fileItem.getName(), Normalizer.Form.NFKC));
+//            LOG.info("Before/After: " + fileItem.getName().length() + " / " +  Normalizer.normalize(fileItem.getName(), Normalizer.Form.NFKC).length());
+            String fileName = fileItem.getName();// Normalizer.normalize(fileItem.getName(), Normalizer.Form.NFKC);
+            File destinationFile = new File(selectedDirectory, fileName);
+            boolean underImagesRoot = FileUtility.directoryIsAncestorOfOrEqualTo(imagesRoot, destinationFile.getParentFile());
+            boolean hasImageExtension = new ImageExtensionFilenameFilter().accept(destinationFile, destinationFile.getName());
             if (!hasImageExtension) {
-                page.setErrorMessage(ImageEditPage.ERROR_MESSAGE__ONLY_ALLOWED_TO_UPLOAD_IMAGES) ;
-            } else if ( destinationFile.exists() ) {
-                page.setErrorMessage(ERROR_MESSAGE__FILE_EXISTS) ;
-            } else if ( underImagesRoot ) {
+                page.setErrorMessage(ImageEditPage.ERROR_MESSAGE__ONLY_ALLOWED_TO_UPLOAD_IMAGES);
+            } else if (destinationFile.exists()) {
+                page.setErrorMessage(ERROR_MESSAGE__FILE_EXISTS);
+            } else if (underImagesRoot) {
+                File tempFile = null;
                 try {
-                    fileItem.write( destinationFile );
-                    page.setCurrentImage( destinationFile ) ;
-                } catch ( Exception e ) {
-                    throw new UnhandledException( "Failed to write file " + destinationFile
-                                                  + ". Possible permissions problem?", e );
+                    tempFile = File.createTempFile("upload_img", null);
+                    fileItem.write(tempFile);
+                    ImageInfo info = ImageOp.getImageInfo(Imcms.getServices().getConfig(), tempFile);
+
+                    boolean validImage = false;
+
+                    if (info != null && info.getFormat() != null) {
+                        Format imageFormat = info.getFormat();
+
+                        for (Format allowedFormat : ImageEditPage.ALLOWED_FORMATS) {
+                            if (imageFormat == allowedFormat) {
+                                validImage = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (validImage) {
+                        LOG.info(String.format("Saving uploaded file %s into %s.", fileName, destinationFile.getCanonicalFile()));
+                        FileUtils.copyFile(tempFile, destinationFile);
+                        page.setCurrentImage(destinationFile);
+                    } else {
+                        page.setErrorMessage(ImageEditPage.ERROR_MESSAGE__ONLY_ALLOWED_TO_UPLOAD_IMAGES);
+                    }
+                } catch (Exception e) {
+                    throw new UnhandledException("Failed to write file " + destinationFile
+                            + ". Possible permissions problem?", e);
+                } finally {
+                    if (tempFile != null) {
+                        tempFile.delete();
+                    }
                 }
             } else {
-                LOG.info( "User " + Utility.getLoggedOnUser( request ) + " was denied uploading to file "
-                          + destinationFile );
+                LOG.info("User " + Utility.getLoggedOnUser(request) + " was denied uploading to file "
+                        + destinationFile);
+            }
+        }
+    }
+
+    public static String getSimpleFileSize(long size) {
+        String sSize = size + " b";
+        try {
+            double dFileSize = (double) size;
+            DecimalFormat df = new DecimalFormat("#.0");
+            if (dFileSize >= (1024 * 1024)) {
+                dFileSize = dFileSize / (1024 * 1024);
+                sSize = df.format(dFileSize);
+                sSize = sSize.replaceAll(",", ".") + " MB";
+            } else if (dFileSize >= 1024) {
+                dFileSize = dFileSize / 1024;
+                sSize = df.format(dFileSize);
+                sSize = sSize.replaceAll(",", ".") + " kB";
+            }
+        } catch (NumberFormatException ex) {
+            // ignore
+        }
+        return sSize;
+    }
+
+    public static String truncateString(String str, int iTruncate) {
+        String ret = str;
+        try {
+            ret = ret.replaceAll("<[^>]+?>", "");
+            ret = ret.trim();
+            if (ret.length() > iTruncate) {
+                ret = ret.substring(0, iTruncate - 3).trim().replaceAll("\\n", "<br/>\n") + "...";
             }
+        } catch (Exception ex) {
+        }
+        return ret;
+    }
+
+    public void doPost(HttpServletRequest req, HttpServletResponse response) throws IOException, ServletException {
+        MultipartHttpServletRequest request = new MultipartHttpServletRequest(req);
+        ImageBrowser imageBrowser = (ImageBrowser) HttpSessionUtils.getSessionAttributeWithNameInRequest(request, ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER);
+        String imageUrl = request.getParameter(REQUEST_PARAMETER__IMAGE_URL);
+
+        if (null != request.getParameter(REQUEST_PARAMETER__CANCEL_BUTTON)) {
+            imageBrowser.cancel(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__OK_BUTTON)
+                && null != imageUrl)
+        {
+            verifyImage(imageUrl, imageBrowser, request, response);
+        } else {
+            browse(imageUrl, false, request, response);
         }
     }
 
@@ -124,33 +229,28 @@ public static class ImageBrowserPage {
         private File currentDirectory;
         private File currentImage;
 
-        public ImageBrowserPage( File currentDirectory, File currentImage ) {
-            this.currentDirectory = currentDirectory ;
+        public ImageBrowserPage(File currentDirectory, File currentImage) {
+            this.currentDirectory = currentDirectory;
             this.currentImage = currentImage;
         }
 
+        public static ImageBrowserPage fromRequest(HttpServletRequest request) {
+            return (ImageBrowserPage) request.getAttribute(REQUEST_ATTRIBUTE__IMAGE_BROWSE_PAGE);
+        }
+
         public String getLabel() {
             return label;
         }
 
-        private void setLabel( String label ) {
+        private void setLabel(String label) {
             this.label = label;
         }
 
-        public String getDirectoriesOptionList() throws IOException {
-            final File imagesRoot = Imcms.getServices().getConfig().getImagePath();
-            Collection imageDirectories = Utility.collectImageDirectories();
-
-            File currentDirectoryRelativeToImageRootParent = FileUtility.relativizeFile( imagesRoot.getParentFile(), currentDirectory );
-            return Html.createOptionList(imageDirectories, currentDirectoryRelativeToImageRootParent, new ToStringPairTransformer() {
-                public String[] transformToStringPair(Object input) {
-                    File file = (File) input;
-                    return new String[] { FileUtility.relativeFileToString(file), FileUtility.relativeFileToString(file) };
-                }
-            });
+        public File getCurrentDirectory() {
+            return currentDirectory;
         }
 
-        public String getImagesOptionList() throws IOException {
+        /*public String getImagesOptionList() throws IOException {
             final File imagesRoot = Imcms.getServices().getConfig().getImagePath();
             if ( null != currentImage ) {
                 imageUrl = FileUtility.relativeFileToString( FileUtility.relativizeFile( imagesRoot, currentImage ) );
@@ -174,32 +274,54 @@ public String[] transformToStringPair(Object input) {
                     }
                 }
             });
+        }*/
+
+        public String getDirectoriesOptionList() throws IOException {
+            final File imagesRoot = Imcms.getServices().getConfig().getImagePath();
+            Collection imageDirectories = Utility.collectImageDirectories();
+
+            File currentDirectoryRelativeToImageRootParent = FileUtility.relativizeFile(imagesRoot.getParentFile(), currentDirectory);
+            return Html.createOptionList(imageDirectories, currentDirectoryRelativeToImageRootParent, new ToStringPairTransformer() {
+                public String[] transformToStringPair(Object input) {
+                    File file = (File) input;
+                    return new String[]{FileUtility.relativeFileToString(file), FileUtility.relativeFileToString(file)};
+                }
+            });
+        }
+
+        public List<File> getImagesList() throws IOException {
+            final File imagesRoot = Imcms.getServices().getConfig().getImagePath();
+            if (null != currentImage) {
+                imageUrl = FileUtility.relativeFileToString(FileUtility.relativizeFile(imagesRoot, currentImage));
+            }
+            File[] images = currentDirectory.listFiles(new ImageForWebExtensionFilenameFilter());
+	        return Arrays.stream(images).sorted().filter(file -> file.length() > 0).collect(Collectors.toList());
         }
 
         public String getImageUrl() {
             return imageUrl;
         }
 
-        public void forward( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-            request.setAttribute( REQUEST_ATTRIBUTE__IMAGE_BROWSE_PAGE, this );
-            UserDomainObject user = Utility.getLoggedOnUser( request );
+        public void forward(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+            request.setAttribute(REQUEST_ATTRIBUTE__IMAGE_BROWSE_PAGE, this);
+            UserDomainObject user = Utility.getLoggedOnUser(request);
             String forwardPath = "/imcms/" + user.getLanguageIso639_2() + "/jsp/" + JSP__IMAGE_BROWSE;
-            request.getRequestDispatcher( forwardPath ).forward( request, response );
+            request.getRequestDispatcher(forwardPath).forward(request, response);
         }
 
-        public static ImageBrowserPage fromRequest( HttpServletRequest request ) {
-            return (ImageBrowserPage)request.getAttribute( REQUEST_ATTRIBUTE__IMAGE_BROWSE_PAGE ) ;
+        public LocalizedMessage getErrorMessage() {
+            return errorMessage;
         }
 
-        public void setErrorMessage( LocalizedMessage errorMessage ) {
+        public void setErrorMessage(LocalizedMessage errorMessage) {
             this.errorMessage = errorMessage;
         }
 
-        public LocalizedMessage getErrorMessage() {
-            return errorMessage;
+        public File getCurrentImage() {
+            return currentImage;
         }
 
-        public void setCurrentImage( File currentImage ) {
+        public void setCurrentImage(File currentImage) {
             this.currentImage = currentImage;
         }
     }
diff --git a/server/src/com/imcode/imcms/servlet/admin/ImageBrowser.java b/server/src/com/imcode/imcms/servlet/admin/ImageBrowser.java
index 4ac1b20ff5..2511190a20 100644
--- a/server/src/com/imcode/imcms/servlet/admin/ImageBrowser.java
+++ b/server/src/com/imcode/imcms/servlet/admin/ImageBrowser.java
@@ -15,17 +15,17 @@ public class ImageBrowser extends WebComponent {
 
     private SelectImageUrlCommand selectImageUrlCommand;
 
-    public void setSelectImageUrlCommand( SelectImageUrlCommand selectImageUrlCommand ) {
+    public void setSelectImageUrlCommand(SelectImageUrlCommand selectImageUrlCommand) {
         this.selectImageUrlCommand = selectImageUrlCommand;
     }
 
-    public void forward( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute( this, request, REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER);
-        ImageBrowse.browse( null, request, response );
+    public void forward(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute(this, request, REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER);
+        ImageBrowse.browse(null, false, request, response);
     }
 
-    public void selectImageUrl( String imageUrl, HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        selectImageUrlCommand.selectImageUrl( imageUrl, request, response );
+    public void selectImageUrl(String imageUrl, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        selectImageUrlCommand.selectImageUrl(imageUrl, request, response);
     }
 
     public static interface SelectImageUrlCommand extends Serializable {
diff --git a/server/src/com/imcode/imcms/servlet/admin/ImageCropPage.java b/server/src/com/imcode/imcms/servlet/admin/ImageCropPage.java
new file mode 100644
index 0000000000..73a8b81c64
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/admin/ImageCropPage.java
@@ -0,0 +1,162 @@
+package com.imcode.imcms.servlet.admin;
+
+import com.imcode.imcms.flow.DispatchCommand;
+import com.imcode.imcms.flow.OkCancelPage;
+import imcode.server.document.textdocument.ImageDomainObject;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.server.document.textdocument.ImageDomainObject.RotateDirection;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import imcode.util.image.ImageInfo;
+import org.apache.commons.lang.math.NumberUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.geom.AffineTransform;
+import java.io.IOException;
+import java.util.Map;
+
+public class ImageCropPage extends OkCancelPage {
+    public static final String REQUEST_PARAMETER__ROTATE_LEFT = "rotateLeft";
+    public static final String REQUEST_PARAMETER__ROTATE_RIGHT = "rotateRight";
+    public static final String PARAM_CROP_X1 = "crop_x1";
+    public static final String PARAM_CROP_Y1 = "crop_y1";
+    public static final String PARAM_CROP_X2 = "crop_x2";
+    public static final String PARAM_CROP_Y2 = "crop_y2";
+    private static final long serialVersionUID = 2032206435742139836L;
+    private static final Map<String, Object> CONSTANTS = Utility.getConstants(ImageCropPage.class);
+
+    private Handler<CropRegion> selectRegionCommand;
+    private CropRegion region;
+    private ImageDomainObject image;
+    private int imageWidth;
+    private int imageHeight;
+    private int forcedWidth;
+    private int forcedHeight;
+    private boolean forceCropRatio;
+
+
+    public ImageCropPage(DispatchCommand okCancelCommand, Handler<CropRegion> selectRegionCommand,
+                         ImageDomainObject image, int forcedWidth, int forcedHeight, boolean forceCropRatio) {
+        super(okCancelCommand, okCancelCommand);
+
+        this.selectRegionCommand = selectRegionCommand;
+        this.image = image;
+        this.region = image.getCropRegion();
+        this.forcedWidth = forcedWidth;
+        this.forcedHeight = forcedHeight;
+        this.forceCropRatio = forceCropRatio;
+
+        if (forcedWidth > 0) {
+            image.setWidth(forcedWidth);
+        }
+        if (forcedHeight > 0) {
+            image.setHeight(forcedHeight);
+        }
+
+        ImageInfo imageInfo = image.getImageInfo();
+        imageWidth = imageInfo.getWidth();
+        imageHeight = imageInfo.getHeight();
+
+        RotateDirection rotateDirection = image.getRotateDirection();
+        if (rotateDirection == RotateDirection.EAST || rotateDirection == RotateDirection.WEST) {
+            exchangeImageWidthAndHeight();
+        }
+    }
+
+    @Override
+    public void forward(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        request.setAttribute("constant", CONSTANTS);
+        request.setAttribute("cropPage", this);
+        request.setAttribute("region", region);
+        request.setAttribute("image", image);
+        request.setAttribute("forceCropRatio", forceCropRatio);
+
+        request.setAttribute("imageWidth", imageWidth);
+        request.setAttribute("imageHeight", imageHeight);
+        request.setAttribute("forcedWidth", forcedWidth);
+        request.setAttribute("forcedHeight", forcedHeight);
+
+        super.forward(request, response);
+    }
+
+    @Override
+    protected void updateFromRequest(HttpServletRequest request) {
+        int cropX1 = NumberUtils.toInt(request.getParameter(PARAM_CROP_X1), -1);
+        int cropY1 = NumberUtils.toInt(request.getParameter(PARAM_CROP_Y1), -1);
+        int cropX2 = NumberUtils.toInt(request.getParameter(PARAM_CROP_X2), -1);
+        int cropY2 = NumberUtils.toInt(request.getParameter(PARAM_CROP_Y2), -1);
+
+        region = new CropRegion(cropX1, cropY1, cropX2, cropY2);
+    }
+
+    @Override
+    protected void dispatchOther(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        if (request.getParameter(REQUEST_PARAMETER__ROTATE_LEFT) != null) {
+            image.setRotateDirection(image.getRotateDirection().getLeftDirection());
+            rotateCropRegion(false);
+            exchangeImageWidthAndHeight();
+
+        } else if (request.getParameter(REQUEST_PARAMETER__ROTATE_RIGHT) != null) {
+            image.setRotateDirection(image.getRotateDirection().getRightDirection());
+            rotateCropRegion(true);
+            exchangeImageWidthAndHeight();
+
+        }
+
+        forward(request, response);
+    }
+
+    private void rotateCropRegion(boolean toRight) {
+        if (image.getWidth() > 0 && image.getHeight() > 0) {
+            return;
+        }
+
+        AffineTransform rotateTransform = null;
+        AffineTransform translateTransform = null;
+
+        if (toRight) {
+            rotateTransform = AffineTransform.getRotateInstance(Math.PI / 2.0);
+            translateTransform = AffineTransform.getTranslateInstance(imageHeight, 0.0);
+
+        } else {
+            rotateTransform = AffineTransform.getRotateInstance(-Math.PI / 2.0);
+            translateTransform = AffineTransform.getTranslateInstance(0.0, imageWidth);
+
+        }
+
+        translateTransform.concatenate(rotateTransform);
+
+        float[] src = {region.getCropX1(), region.getCropY1(), region.getCropX2(), region.getCropY2()};
+        translateTransform.transform(src, 0, src, 0, src.length / 2);
+
+        region = new CropRegion((int) src[0], (int) src[1], (int) src[2], (int) src[3]);
+    }
+
+    private void exchangeImageWidthAndHeight() {
+        int temp = imageWidth;
+        imageWidth = imageHeight;
+        imageHeight = temp;
+    }
+
+    @Override
+    protected void dispatchOk(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        selectRegionCommand.handle(region);
+        super.dispatchOk(request, response);
+    }
+
+    @Override
+    public String getPath(HttpServletRequest request) {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        return "/imcms/" + user.getLanguageIso639_2() + "/jsp/crop_img.jsp";
+    }
+
+    public CropRegion getRegion() {
+        return region;
+    }
+
+    public ImageDomainObject getImage() {
+        return image;
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/admin/ImageEditPage.java b/server/src/com/imcode/imcms/servlet/admin/ImageEditPage.java
index 3e917bc5f3..7d75fdfe93 100644
--- a/server/src/com/imcode/imcms/servlet/admin/ImageEditPage.java
+++ b/server/src/com/imcode/imcms/servlet/admin/ImageEditPage.java
@@ -18,15 +18,22 @@
 import imcode.server.document.index.DocumentIndex;
 import imcode.server.document.index.QueryParser;
 import imcode.server.document.textdocument.*;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.server.document.textdocument.ImageDomainObject.RotateDirection;
+import imcode.server.user.RoleId;
 import imcode.server.user.UserDomainObject;
 import imcode.util.ImcmsImageUtils;
 import imcode.util.ShouldHaveCheckedPermissionsEarlierException;
 import imcode.util.Utility;
+import imcode.util.image.Format;
+import imcode.util.image.ImageInfo;
+import imcode.util.image.Resize;
 import imcode.util.io.InputStreamSource;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
+import org.apache.commons.lang.math.NumberUtils;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
@@ -42,11 +49,14 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.lucene.search.BooleanClause.Occur;
+
 public class ImageEditPage extends OkCancelPage {
 
     public final static String REQUEST_PARAMETER__GO_TO_IMAGE_SEARCH_BUTTON = "goToImageSearch";
     public static final String REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER_BUTTON = "goToImageBrowser";
     public static final String REQUEST_PARAMETER__GO_TO_ADD_RESTRICTED_IMAGE_BUTTON = "goToAddRestrictedImage";
+    public static final String REQUEST_PARAMETER__GO_TO_CROP_IMAGE = "goToCropImage";
     public static final String REQUEST_PARAMETER__PREVIEW_BUTTON = "show_img";
     public static final String REQUEST_PARAMETER__CANCEL_BUTTON = "cancel";
     public static final String REQUEST_PARAMETER__DELETE_BUTTON = "delete";
@@ -64,77 +74,256 @@ public class ImageEditPage extends OkCancelPage {
     public static final String REQUEST_PARAMETER__IMAGE_LOWSRC = "low_scr";
     public static final String REQUEST_PARAMETER__LINK_URL = "imageref_link";
     public static final String REQUEST_PARAMETER__LINK_TARGET = EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET;
+    public static final String REQUEST_PARAMETER__GO_TO_IMAGE_ARCHIVE_BUTTON = "goToImageArchive";
+    public static final String REQUEST_PARAMETER__IMAGE_ARCHIVE = "image_archive";
+    public static final String REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_ID = "archive_img_id";
+    public static final String REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_NAME = "archive_img_nm";
+    public static final String REQUEST_PARAMETER__IMAGE_ARCHIVE_FILE_NAME = "archive_file_nm";
+    public static final String REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_ALT_TEXT = "archive_img_alt_text";
+    public static final String REQUEST_PARAMETER__FORMAT = "format";
+    public static final String REQUEST_PARAMETER__FORMAT_EXTENSION = "format_ext";
+    public static final String REQUEST_PARAMETER__CROP_X1 = "crop_x1";
+    public static final String REQUEST_PARAMETER__CROP_Y1 = "crop_y1";
+    public static final String REQUEST_PARAMETER__CROP_X2 = "crop_x2";
+    public static final String REQUEST_PARAMETER__CROP_Y2 = "crop_y2";
+    public static final String REQUEST_PARAMETER__ROTATE_ANGLE = "rotate_angle";
+    public static final Format[] ALLOWED_FORMATS = new Format[]{Format.GIF, Format.JPEG, Format.PNG};
     static final LocalizedMessage ERROR_MESSAGE__ONLY_ALLOWED_TO_UPLOAD_IMAGES = new LocalizedMessage("error/servlet/images/only_allowed_to_upload_images");
-    private final static String[] IMAGE_MIME_TYPES = new String[] { "image/jpeg", "image/png", "image/gif" };
-
-    private TextDocumentDomainObject document;
-    private ImageDomainObject image;
-    private String label;
+    static final LocalizedMessage ERROR_MESSAGE__FILE_NOT_IMAGE = new LocalizedMessage("error/servlet/images/file_not_image");
+    private final static String[] IMAGE_MIME_TYPES = new String[]{"image/jpeg", "image/png", "image/gif"};
     private final ServletContext servletContext;
     private final Handler<ImageDomainObject> imageCommand;
     private final LocalizedMessage heading;
+    private TextDocumentDomainObject document;
+    private ImageDomainObject image;
+    private Integer imageIndex;
+    private String label;
     private boolean linkable;
+    private int forcedWidth;
+    private int forcedHeight;
+    private int maxWidth;
+    private int maxHeight;
+    private String returnUrl;
 
-    public ImageEditPage(TextDocumentDomainObject document, ImageDomainObject image,
+    public ImageEditPage(TextDocumentDomainObject document, ImageDomainObject image, Integer imageIndex,
                          LocalizedMessage heading, String label, ServletContext servletContext,
                          Handler<ImageDomainObject> imageCommand,
-                         DispatchCommand returnCommand, boolean linkable) {
+                         DispatchCommand returnCommand, boolean linkable,
+                         int forcedWidth, int forcedHeight, int maxWidth, int maxHeight, String returnUrl) {
         super(returnCommand, returnCommand);
         this.document = document;
         this.image = image;
+        this.imageIndex = imageIndex;
         this.label = label;
         this.servletContext = servletContext;
         this.imageCommand = imageCommand;
-        this.heading = heading ;
-        this.linkable = linkable ;
+        this.heading = heading;
+        this.linkable = linkable;
+        this.forcedWidth = forcedWidth;
+        this.forcedHeight = forcedHeight;
+        this.maxWidth = maxWidth;
+        this.maxHeight = maxHeight;
+        this.returnUrl = returnUrl;
+
+        if (forcedWidth > 0) {
+            this.maxWidth = 0;
+        }
+        if (forcedHeight > 0) {
+            this.maxHeight = 0;
+        }
+
+        forceWidthHeight();
+        restrictMaximumDimensions();
+    }
+
+    static boolean userHasImagePermissionsOnDocument(UserDomainObject user, TextDocumentDomainObject document) {
+        TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(document);
+        return textDocumentPermissionSet.getEditImages();
+    }
+
+    public static ImageEditPage getFromRequest(HttpServletRequest request) {
+        return fromRequest(request);
+    }
+
+    public static boolean allowImageArchive(UserDomainObject user) {
+        return allowAccess(user, Imcms.getServices().getConfig().getImageArchiveAllowedRoleIdList());
+    }
+
+    public static boolean allowChooseFile(UserDomainObject user) {
+        return allowAccess(user, Imcms.getServices().getConfig().getChooseFileAllowedRoleIdsList());
+    }
+
+    private static boolean allowAccess(UserDomainObject user, List<RoleId> roleIds) {
+        if (roleIds.isEmpty()) {
+            return true;
+        }
+
+        for (RoleId roleId : roleIds) {
+            if (user.hasRoleId(roleId)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private void forceWidthHeight() {
+        if (image != null) {
+            if (forcedWidth > 0) {
+                image.setWidth(forcedWidth);
+            }
+            if (forcedHeight > 0) {
+                image.setHeight(forcedHeight);
+            }
+        }
+    }
+
+    private void restrictMaximumDimensions() {
+        if (image == null) {
+            return;
+        }
+
+        if (maxWidth > 0) {
+            int imgWidth = image.getWidth();
+
+            if (imgWidth <= 0 || imgWidth > maxWidth) {
+                imgWidth = maxWidth;
+            }
+
+            image.setWidth(imgWidth);
+        }
+        if (maxHeight > 0) {
+            int imgHeight = image.getHeight();
+
+            if (imgHeight <= 0 || imgHeight > maxHeight) {
+                imgHeight = maxHeight;
+            }
+
+            image.setHeight(imgHeight);
+        }
+
+        image.setResize(getResize());
     }
 
     public ImageDomainObject getImage() {
         return image;
     }
 
+    public void setImage(ImageDomainObject image) {
+        this.image = image;
+    }
+
     public String getPath(HttpServletRequest request) {
         UserDomainObject user = Utility.getLoggedOnUser(request);
         return "/imcms/" + user.getLanguageIso639_2() + "/jsp/change_img.jsp";
     }
 
     protected void updateFromRequest(HttpServletRequest request) {
-        image = getImageFromRequest(request);
+        if (request.getParameter(REQUEST_PARAMETER__IMAGE_ARCHIVE) != null) {
+            getImageFromImageArchive(request);
+        } else {
+            image = getImageFromRequest(request);
+        }
     }
 
     public String getLabel() {
         return label;
     }
 
+    private void getImageFromImageArchive(HttpServletRequest request) {
+        String imageName = StringUtils.trimToNull(request.getParameter(REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_NAME));
+        imageName = StringUtils.substring(imageName, 0, 40);
+        String fileName = StringUtils.trimToNull(request.getParameter(REQUEST_PARAMETER__IMAGE_ARCHIVE_FILE_NAME));
+        String archiveImageIdStr = StringUtils.trimToNull(request.getParameter(REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_ID));
+        String altText = StringUtils.trimToNull(request.getParameter(REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_ALT_TEXT));
+
+        Long archiveImageId = null;
+        if (archiveImageIdStr != null) {
+            try {
+                archiveImageId = Long.parseLong(archiveImageIdStr, 10);
+            } catch (NumberFormatException ex) {
+            }
+        }
+
+        if (fileName != null) {
+            fileName = fileName.replaceAll("/|\\\\", "");
+            setNewSourceAndClearSize(new ImageArchiveImageSource(fileName));
+
+            if (imageName != null) {
+                image.setName(imageName);
+            }
+            if (archiveImageId != null) {
+                image.setArchiveImageId(archiveImageId);
+            }
+            if (altText != null) {
+                image.setAlternateText(altText);
+            }
+        }
+    }
+
     private ImageDomainObject getImageFromRequest(HttpServletRequest req) {
         ImageDomainObject image = new ImageDomainObject();
         try {
             image.setWidth(Integer.parseInt(req.getParameter(REQUEST_PARAMETER__IMAGE_WIDTH)));
-        } catch ( NumberFormatException ignored ) {
+        } catch (NumberFormatException ignored) {
         }
         try {
             image.setHeight(Integer.parseInt(req.getParameter(REQUEST_PARAMETER__IMAGE_HEIGHT)));
-        } catch ( NumberFormatException ignored ) {
+        } catch (NumberFormatException ignored) {
         }
         try {
             image.setBorder(Integer.parseInt(req.getParameter(REQUEST_PARAMETER__IMAGE_BORDER)));
-        } catch ( NumberFormatException ignored ) {
+        } catch (NumberFormatException ignored) {
         }
         try {
             image.setVerticalSpace(Integer.parseInt(req.getParameter(REQUEST_PARAMETER__VERTICAL_SPACE)));
-        } catch ( NumberFormatException ignored ) {
+        } catch (NumberFormatException ignored) {
         }
         try {
             image.setHorizontalSpace(Integer.parseInt(req.getParameter(REQUEST_PARAMETER__HORIZONTAL_SPACE)));
-        } catch ( NumberFormatException ignored ) {
+        } catch (NumberFormatException ignored) {
         }
+        try {
+            image.setArchiveImageId(Long.parseLong(req.getParameter(REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_ID)));
+        } catch (NumberFormatException ex) {
+        }
+
+        int rotateAngle = NumberUtils.toInt(req.getParameter(REQUEST_PARAMETER__ROTATE_ANGLE));
+        image.setRotateDirection(RotateDirection.getByAngleDefaultIfNull(rotateAngle));
+
+        image.setResize(getResize());
+
+        CropRegion region = new CropRegion();
+        region.setCropX1(NumberUtils.toInt(req.getParameter(REQUEST_PARAMETER__CROP_X1), -1));
+        region.setCropY1(NumberUtils.toInt(req.getParameter(REQUEST_PARAMETER__CROP_Y1), -1));
+        region.setCropX2(NumberUtils.toInt(req.getParameter(REQUEST_PARAMETER__CROP_X2), -1));
+        region.setCropY2(NumberUtils.toInt(req.getParameter(REQUEST_PARAMETER__CROP_Y2), -1));
+        region.updateValid();
+        image.setCropRegion(region);
+
+
         String imageUrl = req.getParameter(REQUEST_PARAMETER__IMAGE_URL);
-        if ( null != imageUrl && imageUrl.startsWith(req.getContextPath()) ) {
+        if (null != imageUrl && imageUrl.startsWith(req.getContextPath())) {
             imageUrl = imageUrl.substring(req.getContextPath().length());
         }
         ImageSource imageSource = ImcmsImageUtils.createImageSourceFromString(imageUrl);
 
         image.setSource(imageSource);
+
+        ImageInfo imageInfo = image.getImageInfo();
+        image.setFormat((imageInfo != null ? imageInfo.getFormat() : null));
+
+        Format format = null;
+        if (req.getParameter(REQUEST_PARAMETER__FORMAT_EXTENSION) != null) {
+            format = Format.findFormatByExtension(req.getParameter(REQUEST_PARAMETER__FORMAT_EXTENSION));
+        } else {
+            format = Format.findFormat(NumberUtils.toInt(req.getParameter(REQUEST_PARAMETER__FORMAT), 0));
+        }
+
+        if (format != null) {
+            image.setFormat(format);
+        }
+
         image.setName(StringUtils.trim(req.getParameter(REQUEST_PARAMETER__IMAGE_NAME)));
         image.setAlign(req.getParameter(REQUEST_PARAMETER__IMAGE_ALIGN));
         image.setAlternateText(req.getParameter(REQUEST_PARAMETER__IMAGE_ALT));
@@ -152,22 +341,54 @@ protected void dispatchOther(HttpServletRequest request,
         ImcmsServices imcref = Imcms.getServices();
         DocumentMapper documentMapper = imcref.getDocumentMapper();
 
-        if ( null != request.getParameter(REQUEST_PARAMETER__DELETE_BUTTON) ) {
+        if (null != request.getParameter(REQUEST_PARAMETER__DELETE_BUTTON)) {
             image = new ImageDomainObject();
 
             forward(request, response);
-        } else if ( null != request.getParameter(REQUEST_PARAMETER__PREVIEW_BUTTON) ) {
+        } else if (null != request.getParameter(REQUEST_PARAMETER__PREVIEW_BUTTON)) {
 
             forward(request, response);
-        } else if ( null != request.getParameter(REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER_BUTTON) ) {
+        } else if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER_BUTTON)) {
             goToImageBrowser(request, response);
-        } else if ( null != request.getParameter(REQUEST_PARAMETER__GO_TO_IMAGE_SEARCH_BUTTON) ) {
+        } else if (request.getParameter(REQUEST_PARAMETER__GO_TO_IMAGE_ARCHIVE_BUTTON) != null) {
+            goToImageArchive(request, response);
+        } else if (request.getParameter(REQUEST_PARAMETER__IMAGE_ARCHIVE) != null) {
+            forward(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_IMAGE_SEARCH_BUTTON)) {
             goToImageSearch(documentMapper, request, response);
-        } else if ( null != request.getParameter(REQUEST_PARAMETER__GO_TO_ADD_RESTRICTED_IMAGE_BUTTON) ) {
+        } else if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_ADD_RESTRICTED_IMAGE_BUTTON)) {
             goToImageAdder(documentMapper, user, request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__GO_TO_CROP_IMAGE)) {
+            goToCropImage(request, response);
         }
     }
 
+    private void goToImageArchive(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        int port = request.getServerPort();
+        final String protocol = request.getScheme() + "://";
+
+        StringBuilder builder = new StringBuilder();
+        builder.append(protocol);
+        builder.append(request.getServerName());
+
+        if (port != 80) {
+            builder.append(":");
+            builder.append(port);
+        }
+
+        builder.append(request.getContextPath());
+        builder.append("/servlet/PageDispatcher?page=");
+        builder.append(Utility.encodeUrl(getSessionAttributeName()));
+        builder.append("&");
+        builder.append(REQUEST_PARAMETER__IMAGE_ARCHIVE);
+        builder.append("=yes&");
+
+        String imageArchiveUrl = String.format(protocol + "%s?returnTo=%s", Imcms.getServices().getConfig().getImageArchiveUrl(),
+                Utility.encodeUrl(builder.toString()));
+
+        response.sendRedirect(imageArchiveUrl);
+    }
+
     private void goToImageAdder(final DocumentMapper documentMapper,
                                 UserDomainObject user,
                                 HttpServletRequest request,
@@ -182,15 +403,15 @@ private void goToImageAdder(final DocumentMapper documentMapper,
                 public void saveDocument(DocumentDomainObject document, UserDomainObject user) throws NoPermissionInternalException, NoPermissionToAddDocumentToMenuException, DocumentSaveException {
                     FileDocumentDomainObject fileDocument = (FileDocumentDomainObject) document;
                     Map files = fileDocument.getFiles();
-                    for ( FileDocumentDomainObject.FileDocumentFile file : (Iterable<FileDocumentDomainObject.FileDocumentFile>) files.values() ) {
+                    for (FileDocumentDomainObject.FileDocumentFile file : (Iterable<FileDocumentDomainObject.FileDocumentFile>) files.values()) {
                         file.setCreatedAsImage(true);
                     }
                     FileDocumentDomainObject.FileDocumentFile file = (FileDocumentDomainObject.FileDocumentFile) files.values().iterator().next();
-                    if ( null != file ) {
+                    if (null != file) {
                         fileDocument.setHeadline(file.getFilename());
                         fileDocument.setPublicationStatus(Document.PublicationStatus.APPROVED);
                         documentMapper.saveNewDocument(document, user, false);
-                        image.setSourceAndClearSize(new FileDocumentImageSource(documentMapper.getDocumentReference(fileDocument)));
+                        setNewSourceAndClearSize(new FileDocumentImageSource(documentMapper.getDocumentReference(fileDocument)));
                     }
                 }
             };
@@ -203,7 +424,7 @@ public void dispatch(HttpServletRequest request,
             };
             DocumentPageFlow pageFlow = new EditFileDocumentPageFlow(fileDocument, servletContext, returnToImageEditPageCommand, saveNewImageFileDocument, mimeTypeRestriction);
             pageFlow.dispatch(request, response);
-        } catch ( NoPermissionToCreateDocumentException e ) {
+        } catch (NoPermissionToCreateDocumentException e) {
             throw new ShouldHaveCheckedPermissionsEarlierException(e);
         }
     }
@@ -221,13 +442,33 @@ public void dispatch(HttpServletRequest request,
         imageBrowser.setSelectImageUrlCommand(new ImageBrowser.SelectImageUrlCommand() {
             public void selectImageUrl(String imageUrl, HttpServletRequest request,
                                        HttpServletResponse response) throws IOException, ServletException {
-                image.setSourceAndClearSize(new ImagesPathRelativePathImageSource(imageUrl));
+                setNewSourceAndClearSize(new ImagesPathRelativePathImageSource(imageUrl));
                 forward(request, response);
             }
         });
         imageBrowser.forward(request, response);
     }
 
+    private void goToCropImage(final HttpServletRequest request, final HttpServletResponse response)
+            throws IOException, ServletException {
+        DispatchCommand returnCommand = new DispatchCommand() {
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                forward(request, response);
+            }
+        };
+
+        Handler<CropRegion> cropHandler = new Handler<CropRegion>() {
+            public void handle(CropRegion cropRegion) {
+                image.setCropRegion(cropRegion);
+                forceWidthHeight();
+                restrictMaximumDimensions();
+            }
+        };
+
+        ImageCropPage cropPage = new ImageCropPage(returnCommand, cropHandler, image, forcedWidth, forcedHeight, !(maxWidth > 0 || maxHeight > 0));
+        cropPage.forward(request, response);
+    }
+
     private void goToImageSearch(final DocumentMapper documentMapper,
                                  final HttpServletRequest request,
                                  final HttpServletResponse response) throws IOException, ServletException {
@@ -240,9 +481,9 @@ public void dispatch(HttpServletRequest request,
             }
         });
         documentFinder.setSelectDocumentCommand(new Handler<Integer>() {
-            public void handle(Integer documentIdFound){
-                if ( null != documentIdFound ) {
-                    image.setSourceAndClearSize(new FileDocumentImageSource(documentMapper.getDocumentReference(documentIdFound)));
+            public void handle(Integer documentIdFound) {
+                if (null != documentIdFound) {
+                    setNewSourceAndClearSize(new FileDocumentImageSource(documentMapper.getDocumentReference(documentIdFound)));
                 }
             }
         });
@@ -252,30 +493,39 @@ public void handle(Integer documentIdFound){
         documentFinder.forward(request, response);
     }
 
-    static boolean userHasImagePermissionsOnDocument(UserDomainObject user, TextDocumentDomainObject document) {
-        TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(document);
-        return textDocumentPermissionSet.getEditImages();
+    private void setNewSourceAndClearSize(ImageSource imageSource) {
+        image.setSourceAndClearSize(imageSource);
+        image.setFormat(image.getImageInfo().getFormat());
+        image.setCropRegion(new CropRegion());
+        forceWidthHeight();
+        restrictMaximumDimensions();
+
+        Format imageFormat = image.getImageInfo().getFormat();
+        boolean allowed = false;
+        for (Format allowedFormat : ALLOWED_FORMATS) {
+            if (imageFormat == allowedFormat) {
+                allowed = true;
+            }
+        }
+        image.setFormat((allowed ? imageFormat : Format.PNG));
     }
 
     private Query createImageFileDocumentsQuery() {
-        BooleanQuery imageMimeTypeQuery = new BooleanQuery();
+        final BooleanQuery.Builder imageMimeTypeQueryBuilder = new BooleanQuery.Builder();
 
-        for ( String imageMimeType : IMAGE_MIME_TYPES ) {
-            imageMimeTypeQuery.add(new TermQuery(new Term(DocumentIndex.FIELD__MIME_TYPE, imageMimeType)), false, false);
+        for (String imageMimeType : IMAGE_MIME_TYPES) {
+            imageMimeTypeQueryBuilder.add(new TermQuery(new Term(DocumentIndex.FIELD__MIME_TYPE, imageMimeType)), Occur.SHOULD);
         }
 
-        TermQuery fileDocumentQuery = new TermQuery(new Term(DocumentIndex.FIELD__DOC_TYPE_ID, ""
-                                                                                               + DocumentTypeDomainObject
+        final TermQuery fileDocumentQuery = new TermQuery(new Term(DocumentIndex.FIELD__DOC_TYPE_ID, ""
+                + DocumentTypeDomainObject
                 .FILE_ID));
 
-        BooleanQuery booleanQuery = new BooleanQuery();
-        booleanQuery.add(fileDocumentQuery, true, false);
-        booleanQuery.add(imageMimeTypeQuery, true, false);
-        return booleanQuery;
-    }
+        final BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+        booleanQueryBuilder.add(fileDocumentQuery, Occur.MUST);
+        booleanQueryBuilder.add(imageMimeTypeQueryBuilder.build(), Occur.MUST);
 
-    public static ImageEditPage getFromRequest(HttpServletRequest request) {
-        return fromRequest(request);
+        return booleanQueryBuilder.build();
     }
 
     public LocalizedMessage getHeading() {
@@ -283,28 +533,80 @@ public LocalizedMessage getHeading() {
     }
 
     public boolean canAddImageFiles(UserDomainObject user) {
-        return user.canCreateDocumentOfTypeIdFromParent( DocumentTypeDomainObject.FILE_ID, document );
+        return user.canCreateDocumentOfTypeIdFromParent(DocumentTypeDomainObject.FILE_ID, document);
     }
 
     public boolean isLinkable() {
         return linkable;
     }
 
+    public int getForcedWidth() {
+        return forcedWidth;
+    }
+
+    public void setForcedWidth(int forcedWidth) {
+        this.forcedWidth = forcedWidth;
+    }
+
+    public int getForcedHeight() {
+        return forcedHeight;
+    }
+
+    public void setForcedHeight(int forcedHeight) {
+        this.forcedHeight = forcedHeight;
+    }
+
+    public int getMaxHeight() {
+        return maxHeight;
+    }
+
+    public int getMaxWidth() {
+        return maxWidth;
+    }
+
+    private Resize getResize() {
+        if (maxWidth > 0 || maxHeight > 0) {
+            return Resize.GREATER_THAN;
+        }
+
+        return null;
+    }
+
+    public TextDocumentDomainObject getDocument() {
+        return document;
+    }
+
+    public Integer getImageIndex() {
+        return imageIndex;
+    }
+
+    public String getReturnUrl() {
+        return returnUrl;
+    }
+
+    protected void dispatchOk(HttpServletRequest request,
+                              HttpServletResponse response) throws IOException, ServletException {
+        imageCommand.handle(image);
+        super.dispatchOk(request, response);
+    }
+
     private static class HeadlineWildcardQueryParser implements QueryParser {
         public Query parse(String queryString) {
-            String[] queryStrings = StringUtils.split(queryString);
-            BooleanQuery wildcardsQuery = new BooleanQuery();
-            for ( String queryTerm : queryStrings ) {
-                wildcardsQuery.add(new WildcardQuery(new Term(DocumentIndex.FIELD__META_HEADLINE, "*" + queryTerm
-                                                                                                  + "*")), true, false);
+            final String[] queryStrings = StringUtils.split(queryString);
+            final BooleanQuery.Builder wildcardsQueryBuilder = new BooleanQuery.Builder();
+            for (String queryTerm : queryStrings) {
+                wildcardsQueryBuilder.add(new WildcardQuery(new Term(DocumentIndex.FIELD__META_HEADLINE, "*" + queryTerm
+                        + "*")), Occur.MUST);
             }
-            BooleanQuery booleanQuery = new BooleanQuery();
-            booleanQuery.add(wildcardsQuery, false, false);
+
+            final BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+            booleanQueryBuilder.add(wildcardsQueryBuilder.build(), Occur.SHOULD);
             try {
-                booleanQuery.add(new DefaultQueryParser().parse(queryString), false, false);
-            } catch ( ParseException e ) {
+                booleanQueryBuilder.add(new DefaultQueryParser().parse(queryString), Occur.SHOULD);
+            } catch (ParseException e) {
             }
-            return booleanQuery;
+
+            return booleanQueryBuilder.build();
         }
     }
 
@@ -320,16 +622,16 @@ public String render(DocumentDomainObject document, HttpServletRequest request,
                 fileSize = inputStreamSource.getSize();
                 try {
                     imageSize = ImageSize.fromInputStream(inputStream);
-                } catch ( IOException ignored ) {
+                } catch (IOException ignored) {
                 }
-            } catch ( IOException ioe ) {
+            } catch (IOException ioe) {
                 throw new UnhandledException(ioe);
             }
 
-            List values = Arrays.asList(new Object[] {
-                "imageUrl", "GetDoc?meta_id=" + document.getId(),
-                "imageSize", imageSize,
-                "fileSize", HumanReadable.getHumanReadableByteSize(fileSize).replaceAll(" ", "&nbsp;"),
+            List values = Arrays.asList(new Object[]{
+                    "imageUrl", "GetDoc?meta_id=" + document.getId(),
+                    "imageSize", imageSize,
+                    "fileSize", HumanReadable.getHumanReadableByteSize(fileSize).replaceAll(" ", "&nbsp;"),
             });
             return Imcms.getServices().getAdminTemplate("images/thumbnail.frag", user, values);
         }
@@ -339,10 +641,4 @@ public LocalizedMessage getName() {
         }
     }
 
-    protected void dispatchOk(HttpServletRequest request,
-                              HttpServletResponse response) throws IOException, ServletException {
-        imageCommand.handle(image);
-        super.dispatchOk(request, response);
-    }
-
 }
diff --git a/server/src/com/imcode/imcms/servlet/admin/LinkEditPage.java b/server/src/com/imcode/imcms/servlet/admin/LinkEditPage.java
index 14df29f32c..b8105c62fb 100644
--- a/server/src/com/imcode/imcms/servlet/admin/LinkEditPage.java
+++ b/server/src/com/imcode/imcms/servlet/admin/LinkEditPage.java
@@ -1,11 +1,12 @@
 package com.imcode.imcms.servlet.admin;
 
 import com.imcode.imcms.flow.DispatchCommand;
-import com.imcode.imcms.flow.OkCancelPage;
 import com.imcode.imcms.flow.EditDocumentInformationPageFlow;
-import com.imcode.imcms.servlet.DocumentFinder;
-import com.imcode.imcms.api.Document;
+import com.imcode.imcms.flow.OkCancelPage;
 import com.imcode.imcms.mapping.DocumentMapper;
+import com.imcode.imcms.servlet.DocumentFinder;
+import imcode.server.Imcms;
+import imcode.server.document.DocumentDomainObject;
 import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletException;
@@ -13,13 +14,10 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import imcode.server.document.DocumentDomainObject;
-import imcode.server.Imcms;
-
 public class LinkEditPage extends OkCancelPage {
 
-    private EditLink.Link link;
     private final Handler<EditLink.Link> linkRetrievalCommand;
+    private EditLink.Link link;
     private boolean targetEditable = true;
 
     protected LinkEditPage(DispatchCommand returnCommand, Handler<EditLink.Link> linkRetrievalCommand) {
@@ -49,13 +47,6 @@ public void setTargetEditable(boolean targetEditable) {
         this.targetEditable = targetEditable;
     }
 
-    public enum Parameter {
-        HREF,
-        TITLE,
-        TARGET,
-        SEARCH
-    }
-
     protected void dispatchOther(HttpServletRequest request,
                                  HttpServletResponse response) throws IOException, ServletException {
         if (null != request.getParameter(Parameter.SEARCH.toString())) {
@@ -67,9 +58,17 @@ public void dispatch(HttpServletRequest request,
                                      HttpServletResponse response) throws IOException, ServletException {
                     Integer documentId = documentRetrievalCommand.getDocumentId();
                     if (null != documentId) {
-												DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper() ;
-	                      DocumentDomainObject doc = documentMapper.getDocument(documentId) ;
-                        setLink(new SimpleLink(request.getContextPath()+"/"+doc.getName(), link.getTitle(), link.getTarget()));
+                        DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
+                        DocumentDomainObject doc = documentMapper.getDocument(documentId);
+                        setLink(new SimpleLink(
+                                link.getType(),
+                                request.getContextPath() + "/" + doc.getName(),
+                                link.getTitle(),
+                                link.getTarget(),
+                                link.getCssClass(),
+                                link.getCssStyle(),
+                                link.getOtherParams())
+                        );
                     }
                     forward(request, response);
                 }
@@ -81,30 +80,57 @@ public void dispatch(HttpServletRequest request,
     }
 
     protected void updateFromRequest(HttpServletRequest request) {
-        setLink(getLinkFromRequest(request)) ;
+        setLink(getLinkFromRequest(request));
     }
 
     private EditLink.Link getLinkFromRequest(HttpServletRequest request) {
+        final int type = Integer.parseInt(StringUtils.defaultString(request.getParameter(Parameter.TYPE.toString()), "1"));
         final String href = StringUtils.defaultString(request.getParameter(Parameter.HREF.toString()));
         final String title = StringUtils.defaultString(request.getParameter(Parameter.TITLE.toString()));
         final String target = EditDocumentInformationPageFlow.getTargetFromRequest(request, Parameter.TARGET.toString());
-        return new SimpleLink(href, title, isTargetEditable() ? target : link.getTarget());
+        final String cssClass = StringUtils.defaultString(request.getParameter(Parameter.CLASS.toString()));
+        final String cssStyle = StringUtils.defaultString(request.getParameter(Parameter.STYLE.toString()));
+        final String otherParams = StringUtils.defaultString(request.getParameter(Parameter.OTHER.toString()));
+        return new SimpleLink(type, href, title, isTargetEditable() ? target : link.getTarget(), cssClass, cssStyle, otherParams);
     }
 
     public String getPath(HttpServletRequest request) {
-        return "/WEB-INF/imcms/jsp/edit_link.jsp" ;
+        return "/WEB-INF/imcms/jsp/edit_link.jsp";
+    }
+
+    public enum Parameter {
+        TYPE,
+        HREF,
+        TITLE,
+        TARGET,
+        CLASS,
+        STYLE,
+        OTHER,
+        SEARCH
     }
 
     static class SimpleLink implements EditLink.Link {
 
-        private final String href;
-        private final String title;
-        private final String target;
+        private int type = 1; // type selectBox values from edit_link.jsp
+        private String href;
+        private String title;
+        private String target;
+        private String cssClass = null;
+        private String cssStyle = null;
+        private String otherParams = null;
 
-        public SimpleLink(String href, String title, String target) {
+        public SimpleLink(int type, String href, String title, String target, String cssClass, String cssStyle, String otherParams) {
+            this.type = type;
             this.href = href;
             this.title = title;
             this.target = target;
+            this.cssClass = cssClass;
+            this.cssStyle = cssStyle;
+            this.otherParams = otherParams;
+        }
+
+        public int getType() {
+            return type;
         }
 
         public String getHref() {
@@ -118,6 +144,18 @@ public String getTitle() {
         public String getTarget() {
             return target;
         }
+
+        public String getCssClass() {
+            return (null != cssClass) ? cssClass : "";
+        }
+
+        public String getCssStyle() {
+            return (null != cssStyle) ? cssStyle : "";
+        }
+
+        public String getOtherParams() {
+            return (null != otherParams) ? otherParams : "";
+        }
     }
 
     private static class DocumentIdRetrievalCommand implements Handler<Integer> {
diff --git a/server/src/com/imcode/imcms/servlet/admin/ListDocumentAliasPage.java b/server/src/com/imcode/imcms/servlet/admin/ListDocumentAliasPage.java
index d71f2a8d03..438a945c93 100644
--- a/server/src/com/imcode/imcms/servlet/admin/ListDocumentAliasPage.java
+++ b/server/src/com/imcode/imcms/servlet/admin/ListDocumentAliasPage.java
@@ -1,23 +1,22 @@
 package com.imcode.imcms.servlet.admin;
 
-import com.imcode.imcms.flow.OkCancelPage;
 import com.imcode.imcms.flow.DispatchCommand;
+import com.imcode.imcms.flow.OkCancelPage;
 import com.imcode.imcms.mapping.DocumentMapper;
+import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.List;
-import java.util.Arrays;
-import java.io.IOException;
-
-import imcode.server.ImcmsServices;
-import imcode.server.Imcms;
-import imcode.server.user.UserDomainObject;
-import imcode.util.Utility;
-import org.apache.commons.lang.StringUtils;
 
 public class ListDocumentAliasPage extends OkCancelPage {
 
@@ -26,9 +25,9 @@ public class ListDocumentAliasPage extends OkCancelPage {
     public static final String REQUEST_PARAMETER__LIST_END = "end";
     public static final String REQUEST_PARAMETER__CANCEL_BUTTON = "cancel";
 
-    public String startString ;
-    public String endString ;
-    public Set<String> aliasInSelectedRange = new TreeSet<String>();
+    public String startString;
+    public String endString;
+    public Set<String> aliasInSelectedRange = new TreeSet<>();
 
     public ListDocumentAliasPage(DispatchCommand okDispatchCommand, DispatchCommand cancelDispatchCommand, HttpServletRequest request) {
         super(okDispatchCommand, cancelDispatchCommand);
@@ -36,25 +35,25 @@ public ListDocumentAliasPage(DispatchCommand okDispatchCommand, DispatchCommand
     }
 
     protected void updateFromRequest(HttpServletRequest request) {
-        startString = StringUtils.defaultString(request.getParameter( REQUEST_PARAMETER__LIST_START ), "A");
-        endString = StringUtils.defaultString(request.getParameter( REQUEST_PARAMETER__LIST_END ), "Ö");
+        startString = StringUtils.defaultString(request.getParameter(REQUEST_PARAMETER__LIST_START), "A");
+        endString = StringUtils.defaultString(request.getParameter(REQUEST_PARAMETER__LIST_END), "Ö");
     }
 
     protected void dispatchOther(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         ImcmsServices imcref = Imcms.getServices();
-        DocumentMapper documentMapper = imcref.getDocumentMapper() ;
-        List alphaRange = Arrays.asList(new String[]{"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","Å","Ä","Ö" });
-        if(!alphaRange.contains(startString.toUpperCase())) {
+        DocumentMapper documentMapper = imcref.getDocumentMapper();
+        List alphaRange = Arrays.asList(new String[]{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "Å", "Ä", "Ö"});
+        if (!alphaRange.contains(startString.toUpperCase())) {
             startString = alphaRange.get(0).toString();
         }
         if (alphaRange.indexOf(endString.toUpperCase()) < alphaRange.indexOf(startString.toUpperCase())) {
             endString = startString;
         }
-        if ( request.getParameter( REQUEST_PARAMETER_BUTTON__LIST ) != null ) {
-            List selectedRange = alphaRange.subList(alphaRange.indexOf(startString.toUpperCase()), alphaRange.indexOf(endString.toUpperCase())+1);
+        if (request.getParameter(REQUEST_PARAMETER_BUTTON__LIST) != null) {
+            List selectedRange = alphaRange.subList(alphaRange.indexOf(startString.toUpperCase()), alphaRange.indexOf(endString.toUpperCase()) + 1);
             aliasInSelectedRange.clear();
             for (String alias : documentMapper.getAllDocumentAlias()) {
-                if (alias.length() > 0 && selectedRange.contains(alias.toUpperCase().substring(0,1))) {
+                if (alias.length() > 0 && selectedRange.contains(alias.toUpperCase().substring(0, 1))) {
                     aliasInSelectedRange.add(alias);
                 }
             }
@@ -63,9 +62,9 @@ protected void dispatchOther(HttpServletRequest request, HttpServletResponse res
     }
 
     public String getPath(HttpServletRequest request) {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
         return "/imcms/" + user.getLanguageIso639_2()
-               + "/jsp/document_alias_list.jsp";
+                + "/jsp/document_alias_list.jsp";
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/admin/MenuEditPage.java b/server/src/com/imcode/imcms/servlet/admin/MenuEditPage.java
index ab1420efec..5efd4b2678 100644
--- a/server/src/com/imcode/imcms/servlet/admin/MenuEditPage.java
+++ b/server/src/com/imcode/imcms/servlet/admin/MenuEditPage.java
@@ -12,11 +12,7 @@
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.NoPermissionToCreateDocumentException;
 import imcode.server.document.NoPermissionToEditDocumentException;
-import imcode.server.document.textdocument.MenuDomainObject;
-import imcode.server.document.textdocument.MenuItemDomainObject;
-import imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException;
-import imcode.server.document.textdocument.TextDocumentDomainObject;
-import imcode.server.document.textdocument.TreeSortKeyDomainObject;
+import imcode.server.document.textdocument.*;
 import imcode.server.user.UserDomainObject;
 import imcode.util.*;
 import org.apache.commons.lang.UnhandledException;
@@ -38,62 +34,58 @@ public class MenuEditPage extends OkCancelPage {
     public static final String SELECTED = "selected";
     public static final String DOCUMENT_TYPE_ID = "documentTypeId";
     public static final String CREATE = "create";
-
-    private TextDocumentDomainObject textDocument;
-    private final MenuDomainObject menu;
-    private ServletContext servletContext;
     public static final String COPY = "copy";
     public static final String ARCHIVE = "archive";
     public static final String REMOVE = "remove";
-    private int menuIndex;
     public static final String SORT_ORDER = "sortOrder";
     public static final String SORT = "sort";
+    private final MenuDomainObject menu;
+    private final String returnUrl;
+    private TextDocumentDomainObject textDocument;
+    private ServletContext servletContext;
+    private int menuIndex;
 
     public MenuEditPage(DispatchCommand okDispatchCommand, DispatchCommand cancelDispatchCommand,
-                        TextDocumentDomainObject textDocument, int menuIndex, ServletContext servletContext) {
+                        TextDocumentDomainObject textDocument, int menuIndex, ServletContext servletContext, String returnUrl) {
         super(okDispatchCommand, cancelDispatchCommand);
         this.textDocument = textDocument;
         this.menuIndex = menuIndex;
+        this.returnUrl = returnUrl;
         menu = textDocument.getMenu(menuIndex);
         this.servletContext = servletContext;
     }
 
     protected void dispatchOther(HttpServletRequest request,
                                  HttpServletResponse response) throws IOException, ServletException {
-        if ( null != request.getParameter(CREATE) ) {
+
+        if (null != request.getParameter(CREATE)) {
             int documentTypeId = Integer.parseInt(request.getParameter(DOCUMENT_TYPE_ID));
-            if ( 0 == documentTypeId ) {
-                addExistingDocPage( textDocument.getId(), menuIndex, request, response );
+            if (0 == documentTypeId) {
+                addExistingDocPage(textDocument.getId(), menuIndex, request, response);
             } else {
-                DocumentCreator documentCreator = new DocumentCreator(new SaveNewDocumentAndAddToMenuCommand(textDocument, menuIndex), new DispatchCommand() {
-                        public void dispatch(HttpServletRequest request,
-                                             HttpServletResponse response) throws IOException, ServletException {
-                            forward(request, response);
-                        }
-                    }, servletContext);
-                    try {
-                        documentCreator.createDocumentAndDispatchToCreatePageFlow(documentTypeId, textDocument, request, response);
-                        return;
-                    } catch ( NoPermissionToCreateDocumentException e ) {
-                        throw new UnhandledException(e);
-                    }
+                DocumentCreator documentCreator = new DocumentCreator(new SaveNewDocumentAndAddToMenuCommand(textDocument, menuIndex), (DispatchCommand) this::forward, servletContext);
+                try {
+                    documentCreator.createDocumentAndDispatchToCreatePageFlow(documentTypeId, textDocument, request, response);
+                } catch (NoPermissionToCreateDocumentException e) {
+                    throw new UnhandledException(e);
+                }
             }
+        } else {
+            forward(request, response);
         }
-
-        forward(request, response);
     }
 
     protected void updateFromRequest(HttpServletRequest request) {
         MenuItemDomainObject[] menuItems = menu.getMenuItems();
-        for ( MenuItemDomainObject menuItem : menuItems ) {
+        for (MenuItemDomainObject menuItem : menuItems) {
             String newSortKey = request.getParameter(SORT_KEY + menuItem.getDocument().getId());
             if (null != newSortKey) {
-                if ( MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED == menu.getSortOrder() ) {
+                if (MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED == menu.getSortOrder()) {
                     try {
                         menuItem.setSortKey(new Integer(newSortKey));
-                    } catch ( NumberFormatException ignored ) {
+                    } catch (NumberFormatException ignored) {
                     }
-                } else if ( MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER == menu.getSortOrder() ) {
+                } else if (MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER == menu.getSortOrder()) {
                     menuItem.setTreeSortKey(new TreeSortKeyDomainObject(newSortKey));
                 }
             }
@@ -103,32 +95,32 @@ protected void updateFromRequest(HttpServletRequest request) {
             String[] selectedChildrenIds = request.getParameterValues(SELECTED);
             DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
             UserDomainObject user = Utility.getLoggedOnUser(request);
-            if ( request.getParameter(SORT) != null ) {
+            if (request.getParameter(SORT) != null) {
                 int sortOrder = Integer.parseInt(request.getParameter(SORT_ORDER));
-                if ( menu.getSortOrder() != sortOrder ) {
+                if (menu.getSortOrder() != sortOrder) {
                     menu.setSortOrder(sortOrder);
                 }
-            } else if ( request.getParameter(REMOVE) != null ) {
-                if ( selectedChildrenIds != null ) {
-                    for ( String selectedChildrenId : selectedChildrenIds ) {
+            } else if (request.getParameter(REMOVE) != null) {
+                if (selectedChildrenIds != null) {
+                    for (String selectedChildrenId : selectedChildrenIds) {
                         int childId = Integer.parseInt(selectedChildrenId);
                         menu.removeMenuItemByDocumentId(childId);
                     }
                 }
-            } else if ( request.getParameter(ARCHIVE) != null ) {
-                if ( selectedChildrenIds != null ) {
+            } else if (request.getParameter(ARCHIVE) != null) {
+                if (selectedChildrenIds != null) {
                     Date now = new Date();
-                    for ( String selectedChildrenId : selectedChildrenIds ) {
+                    for (String selectedChildrenId : selectedChildrenIds) {
                         int childId = Integer.parseInt(selectedChildrenId);
                         DocumentDomainObject child = documentMapper.getDocument(childId);
                         child.setArchivedDatetime(now);
                         documentMapper.saveDocument(child, user);
                     }
                 }
-            } else if ( request.getParameter(COPY) != null ) {
-                if ( selectedChildrenIds != null ) {
+            } else if (request.getParameter(COPY) != null) {
+                if (selectedChildrenIds != null) {
 
-                    for ( String selectedChildIdStr : selectedChildrenIds ) {
+                    for (String selectedChildIdStr : selectedChildrenIds) {
                         int selectedChildId = Integer.parseInt(selectedChildIdStr);
                         DocumentDomainObject selectedChild = documentMapper.getDocument(selectedChildId);
                         documentMapper.copyDocument(selectedChild, user);
@@ -136,12 +128,12 @@ protected void updateFromRequest(HttpServletRequest request) {
                     }
                 }
             }
-            if ( null == request.getParameter(CREATE) ) {
+            if (null == request.getParameter(CREATE)) {
                 documentMapper.saveDocument(textDocument, user);
             }
-        } catch ( NoPermissionToEditDocumentException e ) {
+        } catch (NoPermissionToEditDocumentException e) {
             throw new ShouldHaveCheckedPermissionsEarlierException(e);
-        } catch ( NoPermissionToAddDocumentToMenuException e ) {
+        } catch (NoPermissionToAddDocumentToMenuException e) {
             throw new ConcurrentDocumentModificationException(e);
         } catch (DocumentSaveException e) {
             throw new ShouldNotBeThrownException(e);
@@ -161,70 +153,71 @@ public String getPath(HttpServletRequest request) {
         UserDomainObject user = Utility.getLoggedOnUser(request);
         return "/imcms/" + user.getLanguageIso639_2() + "/jsp/change_menu.jsp";
     }
-    private void addExistingDocPage( int meta_id, int doc_menu_no,
-                                     HttpServletRequest request, HttpServletResponse response ) throws IOException {
+
+    private void addExistingDocPage(int meta_id, int doc_menu_no,
+                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         Utility.setDefaultHtmlContentType(response);
 
         List vec = new ArrayList();
-        vec.add( "#meta_id#" );
-        vec.add( "" + meta_id );
-        vec.add( "#doc_menu_no#" );
-        vec.add( "" + doc_menu_no );
-        vec.add( "#page#" );
-        vec.add( getSessionAttributeName() ) ;
+        vec.add("#meta_id#");
+        vec.add("" + meta_id);
+        vec.add("#doc_menu_no#");
+        vec.add("" + doc_menu_no);
+        vec.add("#page#");
+        vec.add(getSessionAttributeName());
 
         // Lets get todays date
-        SimpleDateFormat formatter = new SimpleDateFormat( DateConstants.DATE_FORMAT_STRING );
+        SimpleDateFormat formatter = new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING);
         Date toDay = new Date();
-        vec.add( "#start_date#" );
-        vec.add( "" );
-        vec.add( "#end_date#" );
-        vec.add( formatter.format( toDay ) );
+        vec.add("#start_date#");
+        vec.add("");
+        vec.add("#end_date#");
+        vec.add(formatter.format(toDay));
 
-        vec.add( "#searchstring#" );
-        vec.add( "" );
+        vec.add("#searchstring#");
+        vec.add("");
 
-        vec.add( "#searchResults#" );
-        vec.add( "" );
+        vec.add("#searchResults#");
+        vec.add("");
 
         ImcmsServices imcref = Imcms.getServices();
 
-        final UserDomainObject user = Utility.getLoggedOnUser( request );
-        String sortOrderStr = Html.createOptionList( GetExistingDoc.SORT_ORDERS_MAP.entrySet(), new ToStringPairTransformer() {
+        final UserDomainObject user = Utility.getLoggedOnUser(request);
+        String sortOrderStr = Html.createOptionList(GetExistingDoc.SORT_ORDERS_MAP.entrySet(), new ToStringPairTransformer() {
             public String[] transformToStringPair(Object input) {
-                Map.Entry entry = (Map.Entry)input ;
-                return new String[] {(String)entry.getKey(), ((LocalizedMessage)entry.getValue()).toLocalizedString( user )} ;
+                Map.Entry entry = (Map.Entry) input;
+                return new String[]{(String) entry.getKey(), ((LocalizedMessage) entry.getValue()).toLocalizedString(user)};
             }
         });
-        vec.add( "#sortBy#" );
-        vec.add( sortOrderStr );
+        vec.add("#sortBy#");
+        vec.add(sortOrderStr);
 
         // Lets set all the the documenttypes as selected in the html file
-        String[][] allDocTypesArray = imcref.getAllDocumentTypes( user.getLanguageIso639_2() );
-        for ( int i = 0; i < allDocTypesArray.length; ++i ) {
-            vec.add( "#checked_" + allDocTypesArray[i][0] + "#" );
-            vec.add( "checked" );
+        String[][] allDocTypesArray = imcref.getAllDocumentTypes(user.getLanguageIso639_2());
+        for (int i = 0; i < allDocTypesArray.length; ++i) {
+            vec.add("#checked_" + allDocTypesArray[i][0] + "#");
+            vec.add("checked");
         }
 
         // Lets set the create/ change types as selected in the html file
         String[] allPossibleIncludeDocsValues = {"created", "changed"};
-        for ( int i = 0; i < allPossibleIncludeDocsValues.length; i++ ) {
-            vec.add( "#include_check_" + allPossibleIncludeDocsValues[i] + "#" );
-            vec.add( "checked" );
+        for (int i = 0; i < allPossibleIncludeDocsValues.length; i++) {
+            vec.add("#include_check_" + allPossibleIncludeDocsValues[i] + "#");
+            vec.add("checked");
         }
 
         // Lets set the and / or search preposition
         String[] allPossibleSearchPreps = {"and", "or"};
-        for ( int i = 0; i < allPossibleSearchPreps.length; i++ ) {
-            vec.add( "#search_prep_check_" + allPossibleSearchPreps[i] + "#" );
-            if ( i == 0 ) {
-                vec.add( "checked" );
+        for (int i = 0; i < allPossibleSearchPreps.length; i++) {
+            vec.add("#search_prep_check_" + allPossibleSearchPreps[i] + "#");
+            if (i == 0) {
+                vec.add("checked");
             } else {
-                vec.add( "" );
+                vec.add("");
             }
         }
         // Lets parse the html page which consists of the add an existing doc
-        response.getWriter().write( imcref.getAdminTemplate( "existing_doc.html", user, vec ) );
+        response.getWriter().write(imcref.getAdminTemplate("existing_doc.html", user, vec));
     }
 
     public void save(UserDomainObject user) throws DocumentSaveException {
@@ -232,28 +225,32 @@ public void save(UserDomainObject user) throws DocumentSaveException {
         documentMapper.saveDocument(textDocument, user);
     }
 
+    public String getReturnUrl() {
+        return returnUrl;
+    }
+
     public static class SaveNewDocumentAndAddToMenuCommand implements CreateDocumentPageFlow.SaveDocumentCommand {
 
         private TextDocumentDomainObject parentDocument;
         private Integer parentMenuIndex;
         private DocumentDomainObject savedDocument;
 
-        SaveNewDocumentAndAddToMenuCommand( TextDocumentDomainObject parentDocument, Integer parentMenuIndex ) {
+        SaveNewDocumentAndAddToMenuCommand(TextDocumentDomainObject parentDocument, Integer parentMenuIndex) {
             this.parentDocument = parentDocument;
             this.parentMenuIndex = parentMenuIndex;
         }
 
-        public synchronized void saveDocument( DocumentDomainObject document, UserDomainObject user ) throws NoPermissionToEditDocumentException, NoPermissionToAddDocumentToMenuException, DocumentSaveException {
-            if ( null != savedDocument ) {
+        public synchronized void saveDocument(DocumentDomainObject document, UserDomainObject user) throws NoPermissionToEditDocumentException, NoPermissionToAddDocumentToMenuException, DocumentSaveException {
+            if (null != savedDocument) {
                 return;
             }
             final DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-            documentMapper.saveNewDocument( document, user, false);
-            savedDocument = document ;
-            if ( null == parentMenuIndex ) {
+            documentMapper.saveNewDocument(document, user, false);
+            savedDocument = document;
+            if (null == parentMenuIndex) {
                 return;
             }
-            MenuDomainObject menu = parentDocument.getMenu(parentMenuIndex.intValue());
+            MenuDomainObject menu = parentDocument.getMenu(parentMenuIndex);
             menu.addMenuItem(new MenuItemDomainObject(documentMapper.getDocumentReference(document)));
             documentMapper.saveDocument(parentDocument, user);
         }
diff --git a/server/src/com/imcode/imcms/servlet/admin/PageDispatcher.java b/server/src/com/imcode/imcms/servlet/admin/PageDispatcher.java
index 2e7310fd5d..cb2c178ada 100644
--- a/server/src/com/imcode/imcms/servlet/admin/PageDispatcher.java
+++ b/server/src/com/imcode/imcms/servlet/admin/PageDispatcher.java
@@ -1,9 +1,11 @@
 package com.imcode.imcms.servlet.admin;
 
 import com.imcode.imcms.flow.Page;
-import imcode.server.Imcms;
 import com.imcode.util.MultipartHttpServletRequest;
+import imcode.server.Imcms;
+import imcode.server.ImcmsConstants;
 import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -13,19 +15,27 @@
 
 public class PageDispatcher extends HttpServlet {
 
-    public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        doPost( request, response );
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doPost(request, response);
     }
 
-    public void doPost( HttpServletRequest r, HttpServletResponse response ) throws ServletException, IOException {
-        r.setCharacterEncoding( Imcms.DEFAULT_ENCODING );
-        MultipartHttpServletRequest request = new MultipartHttpServletRequest( r );
+    public void doPost(HttpServletRequest r, HttpServletResponse response) throws ServletException, IOException {
+        r.setCharacterEncoding(Imcms.DEFAULT_ENCODING);
+        MultipartHttpServletRequest request = new MultipartHttpServletRequest(r);
+
+        Page page = Page.fromRequest(request);
+        if (null != page) {
+            page.dispatch(request, response);
+            return;
+        }
+
+        final String returnUrl = StringUtils.defaultString(request.getParameter(ImcmsConstants.REQUEST_PARAM__RETURN_URL));
+
+        if (returnUrl.isEmpty()) {
+            Utility.redirectToStartDocument(request, response);
 
-        Page page = Page.fromRequest(request) ;
-        if ( null != page ) {
-            page.dispatch( request, response );
         } else {
-            Utility.redirectToStartDocument( request, response );
+            response.sendRedirect(returnUrl);
         }
     }
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/servlet/admin/SaveInPage.java b/server/src/com/imcode/imcms/servlet/admin/SaveInPage.java
index 3faac0ea5d..40d1877289 100644
--- a/server/src/com/imcode/imcms/servlet/admin/SaveInPage.java
+++ b/server/src/com/imcode/imcms/servlet/admin/SaveInPage.java
@@ -10,8 +10,8 @@
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.ShouldHaveCheckedPermissionsEarlierException;
-import imcode.util.Utility;
 import imcode.util.ShouldNotBeThrownException;
+import imcode.util.Utility;
 import org.apache.commons.lang.UnhandledException;
 
 import javax.servlet.ServletException;
@@ -32,75 +32,76 @@ public class SaveInPage extends HttpServlet {
     /**
      * doPost()
      */
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         ImcmsServices services = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
         DocumentMapper documentMapper = services.getDocumentMapper();
 
-        int documentId = Integer.parseInt( req.getParameter( "meta_id" ) );
-        TextDocumentDomainObject textDocument = (TextDocumentDomainObject)documentMapper.getDocument( documentId );
+        int documentId = Integer.parseInt(req.getParameter("meta_id"));
+        TextDocumentDomainObject textDocument = (TextDocumentDomainObject) documentMapper.getDocument(documentId);
 
         TemplateMapper templateMapper = services.getTemplateMapper();
 
-        TemplateDomainObject requestedTemplate = getRequestedTemplate( req, templateMapper );
+        TemplateDomainObject requestedTemplate = getRequestedTemplate(req, templateMapper);
 
-        TemplateGroupDomainObject requestedTemplateGroup = getRequestedTemplateGroup( req, templateMapper );
+        TemplateGroupDomainObject requestedTemplateGroup = getRequestedTemplateGroup(req, templateMapper);
 
-        TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor( textDocument );
+        TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(textDocument);
         Set allowedTemplateGroupIds = textDocumentPermissionSet.getAllowedTemplateGroupIds();
 
         // Check if user has write rights
-        if ( !textDocumentPermissionSet.getEditTemplates()
-             || null != requestedTemplateGroup && !allowedTemplateGroupIds.contains(new Integer(requestedTemplateGroup.getId()))) {
+        if (!textDocumentPermissionSet.getEditTemplates()
+                || null != requestedTemplateGroup && !allowedTemplateGroupIds.contains(requestedTemplateGroup.getId()))
+        {
             errorNoPermission(documentId, user, req, res);
             return;
         }
 
-        if ( req.getParameter( "update" ) != null ) {
+        if (req.getParameter("update") != null) {
             Writer out = res.getWriter();
 
-            req.getSession().setAttribute( "flags", new Integer( 0 ) );
+            req.getSession().setAttribute("flags", 0);
 
-            if ( requestedTemplate == null ) {
+            if (requestedTemplate == null) {
                 errorNoTemplateSelected(documentId, services, user, out);
                 return;
             } else if (!templateMapper.templateGroupContains(requestedTemplateGroup, requestedTemplate)) {
                 errorNoPermission(documentId, user, req, res);
-                return ;
+                return;
             }
 
             // save textdoc
-            textDocument.setTemplateName( requestedTemplate.getName() );
-            if ( null != requestedTemplateGroup ) {
-                textDocument.setTemplateGroupId( requestedTemplateGroup.getId() );
+            textDocument.setTemplateName(requestedTemplate.getName());
+            if (null != requestedTemplateGroup) {
+                textDocument.setTemplateGroupId(requestedTemplateGroup.getId());
             }
             try {
-                documentMapper.saveDocument( textDocument, user );
-                services.updateMainLog( "Text docs  [" + textDocument.getId() + "] updated by user: [" + user.getFullName()
-                                        + "]" );
-            } catch ( MaxCategoryDomainObjectsOfTypeExceededException e ) {
+                documentMapper.saveDocument(textDocument, user);
+                services.updateMainLog("Text docs  [" + textDocument.getId() + "] updated by user: [" + user.getFullName()
+                        + "]");
+            } catch (MaxCategoryDomainObjectsOfTypeExceededException e) {
                 throw new UnhandledException(e);
-            } catch ( NoPermissionToEditDocumentException e ) {
+            } catch (NoPermissionToEditDocumentException e) {
                 throw new ShouldHaveCheckedPermissionsEarlierException(e);
-            } catch ( NoPermissionToAddDocumentToMenuException e ) {
+            } catch (NoPermissionToAddDocumentToMenuException e) {
                 throw new ConcurrentDocumentModificationException(e);
             } catch (DocumentSaveException e) {
                 throw new ShouldNotBeThrownException(e);
             }
 
-            Utility.setDefaultHtmlContentType( res );
-            AdminDoc.adminDoc( documentId, user, req, res, getServletContext() );
+            Utility.setDefaultHtmlContentType(res);
+            AdminDoc.adminDoc(documentId, user, req, res, getServletContext());
 
-        } else if ( req.getParameter( "change_group" ) != null ) {
-            Utility.setDefaultHtmlContentType( res );
+        } else if (req.getParameter("change_group") != null) {
+            Utility.setDefaultHtmlContentType(res);
 
-            req.getSession().setAttribute( "flags", new Integer( ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEMPLATE ) );
+            req.getSession().setAttribute("flags", ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEMPLATE);
 
-            if ( null != requestedTemplateGroup ) {
-                user.setTemplateGroup( requestedTemplateGroup );
+            if (null != requestedTemplateGroup) {
+                user.setTemplateGroup(requestedTemplateGroup);
             }
 
-            AdminDoc.adminDoc( documentId, user, req, res, getServletContext() );
+            AdminDoc.adminDoc(documentId, user, req, res, getServletContext());
 
         }
     }
@@ -108,32 +109,32 @@ public void doPost( HttpServletRequest req, HttpServletResponse res ) throws Ser
     private void errorNoPermission(int documentId, UserDomainObject user, HttpServletRequest req,
                                    HttpServletResponse res
     ) throws IOException, ServletException {
-        Utility.setDefaultHtmlContentType( res );
+        Utility.setDefaultHtmlContentType(res);
 
-        AdminDoc.adminDoc( documentId, user, req, res, getServletContext() );
+        AdminDoc.adminDoc(documentId, user, req, res, getServletContext());
     }
 
     private void errorNoTemplateSelected(int documentId, ImcmsServices services, UserDomainObject user,
                                          Writer out) throws IOException {
         List vec = new ArrayList();
-        vec.add( "#meta_id#" );
-        vec.add( String.valueOf( documentId ) );
-        String htmlStr = services.getAdminTemplate( "inPage_admin_no_template.html", user, vec );
-        out.write( htmlStr );
+        vec.add("#meta_id#");
+        vec.add(String.valueOf(documentId));
+        String htmlStr = services.getAdminTemplate("inPage_admin_no_template.html", user, vec);
+        out.write(htmlStr);
     }
 
-    private TemplateGroupDomainObject getRequestedTemplateGroup( HttpServletRequest req, TemplateMapper templateMapper ) {
+    private TemplateGroupDomainObject getRequestedTemplateGroup(HttpServletRequest req, TemplateMapper templateMapper) {
         try {
-            return templateMapper.getTemplateGroupById( Integer.parseInt( req.getParameter( "group" ) ) );
-        } catch ( NumberFormatException nfe ) {
+            return templateMapper.getTemplateGroupById(Integer.parseInt(req.getParameter("group")));
+        } catch (NumberFormatException nfe) {
             return null;
         }
     }
 
-    private TemplateDomainObject getRequestedTemplate( HttpServletRequest req, TemplateMapper templateMapper ) {
+    private TemplateDomainObject getRequestedTemplate(HttpServletRequest req, TemplateMapper templateMapper) {
         try {
-            return templateMapper.getTemplateByName( req.getParameter( "template" ) );
-        } catch ( NumberFormatException nfe ) {
+            return templateMapper.getTemplateByName(req.getParameter("template"));
+        } catch (NumberFormatException nfe) {
             return null;
         }
     }
diff --git a/server/src/com/imcode/imcms/servlet/admin/SaveInclude.java b/server/src/com/imcode/imcms/servlet/admin/SaveInclude.java
index d640b3c978..c0dcf4d6d9 100644
--- a/server/src/com/imcode/imcms/servlet/admin/SaveInclude.java
+++ b/server/src/com/imcode/imcms/servlet/admin/SaveInclude.java
@@ -4,17 +4,13 @@
 import com.imcode.imcms.mapping.DocumentSaveException;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
-import imcode.server.document.ConcurrentDocumentModificationException;
-import imcode.server.document.DocumentDomainObject;
-import imcode.server.document.DocumentTypeDomainObject;
-import imcode.server.document.NoPermissionToEditDocumentException;
-import imcode.server.document.TextDocumentPermissionSetDomainObject;
+import imcode.server.document.*;
 import imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.ShouldHaveCheckedPermissionsEarlierException;
-import imcode.util.Utility;
 import imcode.util.ShouldNotBeThrownException;
+import imcode.util.Utility;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -30,23 +26,23 @@
 
 public class SaveInclude extends HttpServlet {
 
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         ImcmsServices imcref = Imcms.getServices();
 
-        Utility.setDefaultHtmlContentType( res );
+        Utility.setDefaultHtmlContentType(res);
 
         Writer out = res.getWriter();
 
-        String meta_id_str = req.getParameter( "meta_id" );
-        int meta_id = Integer.parseInt( meta_id_str );
+        String meta_id_str = req.getParameter("meta_id");
+        int meta_id = Integer.parseInt(meta_id_str);
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
         DocumentMapper documentMapper = imcref.getDocumentMapper();
-        TextDocumentDomainObject document = (TextDocumentDomainObject)documentMapper.getDocument( meta_id );
+        TextDocumentDomainObject document = (TextDocumentDomainObject) documentMapper.getDocument(meta_id);
 
-        TextDocumentPermissionSetDomainObject permissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor( document );
-        if ( !permissionSet.getEditIncludes() ) {	// Checking to see if user may edit this
-            sendPermissionDenied( imcref, out, meta_id, user );
+        TextDocumentPermissionSetDomainObject permissionSet = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(document);
+        if (!permissionSet.getEditIncludes()) {    // Checking to see if user may edit this
+            sendPermissionDenied(imcref, out, meta_id, user);
             return;
         }
 
@@ -54,45 +50,45 @@ public void doPost( HttpServletRequest req, HttpServletResponse res ) throws Ser
             String included_meta_id = req.getParameter("include_meta_id");
             String include_id = req.getParameter("include_id");
 
-            if ( included_meta_id != null && include_id != null ) {
+            if (included_meta_id != null && include_id != null) {
                 included_meta_id = included_meta_id.trim();
                 include_id = include_id.trim();
-                DateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss.SSS " );
-                if ( "".equals(included_meta_id) ) {
+                DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS ");
+                if ("".equals(included_meta_id)) {
                     document.removeInclude(Integer.parseInt(include_id));
                     documentMapper.saveDocument(document, user);
                     imcref.updateMainLog(dateFormat.format(new Date()) + "Include nr [" + include_id + "] on ["
-                                         + meta_id_str
-                                         + "] removed by user: ["
-                                         + user.getFullName()
-                                         + "]");
+                            + meta_id_str
+                            + "] removed by user: ["
+                            + user.getFullName()
+                            + "]");
                 } else {
                     try {
                         int included_meta_id_int = Integer.parseInt(included_meta_id);
                         DocumentDomainObject includedDocument = documentMapper.getDocument(included_meta_id_int);
 
-                        if ( null == includedDocument || !DocumentTypeDomainObject.TEXT.equals(includedDocument.getDocumentType()) ) {
+                        if (null == includedDocument || !DocumentTypeDomainObject.TEXT.equals(includedDocument.getDocumentType())) {
                             sendBadId(imcref, out, meta_id, user);
                             return;
                         }
 
                         // Make sure the user has permission to share the included document
-                        if ( user.canAddDocumentToAnyMenu(includedDocument) ) {
+                        if (user.canAddDocumentToAnyMenu(includedDocument)) {
                             document.setInclude(Integer.parseInt(include_id), includedDocument.getId());
                             documentMapper.saveDocument(document, user);
                             imcref.updateMainLog(dateFormat.format(new Date()) + "Include nr [" + include_id
-                                                 + "] on ["
-                                                 + meta_id_str
-                                                 + "] changed to ["
-                                                 + included_meta_id
-                                                 + "]  by user: ["
-                                                 + user.getFullName()
-                                                 + "]");
+                                    + "] on ["
+                                    + meta_id_str
+                                    + "] changed to ["
+                                    + included_meta_id
+                                    + "]  by user: ["
+                                    + user.getFullName()
+                                    + "]");
                         } else {
                             sendPermissionDenied(imcref, out, meta_id, user);
                             return;
                         }
-                    } catch ( NumberFormatException ignored ) {
+                    } catch (NumberFormatException ignored) {
                         sendBadId(imcref, out, meta_id, user);
                         return;
                     }
@@ -100,29 +96,29 @@ public void doPost( HttpServletRequest req, HttpServletResponse res ) throws Ser
             }
 
             AdminDoc.adminDoc(meta_id, user, req, res, getServletContext());
-        } catch ( NoPermissionToEditDocumentException e ) {
+        } catch (NoPermissionToEditDocumentException e) {
             throw new ShouldHaveCheckedPermissionsEarlierException(e);
-        } catch ( NoPermissionToAddDocumentToMenuException e ) {
+        } catch (NoPermissionToAddDocumentToMenuException e) {
             throw new ConcurrentDocumentModificationException(e);
         } catch (DocumentSaveException e) {
             throw new ShouldNotBeThrownException(e);
         }
     }
 
-    private void sendPermissionDenied( ImcmsServices imcref, Writer out, int meta_id, UserDomainObject user ) throws IOException {
-        List vec = new ArrayList( 2 );
-        vec.add( "#meta_id#" );
-        vec.add( String.valueOf( meta_id ) );
-        String htmlStr = imcref.getAdminTemplate( "include_permission_denied.html", user, vec );
-        out.write( htmlStr );
+    private void sendPermissionDenied(ImcmsServices imcref, Writer out, int meta_id, UserDomainObject user) throws IOException {
+        List vec = new ArrayList(2);
+        vec.add("#meta_id#");
+        vec.add(String.valueOf(meta_id));
+        String htmlStr = imcref.getAdminTemplate("include_permission_denied.html", user, vec);
+        out.write(htmlStr);
     }
 
-    private void sendBadId( ImcmsServices imcref, Writer out, int meta_id, UserDomainObject user ) throws IOException {
-        List vec = new ArrayList( 2 );
-        vec.add( "#meta_id#" );
-        vec.add( String.valueOf( meta_id ) );
-        String htmlStr = imcref.getAdminTemplate( "include_bad_id.html", user, vec );
-        out.write( htmlStr );
+    private void sendBadId(ImcmsServices imcref, Writer out, int meta_id, UserDomainObject user) throws IOException {
+        List vec = new ArrayList(2);
+        vec.add("#meta_id#");
+        vec.add(String.valueOf(meta_id));
+        String htmlStr = imcref.getAdminTemplate("include_bad_id.html", user, vec);
+        out.write(htmlStr);
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/admin/SaveText.java b/server/src/com/imcode/imcms/servlet/admin/SaveText.java
index da63910536..a9a5737350 100644
--- a/server/src/com/imcode/imcms/servlet/admin/SaveText.java
+++ b/server/src/com/imcode/imcms/servlet/admin/SaveText.java
@@ -3,6 +3,7 @@
 import com.imcode.imcms.mapping.DocumentMapper;
 import com.imcode.imcms.mapping.DocumentSaveException;
 import imcode.server.Imcms;
+import imcode.server.ImcmsConstants;
 import imcode.server.ImcmsServices;
 import imcode.server.document.ConcurrentDocumentModificationException;
 import imcode.server.document.NoPermissionToEditDocumentException;
@@ -12,71 +13,111 @@
 import imcode.server.document.textdocument.TextDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.ShouldHaveCheckedPermissionsEarlierException;
-import imcode.util.Utility;
 import imcode.util.ShouldNotBeThrownException;
+import imcode.util.Utility;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 
 public final class SaveText extends HttpServlet {
 
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws IOException {
-        req.setCharacterEncoding( Imcms.DEFAULT_ENCODING );
-        Utility.setDefaultHtmlContentType( res );
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException {
+        req.setCharacterEncoding(Imcms.DEFAULT_ENCODING);
+        Utility.setDefaultHtmlContentType(res);
 
         // Check if user has permission to be here
         ImcmsServices imcref = Imcms.getServices();
-        int meta_id = Integer.parseInt( req.getParameter( "meta_id" ) );
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        int meta_id = Integer.parseInt(req.getParameter("meta_id"));
+        UserDomainObject user = Utility.getLoggedOnUser(req);
         DocumentMapper documentMapper = imcref.getDocumentMapper();
-        TextDocumentDomainObject document = (TextDocumentDomainObject)documentMapper.getDocument( meta_id );
+        TextDocumentDomainObject document = (TextDocumentDomainObject) documentMapper.getDocument(meta_id);
 
-        TextDocumentPermissionSetDomainObject permissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor( document );
+        TextDocumentPermissionSetDomainObject permissionSet = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(document);
+        String returnURL = req.getParameter(ImcmsConstants.REQUEST_PARAM__RETURN_URL);
 
-        if ( permissionSet.getEditTexts()
-             && req.getParameter( "cancel" ) == null ) {
+        if (permissionSet.getEditTexts()
+                && req.getParameter("cancel") == null)
+        {
             // get text_no
-            int txt_no = Integer.parseInt( req.getParameter( "txt_no" ) );
+            int txt_no = Integer.parseInt(req.getParameter("txt_no"));
 
             // get textdocument
-            String text_string = req.getParameter( "text" );
+            String text_string = req.getParameter("text");
+            text_string = text_string
+                    .replace(StringEscapeUtils.escapeHtml("<?imcms:contextpath?>"), "<?imcms:contextpath?>")
+                    .replace(URLEncoder.encode("<?imcms:contextpath?>", Imcms.ISO_8859_1_ENCODING), "<?imcms:contextpath?>")
+                    .replace(URLEncoder.encode("<?imcms:contextpath?>", Imcms.UTF_8_ENCODING), "<?imcms:contextpath?>")
+                    .replace("%3C?imcms:contextpath?%3E", "<?imcms:contextpath?>");
+
+            int text_format = Integer.parseInt(req.getParameter("format_type"));
+
+            TextDomainObject text = new TextDomainObject(text_string, text_format);
+
+            saveText(documentMapper, text, document, txt_no, imcref, meta_id, user);
+
+            String label = StringUtils.defaultString(req.getParameter("label"));
+            String[] formats = req.getParameterValues("format");
+            String rows = StringUtils.defaultString(req.getParameter("rows"));
+            String width = StringUtils.defaultString(req.getParameter("width"));
 
-            int text_format = Integer.parseInt( req.getParameter( "format_type" ) );
+            String redirPath = "ChangeText?meta_id=" + meta_id + "&txt=" + txt_no;
 
-            TextDomainObject text = new TextDomainObject( text_string, text_format );
+            if (!"".equals(label)) {
+                redirPath += "&label=" + URLEncoder.encode(label, Imcms.UTF_8_ENCODING);
+            }
+            if (null != formats && formats.length > 0) {
+                for (String format : formats) {
+                    redirPath += "&format=" + URLEncoder.encode(format, Imcms.UTF_8_ENCODING);
+                }
+            }
+            if (!"".equals(rows)) {
+                redirPath += "&rows=" + URLEncoder.encode(rows, Imcms.UTF_8_ENCODING);
+            }
+            if (!"".equals(width)) {
+                redirPath += "&width=" + URLEncoder.encode(width, Imcms.UTF_8_ENCODING);
+            }
 
-            saveText( documentMapper, text, document, txt_no, imcref, meta_id, user );
+            if (returnURL != null) {
+                redirPath += "&" + ImcmsConstants.REQUEST_PARAM__RETURN_URL + "=" + returnURL;
+            }
 
-            if (null != req.getParameter( "save" )) {
-                res.sendRedirect( "ChangeText?meta_id="+meta_id+"&txt="+txt_no );
-                return ;
+            if (null != req.getParameter("save")) {
+                res.sendRedirect(redirPath);
+                return;
             }
         }
 
-        res.sendRedirect( "AdminDoc?meta_id=" + meta_id + "&flags="
-                          + imcode.server.ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEXTS );
+        if (returnURL != null) {
+            res.sendRedirect(returnURL);
+        } else {
+            res.sendRedirect("AdminDoc?meta_id=" + meta_id + "&flags="
+                    + imcode.server.ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEXTS);
+        }
 
     }
 
     private void saveText(DocumentMapper documentMapper, TextDomainObject text, TextDocumentDomainObject document,
                           int txt_no, ImcmsServices imcref, int meta_id,
                           UserDomainObject user) {
-        document.setText( txt_no, text );
+        document.setText(txt_no, text);
         document.addModifiedTextIndex(txt_no, true);
 
         try {
-            documentMapper.saveDocument( document, user );
-        } catch ( NoPermissionToEditDocumentException e ) {
+            documentMapper.saveDocument(document, user);
+        } catch (NoPermissionToEditDocumentException e) {
             throw new ShouldHaveCheckedPermissionsEarlierException(e);
-        } catch ( NoPermissionToAddDocumentToMenuException e ) {
+        } catch (NoPermissionToAddDocumentToMenuException e) {
             throw new ConcurrentDocumentModificationException(e);
         } catch (DocumentSaveException e) {
             throw new ShouldNotBeThrownException(e);
         }
 
-        imcref.updateMainLog( "Text " + txt_no + " in [" + meta_id + "] modified by user: [" + user.getFullName()
-                              + "]" );
+        imcref.updateMainLog("Text " + txt_no + " in [" + meta_id + "] modified by user: [" + user.getFullName()
+                + "]");
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/admin/UserBrowser.java b/server/src/com/imcode/imcms/servlet/admin/UserBrowser.java
index da22fd8857..f36f33c539 100644
--- a/server/src/com/imcode/imcms/servlet/admin/UserBrowser.java
+++ b/server/src/com/imcode/imcms/servlet/admin/UserBrowser.java
@@ -1,5 +1,9 @@
 package com.imcode.imcms.servlet.admin;
 
+import com.imcode.imcms.api.ContentManagementSystem;
+import com.imcode.imcms.api.SaveException;
+import com.imcode.imcms.api.User;
+import com.imcode.imcms.api.UserService;
 import com.imcode.imcms.flow.DispatchCommand;
 import com.imcode.imcms.servlet.superadmin.UserEditorPage;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
@@ -13,7 +17,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class UserBrowser extends HttpServlet {
 
@@ -24,29 +29,50 @@ public class UserBrowser extends HttpServlet {
     public static final String REQUEST_PARAMETER__SEARCH_STRING = "searchstring";
     public static final String REQUEST_PARAMETER__INCLUDE_INACTIVE_USERS = "includeInactive";
     public static final String REQUEST_ATTRIBUTE__FORM_DATA = "formData";
-    private static final String JSP__USER_BROWSER = "/jsp/userbrowser.jsp";
     public static final String REQUEST_PARAMETER__SELECT_USER_BUTTON = "selectUserButton";
+    public static final String REQUEST_PARAMETER__ARCHIVE_USER_BUTTON = "archiveUserButton";
     public static final String REQUEST_PARAMETER__ADD_USER = "addUser";
     public static final String REQUEST_PARAMETER__CANCEL_BUTTON = "cancel";
+    private static final String JSP__USER_BROWSER = "/jsp/userbrowser.jsp";
     private static final LocalizedMessage ERROR__USER_ALREADY_EXISTS = new LocalizedMessage("error/servlet/AdminUserProps/username_already_exists");
 
-    public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-        UserFinder userFinder = (UserFinder)HttpSessionUtils.getSessionAttributeWithNameInRequest( request, REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE );
-        if ( null == userFinder ) {
+        UserFinder userFinder = (UserFinder) HttpSessionUtils.getSessionAttributeWithNameInRequest(request, REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE);
+        if (null == userFinder) {
             Utility.redirectToStartDocument(request, response);
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__SHOW_USERS_BUTTON ) ) {
-            listUsers( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__SELECT_USER_BUTTON ) ) {
-            UserDomainObject selectedUser = getSelectedUserFromRequest( request );
-            if ( null == selectedUser && !userFinder.isNullSelectable() ) {
-                listUsers( request, response );
+        } else if (null != request.getParameter(REQUEST_PARAMETER__SHOW_USERS_BUTTON)) {
+            listUsers(request, response);
+        } else if (null != request.getParameter(REQUEST_PARAMETER__SELECT_USER_BUTTON)) {
+            UserDomainObject selectedUser = getSelectedUserFromRequest(request);
+            if (null == selectedUser && !userFinder.isNullSelectable()) {
+                listUsers(request, response);
+            } else {
+                userFinder.selectUser(selectedUser, request, response);
+            }
+        } else if (null != request.getParameter(REQUEST_PARAMETER__CANCEL_BUTTON)) {
+            userFinder.cancel(request, response);
+
+        } else if (null != request.getParameter(REQUEST_PARAMETER__ARCHIVE_USER_BUTTON)) {
+            UserDomainObject selectedUser = getSelectedUserFromRequest(request);
+            if (null == selectedUser && !userFinder.isNullSelectable()) {
+                listUsers(request, response);
             } else {
-                userFinder.selectUser( selectedUser, request, response );
+                ContentManagementSystem contentManagementSystem = ContentManagementSystem.fromRequest(request);
+                UserService userService = contentManagementSystem.getUserService();
+                String userLoginName = selectedUser.getLoginName();
+                User user = userService.getUser(userLoginName);
+                user.setActive(false);
+                try {
+                    userService.saveUser(user);
+                    listUsers(request, response);
+                } catch (SaveException e) {
+                    e.printStackTrace();
+                    listUsers(request, response);
+                }
             }
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__CANCEL_BUTTON ) ) {
-            userFinder.cancel( request, response );
-        } else if ( null != request.getParameter( REQUEST_PARAMETER__ADD_USER ) && userFinder.isUsersAddable() ) {
+
+        } else if (null != request.getParameter(REQUEST_PARAMETER__ADD_USER) && userFinder.isUsersAddable()) {
             goToCreateUserPage(userFinder, request, response);
         }
     }
@@ -67,126 +93,130 @@ public void dispatch(HttpServletRequest request,
                 try {
                     Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().addUser(newUser);
                     returnCommand.dispatch(request, response);
-                } catch ( UserAlreadyExistsException e ) {
-                    userEditorPage.setErrorMessage(ERROR__USER_ALREADY_EXISTS) ;
+                } catch (UserAlreadyExistsException e) {
+                    userEditorPage.setErrorMessage(ERROR__USER_ALREADY_EXISTS);
                     userEditorPage.forward(request, response);
                 }
             }
         };
-        userEditorPage.setOkCommand(saveUserAndReturnCommand) ;
+        userEditorPage.setOkCommand(saveUserAndReturnCommand);
         userEditorPage.forward(request, response);
     }
 
-    private void listUsers( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        UserBrowserPage userBrowserPage = createPageFromRequest( request );
-        userBrowserPage.forward( request, response );
+    private void listUsers(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        UserBrowserPage userBrowserPage = createPageFromRequest(request);
+        userBrowserPage.forward(request, response);
     }
 
-    private UserBrowserPage createPageFromRequest( HttpServletRequest request ) {
-        UserDomainObject loggedOnUser = Utility.getLoggedOnUser( request );
+    private UserBrowserPage createPageFromRequest(HttpServletRequest request) {
+        UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
         ImcmsAuthenticatorAndUserAndRoleMapper userMapperAndRole = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
-        boolean includeInactiveUsers = null != request.getParameter( REQUEST_PARAMETER__INCLUDE_INACTIVE_USERS );
-        String searchString = request.getParameter( REQUEST_PARAMETER__SEARCH_STRING );
-        String[] selectedRoleIds = request.getParameter(REQUEST_PARAMETER__ROLE_ID) != null ? request.getParameterValues(REQUEST_PARAMETER__ROLE_ID) : new String[] {};
-        RoleDomainObject[] selectedRoles = selectedRoleIds.length > 0 ? new RoleDomainObject[selectedRoleIds.length] : new RoleDomainObject[0] ;
-        UserDomainObject[] users = userMapperAndRole.findUsersByNamePrefix( searchString, includeInactiveUsers );
-        for (int i=0; i < selectedRoleIds.length; i++ ){
+        boolean includeInactiveUsers = null != request.getParameter(REQUEST_PARAMETER__INCLUDE_INACTIVE_USERS);
+        String searchString = request.getParameter(REQUEST_PARAMETER__SEARCH_STRING);
+        String[] selectedRoleIds = request.getParameter(REQUEST_PARAMETER__ROLE_ID) != null ? request.getParameterValues(REQUEST_PARAMETER__ROLE_ID) : new String[]{};
+        RoleDomainObject[] selectedRoles = selectedRoleIds.length > 0 ? new RoleDomainObject[selectedRoleIds.length] : new RoleDomainObject[0];
+        UserDomainObject[] users = userMapperAndRole.findUsersByNamePrefix(searchString, includeInactiveUsers);
+        for (int i = 0; i < selectedRoleIds.length; i++) {
             selectedRoles[i] = userMapperAndRole.getRoleById(Integer.parseInt(selectedRoleIds[i]));
         }
-        if ( selectedRoles.length > 0 ) {
+        if (selectedRoles.length > 0) {
             List usersList = new ArrayList();
-            for (int i=0; i < users.length; i++ ) {
+            for (int i = 0; i < users.length; i++) {
                 boolean hasRole = false;
                 for (int k = 0; k < selectedRoles.length; k++) {
                     hasRole = users[i].hasRoleId(selectedRoles[k].getId());
-                    if(hasRole){break;}
+                    if (hasRole) {
+                        break;
+                    }
+                }
+                if (hasRole) {
+                    usersList.add(users[i]);
                 }
-                if(hasRole) { usersList.add(users[i]); }
             }
 
-            users = (UserDomainObject[])usersList.toArray(new UserDomainObject[usersList.size()] );
+            users = (UserDomainObject[]) usersList.toArray(new UserDomainObject[usersList.size()]);
         }
 
-        if (loggedOnUser.isUserAdminAndCanEditAtLeastOneRole()){
+        if (loggedOnUser.isUserAdminAndCanEditAtLeastOneRole()) {
             users = getUsersWithUseradminPermissibleRoles(loggedOnUser, users);
         }
 
         UserBrowserPage userBrowserPage = new UserBrowserPage();
-        userBrowserPage.setSearchString( searchString );
-        userBrowserPage.setUsers( users );
+        userBrowserPage.setSearchString(searchString);
+        userBrowserPage.setUsers(users);
         userBrowserPage.setSelectedRoles(selectedRoles);
-        userBrowserPage.setIncludeInactiveUsers( includeInactiveUsers );
+        userBrowserPage.setIncludeInactiveUsers(includeInactiveUsers);
         return userBrowserPage;
     }
 
     private UserDomainObject[] getUsersWithUseradminPermissibleRoles(UserDomainObject loggedOnUser, UserDomainObject[] users) {
         List userList = new ArrayList();
         RoleId[] useradminPermissibleRoles = loggedOnUser.getUserAdminRoleIds();
-        for( int i=0; i < users.length; i++){
-            for( int k=0; k < useradminPermissibleRoles.length; k++){
-                if( users[i].hasRoleId( useradminPermissibleRoles[k] ) ){
+        for (int i = 0; i < users.length; i++) {
+            for (int k = 0; k < useradminPermissibleRoles.length; k++) {
+                if (users[i].hasRoleId(useradminPermissibleRoles[k])) {
                     userList.add(users[i]);
-                    break ;
+                    break;
                 }
             }
         }
-        return (UserDomainObject[])userList.toArray(new UserDomainObject[userList.size()]);
+        return (UserDomainObject[]) userList.toArray(new UserDomainObject[userList.size()]);
     }
 
-    private UserDomainObject getSelectedUserFromRequest( HttpServletRequest request ) {
+    private UserDomainObject getSelectedUserFromRequest(HttpServletRequest request) {
         ImcmsAuthenticatorAndUserAndRoleMapper userMapperAndRole = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
-        String userIdStr = request.getParameter( REQUEST_PARAMETER__USER_ID );
-        if ( null == userIdStr ) {
+        String userIdStr = request.getParameter(REQUEST_PARAMETER__USER_ID);
+        if (null == userIdStr) {
             return null;
         }
-        int userId = Integer.parseInt( userIdStr );
-        return userMapperAndRole.getUser( userId );
+        int userId = Integer.parseInt(userIdStr);
+        return userMapperAndRole.getUser(userId);
     }
 
     public static class UserBrowserPage {
 
         UserDomainObject[] users = new UserDomainObject[0];
         String searchString = "";
-        RoleDomainObject[] selectedRoles = new RoleDomainObject[] {};
+        RoleDomainObject[] selectedRoles = new RoleDomainObject[]{};
         private boolean includeInactiveUsers;
 
         public String getSearchString() {
             return searchString;
         }
 
+        public void setSearchString(String searchString) {
+            this.searchString = searchString;
+        }
+
         public UserDomainObject[] getUsers() {
             return users;
         }
 
-        public void setSearchString( String searchString ) {
-            this.searchString = searchString;
+        public void setUsers(UserDomainObject[] users) {
+            this.users = users;
+        }
+
+        public RoleDomainObject[] getSelectedRoles() {
+            return this.selectedRoles;
         }
 
         public void setSelectedRoles(RoleDomainObject[] selectedRoles) {
             this.selectedRoles = selectedRoles;
         }
 
-         public RoleDomainObject[] getSelectedRoles() {
-             return this.selectedRoles;
-         }
-
-        public void setUsers( UserDomainObject[] users ) {
-            this.users = users;
+        public boolean isIncludeInactiveUsers() {
+            return includeInactiveUsers;
         }
 
-        public void setIncludeInactiveUsers( boolean includeInactiveUsers ) {
+        public void setIncludeInactiveUsers(boolean includeInactiveUsers) {
             this.includeInactiveUsers = includeInactiveUsers;
         }
 
-        public boolean isIncludeInactiveUsers() {
-            return includeInactiveUsers;
-        }
-
-        public void forward( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-            request.setAttribute( REQUEST_ATTRIBUTE__FORM_DATA, this );
-            UserDomainObject user = Utility.getLoggedOnUser( request );
+        public void forward(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+            request.setAttribute(REQUEST_ATTRIBUTE__FORM_DATA, this);
+            UserDomainObject user = Utility.getLoggedOnUser(request);
             String userLanguage = user.getLanguageIso639_2();
-            request.getRequestDispatcher( "/imcms/" + userLanguage + JSP__USER_BROWSER ).forward( request, response );
+            request.getRequestDispatcher("/imcms/" + userLanguage + JSP__USER_BROWSER).forward(request, response);
         }
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/admin/UserFinder.java b/server/src/com/imcode/imcms/servlet/admin/UserFinder.java
index 3575360557..51c3dcd5c0 100644
--- a/server/src/com/imcode/imcms/servlet/admin/UserFinder.java
+++ b/server/src/com/imcode/imcms/servlet/admin/UserFinder.java
@@ -1,9 +1,9 @@
 package com.imcode.imcms.servlet.admin;
 
 import com.imcode.imcms.servlet.WebComponent;
+import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.server.user.UserDomainObject;
 import imcode.util.HttpSessionUtils;
-import com.imcode.imcms.util.l10n.LocalizedMessage;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -14,55 +14,55 @@
 public class UserFinder extends WebComponent {
 
     private boolean usersAddable;
-    private boolean nullSelectable ;
-    private LocalizedMessage selectButtonText ;
-    private LocalizedMessage headline ;
+    private boolean nullSelectable;
+    private LocalizedMessage selectButtonText;
+    private LocalizedMessage headline;
 
     private SelectUserCommand selectUserCommand;
 
-    public static UserFinder getInstance( HttpServletRequest request ) {
-        UserFinder userFinder = (UserFinder)HttpSessionUtils.getSessionAttributeWithNameInRequest( request, UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE );
-        if ( null == userFinder ) {
+    public static UserFinder getInstance(HttpServletRequest request) {
+        UserFinder userFinder = (UserFinder) HttpSessionUtils.getSessionAttributeWithNameInRequest(request, UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE);
+        if (null == userFinder) {
             userFinder = new UserFinder();
         }
         return userFinder;
     }
 
-    public void setUsersAddable( boolean usersAddable ) {
-        this.usersAddable = usersAddable;
-    }
-
-    public void forward( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute( this, request, UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE );
+    public void forward(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        HttpSessionUtils.setSessionAttributeAndSetNameInRequestAttribute(this, request, UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE);
         UserBrowser.UserBrowserPage userBrowserPage = new UserBrowser.UserBrowserPage();
-        userBrowserPage.forward( request, response );
-    }
-
-    public void setSelectButtonText( LocalizedMessage buttonText ) {
-        this.selectButtonText = buttonText;
+        userBrowserPage.forward(request, response);
     }
 
     public LocalizedMessage getSelectButtonText() {
         return selectButtonText;
     }
 
+    public void setSelectButtonText(LocalizedMessage buttonText) {
+        this.selectButtonText = buttonText;
+    }
+
     public boolean isUsersAddable() {
         return usersAddable;
     }
 
+    public void setUsersAddable(boolean usersAddable) {
+        this.usersAddable = usersAddable;
+    }
+
     public boolean isNullSelectable() {
         return nullSelectable;
     }
 
-    public void setNullSelectable( boolean nullSelectable ) {
+    public void setNullSelectable(boolean nullSelectable) {
         this.nullSelectable = nullSelectable;
     }
 
-    public void selectUser( UserDomainObject selectedUser, HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-        this.selectUserCommand.selectUser(selectedUser,request,response) ;
+    public void selectUser(UserDomainObject selectedUser, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        this.selectUserCommand.selectUser(selectedUser, request, response);
     }
 
-    public void setSelectUserCommand( SelectUserCommand selectUserCommand ) {
+    public void setSelectUserCommand(SelectUserCommand selectUserCommand) {
         this.selectUserCommand = selectUserCommand;
     }
 
@@ -70,13 +70,13 @@ public LocalizedMessage getHeadline() {
         return headline;
     }
 
-    public void setHeadline( LocalizedMessage headline ) {
+    public void setHeadline(LocalizedMessage headline) {
         this.headline = headline;
     }
 
     public static interface SelectUserCommand extends Serializable {
 
-        void selectUser( UserDomainObject selectedUser, HttpServletRequest request,
-                                HttpServletResponse response ) throws ServletException, IOException ;
+        void selectUser(UserDomainObject selectedUser, HttpServletRequest request,
+                        HttpServletResponse response) throws ServletException, IOException;
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/beans/AdminManagerExpandableDatesBean.java b/server/src/com/imcode/imcms/servlet/beans/AdminManagerExpandableDatesBean.java
index a11a342c09..d62ed43641 100644
--- a/server/src/com/imcode/imcms/servlet/beans/AdminManagerExpandableDatesBean.java
+++ b/server/src/com/imcode/imcms/servlet/beans/AdminManagerExpandableDatesBean.java
@@ -11,15 +11,15 @@ public DocumentDomainObject getDocument() {
         return document;
     }
 
-    public boolean isExpanded() {
-        return expanded;
+    public void setDocument(DocumentDomainObject document) {
+        this.document = document;
     }
 
-    public void setDocument( DocumentDomainObject document ) {
-        this.document = document;
+    public boolean isExpanded() {
+        return expanded;
     }
 
-    public void setExpanded( boolean expanded ) {
+    public void setExpanded(boolean expanded) {
         this.expanded = expanded;
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubReportListItemBean.java b/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubReportListItemBean.java
index c4e1c8af7a..b1ecf7a6e4 100644
--- a/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubReportListItemBean.java
+++ b/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubReportListItemBean.java
@@ -3,15 +3,15 @@
 import imcode.server.document.DocumentDomainObject;
 
 public class AdminManagerSubReportListItemBean {
-    DocumentDomainObject document ;
-    int index ;
-    boolean expanded ;
+    DocumentDomainObject document;
+    int index;
+    boolean expanded;
 
     public DocumentDomainObject getDocument() {
         return document;
     }
 
-    public void setDocument( DocumentDomainObject document ) {
+    public void setDocument(DocumentDomainObject document) {
         this.document = document;
     }
 
@@ -19,7 +19,7 @@ public boolean isExpanded() {
         return expanded;
     }
 
-    public void setExpanded( boolean expanded ) {
+    public void setExpanded(boolean expanded) {
         this.expanded = expanded;
     }
 
@@ -27,7 +27,7 @@ public int getIndex() {
         return index;
     }
 
-    public void setIndex( int index ) {
+    public void setIndex(int index) {
         this.index = index;
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubreport.java b/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubreport.java
index bce9d2ce27..20a8e660cc 100644
--- a/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubreport.java
+++ b/server/src/com/imcode/imcms/servlet/beans/AdminManagerSubreport.java
@@ -12,8 +12,8 @@ public class AdminManagerSubreport {
     private List documents;
     private LocalizedMessage heading;
     private boolean expanded;
-    private String searchQueryString ;
-    private int maxDocumentCount = AdminManager.DEFAULT_DOCUMENTS_PER_LIST ;
+    private String searchQueryString;
+    private int maxDocumentCount = AdminManager.DEFAULT_DOCUMENTS_PER_LIST;
 
 
     public AdminManagerSubreport() {
@@ -23,59 +23,59 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getSortorder() {
         return sortorder;
     }
 
+    public void setSortorder(String sortorder) {
+        this.sortorder = sortorder;
+    }
+
     public LocalizedMessage getHeading() {
         return heading;
     }
 
-    public List getDocuments() {
-        return documents;
+    public void setHeading(LocalizedMessage heading) {
+        this.heading = heading;
     }
 
-    public boolean isExpanded() {
-        return expanded;
+    public List getDocuments() {
+        return documents;
     }
 
-    public void setDocuments( List documents ) {
+    public void setDocuments(List documents) {
         this.documents = documents;
     }
 
-    public void setExpanded( boolean expanded ) {
-        this.expanded = expanded;
-    }
-
-    public void setHeading( LocalizedMessage heading ) {
-        this.heading = heading;
-    }
-
-    public void setName( String name ) {
-        this.name = name;
+    public boolean isExpanded() {
+        return expanded;
     }
 
-    public void setSortorder( String sortorder ) {
-        this.sortorder = sortorder;
+    public void setExpanded(boolean expanded) {
+        this.expanded = expanded;
     }
 
-    public void setMaxDocumentCount( int maxDocumentCount ) {
+    public void setMaxDocumentCount(int maxDocumentCount) {
         this.maxDocumentCount = maxDocumentCount;
     }
 
-    public boolean isBelowMaxDocumentCount( int i ) {
-        return 0 == maxDocumentCount || i < maxDocumentCount ;
+    public boolean isBelowMaxDocumentCount(int i) {
+        return 0 == maxDocumentCount || i < maxDocumentCount;
     }
 
-    public boolean isAboveMaxDocumentCount( int i ) {
+    public boolean isAboveMaxDocumentCount(int i) {
         return 0 != maxDocumentCount && i > maxDocumentCount;
     }
 
-    public void setSearchQueryString( String searchQueryString ) {
-        this.searchQueryString = searchQueryString;
-    }
-
     public String getSearchQueryString() {
         return searchQueryString;
     }
+
+    public void setSearchQueryString(String searchQueryString) {
+        this.searchQueryString = searchQueryString;
+    }
 }
diff --git a/server/src/com/imcode/imcms/servlet/beans/SessionInfoDTO.java b/server/src/com/imcode/imcms/servlet/beans/SessionInfoDTO.java
new file mode 100644
index 0000000000..94b6ad0d75
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/beans/SessionInfoDTO.java
@@ -0,0 +1,17 @@
+package com.imcode.imcms.servlet.beans;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class SessionInfoDTO {
+    private int userId;
+    private String ip;
+    private String sessionId;
+    private String userAgent;
+    private Date loginDate;
+    private Date expireDate;
+}
diff --git a/server/src/com/imcode/imcms/servlet/beans/Tab.java b/server/src/com/imcode/imcms/servlet/beans/Tab.java
index e61f1d1308..b87c32b741 100644
--- a/server/src/com/imcode/imcms/servlet/beans/Tab.java
+++ b/server/src/com/imcode/imcms/servlet/beans/Tab.java
@@ -2,11 +2,11 @@
 
 public class Tab {
 
-    String name ;
-    String text ;
-    String uri ;
+    String name;
+    String text;
+    String uri;
 
-    public Tab( String name, String text, String uri ) {
+    public Tab(String name, String text, String uri) {
 
         this.name = name;
         this.text = text;
@@ -18,7 +18,7 @@ public String getName() {
     }
 
     public String getText() {
-        return text ;
+        return text;
     }
 
     public String getUri() {
diff --git a/server/src/com/imcode/imcms/servlet/csrf/CsrfTokenManager.java b/server/src/com/imcode/imcms/servlet/csrf/CsrfTokenManager.java
new file mode 100644
index 0000000000..e7eb8da714
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/csrf/CsrfTokenManager.java
@@ -0,0 +1,14 @@
+package com.imcode.imcms.servlet.csrf;
+
+import imcode.server.user.UserDomainObject;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface CsrfTokenManager {
+
+    boolean isExistTokenInCookies(HttpServletRequest request);
+
+    boolean isCorrectTokenForCurrentUser(UserDomainObject user, HttpServletRequest request);
+
+    boolean isTimeExpired(HttpServletRequest request);
+}
diff --git a/server/src/com/imcode/imcms/servlet/csrf/component/CSRFTokenManagerImpl.java b/server/src/com/imcode/imcms/servlet/csrf/component/CSRFTokenManagerImpl.java
new file mode 100644
index 0000000000..af5fb4fcbe
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/csrf/component/CSRFTokenManagerImpl.java
@@ -0,0 +1,34 @@
+package com.imcode.imcms.servlet.csrf.component;
+
+import com.imcode.imcms.servlet.csrf.CsrfTokenManager;
+import imcode.server.user.UserDomainObject;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import static imcode.util.Utility.IM_TOKEN;
+import static imcode.util.Utility.IM_TOKEN_DATE;
+
+public class CSRFTokenManagerImpl implements CsrfTokenManager {
+
+    private final int TOKEN_EXPIRATION_TIME = 2;
+
+    @Override
+    public boolean isExistTokenInCookies(HttpServletRequest request) {
+         return Arrays.stream(request.getCookies())
+                .anyMatch(cookie -> cookie.getName().equals(IM_TOKEN));
+    }
+
+    @Override
+    public boolean isCorrectTokenForCurrentUser(UserDomainObject user, HttpServletRequest request) {
+        return Arrays.stream(request.getCookies())
+                .filter(cookie -> cookie.getName().equals(IM_TOKEN))
+                .anyMatch(cookie -> cookie.getValue().equals(request.getSession().getAttribute(IM_TOKEN)));
+    }
+
+    @Override
+    public boolean isTimeExpired(HttpServletRequest request) {
+        return TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - (long)request.getSession().getAttribute(IM_TOKEN_DATE)) > TOKEN_EXPIRATION_TIME;
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/csrf/filter/CSRFProtectionFilter.java b/server/src/com/imcode/imcms/servlet/csrf/filter/CSRFProtectionFilter.java
new file mode 100644
index 0000000000..dfee593cde
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/csrf/filter/CSRFProtectionFilter.java
@@ -0,0 +1,60 @@
+package com.imcode.imcms.servlet.csrf.filter;
+
+import com.imcode.imcms.servlet.csrf.CsrfTokenManager;
+import com.imcode.imcms.servlet.csrf.component.CSRFTokenManagerImpl;
+import imcode.server.Imcms;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class CSRFProtectionFilter implements Filter {
+
+    private static final Logger log = LogManager.getLogger(CSRFProtectionFilter.class);
+    private final CsrfTokenManager csrfTokenManager = new CSRFTokenManagerImpl();
+    private final boolean include = Boolean.parseBoolean(Imcms.getServerProperties().getProperty("csrf-include"));
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        if(!include) {
+            filterChain.doFilter(servletRequest, servletResponse);
+            return;
+        }
+
+        final HttpServletRequest request = (HttpServletRequest) servletRequest;
+        final HttpServletResponse response = (HttpServletResponse) servletResponse;
+        final UserDomainObject user = Utility.getLoggedOnUser(request);
+
+        if (user != null && !user.isDefaultUser()) {
+            if (!csrfTokenManager.isCorrectTokenForCurrentUser(user, request)) {
+                Utility.makeUserLoggedOut(request);
+                log.error("Potential CSRF detected on user login name: " + user.getLoginName());
+                //add default user for system
+                Utility.makeUserLoggedIn(request, response, Imcms.getServices().verifyUserByIpOrDefault(request.getRemoteAddr()));
+                throw new ServletException("Potential CSRF detected!! Inform a scary sysadmin ASAP!");
+            } else {
+                if (!request.getMethod().equals(HttpGet.METHOD_NAME) && csrfTokenManager.isTimeExpired(request)) {
+                    Utility.setUserToken(request, response, user);
+                }
+            }
+        }
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+
+}
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminCategories.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminCategories.java
index 389608f50c..b09e9a8a70 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminCategories.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminCategories.java
@@ -1,6 +1,5 @@
 package com.imcode.imcms.servlet.superadmin;
 
-import com.imcode.imcms.api.CategoryAlreadyExistsException;
 import com.imcode.imcms.mapping.CategoryMapper;
 import com.imcode.imcms.mapping.DocumentMapper;
 import com.imcode.imcms.servlet.admin.ImageBrowser;
@@ -23,13 +22,6 @@
 
 public class AdminCategories extends HttpServlet {
 
-    private static final String JSP_TEMPLATE = "category_admin.jsp";
-    private static final String PARAMETER__DESCRIPTION = "description";
-    private static final String PARAMETER__ICON = "icon";
-    private static final String PARAMETER__CATEGORIES = "categories";
-    private static final String PARAMETER__OLD_NAME = "oldName";
-    private static final String PARAMETER__CATEGORY_SAVE = "category_save";
-
     public static final String ATTRIBUTE__FORM_DATA = "admincategoriesbean";
     public static final String PARAMETER__NAME = "name";
     public static final String PARAMETER_BUTTON__SELECT_CATEGORY_TYPE_TO_SHOW_OR_REMOVE = "button__select_category_type";
@@ -48,20 +40,61 @@ public class AdminCategories extends HttpServlet {
     public static final String PARAMETER__MAX_CHOICES = "max_choices";
     public static final String PARAMETER_CATEGORY_TYPE_SAVE = "category_type_save";
     public static final String PARAMETER_CATEGORY_TYPE_ADD = "category_type_add";
-    private static final String PARAMETER__ADD_CATEGORY_BUTTON = "category_add";
     public static final String PARAMETER__INHERITED = "inherited";
+    public static final String PARAMETER__IMAGE_ARCHIVE = "image_archive";
     public static final String PARAMETER__CATEGORY_DELETE = "category_delete";
+    private static final String JSP_TEMPLATE = "category_admin.jsp";
+    private static final String PARAMETER__DESCRIPTION = "description";
+    private static final String PARAMETER__ICON = "icon";
+    private static final String PARAMETER__CATEGORIES = "categories";
+    private static final String PARAMETER__OLD_NAME = "oldName";
+    private static final String PARAMETER__CATEGORY_SAVE = "category_save";
+    private static final String PARAMETER__ADD_CATEGORY_BUTTON = "category_add";
+
+    public static String createHtmlOptionListOfCategoryTypes(CategoryTypeDomainObject selectedType) {
+        ImcmsServices imcref = Imcms.getServices();
+        CategoryTypeDomainObject[] categoryTypes = imcref.getCategoryMapper().getAllCategoryTypes();
+        String temps = "";
+        for (int i = 0; i < categoryTypes.length; i++) {
+            boolean selected = selectedType != null && selectedType.getId() == categoryTypes[i].getId();
+            temps += "<option value=\""
+                    + categoryTypes[i].getId()
+                    + "\""
+                    + (selected ? " selected" : "")
+                    + ">"
+                    + categoryTypes[i].getName() + "</option>";
+        }
+        return temps;
+    }
+
+    public static String createHtmlOptionListOfCategoriesForOneType(CategoryTypeDomainObject categoryType,
+                                                                    CategoryDomainObject selectedCategory) {
+        CategoryMapper categoryMapper = Imcms.getServices().getCategoryMapper();
+
+        CategoryDomainObject[] categories = categoryMapper.getAllCategoriesOfType(categoryType);
+        String temps = "";
+        for (int i = 0; i < categories.length; i++) {
+            boolean selected = selectedCategory != null && selectedCategory.equals(categories[i]);
+            temps += "<option value=\""
+                    + categories[i].getId()
+                    + "\""
+                    + (selected ? " selected" : "")
+                    + ">"
+                    + categories[i].getName() + "</option>";
+        }
+        return temps;
+    }
 
-    protected void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        doPost( request, response );
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doPost(request, response);
     }
 
-    protected void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         // Lets verify that the user who tries to add a new user is an admin
         ImcmsServices service = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
         Utility.setDefaultHtmlContentType(res);
-        if ( !user.isSuperAdmin() ) {
+        if (!user.isSuperAdmin()) {
             String header = "Error in AdminCategories. ";
             Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
             String msg = langproperties.getProperty("error/servlet/global/no_administrator") + "<br>";
@@ -69,9 +102,10 @@ protected void doPost( HttpServletRequest req, HttpServletResponse res ) throws
             return;
         }
 
-        if ( null != req.getParameter( PARAMETER_BUTTON__CANCEL )
-             && null != req.getParameter( PARAMETER_MODE__DEFAULT ) ) {
-            res.sendRedirect( "AdminManager" );
+        if (null != req.getParameter(PARAMETER_BUTTON__CANCEL)
+                && null != req.getParameter(PARAMETER_MODE__DEFAULT))
+        {
+            res.sendRedirect("AdminManager");
             return;
         }
 
@@ -79,128 +113,126 @@ protected void doPost( HttpServletRequest req, HttpServletResponse res ) throws
 
         AdminCategoriesPage adminCategoriesPage = new AdminCategoriesPage();
 
-        CategoryTypeDomainObject categoryType = getCategoryTypeFromIdParameterInRequest( req, PARAMETER_SELECT__CATEGORY_TYPE_TO_SHOW, categoryMapper );
-        CategoryDomainObject category = getCategoryFromIdInRequest( req, categoryMapper );
-
-        if ( null != req.getParameter( PARAMETER_MODE__ADD_CATEGORY_TYPE ) ){
-            addCategoryType( req, adminCategoriesPage, categoryMapper );
-        } else if ( null != req.getParameter( PARAMETER_MODE__EDIT_CATEGORY_TYPE ) ) {
-            editCategoryType( categoryType, req, adminCategoriesPage, categoryMapper );
-        } else if ( null != req.getParameter( PARAMETER_MODE__DELETE_CATEGORY_TYPE ) ) {
-            deleteCategoryType( categoryType, adminCategoriesPage, categoryMapper );
-        } else if ( null != req.getParameter( PARAMETER_MODE__ADD_CATEGORY ) ) {
-            adminCategoriesPage = addCategory( req, res, adminCategoriesPage, categoryMapper );
-        } else if ( null != req.getParameter( PARAMETER_MODE__EDIT_CATEGORY ) ) {
-            adminCategoriesPage = editCategory( req, res, adminCategoriesPage, categoryMapper );
-        } else if ( req.getParameter( PARAMETER_MODE__DELETE_CATEGORY ) != null ) {
-            deleteCategory( category, categoryType, req, adminCategoriesPage, categoryMapper, service.getDocumentMapper() );
-        } else if ( null != req.getParameter( PARAMETER_MODE__VIEW_CATEGORY ) ) {
-            viewCategory( categoryType, category, req, adminCategoriesPage );
+        CategoryTypeDomainObject categoryType = getCategoryTypeFromIdParameterInRequest(req, PARAMETER_SELECT__CATEGORY_TYPE_TO_SHOW, categoryMapper);
+        CategoryDomainObject category = getCategoryFromIdInRequest(req, categoryMapper);
+
+        if (null != req.getParameter(PARAMETER_MODE__ADD_CATEGORY_TYPE)) {
+            addCategoryType(req, adminCategoriesPage, categoryMapper);
+        } else if (null != req.getParameter(PARAMETER_MODE__EDIT_CATEGORY_TYPE)) {
+            editCategoryType(categoryType, req, adminCategoriesPage, categoryMapper);
+        } else if (null != req.getParameter(PARAMETER_MODE__DELETE_CATEGORY_TYPE)) {
+            deleteCategoryType(categoryType, adminCategoriesPage, categoryMapper);
+        } else if (null != req.getParameter(PARAMETER_MODE__ADD_CATEGORY)) {
+            adminCategoriesPage = addCategory(req, res, adminCategoriesPage, categoryMapper);
+        } else if (null != req.getParameter(PARAMETER_MODE__EDIT_CATEGORY)) {
+            adminCategoriesPage = editCategory(req, res, adminCategoriesPage, categoryMapper);
+        } else if (req.getParameter(PARAMETER_MODE__DELETE_CATEGORY) != null) {
+            deleteCategory(category, categoryType, req, adminCategoriesPage, categoryMapper, service.getDocumentMapper());
+        } else if (null != req.getParameter(PARAMETER_MODE__VIEW_CATEGORY)) {
+            viewCategory(categoryType, category, req, adminCategoriesPage);
         }
 
-        if ( !res.isCommitted() ) {
-            forward( adminCategoriesPage, user, req, res );
+        if (!res.isCommitted()) {
+            forward(adminCategoriesPage, user, req, res);
         }
     }
 
-    private void forward( AdminCategoriesPage formBean, UserDomainObject user, HttpServletRequest req,
-                          HttpServletResponse res ) throws ServletException, IOException {
-        req.setAttribute( ATTRIBUTE__FORM_DATA, formBean );
-        req.getRequestDispatcher( "/imcms/" + user.getLanguageIso639_2() + "/jsp/" + JSP_TEMPLATE ).forward( req, res );
+    private void forward(AdminCategoriesPage formBean, UserDomainObject user, HttpServletRequest req,
+                         HttpServletResponse res) throws ServletException, IOException {
+        req.setAttribute(ATTRIBUTE__FORM_DATA, formBean);
+        req.getRequestDispatcher("/imcms/" + user.getLanguageIso639_2() + "/jsp/" + JSP_TEMPLATE).forward(req, res);
     }
 
-    private AdminCategoriesPage editCategory( HttpServletRequest req, HttpServletResponse res, AdminCategoriesPage formBean,
-                                   CategoryMapper categoryMapper ) throws ServletException, IOException {
-        formBean.setMode(PARAMETER_MODE__EDIT_CATEGORY) ;
+    private AdminCategoriesPage editCategory(HttpServletRequest req, HttpServletResponse res, AdminCategoriesPage formBean,
+                                             CategoryMapper categoryMapper) throws ServletException, IOException {
+        formBean.setMode(PARAMETER_MODE__EDIT_CATEGORY);
 
-        CategoryDomainObject category = getCategoryFromIdInRequest( req, categoryMapper );
-        CategoryTypeDomainObject categoryTypeToEdit = getCategoryTypeFromIdParameterInRequest( req, PARAMETER_SELECT__CATEGORY_TYPE_TO_SHOW, categoryMapper );
+        CategoryDomainObject category = getCategoryFromIdInRequest(req, categoryMapper);
+        CategoryTypeDomainObject categoryTypeToEdit = getCategoryTypeFromIdParameterInRequest(req, PARAMETER_SELECT__CATEGORY_TYPE_TO_SHOW, categoryMapper);
 
-        formBean.setCategoryTypeToEdit( categoryTypeToEdit );
-        if ( req.getParameter( PARAMETER_BUTTON__SELECT_CATEGORY_TYPE_TO_SHOW_OR_REMOVE ) != null ) {
-            formBean.setCategoryToEdit( null );
+        formBean.setCategoryTypeToEdit(categoryTypeToEdit);
+        if (req.getParameter(PARAMETER_BUTTON__SELECT_CATEGORY_TYPE_TO_SHOW_OR_REMOVE) != null) {
+            formBean.setCategoryToEdit(null);
         } else {
-            formBean.setCategoryToEdit( category );
+            formBean.setCategoryToEdit(category);
         }
 
         boolean nameIsUnique = true;
 
-        if ( req.getParameter( PARAMETER__BROWSE_FOR_IMAGE ) != null ) {
-            setCategoryFromRequest( category, req, categoryMapper );
-            forwardToImageBrowse( formBean, req, res );
-        } else if ( req.getParameter( PARAMETER__CATEGORY_SAVE ) != null ) {
-            boolean nameWasChanged = !req.getParameter( PARAMETER__OLD_NAME ).toLowerCase().equals( req.getParameter( PARAMETER__NAME ).toLowerCase() );
-            CategoryTypeDomainObject categoryTypeToAddTo = getCategoryTypeFromIdParameterInRequest( req, PARAMETER_SELECT__CATEGORY_TYPE_TO_ADD_TO, categoryMapper );
-            if ( nameWasChanged ) {
-                nameIsUnique = null == categoryMapper.getCategoryByTypeAndName( categoryTypeToAddTo, req.getParameter( PARAMETER__NAME ) );
+        if (req.getParameter(PARAMETER__BROWSE_FOR_IMAGE) != null) {
+            setCategoryFromRequest(category, req, categoryMapper);
+            forwardToImageBrowse(formBean, req, res);
+        } else if (req.getParameter(PARAMETER__CATEGORY_SAVE) != null) {
+            boolean nameWasChanged = !req.getParameter(PARAMETER__OLD_NAME).toLowerCase().equals(req.getParameter(PARAMETER__NAME).toLowerCase());
+            CategoryTypeDomainObject categoryTypeToAddTo = getCategoryTypeFromIdParameterInRequest(req, PARAMETER_SELECT__CATEGORY_TYPE_TO_ADD_TO, categoryMapper);
+            if (nameWasChanged) {
+                nameIsUnique = null == categoryMapper.getCategoryByTypeAndName(categoryTypeToAddTo, req.getParameter(PARAMETER__NAME));
             }
-            if ( nameIsUnique ) {
-                setCategoryFromRequest( category, req, categoryMapper );
-                categoryMapper.updateCategory( category );
-                formBean.setCategoryToEdit( null );
+            if (nameIsUnique) {
+                setCategoryFromRequest(category, req, categoryMapper);
+                categoryMapper.updateCategory(category);
+                formBean.setCategoryToEdit(null);
             }
         }
 
-        formBean.setUniqueCategoryName( nameIsUnique );
+        formBean.setUniqueCategoryName(nameIsUnique);
         return formBean;
     }
 
-    private void setCategoryFromRequest( CategoryDomainObject category, HttpServletRequest req,
-                                         CategoryMapper categoryMapper ) {
-        category.setName( req.getParameter( PARAMETER__NAME ) );
-        category.setDescription( req.getParameter( PARAMETER__DESCRIPTION ) );
-        category.setImageUrl( req.getParameter( PARAMETER__ICON ) );
-        CategoryTypeDomainObject categoryTypeToAddTo = getCategoryTypeFromIdParameterInRequest( req, PARAMETER_SELECT__CATEGORY_TYPE_TO_ADD_TO, categoryMapper );
-        category.setType( categoryTypeToAddTo );
+    private void setCategoryFromRequest(CategoryDomainObject category, HttpServletRequest req,
+                                        CategoryMapper categoryMapper) {
+        category.setName(req.getParameter(PARAMETER__NAME));
+        category.setDescription(req.getParameter(PARAMETER__DESCRIPTION));
+        category.setImageUrl(req.getParameter(PARAMETER__ICON));
+        CategoryTypeDomainObject categoryTypeToAddTo = getCategoryTypeFromIdParameterInRequest(req, PARAMETER_SELECT__CATEGORY_TYPE_TO_ADD_TO, categoryMapper);
+        category.setType(categoryTypeToAddTo);
     }
 
-    private AdminCategoriesPage addCategory( HttpServletRequest req, HttpServletResponse res, AdminCategoriesPage adminCategoriesPage,
-                                  CategoryMapper categoryMapper ) throws ServletException, IOException {
-        adminCategoriesPage.setMode(PARAMETER_MODE__ADD_CATEGORY) ;
-
-        CategoryTypeDomainObject categoryTypeToAddTo = getCategoryTypeFromIdParameterInRequest( req, PARAMETER_SELECT__CATEGORY_TYPE_TO_ADD_TO, categoryMapper );
-
-        CategoryDomainObject newCategory = new CategoryDomainObject( 0,
-                                                req.getParameter( PARAMETER__NAME ),
-                                                req.getParameter( PARAMETER__DESCRIPTION ),
-                                                req.getParameter( PARAMETER__ICON ),
-                                                categoryTypeToAddTo );
-        adminCategoriesPage.setCategoryToEdit( newCategory );
-        adminCategoriesPage.setCategoryTypeToEdit( categoryTypeToAddTo );
-
-        if ( req.getParameter( PARAMETER__BROWSE_FOR_IMAGE ) != null ) {
-            forwardToImageBrowse( adminCategoriesPage, req, res );
-        } else if ( null != req.getParameter( PARAMETER__ADD_CATEGORY_BUTTON ) && StringUtils.isNotBlank( newCategory.getName() ) ) {
-            try {
-                categoryMapper.addCategory( newCategory );
-            } catch ( CategoryAlreadyExistsException ignored ) {}
-            adminCategoriesPage.setCategoryToEdit( new CategoryDomainObject( 0, null, "", "", null ) );
-            adminCategoriesPage.setUniqueCategoryName( true );
+    private AdminCategoriesPage addCategory(HttpServletRequest req, HttpServletResponse res, AdminCategoriesPage adminCategoriesPage,
+                                            CategoryMapper categoryMapper) throws ServletException, IOException {
+        adminCategoriesPage.setMode(PARAMETER_MODE__ADD_CATEGORY);
+
+        CategoryTypeDomainObject categoryTypeToAddTo = getCategoryTypeFromIdParameterInRequest(req, PARAMETER_SELECT__CATEGORY_TYPE_TO_ADD_TO, categoryMapper);
+
+        CategoryDomainObject newCategory = new CategoryDomainObject(0,
+                req.getParameter(PARAMETER__NAME),
+                req.getParameter(PARAMETER__DESCRIPTION),
+                req.getParameter(PARAMETER__ICON),
+                categoryTypeToAddTo);
+        adminCategoriesPage.setCategoryToEdit(newCategory);
+        adminCategoriesPage.setCategoryTypeToEdit(categoryTypeToAddTo);
+
+        if (req.getParameter(PARAMETER__BROWSE_FOR_IMAGE) != null) {
+            forwardToImageBrowse(adminCategoriesPage, req, res);
+        } else if (null != req.getParameter(PARAMETER__ADD_CATEGORY_BUTTON) && StringUtils.isNotBlank(newCategory.getName())) {
+            categoryMapper.addCategory(newCategory);
+            adminCategoriesPage.setCategoryToEdit(new CategoryDomainObject(0, null, "", "", null));
+            adminCategoriesPage.setUniqueCategoryName(true);
         }
         return adminCategoriesPage;
     }
 
-    private CategoryDomainObject getCategoryFromIdInRequest( HttpServletRequest req, CategoryMapper categoryMapper ) {
+    private CategoryDomainObject getCategoryFromIdInRequest(HttpServletRequest req, CategoryMapper categoryMapper) {
         CategoryDomainObject categoryToEdit = null;
-        String categoryIdString = req.getParameter( PARAMETER__CATEGORIES );
-        boolean selectCategoryButtonPressed = req.getParameter( PARAMETER_BUTTON__SELECT_CATEGORY_TYPE_TO_SHOW_OR_REMOVE )
-                                              == null;
+        String categoryIdString = req.getParameter(PARAMETER__CATEGORIES);
+        boolean selectCategoryButtonPressed = req.getParameter(PARAMETER_BUTTON__SELECT_CATEGORY_TYPE_TO_SHOW_OR_REMOVE)
+                == null;
         boolean aCategoryWasSelected = categoryIdString != null && selectCategoryButtonPressed;
-        if ( aCategoryWasSelected ) {
-            int categoryId = Integer.parseInt( categoryIdString );
-            categoryToEdit = categoryMapper.getCategoryById( categoryId );
+        if (aCategoryWasSelected) {
+            int categoryId = Integer.parseInt(categoryIdString);
+            categoryToEdit = categoryMapper.getCategoryById(categoryId);
         }
         return categoryToEdit;
     }
 
-    private CategoryTypeDomainObject getCategoryTypeFromIdParameterInRequest( HttpServletRequest req, String requestParameter,
-                                                                 CategoryMapper categoryMapper ) {
+    private CategoryTypeDomainObject getCategoryTypeFromIdParameterInRequest(HttpServletRequest req, String requestParameter,
+                                                                             CategoryMapper categoryMapper) {
         CategoryTypeDomainObject categoryType = null;
-        String categoryTypeIdString = req.getParameter( requestParameter );
+        String categoryTypeIdString = req.getParameter(requestParameter);
         boolean gotCategoryTypeId = null != categoryTypeIdString;
-        if ( gotCategoryTypeId ) {
-            int categoryTypeId = Integer.parseInt( categoryTypeIdString );
-            categoryType = categoryMapper.getCategoryTypeById( categoryTypeId );
+        if (gotCategoryTypeId) {
+            int categoryTypeId = Integer.parseInt(categoryTypeIdString);
+            categoryType = categoryMapper.getCategoryTypeById(categoryTypeId);
         }
         return categoryType;
     }
@@ -209,149 +241,122 @@ private void deleteCategory(CategoryDomainObject categoryToEdit, CategoryTypeDom
                                 HttpServletRequest req, AdminCategoriesPage adminCategoriesPage,
                                 CategoryMapper categoryMapper,
                                 DocumentMapper documentMapper) {
-        adminCategoriesPage.setMode(PARAMETER_MODE__DELETE_CATEGORY) ;
+        adminCategoriesPage.setMode(PARAMETER_MODE__DELETE_CATEGORY);
         String[] documentsOfOneCategory = null;
-        if ( categoryToEdit != null ) {
-            documentsOfOneCategory = categoryMapper.getAllDocumentsOfOneCategory( categoryToEdit );
-            if ( req.getParameter( PARAMETER__CATEGORY_DELETE ) != null ) {
+        if (categoryToEdit != null) {
+            documentsOfOneCategory = categoryMapper.getAllDocumentsOfOneCategory(categoryToEdit);
+            if (req.getParameter(PARAMETER__CATEGORY_DELETE) != null) {
                 DocumentDomainObject document;
-                for ( int i = 0; i < documentsOfOneCategory.length; i++ ) {
-                    document = documentMapper.getDocument( Integer.parseInt( documentsOfOneCategory[i] ) );
-                    categoryMapper.deleteOneCategoryFromDocument( document, categoryToEdit );
+                for (int i = 0; i < documentsOfOneCategory.length; i++) {
+                    document = documentMapper.getDocument(Integer.parseInt(documentsOfOneCategory[i]));
+                    categoryMapper.deleteOneCategoryFromDocument(document, categoryToEdit);
                 }
-                categoryMapper.deleteCategoryFromDb( categoryToEdit );
+                categoryMapper.deleteCategoryFromDb(categoryToEdit);
                 categoryToEdit = null;
                 documentsOfOneCategory = null;
             }
         }
 
-        adminCategoriesPage.setCategoryTypeToEdit( categoryTypeToEdit );
-        adminCategoriesPage.setCategoryToEdit( categoryToEdit );
-        adminCategoriesPage.setDocumentsOfOneCategory( documentsOfOneCategory );
+        adminCategoriesPage.setCategoryTypeToEdit(categoryTypeToEdit);
+        adminCategoriesPage.setCategoryToEdit(categoryToEdit);
+        adminCategoriesPage.setDocumentsOfOneCategory(documentsOfOneCategory);
     }
 
-    private void forwardToImageBrowse( final AdminCategoriesPage adminCategoriesPage, HttpServletRequest request,
-                                       HttpServletResponse response ) throws ServletException, IOException {
+    private void forwardToImageBrowse(final AdminCategoriesPage adminCategoriesPage, HttpServletRequest request,
+                                      HttpServletResponse response) throws ServletException, IOException {
         ImageBrowser imageBrowser = new ImageBrowser();
-        imageBrowser.setSelectImageUrlCommand( new ImageBrowser.SelectImageUrlCommand() {
-            public void selectImageUrl( String imageUrl, HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
+        imageBrowser.setSelectImageUrlCommand(new ImageBrowser.SelectImageUrlCommand() {
+            public void selectImageUrl(String imageUrl, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
                 if (null != imageUrl) {
-                    imageUrl = "../images/"+imageUrl ;
+                    imageUrl = "../images/" + imageUrl;
                 }
-                adminCategoriesPage.getCategoryToEdit().setImageUrl( imageUrl );
-                forward( adminCategoriesPage, Utility.getLoggedOnUser( request ), request, response );
+                adminCategoriesPage.getCategoryToEdit().setImageUrl(imageUrl);
+                forward(adminCategoriesPage, Utility.getLoggedOnUser(request), request, response);
             }
-        } );
-        imageBrowser.forward( request, response );
+        });
+        imageBrowser.forward(request, response);
     }
 
-    private void viewCategory( CategoryTypeDomainObject categoryTypeToEdit, CategoryDomainObject categoryToEdit,
-                               HttpServletRequest req, AdminCategoriesPage formBean ) {
-        formBean.setMode(PARAMETER_MODE__VIEW_CATEGORY) ;
-        formBean.setCategoryTypeToEdit( categoryTypeToEdit );
-        if ( req.getParameter( PARAMETER_BUTTON__SELECT_CATEGORY_TYPE_TO_SHOW_OR_REMOVE ) != null ) {
-            formBean.setCategoryToEdit( null );
+    private void viewCategory(CategoryTypeDomainObject categoryTypeToEdit, CategoryDomainObject categoryToEdit,
+                              HttpServletRequest req, AdminCategoriesPage formBean) {
+        formBean.setMode(PARAMETER_MODE__VIEW_CATEGORY);
+        formBean.setCategoryTypeToEdit(categoryTypeToEdit);
+        if (req.getParameter(PARAMETER_BUTTON__SELECT_CATEGORY_TYPE_TO_SHOW_OR_REMOVE) != null) {
+            formBean.setCategoryToEdit(null);
         } else {
-            formBean.setCategoryToEdit( categoryToEdit );
+            formBean.setCategoryToEdit(categoryToEdit);
         }
     }
 
-    private void deleteCategoryType( CategoryTypeDomainObject categoryTypeToEdit, AdminCategoriesPage formBean,
-                                     CategoryMapper categoryMapper ) {
-        formBean.setMode(PARAMETER_MODE__DELETE_CATEGORY_TYPE) ;
+    private void deleteCategoryType(CategoryTypeDomainObject categoryTypeToEdit, AdminCategoriesPage formBean,
+                                    CategoryMapper categoryMapper) {
+        formBean.setMode(PARAMETER_MODE__DELETE_CATEGORY_TYPE);
         int numberOfCategories = 0;
-        if ( categoryTypeToEdit != null ) {
-            numberOfCategories = categoryMapper.getAllCategoriesOfType( categoryTypeToEdit ).length;
-            if ( numberOfCategories == 0 ) {
-                categoryMapper.deleteCategoryTypeFromDb( categoryTypeToEdit );
+        if (categoryTypeToEdit != null) {
+            numberOfCategories = categoryMapper.getAllCategoriesOfType(categoryTypeToEdit).length;
+            if (numberOfCategories == 0) {
+                categoryMapper.deleteCategoryTypeFromDb(categoryTypeToEdit);
             }
         }
-        formBean.setCategoryTypeToEdit( categoryTypeToEdit );
-        formBean.setNumberOfCategories( numberOfCategories );
+        formBean.setCategoryTypeToEdit(categoryTypeToEdit);
+        formBean.setNumberOfCategories(numberOfCategories);
     }
 
-    private void editCategoryType( CategoryTypeDomainObject categoryTypeToEdit, HttpServletRequest req,
-                                   AdminCategoriesPage formBean, CategoryMapper categoryMapper ) {
-        formBean.setMode(PARAMETER_MODE__EDIT_CATEGORY_TYPE) ;
-        formBean.setUniqueCategoryTypeName( true );
+    private void editCategoryType(CategoryTypeDomainObject categoryTypeToEdit, HttpServletRequest req,
+                                  AdminCategoriesPage formBean, CategoryMapper categoryMapper) {
+        formBean.setMode(PARAMETER_MODE__EDIT_CATEGORY_TYPE);
+        formBean.setUniqueCategoryTypeName(true);
 
-        if ( req.getParameter( PARAMETER_CATEGORY_TYPE_SAVE ) != null ) {
-            String newName = req.getParameter( PARAMETER__NAME ).trim();
-            if ( !newName.equals(categoryTypeToEdit.getName()) ) {
-                formBean.setUniqueCategoryTypeName( categoryMapper.isUniqueCategoryTypeName( newName ) );
+        if (req.getParameter(PARAMETER_CATEGORY_TYPE_SAVE) != null) {
+            String newName = req.getParameter(PARAMETER__NAME).trim();
+            if (!newName.equals(categoryTypeToEdit.getName())) {
+                formBean.setUniqueCategoryTypeName(categoryMapper.isUniqueCategoryTypeName(newName));
             }
-            if (formBean.isUniqueCategoryTypeName()){
-                int maxChoices = Integer.parseInt( req.getParameter( PARAMETER__MAX_CHOICES ) );
-                categoryTypeToEdit.setName( newName );
-                categoryTypeToEdit.setMaxChoices( maxChoices );
+            if (formBean.isUniqueCategoryTypeName()) {
+                int maxChoices = Integer.parseInt(req.getParameter(PARAMETER__MAX_CHOICES));
+                categoryTypeToEdit.setName(newName);
+                categoryTypeToEdit.setMaxChoices(maxChoices);
                 boolean inherited = getInheritedParameterFromRequest(req);
-                categoryTypeToEdit.setInherited( inherited );
-                categoryMapper.updateCategoryType( categoryTypeToEdit );
+                categoryTypeToEdit.setInherited(inherited);
+                categoryTypeToEdit.setImageArchive(getImageArchiveParameterFromRequest(req));
+                categoryMapper.updateCategoryType(categoryTypeToEdit);
             }
         }
-        formBean.setCategoryTypeToEdit( categoryTypeToEdit );
+        formBean.setCategoryTypeToEdit(categoryTypeToEdit);
     }
 
-    private void addCategoryType( HttpServletRequest req, AdminCategoriesPage formBean, CategoryMapper categoryMapper ) {
-        formBean.setMode(PARAMETER_MODE__ADD_CATEGORY_TYPE) ;
-        if ( req.getParameter( PARAMETER_CATEGORY_TYPE_ADD ) != null
-             && !req.getParameter( PARAMETER__NAME ).trim().equals( "" ) ){
+    private void addCategoryType(HttpServletRequest req, AdminCategoriesPage formBean, CategoryMapper categoryMapper) {
+        formBean.setMode(PARAMETER_MODE__ADD_CATEGORY_TYPE);
+        if (req.getParameter(PARAMETER_CATEGORY_TYPE_ADD) != null
+                && !req.getParameter(PARAMETER__NAME).trim().equals(""))
+        {
 
-            CategoryTypeDomainObject categoryType = createCategoryTypeFromRequest( req );
+            CategoryTypeDomainObject categoryType = createCategoryTypeFromRequest(req);
 
-            if ( categoryMapper.isUniqueCategoryTypeName( categoryType.getName() ) ) {
-                formBean.setUniqueCategoryTypeName( true );
-                categoryMapper.addCategoryTypeToDb( categoryType );
+            if (categoryMapper.isUniqueCategoryTypeName(categoryType.getName())) {
+                formBean.setUniqueCategoryTypeName(true);
+                categoryMapper.addCategoryTypeToDb(categoryType);
             } else {
-                formBean.setUniqueCategoryTypeName( false );
+                formBean.setUniqueCategoryTypeName(false);
             }
         }
     }
 
-    private CategoryTypeDomainObject createCategoryTypeFromRequest( HttpServletRequest req ) {
-        String categoryTypeName = req.getParameter( PARAMETER__NAME ).trim();
-        int maxChoices = Integer.parseInt( req.getParameter( PARAMETER__MAX_CHOICES ) );
-        boolean inherited = getInheritedParameterFromRequest(req ) ;
-        CategoryTypeDomainObject categoryType = new CategoryTypeDomainObject( 0, categoryTypeName, maxChoices, inherited );
+    private CategoryTypeDomainObject createCategoryTypeFromRequest(HttpServletRequest req) {
+        String categoryTypeName = req.getParameter(PARAMETER__NAME).trim();
+        int maxChoices = Integer.parseInt(req.getParameter(PARAMETER__MAX_CHOICES));
+        boolean inherited = getInheritedParameterFromRequest(req);
+        boolean imageArchive = getImageArchiveParameterFromRequest(req);
+        CategoryTypeDomainObject categoryType = new CategoryTypeDomainObject(0, categoryTypeName, maxChoices, inherited, imageArchive);
         return categoryType;
     }
 
-    private boolean getInheritedParameterFromRequest( HttpServletRequest request ) {
-        return null != request.getParameter(PARAMETER__INHERITED) ;
-    }
-
-    public static String createHtmlOptionListOfCategoryTypes( CategoryTypeDomainObject selectedType ) {
-        ImcmsServices imcref = Imcms.getServices();
-        CategoryTypeDomainObject[] categoryTypes = imcref.getCategoryMapper().getAllCategoryTypes();
-        String temps = "";
-        for ( int i = 0; i < categoryTypes.length; i++ ) {
-            boolean selected = selectedType != null && selectedType.getId() == categoryTypes[i].getId();
-            temps += "<option value=\""
-                     + categoryTypes[i].getId()
-                     + "\""
-                     + ( selected ? " selected" : "" )
-                     + ">"
-                     + categoryTypes[i].getName() + "</option>";
-        }
-        return temps;
+    private boolean getInheritedParameterFromRequest(HttpServletRequest request) {
+        return null != request.getParameter(PARAMETER__INHERITED);
     }
 
-    public static String createHtmlOptionListOfCategoriesForOneType( CategoryTypeDomainObject categoryType,
-                                                                     CategoryDomainObject selectedCategory ) {
-        CategoryMapper categoryMapper = Imcms.getServices().getCategoryMapper();
-
-        CategoryDomainObject[] categories = categoryMapper.getAllCategoriesOfType( categoryType );
-        String temps = "";
-        for ( int i = 0; i < categories.length; i++ ) {
-            boolean selected = selectedCategory != null && selectedCategory.equals( categories[i] );
-            temps += "<option value=\""
-                     + categories[i].getId()
-                     + "\""
-                     + ( selected ? " selected" : "" )
-                     + ">"
-                     + categories[i].getName() + "</option>";
-        }
-        return temps;
+    private boolean getImageArchiveParameterFromRequest(HttpServletRequest request) {
+        return request.getParameter(PARAMETER__IMAGE_ARCHIVE) != null;
     }
 
     public static class AdminCategoriesPage {
@@ -362,22 +367,21 @@ public static class AdminCategoriesPage {
         private String[] documentsOfOneCategory;
         private boolean uniqueCategoryName;
         private String mode;
+        private boolean uniqueCategoryTypeName;
 
         public boolean isUniqueCategoryTypeName() {
             return uniqueCategoryTypeName;
         }
 
-        public void setUniqueCategoryTypeName( boolean uniqueCategoryTypeName ) {
+        public void setUniqueCategoryTypeName(boolean uniqueCategoryTypeName) {
             this.uniqueCategoryTypeName = uniqueCategoryTypeName;
         }
 
-        private boolean uniqueCategoryTypeName;
-
         public CategoryDomainObject getCategoryToEdit() {
             return categoryToEdit;
         }
 
-        private void setCategoryToEdit( CategoryDomainObject categoryToEdit ) {
+        private void setCategoryToEdit(CategoryDomainObject categoryToEdit) {
             this.categoryToEdit = categoryToEdit;
         }
 
@@ -385,7 +389,7 @@ public CategoryTypeDomainObject getCategoryTypeToEdit() {
             return categoryTypeToEdit;
         }
 
-        private void setCategoryTypeToEdit( CategoryTypeDomainObject categoryTypeToEdit ) {
+        private void setCategoryTypeToEdit(CategoryTypeDomainObject categoryTypeToEdit) {
             this.categoryTypeToEdit = categoryTypeToEdit;
         }
 
@@ -393,7 +397,7 @@ public int getNumberOfCategories() {
             return numberOfCategories;
         }
 
-        private void setNumberOfCategories( int numberOfCategories ) {
+        private void setNumberOfCategories(int numberOfCategories) {
             this.numberOfCategories = numberOfCategories;
         }
 
@@ -401,7 +405,7 @@ public String[] getDocumentsOfOneCategory() {
             return documentsOfOneCategory;
         }
 
-        private void setDocumentsOfOneCategory( String[] documentsOfOneCategory ) {
+        private void setDocumentsOfOneCategory(String[] documentsOfOneCategory) {
             this.documentsOfOneCategory = documentsOfOneCategory;
         }
 
@@ -409,17 +413,17 @@ public boolean getUniqueCategoryName() {
             return uniqueCategoryName;
         }
 
-        private void setUniqueCategoryName( boolean bool ) {
+        private void setUniqueCategoryName(boolean bool) {
             uniqueCategoryName = bool;
         }
 
-        public void setMode( String mode ) {
-            this.mode = mode;
-        }
-
         public String getMode() {
             return mode;
         }
+
+        public void setMode(String mode) {
+            this.mode = mode;
+        }
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminCounter.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminCounter.java
index ae8a954269..48e3fffe33 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminCounter.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminCounter.java
@@ -1,14 +1,15 @@
 package com.imcode.imcms.servlet.superadmin;
 
+import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
 import imcode.server.Imcms;
-import imcode.server.ImcmsServices;
 import imcode.server.ImcmsConstants;
+import imcode.server.ImcmsServices;
 import imcode.server.user.UserDomainObject;
 import imcode.util.DateConstants;
 import imcode.util.Utility;
-import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
 import imcode.util.jscalendar.JSCalendar;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -24,14 +25,14 @@
 
 public class AdminCounter extends HttpServlet {
 
-    private final static Logger mainLog = Logger.getLogger( ImcmsConstants.MAIN_LOG );
+    private final static Logger mainLog = LogManager.getLogger(ImcmsConstants.MAIN_LOG);
     private final static String JSP_TEMPLATE = "admin_session_counter.jsp";
 
 
     public void doGet(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
 
-        doPost(req,res);
+        doPost(req, res);
 
     } // End doGet
 
@@ -41,33 +42,33 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
 
         ImcmsServices imcref = Imcms.getServices();
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            Utility.forwardToLogin( req, res );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.isSuperAdmin()) {
+            Utility.forwardToLogin(req, res);
             return;
         }
 
 
         // ***** SET COUNTER *****
-        if ( req.getParameter("setSessionCounter") != null ) {
+        if (req.getParameter("setSessionCounter") != null) {
             String userVal = (req.getParameter("counter_value") == null) ? "" : (req.getParameter("counter_value"));
             int theUserInt = 0;
             String oldCounterValue = "" + imcref.getSessionCounter();
 
             boolean ok = true;
             try {
-                if ( userVal.equals("") ) {
+                if (userVal.equals("")) {
                     ok = false;
                 }
                 theUserInt = Integer.parseInt(userVal);
 
-            } catch ( Exception e ) {
+            } catch (Exception e) {
                 ok = false;
             }
 
-            if ( ok ) {
+            if (ok) {
                 imcref.setSessionCounter(theUserInt);
-                mainLog.info("Session counter value updated by user: " + user.getLoginName() + ", new value = " + theUserInt + ", old value = " + oldCounterValue );
+                mainLog.info("Session counter value updated by user: " + user.getLoginName() + ", new value = " + theUserInt + ", old value = " + oldCounterValue);
             }
 
         }
@@ -79,14 +80,14 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
         Date currentDate = imcref.getSessionCounterDate();
         String newDateStr = dateFormat.format(currentDate);
 
-        if ( req.getParameter("setDate") != null ) {
+        if (req.getParameter("setDate") != null) {
 
             String dateStr = req.getParameter("date_value");
 
             try {
                 Date date = dateFormat.parse(dateStr);
                 newDateStr = dateFormat.format(date);
-                if ( !newDateStr.equals(dateStr) ) {
+                if (!newDateStr.equals(dateStr)) {
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     errormsg = langproperties.getProperty("error/servlet/AdminCounter/no_valid_date");
                     newDateStr = dateStr;
@@ -95,7 +96,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
                     mainLog.info("Session counter startdate value updated by user: " + user.getLoginName() + ", new date = " + newDateStr + ", old date = " + dateFormat.format(currentDate));
                 }
 
-            } catch ( ParseException pe ) {
+            } catch (ParseException pe) {
                 Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                 errormsg = langproperties.getProperty("error/servlet/AdminCounter/no_valid_date");
                 newDateStr = dateStr;
@@ -109,7 +110,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
         adminSessionCounterPage.setNewDateStr(newDateStr);
         adminSessionCounterPage.setErrormsg(errormsg);
 
-        adminSessionCounterPage.forward( req, res, user );
+        adminSessionCounterPage.forward(req, res, user);
 
     }
 
@@ -117,22 +118,22 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
     public static class AdminSessionCounterPage implements Serializable {
 
         public static final String REQUEST_ATTRIBUTE__PAGE = "sessioncounterpage";
-        public static final String REQUEST_PARAMETER__COUNTER_VALUE= "counter_value";
-        public static final String REQUEST_PARAMETER__DATE_VALUE= "date_value";
+        public static final String REQUEST_PARAMETER__COUNTER_VALUE = "counter_value";
+        public static final String REQUEST_PARAMETER__DATE_VALUE = "date_value";
 
-        private int counterValue ;
-        private String newDateStr ;
+        private int counterValue;
+        private String newDateStr;
         private String errormsg;
 
 
-        public void forward( HttpServletRequest request, HttpServletResponse response, UserDomainObject user ) throws IOException, ServletException {
-            putInRequest( request );
+        public void forward(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) throws IOException, ServletException {
+            putInRequest(request);
             String forwardPath = "/imcms/" + user.getLanguageIso639_2() + "/jsp/" + JSP_TEMPLATE;
-            request.getRequestDispatcher( forwardPath ).forward( request, response );
+            request.getRequestDispatcher(forwardPath).forward(request, response);
         }
 
-        public void putInRequest( HttpServletRequest request ) {
-            request.setAttribute( REQUEST_ATTRIBUTE__PAGE, this );
+        public void putInRequest(HttpServletRequest request) {
+            request.setAttribute(REQUEST_ATTRIBUTE__PAGE, this);
         }
 
         public int getCounterValue() {
@@ -151,17 +152,17 @@ public void setNewDateStr(String newDateStr) {
             this.newDateStr = newDateStr;
         }
 
-        public void setErrormsg(String errormsg) {
-            this.errormsg = errormsg;
-        }
-
         public String getErrormsg() {
             return errormsg;
         }
 
+        public void setErrormsg(String errormsg) {
+            this.errormsg = errormsg;
+        }
+
         public JSCalendar getJSCalendar(HttpServletRequest request) {
-            return new JSCalendar( Utility.getLoggedOnUser(request).getLanguageIso639_2(), request ) ;
+            return new JSCalendar(Utility.getLoggedOnUser(request).getLanguageIso639_2(), request);
         }
-     }
+    }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminDeleteDoc.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminDeleteDoc.java
index 888c5ee9a5..c39302b3eb 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminDeleteDoc.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminDeleteDoc.java
@@ -1,6 +1,6 @@
 package com.imcode.imcms.servlet.superadmin;
 
-import com.imcode.db.handlers.ObjectFromFirstRowResultSetHandler;
+import com.imcode.db.handlers.SingleObjectHandler;
 import com.imcode.imcms.db.StringFromRowFactory;
 import com.imcode.imcms.mapping.DocumentMapper;
 import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
@@ -9,23 +9,27 @@
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
 public class AdminDeleteDoc extends HttpServlet {
 
-    private final static Logger log = Logger.getLogger( AdminDeleteDoc.class.getName() );
+    private final static Logger log = LogManager.getLogger(AdminDeleteDoc.class.getName());
 
     private final static String HTML_TEMPLATE = "AdminDeleteDoc.htm";
 
+    private final static String ERROR_MESSAGE = "ERROR_MESSAGE";
+
     /**
      * The GET method creates the html page when this side has been
      * redirected from somewhere else.
@@ -37,11 +41,10 @@ public void doGet(HttpServletRequest req, HttpServletResponse res)
         // Lets verify that this user is an admin
         ImcmsServices imcref = Imcms.getServices();
         UserDomainObject user = Utility.getLoggedOnUser(req);
-        if ( !user.isSuperAdmin() ) {
-            AdminIpAccess.printNonAdminError(imcref, user, req, res, getClass());
+        if (!user.isSuperAdmin()) {
+            AdminIpAccess.printNonAdminError(user, req, res, getClass());
         } else {
-            Map vm = new HashMap();
-            AdminRoles.sendHtml(req, res, vm, HTML_TEMPLATE);
+            sendHtmlWithErrorMessage(req, res, "");
         }
 
     }
@@ -49,61 +52,74 @@ public void doGet(HttpServletRequest req, HttpServletResponse res)
     public void doPost(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
 
+        ImcmsServices imcref = Imcms.getServices();
 
         // Lets check if the user is an admin, otherwise throw him out.
-        ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            AdminIpAccess.printNonAdminError(imcref, user, req, res, getClass());
-        } else {
-            if ( req.getParameter("DELETE_DOC") != null ) {
-
-                // Lets get the parameters from html page and validate them
-                Properties params = getParameters(req);
-                if ( !validateParameters(params) ) {
-                    String header = "Error in AdminDeleteDoc.";
-                    Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
-                    String msg = langproperties.getProperty("error/servlet/AdminDeleteDoc/no_valid_metaid") + "<br>";
-                    log.debug(header + "- no valid metaid");
-                    AdminRoles.printErrorMessage(req, res, header, msg);
-                    return;
-                }
-
-                // OK, Lets check that the metaid were gonna delete exists in db
-                int metaId = Integer.parseInt(params.getProperty("DEL_META_ID"));
-                final Object[] parameters = new String[] { ""
-                                                           + metaId };
-                String foundMetaId = (String) imcref.getProcedureExecutor().executeProcedure("FindMetaId", parameters, new ObjectFromFirstRowResultSetHandler(new StringFromRowFactory()));
-                log.debug("FoundMetaId: " + foundMetaId);
-
-                if ( foundMetaId == null ) {
-                    String header = "Error in AdminDeleteDoc. ";
-                    Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
-                    String msg = langproperties.getProperty("error/servlet/AdminDeleteDoc/no_metaid_in_db") + "( "
-                                 + metaId
-                                 + " ) <br>";
-                    log.debug(header + "- metaid could not be found in db");
-                    AdminRoles.printErrorMessage(req, res, header, msg);
-                    return;
-                }
-
-                // Ok, Lets delete the meta id
-                DocumentMapper documentMapper = imcref.getDocumentMapper();
-                DocumentDomainObject document = documentMapper.getDocument(metaId);
-                documentMapper.deleteDocument(document, user);
-                imcref.updateMainLog("Document  " + "[" + document.getId() +
-                                     "] ALL deleted by user: [" + user.getFullName() + "]");
-
-                doGet(req, res);
-                //this.goAdminUsers(req, res) ;
-            } else if ( req.getParameter("GO_BACK") != null ) {
-                String url = "AdminManager";
-                res.sendRedirect(url);
-            } else {
-                log.debug("Unidentified argument was sent!");
-                doGet(req, res);
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.isSuperAdmin()) {
+            AdminIpAccess.printNonAdminError(user, req, res, getClass());
+            return;
+        }
+
+        if (req.getParameter("DELETE_DOC") != null) {
+            // Lets get the parameters from html page and validate them
+            Properties params = getParameters(req);
+
+            if (!validateParameters(params)) {
+                String header = "Error in AdminDeleteDoc.";
+                Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
+                String msg = langproperties.getProperty("error/servlet/AdminDeleteDoc/no_valid_metaid");
+                log.debug(header + "- no valid metaid");
+
+                sendHtmlWithErrorMessage(req, res, msg);
+                return;
             }
+
+            final int metaId = Integer.parseInt(params.getProperty("DEL_META_ID"));
+
+            //Let's check if the document is protected from deletion
+            if (isDeletionProtectedDocument(metaId)) {
+                String header = "Error in AdminDeleteDoc.";
+                Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
+                String msg = langproperties.getProperty("error/servlet/AdminDeleteDoc/protected_document");
+                log.debug(header + "- metaid could not be found in db");
+
+                sendHtmlWithErrorMessage(req, res, msg);
+                return;
+            }
+
+            // OK, Lets check that the metaid were gonna delete exists in db
+            final Object[] parameters = new String[]{""
+                    + metaId};
+            String foundMetaId = (String) imcref.getProcedureExecutor().executeProcedure("FindMetaId", parameters, new SingleObjectHandler<>(new StringFromRowFactory()));
+            log.debug("FoundMetaId: " + foundMetaId);
+
+            if (foundMetaId == null) {
+                String header = "Error in AdminDeleteDoc. ";
+                Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
+                String msg = langproperties.getProperty("error/servlet/AdminDeleteDoc/no_metaid_in_db") + " ( " + metaId + " )";
+                log.debug(header + "- metaid could not be found in db");
+
+                sendHtmlWithErrorMessage(req, res, msg);
+                return;
+            }
+            // Ok, Lets delete the meta id
+            DocumentMapper documentMapper = imcref.getDocumentMapper();
+            DocumentDomainObject document = documentMapper.getDocument(metaId);
+            documentMapper.deleteDocument(document, user);
+            imcref.updateMainLog("Document  " + "[" + document.getId() +
+                    "] ALL deleted by user: [" + user.getFullName() + "]");
+
+            doGet(req, res);
+
+        } else if (req.getParameter("GO_BACK") != null) {
+            String url = "AdminManager";
+            res.sendRedirect(url);
+        } else {
+            log.debug("Unidentified argument was sent!");
+            doGet(req, res);
         }
+
     } // end HTTP POST
 
     /**
@@ -127,7 +143,7 @@ private Properties getParameters(HttpServletRequest req) {
 
     private boolean validateParameters(Properties params) {
 
-        if ( params.values().contains("") ) { 
+        if (params.values().contains("")) {
             return false;
         }
         try {
@@ -138,5 +154,17 @@ private boolean validateParameters(Properties params) {
         return true;
     }
 
+    private boolean isDeletionProtectedDocument(int docId) {
+        String deleteProtectedMetaIds = Imcms.getServerProperties().getProperty("DeleteProtectedMetaIds");
+
+        return !deleteProtectedMetaIds.isEmpty() && Arrays.stream(deleteProtectedMetaIds.split(","))
+                .anyMatch(protectedId -> docId == Integer.parseInt(protectedId.trim()));
+    }
+
+    private void sendHtmlWithErrorMessage(HttpServletRequest req, HttpServletResponse res, String errorMsg) throws IOException {
+        Map vm = new HashMap();
+        vm.put(ERROR_MESSAGE, errorMsg);
+        AdminRoles.sendHtml(req, res, vm, HTML_TEMPLATE);
+    }
 
 } // End of class
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminIpAccess.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminIpAccess.java
index 7f43a55afe..ad3cef212e 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminIpAccess.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminIpAccess.java
@@ -8,7 +8,8 @@
 import imcode.util.Html;
 import imcode.util.Utility;
 import org.apache.commons.lang.ClassUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -20,30 +21,38 @@
 
 public class AdminIpAccess extends HttpServlet {
 
-    private final static Logger log = Logger.getLogger( AdminIpAccess.class );
+    private final static Logger log = LogManager.getLogger(AdminIpAccess.class);
 
     private static final String HTML_TEMPLATE = "AdminIpAccess.htm";
     private static final String HTML_IP_SNIPPET = "AdminIpAccessList.htm";
     private static final String ADD_IP_TEMPLATE = "AdminIpAccess_Add.htm";
     private static final String WARN_DEL_IP_TEMPLATE = "AdminIpAccess_Delete2.htm";
 
+    static void printNonAdminError(UserDomainObject user, HttpServletRequest req,
+                                   HttpServletResponse res, Class clazz) throws IOException {
+        final Properties langProperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
+        final String msg = langProperties.getProperty("error/servlet/global/no_administrator") + "<br>";
+        final String header = "Error in " + ClassUtils.getShortClassName(clazz) + ".";
+        log.debug(header + "- user is not an administrator");
+        AdminRoles.printErrorMessage(req, res, header, msg);
+    }
+
     /**
      * The GET method creates the html page when this page has been
      * redirected from somewhere else.
      */
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res )
-            throws ServletException, IOException {
-
-        ImcmsServices imcref = Imcms.getServices();
+        ImcmsServices imcmsServices = Imcms.getServices();
 
         // ********** GENERATE THE IP-ACCESS PAGE *********
         // Lets get all IP-accesses from DB
         final Object[] parameters = new String[0];
-        String[][] multi = (String[][]) imcref.getProcedureExecutor().executeProcedure("IPAccessesGetAll", parameters, new StringArrayArrayResultSetHandler());
+        String[][] multi = (String[][]) imcmsServices.getProcedureExecutor()
+                .executeProcedure("IPAccessesGetAll", parameters, new StringArrayArrayResultSetHandler());
 
         // Lets build the variables for each record
-        List tags = new ArrayList();
+        List<String> tags = new ArrayList<>();
         tags.add("IP_ACCESS_ID");
         tags.add("USER_ID");
         tags.add("LOGIN_NAME");
@@ -53,12 +62,12 @@ public void doGet( HttpServletRequest req, HttpServletResponse res )
         // Lets parse each record and put it in a string
         String recs = "";
         int nbrOfRows = multi.length;
-        for ( int counter = 0; counter < nbrOfRows; counter++ ) {
-            List aRecV = new ArrayList(Arrays.asList(multi[counter]));
-            Map vmRec = new HashMap();
-            aRecV.set(3, Utility.ipLongToString(Long.parseLong((String) aRecV.get(3))));
-            aRecV.set(4, Utility.ipLongToString(Long.parseLong((String) aRecV.get(4))));
-            for ( int i = 0; i < tags.size(); i++ ) {
+        for (int counter = 0; counter < nbrOfRows; counter++) {
+            List<String> aRecV = new ArrayList<>(Arrays.asList(multi[counter]));
+            Map<String, String> vmRec = new HashMap<>();
+            aRecV.set(3, Utility.ipLongToString(Long.parseLong(aRecV.get(3))));
+            aRecV.set(4, Utility.ipLongToString(Long.parseLong(aRecV.get(4))));
+            for (int i = 0; i < tags.size(); i++) {
                 vmRec.put(tags.get(i), aRecV.get(i));
             }
             vmRec.put("RECORD_COUNTER", "" + counter);
@@ -66,90 +75,89 @@ public void doGet( HttpServletRequest req, HttpServletResponse res )
         }
 
         // Lets generate the html page
-        Map vm = new HashMap();
+        Map<String, String> vm = new HashMap<>();
         vm.put("ALL_IP_ACCESSES", recs);
         AdminRoles.sendHtml(req, res, vm, HTML_TEMPLATE);
     }
 
-    public void doPost( HttpServletRequest req, HttpServletResponse res )
+    public void doPost(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
 
         // Lets check if the user is an admin, otherwise throw him out.
-        ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            printNonAdminError(imcref, user, req, res, getClass());
+        ImcmsServices imcmsServices = Imcms.getServices();
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.isSuperAdmin()) {
+            printNonAdminError(user, req, res, getClass());
         } else {
-            if ( req.getParameter("ADD_IP_ACCESS") != null ) {
+            if (req.getParameter("ADD_IP_ACCESS") != null) {
 
                 // Lets get all USERS from DB
-                String usersOption = Html.createUsersOptionList(imcref);
+                String usersOption = Html.createUsersOptionList(imcmsServices);
 
                 // Lets generate the html page
-                Map vm = new HashMap();
+                Map<String, String> vm = new HashMap<>();
                 vm.put("USERS_LIST", usersOption);
                 AdminRoles.sendHtml(req, res, vm, ADD_IP_TEMPLATE);
-            } else if ( req.getParameter("CANCEL_ADD_IP") != null || req.getParameter("IP_CANCEL_DELETE") != null ) {
+            } else if (req.getParameter("CANCEL_ADD_IP") != null || req.getParameter("IP_CANCEL_DELETE") != null) {
                 res.sendRedirect("AdminIpAccess?action=start");
-            } else if ( req.getParameter("ADD_NEW_IP_ACCESS") != null ) {
+            } else if (req.getParameter("ADD_NEW_IP_ACCESS") != null) {
                 log.debug("Now's ADD_IP_ACCESS running");
 
                 // Lets get the parameters from html page and validate them
                 Properties params = getAddParameters(req);
-                params = validateParameters(params, req, res, imcref, user);
-                if ( params == null ) {
+                params = validateParameters(params, req, res, user);
+                if (params == null) {
                     return;
                 }
 
-                final Object[] parameters = new String[] { params.getProperty("USER_ID"),
+                final Object[] parameters = new String[]{params.getProperty("USER_ID"),
                         params.getProperty("IP_START"),
-                        params.getProperty("IP_END") };
-                imcref.getProcedureExecutor().executeUpdateProcedure("IPAccessAdd", parameters);
+                        params.getProperty("IP_END")};
+                imcmsServices.getProcedureExecutor().executeUpdateProcedure("IPAccessAdd", parameters);
                 res.sendRedirect("AdminIpAccess?action=start");
-            } else if ( req.getParameter("RESAVE_IP_ACCESS") != null ) {
+            } else if (req.getParameter("RESAVE_IP_ACCESS") != null) {
 
                 // Lets get all the ip_access id:s
                 String[] reSavesIds = getEditedIpAccesses(req);
 
                 // Lets resave all marked ip-accesses.
-                if ( reSavesIds != null ) {
-                    for ( int i = 0; i < reSavesIds.length; i++ ) {
-                        log.debug("ResaveId: " + reSavesIds[i]);
-                        String tmpId = reSavesIds[i];
+                if (reSavesIds != null) {
+                    for (String reSavesId : reSavesIds) {
+                        log.debug("ResaveId: " + reSavesId);
                         // Lets get all edited fields for that ip-access
-                        String ipAccessId = req.getParameter("IP_ACCESS_ID_" + tmpId);
-                        String ipUserId = req.getParameter("IP_USER_ID_" + tmpId);
-                        String ipStart = req.getParameter("IP_START_" + tmpId);
-                        String ipEnd = req.getParameter("IP_END_" + tmpId);
+                        String ipAccessId = req.getParameter("IP_ACCESS_ID_" + reSavesId);
+                        String ipUserId = req.getParameter("IP_USER_ID_" + reSavesId);
+                        String ipStart = req.getParameter("IP_START_" + reSavesId);
+                        String ipEnd = req.getParameter("IP_END_" + reSavesId);
 
                         long ipStartInt = Utility.ipStringToLong(ipStart);
 
                         long ipEndInt = Utility.ipStringToLong(ipEnd);
 
-                        final Object[] parameters = new String[] { ipAccessId,
+                        final Object[] parameters = new String[]{ipAccessId,
                                 ipUserId,
                                 "" + ipStartInt,
-                                "" + ipEndInt };
-                        imcref.getProcedureExecutor().executeUpdateProcedure("IPAccessUpdate", parameters);
+                                "" + ipEndInt};
+                        imcmsServices.getProcedureExecutor().executeUpdateProcedure("IPAccessUpdate", parameters);
                     }
                 }
 
                 doGet(req, res);
-            } else if ( req.getParameter("IP_WARN_DELETE") != null ) {
+            } else if (req.getParameter("IP_WARN_DELETE") != null) {
 
                 // Lets get the parameters from html page and validate them
                 HttpSession session = req.getSession(false);
-                if ( session != null ) {
+                if (session != null) {
                     Enumeration enumNames = req.getParameterNames();
-                    while ( enumNames.hasMoreElements() ) {
+                    while (enumNames.hasMoreElements()) {
                         String paramName = (String) enumNames.nextElement();
                         String[] arr = req.getParameterValues(paramName);
                         session.setAttribute("IP." + paramName, arr);
                     }
                 } else {
                     String header = "Error in AdminIpAccess, delete. ";
-                    Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
-                    String msg = langproperties.getProperty("error/servlet/AdminIpAccess/no_session") + "<br>";
+                    Properties langProperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
+                    String msg = langProperties.getProperty("error/servlet/AdminIpAccess/no_session") + "<br>";
                     log.debug(header + "- session could not be created");
                     AdminRoles.printErrorMessage(req, res, header, msg);
                     return;
@@ -158,27 +166,27 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 // Lets generate the last warning html page
                 Map vm = new HashMap();
                 AdminRoles.sendHtml(req, res, vm, WARN_DEL_IP_TEMPLATE);
-            } else if ( req.getParameter("DEL_IP_ACCESS") != null ) {
+            } else if (req.getParameter("DEL_IP_ACCESS") != null) {
                 HttpSession session = req.getSession(false);
-                if ( session != null ) {
+                if (session != null) {
                     log.debug("Ok, ta bort en Ip-access: " + session.toString());
 
                     String[] deleteIds = (String[]) session.getAttribute("IP.EDIT_IP_ACCESS");
 
                     // Lets resave all marked ip-accesses.
-                    if ( deleteIds != null ) {
-                        for ( int i = 0; i < deleteIds.length; i++ ) {
-                            String tmpId = "IP.IP_ACCESS_ID_" + deleteIds[i];
+                    if (deleteIds != null) {
+                        for (String deleteId : deleteIds) {
+                            String tmpId = "IP.IP_ACCESS_ID_" + deleteId;
                             String[] tmpArr = (String[]) session.getAttribute(tmpId);
                             String ipAccessId = tmpArr[0];
-                            final Object[] parameters = new String[] { ipAccessId };
-                            imcref.getProcedureExecutor().executeUpdateProcedure("IPAccessDelete", parameters);
+                            final Object[] parameters = new String[]{ipAccessId};
+                            imcmsServices.getProcedureExecutor().executeUpdateProcedure("IPAccessDelete", parameters);
                         }
                     }
                 } else {
                     String header = "Error in AdminIpAccess, delete.";
-                    Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
-                    String msg = langproperties.getProperty("error/servlet/AdminIpAccess/no_session") + "<br>";
+                    Properties langProperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
+                    String msg = langProperties.getProperty("error/servlet/AdminIpAccess/no_session") + "<br>";
                     log.debug(header + "- session could not be created");
                     AdminRoles.printErrorMessage(req, res, header, msg);
                     return;
@@ -189,19 +197,10 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
 
     } // end HTTP POST
 
-    static void printNonAdminError(ImcmsServices imcref, UserDomainObject user, HttpServletRequest req,
-                                   HttpServletResponse res, Class clazz) throws IOException {
-        Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
-        String msg = langproperties.getProperty("error/servlet/global/no_administrator") + "<br>";
-        String header = "Error in "+ ClassUtils.getShortClassName(clazz) +".";
-        log.debug(header + "- user is not an administrator");
-        AdminRoles.printErrorMessage(req, res, header, msg);
-    }
-
     /**
      * Collects the parameters from the request object for the add function
      */
-    private Properties getAddParameters( HttpServletRequest req ) {
+    private Properties getAddParameters(HttpServletRequest req) {
 
         Properties ipInfo = new Properties();
         // Lets get the parameters we know we are supposed to get from the request object
@@ -209,21 +208,20 @@ private Properties getAddParameters( HttpServletRequest req ) {
         String ipStart = req.getParameter("IP_START") == null ? "" : req.getParameter("IP_START").trim();
         String ipEnd = req.getParameter("IP_END") == null ? "" : req.getParameter("IP_END").trim();
 
-        long ipStartInt = Utility.ipStringToLong( ipStart );
+        long ipStartInt = Utility.ipStringToLong(ipStart);
 
-        long ipEndInt = Utility.ipStringToLong( ipEnd );
+        long ipEndInt = Utility.ipStringToLong(ipEnd);
 
-        ipInfo.setProperty( "USER_ID", user_id );
-        ipInfo.setProperty( "IP_START", String.valueOf( ipStartInt ) );
-        ipInfo.setProperty( "IP_END", String.valueOf( ipEndInt ) );
+        ipInfo.setProperty("USER_ID", user_id);
+        ipInfo.setProperty("IP_START", String.valueOf(ipStartInt));
+        ipInfo.setProperty("IP_END", String.valueOf(ipEndInt));
         return ipInfo;
     }
 
     /**
      * Collects the parameters used to delete a reply
      */
-
-    private String[] getEditedIpAccesses( HttpServletRequest req ) {
+    private String[] getEditedIpAccesses(HttpServletRequest req) {
 
         // Lets get the standard discussion_id to delete
         return req.getParameterValues("EDIT_IP_ACCESS");
@@ -233,13 +231,12 @@ private String[] getEditedIpAccesses( HttpServletRequest req ) {
      * Returns a Properties, containing the user information from the html page. if Something
      * failes, a error page will be generated and null will be returned.
      */
+    private Properties validateParameters(Properties aPropObj, HttpServletRequest req, HttpServletResponse res, UserDomainObject user) throws IOException {
 
-    private Properties validateParameters( Properties aPropObj, HttpServletRequest req, HttpServletResponse res, ImcmsServices imcref, UserDomainObject user ) throws IOException {
-
-        if ( aPropObj.values().contains("") ) {
+        if (aPropObj.values().contains("")) {
             String header = "Error in AdminIpAccess, assertNoEmptyStringsInPropertyValues.";
-            Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
-            String msg = langproperties.getProperty("error/servlet/AdminIpAccess/vaidate_form_parameters") + "<br>";
+            Properties langProperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
+            String msg = langProperties.getProperty("error/servlet/AdminIpAccess/vaidate_form_parameters") + "<br>";
             log.debug(header + "- values is missing for some parameters");
             AdminRoles.printErrorMessage(req, res, header, msg);
             return null;
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminIpWhiteList.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminIpWhiteList.java
new file mode 100644
index 0000000000..985cf44b37
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminIpWhiteList.java
@@ -0,0 +1,326 @@
+package com.imcode.imcms.servlet.superadmin;
+
+import com.imcode.db.DatabaseCommand;
+import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
+import com.imcode.db.commands.SqlQueryCommand;
+import com.imcode.db.commands.SqlQueryDatabaseCommand;
+import com.imcode.db.commands.SqlUpdateCommand;
+import com.imcode.db.handlers.CollectionHandler;
+import com.imcode.db.handlers.RowTransformer;
+import com.imcode.imcms.servlet.RoleIpRange;
+import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
+import imcode.server.Imcms;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.validator.routines.InetAddressValidator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Feature allows to define IP white list per user role.
+ *
+ * @author Serhii Maksymchuk from Ubrainians for imCode
+ * 20.11.17.
+ */
+public class AdminIpWhiteList extends HttpServlet {
+
+    private static final Logger log = LogManager.getLogger(AdminIpWhiteList.class);
+
+    private static final String WHITE_LIST_TEMPLATE = "AdminIpWhiteList.jsp";
+    private static final String WHITE_LIST_ADD_TEMPLATE = "AdminIpWhiteList_Add.jsp";
+    private static final String WARN_DEL_IP_TEMPLATE = "AdminIpWhiteList_Delete.jsp";
+
+    private static final String TABLE_NAME = "imcms_ip_white_list";
+    private static final String IS_ADMIN = "is_admin";
+    private static final String IP_RANGE_FROM = "ip_range_from";
+    private static final String IP_RANGE_TO = "ip_range_to";
+    private static final String IP_DESCRIPTION = "description";
+    private static final String SELECT_IP_WHITE_LIST_QUERY =
+            "SELECT id, " + IS_ADMIN + ", " + IP_RANGE_FROM + ", " + IP_RANGE_TO + ", " + IP_DESCRIPTION
+                    + " FROM " + TABLE_NAME
+                    + " ORDER BY id";
+    private static final String SELECT_SETTING_IP_WHITELIST_VIA_HTTPS = "SELECT value FROM document_properties where key_name = 'imcms.ip.whitelist.https' AND meta_id = 1001";
+    private static final String UPDATE_SETTING_IP_WHITELIST_VIA_HTTPS = "INSERT INTO document_properties (meta_id, key_name, value) VALUES (1001, 'imcms.ip.whitelist.https', ?) ON DUPLICATE KEY UPDATE value = ?";
+
+    private final InetAddressValidator ipValidator = InetAddressValidator.getInstance();
+
+    public static List<RoleIpRange> getRoleIpRanges() {
+        final RowTransformer<RoleIpRange> rowTransformer = new RowTransformer<RoleIpRange>() {
+            @Override
+            public RoleIpRange createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
+                final int id = resultSet.getInt("id");
+                final boolean isAdmin = resultSet.getBoolean(IS_ADMIN);
+                final String ipFrom = resultSet.getString(IP_RANGE_FROM);
+                final String ipTo = resultSet.getString(IP_RANGE_TO);
+                final String ipDescription = resultSet.getString(IP_DESCRIPTION);
+                return new RoleIpRange(id, isAdmin, ipFrom, ipTo, ipDescription);
+            }
+
+            @Override
+            public Class<RoleIpRange> getClassOfCreatedObjects() {
+                return RoleIpRange.class;
+            }
+        };
+
+        final CollectionHandler<RoleIpRange, List<RoleIpRange>> collectionHandler =
+                new CollectionHandler<>(new ArrayList<>(), rowTransformer);
+
+        final DatabaseCommand<List<RoleIpRange>> queryCommand = new SqlQueryDatabaseCommand<>(
+                SELECT_IP_WHITE_LIST_QUERY, new Object[]{}, collectionHandler
+        );
+
+        return Imcms.getServices().getDatabase().execute(queryCommand);
+    }
+
+    public static boolean isHttpsRequired() {
+        final String isHttpsRequired = Imcms.getServices()
+                .getDatabase()
+                .execute(new SqlQueryCommand<>(
+                        SELECT_SETTING_IP_WHITELIST_VIA_HTTPS,
+                        new String[]{},
+                        Utility.SINGLE_STRING_HANDLER
+                ));
+
+        return BooleanUtils.toBoolean(isHttpsRequired);
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        final UserDomainObject user = Utility.getLoggedOnUser(request);
+
+        if (!user.isSuperAdmin()) {
+            AdminIpAccess.printNonAdminError(user, request, response, getClass());
+            return;
+        }
+
+        setRangesAndViewDataAndForwardTo(WHITE_LIST_TEMPLATE, request, response, user);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        final UserDomainObject user = Utility.getLoggedOnUser(request);
+
+        if (!user.isSuperAdmin()) {
+            AdminIpAccess.printNonAdminError(user, request, response, getClass());
+
+        } else if (request.getParameter("ADD_IP_RANGE") != null) {
+            setViewDataAndForwardTo(WHITE_LIST_ADD_TEMPLATE, request, response, user);
+
+        } else if (request.getParameter("ADD_NEW_IP_RANGE") != null) {
+            addNewIpRange(request, response);
+
+        } else if ((request.getParameter("CANCEL_ADD_IP") != null)
+                || (request.getParameter("IP_CANCEL_DELETE") != null))
+        {
+            doGet(request, response);
+
+        } else if (request.getParameter("UPDATE_IP_RANGE") != null) {
+            updateIpRange(request, response);
+
+        } else if (request.getParameter("IP_WARN_DELETE") != null) {
+            showDeletionWarning(request, response, user);
+
+        } else if (request.getParameter("DEL_IP_RANGE") != null) {
+            deleteIpRange(request, response);
+
+        } else if (request.getParameter("LOGIN_VIA_HTTPS") != null) {
+            setLoginViaHttps(request, response, user);
+        }
+    }
+
+    private void setLoginViaHttps(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) throws ServletException, IOException {
+        String loginViaHttps = request.getParameter("LOGIN_VIA_HTTPS");
+        loginViaHttps = BooleanUtils.toBooleanObject(loginViaHttps).toString(); // "on/off" transfers to "true/false"
+
+        final SqlUpdateCommand command = new SqlUpdateCommand(UPDATE_SETTING_IP_WHITELIST_VIA_HTTPS, new Object[]{
+                loginViaHttps, loginViaHttps // exactly twice
+        });
+        Imcms.getServices().getDatabase().execute(command);
+
+        setRangesAndViewDataAndForwardTo(WHITE_LIST_TEMPLATE, request, response, user);
+    }
+
+    private void showDeletionWarning(HttpServletRequest request, HttpServletResponse response, UserDomainObject user)
+            throws ServletException, IOException {
+
+        final String[] editIpRangeIds = request.getParameterValues("EDIT_IP_RANGE_ID");
+
+        if (editIpRangeIds == null || editIpRangeIds.length == 0) {
+            doGet(request, response);
+            return;
+        }
+
+        request.setAttribute("DELETE_IP_RANGE_ID", editIpRangeIds);
+        setViewDataAndForwardTo(WARN_DEL_IP_TEMPLATE, request, response, user);
+    }
+
+    private void deleteIpRange(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        final String[] deleteIpRangeIdsStr = request.getParameterValues("DELETE_IP_RANGE_ID");
+
+        if (deleteIpRangeIdsStr == null || deleteIpRangeIdsStr.length == 0) {
+            doGet(request, response);
+            return;
+        }
+
+        final Integer[] deleteIpRangeIds = new Integer[deleteIpRangeIdsStr.length];
+        String sql = "DELETE FROM " + TABLE_NAME + " WHERE";
+
+        for (int i = 0; i < deleteIpRangeIdsStr.length; i++) {
+            if (i != 0) {
+                sql = sql.concat(" OR");
+            }
+
+            sql = sql.concat(" id = ?");
+
+            deleteIpRangeIds[i] = Integer.parseInt(deleteIpRangeIdsStr[i]);
+        }
+
+        Imcms.getServices().getDatabase().execute(new SqlUpdateCommand(sql, deleteIpRangeIds));
+        doGet(request, response);
+    }
+
+    private void updateIpRange(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        final String[] editIpRangeIds = request.getParameterValues("EDIT_IP_RANGE_ID");
+
+        if ((editIpRangeIds == null) || (editIpRangeIds.length == 0)) {
+            doGet(request, response);
+            return;
+        }
+
+        for (String editIpRangeId : editIpRangeIds) {
+            final int rangeId = Integer.parseInt(editIpRangeId);
+            final String ipFrom = request.getParameter("IP_START" + rangeId);
+            final String ipTo = request.getParameter("IP_END" + rangeId);
+            final String ipDescription = request.getParameter("IP_DESCRIPTION" + rangeId);
+
+            if (ipValidator.isValidInet4Address(ipFrom)
+                    && ipValidator.isValidInet4Address(ipTo)
+                    && isIpFromLessThanIpTo(ipFrom, ipTo))
+            {
+                final String sql = "UPDATE " + TABLE_NAME
+                        + " SET " + IP_RANGE_FROM + " = ?,"
+                        + " " + IP_RANGE_TO + " = ?,"
+                        + " " + IP_DESCRIPTION + " = ?"
+                        + " WHERE id = ?";
+
+                final Object[] params = {ipFrom, ipTo, ipDescription, rangeId};
+
+                log.info("Updating IP range with id " + rangeId + " from " + ipFrom + " to " + ipTo);
+
+                Imcms.getServices().getDatabase().execute(new SqlUpdateCommand(sql, params));
+            }
+        }
+
+        doGet(request, response);
+    }
+
+    private void addNewIpRange(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        final String ipFrom = request.getParameter("IP_START");
+        final String ipTo = request.getParameter("IP_END");
+        final String ipDescription = request.getParameter("IP_DESCRIPTION");
+
+        if (ipValidator.isValidInet4Address(ipFrom)
+                && ipValidator.isValidInet4Address(ipTo)
+                && isIpFromLessThanIpTo(ipFrom, ipTo))
+        {
+            final String isAdmin = String.valueOf(request.getParameter("IS_ADMIN"));
+            final String[][] commandParams = new String[][]{
+                    {IS_ADMIN, isAdmin},
+                    {IP_RANGE_FROM, ipFrom},
+                    {IP_RANGE_TO, ipTo},
+                    {IP_DESCRIPTION, ipDescription},
+            };
+
+            log.info("Adding new IP range from " + ipFrom + " to " + ipTo + " for "
+                    + ("1".equals(isAdmin) ? "super" : "non") + "-admin roles.");
+
+            Imcms.getServices().getDatabase().execute(new InsertIntoTableDatabaseCommand(TABLE_NAME, commandParams));
+
+            doGet(request, response);
+
+        } else {
+            doError(request, response);
+        }
+    }
+
+    private void setViewDataAndForwardTo(String templateName,
+                                         HttpServletRequest request,
+                                         HttpServletResponse response,
+                                         UserDomainObject user) throws ServletException, IOException {
+
+        final String templatePath = getAdminTemplatePath(templateName, user);
+        final String language = user.getLanguageIso639_2();
+
+        String userIP = request.getRemoteAddr();
+
+        if ("0:0:0:0:0:0:0:1".equals(userIP)) {
+            userIP = "127.0.0.1"; // localhost handled here
+        }
+
+        request.setAttribute("contextPath", request.getContextPath());
+        request.setAttribute("language", language);
+        request.setAttribute("userIP", userIP);
+        request.getRequestDispatcher(templatePath).forward(request, response);
+    }
+
+    private void setRangesAndViewDataAndForwardTo(String templateName,
+                                                  HttpServletRequest request,
+                                                  HttpServletResponse response,
+                                                  UserDomainObject user) throws ServletException, IOException {
+
+        final String templatePath = getAdminTemplatePath(templateName, user);
+        final List<RoleIpRange> roleIpRanges = getRoleIpRanges();
+        final String language = user.getLanguageIso639_2();
+
+        String userIP = request.getRemoteAddr();
+
+        if ("0:0:0:0:0:0:0:1".equals(userIP)) {
+            userIP = "127.0.0.1"; // localhost handled here
+        }
+
+        request.setAttribute("contextPath", request.getContextPath());
+        request.setAttribute("language", language);
+        request.setAttribute("userIP", userIP);
+        request.setAttribute("roleIpRanges", roleIpRanges);
+        request.setAttribute("isHttpsRequired", isHttpsRequired());
+        request.getRequestDispatcher(templatePath).forward(request, response);
+    }
+
+    private void doError(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        final UserDomainObject user = Utility.getLoggedOnUser(request);
+        final String header = "Error in AdminIpWhiteList";
+        final String msg = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user)
+                .getProperty("error/servlet/AdminIpWhiteList/validate_form_parameters") + "<br>";
+
+        AdminRoles.printErrorMessage(request, response, header, msg);
+    }
+
+    private boolean isIpFromLessThanIpTo(String ipFrom, String ipTo) {
+        final long ipFromLong = Utility.ipStringToLong(ipFrom);
+        final long ipToLong = Utility.ipStringToLong(ipTo);
+
+        return ipFromLong <= ipToLong;
+    }
+
+    private String getAdminTemplatePath(String templateFileName, UserDomainObject user) {
+        return "/WEB-INF/templates/" + user.getLanguageIso639_2() + "/admin/" + templateFileName;
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminManager.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminManager.java
index a1749cba23..04af3740e0 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminManager.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminManager.java
@@ -14,18 +14,14 @@
 import com.imcode.util.ChainableReversibleNullComparator;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
-import imcode.server.document.DocumentComparator;
-import imcode.server.document.DocumentDomainObject;
-import imcode.server.document.NoPermissionToCreateDocumentException;
-import imcode.server.document.NoPermissionToEditDocumentException;
-import imcode.server.document.LifeCyclePhase;
+import imcode.server.document.*;
 import imcode.server.document.index.DocumentIndex;
 import imcode.server.document.index.SimpleDocumentQuery;
 import imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import imcode.util.Utility;
 import imcode.util.ShouldNotBeThrownException;
+import imcode.util.Utility;
 import imcode.util.jscalendar.JSCalendar;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
@@ -44,124 +40,155 @@
 
 public class AdminManager extends HttpServlet {
 
-    private final static String HTML_ADMINTASK = "AdminManager_adminTask_element.htm";
-    private final static String HTML_USERADMINTASK = "AdminManager_useradminTask_element.htm";
     public final static String REQUEST_PARAMETER__SHOW = "show";
     public final static String PARAMETER_VALUE__SHOW_CREATE = "create";
     public final static String PARAMETER_VALUE__SHOW_RECENT = "recent";
     public final static String PARAMETER_VALUE__SHOW_REMINDERS = "reminders";
     public final static String PARAMETER_VALUE__SHOW_SUMMARY = "summary";
     public final static String PARAMETER_VALUE__SHOW_SEARCH = "search";
-
     public static final int DEFAULT_DOCUMENTS_PER_LIST = 5;
     public static final String REQUEST_PARAMETER__FROMPAGE = "frompage";
     public static final String REQUEST_PARAMETER__CREATE_NEW_DOCUMENT = "create_new_document";
     public static final String REQUEST_PARAMETER__NEW_DOCUMENT_PARENT_ID = "parent_id";
     public static final String REQUEST_PARAMETER__CREATE_DOCUMENT_ACTION = "new_document_type_id";
     public static final String REQUEST_PARAMETER__ACTION__COPY = "copy";
-
     public static final String PAGE_SEARCH = "search";
-    private static final LocalizedMessage ERROR_MESSAGE__NO_CREATE_PERMISSION = new LocalizedMessage( "error/servlet/AdminManager/no_create_permission" );
-    private static final LocalizedMessage ERROR_MESSAGE__NO_PARENT_ID = new LocalizedMessage( "error/servlet/AdminManager/no_parent_id" );
-    private static final LocalizedMessage ERROR_MESSAGE__PARENT_MUST_BE_TEXT_DOCUMENT = new LocalizedMessage( "error/servlet/AdminManager/parent_must_be_text_document" );
+    private final static String HTML_ADMINTASK = "AdminManager_adminTask_element.htm";
+    private final static String HTML_USERADMINTASK = "AdminManager_useradminTask_element.htm";
+    private static final LocalizedMessage ERROR_MESSAGE__NO_CREATE_PERMISSION = new LocalizedMessage("error/servlet/AdminManager/no_create_permission");
+    private static final LocalizedMessage ERROR_MESSAGE__NO_PARENT_ID = new LocalizedMessage("error/servlet/AdminManager/no_parent_id");
+    private static final LocalizedMessage ERROR_MESSAGE__PARENT_MUST_BE_TEXT_DOCUMENT = new LocalizedMessage("error/servlet/AdminManager/parent_must_be_text_document");
+
+    public static ChainableReversibleNullComparator getComparator(String sortorder) {
+
+        ChainableReversibleNullComparator comparator = DocumentComparator.MODIFIED_DATETIME.reversed();
+        if ("MODR".equals(sortorder)) {
+            comparator = DocumentComparator.MODIFIED_DATETIME;
+        } else if ("PUBS".equals(sortorder)) {
+            comparator = DocumentComparator.PUBLICATION_START_DATETIME.reversed();
+        } else if ("PUBSR".equals(sortorder)) {
+            comparator = DocumentComparator.PUBLICATION_START_DATETIME;
+        } else if ("PUBE".equals(sortorder)) {
+            comparator = DocumentComparator.PUBLICATION_END_DATETIME.reversed().nullsLast();
+        } else if ("PUBER".equals(sortorder)) {
+            comparator = DocumentComparator.PUBLICATION_END_DATETIME.nullsLast();
+        } else if ("ARC".equals(sortorder)) {
+            comparator = DocumentComparator.ARCHIVED_DATETIME.reversed().nullsLast();
+        } else if ("ARCR".equals(sortorder)) {
+            comparator = DocumentComparator.ARCHIVED_DATETIME.nullsLast();
+        } else if ("HEADL".equals(sortorder)) {
+            comparator = DocumentComparator.HEADLINE;
+        } else if ("HEADLR".equals(sortorder)) {
+            comparator = DocumentComparator.HEADLINE.reversed();
+        } else if ("ID".equals(sortorder)) {
+            comparator = DocumentComparator.ID;
+        } else if ("IDR".equals(sortorder)) {
+            comparator = DocumentComparator.ID.reversed();
+        }
+        return comparator;
+    }
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-        this.doPost( req, res );
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        this.doPost(req, res);
     }
 
-    public void doPost( HttpServletRequest request, HttpServletResponse response )
+    public void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
         ImcmsServices service = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        Utility.setDefaultHtmlContentType( response );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        Utility.setDefaultHtmlContentType(response);
 
-        String whichButton = request.getParameter( "AdminTask" );
-        if ( null != whichButton ) {
+        String whichButton = request.getParameter("AdminTask");
+        if (null != whichButton) {
 
-            String url = getAdminTaskUrl( whichButton, request );
-            if ( !user.isSuperAdmin() && !user.isUserAdminAndCanEditAtLeastOneRole() ) {
-                Utility.forwardToLogin( request, response );
+            String url = getAdminTaskUrl(whichButton, request);
+            if (!user.isSuperAdmin() && !user.isUserAdminAndCanEditAtLeastOneRole()) {
+                Utility.forwardToLogin(request, response);
                 return;
             }
 
-            if ( StringUtils.isNotBlank( url ) ) {
-                response.sendRedirect( url );
+            if (StringUtils.isNotBlank(url)) {
+                response.sendRedirect(url);
                 return;
             }
         }
 
-        if ( !user.canAccessAdminPages() ) {
-            Utility.forwardToLogin( request, response );
+        if (!user.canAccessAdminPages()) {
+            Utility.forwardToLogin(request, response);
             return;
         }
 
         final DocumentMapper documentMapper = service.getDocumentMapper();
-        if ( Utility.parameterIsSet( request, REQUEST_PARAMETER__CREATE_NEW_DOCUMENT ) ) {
-        String parentPageId =  request.getParameter( REQUEST_PARAMETER__NEW_DOCUMENT_PARENT_ID );
+        if (Utility.parameterIsSet(request, REQUEST_PARAMETER__CREATE_NEW_DOCUMENT)) {
+            String parentPageId = request.getParameter(REQUEST_PARAMETER__NEW_DOCUMENT_PARENT_ID);
             try {
                 DocumentDomainObject parentDocument = documentMapper.getDocument(parentPageId.toLowerCase().trim());
-                String createDocumentAction = request.getParameter( REQUEST_PARAMETER__CREATE_DOCUMENT_ACTION );
-                if ( REQUEST_PARAMETER__ACTION__COPY.equals( createDocumentAction ) && parentDocument != null ) {
-                    documentMapper.copyDocument( parentDocument, user );
-                    createAndShowAdminManagerPage( request, response, null, PARAMETER_VALUE__SHOW_RECENT);
+                String createDocumentAction = request.getParameter(REQUEST_PARAMETER__CREATE_DOCUMENT_ACTION);
+                if (REQUEST_PARAMETER__ACTION__COPY.equals(createDocumentAction) && parentDocument != null) {
+                    documentMapper.copyDocument(parentDocument, user);
+                    createAndShowAdminManagerPage(request, response, null, PARAMETER_VALUE__SHOW_RECENT);
                 } else {
                     if (!(parentDocument instanceof TextDocumentDomainObject)) {
-                        createAndShowAdminManagerPage( request, response, ERROR_MESSAGE__PARENT_MUST_BE_TEXT_DOCUMENT, PARAMETER_VALUE__SHOW_CREATE);
-                        return ;
+                        createAndShowAdminManagerPage(request, response, ERROR_MESSAGE__PARENT_MUST_BE_TEXT_DOCUMENT, PARAMETER_VALUE__SHOW_CREATE);
+                        return;
                     }
-                    int documentTypeId = Integer.parseInt( createDocumentAction );
+                    int documentTypeId = Integer.parseInt(createDocumentAction);
 
                     DocumentPageFlow.SaveDocumentCommand saveNewDocumentCommand = new SaveNewDocumentCommand();
                     DispatchCommand returnCommand = new ShowRecentChangesPageCommand();
 
-                    DocumentCreator documentCreator = new DocumentCreator( saveNewDocumentCommand, returnCommand, getServletContext() );
-                    documentCreator.createDocumentAndDispatchToCreatePageFlow( documentTypeId, parentDocument, request, response );
+                    DocumentCreator documentCreator = new DocumentCreator(saveNewDocumentCommand, returnCommand, getServletContext());
+                    documentCreator.createDocumentAndDispatchToCreatePageFlow(documentTypeId, parentDocument, request, response);
                 }
-            } catch ( NumberFormatException nfe ) {
-                createAndShowAdminManagerPage( request, response, ERROR_MESSAGE__NO_PARENT_ID, PARAMETER_VALUE__SHOW_CREATE);
-            } catch ( NoPermissionToCreateDocumentException ex ) {
-                createAndShowAdminManagerPage( request, response, ERROR_MESSAGE__NO_CREATE_PERMISSION, PARAMETER_VALUE__SHOW_CREATE);
-            } catch ( NoPermissionToAddDocumentToMenuException e ) {
+            } catch (NumberFormatException nfe) {
+                createAndShowAdminManagerPage(request, response, ERROR_MESSAGE__NO_PARENT_ID, PARAMETER_VALUE__SHOW_CREATE);
+            } catch (NoPermissionToCreateDocumentException ex) {
+                createAndShowAdminManagerPage(request, response, ERROR_MESSAGE__NO_CREATE_PERMISSION, PARAMETER_VALUE__SHOW_CREATE);
+            } catch (NoPermissionToAddDocumentToMenuException e) {
                 throw new UnhandledException(e);
             } catch (DocumentSaveException e) {
                 throw new ShouldNotBeThrownException(e);
             }
         } else {
-            createAndShowAdminManagerPage( request, response, null);
+            createAndShowAdminManagerPage(request, response, null);
         }
     }
 
-    private void createAndShowAdminManagerPage( HttpServletRequest request, HttpServletResponse response,
-                                                LocalizedMessage errorMessage ) throws IOException, ServletException {
+    private void createAndShowAdminManagerPage(HttpServletRequest request, HttpServletResponse response,
+                                               LocalizedMessage errorMessage) throws IOException, ServletException {
 
-        String tabToShow = null != request.getParameter( REQUEST_PARAMETER__SHOW )
-                           ? request.getParameter( REQUEST_PARAMETER__SHOW ) : PARAMETER_VALUE__SHOW_CREATE;
+        String tabToShow = null != request.getParameter(REQUEST_PARAMETER__SHOW)
+                ? request.getParameter(REQUEST_PARAMETER__SHOW) : PARAMETER_VALUE__SHOW_CREATE;
 
         createAndShowAdminManagerPage(request, response, errorMessage, tabToShow);
     }
 
     private void createAndShowAdminManagerPage(HttpServletRequest request, HttpServletResponse response, LocalizedMessage errorMessage, String tabToShow) throws IOException, ServletException {
-        UserDomainObject loggedOnUser = Utility.getLoggedOnUser( request );
+        UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
         ImcmsServices service = Imcms.getServices();
         final DocumentMapper documentMapper = service.getDocumentMapper();
 
         String html_admin_part = "";
 
-        if ( loggedOnUser.isSuperAdmin() ) {
-            html_admin_part = service.getAdminTemplate( HTML_ADMINTASK, loggedOnUser, null ); // if superadmin
-        } else if ( loggedOnUser.isUserAdminAndCanEditAtLeastOneRole() ) { //if user is useradmin
-            html_admin_part = service.getAdminTemplate( HTML_USERADMINTASK, loggedOnUser, null ); //if useradmin
+        if (loggedOnUser.isSuperAdmin()) {
+	        String hasUserAccessKey = "#hasUserAccess#";
+	        String hasUserAccessValue = FileAdmin.hasAccess(loggedOnUser.getId()) ? "" : "disabled";
+
+	        html_admin_part = service.getAdminTemplate(HTML_ADMINTASK, loggedOnUser, Arrays.asList(hasUserAccessKey, hasUserAccessValue)); // if superadmin
+        } else if (loggedOnUser.isUserAdminAndCanEditAtLeastOneRole()) { //if user is useradmin
+            html_admin_part = service.getAdminTemplate(HTML_USERADMINTASK, loggedOnUser, null); //if useradmin
         }
 
         DocumentIndex index = documentMapper.getDocumentIndex();
 
-        Query query = new TermQuery( new Term( DocumentIndex.FIELD__CREATOR_ID, loggedOnUser.getId() + "" ) );
+        Query query = new TermQuery(new Term(DocumentIndex.FIELD__CREATOR_ID, loggedOnUser.getId() + ""));
 
         List documentsFound = Collections.EMPTY_LIST;
-        if ( tabToShow.equals( PARAMETER_VALUE__SHOW_RECENT ) || tabToShow.equals(PARAMETER_VALUE__SHOW_REMINDERS)
-             || tabToShow.equals(PARAMETER_VALUE__SHOW_SUMMARY) ) {
-            documentsFound = index.search( new SimpleDocumentQuery(query), loggedOnUser );
+        if (tabToShow.equals(PARAMETER_VALUE__SHOW_RECENT) || tabToShow.equals(PARAMETER_VALUE__SHOW_REMINDERS)
+                || tabToShow.equals(PARAMETER_VALUE__SHOW_SUMMARY))
+        {
+            documentsFound = index.search(new SimpleDocumentQuery(query), loggedOnUser);
         }
 
         AdminManagerSubreport newDocumentsSubreport = new AdminManagerSubreport();
@@ -171,266 +198,268 @@ private void createAndShowAdminManagerPage(HttpServletRequest request, HttpServl
         AdminManagerSubreport documentsUnmodifiedForSixMonthsSubreport = new AdminManagerSubreport();
 
 
-        if ( tabToShow.equals(PARAMETER_VALUE__SHOW_RECENT) || tabToShow.equals(PARAMETER_VALUE__SHOW_SUMMARY) ) {
-            newDocumentsSubreport = createNewDocumentsSubreport( documentsFound );
+        if (tabToShow.equals(PARAMETER_VALUE__SHOW_RECENT) || tabToShow.equals(PARAMETER_VALUE__SHOW_SUMMARY)) {
+            newDocumentsSubreport = createNewDocumentsSubreport(documentsFound);
             sortAndSetExpandedSubreport(newDocumentsSubreport, request);
 
-            modifiedDocumentsSubreport = createModifiedDocumentsSubreport( documentsFound );
+            modifiedDocumentsSubreport = createModifiedDocumentsSubreport(documentsFound);
             sortAndSetExpandedSubreport(modifiedDocumentsSubreport, request);
         }
 
-        if ( tabToShow.equals(PARAMETER_VALUE__SHOW_REMINDERS) || tabToShow.equals(PARAMETER_VALUE__SHOW_SUMMARY) ) {
-            documentsArchivedWithinOneWeekSubreport = createDocumentsArchivedWithinOneWeekSubreport( documentsFound );
+        if (tabToShow.equals(PARAMETER_VALUE__SHOW_REMINDERS) || tabToShow.equals(PARAMETER_VALUE__SHOW_SUMMARY)) {
+            documentsArchivedWithinOneWeekSubreport = createDocumentsArchivedWithinOneWeekSubreport(documentsFound);
             sortAndSetExpandedSubreport(documentsArchivedWithinOneWeekSubreport, request);
 
-            documentsUnpublishedWithinOneWeekSubreport = createDocumentsUnpublishedWithinOneWeekSubreport( documentsFound );
+            documentsUnpublishedWithinOneWeekSubreport = createDocumentsUnpublishedWithinOneWeekSubreport(documentsFound);
             sortAndSetExpandedSubreport(documentsUnpublishedWithinOneWeekSubreport, request);
 
-            documentsUnmodifiedForSixMonthsSubreport = createDocumentsUnmodifiedForSixMonthsSubreport( documentsFound );
+            documentsUnmodifiedForSixMonthsSubreport = createDocumentsUnmodifiedForSixMonthsSubreport(documentsFound);
             sortAndSetExpandedSubreport(documentsUnmodifiedForSixMonthsSubreport, request);
         }
 
         AdminManagerPage adminManagerPage = null;
-        if ( tabToShow.equals( PARAMETER_VALUE__SHOW_CREATE ) ) {
+        if (tabToShow.equals(PARAMETER_VALUE__SHOW_CREATE)) {
             AdminManagerPage newDocumentsAdminManagerPage = new AdminManagerPage();
-            newDocumentsAdminManagerPage.setTabName( PARAMETER_VALUE__SHOW_CREATE );
-            newDocumentsAdminManagerPage.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/0" ) );
+            newDocumentsAdminManagerPage.setTabName(PARAMETER_VALUE__SHOW_CREATE);
+            newDocumentsAdminManagerPage.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/0"));
             adminManagerPage = newDocumentsAdminManagerPage;
 
-        } else if ( tabToShow.equals( PARAMETER_VALUE__SHOW_RECENT ) ) {
+        } else if (tabToShow.equals(PARAMETER_VALUE__SHOW_RECENT)) {
 
-            newDocumentsSubreport.setMaxDocumentCount( 10 );
+            newDocumentsSubreport.setMaxDocumentCount(10);
 
             AdminManagerPage newDocumentsAdminManagerPage = new AdminManagerPage();
-            newDocumentsAdminManagerPage.setTabName( PARAMETER_VALUE__SHOW_RECENT );
-            newDocumentsAdminManagerPage.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/1" ) );
+            newDocumentsAdminManagerPage.setTabName(PARAMETER_VALUE__SHOW_RECENT);
+            newDocumentsAdminManagerPage.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/1"));
 
-            newDocumentsAdminManagerPage.addSubreport( newDocumentsSubreport );
+            newDocumentsAdminManagerPage.addSubreport(newDocumentsSubreport);
 
-            modifiedDocumentsSubreport.setMaxDocumentCount( 10 );
-            newDocumentsAdminManagerPage.addSubreport( modifiedDocumentsSubreport );
+            modifiedDocumentsSubreport.setMaxDocumentCount(10);
+            newDocumentsAdminManagerPage.addSubreport(modifiedDocumentsSubreport);
 
             adminManagerPage = newDocumentsAdminManagerPage;
 
-        } else if ( tabToShow.equals( PARAMETER_VALUE__SHOW_REMINDERS ) ) {
+        } else if (tabToShow.equals(PARAMETER_VALUE__SHOW_REMINDERS)) {
 
             AdminManagerPage reminderAdminManagerPage = new AdminManagerPage();
-            reminderAdminManagerPage.setTabName( PARAMETER_VALUE__SHOW_REMINDERS );
-            reminderAdminManagerPage.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/2" ) );
+            reminderAdminManagerPage.setTabName(PARAMETER_VALUE__SHOW_REMINDERS);
+            reminderAdminManagerPage.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/2"));
 
-            documentsArchivedWithinOneWeekSubreport.setMaxDocumentCount( 10 );
-            reminderAdminManagerPage.addSubreport( documentsArchivedWithinOneWeekSubreport );
+            documentsArchivedWithinOneWeekSubreport.setMaxDocumentCount(10);
+            reminderAdminManagerPage.addSubreport(documentsArchivedWithinOneWeekSubreport);
 
-            documentsUnpublishedWithinOneWeekSubreport.setMaxDocumentCount( 10 );
-            reminderAdminManagerPage.addSubreport( documentsUnpublishedWithinOneWeekSubreport );
+            documentsUnpublishedWithinOneWeekSubreport.setMaxDocumentCount(10);
+            reminderAdminManagerPage.addSubreport(documentsUnpublishedWithinOneWeekSubreport);
 
-            documentsUnmodifiedForSixMonthsSubreport.setMaxDocumentCount( 10 );
-            reminderAdminManagerPage.addSubreport( documentsUnmodifiedForSixMonthsSubreport );
+            documentsUnmodifiedForSixMonthsSubreport.setMaxDocumentCount(10);
+            reminderAdminManagerPage.addSubreport(documentsUnmodifiedForSixMonthsSubreport);
 
             adminManagerPage = reminderAdminManagerPage;
 
-        } else if ( tabToShow.equals( PARAMETER_VALUE__SHOW_SUMMARY ) ) {
+        } else if (tabToShow.equals(PARAMETER_VALUE__SHOW_SUMMARY)) {
 
             AdminManagerPage summaryAdminManagerPage = new AdminManagerPage();
-            summaryAdminManagerPage.setTabName( PARAMETER_VALUE__SHOW_SUMMARY );
-            summaryAdminManagerPage.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/3" ) );
+            summaryAdminManagerPage.setTabName(PARAMETER_VALUE__SHOW_SUMMARY);
+            summaryAdminManagerPage.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/3"));
 
-            summaryAdminManagerPage.addSubreport( newDocumentsSubreport );
+            summaryAdminManagerPage.addSubreport(newDocumentsSubreport);
 
-            summaryAdminManagerPage.addSubreport( modifiedDocumentsSubreport );
+            summaryAdminManagerPage.addSubreport(modifiedDocumentsSubreport);
 
-            summaryAdminManagerPage.addSubreport( documentsArchivedWithinOneWeekSubreport );
+            summaryAdminManagerPage.addSubreport(documentsArchivedWithinOneWeekSubreport);
 
-            summaryAdminManagerPage.addSubreport( documentsUnpublishedWithinOneWeekSubreport );
+            summaryAdminManagerPage.addSubreport(documentsUnpublishedWithinOneWeekSubreport);
 
-            summaryAdminManagerPage.addSubreport( documentsUnmodifiedForSixMonthsSubreport );
+            summaryAdminManagerPage.addSubreport(documentsUnmodifiedForSixMonthsSubreport);
             adminManagerPage = summaryAdminManagerPage;
 
-        } else if ( tabToShow.equals( PARAMETER_VALUE__SHOW_SEARCH ) ) {
+        } else if (tabToShow.equals(PARAMETER_VALUE__SHOW_SEARCH)) {
 
             AdminManagerPage searchAdminManagerPage = new AdminManagerPage() {
-                public void forward( HttpServletRequest request, HttpServletResponse response, UserDomainObject user ) throws IOException, ServletException {
-                    AdminManagerSearchPage page = new AdminManagerSearchPage( this );
-                    DocumentFinder documentFinder = new DocumentFinder( page );
-                    documentFinder.setDocumentComparator( getComparator( null ) );
-                    page.updateFromRequest( request );
-                    documentFinder.addExtraSearchResultColumn( new DatesSummarySearchResultColumn() );
-                    documentFinder.forward( request, response );
+                public void forward(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) throws IOException, ServletException {
+                    AdminManagerSearchPage page = new AdminManagerSearchPage(this);
+                    DocumentFinder documentFinder = new DocumentFinder(page);
+                    documentFinder.setDocumentComparator(getComparator(null));
+                    page.updateFromRequest(request);
+                    documentFinder.addExtraSearchResultColumn(new DatesSummarySearchResultColumn());
+                    documentFinder.forward(request, response);
                 }
             };
-            searchAdminManagerPage.setTabName( PARAMETER_VALUE__SHOW_SEARCH );
-            searchAdminManagerPage.setHeading( new LocalizedMessage( "global/Search" ) );
+            searchAdminManagerPage.setTabName(PARAMETER_VALUE__SHOW_SEARCH);
+            searchAdminManagerPage.setHeading(new LocalizedMessage("global/Search"));
             adminManagerPage = searchAdminManagerPage;
         }
         if (null != adminManagerPage) {
-            adminManagerPage.setErrorMessage( errorMessage  );
-            adminManagerPage.setHtmlAdminPart( "".equals( html_admin_part ) ? null : html_admin_part );
-            adminManagerPage.forward( request, response, loggedOnUser );
+            adminManagerPage.setErrorMessage(errorMessage);
+            adminManagerPage.setHtmlAdminPart("".equals(html_admin_part) ? null : html_admin_part);
+            adminManagerPage.forward(request, response, loggedOnUser);
         }
     }
 
-    private void sortAndSetExpandedSubreport (AdminManagerSubreport subreport, HttpServletRequest request ) {
+    private void sortAndSetExpandedSubreport(AdminManagerSubreport subreport, HttpServletRequest request) {
 
-            String newSortOrder = request.getParameter( subreport.getName() + "_sortorder" );
-            if ( null != newSortOrder ) {
-                subreport.setSortorder( newSortOrder );
-            }
-            Collections.sort( subreport.getDocuments(), getComparator( subreport.getSortorder() ) );
-            boolean expanded = Utility.parameterIsSet( request, subreport.getName() + "_expand" )
-                               && !Utility.parameterIsSet( request, subreport.getName() + "_unexpand" );
-            subreport.setExpanded( expanded );
+        String newSortOrder = request.getParameter(subreport.getName() + "_sortorder");
+        if (null != newSortOrder) {
+            subreport.setSortorder(newSortOrder);
+        }
+        Collections.sort(subreport.getDocuments(), getComparator(subreport.getSortorder()));
+        boolean expanded = Utility.parameterIsSet(request, subreport.getName() + "_expand")
+                && !Utility.parameterIsSet(request, subreport.getName() + "_unexpand");
+        subreport.setExpanded(expanded);
 
 
     }
 
-    private AdminManagerSubreport createModifiedDocumentsSubreport( List documentsFound ) {
+    private AdminManagerSubreport createModifiedDocumentsSubreport(List documentsFound) {
         List modifiedDocuments = new ArrayList();
         Date oneWeekAgo = getDateOneWeekAgo();
-        for ( Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
             DocumentDomainObject document = (DocumentDomainObject) iterator.next();
-            boolean createdInPastWeek = !document.getCreatedDatetime().before( oneWeekAgo );
-            boolean modifiedInPastWeek = !document.getModifiedDatetime().before( oneWeekAgo );
-            if ( modifiedInPastWeek && !createdInPastWeek ) {
-                modifiedDocuments.add( document );
+            boolean createdInPastWeek = !document.getCreatedDatetime().before(oneWeekAgo);
+            boolean modifiedInPastWeek = !document.getModifiedDatetime().before(oneWeekAgo);
+            if (modifiedInPastWeek && !createdInPastWeek) {
+                modifiedDocuments.add(document);
             }
         }
 
         AdminManagerSubreport modifiedDocumentsSubreport = new AdminManagerSubreport();
-        modifiedDocumentsSubreport.setName( "modified" );
-        modifiedDocumentsSubreport.setDocuments( modifiedDocuments );
-        modifiedDocumentsSubreport.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/5" ) );
-        String dateSearchQueryString = createDateSearchQueryString( SearchDocumentsPage.DATE_TYPE__MODIFIED, oneWeekAgo, null, null );
-        modifiedDocumentsSubreport.setSearchQueryString( dateSearchQueryString );
+        modifiedDocumentsSubreport.setName("modified");
+        modifiedDocumentsSubreport.setDocuments(modifiedDocuments);
+        modifiedDocumentsSubreport.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/5"));
+        String dateSearchQueryString = createDateSearchQueryString(SearchDocumentsPage.DATE_TYPE__MODIFIED, oneWeekAgo, null, null);
+        modifiedDocumentsSubreport.setSearchQueryString(dateSearchQueryString);
         return modifiedDocumentsSubreport;
     }
 
-    private AdminManagerSubreport createNewDocumentsSubreport( List documentsFound ) {
+    private AdminManagerSubreport createNewDocumentsSubreport(List documentsFound) {
         List newDocuments = new ArrayList();
 
         Date oneWeekAgo = getDateOneWeekAgo();
-        for ( Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
             DocumentDomainObject document = (DocumentDomainObject) iterator.next();
-            boolean createdInPastWeek = !document.getCreatedDatetime().before( oneWeekAgo );
-            if ( createdInPastWeek ) {
-                newDocuments.add( document );
+            boolean createdInPastWeek = !document.getCreatedDatetime().before(oneWeekAgo);
+            if (createdInPastWeek) {
+                newDocuments.add(document);
             }
         }
 
         AdminManagerSubreport newDocumentsSubreport = new AdminManagerSubreport();
-        newDocumentsSubreport.setName( "new" );
-        newDocumentsSubreport.setDocuments( newDocuments );
-        newDocumentsSubreport.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/1" ) );
-        String dateSearchQueryString = createDateSearchQueryString( SearchDocumentsPage.DATE_TYPE__CREATED, oneWeekAgo, null, null );
-        newDocumentsSubreport.setSearchQueryString( dateSearchQueryString );
+        newDocumentsSubreport.setName("new");
+        newDocumentsSubreport.setDocuments(newDocuments);
+        newDocumentsSubreport.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/1"));
+        String dateSearchQueryString = createDateSearchQueryString(SearchDocumentsPage.DATE_TYPE__CREATED, oneWeekAgo, null, null);
+        newDocumentsSubreport.setSearchQueryString(dateSearchQueryString);
         return newDocumentsSubreport;
     }
 
     private AdminManagerSubreport createDocumentsUnmodifiedForSixMonthsSubreport(
-            List documentsFound ) {
+            List documentsFound) {
         LifeCyclePhase[] phases = new LifeCyclePhase[]{
-            LifeCyclePhase.APPROVED, LifeCyclePhase.NEW,
-            LifeCyclePhase.PUBLISHED, LifeCyclePhase.ARCHIVED,
+                LifeCyclePhase.APPROVED, LifeCyclePhase.NEW,
+                LifeCyclePhase.PUBLISHED, LifeCyclePhase.ARCHIVED,
         };
         Date sixMonthsAgo = getDateSixMonthsAgo();
         List documentsUnchangedForSixMonths = new ArrayList();
 
-        for ( Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
             DocumentDomainObject document = (DocumentDomainObject) iterator.next();
             LifeCyclePhase phase = document.getLifeCyclePhase();
-            if ( ArrayUtils.contains( phases, phase ) && document.getModifiedDatetime().before( sixMonthsAgo ) ) {
-                documentsUnchangedForSixMonths.add( document );
+            if (ArrayUtils.contains(phases, phase) && document.getModifiedDatetime().before(sixMonthsAgo)) {
+                documentsUnchangedForSixMonths.add(document);
             }
         }
 
         AdminManagerSubreport documentsUnchangedForSixMonthsSubreport = new AdminManagerSubreport();
-        documentsUnchangedForSixMonthsSubreport.setName( "unchangedForSixMonths" );
-        documentsUnchangedForSixMonthsSubreport.setDocuments( documentsUnchangedForSixMonths );
-        documentsUnchangedForSixMonthsSubreport.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/4" ) );
-        documentsUnchangedForSixMonthsSubreport.setSortorder( "MODR" );
-        String dateSearchQueryString = createDateSearchQueryString( SearchDocumentsPage.DATE_TYPE__MODIFIED, null, sixMonthsAgo, phases );
-        documentsUnchangedForSixMonthsSubreport.setSearchQueryString( dateSearchQueryString );
+        documentsUnchangedForSixMonthsSubreport.setName("unchangedForSixMonths");
+        documentsUnchangedForSixMonthsSubreport.setDocuments(documentsUnchangedForSixMonths);
+        documentsUnchangedForSixMonthsSubreport.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/4"));
+        documentsUnchangedForSixMonthsSubreport.setSortorder("MODR");
+        String dateSearchQueryString = createDateSearchQueryString(SearchDocumentsPage.DATE_TYPE__MODIFIED, null, sixMonthsAgo, phases);
+        documentsUnchangedForSixMonthsSubreport.setSearchQueryString(dateSearchQueryString);
         return documentsUnchangedForSixMonthsSubreport;
     }
 
-    private AdminManagerSubreport createDocumentsArchivedWithinOneWeekSubreport( List documentsFound ) {
+    private AdminManagerSubreport createDocumentsArchivedWithinOneWeekSubreport(List documentsFound) {
         LifeCyclePhase[] phases = new LifeCyclePhase[]{
-            LifeCyclePhase.APPROVED,
-            LifeCyclePhase.PUBLISHED
+                LifeCyclePhase.APPROVED,
+                LifeCyclePhase.PUBLISHED
         };
         List documentsArchivedWithinOneWeek = new ArrayList();
         Date lastMidnight = getDateLastMidnight();
         Date oneWeekAhead = getDateOneWeekAhead();
-        for ( Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
             DocumentDomainObject document = (DocumentDomainObject) iterator.next();
             LifeCyclePhase phase = document.getLifeCyclePhase();
             Date archivedDatetime = document.getArchivedDatetime();
-            if ( ArrayUtils.contains( phases, phase ) && null != archivedDatetime
-                 && !archivedDatetime.before( lastMidnight )
-                 && archivedDatetime.before( oneWeekAhead ) ) {
-                documentsArchivedWithinOneWeek.add( document );
+            if (ArrayUtils.contains(phases, phase) && null != archivedDatetime
+                    && !archivedDatetime.before(lastMidnight)
+                    && archivedDatetime.before(oneWeekAhead))
+            {
+                documentsArchivedWithinOneWeek.add(document);
             }
         }
         AdminManagerSubreport documentsArchivedWithinOneWeekSubreport = new AdminManagerSubreport();
-        documentsArchivedWithinOneWeekSubreport.setName( "archivedWithinOneWeek" );
-        documentsArchivedWithinOneWeekSubreport.setDocuments( documentsArchivedWithinOneWeek );
-        documentsArchivedWithinOneWeekSubreport.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/2" ) );
-        documentsArchivedWithinOneWeekSubreport.setSortorder( "ARCR" );
-        String dateSearchQueryString = createDateSearchQueryString( SearchDocumentsPage.DATE_TYPE__ARCHIVED, lastMidnight, oneWeekAhead, phases );
-        documentsArchivedWithinOneWeekSubreport.setSearchQueryString( dateSearchQueryString );
+        documentsArchivedWithinOneWeekSubreport.setName("archivedWithinOneWeek");
+        documentsArchivedWithinOneWeekSubreport.setDocuments(documentsArchivedWithinOneWeek);
+        documentsArchivedWithinOneWeekSubreport.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/2"));
+        documentsArchivedWithinOneWeekSubreport.setSortorder("ARCR");
+        String dateSearchQueryString = createDateSearchQueryString(SearchDocumentsPage.DATE_TYPE__ARCHIVED, lastMidnight, oneWeekAhead, phases);
+        documentsArchivedWithinOneWeekSubreport.setSearchQueryString(dateSearchQueryString);
         return documentsArchivedWithinOneWeekSubreport;
     }
 
     private AdminManagerSubreport createDocumentsUnpublishedWithinOneWeekSubreport(
-            List documentsFound ) {
+            List documentsFound) {
         LifeCyclePhase[] phases = new LifeCyclePhase[]{
-            LifeCyclePhase.APPROVED,
-            LifeCyclePhase.ARCHIVED, LifeCyclePhase.PUBLISHED
+                LifeCyclePhase.APPROVED,
+                LifeCyclePhase.ARCHIVED, LifeCyclePhase.PUBLISHED
         };
         Date lastMidnight = getDateLastMidnight();
         Date oneWeekAhead = getDateOneWeekAhead();
         List documentsUnpublishedWithinOneWeek = new ArrayList();
-        for ( Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = documentsFound.iterator(); iterator.hasNext(); ) {
             DocumentDomainObject document = (DocumentDomainObject) iterator.next();
             LifeCyclePhase phase = document.getLifeCyclePhase();
             Date publicationEndDatetime = document.getPublicationEndDatetime();
-            if ( ArrayUtils.contains( phases, phase ) && null != publicationEndDatetime
-                 && !publicationEndDatetime.before( lastMidnight )
-                 && publicationEndDatetime.before( oneWeekAhead ) ) {
-                documentsUnpublishedWithinOneWeek.add( document );
+            if (ArrayUtils.contains(phases, phase) && null != publicationEndDatetime
+                    && !publicationEndDatetime.before(lastMidnight)
+                    && publicationEndDatetime.before(oneWeekAhead))
+            {
+                documentsUnpublishedWithinOneWeek.add(document);
             }
         }
 
         AdminManagerSubreport documentsUnpublishedWithinOneWeekSubreport = new AdminManagerSubreport();
-        documentsUnpublishedWithinOneWeekSubreport.setName( "unpublishedWithinOneWeek" );
-        documentsUnpublishedWithinOneWeekSubreport.setDocuments( documentsUnpublishedWithinOneWeek );
-        documentsUnpublishedWithinOneWeekSubreport.setHeading( new LocalizedMessage( "web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/3" ) );
-        documentsUnpublishedWithinOneWeekSubreport.setSortorder( "PUBER" );
-        String dateSearchQueryString = createDateSearchQueryString( SearchDocumentsPage.DATE_TYPE__PUBLICATION_END, lastMidnight, oneWeekAhead, phases );
-        documentsUnpublishedWithinOneWeekSubreport.setSearchQueryString( dateSearchQueryString );
+        documentsUnpublishedWithinOneWeekSubreport.setName("unpublishedWithinOneWeek");
+        documentsUnpublishedWithinOneWeekSubreport.setDocuments(documentsUnpublishedWithinOneWeek);
+        documentsUnpublishedWithinOneWeekSubreport.setHeading(new LocalizedMessage("web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/3"));
+        documentsUnpublishedWithinOneWeekSubreport.setSortorder("PUBER");
+        String dateSearchQueryString = createDateSearchQueryString(SearchDocumentsPage.DATE_TYPE__PUBLICATION_END, lastMidnight, oneWeekAhead, phases);
+        documentsUnpublishedWithinOneWeekSubreport.setSearchQueryString(dateSearchQueryString);
         return documentsUnpublishedWithinOneWeekSubreport;
     }
 
-    private String createDateSearchQueryString( String dateType, Date startDate, Date endDate,
-                                                LifeCyclePhase[] lifeCyclePhases ) {
+    private String createDateSearchQueryString(String dateType, Date startDate, Date endDate,
+                                               LifeCyclePhase[] lifeCyclePhases) {
         String result = SearchDocumentsPage.REQUEST_PARAMETER__DATE_TYPE + "="
-                        + dateType;
+                + dateType;
 
-        result += "&"+SearchDocumentsPage.REQUEST_PARAMETER__USER_RESTRICTION+"="+SearchDocumentsPage.USER_DOCUMENTS_RESTRICTION__DOCUMENTS_CREATED_BY_USER ;
+        result += "&" + SearchDocumentsPage.REQUEST_PARAMETER__USER_RESTRICTION + "=" + SearchDocumentsPage.USER_DOCUMENTS_RESTRICTION__DOCUMENTS_CREATED_BY_USER;
 
-        if ( null != startDate ) {
+        if (null != startDate) {
             result += "&"
-                      + SearchDocumentsPage.REQUEST_PARAMETER__START_DATE
-                      + "="
-                      + Utility.formatDate( startDate );
+                    + SearchDocumentsPage.REQUEST_PARAMETER__START_DATE
+                    + "="
+                    + Utility.formatDate(startDate);
         }
 
-        if ( null != endDate ) {
+        if (null != endDate) {
             result += "&"
-                      + SearchDocumentsPage.REQUEST_PARAMETER__END_DATE
-                      + "=" + Utility.formatDate( endDate );
+                    + SearchDocumentsPage.REQUEST_PARAMETER__END_DATE
+                    + "=" + Utility.formatDate(endDate);
         }
-        if ( null != lifeCyclePhases ) {
-            for ( int i = 0; i < lifeCyclePhases.length; i++ ) {
+        if (null != lifeCyclePhases) {
+            for (int i = 0; i < lifeCyclePhases.length; i++) {
                 LifeCyclePhase phase = lifeCyclePhases[i];
                 result += "&" + SearchDocumentsPage.REQUEST_PARAMETER__PHASE + "=" + phase;
             }
@@ -439,39 +468,103 @@ private String createDateSearchQueryString( String dateType, Date startDate, Dat
         return result;
     }
 
+    private Date getDateTruncated(int days) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, days);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTime();
+    }
+
+    private Date getDateLastMidnight() {
+        return getDateTruncated(0);
+    }
+
+    private Date getDateSixMonthsAgo() {
+        return getDateTruncated(-182);
+    }
+
+    private Date getDateOneWeekAhead() {
+        return getDateTruncated(+7);
+    }
+
+    private Date getDateOneWeekAgo() {
+        return getDateTruncated(-7);
+    }
+
+    private String getAdminTaskUrl(String whichButton, HttpServletRequest request) {
+        String url = "";
+        if (whichButton.equalsIgnoreCase("UserStart")) {
+            url += "AdminUser";
+        } else if (whichButton.equalsIgnoreCase("CounterStart")) {
+            url += "AdminCounter";
+        } else if (whichButton.equalsIgnoreCase("AdminSearchTerms")) {
+            url += "AdminSearchTerms";
+        } else if (whichButton.equalsIgnoreCase("AddTemplates")) {
+            url += "TemplateAdmin";
+        } else if (whichButton.equalsIgnoreCase("DeleteDocs")) {
+            url += "AdminDeleteDoc";
+        } else if (whichButton.equalsIgnoreCase("IP-access")) {
+            url += "AdminIpAccess";
+        } else if (whichButton.equalsIgnoreCase("IP-whitelist")) {
+            url += "AdminIpWhiteList";
+        } else if (whichButton.equalsIgnoreCase("SystemMessage")) {
+            url += "AdminSystemInfo";
+        } else if (whichButton.equalsIgnoreCase("AdminRoles")) {
+            url += "AdminRoles";
+        } else if (whichButton.equalsIgnoreCase("LinkCheck")) {
+            url += "LinkCheck";
+        } else if (whichButton.equalsIgnoreCase("ListDocuments")) {
+            url += "ListDocuments";
+        } else if (whichButton.equalsIgnoreCase("FileAdmin")) {
+            url += "FileAdmin";
+        } else if (whichButton.equalsIgnoreCase("AdminSection")) {
+            url += "AdminSection";
+        } else if (whichButton.equalsIgnoreCase("AdminCategories")) {
+            url += "AdminCategories";
+        } else if (whichButton.equalsIgnoreCase("ExportDocuments")) {
+	        url += "ListDocuments?export=true";
+        } else if (whichButton.equals("AdminProfiles")) {
+            url = request.getContextPath() + "/imcms/admin/profile/list";
+        }
+        return url;
+
+    }
+
     public static class DatesSummarySearchResultColumn implements DocumentFinder.SearchResultColumn {
 
-        public String render( DocumentDomainObject document, HttpServletRequest request,
-                              HttpServletResponse response ) throws IOException, ServletException {
-            UserDomainObject user = Utility.getLoggedOnUser( request );
+        public String render(DocumentDomainObject document, HttpServletRequest request,
+                             HttpServletResponse response) throws IOException, ServletException {
+            UserDomainObject user = Utility.getLoggedOnUser(request);
             AdminManagerExpandableDatesBean expandableDatesBean = new AdminManagerExpandableDatesBean();
-            expandableDatesBean.setExpanded( true );
-            expandableDatesBean.setDocument( document );
-            request.setAttribute( "expandableDatesBean", expandableDatesBean );
-            return Utility.getContents( "/imcms/" + user.getLanguageIso639_2()
-                                        + "/jsp/admin/admin_manager_expandable_dates.jsp", request, response );
+            expandableDatesBean.setExpanded(true);
+            expandableDatesBean.setDocument(document);
+            request.setAttribute("expandableDatesBean", expandableDatesBean);
+            return Utility.getContents("/imcms/" + user.getLanguageIso639_2()
+                    + "/jsp/admin/admin_manager_expandable_dates.jsp", request, response);
         }
 
         public LocalizedMessage getName() {
-            return new LocalizedMessage( "global/Dates" );
+            return new LocalizedMessage("global/Dates");
         }
     }
 
     public static class AdminManagerPage implements Serializable {
 
+        public static final String REQUEST_ATTRIBUTE__PAGE = "ampage";
         LocalizedMessage heading;
         String tabName;
         List subreports = new ArrayList();
         String htmlAdminPart;
-        public static final String REQUEST_ATTRIBUTE__PAGE = "ampage";
-
         private LocalizedMessage errorMessage;
 
         public LocalizedMessage getHeading() {
             return heading;
         }
 
-        public void setHeading( LocalizedMessage heading ) {
+        public void setHeading(LocalizedMessage heading) {
             this.heading = heading;
         }
 
@@ -483,147 +576,57 @@ public String getTabName() {
             return tabName;
         }
 
-        public void setTabName( String tabName ) {
+        public void setTabName(String tabName) {
             this.tabName = tabName;
         }
 
-        public void addSubreport( AdminManagerSubreport newDocumentsSubreport ) {
-            subreports.add( newDocumentsSubreport );
+        public void addSubreport(AdminManagerSubreport newDocumentsSubreport) {
+            subreports.add(newDocumentsSubreport);
         }
 
         public String getHtmlAdminPart() {
             return htmlAdminPart;
         }
 
-        public void setHtmlAdminPart( String htmlAdminPart ) {
+        public void setHtmlAdminPart(String htmlAdminPart) {
             this.htmlAdminPart = htmlAdminPart;
         }
 
-        public void forward( HttpServletRequest request, HttpServletResponse response, UserDomainObject user ) throws IOException, ServletException {
-            putInRequest( request );
+        public void forward(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) throws IOException, ServletException {
+            putInRequest(request);
             String forwardPath = "/imcms/" + user.getLanguageIso639_2() + "/jsp/admin/admin_manager.jsp";
-            request.getRequestDispatcher( forwardPath ).forward( request, response );
+            request.getRequestDispatcher(forwardPath).forward(request, response);
         }
 
-        public void putInRequest( HttpServletRequest request ) {
-            request.setAttribute( REQUEST_ATTRIBUTE__PAGE, this );
+        public void putInRequest(HttpServletRequest request) {
+            request.setAttribute(REQUEST_ATTRIBUTE__PAGE, this);
         }
 
         public LocalizedMessage getErrorMessage() {
             return errorMessage;
         }
 
-        public void setErrorMessage( LocalizedMessage errorMessage ) {
+        public void setErrorMessage(LocalizedMessage errorMessage) {
             this.errorMessage = errorMessage;
         }
 
         public JSCalendar getJSCalendar(HttpServletRequest request) {
-            return new JSCalendar( Utility.getLoggedOnUser(request).getLanguageIso639_2(), request ) ;
-        }
-
-    }
-
-    private Date getDateTruncated( int days ) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.add( Calendar.DATE, days );
-        calendar.set( Calendar.HOUR_OF_DAY, 0 );
-        calendar.set( Calendar.MINUTE, 0 );
-        calendar.set( Calendar.SECOND, 0 );
-        calendar.set( Calendar.MILLISECOND, 0 );
-        return calendar.getTime();
-    }
-
-    private Date getDateLastMidnight() {
-        return getDateTruncated( 0 );
-    }
-
-    private Date getDateSixMonthsAgo() {
-        return getDateTruncated( -182 );
-    }
-
-    private Date getDateOneWeekAhead() {
-        return getDateTruncated( +7 );
-    }
-
-    private Date getDateOneWeekAgo() {
-        return getDateTruncated( -7 );
-    }
-
-    public static ChainableReversibleNullComparator getComparator( String sortorder ) {
-
-        ChainableReversibleNullComparator comparator = DocumentComparator.MODIFIED_DATETIME.reversed();
-        if ( "MODR".equals( sortorder ) ) {
-            comparator = DocumentComparator.MODIFIED_DATETIME;
-        } else if ( "PUBS".equals( sortorder ) ) {
-            comparator = DocumentComparator.PUBLICATION_START_DATETIME.reversed();
-        } else if ( "PUBSR".equals( sortorder ) ) {
-            comparator = DocumentComparator.PUBLICATION_START_DATETIME;
-        } else if ( "PUBE".equals( sortorder ) ) {
-            comparator = DocumentComparator.PUBLICATION_END_DATETIME.reversed().nullsLast();
-        } else if ( "PUBER".equals( sortorder ) ) {
-            comparator = DocumentComparator.PUBLICATION_END_DATETIME.nullsLast();
-        } else if ( "ARC".equals( sortorder ) ) {
-            comparator = DocumentComparator.ARCHIVED_DATETIME.reversed().nullsLast();
-        } else if ( "ARCR".equals( sortorder ) ) {
-            comparator = DocumentComparator.ARCHIVED_DATETIME.nullsLast();
-        } else if ( "HEADL".equals( sortorder ) ) {
-            comparator = DocumentComparator.HEADLINE;
-        } else if ( "HEADLR".equals( sortorder ) ) {
-            comparator = DocumentComparator.HEADLINE.reversed();
-        } else if ( "ID".equals( sortorder ) ) {
-            comparator = DocumentComparator.ID;
-        } else if ( "IDR".equals( sortorder ) ) {
-            comparator = DocumentComparator.ID.reversed();
-        }
-        return comparator;
-    }
-
-    private String getAdminTaskUrl(String whichButton, HttpServletRequest request) {
-        String url = "";
-        if ( whichButton.equalsIgnoreCase( "UserStart" ) ) {
-            url += "AdminUser";
-        } else if ( whichButton.equalsIgnoreCase( "CounterStart" ) ) {
-            url += "AdminCounter";
-        } else if ( whichButton.equalsIgnoreCase( "AdminSearchTerms" ) ) {
-            url += "AdminSearchTerms";
-        } else if ( whichButton.equalsIgnoreCase( "AddTemplates" ) ) {
-            url += "TemplateAdmin";
-        } else if ( whichButton.equalsIgnoreCase( "DeleteDocs" ) ) {
-            url += "AdminDeleteDoc";
-        } else if ( whichButton.equalsIgnoreCase( "IP-access" ) ) {
-            url += "AdminIpAccess";
-        } else if ( whichButton.equalsIgnoreCase( "SystemMessage" ) ) {
-            url += "AdminSystemInfo";
-        } else if ( whichButton.equalsIgnoreCase( "AdminRoles" ) ) {
-            url += "AdminRoles";
-        } else if ( whichButton.equalsIgnoreCase( "LinkCheck" ) ) {
-            url += "LinkCheck";
-        } else if ( whichButton.equalsIgnoreCase( "ListDocuments" ) ) {
-            url += "ListDocuments";
-        } else if ( whichButton.equalsIgnoreCase( "FileAdmin" ) ) {
-            url += "FileAdmin";
-        } else if ( whichButton.equalsIgnoreCase( "AdminSection" ) ) {
-            url += "AdminSection";
-        } else if ( whichButton.equalsIgnoreCase( "AdminCategories" ) ) {
-            url += "AdminCategories";
-        } else if ( whichButton.equals( "AdminProfiles" ) ) {
-            url = request.getContextPath()+"/imcms/admin/profile/list";
+            return new JSCalendar(Utility.getLoggedOnUser(request).getLanguageIso639_2(), request);
         }
-        return url;
 
     }
 
     private static class SaveNewDocumentCommand implements DocumentPageFlow.SaveDocumentCommand {
 
-        public void saveDocument( DocumentDomainObject document, UserDomainObject user ) throws NoPermissionToEditDocumentException, NoPermissionToAddDocumentToMenuException, DocumentSaveException {
-            Imcms.getServices().getDocumentMapper().saveNewDocument( document, user, false);
+        public void saveDocument(DocumentDomainObject document, UserDomainObject user) throws NoPermissionToEditDocumentException, NoPermissionToAddDocumentToMenuException, DocumentSaveException {
+            Imcms.getServices().getDocumentMapper().saveNewDocument(document, user, false);
         }
     }
 
     private class ShowRecentChangesPageCommand implements DispatchCommand {
 
-        public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-            createAndShowAdminManagerPage( request, response, null, PARAMETER_VALUE__SHOW_RECENT );
+        public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+            createAndShowAdminManagerPage(request, response, null, PARAMETER_VALUE__SHOW_RECENT);
         }
     }
 } // End of class
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminProfiles.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminProfiles.java
index 3d01f5ed70..d81b294ec7 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminProfiles.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminProfiles.java
@@ -1,10 +1,11 @@
 package com.imcode.imcms.servlet.superadmin;
 
 import com.imcode.db.Database;
-import com.imcode.imcms.mapping.ProfileMapper;
 import com.imcode.imcms.api.ContentManagementSystem;
+import com.imcode.imcms.mapping.ProfileMapper;
 import imcode.server.Imcms;
 import imcode.server.document.Profile;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -14,39 +15,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
-
 public class AdminProfiles extends HttpServlet {
 
-    public enum Parameter {
-        EDIT_PREFIX,
-        DELETE_PREFIX,
-        PROFILE_ID,
-        PROFILE_NAME,
-        PROFILE_DOCUMENT_NAME,
-        NEW_PROFILE,
-        BACK;
-
-        String from(HttpServletRequest request) {
-            return request.getParameter(toString());
-        }
-
-        public String suffixFrom(HttpServletRequest request) {
-            Map<String, String[]> parameterMap = (Map<String, String[]>) request.getParameterMap();
-            for ( String parameterName : parameterMap.keySet() ) {
-                String prefix = toString();
-                if (parameterName.startsWith(prefix)) {
-                    return parameterName.substring(prefix.length());
-                }
-            }
-            return null;
-        }
-
-        public boolean in(HttpServletRequest request) {
-            return null != from(request);
-        }
-    }
-
     private Database getDatabase() {
         return Imcms.getServices().getDatabase();
     }
@@ -55,7 +25,7 @@ protected void doGet(HttpServletRequest request,
                          HttpServletResponse response) throws ServletException, IOException {
         String pathInfo = request.getPathInfo();
         if ("/list".equals(pathInfo)) {
-            list(request,response);
+            list(request, response);
         } else if ("/edit".equals(pathInfo)) {
             edit(request, response, new ProfileMapper.SimpleProfile("", "", ""));
         }
@@ -67,7 +37,7 @@ protected void doPost(HttpServletRequest request,
         ProfileMapper profileMapper = getProfileMapper();
         if ("/list".equals(pathInfo)) {
             if (Parameter.BACK.in(request)) {
-                response.sendRedirect(request.getContextPath()+"/servlet/AdminManager");
+                response.sendRedirect(request.getContextPath() + "/servlet/AdminManager");
                 return;
             }
             String editId = Parameter.EDIT_PREFIX.suffixFrom(request);
@@ -86,17 +56,17 @@ protected void doPost(HttpServletRequest request,
             list(request, response);
         } else if ("/edit".equals(pathInfo)) {
             if (Parameter.BACK.in(request)) {
-                response.sendRedirect(request.getContextPath()+"/imcms/admin/profile/list");
+                response.sendRedirect(request.getContextPath() + "/imcms/admin/profile/list");
                 return;
             }
             String id = Parameter.PROFILE_ID.from(request);
             String name = Parameter.PROFILE_NAME.from(request);
             String documentName = Parameter.PROFILE_DOCUMENT_NAME.from(request);
-            if ( null == ContentManagementSystem.fromRequest(request).getDocumentService().getDocument(documentName) ) {
+            if (null == ContentManagementSystem.fromRequest(request).getDocumentService().getDocument(documentName)) {
                 edit(request, response, new ProfileMapper.SimpleProfile(id, name, ""));
                 return;
             }
-            if ( StringUtils.isNotBlank(id) ) {
+            if (StringUtils.isNotBlank(id)) {
                 profileMapper.update(new ProfileMapper.SimpleProfile(id, name, documentName));
             } else {
                 profileMapper.create(new ProfileMapper.SimpleProfile(null, name, documentName));
@@ -105,8 +75,6 @@ protected void doPost(HttpServletRequest request,
         }
     }
 
-
-
     private void edit(HttpServletRequest request, HttpServletResponse response,
                       Profile profile) throws ServletException, IOException {
         request.setAttribute("profile", profile);
@@ -123,4 +91,33 @@ private ProfileMapper getProfileMapper() {
         return new ProfileMapper(getDatabase());
     }
 
+    public enum Parameter {
+        EDIT_PREFIX,
+        DELETE_PREFIX,
+        PROFILE_ID,
+        PROFILE_NAME,
+        PROFILE_DOCUMENT_NAME,
+        NEW_PROFILE,
+        BACK;
+
+        String from(HttpServletRequest request) {
+            return request.getParameter(toString());
+        }
+
+        public String suffixFrom(HttpServletRequest request) {
+            Map<String, String[]> parameterMap = (Map<String, String[]>) request.getParameterMap();
+            for (String parameterName : parameterMap.keySet()) {
+                String prefix = toString();
+                if (parameterName.startsWith(prefix)) {
+                    return parameterName.substring(prefix.length());
+                }
+            }
+            return null;
+        }
+
+        public boolean in(HttpServletRequest request) {
+            return null != from(request);
+        }
+    }
+
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminRoles.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminRoles.java
index 9cc321c6b0..340bd3e417 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminRoles.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminRoles.java
@@ -1,7 +1,12 @@
 package com.imcode.imcms.servlet.superadmin;
 
 import com.imcode.imcms.db.StringArrayResultSetHandler;
+import com.imcode.imcms.domain.component.AzureAuthenticationProvider;
+import com.imcode.imcms.domain.dto.AzureActiveDirectoryGroupDTO;
+import com.imcode.imcms.domain.dto.ExternalRole;
+import com.imcode.imcms.model.AuthenticationProvider;
 import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
+import imcode.server.DefaultImcmsServices;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.document.DocumentDomainObject;
@@ -10,7 +15,8 @@
 import imcode.util.ToStringPairTransformer;
 import imcode.util.Utility;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -18,11 +24,13 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.sql.SQLException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class AdminRoles extends HttpServlet {
 
-    private final static Logger LOG = Logger.getLogger( AdminRoles.class.getName() );
+    private final static Logger LOG = LogManager.getLogger(AdminRoles.class.getName());
 
     private final static String HTML_ADMIN_ROLES = "AdminRoles_roles.htm";
     private final static String HTML_ADD_ROLE = "AdminRoles_Add.htm";
@@ -32,19 +40,68 @@ public class AdminRoles extends HttpServlet {
     private final static String HTML_EDIT_ROLE = "AdminRoles_Edit.html";
     private final static String HTML_EDIT_ROLE_TABLE = "AdminRoles_Edit_Permissions_List.html";
     private final static String HTML_EDIT_ROLE_TABLE_ROW = "AdminRoles_Edit_Permission.html";
+    private final String identifierId = Imcms.getServerProperties().getProperty("ExternalAuthenticator");
+
+
+    public static void printErrorMessage(HttpServletRequest req, HttpServletResponse res, String header, String msg
+    ) throws IOException {
+        List tagsAndData = new ArrayList();
+        tagsAndData.add("#ERROR_HEADER#");
+        tagsAndData.add(header);
+        tagsAndData.add("#ERROR_MESSAGE#");
+        tagsAndData.add(msg);
+
+        String fileName = "AdminError.htm";
+
+        // Lets get the path to the admin templates folder
+        ImcmsServices imcref = Imcms.getServices();
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+
+        String html = imcref.getAdminTemplate(fileName, user, tagsAndData);
+        Utility.setDefaultHtmlContentType(res);
+        res.getWriter().println(html);
+    }
+
+    static String createHtml(HttpServletRequest req,
+                             Map vm, String htmlFile) {
+
+        ImcmsServices imcref = Imcms.getServices();
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+
+        vm.put("SERVLET_URL", "");
+        vm.put("SERVLET_URL2", "");
+
+        List tagsAndData1 = new ArrayList(vm.size() * 2);
+        for (Map.Entry<String, String> entry1 : (Iterable<Map.Entry<String, String>>) vm.entrySet()) {
+            tagsAndData1.add("#" + entry1.getKey() + "#");
+            tagsAndData1.add(entry1.getValue());
+        }
+
+        return imcref.getAdminTemplate(htmlFile, user, tagsAndData1);
+    }
+
+    public static void sendHtml(HttpServletRequest req, HttpServletResponse res,
+                                Map vm, String htmlFile) throws IOException {
+
+        String str = createHtml(req, vm, htmlFile);
+        Utility.setDefaultHtmlContentType(res);
+        PrintWriter out = res.getWriter();
+
+        out.println(str);
+    }
 
     /**
      * The GET method creates the html page when this side has been
      * redirected from somewhere else.
      */
-    public void doGet( HttpServletRequest req, HttpServletResponse res )
+    public void doGet(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
 
         // Lets verify that the user who tries to add a new user is an admin
         ImcmsServices imcref = Imcms.getServices();
         UserDomainObject user = Utility.getLoggedOnUser(req);
         Utility.setDefaultHtmlContentType(res);
-        if ( !user.isSuperAdmin() ) {
+        if (!user.isSuperAdmin()) {
             String header = "Error in AdminRoles.";
             Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
             String msg = langproperties.getProperty("error/servlet/global/no_administrator") + "<br>";
@@ -58,9 +115,59 @@ public void doGet( HttpServletRequest req, HttpServletResponse res )
         List rolesV = new ArrayList(Arrays.asList(rolesArr));
 
         Map vm = new HashMap();
-        String opt = Html.createOptionList(rolesV, Arrays.asList(new String[] { "" }));
+        String opt = Html.createOptionList(rolesV, Arrays.asList(new String[]{""}));
         vm.put("ROLES_MENU", opt);
 
+        vm.put("DISPLAY_AZURE", !AzureAuthenticationProvider.EXTERNAL_AUTHENTICATOR_AZURE_AD.equalsIgnoreCase(identifierId) ? "none" : "table-cell");
+
+	    final List<ExternalRole> externalRoles = new ArrayList<>();
+	    if (!identifierId.isEmpty() && !identifierId.equalsIgnoreCase(DefaultImcmsServices.EXTERNAL_AUTHENTICATOR_LDAP)) {
+		    final AuthenticationProvider authenticationProvider = imcref.getAuthenticationProviderService().getAuthenticationProvider(identifierId);
+
+			externalRoles.addAll(authenticationProvider.getRoles());
+	    }
+
+        final List<String> azureNamesRoles = new ArrayList<>();
+
+        for (ExternalRole azureNamesRolesParam : externalRoles) {
+            if (azureNamesRolesParam instanceof AzureActiveDirectoryGroupDTO) {
+                azureNamesRoles.add(azureNamesRolesParam.getId());
+                azureNamesRoles.add(((AzureActiveDirectoryGroupDTO) azureNamesRolesParam).getDisplayName());
+            }
+        }
+
+        String list = Html.createOptionList(azureNamesRoles, Arrays.asList(new String[]{""}));
+        vm.put("EXTERNAL_ROLES_MENU", list);
+
+        String externalRoleId = req.getParameter("extRoleId");
+        String dropListRoles;
+        boolean addOnClick = true;
+
+        if (externalRoleId != null) {
+            final List<String> rolesIds;
+            try {
+                rolesIds = Imcms.getServices().getExternalToLocalRoleLinkComponent()
+                        .findRolesByExternalRoleId(externalRoleId)
+                        .stream()
+                        .map(RoleDomainObject::getId)
+                        .map(RoleId::toString)
+                        .collect(Collectors.toList());
+            } catch (SQLException e) {
+                LOG.error(e.getMessage());
+                return;
+            }
+
+            dropListRoles = Html.createDropDownList(rolesV, rolesIds, addOnClick, "enableBtnSave");
+            Utility.setDefaultHtmlContentType(res);
+            PrintWriter out = res.getWriter();
+
+            out.println(dropListRoles);
+            return;
+        } else {
+            dropListRoles = Html.createDropDownList(rolesV, Collections.EMPTY_LIST, addOnClick, "enableBtnSave");
+        }
+
+        vm.put("LINKED_ROLES", dropListRoles);
         sendHtml(req, res, vm, HTML_ADMIN_ROLES);
 
     } // End doGet
@@ -68,19 +175,19 @@ public void doGet( HttpServletRequest req, HttpServletResponse res )
     /**
      * POST
      */
-    public void doPost( HttpServletRequest req, HttpServletResponse res )
+    public void doPost(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
 
         // Lets check if the user is an admin, otherwise throw him out.
         ImcmsServices imcref = Imcms.getServices();
         ImcmsAuthenticatorAndUserAndRoleMapper userAndRoleMapper = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
         Utility.setDefaultHtmlContentType(res);
 
-        if ( !user.isSuperAdmin() ) {
-            AdminIpAccess.printNonAdminError(imcref, user, req, res, getClass());
+        if (!user.isSuperAdmin()) {
+            AdminIpAccess.printNonAdminError(user, req, res, getClass());
         } else {// *************** GENERATE THE ADMINISTRATE ROLES PAGE *****************
-            if ( req.getParameter("VIEW_ADMIN_ROLES") != null ) {
+            if (req.getParameter("VIEW_ADMIN_ROLES") != null) {
                 // Lets get all ROLES from DB
                 final Object[] parameters = new String[0];
                 String[] rolesArr = (String[]) imcref.getProcedureExecutor().executeProcedure("RoleAdminGetAll", parameters, new StringArrayResultSetHandler());
@@ -95,22 +202,22 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 sendHtml(req, res, vm, HTML_ADMIN_ROLES);
 
                 return;
-            } else if ( req.getParameter("CANCEL") != null || req.getParameter("CANCEL_ROLE_ADMIN") != null ) {
+            } else if (req.getParameter("CANCEL") != null || req.getParameter("CANCEL_ROLE_ADMIN") != null) {
                 res.sendRedirect("AdminManager");
                 return;
-            } else if ( req.getParameter("CANCEL_ROLE") != null ) {
+            } else if (req.getParameter("CANCEL_ROLE") != null) {
                 doGet(req, res);
                 return;
-            } else if ( req.getParameter("VIEW_ADD_NEW_ROLE") != null ) {
+            } else if (req.getParameter("VIEW_ADD_NEW_ROLE") != null) {
 
                 // lets adjust the list to fit method cal
                 RolePermissionDomainObject[] allRolePermissions = RoleDomainObject.getAllRolePermissions();
                 String[][] permissionList = new String[allRolePermissions.length][];
 
-                for ( int i = 0; i < permissionList.length; i++ ) {
+                for (int i = 0; i < permissionList.length; i++) {
                     RolePermissionDomainObject rolePermission = allRolePermissions[i];
-                    permissionList[i] = new String[] { "0", "" + rolePermission.getId(),
-                            rolePermission.getDescription().toLocalizedString(req) };
+                    permissionList[i] = new String[]{"0", "" + rolePermission.getId(),
+                            rolePermission.getDescription().toLocalizedString(req)};
                 }
 
                 // lets get data on permissions and values
@@ -122,9 +229,9 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 sendHtml(req, res, vm, HTML_ADD_ROLE);
 
                 return;
-            } else if ( req.getParameter("VIEW_RENAME_ROLE") != null ) {
+            } else if (req.getParameter("VIEW_RENAME_ROLE") != null) {
                 String roleIdStr = req.getParameter("ROLE_ID");
-                if ( roleIdStr == null ) {
+                if (roleIdStr == null) {
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/rolename_missing") + "<BR>";
                     LOG.debug("Error in rename roles, no role selected for rename");
@@ -139,10 +246,10 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 vm.put("CURRENT_ROLE_NAME", "" + role.getName());
                 sendHtml(req, res, vm, HTML_RENAME_ROLE);
                 return;
-            } else if ( req.getParameter("VIEW_EDIT_ROLE") != null ) {
+            } else if (req.getParameter("VIEW_EDIT_ROLE") != null) {
 
                 String roleIdStr = req.getParameter("ROLE_ID");
-                if ( roleIdStr == null ) {
+                if (roleIdStr == null) {
                     String header = "Error in AdminRoles, edit role";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/role_missing") + "<br>";
@@ -152,7 +259,7 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 }
 
                 // dont list superadmin permissions
-                if ( roleIdStr.equals("0") ) {
+                if (roleIdStr.equals("0")) {
                     LOG.debug("Error in checking roles: Trying to look att superadmin permissions");
                     printErrorMessage(req, res, "Error in AdminRoles, edit role", "<BR>");
                     return;
@@ -162,7 +269,7 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 RoleDomainObject role = userAndRoleMapper.getRoleById(roleId);
                 RolePermissionDomainObject[] allRolePermissions = RoleDomainObject.getAllRolePermissions();
                 String[][] permissionList = new String[allRolePermissions.length][];
-                for ( int i = 0; i < permissionList.length; i++ ) {
+                for (int i = 0; i < permissionList.length; i++) {
                     RolePermissionDomainObject rolePermission = allRolePermissions[i];
                     int rolePermissionId = rolePermission.getId();
                     permissionList[i] = new String[3];
@@ -182,11 +289,11 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 sendHtml(req, res, vm, HTML_EDIT_ROLE);
 
                 return;
-            } else if ( req.getParameter("ADD_NEW_ROLE") != null ) {
+            } else if (req.getParameter("ADD_NEW_ROLE") != null) {
 
                 // Lets get the parameters from html page and validate them
                 Properties params = getAddRoleParameters(req);
-                if ( params.values().contains("") ) {
+                if (params.values().contains("")) {
                     String header = "Error in AdminRoles ";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/new_rolename_missing") + "<br>";
@@ -197,11 +304,11 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
 
                 // Lets check that the new rolename doesnt exists already in db
                 String roleName = params.getProperty("ROLE_NAME");
-                if ( roleExists(userAndRoleMapper, roleName) ) {
+                if (roleExists(userAndRoleMapper, roleName)) {
                     String header = "Error in AdminRoles.";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/rolename_already_exists")
-                                 + "<br>";
+                            + "<br>";
                     LOG.debug(header + "- role name already exists");
                     printErrorMessage(req, res, header, msg);
                     return;
@@ -216,17 +323,17 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 role.addUnionOfPermissionIdsToRole(permissionValue);
                 try {
                     userAndRoleMapper.saveRole(role);
-                } catch ( UserAndRoleRegistryException e ) {
+                } catch (UserAndRoleRegistryException e) {
                     throw new UnhandledException(e);
                 }
                 doGet(req, res);
 
                 return;
-            } else if ( req.getParameter("RENAME_ROLE") != null ) {
+            } else if (req.getParameter("RENAME_ROLE") != null) {
 
                 // Lets get the parameters from html page and validate them
                 Properties params = getRenameRoleParameters(req);
-                if ( params.values().contains("") ) {
+                if (params.values().contains("")) {
                     String header = "Error in AdminRoles, rename role ";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/new_rolename_missing") + "<br>";
@@ -242,13 +349,13 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 role.setName(roleName);
                 try {
                     userAndRoleMapper.saveRole(role);
-                } catch ( NameTooLongException e ) {
+                } catch (NameTooLongException e) {
                     throw new UnhandledException(e);
-                } catch ( RoleAlreadyExistsException e ) {
+                } catch (RoleAlreadyExistsException e) {
                     String header = "Error in AdminRoles.";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/rolename_already_exists")
-                                 + "<br>";
+                            + "<br>";
                     LOG.debug(header + "- rolename already exists");
                     printErrorMessage(req, res, header, msg);
                     return;
@@ -256,17 +363,35 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 doGet(req, res);
 
                 return;
+            } else if (req.getParameter("SAVE_EXTERNAL_TO_LOCAL_ROLE") != null) {
+                String externalRoleId = req.getParameter("AZURE_ROLE_ID");
+                Set<Integer> localRoleIds = Arrays.stream(req.getParameterValues("role"))
+                        .map(Integer::new)
+                        .collect(Collectors.toSet());
+
+                try {
+                    Imcms.getServices()
+                            .getExternalToLocalRoleLinkService()
+                            .setLinkedRoles(new ExternalRole(identifierId, externalRoleId), localRoleIds);
+                } catch (SQLException e) {
+                    LOG.error(e.getMessage());
+                }
+
+                doGet(req, res);
+
+                return;
+
             }
 
 
             // ****** VIEW AFFECTED META ID:S WHICH WILL BE AFFECTED OF A DELETE ********
 
             boolean warnDelRole = false;
-            if ( req.getParameter("VIEW_DELETE_ROLE") != null ) {
+            if (req.getParameter("VIEW_DELETE_ROLE") != null) {
 
                 // Lets get the parameters from html page and validate them
                 Properties params = getDeleteRoleParameters(req);
-                if ( params.values().contains("") ) {
+                if (params.values().contains("")) {
                     String header = "Error in AdminRoles ";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/role_to_delete_missing") + "<br>";
@@ -280,30 +405,30 @@ public void doPost( HttpServletRequest req, HttpServletResponse res )
                 RoleDomainObject role = userAndRoleMapper.getRoleById(roleId);
                 List affectedDocuments = imcref.getDocumentMapper().getDocumentsWithPermissionsForRole(role);
                 int affectedDocumentsCount = affectedDocuments.size();
-                if ( affectedDocuments.size() > 50 ) {
+                if (affectedDocuments.size() > 50) {
                     affectedDocuments = affectedDocuments.subList(0, 50);
                 }
 
                 List affectedUsers = Arrays.asList(userAndRoleMapper.getAllUsersWithRole(role));
-                if ( affectedUsers.size() > 50 ) {
+                if (affectedUsers.size() > 50) {
                     affectedUsers = affectedUsers.subList(0, 50);
                 }
 
-                if ( !affectedUsers.isEmpty() || !affectedDocuments.isEmpty() ) {
+                if (!affectedUsers.isEmpty() || !affectedDocuments.isEmpty()) {
 
                     // Lets generate the affected users & metaid warning html page
                     String opt = Html.createOptionList(affectedDocuments, new ToStringPairTransformer() {
                         public String[] transformToStringPair(Object input) {
                             DocumentDomainObject d = (DocumentDomainObject) input;
-                            return new String[] { "" + d.getId(), "" + d.getId() };
+                            return new String[]{"" + d.getId(), "" + d.getId()};
                         }
                     });
                     String users = Html.createOptionList(affectedUsers, new ToStringPairTransformer() {
                         public String[] transformToStringPair(Object input) {
                             UserDomainObject user = (UserDomainObject) input;
-                            return new String[] { "" + user.getId(),
+                            return new String[]{"" + user.getId(),
                                     user.getLastName() + ", " + user.getFirstName() + " (" + user.getLoginName()
-                                    + ")" };
+                                            + ")"};
                         }
                     });
                     Map vm = new HashMap();
@@ -322,10 +447,10 @@ public String[] transformToStringPair(Object input) {
             }
 
             // *************** GENERATE THE LAST DELETE ROLE WARNING PAGE  **********
-            if ( req.getParameter("WARN_DELETE_ROLE") != null || warnDelRole ) {
+            if (req.getParameter("WARN_DELETE_ROLE") != null || warnDelRole) {
                 // Lets get the parameters from html page and validate them
                 Properties params = getDeleteRoleParameters(req);
-                if ( params.values().contains("") ) {
+                if (params.values().contains("")) {
                     String header = "Error in AdminRoles, delete ";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/role_to_delete_missing") + "<br>";
@@ -343,11 +468,11 @@ public String[] transformToStringPair(Object input) {
             }
 
             // ****** DELETE A ROLE ********
-            if ( req.getParameter("DELETE_ROLE") != null ) {
+            if (req.getParameter("DELETE_ROLE") != null) {
 
                 // Lets get the parameters from html page and validate them
                 Properties params = getDeleteRoleParameters(req);
-                if ( params.values().contains("") ) {
+                if (params.values().contains("")) {
                     String header = "Error in AdminRoles, delete";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/role_to_delete_missing") + "<br>";
@@ -368,13 +493,13 @@ public String[] transformToStringPair(Object input) {
             }
 
             // ****** UPDATE ROLE PERMISSIONS ********
-            if ( req.getParameter("UPDATE_ROLE_PERMISSIONS") != null ) {
+            if (req.getParameter("UPDATE_ROLE_PERMISSIONS") != null) {
 
                 // Lets check that role_id is corect, not lost or manipulated
                 Properties params = getEditRoleParameters(req);
                 String[] checkedPermissions = req.getParameterValues("PERMISSION_CHECKBOX");
 
-                if ( params.values().contains("") ) {
+                if (params.values().contains("")) {
                     String header = "Error in AdminRoles ";
                     Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                     String msg = langproperties.getProperty("error/servlet/AdminRoles/role_to_delete_missing") + "<br>";
@@ -386,8 +511,8 @@ public String[] transformToStringPair(Object input) {
                 int permissionValue = collectPermissionsState(checkedPermissions);
 
                 // lets update
-                final Object[] parameters = new String[] { params.getProperty("ROLE_ID"),
-                        "" + permissionValue };
+                final Object[] parameters = new String[]{params.getProperty("ROLE_ID"),
+                        "" + permissionValue};
                 imcref.getProcedureExecutor().executeUpdateProcedure("RoleUpdatePermissions", parameters);
 
                 doGet(req, res);
@@ -396,18 +521,22 @@ public String[] transformToStringPair(Object input) {
 
     } // end HTTP POST
 
-    private boolean roleExists( ImcmsAuthenticatorAndUserAndRoleMapper userAndRoleMapper, String roleName ) {
-        return null != userAndRoleMapper.getRoleByName( roleName );
+    public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        doGet(req, resp);
+    }
+
+    private boolean roleExists(ImcmsAuthenticatorAndUserAndRoleMapper userAndRoleMapper, String roleName) {
+        return null != userAndRoleMapper.getRoleByName(roleName);
     }
 
     /**
      * Collects the parameters from the request object
      */
 
-    private Properties getAddRoleParameters( HttpServletRequest req ) {
+    private Properties getAddRoleParameters(HttpServletRequest req) {
         Properties roleInfoP = new Properties();
-        String roleInfo = req.getParameter("ROLE_NAME") != null ? ( req.getParameter("ROLE_NAME") ) : "";
-        roleInfoP.setProperty( "ROLE_NAME", roleInfo );
+        String roleInfo = req.getParameter("ROLE_NAME") != null ? (req.getParameter("ROLE_NAME")) : "";
+        roleInfoP.setProperty("ROLE_NAME", roleInfo);
         return roleInfoP;
     }
 
@@ -415,12 +544,12 @@ private Properties getAddRoleParameters( HttpServletRequest req ) {
      * Collects the parameters from the request object at RENAME process
      */
 
-    private Properties getRenameRoleParameters( HttpServletRequest req ) {
+    private Properties getRenameRoleParameters(HttpServletRequest req) {
         Properties roleInfoP = new Properties();
         String roleId = req.getParameter("ROLE_ID") != null ? req.getParameter("ROLE_ID") : "";
-        String roleInfo = !( req.getParameter("ROLE_NAME") == null ) ? req.getParameter("ROLE_NAME") : "";
-        roleInfoP.setProperty( "ROLE_ID", roleId );
-        roleInfoP.setProperty( "ROLE_NAME", roleInfo );
+        String roleInfo = !(req.getParameter("ROLE_NAME") == null) ? req.getParameter("ROLE_NAME") : "";
+        roleInfoP.setProperty("ROLE_ID", roleId);
+        roleInfoP.setProperty("ROLE_NAME", roleInfo);
         return roleInfoP;
     }
 
@@ -428,29 +557,29 @@ private Properties getRenameRoleParameters( HttpServletRequest req ) {
      * Collects the parameters from the request object
      */
 
-    private Properties getDeleteRoleParameters( HttpServletRequest req ) {
+    private Properties getDeleteRoleParameters(HttpServletRequest req) {
         Properties roleInfoP = new Properties();
         String roleInfo = req.getParameter("ROLE_ID") != null ? req.getParameter("ROLE_ID") : "";
-        roleInfoP.setProperty( "ROLE_ID", roleInfo );
+        roleInfoP.setProperty("ROLE_ID", roleInfo);
         return roleInfoP;
     }
 
     /**
      * Collects the parameters from the request object at UPDATE process
      */
-    private Properties getEditRoleParameters( HttpServletRequest req ) {
+    private Properties getEditRoleParameters(HttpServletRequest req) {
         Properties roleInfoP = new Properties();
 
         String roleInfo = req.getParameter("ROLE_ID") == null ? "" : req.getParameter("ROLE_ID");
 
-        roleInfoP.setProperty( "ROLE_ID", roleInfo );
+        roleInfoP.setProperty("ROLE_ID", roleInfo);
 
         return roleInfoP;
     }
 
     /* create permissions tag */
-    private String createPermissionComponent( HttpServletRequest req,
-                                              String[][] permissionList ) {
+    private String createPermissionComponent(HttpServletRequest req,
+                                             String[][] permissionList) {
 
         /* create rows of permission */
         StringBuffer permissionTableRows = new StringBuffer();
@@ -459,7 +588,7 @@ private String createPermissionComponent( HttpServletRequest req,
          * lets create permission as a component
          * element: 0 = value, 1 = permission_id, 2 = description
          */
-        for ( String[] aPermissionList : permissionList ) {
+        for (String[] aPermissionList : permissionList) {
 
             String permissionId = aPermissionList[1];
             String description = aPermissionList[2];
@@ -469,7 +598,7 @@ private String createPermissionComponent( HttpServletRequest req,
             vm.put("PERMISSION_DESCRIPTION", description);
             vm.put("PERMISSON_ID", permissionId);
 
-            if ( isChecked ) {
+            if (isChecked) {
                 vm.put("PERMISSION_CHECKED", "checked");
             } else {
                 vm.put("PERMISSION_CHECKED", "");
@@ -483,22 +612,22 @@ private String createPermissionComponent( HttpServletRequest req,
 
         //create component
         Map vmTable = new HashMap();
-        vmTable.put("PERMISSION_ROWS", permissionTableRows.toString()) ;
+        vmTable.put("PERMISSION_ROWS", permissionTableRows.toString());
 
-        return createHtml( req, vmTable, HTML_EDIT_ROLE_TABLE );
+        return createHtml(req, vmTable, HTML_EDIT_ROLE_TABLE);
     }
 
-    private int collectPermissionsState( String[] checkedPermissions ) {
+    private int collectPermissionsState(String[] checkedPermissions) {
         int permissionValue = 0;
 
-        if ( checkedPermissions != null ) {
+        if (checkedPermissions != null) {
 
-            for ( String checkedPermission : checkedPermissions ) {
+            for (String checkedPermission : checkedPermissions) {
                 int permissionId = 0;
 
                 try {
                     permissionId = Integer.parseInt(checkedPermission);
-                } catch ( NumberFormatException e ) {
+                } catch (NumberFormatException e) {
                     LOG.debug("Error in checking roles: NumberFormatException");
                 }
 
@@ -507,51 +636,4 @@ private int collectPermissionsState( String[] checkedPermissions ) {
         }
         return permissionValue;
     }
-
-    public static void printErrorMessage(HttpServletRequest req, HttpServletResponse res, String header, String msg
-    ) throws IOException {
-        List tagsAndData = new ArrayList();
-        tagsAndData.add("#ERROR_HEADER#");
-        tagsAndData.add(header);
-        tagsAndData.add("#ERROR_MESSAGE#");
-        tagsAndData.add(msg);
-
-        String fileName = "AdminError.htm";
-
-        // Lets get the path to the admin templates folder
-        ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser(req);
-
-        String html = imcref.getAdminTemplate(fileName, user, tagsAndData);
-        Utility.setDefaultHtmlContentType(res);
-        res.getWriter().println(html);
-    }
-
-    static String createHtml(HttpServletRequest req,
-                             Map vm, String htmlFile) {
-
-        ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser(req);
-
-        vm.put("SERVLET_URL", "");
-        vm.put("SERVLET_URL2", "");
-
-        List tagsAndData1 = new ArrayList(vm.size() * 2);
-        for ( Map.Entry<String, String> entry1 : (Iterable<Map.Entry<String, String>>) vm.entrySet() ) {
-            tagsAndData1.add("#" + entry1.getKey() + "#");
-            tagsAndData1.add(entry1.getValue());
-        }
-
-        return imcref.getAdminTemplate(htmlFile, user, tagsAndData1);
-    }
-
-    public static void sendHtml(HttpServletRequest req, HttpServletResponse res,
-                                Map vm, String htmlFile) throws IOException {
-
-        String str = createHtml(req, vm, htmlFile);
-        Utility.setDefaultHtmlContentType(res);
-        PrintWriter out = res.getWriter();
-
-        out.println(str);
-    }
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminSearchTerms.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminSearchTerms.java
index 201522c81e..a058e7e3a4 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminSearchTerms.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminSearchTerms.java
@@ -30,8 +30,8 @@ public class AdminSearchTerms extends HttpServlet {
 
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response) throws ServletException, IOException {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        if ( !user.isSuperAdmin() ) {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        if (!user.isSuperAdmin()) {
             Utility.forwardToLogin(request, response);
             return;
         }
@@ -41,14 +41,14 @@ protected void doGet(HttpServletRequest request,
 
     protected void doPost(HttpServletRequest request,
                           HttpServletResponse response) throws ServletException, IOException {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        if ( !user.isSuperAdmin() ) {
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        if (!user.isSuperAdmin()) {
             Utility.forwardToLogin(request, response);
             return;
         }
 
         if (null != request.getParameter(OkCancelPage.REQUEST_PARAMETER__CANCEL)) {
-            response.sendRedirect(request.getContextPath()+"/servlet/AdminManager");
+            response.sendRedirect(request.getContextPath() + "/servlet/AdminManager");
             return;
         }
         Date fromDate = getDateParameter(request, "from_date");
@@ -62,7 +62,7 @@ private Date getDateParameter(HttpServletRequest request, String parameterName)
         Date date = null;
         try {
             date = dateFormat.parse(parameterValue);
-        } catch ( ParseException e ) {
+        } catch (ParseException e) {
 
         }
         return date;
@@ -70,8 +70,8 @@ private Date getDateParameter(HttpServletRequest request, String parameterName)
 
     private List<TermCount> getTermCounts(Date fromDate, Date toDate) {
         Database database = Imcms.getServices().getDatabase();
-        List<String> whereClauses = new ArrayList<String>();
-        List<Date> parameters = new ArrayList<Date>();
+        List<String> whereClauses = new ArrayList<>();
+        List<Date> parameters = new ArrayList<>();
         if (null != fromDate) {
             whereClauses.add("datetime >= ?");
             parameters.add(new Timestamp(fromDate.getTime()));
@@ -80,11 +80,11 @@ private List<TermCount> getTermCounts(Date fromDate, Date toDate) {
             whereClauses.add("datetime < ?");
             parameters.add(new Timestamp(toDate.getTime()));
         }
-        String whereClausesString = whereClauses.isEmpty() ? "" : " WHERE "+StringUtils.join(whereClauses.iterator(), " AND ");
-        DatabaseCommand queryCommand = new SqlQueryDatabaseCommand("SELECT term, COUNT(term) c FROM document_search_log"+whereClausesString+
-                                                                   " GROUP BY term ORDER BY c DESC, term", 
-                                                                   parameters.toArray(new Object[parameters.size()]),
-                                                                   new CollectionHandler(new ArrayList(), new TermCountFactory()));
+        String whereClausesString = whereClauses.isEmpty() ? "" : " WHERE " + StringUtils.join(whereClauses.iterator(), " AND ");
+        DatabaseCommand queryCommand = new SqlQueryDatabaseCommand("SELECT term, COUNT(term) c FROM document_search_log" + whereClausesString +
+                " GROUP BY term ORDER BY c DESC, term",
+                parameters.toArray(new Object[parameters.size()]),
+                new CollectionHandler(new ArrayList(), new TermCountFactory()));
         return (List<TermCount>) database.execute(queryCommand);
     }
 
@@ -92,10 +92,10 @@ private void doView(Date fromDate, Date toDate, boolean search, HttpServletReque
                         HttpServletResponse response) throws ServletException, IOException {
         if (search) {
             request.setAttribute("fromDate", fromDate);
-            request.setAttribute("toDate", Utility.addDate(toDate,-1));
+            request.setAttribute("toDate", Utility.addDate(toDate, -1));
             request.setAttribute("termCounts", getTermCounts(fromDate, toDate));
         }
-        request.getRequestDispatcher( "/WEB-INF/jsp/imcms/document_search_terms.jsp" ).forward( request, response );
+        request.getRequestDispatcher("/WEB-INF/jsp/imcms/document_search_terms.jsp").forward(request, response);
     }
 
     public static class TermCount {
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminSection.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminSection.java
index ea4123f9b1..baab0fdcf0 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminSection.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminSection.java
@@ -2,7 +2,7 @@
 
 import com.imcode.db.commands.DeleteWhereColumnsEqualDatabaseCommand;
 import com.imcode.db.commands.SqlUpdateCommand;
-import com.imcode.db.handlers.ObjectFromFirstRowResultSetHandler;
+import com.imcode.db.handlers.SingleObjectHandler;
 import com.imcode.imcms.db.StringArrayArrayResultSetHandler;
 import com.imcode.imcms.db.StringFromRowFactory;
 import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
@@ -10,7 +10,8 @@
 import imcode.server.ImcmsServices;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
@@ -23,7 +24,7 @@
 
 public class AdminSection extends HttpServlet {
 
-    private final static Logger log = Logger.getLogger( AdminSection.class.getName() );
+    private final static Logger log = LogManager.getLogger(AdminSection.class.getName());
 
     private final static String ADMIN_TEMPLATE = "sections/admin_section.html";
     private final static String ADD_TEMPLATE = "sections/admin_section_add.html";
@@ -35,12 +36,12 @@ public class AdminSection extends HttpServlet {
     public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         ImcmsServices imcref = Imcms.getServices();
 
-        Utility.setDefaultHtmlContentType( res );
+        Utility.setDefaultHtmlContentType(res);
 
         UserDomainObject user = Utility.getLoggedOnUser(req);
 
         //lets see if its a super admin we got otherwise get rid of him fast
-        if ( !user.isSuperAdmin() ) {
+        if (!user.isSuperAdmin()) {
             log.debug("the user wasn't a administrator so lets get rid of him");
             res.sendRedirect("StartDoc");
             return;
@@ -48,7 +49,8 @@ public void doGet(HttpServletRequest req, HttpServletResponse res) throws Servle
 
         //ok so far lets load the admin page
         ServletOutputStream out = res.getOutputStream();
-        out.print(imcref.getAdminTemplate( ADMIN_TEMPLATE, user, null ));
+        String content = imcref.getAdminTemplate(ADMIN_TEMPLATE, user, null);
+        out.write(content.getBytes(Imcms.DEFAULT_ENCODING));
         out.flush();
         out.close();
         return;
@@ -83,8 +85,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
             //lets start and see if we need to save anything to the db
             if (!new_section_name.equals("")) {
                 boolean section_exists = false;
-                for( int i=0; i < section_arr.length; i++){
-                    if( new_section_name.equals( section_arr[i][1]) ){
+                for (int i = 0; i < section_arr.length; i++) {
+                    if (new_section_name.equals(section_arr[i][1])) {
                         section_exists = true;
                         Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                         errormsg = langproperties.getProperty("error/servlet/AdminSection/section_exists");
@@ -93,8 +95,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
                 }
 
                 //ok we have a new name lets save it to db, but only if it's not exists in db
-                if(!section_exists){
-                    final Object[] parameters = new String[] {new_section_name};
+                if (!section_exists) {
+                    final Object[] parameters = new String[]{new_section_name};
                     imcref.getProcedureExecutor().executeUpdateProcedure("SectionAdd", parameters);
                     imcref.getDocumentMapper().initSections();
                     final Object[] parameters1 = new String[0];
@@ -103,11 +105,11 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
             }
 
             vec.add("#errormsg#");
-            vec.add( errormsg );
+            vec.add(errormsg);
             vec.add("#section_list#");
             vec.add(createOptionList(section_arr, user, null));
             //ok lets parse the page with right template
-            htmlToSend.append(imcref.getAdminTemplate( ADD_TEMPLATE, user, vec ));
+            htmlToSend.append(imcref.getAdminTemplate(ADD_TEMPLATE, user, vec));
         }//end if(req.getParameter("add_section")!= null)
         //**** end add_section-case ****
 
@@ -118,8 +120,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
             String section_id = req.getParameter("section_list") == null ? "-1" : req.getParameter("section_list");
             if ((!new_section.equals("")) && (!section_id.equals("-1"))) {
                 //ok we have a new name lets save it to db, but only if it's not exists in db
-                final Object[] parameters = new String[] {section_id,
-                                                                                                new_section};
+                final Object[] parameters = new String[]{section_id,
+                        new_section};
                 imcref.getProcedureExecutor().executeUpdateProcedure("SectionChangeName", parameters);
                 imcref.getDocumentMapper().initSections();
             }
@@ -131,7 +133,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
             vec.add("#section_list#");
             vec.add(createOptionList(section_arr, user, null));
             //ok lets parse the page with right template
-            htmlToSend.append(imcref.getAdminTemplate( NAME_TEMPLATE, user, vec ));
+            htmlToSend.append(imcref.getAdminTemplate(NAME_TEMPLATE, user, vec));
 
         }//end if (req.getParameter("edit_section")!= null)
         //**** lend edit_section-case ****
@@ -154,12 +156,12 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
                 return;
             }
             if (new_sections.equals("-1")) {
-                deleteSection( imcref, del_section );
+                deleteSection(imcref, del_section);
             } else {
-                final Object[] parameters = new String[] {new_sections,
-                                                                                            del_section};
+                final Object[] parameters = new String[]{new_sections,
+                        del_section};
                 imcref.getDatabase().execute(new SqlUpdateCommand("update meta_section set section_id = ? where section_id = ?", parameters));
-                deleteSection( imcref, del_section );
+                deleteSection(imcref, del_section);
             }
         }
 
@@ -169,8 +171,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
             String section_id = req.getParameter("section_list") == null ? "-1" : req.getParameter("section_list");
             if (!section_id.equals("-1")) {
                 //ok we have a request for delete lets see if there is any docs connected to that section_id
-                final Object[] parameters = new String[] {section_id};
-                String doc_nrs = (String) imcref.getProcedureExecutor().executeProcedure("SectionCount", parameters, new ObjectFromFirstRowResultSetHandler(new StringFromRowFactory()));
+                final Object[] parameters = new String[]{section_id};
+                String doc_nrs = (String) imcref.getProcedureExecutor().executeProcedure("SectionCount", parameters, new SingleObjectHandler<>(new StringFromRowFactory()));
                 int doc_int = 0;
                 if (doc_nrs != null) {
                     try {
@@ -192,11 +194,11 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
                     vec.add(doc_nrs);
                     vec.add("#delete_section#");
                     vec.add(section_id);
-                    htmlToSend.append(imcref.getAdminTemplate( DELETE_CONFIRM_TEMPLATE, user, vec ));
+                    htmlToSend.append(imcref.getAdminTemplate(DELETE_CONFIRM_TEMPLATE, user, vec));
                     got_confirm_page = true;
                 } else {
                     //ok we can delete it right a way an carry on with it
-                    deleteSection( imcref, section_id );
+                    deleteSection(imcref, section_id);
                 }
             }
 
@@ -209,14 +211,13 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
                 vec.add("#section_list#");
                 vec.add(createOptionList(section_arr, user, null));
                 //ok lets parse the page with right template
-                htmlToSend.append(imcref.getAdminTemplate( DELETE_TEMPLATE, user, vec ));
+                htmlToSend.append(imcref.getAdminTemplate(DELETE_TEMPLATE, user, vec));
             }
 
         }//end if (req.getParameter("edit_section")!= null)
         //**** end delete_section-case ****
 
 
-
         //**** ok lets rapp it all up *****
         //lets see if we got anything to send, if not lets send it to doGet-method instead
         if (htmlToSend.length() == 0) {
@@ -224,16 +225,16 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
             return;
         }
         //ok now lets send the page to browser
-        Utility.setDefaultHtmlContentType( res );
+        Utility.setDefaultHtmlContentType(res);
         ServletOutputStream out = res.getOutputStream();
-        out.print(htmlToSend.toString());
+        out.write(htmlToSend.toString().getBytes(Imcms.DEFAULT_ENCODING));
         out.flush();
         out.close();
     }//end doPost()
 
-    private void deleteSection( ImcmsServices imcref, String del_section ) {
-        imcref.getDatabase().execute(new DeleteWhereColumnsEqualDatabaseCommand( "meta_section", "section_id", del_section) ) ;
-        imcref.getDatabase().execute(new DeleteWhereColumnsEqualDatabaseCommand( "sections", "section_id", del_section) ) ;
+    private void deleteSection(ImcmsServices imcref, String del_section) {
+        imcref.getDatabase().execute(new DeleteWhereColumnsEqualDatabaseCommand("meta_section", "section_id", del_section));
+        imcref.getDatabase().execute(new DeleteWhereColumnsEqualDatabaseCommand("sections", "section_id", del_section));
         imcref.getDocumentMapper().initSections();
     }
 
@@ -256,7 +257,7 @@ private String createOptionList(String[][] arr, UserDomainObject user, String no
                 vec.add(arr[i][1]);
                 vec.add("#docs#");
                 vec.add(arr[i][2]);
-                buff.append(imcref.getAdminTemplate( LINE_TEMPLATE, user, vec ));
+                buff.append(imcref.getAdminTemplate(LINE_TEMPLATE, user, vec));
             }
         }
         return buff.toString();
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminSystemInfo.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminSystemInfo.java
index d3d3f407b7..c7c34f3496 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminSystemInfo.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminSystemInfo.java
@@ -1,12 +1,15 @@
 package com.imcode.imcms.servlet.superadmin;
 
+import com.imcode.imcms.servlet.Version;
+import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.SystemData;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
-import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
-import org.apache.log4j.Logger;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -19,10 +22,12 @@
 
 public class AdminSystemInfo extends HttpServlet {
 
-    private final static Logger log = Logger.getLogger( AdminSystemInfo.class.getName() );
+    private final static Logger log = LogManager.getLogger(AdminSystemInfo.class.getName());
 
     private final static String HTML_TEMPLATE = "AdminSystemMessage.htm";
 
+    private final static String VERSION_FILE = "/WEB-INF/version.txt";
+
     /**
      * The GET method creates the html page when this side has been
      * redirected from somewhere else.
@@ -44,14 +49,27 @@ public void doGet(HttpServletRequest req, HttpServletResponse res)
         String serverMasterEmail = sysData.getServerMasterAddress();
 
 
+        String imcmsVersion = Version.getImcmsVersion(getServletContext());
+        String serverInfo = getServletContext().getServerInfo();
+        String databaseProductNameAndVersion = Version.getDatabaseProductNameAndVersion();
+        String javaVersion = Version.getJavaVersion();
+        String imCmsData = "Version:  " + imcmsVersion +
+                "\nServer:   " + serverInfo +
+                "\nDatabase: " + databaseProductNameAndVersion +
+                "\nJava:     " + javaVersion +
+                "\nPath:     " + Imcms.getPath();
+
+
         // Lets generate the html page
         Map vm = new HashMap();
+        vm.put("IMCMS_DATA", "" + imCmsData);
         vm.put("STARTDOCUMENT", "" + startDoc);
         vm.put("SYSTEM_MESSAGE", msg);
         vm.put("WEB_MASTER", webMaster);
         vm.put("WEB_MASTER_EMAIL", webMasterEmail);
         vm.put("SERVER_MASTER", serverMaster);
         vm.put("SERVER_MASTER_EMAIL", serverMasterEmail);
+        vm.put("PASSWORD_RESET_EXPIRATION_INTERVAL", "" + sysData.getUserLoginPasswordResetExpirationInterval());
 
         AdminRoles.sendHtml(req, res, vm, HTML_TEMPLATE);
     } // End doGet
@@ -62,8 +80,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
         ImcmsServices imcref = Imcms.getServices();
 
         // Lets check if the user is an admin, otherwise throw him out.
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.isSuperAdmin()) {
             String header = "Error in AdminSystemInfo. ";
             Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
             String msg = langproperties.getProperty("error/servlet/global/no_administrator") + "<br>";
@@ -111,11 +129,11 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
             String serverMasterEmail = req.getParameter("SERVER_MASTER_EMAIL") == null ? "" : req.getParameter("SERVER_MASTER_EMAIL");
 
             // Lets validate the parameters
-            if (serverMaster.equalsIgnoreCase("") || !Utility.isValidEmail( serverMasterEmail )) {
+            if (serverMaster.equalsIgnoreCase("") || !Utility.isValidEmail(serverMasterEmail)) {
                 String header = "Error in AdminSystemInfo, servermaster info.";
                 Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                 String msg = langproperties.getProperty("error/servlet/AdminSystemInfo/validate_form_parameters")
-                             + "<br>";
+                        + "<br>";
                 AdminRoles.printErrorMessage(req, res, header, msg);
                 return;
             }
@@ -139,11 +157,11 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
             String webMasterEmail = req.getParameter("WEB_MASTER_EMAIL") == null ? "" : req.getParameter("WEB_MASTER_EMAIL");
 
             // Lets validate the parameters
-            if (webMaster.equalsIgnoreCase("") || !Utility.isValidEmail( webMasterEmail )) {
+            if (webMaster.equalsIgnoreCase("") || !Utility.isValidEmail(webMasterEmail)) {
                 String header = "Error in AdminSystemInfo, webmaster info.";
                 Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
                 String msg = langproperties.getProperty("error/servlet/AdminSystemInfo/validate_form_parameters")
-                             + "<br>";
+                        + "<br>";
                 AdminRoles.printErrorMessage(req, res, header, msg);
                 return;
             }
@@ -158,6 +176,30 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
             doGet(req, res);
             return;
         }
+
+
+        if (req.getParameter("SetPasswordResetExpirationInterval") != null) {
+            String value = StringUtils.trimToEmpty(req.getParameter("PASSWORD_RESET_EXPIRATION_INTERVAL"));
+
+            if (!value.isEmpty()) {
+                try {
+                    int interval = Integer.parseInt(value);
+                    if (interval > 0) {
+                        imcode.server.SystemData sysData = imcref.getSystemData();
+                        sysData.setUserLoginPasswordResetExpirationInterval(interval);
+
+                        imcref.setSystemData(sysData);
+                    }
+                } catch (NumberFormatException e) {
+                    // ignore
+                }
+            }
+
+            doGet(req, res);
+            return;
+        }
+
+
         if (req.getParameter("Cancel") != null) {
             res.sendRedirect("AdminManager");
         }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/AdminUser.java b/server/src/com/imcode/imcms/servlet/superadmin/AdminUser.java
index 2afcf7a413..a2b48ae794 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/AdminUser.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/AdminUser.java
@@ -2,12 +2,13 @@
 
 import com.imcode.imcms.flow.DispatchCommand;
 import com.imcode.imcms.servlet.admin.UserFinder;
+import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.server.Imcms;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
-import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -20,19 +21,19 @@
 
 public class AdminUser extends HttpServlet {
 
-    private final static Logger log = Logger.getLogger( AdminUser.class.getName() );
-    private final static String CHANGE_EXTERNAL_USER_URL = "/jsp/changeexternaluser.jsp";
-    private static final LocalizedMessage BUTTON_TEXT__EDIT_USER = new LocalizedMessage( "templates/sv/AdminChangeUser.htm/2006" );
-    private static final LocalizedMessage HEADLINE__EDIT_USER = new LocalizedMessage( "templates/sv/AdminChangeUser.htm/4/1" );
     public final static String USER_LOGIN_NAME_PARAMETER_NAME = "loginname";
+    private final static Logger log = LogManager.getLogger(AdminUser.class.getName());
+    private final static String CHANGE_EXTERNAL_USER_URL = "/jsp/changeexternaluser.jsp";
+    private static final LocalizedMessage BUTTON_TEXT__EDIT_USER = new LocalizedMessage("templates/sv/AdminChangeUser.htm/2006");
+    private static final LocalizedMessage HEADLINE__EDIT_USER = new LocalizedMessage("templates/sv/AdminChangeUser.htm/4/1");
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
-        final UserDomainObject user = Utility.getLoggedOnUser( req );
-        Utility.setDefaultHtmlContentType( res );
+        final UserDomainObject user = Utility.getLoggedOnUser(req);
+        Utility.setDefaultHtmlContentType(res);
 
         // Lets verify that the user is an admin, otherwise throw him out.
-        if ( !user.isSuperAdmin() && !user.isUserAdminAndCanEditAtLeastOneRole() ) {
+        if (!user.isSuperAdmin() && !user.isUserAdminAndCanEditAtLeastOneRole()) {
             String header = "Error in AdminUser.";
             Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
             String msg = langproperties.getProperty("error/servlet/global/no_administrator") + "<br>";
@@ -42,47 +43,47 @@ public void doGet( HttpServletRequest req, HttpServletResponse res ) throws Serv
         }
 
         UserFinder userFinder = new UserFinder();
-        userFinder.setUsersAddable( true );
-        userFinder.setHeadline( HEADLINE__EDIT_USER ) ;
-        userFinder.setSelectButtonText( BUTTON_TEXT__EDIT_USER );
-        userFinder.setSelectUserCommand( new UserFinder.SelectUserCommand() {
-            public void selectUser( UserDomainObject selectedUser, HttpServletRequest request,
-                                    HttpServletResponse response ) throws ServletException, IOException {
-                gotoChangeUser( request, response, user, selectedUser );
+        userFinder.setUsersAddable(true);
+        userFinder.setHeadline(HEADLINE__EDIT_USER);
+        userFinder.setSelectButtonText(BUTTON_TEXT__EDIT_USER);
+        userFinder.setSelectUserCommand(new UserFinder.SelectUserCommand() {
+            public void selectUser(UserDomainObject selectedUser, HttpServletRequest request,
+                                   HttpServletResponse response) throws ServletException, IOException {
+                gotoChangeUser(request, response, user, selectedUser);
             }
-        } );
-        userFinder.setCancelCommand( new DispatchCommand() {
-            public void dispatch( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException {
-                request.getRequestDispatcher( "AdminManager" ).forward( request, response );
+        });
+        userFinder.setCancelCommand(new DispatchCommand() {
+            public void dispatch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+                request.getRequestDispatcher("AdminManager").forward(request, response);
             }
-        } );
-        userFinder.forward( req, res );
+        });
+        userFinder.forward(req, res);
     }
 
-    public void doPost( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        response.sendRedirect( "AdminManager" );
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.sendRedirect("AdminManager");
     }
 
-    private void gotoChangeUser( HttpServletRequest req, HttpServletResponse res, UserDomainObject user,
-                                 UserDomainObject userToChange ) throws IOException, ServletException {
-        if ( !userToChange.isImcmsExternal() ) {
-            redirectChangeUser( req, res, user, userToChange );
+    private void gotoChangeUser(HttpServletRequest req, HttpServletResponse res, UserDomainObject user,
+                                UserDomainObject userToChange) throws IOException, ServletException {
+        if (!userToChange.isImcmsExternal()) {
+            redirectChangeUser(req, res, user, userToChange);
         } else {
             String queryString = "?"
-                                 + URLEncoder.encode( USER_LOGIN_NAME_PARAMETER_NAME, "UTF-8" )
-                                 + "="
-                                 + URLEncoder.encode( userToChange.getLoginName(), "UTF-8" );
-            RequestDispatcher rd = req.getRequestDispatcher( "/imcms/" + user.getLanguageIso639_2()
-                                                             + CHANGE_EXTERNAL_USER_URL
-                                                             + queryString );
-            rd.forward( req, res );
+                    + URLEncoder.encode(USER_LOGIN_NAME_PARAMETER_NAME, "UTF-8")
+                    + "="
+                    + URLEncoder.encode(userToChange.getLoginName(), "UTF-8");
+            RequestDispatcher rd = req.getRequestDispatcher("/imcms/" + user.getLanguageIso639_2()
+                    + CHANGE_EXTERNAL_USER_URL
+                    + queryString);
+            rd.forward(req, res);
         }
     }
 
-    private void redirectChangeUser( HttpServletRequest req, HttpServletResponse res, UserDomainObject user,
-                                     final UserDomainObject userToChange ) throws IOException, ServletException {
+    private void redirectChangeUser(HttpServletRequest req, HttpServletResponse res, UserDomainObject user,
+                                    final UserDomainObject userToChange) throws IOException, ServletException {
 
-        if ( !user.isSuperAdmin() && !user.isUserAdminAndCanEditAtLeastOneRole() && !userToChange.equals( user ) ) {
+        if (!user.isSuperAdmin() && !user.isUserAdminAndCanEditAtLeastOneRole() && !userToChange.equals(user)) {
             String header = "Error in AdminUser, change user.";
             Properties langproperties = ImcmsPrefsLocalizedMessageProvider.getLanguageProperties(user);
             String msg = langproperties.getProperty("error/servlet/AdminUser/user_have_no_permission") + "<br>";
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/DocumentReferences.java b/server/src/com/imcode/imcms/servlet/superadmin/DocumentReferences.java
index 294910d918..dc8ba26b14 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/DocumentReferences.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/DocumentReferences.java
@@ -1,15 +1,15 @@
 package com.imcode.imcms.servlet.superadmin;
 
-import imcode.server.user.UserDomainObject;
 import com.imcode.imcms.mapping.DocumentMapper;
-import imcode.server.document.DocumentDomainObject;
 import imcode.server.Imcms;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import java.io.IOException;
 
 public class DocumentReferences extends HttpServlet {
@@ -19,34 +19,34 @@ public class DocumentReferences extends HttpServlet {
     public static final String REQUEST_PARAMETER__BUTTON_RETURN = "return";
     public static final String REQUEST_ATTRIBUTE__DOCUMENT_MENU_PAIRS = "documentMenuPairs";
 
-    public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        if ( !user.isSuperAdmin() ) {
-            Utility.redirectToStartDocument( request, response );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        if (!user.isSuperAdmin()) {
+            Utility.redirectToStartDocument(request, response);
             return;
         }
 
-        if (null != request.getParameter( REQUEST_PARAMETER__BUTTON_RETURN )) {
-            request.getRequestDispatcher( request.getParameter( REQUEST_PARAMETER__RETURNURL )).forward( request, response );
-            return ;
+        if (null != request.getParameter(REQUEST_PARAMETER__BUTTON_RETURN)) {
+            request.getRequestDispatcher(request.getParameter(REQUEST_PARAMETER__RETURNURL)).forward(request, response);
+            return;
         }
 
-        if ( null != request.getParameter( REQUEST_PARAMETER__REFERENCED_DOCUMENT_ID ) ) {
-            forwardToDocumentReferencesPage( request, response, user );
-            return ;
+        if (null != request.getParameter(REQUEST_PARAMETER__REFERENCED_DOCUMENT_ID)) {
+            forwardToDocumentReferencesPage(request, response, user);
+            return;
         }
 
     }
 
-    private void forwardToDocumentReferencesPage( HttpServletRequest request, HttpServletResponse response,
-                                                     UserDomainObject user ) throws IOException, ServletException {
-        int documentId = Integer.parseInt( request.getParameter( REQUEST_PARAMETER__REFERENCED_DOCUMENT_ID ) );
+    private void forwardToDocumentReferencesPage(HttpServletRequest request, HttpServletResponse response,
+                                                 UserDomainObject user) throws IOException, ServletException {
+        int documentId = Integer.parseInt(request.getParameter(REQUEST_PARAMETER__REFERENCED_DOCUMENT_ID));
         DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-        DocumentDomainObject document = documentMapper.getDocument( documentId );
-        DocumentMapper.TextDocumentMenuIndexPair[] documentMenuPairs = documentMapper.getDocumentMenuPairsContainingDocument( document );
-        request.setAttribute( REQUEST_ATTRIBUTE__DOCUMENT_MENU_PAIRS, documentMenuPairs );
-        request.getRequestDispatcher( "/imcms/" + user.getLanguageIso639_2() + "/jsp/document_references.jsp" ).forward( request, response );
+        DocumentDomainObject document = documentMapper.getDocument(documentId);
+        DocumentMapper.TextDocumentMenuIndexPair[] documentMenuPairs = documentMapper.getDocumentMenuPairsContainingDocument(document);
+        request.setAttribute(REQUEST_ATTRIBUTE__DOCUMENT_MENU_PAIRS, documentMenuPairs);
+        request.getRequestDispatcher("/imcms/" + user.getLanguageIso639_2() + "/jsp/document_references.jsp").forward(request, response);
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/EncryptPasswords.java b/server/src/com/imcode/imcms/servlet/superadmin/EncryptPasswords.java
new file mode 100644
index 0000000000..fcb0b3d8bc
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/superadmin/EncryptPasswords.java
@@ -0,0 +1,23 @@
+package com.imcode.imcms.servlet.superadmin;
+
+import com.imcode.imcms.api.ContentManagementSystem;
+import imcode.server.Imcms;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class EncryptPasswords extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        ContentManagementSystem cms = ContentManagementSystem.fromRequest(request);
+        if (!cms.getCurrentUser().isSuperAdmin()) {
+            response.sendError(HttpServletResponse.SC_FORBIDDEN);
+            return;
+        }
+
+        Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().encryptUnencryptedUsersLoginPasswords();
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/ExportDocuments.java b/server/src/com/imcode/imcms/servlet/superadmin/ExportDocuments.java
new file mode 100644
index 0000000000..0fffe9c890
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/superadmin/ExportDocuments.java
@@ -0,0 +1,92 @@
+package com.imcode.imcms.servlet.superadmin;
+
+import com.imcode.imcms.domain.dto.export.DocumentExportService;
+import imcode.server.Imcms;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+
+@Log4j2
+public class ExportDocuments extends HttpServlet {
+
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		final UserDomainObject user = Utility.getLoggedOnUser(req);
+		if (!user.isSuperAdmin()) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN);
+			return;
+		}
+
+		final String startIdString = req.getParameter("start");
+		final String endIdString = req.getParameter("end");
+		final String documentsList = req.getParameter("documentsList");
+
+		if ((startIdString == null && endIdString == null) || documentsList == null) {
+			resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Incorrect params");
+			return;
+		}
+
+		final DocumentExportService documentExportService = Imcms.getServices().getDocumentExportService();
+		final boolean skipExported = Boolean.parseBoolean(req.getParameter("skipExported"));
+		final boolean exportImages = Boolean.parseBoolean(req.getParameter("exportImages"));
+		final boolean exportFiles = Boolean.parseBoolean(req.getParameter("exportFiles"));
+
+		if (StringUtils.isNotEmpty(documentsList)) {
+			final Integer[] documentsId = Arrays.stream(documentsList.split(",")).map(Integer::valueOf).toArray(Integer[]::new);
+			documentExportService.exportDocuments(documentsId, skipExported, exportImages, exportFiles, user);
+
+			resp.sendError(HttpServletResponse.SC_OK);
+			return;
+		}
+
+		documentExportService.exportDocuments(Integer.parseInt(startIdString), Integer.parseInt(endIdString), skipExported, exportImages, exportFiles, user);
+		resp.sendError(HttpServletResponse.SC_OK);
+	}
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		final UserDomainObject user = Utility.getLoggedOnUser(req);
+		if (!user.isSuperAdmin()) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN);
+			return;
+		}
+
+		final DocumentExportService documentExportService = Imcms.getServices().getDocumentExportService();
+		final Path exportZip = documentExportService.getExportZipPath();
+
+		if (Boolean.parseBoolean(req.getParameter("download"))) {
+			try (final OutputStream outputStream = resp.getOutputStream();
+				 final InputStream inputStream = Files.newInputStream(exportZip)) {
+				final byte[] bytes = new byte[1024];
+
+				resp.setContentType("application/zip");
+				resp.setContentLength(Math.toIntExact(inputStream.available()));
+				resp.setHeader("Content-Disposition", "attachment; filename=" + exportZip.getFileName());
+
+				int length;
+				while ((length = inputStream.read(bytes)) >= 0) {
+					outputStream.write(bytes, 0, length);
+				}
+
+				return;
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		req.setAttribute("history", documentExportService.getDocumentExportHistory());
+		req.getRequestDispatcher("/imcms/" + user.getLanguageIso639_2() + "/jsp/export/export_summary.jsp").forward(req, resp);
+	}
+}
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/FileAdmin.java b/server/src/com/imcode/imcms/servlet/superadmin/FileAdmin.java
index 51fec893e9..ba44ffdff6 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/FileAdmin.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/FileAdmin.java
@@ -12,7 +12,8 @@
 import org.apache.commons.io.filefilter.NotFileFilter;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
@@ -24,20 +25,35 @@
 
 public class FileAdmin extends HttpServlet {
 
-    private final static Logger LOG = Logger.getLogger( "FileAdmin" );
+    private final static Logger LOG = LogManager.getLogger("FileAdmin");
     private static final int BUFFER_SIZE = 65536;
     private static final String ADMIN_TEMPLATE_FILE_ADMIN_COPY_OVERWRIGHT_WARNING = "FileAdminCopyOverwriteWarning.html";
     private static final String ADMIN_TEMPLATE_FILE_ADMIN_MOVE_OVERWRITE_WARNING = "FileAdminMoveOverwriteWarning.html";
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            Utility.redirectToStartDocument( req, res );
+    static File findUniqueFilename(File file) {
+        File uniqueFile = file;
+        int counter = 1;
+        String previousSuffix = "";
+        while (uniqueFile.exists()) {
+            String filenameWithoutSuffix = StringUtils.substringBeforeLast(uniqueFile.getName(), previousSuffix);
+            String suffix = "." + counter;
+            counter++;
+            uniqueFile = new File(uniqueFile.getParentFile(), filenameWithoutSuffix + suffix);
+            previousSuffix = suffix;
+        }
+        return uniqueFile;
+    }
+
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+	    if (!user.isSuperAdmin() || !hasAccess(user.getId())) {
+            Utility.redirectToStartDocument(req, res);
             return;
         }
 
-        Utility.setNoCache( res );
+        Utility.setNoCache(res);
 
         File dir1 = null;
         File dir2 = null;
@@ -50,36 +66,36 @@ public void doGet( HttpServletRequest req, HttpServletResponse res ) throws Serv
             }
         }
 
-        outputFileAdmin( res, user, dir1, dir2 );
+        outputFileAdmin(res, user, dir1, dir2);
     }
 
     /**
      * Check to see if the path is a child to one of the rootpaths
      */
-    private boolean isUnderRoot( File path, File[] roots ) throws IOException {
-        for ( int i = 0; i < roots.length; i++ ) {
-            if ( FileUtility.directoryIsAncestorOfOrEqualTo( roots[i], path ) ) {
+    private boolean isUnderRoot(File path, File[] roots) throws IOException {
+        for (int i = 0; i < roots.length; i++) {
+            if (FileUtility.directoryIsAncestorOfOrEqualTo(roots[i], path)) {
                 return true;
             }
         }
         return false;
     }
 
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         ImcmsServices imcref = Imcms.getServices();
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            Utility.redirectToStartDocument( req, res );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+	    if (!user.isSuperAdmin() || !hasAccess(user.getId())) {
+            Utility.redirectToStartDocument(req, res);
             return;
         }
 
-        Utility.setNoCache( res );
+        Utility.setNoCache(res);
 
         MultipartHttpServletRequest mp = new MultipartHttpServletRequest(req);
 
-        if ( mp.getParameter( "cancel" ) != null ) {
-            res.sendRedirect( "AdminManager" );
+        if (mp.getParameter("cancel") != null) {
+            res.sendRedirect("AdminManager");
             return;
         }
 
@@ -88,106 +104,122 @@ public void doPost( HttpServletRequest req, HttpServletResponse res ) throws Ser
         File dir1 = getContextRelativeDirectoryFromRequest(mp, "dir1");
         File dir2 = getContextRelativeDirectoryFromRequest(mp, "dir2");
 
-        if ( !isUnderRoot( dir1, roots ) || !isUnderRoot( dir2, roots )) {
-            doGet( req, res );
-            return ;
+        if (!isUnderRoot(dir1, roots) || !isUnderRoot(dir2, roots)) {
+            doGet(req, res);
+            return;
         }
-        
-        String[] files1 = mp.getParameterValues( "files1" );
-        String[] files2 = mp.getParameterValues( "files2" );
-        String name = mp.getParameter( "name" );
+
+        String[] files1 = mp.getParameterValues("files1");
+        String[] files2 = mp.getParameterValues("files2");
+        String name = mp.getParameter("name");
 
         boolean outputHasBeenHandled = false;
 
-        if ( mp.getParameter( "change1" ) != null ) {	//UserDomainObject wants to change dir1
-            dir1 = changeDir( files1, dir1, roots );
-        } else if ( mp.getParameter( "change2" ) != null ) {	//UserDomainObject wants to change dir2
-            dir2 = changeDir( files2, dir2, roots );
-        } else if ( mp.getParameter( "mkdir1" ) != null ) {
-            outputHasBeenHandled = makeDirectory( name, dir1, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "mkdir2" ) != null ) {
-            outputHasBeenHandled = makeDirectory( name, dir2, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "delete1" ) != null ) {
-            outputHasBeenHandled = delete( dir1, files1, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "delete2" ) != null ) {
-            outputHasBeenHandled = delete( dir2, files2, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "deleteok" ) != null ) {
-            deleteOk( mp, roots );
-        } else if ( mp.getParameter( "upload1" ) != null ) {
-            outputHasBeenHandled = upload( mp, dir1, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "upload2" ) != null ) {
-            outputHasBeenHandled = upload( mp, dir2, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "download1" ) != null ) {
-            outputHasBeenHandled = download( files1, dir1, res );
-        } else if ( mp.getParameter( "download2" ) != null ) {
-            outputHasBeenHandled = download( files2, dir2, res );
-        } else if ( mp.getParameter( "rename1" ) != null ) {
-            outputHasBeenHandled = rename( files1, name, dir1, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "rename2" ) != null ) {
-            outputHasBeenHandled = rename( files2, name, dir2, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "copy1" ) != null ) {
-            outputHasBeenHandled = copy( files1, dir1, dir2, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "copy2" ) != null ) {
-            outputHasBeenHandled = copy( files2, dir2, dir1, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "copyok" ) != null ) {
-            copyOk( mp, roots );
-        } else if ( mp.getParameter( "move1" ) != null ) {
-            outputHasBeenHandled = move( files1, dir1, dir2, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "move2" ) != null ) {
-            outputHasBeenHandled = move( files2, dir2, dir1, dir1, dir2, res, user, imcref );
-        } else if ( mp.getParameter( "moveok" ) != null ) {
-            moveOk( mp, roots );
-        }
-
-        if ( !outputHasBeenHandled ) {
-            outputFileAdmin( res, user, dir1, dir2 );
+        if (mp.getParameter("change1") != null) {    //UserDomainObject wants to change dir1
+            dir1 = changeDir(files1, dir1, roots);
+        } else if (mp.getParameter("change2") != null) {    //UserDomainObject wants to change dir2
+            dir2 = changeDir(files2, dir2, roots);
+        } else if (mp.getParameter("mkdir1") != null) {
+            outputHasBeenHandled = makeDirectory(name, dir1, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("mkdir2") != null) {
+            outputHasBeenHandled = makeDirectory(name, dir2, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("delete1") != null) {
+            outputHasBeenHandled = delete(dir1, files1, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("delete2") != null) {
+            outputHasBeenHandled = delete(dir2, files2, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("deleteok") != null) {
+            deleteOk(mp, roots);
+        } else if (mp.getParameter("upload1") != null) {
+            outputHasBeenHandled = upload(mp, dir1, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("upload2") != null) {
+            outputHasBeenHandled = upload(mp, dir2, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("download1") != null) {
+            outputHasBeenHandled = download(files1, dir1, res);
+        } else if (mp.getParameter("download2") != null) {
+            outputHasBeenHandled = download(files2, dir2, res);
+        } else if (mp.getParameter("rename1") != null) {
+            outputHasBeenHandled = rename(files1, name, dir1, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("rename2") != null) {
+            outputHasBeenHandled = rename(files2, name, dir2, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("copy1") != null) {
+            outputHasBeenHandled = copy(files1, dir1, dir2, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("copy2") != null) {
+            outputHasBeenHandled = copy(files2, dir2, dir1, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("copyok") != null) {
+            copyOk(mp, roots);
+        } else if (mp.getParameter("move1") != null) {
+            outputHasBeenHandled = move(files1, dir1, dir2, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("move2") != null) {
+            outputHasBeenHandled = move(files2, dir2, dir1, dir1, dir2, res, user, imcref);
+        } else if (mp.getParameter("moveok") != null) {
+            moveOk(mp, roots);
+        }
+
+        if (!outputHasBeenHandled) {
+            outputFileAdmin(res, user, dir1, dir2);
         }
     }
 
     private File getContextRelativeDirectoryFromRequest(HttpServletRequest request, String parameter) throws IOException {
-        File webappPath = Imcms.getPath() ;
-        String dirParameter = request.getParameter( parameter );
-        return new File( webappPath, dirParameter ).getCanonicalFile();
+        File webappPath = Imcms.getPath();
+        String dirParameter = request.getParameter(parameter);
+        return new File(webappPath, dirParameter).getCanonicalFile();
     }
 
+	public static boolean hasAccess(int userId) {
+        return Arrays.stream(Imcms.getServices().getConfig().getAllowFileAdmin().split(","))
+                .filter(id -> !id.isEmpty())
+                .anyMatch(id -> userId == Integer.parseInt(id.trim()));
+	}
+
     private File[] getRoots() {
         String rootpaths = Imcms.getServices().getConfig().getFileAdminRootPaths();
-        List rootList = new ArrayList();
-        if ( rootpaths != null ) {
-            StringTokenizer st = new StringTokenizer( rootpaths, ":;" );
+        List<File> rootList = new ArrayList<>();
+        if (rootpaths != null) {
+            StringTokenizer st = new StringTokenizer(rootpaths, ":;");
             int tokenCount = st.countTokens();
-            for ( int i = 0; i < tokenCount; i++ ) {
+            for (int i = 0; i < tokenCount; i++) {
                 String oneRoot = st.nextToken().trim();
-                File oneRootFile = FileUtility.getFileFromWebappRelativePath( oneRoot );
-                if ( oneRootFile.isDirectory() ) {
-                    rootList.add( oneRootFile );
+                File oneRootFile = FileUtility.getFileFromWebappRelativePath(oneRoot);
+                if (oneRootFile.isDirectory()) {
+                    rootList.add(oneRootFile);
                 }
             }
         }
-        return (File[])rootList.toArray( new File[rootList.size()] );
+
+        File[] directoryArray = rootList.toArray(new File[rootList.size()]);
+        Arrays.sort(directoryArray, getFileComparator());
+        return directoryArray;
     }
 
-    private boolean move( String[] files, File sourceDir, File destDir, File dir1, File dir2, HttpServletResponse res,
-                          UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private boolean move(String[] files, File sourceDir, File destDir, File dir1, File dir2, HttpServletResponse res,
+                         UserDomainObject user, ImcmsServices imcref) throws IOException {
         boolean handledOutput = false;
-        if ( files != null && !sourceDir.equals( destDir ) ) {
-            File[] sourceFileTree = makeFileTreeList( makeAbsoluteFileList( sourceDir, files ), false );
-            File[] relativeSourceFileTree = makeRelativeFileList( sourceDir, sourceFileTree );
+        if (files != null && !sourceDir.equals(destDir)) {
+            File[] sourceFileTree = makeFileTreeList(makeAbsoluteFileList(sourceDir, files), false);
+            File[] relativeSourceFileTree = makeRelativeFileList(sourceDir, sourceFileTree);
+
             StringBuffer optionList = new StringBuffer();
             StringBuffer fileList = buildWarningOptions(relativeSourceFileTree, destDir, optionList);
-            if ( optionList.length() > 0 ) {
-                outputMoveOverwriteWarning( optionList.toString(), sourceDir, destDir, fileList.toString(), dir1, dir2, res, user, imcref );
+            if (optionList.length() > 0) {
+                outputMoveOverwriteWarning(optionList.toString(), sourceDir, destDir, fileList.toString(), dir1, dir2, res, user, imcref);
                 handledOutput = true;
             } else {
-                File[] destFiles = makeAbsoluteFileList( destDir, relativeSourceFileTree );
-                for ( int i = 0; i < sourceFileTree.length; i++ ) {
+                File[] destFiles = makeAbsoluteFileList(destDir, relativeSourceFileTree);
+                for (int i = 0; i < sourceFileTree.length; i++) {
                     File destFile = destFiles[i];
                     destFile.getParentFile().mkdirs();
                     File sourceFile = sourceFileTree[i];
-                    if ( sourceFile.isFile() ) {
-                        FileUtils.copyFile( sourceFile, destFile );
+
+                    if (!isUnderRoot(sourceFile, getRoots())) {
+                        LOG.error(String.format("move: File source path %s is not locate under root dir", sourceFile.getAbsolutePath()));
+                        return true;
+                    }
+
+                    if (sourceFile.isFile()) {
+                        FileUtils.copyFile(sourceFile, destFile);
                     }
-                    if ( sourceFile.length() == destFile.length() ) {
+                    if (sourceFile.length() == destFile.length()) {
                         FileUtils.forceDelete(sourceFile);
                     }
                 }
@@ -198,32 +230,38 @@ private boolean move( String[] files, File sourceDir, File destDir, File dir1, F
 
     private String createWarningFileOptionString(File destFile) throws IOException {
         File webAppPath = Imcms.getPath();
-        return FileUtility.relativizeFile(webAppPath, destFile).getPath() + ( destFile.isDirectory()
-                                                                              ? File.separator
-                                                                              : " [" + destFile.length() + "]" );
+        return FileUtility.relativizeFile(webAppPath, destFile).getPath() + (destFile.isDirectory()
+                ? File.separator
+                : " [" + destFile.length() + "]");
     }
 
-    private boolean copy( String[] files, File sourceDir, File destDir, File dir1, File dir2, HttpServletResponse res,
-                          UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private boolean copy(String[] files, File sourceDir, File destDir, File dir1, File dir2, HttpServletResponse res,
+                         UserDomainObject user, ImcmsServices imcref) throws IOException {
         boolean handledOutput = false;
-        if ( files != null && !sourceDir.equals( destDir ) ) {
-            File[] sourceFileTree = makeFileTreeList( makeAbsoluteFileList( sourceDir, files ), true );
-            File[] relativeSourceFileTree = makeRelativeFileList( sourceDir, sourceFileTree );
+        if (files != null && !sourceDir.equals(destDir)) {
+            File[] sourceFileTree = makeFileTreeList(makeAbsoluteFileList(sourceDir, files), true);
+            File[] relativeSourceFileTree = makeRelativeFileList(sourceDir, sourceFileTree);
             StringBuffer optionList = new StringBuffer();
             StringBuffer fileList = buildWarningOptions(relativeSourceFileTree, destDir, optionList);
-            if ( optionList.length() > 0 ) {
-                ouputCopyOverwriteWarning( optionList.toString(), sourceDir, destDir, fileList.toString(), dir1, dir2, res, user, imcref );
+            if (optionList.length() > 0) {
+                ouputCopyOverwriteWarning(optionList.toString(), sourceDir, destDir, fileList.toString(), dir1, dir2, res, user, imcref);
                 handledOutput = true;
             } else {
-                File[] destFileTree = makeAbsoluteFileList( destDir, relativeSourceFileTree );
-                for ( int i = 0; i < sourceFileTree.length; i++ ) {
+                File[] destFileTree = makeAbsoluteFileList(destDir, relativeSourceFileTree);
+                for (int i = 0; i < sourceFileTree.length; i++) {
                     File sourceFile = sourceFileTree[i];
                     File destFile = destFileTree[i];
-                    if ( sourceFile.isDirectory() ) {
+                    if (!isUnderRoot(sourceFile, getRoots()) && !isUnderRoot(destFile, getRoots())) {
+                        LOG.error(String.format("copy: File source: %s or destination: %s are not locate under root dir",
+                                sourceFile.getAbsolutePath(), destFile.getAbsolutePath()));
+                        return true;
+                    }
+
+                    if (sourceFile.isDirectory()) {
                         destFile.mkdir();
                         continue;
                     }
-                    FileUtils.copyFile( sourceFile, destFile );
+                    FileUtils.copyFile(sourceFile, destFile);
                 }
             }
         }
@@ -232,107 +270,131 @@ private boolean copy( String[] files, File sourceDir, File destDir, File dir1, F
 
     private StringBuffer buildWarningOptions(File[] relativeSourceFileTree, File destDir, StringBuffer optionList) throws IOException {
         StringBuffer fileList = new StringBuffer();
-        for ( int i = 0; i < relativeSourceFileTree.length; i++ ) {
-            File destFile = new File( destDir, relativeSourceFileTree[i].getPath() );
-            fileList.append( relativeSourceFileTree[i] ).append( File.pathSeparator );
-            if ( destFile.exists() ) {
+        for (int i = 0; i < relativeSourceFileTree.length; i++) {
+            File destFile = new File(destDir, relativeSourceFileTree[i].getPath());
+            fileList.append(relativeSourceFileTree[i]).append(File.pathSeparator);
+            if (destFile.exists()) {
                 String optionString = createWarningFileOptionString(destFile);
-                optionList.append( "<option>" ).append( optionString ).append( "</option>" );
+                optionList.append("<option>").append(optionString).append("</option>");
             }
         }
         return fileList;
     }
 
-    private boolean rename( String[] files, String name, File dir, File dir1, File dir2, HttpServletResponse res,
-                            UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private boolean rename(String[] files, String name, File dir, File dir1, File dir2, HttpServletResponse res,
+                           UserDomainObject user, ImcmsServices imcref) throws IOException {
         boolean handledOutput = false;
-        if ( files != null && files.length == 1 ) {	//Has the user chosen just one file?
-            if ( name != null && name.length() > 0 ) {
-                File oldFilename = new File( dir, files[0] );
-                File newFilename = new File( dir, name );
-                if ( oldFilename.exists() ) {
-                    oldFilename.renameTo( newFilename );
+        File[] roots = getRoots();
+        if (files != null && files.length == 1) {    //Has the user chosen just one file?
+            if (name != null && name.length() > 0) {
+                File oldFilename = new File(dir, files[0]);
+                File newFilename = new File(dir, name);
+                if (!isUnderRoot(oldFilename, roots) && !isUnderRoot(newFilename, roots)) {
+                    LOG.error(String.format("rename: File paths newName %s or oldName %s are not locate under root dir",
+                            newFilename.getAbsolutePath(), oldFilename.getAbsolutePath()));
+                    return true;
+                }
+
+                if (oldFilename.exists()) {
+                    oldFilename.renameTo(newFilename);
                 }
             } else {
-                outputBlankFilenameError( dir1, dir2, res, user, imcref );
+                outputBlankFilenameError(dir1, dir2, res, user, imcref);
                 handledOutput = true;
             }
         }
         return handledOutput;
     }
 
-    private boolean download( String[] files, File dir, HttpServletResponse res ) throws IOException {
+    private boolean download(String[] files, File dir, HttpServletResponse res) throws IOException {
         boolean handledOutput = false;
-        if ( files != null && files.length == 1 ) {	//Has the user chosen just one file?
-            File file = new File( dir, files[0] );
+        if (files != null && files.length == 1) {    //Has the user chosen just one file?
+            File file = new File(dir, files[0]);
+            if (!isUnderRoot(file, getRoots())) {
+                LOG.error(String.format("download: File path %s is not locate under root dir ", file.getAbsolutePath()));
+                return true;
+            }
             try {
-                res.setContentType( "application/octet-stream" );
-                res.setHeader( "Content-Disposition", "attachment; filename=\"" + file.getName() + '\"' );
-                BufferedInputStream fin = new BufferedInputStream( new FileInputStream( file ) );
-                res.setContentLength( fin.available() );
+                res.setContentType("application/octet-stream");
+                res.setHeader("Content-Disposition", "attachment; filename=\"" + file.getName() + '\"');
+                BufferedInputStream fin = new BufferedInputStream(new FileInputStream(file));
+                res.setContentLength(fin.available());
                 byte[] buffer = new byte[BUFFER_SIZE];
                 ServletOutputStream out = res.getOutputStream();
-                for ( int bytes_read; ( bytes_read = fin.read( buffer ) ) != -1; ) {
-                    out.write( buffer, 0, bytes_read );
+                for (int bytes_read; (bytes_read = fin.read(buffer)) != -1; ) {
+                    out.write(buffer, 0, bytes_read);
                 }
                 handledOutput = true;
-            } catch ( FileNotFoundException ex ) {
+            } catch (FileNotFoundException ex) {
                 // FIXME: Error dialog?
-                LOG.debug( "Download failed", ex );
+                LOG.debug("Download failed", ex);
             }
         }
         return handledOutput;
     }
 
-    private boolean delete( File dir, String[] files, File dir1, File dir2, HttpServletResponse res,
-                            UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private boolean delete(File dir, String[] files, File dir1, File dir2, HttpServletResponse res,
+                           UserDomainObject user, ImcmsServices imcref) throws IOException {
         boolean handledOutput = false;
-        File[] farray = makeFileTreeList( makeAbsoluteFileList( dir, files ), false );
-        File[] filelist = makeRelativeFileList( dir, farray );
-        if ( filelist != null && filelist.length > 0 ) {
-            outputDeleteWarning( filelist, dir1, dir2, dir, res, user, imcref );
+        File[] farray = makeFileTreeList(makeAbsoluteFileList(dir, files), false);
+        File[] filelist = makeRelativeFileList(dir, farray);
+        if (filelist != null && filelist.length > 0) {
+            for (int i = 0; i < filelist.length; i++) {
+                File currentFile = farray[i];
+                if (!isUnderRoot(currentFile, getRoots())) {
+                    LOG.error(String.format("delete: File path %s is not locate under root dir", currentFile.getAbsolutePath()));
+                    return true;
+                }
+            }
+            outputDeleteWarning(filelist, dir1, dir2, dir, res, user, imcref);
             handledOutput = true;
         }
         return handledOutput;
     }
 
-    private boolean makeDirectory( String name, File dir, File dir1, File dir2, HttpServletResponse res,
-                                   UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private boolean makeDirectory(String name, File dir, File dir1, File dir2, HttpServletResponse res,
+                                  UserDomainObject user, ImcmsServices imcref) throws IOException {
         boolean handledOutput = false;
-        if ( name != null && name.length() > 0 ) {
-            File newname = new File( dir, name );
-            if ( !newname.exists() ) {
+
+        if (name != null && name.length() > 0) {
+            File newname = new File(dir, name);
+            if (isUnderRoot(newname, getRoots()) && !newname.exists()) {
                 newname.mkdir();
             }
         } else {
-            outputBlankFilenameError( dir1, dir2, res, user, imcref );
+            outputBlankFilenameError(dir1, dir2, res, user, imcref);
             handledOutput = true;
         }
         return handledOutput;
     }
 
-    private boolean upload( MultipartHttpServletRequest mp, File destDir, File dir1, File dir2, HttpServletResponse res,
-                            UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private boolean upload(MultipartHttpServletRequest mp, File destDir, File dir1, File dir2, HttpServletResponse res,
+                           UserDomainObject user, ImcmsServices imcref) throws IOException {
         boolean handledOutput = false;
         MultipartHttpServletRequest.DataSourceFileItem parameterFileItem = mp.getParameterFileItem("file");
-        if ( parameterFileItem == null || parameterFileItem.getSize() < 1 ) {
-            outputBlankFileError( dir1, dir2, res, user, imcref );
+        if (parameterFileItem == null || parameterFileItem.getSize() < 1) {
+            outputBlankFileError(dir1, dir2, res, user, imcref);
             handledOutput = true;
             return handledOutput;
         }
-        String filename = parameterFileItem.getName() ;
-        File file = new File( destDir, filename );
-        File uniqueFile = findUniqueFilename( file );
-        if ( file.equals( uniqueFile ) || file.renameTo( uniqueFile ) ) {
+        String filename = parameterFileItem.getName();
+        File file = new File(destDir, filename);
+            if (!isUnderRoot(file, getRoots())) {
+                LOG.error(String.format("upload: File path %s is not locate under root dir", file.getAbsolutePath()));
+                return true;
+            }
+
+        File uniqueFile = findUniqueFilename(file);
+        if (file.equals(uniqueFile) || file.renameTo(uniqueFile)) {
             try {
                 parameterFileItem.write(file);
-            } catch ( Exception e ) {
+            } catch (Exception e) {
                 IOException ioException = new IOException("Failed to write file.");
-                ioException.initCause(e) ;
-                throw ioException ;
+                ioException.initCause(e);
+                throw ioException;
             }
-            if ( !file.equals( uniqueFile ) ) {
-                outputFileExistedAndTheOriginalWasRenamedNotice( dir1, dir2, uniqueFile.getName(), res, user, imcref );
+            if (!file.equals(uniqueFile)) {
+                outputFileExistedAndTheOriginalWasRenamedNotice(dir1, dir2, uniqueFile.getName(), res, user, imcref);
                 handledOutput = true;
             }
         } else {
@@ -342,35 +404,22 @@ private boolean upload( MultipartHttpServletRequest mp, File destDir, File dir1,
         return handledOutput;
     }
 
-    private void outputFileAdmin( HttpServletResponse res, UserDomainObject user, File dir1, File dir2 )
+    private void outputFileAdmin(HttpServletResponse res, UserDomainObject user, File dir1, File dir2)
             throws IOException {
-        Utility.setDefaultHtmlContentType( res );
-        res.getOutputStream().print( parseFileAdmin( user, dir1, dir2 ) );
+        Utility.setDefaultHtmlContentType(res);
+        String content = parseFileAdmin(user, dir1, dir2);
+        res.getOutputStream().write(content.getBytes(Imcms.DEFAULT_ENCODING));
     }
 
-    static File findUniqueFilename(File file) {
-        File uniqueFile = file;
-        int counter = 1;
-        String previousSuffix = "";
-        while ( uniqueFile.exists() ) {
-            String filenameWithoutSuffix = StringUtils.substringBeforeLast(uniqueFile.getName(), previousSuffix);
-            String suffix = "." + counter;
-            counter++;
-            uniqueFile = new File(uniqueFile.getParentFile(), filenameWithoutSuffix + suffix);
-            previousSuffix = suffix;
-        }
-        return uniqueFile;
-    }
-
-    private void outputMoveOverwriteWarning( String option_list, File sourceDir, File destDir,
-                                             String file_list, File dir1, File dir2, HttpServletResponse res,
-                                             UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private void outputMoveOverwriteWarning(String option_list, File sourceDir, File destDir,
+                                            String file_list, File dir1, File dir2, HttpServletResponse res,
+                                            UserDomainObject user, ImcmsServices imcref) throws IOException {
         outputWarning(option_list, sourceDir, destDir, file_list, dir1, dir2, res, imcref, ADMIN_TEMPLATE_FILE_ADMIN_MOVE_OVERWRITE_WARNING, user);
     }
 
-    private void ouputCopyOverwriteWarning( String option_list, File sourceDir, File destDir,
-                                            String file_list, File dir1, File dir2, HttpServletResponse res,
-                                            UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private void ouputCopyOverwriteWarning(String option_list, File sourceDir, File destDir,
+                                           String file_list, File dir1, File dir2, HttpServletResponse res,
+                                           UserDomainObject user, ImcmsServices imcref) throws IOException {
         outputWarning(option_list, sourceDir, destDir, file_list, dir1, dir2, res, imcref, ADMIN_TEMPLATE_FILE_ADMIN_COPY_OVERWRIGHT_WARNING, user);
     }
 
@@ -378,203 +427,212 @@ private void outputWarning(String option_list, File sourceDir, File destDir, Str
                                HttpServletResponse res, ImcmsServices imcref, String template,
                                UserDomainObject user) throws IOException {
         List vec = new ArrayList();
-        vec.add( "#filelist#" );
-        vec.add( option_list );
-        vec.add( "#source#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(sourceDir) );
-        vec.add( "#dest#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(destDir) );
-        vec.add( "#files#" );
-        vec.add( file_list );
-        vec.add( "#dir1#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir1) );
-        vec.add( "#dir2#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir2) );
-        Utility.setDefaultHtmlContentType( res );
+        vec.add("#filelist#");
+        vec.add(option_list);
+        vec.add("#source#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(sourceDir));
+        vec.add("#dest#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(destDir));
+        vec.add("#files#");
+        vec.add(file_list);
+        vec.add("#dir1#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir1));
+        vec.add("#dir2#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir2));
+        Utility.setDefaultHtmlContentType(res);
         ServletOutputStream out = res.getOutputStream();
-        out.print( imcref.getAdminTemplate( template, user, vec ) );
+        String content = imcref.getAdminTemplate(template, user, vec);
+        out.write(content.getBytes(Imcms.DEFAULT_ENCODING));
     }
 
-    private void outputFileExistedAndTheOriginalWasRenamedNotice( File dir1, File dir2, String newFilename,
-                                                                  HttpServletResponse res, UserDomainObject user,
-                                                                  ImcmsServices imcref ) throws IOException {
+    private void outputFileExistedAndTheOriginalWasRenamedNotice(File dir1, File dir2, String newFilename,
+                                                                 HttpServletResponse res, UserDomainObject user,
+                                                                 ImcmsServices imcref) throws IOException {
         List vec = new ArrayList();
-        vec.add( "#dir1#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir1) );
-        vec.add( "#dir2#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir2) );
-        vec.add( "#filename#" );
-        vec.add( newFilename );
-        Utility.setDefaultHtmlContentType( res );
+        vec.add("#dir1#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir1));
+        vec.add("#dir2#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir2));
+        vec.add("#filename#");
+        vec.add(newFilename);
+        Utility.setDefaultHtmlContentType(res);
         ServletOutputStream out = res.getOutputStream();
-        out.print( imcref.getAdminTemplate( "FileAdminFileExisted.html", user, vec ) );
+        String content = imcref.getAdminTemplate("FileAdminFileExisted.html", user, vec);
+        out.write(content.getBytes(Imcms.DEFAULT_ENCODING));
     }
 
-    private void outputBlankFileError( File dir1, File dir2, HttpServletResponse res, UserDomainObject user,
-                                       ImcmsServices imcref ) throws IOException {
+    private void outputBlankFileError(File dir1, File dir2, HttpServletResponse res, UserDomainObject user,
+                                      ImcmsServices imcref) throws IOException {
         List vec = new ArrayList();
-        vec.add( "#dir1#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir1) );
-        vec.add( "#dir2#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir2) );
-        Utility.setDefaultHtmlContentType( res );
+        vec.add("#dir1#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir1));
+        vec.add("#dir2#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir2));
+        Utility.setDefaultHtmlContentType(res);
         ServletOutputStream out = res.getOutputStream();
-        out.print( imcref.getAdminTemplate( "FileAdminFileBlank.html", user, vec ) );
+        String content = imcref.getAdminTemplate("FileAdminFileBlank.html", user, vec);
+        out.write(content.getBytes(Imcms.DEFAULT_ENCODING));
     }
 
-    private void outputDeleteWarning( File[] filelist, File dir1, File dir2, File sourceDir, HttpServletResponse res,
-                                      UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    private void outputDeleteWarning(File[] filelist, File dir1, File dir2, File sourceDir, HttpServletResponse res,
+                                     UserDomainObject user, ImcmsServices imcref) throws IOException {
         StringBuffer files = new StringBuffer();
         StringBuffer optionlist = new StringBuffer();
-        for ( int i = 0; i < filelist.length; i++ ) {
-            File foo = new File( sourceDir, filelist[i].getPath() );
+        for (int i = 0; i < filelist.length; i++) {
+            File foo = new File(sourceDir, filelist[i].getPath());
             String bar = createWarningFileOptionString(foo);
-            optionlist.append( "<option>" ).append( bar ).append( "</option>" );
-            files.append( filelist[i] ).append( File.pathSeparator );
+            optionlist.append("<option>").append(bar).append("</option>");
+            files.append(filelist[i]).append(File.pathSeparator);
         }
         List vec = new ArrayList();
-        vec.add( "#filelist#" );
-        vec.add( optionlist.toString() );
-        vec.add( "#files#" );
-        vec.add( StringEscapeUtils.escapeHtml(files.toString()) );
-        vec.add( "#source#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(sourceDir) );
-        vec.add( "#dir1#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir1) );
-        vec.add( "#dir2#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir2) );
-        Utility.setDefaultHtmlContentType( res );
+        vec.add("#filelist#");
+        vec.add(optionlist.toString());
+        vec.add("#files#");
+        vec.add(StringEscapeUtils.escapeHtml(files.toString()));
+        vec.add("#source#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(sourceDir));
+        vec.add("#dir1#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir1));
+        vec.add("#dir2#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir2));
+        Utility.setDefaultHtmlContentType(res);
         ServletOutputStream out = res.getOutputStream();
-        out.print( imcref.getAdminTemplate( "FileAdminDeleteWarning.html", user, vec ) );
+        String content = imcref.getAdminTemplate("FileAdminDeleteWarning.html", user, vec);
+        out.write(content.getBytes(Imcms.DEFAULT_ENCODING));
     }
 
-    private void outputBlankFilenameError( File dir1, File dir2, HttpServletResponse res, UserDomainObject user,
-                                           ImcmsServices imcref ) throws IOException {
+    private void outputBlankFilenameError(File dir1, File dir2, HttpServletResponse res, UserDomainObject user,
+                                          ImcmsServices imcref) throws IOException {
         List vec = new ArrayList();
-        vec.add( "#dir1#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir1) );
-        vec.add( "#dir2#" );
-        vec.add( getContextRelativeAbsolutePathToDirectory(dir2) );
-        Utility.setDefaultHtmlContentType( res );
+        vec.add("#dir1#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir1));
+        vec.add("#dir2#");
+        vec.add(getContextRelativeAbsolutePathToDirectory(dir2));
+        Utility.setDefaultHtmlContentType(res);
         ServletOutputStream out = res.getOutputStream();
-        out.print( imcref.getAdminTemplate( "FileAdminNameBlank.html", user, vec ) );
+        String content = imcref.getAdminTemplate("FileAdminNameBlank.html", user, vec);
+        out.write(content.getBytes(Imcms.DEFAULT_ENCODING));
     }
 
-    private interface FromSourceFileToDestinationFileCommand {
-        void execute(File source, File destination) throws IOException;
-    }
+    private void moveOk(HttpServletRequest mp, File[] roots) throws IOException {
+        fromSourceToDestination(mp, roots, (source, dest) -> {
+            if (!isUnderRoot(dest, roots) && !isUnderRoot(source, roots)) {
+                LOG.error(String.format("moveOk: destination: %s or source %s aren't locate under root dirs",
+                        dest.getAbsolutePath(), source.getAbsolutePath()));
+                return;
+            }
 
-    private void moveOk( HttpServletRequest mp, File[] roots ) throws IOException {
-        fromSourceToDestination(mp, roots, new FromSourceFileToDestinationFileCommand() {
-            public void execute(File source, File dest) throws IOException {
-                dest.getParentFile().mkdirs();
-                if ( source.isFile() ) {
-                    FileUtils.copyFile( source, dest );
-                }
-                if ( source.length() == dest.length() ) {
-                    FileUtils.forceDelete( source );
-                }
+            dest.getParentFile().mkdirs();
+            if (source.isFile()) {
+                FileUtils.copyFile(source, dest);
+            }
+            if (source.length() == dest.length()) {
+                FileUtils.forceDelete(source);
             }
         });
     }
 
     private void fromSourceToDestination(HttpServletRequest mp, File[] roots,
                                          FromSourceFileToDestinationFileCommand command) throws IOException {
-        File srcdir = getContextRelativeDirectoryFromRequest(mp, "source" );
-        File dstdir = getContextRelativeDirectoryFromRequest(mp, "dest" );
-        String files = mp.getParameter( "files" );
-        if ( isUnderRoot( srcdir, roots ) && isUnderRoot( dstdir, roots ) ) {
-            StringTokenizer st = new StringTokenizer( files, ":;" );
-            while ( st.hasMoreTokens() ) {
+        File srcdir = getContextRelativeDirectoryFromRequest(mp, "source");
+        File dstdir = getContextRelativeDirectoryFromRequest(mp, "dest");
+        String files = mp.getParameter("files");
+        if (isUnderRoot(srcdir, roots) && isUnderRoot(dstdir, roots)) {
+            StringTokenizer st = new StringTokenizer(files, ":;");
+            while (st.hasMoreTokens()) {
                 String foo = st.nextToken();
-                File source = new File( srcdir, foo );
-                File dest = new File( dstdir, foo );
+                File source = new File(srcdir, foo);
+                File dest = new File(dstdir, foo);
                 command.execute(source, dest);
             }
         }
     }
 
-    private void copyOk( HttpServletRequest mp, File[] roots ) throws IOException {
-        fromSourceToDestination(mp, roots, new FromSourceFileToDestinationFileCommand() {
-            public void execute(File source, File destination) throws IOException {
-                if ( source.isDirectory() ) {
-                    destination.mkdir();
-                } else {
-                    FileUtils.copyFile( source, destination );
-                }
+    private void copyOk(HttpServletRequest mp, File[] roots) throws IOException {
+        fromSourceToDestination(mp, roots, (source, destination) -> {
+            if (!isUnderRoot(destination, roots) && !isUnderRoot(source, roots)) {
+                LOG.error(String.format("copyOk: destination %s or source %s aren't locate under root dir",
+                        destination.getAbsolutePath(), source.getAbsolutePath()));
+                return;
+            }
+
+            if (source.isDirectory()) {
+                destination.mkdir();
+            } else {
+                FileUtils.copyFile(source, destination);
             }
         });
     }
 
-    private void deleteOk( HttpServletRequest mp, File[] roots ) throws IOException {
-        String files = mp.getParameter( "files" ) ;
-        File path = getContextRelativeDirectoryFromRequest(mp, "source") ;
-        if ( null != files && null != path ) {
-            StringTokenizer st = new StringTokenizer( files, ":;" );
-            while ( st.hasMoreTokens() ) {
-                File foo = new File( path, st.nextToken() );
-                if ( foo.exists() && isUnderRoot( foo.getParentFile(), roots ) ) {
+    private void deleteOk(HttpServletRequest mp, File[] roots) throws IOException {
+        String files = mp.getParameter("files");
+        File path = getContextRelativeDirectoryFromRequest(mp, "source");
+        if (null != files && null != path) {
+            StringTokenizer st = new StringTokenizer(files, ":;");
+            while (st.hasMoreTokens()) {
+                File foo = new File(path, st.nextToken());
+                if (foo.exists() && isUnderRoot(foo.getParentFile(), roots)) {
                     FileUtils.forceDelete(foo);
                 }
             }
         }
     }
 
-    private File changeDir( String[] files, File dir, File[] roots ) throws IOException {
+    private File changeDir(String[] files, File dir, File[] roots) throws IOException {
         File resultDir = dir;
-        if ( files != null && files.length == 1 ) {	//Has the user chosen just one dir?
+        if (files != null && files.length == 1) {    //Has the user chosen just one dir?
             String filename = files[0];
-            if ( filename.startsWith(File.separator) ) {
-                resultDir = new File( Imcms.getPath(), filename) ;
-            } else {					//Is the dir one of the roots?
-                File newDir = new File( dir, filename );		//No? Treat it like a relative path...
-                if ( newDir.isDirectory() ) {			//It IS a directory, i hope?
+            if (filename.startsWith(File.separator)) {
+                resultDir = new File(Imcms.getPath(), filename);
+            } else {                    //Is the dir one of the roots?
+                File newDir = new File(dir, filename);        //No? Treat it like a relative path...
+                if (newDir.isDirectory()) {            //It IS a directory, i hope?
                     resultDir = newDir;
                 }
             }
         }
         if (!isUnderRoot(resultDir, roots)) {
-            return dir ;
+            return dir;
         }
         return resultDir.getCanonicalFile();
     }
 
-    private File[] makeAbsoluteFileList( File parent, String[] filePaths ) {
+    private File[] makeAbsoluteFileList(File parent, String[] filePaths) {
         File[] files = new File[filePaths.length];
-        for ( int i = 0; i < filePaths.length; i++ ) {
+        for (int i = 0; i < filePaths.length; i++) {
             String filePath = filePaths[i];
-            files[i] = new File( filePath );
+            files[i] = new File(filePath);
         }
-        return makeAbsoluteFileList( parent, files );
+        return makeAbsoluteFileList(parent, files);
     }
 
     /**
      * Takes a list of files that are supposed to share a common parent, and returns them in an array.
      */
-    private File[] makeAbsoluteFileList( File parent, File[] files ) {
-        if ( files == null || parent == null ) {
+    private File[] makeAbsoluteFileList(File parent, File[] files) {
+        if (files == null || parent == null) {
             return null;
         }
         LinkedList list = new LinkedList();
-        for ( int i = 0; i < files.length; i++ ) {
+        for (int i = 0; i < files.length; i++) {
             String filename = files[i].getPath();
-            if ( !( "..".equals( filename ) || new File( filename ).isAbsolute() ) ) {
-                list.add( new File( parent, filename ) );
+            if (!("..".equals(filename) || new File(filename).isAbsolute())) {
+                list.add(new File(parent, filename));
             }
         }
-        return (File[])list.toArray( new File[list.size()] );
+        return (File[]) list.toArray(new File[list.size()]);
     }
 
     /**
      * Takes a list of files that share a common parent, orphans them, and returns them in an array.
      */
-    private File[] makeRelativeFileList( File relativeParentDir, File[] files ) throws IOException {
-        if ( files == null || relativeParentDir == null ) {
+    private File[] makeRelativeFileList(File relativeParentDir, File[] files) throws IOException {
+        if (files == null || relativeParentDir == null) {
             return null;
         }
         File[] relativeFileList = new File[files.length];
-        for ( int i = 0; i < files.length; i++ ) {
-            relativeFileList[i] = FileUtility.relativizeFile( relativeParentDir, files[i] );
+        for (int i = 0; i < files.length; i++) {
+            relativeFileList[i] = FileUtility.relativizeFile(relativeParentDir, files[i]);
         }
         return relativeFileList;
     }
@@ -582,63 +640,61 @@ private File[] makeRelativeFileList( File relativeParentDir, File[] files ) thro
     /**
      * Takes a list of files and dirs in one dir, and recursively adds the files of the subdirs.
      */
-    private File[] makeFileTreeList( File[] files, boolean dirfirst ) {
-        if ( files == null ) {
+    private File[] makeFileTreeList(File[] files, boolean dirfirst) {
+        if (files == null) {
             return new File[0];
         }
         LinkedList list = new LinkedList();
-        for ( int i = 0; i < files.length; i++ ) {
-            if ( dirfirst ) {
-                list.add( files[i] );
+        for (int i = 0; i < files.length; i++) {
+            if (dirfirst) {
+                list.add(files[i]);
             }
-            if ( files[i].isDirectory() ) {
-                File[] sub_list = makeFileTreeList( files[i].listFiles(), dirfirst );
-                for ( int j = 0; j < sub_list.length; j++ ) {
-                    list.add( sub_list[j] );
-                }
+            if (files[i].isDirectory()) {
+                File[] sub_list = makeFileTreeList(files[i].listFiles(), dirfirst);
+                Collections.addAll(list, sub_list);
             }
-            if ( !dirfirst ) {
-                list.add( files[i] );
+            if (!dirfirst) {
+                list.add(files[i]);
             }
         }
         File[] result = new File[list.size()];
-        for ( int i = 0; i < result.length; i++ ) {
-            result[i] = (File)list.removeFirst();
+        for (int i = 0; i < result.length; i++) {
+            result[i] = (File) list.removeFirst();
         }
         return result;
     }
 
-    private String parseFileAdmin( UserDomainObject user, File fd1, File fd2 ) throws IOException {
+    private String parseFileAdmin(UserDomainObject user, File fd1, File fd2) throws IOException {
         ImcmsServices imcref = Imcms.getServices();
 
         File[] rootlist = getRoots();
         List vec = new ArrayList();
-        if ( fd1 != null ) {
-            vec.add( "#dir1#" );
-            vec.add( getContextRelativeAbsolutePathToDirectory(fd1) );
-            String optionlist = createDirectoryOptionList( rootlist, fd1 );
-            vec.add( "#files1#" );
-            vec.add( optionlist );
+        if (fd1 != null) {
+            vec.add("#dir1#");
+            vec.add(getContextRelativeAbsolutePathToDirectory(fd1));
+            String optionlist = createDirectoryOptionList(rootlist, fd1);
+            vec.add("#files1#");
+            vec.add(optionlist);
         } else {
-            vec.add( "#dir1#" );
-            vec.add( "" );
-            vec.add( "#files1#" );
-            vec.add( "" );
-        }
-        if ( fd2 != null ) {
-            vec.add( "#dir2#" );
-            vec.add( getContextRelativeAbsolutePathToDirectory(fd2) );
-            String optionlist = createDirectoryOptionList( rootlist, fd2 );
-            vec.add( "#files2#" );
-            vec.add( optionlist );
+            vec.add("#dir1#");
+            vec.add("");
+            vec.add("#files1#");
+            vec.add("");
+        }
+        if (fd2 != null) {
+            vec.add("#dir2#");
+            vec.add(getContextRelativeAbsolutePathToDirectory(fd2));
+            String optionlist = createDirectoryOptionList(rootlist, fd2);
+            vec.add("#files2#");
+            vec.add(optionlist);
         } else {
-            vec.add( "#dir2#" );
-            vec.add( "" );
-            vec.add( "#files2#" );
-            vec.add( "" );
+            vec.add("#dir2#");
+            vec.add("");
+            vec.add("#files2#");
+            vec.add("");
         }
 
-        return imcref.getAdminTemplate( "FileAdmin.html", user, vec );
+        return imcref.getAdminTemplate("FileAdmin.html", user, vec);
     }
 
     private String getContextRelativeAbsolutePathToDirectory(File dir) throws IOException {
@@ -646,38 +702,38 @@ private String getContextRelativeAbsolutePathToDirectory(File dir) throws IOExce
     }
 
     private String getPathRelativeTo(File root, File file) throws IOException {
-        root = root.getCanonicalFile() ;
-        file = file.getCanonicalFile() ;
-        if ( !FileUtility.directoryIsAncestorOfOrEqualTo( root, file ) ) {
+        root = root.getCanonicalFile();
+        file = file.getCanonicalFile();
+        if (!FileUtility.directoryIsAncestorOfOrEqualTo(root, file)) {
             return file.getAbsolutePath();
         }
-        if ( file.equals( root ) ) {
+        if (file.equals(root)) {
             return "";
         }
-        return FileUtility.relativizeFile( root, file ).getPath() ;
+        return FileUtility.relativizeFile(root, file).getPath();
     }
 
-    private String createDirectoryOptionList( File[] rootlist, File directory ) throws IOException {
+    private String createDirectoryOptionList(File[] rootlist, File directory) throws IOException {
         StringBuffer optionlist = new StringBuffer();
         File webappPath = Imcms.getPath();
-        for ( int i = 0; i < rootlist.length; i++ ) {
-            String dirname = getPathRelativeTo(webappPath, rootlist[i]) ;
-            optionlist.append(getDirectoryOption(File.separator + dirname + File.separator, File.separator + dirname + File.separator) );
+        for (int i = 0; i < rootlist.length; i++) {
+            String dirname = getPathRelativeTo(webappPath, rootlist[i]);
+            optionlist.append(getDirectoryOption(File.separator + dirname + File.separator, File.separator + dirname + File.separator));
         }
         File parent = directory.getCanonicalFile().getParentFile();
-        if ( isUnderRoot( parent, rootlist )) {
-            optionlist.append(getDirectoryOption(".." + File.separator, ".." + File.separator) );
+        if (isUnderRoot(parent, rootlist)) {
+            optionlist.append(getDirectoryOption(".." + File.separator, ".." + File.separator));
         }
-        File[] dirlist = directory.listFiles( (FileFilter)DirectoryFileFilter.INSTANCE );
+        File[] dirlist = directory.listFiles((FileFilter) DirectoryFileFilter.INSTANCE);
         Arrays.sort(dirlist, getFileComparator());
-        for ( int i = 0; null != dirlist && i < dirlist.length; i++ ) {
+        for (int i = 0; null != dirlist && i < dirlist.length; i++) {
             optionlist.append(getDirectoryOption(dirlist[i].getName() + File.separator, dirlist[i].getName() + File.separator));
         }
-        File[] filelist = directory.listFiles( (FileFilter)new NotFileFilter( DirectoryFileFilter.INSTANCE ) );
+        File[] filelist = directory.listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE));
         Arrays.sort(filelist, getFileComparator());
 
-        for ( int i = 0; null != filelist && i < filelist.length; i++ ) {
-            String formatedFileSize = HumanReadable.getHumanReadableByteSize( filelist[i].length() );
+        for (int i = 0; null != filelist && i < filelist.length; i++) {
+            String formatedFileSize = HumanReadable.getHumanReadableByteSize(filelist[i].length());
             String filename = filelist[i].getName();
             String fileNameAndSize = filename + " [" + formatedFileSize + "]";
             optionlist.append("<option value=\"");
@@ -691,27 +747,30 @@ private String createDirectoryOptionList( File[] rootlist, File directory ) thro
 
     private String getDirectoryOption(String value, String text) {
         return "<option style=\"background-color:#f0f0f0\" value=\""
-               + StringEscapeUtils.escapeHtml(value) + "\">"
-               + StringEscapeUtils.escapeHtml(text) + "</option>";
+                + StringEscapeUtils.escapeHtml(value) + "\">"
+                + StringEscapeUtils.escapeHtml(text) + "</option>";
     }
 
+    /**
+     * Creates and returns comparator for ordering directory content.
+     * Order is case-insensitive, alphabetical and directories comes before files.
+     *
+     * @return file comparator
+     */
     private Comparator getFileComparator() {
-        return new Comparator() {
-            public int compare(Object a, Object b) {
-                File filea = (File)a;
-                File fileb = (File)b;
-                //--- Sort directories before files,
-                //    otherwise alphabetical ignoring case.
-                if (filea.isDirectory() && !fileb.isDirectory()) {
-                    return -1;
-                } else if (!filea.isDirectory() && fileb.isDirectory()) {
-                    return 1;
-                } else {
-                    return filea.getName().compareToIgnoreCase(fileb.getName());
-                }
-
+        return new Comparator<File>() {
+            public int compare(File filea, File fileb) {
+                return filea.isDirectory() == fileb.isDirectory()
+                        ? filea.getAbsolutePath().compareToIgnoreCase(fileb.getAbsolutePath())
+                        : filea.isDirectory()
+                        ? -1
+                        : 1;
             }
         };
     }
 
+    private interface FromSourceFileToDestinationFileCommand {
+        void execute(File source, File destination) throws IOException;
+    }
+
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/LinkCheck.java b/server/src/com/imcode/imcms/servlet/superadmin/LinkCheck.java
index 9c380164b5..d7a7377e3a 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/LinkCheck.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/LinkCheck.java
@@ -1,9 +1,11 @@
 package com.imcode.imcms.servlet.superadmin;
 
+import com.imcode.imcms.mapping.DocumentMapper;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
-import imcode.server.document.*;
-import com.imcode.imcms.mapping.DocumentMapper;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.DocumentTypeDomainObject;
+import imcode.server.document.UrlDocumentDomainObject;
 import imcode.server.document.index.DocumentIndex;
 import imcode.server.document.index.SimpleDocumentQuery;
 import imcode.server.document.textdocument.ImageDomainObject;
@@ -11,11 +13,15 @@
 import imcode.server.document.textdocument.TextDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
-import org.apache.commons.httpclient.*;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.HeadMethod;
 import org.apache.commons.lang.math.IntRange;
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.PrefixQuery;
@@ -34,82 +40,155 @@
 import java.util.*;
 import java.util.regex.Pattern;
 
-public class LinkCheck extends HttpServlet {
-
-    private static final String USER_AGENT = "imCMS LinkCheck - http://www.imcms.net/";
-    private static final String HTTP_REQUEST_HEADER__USER_AGENT = "user-agent";
+import static org.apache.lucene.search.BooleanClause.Occur;
 
-    private static final int CONNECTION_TIMEOUT_MILLISECONDS = 10000;
-    private static final int READ_TIMEOUT_MILLISECONDS = 10000;
-
-    private final static Logger log = Logger.getLogger( LinkCheck.class.getName() );
+public class LinkCheck extends HttpServlet {
 
     public static final String REQUEST_PARAMETER__START_BUTTON = "start_check";
     public static final String REQUEST_PARAMETER__BROKEN_ONLY = "broken_only";
     public static final String REQUEST_PARAMETER__START_ID = "start_id";
     public static final String REQUEST_PARAMETER__END_ID = "end_id";
+    private static final String USER_AGENT = "imCMS LinkCheck - http://www.imcms.net/";
+    private static final String HTTP_REQUEST_HEADER__USER_AGENT = "user-agent";
+    private static final int CONNECTION_TIMEOUT_MILLISECONDS = 10000;
+    private static final int READ_TIMEOUT_MILLISECONDS = 10000;
+    private final static Logger log = LogManager.getLogger(LinkCheck.class.getName());
 
-    public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        if ( !user.isSuperAdmin() ) {
-            Utility.forwardToLogin( request, response );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        if (!user.isSuperAdmin()) {
+            Utility.forwardToLogin(request, response);
             return;
         }
 
-        List links = new ArrayList();
+        List<Link> links = new ArrayList<>();
         ImcmsServices imcref = Imcms.getServices();
         DocumentMapper documentMapper = imcref.getDocumentMapper();
         DocumentIndex reindexingIndex = documentMapper.getDocumentIndex();
 
         int lowestDocumentId = documentMapper.getLowestDocumentId();
         int highestDocumentId = documentMapper.getHighestDocumentId();
-        int startId = NumberUtils.stringToInt( request.getParameter( REQUEST_PARAMETER__START_ID ), lowestDocumentId );
-        int endId =   NumberUtils.stringToInt( request.getParameter( REQUEST_PARAMETER__END_ID ),   highestDocumentId );
-        IntRange range = new IntRange( startId,endId );
-        range = new IntRange( Math.max(range.getMinimumInteger(), lowestDocumentId), Math.min(range.getMaximumInteger(), highestDocumentId));
-
-        addUrlDocumentLinks( links, reindexingIndex, user, request, range );
-        addTextAndImageLinks( links, reindexingIndex, user, request, range );
-        Collections.sort( links, new Comparator() {
-            public int compare( Object o1, Object o2 ) {
-                Link l1 = (Link)o1 ;
-                Link l2 = (Link)o2 ;
-                return l1.getDocument().getId() - l2.getDocument().getId() ;
+        int startId = NumberUtils.toInt(request.getParameter(REQUEST_PARAMETER__START_ID), lowestDocumentId);
+        int endId = NumberUtils.toInt(request.getParameter(REQUEST_PARAMETER__END_ID), highestDocumentId);
+        IntRange range = new IntRange(startId, endId);
+        range = new IntRange(Math.max(range.getMinimumInteger(), lowestDocumentId), Math.min(range.getMaximumInteger(), highestDocumentId));
+
+        addUrlDocumentLinks(links, reindexingIndex, user, request, range);
+        addTextAndImageLinks(links, reindexingIndex, user, request, range);
+        Collections.sort(links, new Comparator<Link>() {
+            public int compare(Link o1, Link o2) {
+                return o1.getDocument().getId() - o2.getDocument().getId();
             }
-        } );
+        });
 
         LinkCheckPage linkCheckPage = new LinkCheckPage();
-        linkCheckPage.setLinksIterator( links.iterator() );
-        boolean doCheckLinks = null != request.getParameter( REQUEST_PARAMETER__START_BUTTON );
-        linkCheckPage.setDoCheckLinks( doCheckLinks );
-        linkCheckPage.setStartId( range.getMinimumInteger() ) ;
-        linkCheckPage.setEndId( range.getMaximumInteger() ) ;
-        linkCheckPage.setBrokenOnly( null != request.getParameter( REQUEST_PARAMETER__BROKEN_ONLY ) );
-        if ( doCheckLinks ) {
+        linkCheckPage.setLinksIterator(links.iterator());
+        boolean doCheckLinks = null != request.getParameter(REQUEST_PARAMETER__START_BUTTON);
+        linkCheckPage.setDoCheckLinks(doCheckLinks);
+        linkCheckPage.setStartId(range.getMinimumInteger());
+        linkCheckPage.setEndId(range.getMaximumInteger());
+        linkCheckPage.setBrokenOnly(null != request.getParameter(REQUEST_PARAMETER__BROKEN_ONLY));
+        if (doCheckLinks) {
             Iterator iterator = links.iterator();
-            for ( int i = 0; i < 10; ++i ) {
-                new LinkCheckThread( iterator ).start();
+            for (int i = 0; i < 10; ++i) {
+                new LinkCheckThread(iterator).start();
+            }
+        }
+        linkCheckPage.forward(request, response, user);
+
+    }
+
+    private void addUrlDocumentLinks(List<Link> links, DocumentIndex reindexingIndex, UserDomainObject user,
+                                     HttpServletRequest request, IntRange range) {
+        TermQuery urlDocumentsQuery = new TermQuery(new Term(DocumentIndex.FIELD__DOC_TYPE_ID, ""
+                + DocumentTypeDomainObject.URL_ID));
+        List<DocumentDomainObject> urlDocuments = reindexingIndex.search(new SimpleDocumentQuery(urlDocumentsQuery), user);
+
+        for (DocumentDomainObject urlDocument1 : urlDocuments) {
+            UrlDocumentDomainObject urlDocument = (UrlDocumentDomainObject) urlDocument1;
+            if (!range.containsInteger(urlDocument.getId())) {
+                continue;
+            }
+            Link link = new UrlDocumentLink(urlDocument, request);
+            links.add(link);
+        }
+    }
+
+    private void addTextAndImageLinks(List<Link> links, DocumentIndex reindexingIndex, UserDomainObject user,
+                                      HttpServletRequest request, IntRange range) {
+        final BooleanQuery.Builder queryBuilder = new BooleanQuery.Builder();
+        queryBuilder.add(new PrefixQuery(new Term(DocumentIndex.FIELD__NONSTRIPPED_TEXT, "http")), Occur.SHOULD);
+        queryBuilder.add(new PrefixQuery(new Term(DocumentIndex.FIELD__NONSTRIPPED_TEXT, "href")), Occur.SHOULD);
+        queryBuilder.add(new PrefixQuery(new Term(DocumentIndex.FIELD__IMAGE_LINK_URL, "http")), Occur.SHOULD);
+
+        List<DocumentDomainObject> textDocuments = reindexingIndex.search(new SimpleDocumentQuery(queryBuilder.build()), user);
+
+        for (DocumentDomainObject textDocument1 : textDocuments) {
+            TextDocumentDomainObject textDocument = (TextDocumentDomainObject) textDocument1;
+            if (!range.containsInteger(textDocument.getId())) {
+                continue;
+            }
+            addTextLinks(links, textDocument, request);
+            addImageLinks(links, textDocument, request);
+        }
+    }
+
+    private void addTextLinks(List<Link> links, TextDocumentDomainObject textDocument, HttpServletRequest request) {
+        Map<Integer, TextDomainObject> texts = textDocument.getTexts();
+        for (Map.Entry<Integer, TextDomainObject> entry : texts.entrySet()) {
+            Integer textIndex = entry.getKey();
+            TextDomainObject text = entry.getValue();
+            String textString = text.getText();
+            Perl5Util perl5Util = new Perl5Util();
+            PatternMatcherInput patternMatcherInput = new PatternMatcherInput(textString);
+            while (matchesUrl(perl5Util, patternMatcherInput)) {
+                String url = perl5Util.group(1);
+                if (null == url) {
+                    url = perl5Util.group(0);
+                }
+                Link link = new TextLink(textDocument, textIndex, url, request);
+                links.add(link);
             }
         }
-        linkCheckPage.forward( request, response, user );
+    }
 
+    boolean matchesUrl(Perl5Util perl5Util,
+                       PatternMatcherInput patternMatcherInput) {
+        String urlWithoutSchemePattern = "[^\\s\"'()]+";
+        return perl5Util.match("m,\\bhttp://" + urlWithoutSchemePattern + "|\\bhref=[\"']?("
+                + urlWithoutSchemePattern
+                + "),i", patternMatcherInput);
+    }
+
+    private void addImageLinks(List<Link> links, TextDocumentDomainObject textDocument, HttpServletRequest request) {
+        Map<Integer, ImageDomainObject> images = textDocument.getImages();
+        for (Map.Entry<Integer, ImageDomainObject> entry : images.entrySet()) {
+            Integer imageIndex = entry.getKey();
+            ImageDomainObject image = entry.getValue();
+            String imageLinkUrl = image.getLinkUrl();
+            if (null != imageLinkUrl && imageLinkUrl.length() > 0) {
+                Link link = new ImageLink(textDocument, imageIndex, imageLinkUrl, request);
+                links.add(link);
+            }
+        }
     }
 
     public static class LinkCheckThread extends Thread {
 
         private Iterator iterator;
 
-        public LinkCheckThread( Iterator iterator ) {
+        public LinkCheckThread(Iterator iterator) {
             this.iterator = iterator;
         }
 
         public void run() {
-            while ( iterator.hasNext() ) {
+            while (iterator.hasNext()) {
                 try {
-                    Link link = (Link)iterator.next();
+                    Link link = (Link) iterator.next();
                     link.check();
-                } catch ( NoSuchElementException ignored ) {}
+                } catch (NoSuchElementException ignored) {
+                }
             }
         }
     }
@@ -124,21 +203,21 @@ public static class LinkCheckPage implements Serializable {
         private int startId;
         private int endId;
 
-        public void forward( HttpServletRequest request, HttpServletResponse response, UserDomainObject user ) throws IOException, ServletException {
-            putInRequest( request );
+        public void forward(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) throws IOException, ServletException {
+            putInRequest(request);
             String forwardPath = "/imcms/" + user.getLanguageIso639_2() + "/jsp/linkcheck/linkcheck.jsp";
-            request.getRequestDispatcher( forwardPath ).forward( request, response );
+            request.getRequestDispatcher(forwardPath).forward(request, response);
         }
 
-        public void putInRequest( HttpServletRequest request ) {
-            request.setAttribute( REQUEST_ATTRIBUTE__PAGE, this );
+        public void putInRequest(HttpServletRequest request) {
+            request.setAttribute(REQUEST_ATTRIBUTE__PAGE, this);
         }
 
         public boolean isDoCheckLinks() {
             return doCheckLinks;
         }
 
-        public void setDoCheckLinks( boolean doCheckLinks ) {
+        public void setDoCheckLinks(boolean doCheckLinks) {
             this.doCheckLinks = doCheckLinks;
         }
 
@@ -146,115 +225,38 @@ public boolean isBrokenOnly() {
             return brokenOnly;
         }
 
-        public void setBrokenOnly( boolean brokenOnly ) {
+        public void setBrokenOnly(boolean brokenOnly) {
             this.brokenOnly = brokenOnly;
         }
 
-        public void setLinksIterator( Iterator linksIterator ) {
-            this.linksIterator = linksIterator;
-        }
-
         public Iterator getLinksIterator() {
             return linksIterator;
         }
 
-        public int getStartId() {
-            return startId;
+        public void setLinksIterator(Iterator linksIterator) {
+            this.linksIterator = linksIterator;
         }
 
-        public int getEndId() {
-            return endId;
+        public int getStartId() {
+            return startId;
         }
 
-        public void setStartId( int startId ) {
+        public void setStartId(int startId) {
             this.startId = startId;
         }
 
-        public void setEndId( int endId ) {
-            this.endId = endId;
-        }
-    }
-
-    private void addUrlDocumentLinks( List links, DocumentIndex reindexingIndex, UserDomainObject user,
-                                      HttpServletRequest request, IntRange range ) {
-        TermQuery urlDocumentsQuery = new TermQuery( new Term( DocumentIndex.FIELD__DOC_TYPE_ID, ""
-                                                                                     + DocumentTypeDomainObject.URL_ID ) );
-        List urlDocuments = reindexingIndex.search( new SimpleDocumentQuery(urlDocumentsQuery), user );
-
-        for ( Iterator iterator = urlDocuments.iterator(); iterator.hasNext(); ) {
-            UrlDocumentDomainObject urlDocument = (UrlDocumentDomainObject) iterator.next();
-            if ( !range.containsInteger( urlDocument.getId() )) {
-                continue ;
-            }
-            Link link = new UrlDocumentLink( urlDocument, request );
-            links.add( link );
-        }
-    }
-
-    private void addTextAndImageLinks( List links, DocumentIndex reindexingIndex, UserDomainObject user,
-                                       HttpServletRequest request, IntRange range ) {
-        BooleanQuery query = new BooleanQuery();
-        query.add( new PrefixQuery( new Term( DocumentIndex.FIELD__NONSTRIPPED_TEXT, "http" ) ), false, false );
-        query.add( new PrefixQuery( new Term( DocumentIndex.FIELD__NONSTRIPPED_TEXT, "href" ) ), false, false );
-        query.add( new PrefixQuery( new Term( DocumentIndex.FIELD__IMAGE_LINK_URL, "http" ) ), false, false );
-
-        List textDocuments = reindexingIndex.search( new SimpleDocumentQuery(query), user );
-
-        for ( Iterator iterator = textDocuments.iterator(); iterator.hasNext(); ) {
-            TextDocumentDomainObject textDocument = (TextDocumentDomainObject) iterator.next();
-            if (!range.containsInteger( textDocument.getId() )) {
-                continue;
-            }
-            addTextLinks( links, textDocument, request );
-            addImageLinks( links, textDocument, request );
-        }
-    }
-
-    private void addTextLinks( List links, TextDocumentDomainObject textDocument, HttpServletRequest request ) {
-        Map texts = textDocument.getTexts();
-        for ( Iterator iterator = texts.entrySet().iterator(); iterator.hasNext(); ) {
-            Map.Entry entry = (Map.Entry)iterator.next();
-            Integer textIndex = (Integer)entry.getKey();
-            TextDomainObject text = (TextDomainObject)entry.getValue();
-            String textString = text.getText();
-            Perl5Util perl5Util = new Perl5Util();
-            PatternMatcherInput patternMatcherInput = new PatternMatcherInput( textString );
-            while ( matchesUrl( perl5Util, patternMatcherInput ) ) {
-                String url = perl5Util.group( 1 );
-                if ( null == url ) {
-                    url = perl5Util.group( 0 );
-                }
-                Link link = new TextLink( textDocument, textIndex.intValue(), url, request );
-                links.add( link );
-            }
+        public int getEndId() {
+            return endId;
         }
-    }
-
-    boolean matchesUrl( Perl5Util perl5Util,
-                                PatternMatcherInput patternMatcherInput ) {
-        String urlWithoutSchemePattern = "[^\\s\"'()]+";
-        return perl5Util.match( "m,\\bhttp://" + urlWithoutSchemePattern + "|\\bhref=[\"']?("
-                                 + urlWithoutSchemePattern
-                                 + "),i", patternMatcherInput );
-    }
 
-    private void addImageLinks( List links, TextDocumentDomainObject textDocument, HttpServletRequest request ) {
-        Map images = textDocument.getImages();
-        for ( Iterator iterator = images.entrySet().iterator(); iterator.hasNext(); ) {
-            Map.Entry entry = (Map.Entry)iterator.next();
-            Integer imageIndex = (Integer)entry.getKey();
-            ImageDomainObject image = (ImageDomainObject)entry.getValue();
-            String imageLinkUrl = image.getLinkUrl();
-            if ( null != imageLinkUrl && imageLinkUrl.length() > 0 ) {
-                Link link = new ImageLink( textDocument, imageIndex.intValue(), imageLinkUrl, request );
-                links.add( link );
-            }
+        public void setEndId(int endId) {
+            this.endId = endId;
         }
     }
 
     public abstract static class Link {
 
-        private boolean checkable = true ;
+        private boolean checkable = true;
 
         private boolean ok;
         private boolean hostFound;
@@ -263,14 +265,14 @@ public abstract static class Link {
 
         private HttpServletRequest request;
 
-        public Link( HttpServletRequest request ) {
+        public Link(HttpServletRequest request) {
             this.request = request;
         }
 
         public abstract String getUrl();
 
         public boolean isCheckable() {
-            check() ;
+            check();
             return checkable;
         }
 
@@ -290,19 +292,19 @@ public boolean isOk() {
         }
 
         private synchronized void check() {
-            if ( checked ) {
+            if (checked) {
                 return;
             }
             checked = true;
-            checkUrl( fixSchemeLessUrl() );
+            checkUrl(fixSchemeLessUrl());
         }
 
         public String fixSchemeLessUrl() {
             String url = getUrl();
-            boolean hasScheme = Pattern.compile( "^(\\w+):" ).matcher( url ).find();
+            boolean hasScheme = Pattern.compile("^(\\w+):").matcher(url).find();
             if (!hasScheme) {
                 String requestUrlWithoutPath = Utility.getRequestURLWithoutPath(request);
-                if ( url.startsWith( "/" ) ) {
+                if (url.startsWith("/")) {
                     url = requestUrlWithoutPath + url;
                 } else {
                     url = requestUrlWithoutPath + request.getContextPath() + "/" + url;
@@ -311,39 +313,37 @@ public String fixSchemeLessUrl() {
             return url;
         }
 
-        private void checkUrl( String url ) {
-            log.debug( "checkUrl(" + url + ")" );
+        private void checkUrl(String url) {
+            log.debug("checkUrl(" + url + ")");
             HttpClient httpClient = new HttpClient();
-            httpClient.setConnectionTimeout( CONNECTION_TIMEOUT_MILLISECONDS );
-            httpClient.setTimeout( READ_TIMEOUT_MILLISECONDS );
+            httpClient.setConnectionTimeout(CONNECTION_TIMEOUT_MILLISECONDS);
+            httpClient.setTimeout(READ_TIMEOUT_MILLISECONDS);
             HttpMethod httpMethod;
             try {
-                httpMethod = new HeadMethod( url );
-            } catch ( Exception e ) {
-                checkable = false ;
+                httpMethod = new HeadMethod(url);
+            } catch (Exception e) {
+                checkable = false;
                 return;
             }
-            httpMethod.setRequestHeader( HTTP_REQUEST_HEADER__USER_AGENT, USER_AGENT );
+            httpMethod.setRequestHeader(HTTP_REQUEST_HEADER__USER_AGENT, USER_AGENT);
             try {
-                int status = httpClient.executeMethod( httpMethod );
+                int status = httpClient.executeMethod(httpMethod);
                 hostFound = true;
                 hostReachable = true;
                 httpMethod.releaseConnection();
-                if ( HttpStatus.SC_OK == status ) {
+                if (HttpStatus.SC_OK == status) {
                     ok = true;
                 }
-            } catch ( IllegalArgumentException e ) {
-                log.debug( "Error testing url " + url, e );
-            } catch ( UnknownHostException e ) {
-            } catch ( HttpConnection.ConnectionTimeoutException e ) {
+            } catch (IllegalArgumentException e) {
+                log.debug("Error testing url " + url, e);
+            } catch (UnknownHostException ignore) {
+            } catch (ConnectException e) {
                 hostFound = true;
-            } catch ( ConnectException e ) {
-                hostFound = true;
-            } catch ( HttpException e ) {
+            } catch (HttpException e) {
                 hostFound = true;
                 hostReachable = true;
-            } catch ( IOException e ) {
-                log.warn( "Unknown IOException in LinkCheck.", e );
+            } catch (IOException e) {
+                log.warn("Unknown IOException in LinkCheck.", e);
             }
         }
 
@@ -355,10 +355,10 @@ public final static class UrlDocumentLink extends Link {
         private UrlDocumentDomainObject urlDocument;
         private DocumentMapper.TextDocumentMenuIndexPair[] documentMenuPairsContainingUrlDocument;
 
-        public UrlDocumentLink( UrlDocumentDomainObject urlDocument, HttpServletRequest request ) {
-            super( request );
+        public UrlDocumentLink(UrlDocumentDomainObject urlDocument, HttpServletRequest request) {
+            super(request);
             this.urlDocument = urlDocument;
-            documentMenuPairsContainingUrlDocument = Imcms.getServices().getDocumentMapper().getDocumentMenuPairsContainingDocument( urlDocument );
+            documentMenuPairsContainingUrlDocument = Imcms.getServices().getDocumentMapper().getDocumentMenuPairsContainingDocument(urlDocument);
         }
 
         public String getUrl() {
@@ -372,7 +372,6 @@ public DocumentDomainObject getDocument() {
         public DocumentMapper.TextDocumentMenuIndexPair[] getDocumentMenuPairsContainingUrlDocument() {
             return documentMenuPairsContainingUrlDocument;
         }
-
     }
 
     public abstract static class TextDocumentElementLink extends Link {
@@ -381,9 +380,9 @@ public abstract static class TextDocumentElementLink extends Link {
         protected int index;
         protected String url;
 
-        public TextDocumentElementLink( TextDocumentDomainObject textDocument, int index, String url,
-                                        HttpServletRequest request ) {
-            super( request );
+        public TextDocumentElementLink(TextDocumentDomainObject textDocument, int index, String url,
+                                       HttpServletRequest request) {
+            super(request);
             this.textDocument = textDocument;
             this.index = index;
             this.url = url;
@@ -400,24 +399,21 @@ public int getIndex() {
         public DocumentDomainObject getDocument() {
             return textDocument;
         }
-
     }
 
     public static class TextLink extends TextDocumentElementLink {
 
-        public TextLink( TextDocumentDomainObject textDocument, int index, String url,
-                         HttpServletRequest request ) {
-            super( textDocument, index, url, request );
+        public TextLink(TextDocumentDomainObject textDocument, int index, String url,
+                        HttpServletRequest request) {
+            super(textDocument, index, url, request);
         }
-
     }
 
     public static class ImageLink extends TextDocumentElementLink {
 
-        public ImageLink( TextDocumentDomainObject textDocument, int index, String url,
-                          HttpServletRequest request ) {
-            super( textDocument, index, url, request );
+        public ImageLink(TextDocumentDomainObject textDocument, int index, String url,
+                         HttpServletRequest request) {
+            super(textDocument, index, url, request);
         }
-
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/ListDocuments.java b/server/src/com/imcode/imcms/servlet/superadmin/ListDocuments.java
index f868de8df0..ad9d144473 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/ListDocuments.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/ListDocuments.java
@@ -1,7 +1,7 @@
 package com.imcode.imcms.servlet.superadmin;
 
-import com.imcode.imcms.mapping.DocumentMapper;
 import com.imcode.db.commands.SqlQueryCommand;
+import com.imcode.imcms.mapping.DocumentMapper;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.user.UserDomainObject;
@@ -13,6 +13,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Iterator;
 
 public class ListDocuments extends HttpServlet {
@@ -20,53 +21,71 @@ public class ListDocuments extends HttpServlet {
     public static final String PARAMETER_BUTTON__LIST = "showspan";
     public static final String PARAMETER__LIST_START = "start";
     public static final String PARAMETER__LIST_END = "end";
+	public static final String PARAMETER__EXPORT_DOCUMENTS = "export";
+	public static final String PARAMETER__LIST = "documentsList";
 
     public static final String REQUEST_ATTRIBUTE__FORM_DATA = "formData";
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
 
         if (!user.isSuperAdmin()) {
-            return ;
+            return;
         }
 
         ImcmsServices imcref = Imcms.getServices();
 
-        IntRange allDocumentsRange = new IntRange( getMinDocumentId( imcref ), getMaxDocumentId( imcref ) );
+        IntRange allDocumentsRange = new IntRange(getMinDocumentId(imcref), getMaxDocumentId(imcref));
 
-        String startString = req.getParameter( PARAMETER__LIST_START );
-        String endString = req.getParameter( PARAMETER__LIST_END );
+        String startString = req.getParameter(PARAMETER__LIST_START);
+        String endString = req.getParameter(PARAMETER__LIST_END);
+	    String exportString = req.getParameter(PARAMETER__EXPORT_DOCUMENTS);
+	    String[] listString = req.getParameterValues(PARAMETER__LIST);
 
-        int start = null != startString ? Integer.parseInt( startString ) : allDocumentsRange.getMinimumInteger() ;
-        int end = null != endString ? Integer.parseInt( endString ) : allDocumentsRange.getMaximumInteger();
+        int start = null != startString ? Integer.parseInt(startString) : allDocumentsRange.getMinimumInteger();
+        int end = null != endString ? Integer.parseInt(endString) : allDocumentsRange.getMaximumInteger();
+        Integer[] list = listString != null ? Arrays.stream(listString).map(Integer::valueOf).distinct().toArray(Integer[]::new) : new Integer[]{};
+	    boolean export = Boolean.parseBoolean(exportString);
 
         FormData formData = new FormData();
-        formData.selectedRange = new IntRange( start, end ) ;
-        DocumentMapper documentMapper = imcref.getDocumentMapper() ;
-        if ( req.getParameter( PARAMETER_BUTTON__LIST ) != null ) {
-            formData.documentsIterator = documentMapper.getDocumentsIterator(formData.selectedRange) ;
+        DocumentMapper documentMapper = imcref.getDocumentMapper();
+        formData.selectedRange = new IntRange(start, end);
+        if (req.getParameter(PARAMETER_BUTTON__LIST) != null) {
+            if (list.length > 0) {
+                formData.list = list;
+                formData.documentsIterator = documentMapper.getDocumentsIteratorIn(formData.list);
+            } else {
+                formData.documentsIterator = documentMapper.getDocumentsIteratorInRange(formData.selectedRange);
+            }
         }
 
-        req.setAttribute( REQUEST_ATTRIBUTE__FORM_DATA, formData );
-        req.getRequestDispatcher( "/imcms/"+user.getLanguageIso639_2()+"/jsp/document_list.jsp").forward( req, res );
+        req.setAttribute(REQUEST_ATTRIBUTE__FORM_DATA, formData);
+	    req.getRequestDispatcher("/imcms/" + user.getLanguageIso639_2() + "/jsp/" + (export ? "export/export_" : "") + "document_list.jsp").forward(req, res);
 
     }
 
-    private int getMaxDocumentId( ImcmsServices imcref ) {
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        doGet(req, resp);
+    }
+
+    private int getMaxDocumentId(ImcmsServices imcref) {
         final Object[] parameters = new String[0];
-        return Integer.parseInt( (String) imcref.getDatabase().execute(new SqlQueryCommand("select max(meta_id) from meta", parameters, Utility.SINGLE_STRING_HANDLER)) );
+        return Integer.parseInt((String) imcref.getDatabase().execute(new SqlQueryCommand("select max(meta_id) from meta", parameters, Utility.SINGLE_STRING_HANDLER)));
     }
 
-    private int getMinDocumentId( ImcmsServices imcref ) {
+    private int getMinDocumentId(ImcmsServices imcref) {
         final Object[] parameters = new String[0];
-        return Integer.parseInt( (String) imcref.getDatabase().execute(new SqlQueryCommand("select min(meta_id) from meta", parameters, Utility.SINGLE_STRING_HANDLER)) );
+        return Integer.parseInt((String) imcref.getDatabase().execute(new SqlQueryCommand("select min(meta_id) from meta", parameters, Utility.SINGLE_STRING_HANDLER)));
     }
 
     public static class FormData {
 
         public IntRange selectedRange;
 
+        public Integer[] list;
+
         public Iterator documentsIterator;
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/SanityCheckServlet.java b/server/src/com/imcode/imcms/servlet/superadmin/SanityCheckServlet.java
index 34b9d39c00..3cb1890aef 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/SanityCheckServlet.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/SanityCheckServlet.java
@@ -1,20 +1,19 @@
 package com.imcode.imcms.servlet.superadmin;
 
-import imcode.server.SanityCheck;
+import com.imcode.imcms.api.ContentManagementSystem;
+import com.imcode.imcms.db.DatabaseUtils;
 import imcode.server.DatabaseSanityCheck;
 import imcode.server.Imcms;
+import imcode.server.SanityCheck;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collection;
 
-import com.imcode.imcms.db.DatabaseUtils;
-import com.imcode.imcms.api.ContentManagementSystem;
-
 public class SanityCheckServlet extends HttpServlet {
 
     protected void doGet(HttpServletRequest request,
@@ -24,13 +23,13 @@ protected void doGet(HttpServletRequest request,
             response.sendError(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
-        
+
         DatabaseSanityCheck databaseSanityCheck = new DatabaseSanityCheck(Imcms.getServices().getDatabase(), DatabaseUtils.getWantedDdl());
         Collection<SanityCheck.Problem> problems = databaseSanityCheck.execute();
         response.setContentType("text/plain");
         PrintWriter writer = response.getWriter();
-        for ( SanityCheck.Problem problem : problems ) {
-            writer.println(problem.getSeverity()+": "+problem.getDescription());
+        for (SanityCheck.Problem problem : problems) {
+            writer.println(problem.getSeverity() + ": " + problem.getDescription());
         }
 
     }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdd.java b/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdd.java
index f8a7a9c89a..7eff77738c 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdd.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdd.java
@@ -1,142 +1,48 @@
 package com.imcode.imcms.servlet.superadmin;
 
-import com.imcode.util.MultipartHttpServletRequest;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
-import imcode.server.document.TemplateDomainObject;
-import imcode.server.document.TemplateGroupDomainObject;
-import imcode.server.document.TemplateMapper;
 import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
-import org.apache.commons.fileupload.FileItem;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
 public class TemplateAdd extends HttpServlet {
-
-    private static final String REQUEST_PARAMETER__FILE = "file";
-    private static final String REQUEST_PARAMETER__OVERWRITE = "overwrite";
-    private static final String REQUEST_PARAMETER__NAME = "name";
     private static final String REQUEST_PARAMETER__ACTION = "action";
-    private static final String REQUEST_PARAMETER__LANGUAGE = "language";
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         ImcmsServices imcref = Imcms.getServices();
 
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            Utility.redirectToStartDocument( req, res );
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.isSuperAdmin()) {
+            Utility.redirectToStartDocument(req, res);
             return;
         }
 
         ServletOutputStream out = res.getOutputStream();
 
         // Redirected here with bogus parameter, no-cache workaround
-        if ( req.getParameter( REQUEST_PARAMETER__ACTION ) != null ) {
-            if ( req.getParameter( REQUEST_PARAMETER__ACTION ).equals( "return" ) ) {
-                Utility.setDefaultHtmlContentType( res );
+        if (req.getParameter(REQUEST_PARAMETER__ACTION) != null) {
+            if (req.getParameter(REQUEST_PARAMETER__ACTION).equals("return")) {
+                Utility.setDefaultHtmlContentType(res);
 
                 List vec = new ArrayList();
-                vec.add( "#buttonName#" );
-                vec.add( "return" );
-                vec.add( "#formAction#" );
-                vec.add( "TemplateAdmin" );
-                vec.add( "#formTarget#" );
-                vec.add( "_top" );
-                out.write( imcref.getAdminTemplate("back_button.html", user, vec).getBytes("8859_1") );
+                vec.add("#buttonName#");
+                vec.add("return");
+                vec.add("#formAction#");
+                vec.add("TemplateAdmin");
+                vec.add("#formTarget#");
+                vec.add("_top");
+                out.write(imcref.getAdminTemplate("back_button.html", user, vec).getBytes(Imcms.DEFAULT_ENCODING));
             }
         }
 
     }
-
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-        ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            Utility.redirectToStartDocument( req, res );
-            return;
-        }
-
-        TemplateMapper templateMapper = imcref.getTemplateMapper();
-
-        PrintWriter out = res.getWriter();
-
-        MultipartHttpServletRequest request = new MultipartHttpServletRequest(req);
-
-        if ( request.getParameter( "cancel" ) != null ) {
-            res.sendRedirect( "TemplateAdmin" );
-            return;
-        }
-
-        String language = request.getParameter( REQUEST_PARAMETER__LANGUAGE );
-
-        String simpleName = request.getParameter(REQUEST_PARAMETER__NAME);
-        if ( simpleName == null || simpleName.equals( "" ) ) {
-            List vec = new ArrayList();
-            vec.add( "#language#" );
-            vec.add( language );
-            String htmlStr = imcref.getAdminTemplate( "template_upload_name_blank.html", user, vec );
-            Utility.setDefaultHtmlContentType( res );
-            out.print( htmlStr );
-            return;
-        }
-
-        FileItem file = request.getParameterFileItem( REQUEST_PARAMETER__FILE );
-        if ( file == null || file.getSize() == 0 ) {
-            List vec = new ArrayList();
-            vec.add( "#language#" );
-            vec.add( language );
-            String htmlStr = imcref.getAdminTemplate("template_upload_file_blank.html", user, vec);
-            Utility.setDefaultHtmlContentType( res );
-            out.print( htmlStr );
-            return;
-        }
-
-        String filename = request.getParameterFileItem( REQUEST_PARAMETER__FILE ).getName();
-        File fn = new File( filename );
-        boolean overwrite = request.getParameter(REQUEST_PARAMETER__OVERWRITE) != null;
-        String htmlStr;
-
-        int result = imcref.getTemplateMapper().saveTemplate( simpleName, fn.getName(), file.getInputStream(), overwrite);
-        if ( result == -2 ) {
-            List vec = new ArrayList();
-            vec.add( "#language#" );
-            vec.add( language );
-            htmlStr = imcref.getAdminTemplate( "template_upload_error.html", user, vec );
-        } else if ( result == -1 ) {
-            List vec = new ArrayList();
-            vec.add( "#language#" );
-            vec.add( language );
-            htmlStr = imcref.getAdminTemplate( "template_upload_file_exists.html", user, vec );
-        } else {
-            TemplateDomainObject template = templateMapper.getTemplateByName(simpleName);
-
-            String[] templateGroupIdStrings = request.getParameterValues( "templategroup" );
-            if ( templateGroupIdStrings != null ) {
-                for ( String templateGroupIdString : templateGroupIdStrings ) {
-                    int templateGroupId = Integer.parseInt(templateGroupIdString);
-                    TemplateGroupDomainObject templateGroup = templateMapper.getTemplateGroupById(templateGroupId);
-                    templateMapper.removeTemplateFromGroup(template, templateGroup);
-                    templateMapper.addTemplateToGroup(template, templateGroup);
-                }
-            }
-
-            List vec = new ArrayList();
-            vec.add( "#language#" );
-            vec.add( language );
-            htmlStr = imcref.getAdminTemplate( "template_upload_done.html", user, vec );
-        }
-        Utility.setDefaultHtmlContentType( res );
-        out.print( htmlStr );
-    }
-
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdmin.java b/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdmin.java
index fd17b8f67e..3a9f232451 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdmin.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/TemplateAdmin.java
@@ -1,5 +1,6 @@
 package com.imcode.imcms.servlet.superadmin;
 
+import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.document.DocumentDomainObject;
@@ -7,7 +8,6 @@
 import imcode.server.document.TemplateGroupDomainObject;
 import imcode.server.document.TemplateMapper;
 import imcode.server.user.UserDomainObject;
-import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.util.Parser;
 import imcode.util.Utility;
 import org.apache.commons.collections.iterators.ArrayIterator;
@@ -38,228 +38,103 @@ public class TemplateAdmin extends HttpServlet {
     private static final String TEMPLATE_GROUP_DELETE_WARNING = "templategroup_delete_warning.html";
     private static final String TEMPLATE_GROUP_DELETE_DOCUMENTS_ASSIGNED_WARNING = "templategroup_delete_documents_assigned_warning.html";
 
-    public void doGet( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-
-        ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            Utility.redirectToStartDocument( req, res );
-            return;
-        }
-
-        Utility.setDefaultHtmlContentType( res );
-
-        PrintWriter out = res.getWriter();
-
-        String htmlStr = imcref.getAdminTemplate( TEMPLATE_ADMIN, user, null );
-        out.println( htmlStr );
-
-    }
-
-    public void doPost( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException {
-
-        ImcmsServices imcref = Imcms.getServices();
-        UserDomainObject user = Utility.getLoggedOnUser( req );
-        if ( !user.isSuperAdmin() ) {
-            Utility.redirectToStartDocument( req, res );
-            return;
-        }
-
-        Utility.setDefaultHtmlContentType( res );
-        PrintWriter out = res.getWriter();
-
-        String lang = req.getParameter( "language" );
-        String htmlStr = null;
-        TemplateMapper templateMapper = imcref.getTemplateMapper();
-        if ( req.getParameter( "cancel" ) != null ) {
-            res.sendRedirect( "AdminManager" );
-            return;
-        } else if ( req.getParameter( "add_template" ) != null ) {
-            htmlStr = createUploadTemplateDialog( templateMapper, lang, imcref, user );
-        } else if ( req.getParameter( "add_demotemplate" ) != null ) {
-            htmlStr = createUploadDemoTemplateDialog( lang, templateMapper, imcref, user );
-        } else if ( req.getParameter( "delete_template" ) != null ) {
-            htmlStr = createDeleteTemplateDialog( templateMapper, user, lang, imcref );
-        } else if ( req.getParameter( "rename_template" ) != null ) {
-            htmlStr = createRenameTemplateDialog( lang, imcref, templateMapper, user, null);
-        } else if ( req.getParameter( "get_template" ) != null ) {
-            htmlStr = createDownloadTemplateDialog( lang, imcref, templateMapper, user );
-        } else if ( req.getParameter( "edit_template" ) != null ) {
-            htmlStr = createEditTemplateDialog( lang, imcref, templateMapper, user );
-        } else if ( req.getParameter( "add_group" ) != null ) {
-            htmlStr = createAddGroupDialog( imcref, user );
-        } else if ( req.getParameter( "delete_group" ) != null ) {
-            htmlStr = createDeleteTemplateGroupDialog( templateMapper, imcref, user );
-        } else if ( req.getParameter( "rename_group" ) != null ) {
-            htmlStr = createRenameTemplateGroupDialog( templateMapper, imcref, user );
-        } else if ( req.getParameter( "assign_group" ) != null ) {
-            htmlStr = createAssignTemplateGroupDialog( lang, templateMapper, user, imcref );
-        } else if ( req.getParameter( "show_templates" ) != null ) {
-            htmlStr = createListTemplatesDialog( templateMapper, user, lang, imcref );
-        }
-        out.print( htmlStr );
-    }
-
-    private String createListTemplatesDialog( TemplateMapper templateMapper, UserDomainObject user, String lang,
-                                              ImcmsServices imcref ) {
-        String templateList = templateMapper.createHtmlOptionListOfTemplatesWithDocumentCount(user);
-        List vec = new ArrayList();
-        vec.add( "#template_list#" );
-        vec.add( templateList );
-        vec.add( "#language#" );
-        vec.add( lang );
-        return imcref.getAdminTemplate( "template_list.html", user, vec );
-    }
-
-    private String createAssignTemplateGroupDialog( String lang, TemplateMapper templateMapper,
-                                                    UserDomainObject user, ImcmsServices imcref ) throws IOException {
-        return createAssignTemplatesToGroupDialog( templateMapper, null, lang, user, imcref );
-    }
-
-    static String createDeleteTemplateGroupDialog( TemplateMapper templateMapper, ImcmsServices imcref,
-                                                   UserDomainObject user ) {
-        String temps = templateMapper.createHtmlOptionListOfTemplateGroups( null );
+    static String createDeleteTemplateGroupDialog(TemplateMapper templateMapper, ImcmsServices imcref,
+                                                  UserDomainObject user) {
+        String temps = templateMapper.createHtmlOptionListOfTemplateGroups(null);
         List vec = new ArrayList();
-        vec.add( "#templategroups#" );
-        vec.add( temps );
+        vec.add("#templategroups#");
+        vec.add(temps);
         return imcref.getAdminTemplate(ADMIN_TEMPLATE_DELETE, user, vec);
     }
 
-    static String createAddGroupDialog( ImcmsServices imcref, UserDomainObject user ) {
+    static String createAddGroupDialog(ImcmsServices imcref, UserDomainObject user) {
         return imcref.getAdminTemplate(ADMIN_TEMPLATE_ADD, user, null);
     }
 
-    private String createEditTemplateDialog( String lang, ImcmsServices imcref, TemplateMapper templateMapper,
-                                             UserDomainObject user ) throws IOException {
-        List vec = new ArrayList();
-        vec.add( "#language#" );
-        vec.add( lang );
-        List<TemplateDomainObject> templates = imcref.getTemplateMapper().getAllTemplates();
-        String temps = templateMapper.createHtmlOptionListOfTemplates( templates, null );
-        vec.add( "#templates#" );
-        vec.add( temps );
-        return imcref.getAdminTemplate(ADMIN_TEMPLATE_EDIT, user, vec);
-    }
-
-    private String createDownloadTemplateDialog( String lang, ImcmsServices imcref,
-                                                 TemplateMapper templateMapper, UserDomainObject user ) throws IOException {
-        List vec = new ArrayList();
-        vec.add( "#language#" );
-        vec.add( lang );
-        List<TemplateDomainObject> templates = imcref.getTemplateMapper().getAllTemplates();
-        String temps = templateMapper.createHtmlOptionListOfTemplates( templates, null );
-        vec.add( "#templates#" );
-        vec.add( temps );
-        return imcref.getAdminTemplate("template_get.html", user, vec);
-    }
-
     static String createRenameTemplateDialog(String lang, ImcmsServices imcref, TemplateMapper templateMapper,
                                              UserDomainObject user, LocalizedMessage error) throws IOException {
         List vec = new ArrayList();
-        vec.add( "#language#" );
-        vec.add( lang );
-        vec.add( "#templates#" );
-        vec.add( templateMapper.createHtmlOptionListOfTemplates( imcref.getTemplateMapper().getAllTemplates(), null ) );
-        vec.add( "#error#" );
-        vec.add( null == error ? "" : error.toLocalizedString(user)) ;
+        vec.add("#language#");
+        vec.add(lang);
+        vec.add("#templates#");
+        vec.add(templateMapper.createHtmlOptionListOfTemplates(imcref.getTemplateMapper().getAllTemplates(), null));
+        vec.add("#error#");
+        vec.add(null == error ? "" : error.toLocalizedString(user));
         return imcref.getAdminTemplate(ADMIN_TEMPLATE_RENAME, user, vec);
     }
 
-    static String createDeleteTemplateDialog( TemplateMapper templateMapper, UserDomainObject user, String lang,
-                                              ImcmsServices imcref ) {
+    static String createDeleteTemplateDialog(TemplateMapper templateMapper, UserDomainObject user, String lang,
+                                             ImcmsServices imcref) {
         List vec = new ArrayList();
         String templatesList = templateMapper.createHtmlOptionListOfTemplatesWithDocumentCount(user);
-        vec.add( "#templates#" );
-        vec.add( templatesList );
-        vec.add( "#language#" );
-        vec.add( lang );
-        return imcref.getAdminTemplate( TEMPLATE_DELETE, user, vec );
-    }
-
-    private String createUploadDemoTemplateDialog( String lang, TemplateMapper templateMapper,
-                                                   ImcmsServices imcref, UserDomainObject user ) throws IOException {
-        List vec = new ArrayList();
-        vec.add( "#language#" );
-        vec.add( lang );
-        List<TemplateDomainObject> templates = templateMapper.getAllTemplates();
-        String temps = templateMapper.createHtmlOptionListOfTemplates( templates, null );
-        vec.add( "#templates#" );
-        vec.add( temps );
-        return imcref.getAdminTemplate(TEMPLATE_DEMO_UPLOAD, user, vec);
-    }
-
-    private String createUploadTemplateDialog( TemplateMapper templateMapper, String lang, ImcmsServices imcref,
-                                               UserDomainObject user ) {
-        List vec = new ArrayList();
-        String temps = templateMapper.createHtmlOptionListOfTemplateGroups( null );
-        vec.add( "#templategroups#" );
-        vec.add( temps );
-        vec.add( "#language#" );
-        vec.add( lang );
-        return imcref.getAdminTemplate(TEMPLATE_UPLOAD, user, vec);
+        vec.add("#templates#");
+        vec.add(templatesList);
+        vec.add("#language#");
+        vec.add(lang);
+        return imcref.getAdminTemplate(TEMPLATE_DELETE, user, vec);
     }
 
-    static String createRenameTemplateGroupDialog( TemplateMapper templateMapper, ImcmsServices imcref,
-                                                   UserDomainObject user ) {
-        String htmlOptionListOfTemplateGroups = templateMapper.createHtmlOptionListOfTemplateGroups( null );
+    static String createRenameTemplateGroupDialog(TemplateMapper templateMapper, ImcmsServices imcref,
+                                                  UserDomainObject user) {
+        String htmlOptionListOfTemplateGroups = templateMapper.createHtmlOptionListOfTemplateGroups(null);
         List vec = new ArrayList();
-        vec.add( "#templategroups#" );
-        vec.add( htmlOptionListOfTemplateGroups );
+        vec.add("#templategroups#");
+        vec.add(htmlOptionListOfTemplateGroups);
         return imcref.getAdminTemplate(TEMPLATE_GROUP_RENAME, user, vec);
     }
 
-    static String createAssignTemplatesToGroupDialog( TemplateMapper templateMapper, TemplateGroupDomainObject currentTemplateGroup, String language,
-                                                      UserDomainObject user, ImcmsServices imcref ) throws IOException {
+    static String createAssignTemplatesToGroupDialog(TemplateMapper templateMapper, TemplateGroupDomainObject currentTemplateGroup, String language,
+                                                     UserDomainObject user, ImcmsServices imcref) throws IOException {
         List vec = new ArrayList();
 
         String htmlOptionListOfTemplateGroups = templateMapper.createHtmlOptionListOfTemplateGroups(
-                currentTemplateGroup );
-
-        vec.add( "#templategroups#" );
-        vec.add( htmlOptionListOfTemplateGroups );
-        if ( currentTemplateGroup == null ) {
-            vec.add( "#assigned#" );
-            vec.add( "" );
-            vec.add( "#unassigned#" );
-            vec.add( "" );
-            vec.add( "#group#" );
-            vec.add( "" );
-            vec.add( "#group_id#" );
-            vec.add( "" );
+                currentTemplateGroup);
+
+        vec.add("#templategroups#");
+        vec.add(htmlOptionListOfTemplateGroups);
+        if (currentTemplateGroup == null) {
+            vec.add("#assigned#");
+            vec.add("");
+            vec.add("#unassigned#");
+            vec.add("");
+            vec.add("#group#");
+            vec.add("");
+            vec.add("#group_id#");
+            vec.add("");
         } else {
-            List<TemplateDomainObject> templatesInGroup = templateMapper.getTemplatesInGroup( currentTemplateGroup );
-            List<TemplateDomainObject> templatesNotInGroup = templateMapper.getTemplatesNotInGroup( currentTemplateGroup );
+            List<TemplateDomainObject> templatesInGroup = templateMapper.getTemplatesInGroup(currentTemplateGroup);
+            List<TemplateDomainObject> templatesNotInGroup = templateMapper.getTemplatesNotInGroup(currentTemplateGroup);
             String htmlOptionListOfTemplatesInSelectedGroup = templateMapper.createHtmlOptionListOfTemplates(
-                    templatesInGroup, null );
+                    templatesInGroup, null);
             String htmlOptionListOfTemplatesNotInSelectedGroup = templateMapper.createHtmlOptionListOfTemplates(
-                    templatesNotInGroup, null );
-            vec.add( "#assigned#" );
-            vec.add( htmlOptionListOfTemplatesInSelectedGroup );
-            vec.add( "#unassigned#" );
-            vec.add( htmlOptionListOfTemplatesNotInSelectedGroup );
-            vec.add( "#group#" );
-            vec.add( currentTemplateGroup.getName() );
-            vec.add( "#group_id#" );
-            vec.add( "" + currentTemplateGroup.getId() );
+                    templatesNotInGroup, null);
+            vec.add("#assigned#");
+            vec.add(htmlOptionListOfTemplatesInSelectedGroup);
+            vec.add("#unassigned#");
+            vec.add(htmlOptionListOfTemplatesNotInSelectedGroup);
+            vec.add("#group#");
+            vec.add(currentTemplateGroup.getName());
+            vec.add("#group_id#");
+            vec.add("" + currentTemplateGroup.getId());
         }
-        vec.add( "#language#" );
-        vec.add( language );
-        return imcref.getAdminTemplate( TEMPLATE_ASSIGN, user, vec );
+        vec.add("#language#");
+        vec.add(language);
+        return imcref.getAdminTemplate(TEMPLATE_ASSIGN, user, vec);
     }
 
-    static String createHtmlOptionListOfDocumentsUsingTemplate( ImcmsServices imcref, TemplateDomainObject template,
-                                                                 UserDomainObject user ) {
-        DocumentDomainObject[] documents = imcref.getTemplateMapper().getDocumentsUsingTemplate( template );
+    static String createHtmlOptionListOfDocumentsUsingTemplate(ImcmsServices imcref, TemplateDomainObject template,
+                                                               UserDomainObject user) {
+        DocumentDomainObject[] documents = imcref.getTemplateMapper().getDocumentsUsingTemplate(template);
         StringBuffer htmlOptionList = new StringBuffer();
-        for ( DocumentDomainObject document : documents ) {
+        for (DocumentDomainObject document : documents) {
             List vec = new ArrayList();
             vec.add("#meta_id#");
             vec.add("" + document.getId());
             vec.add("#meta_headline#");
 
-            String[] pd = { "&", "&amp;", "<", "&lt;", ">", "&gt;", "\"", "&quot;" };
+            String[] pd = {"&", "&amp;", "<", "&lt;", ">", "&gt;", "\"", "&quot;"};
             String headline = document.getHeadline();
-            headline = StringUtils.abbreviate(headline, 60) ;
+            headline = StringUtils.abbreviate(headline, 60);
             headline = Parser.parseDoc(headline, pd);
             vec.add(headline);
             htmlOptionList.append(imcref.getAdminTemplate(TEMPLATE_DOCS_ROW, user, vec));
@@ -267,31 +142,31 @@ static String createHtmlOptionListOfDocumentsUsingTemplate( ImcmsServices imcref
         return htmlOptionList.toString();
     }
 
-    static String createDeleteTemplateInUseWarningDialog( String lang, ImcmsServices imcref,
-                                                      TemplateDomainObject template, UserDomainObject user,
-                                                      TemplateMapper templateMapper ) throws IOException {
+    static String createDeleteTemplateInUseWarningDialog(String lang, ImcmsServices imcref,
+                                                         TemplateDomainObject template, UserDomainObject user,
+                                                         TemplateMapper templateMapper) throws IOException {
         List vec = new ArrayList();
-        vec.add( "#language#" );
-        vec.add( lang );
-        vec.add( "#template#" );
-        vec.add( template.getName() );
-        vec.add( "#docs#" );
-        vec.add( createHtmlOptionListOfDocumentsUsingTemplate( imcref, template, user ) );
-        vec.add( "#templates#" );
-        vec.add( templateMapper.createHtmlOptionListOfTemplates( templateMapper.getAllTemplatesExceptOne( template ), null ) );
+        vec.add("#language#");
+        vec.add(lang);
+        vec.add("#template#");
+        vec.add(template.getName());
+        vec.add("#docs#");
+        vec.add(createHtmlOptionListOfDocumentsUsingTemplate(imcref, template, user));
+        vec.add("#templates#");
+        vec.add(templateMapper.createHtmlOptionListOfTemplates(templateMapper.getAllTemplatesExceptOne(template), null));
 
         return imcref.getAdminTemplate(TEMPLATE_DELETE_WARNING, user, vec);
     }
 
-    static String createDeleteNonEmptyTemplateGroupWarningDialog( Iterable<TemplateDomainObject> templatesInGroup,
-                                                                   int templateGroupId, ImcmsServices imcref,
-                                                                   UserDomainObject user ) {
+    static String createDeleteNonEmptyTemplateGroupWarningDialog(Iterable<TemplateDomainObject> templatesInGroup,
+                                                                 int templateGroupId, ImcmsServices imcref,
+                                                                 UserDomainObject user) {
         return createTemplateGroupWarningDialog(templatesInGroup, templateGroupId, imcref, TEMPLATE_GROUP_DELETE_WARNING, user);
     }
 
-    static String createDocumentsAssignedToTemplateInTemplateGroupWarningDialog( Iterable<TemplateDomainObject> templatesInGroup,
-                                                                   int templateGroupId, ImcmsServices imcref,
-                                                                   UserDomainObject user) {
+    static String createDocumentsAssignedToTemplateInTemplateGroupWarningDialog(Iterable<TemplateDomainObject> templatesInGroup,
+                                                                                int templateGroupId, ImcmsServices imcref,
+                                                                                UserDomainObject user) {
 
         return createTemplateGroupWarningDialog(templatesInGroup, templateGroupId, imcref, TEMPLATE_GROUP_DELETE_DOCUMENTS_ASSIGNED_WARNING, user);
     }
@@ -299,17 +174,130 @@ static String createDocumentsAssignedToTemplateInTemplateGroupWarningDialog( Ite
     private static String createTemplateGroupWarningDialog(Iterable<TemplateDomainObject> templatesInGroup, int templateGroupId,
                                                            ImcmsServices imcref, String template,
                                                            UserDomainObject user) {
-        String commaSeparatedTemplateNames = StringUtils.join( new ArrayIterator( templatesInGroup ) {
+        String commaSeparatedTemplateNames = StringUtils.join(new ArrayIterator(templatesInGroup) {
             public Object next() {
                 TemplateDomainObject template = (TemplateDomainObject) super.next();
-                return template.getName() ;
+                return template.getName();
             }
-        }, ", " );
+        }, ", ");
         List vec = new ArrayList();
-        vec.add( "#templates#" );
-        vec.add( commaSeparatedTemplateNames );
-        vec.add( "#templategroup#" );
-        vec.add( String.valueOf( templateGroupId ) );
+        vec.add("#templates#");
+        vec.add(commaSeparatedTemplateNames);
+        vec.add("#templategroup#");
+        vec.add(String.valueOf(templateGroupId));
         return imcref.getAdminTemplate(template, user, vec);
     }
+
+    public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+
+        ImcmsServices imcref = Imcms.getServices();
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.isSuperAdmin()) {
+            Utility.redirectToStartDocument(req, res);
+            return;
+        }
+
+        Utility.setDefaultHtmlContentType(res);
+
+        PrintWriter out = res.getWriter();
+
+        String htmlStr = imcref.getAdminTemplate(TEMPLATE_ADMIN, user, null);
+        out.println(htmlStr);
+
+    }
+
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+
+        ImcmsServices imcref = Imcms.getServices();
+        UserDomainObject user = Utility.getLoggedOnUser(req);
+        if (!user.isSuperAdmin()) {
+            Utility.redirectToStartDocument(req, res);
+            return;
+        }
+
+        Utility.setDefaultHtmlContentType(res);
+        PrintWriter out = res.getWriter();
+
+        String lang = req.getParameter("language");
+        String htmlStr = null;
+        TemplateMapper templateMapper = imcref.getTemplateMapper();
+        if (req.getParameter("cancel") != null) {
+            res.sendRedirect("AdminManager");
+            return;
+        } else if (req.getParameter("add_group") != null) {
+            htmlStr = createAddGroupDialog(imcref, user);
+        } else if (req.getParameter("delete_group") != null) {
+            htmlStr = createDeleteTemplateGroupDialog(templateMapper, imcref, user);
+        } else if (req.getParameter("rename_group") != null) {
+            htmlStr = createRenameTemplateGroupDialog(templateMapper, imcref, user);
+        } else if (req.getParameter("assign_group") != null) {
+            htmlStr = createAssignTemplateGroupDialog(lang, templateMapper, user, imcref);
+        } else if (req.getParameter("show_templates") != null) {
+            htmlStr = createListTemplatesDialog(templateMapper, user, lang, imcref);
+        }
+        out.print(htmlStr);
+    }
+
+    private String createListTemplatesDialog(TemplateMapper templateMapper, UserDomainObject user, String lang,
+                                             ImcmsServices imcref) {
+        String templateList = templateMapper.createHtmlOptionListOfTemplatesWithDocumentCount(user);
+        List vec = new ArrayList();
+        vec.add("#template_list#");
+        vec.add(templateList);
+        vec.add("#language#");
+        vec.add(lang);
+        return imcref.getAdminTemplate("template_list.html", user, vec);
+    }
+
+    private String createAssignTemplateGroupDialog(String lang, TemplateMapper templateMapper,
+                                                   UserDomainObject user, ImcmsServices imcref) throws IOException {
+        return createAssignTemplatesToGroupDialog(templateMapper, null, lang, user, imcref);
+    }
+
+    private String createEditTemplateDialog(String lang, ImcmsServices imcref, TemplateMapper templateMapper,
+                                            UserDomainObject user) throws IOException {
+        List vec = new ArrayList();
+        vec.add("#language#");
+        vec.add(lang);
+        List<TemplateDomainObject> templates = imcref.getTemplateMapper().getAllTemplates();
+        String temps = templateMapper.createHtmlOptionListOfTemplates(templates, null);
+        vec.add("#templates#");
+        vec.add(temps);
+        return imcref.getAdminTemplate(ADMIN_TEMPLATE_EDIT, user, vec);
+    }
+
+    private String createDownloadTemplateDialog(String lang, ImcmsServices imcref,
+                                                TemplateMapper templateMapper, UserDomainObject user) throws IOException {
+        List vec = new ArrayList();
+        vec.add("#language#");
+        vec.add(lang);
+        List<TemplateDomainObject> templates = imcref.getTemplateMapper().getAllTemplates();
+        String temps = templateMapper.createHtmlOptionListOfTemplates(templates, null);
+        vec.add("#templates#");
+        vec.add(temps);
+        return imcref.getAdminTemplate("template_get.html", user, vec);
+    }
+
+    private String createUploadDemoTemplateDialog(String lang, TemplateMapper templateMapper,
+                                                  ImcmsServices imcref, UserDomainObject user) throws IOException {
+        List vec = new ArrayList();
+        vec.add("#language#");
+        vec.add(lang);
+        List<TemplateDomainObject> templates = templateMapper.getAllTemplates();
+        String temps = templateMapper.createHtmlOptionListOfTemplates(templates, null);
+        vec.add("#templates#");
+        vec.add(temps);
+        return imcref.getAdminTemplate(TEMPLATE_DEMO_UPLOAD, user, vec);
+    }
+
+    private String createUploadTemplateDialog(TemplateMapper templateMapper, String lang, ImcmsServices imcref,
+                                              UserDomainObject user) {
+        List vec = new ArrayList();
+        String temps = templateMapper.createHtmlOptionListOfTemplateGroups(null);
+        vec.add("#templategroups#");
+        vec.add(temps);
+        vec.add("#language#");
+        vec.add(lang);
+        return imcref.getAdminTemplate(TEMPLATE_UPLOAD, user, vec);
+    }
 }
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/TemplateChange.java b/server/src/com/imcode/imcms/servlet/superadmin/TemplateChange.java
index cde594464d..6689cc9960 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/TemplateChange.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/TemplateChange.java
@@ -1,5 +1,6 @@
 package com.imcode.imcms.servlet.superadmin;
 
+import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.document.DocumentDomainObject;
@@ -7,7 +8,6 @@
 import imcode.server.document.TemplateGroupDomainObject;
 import imcode.server.document.TemplateMapper;
 import imcode.server.user.UserDomainObject;
-import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.util.Utility;
 
 import javax.servlet.ServletException;
@@ -32,7 +32,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
 
         ImcmsServices imcref = Imcms.getServices();
         UserDomainObject user = Utility.getLoggedOnUser(request);
-        if ( !user.isSuperAdmin() ) {
+        if (!user.isSuperAdmin()) {
             Utility.redirectToStartDocument(request, response);
             return;
         }
@@ -42,59 +42,48 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
         TemplateMapper templateMapper = imcref.getTemplateMapper();
         String htmlStr = null;
         String lang = request.getParameter("language");
-        if ( request.getParameter("cancel") != null ) {
+        if (request.getParameter("cancel") != null) {
             response.sendRedirect("TemplateAdmin");
-        } else if ( request.getParameter("template_get") != null ) {
-            downloadTemplate(request, imcref, response);
-        } else if ( request.getParameter("template_delete_cancel") != null ) {
-            htmlStr = TemplateAdmin.createDeleteTemplateDialog(templateMapper, user, lang, imcref);
-        } else if ( request.getParameter("template_delete") != null ) {
-            deleteTemplate(request, imcref);
-            htmlStr = TemplateAdmin.createDeleteTemplateDialog(templateMapper, user, lang, imcref);
-        } else if ( request.getParameter("assign") != null ) {
+        } else if (request.getParameter("assign") != null) {
             htmlStr = addTemplatesToGroup(request, templateMapper, lang, user, imcref);
-        } else if ( request.getParameter("deassign") != null ) {
+        } else if (request.getParameter("deassign") != null) {
             htmlStr = removeTemplatesFromGroup(request, templateMapper, lang, user, imcref);
-        } else if ( request.getParameter("show_assigned") != null ) {
+        } else if (request.getParameter("show_assigned") != null) {
             int templateGroupId = Integer.parseInt(request.getParameter("templategroup"));
             TemplateGroupDomainObject templateGroup = templateMapper.getTemplateGroupById(templateGroupId);
             htmlStr =
                     TemplateAdmin.createAssignTemplatesToGroupDialog(templateMapper, templateGroup, lang, user,
-                                                                     imcref);
-        } else if ( request.getParameter("template_rename") != null ) {
-            htmlStr = renameTemplate(request, templateMapper, lang, imcref, user);
-        } else if ( request.getParameter("template_delete_check") != null ) {
-            htmlStr = deleteTemplateAfterCheckingUsage(request, imcref, lang, user);
-        } else if ( request.getParameter("group_delete_check") != null ) {
+                            imcref);
+        } else if (request.getParameter("group_delete_check") != null) {
             htmlStr = deleteTemplateGroupAfterCheckingUsage(request, imcref, user);
-        } else if ( request.getParameter("group_delete") != null ) {
+        } else if (request.getParameter("group_delete") != null) {
             deleteTemplateGroup(request, imcref);
             htmlStr = TemplateAdmin.createDeleteTemplateGroupDialog(templateMapper, imcref, user);
-        } else if ( request.getParameter("group_delete_cancel") != null ) {
+        } else if (request.getParameter("group_delete_cancel") != null) {
             htmlStr = TemplateAdmin.createDeleteTemplateGroupDialog(templateMapper, imcref, user);
-        } else if ( request.getParameter("group_add") != null ) {
+        } else if (request.getParameter("group_add") != null) {
             htmlStr = addTemplateGroup(request, imcref, user);
-        } else if ( request.getParameter("group_rename") != null ) {
+        } else if (request.getParameter("group_rename") != null) {
             htmlStr = renameTemplateGroup(request, imcref, user, lang);
-        } else if ( request.getParameter("list_templates_docs") != null ) {
+        } else if (request.getParameter("list_templates_docs") != null) {
             htmlStr = listDocumentsUsingTemplate(request, imcref, lang, user);
-        } else if ( request.getParameter("show_doc") != null ) {
+        } else if (request.getParameter("show_doc") != null) {
             htmlStr = showDocument(request, response, imcref, lang, user);
         }
 
-        if ( null != htmlStr ) {
-            response.getOutputStream().print(htmlStr);
+        if (null != htmlStr) {
+            response.getOutputStream().write(htmlStr.getBytes(Imcms.DEFAULT_ENCODING));
         }
     }
 
     private String addTemplateGroup(HttpServletRequest req, ImcmsServices imcref, UserDomainObject user) {
         String htmlStr;
         String name = req.getParameter("name");
-        if ( name == null || "".equals(name) ) {
+        if (name == null || "".equals(name)) {
             htmlStr = createAddNameEmptyErrorDialog(imcref, user);
         } else {
             TemplateGroupDomainObject templateGroup = imcref.getTemplateMapper().getTemplateGroupByName(name);
-            if ( null != templateGroup ) {
+            if (null != templateGroup) {
                 htmlStr = createTemplateGroupExistsErrorDialog(imcref, user);
             } else {
                 imcref.getTemplateMapper().createTemplateGroup(name);
@@ -109,10 +98,10 @@ private String addTemplatesToGroup(HttpServletRequest req, TemplateMapper templa
         String groupIdParameter = req.getParameter("group_id");
         String[] templateNames = req.getParameterValues("unassigned");
         TemplateGroupDomainObject templateGroup = null;
-        if ( null != groupIdParameter && null != templateNames ) {
+        if (null != groupIdParameter && null != templateNames) {
             int grp_id = Integer.parseInt(groupIdParameter);
             templateGroup = templateMapper.getTemplateGroupById(grp_id);
-            for ( String templateName : templateNames ) {
+            for (String templateName : templateNames) {
                 TemplateDomainObject templateToAssign = templateMapper.getTemplateByName(templateName);
                 templateMapper.addTemplateToGroup(templateToAssign, templateGroup);
             }
@@ -125,8 +114,8 @@ private String removeTemplatesFromGroup(HttpServletRequest req, TemplateMapper t
         String groupIdParameter = req.getParameter("group_id");
         String[] templateIds = req.getParameterValues("assigned");
         TemplateGroupDomainObject templateGroup = templateMapper.getTemplateGroupById(Integer.parseInt(groupIdParameter));
-        if ( null != templateGroup && null != templateIds ) {
-            for ( String templateName : templateIds ) {
+        if (null != templateGroup && null != templateIds) {
+            for (String templateName : templateIds) {
                 TemplateDomainObject templateToUnassign = templateMapper.getTemplateByName(templateName);
                 templateMapper.removeTemplateFromGroup(templateToUnassign, templateGroup);
             }
@@ -143,7 +132,7 @@ private String createDocumentsUsingTemplateDialog(ImcmsServices imcref, UserDoma
         List vec2 = new ArrayList();
         vec2.add("#template_list#");
         vec2.add(imcref.getTemplateMapper().createHtmlOptionListOfTemplatesWithDocumentCount(user));
-        if ( template != null ) {
+        if (template != null) {
             vec2.add("#templates_docs#");
             vec2.add(TemplateAdmin.createHtmlOptionListOfDocumentsUsingTemplate(imcref, template, user));
         }
@@ -181,7 +170,7 @@ private String deleteTemplateAfterCheckingUsage(HttpServletRequest req, ImcmsSer
         String template_id = req.getParameter("template");
         TemplateDomainObject template = templateMapper.getTemplateByName(template_id);
         DocumentDomainObject[] documentsUsingTemplate = templateMapper.getDocumentsUsingTemplate(template);
-        if ( documentsUsingTemplate.length > 0 ) {
+        if (documentsUsingTemplate.length > 0) {
             htmlStr = TemplateAdmin.createDeleteTemplateInUseWarningDialog(lang, imcref, template, user, templateMapper);
         } else {
             templateMapper.deleteTemplate(template);
@@ -202,16 +191,16 @@ private String deleteTemplateGroupAfterCheckingUsage(HttpServletRequest req, Imc
         TemplateGroupDomainObject templateGroup = templateMapper.getTemplateGroupById(templateGroupId);
         List<TemplateDomainObject> templatesInGroup = templateMapper.getTemplatesInGroup(templateGroup);
         boolean existsDocumentUsingTemplateInTemplateGroup = false;
-        for ( TemplateDomainObject aTemplatesInGroup : templatesInGroup ) {
-            if ( templateMapper.getDocumentsUsingTemplate(aTemplatesInGroup).length > 0 ) {
+        for (TemplateDomainObject aTemplatesInGroup : templatesInGroup) {
+            if (templateMapper.getDocumentsUsingTemplate(aTemplatesInGroup).length > 0) {
                 existsDocumentUsingTemplateInTemplateGroup = true;
             }
         }
         String htmlStr;
 
-        if ( templatesInGroup.size() > 0 ) {
+        if (templatesInGroup.size() > 0) {
             htmlStr = TemplateAdmin.createDeleteNonEmptyTemplateGroupWarningDialog(templatesInGroup, templateGroupId, imcref, user);
-            if ( existsDocumentUsingTemplateInTemplateGroup ) {
+            if (existsDocumentUsingTemplateInTemplateGroup) {
                 htmlStr = TemplateAdmin.createDocumentsAssignedToTemplateInTemplateGroupWarningDialog(templatesInGroup, templateGroupId, imcref, user);
             }
         } else {
@@ -226,10 +215,10 @@ private void downloadTemplate(HttpServletRequest req, ImcmsServices imcref, Http
         String template_id = req.getParameter("template");
         TemplateMapper templateMapper = imcref.getTemplateMapper();
         String filename = templateMapper.getTemplateByName(template_id).getFileName();
-        if ( filename == null ) {
+        if (filename == null) {
             filename = "";
         }
-        byte[] file = templateMapper.getTemplateData(template_id).getBytes();
+        byte[] file = templateMapper.getTemplateData(template_id).getBytes(Imcms.DEFAULT_ENCODING);
         res.setContentType("application/octet-stream; name=\"" + filename + "\"");
         res.setContentLength(file.length);
         res.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\";");
@@ -251,11 +240,11 @@ private String renameTemplate(HttpServletRequest req, TemplateMapper templateMap
         String template_id = req.getParameter("template");
         TemplateDomainObject template = templateMapper.getTemplateByName(template_id);
         String newNameForTemplate = req.getParameter("name");
-        if ( newNameForTemplate == null || "".equals(newNameForTemplate) ) {
+        if (newNameForTemplate == null || "".equals(newNameForTemplate)) {
             htmlStr = createRenameNameEmptyErrorDialog(lang, imcref, user);
         } else {
             LocalizedMessage error = null;
-            if ( !templateMapper.renameTemplate(template.getName(), newNameForTemplate) ) {
+            if (!templateMapper.renameTemplate(template.getName(), newNameForTemplate)) {
                 error = ERROR__TEMPLATE_NAME_TAKEN;
             }
             htmlStr = TemplateAdmin.createRenameTemplateDialog(lang, imcref, templateMapper, user, error);
@@ -268,7 +257,7 @@ private String renameTemplateGroup(HttpServletRequest req, ImcmsServices imcref,
         String htmlStr;
         int grp_id = Integer.parseInt(req.getParameter("templategroup"));
         String name = req.getParameter("name");
-        if ( name == null || "".equals(name) ) {
+        if (name == null || "".equals(name)) {
             htmlStr = createRenameNameEmptyErrorDialog(lang, imcref, user);
         } else {
             TemplateMapper templateMapper = imcref.getTemplateMapper();
@@ -283,7 +272,7 @@ private String showDocument(HttpServletRequest req, HttpServletResponse res, Imc
                                 String lang, UserDomainObject user) throws IOException {
         String meta_id = req.getParameter("templates_doc");
         String htmlStr = null;
-        if ( meta_id != null ) {
+        if (meta_id != null) {
             res.sendRedirect("AdminDoc?meta_id=" + meta_id);
         } else {
             htmlStr = createDocumentsUsingTemplateDialog(imcref, user, null, lang);
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/UpdateDocumentExportStatusServlet.java b/server/src/com/imcode/imcms/servlet/superadmin/UpdateDocumentExportStatusServlet.java
new file mode 100644
index 0000000000..3c04be8753
--- /dev/null
+++ b/server/src/com/imcode/imcms/servlet/superadmin/UpdateDocumentExportStatusServlet.java
@@ -0,0 +1,39 @@
+package com.imcode.imcms.servlet.superadmin;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import imcode.server.Imcms;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import lombok.extern.log4j.Log4j2;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Properties;
+
+@Log4j2
+public class UpdateDocumentExportStatusServlet extends HttpServlet {
+
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		final UserDomainObject user = Utility.getLoggedOnUser(req);
+
+		if (!user.isSuperAdmin()) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN);
+			return;
+		}
+
+		final ObjectMapper mapper = new ObjectMapper();
+		final Properties properties = mapper.readValue(req.getInputStream(), Properties.class);
+
+		Imcms.getServices().getDocumentMapper()
+				.updateExportStatus(
+						Integer.parseInt(String.valueOf(properties.get("docId"))),
+						Boolean.parseBoolean(String.valueOf(properties.get("allowedToExport"))),
+						Utility.getLoggedOnUser(req));
+
+		resp.sendError(HttpServletResponse.SC_OK);
+	}
+}
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/UserEditorPage.java b/server/src/com/imcode/imcms/servlet/superadmin/UserEditorPage.java
index 0e3a51a3fa..a5d34e7a8d 100644
--- a/server/src/com/imcode/imcms/servlet/superadmin/UserEditorPage.java
+++ b/server/src/com/imcode/imcms/servlet/superadmin/UserEditorPage.java
@@ -1,17 +1,12 @@
 package com.imcode.imcms.servlet.superadmin;
 
-import com.imcode.imcms.api.NoPermissionException;
 import com.imcode.imcms.flow.DispatchCommand;
 import com.imcode.imcms.flow.OkCancelPage;
-import com.imcode.imcms.util.l10n.LocalizedMessage;
 import com.imcode.imcms.mapping.NoPermissionInternalException;
+import com.imcode.imcms.util.l10n.LocalizedMessage;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
-import imcode.server.user.PhoneNumber;
-import imcode.server.user.PhoneNumberType;
-import imcode.server.user.RoleDomainObject;
-import imcode.server.user.RoleId;
-import imcode.server.user.UserDomainObject;
+import imcode.server.user.*;
 import imcode.util.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
@@ -28,6 +23,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.imcode.imcms.domain.services.core.TwoFactorAuthService.REQUEST_PARAMETER_2FA;
+import static com.imcode.imcms.domain.services.core.TwoFactorAuthService.USER_2FA_DISABLED_PROPERTY;
+
 public class UserEditorPage extends OkCancelPage {
     public static final String REQUEST_PARAMETER__LOGIN_NAME = "login_name";
     public static final String REQUEST_PARAMETER__PASSWORD1 = "password1";
@@ -59,19 +57,35 @@ public class UserEditorPage extends OkCancelPage {
     private static final LocalizedMessage ERROR__PASSWORD_LENGTH = new LocalizedMessage("error/password_length");
     private static final LocalizedMessage ERROR__PASSWORD_TOO_WEAK = new LocalizedMessage("error/password_too_weak");
     private static final LocalizedMessage ERROR__EDITED_USER_MUST_HAVE_AT_LEAST_ONE_ROLE = new LocalizedMessage("error/user_must_have_at_least_one_role");
-
+    private static final int MAXIMUM_PASSWORD_LENGTH = 250;
+    private static final int MINIMUM_PASSWORD_LENGTH = 4;
     private UserDomainObject editedUser;
     private UserDomainObject uneditedUser;
     private PhoneNumber currentPhoneNumber = new PhoneNumber("", PhoneNumberType.OTHER);
     private LocalizedMessage errorMessage;
-    private static final int MAXIMUM_PASSWORD_LENGTH = 15;
-    private static final int MINIMUM_PASSWORD_LENGTH = 4;
 
     public UserEditorPage(UserDomainObject user, DispatchCommand okDispatchCommand,
                           DispatchCommand cancelDispatchCommand) {
         super(okDispatchCommand, cancelDispatchCommand);
         editedUser = user;
-        uneditedUser = (UserDomainObject) user.clone() ;
+        uneditedUser = (UserDomainObject) user.clone();
+    }
+
+    /**
+     * @param login
+     * @param password
+     * @param passwordCheck
+     * @return
+     * @since 4.0.7
+     */
+    public static LocalizedMessage validatePassword(String login, String password, String passwordCheck) {
+        return StringUtils.isBlank(password)
+                ? ERROR__PASSWORD_LENGTH
+                : !password.equals(passwordCheck)
+                ? ERROR__PASSWORDS_DID_NOT_MATCH
+                : login.equalsIgnoreCase(password)
+                ? ERROR__PASSWORD_TOO_WEAK
+                : null;
     }
 
     protected void updateFromRequest(HttpServletRequest request) {
@@ -94,6 +108,8 @@ private void updateUserFromRequest(HttpServletRequest request) {
         editedUser.setLanguageIso639_2(request.getParameter(REQUEST_PARAMETER__LANGUAGE));
         editedUser.setActive(null != request.getParameter(REQUEST_PARAMETER__ACTIVE));
 
+        editedUser.getProperties()
+                .put(USER_2FA_DISABLED_PROPERTY, String.valueOf(null != request.getParameter(REQUEST_PARAMETER_2FA)));
         updateUserPasswordFromRequest(editedUser, request);
 
         updateUserRolesFromRequest(request);
@@ -101,10 +117,10 @@ private void updateUserFromRequest(HttpServletRequest request) {
     }
 
     private void updateUserAdminRolesFromRequest(HttpServletRequest request) {
-        if ( Utility.getLoggedOnUser(request).isSuperAdmin() && editedUser.isUserAdmin() ) {
+        if (Utility.getLoggedOnUser(request).isSuperAdmin() && editedUser.isUserAdmin()) {
             editedUser.setUserAdminRolesIds(getRoleIdsFromRequestParameterValues(request, REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS));
-            editedUser.removeUserAdminRoleId(RoleId.SUPERADMIN) ;
-            editedUser.removeUserAdminRoleId(RoleId.USERADMIN) ;
+            editedUser.removeUserAdminRoleId(RoleId.SUPERADMIN);
+            editedUser.removeUserAdminRoleId(RoleId.USERADMIN);
         }
     }
 
@@ -116,8 +132,8 @@ private RoleId[] getRoleIdsFromRequestParameterValues(HttpServletRequest request
     private Set getRoleIdsSetFromRequestParameterValues(HttpServletRequest request, String requestParameter) {
         Set roleIds = new HashSet();
         String[] roleIdStrings = request.getParameterValues(requestParameter);
-        if ( null != roleIdStrings ) {
-            for ( int i = 0; i < roleIdStrings.length; i++ ) {
+        if (null != roleIdStrings) {
+            for (int i = 0; i < roleIdStrings.length; i++) {
                 RoleId roleId = new RoleId(Integer.parseInt(roleIdStrings[i]));
                 roleIds.add(roleId);
             }
@@ -126,21 +142,21 @@ private Set getRoleIdsSetFromRequestParameterValues(HttpServletRequest request,
     }
 
     private ImcmsServices getImcmsServices() {
-        return Imcms.getServices() ;
+        return Imcms.getServices();
     }
 
     private void updateUserRolesFromRequest(HttpServletRequest request) {
         UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
-        if ( loggedOnUser.canEditRolesFor(uneditedUser) ) {
+        if (loggedOnUser.canEditRolesFor(uneditedUser)) {
             Set roleIdsSetFromRequest = getRoleIdsSetFromRequestParameterValues(request, REQUEST_PARAMETER__ROLE_IDS);
-            RoleId[] userRoleIdsArray ;
+            RoleId[] userRoleIdsArray;
             if (loggedOnUser.isUserAdminAndNotSuperAdmin()) {
                 List userAdminRoleIds = Arrays.asList(loggedOnUser.getUserAdminRoleIds());
-                roleIdsSetFromRequest.retainAll(userAdminRoleIds) ;
+                roleIdsSetFromRequest.retainAll(userAdminRoleIds);
 
-                Set userRoleIds = new HashSet(Arrays.asList(editedUser.getRoleIds())) ;
-                userRoleIds.removeAll(userAdminRoleIds) ;
-                userRoleIds.addAll(roleIdsSetFromRequest) ;
+                Set userRoleIds = new HashSet(Arrays.asList(editedUser.getRoleIds()));
+                userRoleIds.removeAll(userAdminRoleIds);
+                userRoleIds.addAll(roleIdsSetFromRequest);
                 userRoleIdsArray = (RoleId[]) userRoleIds.toArray(new RoleId[userRoleIds.size()]);
             } else {
                 userRoleIdsArray = (RoleId[]) roleIdsSetFromRequest.toArray(new RoleId[roleIdsSetFromRequest.size()]);
@@ -151,13 +167,13 @@ private void updateUserRolesFromRequest(HttpServletRequest request) {
 
     private void updateUserPasswordFromRequest(UserDomainObject user, HttpServletRequest request) {
         String password1 = getPassword1FromRequest(request);
-        if ( StringUtils.isNotBlank(password1) ) {
-            if ( !passwordPassesLengthRequirements(password1) ) {
+        if (StringUtils.isNotBlank(password1)) {
+            if (!passwordPassesLengthRequirements(password1)) {
                 errorMessage = ERROR__PASSWORD_LENGTH;
-            } else if ( !passwordsMatch(request) ) {
+            } else if (!passwordsMatch(request)) {
                 errorMessage = ERROR__PASSWORDS_DID_NOT_MATCH;
-            } else if ( !user.isDefaultUser() && password1.equalsIgnoreCase(user.getLoginName()) ) {
-                errorMessage = ERROR__PASSWORD_TOO_WEAK ;
+            } else if (!user.isDefaultUser() && password1.equalsIgnoreCase(user.getLoginName())) {
+                errorMessage = ERROR__PASSWORD_TOO_WEAK;
             } else {
                 user.setPassword(password1);
             }
@@ -166,7 +182,7 @@ private void updateUserPasswordFromRequest(UserDomainObject user, HttpServletReq
 
     private boolean passwordPassesLengthRequirements(String password1) {
         return password1.length() >= MINIMUM_PASSWORD_LENGTH
-               && password1.length() <= MAXIMUM_PASSWORD_LENGTH;
+                && password1.length() <= MAXIMUM_PASSWORD_LENGTH;
     }
 
     public String getPath(HttpServletRequest request) {
@@ -179,19 +195,19 @@ protected void dispatchOther(HttpServletRequest request,
         PhoneNumber editedPhoneNumber = getEditedPhoneNumberFromRequest(request);
         PhoneNumber selectedPhoneNumber = getSelectedPhoneNumberFromRequest(request);
 
-        if ( null != request.getParameter(REQUEST_PARAMETER__ADD_PHONE_NUMBER) && null != editedPhoneNumber ) {
-            if ( !editedPhoneNumber.equals(currentPhoneNumber) ) {
+        if (null != request.getParameter(REQUEST_PARAMETER__ADD_PHONE_NUMBER) && null != editedPhoneNumber) {
+            if (!editedPhoneNumber.equals(currentPhoneNumber)) {
                 editedUser.removePhoneNumber(currentPhoneNumber);
             }
             editedUser.removePhoneNumber(editedPhoneNumber);
             editedUser.addPhoneNumber(editedPhoneNumber);
             currentPhoneNumber = new PhoneNumber("", PhoneNumberType.OTHER);
-        } else if ( null != request.getParameter(REQUEST_PARAMETER__REMOVE_PHONE_NUMBER)
-                    && null != selectedPhoneNumber ) {
+        } else if (null != request.getParameter(REQUEST_PARAMETER__REMOVE_PHONE_NUMBER)
+                && null != selectedPhoneNumber) {
             editedUser.removePhoneNumber(selectedPhoneNumber);
             currentPhoneNumber = selectedPhoneNumber;
-        } else if ( null != request.getParameter(REQUEST_PARAMETER__EDIT_PHONE_NUMBER)
-                    && null != selectedPhoneNumber ) {
+        } else if (null != request.getParameter(REQUEST_PARAMETER__EDIT_PHONE_NUMBER)
+                && null != selectedPhoneNumber) {
             currentPhoneNumber = selectedPhoneNumber;
         }
         forward(request, response);
@@ -199,15 +215,15 @@ protected void dispatchOther(HttpServletRequest request,
 
     protected void dispatchOk(HttpServletRequest request,
                               HttpServletResponse response) throws IOException, ServletException {
-        if ( null == errorMessage ) {
-            if ( StringUtils.isBlank(editedUser.getPassword()) ) {
+        if (null == errorMessage) {
+            if (StringUtils.isBlank(editedUser.getPassword())) {
                 errorMessage = ERROR__PASSWORD_LENGTH;
             } else {
                 boolean editedUserHasOnlyTheUsersRole = 1 == editedUser.getRoleIds().length;
                 UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
                 if (editedUserHasOnlyTheUsersRole || loggedOnUser.isUserAdminAndNotSuperAdmin()
-                                                     && !loggedOnUser.canEditRolesAccordingToUserAdminRoles(editedUser) ) {
-                    errorMessage = ERROR__EDITED_USER_MUST_HAVE_AT_LEAST_ONE_ROLE ;
+                        && !loggedOnUser.canEditRolesAccordingToUserAdminRoles(editedUser)) {
+                    errorMessage = ERROR__EDITED_USER_MUST_HAVE_AT_LEAST_ONE_ROLE;
                 } else {
                     super.dispatchOk(request, response);
                     return;
@@ -230,7 +246,7 @@ private String getPassword1FromRequest(HttpServletRequest request) {
     private PhoneNumber getEditedPhoneNumberFromRequest(HttpServletRequest request) {
         PhoneNumber editedPhoneNumber = null;
         String editedPhoneNumberString = request.getParameter(REQUEST_PARAMETER__EDITED_PHONE_NUMBER);
-        if ( StringUtils.isNotBlank(editedPhoneNumberString) ) {
+        if (StringUtils.isNotBlank(editedPhoneNumberString)) {
             int editedPhoneNumberTypeId = Integer.parseInt(request.getParameter(REQUEST_PARAMETER__PHONE_NUMBER_TYPE_ID));
             PhoneNumberType editedPhoneNumberType = PhoneNumberType.getPhoneNumberTypeById(editedPhoneNumberTypeId);
             editedPhoneNumber = new PhoneNumber(editedPhoneNumberString, editedPhoneNumberType);
@@ -241,9 +257,9 @@ private PhoneNumber getEditedPhoneNumberFromRequest(HttpServletRequest request)
     private PhoneNumber getSelectedPhoneNumberFromRequest(HttpServletRequest request) {
         PhoneNumber selectedPhoneNumber = null;
         String selectedPhoneNumberString = request.getParameter(REQUEST_PARAMETER__SELECTED_PHONE_NUMBER);
-        if ( StringUtils.isNotBlank(selectedPhoneNumberString) ) {
+        if (StringUtils.isNotBlank(selectedPhoneNumberString)) {
             Matcher matcher = Pattern.compile("(\\d+) (.*)").matcher(selectedPhoneNumberString);
-            if ( matcher.matches() ) {
+            if (matcher.matches()) {
                 int selectedPhoneNumberTypeId = Integer.parseInt(matcher.group(1));
                 PhoneNumberType selectedPhoneNumberType = PhoneNumberType.getPhoneNumberTypeById(selectedPhoneNumberTypeId);
                 selectedPhoneNumber = new PhoneNumber(matcher.group(2), selectedPhoneNumberType);
@@ -265,7 +281,7 @@ public String createPhoneTypesHtmlOptionList(final UserDomainObject loggedOnUser
         return Html.createOptionList(Arrays.asList(PhoneNumberType.getAllPhoneNumberTypes()), selectedType, new ToStringPairTransformer() {
             public String[] transformToStringPair(Object object) {
                 PhoneNumberType phoneType = (PhoneNumberType) object;
-                return new String[] { "" + phoneType.getId(), phoneType.getName().toLocalizedString(loggedOnUser) };
+                return new String[]{"" + phoneType.getId(), phoneType.getName().toLocalizedString(loggedOnUser)};
             }
         });
     }
@@ -279,10 +295,10 @@ public String getUserPhoneNumbersHtmlOptionList(final HttpServletRequest request
         return Html.createOptionList(phoneNumbers, currentPhoneNumber, new ToStringPairTransformer() {
             protected String[] transformToStringPair(Object object) {
                 PhoneNumber phoneNumber = (PhoneNumber) object;
-                return new String[] { phoneNumber.getType().getId() + " " + phoneNumber.getNumber(), "("
-                                                                                                     + phoneNumber.getType().getName().toLocalizedString(request)
-                                                                                                     + ") "
-                                                                                                     + phoneNumber.getNumber() };
+                return new String[]{phoneNumber.getType().getId() + " " + phoneNumber.getNumber(), "("
+                        + phoneNumber.getType().getName().toLocalizedString(request)
+                        + ") "
+                        + phoneNumber.getNumber()};
             }
         });
     }
@@ -291,8 +307,12 @@ public LocalizedMessage getErrorMessage() {
         return errorMessage;
     }
 
+    public void setErrorMessage(LocalizedMessage errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
     public String createRolesHtmlOptionList(HttpServletRequest request) {
-        UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request) ;
+        UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
         RoleDomainObject[] roles = loggedOnUser.isUserAdminAndNotSuperAdmin() ? getRoles(loggedOnUser.getUserAdminRoleIds()) : getAllRolesExceptUsersRole();
         RoleDomainObject[] usersRoles = getRoles(editedUser.getRoleIds());
         return createRolesHtmlOptionList(roles, usersRoles);
@@ -300,10 +320,10 @@ public String createRolesHtmlOptionList(HttpServletRequest request) {
 
     private RoleDomainObject[] getRoles(RoleId[] roleIds) {
         RoleDomainObject[] roles = new RoleDomainObject[roleIds.length];
-        for ( int i = 0; i < roleIds.length; i++ ) {
-            roles[i] = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().getRole(roleIds[i]) ;
+        for (int i = 0; i < roleIds.length; i++) {
+            roles[i] = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper().getRole(roleIds[i]);
         }
-        return roles ;
+        return roles;
     }
 
     private String createRolesHtmlOptionList(RoleDomainObject[] allRoles, RoleDomainObject[] usersRoles) {
@@ -312,11 +332,11 @@ private String createRolesHtmlOptionList(RoleDomainObject[] allRoles, RoleDomain
 
     public String createUserAdminRolesHtmlOptionList() {
         RoleDomainObject[] allRoles = getAllRolesExceptUsersRole();
-        Set allRolesSet = new HashSet(Arrays.asList(allRoles)) ;
+        Set allRolesSet = new HashSet(Arrays.asList(allRoles));
         CollectionUtils.filter(allRolesSet, new Predicate() {
             public boolean evaluate(Object o) {
-                RoleId roleId = ( (RoleDomainObject) o ).getId();
-                return !(roleId.equals(RoleId.SUPERADMIN) || roleId.equals(RoleId.USERADMIN)) ; 
+                RoleId roleId = ((RoleDomainObject) o).getId();
+                return !(roleId.equals(RoleId.SUPERADMIN) || roleId.equals(RoleId.USERADMIN));
             }
         });
         RoleDomainObject[] allUserAdminRoles = (RoleDomainObject[]) allRolesSet.toArray(new RoleDomainObject[allRolesSet.size()]);
@@ -331,10 +351,6 @@ private RoleDomainObject[] getAllRolesExceptUsersRole() {
         return allRoles;
     }
 
-    public void setErrorMessage(LocalizedMessage errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
     public void setOkCommand(DispatchCommand okCommand) {
         this.okCommand = okCommand;
     }
@@ -343,19 +359,19 @@ public UserDomainObject getUneditedUser() {
         return uneditedUser;
     }
 
-    public static class RoleToStringPairTransformer extends ToStringPairTransformer {
-        protected String[] transformToStringPair(Object object) {
-            RoleDomainObject role = (RoleDomainObject) object;
-            return new String[] { "" + role.getId(), role.getName() };
-        }
-    }
-
     public void forward(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
         if (!uneditedUser.isNew() && !loggedOnUser.canEdit(uneditedUser)) {
-            throw new ShouldHaveCheckedPermissionsEarlierException(new NoPermissionInternalException("User "+loggedOnUser+" does not have the permission to edit "+editedUser));
+            throw new ShouldHaveCheckedPermissionsEarlierException(new NoPermissionInternalException("User " + loggedOnUser + " does not have the permission to edit " + editedUser));
         }
 
         super.forward(request, response);
     }
+
+    public static class RoleToStringPairTransformer extends ToStringPairTransformer {
+        protected String[] transformToStringPair(Object object) {
+            RoleDomainObject role = (RoleDomainObject) object;
+            return new String[]{"" + role.getId(), role.getName()};
+        }
+    }
 }
diff --git a/server/src/com/imcode/imcms/servlet/tags/AdminTag.java b/server/src/com/imcode/imcms/servlet/tags/AdminTag.java
index 1268c3af50..12a0289c52 100644
--- a/server/src/com/imcode/imcms/servlet/tags/AdminTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/AdminTag.java
@@ -20,14 +20,14 @@ public int doStartTag() throws JspException {
             UserDomainObject user = Utility.getLoggedOnUser((HttpServletRequest) pageContext.getRequest());
             HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
             ParserParameters parserParameters = ParserParameters.fromRequest(request);
-            if ( parserParameters.getFlags() >= 0 && parserParameters.isAdminButtonsVisible() ) {
+            if (parserParameters.getFlags() >= 0 && parserParameters.isAdminButtonsVisible()) {
                 TextDocumentDomainObject document = (TextDocumentDomainObject) parserParameters.getDocumentRequest().getDocument();
                 HttpServletResponse response = (HttpServletResponse) pageContext.getResponse();
                 String adminButtons = Html.getAdminButtons(user, document, request, response);
                 pageContext.getOut().print(adminButtons);
                 pageContext.getOut().print(TextDocumentParser.createChangeTemplateUi(parserParameters.isTemplateMode(), user, document, Imcms.getServices()));
             }
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             throw new JspException(e);
         }
         return SKIP_BODY;
diff --git a/server/src/com/imcode/imcms/servlet/tags/ContextPathTag.java b/server/src/com/imcode/imcms/servlet/tags/ContextPathTag.java
index 6eff7607fc..2b18b12c35 100644
--- a/server/src/com/imcode/imcms/servlet/tags/ContextPathTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/ContextPathTag.java
@@ -8,8 +8,8 @@ public class ContextPathTag extends TagSupport {
 
     public int doStartTag() throws JspException {
         try {
-            pageContext.getOut().print((( HttpServletRequest)pageContext.getRequest()).getContextPath());
-        } catch ( Exception e ) {
+            pageContext.getOut().print(((HttpServletRequest) pageContext.getRequest()).getContextPath());
+        } catch (Exception e) {
             throw new JspException(e);
         }
         return SKIP_BODY;
diff --git a/server/src/com/imcode/imcms/servlet/tags/ImageTag.java b/server/src/com/imcode/imcms/servlet/tags/ImageTag.java
index 504ffff20d..1052c8238c 100644
--- a/server/src/com/imcode/imcms/servlet/tags/ImageTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/ImageTag.java
@@ -9,26 +9,31 @@ protected String getContent(TagParser tagParser) {
     }
 
     public void setMode(String mode) {
-        attributes.setProperty("mode", mode) ;
+        attributes.setProperty("mode", mode);
     }
 
     public void setStyle(String style) {
-        attributes.setProperty("style", style) ;
+        attributes.setProperty("style", style);
     }
 
     public void setStyleClass(String styleClass) {
-        attributes.setProperty("class", styleClass) ;
+        attributes.setProperty("class", styleClass);
     }
 
     public void setUsemap(String usemap) {
-        attributes.setProperty("usemap", usemap) ;
+        attributes.setProperty("usemap", usemap);
     }
-    
+
     public void setStyleId(String id) {
-        attributes.setProperty("id", id) ;
+        attributes.setProperty("id", id);
     }
 
     public void setDocument(String documentName) {
-        attributes.setProperty("document", documentName) ;
+        attributes.setProperty("document", documentName);
+    }
+
+    public void setLinkable(String linkable) {
+        attributes.setProperty("linkable", linkable);
     }
+
 }
diff --git a/server/src/com/imcode/imcms/servlet/tags/IncludeTag.java b/server/src/com/imcode/imcms/servlet/tags/IncludeTag.java
index 1f8fc40cd7..0f835e727b 100644
--- a/server/src/com/imcode/imcms/servlet/tags/IncludeTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/IncludeTag.java
@@ -5,7 +5,7 @@
 public class IncludeTag extends SimpleImcmsTag {
 
     protected String getContent(TagParser tagParser) {
-        return tagParser.tagInclude(attributes) ;
+        return tagParser.tagInclude(attributes);
     }
 
     public void setPath(String path) {
@@ -17,7 +17,7 @@ public void setUrl(String url) {
     }
 
     public void setDocument(String documentId) {
-        attributes.setProperty("document", documentId) ;
+        attributes.setProperty("document", documentId);
     }
 
     public void setFile(String filename) {
diff --git a/server/src/com/imcode/imcms/servlet/tags/MenuItemHideTag.java b/server/src/com/imcode/imcms/servlet/tags/MenuItemHideTag.java
index 2ddb11e693..0b9419126c 100644
--- a/server/src/com/imcode/imcms/servlet/tags/MenuItemHideTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/MenuItemHideTag.java
@@ -1,17 +1,17 @@
 package com.imcode.imcms.servlet.tags;
 
-import javax.servlet.jsp.tagext.TagSupport;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.tagext.TagSupport;
 
 public class MenuItemHideTag extends TagSupport {
 
     public int doStartTag() throws JspException {
-        MenuTag menuTag = (MenuTag) findAncestorWithClass(this, MenuTag.class) ;
+        MenuTag menuTag = (MenuTag) findAncestorWithClass(this, MenuTag.class);
         if (menuTag == null) {
-            throw new JspTagException("menuitem must be enclosed in a menuloop or menu.") ;
+            throw new JspTagException("menuitem must be enclosed in a menuloop or menu.");
         }
-        if ( null == menuTag.getMenuItem() ) {
+        if (null == menuTag.getMenuItem()) {
             return SKIP_BODY;
         }
         return EVAL_BODY_INCLUDE;
diff --git a/server/src/com/imcode/imcms/servlet/tags/MenuItemLinkTag.java b/server/src/com/imcode/imcms/servlet/tags/MenuItemLinkTag.java
index 6150a04471..6e44037e42 100644
--- a/server/src/com/imcode/imcms/servlet/tags/MenuItemLinkTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/MenuItemLinkTag.java
@@ -13,9 +13,9 @@
 public class MenuItemLinkTag extends TagSupport {
 
     public int doStartTag() throws JspException {
-        MenuTag menuTag = (MenuTag) findAncestorWithClass(this, MenuTag.class) ;
+        MenuTag menuTag = (MenuTag) findAncestorWithClass(this, MenuTag.class);
         if (menuTag == null) {
-            throw new JspTagException("menuitem must be enclosed in a menuloop or menu.") ;
+            throw new JspTagException("menuitem must be enclosed in a menuloop or menu.");
         }
         MenuItemDomainObject menuItem = menuTag.getMenuItem();
         if (null == menuItem) {
@@ -25,8 +25,8 @@ public int doStartTag() throws JspException {
         DocumentDomainObject document = menuItem.getDocument();
         String pathToDocument = MenuParser.getPathToDocument(request, document, menuTag.getTemplate());
         try {
-            pageContext.getOut().print("<a href=\"" + pathToDocument+"\" target=\""+ document.getTarget()+"\">");
-        } catch ( IOException e ) {
+            pageContext.getOut().print("<a href=\"" + pathToDocument + "\" target=\"" + document.getTarget() + "\">");
+        } catch (IOException e) {
             throw new JspException(e);
         }
         return EVAL_BODY_INCLUDE;
@@ -35,7 +35,7 @@ public int doStartTag() throws JspException {
     public int doEndTag() throws JspException {
         try {
             pageContext.getOut().print("</a>");
-        } catch ( IOException e ) {
+        } catch (IOException e) {
             throw new JspException(e);
         }
         return EVAL_PAGE;
diff --git a/server/src/com/imcode/imcms/servlet/tags/MenuItemTag.java b/server/src/com/imcode/imcms/servlet/tags/MenuItemTag.java
index b9190aa632..bf8581a6b2 100644
--- a/server/src/com/imcode/imcms/servlet/tags/MenuItemTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/MenuItemTag.java
@@ -11,9 +11,9 @@ public int doStartTag() throws JspException {
     }
 
     public int doEndTag() throws JspException {
-        MenuTag menuTag = (MenuTag) findAncestorWithClass(this, MenuTag.class) ;
+        MenuTag menuTag = (MenuTag) findAncestorWithClass(this, MenuTag.class);
         if (menuTag == null) {
-            throw new JspTagException("menuitem must be enclosed in a menuloop or menu.") ;
+            throw new JspTagException("menuitem must be enclosed in a menuloop or menu.");
         }
         menuTag.invalidateMenuItem();
         return EVAL_PAGE;
diff --git a/server/src/com/imcode/imcms/servlet/tags/MenuLoopTag.java b/server/src/com/imcode/imcms/servlet/tags/MenuLoopTag.java
index 2e0440f216..2ea139f19a 100644
--- a/server/src/com/imcode/imcms/servlet/tags/MenuLoopTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/MenuLoopTag.java
@@ -9,7 +9,7 @@ public class MenuLoopTag extends TagSupport {
     public int doStartTag() throws JspException {
         MenuTag menuTag = (MenuTag) findAncestorWithClass(this, MenuTag.class);
         if (null == menuTag) {
-            throw new JspTagException("menuloop must be enclosed in menu.") ;
+            throw new JspTagException("menuloop must be enclosed in menu.");
         }
         return EVAL_BODY_INCLUDE;
     }
diff --git a/server/src/com/imcode/imcms/servlet/tags/MenuTag.java b/server/src/com/imcode/imcms/servlet/tags/MenuTag.java
index 9460bf7bfa..3b4b6f0a67 100644
--- a/server/src/com/imcode/imcms/servlet/tags/MenuTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/MenuTag.java
@@ -2,6 +2,7 @@
 
 import com.imcode.imcms.api.ContentManagementSystem;
 import com.imcode.imcms.api.TextDocument;
+import imcode.server.Imcms;
 import imcode.server.document.textdocument.MenuDomainObject;
 import imcode.server.document.textdocument.MenuItemDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
@@ -25,18 +26,22 @@ public class MenuTag extends BodyTagSupport {
     private int no;
     private Properties attributes = new Properties();
     private Iterator<MenuItemDomainObject> menuItemIterator;
-    private MenuItemDomainObject menuItem ;
+    private MenuItemDomainObject menuItem;
     private String template;
     private MenuDomainObject menu;
     private String label;
+    private Integer document;
 
     public int doStartTag() throws JspException {
         HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
         ParserParameters parserParameters = ParserParameters.fromRequest(request);
-        TextDocumentDomainObject document = (TextDocumentDomainObject) parserParameters.getDocumentRequest().getDocument();
+        TextDocumentDomainObject document = ((TextDocumentDomainObject) ((this.document == null)
+                ? parserParameters.getDocumentRequest().getDocument()
+                : Imcms.getServices().getDocumentMapper().getDocument(this.document)));
+
         menu = document.getMenu(no);
         MenuItemDomainObject[] menuItems = menu.getMenuItems();
-        menuItemIterator = new FilterIterator(new ArrayIterator(menuItems), new MenuParser.UserCanSeeMenuItemPredicate(parserParameters.getDocumentRequest().getUser())) ;
+        menuItemIterator = new FilterIterator(new ArrayIterator(menuItems), new MenuParser.UserCanSeeMenuItemPredicate(parserParameters.getDocumentRequest().getUser()));
         if (menuItemIterator.hasNext()) {
             nextMenuItem();
             return EVAL_BODY_BUFFERED;
@@ -48,8 +53,8 @@ public int doStartTag() throws JspException {
     public boolean nextMenuItem() {
         if (menuItemIterator.hasNext()) {
             menuItem = menuItemIterator.next();
-            pageContext.setAttribute("menuitem", new TextDocument.MenuItem(menuItem, ContentManagementSystem.fromRequest(pageContext.getRequest()))) ;
-            return true ;
+            pageContext.setAttribute("menuitem", new TextDocument.MenuItem(menuItem, ContentManagementSystem.fromRequest(pageContext.getRequest())));
+            return true;
         } else {
             invalidateMenuItem();
             return false;
@@ -57,7 +62,7 @@ public boolean nextMenuItem() {
     }
 
     public int doAfterBody() throws JspException {
-        if ( menuItemIterator.hasNext() ) {
+        if (menuItemIterator.hasNext()) {
             nextMenuItem();
             return EVAL_BODY_AGAIN;
         } else {
@@ -68,47 +73,51 @@ public int doAfterBody() throws JspException {
     public int doEndTag() throws JspException {
         try {
             String bodyContentString = null != getBodyContent() ? getBodyContent().getString() : "";
-            bodyContent = null ;
+            bodyContent = null;
             HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
             HttpServletResponse response = (HttpServletResponse) pageContext.getResponse();
             ParserParameters parserParameters = ParserParameters.fromRequest(request);
             bodyContentString = MenuParser.addMenuAdmin(no,
-                                                        parserParameters.isMenuMode(),
-                                                        bodyContentString, menu, request,response,label);
+                    parserParameters.isMenuMode(),
+                    bodyContentString, menu, request, response, label);
             bodyContentString = TagParser.addPreAndPost(attributes, bodyContentString);
             pageContext.getOut().write(bodyContentString);
-        } catch ( IOException e ) {
+        } catch (IOException e) {
             throw new JspException(e);
-        } catch ( ServletException e ) {
+        } catch (ServletException e) {
             throw new JspException(e);
-        } catch ( RuntimeException e ) {
+        } catch (RuntimeException e) {
             throw new JspException(e);
         }
         return EVAL_PAGE;
     }
 
-    public void setNo(int no) {
-        this.no = no ;
+    public int getNo() {
+        return no;
     }
 
-    public int getNo() {
-        return no ;
+    public void setNo(int no) {
+        this.no = no;
     }
 
     public void setMode(String mode) {
-        attributes.setProperty("mode", mode) ;
+        attributes.setProperty("mode", mode);
     }
 
     public void setLabel(String label) {
         this.label = label;
     }
 
+    public void setDocument(Integer document) {
+        this.document = document;
+    }
+
     public void setPre(String pre) {
-        attributes.setProperty("pre", pre) ;
+        attributes.setProperty("pre", pre);
     }
 
     public void setPost(String post) {
-        attributes.setProperty("post", post) ;
+        attributes.setProperty("post", post);
     }
 
     public Iterator<MenuItemDomainObject> getMenuItemIterator() {
@@ -123,7 +132,7 @@ public MenuItemDomainObject getMenuItem() {
     }
 
     public void invalidateMenuItem() {
-        menuItem = null ;
+        menuItem = null;
         pageContext.removeAttribute("menuitem");
     }
 
diff --git a/server/src/com/imcode/imcms/servlet/tags/SimpleImcmsTag.java b/server/src/com/imcode/imcms/servlet/tags/SimpleImcmsTag.java
index e69de02b65..e4771100c5 100644
--- a/server/src/com/imcode/imcms/servlet/tags/SimpleImcmsTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/SimpleImcmsTag.java
@@ -1,15 +1,15 @@
 package com.imcode.imcms.servlet.tags;
 
+import imcode.server.Imcms;
 import imcode.server.parser.ParserParameters;
 import imcode.server.parser.TagParser;
 import imcode.server.parser.TextDocumentParser;
-import imcode.server.Imcms;
 
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspException;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Properties;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
 import java.io.IOException;
+import java.util.Properties;
 
 public abstract class SimpleImcmsTag extends TagSupport {
 
@@ -23,29 +23,29 @@ public int doStartTag() throws JspException {
             String content = getContent(tagParser);
             String contentWithPreAndPost = TagParser.addPreAndPost(attributes, content);
             pageContext.getOut().print(contentWithPreAndPost);
-        } catch ( IOException e ) {
+        } catch (IOException e) {
             throw new JspException(e);
-        } catch ( RuntimeException e ) {
+        } catch (RuntimeException e) {
             throw new JspException(e);
         }
         return SKIP_BODY;
     }
 
-    protected abstract String getContent(TagParser tagParser) ;
+    protected abstract String getContent(TagParser tagParser);
 
     public void setNo(int no) {
-        attributes.setProperty("no", ""+no) ;
+        attributes.setProperty("no", "" + no);
     }
 
     public void setLabel(String label) {
-        attributes.setProperty("label", label) ;
+        attributes.setProperty("label", label);
     }
 
     public void setPre(String pre) {
-        attributes.setProperty("pre", pre) ;
+        attributes.setProperty("pre", pre);
     }
 
     public void setPost(String post) {
-        attributes.setProperty("post", post) ;
+        attributes.setProperty("post", post);
     }
 }
diff --git a/server/src/com/imcode/imcms/servlet/tags/TextTag.java b/server/src/com/imcode/imcms/servlet/tags/TextTag.java
index e8662ea27d..ab1464183e 100644
--- a/server/src/com/imcode/imcms/servlet/tags/TextTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/TextTag.java
@@ -9,19 +9,19 @@ protected String getContent(TagParser tagParser) {
     }
 
     public void setRows(int rows) {
-        attributes.setProperty("rows", ""+rows) ;
+        attributes.setProperty("rows", "" + rows);
     }
 
     public void setMode(String mode) {
-        attributes.setProperty("mode", mode) ;
+        attributes.setProperty("mode", mode);
     }
 
     public void setFormats(String formats) {
-        attributes.setProperty("formats", formats) ;
+        attributes.setProperty("formats", formats);
     }
 
     public void setDocument(String documentName) {
-        attributes.setProperty("document", documentName) ;
+        attributes.setProperty("document", documentName);
     }
 
 }
diff --git a/server/src/com/imcode/imcms/servlet/tags/VariablesTag.java b/server/src/com/imcode/imcms/servlet/tags/VariablesTag.java
index 7638e2f803..0e8e177052 100644
--- a/server/src/com/imcode/imcms/servlet/tags/VariablesTag.java
+++ b/server/src/com/imcode/imcms/servlet/tags/VariablesTag.java
@@ -11,8 +11,8 @@ public class VariablesTag extends TagSupport {
     public int doStartTag() throws JspException {
         HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
         TextDocumentViewing viewing = TextDocumentViewing.fromRequest(request);
-        pageContext.setAttribute("viewing", viewing) ;
-        pageContext.setAttribute("document", viewing.getTextDocument()) ;
+        pageContext.setAttribute("viewing", viewing);
+        pageContext.setAttribute("document", viewing.getTextDocument());
         return SKIP_BODY;
     }
 }
diff --git a/server/src/com/imcode/imcms/util/AuthHelper.java b/server/src/com/imcode/imcms/util/AuthHelper.java
new file mode 100644
index 0000000000..f7a282a5fe
--- /dev/null
+++ b/server/src/com/imcode/imcms/util/AuthHelper.java
@@ -0,0 +1,46 @@
+package com.imcode.imcms.util;
+
+import com.microsoft.aad.adal4j.AuthenticationResult;
+import com.nimbusds.openid.connect.sdk.AuthenticationResponse;
+import com.nimbusds.openid.connect.sdk.AuthenticationSuccessResponse;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Map;
+
+public final class AuthHelper {
+
+    public static final String PRINCIPAL_SESSION_NAME = "principal";
+
+    private AuthHelper() {
+    }
+
+    public static boolean isAuthenticated(HttpServletRequest request) {
+        return request.getSession().getAttribute(PRINCIPAL_SESSION_NAME) != null;
+    }
+
+    public static boolean isAuthDataExpired(AuthenticationResult result) {
+        return result.getExpiresOnDate().before(new Date());
+    }
+
+    public static AuthenticationResult getAuthenticationResult(HttpServletRequest request) {
+        return (AuthenticationResult) request.getSession().getAttribute(PRINCIPAL_SESSION_NAME);
+    }
+
+    public static void setAuthenticationResult(HttpServletRequest httpRequest, AuthenticationResult result) {
+        httpRequest.getSession().setAttribute(AuthHelper.PRINCIPAL_SESSION_NAME, result);
+    }
+
+    public static boolean containsAuthenticationData(HttpServletRequest httpRequest) {
+        final boolean isPostMethod = httpRequest.getMethod().equalsIgnoreCase("POST");
+        final Map<String, String[]> map = httpRequest.getParameterMap();
+        final boolean hasAnyRequiredParameter = map.containsKey(AuthParameterNames.ERROR)
+                || map.containsKey(AuthParameterNames.ID_TOKEN)
+                || map.containsKey(AuthParameterNames.CODE);
+        return (isPostMethod && hasAnyRequiredParameter);
+    }
+
+    public static boolean isAuthenticationSuccessful(AuthenticationResponse authResponse) {
+        return (authResponse instanceof AuthenticationSuccessResponse);
+    }
+}
diff --git a/server/src/com/imcode/imcms/util/AuthParameterNames.java b/server/src/com/imcode/imcms/util/AuthParameterNames.java
new file mode 100644
index 0000000000..06aa8b2c98
--- /dev/null
+++ b/server/src/com/imcode/imcms/util/AuthParameterNames.java
@@ -0,0 +1,39 @@
+package com.imcode.imcms.util;
+
+/*
+ // Copyright (c) Microsoft Corporation.
+ // All rights reserved.
+ //
+ // This code is licensed under the MIT License.
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining a copy
+ // of this software and associated documentation files(the "Software"), to deal
+ // in the Software without restriction, including without limitation the rights
+ // to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+ // copies of the Software, and to permit persons to whom the Software is
+ // furnished to do so, subject to the following conditions :
+ //
+ // The above copyright notice and this permission notice shall be included in
+ // all copies or substantial portions of the Software.
+ //
+ // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+ // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ // THE SOFTWARE.
+*/
+//https://github.com/Azure-Samples/active-directory-java-webapp-openidconnect
+
+public final class AuthParameterNames {
+
+    public static String ERROR = "error";
+    public static String ERROR_DESCRIPTION = "error_description";
+    public static String ERROR_URI = "error_uri";
+    public static String ID_TOKEN = "id_token";
+    public static String CODE = "code";
+
+    private AuthParameterNames() {
+    }
+}
diff --git a/server/src/com/imcode/imcms/util/BrowserCheck.java b/server/src/com/imcode/imcms/util/BrowserCheck.java
new file mode 100644
index 0000000000..e6241b99bc
--- /dev/null
+++ b/server/src/com/imcode/imcms/util/BrowserCheck.java
@@ -0,0 +1,378 @@
+package com.imcode.imcms.util;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.oro.text.perl.Perl5Util;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Tommy Ullberg
+ * imCode Partner AB
+ * Date: 2014-sep-30
+ * Time: 11:18:04
+ * Fixed since last version:
+ * - Win 8 support
+ * - IE 10-11 support
+ * - Mobile device substring index bug when empty UA.
+ */
+public class BrowserCheck {
+
+    private HttpServletRequest request;
+    private String userAgentOriginal;
+    private String userAgent;
+    private String company;
+    private String name;
+    private String version;
+    private String mainVersion;
+    private String minorVersion;
+    private String os;
+    private String error = "";
+    private double versionNbr;
+    private Perl5Util re = new Perl5Util();
+    private boolean isIE = true;
+    private boolean isGecko = false;
+    private boolean isFirefox = false;
+    private boolean isSafari = false;
+    private boolean isWin = true;
+    private boolean isWin2k = false;
+    private boolean isWinXP = false;
+    private boolean isWinVista = false;
+    private boolean isWin7 = false;
+    private boolean isWin8 = false;
+    private boolean isMac = false;
+
+    public BrowserCheck(HttpServletRequest request) {
+        this.request = request;
+        this.userAgentOriginal = StringUtils.defaultString(this.request.getHeader("User-Agent"));
+        setUserAgent(userAgentOriginal);
+    }
+
+    public String getUserAgent() {
+        return userAgentOriginal;
+    }
+
+    public void setUserAgent(String httpUserAgent) {
+        this.userAgent = httpUserAgent.toLowerCase();
+        this.setCompany();
+        this.setName();
+        this.setOs();
+        this.setVersions();
+    }
+
+    public String getUserAgentUsed() {
+        return userAgent;
+    }
+
+    private String getException(Exception e) {
+        String ret = "ERROR: " + e.getMessage() + "\n";
+        ret += "StackTrace:\n";
+        StackTraceElement[] stackTrace = e.getStackTrace();
+        for (StackTraceElement trace : stackTrace) {
+            ret += trace + "\n";
+        }
+        return ret;
+    }
+
+    private void setVersions() {
+        try {
+            int tmpPos;
+            String tmpString;
+            if (company.equals("Microsoft") && !userAgent.contains("msie") && re.match("/rv:(\\d+\\.\\d+)/", userAgent)) {// IE11plus
+                this.versionNbr = Double.parseDouble(re.group(1));
+            } else if (company.equals("Microsoft")) {// IE10minus
+                String str = userAgent.substring(userAgent.indexOf("msie") + 5);
+                this.versionNbr = Double.parseDouble(str.substring(0, str.indexOf(";")));
+            } else if (re.match("/firefox\\/(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)/", userAgent)) {
+                this.versionNbr = Double.parseDouble(re.group(1) + "." + re.group(2) + re.group(3) + re.group(4));
+            } else {
+                tmpString = (userAgent.substring(tmpPos = (userAgent.indexOf("/")) + 1, tmpPos + userAgent.indexOf(" "))).trim();
+                this.versionNbr = Double.parseDouble(tmpString.substring(0, tmpString.indexOf(" ")));
+            }
+        } catch (Exception e) {
+            this.error += company.equals("Microsoft") + "<br/>" + !userAgent.contains("msie") + "<br/>" + re.match("/rv:(\\d+\\.\\d+)/", userAgent) + "<br/>" + getException(e);
+            this.versionNbr = 0.0;
+        }
+        try {
+            this.version = String.valueOf(versionNbr);
+            this.mainVersion = version.split("\\.")[0];
+            this.minorVersion = version.split("\\.")[1];
+        } catch (Exception e) {
+            this.error += getException(e);
+            this.version = "unknown";
+            this.mainVersion = "unknown";
+            this.minorVersion = "unknown";
+        }
+    }
+
+    private void setCompany() {
+        if (userAgent.contains("msie") || userAgent.contains("trident")) {
+            this.company = "Microsoft";
+        } else if (userAgent.contains("opera")) {
+            this.company = "Opera Software";
+        } else if (userAgent.contains("mozilla")) {
+            this.company = "Netscape Communications";
+        } else {
+            this.company = "unknown";
+        }
+    }
+
+    public String getError() {
+        return error;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    private void setName() {
+        if (company.equals("Microsoft")) {
+            this.name = "Microsoft Internet Explorer";
+        } else if (company.equals("Netscape Communications")) {
+            this.name = "Netscape Navigator";
+        } else if (company.equals("Operasoftware")) {
+            this.name = "Operasoftware Opera";
+        } else {
+            this.name = "unknown";
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getMainVersion() {
+        return mainVersion;
+    }
+
+    public String getMinorVersion() {
+        return minorVersion;
+    }
+
+    public double getVersionNumber() {
+        return versionNbr;
+    }
+
+    private void setOs() {
+        try {
+            if (isWin()) {
+                if (userAgent.matches(".+Windows NT 6\\.[23]") || userAgent.contains("Windows NT 8")) {
+                    this.os = "Windows 8";
+                    this.isWin8 = true;
+                } else if (userAgent.matches(".+Windows NT 6\\.1") || userAgent.contains("Windows NT 7")) {
+                    this.os = "Windows 7";
+                    this.isWin7 = true;
+                } else if (userAgent.contains("Windows NT 6.0")) {
+                    this.os = "Windows Vista";
+                    this.isWinVista = true;
+                } else if (userAgent.contains("Windows NT 5.1")) {
+                    this.os = "Windows XP";
+                    this.isWinXP = true;
+                } else if (userAgent.contains("Windows NT 5.0")) {
+                    this.os = "Windows 2000";
+                    this.isWin2k = true;
+                } else if (userAgent.contains("windows 98") || userAgent.contains("win98")) {
+                    this.os = "Windows 98";
+                } else if (userAgent.contains("windows 95") || userAgent.contains("win95")) {
+                    this.os = "Windows 95";
+                } else if (userAgent.contains("winnt")) {
+                    this.os = "Windows NT";
+                } else if (userAgent.contains("win16") || userAgent.contains("windows 3.")) {
+                    this.os = "Windows 3.x";
+                }
+            }
+        } catch (Exception e) {
+            this.error += getException(e);
+            this.os = "unknown";
+        }
+    }
+
+    public String getOs() {
+        return os;
+    }
+
+    public boolean isIE() {
+        return userAgent.contains("msie") || userAgent.contains("trident");
+    }
+
+    public boolean isIE55plus() {
+        return isIE() && versionNbr >= 5.5;
+    }
+
+    public boolean isIE6plus() {
+        return isIE() && versionNbr >= 6.0;
+    }
+
+    public boolean isIE6() {
+        return isIE() && versionNbr >= 6.0 && versionNbr < 7.0;
+    }
+
+    public boolean isIE7plus() {
+        return isIE() && versionNbr >= 7.0;
+    }
+
+    public boolean isIE7minus() {
+        return isIE() && versionNbr < 8.0;
+    }
+
+    public boolean isIE7() {
+        return isIE() && versionNbr >= 7.0 && versionNbr < 8.0;
+    }
+
+    public boolean isIE7compatMode() {
+        return isIE7compatModeIE8() || isIE7compatModeIE9();
+    }
+
+    public boolean isIE7compatModeIE8() {
+        return isIE7() && userAgent.contains("trident/4");
+    }
+
+    public boolean isIE7compatModeIE9() {
+        return isIE7() && userAgent.contains("trident/5");
+    }
+
+    public boolean isIE8plus() {
+        return isIE() && versionNbr >= 8.0;
+    }
+
+    public boolean isIE8minus() {
+        return isIE() && versionNbr < 9.0;
+    }
+
+    public boolean isIE8() {
+        return isIE() && versionNbr >= 8.0 && versionNbr < 9.0;
+    }
+
+    public boolean isIE9plus() {
+        return isIE() && versionNbr >= 9.0;
+    }
+
+    public boolean isIE9() {
+        return isIE() && versionNbr >= 9.0 && versionNbr < 10.0;
+    }
+
+    public boolean isIE10plus() {
+        return isIE() && versionNbr >= 10.0;
+    }
+
+    public boolean isIE10() {
+        return isIE() && versionNbr >= 10.0 && versionNbr < 11.0;
+    }
+
+    public boolean isIE11plus() {
+        return isIE() && versionNbr >= 11.0;
+    }
+
+    public boolean isIE11() {
+        return isIE() && versionNbr >= 11.0 && versionNbr < 12.0;
+    }
+
+    public boolean isGecko() {
+        return userAgent.contains("gecko") && !userAgent.contains("like gecko");
+    }
+
+    public boolean isGecko5plus() {
+        return isGecko() && new Double(version) >= 5.0;
+    }
+
+    public boolean isFirefox() {
+        return userAgent.contains("firefox");
+    }
+
+    public boolean isFirefox2plus() {
+        return isFirefox() && versionNbr >= 2.0;
+    }
+
+    public boolean isFirefox3plus() {
+        return isFirefox() && versionNbr >= 3.0;
+    }
+
+    public boolean isFirefox35plus() {
+        return isFirefox() && versionNbr >= 3.5;
+    }
+
+    public boolean isSafari() {
+        return userAgent.contains("safari");
+    }
+
+    public boolean isWebKit() {
+        return userAgent.contains("webkit");
+    }
+
+    public boolean isIphone() {
+        return userAgent.contains("iphone");
+    }
+
+    public boolean isIpad() {
+        return userAgent.contains("ipad");
+    }
+
+    public boolean isAndroid() {
+        return userAgent.contains("android");
+    }
+
+    public boolean isMobileDevice() {
+        // From http://detectmobilebrowsers.com/ Modified by Tommy Ullberg
+        return isIphone() || isIpad() || isAndroid() || userAgent.matches("(?i).*(android.+mobile|avantgo|bada\\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|meego.+mobile|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*") || (userAgent + "xxxxx").substring(0, 4).matches("(?i)1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\\-|your|zeto|zte\\-");
+    }
+
+    public boolean isMac() {
+        return userAgent.contains("mac");
+    }
+
+    public boolean isWin() {
+        return !isMac();
+    }
+
+    public boolean isWin2k() {
+        return isWin2k;
+    }
+
+    public boolean isWinXP() {
+        return isWinXP;
+    }
+
+    public boolean isWinVista() {
+        return isWinVista;
+    }
+
+    public boolean isWin7() {
+        return isWin7;
+    }
+
+    public boolean isWin8() {
+        return isWin8;
+    }
+
+	/*
+	<pre style="font-size:11px;">
+	out.print("<br/>browser.getUserAgent():     " + browser.getUserAgent());
+	out.print("<br/>browser.getName():          " + browser.getName());
+	out.print("<br/>browser.getOs():            " + browser.getOs());
+	out.print("<br/>browser.getCompany():       " + browser.getCompany());
+	out.print("<br/>browser.getVersion():       " + browser.getVersion());
+	out.print("<br/>browser.getMainVersion():   " + browser.getMainVersion());
+	out.print("<br/>browser.getMinorVersion():  " + browser.getMinorVersion());
+	out.print("<br/>browser.getVersionNumber(): " + browser.getVersionNumber());
+	out.print("<br/>browser.isWin():            " + browser.isWin());
+	out.print("<br/>browser.isMac():            " + browser.isMac());
+	out.print("<br/>browser.isGecko():          " + browser.isGecko());
+	out.print("<br/>browser.isGecko5plus():     " + browser.isGecko5plus());
+	out.print("<br/>browser.isFirefox():        " + browser.isFirefox());
+	out.print("<br/>browser.isFirefox2plus():   " + browser.isFirefox2plus());
+	out.print("<br/>browser.isFirefox3plus():   " + browser.isFirefox3plus());
+	out.print("<br/>browser.isFirefox35plus():  " + browser.isFirefox35plus());
+	out.print("<br/>browser.isIE():             " + browser.isIE());
+	out.print("<br/>browser.isIE55plus():       " + browser.isIE55plus());
+	out.print("<br/>browser.isIE6():            " + browser.isIE6());
+	out.print("<br/>browser.isIE6plus():        " + browser.isIE6plus());
+	out.print("<br/>browser.isIE7():            " + browser.isIE7());
+	out.print("<br/>browser.isIE7plus():        " + browser.isIE7plus());
+	out.print("<br/>browser.isIE8():            " + browser.isIE8());
+	out.print("<br/>browser.isIE8plus():        " + browser.isIE8plus());
+	</pre> */
+}
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/util/EmptyEnumeration.java b/server/src/com/imcode/imcms/util/EmptyEnumeration.java
index 49e3d50644..18a0f3d726 100644
--- a/server/src/com/imcode/imcms/util/EmptyEnumeration.java
+++ b/server/src/com/imcode/imcms/util/EmptyEnumeration.java
@@ -10,6 +10,6 @@ public boolean hasMoreElements() {
     }
 
     public E nextElement() {
-        throw new NoSuchElementException() ;
+        throw new NoSuchElementException();
     }
 }
diff --git a/server/src/com/imcode/imcms/util/l10n/CachingLocalizedMessageProvider.java b/server/src/com/imcode/imcms/util/l10n/CachingLocalizedMessageProvider.java
index 7f57116757..53ab72056d 100644
--- a/server/src/com/imcode/imcms/util/l10n/CachingLocalizedMessageProvider.java
+++ b/server/src/com/imcode/imcms/util/l10n/CachingLocalizedMessageProvider.java
@@ -6,7 +6,7 @@
 
 public class CachingLocalizedMessageProvider extends LocalizedMessageProvider {
 
-    private final LocalizedMessageProvider provider ;
+    private final LocalizedMessageProvider provider;
     private final Map<String, ResourceBundle> bundleMap = new HashMap();
 
     public CachingLocalizedMessageProvider(LocalizedMessageProvider provider) {
@@ -19,11 +19,11 @@ public CachingLocalizedMessageProvider() {
 
     public ResourceBundle getResourceBundle(String languageIso639_2) {
         ResourceBundle resourceBundle = bundleMap.get(languageIso639_2);
-        if ( null == resourceBundle ) {
+        if (null == resourceBundle) {
             resourceBundle = provider.getResourceBundle(languageIso639_2);
             bundleMap.put(languageIso639_2, resourceBundle);
         }
-        return resourceBundle ;
+        return resourceBundle;
     }
 
 }
diff --git a/server/src/com/imcode/imcms/util/l10n/ImcmsPrefsLocalizedMessageProvider.java b/server/src/com/imcode/imcms/util/l10n/ImcmsPrefsLocalizedMessageProvider.java
index 0e96f4c8f8..60a5647bc9 100644
--- a/server/src/com/imcode/imcms/util/l10n/ImcmsPrefsLocalizedMessageProvider.java
+++ b/server/src/com/imcode/imcms/util/l10n/ImcmsPrefsLocalizedMessageProvider.java
@@ -12,8 +12,18 @@
 
 public class ImcmsPrefsLocalizedMessageProvider extends LocalizedMessageProvider {
 
+    public static Properties getLanguageProperties(UserDomainObject user) {
+        String languageIso639_2 = user.getLanguageIso639_2();
+        final ResourceBundle resourceBundle = new CachingLocalizedMessageProvider().getResourceBundle(languageIso639_2);
+        return new Properties() {
+            public String getProperty(String key) {
+                return resourceBundle.getString(key);
+            }
+        };
+    }
+
     public ResourceBundle getResourceBundle(String languageIso639_2) {
-        String propertiesFilename = "imcms_"+languageIso639_2 + ".properties";
+        String propertiesFilename = "imcms_" + languageIso639_2 + ".properties";
         try {
             final Properties languageProperties = Prefs.getProperties(propertiesFilename);
             return new ResourceBundle() {
@@ -25,18 +35,8 @@ public Enumeration<String> getKeys() {
                     return new IteratorEnumeration(languageProperties.keySet().iterator());
                 }
             };
-        } catch ( IOException e ) {
+        } catch (IOException e) {
             throw new UnhandledException(e);
         }
     }
-
-    public static Properties getLanguageProperties(UserDomainObject user) {
-        String languageIso639_2 = user.getLanguageIso639_2();
-        final ResourceBundle resourceBundle = new CachingLocalizedMessageProvider().getResourceBundle(languageIso639_2);
-        return new Properties() {
-            public String getProperty(String key) {
-                return resourceBundle.getString(key);
-            }
-        };
-    }
 }
diff --git a/server/src/com/imcode/imcms/util/l10n/LocalizedMessage.java b/server/src/com/imcode/imcms/util/l10n/LocalizedMessage.java
index 09ef0ec712..375546c52f 100644
--- a/server/src/com/imcode/imcms/util/l10n/LocalizedMessage.java
+++ b/server/src/com/imcode/imcms/util/l10n/LocalizedMessage.java
@@ -14,7 +14,7 @@ public class LocalizedMessage implements Serializable {
     private final String languageKey;
     private final LocalizedMessageProvider provider;
 
-    public LocalizedMessage( String languageKey  ) {
+    public LocalizedMessage(String languageKey) {
         this(languageKey, null);
     }
 
@@ -27,16 +27,16 @@ public LocalizedMessage( String languageKey  ) {
     }
 
     public final String toLocalizedString(HttpServletRequest request) {
-        UserDomainObject user = Utility.getLoggedOnUser( request );
-        return toLocalizedString( user );
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        return toLocalizedString(user);
     }
 
-    public final String toLocalizedString( UserDomainObject user ) {
+    public final String toLocalizedString(UserDomainObject user) {
         return toLocalizedString(user.getLanguageIso639_2());
     }
 
     public String toLocalizedString(String languageIso639_2) {
-        LocalizedMessageProvider localProvider = provider ;
+        LocalizedMessageProvider localProvider = provider;
         if (null == localProvider) {
             localProvider = Imcms.getServices().getLocalizedMessageProvider();
         }
@@ -44,25 +44,25 @@ public String toLocalizedString(String languageIso639_2) {
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
         final LocalizedMessage that = (LocalizedMessage) o;
 
-        if ( !languageKey.equals(that.languageKey) ) {
+        if (!languageKey.equals(that.languageKey)) {
             return false;
         }
-        return !( provider != null ? !provider.equals(that.provider) : that.provider != null );
+        return !(provider != null ? !provider.equals(that.provider) : that.provider != null);
 
     }
 
     public int hashCode() {
         int result = languageKey.hashCode();
-        result = 29 * result + ( provider != null ? provider.hashCode() : 0 );
+        result = 29 * result + (provider != null ? provider.hashCode() : 0);
         return result;
     }
 }
diff --git a/server/src/com/imcode/imcms/util/l10n/LocalizedMessageFormat.java b/server/src/com/imcode/imcms/util/l10n/LocalizedMessageFormat.java
index 8c24fb966d..50824d742a 100644
--- a/server/src/com/imcode/imcms/util/l10n/LocalizedMessageFormat.java
+++ b/server/src/com/imcode/imcms/util/l10n/LocalizedMessageFormat.java
@@ -12,7 +12,7 @@ public LocalizedMessageFormat(String messageKey, Object... arguments) {
     }
 
     public String toLocalizedString(String languageIso639_2) {
-        return new MessageFormat(super.toLocalizedString(languageIso639_2)).format(arguments) ;
+        return new MessageFormat(super.toLocalizedString(languageIso639_2)).format(arguments);
 
     }
 }
diff --git a/server/src/com/imcode/imcms/util/l10n/LocalizedMessageProvider.java b/server/src/com/imcode/imcms/util/l10n/LocalizedMessageProvider.java
index 6562f03e94..f7221a22b5 100644
--- a/server/src/com/imcode/imcms/util/l10n/LocalizedMessageProvider.java
+++ b/server/src/com/imcode/imcms/util/l10n/LocalizedMessageProvider.java
@@ -4,6 +4,15 @@
 
 public abstract class LocalizedMessageProvider {
 
+    public boolean supportsLanguage(String languageIso639_2) {
+        try {
+            getResourceBundle(languageIso639_2);
+            return true;
+        } catch (Exception ex) {
+            return false;
+        }
+    }
+
     public LocalizedMessage get(String key) {
         return new LocalizedMessage(key, this);
     }
diff --git a/server/src/com/imcode/imcms/util/rss/Item.java b/server/src/com/imcode/imcms/util/rss/Item.java
index b40e6ab1a1..a46046557e 100644
--- a/server/src/com/imcode/imcms/util/rss/Item.java
+++ b/server/src/com/imcode/imcms/util/rss/Item.java
@@ -12,7 +12,7 @@ public interface Item {
 
     String getDescription();
 
-    Map<NameSpace,Map<String,String>> getNameSpaceStrings();
+    Map<NameSpace, Map<String, String>> getNameSpaceStrings();
 
     Map<NameSpace, DynaBean> getNameSpaceBeans();
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/util/rss/NameSpace.java b/server/src/com/imcode/imcms/util/rss/NameSpace.java
index 3e52943d0e..201e657d5d 100644
--- a/server/src/com/imcode/imcms/util/rss/NameSpace.java
+++ b/server/src/com/imcode/imcms/util/rss/NameSpace.java
@@ -2,10 +2,11 @@
 
 public abstract class NameSpace {
     public abstract String getNameSpaceUri();
+
     public abstract String getSuggestedPrefix();
 
     public boolean equals(Object obj) {
-        if (!( obj instanceof NameSpace)) {
+        if (!(obj instanceof NameSpace)) {
             return false;
         }
         NameSpace nameSpace = (NameSpace) obj;
diff --git a/server/src/com/imcode/imcms/util/rss/Rss20DocumentFactory.java b/server/src/com/imcode/imcms/util/rss/Rss20DocumentFactory.java
index a8d47c0165..d2dc017dd8 100644
--- a/server/src/com/imcode/imcms/util/rss/Rss20DocumentFactory.java
+++ b/server/src/com/imcode/imcms/util/rss/Rss20DocumentFactory.java
@@ -1,9 +1,11 @@
 package com.imcode.imcms.util.rss;
 
+import com.imcode.imcms.util.rss.dc.DublinCoreEntity;
+import com.imcode.imcms.util.rss.dc.DublinCoreTerms;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.UnhandledException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.apache.commons.lang.UnhandledException;
-import org.apache.commons.lang.StringUtils;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -11,14 +13,13 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 
-import com.imcode.imcms.util.rss.dc.DublinCoreTerms;
-import com.imcode.imcms.util.rss.dc.DublinCoreEntity;
-
 public class Rss20DocumentFactory implements RssDocumentFactory {
 
     private static final String RFC822_DATE_PATTERN = "EEE, d MMM yyyy HH:mm:ss Z";
+    private static final Locale EN_LOCALE = Locale.US;
 
     public Document createRssDocument(Channel channel) {
         try {
@@ -29,7 +30,7 @@ public Document createRssDocument(Channel channel) {
             appendRssElement(xmlDocument, channel);
 
             return xmlDocument;
-        } catch ( ParserConfigurationException e ) {
+        } catch (ParserConfigurationException e) {
             throw new UnhandledException(e);
         }
     }
@@ -64,7 +65,7 @@ private Element appendChannelElement(Element rssElement,
     private void appendItems(Element channelElement,
                              Channel channel) {
 
-        for ( Item item : channel.getItems() ) {
+        for (Item item : channel.getItems()) {
             appendItem(channelElement, item);
         }
     }
@@ -75,7 +76,7 @@ private void appendItem(Element channelElement, Item item) {
 
     private Element createItemElement(Document xmlDocument,
                                       Item item) {
-        DateFormat dateFormat = new SimpleDateFormat(RFC822_DATE_PATTERN);
+        DateFormat dateFormat = new SimpleDateFormat(RFC822_DATE_PATTERN, EN_LOCALE);
 
         Element itemElement = xmlDocument.createElement("item");
         appendTextElement(itemElement, "link", item.getLink());
@@ -85,13 +86,13 @@ private Element createItemElement(Document xmlDocument,
         try {
             DublinCoreEntity dublinCoreEntity = (DublinCoreEntity) item.getNameSpaceBeans().get(DublinCoreTerms.DUBLIN_CORE_ELEMENTS_NAME_SPACE).get("creator");
             appendTextElement(itemElement, "author", dublinCoreEntity.getEmailAddress());
-        } catch ( NullPointerException npe ) {
+        } catch (NullPointerException npe) {
         }
 
         try {
             Date issued = (Date) item.getNameSpaceBeans().get(DublinCoreTerms.DUBLIN_CORE_TERMS_NAME_SPACE).get("issued");
             appendTextElement(itemElement, "pubDate", dateFormat.format(issued));
-        } catch ( NullPointerException npe ) {
+        } catch (NullPointerException npe) {
         }
 
         Map<NameSpace, Map<String, String>> nameSpaces = item.getNameSpaceStrings();
@@ -101,14 +102,14 @@ private Element createItemElement(Document xmlDocument,
 
     private void appendNameSpaceStrings(Element itemElement, Map<NameSpace, Map<String, String>> nameSpaces
     ) {
-        for ( Map.Entry<NameSpace, Map<String, String>> nameSpaceEntry : nameSpaces.entrySet() ) {
+        for (Map.Entry<NameSpace, Map<String, String>> nameSpaceEntry : nameSpaces.entrySet()) {
             NameSpace nameSpace = nameSpaceEntry.getKey();
             String nameSpaceUri = nameSpace.getNameSpaceUri();
             String prefix = lookupPrefix(itemElement, nameSpaceUri, nameSpace);
             Map<String, String> nameSpaceValues = nameSpaceEntry.getValue();
-            for ( Map.Entry<String, String> nameSpaceValueEntry : nameSpaceValues.entrySet() ) {
+            for (Map.Entry<String, String> nameSpaceValueEntry : nameSpaceValues.entrySet()) {
                 String name = nameSpaceValueEntry.getKey();
-                if ( null != prefix ) {
+                if (null != prefix) {
                     name = prefix + ":" + name;
                 }
                 String value = nameSpaceValueEntry.getValue();
@@ -119,9 +120,9 @@ private void appendNameSpaceStrings(Element itemElement, Map<NameSpace, Map<Stri
 
     private String lookupPrefix(Element element, String nameSpaceUri, NameSpace nameSpace) {
         String prefix = element.lookupPrefix(nameSpaceUri);
-        if ( null == prefix ) {
+        if (null == prefix) {
             String suggestedPrefix = nameSpace.getSuggestedPrefix();
-            if ( null == element.lookupNamespaceURI(suggestedPrefix) ) {
+            if (null == element.lookupNamespaceURI(suggestedPrefix)) {
                 prefix = suggestedPrefix;
                 element.getOwnerDocument().getDocumentElement().setAttribute("xmlns:" + prefix, nameSpaceUri);
             }
@@ -135,7 +136,7 @@ private void appendTextElement(Element parentElement, String tagName, String tex
 
     private void appendTextElementNS(Element parentElement, String namespaceUri, String qualifiedName,
                                      String text) {
-        if ( StringUtils.isNotBlank(text) ) {
+        if (StringUtils.isNotBlank(text)) {
             parentElement.appendChild(createTextElementNS(parentElement.getOwnerDocument(), namespaceUri, qualifiedName, text));
         }
     }
diff --git a/server/src/com/imcode/imcms/util/rss/RssDocumentFactory.java b/server/src/com/imcode/imcms/util/rss/RssDocumentFactory.java
index ca22357574..b99a2f8c52 100644
--- a/server/src/com/imcode/imcms/util/rss/RssDocumentFactory.java
+++ b/server/src/com/imcode/imcms/util/rss/RssDocumentFactory.java
@@ -2,9 +2,7 @@
 
 import org.w3c.dom.Document;
 
-import javax.xml.parsers.ParserConfigurationException;
-
 public interface RssDocumentFactory {
 
-    Document createRssDocument(Channel channel) ;
+    Document createRssDocument(Channel channel);
 }
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/util/rss/dc/DublinCoreItem.java b/server/src/com/imcode/imcms/util/rss/dc/DublinCoreItem.java
index 501846e864..c99507a4b5 100644
--- a/server/src/com/imcode/imcms/util/rss/dc/DublinCoreItem.java
+++ b/server/src/com/imcode/imcms/util/rss/dc/DublinCoreItem.java
@@ -1,14 +1,13 @@
 package com.imcode.imcms.util.rss.dc;
 
+import com.imcode.imcms.util.rss.Item;
+import com.imcode.imcms.util.rss.NameSpace;
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.commons.beanutils.WrapDynaBean;
 import org.apache.commons.lang.ArrayUtils;
 
 import java.util.Map;
 
-import com.imcode.imcms.util.rss.Item;
-import com.imcode.imcms.util.rss.NameSpace;
-
 public class DublinCoreItem implements Item {
 
     private DublinCoreTerms dublinCoreTerms;
@@ -29,15 +28,15 @@ public String getDescription() {
         return dublinCoreTerms.getDescription();
     }
 
-    public Map<NameSpace,Map<String,String>> getNameSpaceStrings() {
+    public Map<NameSpace, Map<String, String>> getNameSpaceStrings() {
         return new DublinCoreTermsMapFactory().getNameSpaceStrings(dublinCoreTerms);
     }
 
     public Map<NameSpace, DynaBean> getNameSpaceBeans() {
         WrapDynaBean dublinCoreDynaBean = new WrapDynaBean(dublinCoreTerms);
-        return ArrayUtils.toMap(new Object[][] {
-                { DublinCoreTerms.DUBLIN_CORE_ELEMENTS_NAME_SPACE, dublinCoreDynaBean },
-                { DublinCoreTerms.DUBLIN_CORE_TERMS_NAME_SPACE, dublinCoreDynaBean },
+        return ArrayUtils.toMap(new Object[][]{
+                {DublinCoreTerms.DUBLIN_CORE_ELEMENTS_NAME_SPACE, dublinCoreDynaBean},
+                {DublinCoreTerms.DUBLIN_CORE_TERMS_NAME_SPACE, dublinCoreDynaBean},
         });
     }
 }
diff --git a/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTerms.java b/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTerms.java
index 8199e66c81..d6771853de 100644
--- a/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTerms.java
+++ b/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTerms.java
@@ -10,7 +10,7 @@ public interface DublinCoreTerms {
     String DUBLIN_CORE_METADATA_ELEMENTS_NAMESPACE_URI = "http://purl.org/dc/elements/1.1/";
     String DUBLIN_CORE_METADATA_TERMS_NAMESPACE_URI = "http://purl.org/dc/terms/";
     NameSpace DUBLIN_CORE_ELEMENTS_NAME_SPACE = new SimpleNameSpace("dc", DUBLIN_CORE_METADATA_ELEMENTS_NAMESPACE_URI);
-    NameSpace DUBLIN_CORE_TERMS_NAME_SPACE = new SimpleNameSpace("dcterms",DUBLIN_CORE_METADATA_TERMS_NAMESPACE_URI);
+    NameSpace DUBLIN_CORE_TERMS_NAME_SPACE = new SimpleNameSpace("dcterms", DUBLIN_CORE_METADATA_TERMS_NAMESPACE_URI);
 
     Date getIssued();
 
diff --git a/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTermsMapFactory.java b/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTermsMapFactory.java
index 3e140045df..38f7788921 100644
--- a/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTermsMapFactory.java
+++ b/server/src/com/imcode/imcms/util/rss/dc/DublinCoreTermsMapFactory.java
@@ -12,17 +12,17 @@ class DublinCoreTermsMapFactory {
 
     public Map<NameSpace, Map<String, String>> getNameSpaceStrings(DublinCoreTerms dublinCoreTerms) {
         Format iso8601Format = DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
-        return ArrayUtils.toMap(new Object[][] {
-                { DublinCoreTerms.DUBLIN_CORE_ELEMENTS_NAME_SPACE, ArrayUtils.toMap(new Object[][] {
+        return ArrayUtils.toMap(new Object[][]{
+                {DublinCoreTerms.DUBLIN_CORE_ELEMENTS_NAME_SPACE, ArrayUtils.toMap(new Object[][]{
                         {"creator", null != dublinCoreTerms.getCreator() ? dublinCoreTerms.getCreator().getName() : null},
-                        {"description",dublinCoreTerms.getDescription()},
-                        {"identifier",dublinCoreTerms.getIdentifer()},
-                        {"title",dublinCoreTerms.getTitle()},
+                        {"description", dublinCoreTerms.getDescription()},
+                        {"identifier", dublinCoreTerms.getIdentifer()},
+                        {"title", dublinCoreTerms.getTitle()},
                 })},
-                { DublinCoreTerms.DUBLIN_CORE_TERMS_NAME_SPACE, ArrayUtils.toMap(new Object[][] {
-                        {"created", format(iso8601Format, dublinCoreTerms.getCreated()) },
-                        {"issued",format(iso8601Format, dublinCoreTerms.getIssued()) },
-                        {"modified",format(iso8601Format, dublinCoreTerms.getModified()) },
+                {DublinCoreTerms.DUBLIN_CORE_TERMS_NAME_SPACE, ArrayUtils.toMap(new Object[][]{
+                        {"created", format(iso8601Format, dublinCoreTerms.getCreated())},
+                        {"issued", format(iso8601Format, dublinCoreTerms.getIssued())},
+                        {"modified", format(iso8601Format, dublinCoreTerms.getModified())},
                 })},
         });
     }
diff --git a/server/src/com/imcode/imcms/util/rss/imcms/DocumentDublinCoreTerms.java b/server/src/com/imcode/imcms/util/rss/imcms/DocumentDublinCoreTerms.java
index f1f341f114..cff38b4a62 100644
--- a/server/src/com/imcode/imcms/util/rss/imcms/DocumentDublinCoreTerms.java
+++ b/server/src/com/imcode/imcms/util/rss/imcms/DocumentDublinCoreTerms.java
@@ -1,13 +1,12 @@
 package com.imcode.imcms.util.rss.imcms;
 
+import com.imcode.imcms.api.Document;
+import com.imcode.imcms.util.rss.dc.DublinCoreEntity;
+import com.imcode.imcms.util.rss.dc.DublinCoreTerms;
 import imcode.util.Utility;
 
 import java.util.Date;
 
-import com.imcode.imcms.api.Document;
-import com.imcode.imcms.util.rss.dc.DublinCoreTerms;
-import com.imcode.imcms.util.rss.dc.DublinCoreEntity;
-
 public class DocumentDublinCoreTerms implements DublinCoreTerms {
 
     private final String urlRoot;
@@ -37,7 +36,7 @@ public String getEmailAddress() {
             }
 
             public String getName() {
-                return document.getCreator().getFirstName()+" "+document.getCreator().getLastName();
+                return document.getCreator().getFirstName() + " " + document.getCreator().getLastName();
             }
         };
     }
diff --git a/server/src/com/imcode/imcms/util/rss/imcms/DocumentMenuChannel.java b/server/src/com/imcode/imcms/util/rss/imcms/DocumentMenuChannel.java
index 8499fe2222..6db2fcfa94 100644
--- a/server/src/com/imcode/imcms/util/rss/imcms/DocumentMenuChannel.java
+++ b/server/src/com/imcode/imcms/util/rss/imcms/DocumentMenuChannel.java
@@ -22,8 +22,8 @@ public DocumentMenuChannel(TextDocument document, String urlRoot, int menuIndex)
 
     public Iterable<Item> getItems() {
         TextDocument.MenuItem[] visibleMenuItems = document.getMenu(menuIndex).getVisibleMenuItems();
-        List<Item> result = new ArrayList<Item>();
-        for ( TextDocument.MenuItem menuItem : visibleMenuItems ) {
+        List<Item> result = new ArrayList<>();
+        for (TextDocument.MenuItem menuItem : visibleMenuItems) {
             result.add(new MenuItemItem(urlRoot, menuItem));
         }
         return result;
diff --git a/server/src/com/imcode/imcms/util/rss/imcms/MenuItemItem.java b/server/src/com/imcode/imcms/util/rss/imcms/MenuItemItem.java
index b650fec76d..729746b63f 100644
--- a/server/src/com/imcode/imcms/util/rss/imcms/MenuItemItem.java
+++ b/server/src/com/imcode/imcms/util/rss/imcms/MenuItemItem.java
@@ -10,9 +10,9 @@
 
 public class MenuItemItem extends DublinCoreItem {
 
-    private TextDocument.MenuItem menuItem;
     private static final String IMCMS_MENU_NAMESPACE_URI = "imcms:menu";
     private static final NameSpace IMCMS_MENU_NAME_SPACE = new SimpleNameSpace("imcms", IMCMS_MENU_NAMESPACE_URI);
+    private TextDocument.MenuItem menuItem;
 
     public MenuItemItem(String urlRoot, TextDocument.MenuItem menuItem) {
         super(new DocumentDublinCoreTerms(urlRoot, menuItem.getDocument()));
@@ -21,9 +21,9 @@ public MenuItemItem(String urlRoot, TextDocument.MenuItem menuItem) {
 
     public Map<NameSpace, Map<String, String>> getNameSpaceStrings() {
         Map<NameSpace, Map<String, String>> nameSpaces = super.getNameSpaceStrings();
-        nameSpaces.put(IMCMS_MENU_NAME_SPACE, ArrayUtils.toMap(new Object[][] {
-                { "target", menuItem.getDocument().getTarget() },
-                { "treeKey", menuItem.getTreeKey().toString() }
+        nameSpaces.put(IMCMS_MENU_NAME_SPACE, ArrayUtils.toMap(new Object[][]{
+                {"target", menuItem.getDocument().getTarget()},
+                {"treeKey", menuItem.getTreeKey().toString()}
         }));
         return nameSpaces;
     }
diff --git a/server/src/imcode/server/AuthenticationMethodConfiguration.java b/server/src/imcode/server/AuthenticationMethodConfiguration.java
new file mode 100644
index 0000000000..5948b0f1a1
--- /dev/null
+++ b/server/src/imcode/server/AuthenticationMethodConfiguration.java
@@ -0,0 +1,43 @@
+package imcode.server;
+
+/**
+ * Created by Shadowgun on 01.12.2014.
+ */
+public class AuthenticationMethodConfiguration {
+
+    public static final String AUTHENTICATION_METHOD_NAMING_PATTERN = "authentication-method-{replace}";
+    public static final String AUTHENTICATION_REPLACEABLE = "{replace}";
+    public static final String AUTHENTICATION_URL_NAMING_PATTERN = "{replace}-authentication-method-url";
+    private String mName = "";
+    private String mUrl = "";
+    private int mOrder = 1;
+
+    public String getName() {
+        return mName;
+    }
+
+    public AuthenticationMethodConfiguration setName(String name) {
+        this.mName = name;
+        return this;
+    }
+
+    public int getOrder() {
+        return mOrder;
+    }
+
+    public AuthenticationMethodConfiguration setOrder(int order) {
+        this.mOrder = order;
+        return this;
+    }
+
+
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public AuthenticationMethodConfiguration setUrl(String url) {
+        this.mUrl = url;
+        return this;
+    }
+
+}
diff --git a/server/src/imcode/server/Config.java b/server/src/imcode/server/Config.java
index fa1babc4b2..3e50bf231a 100644
--- a/server/src/imcode/server/Config.java
+++ b/server/src/imcode/server/Config.java
@@ -1,10 +1,12 @@
 package imcode.server;
 
+import imcode.server.user.RoleId;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
-import java.security.KeyStore;
 import java.nio.charset.Charset;
+import java.security.KeyStore;
+import java.util.*;
 
 public class Config {
 
@@ -12,6 +14,11 @@ public class Config {
     private File includePath;
     private File filePath;
     private File imagePath;
+    private File imageCachePath;
+    private String imageCacheAllowedPaths;
+    private long imageCacheMaxSize;
+    // Maximum number of cached ImageSize objects for realSize of an ImageDomainObject
+    private int imageSizeCacheObjects = 10000;
     private String imageUrl;
     private String smtpServer;
     private int smtpPort;
@@ -20,90 +27,171 @@ public class Config {
     private String fileAdminRootPaths;
     private float indexingSchedulePeriodInMinutes;
     private String documentPathPrefix;
-    private int documentCacheMaxSize = 100 ;
-    private String keyStorePath ;
-    private String keyStoreType ;
+    private int documentCacheMaxSize = 100;
+    private String keyStorePath;
+    private String keyStoreType;
     private String workaroundUriEncoding;
     private boolean secureLoginRequired;
     private boolean denyMultipleUserLogin;
+    private String imageArchiveUrl;
+    private String imageArchiveAllowedRoleIds;
+    private List<RoleId> imageArchiveAllowedRoleIdList = Collections.emptyList();
+    private String chooseFileAllowedRoleIds;
+    private List<RoleId> chooseFileAllowedRoleIdsList = Collections.emptyList();
+    private File imageArchiveImagePath;
+    private String imageArchiveImageUrl;
+    private File imageMagickPath;
+    private DatabaseVendor databaseVendor;
+
+    private boolean ssoEnabled;
+    private boolean ssoUseLocalJaasConfig;
+    private String ssoJaasConfigName;
+    private String ssoJaasPrincipalPassword;
+    private boolean ssoUseLocalKrbConfig;
+    private boolean ssoKerberosDebug;
+
+    private String loginPasswordEncryptionSalt;
+    private boolean loginPasswordEncryptionEnabled;
+    private boolean superadminLoginPasswordResetAllowed;
+    private String indexDisabledFileExtensions;
+    private String indexDisabledFileMimes;
+    private Set<String> indexDisabledFileExtensionsSet = Collections.emptySet();
+    private Set<String> indexDisabledFileMimesSet = Collections.emptySet();
+    private Map<String, AuthenticationMethodConfiguration> authenticationConfiguration = new HashMap<>();
+    private String cgiUserRoleName;
+    private String cgiMetadataUrl;
+    private String serverName;
+	private String allowFileAdmin;
+    private static List<RoleId> convertRoleIds(String roleIdsString) {
+        String[] ids = StringUtils.split(roleIdsString, ',');
+        List<RoleId> roleIds = new ArrayList<>(ids.length);
+
+        for (String id : ids) {
+            try {
+                roleIds.add(new RoleId(Integer.parseInt(id.trim())));
+            } catch (NumberFormatException ex) {
+            }
+        }
 
-    public String getWorkaroundUriEncoding() {
-        return workaroundUriEncoding;
+        return roleIds;
     }
 
-    public void setWorkaroundUriEncoding(String workaroundUriEncoding) {
-        Charset charset = StringUtils.isNotBlank(workaroundUriEncoding) ? Charset.forName(workaroundUriEncoding) : Charset.defaultCharset() ;
-        this.workaroundUriEncoding = charset.name();
-    }
+    private static List<String> splitCommaSeparatedString(String string) {
+        StringTokenizer st = new StringTokenizer(StringUtils.trimToEmpty(string), " \t\n\r\f,");
+        List<String> tokens = new LinkedList<>();
 
-    public void setTemplatePath( File templatePath ) {
-        this.templatePath = templatePath;
-    }
+        while (st.hasMoreTokens()) {
+            tokens.add(st.nextToken());
+        }
 
-    public void setIncludePath( File includePath ) {
-        this.includePath = includePath;
+        return tokens;
     }
 
-    public void setFilePath( File filePath ) {
-        this.filePath = filePath;
+    private static Set<String> distinctLowerCased(List<String> strings) {
+        Set<String> distinctStrings = new LinkedHashSet<>();
+
+        for (String string : strings) {
+            distinctStrings.add(string.toLowerCase());
+        }
+
+        return Collections.unmodifiableSet(distinctStrings);
     }
 
-    public void setImageUrl( String imageUrl ) {
-        this.imageUrl = imageUrl;
+    public Map<String, AuthenticationMethodConfiguration> getAuthenticationConfiguration() {
+        return authenticationConfiguration;
     }
 
-    public void setSmtpServer( String smtpServer ) {
-        this.smtpServer = smtpServer;
+    public void setAuthenticationConfiguration(String methods) {
+        String[] methodList = methods.split(",\\s?+");
+        int index = 1;
+
+        for (String authenticationMethodName : methodList) {
+            AuthenticationMethodConfiguration configuration = new AuthenticationMethodConfiguration()
+                    .setName(authenticationMethodName)
+                    .setOrder(index);
+
+            authenticationConfiguration.put(authenticationMethodName, configuration);
+            ++index;
+        }
     }
 
-    public void setSmtpPort( int smtpPort ) {
-        this.smtpPort = smtpPort;
+    public String getWorkaroundUriEncoding() {
+        return workaroundUriEncoding;
     }
 
-    public void setDefaultLanguage( String defaultLanguage ) {
-        try {
-            if ( defaultLanguage.length() < 3 ) {
-                defaultLanguage = LanguageMapper.convert639_1to639_2( defaultLanguage );
-            }
-        } catch ( LanguageMapper.LanguageNotSupportedException e1 ) {
-            defaultLanguage = null;
-        }
-        this.defaultLanguage = defaultLanguage;
+    public void setWorkaroundUriEncoding(String workaroundUriEncoding) {
+        Charset charset = StringUtils.isNotBlank(workaroundUriEncoding) ? Charset.forName(workaroundUriEncoding) : Charset.defaultCharset();
+        workaroundUriEncoding = charset.name();
     }
 
     public File getFilePath() {
         return filePath;
     }
 
+    public void setFilePath(File filePath) {
+        this.filePath = filePath;
+    }
+
     public String getSmtpServer() {
         return smtpServer;
     }
 
+    public void setSmtpServer(String smtpServer) {
+        this.smtpServer = smtpServer;
+    }
+
     public int getSmtpPort() {
         return smtpPort;
     }
 
+    public void setSmtpPort(int smtpPort) {
+        this.smtpPort = smtpPort;
+    }
+
     public File getTemplatePath() {
         return templatePath;
     }
 
+    public void setTemplatePath(File templatePath) {
+        this.templatePath = templatePath;
+    }
+
     public String getImageUrl() {
         return imageUrl;
     }
 
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
     public String getDefaultLanguage() {
         return defaultLanguage;
     }
 
+    public void setDefaultLanguage(String defaultLanguage) {
+        try {
+            if (defaultLanguage.length() < 3) {
+                defaultLanguage = LanguageMapper.convert639_1to639_2(defaultLanguage);
+            }
+        } catch (LanguageMapper.LanguageNotSupportedException e1) {
+            defaultLanguage = null;
+        }
+        this.defaultLanguage = defaultLanguage;
+    }
+
     public File getIncludePath() {
         return includePath;
     }
 
+    public void setIncludePath(File includePath) {
+        this.includePath = includePath;
+    }
+
     public String getSessionCookieDomain() {
         return sessionCookieDomain;
     }
 
-    public void setSessionCookieDomain( String sessionCookieDomain ) {
+    public void setSessionCookieDomain(String sessionCookieDomain) {
         this.sessionCookieDomain = sessionCookieDomain;
     }
 
@@ -111,7 +199,7 @@ public File getImagePath() {
         return imagePath;
     }
 
-    public void setImagePath( File imagePath ) {
+    public void setImagePath(File imagePath) {
         this.imagePath = imagePath;
     }
 
@@ -119,7 +207,7 @@ public String getFileAdminRootPaths() {
         return fileAdminRootPaths;
     }
 
-    public void setFileAdminRootPaths( String fileAdminRootPaths ) {
+    public void setFileAdminRootPaths(String fileAdminRootPaths) {
         this.fileAdminRootPaths = fileAdminRootPaths;
     }
 
@@ -127,7 +215,7 @@ public float getIndexingSchedulePeriodInMinutes() {
         return indexingSchedulePeriodInMinutes;
     }
 
-    public void setIndexingSchedulePeriodInMinutes( float indexingSchedulePeriodInMinutes ) {
+    public void setIndexingSchedulePeriodInMinutes(float indexingSchedulePeriodInMinutes) {
         this.indexingSchedulePeriodInMinutes = indexingSchedulePeriodInMinutes;
     }
 
@@ -135,7 +223,7 @@ public String getDocumentPathPrefix() {
         return documentPathPrefix;
     }
 
-    public void setDocumentPathPrefix( String documentPathPrefix ) {
+    public void setDocumentPathPrefix(String documentPathPrefix) {
         this.documentPathPrefix = documentPathPrefix;
     }
 
@@ -143,7 +231,7 @@ public int getDocumentCacheMaxSize() {
         return documentCacheMaxSize;
     }
 
-    public void setDocumentCacheMaxSize( int documentCacheMaxSize ) {
+    public void setDocumentCacheMaxSize(int documentCacheMaxSize) {
         this.documentCacheMaxSize = documentCacheMaxSize;
     }
 
@@ -151,7 +239,7 @@ public String getKeyStorePath() {
         return keyStorePath;
     }
 
-    public void setKeyStorePath( String keyStorePath ) {
+    public void setKeyStorePath(String keyStorePath) {
         this.keyStorePath = keyStorePath;
     }
 
@@ -159,9 +247,9 @@ public String getKeyStoreType() {
         return keyStoreType;
     }
 
-    public void setKeyStoreType( String keyStoreType ) {
+    public void setKeyStoreType(String keyStoreType) {
         if (StringUtils.isBlank(keyStoreType)) {
-            keyStoreType = KeyStore.getDefaultType() ;
+            keyStoreType = KeyStore.getDefaultType();
         }
         this.keyStoreType = keyStoreType;
     }
@@ -181,4 +269,246 @@ public boolean isDenyMultipleUserLogin() {
     public void setDenyMultipleUserLogin(boolean denyMultipleUserLogin) {
         this.denyMultipleUserLogin = denyMultipleUserLogin;
     }
+
+    public String getImageArchiveUrl() {
+        return imageArchiveUrl;
+    }
+
+    public void setImageArchiveUrl(String imageArchiveUrl) {
+        this.imageArchiveUrl = imageArchiveUrl;
+    }
+
+    public File getImageArchiveImagePath() {
+        return imageArchiveImagePath;
+    }
+
+    public void setImageArchiveImagePath(File imageArchiveImagePath) {
+        this.imageArchiveImagePath = imageArchiveImagePath;
+    }
+
+    public String getImageArchiveImageUrl() {
+        return imageArchiveImageUrl;
+    }
+
+    public void setImageArchiveImageUrl(String imageArchiveImageUrl) {
+        this.imageArchiveImageUrl = imageArchiveImageUrl;
+    }
+
+    public String getImageArchiveAllowedRoleIds() {
+        return imageArchiveAllowedRoleIds;
+    }
+
+    public void setImageArchiveAllowedRoleIds(String imageArchiveAllowedRoleIds) {
+        this.imageArchiveAllowedRoleIds = imageArchiveAllowedRoleIds;
+
+        if (imageArchiveAllowedRoleIds != null) {
+            imageArchiveAllowedRoleIdList = convertRoleIds(imageArchiveAllowedRoleIds);
+        }
+    }
+
+    public List<RoleId> getImageArchiveAllowedRoleIdList() {
+        return imageArchiveAllowedRoleIdList;
+    }
+
+    public void setImageArchiveAllowedRoleIdList(List<RoleId> imageArchiveAllowedRoleIdList) {
+        this.imageArchiveAllowedRoleIdList = imageArchiveAllowedRoleIdList;
+    }
+
+    public String getChooseFileAllowedRoleIds() {
+        return chooseFileAllowedRoleIds;
+    }
+
+    public void setChooseFileAllowedRoleIds(String chooseFileAllowedRoleIds) {
+        this.chooseFileAllowedRoleIds = chooseFileAllowedRoleIds;
+
+        if (chooseFileAllowedRoleIds != null) {
+            chooseFileAllowedRoleIdsList = convertRoleIds(chooseFileAllowedRoleIds);
+        }
+    }
+
+    public List<RoleId> getChooseFileAllowedRoleIdsList() {
+        return chooseFileAllowedRoleIdsList;
+    }
+
+    public void setChooseFileAllowedRoleIdsList(List<RoleId> chooseFileAllowedRoleIdsList) {
+        this.chooseFileAllowedRoleIdsList = chooseFileAllowedRoleIdsList;
+    }
+
+    public File getImageCachePath() {
+        return imageCachePath;
+    }
+
+    public void setImageCachePath(File imageCachePath) {
+        this.imageCachePath = imageCachePath;
+    }
+
+    public String getImageCacheAllowedPaths() {
+        return imageCacheAllowedPaths;
+    }
+
+    public void setImageCacheAllowedPaths(String imageCacheAllowedPaths) {
+        this.imageCacheAllowedPaths = imageCacheAllowedPaths;
+    }
+
+    public long getImageCacheMaxSize() {
+        return imageCacheMaxSize;
+    }
+
+    public void setImageCacheMaxSize(long imageCacheMaxSize) {
+        this.imageCacheMaxSize = imageCacheMaxSize;
+    }
+
+    public File getImageMagickPath() {
+        return imageMagickPath;
+    }
+
+    public void setImageMagickPath(File imageMagickPath) {
+        this.imageMagickPath = imageMagickPath;
+    }
+
+    public DatabaseVendor getDatabaseVendor() {
+        return databaseVendor;
+    }
+
+    public void setDatabaseVendor(DatabaseVendor databaseVendor) {
+        this.databaseVendor = databaseVendor;
+    }
+
+    public boolean isSsoEnabled() {
+        return ssoEnabled;
+    }
+
+    public void setSsoEnabled(boolean ssoEnabled) {
+        this.ssoEnabled = ssoEnabled;
+    }
+
+    public boolean isSsoKerberosDebug() {
+        return ssoKerberosDebug;
+    }
+
+    public void setSsoKerberosDebug(boolean ssoKerberosDebug) {
+        this.ssoKerberosDebug = ssoKerberosDebug;
+    }
+
+    public String getSsoJaasConfigName() {
+        return ssoJaasConfigName;
+    }
+
+    public void setSsoJaasConfigName(String ssoJaasConfigName) {
+        this.ssoJaasConfigName = ssoJaasConfigName;
+    }
+
+    public boolean isSsoUseLocalJaasConfig() {
+        return ssoUseLocalJaasConfig;
+    }
+
+    public void setSsoUseLocalJaasConfig(boolean ssoUseLocalJaasConfig) {
+        this.ssoUseLocalJaasConfig = ssoUseLocalJaasConfig;
+    }
+
+    public String getSsoJaasPrincipalPassword() {
+        return ssoJaasPrincipalPassword;
+    }
+
+    public void setSsoJaasPrincipalPassword(String ssoJaasPrincipalPassword) {
+        this.ssoJaasPrincipalPassword = ssoJaasPrincipalPassword;
+    }
+
+    public boolean isSsoUseLocalKrbConfig() {
+        return ssoUseLocalKrbConfig;
+    }
+
+    public void setSsoUseLocalKrbConfig(boolean ssoUseLocalKrbConfig) {
+        this.ssoUseLocalKrbConfig = ssoUseLocalKrbConfig;
+    }
+
+    public boolean isLoginPasswordEncryptionEnabled() {
+        return loginPasswordEncryptionEnabled;
+    }
+
+    public void setLoginPasswordEncryptionEnabled(boolean loginPasswordEncryptionEnabled) {
+        this.loginPasswordEncryptionEnabled = loginPasswordEncryptionEnabled;
+    }
+
+    public String getLoginPasswordEncryptionSalt() {
+        return loginPasswordEncryptionSalt;
+    }
+
+    public void setLoginPasswordEncryptionSalt(String loginPasswordEncryptionSalt) {
+        this.loginPasswordEncryptionSalt = loginPasswordEncryptionSalt;
+    }
+
+    public boolean isSuperadminLoginPasswordResetAllowed() {
+        return superadminLoginPasswordResetAllowed;
+    }
+
+    public void setSuperadminLoginPasswordResetAllowed(boolean superadminLoginPasswordResetAllowed) {
+        this.superadminLoginPasswordResetAllowed = superadminLoginPasswordResetAllowed;
+    }
+
+    public int getImageSizeCacheObjects() {
+        return imageSizeCacheObjects;
+    }
+
+    public void setImageSizeCacheObjects(int imageSizeCacheObjects) {
+        this.imageSizeCacheObjects = imageSizeCacheObjects;
+    }
+
+    public String getIndexDisabledFileExtensions() {
+        return indexDisabledFileExtensions;
+    }
+
+    public void setIndexDisabledFileExtensions(String indexDisabledFileExtensions) {
+        this.indexDisabledFileExtensions = indexDisabledFileExtensions;
+        this.indexDisabledFileExtensionsSet = distinctLowerCased(splitCommaSeparatedString(indexDisabledFileExtensions));
+    }
+
+    public Set<String> getIndexDisabledFileExtensionsAsSet() {
+        return indexDisabledFileExtensionsSet;
+    }
+
+    public String getIndexDisabledFileMimes() {
+        return indexDisabledFileMimes;
+    }
+
+    public void setIndexDisabledFileMimes(String indexDisabledFileMimes) {
+        this.indexDisabledFileMimes = indexDisabledFileMimes;
+        this.indexDisabledFileMimesSet = distinctLowerCased(splitCommaSeparatedString(indexDisabledFileMimes));
+    }
+
+    public Set<String> getIndexDisabledFileMimesAsSet() {
+        return indexDisabledFileMimesSet;
+    }
+
+    public String getCgiUserRoleName() {
+        return this.cgiUserRoleName;
+    }
+
+    public void setCgiUserRoleName(String cgiUserRoleName) {
+        this.cgiUserRoleName = cgiUserRoleName;
+    }
+
+    public String getCgiMetadataUrl() {
+        return this.cgiMetadataUrl;
+    }
+
+    public void setCgiMetadataUrl(String cgiMetadataUrl) {
+        this.cgiMetadataUrl = cgiMetadataUrl;
+    }
+
+    public String getServerName() {
+        return this.serverName;
+    }
+
+    public void setServerName(String serverName) {
+        this.serverName = serverName;
+    }
+
+	public String getAllowFileAdmin() {
+		return allowFileAdmin;
+	}
+
+	public void setAllowFileAdmin(String allowFileAdmin) {
+		this.allowFileAdmin = allowFileAdmin;
+	}
 }
diff --git a/server/src/imcode/server/DatabaseSanityCheck.java b/server/src/imcode/server/DatabaseSanityCheck.java
index 9518a7a6e2..41298ad814 100644
--- a/server/src/imcode/server/DatabaseSanityCheck.java
+++ b/server/src/imcode/server/DatabaseSanityCheck.java
@@ -7,13 +7,38 @@
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ddlutils.Platform;
-import org.apache.ddlutils.alteration.*;
+import org.apache.ddlutils.alteration.AddColumnChange;
+import org.apache.ddlutils.alteration.AddForeignKeyChange;
+import org.apache.ddlutils.alteration.AddIndexChange;
+import org.apache.ddlutils.alteration.AddPrimaryKeyChange;
+import org.apache.ddlutils.alteration.AddTableChange;
+import org.apache.ddlutils.alteration.ColumnAutoIncrementChange;
+import org.apache.ddlutils.alteration.ColumnChange;
+import org.apache.ddlutils.alteration.ColumnDataTypeChange;
+import org.apache.ddlutils.alteration.ColumnDefaultValueChange;
+import org.apache.ddlutils.alteration.ColumnOrderChange;
+import org.apache.ddlutils.alteration.ColumnRequiredChange;
+import org.apache.ddlutils.alteration.ColumnSizeChange;
+import org.apache.ddlutils.alteration.ModelChange;
+import org.apache.ddlutils.alteration.ModelComparator;
+import org.apache.ddlutils.alteration.PrimaryKeyChange;
+import org.apache.ddlutils.alteration.RemoveColumnChange;
+import org.apache.ddlutils.alteration.RemoveForeignKeyChange;
+import org.apache.ddlutils.alteration.RemoveIndexChange;
+import org.apache.ddlutils.alteration.RemovePrimaryKeyChange;
+import org.apache.ddlutils.alteration.RemoveTableChange;
+import org.apache.ddlutils.alteration.TableChange;
 import org.apache.ddlutils.model.ForeignKey;
 import org.apache.ddlutils.model.Index;
 import org.apache.ddlutils.model.IndexColumn;
 import org.apache.ddlutils.model.Reference;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class DatabaseSanityCheck implements SanityCheck {
 
@@ -25,93 +50,43 @@ public DatabaseSanityCheck(Database database, org.apache.ddlutils.model.Database
         this.wantedModel = wantedModel;
     }
 
-    public Collection<Problem> execute() {
-        DdlUtilsPlatformCommand databaseCommand = new DdlUtilsPlatformCommand() {
-            protected Object executePlatform(DatabaseConnection databaseConnection, Platform platform) {
-                org.apache.ddlutils.model.Database actualModel = platform.readModelFromDatabase(null);
-                ModelComparator modelComparator = new ModelComparator(platform.getPlatformInfo(), false);
-                List<ModelChange> changes = modelComparator.compare(actualModel, wantedModel);
-                Set<Class> errorChanges = new HashSet<Class>(Arrays.asList(new Class[] {
-                        AddColumnChange.class,
-                        RemoveColumnChange.class,
-                        AddTableChange.class,
-                        ColumnAutoIncrementChange.class,
-                        AddPrimaryKeyChange.class,
-                        ColumnRequiredChange.class,
-                        PrimaryKeyChange.class,
-                        AddIndexChange.class,
-                        ColumnDataTypeChange.class,
-                }));
-                Set<Class> warningChanges = new HashSet<Class>(Arrays.asList(new Class[] {
-                        ColumnSizeChange.class,
-                        AddForeignKeyChange.class,
-                        ColumnOrderChange.class,
-                }));
-                Set<Class> ignoredChanges = new HashSet<Class>(Arrays.asList(new Class[] {
-                        RemoveForeignKeyChange.class,
-                        RemoveIndexChange.class,
-                        RemoveTableChange.class,
-                        RemovePrimaryKeyChange.class,
-                        ColumnDefaultValueChange.class
-                }));
-                List<Problem> problems = new ArrayList<Problem>();
-                for ( ModelChange change : changes ) {
-                    Class<? extends ModelChange> changeClass = change.getClass();
-                    Problem problem = null;
-                    if (errorChanges.contains(changeClass)) {
-                        problem = getProblem(Problem.Severity.ERROR, change, platform);
-                    } else if (warningChanges.contains(changeClass)) {
-                        problem = getProblem(Problem.Severity.WARNING, change, platform);
-                    } else if (!ignoredChanges.contains(changeClass)){
-                        problem = getProblem(Problem.Severity.UNKNOWN, change, platform);
-                    }
-                    if (null != problem) {
-                        problems.add(problem);
-                    }
-                }
-                return problems;
-            }
-        };
-        return (Collection<Problem>) database.execute(databaseCommand);
-    }
-
     private static Problem getProblem(final Problem.Severity severity, ModelChange change, Platform platform) {
         String changeString;
-        if (change instanceof RemoveIndexChange ) {
+        if (change instanceof RemoveIndexChange) {
             RemoveIndexChange removeIndexChange = (RemoveIndexChange) change;
             Index index = removeIndexChange.getIndex();
-            changeString = "Unexpected index "+index.getName() + " on column(s) "+ stringifyIndexColumns(index);
-        } else if (change instanceof ColumnDefaultValueChange ) {
+            changeString = "Unexpected index " + index.getName() + " on column(s) " + stringifyIndexColumns(index);
+        } else if (change instanceof ColumnDefaultValueChange) {
             ColumnDefaultValueChange columnDefaultValueChange = (ColumnDefaultValueChange) change;
-            changeString = "Unexpected default value "+columnDefaultValueChange.getChangedColumn().getDefaultValue()+", expected "+columnDefaultValueChange.getNewDefaultValue();
-        } else if (change instanceof ColumnDataTypeChange ) {
+            changeString = "Unexpected default value " + columnDefaultValueChange.getChangedColumn().getDefaultValue() + ", expected " + columnDefaultValueChange.getNewDefaultValue();
+        } else if (change instanceof ColumnDataTypeChange) {
             ColumnDataTypeChange columnDataTypeChange = (ColumnDataTypeChange) change;
-            changeString = "Expected data type "+platform.getPlatformInfo().getNativeType(columnDataTypeChange.getNewTypeCode()) ;
-        } else if (change instanceof AddTableChange ) {
+            changeString = "Expected data type " + platform.getPlatformInfo().getNativeType(columnDataTypeChange.getNewTypeCode());
+        } else if (change instanceof AddTableChange) {
             AddTableChange addTableChange = (AddTableChange) change;
-            changeString = "Missing table "+addTableChange.getNewTable();
+            changeString = "Missing table " + addTableChange.getNewTable();
         } else if (change instanceof RemoveForeignKeyChange) {
             RemoveForeignKeyChange removeForeignKeyChange = (RemoveForeignKeyChange) change;
             ForeignKey foreignKey = removeForeignKeyChange.getForeignKey();
-            changeString = "Unexpected foreign key to "+foreignKey.getForeignTableName();
-            changeString+=" ("+stringifyReferences(foreignKey)+")";
+            changeString = "Unexpected foreign key to " + foreignKey.getForeignTableName();
+            changeString += " (" + stringifyReferences(foreignKey) + ")";
         } else if (change instanceof AddForeignKeyChange) {
             AddForeignKeyChange removeForeignKeyChange = (AddForeignKeyChange) change;
             ForeignKey newForeignKey = removeForeignKeyChange.getNewForeignKey();
-            changeString = "Missing foreign key to "+newForeignKey.getForeignTableName();
-            changeString+=" ("+stringifyReferences(newForeignKey)+")";
+            changeString = "Missing foreign key to " + newForeignKey.getForeignTableName();
+            changeString += " (" + stringifyReferences(newForeignKey) + ")";
         } else if (change instanceof AddIndexChange) {
             AddIndexChange addIndexChange = (AddIndexChange) change;
             Index index = addIndexChange.getNewIndex();
-            changeString = "Missing index "+index.getName()+ " on column(s) "+stringifyIndexColumns(index);
+            changeString = "Missing index " + index.getName() + " on column(s) " + stringifyIndexColumns(index);
         } else {
             changeString = change.toString();
         }
-        if (change instanceof ColumnChange ) {
+        if (change instanceof ColumnChange) {
             ColumnChange columnChange = (ColumnChange) change;
-            changeString = columnChange.getChangedTable().getName()+"."+columnChange.getChangedColumn().getName()+": "+changeString ;
-        } else if (change instanceof TableChange ) {
-            changeString = ((TableChange)change).getChangedTable().getName()+": "+changeString ;
+            changeString = columnChange.getChangedTable().getName() + "." + columnChange.getChangedColumn().getName() + ": " + changeString;
+        } else if (change instanceof TableChange) {
+            changeString = ((TableChange) change).getChangedTable().getName() + ": " + changeString;
         }
 
         return new SimpleProblem(severity, changeString);
@@ -120,7 +95,7 @@ private static Problem getProblem(final Problem.Severity severity, ModelChange c
     private static String stringifyIndexColumns(Index index) {
         return commafy(index.getColumns(), new Transformer() {
             public Object transform(Object input) {
-                IndexColumn indexColumn = (IndexColumn) input ;
+                IndexColumn indexColumn = (IndexColumn) input;
                 return indexColumn.getName();
             }
         });
@@ -139,4 +114,55 @@ private static String commafy(Object[] array, Transformer transformer) {
         return StringUtils.join(CollectionUtils.collect(Arrays.asList(array), transformer).iterator(), ", ");
     }
 
+    public Collection<Problem> execute() {
+        DdlUtilsPlatformCommand databaseCommand = new DdlUtilsPlatformCommand() {
+            protected Object executePlatform(DatabaseConnection databaseConnection, Platform platform) {
+                platform.setDelimitedIdentifierModeOn(true);
+                org.apache.ddlutils.model.Database actualModel = platform.readModelFromDatabase(null);
+                ModelComparator modelComparator = new ModelComparator(platform.getPlatformInfo(), false);
+                List<ModelChange> changes = modelComparator.compare(actualModel, wantedModel);
+                Set<Class> errorChanges = new HashSet<>(Arrays.asList(new Class[]{
+                        AddColumnChange.class,
+                        RemoveColumnChange.class,
+                        AddTableChange.class,
+                        ColumnAutoIncrementChange.class,
+                        AddPrimaryKeyChange.class,
+                        ColumnRequiredChange.class,
+                        PrimaryKeyChange.class,
+                        AddIndexChange.class,
+                        ColumnDataTypeChange.class,
+                }));
+                Set<Class> warningChanges = new HashSet<>(Arrays.asList(new Class[]{
+                        ColumnSizeChange.class,
+                        AddForeignKeyChange.class,
+                        ColumnOrderChange.class,
+                }));
+                Set<Class> ignoredChanges = new HashSet<>(Arrays.asList(new Class[]{
+                        RemoveForeignKeyChange.class,
+                        RemoveIndexChange.class,
+                        RemoveTableChange.class,
+                        RemovePrimaryKeyChange.class,
+                        ColumnDefaultValueChange.class
+                }));
+                List<Problem> problems = new ArrayList<>();
+                for (ModelChange change : changes) {
+                    Class<? extends ModelChange> changeClass = change.getClass();
+                    Problem problem = null;
+                    if (errorChanges.contains(changeClass)) {
+                        problem = getProblem(Problem.Severity.ERROR, change, platform);
+                    } else if (warningChanges.contains(changeClass)) {
+                        problem = getProblem(Problem.Severity.WARNING, change, platform);
+                    } else if (!ignoredChanges.contains(changeClass)) {
+                        problem = getProblem(Problem.Severity.UNKNOWN, change, platform);
+                    }
+                    if (null != problem) {
+                        problems.add(problem);
+                    }
+                }
+                return problems;
+            }
+        };
+        return (Collection<Problem>) database.execute(databaseCommand);
+    }
+
 }
diff --git a/server/src/imcode/server/DatabaseVendor.java b/server/src/imcode/server/DatabaseVendor.java
new file mode 100644
index 0000000000..edf7c347b4
--- /dev/null
+++ b/server/src/imcode/server/DatabaseVendor.java
@@ -0,0 +1,22 @@
+package imcode.server;
+
+public enum DatabaseVendor {
+    MYSQL("com.mysql.jdbc.Driver"),
+    MSSQL("net.sourceforge.jtds.jdbc.Driver");
+
+    private final String driverClass;
+
+    private DatabaseVendor(String driverClass) {
+        this.driverClass = driverClass;
+    }
+
+    public static DatabaseVendor findByDriverClass(String klass) {
+        for (DatabaseVendor vendor : DatabaseVendor.values()) {
+            if (vendor.driverClass.equals(klass)) {
+                return vendor;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/server/src/imcode/server/DefaultImcmsServices.java b/server/src/imcode/server/DefaultImcmsServices.java
index 8978c15a8c..018ada6e73 100644
--- a/server/src/imcode/server/DefaultImcmsServices.java
+++ b/server/src/imcode/server/DefaultImcmsServices.java
@@ -1,40 +1,47 @@
 package imcode.server;
 
 import com.imcode.db.Database;
-import com.imcode.db.commands.SqlUpdateDatabaseCommand;
 import com.imcode.db.commands.SqlQueryCommand;
 import com.imcode.db.commands.SqlUpdateCommand;
 import com.imcode.imcms.db.DefaultProcedureExecutor;
 import com.imcode.imcms.db.ProcedureExecutor;
 import com.imcode.imcms.db.StringArrayArrayResultSetHandler;
+import com.imcode.imcms.domain.component.AzureAuthenticationProvider;
+import com.imcode.imcms.domain.dto.export.DocumentExportService;
+import com.imcode.imcms.domain.repository.ExternalToLocalRoleLinkComponent;
+import com.imcode.imcms.domain.services.api.DefaultExternalToLocalRoleLinkService;
+import com.imcode.imcms.domain.services.api.ImcmsAuthenticationProviderService;
+import com.imcode.imcms.domain.services.core.ServerSettings;
 import com.imcode.imcms.mapping.CategoryMapper;
 import com.imcode.imcms.mapping.DocumentMapper;
+import com.imcode.imcms.mapping.ImageCacheMapper;
+import com.imcode.imcms.servlet.LoginPasswordManager;
 import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
 import com.imcode.net.ldap.LdapClientException;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.TemplateMapper;
-import imcode.server.document.index.RebuildingDirectoryIndex;
-import imcode.server.document.index.IndexDocumentFactory;
+import imcode.server.document.index.*;
+import imcode.server.kerberos.KerberosLoginService;
 import imcode.server.parser.ParserParameters;
 import imcode.server.parser.TextDocumentParser;
 import imcode.server.user.*;
 import imcode.util.*;
 import imcode.util.io.FileUtility;
 import imcode.util.net.SMTP;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.Converter;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.beanutils.*;
 import org.apache.commons.lang.NullArgumentException;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
+import org.apache.commons.lang.WordUtils;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
 import java.beans.PropertyDescriptor;
 import java.io.*;
+import java.lang.reflect.Method;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.text.Collator;
@@ -45,48 +52,50 @@
 
 final public class DefaultImcmsServices implements ImcmsServices {
 
+    private static final int DEFAULT_STARTDOCUMENT = 1001;
+    private final static Logger mainLog = LogManager.getLogger(ImcmsConstants.MAIN_LOG);
+    private final static Logger log = LogManager.getLogger(DefaultImcmsServices.class.getName());
+    public static final String EXTERNAL_AUTHENTICATOR_LDAP = "ldap";
+    private static final String EXTERNAL_USER_AND_ROLE_MAPPER_LDAP = "ldap";
+
+    static {
+        mainLog.info("Main log started.");
+    }
+
     private final Database database;
+    private final LocalizedMessageProvider localizedMessageProvider;
     private TextDocumentParser textDocParser;
+	private DocumentExportService documentExportService;
     private Config config;
-
-    private static final int DEFAULT_STARTDOCUMENT = 1001;
-
     private SystemData sysData;
-
-    private Date sessionCounterDate;
-    private int sessionCounter = 0;
-    private CachingFileLoader fileLoader ;
-
-    private final static Logger mainLog = Logger.getLogger(ImcmsConstants.MAIN_LOG);
-
-    private final static Logger log = Logger.getLogger(DefaultImcmsServices.class.getName());
-
-    private static final String EXTERNAL_AUTHENTICATOR_LDAP = "LDAP";
-    private static final String EXTERNAL_USER_AND_ROLE_MAPPER_LDAP = "LDAP";
-
+    private CachingFileLoader fileLoader;
     private ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper;
     private ExternalizedImcmsAuthenticatorAndUserRegistry externalizedImcmsAuthAndMapper;
     private DocumentMapper documentMapper;
     private TemplateMapper templateMapper;
+    private ImageCacheMapper imageCacheMapper;
     private KeyStore keyStore;
-
+    private KerberosLoginService kerberosLoginService;
     private Map velocityEngines = new TreeMap();
     private LanguageMapper languageMapper;
     private ProcedureExecutor procedureExecutor;
-    private final LocalizedMessageProvider localizedMessageProvider;
-
-    static {
-        mainLog.info("Main log started.");
-    }
+    private ImcmsAuthenticationProviderService authenticationProviderService;
+    private ExternalToLocalRoleLinkComponent externalToLocalRoleLinkComponent;
+    private DefaultExternalToLocalRoleLinkService externalToLocalRoleLinkService;
 
-    /** Contructs an DefaultImcmsServices object. */
+    /**
+     * Contructs an DefaultImcmsServices object.
+     */
     public DefaultImcmsServices(Database database, Properties props, LocalizedMessageProvider localizedMessageProvider,
-                                CachingFileLoader fileLoader, DefaultProcedureExecutor procedureExecutor) {
+                                CachingFileLoader fileLoader, DefaultProcedureExecutor procedureExecutor,
+                                ImcmsAuthenticationProviderService authenticationProviderService,
+                                ExternalToLocalRoleLinkComponent externalToLocalRoleLinkComponent) {
         this.database = database;
         this.localizedMessageProvider = localizedMessageProvider;
         this.procedureExecutor = procedureExecutor;
         this.fileLoader = fileLoader;
         initConfig(props);
+        initSso();
         initKeyStore();
         initSysData();
         initSessionCounter();
@@ -94,28 +103,122 @@ public DefaultImcmsServices(Database database, Properties props, LocalizedMessag
         initAuthenticatorsAndUserAndRoleMappers(props);
         initDocumentMapper();
         initTemplateMapper();
+        initImageCacheMapper();
         initTextDocParser();
+		initDocumentExportService();
+        this.authenticationProviderService = authenticationProviderService;
+        this.externalToLocalRoleLinkComponent = externalToLocalRoleLinkComponent;
+        this.externalToLocalRoleLinkService = new DefaultExternalToLocalRoleLinkService(externalToLocalRoleLinkComponent);
+
+        kerberosLoginService = new KerberosLoginService(config);
+    }
+
+    private static Config createConfigFromProperties(Properties props) {
+        Config config = new Config();
+        ConvertUtils.register(new WebappRelativeFileConverter(), File.class);
+        PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(config);
+
+        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            Method extraWriteMethod = null;
+            if (null == propertyDescriptor.getWriteMethod()) {
+                extraWriteMethod = MethodUtils.getAccessibleMethod(Config.class, "set" + WordUtils.capitalize(propertyDescriptor.getName()), String.class);
+                if (extraWriteMethod == null) {
+                    continue;
+                }
+            }
+
+            String uncapitalizedPropertyName = propertyDescriptor.getName();
+            String capitalizedPropertyName = StringUtils.capitalize(uncapitalizedPropertyName);
+            String propertyValue = props.getProperty(capitalizedPropertyName);
+            if (null != propertyValue) {
+                try {
+                    if (extraWriteMethod == null) {
+                        BeanUtils.setProperty(config, uncapitalizedPropertyName, propertyValue);
+                    } else {
+                        extraWriteMethod.invoke(config, propertyValue);
+                    }
+                } catch (Exception e) {
+                    log.error("Failed to set property " + capitalizedPropertyName, e.getCause());
+                    continue;
+                }
+            }
+
+            try {
+                String property = BeanUtils.getProperty(config, uncapitalizedPropertyName);
+                if (null != property) {
+                    log.info(capitalizedPropertyName + " = " + property);
+                } else {
+                    log.warn(capitalizedPropertyName + " not set.");
+                }
+            } catch (Exception e) {
+                log.error(e);
+            }
+        }
+
+        String jdbcDriver = props.getProperty(ServerSettings.JDBC_DRIVER);
+        DatabaseVendor databaseVendor = DatabaseVendor.findByDriverClass(jdbcDriver);
+        if (databaseVendor == null) {
+            log.error("Error with JdbcDriver settings! Check server properties!");
+            throw new RuntimeException("Failed to determine database vendor using JdbcDriver: " + jdbcDriver);
+        } else {
+            config.setDatabaseVendor(databaseVendor);
+            return config;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T instantiate(String mapperName) { // modify create instance of class
+        try {
+            return (null == mapperName) ? null : (T) Class.forName(mapperName).newInstance();
+        } catch (ClassNotFoundException e) {
+            log.error("Could not create instance of class '" + mapperName + "'.", e);
+        } catch (Exception e) {
+            log.error("Error", e);
+        }
+        return null;
+    }
+
+    private void initSso() {
+        if (!config.isSsoEnabled()) {
+            return;
+        }
+
+        if (config.isSsoUseLocalJaasConfig()) {
+            File jaasConfigFile = new File(getRealContextPath(), "WEB-INF/conf/jaas.conf");
+
+            System.setProperty("java.security.auth.login.config", jaasConfigFile.getAbsolutePath());
+        }
+
+        if (config.isSsoUseLocalKrbConfig()) {
+            File krbConfigFile = new File(getRealContextPath(), "WEB-INF/conf/krb.conf");
+
+            System.setProperty("java.security.krb5.conf", krbConfigFile.getAbsolutePath());
+        }
+
+        if (config.isSsoKerberosDebug()) {
+            System.setProperty("sun.security.krb5.debug", "true");
+        }
     }
 
     private void initKeyStore() {
         String keyStoreType = config.getKeyStoreType();
-        if ( StringUtils.isBlank(keyStoreType) ) {
+        if (StringUtils.isBlank(keyStoreType)) {
             keyStoreType = KeyStore.getDefaultType();
         }
         try {
             keyStore = KeyStore.getInstance(keyStoreType);
             keyStore.load(null, null);
-        } catch ( GeneralSecurityException e ) {
+        } catch (GeneralSecurityException e) {
             throw new UnhandledException(e);
-        } catch ( IOException e ) {
+        } catch (IOException e) {
             throw new UnhandledException(e);
         }
         String keyStorePath = config.getKeyStorePath();
-        if ( StringUtils.isNotBlank(keyStorePath) ) {
+        if (StringUtils.isNotBlank(keyStorePath)) {
             File keyStoreFile = FileUtility.getFileFromWebappRelativePath(keyStorePath);
             try {
                 keyStore.load(new FileInputStream(keyStoreFile), null);
-            } catch ( Exception e ) {
+            } catch (Exception e) {
                 log.error("Failed to load keystore from path " + keyStoreFile, e);
             }
         }
@@ -125,53 +228,28 @@ private void initTextDocParser() {
         textDocParser = new TextDocumentParser(this);
     }
 
+	private void initDocumentExportService() {
+		this.documentExportService = new DocumentExportService(this);
+	}
+
     private void initSysData() {
         sysData = getSystemDataFromDb();
     }
 
     private void initConfig(Properties props) {
         this.config = createConfigFromProperties(props);
-    }
 
-    private static Config createConfigFromProperties(Properties props) {
-        Config config = new Config();
-        ConvertUtils.register(new WebappRelativeFileConverter(), File.class);
-        PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(config);
-        for ( int i = 0; i < propertyDescriptors.length; i++ ) {
-            PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
-            if ( null == propertyDescriptor.getWriteMethod() ) {
-                continue;
-            }
-            String uncapitalizedPropertyName = propertyDescriptor.getName();
-            String capitalizedPropertyName = StringUtils.capitalize(uncapitalizedPropertyName);
-            String propertyValue = props.getProperty(capitalizedPropertyName);
-            if ( null != propertyValue ) {
-                try {
-                    BeanUtils.setProperty(config, uncapitalizedPropertyName, propertyValue);
-                } catch ( Exception e ) {
-                    log.error("Failed to set property " + capitalizedPropertyName, e.getCause());
-                    continue;
-                }
-            }
-            try {
-                String setPropertyValue = BeanUtils.getProperty(config, uncapitalizedPropertyName);
-                if ( null != setPropertyValue ) {
-                    log.info(capitalizedPropertyName + " = " + setPropertyValue);
-                } else {
-                    log.warn(capitalizedPropertyName + " not set.");
-                }
-            } catch ( Exception e ) {
-                log.error(e, e);
-            }
-        }
-        return config;
+        ImcmsImageUtils.setImageSizeCacheObjects(config.getImageSizeCacheObjects());
     }
 
     private void initSessionCounter() {
+        int sessionCounter;
+        Date sessionCounterDate;
+
         try {
             sessionCounter = getSessionCounterFromDb();
             sessionCounterDate = getSessionCounterDateFromDb();
-        } catch ( NumberFormatException ex ) {
+        } catch (NumberFormatException ex) {
             log.fatal("Failed to get SessionCounter from db.", ex);
             throw ex;
         }
@@ -184,8 +262,8 @@ private Date getSessionCounterDateFromDb() {
         try {
             DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING);
             final Object[] parameters = new String[0];
-            return dateFormat.parse((String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 2", parameters, Utility.SINGLE_STRING_HANDLER)));
-        } catch ( ParseException ex ) {
+            return dateFormat.parse(getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 2", parameters, Utility.SINGLE_STRING_HANDLER)));
+        } catch (ParseException ex) {
             log.fatal("Failed to get SessionCounterDate from db.", ex);
             throw new UnhandledException(ex);
         }
@@ -193,19 +271,34 @@ private Date getSessionCounterDateFromDb() {
 
     private int getSessionCounterFromDb() {
         final Object[] parameters = new String[0];
-        return Integer.parseInt((String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 1", parameters, Utility.SINGLE_STRING_HANDLER)));
+        return Integer.parseInt(getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 1", parameters, Utility.SINGLE_STRING_HANDLER)));
     }
 
     private void initDocumentMapper() {
-        File indexDirectory = new File(getRealContextPath(), "WEB-INF/index");
+        File indexDirectory = Imcms.getIndexDirectory();
         documentMapper = new DocumentMapper(this, this.getDatabase());
-        documentMapper.setDocumentIndex(new LoggingDocumentIndex(database, new PhaseQueryFixingDocumentIndex(new RebuildingDirectoryIndex(indexDirectory, getConfig().getIndexingSchedulePeriodInMinutes(), new IndexDocumentFactory(getCategoryMapper()))))) ;
+        final DefaultReindexingDocumentRepository repository = new DefaultReindexingDocumentRepository(documentMapper);
+        DefaultDirectoryIndex.addCustomDocRepository("default", repository);
+
+        final float indexingSchedulePeriod = getConfig().getIndexingSchedulePeriodInMinutes();
+        final IndexDocumentFactory indexDocumentFactory = new IndexDocumentFactory(getCategoryMapper());
+
+        DocumentIndex documentIndex = new RebuildingDirectoryIndex(
+                indexDirectory, indexingSchedulePeriod, indexDocumentFactory
+        );
+        documentIndex = new PhaseQueryFixingDocumentIndex(documentIndex);
+
+        documentMapper.setDocumentIndex(new LoggingDocumentIndex(database, documentIndex));
     }
 
     private void initTemplateMapper() {
         templateMapper = new TemplateMapper(this);
     }
 
+    private void initImageCacheMapper() {
+        imageCacheMapper = new ImageCacheMapper(database);
+    }
+
     private void initAuthenticatorsAndUserAndRoleMappers(Properties props) {
         String externalAuthenticatorName = props.getProperty("ExternalAuthenticator");
         String externalUserAndRoleMapperName = props.getProperty("ExternalUserAndRoleMapper");
@@ -215,19 +308,20 @@ private void initAuthenticatorsAndUserAndRoleMappers(Properties props) {
 
         boolean externalAuthenticatorIsSet = StringUtils.isNotBlank(externalAuthenticatorName);
         boolean externalUserAndRoleRegistryIsSet = StringUtils.isNotBlank(externalUserAndRoleMapperName);
-        if ( externalAuthenticatorIsSet && externalUserAndRoleRegistryIsSet ) {
+
+        if (externalAuthenticatorIsSet && externalUserAndRoleRegistryIsSet) {
             log.info("ExternalAuthenticator: " + externalAuthenticatorName);
             log.info("ExternalUserAndRoleMapper: " + externalUserAndRoleMapperName);
             externalAuthenticator =
                     initExternalAuthenticator(externalAuthenticatorName, props);
             externalUserAndRoleRegistry =
                     initExternalUserAndRoleMapper(externalUserAndRoleMapperName, props);
-            if ( null == externalAuthenticator || null == externalUserAndRoleRegistry ) {
+            if (null == externalAuthenticator || null == externalUserAndRoleRegistry) {
                 log.error("Failed to initialize both authenticator and user-and-role-documentMapper, using default implementations.");
                 externalAuthenticator = null;
                 externalUserAndRoleRegistry = null;
             }
-        } else if ( !externalAuthenticatorIsSet && !externalUserAndRoleRegistryIsSet ) {
+        } else if (!externalAuthenticatorIsSet && !externalUserAndRoleRegistryIsSet) {
             log.info("ExternalAuthenticator not set.");
             log.info("ExternalUserAndRoleMapper not set.");
         } else {
@@ -235,7 +329,7 @@ private void initAuthenticatorsAndUserAndRoleMappers(Properties props) {
             log.error("External authenticator and external usermapper should both be either set or not set. Using default implementation.");
         }
 
-        // TO-DO: problem if primary LDAP classes are not instantiatd,
+        // TODO: problem if primary LDAP classes are not instantiated,
         // because of conf error, secondary LDAP also will not be instantiated
         if (externalAuthenticator != null
                 && externalUserAndRoleRegistry != null
@@ -245,31 +339,32 @@ private void initAuthenticatorsAndUserAndRoleMappers(Properties props) {
             ChainedLdapUserAndRoleRegistry chainedLdapUserAndRoleRegistry
                     = new ChainedLdapUserAndRoleRegistry(externalAuthenticator, externalUserAndRoleRegistry);
 
-
-            initAndAddSecondaryLdapUserAndRoleRegistry(chainedLdapUserAndRoleRegistry,
+            initAndAddSecondaryLdapUserAndRoleRegistry(
+                    chainedLdapUserAndRoleRegistry,
                     props);
 
             externalAuthenticator = chainedLdapUserAndRoleRegistry;
             externalUserAndRoleRegistry = chainedLdapUserAndRoleRegistry;
         }
 
-        imcmsAuthenticatorAndUserAndRoleMapper = new ImcmsAuthenticatorAndUserAndRoleMapper(this);
+        imcmsAuthenticatorAndUserAndRoleMapper = new ImcmsAuthenticatorAndUserAndRoleMapper(
+                this,
+                new LoginPasswordManager(StringUtils.trimToNull(config.getLoginPasswordEncryptionSalt())));
         externalizedImcmsAuthAndMapper =
                 new ExternalizedImcmsAuthenticatorAndUserRegistry(imcmsAuthenticatorAndUserAndRoleMapper, externalAuthenticator,
-                                                                  externalUserAndRoleRegistry, getLanguageMapper().getDefaultLanguage());
+                        externalUserAndRoleRegistry, getLanguageMapper().getDefaultLanguage());
         externalizedImcmsAuthAndMapper.synchRolesWithExternal();
     }
 
-
     /**
      * Inits and adds secondary LdapUserAndRoleRegistry to the ChainedLdapUserAndRoleRegistry.
-     * 
+     *
      * @param chainedLdapUserAndRoleRegistry instance of ChainedLdapUserAndRoleRegistry
-     * @param props configuration properties
+     * @param props                          configuration properties
      */
     private void initAndAddSecondaryLdapUserAndRoleRegistry(
             ChainedLdapUserAndRoleRegistry chainedLdapUserAndRoleRegistry,
-            Properties props) {   
+            Properties props) {
 
         final String secondaryLdapPrefix = "Secondary";
         final int secondaryLdapPrefixLength = secondaryLdapPrefix.length();
@@ -281,10 +376,10 @@ private void initAndAddSecondaryLdapUserAndRoleRegistry(
         Enumeration names = props.propertyNames();
 
         while (names.hasMoreElements()) {
-            String name = (String)names.nextElement();
+            String name = (String) names.nextElement();
 
             if (name.startsWith(secondaryLdapPrefix)) {
-                String newName = name.substring(secondaryLdapPrefixLength);                
+                String newName = name.substring(secondaryLdapPrefixLength);
                 String value = props.getProperty(name);
 
                 secondaryLdapProperties.setProperty(newName, value);
@@ -292,7 +387,7 @@ private void initAndAddSecondaryLdapUserAndRoleRegistry(
         }
 
         if (secondaryLdapProperties.size() == 0) {
-            log.info("Secondary LDAP configuration parameters not found.");    
+            log.info("Secondary LDAP configuration parameters not found.");
         } else {
             log.info("Found secondary LDAP configuration parameters. " +
                     "Initializing secondary LDAP user and role registry");
@@ -307,8 +402,8 @@ private void initAndAddSecondaryLdapUserAndRoleRegistry(
 
             boolean externalAuthenticatorIsSet = StringUtils.isNotBlank(externalAuthenticatorName);
             boolean externalUserAndRoleRegistryIsSet = StringUtils.isNotBlank(externalUserAndRoleMapperName);
-            
-            if ( !externalAuthenticatorIsSet || !externalUserAndRoleRegistryIsSet ) {
+
+            if (!externalAuthenticatorIsSet || !externalUserAndRoleRegistryIsSet) {
                 log.error("Secondary LDAP configuration ignored. External authenticator and external usermapper should both be either set or not set.");
             } else {
                 log.info("SecondaryExternalAuthenticator: " + externalAuthenticatorName);
@@ -318,36 +413,42 @@ private void initAndAddSecondaryLdapUserAndRoleRegistry(
                 externalUserAndRoleRegistry =
                         initExternalUserAndRoleMapper(externalUserAndRoleMapperName, secondaryLdapProperties);
 
-                if ( null == externalAuthenticator || null == externalUserAndRoleRegistry ) {
+                if (null == externalAuthenticator || null == externalUserAndRoleRegistry) {
                     log.error("Secondary LDAP configuration ignored. Failed to initialize both authenticator and user-and-role-documentMapper.");
                 } else if (!(externalAuthenticator instanceof LdapUserAndRoleRegistry)
                         || !(externalUserAndRoleRegistry instanceof LdapUserAndRoleRegistry)) {
                     log.error("Secondary LDAP configuration ignored. Both SecondaryExternalAuthenticator and SecondaryExternalUserAndRoleMapper properties should be set to LDAP.");
                 } else {
-                     chainedLdapUserAndRoleRegistry.addLink(externalAuthenticator, externalUserAndRoleRegistry);   
+                    chainedLdapUserAndRoleRegistry.addLink(externalAuthenticator, externalUserAndRoleRegistry);
                 }
             }
         }
     }
-    
 
     public synchronized int getSessionCounter() {
-        return sessionCounter;
+        return getSessionCounterFromDb();
+    }
+
+    /**
+     * Set session counter.
+     */
+    public synchronized void setSessionCounter(int value) {
+        setSessionCounterInDb(value);
     }
 
     public String getSessionCounterDateAsString() {
         DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING);
 
-        return dateFormat.format(sessionCounterDate);
+        return dateFormat.format(getSessionCounterDateFromDb());
     }
 
     public UserDomainObject verifyUserByIpOrDefault(String remoteAddr) {
         UserDomainObject user = imcmsAuthenticatorAndUserAndRoleMapper.getUserByIpAddress(remoteAddr);
-        if ( null == user ) {
+        if (null == user) {
             user = imcmsAuthenticatorAndUserAndRoleMapper.getDefaultUser();
         }
         UserDomainObject result = null;
-        if ( !user.isActive() ) {
+        if (!user.isActive()) {
             logUserDeactivated(user);
         } else {
             result = user;
@@ -361,25 +462,44 @@ public LocalizedMessageProvider getLocalizedMessageProvider() {
     }
 
     public UserDomainObject verifyUser(String login, String password) {
-        NDC.push("verifyUser");
-        try {
+        try(CloseableThreadContext.Instance ignored=CloseableThreadContext.push("verifyUser")) {
             UserDomainObject result = null;
 
+            if (login == null || password == null) {
+                throw new MissingLoginDataException();
+            }
+
             boolean userAuthenticates = externalizedImcmsAuthAndMapper.authenticate(login, password);
             UserDomainObject user = externalizedImcmsAuthAndMapper.getUser(login);
-            if ( null == user ) {
+            if (null == user) {
                 mainLog.info("->User '" + login + "' failed to log in: User not found.");
-            } else if ( !user.isActive() ) {
+            } else if (!user.isActive()) {
                 logUserDeactivated(user);
-            } else if ( !userAuthenticates ) {
+            } else if (!userAuthenticates) {
                 mainLog.info("->User '" + login + "' failed to log in: Wrong password.");
             } else {
                 result = user;
                 logUserLoggedIn(user);
             }
             return result;
-        } finally {
-            NDC.pop();
+        }
+    }
+
+    public UserDomainObject verifyUser(String clientPrincipalName) {
+        String login = clientPrincipalName.substring(0, clientPrincipalName.lastIndexOf('@'));
+	    try (CloseableThreadContext.Instance ignored = CloseableThreadContext.push("verifyUser")) {
+            UserDomainObject result = null;
+
+            UserDomainObject user = externalizedImcmsAuthAndMapper.getUser(login);
+            if (null == user) {
+                mainLog.info("->User '" + login + "' failed to log in: User not found.");
+            } else if (!user.isActive()) {
+                logUserDeactivated(user);
+            } else {
+                result = user;
+                logUserLoggedIn(user);
+            }
+            return result;
         }
     }
 
@@ -388,66 +508,54 @@ private void logUserDeactivated(UserDomainObject user) {
     }
 
     private void logUserLoggedIn(UserDomainObject user) {
-        if ( !user.isDefaultUser() ) {
+        if (!user.isDefaultUser()) {
             mainLog.info("->User '" + user.getLoginName() + "' successfully logged in.");
         }
     }
 
     public synchronized void incrementSessionCounter() {
-        sessionCounter++;
-        final Object[] parameters = new String[] { ""
-                                                   + sessionCounter };
-        getDatabase().execute(new SqlUpdateCommand("UPDATE sys_data SET value = ? WHERE type_id = 1", parameters));
+        getDatabase().execute(new SqlUpdateCommand("UPDATE sys_data SET value = value + 1 WHERE type_id = 1", new Object[]{}));
     }
 
     private UserAndRoleRegistry initExternalUserAndRoleMapper(String externalUserAndRoleMapperName,
                                                               Properties userAndRoleMapperPropertiesSubset) {
-        UserAndRoleRegistry externalUserAndRoleRegistry = null;
-        if ( null == externalUserAndRoleMapperName ) {
-            externalUserAndRoleRegistry = null;
-        } else if ( EXTERNAL_USER_AND_ROLE_MAPPER_LDAP.equalsIgnoreCase(externalUserAndRoleMapperName) ) {
-            try {
-                externalUserAndRoleRegistry = new LdapUserAndRoleRegistry(userAndRoleMapperPropertiesSubset);
-            } catch ( LdapClientException e ) {
-                log.error("LdapUserAndRoleRegistry could not be created, using default user and role documentMapper.",
-                          e);
-            }
-        } else {
-            externalUserAndRoleRegistry = (UserAndRoleRegistry) createInstanceOfClass(externalUserAndRoleMapperName);
+        switch (externalUserAndRoleMapperName.toLowerCase()) {
+            case EXTERNAL_USER_AND_ROLE_MAPPER_LDAP:
+                return initLdapUserAndRoleRegistry(userAndRoleMapperPropertiesSubset);
+            case AzureAuthenticationProvider.EXTERNAL_USER_AND_ROLE_AZURE_AD:
+                return initAzureActiveDirectoryUserAndRoleRegistry(userAndRoleMapperPropertiesSubset);
+            default:
+                return instantiate(externalUserAndRoleMapperName);
         }
-        return externalUserAndRoleRegistry;
     }
 
-    private Authenticator initExternalAuthenticator(String externalAuthenticatorName,
-                                                    Properties authenticatorPropertiesSubset) {
-        Authenticator externalAuthenticator = null;
+    private LdapUserAndRoleRegistry initLdapUserAndRoleRegistry(Properties userAndRoleMapperPropertiesSubset) {
         try {
-            if ( null == externalAuthenticatorName ) {
-                externalAuthenticator = null;
-            } else if ( EXTERNAL_AUTHENTICATOR_LDAP.equalsIgnoreCase(externalAuthenticatorName) ) {
-                try {
-                    externalAuthenticator = new LdapUserAndRoleRegistry(authenticatorPropertiesSubset);
-                } catch ( LdapClientException e ) {
-                    log.error("LdapUserAndRoleRegistry could not be created, using default user and role documentMapper.",
-                              e);
-                }
-            } else {
-                externalAuthenticator = (Authenticator) createInstanceOfClass(externalAuthenticatorName);
-            }
-        } catch ( Exception e ) {
-            log.error("Failed to initialize external authenticator.", e);
+            return new LdapUserAndRoleRegistry(userAndRoleMapperPropertiesSubset);
+        } catch (LdapClientException e) {
+            log.error("LdapUserAndRoleRegistry could not be created, using default user and role documentMapper.", e);
+            return null;
         }
-        return externalAuthenticator;
     }
 
-    private static Object createInstanceOfClass(String className) {
-        Object instance = null;
-        try {
-            instance = Class.forName(className).newInstance();
-        } catch ( Exception e ) {
-            log.error("Could not create instance of class '" + className + "'.", e);
+    private UserAndRoleRegistry initAzureActiveDirectoryUserAndRoleRegistry(Properties userAndRoleMapperPropertiesSubset) {
+        return null;
+    }
+
+    private Authenticator initExternalAuthenticator(String externalAuthenticatorName,
+                                                    Properties authenticatorPropertiesSubset) {
+        switch (externalAuthenticatorName.toLowerCase()) {
+            case EXTERNAL_AUTHENTICATOR_LDAP:
+                return initLdapUserAndRoleRegistry(authenticatorPropertiesSubset);
+            case AzureAuthenticationProvider.EXTERNAL_USER_AND_ROLE_AZURE_AD:
+                return initAzureActiveDirectoryAuthenticator(authenticatorPropertiesSubset);
+            default:
+                return instantiate(externalAuthenticatorName);
         }
-        return instance;
+    }
+
+    private Authenticator initAzureActiveDirectoryAuthenticator(Properties authenticatorPropertiesSubset) {
+        return null;
     }
 
     public void parsePage(ParserParameters paramsToParse, Writer writer)
@@ -467,6 +575,22 @@ public TemplateMapper getTemplateMapper() {
         return templateMapper;
     }
 
+	public DocumentExportService getDocumentExportService() {
+		return documentExportService;
+	}
+
+    public ImcmsAuthenticationProviderService getAuthenticationProviderService() {
+        return authenticationProviderService;
+    }
+
+    public ExternalToLocalRoleLinkComponent getExternalToLocalRoleLinkComponent() {
+        return externalToLocalRoleLinkComponent;
+    }
+
+    public DefaultExternalToLocalRoleLinkService getExternalToLocalRoleLinkService() {
+        return externalToLocalRoleLinkService;
+    }
+
     public SMTP getSMTP() {
         return new SMTP(config.getSmtpServer(), config.getSmtpPort());
     }
@@ -475,35 +599,39 @@ public ImcmsAuthenticatorAndUserAndRoleMapper getImcmsAuthenticatorAndUserAndRol
         return imcmsAuthenticatorAndUserAndRoleMapper;
     }
 
-    /** Parse doc replace variables with data , use template */
+    /**
+     * Parse doc replace variables with data , use template
+     */
     public String getAdminTemplate(String adminTemplateName, UserDomainObject user,
                                    List tagsWithReplacements) {
         return getTemplateFromDirectory(adminTemplateName, user, tagsWithReplacements, "admin");
     }
 
-    /** Parse doc replace variables with data , use template */
+    /**
+     * Parse doc replace variables with data , use template
+     */
     public String getTemplateFromDirectory(String adminTemplateName, UserDomainObject user, List variables,
                                            String directory) {
-        if ( null == user ) {
+        if (null == user) {
             throw new NullArgumentException("user");
         }
         String langPrefix = user.getLanguageIso639_2();
         return getTemplate(langPrefix + "/" + directory + "/"
-                           + adminTemplateName, user, variables);
+                + adminTemplateName, user, variables);
     }
 
     private String getTemplate(String path, UserDomainObject user, List variables) {
         try {
             VelocityEngine velocity = getVelocityEngine(user);
             VelocityContext context = getVelocityContext(user);
-            if ( null != variables ) {
+            if (null != variables) {
                 List parseDocVariables = new ArrayList(variables.size());
-                for ( Iterator iterator = variables.iterator(); iterator.hasNext(); ) {
+                for (Iterator iterator = variables.iterator(); iterator.hasNext(); ) {
                     String key = (String) iterator.next();
                     Object value = iterator.next();
                     context.put(key, value);
-                    boolean isVelocityVariable = StringUtils.isAlpha(key) || !( value instanceof String );
-                    if ( !isVelocityVariable ) {
+                    boolean isVelocityVariable = StringUtils.isAlpha(key) || !(value instanceof String);
+                    if (!isVelocityVariable) {
                         parseDocVariables.add(key);
                         parseDocVariables.add(value);
                     }
@@ -513,11 +641,11 @@ private String getTemplate(String path, UserDomainObject user, List variables) {
             StringWriter stringWriter = new StringWriter();
             velocity.mergeTemplate(path, Imcms.DEFAULT_ENCODING, context, stringWriter);
             String result = stringWriter.toString();
-            if ( null != variables ) {
+            if (null != variables) {
                 result = Parser.parseDoc(result, (String[]) variables.toArray(new String[variables.size()]));
             }
             return result;
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             throw new UnhandledException("getTemplate(\"" + path + "\") : " + e.getMessage(), e);
         }
     }
@@ -529,6 +657,7 @@ private synchronized VelocityEngine createVelocityEngine(String languageIso639_2
         velocity.setProperty(VelocityEngine.VM_LIBRARY_AUTORELOAD, "true");
         velocity.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.SimpleLog4JLogSystem");
         velocity.setProperty(VelocityEngine.INPUT_ENCODING, Imcms.DEFAULT_ENCODING);
+        velocity.setProperty(VelocityEngine.OUTPUT_ENCODING, Imcms.DEFAULT_ENCODING);
         velocity.setProperty("runtime.log.logsystem.log4j.category", "org.apache.velocity");
         velocity.init();
         return velocity;
@@ -538,12 +667,12 @@ public VelocityEngine getVelocityEngine(UserDomainObject user) {
         try {
             String languageIso639_2 = user.getLanguageIso639_2();
             VelocityEngine velocityEngine = (VelocityEngine) velocityEngines.get(languageIso639_2);
-            if ( velocityEngine == null ) {
+            if (velocityEngine == null) {
                 velocityEngine = createVelocityEngine(languageIso639_2);
                 velocityEngines.put(languageIso639_2, velocityEngine);
             }
             return velocityEngine;
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             throw new UnhandledException(e);
         }
     }
@@ -568,39 +697,38 @@ public KeyStore getKeyStore() {
         return keyStore;
     }
 
-    /** Set session counter. */
-    public synchronized void setSessionCounter(int value) {
-        setSessionCounterInDb(value);
-        sessionCounter = getSessionCounterFromDb();
-    }
-
     private void setSessionCounterInDb(int value) {
-        final Object[] parameters = new String[] { ""
-                                                   + value };
+        final Object[] parameters = new String[]{""
+                + value};
         getProcedureExecutor().executeUpdateProcedure("SetSessionCounterValue", parameters);
     }
 
-    /** Set session counter date. */
-    public void setSessionCounterDate(Date date) {
-        setSessionCounterDateInDb(date);
-        sessionCounterDate = getSessionCounterDateFromDb();
-    }
-
     private void setSessionCounterDateInDb(Date date) {
         DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING);
-        final Object[] parameters = new String[] { dateFormat.format(date) };
+        final Object[] parameters = new String[]{dateFormat.format(date)};
         getProcedureExecutor().executeUpdateProcedure("SetSessionCounterDate", parameters);
     }
 
-    /** Get session counter date. */
+    /**
+     * Get session counter date.
+     */
     public Date getSessionCounterDate() {
-        return sessionCounterDate;
+        return getSessionCounterDateFromDb();
+    }
+
+    /**
+     * Set session counter date.
+     */
+    public void setSessionCounterDate(Date date) {
+        setSessionCounterDateInDb(date);
     }
 
-    /** get doctype */
+    /**
+     * get doctype
+     */
     public int getDocType(int meta_id) {
         DocumentDomainObject document = documentMapper.getDocument(meta_id);
-        if ( null != document ) {
+        if (null != document) {
             return document.getDocumentTypeId();
         } else {
             return 0;
@@ -612,29 +740,51 @@ private SystemData getSystemDataFromDb() {
         SystemData sd = new SystemData();
 
         final Object[] parameters5 = new String[0];
-        String startDocument = (String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 0", parameters5, Utility.SINGLE_STRING_HANDLER));
+        String startDocument = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 0", parameters5, Utility.SINGLE_STRING_HANDLER));
         sd.setStartDocument(startDocument == null ? DEFAULT_STARTDOCUMENT : Integer.parseInt(startDocument));
 
         final Object[] parameters4 = new String[0];
-        String systemMessage = (String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 3", parameters4, Utility.SINGLE_STRING_HANDLER));
+        String systemMessage = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 3", parameters4, Utility.SINGLE_STRING_HANDLER));
         sd.setSystemMessage(systemMessage);
 
         final Object[] parameters3 = new String[0];
-        String serverMasterName = (String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 4", parameters3, Utility.SINGLE_STRING_HANDLER));
+        String serverMasterName = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 4", parameters3, Utility.SINGLE_STRING_HANDLER));
         sd.setServerMaster(serverMasterName);
 
         final Object[] parameters2 = new String[0];
-        String serverMasterAddress = (String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 5", parameters2, Utility.SINGLE_STRING_HANDLER));
+        String serverMasterAddress = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 5", parameters2, Utility.SINGLE_STRING_HANDLER));
         sd.setServerMasterAddress(serverMasterAddress);
 
         final Object[] parameters1 = new String[0];
-        String webMasterName = (String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 6", parameters1, Utility.SINGLE_STRING_HANDLER));
+        String webMasterName = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 6", parameters1, Utility.SINGLE_STRING_HANDLER));
         sd.setWebMaster(webMasterName);
 
-        final Object[] parameters = new String[0];
-        String webMasterAddress = (String) getDatabase().execute(new SqlQueryCommand("SELECT value FROM sys_data WHERE type_id = 7", parameters, Utility.SINGLE_STRING_HANDLER));
+        final Object[] parameters7 = new String[0];
+        String webMasterAddress = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 7", parameters7, Utility.SINGLE_STRING_HANDLER));
         sd.setWebMasterAddress(webMasterAddress);
 
+        final Object[] parameter9 = new String[0];
+        String userLoginPasswordExpirationInterval = getDatabase().execute(new SqlQueryCommand<>("SELECT value FROM sys_data WHERE type_id = 9", parameter9, Utility.SINGLE_STRING_HANDLER));
+        if (userLoginPasswordExpirationInterval == null) {
+            log.warn("System property userLoginPasswordResetExpirationInterval is not set; using default");
+        } else {
+            try {
+                int interval = Integer.parseInt(userLoginPasswordExpirationInterval);
+
+                if (interval > 0) {
+                    sd.setUserLoginPasswordResetExpirationInterval(interval);
+                } else {
+                    log.warn(String.format(
+                            "System property userLoginPasswordResetExpirationInterval must be  '> 0' but set to %d; using default.",
+                            interval));
+                }
+            } catch (Throwable t) {
+                log.warn(String.format(
+                        "System property userLoginPasswordResetExpirationInterval value must be positive integer but set to %s; using default.",
+                        userLoginPasswordExpirationInterval));
+            }
+        }
+
         return sd;
     }
 
@@ -645,20 +795,20 @@ public SystemData getSystemData() {
     public void setSystemData(SystemData sd) {
         String[] sqlParams;
 
-        sqlParams = new String[] { "" + sd.getStartDocument() };
+        sqlParams = new String[]{"" + sd.getStartDocument()};
         getProcedureExecutor().executeUpdateProcedure("StartDocSet", sqlParams);
 
-        database.execute(new SqlUpdateDatabaseCommand("UPDATE sys_data SET value = ? WHERE type_id = 4", new Object[] {
-                sd.getServerMaster() }));
-        database.execute(new SqlUpdateDatabaseCommand("UPDATE sys_data SET value = ? WHERE type_id = 5", new Object[] {
-                sd.getServerMasterAddress() }));
+        database.execute(new SqlUpdateCommand("UPDATE sys_data SET value = ? WHERE type_id = 4", new Object[]{
+                sd.getServerMaster()}));
+        database.execute(new SqlUpdateCommand("UPDATE sys_data SET value = ? WHERE type_id = 5", new Object[]{
+                sd.getServerMasterAddress()}));
 
-        database.execute(new SqlUpdateDatabaseCommand("UPDATE sys_data SET value = ? WHERE type_id = 6", new Object[] {
-                sd.getWebMaster() }));
-        database.execute(new SqlUpdateDatabaseCommand("UPDATE sys_data SET value = ? WHERE type_id = 7", new Object[] {
-                sd.getWebMasterAddress() }));
+        database.execute(new SqlUpdateCommand("UPDATE sys_data SET value = ? WHERE type_id = 6", new Object[]{
+                sd.getWebMaster()}));
+        database.execute(new SqlUpdateCommand("UPDATE sys_data SET value = ? WHERE type_id = 7", new Object[]{
+                sd.getWebMasterAddress()}));
 
-        sqlParams = new String[] { sd.getSystemMessage() };
+        sqlParams = new String[]{sd.getSystemMessage()};
         getProcedureExecutor().executeUpdateProcedure("SystemMessageSet", sqlParams);
 
         /* Update the local copy last, so we stay aware of any database errors */
@@ -670,7 +820,7 @@ public void setSystemData(SystemData sd) {
      * the array consists of pairs of id:, value. Suitable for parsing into select boxes etc.
      */
     public String[][] getAllDocumentTypes(String langPrefixStr) {
-        final Object[] parameters = new String[] { langPrefixStr };
+        final Object[] parameters = new String[]{langPrefixStr};
         return (String[][]) getProcedureExecutor().executeProcedure("GetDocTypes", parameters, new StringArrayArrayResultSetHandler());
     }
 
@@ -681,7 +831,7 @@ public File getIncludePath() {
     public Collator getDefaultLanguageCollator() {
         try {
             return Collator.getInstance(new Locale(LanguageMapper.convert639_2to639_1(config.getDefaultLanguage())));
-        } catch ( LanguageMapper.LanguageNotSupportedException e ) {
+        } catch (LanguageMapper.LanguageNotSupportedException e) {
             throw new RuntimeException(e);
         }
     }
@@ -694,6 +844,10 @@ public CategoryMapper getCategoryMapper() {
         return documentMapper.getCategoryMapper();
     }
 
+    public ImageCacheMapper getImageCacheMapper() {
+        return imageCacheMapper;
+    }
+
     public LanguageMapper getLanguageMapper() {
         return this.languageMapper;
     }
@@ -710,11 +864,14 @@ public ProcedureExecutor getProcedureExecutor() {
         return procedureExecutor;
     }
 
+    public KerberosLoginService getKerberosLoginService() {
+        return kerberosLoginService;
+    }
+
     private static class WebappRelativeFileConverter implements Converter {
 
         public Object convert(Class type, Object value) {
             return FileUtility.getFileFromWebappRelativePath((String) value);
         }
     }
-
 }
diff --git a/server/src/imcode/server/DocumentRequest.java b/server/src/imcode/server/DocumentRequest.java
index d63fea2a0f..d6708a1b2c 100644
--- a/server/src/imcode/server/DocumentRequest.java
+++ b/server/src/imcode/server/DocumentRequest.java
@@ -2,15 +2,17 @@
 
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
+import imcode.util.log.DocumentRequestRenderer;
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.util.StringBuilderFormattable;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-
- This class exists to store data about requests for documents in.
+ * This class exists to store data about requests for documents in.
  **/
-public class DocumentRequest implements Cloneable {
+public class DocumentRequest implements Message, StringBuilderFormattable, Cloneable {
 
     private HttpServletRequest httpServletRequest;
     private HttpServletResponse httpServletResponse;
@@ -19,37 +21,27 @@ public class DocumentRequest implements Cloneable {
     private UserDomainObject user;
     private DocumentDomainObject document;
     private DocumentDomainObject referrer;
-    private String[] emphasize ;
-
-    private Revisits revisits;
+    private String[] emphasize;
 
-    public DocumentRequest( ImcmsServices serverObject, UserDomainObject user, DocumentDomainObject document,
-                            DocumentDomainObject referrer, HttpServletRequest httpServletRequest,
-                            HttpServletResponse httpServletResponse ) {
+    public DocumentRequest(ImcmsServices serverObject, UserDomainObject user, DocumentDomainObject document,
+                           DocumentDomainObject referrer, HttpServletRequest httpServletRequest,
+                           HttpServletResponse httpServletResponse) {
         this.serverObject = serverObject;
         this.user = user;
-        this.document = document ;
+        this.document = document;
         this.referrer = referrer;
         this.httpServletRequest = httpServletRequest;
         this.httpServletResponse = httpServletResponse;
     }
 
     public Object clone() throws CloneNotSupportedException {
-        return super.clone() ;
+        return super.clone();
     }
 
     public ImcmsServices getServices() {
         return this.serverObject;
     }
 
-    public void setRevisits( Revisits revisits ) {
-        this.revisits = revisits;
-    }
-
-    public Revisits getRevisits() {
-        return this.revisits;
-    }
-
     public UserDomainObject getUser() {
         return this.user;
     }
@@ -58,15 +50,15 @@ public DocumentDomainObject getDocument() {
         return document;
     }
 
-    public DocumentDomainObject getReferrer() {
-        return referrer;
+    public void setDocument(DocumentDomainObject document) {
+        this.document = document;
     }
 
-    public void setDocument( DocumentDomainObject document ) {
-        this.document = document;
+    public DocumentDomainObject getReferrer() {
+        return referrer;
     }
 
-    public void setReferrer( DocumentDomainObject referrer ) {
+    public void setReferrer(DocumentDomainObject referrer) {
         this.referrer = referrer;
     }
 
@@ -75,14 +67,39 @@ public HttpServletRequest getHttpServletRequest() {
     }
 
     public String[] getEmphasize() {
-        return null != emphasize ? (String[])emphasize.clone() : null ;
+        return null != emphasize ? (String[]) emphasize.clone() : null;
     }
 
-    public void setEmphasize( String[] emphasize ) {
-        this.emphasize = null != emphasize ? (String[])emphasize.clone() : null ;
+    public void setEmphasize(String[] emphasize) {
+        this.emphasize = null != emphasize ? (String[]) emphasize.clone() : null;
     }
 
     public HttpServletResponse getHttpServletResponse() {
         return httpServletResponse;
     }
+
+	@Override
+	public String getFormattedMessage() {
+		return DocumentRequestRenderer.render(this);
+	}
+
+	@Override
+	public String getFormat() {
+		return getFormattedMessage();
+	}
+
+	@Override
+	public Object[] getParameters() {
+		return new Object[]{this};
+	}
+
+	@Override
+	public Throwable getThrowable() {
+		return null;
+	}
+
+	@Override
+	public void formatTo(final StringBuilder buffer) {
+		buffer.append(getFormattedMessage());
+	}
 }
diff --git a/server/src/imcode/server/Imcms.java b/server/src/imcode/server/Imcms.java
index 310c80c8bc..15696790cd 100644
--- a/server/src/imcode/server/Imcms.java
+++ b/server/src/imcode/server/Imcms.java
@@ -1,65 +1,73 @@
 package imcode.server;
 
-import com.imcode.db.*;
+import com.imcode.db.DataSourceDatabase;
 import com.imcode.db.Database;
 import com.imcode.imcms.db.*;
+import com.imcode.imcms.domain.factory.AuthenticationProvidersFactory;
+import com.imcode.imcms.domain.repository.ExternalToLocalRoleLinkComponent;
+import com.imcode.imcms.domain.services.api.ImcmsAuthenticationProviderService;
+import com.imcode.imcms.domain.services.core.ServerSettings;
+import com.imcode.imcms.domain.services.core.ServerSettingsChecker;
 import com.imcode.imcms.util.l10n.CachingLocalizedMessageProvider;
 import com.imcode.imcms.util.l10n.ImcmsPrefsLocalizedMessageProvider;
 import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
-import imcode.util.Prefs;
 import imcode.util.CachingFileLoader;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.lang.UnhandledException;
+import imcode.util.Prefs;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Transformer;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.ddlutils.Platform;
-import org.apache.ddlutils.model.Index;
-import org.apache.ddlutils.model.IndexColumn;
-import org.apache.ddlutils.model.ForeignKey;
-import org.apache.ddlutils.alteration.*;
+import org.apache.commons.lang.UnhandledException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.sql.DataSource;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 public class Imcms {
 
-    private static final String SERVER_PROPERTIES_FILENAME = "server.properties";
+    public static final String SERVER_PROPERTIES_FILENAME = "server.properties";
     public static final String ASCII_ENCODING = "US-ASCII";
     public static final String ISO_8859_1_ENCODING = "ISO-8859-1";
     public static final String UTF_8_ENCODING = "UTF-8";
     public static final String DEFAULT_ENCODING = UTF_8_ENCODING;
+    public final static String ERROR_LOGGER_URL = "https://errors.imcode.com/ErrorLogger";
 
-    private final static Logger LOG = Logger.getLogger(Imcms.class.getName());
+    private final static Logger LOG = LogManager.getLogger(Imcms.class.getName());
     private static ImcmsServices services;
     private static BasicDataSource apiDataSource;
     private static BasicDataSource dataSource;
     private static File path;
+    private static File indexDirectory;
 
     private Imcms() {
     }
 
     public synchronized static ImcmsServices getServices() {
-        if ( null == services ) {
+        if (null == services) {
             start();
         }
         return services;
     }
 
-    public static void setPath(File path) {
-        Imcms.path = path;
-    }
-
     public static File getPath() {
         return path;
     }
 
+    public static void setPath(File path) {
+        Imcms.path = path;
+    }
+
     public synchronized static void start() throws StartupException {
         try {
             services = createServices();
@@ -73,20 +81,63 @@ private synchronized static ImcmsServices createServices() throws Exception {
         LOG.debug("Creating main DataSource.");
         Database database = createDatabase(serverprops);
         LocalizedMessageProvider localizedMessageProvider = new CachingLocalizedMessageProvider(new ImcmsPrefsLocalizedMessageProvider());
-        InputStreamReader initScriptReader = new InputStreamReader(new FileInputStream(new File(getPath(), "WEB-INF/sql/init.sql")), "UTF-8");
+        InputStreamReader initScriptReader = new InputStreamReader(new FileInputStream(new File(getPath(), "WEB-INF/sql/init.sql")), StandardCharsets.UTF_8);
         org.apache.ddlutils.model.Database wantedDdl = DatabaseUtils.getWantedDdl();
         DatabaseUpgrade upgrade = new StartupDatabaseUpgrade(wantedDdl, new ImcmsDatabaseCreator(initScriptReader, localizedMessageProvider));
         upgrade.upgrade(database);
         sanityCheckDatabase(database, wantedDdl);
+        AuthenticationProvidersFactory authenticationProvidersFactory = new AuthenticationProvidersFactory(serverprops);
         final CachingFileLoader fileLoader = new CachingFileLoader();
-        return new DefaultImcmsServices(database, serverprops, localizedMessageProvider, fileLoader, new DefaultProcedureExecutor(database, fileLoader));
+        DefaultImcmsServices defaultImcmsServices = new DefaultImcmsServices(database, serverprops,
+                localizedMessageProvider, fileLoader, new DefaultProcedureExecutor(database, fileLoader),
+                new ImcmsAuthenticationProviderService(authenticationProvidersFactory),
+                new ExternalToLocalRoleLinkComponent(getApiDataSource()));
+
+        defaultImcmsServices.getImcmsAuthenticatorAndUserAndRoleMapper().encryptUnencryptedUsersLoginPasswords();
+
+        return defaultImcmsServices;
+    }
+
+    public static String getServerName() {
+        return getServerProperties().getProperty("ServerName", "http://localhost:8080");
+    }
+
+    public static Map<String, AuthenticationMethodConfiguration> getAuthenticationConfiguration() {
+        Map<String, AuthenticationMethodConfiguration> result = new HashMap<>();
+
+        Properties prop = getServerProperties();
+        String authenticationMethodName;
+        int index = 1;
+        while (!(authenticationMethodName =
+                prop.getProperty(
+                        AuthenticationMethodConfiguration.AUTHENTICATION_METHOD_NAMING_PATTERN
+                                .replace(AuthenticationMethodConfiguration.AUTHENTICATION_REPLACEABLE, String.valueOf(index)),
+                        AuthenticationMethodConfiguration.AUTHENTICATION_REPLACEABLE)).equals(AuthenticationMethodConfiguration.AUTHENTICATION_REPLACEABLE)) {
+            result.put(
+                    authenticationMethodName,
+                    new AuthenticationMethodConfiguration()
+                            .setName(authenticationMethodName)
+                            .setOrder(index)
+                            .setUrl(
+                                    prop.getProperty(
+                                            AuthenticationMethodConfiguration.AUTHENTICATION_URL_NAMING_PATTERN
+                                                    .replace(AuthenticationMethodConfiguration.AUTHENTICATION_REPLACEABLE,
+                                                            authenticationMethodName)
+                                    )
+                            )
+            );
+            index++;
+        }
+
+
+        return result;
     }
 
     private static void sanityCheckDatabase(Database database, org.apache.ddlutils.model.Database wantedDdl) {
         DatabaseSanityCheck databaseSanityCheck = new DatabaseSanityCheck(database, wantedDdl);
         Collection<SanityCheck.Problem> problems = databaseSanityCheck.execute();
-        for ( SanityCheck.Problem problem : problems ) {
-            if ( SanityCheck.Problem.Severity.ERROR == problem.getSeverity() ) {
+        for (SanityCheck.Problem problem : problems) {
+            if (SanityCheck.Problem.Severity.ERROR == problem.getSeverity()) {
                 LOG.error(problem.getDescription());
             } else if (SanityCheck.Problem.Severity.WARNING == problem.getSeverity()) {
                 LOG.warn(problem.getDescription());
@@ -96,41 +147,38 @@ private static void sanityCheckDatabase(Database database, org.apache.ddlutils.m
         }
     }
 
-    private static Database createDatabase(Properties serverprops) {
-        dataSource = createDataSource(serverprops);
+    private static Database createDatabase(Properties serverProps) {
+        dataSource = createDataSource(serverProps);
+        dataSource.setJmxName("org.apache.dbcp:DataSource=dataSource,connectionPool=connections");
         return new DataSourceDatabase(dataSource);
     }
 
     public synchronized static DataSource getApiDataSource() {
-        if ( null == apiDataSource ) {
+        if (null == apiDataSource) {
             Properties serverprops = getServerProperties();
             LOG.debug("Creating API DataSource.");
             apiDataSource = createDataSource(serverprops);
+            apiDataSource.setJmxName("org.apache.dbcp:DataSource=apiDataSource,connectionPool=apiConnections");
         }
         return apiDataSource;
     }
 
-    private static Properties getServerProperties() {
+    public static Properties getServerProperties() {
         try {
             return Prefs.getProperties(SERVER_PROPERTIES_FILENAME);
-        } catch ( IOException e ) {
-            LOG.fatal("Failed to initialize imCMS", e);
+        } catch (IOException e) {
+            LOG.fatal("Failed to initialize imCMS - can't read server properties!", e);
             throw new UnhandledException(e);
         }
     }
 
     private static BasicDataSource createDataSource(Properties props) {
 
-        String jdbcDriver = props.getProperty("JdbcDriver");
-        String jdbcUrl = props.getProperty("JdbcUrl");
-        String user = props.getProperty("User");
-        String password = props.getProperty("Password");
-        int maxConnectionCount = Integer.parseInt(props.getProperty("MaxConnectionCount"));
-
-        LOG.debug("JdbcDriver = " + jdbcDriver);
-        LOG.debug("JdbcUrl = " + jdbcUrl);
-        LOG.debug("User = " + user);
-        LOG.debug("MaxConnectionCount = " + maxConnectionCount);
+        String jdbcDriver = props.getProperty(ServerSettings.JDBC_DRIVER);
+        String jdbcUrl = props.getProperty(ServerSettings.JDBC_URL);
+        String user = props.getProperty(ServerSettings.DB_USER);
+        String password = props.getProperty(ServerSettings.DB_PASSWORD);
+        int maxConnectionCount = Integer.parseInt(props.getProperty(ServerSettings.DB_MAX_CONNECTIONS));
 
         return createDataSource(jdbcDriver, jdbcUrl, user, password, maxConnectionCount);
     }
@@ -141,19 +189,19 @@ public synchronized static void restart() {
     }
 
     public static void stop() {
-        if ( null != apiDataSource ) {
+        if (null != apiDataSource) {
             try {
                 LOG.debug("Closing API DataSource.");
                 apiDataSource.close();
-            } catch ( SQLException e ) {
+            } catch (SQLException e) {
                 LOG.error(e, e);
             }
         }
-        if ( null != dataSource ) {
+        if (null != dataSource) {
             try {
                 LOG.debug("Closing main DataSource.");
                 dataSource.close();
-            } catch ( SQLException e ) {
+            } catch (SQLException e) {
                 LOG.error(e, e);
             }
         }
@@ -177,26 +225,65 @@ public static BasicDataSource createDataSource(String jdbcDriver, String jdbcUrl
             basicDataSource.setPassword(password);
             basicDataSource.setUrl(jdbcUrl);
 
-            basicDataSource.setMaxActive(maxConnectionCount);
+            basicDataSource.setMaxTotal(maxConnectionCount);
             basicDataSource.setMaxIdle(maxConnectionCount);
+            basicDataSource.setMaxConnLifetimeMillis(TimeUnit.SECONDS.toMillis(40));
+            basicDataSource.setMaxWaitMillis(TimeUnit.SECONDS.toMillis(20));
             basicDataSource.setDefaultAutoCommit(true);
             basicDataSource.setPoolPreparedStatements(true);
+            basicDataSource.setTestOnBorrow(true);
+            basicDataSource.setLogAbandoned(true);
+            basicDataSource.setLogExpiredConnections(true);
+            basicDataSource.setRemoveAbandonedTimeout(60);
+            basicDataSource.setValidationQuery("select 1");
 
             logDatabaseVersion(basicDataSource);
 
             return basicDataSource;
-        } catch ( SQLException ex ) {
-            String message = "Could not connect to database "+ jdbcUrl + " with driver " + jdbcDriver + ": "+ex.getMessage()+" Error code: "
-                             + ex.getErrorCode() + " SQL State: " + ex.getSQLState();
+        } catch (SQLException ex) {
+            String message;
+
+            if (StringUtils.trimToNull(jdbcDriver) == null) {
+                message = ServerSettingsChecker.getEmptyPropertyMessage(ServerSettings.JDBC_DRIVER);
+
+            } else if (StringUtils.trimToNull(jdbcUrl) == null) {
+                message = ServerSettingsChecker.getEmptyPropertyMessage(ServerSettings.JDBC_URL);
+
+            } else if (StringUtils.trimToNull(user) == null) {
+                message = ServerSettingsChecker.getEmptyPropertyMessage(ServerSettings.DB_USER);
+
+            } else if (StringUtils.trimToNull(password) == null) {
+                message = ServerSettingsChecker.getEmptyPropertyMessage(ServerSettings.DB_PASSWORD);
+
+            } else {
+                message = "Could not connect to database " + jdbcUrl + " with driver " + jdbcDriver + ": " + ex.getMessage() + " Error code: "
+                        + ex.getErrorCode() + " SQL State: " + ex.getSQLState();
+            }
+
             LOG.fatal(message, ex);
             throw new RuntimeException(message, ex);
         }
     }
 
+    public static String getDefaultLanguage() {
+        Properties props = getServerProperties();
+        String language = props.getProperty("DefaultLanguage");
+
+        return (!StringUtils.isBlank(language)) ? language : "eng";
+    }
+
+    public static File getIndexDirectory() {
+        if (indexDirectory == null) {
+            indexDirectory = new File(getPath(), "WEB-INF/index");
+        }
+
+        return indexDirectory;
+    }
+
     public static class StartupException extends RuntimeException {
 
         public StartupException(String message, Exception e) {
-            super(message, e) ;
+            super(message, e);
         }
     }
 
diff --git a/server/src/imcode/server/ImcmsConstants.java b/server/src/imcode/server/ImcmsConstants.java
index 5032e3df50..3d4e19b3d5 100644
--- a/server/src/imcode/server/ImcmsConstants.java
+++ b/server/src/imcode/server/ImcmsConstants.java
@@ -1,59 +1,95 @@
-package imcode.server ;
+package imcode.server;
 
 public interface ImcmsConstants {
 
     /* Permissions for restricted permission-sets 1 and 2, applicable for all document-types. */
 
-    /** Permission to edit the headline, text, and image of a document. **/
-    public final static int PERM_EDIT_HEADLINE           = (1 << 0) ; // 1
+    /**
+     * Permission to edit the headline, text, and image of a document.
+     **/
+    public final static int PERM_EDIT_HEADLINE = (1 << 0); // 1
 
-    /** Permission to edit all docinfo for a document. **/
-    public final static int PERM_EDIT_DOCINFO            = PERM_EDIT_HEADLINE ;
+    /**
+     * Permission to edit all docinfo for a document.
+     **/
+    public final static int PERM_EDIT_DOCINFO = PERM_EDIT_HEADLINE;
 
-    /** Permission to set permissions for a document. **/
-    public final static int PERM_EDIT_PERMISSIONS        = (1 << 2) ; // 4
+    /**
+     * Permission to set permissions for a document.
+     **/
+    public final static int PERM_EDIT_PERMISSIONS = (1 << 2); // 4
 
 
     /* Permissions for restricted permission-sets 1 and 2, only applicable to non-text-documents. */
 
-    public final static int PERM_EDIT_DOCUMENT  = (1 << 16) ; // 65536
+    public final static int PERM_EDIT_DOCUMENT = (1 << 16); // 65536
 
-    /** Permission to edit the url of an url-document. **/
-    public final static int PERM_EDIT_URL_DOCUMENT             = PERM_EDIT_DOCUMENT ;
+    /**
+     * Permission to edit the url of an url-document.
+     **/
+    public final static int PERM_EDIT_URL_DOCUMENT = PERM_EDIT_DOCUMENT;
 
-    /** Permission to edit the mappings of a browser-document. **/
-    public final static int PERM_EDIT_BROWSER_DOCUMENT         = PERM_EDIT_DOCUMENT ;
+    /**
+     * Permission to edit the mappings of a browser-document.
+     **/
+    public final static int PERM_EDIT_BROWSER_DOCUMENT = PERM_EDIT_DOCUMENT;
 
-    /** Permission to edit a html-document. **/
-    public final static int PERM_EDIT_HTML_DOCUMENT            = PERM_EDIT_DOCUMENT ;
+    /**
+     * Permission to edit a html-document.
+     **/
+    public final static int PERM_EDIT_HTML_DOCUMENT = PERM_EDIT_DOCUMENT;
 
-    /** Permission to change content and mime-type for a file. **/
-    public final static int PERM_EDIT_FILE_DOCUMENT            = PERM_EDIT_DOCUMENT ;
+    /**
+     * Permission to change content and mime-type for a file.
+     **/
+    public final static int PERM_EDIT_FILE_DOCUMENT = PERM_EDIT_DOCUMENT;
 
     /* Permissions for restricted permission-sets 1 and 2, only applicable to text-documents. */
 
-    /** Permission to change the texts of a text-document. **/
-    public final static int PERM_EDIT_TEXT_DOCUMENT_TEXTS      = PERM_EDIT_DOCUMENT ;
+    /**
+     * Permission to change the texts of a text-document.
+     **/
+    public final static int PERM_EDIT_TEXT_DOCUMENT_TEXTS = PERM_EDIT_DOCUMENT;
 
-    /** Permission to change the images of a text-document. **/
-    public final static int PERM_EDIT_TEXT_DOCUMENT_IMAGES     = (1 << 17) ; // 131072
+    /**
+     * Permission to change the images of a text-document.
+     **/
+    public final static int PERM_EDIT_TEXT_DOCUMENT_IMAGES = (1 << 17); // 131072
 
-    /** Permission to change the menus of a text-document. **/
-    public final static int PERM_EDIT_TEXT_DOCUMENT_MENUS      = (1 << 18) ; // 262144
+    /**
+     * Permission to change the menus of a text-document.
+     **/
+    public final static int PERM_EDIT_TEXT_DOCUMENT_MENUS = (1 << 18); // 262144
 
-    /** Permission to change the template of a text-document. **/
-    public final static int PERM_EDIT_TEXT_DOCUMENT_TEMPLATE = (1 << 19) ; // 524288
+    /**
+     * Permission to change the template of a text-document.
+     **/
+    public final static int PERM_EDIT_TEXT_DOCUMENT_TEMPLATE = (1 << 19); // 524288
 
-    /** Permission to change the includes of a text-document. **/
-    public final static int PERM_EDIT_TEXT_DOCUMENT_INCLUDES   = (1 << 20) ; // 1048576
+    /**
+     * Permission to change the includes of a text-document.
+     **/
+    public final static int PERM_EDIT_TEXT_DOCUMENT_INCLUDES = (1 << 20); // 1048576
+
+    /**
+     * Permission to use images in image archive
+     */
+    public final static int PERM_IMAGE_ARCHIVE_USE_IMAGE = (1 << 22);
+
+    /**
+     * Permission to change images in image archive
+     */
+    public final static int PERM_IMAGE_ARCHIVE_CHANGE_IMAGE = (1 << 23);
 
 
     /* Log instances. */
 
-    /** The access-log, used for keeping track of page hits. **/
-    public final static String ACCESS_LOG		= "com.imcode.imcms.log.access";
+    /**
+     * The access-log, used for keeping track of page hits.
+     **/
+    public final static String ACCESS_LOG = "com.imcode.imcms.log.access";
 
-    public final static String MAIN_LOG         = "com.imcode.imcms.log.main";
+    public final static String MAIN_LOG = "com.imcode.imcms.log.main";
 
     final static int PASSWORD_MINIMUM_LENGTH = 4;
 
@@ -65,4 +101,14 @@ public interface ImcmsConstants {
     int DISPATCH_FLAG__EDIT_MENU = PERM_EDIT_TEXT_DOCUMENT_MENUS;
     int DISPATCH_FLAG__EDIT_TEXT_DOCUMENT_IMAGES = PERM_EDIT_TEXT_DOCUMENT_IMAGES;
     int DISPATCH_FLAG__DOCUMENT_PERMISSIONS_PAGE = PERM_EDIT_PERMISSIONS;
+
+    /**
+     * Overrides default return URL which is used when a user leaves the editor or an add-on page.
+     */
+    public static final String REQUEST_PARAM__RETURN_URL = "imcms.return.url";
+
+    public static final String ENG_CODE_ISO_639_2 = "eng";
+    public static final String SWE_CODE_ISO_639_2 = "swe";
+
+    public static final String SERVLET_PREFIX = "/servlet";
 }
diff --git a/server/src/imcode/server/ImcmsServices.java b/server/src/imcode/server/ImcmsServices.java
index 35352189bd..e42ba1b237 100644
--- a/server/src/imcode/server/ImcmsServices.java
+++ b/server/src/imcode/server/ImcmsServices.java
@@ -1,11 +1,17 @@
-package imcode.server ;
+package imcode.server;
 
 import com.imcode.db.Database;
 import com.imcode.imcms.db.ProcedureExecutor;
+import com.imcode.imcms.domain.dto.export.DocumentExportService;
+import com.imcode.imcms.domain.repository.ExternalToLocalRoleLinkComponent;
+import com.imcode.imcms.domain.services.AuthenticationProviderService;
+import com.imcode.imcms.domain.services.api.DefaultExternalToLocalRoleLinkService;
 import com.imcode.imcms.mapping.CategoryMapper;
 import com.imcode.imcms.mapping.DocumentMapper;
+import com.imcode.imcms.mapping.ImageCacheMapper;
 import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
 import imcode.server.document.TemplateMapper;
+import imcode.server.kerberos.KerberosLoginService;
 import imcode.server.parser.ParserParameters;
 import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
 import imcode.server.user.RoleGetter;
@@ -24,46 +30,50 @@
 
 public interface ImcmsServices {
 
-    /** Verify a Internet/Intranet user. Data from any SQL Database. **/
-    UserDomainObject verifyUser(String login, String password)
-    ;
+    /**
+     * Verify a Internet/Intranet user. Data from any SQL Database.
+     **/
+    UserDomainObject verifyUser(String login, String password);
 
-    void parsePage(ParserParameters paramsToParse, Writer out) throws IOException ;
+    // Verify a Intranet user based on a Kerberos client principal name.
+    UserDomainObject verifyUser(String clientPrincipalName);
 
-    void incrementSessionCounter();
+    void parsePage(ParserParameters paramsToParse, Writer out) throws IOException;
 
-    // set session counter
-    void setSessionCounter(int value)  ;
+    void incrementSessionCounter();
 
     // set  session counter date
-    void setSessionCounterDate(Date date)  ;
+    Date getSessionCounterDate();
 
     // set  session counter date
-    Date getSessionCounterDate()  ;
+    void setSessionCounterDate(Date date);
 
     // parsedoc use template
-    String getAdminTemplate( String adminTemplateName, UserDomainObject user, java.util.List tagsWithReplacements )  ;
+    String getAdminTemplate(String adminTemplateName, UserDomainObject user, java.util.List tagsWithReplacements);
 
     // parseExternaldoc use template
-    String getTemplateFromDirectory( String adminTemplateName, UserDomainObject user, java.util.List variables,
-                                     String directory )
+    String getTemplateFromDirectory(String adminTemplateName, UserDomainObject user, java.util.List variables,
+                                    String directory)
     ;
 
     // get doctype
     int getDocType(int meta_id)
     ;
 
-    SystemData getSystemData()  ;
+    SystemData getSystemData();
 
-    void setSystemData(SystemData sd)  ;
+    void setSystemData(SystemData sd);
 
-    String[][] getAllDocumentTypes(String langPrefixStr)  ;
+    String[][] getAllDocumentTypes(String langPrefixStr);
 
     int getSessionCounter();
 
+    // set session counter
+    void setSessionCounter(int value);
+
     String getSessionCounterDateAsString();
 
-    void updateMainLog( String logMessage );
+    void updateMainLog(String logMessage);
 
     DocumentMapper getDocumentMapper();
 
@@ -79,7 +89,7 @@ int getDocType(int meta_id)
 
     VelocityEngine getVelocityEngine(UserDomainObject user);
 
-    VelocityContext getVelocityContext( UserDomainObject user );
+    VelocityContext getVelocityContext(UserDomainObject user);
 
     Config getConfig();
 
@@ -91,6 +101,8 @@ int getDocType(int meta_id)
 
     LanguageMapper getLanguageMapper();
 
+    ImageCacheMapper getImageCacheMapper();
+
     CachingFileLoader getFileCache();
 
     RoleGetter getRoleGetter();
@@ -100,4 +112,14 @@ int getDocType(int meta_id)
     UserDomainObject verifyUserByIpOrDefault(String remoteAddr);
 
     LocalizedMessageProvider getLocalizedMessageProvider();
+
+    KerberosLoginService getKerberosLoginService();
+
+    AuthenticationProviderService getAuthenticationProviderService();
+
+    ExternalToLocalRoleLinkComponent getExternalToLocalRoleLinkComponent();
+
+    DefaultExternalToLocalRoleLinkService getExternalToLocalRoleLinkService();
+
+	DocumentExportService getDocumentExportService();
 }
diff --git a/server/src/imcode/server/LanguageMapper.java b/server/src/imcode/server/LanguageMapper.java
index 2aabd74c5d..700230c5e2 100644
--- a/server/src/imcode/server/LanguageMapper.java
+++ b/server/src/imcode/server/LanguageMapper.java
@@ -6,110 +6,112 @@
 import imcode.util.Html;
 import imcode.util.Utility;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.*;
 
-/** @author kreiger */
+/**
+ * @author kreiger
+ */
 public class LanguageMapper {
-    /** {@see <a href="http://www.loc.gov/standards/iso639-2/langhome.html">http://www.loc.gov/standards/iso639-2/langhome.html</a>} **/
+    /**
+     * {@see <a href="http://www.loc.gov/standards/iso639-2/langhome.html">http://www.loc.gov/standards/iso639-2/langhome.html</a>}
+     **/
     public final static String ISO639_2 = "ISO 639-2";
-
+    private final static Logger log = LogManager.getLogger(LanguageMapper.class.getName());
     private static Map iso639_1to639_2map;
     private static Map iso639_2to639_1map;
-
-    private static String[][] iso6391to6392table = new String[][] {
-            { "aar", "aa" }, { "abk", "ab" }, { "ace", "" }, { "ach", "" }, { "ada", "" }, { "ady", "" }, { "afa", "" },
-            { "afh", "" }, { "afr", "af" }, { "aka", "ak" }, { "akk", "" }, { "alb/sqi", "sq" }, { "ale", "" },
-            { "alg", "" }, { "amh", "am" }, { "ang", "" }, { "apa", "" }, { "ara", "ar" }, { "arc", "" },
-            { "arg", "an" }, { "arm/hye", "hy" }, { "arn", "" }, { "arp", "" }, { "art", "" }, { "arw", "" },
-            { "asm", "as" }, { "ast", "" }, { "ath", "" }, { "aus", "" }, { "ava", "av" }, { "ave", "ae" },
-            { "awa", "" }, { "aym", "ay" }, { "aze", "az" }, { "bad", "" }, { "bai", "" }, { "bak", "ba" },
-            { "bal", "" }, { "bam", "bm" }, { "ban", "" }, { "baq/eus", "eu" }, { "bas", "" }, { "bat", "" },
-            { "bej", "" }, { "bel", "be" }, { "bem", "" }, { "ben", "bn" }, { "ber", "" }, { "bho", "" },
-            { "bih", "bh" }, { "bik", "" }, { "bin", "" }, { "bis", "bi" }, { "bla", "" }, { "bnt", "" },
-            { "tib/bod", "bo" }, { "bos", "bs" }, { "bra", "" }, { "bre", "br" }, { "btk", "" }, { "bua", "" },
-            { "bug", "" }, { "bul", "bg" }, { "bur/mya", "my" }, { "cad", "" }, { "cai", "" }, { "car", "" },
-            { "cat", "ca" }, { "cau", "" }, { "ceb", "" }, { "cel", "" }, { "cze/ces", "cs" }, { "cha", "ch" },
-            { "chb", "" }, { "che", "ce" }, { "chg", "" }, { "chi/zho", "zh" }, { "chk", "" }, { "chm", "" },
-            { "chn", "" }, { "cho", "" }, { "chp", "" }, { "chr", "" }, { "chu", "cu" }, { "chv", "cv" }, { "chy", "" },
-            { "cmc", "" }, { "cop", "" }, { "cor", "kw" }, { "cos", "co" }, { "cpe", "" }, { "cpf", "" }, { "cpp", "" },
-            { "cre", "cr" }, { "crh", "" }, { "crp", "" }, { "csb", "" }, { "cus", "" }, { "wel/cym", "cy" },
-            { "cze/ces", "cs" }, { "dak", "" }, { "dan", "da" }, { "dar", "" }, { "day", "" }, { "del", "" },
-            { "den", "" }, { "ger/deu", "de" }, { "dgr", "" }, { "din", "" }, { "div", "dv" }, { "doi", "" },
-            { "dra", "" }, { "dsb", "" }, { "dua", "" }, { "dum", "" }, { "dut/nld", "nl" }, { "dyu", "" },
-            { "dzo", "dz" }, { "efi", "" }, { "egy", "" }, { "eka", "" }, { "gre/ell", "el" }, { "elx", "" },
-            { "eng", "en" }, { "enm", "" }, { "epo", "eo" }, { "est", "et" }, { "baq/eus", "eu" }, { "ewe", "ee" },
-            { "ewo", "" }, { "fan", "" }, { "fao", "fo" }, { "per/fas", "fa" }, { "fat", "" }, { "fij", "fj" },
-            { "fin", "fi" }, { "fiu", "" }, { "fon", "" }, { "fre/fra", "fr" }, { "frm", "" }, { "fro", "" },
-            { "fry", "fy" }, { "ful", "ff" }, { "fur", "", }, { "gaa", "Ga" }, { "gay", "" }, { "gba", "" },
-            { "gem", "" }, { "geo/kat", "ka" }, { "ger/deu", "de" }, { "gez", "" }, { "gil", "" }, { "gla", "gd" },
-            { "gle", "ga" }, { "glg", "gl" }, { "glv", "gv" }, { "gmh", "" }, { "goh", "" }, { "gon", "" },
-            { "gor", "" }, { "got", "" }, { "grb", "" }, { "grc", "" }, { "gre/ell", "el" }, { "grn", "gn" },
-            { "guj", "gu" }, { "gwi", "" }, { "hai", "" }, { "hat", "ht" }, { "hau", "ha" }, { "haw", "" },
-            { "heb", "he" }, { "her", "hz" }, { "hil", "" }, { "him", "" }, { "hin", "hi" }, { "hit", "" },
-            { "hmn", "" }, { "hmo", "ho" }, { "scr/hrv", "hr" }, { "hsb", "" }, { "hun", "hu" }, { "hup", "" },
-            { "arm/hye", "hy" }, { "iba", "" }, { "ibo", "ig" }, { "ice/isl", "is" }, { "ido", "io" }, { "iii", "ii" },
-            { "ijo", "" }, { "iku", "iu" }, { "ile", "ie" }, { "ilo", "" }, { "ina", "ia" }, { "inc", "" },
-            { "ind", "id" }, { "ine", "" }, { "inh", "" }, { "ipk", "ik" }, { "ira", "" }, { "iro", "" },
-            { "ice/isl", "is" }, { "ita", "it" }, { "jav", "jv" }, { "jbo", "" }, { "jpn", "ja" }, { "jpr", "" },
-            { "jrb", "" }, { "kaa", "" }, { "kab", "" }, { "kac", "" }, { "kal", "kl" }, { "kam", "" }, { "kan", "kn" },
-            { "kar", "" }, { "kas", "ks" }, { "geo/kat", "ka" }, { "kau", "kr" }, { "kaw", "" }, { "kaz", "kk" },
-            { "kbd", "" }, { "kha", "" }, { "khi", "" }, { "khm", "km" }, { "kho", "" }, { "kik", "ki" },
-            { "kin", "rw" }, { "kir", "ky" }, { "kmb", "" }, { "kok", "" }, { "kom", "kv" }, { "kon", "kg" },
-            { "kor", "ko" }, { "kos", "" }, { "kpe", "" }, { "krc", "" }, { "kro", "" }, { "kru", "" }, { "kua", "kj" },
-            { "kum", "" }, { "kur", "ku" }, { "kut", "" }, { "lad", "" }, { "lah", "" }, { "lam", "" }, { "lao", "lo" },
-            { "lat", "la" }, { "lav", "lv" }, { "lez", "" }, { "lim", "li" }, { "lin", "ln" }, { "lit", "lt" },
-            { "lol", "" }, { "loz", "" }, { "ltz", "lb" }, { "lua", "" }, { "lub", "lu" }, { "lug", "lg" },
-            { "lui", "" }, { "lun", "" }, { "luo", "" }, { "lus", "" }, { "mac/mkd", "mk" }, { "mad", "" },
-            { "mag", "" }, { "mah", "mh" }, { "mai", "" }, { "mak", "" }, { "mal", "ml" }, { "man", "" },
-            { "mao/mri", "mi" }, { "map", "" }, { "mar", "mr" }, { "mas", "" }, { "may/msa", "ms" }, { "mdf", "" },
-            { "mdr", "" }, { "men", "" }, { "mga", "" }, { "mic", "" }, { "min", "" }, { "mis", "" },
-            { "mac/mkd", "mk" }, { "mkh", "" }, { "mlg", "mg" }, { "mlt", "mt" }, { "mnc", "" }, { "mni", "" },
-            { "mno", "" }, { "moh", "" }, { "mol", "mo" }, { "mon", "mn" }, { "mos", "" }, { "mao/mri", "mi" },
-            { "may/msa", "ms" }, { "mul", "" }, { "mun", "" }, { "mus", "" }, { "mwr", "" }, { "bur/mya", "my" },
-            { "myn", "" }, { "myv", "" }, { "nah", "" }, { "nai", "" }, { "nap", "" }, { "nau", "na" }, { "nav", "nv" },
-            { "nbl", "nr" }, { "nde", "nd" }, { "ndo", "ng" }, { "nds", "" }, { "nep", "ne" }, { "new", "" },
-            { "nia", "" }, { "nic", "" }, { "niu", "" }, { "dut/nld", "nl" }, { "nno", "nn" }, { "nob", "nb" },
-            { "nog", "" }, { "non", "" }, { "nor", "no" }, { "nso", "" }, { "nub", "" }, { "nya", "ny" }, { "nym", "" },
-            { "nyn", "" }, { "nyo", "" }, { "nzi", "" }, { "oci", "oc" }, { "oji", "oj" }, { "ori", "or" },
-            { "orm", "om" }, { "osa", "" }, { "oss", "os" }, { "ota", "" }, { "oto", "" }, { "paa", "" }, { "pag", "" },
-            { "pal", "" }, { "pam", "" }, { "pan", "pa" }, { "pap", "" }, { "pau", "" }, { "peo", "" },
-            { "per/fas", "fa" }, { "phi", "" }, { "phn", "" }, { "pli", "pi" }, { "pol", "pl" }, { "pon", "" },
-            { "por", "pt" }, { "pra", "" }, { "pro", "" }, { "pus", "ps" }, { "que", "qu" }, { "raj", "" },
-            { "rap", "" }, { "rar", "" }, { "roa", "", }, { "roh", "rm" }, { "rom", "" }, { "rum/ron", "ro" },
-            { "run", "rn" }, { "rus", "ru" }, { "sad", "" }, { "sag", "sg" }, { "sah", "" }, { "sai", "" },
-            { "sal", "" }, { "sam", "" }, { "san", "sa" }, { "sas", "" }, { "sat", "" }, { "scc/srp", "sr" },
-            { "sco", "" }, { "scr/hrv", "hr" }, { "sel", "" }, { "sem", "" }, { "sga", "" }, { "sgn", "" },
-            { "shn", "" }, { "sid", "" }, { "sin", "si" }, { "sio", "" }, { "sit", "" }, { "sla", "" },
-            { "slo/slk", "sk" }, { "slv", "sl" }, { "sma", "" }, { "sme", "se" }, { "smi", "" }, { "smj", "" },
-            { "smn", "" }, { "smo", "sm" }, { "sms", "" }, { "sna", "sn" }, { "snd", "sd" }, { "snk", "" },
-            { "sog", "" }, { "som", "so" }, { "son", "" }, { "sot", "st" }, { "spa", "es" }, { "alb/sqi", "sq" },
-            { "srd", "sc" }, { "scc/srp", "sr" }, { "srr", "" }, { "ssa", "" }, { "ssw", "ss" }, { "suk", "" },
-            { "sun", "su" }, { "sus", "" }, { "sux", "" }, { "swa", "sw" }, { "swe", "sv" }, { "syr", "" },
-            { "tah", "ty" }, { "tai", "" }, { "tam", "ta" }, { "tat", "tt" }, { "tel", "te" }, { "tem", "" },
-            { "ter", "" }, { "tet", "" }, { "tgk", "tg" }, { "tgl", "tl" }, { "tha", "th" }, { "tib/bod", "bo" },
-            { "tig", "" }, { "tir", "ti" }, { "tiv", "" }, { "tkl", "" }, { "tli", "" }, { "tmh", "" }, { "tog", "" },
-            { "ton", "to" }, { "tpi", "" }, { "tsi", "" }, { "tsn", "tn" }, { "tso", "ts" }, { "tuk", "tk" },
-            { "tum", "" }, { "tup", "" }, { "tur", "tr" }, { "tut", "" }, { "tvl", "" }, { "twi", "tw" }, { "tyv", "" },
-            { "udm", "" }, { "uga", "" }, { "uig", "ug" }, { "ukr", "uk" }, { "umb", "" }, { "und", "" },
-            { "urd", "ur" }, { "uzb", "uz" }, { "vai", "" }, { "ven", "ve" }, { "vie", "vi" }, { "vol", "vo" },
-            { "vot", "" }, { "wak", "" }, { "wal", "" }, { "war", "" }, { "was", "" }, { "wel/cym", "cy" },
-            { "wen", "" }, { "wln", "wa" }, { "wol", "wo" }, { "xal", "" }, { "xho", "xh" }, { "yao", "" },
-            { "yap", "" }, { "yid", "yi" }, { "yor", "yo" }, { "ypk", "" }, { "zap", "" }, { "zen", "" },
-            { "zha", "za" }, { "chi/zho", "zh" }, { "znd", "" }, { "zul", "zu" }, { "zun", "" }, };
-
-    private final static Logger log = Logger.getLogger(LanguageMapper.class.getName());
+    private static String[][] iso6391to6392table = new String[][]{
+            {"aar", "aa"}, {"abk", "ab"}, {"ace", ""}, {"ach", ""}, {"ada", ""}, {"ady", ""}, {"afa", ""},
+            {"afh", ""}, {"afr", "af"}, {"aka", "ak"}, {"akk", ""}, {"alb/sqi", "sq"}, {"ale", ""},
+            {"alg", ""}, {"amh", "am"}, {"ang", ""}, {"apa", ""}, {"ara", "ar"}, {"arc", ""},
+            {"arg", "an"}, {"arm/hye", "hy"}, {"arn", ""}, {"arp", ""}, {"art", ""}, {"arw", ""},
+            {"asm", "as"}, {"ast", ""}, {"ath", ""}, {"aus", ""}, {"ava", "av"}, {"ave", "ae"},
+            {"awa", ""}, {"aym", "ay"}, {"aze", "az"}, {"bad", ""}, {"bai", ""}, {"bak", "ba"},
+            {"bal", ""}, {"bam", "bm"}, {"ban", ""}, {"baq/eus", "eu"}, {"bas", ""}, {"bat", ""},
+            {"bej", ""}, {"bel", "be"}, {"bem", ""}, {"ben", "bn"}, {"ber", ""}, {"bho", ""},
+            {"bih", "bh"}, {"bik", ""}, {"bin", ""}, {"bis", "bi"}, {"bla", ""}, {"bnt", ""},
+            {"tib/bod", "bo"}, {"bos", "bs"}, {"bra", ""}, {"bre", "br"}, {"btk", ""}, {"bua", ""},
+            {"bug", ""}, {"bul", "bg"}, {"bur/mya", "my"}, {"cad", ""}, {"cai", ""}, {"car", ""},
+            {"cat", "ca"}, {"cau", ""}, {"ceb", ""}, {"cel", ""}, {"cze/ces", "cs"}, {"cha", "ch"},
+            {"chb", ""}, {"che", "ce"}, {"chg", ""}, {"chi/zho", "zh"}, {"chk", ""}, {"chm", ""},
+            {"chn", ""}, {"cho", ""}, {"chp", ""}, {"chr", ""}, {"chu", "cu"}, {"chv", "cv"}, {"chy", ""},
+            {"cmc", ""}, {"cop", ""}, {"cor", "kw"}, {"cos", "co"}, {"cpe", ""}, {"cpf", ""}, {"cpp", ""},
+            {"cre", "cr"}, {"crh", ""}, {"crp", ""}, {"csb", ""}, {"cus", ""}, {"wel/cym", "cy"},
+            {"cze/ces", "cs"}, {"dak", ""}, {"dan", "da"}, {"dar", ""}, {"day", ""}, {"del", ""},
+            {"den", ""}, {"ger/deu", "de"}, {"dgr", ""}, {"din", ""}, {"div", "dv"}, {"doi", ""},
+            {"dra", ""}, {"dsb", ""}, {"dua", ""}, {"dum", ""}, {"dut/nld", "nl"}, {"dyu", ""},
+            {"dzo", "dz"}, {"efi", ""}, {"egy", ""}, {"eka", ""}, {"gre/ell", "el"}, {"elx", ""},
+            {"eng", "en"}, {"enm", ""}, {"epo", "eo"}, {"est", "et"}, {"baq/eus", "eu"}, {"ewe", "ee"},
+            {"ewo", ""}, {"fan", ""}, {"fao", "fo"}, {"per/fas", "fa"}, {"fat", ""}, {"fij", "fj"},
+            {"fin", "fi"}, {"fiu", ""}, {"fon", ""}, {"fre/fra", "fr"}, {"frm", ""}, {"fro", ""},
+            {"fry", "fy"}, {"ful", "ff"}, {"fur", "",}, {"gaa", "Ga"}, {"gay", ""}, {"gba", ""},
+            {"gem", ""}, {"geo/kat", "ka"}, {"ger/deu", "de"}, {"gez", ""}, {"gil", ""}, {"gla", "gd"},
+            {"gle", "ga"}, {"glg", "gl"}, {"glv", "gv"}, {"gmh", ""}, {"goh", ""}, {"gon", ""},
+            {"gor", ""}, {"got", ""}, {"grb", ""}, {"grc", ""}, {"gre/ell", "el"}, {"grn", "gn"},
+            {"guj", "gu"}, {"gwi", ""}, {"hai", ""}, {"hat", "ht"}, {"hau", "ha"}, {"haw", ""},
+            {"heb", "he"}, {"her", "hz"}, {"hil", ""}, {"him", ""}, {"hin", "hi"}, {"hit", ""},
+            {"hmn", ""}, {"hmo", "ho"}, {"scr/hrv", "hr"}, {"hsb", ""}, {"hun", "hu"}, {"hup", ""},
+            {"arm/hye", "hy"}, {"iba", ""}, {"ibo", "ig"}, {"ice/isl", "is"}, {"ido", "io"}, {"iii", "ii"},
+            {"ijo", ""}, {"iku", "iu"}, {"ile", "ie"}, {"ilo", ""}, {"ina", "ia"}, {"inc", ""},
+            {"ind", "id"}, {"ine", ""}, {"inh", ""}, {"ipk", "ik"}, {"ira", ""}, {"iro", ""},
+            {"ice/isl", "is"}, {"ita", "it"}, {"jav", "jv"}, {"jbo", ""}, {"jpn", "ja"}, {"jpr", ""},
+            {"jrb", ""}, {"kaa", ""}, {"kab", ""}, {"kac", ""}, {"kal", "kl"}, {"kam", ""}, {"kan", "kn"},
+            {"kar", ""}, {"kas", "ks"}, {"geo/kat", "ka"}, {"kau", "kr"}, {"kaw", ""}, {"kaz", "kk"},
+            {"kbd", ""}, {"kha", ""}, {"khi", ""}, {"khm", "km"}, {"kho", ""}, {"kik", "ki"},
+            {"kin", "rw"}, {"kir", "ky"}, {"kmb", ""}, {"kok", ""}, {"kom", "kv"}, {"kon", "kg"},
+            {"kor", "ko"}, {"kos", ""}, {"kpe", ""}, {"krc", ""}, {"kro", ""}, {"kru", ""}, {"kua", "kj"},
+            {"kum", ""}, {"kur", "ku"}, {"kut", ""}, {"lad", ""}, {"lah", ""}, {"lam", ""}, {"lao", "lo"},
+            {"lat", "la"}, {"lav", "lv"}, {"lez", ""}, {"lim", "li"}, {"lin", "ln"}, {"lit", "lt"},
+            {"lol", ""}, {"loz", ""}, {"ltz", "lb"}, {"lua", ""}, {"lub", "lu"}, {"lug", "lg"},
+            {"lui", ""}, {"lun", ""}, {"luo", ""}, {"lus", ""}, {"mac/mkd", "mk"}, {"mad", ""},
+            {"mag", ""}, {"mah", "mh"}, {"mai", ""}, {"mak", ""}, {"mal", "ml"}, {"man", ""},
+            {"mao/mri", "mi"}, {"map", ""}, {"mar", "mr"}, {"mas", ""}, {"may/msa", "ms"}, {"mdf", ""},
+            {"mdr", ""}, {"men", ""}, {"mga", ""}, {"mic", ""}, {"min", ""}, {"mis", ""},
+            {"mac/mkd", "mk"}, {"mkh", ""}, {"mlg", "mg"}, {"mlt", "mt"}, {"mnc", ""}, {"mni", ""},
+            {"mno", ""}, {"moh", ""}, {"mol", "mo"}, {"mon", "mn"}, {"mos", ""}, {"mao/mri", "mi"},
+            {"may/msa", "ms"}, {"mul", ""}, {"mun", ""}, {"mus", ""}, {"mwr", ""}, {"bur/mya", "my"},
+            {"myn", ""}, {"myv", ""}, {"nah", ""}, {"nai", ""}, {"nap", ""}, {"nau", "na"}, {"nav", "nv"},
+            {"nbl", "nr"}, {"nde", "nd"}, {"ndo", "ng"}, {"nds", ""}, {"nep", "ne"}, {"new", ""},
+            {"nia", ""}, {"nic", ""}, {"niu", ""}, {"dut/nld", "nl"}, {"nno", "nn"}, {"nob", "nb"},
+            {"nog", ""}, {"non", ""}, {"nor", "no"}, {"nso", ""}, {"nub", ""}, {"nya", "ny"}, {"nym", ""},
+            {"nyn", ""}, {"nyo", ""}, {"nzi", ""}, {"oci", "oc"}, {"oji", "oj"}, {"ori", "or"},
+            {"orm", "om"}, {"osa", ""}, {"oss", "os"}, {"ota", ""}, {"oto", ""}, {"paa", ""}, {"pag", ""},
+            {"pal", ""}, {"pam", ""}, {"pan", "pa"}, {"pap", ""}, {"pau", ""}, {"peo", ""},
+            {"per/fas", "fa"}, {"phi", ""}, {"phn", ""}, {"pli", "pi"}, {"pol", "pl"}, {"pon", ""},
+            {"por", "pt"}, {"pra", ""}, {"pro", ""}, {"pus", "ps"}, {"que", "qu"}, {"raj", ""},
+            {"rap", ""}, {"rar", ""}, {"roa", "",}, {"roh", "rm"}, {"rom", ""}, {"rum/ron", "ro"},
+            {"run", "rn"}, {"rus", "ru"}, {"sad", ""}, {"sag", "sg"}, {"sah", ""}, {"sai", ""},
+            {"sal", ""}, {"sam", ""}, {"san", "sa"}, {"sas", ""}, {"sat", ""}, {"scc/srp", "sr"},
+            {"sco", ""}, {"scr/hrv", "hr"}, {"sel", ""}, {"sem", ""}, {"sga", ""}, {"sgn", ""},
+            {"shn", ""}, {"sid", ""}, {"sin", "si"}, {"sio", ""}, {"sit", ""}, {"sla", ""},
+            {"slo/slk", "sk"}, {"slv", "sl"}, {"sma", ""}, {"sme", "se"}, {"smi", ""}, {"smj", ""},
+            {"smn", ""}, {"smo", "sm"}, {"sms", ""}, {"sna", "sn"}, {"snd", "sd"}, {"snk", ""},
+            {"sog", ""}, {"som", "so"}, {"son", ""}, {"sot", "st"}, {"spa", "es"}, {"alb/sqi", "sq"},
+            {"srd", "sc"}, {"scc/srp", "sr"}, {"srr", ""}, {"ssa", ""}, {"ssw", "ss"}, {"suk", ""},
+            {"sun", "su"}, {"sus", ""}, {"sux", ""}, {"swa", "sw"}, {"swe", "sv"}, {"syr", ""},
+            {"tah", "ty"}, {"tai", ""}, {"tam", "ta"}, {"tat", "tt"}, {"tel", "te"}, {"tem", ""},
+            {"ter", ""}, {"tet", ""}, {"tgk", "tg"}, {"tgl", "tl"}, {"tha", "th"}, {"tib/bod", "bo"},
+            {"tig", ""}, {"tir", "ti"}, {"tiv", ""}, {"tkl", ""}, {"tli", ""}, {"tmh", ""}, {"tog", ""},
+            {"ton", "to"}, {"tpi", ""}, {"tsi", ""}, {"tsn", "tn"}, {"tso", "ts"}, {"tuk", "tk"},
+            {"tum", ""}, {"tup", ""}, {"tur", "tr"}, {"tut", ""}, {"tvl", ""}, {"twi", "tw"}, {"tyv", ""},
+            {"udm", ""}, {"uga", ""}, {"uig", "ug"}, {"ukr", "uk"}, {"umb", ""}, {"und", ""},
+            {"urd", "ur"}, {"uzb", "uz"}, {"vai", ""}, {"ven", "ve"}, {"vie", "vi"}, {"vol", "vo"},
+            {"vot", ""}, {"wak", ""}, {"wal", ""}, {"war", ""}, {"was", ""}, {"wel/cym", "cy"},
+            {"wen", ""}, {"wln", "wa"}, {"wol", "wo"}, {"xal", ""}, {"xho", "xh"}, {"yao", ""},
+            {"yap", ""}, {"yid", "yi"}, {"yor", "yo"}, {"ypk", ""}, {"zap", ""}, {"zen", ""},
+            {"zha", "za"}, {"chi/zho", "zh"}, {"znd", ""}, {"zul", "zu"}, {"zun", ""},};
 
     static {
         Map iso6391to6392map = new HashMap();
         Map iso6392to6391map = new HashMap();
-        for ( int i = 0; i < iso6391to6392table.length; i++ ) {
+        for (int i = 0; i < iso6391to6392table.length; i++) {
             String iso639_2 = iso6391to6392table[i][0];
             String iso639_1 = iso6391to6392table[i][1];
-            if ( !"".equalsIgnoreCase(iso639_1) ) {
+            if (!"".equalsIgnoreCase(iso639_1)) {
                 int index = iso639_2.indexOf("/");
-                if ( -1 != index ) {
+                if (-1 != index) {
                     iso639_2 = iso639_2.substring(0, index);
                 }
                 iso6391to6392map.put(iso639_1, iso639_2);
@@ -128,54 +130,16 @@ public LanguageMapper(Database database, String defaultLanguage) {
         this.defaultLanguage = defaultLanguage;
     }
 
-    public String getCurrentLanguageNameInUsersLanguage(UserDomainObject user,
-                                                        String documentLanguage) {
-        List languageKeysAndNamesInUsersLanguage = getListOfLanguageKeysAndNamesInUsersLanguage(user);
-        String result = null;
-        for ( Iterator iterator = languageKeysAndNamesInUsersLanguage.iterator(); iterator.hasNext(); ) {
-            String langPrefix = (String) iterator.next();
-            String languageNameInUserLanguage = (String) iterator.next();
-            if ( langPrefix.equalsIgnoreCase(documentLanguage) ) {
-                result = languageNameInUserLanguage;
-            }
-        }
-        return result;
-    }
-
-    public String createLanguagesOptionList(UserDomainObject user,
-                                            String documentLanguage) {
-        List languageKeysAndNamesInUsersLanguage = getListOfLanguageKeysAndNamesInUsersLanguage(user);
-        return Html.createOptionList(languageKeysAndNamesInUsersLanguage, documentLanguage);
-    }
-
-    private List getListOfLanguageKeysAndNamesInUsersLanguage(UserDomainObject user) {
-        final Object[] parameters = new String[] {
-                user.getLanguageIso639_2() };
-        String[][] languages = (String[][]) database.execute(new SqlQueryCommand("select lang_prefix, user_prefix, language from languages where user_prefix = ?", parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
-        List languagesInOptionList = new ArrayList();
-        for ( int i = 0; i < languages.length; i++ ) {
-            String langStr = languages[i][0];
-            langStr = getAsIso639_2OrDefaultLanguage(langStr, defaultLanguage);
-            String userLangPrefix = languages[i][1];
-            String languageNameInUserLanguage = languages[i][2];
-            if ( userLangPrefix.equalsIgnoreCase(user.getLanguageIso639_2()) ) {
-                languagesInOptionList.add(langStr);
-                languagesInOptionList.add(languageNameInUserLanguage);
-            }
-        }
-        return languagesInOptionList;
-    }
-
     public static String getAsIso639_2OrDefaultLanguage(String langStr, String defaultLanguage) {
         try {
-            if ( StringUtils.isBlank(langStr) ) {
+            if (StringUtils.isBlank(langStr)) {
                 return defaultLanguage;
             }
             return getAsIso639_2(langStr);
-        } catch ( LanguageNotSupportedException e ) {
+        } catch (LanguageNotSupportedException e) {
             log.error("Unsupported language '"
-                      + langStr
-                      + "' found in database. Using default.", e);
+                    + langStr
+                    + "' found in database. Using default.", e);
             return defaultLanguage;
         }
     }
@@ -186,12 +150,12 @@ public static String getAsIso639_2OrDefaultLanguage(String langStr, String defau
      * @throws IllegalArgumentException If an unsupported language is requested.
      */
     public static String convert639_1to639_2(String language) throws LanguageNotSupportedException {
-        if ( "se".equalsIgnoreCase(language) ) {
+        if ("se".equalsIgnoreCase(language)) {
             // FIXME Nasty workaround for our "se" which should be "sv". Hides Northern Sami language (sme).
             return (String) iso639_1to639_2map.get("sv");
         }
         String iso6392 = (String) iso639_1to639_2map.get(language.toLowerCase());
-        if ( null == iso6392 ) {
+        if (null == iso6392) {
             throw new LanguageNotSupportedException("Language '" + language + "' not supported.");
         }
         return iso6392;
@@ -204,7 +168,7 @@ public static String convert639_1to639_2(String language) throws LanguageNotSupp
      */
     public static String convert639_2to639_1(String language) throws LanguageNotSupportedException {
         String iso6391 = (String) iso639_2to639_1map.get(language.toLowerCase());
-        if ( null == iso6391 ) {
+        if (null == iso6391) {
             throw new LanguageNotSupportedException("Language '" + language + "' not supported.");
         }
         return iso6391;
@@ -215,12 +179,50 @@ public static boolean existsIsoCode639_2(String isoCode639_2) {
     }
 
     private static String getAsIso639_2(String langStr) throws LanguageNotSupportedException {
-        if ( 2 == langStr.length() ) {
+        if (2 == langStr.length()) {
             langStr = convert639_1to639_2(langStr);
         }
         return langStr;
     }
 
+    public String getCurrentLanguageNameInUsersLanguage(UserDomainObject user,
+                                                        String documentLanguage) {
+        List languageKeysAndNamesInUsersLanguage = getListOfLanguageKeysAndNamesInUsersLanguage(user);
+        String result = null;
+        for (Iterator iterator = languageKeysAndNamesInUsersLanguage.iterator(); iterator.hasNext(); ) {
+            String langPrefix = (String) iterator.next();
+            String languageNameInUserLanguage = (String) iterator.next();
+            if (langPrefix.equalsIgnoreCase(documentLanguage)) {
+                result = languageNameInUserLanguage;
+            }
+        }
+        return result;
+    }
+
+    public String createLanguagesOptionList(UserDomainObject user,
+                                            String documentLanguage) {
+        List languageKeysAndNamesInUsersLanguage = getListOfLanguageKeysAndNamesInUsersLanguage(user);
+        return Html.createOptionList(languageKeysAndNamesInUsersLanguage, documentLanguage);
+    }
+
+    private List getListOfLanguageKeysAndNamesInUsersLanguage(UserDomainObject user) {
+        final Object[] parameters = new String[]{
+                user.getLanguageIso639_2()};
+        String[][] languages = (String[][]) database.execute(new SqlQueryCommand("select lang_prefix, user_prefix, language from languages where user_prefix = ?", parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        List languagesInOptionList = new ArrayList();
+        for (int i = 0; i < languages.length; i++) {
+            String langStr = languages[i][0];
+            langStr = getAsIso639_2OrDefaultLanguage(langStr, defaultLanguage);
+            String userLangPrefix = languages[i][1];
+            String languageNameInUserLanguage = languages[i][2];
+            if (userLangPrefix.equalsIgnoreCase(user.getLanguageIso639_2())) {
+                languagesInOptionList.add(langStr);
+                languagesInOptionList.add(languageNameInUserLanguage);
+            }
+        }
+        return languagesInOptionList;
+    }
+
     public String getDefaultLanguage() {
         return defaultLanguage;
     }
diff --git a/server/src/imcode/server/LoggingDocumentIndex.java b/server/src/imcode/server/LoggingDocumentIndex.java
index 4644a97182..696dd3f510 100644
--- a/server/src/imcode/server/LoggingDocumentIndex.java
+++ b/server/src/imcode/server/LoggingDocumentIndex.java
@@ -1,21 +1,31 @@
 package imcode.server;
 
+import com.imcode.db.Database;
+import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
+import com.imcode.imcms.api.SearchResult;
+import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.index.DocumentIndex;
 import imcode.server.document.index.DocumentIndexWrapper;
 import imcode.server.document.index.DocumentQuery;
 import imcode.server.document.index.IndexException;
 import imcode.server.user.UserDomainObject;
-import com.imcode.db.Database;
-import com.imcode.db.commands.InsertIntoTableDatabaseCommand;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.*;
 
-import java.util.*;
 import java.sql.Timestamp;
+import java.util.*;
 
-import org.apache.lucene.search.*;
-import org.apache.lucene.index.Term;
+import static org.apache.lucene.search.BooleanClause.Occur;
 
 public class LoggingDocumentIndex extends DocumentIndexWrapper {
 
+    private final static Set<String> LOGGED_FIELDS = new HashSet<>(Arrays.asList(
+            DocumentIndex.FIELD__META_HEADLINE,
+            DocumentIndex.FIELD__META_TEXT,
+            DocumentIndex.FIELD__TEXT,
+            DocumentIndex.FIELD__ALIAS,
+            DocumentIndex.FIELD__KEYWORD
+    ));
     private final Database database;
 
     public LoggingDocumentIndex(Database database, DocumentIndex documentIndex) {
@@ -23,57 +33,60 @@ public LoggingDocumentIndex(Database database, DocumentIndex documentIndex) {
         this.database = database;
     }
 
-    public List search(DocumentQuery documentQuery, UserDomainObject searchingUser) throws IndexException {
+    public List<DocumentDomainObject> search(DocumentQuery documentQuery, UserDomainObject searchingUser) throws IndexException {
         Query query = documentQuery.getQuery();
         logTerms(getTerms(query));
         return super.search(documentQuery, searchingUser);
     }
 
+    @Override
+    public SearchResult<DocumentDomainObject> search(DocumentQuery documentQuery, UserDomainObject searchingUser, int startPosition,
+                                                     int maxResults) throws IndexException {
+
+        Query query = documentQuery.getQuery();
+        logTerms(getTerms(query));
+        return super.search(documentQuery, searchingUser, startPosition, maxResults);
+    }
+
     private Collection<String> getTerms(Query query) {
-        Collection<String> terms = new HashSet<String>();
+        Collection<String> terms = new HashSet<>();
         getTerms(query, terms);
         return terms;
     }
 
     private void logTerms(Collection<String> terms) {
         Timestamp timestamp = new Timestamp(new Date().getTime());
-        for ( String term : terms ) {
-            database.execute(new InsertIntoTableDatabaseCommand("document_search_log", new Object[][] {
-                    { "datetime", timestamp },
-                    { "term", term }
-            })) ;
+        for (String term : terms) {
+            database.execute(new InsertIntoTableDatabaseCommand("document_search_log", new Object[][]{
+                    {"datetime", timestamp},
+                    {"term", term}
+            }));
         }
     }
 
     private void getTerms(Query query, Collection<String> terms) {
-        if ( query instanceof BooleanQuery ) {
-            BooleanQuery booleanQuery = (BooleanQuery) query ;
-            BooleanClause[] clauses = booleanQuery.getClauses();
-            for ( BooleanClause clause : clauses ) {
-                if (!clause.prohibited) {
-                    getTerms(clause.query, terms);
+        if (query instanceof BooleanQuery) {
+            final BooleanQuery booleanQuery = (BooleanQuery) query;
+
+            final List<BooleanClause> booleanClauses = new ArrayList<>();
+            booleanQuery.iterator().forEachRemaining(booleanClauses::add);
+            final BooleanClause[] clauses = booleanClauses.toArray(new BooleanClause[0]);
+
+            for (BooleanClause clause : clauses) {
+                if (clause.getOccur() != Occur.MUST_NOT) {
+                    getTerms(clause.getQuery(), terms);
                 }
             }
-        } else if ( query instanceof TermQuery ) {
-            TermQuery termQuery = (TermQuery) query;
+        } else if (query instanceof TermQuery) {
+            final TermQuery termQuery = (TermQuery) query;
             addTerm(terms, termQuery.getTerm());
-        } else if ( query instanceof MultiTermQuery ) {
-            MultiTermQuery multiTermQuery = (MultiTermQuery) query;
-            addTerm(terms, multiTermQuery.getTerm());
-        } else if ( query instanceof PrefixQuery ) {
-            PrefixQuery prefixQuery = (PrefixQuery) query;
-            addTerm(terms, prefixQuery.getPrefix());
+        } else if (query instanceof PhraseQuery) {
+            final PhraseQuery phraseQuery = (PhraseQuery) query;
+            for (Term term : phraseQuery.getTerms())
+                addTerm(terms, term);
         }
     }
 
-    private final static Set LOGGED_FIELDS = new HashSet(Arrays.asList(new String[] {
-            DocumentIndex.FIELD__META_HEADLINE,
-            DocumentIndex.FIELD__META_TEXT,
-            DocumentIndex.FIELD__TEXT,
-            DocumentIndex.FIELD__ALIAS,
-            DocumentIndex.FIELD__KEYWORD,
-    } )); 
-    
     private void addTerm(Collection<String> terms, Term term) {
         if (LOGGED_FIELDS.contains(term.field())) {
             terms.add(term.text());
diff --git a/server/src/imcode/server/MockImcmsServices.java b/server/src/imcode/server/MockImcmsServices.java
deleted file mode 100644
index 7d21d5a396..0000000000
--- a/server/src/imcode/server/MockImcmsServices.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package imcode.server;
-
-import com.imcode.db.Database;
-import com.imcode.db.mock.MockDatabase;
-import com.imcode.imcms.db.ProcedureExecutor;
-import com.imcode.imcms.mapping.CategoryMapper;
-import com.imcode.imcms.mapping.DocumentMapper;
-import imcode.server.document.TemplateMapper;
-import imcode.server.parser.ParserParameters;
-import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
-import imcode.server.user.RoleGetter;
-import imcode.server.user.UserDomainObject;
-import imcode.util.CachingFileLoader;
-import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
-import imcode.util.net.SMTP;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.commons.lang.NotImplementedException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-import java.security.KeyStore;
-import java.text.Collator;
-import java.util.Date;
-import java.util.List;
-
-public class MockImcmsServices implements ImcmsServices {
-
-    private ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper;
-
-    private Database database = new MockDatabase();
-    private KeyStore keyStore;
-    private TemplateMapper templateMapper;
-    private DocumentMapper documentMapper;
-    private CategoryMapper categoryMapper;
-    private LanguageMapper languageMapper = new LanguageMapper(null, null);
-    private RoleGetter roleGetter;
-    private ProcedureExecutor procedureExecutor;
-    private Config config = new Config();
-
-    public UserDomainObject verifyUser( String login, String password ) {
-        return null;
-    }
-
-    public void parsePage(ParserParameters paramsToParse, Writer out) throws IOException {
-
-    }
-
-    public void incrementSessionCounter() {
-
-    }
-
-    // set session counter
-    public void setSessionCounter( int value ) {
-
-    }
-
-    // set  session counter date
-    public void setSessionCounterDate( Date date ) {
-
-    }
-
-    // set  session counter date
-    public Date getSessionCounterDate() {
-        return null;
-    }
-
-    // parsedoc use template
-    public String getAdminTemplate( String adminTemplateName, UserDomainObject user, List tagsWithReplacements ) {
-        return null;
-    }
-
-    // parseExternaldoc use template
-    public String getTemplateFromDirectory( String adminTemplateName, UserDomainObject user, List variables,
-                                            String directory ) {
-        return null;
-    }
-
-    // get doctype
-    public int getDocType( int meta_id ) {
-        return 0;
-    }
-
-    public SystemData getSystemData() {
-        return null;
-    }
-
-    public void setSystemData( SystemData sd ) {
-
-    }
-
-    public String[][] getAllDocumentTypes( String langPrefixStr ) {
-        return new String[0][];
-    }
-
-    public int getSessionCounter() {
-        return 0;
-    }
-
-    public String getSessionCounterDateAsString() {
-        return null;
-    }
-
-    public void updateMainLog( String logMessage ) {
-
-    }
-
-    public DocumentMapper getDocumentMapper() {
-        return documentMapper;
-    }
-
-    public ImcmsAuthenticatorAndUserAndRoleMapper getImcmsAuthenticatorAndUserAndRoleMapper() {
-        return imcmsAuthenticatorAndUserAndRoleMapper ;
-    }
-
-    public TemplateMapper getTemplateMapper() {
-        return templateMapper;
-    }
-
-    public SMTP getSMTP() {
-        return null;
-    }
-
-    public File getIncludePath() {
-        return null;
-    }
-
-    public Collator getDefaultLanguageCollator() {
-        return null;
-    }
-
-    public VelocityEngine getVelocityEngine( UserDomainObject user ) {
-        return null;
-    }
-
-    public VelocityContext getVelocityContext( UserDomainObject user ) {
-        return null;
-    }
-
-    public Config getConfig() {
-        return this.config;
-    }
-
-    public Database getDatabase() {
-        return database ;
-    }
-
-    public CategoryMapper getCategoryMapper() {
-        return categoryMapper ;
-    }
-
-    public LanguageMapper getLanguageMapper() {
-        return languageMapper;
-    }
-
-    public CachingFileLoader getFileCache() {
-        return null ;
-    }
-
-    public RoleGetter getRoleGetter() {
-        return roleGetter ;
-    }
-
-    public ProcedureExecutor getProcedureExecutor() {
-        return procedureExecutor;
-    }
-
-    public UserDomainObject verifyUserByIpOrDefault(String remoteAddr) {
-        return null;
-    }
-
-    public LocalizedMessageProvider getLocalizedMessageProvider() {
-        throw new NotImplementedException("imcode.server.MockImcmsServices.getLocalizedMessageFactory");
-    }
-
-    public KeyStore getKeyStore() {
-        return keyStore;
-    }
-
-    public void setImcmsAuthenticatorAndUserAndRoleMapper(
-            ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper ) {
-        this.imcmsAuthenticatorAndUserAndRoleMapper = imcmsAuthenticatorAndUserAndRoleMapper;
-    }
-
-    public void setDatabase( Database database ) {
-        this.database = database;
-    }
-
-    public void setKeyStore( KeyStore keyStore ) {
-        this.keyStore = keyStore;
-    }
-
-    public void setTemplateMapper( TemplateMapper templateMapper ) {
-        this.templateMapper = templateMapper;
-    }
-
-    public void setDocumentMapper( DocumentMapper documentMapper ) {
-        this.documentMapper = documentMapper;
-    }
-
-    public void setCategoryMapper(CategoryMapper categoryMapper) {
-        this.categoryMapper = categoryMapper;
-    }
-
-    public void setLanguageMapper(LanguageMapper languageMapper) {
-        this.languageMapper = languageMapper;
-    }
-
-    public void setRoleGetter(RoleGetter roleGetter) {
-        this.roleGetter = roleGetter;
-    }
-
-    public void setProcedureExecutor(ProcedureExecutor procedureExecutor) {
-        this.procedureExecutor = procedureExecutor;
-    }
-}
diff --git a/server/src/imcode/server/PhaseQueryFixingDocumentIndex.java b/server/src/imcode/server/PhaseQueryFixingDocumentIndex.java
index 29f4a3c788..f6a6c461c7 100644
--- a/server/src/imcode/server/PhaseQueryFixingDocumentIndex.java
+++ b/server/src/imcode/server/PhaseQueryFixingDocumentIndex.java
@@ -1,11 +1,9 @@
 package imcode.server;
 
+import com.imcode.imcms.api.SearchResult;
+import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.LifeCyclePhase;
-import imcode.server.document.index.DocumentIndex;
-import imcode.server.document.index.DocumentIndexWrapper;
-import imcode.server.document.index.DocumentQuery;
-import imcode.server.document.index.IndexException;
-import imcode.server.document.index.SimpleDocumentQuery;
+import imcode.server.document.index.*;
 import imcode.server.user.UserDomainObject;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanClause;
@@ -15,6 +13,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.function.Predicate;
 
 public class PhaseQueryFixingDocumentIndex extends DocumentIndexWrapper {
 
@@ -22,35 +21,54 @@ public PhaseQueryFixingDocumentIndex(DocumentIndex index) {
         super(index);
     }
 
-    public List search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
+    public List<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
         return super.search(fixQuery(query), searchingUser);
     }
 
-    DocumentQuery fixQuery(DocumentQuery documentQuery) {
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser, int startPosition, int maxResults) throws IndexException {
+        return super.search(fixQuery(query), searchingUser, startPosition, maxResults);
+    }
+
+    @Override
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser, int startPosition, int maxResults, Predicate<DocumentDomainObject> filterPredicate) throws IndexException {
+        return super.search(fixQuery(query), searchingUser, startPosition, maxResults, filterPredicate);
+    }
+
+    private DocumentQuery fixQuery(DocumentQuery documentQuery) {
         Query query = documentQuery.getQuery();
         return new SimpleDocumentQuery(fixQuery(query), documentQuery.getSort(), documentQuery.isLogged());
     }
 
     Query fixQuery(Query query) {
-        if (query instanceof BooleanQuery ) {
-            BooleanQuery booleanQuery = (BooleanQuery) query ;
-            BooleanClause[] clauses = booleanQuery.getClauses();
-            for ( BooleanClause clause : clauses ) {
-                clause.query = fixQuery(clause.query);
+        if (query instanceof BooleanQuery) {
+            BooleanQuery booleanQuery = (BooleanQuery) query;
+
+            final BooleanQuery.Builder queryBuilder = new BooleanQuery.Builder();
+            final List<BooleanClause> booleanClauses = booleanQuery.clauses();
+
+            for (final BooleanClause booleanClause : booleanClauses) {
+                final BooleanClause fixedBooleanClause = new BooleanClause(
+                        fixQuery(booleanClause.getQuery()), booleanClause.getOccur()
+                );
+
+                queryBuilder.add(fixedBooleanClause);
             }
-        } else if ( query instanceof TermQuery ) {
+
+            return queryBuilder.build();
+
+        } else if (query instanceof TermQuery) {
             TermQuery termQuery = (TermQuery) query;
             Term term = termQuery.getTerm();
-            if ( DocumentIndex.FIELD__PHASE.equals(term.field())) {
-                LifeCyclePhase[] allPhases = LifeCyclePhase.ALL ;
+            if (DocumentIndex.FIELD__PHASE.equals(term.field())) {
+                LifeCyclePhase[] allPhases = LifeCyclePhase.ALL;
                 Date now = new Date();
-                for ( LifeCyclePhase phase : allPhases ) {
-                    if ( phase.toString().equals(term.text()) ) {
+                for (LifeCyclePhase phase : allPhases) {
+                    if (phase.toString().equals(term.text())) {
                         return phase.asQuery(now);
                     }
                 }
             }
         }
-        return query ;
+        return query;
     }
 }
diff --git a/server/src/imcode/server/Revisits.java b/server/src/imcode/server/Revisits.java
index e1f66fc8b6..393df968d1 100644
--- a/server/src/imcode/server/Revisits.java
+++ b/server/src/imcode/server/Revisits.java
@@ -1,24 +1,24 @@
-package imcode.server ;
+package imcode.server;
 
 public class Revisits {
-    
-	private String revisitsId ;
-	private String revisitsDate;
 
-	public String getRevisitsId() {
-	return revisitsId ;
-	}
-	
-	public String getRevisitsDate() {
-	return revisitsDate ;
-	}
+    private String revisitsId;
+    private String revisitsDate;
 
-	public void setRevisitsId(String revisitsId) {
-	this.revisitsId=revisitsId ;
-	}
-	
-	public void setRevisitsDate(String revisitsDate) {
-	this.revisitsDate=revisitsDate ;
+    public String getRevisitsId() {
+        return revisitsId;
+    }
+
+    public void setRevisitsId(String revisitsId) {
+        this.revisitsId = revisitsId;
+    }
+
+    public String getRevisitsDate() {
+        return revisitsDate;
+    }
+
+    public void setRevisitsDate(String revisitsDate) {
+        this.revisitsDate = revisitsDate;
     }
 
 }
diff --git a/server/src/imcode/server/SanityCheck.java b/server/src/imcode/server/SanityCheck.java
index b0cec7b435..694a3699c9 100644
--- a/server/src/imcode/server/SanityCheck.java
+++ b/server/src/imcode/server/SanityCheck.java
@@ -4,18 +4,18 @@
 
 public interface SanityCheck {
 
-    Collection<Problem> execute() ;
+    Collection<Problem> execute();
 
     interface Problem {
+        Severity getSeverity();
+
+        String getDescription();
+
         enum Severity {
             UNKNOWN,
             WARNING,
             ERROR,
         }
-    
-        Severity getSeverity();
-        
-        String getDescription();
-        
+
     }
 }
diff --git a/server/src/imcode/server/SimpleProblem.java b/server/src/imcode/server/SimpleProblem.java
index 6a1f327a2c..5460f0f067 100644
--- a/server/src/imcode/server/SimpleProblem.java
+++ b/server/src/imcode/server/SimpleProblem.java
@@ -16,6 +16,8 @@ public Severity getSeverity() {
 
     public String getDescription() {
         return description;
-    };
+    }
+
+    ;
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/SystemData.java b/server/src/imcode/server/SystemData.java
index 614a9483b5..07ce06831b 100644
--- a/server/src/imcode/server/SystemData.java
+++ b/server/src/imcode/server/SystemData.java
@@ -1,85 +1,134 @@
-package imcode.server ;
+package imcode.server;
 
 /**
-   Storage-container for systemdata
+ * Storage-container for systemdata
  */
 public class SystemData implements java.io.Serializable {
 
-    /** The startdocument **/
-    private int startDocument ;
-
-    /** The servermaster */
-    private String serverMaster ;
-
-    /** The servermaster's address */
-    private String serverMasterAddress ;
-
-    /** The webmaster */
-    private String webMaster ;
-
-    /** The webmaster's address */
-    private String webMasterAddress ;
-
-    /** The systemmessage */
-    private String systemMessage ;
-
-
-    /** Get the startdocument **/
+    /**
+     * 24h
+     */
+    private final static int DEFAULT_USER_LOGIN_PASSWORD_EXPIRATION_INTERVAL = 24;
+
+    /**
+     * The startdocument *
+     */
+    private int startDocument;
+
+    /**
+     * The servermaster
+     */
+    private String serverMaster;
+
+    /**
+     * The servermaster's address
+     */
+    private String serverMasterAddress;
+
+    /**
+     * The webmaster
+     */
+    private String webMaster;
+
+    /**
+     * The webmaster's address
+     */
+    private String webMasterAddress;
+
+    /**
+     * The systemmessage
+     */
+    private String systemMessage;
+
+    /**
+     * User's login password reset expiration interval in hours.
+     */
+    private int userLoginPasswordResetExpirationInterval = DEFAULT_USER_LOGIN_PASSWORD_EXPIRATION_INTERVAL;
+
+
+    /**
+     * Get the startdocument *
+     */
     public int getStartDocument() {
-	return startDocument ;
+        return startDocument;
     }
 
-    /** Get the servermaster */
+    public void setStartDocument(int startDocument) {
+        this.startDocument = startDocument;
+    }
+
+    /**
+     * Get the servermaster
+     */
     public String getServerMaster() {
-	return serverMaster ;
+        return serverMaster;
     }
 
-    /** Get the servermaster's address */
-    public String getServerMasterAddress() {
-	return serverMasterAddress ;
+    public void setServerMaster(String serverMaster) {
+        this.serverMaster = serverMaster;
     }
 
-    /** Get the webmaster */
-    public String getWebMaster() {
-	return webMaster ;
+    /**
+     * Get the servermaster's address
+     */
+    public String getServerMasterAddress() {
+        return serverMasterAddress;
     }
 
-    /** Get the webmaster's address */
-    public String getWebMasterAddress() {
-	return webMasterAddress ;
+    /**
+     * Get the servermaster's address
+     */
+    public void setServerMasterAddress(String serverMasterAddress) {
+        this.serverMasterAddress = serverMasterAddress;
     }
 
-    /** Get the systemmessage */
-    public String getSystemMessage() {
-	return systemMessage ;
+    /**
+     * Get the webmaster
+     */
+    public String getWebMaster() {
+        return webMaster;
     }
 
+    /**
+     * Get the webmaster
+     */
+    public void setWebMaster(String webMaster) {
+        this.webMaster = webMaster;
+    }
 
-    public void setStartDocument(int startDocument) {
-	this.startDocument = startDocument ;
+    /**
+     * Get the webmaster's address
+     */
+    public String getWebMasterAddress() {
+        return webMasterAddress;
     }
 
-    public void setServerMaster(String serverMaster) {
-	this.serverMaster = serverMaster ;
+    /**
+     * Get the webmaster's address
+     */
+    public void setWebMasterAddress(String webMasterAddress) {
+        this.webMasterAddress = webMasterAddress;
     }
 
-    /** Get the servermaster's address */
-    public void setServerMasterAddress(String serverMasterAddress) {
-	this.serverMasterAddress = serverMasterAddress ;
+    /**
+     * Get the systemmessage
+     */
+    public String getSystemMessage() {
+        return systemMessage;
     }
 
-    /** Get the webmaster */
-    public void setWebMaster(String webMaster) {
-	this.webMaster = webMaster ;
+    /**
+     * Get the systemmessage
+     */
+    public void setSystemMessage(String systemMessage) {
+        this.systemMessage = systemMessage;
     }
 
-    /** Get the webmaster's address */
-    public void setWebMasterAddress(String webMasterAddress) {
-	this.webMasterAddress = webMasterAddress ;
+    public int getUserLoginPasswordResetExpirationInterval() {
+        return userLoginPasswordResetExpirationInterval;
     }
 
-    /** Get the systemmessage */
-    public void setSystemMessage(String systemMessage) {
-	this.systemMessage = systemMessage ;
+    public void setUserLoginPasswordResetExpirationInterval(int userLoginPasswordResetExpirationInterval) {
+        this.userLoginPasswordResetExpirationInterval = userLoginPasswordResetExpirationInterval;
     }
 }
diff --git a/server/src/imcode/server/XMLConfig.java b/server/src/imcode/server/XMLConfig.java
new file mode 100644
index 0000000000..8475e63535
--- /dev/null
+++ b/server/src/imcode/server/XMLConfig.java
@@ -0,0 +1,106 @@
+package imcode.server;
+
+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableList;
+import imcode.server.user.ldap.MappedRole;
+import imcode.server.user.ldap.MappedRoles;
+import imcode.server.user.ldap.jaxb.*;
+import org.apache.commons.io.input.BOMInputStream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+public final class XMLConfig {
+
+    private final ServerElement serverElement;
+
+    private final MappedRoles ldapMappedRoles;
+
+    private Logger logger = LogManager.getLogger(getClass().getName());
+
+    public XMLConfig(String configFilePath) {
+        logger.info(String.format("Reading xml based configuration from %s.", configFilePath));
+
+        if (configFilePath == null) {
+            logger.fatal("Config file path is not provided (null)");
+            throw new IllegalArgumentException("configFilePath must not be null");
+        }
+
+        try {
+            JAXBContext context = JAXBContext.newInstance(ServerElement.class);
+            Unmarshaller um = context.createUnmarshaller();
+            serverElement = (ServerElement) um.unmarshal(new InputStreamReader(
+                    new BOMInputStream(new FileInputStream(configFilePath)), StandardCharsets.UTF_8));
+        } catch (FileNotFoundException e) {
+            String errorMsg = String.format("Configuration file %s can not be found.", configFilePath);
+            logger.fatal(errorMsg, e);
+            throw new RuntimeException(errorMsg, e);
+        } catch (IOException e) {
+            String errorMsg = String.format("Failed to read configuration file %s.", configFilePath);
+            logger.fatal(errorMsg, e);
+            throw new RuntimeException(errorMsg, e);
+        } catch (JAXBException e) {
+            String errorMsg = String.format("Failed to parse configuration file %s.", configFilePath);
+            logger.fatal(errorMsg, e);
+            throw new RuntimeException(errorMsg, e);
+        }
+
+        ldapMappedRoles = readLdapMappedRoles();
+    }
+
+
+    public MappedRoles getLdapMappedRoles() {
+        return ldapMappedRoles;
+    }
+
+
+    private MappedRoles readLdapMappedRoles() {
+        logger.info("Reading LDAP attributes mapped to roles.");
+
+        ImmutableCollection.Builder<MappedRole.RoleToAttribute> rolesToAttributesColl = ImmutableList.builder();
+        ImmutableCollection.Builder<MappedRole.RoleToAdGroup> rolesToAdGroupsBuilderColl = ImmutableList.builder();
+
+        LdapElement ldapElement = serverElement.ldapElement();
+
+        if (ldapElement != null) {
+            MappedRolesElement rolesMappingElement = ldapElement.mappedRolesElement();
+
+            for (RoleToAttributeElement el : rolesMappingElement.rolesToAttributesElements()) {
+                String roleName = el.role();
+                String attributeName = el.attributeName();
+                String attributeValue = el.attributeValue();
+
+                rolesToAttributesColl.add(new MappedRole.RoleToAttribute(roleName, attributeName, attributeValue));
+
+                logger.info(String.format("Added LDAP role-to-attribute mapping. Role: %s, attribute: %s -> %s.",
+                        roleName, attributeName, attributeValue));
+            }
+
+            for (RoleToAdGroupElement el : rolesMappingElement.rolesToAdGroupsElements()) {
+                String role = el.role();
+                String group = el.group();
+
+                rolesToAdGroupsBuilderColl.add(new MappedRole.RoleToAdGroup(role, group));
+
+                logger.info(String.format("Added AD role-to-ad-group mapping. Role: %s, group sAMAccountName: %s.",
+                        role, group));
+            }
+        }
+
+        MappedRoles mappedRoles = new MappedRoles(rolesToAttributesColl.build(), rolesToAdGroupsBuilderColl.build());
+
+        if (mappedRoles.roles().isEmpty()) {
+            logger.info("No configuration provided for LDAP mapped roles.");
+        }
+
+        return mappedRoles;
+    }
+}
\ No newline at end of file
diff --git a/server/src/imcode/server/document/BrowserDocumentDomainObject.java b/server/src/imcode/server/document/BrowserDocumentDomainObject.java
index 64c0932065..dae954c03d 100644
--- a/server/src/imcode/server/document/BrowserDocumentDomainObject.java
+++ b/server/src/imcode/server/document/BrowserDocumentDomainObject.java
@@ -9,55 +9,55 @@
 
 public class BrowserDocumentDomainObject extends DocumentDomainObject {
 
-    private Map browserDocumentIdMap = MapUtils.typedMap( new HashMap(), Browser.class, Integer.class ) ;
+    private Map browserDocumentIdMap = MapUtils.typedMap(new HashMap(), Browser.class, Integer.class);
 
     public Map getBrowserDocumentIdMap() {
-        return Collections.unmodifiableMap( browserDocumentIdMap );
+        return Collections.unmodifiableMap(browserDocumentIdMap);
     }
 
     public DocumentTypeDomainObject getDocumentType() {
         return DocumentTypeDomainObject.BROWSER;
     }
 
-    public void accept( DocumentVisitor documentVisitor ) {
-        documentVisitor.visitBrowserDocument(this) ;
+    public void accept(DocumentVisitor documentVisitor) {
+        documentVisitor.visitBrowserDocument(this);
     }
 
-    public void setBrowserDocumentId( Browser browser, int documentId ) {
-        this.browserDocumentIdMap.put( browser, new Integer( documentId ) );
+    public void setBrowserDocumentId(Browser browser, int documentId) {
+        this.browserDocumentIdMap.put(browser, documentId);
     }
 
-    public void setBrowserDocuments( Map browserDocuments ) {
+    public void setBrowserDocuments(Map browserDocuments) {
         this.browserDocumentIdMap.clear();
-        this.browserDocumentIdMap.putAll( browserDocuments );
+        this.browserDocumentIdMap.putAll(browserDocuments);
     }
 
     public static class Browser implements Comparable, Serializable {
 
         /* Null object */
-        public final static Browser DEFAULT = new Browser( 0, "", 0 );
+        public final static Browser DEFAULT = new Browser(0, "", 0);
 
         private int id;
         private String name;
         private int specificity;
 
-        public Browser( int id, String name, int specificity ) {
+        public Browser(int id, String name, int specificity) {
             this.id = id;
             this.name = name;
             this.specificity = specificity;
         }
 
-        public boolean equals( Object o ) {
-            if ( this == o ) {
+        public boolean equals(Object o) {
+            if (this == o) {
                 return true;
             }
-            if ( !( o instanceof Browser ) ) {
+            if (!(o instanceof Browser)) {
                 return false;
             }
 
-            final Browser browser = (Browser)o;
+            final Browser browser = (Browser) o;
 
-            if ( id != browser.id ) {
+            if (id != browser.id) {
                 return false;
             }
 
@@ -76,11 +76,11 @@ public int getId() {
             return id;
         }
 
-        public int compareTo( Object o ) {
-            Browser browser = (Browser)o;
+        public int compareTo(Object o) {
+            Browser browser = (Browser) o;
             int comparison = browser.specificity - specificity;
-            if ( 0 == comparison ) {
-                comparison = name.compareTo( browser.name );
+            if (0 == comparison) {
+                comparison = name.compareTo(browser.name);
             }
             return comparison;
         }
diff --git a/server/src/imcode/server/document/CategoryDomainObject.java b/server/src/imcode/server/document/CategoryDomainObject.java
index 462f65d5bb..ab4adfd2fe 100644
--- a/server/src/imcode/server/document/CategoryDomainObject.java
+++ b/server/src/imcode/server/document/CategoryDomainObject.java
@@ -2,7 +2,9 @@
 
 import java.io.Serializable;
 
-/** @author kreiger */
+/**
+ * @author kreiger
+ */
 public class CategoryDomainObject implements Comparable, Serializable {
 
     private String name;
@@ -23,23 +25,35 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public int getId() {
         return id;
     }
 
+    public void setId(int id) {
+        this.id = id;
+    }
+
     public CategoryTypeDomainObject getType() {
         return type;
     }
 
+    public void setType(CategoryTypeDomainObject type) {
+        this.type = type;
+    }
+
     public String toString() {
         return type + ": " + name;
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof CategoryDomainObject ) ) {
+        if (!(o instanceof CategoryDomainObject)) {
             return false;
         }
 
@@ -57,31 +71,19 @@ public String getDescription() {
         return description;
     }
 
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public int compareTo(Object o) {
-        return name.compareToIgnoreCase(( (CategoryDomainObject) o ).name);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public void setDescription(String description) {
         this.description = description;
     }
 
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
+    public String getImageUrl() {
+        return imageUrl;
     }
 
-    public void setType(CategoryTypeDomainObject type) {
-        this.type = type;
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
     }
 
-    public void setId(int id) {
-        this.id = id;
+    public int compareTo(Object o) {
+        return name.compareToIgnoreCase(((CategoryDomainObject) o).name);
     }
 }
diff --git a/server/src/imcode/server/document/CategoryTypeDomainObject.java b/server/src/imcode/server/document/CategoryTypeDomainObject.java
index 5f8182bd80..60010900d0 100644
--- a/server/src/imcode/server/document/CategoryTypeDomainObject.java
+++ b/server/src/imcode/server/document/CategoryTypeDomainObject.java
@@ -10,15 +10,17 @@
 public class CategoryTypeDomainObject implements Comparable, Serializable {
 
     private final int id;
-    private String name ;
-    private int maxChoices ;
+    private String name;
+    private int maxChoices;
     private boolean inherited;
+    private boolean imageArchive;
 
-    public CategoryTypeDomainObject(int id, String name, int maxChoices, boolean inherited) {
+    public CategoryTypeDomainObject(int id, String name, int maxChoices, boolean inherited, boolean imageArchive) {
         this.id = id;
         this.name = name;
         this.maxChoices = maxChoices;  // 0=single choice, 1=multi choice
         this.inherited = inherited;
+        this.imageArchive = imageArchive;
     }
 
     public int getId() {
@@ -33,22 +35,30 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public void setMaxChoices(int maxChoices) {
-        this.maxChoices = maxChoices;
-    }
-
     public int getMaxChoices() {
         return maxChoices;
     }
 
+    public void setMaxChoices(int maxChoices) {
+        this.maxChoices = maxChoices;
+    }
+
     public boolean isInherited() {
         return inherited;
     }
 
-    public void setInherited( boolean inherited ) {
+    public void setInherited(boolean inherited) {
         this.inherited = inherited;
     }
 
+    public boolean isImageArchive() {
+        return imageArchive;
+    }
+
+    public void setImageArchive(boolean imageArchive) {
+        this.imageArchive = imageArchive;
+    }
+
     public boolean equals(Object o) {
         if (this == o) {
             return true;
@@ -59,7 +69,7 @@ public boolean equals(Object o) {
 
         final CategoryTypeDomainObject categoryTypeDomainObject = (CategoryTypeDomainObject) o;
 
-        return id==categoryTypeDomainObject.id ;
+        return id == categoryTypeDomainObject.id;
 
     }
 
@@ -68,11 +78,11 @@ public int hashCode() {
     }
 
     public String toString() {
-        return getName() ;
+        return getName();
     }
 
-    public int compareTo( Object o ) {
-        return name.compareToIgnoreCase( ((CategoryTypeDomainObject)o).name) ;
+    public int compareTo(Object o) {
+        return name.compareToIgnoreCase(((CategoryTypeDomainObject) o).name);
     }
 
     public boolean hasImages() {
@@ -80,7 +90,7 @@ public boolean hasImages() {
         boolean hasImages = false;
         for (int i = 0; i < categories.length; i++) {
             CategoryDomainObject category = categories[i];
-            if( !"".equals(category.getImageUrl()) ) {
+            if (!"".equals(category.getImageUrl())) {
                 hasImages = true;
                 break;
             }
diff --git a/server/src/imcode/server/document/ConcurrentDocumentModificationException.java b/server/src/imcode/server/document/ConcurrentDocumentModificationException.java
index c18df3f3f9..173bb9b894 100644
--- a/server/src/imcode/server/document/ConcurrentDocumentModificationException.java
+++ b/server/src/imcode/server/document/ConcurrentDocumentModificationException.java
@@ -3,8 +3,8 @@
 import java.util.ConcurrentModificationException;
 
 /**
-    The document changed while we were not expecting it to. Probably a bug.
-**/
+ * The document changed while we were not expecting it to. Probably a bug.
+ **/
 public class ConcurrentDocumentModificationException extends ConcurrentModificationException {
     public ConcurrentDocumentModificationException(Throwable throwable) {
         initCause(throwable);
diff --git a/server/src/imcode/server/document/CopyableHashSet.java b/server/src/imcode/server/document/CopyableHashSet.java
index 5a62d1d3a1..758bcc5765 100644
--- a/server/src/imcode/server/document/CopyableHashSet.java
+++ b/server/src/imcode/server/document/CopyableHashSet.java
@@ -2,20 +2,19 @@
 
 import imcode.util.LazilyLoadedObject;
 
-import java.util.Set;
 import java.util.Collection;
 import java.util.HashSet;
 
-public class CopyableHashSet extends HashSet implements LazilyLoadedObject.Copyable {
+public class CopyableHashSet<K> extends HashSet<K> implements LazilyLoadedObject.Copyable<CopyableHashSet<K>> {
 
     public CopyableHashSet() {
     }
 
-    public CopyableHashSet(Collection collection) {
-        super(collection) ;
+    public CopyableHashSet(Collection<K> collection) {
+        super(collection);
     }
 
-    public LazilyLoadedObject.Copyable copy() {
-        return new CopyableHashSet(this);
+    public CopyableHashSet<K> copy() {
+        return new CopyableHashSet<>(this);
     }
 }
diff --git a/server/src/imcode/server/document/DirectDocumentReference.java b/server/src/imcode/server/document/DirectDocumentReference.java
index 13433cf868..b9d74cac2d 100644
--- a/server/src/imcode/server/document/DirectDocumentReference.java
+++ b/server/src/imcode/server/document/DirectDocumentReference.java
@@ -6,10 +6,10 @@ public class DirectDocumentReference extends DocumentReference {
 
     public DirectDocumentReference(DocumentDomainObject document) {
         super(document.getId());
-        this.document = document ;
+        this.document = document;
     }
 
     public DocumentDomainObject getDocument() {
-        return document ;
+        return document;
     }
 }
diff --git a/server/src/imcode/server/document/DocumentComparator.java b/server/src/imcode/server/document/DocumentComparator.java
index ff78203a28..0b7ece67a7 100644
--- a/server/src/imcode/server/document/DocumentComparator.java
+++ b/server/src/imcode/server/document/DocumentComparator.java
@@ -3,69 +3,61 @@
 import com.imcode.util.ChainableReversibleNullComparator;
 import org.apache.commons.lang.NullArgumentException;
 
-public abstract class DocumentComparator extends ChainableReversibleNullComparator {
-
-    private final String name ;
-
-    protected DocumentComparator( String name ) {
-        this.name = name;
-    }
-
-    public String toString() {
-        return name ;
-    }
-
-    public int compare( Object o1, Object o2 ) {
-        if (null == o1 || null == o2) {
-            throw new NullArgumentException("o1 and o2") ;
-        }
-        final DocumentDomainObject d1 = (DocumentDomainObject)o1;
-        final DocumentDomainObject d2 = (DocumentDomainObject)o2;
-        try {
-            return compareDocuments( d1, d2 );
-        } catch ( NullPointerException npe ) {
-            NullPointerException nullPointerException = new NullPointerException("Tried sorting on null fields! You need to call .nullsFirst() or .nullsLast() on your Comparator.");
-            nullPointerException.initCause(npe) ;
-            throw nullPointerException ;
-        }
-    }
-
-    protected abstract int compareDocuments( DocumentDomainObject d1, DocumentDomainObject d2 ) ;
+public abstract class DocumentComparator extends ChainableReversibleNullComparator<DocumentDomainObject> {
 
     public final static DocumentComparator ID = new DocumentComparator("ID") {
-        protected int compareDocuments( DocumentDomainObject d1, DocumentDomainObject d2 ) {
+        protected int compareDocuments(DocumentDomainObject d1, DocumentDomainObject d2) {
             return d1.getId() - d2.getId();
         }
     };
-
     public final static DocumentComparator HEADLINE = new DocumentComparator("HEADLINE") {
-        protected int compareDocuments( DocumentDomainObject d1, DocumentDomainObject d2 ) {
-            return d1.getHeadline().compareToIgnoreCase( d2.getHeadline() ) ;
+        protected int compareDocuments(DocumentDomainObject d1, DocumentDomainObject d2) {
+            return d1.getHeadline().compareToIgnoreCase(d2.getHeadline());
         }
     };
-
     public final static DocumentComparator MODIFIED_DATETIME = new DocumentComparator("MODIFIED_DATETIME") {
-        protected int compareDocuments( DocumentDomainObject d1, DocumentDomainObject d2 ) {
-            return d1.getModifiedDatetime().compareTo( d2.getModifiedDatetime() ) ;
+        protected int compareDocuments(DocumentDomainObject d1, DocumentDomainObject d2) {
+            return d1.getModifiedDatetime().compareTo(d2.getModifiedDatetime());
         }
     };
-
     public final static DocumentComparator ARCHIVED_DATETIME = new DocumentComparator("ARCHIVED_DATETIME") {
-        protected int compareDocuments( DocumentDomainObject d1, DocumentDomainObject d2 ) {
-            return d1.getArchivedDatetime().compareTo( d2.getArchivedDatetime() ) ;
+        protected int compareDocuments(DocumentDomainObject d1, DocumentDomainObject d2) {
+            return d1.getArchivedDatetime().compareTo(d2.getArchivedDatetime());
         }
     };
-
     public final static DocumentComparator PUBLICATION_START_DATETIME = new DocumentComparator("PUBLICATION_START_DATETIME") {
-        protected int compareDocuments( DocumentDomainObject d1, DocumentDomainObject d2 ) {
-            return d1.getPublicationStartDatetime().compareTo( d2.getPublicationStartDatetime() ) ;
+        protected int compareDocuments(DocumentDomainObject d1, DocumentDomainObject d2) {
+            return d1.getPublicationStartDatetime().compareTo(d2.getPublicationStartDatetime());
         }
     };
-
     public final static DocumentComparator PUBLICATION_END_DATETIME = new DocumentComparator("PUBLICATION_END_DATETIME") {
-        protected int compareDocuments( DocumentDomainObject d1, DocumentDomainObject d2 ) {
-            return d1.getPublicationEndDatetime().compareTo( d2.getPublicationEndDatetime() ) ;
+        protected int compareDocuments(DocumentDomainObject d1, DocumentDomainObject d2) {
+            return d1.getPublicationEndDatetime().compareTo(d2.getPublicationEndDatetime());
         }
     };
+    private final String name;
+
+    protected DocumentComparator(String name) {
+        this.name = name;
+    }
+
+    public String toString() {
+        return name;
+    }
+
+    public int compare(DocumentDomainObject d1, DocumentDomainObject d2) {
+        if (null == d1 || null == d2) {
+            throw new NullArgumentException("o1 and o2");
+        }
+        try {
+            return compareDocuments(d1, d2);
+        } catch (NullPointerException npe) {
+            NullPointerException nullPointerException = new NullPointerException("Tried sorting on null fields! You need to call .nullsFirst() or .nullsLast() on your Comparator.");
+            nullPointerException.initCause(npe);
+            throw nullPointerException;
+        }
+    }
+
+    protected abstract int compareDocuments(DocumentDomainObject d1, DocumentDomainObject d2);
 
 }
diff --git a/server/src/imcode/server/document/DocumentDomainObject.java b/server/src/imcode/server/document/DocumentDomainObject.java
index 57a16863ec..01d8674826 100644
--- a/server/src/imcode/server/document/DocumentDomainObject.java
+++ b/server/src/imcode/server/document/DocumentDomainObject.java
@@ -2,15 +2,15 @@
 
 import com.imcode.imcms.api.Document;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
-import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.document.textdocument.CopyableHashMap;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
 import imcode.server.user.RoleId;
 import imcode.server.user.UserDomainObject;
 import imcode.util.LazilyLoadedObject;
 import org.apache.commons.lang.NullArgumentException;
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.Serializable;
 import java.util.*;
@@ -19,23 +19,15 @@ public abstract class DocumentDomainObject implements Cloneable, Serializable {
 
     public static final int ID_NEW = 0;
     public static final String DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_ALIAS = "imcms.document.alias";
-
+    public static final String DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_MODIFIED_BY = "imcms.document.modified_by";
+    private static Logger log = LogManager.getLogger(DocumentDomainObject.class);
     protected Attributes attributes = new Attributes();
-    private static Logger log = Logger.getLogger( DocumentDomainObject.class );
-
-    public Object clone() throws CloneNotSupportedException {
-        DocumentDomainObject clone = (DocumentDomainObject)super.clone();
-        if ( null != attributes ) {
-            clone.attributes = (Attributes)attributes.clone();
-        }
-        return clone;
-    }
 
-    public static DocumentDomainObject fromDocumentTypeId( int documentTypeId ) {
+    public static DocumentDomainObject fromDocumentTypeId(int documentTypeId) {
         DocumentDomainObject document;
 
-        switch ( documentTypeId ) {
-            case DocumentTypeDomainObject.TEXT_ID :
+        switch (documentTypeId) {
+            case DocumentTypeDomainObject.TEXT_ID:
                 document = new TextDocumentDomainObject();
                 break;
             case DocumentTypeDomainObject.URL_ID:
@@ -52,30 +44,38 @@ public static DocumentDomainObject fromDocumentTypeId( int documentTypeId ) {
                 break;
             default:
                 String errorMessage = "Unknown document-type-id: " + documentTypeId;
-                log.error( errorMessage );
-                throw new IllegalArgumentException( errorMessage );
+                log.error(errorMessage);
+                throw new IllegalArgumentException(errorMessage);
         }
 
         return document;
     }
 
+    public Object clone() throws CloneNotSupportedException {
+        DocumentDomainObject clone = (DocumentDomainObject) super.clone();
+        if (null != attributes) {
+            clone.attributes = (Attributes) attributes.clone();
+        }
+        return clone;
+    }
+
     public Date getArchivedDatetime() {
         return attributes.archivedDatetime;
     }
 
-    public void setArchivedDatetime( Date v ) {
+    public void setArchivedDatetime(Date v) {
         attributes.archivedDatetime = v;
     }
 
     public Set<Integer> getCategoryIds() {
-        return Collections.unmodifiableSet((Set<Integer>) attributes.categoryIds.get()) ;
+        return Collections.unmodifiableSet(attributes.categoryIds.get());
     }
 
     public Date getCreatedDatetime() {
         return attributes.createdDatetime;
     }
 
-    public void setCreatedDatetime( Date v ) {
+    public void setCreatedDatetime(Date v) {
         attributes.createdDatetime = v;
     }
 
@@ -83,23 +83,30 @@ public int getCreatorId() {
         return attributes.creatorId;
     }
 
-    public void setCreatorId( int creatorId ) {
+    public void setCreatorId(int creatorId) {
         attributes.creatorId = creatorId;
     }
 
-    public void setCreator( UserDomainObject creator ) {
-        setCreatorId(creator.getId());
+    /**
+     * @return a user's id who modified document or null if there is no such data.
+     */
+    public Integer getModifierId() {
+        try {
+            return Integer.valueOf(getProperty(DocumentDomainObject.DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_MODIFIED_BY));
+        } catch (Exception e) {
+            return null;
+        }
     }
 
-    public void setAttributes( Attributes attributes ) {
-        this.attributes = attributes;
+    public void setCreator(UserDomainObject creator) {
+        setCreatorId(creator.getId());
     }
 
     public String getHeadline() {
         return attributes.headline;
     }
 
-    public void setHeadline( String v ) {
+    public void setHeadline(String v) {
         attributes.headline = v;
     }
 
@@ -107,7 +114,7 @@ public int getId() {
         return attributes.id;
     }
 
-    public void setId( int v ) {
+    public void setId(int v) {
         attributes.id = v;
     }
 
@@ -115,38 +122,38 @@ public String getMenuImage() {
         return attributes.image;
     }
 
-    public void setMenuImage( String v ) {
+    public void setMenuImage(String v) {
         attributes.image = v;
     }
 
-    public Set getKeywords() {
-        return Collections.unmodifiableSet((Set) attributes.keywords.get()) ;
+    public Set<String> getKeywords() {
+        return Collections.unmodifiableSet(attributes.keywords.get());
     }
 
-    public void setKeywords( Set keywords ) {
-        attributes.keywords.set(new CopyableHashSet(keywords));
+    public void setKeywords(Set<String> keywords) {
+        attributes.keywords.set(new CopyableHashSet<>(keywords));
     }
 
-    public void setProperties( Map properties ) {
-        attributes.properties.set(new CopyableHashMap(properties));
+    public Map<String, String> getProperties() {
+        return new HashMap<>(attributes.properties.get());
     }
 
-    public Map<String, String> getProperties() {
-        return Collections.unmodifiableMap((Map<String, String>)attributes.properties.get()) ;
+    public void setProperties(Map<String, String> properties) {
+        attributes.properties.set(new CopyableHashMap<>(properties));
     }
 
     public String getProperty(String key) {
-        Map<String,String> properties = (Map<String, String>) attributes.properties.get();
+        Map<String, String> properties = attributes.properties.get();
         return properties.get(key);
     }
 
     public void setProperty(String key, String value) {
-        Map<String, String> properties = (Map<String, String>) attributes.properties.get();
+        Map<String, String> properties = attributes.properties.get();
         properties.put(key, value);
     }
 
     public void removeProperty(String key) {
-        Map<String, String> properties = (Map<String, String>) attributes.properties.get();
+        Map<String, String> properties = attributes.properties.get();
         properties.remove(key);
     }
 
@@ -154,7 +161,7 @@ public String getLanguageIso639_2() {
         return attributes.languageIso639_2;
     }
 
-    public void setLanguageIso639_2( String languageIso639_2 ) {
+    public void setLanguageIso639_2(String languageIso639_2) {
         attributes.languageIso639_2 = languageIso639_2;
     }
 
@@ -162,7 +169,7 @@ public String getMenuText() {
         return attributes.menuText;
     }
 
-    public void setMenuText( String v ) {
+    public void setMenuText(String v) {
         attributes.menuText = v;
     }
 
@@ -170,31 +177,47 @@ public Date getModifiedDatetime() {
         return attributes.modifiedDatetime;
     }
 
-    public void setModifiedDatetime( Date v ) {
+    public void setModifiedDatetime(Date v) {
         attributes.modifiedDatetime = v;
     }
 
-    public void setActualModifiedDatetime( Date modifiedDatetime ) {
-        this.attributes.actualModifiedDatetime = modifiedDatetime;
-    }
-
     public Date getActualModifiedDatetime() {
         return attributes.actualModifiedDatetime;
     }
 
+    public void setActualModifiedDatetime(Date modifiedDatetime) {
+        this.attributes.actualModifiedDatetime = modifiedDatetime;
+    }
+
     public Date getPublicationEndDatetime() {
         return attributes.publicationEndDatetime;
     }
 
-    public void setPublicationEndDatetime( Date datetime ) {
+    public void setPublicationEndDatetime(Date datetime) {
         attributes.publicationEndDatetime = datetime;
     }
 
+	public boolean isExportAllowed() {
+		return attributes.exportAllowed;
+	}
+
+	public void setExportAllowed(boolean allowedToExport) {
+		attributes.exportAllowed = allowedToExport;
+	}
+
+	public boolean isExported() {
+		return attributes.exported;
+	}
+
+	public void setExported(boolean exported) {
+		attributes.exported = exported;
+	}
+
     public Date getPublicationStartDatetime() {
         return attributes.publicationStartDatetime;
     }
 
-    public void setPublicationStartDatetime( Date v ) {
+    public void setPublicationStartDatetime(Date v) {
         attributes.publicationStartDatetime = v;
     }
 
@@ -202,42 +225,41 @@ public Integer getPublisherId() {
         return attributes.publisherId;
     }
 
-    public void setPublisher( UserDomainObject user ) {
-        setPublisherId(new Integer(user.getId())) ;
+    public void setPublisherId(Integer publisherId) {
+        attributes.publisherId = publisherId;
     }
 
-    public void setPublisherId(Integer publisherId) {
-        attributes.publisherId = publisherId ;
+    public void setPublisher(UserDomainObject user) {
+        setPublisherId(user.getId());
     }
 
     public RoleIdToDocumentPermissionSetTypeMappings getRoleIdsMappedToDocumentPermissionSetTypes() {
-        return (RoleIdToDocumentPermissionSetTypeMappings)getRolePermissionMappings().clone();
+        return getRolePermissionMappings().clone();
     }
 
-    private RoleIdToDocumentPermissionSetTypeMappings getRolePermissionMappings() {
-        RoleIdToDocumentPermissionSetTypeMappings rolePermissionMappings = (RoleIdToDocumentPermissionSetTypeMappings) attributes.roleIdToDocumentPermissionSetTypeMappings.get();
-        return rolePermissionMappings;
+    public void setRoleIdsMappedToDocumentPermissionSetTypes(RoleIdToDocumentPermissionSetTypeMappings roleIdToDocumentPermissionSetTypeMappings) {
+        attributes.roleIdToDocumentPermissionSetTypeMappings.set(roleIdToDocumentPermissionSetTypeMappings.clone());
     }
 
-    public void setRoleIdsMappedToDocumentPermissionSetTypes( RoleIdToDocumentPermissionSetTypeMappings roleIdToDocumentPermissionSetTypeMappings ) {
-        attributes.roleIdToDocumentPermissionSetTypeMappings.set((LazilyLoadedObject.Copyable) roleIdToDocumentPermissionSetTypeMappings.clone());
+    private RoleIdToDocumentPermissionSetTypeMappings getRolePermissionMappings() {
+        return attributes.roleIdToDocumentPermissionSetTypeMappings.get();
     }
 
-    public Set getSectionIds() {
-        return Collections.unmodifiableSet((Set) attributes.sectionIds.get()) ;
+    public Set<Integer> getSectionIds() {
+        return Collections.unmodifiableSet(attributes.sectionIds.get());
     }
 
-    public void setSectionIds( Set sectionIds ) {
-        attributes.sectionIds.set(new CopyableHashSet(sectionIds));
+    public void setSectionIds(Set<Integer> sectionIds) {
+        attributes.sectionIds.set(new CopyableHashSet<>(sectionIds));
     }
 
     public Document.PublicationStatus getPublicationStatus() {
         return attributes.publicationStatus;
     }
 
-    public void setPublicationStatus( Document.PublicationStatus status ) {
+    public void setPublicationStatus(Document.PublicationStatus status) {
         if (null == status) {
-            throw new NullArgumentException("status") ;
+            throw new NullArgumentException("status");
         }
         attributes.publicationStatus = status;
     }
@@ -246,19 +268,19 @@ public String getTarget() {
         return attributes.target;
     }
 
-    public void setTarget( String v ) {
+    public void setTarget(String v) {
         attributes.target = v;
     }
 
     public boolean isArchived() {
-        return hasBeenArchivedAtTime( new Date() );
+        return hasBeenArchivedAtTime(new Date());
     }
 
     public boolean isLinkableByOtherUsers() {
         return attributes.linkableByOtherUsers;
     }
 
-    public void setLinkableByOtherUsers( boolean linkableByOtherUsers ) {
+    public void setLinkableByOtherUsers(boolean linkableByOtherUsers) {
         attributes.linkableByOtherUsers = linkableByOtherUsers;
     }
 
@@ -266,12 +288,12 @@ public boolean isRestrictedOneMorePrivilegedThanRestrictedTwo() {
         return attributes.restrictedOneMorePrivilegedThanRestrictedTwo;
     }
 
-    public void setRestrictedOneMorePrivilegedThanRestrictedTwo( boolean b ) {
+    public void setRestrictedOneMorePrivilegedThanRestrictedTwo(boolean b) {
         attributes.restrictedOneMorePrivilegedThanRestrictedTwo = b;
     }
 
     public boolean isPublished() {
-        return isPublishedAtTime( new Date() );
+        return isPublishedAtTime(new Date());
     }
 
     public boolean isActive() {
@@ -286,7 +308,7 @@ public boolean isSearchDisabled() {
         return attributes.searchDisabled;
     }
 
-    public void setSearchDisabled( boolean searchDisabled ) {
+    public void setSearchDisabled(boolean searchDisabled) {
         attributes.searchDisabled = searchDisabled;
     }
 
@@ -294,29 +316,29 @@ public boolean isLinkedForUnauthorizedUsers() {
         return attributes.linkedForUnauthorizedUsers;
     }
 
-    public void setLinkedForUnauthorizedUsers( boolean linkedForUnauthorizedUsers ) {
+    public void setLinkedForUnauthorizedUsers(boolean linkedForUnauthorizedUsers) {
         attributes.linkedForUnauthorizedUsers = linkedForUnauthorizedUsers;
     }
 
-    public void addCategoryId( int categoryId ) {
-        Set categoryIds = (Set) attributes.categoryIds.get();
-        categoryIds.add( new Integer(categoryId) );
+    public void addCategoryId(int categoryId) {
+        Set<Integer> categoryIds = attributes.categoryIds.get();
+        categoryIds.add(categoryId);
     }
 
-    public void addSectionId( int sectionId ) {
-        Set sectionIds = (Set) attributes.sectionIds.get();
-        sectionIds.add( new Integer(sectionId) );
+    public void addSectionId(int sectionId) {
+        Set<Integer> sectionIds = attributes.sectionIds.get();
+        sectionIds.add(sectionId);
     }
 
-    public boolean equals( Object o ) {
-        if ( this == o ) {
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof DocumentDomainObject ) ) {
+        if (!(o instanceof DocumentDomainObject)) {
             return false;
         }
 
-        final DocumentDomainObject document = (DocumentDomainObject)o;
+        final DocumentDomainObject document = (DocumentDomainObject) o;
 
         return attributes.id == document.attributes.id;
 
@@ -336,61 +358,65 @@ public int hashCode() {
         return attributes.id;
     }
 
-    private boolean hasBeenArchivedAtTime( Date time ) {
+    private boolean hasBeenArchivedAtTime(Date time) {
         Date archivedDatetime = this.attributes.archivedDatetime;
-        return archivedDatetime != null && archivedDatetime.before( time );
+        return archivedDatetime != null && archivedDatetime.before(time);
     }
 
     public void removeAllCategories() {
-        attributes.categoryIds.set(new CopyableHashSet());
+        attributes.categoryIds.set(new CopyableHashSet<>());
     }
 
     public void removeAllSections() {
-        attributes.sectionIds.set(new CopyableHashSet());
+        attributes.sectionIds.set(new CopyableHashSet<>());
     }
 
-    public void removeCategoryId( int categoryId ) {
-        Set categoryIds = (Set) attributes.categoryIds.get();
-        categoryIds.remove( new Integer(categoryId) );
+    public void removeCategoryId(int categoryId) {
+        Set<Integer> categoryIds = attributes.categoryIds.get();
+        categoryIds.remove(categoryId);
     }
 
-    public void setDocumentPermissionSetTypeForRoleId( RoleId roleId, DocumentPermissionSetTypeDomainObject permissionSetType ) {
-        getRolePermissionMappings().setPermissionSetTypeForRole(roleId, permissionSetType) ;
+    public void setDocumentPermissionSetTypeForRoleId(RoleId roleId, DocumentPermissionSetTypeDomainObject permissionSetType) {
+        getRolePermissionMappings().setPermissionSetTypeForRole(roleId, permissionSetType);
     }
 
-    public DocumentPermissionSetTypeDomainObject getDocumentPermissionSetTypeForRoleId( RoleId roleId ) {
-        return getRolePermissionMappings().getPermissionSetTypeForRole( roleId );
+    public DocumentPermissionSetTypeDomainObject getDocumentPermissionSetTypeForRoleId(RoleId roleId) {
+        return getRolePermissionMappings().getPermissionSetTypeForRole(roleId);
     }
 
-    private boolean isPublishedAtTime( Date date ) {
+    private boolean isPublishedAtTime(Date date) {
         boolean statusIsApproved = Document.PublicationStatus.APPROVED.equals(getPublicationStatus());
         return statusIsApproved && publicationHasStartedAtTime(date)
-               && !publicationHasEndedAtTime(date);
+                && !publicationHasEndedAtTime(date);
     }
 
     private boolean publicationHasStartedAtTime(Date date) {
         Date publicationStartDatetime = attributes.publicationStartDatetime;
-        return publicationStartDatetime != null && publicationStartDatetime.before( date );
+        return publicationStartDatetime != null && publicationStartDatetime.before(date);
     }
 
-    private boolean publicationHasEndedAtTime( Date date ) {
+    private boolean publicationHasEndedAtTime(Date date) {
         Date publicationEndDatetime = attributes.publicationEndDatetime;
-        return publicationEndDatetime != null && publicationEndDatetime.before( date );
+        return publicationEndDatetime != null && publicationEndDatetime.before(date);
     }
 
     public DocumentPermissionSets getPermissionSets() {
-        return (DocumentPermissionSets) this.attributes.permissionSets.get();
+        return this.attributes.permissionSets.get();
     }
 
     public DocumentPermissionSets getPermissionSetsForNewDocuments() {
-        return (DocumentPermissionSets) this.attributes.permissionSetsForNewDocuments.get();
+        return this.attributes.permissionSetsForNewDocuments.get();
     }
 
     public Attributes getAttributes() {
         return attributes;
     }
 
-    public abstract void accept( DocumentVisitor documentVisitor );
+    public void setAttributes(Attributes attributes) {
+        this.attributes = attributes;
+    }
+
+    public abstract void accept(DocumentVisitor documentVisitor);
 
     public LifeCyclePhase getLifeCyclePhase() {
         return getLifeCyclePhaseAtTime(new Date());
@@ -399,15 +425,15 @@ public LifeCyclePhase getLifeCyclePhase() {
     LifeCyclePhase getLifeCyclePhaseAtTime(Date time) {
         LifeCyclePhase lifeCyclePhase;
         Document.PublicationStatus publicationStatus = getPublicationStatus();
-        if ( Document.PublicationStatus.NEW.equals(publicationStatus) ) {
+        if (Document.PublicationStatus.NEW.equals(publicationStatus)) {
             lifeCyclePhase = LifeCyclePhase.NEW;
-        } else if ( Document.PublicationStatus.DISAPPROVED.equals(publicationStatus) ) {
+        } else if (Document.PublicationStatus.DISAPPROVED.equals(publicationStatus)) {
             lifeCyclePhase = LifeCyclePhase.DISAPPROVED;
         } else {
-            if ( publicationHasEndedAtTime(time) ) {
+            if (publicationHasEndedAtTime(time)) {
                 lifeCyclePhase = LifeCyclePhase.UNPUBLISHED;
-            } else if ( publicationHasStartedAtTime(time) ) {
-                if ( hasBeenArchivedAtTime(time) ) {
+            } else if (publicationHasStartedAtTime(time)) {
+                if (hasBeenArchivedAtTime(time)) {
                     lifeCyclePhase = LifeCyclePhase.ARCHIVED;
                 } else {
                     lifeCyclePhase = LifeCyclePhase.PUBLISHED;
@@ -416,34 +442,34 @@ LifeCyclePhase getLifeCyclePhaseAtTime(Date time) {
                 lifeCyclePhase = LifeCyclePhase.APPROVED;
             }
         }
-        return lifeCyclePhase ;
+        return lifeCyclePhase;
     }
 
-    public void setLazilyLoadedSectionIds(LazilyLoadedObject sectionIds) {
-        attributes.sectionIds = sectionIds ;
+    public void setLazilyLoadedSectionIds(LazilyLoadedObject<CopyableHashSet<Integer>> sectionIds) {
+        attributes.sectionIds = sectionIds;
     }
 
-    public void setLazilyLoadedKeywords(LazilyLoadedObject keywords) {
-        attributes.keywords = keywords ;
+    public void setLazilyLoadedKeywords(LazilyLoadedObject<CopyableHashSet<String>> keywords) {
+        attributes.keywords = keywords;
     }
 
-    public void setLazilyLoadedProperties(LazilyLoadedObject properties) {
-        attributes.properties = properties ;
+    public void setLazilyLoadedProperties(LazilyLoadedObject<CopyableHashMap<String, String>> properties) {
+        attributes.properties = properties;
     }
 
-    public void setLazilyLoadedCategoryIds(LazilyLoadedObject categoryIds) {
+    public void setLazilyLoadedCategoryIds(LazilyLoadedObject<CopyableHashSet<Integer>> categoryIds) {
         attributes.categoryIds = categoryIds;
     }
 
-    public void setLazilyLoadedRoleIdsMappedToDocumentPermissionSetTypes(LazilyLoadedObject rolePermissionMappings) {
-        attributes.roleIdToDocumentPermissionSetTypeMappings = rolePermissionMappings ;
+    public void setLazilyLoadedRoleIdsMappedToDocumentPermissionSetTypes(LazilyLoadedObject<RoleIdToDocumentPermissionSetTypeMappings> rolePermissionMappings) {
+        attributes.roleIdToDocumentPermissionSetTypeMappings = rolePermissionMappings;
     }
 
-    public void setLazilyLoadedPermissionSets(LazilyLoadedObject permissionSets) {
-        attributes.permissionSets = permissionSets ;
+    public void setLazilyLoadedPermissionSets(LazilyLoadedObject<DocumentPermissionSets> permissionSets) {
+        attributes.permissionSets = permissionSets;
     }
 
-    public void setLazilyLoadedPermissionSetsForNew(LazilyLoadedObject permissionSetsForNew) {
+    public void setLazilyLoadedPermissionSetsForNew(LazilyLoadedObject<DocumentPermissionSets> permissionSetsForNew) {
         attributes.permissionSetsForNewDocuments = permissionSetsForNew;
     }
 
@@ -462,15 +488,15 @@ public String getAlias() {
     }
 
     public void setAlias(String alias) {
-        if(alias==null) {
+        if (alias == null) {
             removeProperty(DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_ALIAS);
-        }else{
+        } else {
             setProperty(DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_ALIAS, alias);
         }
     }
 
     public String getName() {
-        return StringUtils.defaultString(getAlias(), getId()+"");
+        return StringUtils.defaultString(getAlias(), getId() + "");
     }
 
     public static class Attributes implements Cloneable, Serializable {
@@ -493,55 +519,54 @@ public static class Attributes implements Cloneable, Serializable {
         private boolean restrictedOneMorePrivilegedThanRestrictedTwo;
         private Date publicationStartDatetime;
         private Date publicationEndDatetime;
+		private boolean exportAllowed;
+		private boolean exported;
         private Integer publisherId;
         private boolean searchDisabled;
         private Document.PublicationStatus publicationStatus = Document.PublicationStatus.NEW;
         private String target;
         private boolean linkedForUnauthorizedUsers;
 
-        private LazilyLoadedObject categoryIds = new LazilyLoadedObject(new CopyableHashSetLoader());
-        private LazilyLoadedObject keywords = new LazilyLoadedObject(new CopyableHashSetLoader());
-        private LazilyLoadedObject sectionIds = new LazilyLoadedObject(new CopyableHashSetLoader());
-        private LazilyLoadedObject permissionSets = new LazilyLoadedObject(new DocumentPermissionSetsLoader());
-        private LazilyLoadedObject permissionSetsForNewDocuments = new LazilyLoadedObject(new DocumentPermissionSetsLoader());
-        private LazilyLoadedObject properties = new LazilyLoadedObject(new CopyableHashMapLoader());
+        private LazilyLoadedObject<CopyableHashSet<Integer>> categoryIds = new LazilyLoadedObject<>(new CopyableHashSetLoader<>());
 
-        private LazilyLoadedObject roleIdToDocumentPermissionSetTypeMappings = new LazilyLoadedObject(new LazilyLoadedObject.Loader() {
-            public LazilyLoadedObject.Copyable load() {
-                return new RoleIdToDocumentPermissionSetTypeMappings();
-            }
-        });
+        private LazilyLoadedObject<CopyableHashSet<String>> keywords = new LazilyLoadedObject<>(new CopyableHashSetLoader<>());
+        private LazilyLoadedObject<CopyableHashSet<Integer>> sectionIds = new LazilyLoadedObject<>(new CopyableHashSetLoader<>());
+        private LazilyLoadedObject<DocumentPermissionSets> permissionSets = new LazilyLoadedObject<>(new DocumentPermissionSetsLoader());
+        private LazilyLoadedObject<DocumentPermissionSets> permissionSetsForNewDocuments = new LazilyLoadedObject<>(new DocumentPermissionSetsLoader());
+        private LazilyLoadedObject<CopyableHashMap<String, String>> properties = new LazilyLoadedObject<>(new CopyableHashMapLoader<>());
+
+        private LazilyLoadedObject<RoleIdToDocumentPermissionSetTypeMappings> roleIdToDocumentPermissionSetTypeMappings = new LazilyLoadedObject<>(RoleIdToDocumentPermissionSetTypeMappings::new);
 
         public Object clone() throws CloneNotSupportedException {
-            Attributes clone = (Attributes)super.clone();
-            clone.keywords = (LazilyLoadedObject) keywords.clone();
-            clone.properties = (LazilyLoadedObject) properties.clone();
-            clone.sectionIds = (LazilyLoadedObject) sectionIds.clone();
-            clone.categoryIds = (LazilyLoadedObject) categoryIds.clone();
-            clone.roleIdToDocumentPermissionSetTypeMappings = (LazilyLoadedObject) roleIdToDocumentPermissionSetTypeMappings.clone();
-            clone.permissionSets = (LazilyLoadedObject) permissionSets.clone() ;
-            clone.permissionSetsForNewDocuments = (LazilyLoadedObject) permissionSetsForNewDocuments.clone() ;
+            Attributes clone = (Attributes) super.clone();
+            clone.keywords = keywords.clone();
+            clone.properties = properties.clone();
+            clone.sectionIds = sectionIds.clone();
+            clone.categoryIds = categoryIds.clone();
+            clone.roleIdToDocumentPermissionSetTypeMappings = roleIdToDocumentPermissionSetTypeMappings.clone();
+            clone.permissionSets = permissionSets.clone();
+            clone.permissionSetsForNewDocuments = permissionSetsForNewDocuments.clone();
             return clone;
         }
 
-        private static class CopyableHashSetLoader implements LazilyLoadedObject.Loader {
+        private static class CopyableHashSetLoader<K> implements LazilyLoadedObject.Loader<CopyableHashSet<K>> {
 
-            public LazilyLoadedObject.Copyable load() {
-                return new CopyableHashSet();
+            public CopyableHashSet<K> load() {
+                return new CopyableHashSet<>();
             }
         }
 
-        private static class CopyableHashMapLoader implements LazilyLoadedObject.Loader {
+        public static class CopyableHashMapLoader<K, V> implements LazilyLoadedObject.Loader<CopyableHashMap<K, V>> {
 
-            public LazilyLoadedObject.Copyable load() {
-                return new CopyableHashMap();
+            public CopyableHashMap<K, V> load() {
+                return new CopyableHashMap<>();
             }
         }
 
-        private static class DocumentPermissionSetsLoader implements LazilyLoadedObject.Loader {
+        private static class DocumentPermissionSetsLoader implements LazilyLoadedObject.Loader<DocumentPermissionSets> {
 
-            public LazilyLoadedObject.Copyable load() {
-                return new DocumentPermissionSets() ;
+            public DocumentPermissionSets load() {
+                return new DocumentPermissionSets();
             }
         }
     }
diff --git a/server/src/imcode/server/document/DocumentPermission.java b/server/src/imcode/server/document/DocumentPermission.java
index d95dfc91b8..1a57cf3d1b 100644
--- a/server/src/imcode/server/document/DocumentPermission.java
+++ b/server/src/imcode/server/document/DocumentPermission.java
@@ -6,29 +6,29 @@
 
 public class DocumentPermission implements Serializable {
 
-    private final String name ;
+    private final String name;
 
-    public DocumentPermission( String name ) {
+    public DocumentPermission(String name) {
         if (null == name) {
-            throw new NullArgumentException( "name" ) ;
+            throw new NullArgumentException("name");
         }
         this.name = name;
     }
 
-    public boolean equals( Object o ) {
-        if ( this == o ) {
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof DocumentPermission ) ) {
+        if (!(o instanceof DocumentPermission)) {
             return false;
         }
 
-        final DocumentPermission documentPermission = (DocumentPermission)o;
+        final DocumentPermission documentPermission = (DocumentPermission) o;
 
-        return name.equals( documentPermission.name ) ;
+        return name.equals(documentPermission.name);
     }
 
     public int hashCode() {
-        return name.hashCode() ;
+        return name.hashCode();
     }
 }
diff --git a/server/src/imcode/server/document/DocumentPermissionSetDomainObject.java b/server/src/imcode/server/document/DocumentPermissionSetDomainObject.java
index 1e5c8383e0..8d0c4d6422 100644
--- a/server/src/imcode/server/document/DocumentPermissionSetDomainObject.java
+++ b/server/src/imcode/server/document/DocumentPermissionSetDomainObject.java
@@ -11,64 +11,75 @@
 
 public class DocumentPermissionSetDomainObject implements Serializable, LazilyLoadedObject.Copyable, Cloneable {
 
-    public static final DocumentPermissionSetDomainObject NONE = new TextDocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject.NONE ) {
-        public boolean hasPermission( DocumentPermission permission ) {
+    public static final DocumentPermissionSetDomainObject NONE = new TextDocumentPermissionSetDomainObject(DocumentPermissionSetTypeDomainObject.NONE) {
+        public boolean hasPermission(DocumentPermission permission) {
             return false;
         }
     };
 
-    public static final DocumentPermissionSetDomainObject READ = new TextDocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject.READ ) {
-        public boolean hasPermission( DocumentPermission permission ) {
+    public static final DocumentPermissionSetDomainObject READ = new TextDocumentPermissionSetDomainObject(DocumentPermissionSetTypeDomainObject.READ) {
+        public boolean hasPermission(DocumentPermission permission) {
             return false;
         }
     };
 
-    public static final DocumentPermissionSetDomainObject FULL = new TextDocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject.FULL ) {
+    public static final DocumentPermissionSetDomainObject FULL = new TextDocumentPermissionSetDomainObject(DocumentPermissionSetTypeDomainObject.FULL) {
         public Set getAllowedTemplateGroupIds() {
-            return Imcms.getServices().getTemplateMapper().getAllTemplateGroupIds() ;
+            return Imcms.getServices().getTemplateMapper().getAllTemplateGroupIds();
         }
 
         public Set getAllowedDocumentTypeIds() {
             return DocumentTypeDomainObject.getAllDocumentTypeIdsSet();
         }
 
-        public boolean hasPermission( DocumentPermission permission ) {
+        public boolean hasPermission(DocumentPermission permission) {
             return true;
         }
-    } ;
-
-    static final DocumentPermission EDIT = new DocumentPermission( "edit" );
-
+    };
+    public final static int EDIT_DOCINFO_PERMISSION_ID = ImcmsConstants.PERM_EDIT_DOCINFO;
+    public final static int EDIT_PERMISSIONS_PERMISSION_ID = ImcmsConstants.PERM_EDIT_PERMISSIONS;
+    public final static int EDIT_DOCUMENT_PERMISSION_ID = ImcmsConstants.PERM_EDIT_DOCUMENT;
+    static final DocumentPermission EDIT = new DocumentPermission("edit");
+    static final DocumentPermission EDIT_DOCUMENT_INFORMATION = new DocumentPermission("editDocumentInformation");
+    static final DocumentPermission EDIT_PERMISSIONS = new DocumentPermission("editPermissions");
     private static final String PERMISSION_SET_NAME__FULL = "Full";
     private static final String PERMISSION_SET_NAME__RESTRICTED_1 = "Restricted One";
     private static final String PERMISSION_SET_NAME__RESTRICTED_2 = "Restricted Two";
     private static final String PERMISSION_SET_NAME__READ = "Read";
     private static final String PERMISSION_SET_NAME__NONE = "None";
-
     private DocumentPermissionSetTypeDomainObject type;
-
     private HashSet permissions = new HashSet();
-    static final DocumentPermission EDIT_DOCUMENT_INFORMATION = new DocumentPermission( "editDocumentInformation" );
-    static final DocumentPermission EDIT_PERMISSIONS = new DocumentPermission( "editPermissions" );
 
-    public final static int EDIT_DOCINFO_PERMISSION_ID = ImcmsConstants.PERM_EDIT_DOCINFO;
-    public final static int EDIT_PERMISSIONS_PERMISSION_ID = ImcmsConstants.PERM_EDIT_PERMISSIONS;
-    public final static int EDIT_DOCUMENT_PERMISSION_ID = ImcmsConstants.PERM_EDIT_DOCUMENT;
-
-    public DocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject typeId ) {
+    public DocumentPermissionSetDomainObject(DocumentPermissionSetTypeDomainObject typeId) {
         this.type = typeId;
     }
 
-    void setPermission( DocumentPermission permission, boolean b ) {
-        if ( b ) {
-            permissions.add( permission );
+    private static String getName(DocumentPermissionSetTypeDomainObject userPermissionSetId) {
+        String result;
+        if (DocumentPermissionSetTypeDomainObject.FULL.equals(userPermissionSetId)) {
+            result = PERMISSION_SET_NAME__FULL;
+        } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(userPermissionSetId)) {
+            result = PERMISSION_SET_NAME__RESTRICTED_1;
+        } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(userPermissionSetId)) {
+            result = PERMISSION_SET_NAME__RESTRICTED_2;
+        } else if (DocumentPermissionSetTypeDomainObject.READ.equals(userPermissionSetId)) {
+            result = PERMISSION_SET_NAME__READ;
+        } else {
+            result = PERMISSION_SET_NAME__NONE;
+        }
+        return result;
+    }
+
+    void setPermission(DocumentPermission permission, boolean b) {
+        if (b) {
+            permissions.add(permission);
         } else {
-            permissions.remove( permission );
+            permissions.remove(permission);
         }
     }
 
-    public boolean hasPermission( DocumentPermission permission ) {
-        return permissions.contains( permission );
+    public boolean hasPermission(DocumentPermission permission) {
+        return permissions.contains(permission);
     }
 
     public DocumentPermissionSetTypeDomainObject getType() {
@@ -76,29 +87,13 @@ public DocumentPermissionSetTypeDomainObject getType() {
     }
 
     public String getTypeName() {
-        return getName( type );
-    }
-
-    private static String getName( DocumentPermissionSetTypeDomainObject userPermissionSetId ) {
-        String result ;
-        if ( DocumentPermissionSetTypeDomainObject.FULL.equals(userPermissionSetId) ) {
-            result = PERMISSION_SET_NAME__FULL;
-        } else if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(userPermissionSetId) ) {
-            result = PERMISSION_SET_NAME__RESTRICTED_1;
-        } else if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(userPermissionSetId) ) {
-            result = PERMISSION_SET_NAME__RESTRICTED_2;
-        } else if ( DocumentPermissionSetTypeDomainObject.READ.equals(userPermissionSetId) ) {
-            result = PERMISSION_SET_NAME__READ;
-        } else {
-            result = PERMISSION_SET_NAME__NONE;
-        }
-        return result;
+        return getName(type);
     }
 
     public String toString() {
         StringBuffer buff = new StringBuffer();
         buff.append(getTypeName());
-        if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(type) || DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(type) ) {
+        if (DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(type) || DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(type)) {
             buff.append(" (")
                     .append("editDocumentInformation=" + getEditDocumentInformation() + ", ")
                     .append("editPermissions=" + getEditPermissions() + ", ")
@@ -108,47 +103,47 @@ public String toString() {
     }
 
     public boolean getEditDocumentInformation() {
-        return hasPermission( EDIT_DOCUMENT_INFORMATION );
+        return hasPermission(EDIT_DOCUMENT_INFORMATION);
     }
 
-    public void setEditDocumentInformation( boolean editDocumentInformation ) {
-        setPermission( EDIT_DOCUMENT_INFORMATION, editDocumentInformation );
+    public void setEditDocumentInformation(boolean editDocumentInformation) {
+        setPermission(EDIT_DOCUMENT_INFORMATION, editDocumentInformation);
     }
 
     public boolean getEditPermissions() {
-        return hasPermission( EDIT_PERMISSIONS );
+        return hasPermission(EDIT_PERMISSIONS);
     }
 
-    public void setEditPermissions( boolean editPermissions ) {
-        setPermission( EDIT_PERMISSIONS, editPermissions );
+    public void setEditPermissions(boolean editPermissions) {
+        setPermission(EDIT_PERMISSIONS, editPermissions);
     }
 
     public void setFromBits(int permissionBits) {
-        setEditDocumentInformation(0 != ( permissionBits & EDIT_DOCINFO_PERMISSION_ID ));
-        setEditPermissions(0 != ( permissionBits & EDIT_PERMISSIONS_PERMISSION_ID ));
-        setEdit(0 != ( permissionBits & EDIT_DOCUMENT_PERMISSION_ID ));
+        setEditDocumentInformation(0 != (permissionBits & EDIT_DOCINFO_PERMISSION_ID));
+        setEditPermissions(0 != (permissionBits & EDIT_PERMISSIONS_PERMISSION_ID));
+        setEdit(0 != (permissionBits & EDIT_DOCUMENT_PERMISSION_ID));
     }
 
     public boolean getEdit() {
-        return hasPermission( EDIT );
+        return hasPermission(EDIT);
     }
 
-    public void setEdit( boolean edit ) {
-        setPermission( EDIT, edit );
+    public void setEdit(boolean edit) {
+        setPermission(EDIT, edit);
     }
 
     public LazilyLoadedObject.Copyable copy() {
         try {
-            return (LazilyLoadedObject.Copyable) clone() ;
-        } catch ( CloneNotSupportedException e ) {
+            return (LazilyLoadedObject.Copyable) clone();
+        } catch (CloneNotSupportedException e) {
             throw new ShouldNotBeThrownException(e);
         }
     }
 
     protected Object clone() throws CloneNotSupportedException {
-        DocumentPermissionSetDomainObject clone = (DocumentPermissionSetDomainObject) super.clone() ;
+        DocumentPermissionSetDomainObject clone = (DocumentPermissionSetDomainObject) super.clone();
         clone.permissions = (HashSet) permissions.clone();
-        return clone ;
+        return clone;
     }
 
     public boolean isEmpty() {
diff --git a/server/src/imcode/server/document/DocumentPermissionSetTypeDomainObject.java b/server/src/imcode/server/document/DocumentPermissionSetTypeDomainObject.java
index 842ad25853..a4c031bd8d 100644
--- a/server/src/imcode/server/document/DocumentPermissionSetTypeDomainObject.java
+++ b/server/src/imcode/server/document/DocumentPermissionSetTypeDomainObject.java
@@ -9,34 +9,34 @@ public enum DocumentPermissionSetTypeDomainObject implements Serializable {
     RESTRICTED_2(2),
     READ(3),
     NONE(4);
-    
-    private final int id ;
+
+    private final int id;
 
     private DocumentPermissionSetTypeDomainObject(int id) {
         this.id = id;
     }
 
+    public static DocumentPermissionSetTypeDomainObject fromInt(int id) {
+        try {
+            return values()[id];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return NONE;
+        }
+    }
+
     public int getId() {
         return id;
     }
 
     public String toString() {
-        return ""+id ;
+        return "" + id;
     }
 
     public boolean isMorePrivilegedThan(DocumentPermissionSetTypeDomainObject type) {
-        return id < type.id ;
+        return id < type.id;
     }
 
     public boolean isAtLeastAsPrivilegedAs(DocumentPermissionSetTypeDomainObject type) {
-        return id <= type.id ;
-    }
-
-    public static DocumentPermissionSetTypeDomainObject fromInt(int id) {
-        try {
-            return values()[id];
-        } catch(ArrayIndexOutOfBoundsException e) {
-            return NONE;
-        }
+        return id <= type.id;
     }
 }
diff --git a/server/src/imcode/server/document/DocumentPermissionSets.java b/server/src/imcode/server/document/DocumentPermissionSets.java
index 0094aac106..c2bb7ffe7e 100644
--- a/server/src/imcode/server/document/DocumentPermissionSets.java
+++ b/server/src/imcode/server/document/DocumentPermissionSets.java
@@ -5,46 +5,46 @@
 
 import java.io.Serializable;
 
-public class DocumentPermissionSets implements Serializable, Cloneable, LazilyLoadedObject.Copyable {
+public class DocumentPermissionSets implements Serializable, Cloneable, LazilyLoadedObject.Copyable<DocumentPermissionSets> {
 
-    private DocumentPermissionSetDomainObject[] permissionSets = new DocumentPermissionSetDomainObject[] {
-            new TextDocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject.RESTRICTED_1 ),
-            new TextDocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject.RESTRICTED_2 )
+    private DocumentPermissionSetDomainObject[] permissionSets = new DocumentPermissionSetDomainObject[]{
+            new TextDocumentPermissionSetDomainObject(DocumentPermissionSetTypeDomainObject.RESTRICTED_1),
+            new TextDocumentPermissionSetDomainObject(DocumentPermissionSetTypeDomainObject.RESTRICTED_2)
     };
 
-    public void setRestricted1(DocumentPermissionSetDomainObject restricted1) {
-        permissionSets[0] = restricted1;
-    }
-
-    public void setRestricted2(DocumentPermissionSetDomainObject restricted2) {
-        permissionSets[1] = restricted2;
-    }
-
     public DocumentPermissionSetDomainObject getRestricted1() {
         return permissionSets[0];
     }
 
+    public void setRestricted1(DocumentPermissionSetDomainObject restricted1) {
+        permissionSets[0] = restricted1;
+    }
+
     public DocumentPermissionSetDomainObject getRestricted2() {
         return permissionSets[1];
     }
 
+    public void setRestricted2(DocumentPermissionSetDomainObject restricted2) {
+        permissionSets[1] = restricted2;
+    }
+
     public DocumentPermissionSetDomainObject getRestricted(int n) {
-        return permissionSets[n-1] ;
+        return permissionSets[n - 1];
     }
 
-    public Object clone() throws CloneNotSupportedException {
+    public DocumentPermissionSets clone() throws CloneNotSupportedException {
         DocumentPermissionSets clone = (DocumentPermissionSets) super.clone();
-        clone.permissionSets = new DocumentPermissionSetDomainObject[] {
+        clone.permissionSets = new DocumentPermissionSetDomainObject[]{
                 (DocumentPermissionSetDomainObject) permissionSets[0].clone(),
                 (DocumentPermissionSetDomainObject) permissionSets[1].clone()
         };
-        return clone ;
+        return clone;
     }
 
-    public LazilyLoadedObject.Copyable copy() {
+    public DocumentPermissionSets copy() {
         try {
-            return (LazilyLoadedObject.Copyable) clone() ;
-        } catch ( CloneNotSupportedException e ) {
+            return clone();
+        } catch (CloneNotSupportedException e) {
             throw new ShouldNotBeThrownException(e);
         }
     }
diff --git a/server/src/imcode/server/document/DocumentPredicate.java b/server/src/imcode/server/document/DocumentPredicate.java
index e735d1acd4..c7e4c26910 100644
--- a/server/src/imcode/server/document/DocumentPredicate.java
+++ b/server/src/imcode/server/document/DocumentPredicate.java
@@ -4,9 +4,9 @@
 
 public abstract class DocumentPredicate implements Predicate {
 
-    public boolean evaluate( Object object ) {
-        return evaluateDocument((DocumentDomainObject)object) ;
+    public boolean evaluate(Object object) {
+        return evaluateDocument((DocumentDomainObject) object);
     }
 
-    public abstract boolean evaluateDocument( DocumentDomainObject document ) ;
+    public abstract boolean evaluateDocument(DocumentDomainObject document);
 }
diff --git a/server/src/imcode/server/document/DocumentReference.java b/server/src/imcode/server/document/DocumentReference.java
index eecb0a2424..5097bd503b 100644
--- a/server/src/imcode/server/document/DocumentReference.java
+++ b/server/src/imcode/server/document/DocumentReference.java
@@ -14,17 +14,17 @@ public int getDocumentId() {
         return documentId;
     }
 
-    public abstract DocumentDomainObject getDocument() ;
+    public abstract DocumentDomainObject getDocument();
 
     public int hashCode() {
-        return documentId ;
+        return documentId;
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
diff --git a/server/src/imcode/server/document/DocumentTypeDomainObject.java b/server/src/imcode/server/document/DocumentTypeDomainObject.java
index 19bde60ad1..2cf8f6274e 100644
--- a/server/src/imcode/server/document/DocumentTypeDomainObject.java
+++ b/server/src/imcode/server/document/DocumentTypeDomainObject.java
@@ -1,10 +1,10 @@
 package imcode.server.document;
 
-import imcode.util.IdLocalizedNamePair;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
+import imcode.util.IdLocalizedNamePair;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 public class DocumentTypeDomainObject extends IdLocalizedNamePair {
 
@@ -16,40 +16,40 @@ public class DocumentTypeDomainObject extends IdLocalizedNamePair {
 
     private static final String DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX = "document_type/name/";
 
-    public final static DocumentTypeDomainObject TEXT = new DocumentTypeDomainObject( TEXT_ID, new LocalizedMessage( DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "text" ) );
-    public final static DocumentTypeDomainObject URL = new DocumentTypeDomainObject( URL_ID, new LocalizedMessage( DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "url" ) );
-    public final static DocumentTypeDomainObject BROWSER = new DocumentTypeDomainObject( BROWSER_ID, new LocalizedMessage( DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "browser" ) );
-    public final static DocumentTypeDomainObject HTML = new DocumentTypeDomainObject( HTML_ID, new LocalizedMessage( DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "html" ) );
-    public final static DocumentTypeDomainObject FILE = new DocumentTypeDomainObject( FILE_ID, new LocalizedMessage( DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "file" ) );
+    public final static DocumentTypeDomainObject BROWSER = new DocumentTypeDomainObject(BROWSER_ID, new LocalizedMessage(DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "browser"));
+    public final static DocumentTypeDomainObject TEXT = new DocumentTypeDomainObject(TEXT_ID, new LocalizedMessage(DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "text"));
+    public final static DocumentTypeDomainObject URL = new DocumentTypeDomainObject(URL_ID, new LocalizedMessage(DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "url"));
+    public final static DocumentTypeDomainObject HTML = new DocumentTypeDomainObject(HTML_ID, new LocalizedMessage(DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "html"));
+    public final static DocumentTypeDomainObject FILE = new DocumentTypeDomainObject(FILE_ID, new LocalizedMessage(DOCUMENT_TYPE_NAME_LOCALIZED_MESSAGE_PREFIX + "file"));
 
     final static DocumentTypeDomainObject[] ALL_DOCUMENT_TYPES = {
-       BROWSER,
-       FILE,
-       HTML,
-       TEXT,
-       URL,
-    } ;
-
-    public DocumentTypeDomainObject( int id, LocalizedMessage name ) {
+            BROWSER,
+            FILE,
+            HTML,
+            TEXT,
+            URL,
+    };
+
+    public DocumentTypeDomainObject(int id, LocalizedMessage name) {
         super(id, name);
     }
 
     public static int[] getAllDocumentTypeIds() {
-        int[] allDocumentTypeIds = new int[ALL_DOCUMENT_TYPES.length] ;
-        for ( int i = 0; i < ALL_DOCUMENT_TYPES.length; i++ ) {
+        int[] allDocumentTypeIds = new int[ALL_DOCUMENT_TYPES.length];
+        for (int i = 0; i < ALL_DOCUMENT_TYPES.length; i++) {
             DocumentTypeDomainObject documentType = ALL_DOCUMENT_TYPES[i];
-            allDocumentTypeIds[i] = documentType.getId() ;
+            allDocumentTypeIds[i] = documentType.getId();
         }
-        return allDocumentTypeIds ;
+        return allDocumentTypeIds;
     }
 
     public static Set getAllDocumentTypeIdsSet() {
-        Set set = new HashSet() ;
+        Set set = new HashSet();
         int[] allDocumentTypeIds = getAllDocumentTypeIds();
-        for ( int i = 0; i < allDocumentTypeIds.length; i++ ) {
+        for (int i = 0; i < allDocumentTypeIds.length; i++) {
             int documentTypeId = allDocumentTypeIds[i];
-            set.add(new Integer(documentTypeId)) ;
+            set.add(documentTypeId);
         }
-        return set ;
+        return set;
     }
 }
diff --git a/server/src/imcode/server/document/DocumentVisitor.java b/server/src/imcode/server/document/DocumentVisitor.java
index 41fa93d572..faf7f68538 100644
--- a/server/src/imcode/server/document/DocumentVisitor.java
+++ b/server/src/imcode/server/document/DocumentVisitor.java
@@ -4,27 +4,29 @@
 
 public class DocumentVisitor {
 
-    public void visitTextDocument( TextDocumentDomainObject textDocument ) {
-        visitOtherDocument( textDocument ) ;
+	public final static int SORTED_DOC_VALUES_FIELD_MAX_SIZE = 32766;
+
+    public void visitTextDocument(TextDocumentDomainObject textDocument) {
+        visitOtherDocument(textDocument);
     }
 
-    public void visitBrowserDocument( BrowserDocumentDomainObject browserDocument ) {
-        visitOtherDocument( browserDocument );
+    public void visitBrowserDocument(BrowserDocumentDomainObject browserDocument) {
+        visitOtherDocument(browserDocument);
     }
 
-    public void visitFileDocument( FileDocumentDomainObject fileDocument ) {
-        visitOtherDocument( fileDocument );
+    public void visitFileDocument(FileDocumentDomainObject fileDocument) {
+        visitOtherDocument(fileDocument);
     }
 
-    public void visitHtmlDocument( HtmlDocumentDomainObject htmlDocument ) {
-        visitOtherDocument( htmlDocument );
+    public void visitHtmlDocument(HtmlDocumentDomainObject htmlDocument) {
+        visitOtherDocument(htmlDocument);
     }
 
-    public void visitUrlDocument( UrlDocumentDomainObject urlDocument ) {
-        visitOtherDocument( urlDocument );
+    public void visitUrlDocument(UrlDocumentDomainObject urlDocument) {
+        visitOtherDocument(urlDocument);
     }
 
-    protected void visitOtherDocument( DocumentDomainObject otherDocument ) {
+    protected void visitOtherDocument(DocumentDomainObject otherDocument) {
     }
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/document/FileDocumentDomainObject.java b/server/src/imcode/server/document/FileDocumentDomainObject.java
index e7eda90c36..40cd1c8013 100644
--- a/server/src/imcode/server/document/FileDocumentDomainObject.java
+++ b/server/src/imcode/server/document/FileDocumentDomainObject.java
@@ -1,5 +1,7 @@
 package imcode.server.document;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.imcode.imcms.domain.dto.export.FileDocumentSerializer;
 import imcode.util.Utility;
 import imcode.util.io.ExceptionFreeInputStreamSource;
 import imcode.util.io.InputStreamSource;
@@ -11,127 +13,129 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@JsonSerialize(using = FileDocumentSerializer.class)
 public class FileDocumentDomainObject extends DocumentDomainObject {
 
-    private Map files = createFilesMap();
-
-    private String defaultFileId;
     public static final String MIME_TYPE__APPLICATION_OCTET_STREAM = "application/octet-stream";
     public static final String MIME_TYPE__UNKNOWN_DEFAULT = MIME_TYPE__APPLICATION_OCTET_STREAM;
+    private Map files = createFilesMap();
+    private String defaultFileId;
 
     public DocumentTypeDomainObject getDocumentType() {
         return DocumentTypeDomainObject.FILE;
     }
 
-    public void accept( DocumentVisitor documentVisitor ) {
-        documentVisitor.visitFileDocument( this );
+    public void accept(DocumentVisitor documentVisitor) {
+        documentVisitor.visitFileDocument(this);
     }
 
-    public void addFile( String fileId, FileDocumentFile file ) {
-        if ( null == fileId ) {
-            throw new NullArgumentException( "fileId" );
+    public void addFile(String fileId, FileDocumentFile file) {
+        if (null == fileId) {
+            throw new NullArgumentException("fileId");
         }
-        if ( !files.containsKey( defaultFileId ) ) {
+        if (!files.containsKey(defaultFileId)) {
             defaultFileId = fileId;
         }
-        FileDocumentFile fileClone = cloneFile( file );
-        fileClone.setId( fileId );
-        files.put( fileId, fileClone );
+        FileDocumentFile fileClone = cloneFile(file);
+        fileClone.setId(fileId);
+        files.put(fileId, fileClone);
     }
 
-    private FileDocumentFile cloneFile( FileDocumentFile file ) {
+    private FileDocumentFile cloneFile(FileDocumentFile file) {
         if (null == file) {
-            return null ;
+            return null;
         }
         FileDocumentFile fileClone;
         try {
-            fileClone = (FileDocumentFile)file.clone();
-        } catch ( CloneNotSupportedException e ) {
-            throw new UnhandledException( e );
+            fileClone = (FileDocumentFile) file.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new UnhandledException(e);
         }
         return fileClone;
     }
 
     public Map getFiles() {
         Map map = createFilesMap();
-        map.putAll( files );
+        map.putAll(files);
         return map;
     }
 
     private Map createFilesMap() {
-        return MapUtils.orderedMap( new HashMap() );
+        return MapUtils.orderedMap(new HashMap());
     }
 
-    public FileDocumentFile getFile( String fileId ) {
-        return cloneFile( (FileDocumentFile)files.get( fileId ) );
+    public FileDocumentFile getFile(String fileId) {
+        return cloneFile((FileDocumentFile) files.get(fileId));
     }
 
-    public FileDocumentFile removeFile( String fileId ) {
-        FileDocumentFile fileDocumentFile = (FileDocumentFile)files.remove( fileId );
-        selectDefaultFileName( fileId );
+    public FileDocumentFile removeFile(String fileId) {
+        FileDocumentFile fileDocumentFile = (FileDocumentFile) files.remove(fileId);
+        selectDefaultFileName(fileId);
         return fileDocumentFile;
     }
 
-    private void selectDefaultFileName( String fileId ) {
-        if ( files.isEmpty() ) {
+    private void selectDefaultFileName(String fileId) {
+        if (files.isEmpty()) {
             defaultFileId = null;
-        } else if ( defaultFileId.equals( fileId ) ) {
-            defaultFileId = (String)Utility.firstElementOfSetByOrderOf( files.keySet(), String.CASE_INSENSITIVE_ORDER );
+        } else if (defaultFileId.equals(fileId)) {
+            defaultFileId = (String) Utility.firstElementOfSetByOrderOf(files.keySet(), String.CASE_INSENSITIVE_ORDER);
         }
     }
 
-    public void setDefaultFileId( String defaultFileId ) {
-        if ( !files.containsKey( defaultFileId ) ) {
-            throw new IllegalArgumentException( "Cannot set defaultFileId to non-existant key "
-                                                + defaultFileId );
-        }
-        this.defaultFileId = defaultFileId;
-    }
-
     public String getDefaultFileId() {
         return defaultFileId;
     }
 
-    public FileDocumentFile getFileOrDefault( String fileId ) {
-        if ( null == fileId ) {
+    public void setDefaultFileId(String defaultFileId) {
+        if (!files.containsKey(defaultFileId)) {
+            throw new IllegalArgumentException("Cannot set defaultFileId to non-existant key "
+                    + defaultFileId);
+        }
+        this.defaultFileId = defaultFileId;
+    }
+
+    public FileDocumentFile getFileOrDefault(String fileId) {
+        if (null == fileId) {
             return getDefaultFile();
         }
-        FileDocumentFile fileDocumentFile = getFile( fileId );
-        if ( null == fileDocumentFile ) {
+        FileDocumentFile fileDocumentFile = getFile(fileId);
+        if (null == fileDocumentFile) {
             fileDocumentFile = getDefaultFile();
         }
         return fileDocumentFile;
     }
 
     public FileDocumentFile getDefaultFile() {
-        return getFile( defaultFileId );
+        return getFile(defaultFileId);
 
     }
 
-    public void changeFileId( String oldFileId, String newFileId ) {
-        if ( null == oldFileId ) {
-            throw new NullArgumentException( "oldFileId" );
+    public void changeFileId(String oldFileId, String newFileId) {
+        if (null == oldFileId) {
+            throw new NullArgumentException("oldFileId");
         }
-        if ( null == newFileId ) {
-            throw new NullArgumentException( "newFileId" );
+        if (null == newFileId) {
+            throw new NullArgumentException("newFileId");
         }
-        if ( !files.containsKey( oldFileId ) ) {
-            throw new IllegalStateException( "There is no file with the id " + oldFileId );
+        if (!files.containsKey(oldFileId)) {
+            throw new IllegalStateException("There is no file with the id " + oldFileId);
         }
-        if ( oldFileId.equals( newFileId ) ) {
+        if (oldFileId.equals(newFileId)) {
             return;
         }
-        if ( files.containsKey( newFileId ) ) {
-            throw new IllegalStateException( "There already is a file with the id " + newFileId );
+        if (files.containsKey(newFileId)) {
+            throw new IllegalStateException("There already is a file with the id " + newFileId);
         }
-        addFile( newFileId, (FileDocumentFile)files.remove( oldFileId ) );
-        if ( defaultFileId.equals( oldFileId ) ) {
+        addFile(newFileId, (FileDocumentFile) files.remove(oldFileId));
+        if (defaultFileId.equals(oldFileId)) {
             defaultFileId = newFileId;
         }
     }
 
     public static class FileDocumentFile implements Cloneable, Serializable {
 
+        public static final int ID_LENGTH = 100;
+
         private String id;
         private String filename;
         private String mimeType;
@@ -142,7 +146,7 @@ public String getFilename() {
             return filename;
         }
 
-        public void setFilename( String v ) {
+        public void setFilename(String v) {
             this.filename = v;
         }
 
@@ -150,38 +154,47 @@ public String getMimeType() {
             return mimeType;
         }
 
-        public void setMimeType( String mimeType ) {
+        public void setMimeType(String mimeType) {
             this.mimeType = mimeType;
         }
 
-        public void setInputStreamSource( InputStreamSource inputStreamSource ) {
-            this.inputStreamSource = inputStreamSource;
-        }
-
         public InputStreamSource getInputStreamSource() {
             return new ExceptionFreeInputStreamSource(inputStreamSource);
         }
 
-        public void setCreatedAsImage( boolean createdAsImage ) {
-            this.createdAsImage = createdAsImage;
+        public void setInputStreamSource(InputStreamSource inputStreamSource) {
+            this.inputStreamSource = inputStreamSource;
         }
 
         public boolean isCreatedAsImage() {
             return createdAsImage;
         }
 
-        public void setId( String id ) {
-            this.id = id;
+        public void setCreatedAsImage(boolean createdAsImage) {
+            this.createdAsImage = createdAsImage;
         }
 
         public String getId() {
             return id;
         }
 
+        public void setId(String id) {
+            this.id = id;
+        }
+
         protected Object clone() throws CloneNotSupportedException {
             return super.clone();
         }
 
+        @Override
+        public String toString() {
+            return "FileDocumentFile{" +
+                    ", id='" + id + '\'' +
+                    ", filename='" + filename + '\'' +
+                    ", mimeType='" + mimeType + '\'' +
+                    ", createdAsImage=" + createdAsImage +
+                    '}';
+        }
     }
 
-}
\ No newline at end of file
+}
diff --git a/server/src/imcode/server/document/GetterDocumentReference.java b/server/src/imcode/server/document/GetterDocumentReference.java
index 15ab18001c..6852441aef 100644
--- a/server/src/imcode/server/document/GetterDocumentReference.java
+++ b/server/src/imcode/server/document/GetterDocumentReference.java
@@ -1,27 +1,26 @@
 package imcode.server.document;
 
+import com.imcode.imcms.mapping.DocumentGetter;
 import imcode.server.Imcms;
 
-import java.io.ObjectInputStream;
 import java.io.IOException;
-
-import com.imcode.imcms.mapping.DocumentGetter;
+import java.io.ObjectInputStream;
 
 public class GetterDocumentReference extends DocumentReference {
 
     private transient DocumentGetter documentGetter;
 
-    public GetterDocumentReference( int documentId, DocumentGetter documentGetter ) {
-        super(documentId) ;
+    public GetterDocumentReference(int documentId, DocumentGetter documentGetter) {
+        super(documentId);
         this.documentGetter = documentGetter;
     }
 
     public DocumentDomainObject getDocument() {
-        return documentGetter.getDocument( new Integer(getDocumentId()) ) ;
+        return documentGetter.getDocument(getDocumentId());
     }
 
     public void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-        documentGetter = Imcms.getServices().getDocumentMapper().getDocumentGetter() ;
+        documentGetter = Imcms.getServices().getDocumentMapper().getDocumentGetter();
         ois.defaultReadObject();
     }
 
diff --git a/server/src/imcode/server/document/HtmlDocumentDomainObject.java b/server/src/imcode/server/document/HtmlDocumentDomainObject.java
index 4c31a89ad3..869bbfd4db 100644
--- a/server/src/imcode/server/document/HtmlDocumentDomainObject.java
+++ b/server/src/imcode/server/document/HtmlDocumentDomainObject.java
@@ -4,20 +4,20 @@ public class HtmlDocumentDomainObject extends DocumentDomainObject {
 
     private String html = "";
 
-    public void setHtml( String html ) {
-        this.html = html;
-    }
-
     public String getHtml() {
         return html;
     }
 
+    public void setHtml(String html) {
+        this.html = html;
+    }
+
     public DocumentTypeDomainObject getDocumentType() {
         return DocumentTypeDomainObject.HTML;
     }
 
-    public void accept( DocumentVisitor documentVisitor ) {
-        documentVisitor.visitHtmlDocument( this );
+    public void accept(DocumentVisitor documentVisitor) {
+        documentVisitor.visitHtmlDocument(this);
     }
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/document/LifeCyclePhase.java b/server/src/imcode/server/document/LifeCyclePhase.java
index bf3d9159ef..4a148f5c52 100644
--- a/server/src/imcode/server/document/LifeCyclePhase.java
+++ b/server/src/imcode/server/document/LifeCyclePhase.java
@@ -1,113 +1,112 @@
 package imcode.server.document;
 
-import org.apache.lucene.search.Query;
+import com.imcode.imcms.api.Document;
+import imcode.server.document.index.DocumentIndex;
+import org.apache.lucene.document.DateTools;
+import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.RangeQuery;
+import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.document.DateField;
-import com.imcode.imcms.api.Document;
+import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.util.BytesRef;
 
 import java.util.Date;
 
-import imcode.server.document.index.DocumentIndex;
+import static org.apache.lucene.search.BooleanClause.Occur;
 
 public abstract class LifeCyclePhase {
 
     public static final LifeCyclePhase NEW = new LifeCyclePhase("new") {
         public Query asQuery(Date time) {
-            return getStatusQuery(Document.PublicationStatus.NEW) ;
+            return getStatusQuery(Document.PublicationStatus.NEW);
         }
     };
     public static final LifeCyclePhase DISAPPROVED = new LifeCyclePhase("disapproved") {
         public Query asQuery(Date time) {
-            return getStatusQuery(Document.PublicationStatus.DISAPPROVED) ;
+            return getStatusQuery(Document.PublicationStatus.DISAPPROVED);
         }
     };
     public static final LifeCyclePhase UNPUBLISHED = new LifeCyclePhase("unpublished") {
         public Query asQuery(Date time) {
-            return add(getApprovedBooleanQuery(), getPublicationEndRangeQuery(time)) ;
+            return add(getApprovedBooleanQuery(), getPublicationEndRangeQuery(time)).build();
         }
     };
     public static final LifeCyclePhase APPROVED = new LifeCyclePhase("approved") {
         public Query asQuery(Date time) {
-            return subtract(getApprovedNonUnpublishedQuery(time), getPublicationStartRangeQuery(time)) ;
+            return subtract(getApprovedNonUnpublishedQuery(time), getPublicationStartRangeQuery(time)).build();
         }
     };
     public static final LifeCyclePhase ARCHIVED = new LifeCyclePhase("archived") {
         public Query asQuery(Date time) {
-            return add(getPublishedQuery(time), getArchivedRangeQuery(time));
+            return add(getPublishedQuery(time), getArchivedRangeQuery(time)).build();
         }
     };
     public static final LifeCyclePhase PUBLISHED = new LifeCyclePhase("published") {
         public Query asQuery(Date time) {
-            return subtract(getPublishedQuery(time), getArchivedRangeQuery(time)) ;
+            return subtract(getPublishedQuery(time), getArchivedRangeQuery(time)).build();
         }
     };
 
-    public static final LifeCyclePhase[] ALL = new LifeCyclePhase[] {
+    public static final LifeCyclePhase[] ALL = new LifeCyclePhase[]{
             NEW, APPROVED, DISAPPROVED,
             PUBLISHED, ARCHIVED, UNPUBLISHED
     };
+    private final String name;
+
+    private LifeCyclePhase(String name) {
+        this.name = name;
+    }
 
-   
-    private static BooleanQuery add(BooleanQuery query, Query otherQuery) {
-        query.add(
-                otherQuery,
-                true, false) ;
-        return query;
+    private static BooleanQuery.Builder add(BooleanQuery.Builder booleanQueryBuilder, Query otherQuery) {
+        return booleanQueryBuilder.add(otherQuery, Occur.MUST);
     }
 
-    private static BooleanQuery subtract(BooleanQuery minuend, Query subtrahend) {
-        minuend.add(
-                subtrahend,
-                false, true) ;
-        return minuend;
+    private static BooleanQuery.Builder subtract(BooleanQuery.Builder booleanQueryBuilder, Query subtrahend) {
+        return booleanQueryBuilder.add(subtrahend, Occur.MUST_NOT);
     }
 
-    private static RangeQuery getPublicationStartRangeQuery(Date now) {
+    private static TermRangeQuery getPublicationStartRangeQuery(Date now) {
         return getDateRangeQuery(DocumentIndex.FIELD__PUBLICATION_START_DATETIME, now);
     }
 
-    private static RangeQuery getPublicationEndRangeQuery(Date now) {
+    private static TermRangeQuery getPublicationEndRangeQuery(Date now) {
         return getDateRangeQuery(DocumentIndex.FIELD__PUBLICATION_END_DATETIME, now);
     }
 
-    private static RangeQuery getArchivedRangeQuery(Date now) {
+    private static TermRangeQuery getArchivedRangeQuery(Date now) {
         return getDateRangeQuery(DocumentIndex.FIELD__ARCHIVED_DATETIME, now);
     }
 
-    private static RangeQuery getDateRangeQuery(String field, Date now) {
-        return new RangeQuery(new Term(field, DateField.MIN_DATE_STRING()),
-                              new Term(field, DateField.dateToString(now)),
-                              true);
+    /**
+     * @param field range field name.
+     * @param now   range upper bound.
+     * @return a TermRangeQuery in an interval from minimum to now.
+     */
+    private static TermRangeQuery getDateRangeQuery(String field, Date now) {
+        return new TermRangeQuery(field,
+                new BytesRef("0"),
+                new BytesRef(DateTools.dateToString(now, DateTools.Resolution.MINUTE)),
+                true, true);
     }
 
-    private static BooleanQuery getPublishedQuery(Date now) {
-        return add(getApprovedNonUnpublishedQuery(now), getPublicationStartRangeQuery(now)) ;
+    private static BooleanQuery.Builder getPublishedQuery(Date now) {
+        return add(getApprovedNonUnpublishedQuery(now), getPublicationStartRangeQuery(now));
     }
 
-    private static BooleanQuery getApprovedNonUnpublishedQuery(Date now) {
-        return subtract(getApprovedBooleanQuery(), getPublicationEndRangeQuery(now)) ;
+    private static BooleanQuery.Builder getApprovedNonUnpublishedQuery(Date now) {
+        return subtract(getApprovedBooleanQuery(), getPublicationEndRangeQuery(now));
     }
 
-    private static BooleanQuery getApprovedBooleanQuery() {
-        return add(new BooleanQuery(), getStatusQuery(Document.PublicationStatus.APPROVED)) ;
+    private static BooleanQuery.Builder getApprovedBooleanQuery() {
+        return add(new BooleanQuery.Builder(), getStatusQuery(Document.PublicationStatus.APPROVED));
     }
 
     private static TermQuery getStatusQuery(Document.PublicationStatus publicationStatus) {
         return new TermQuery(new Term(DocumentIndex.FIELD__STATUS, publicationStatus.toString()));
     }
 
-
-    private final String name;
-
-    private LifeCyclePhase( String name ) {
-        this.name = name ;
-    }
-
     public String toString() {
-        return name ;
+        return name;
     }
 
     public abstract Query asQuery(Date time);
diff --git a/server/src/imcode/server/document/MaxCategoryDomainObjectsOfTypeExceededException.java b/server/src/imcode/server/document/MaxCategoryDomainObjectsOfTypeExceededException.java
index 560c638b4e..fae23b757f 100644
--- a/server/src/imcode/server/document/MaxCategoryDomainObjectsOfTypeExceededException.java
+++ b/server/src/imcode/server/document/MaxCategoryDomainObjectsOfTypeExceededException.java
@@ -7,6 +7,6 @@
  */
 public class MaxCategoryDomainObjectsOfTypeExceededException extends DocumentSaveException {
     public MaxCategoryDomainObjectsOfTypeExceededException(String message) {
-        super(message) ;
+        super(message);
     }
 }
diff --git a/server/src/imcode/server/document/NoPermissionToCreateDocumentException.java b/server/src/imcode/server/document/NoPermissionToCreateDocumentException.java
index 916c560d08..ae1a341d0d 100644
--- a/server/src/imcode/server/document/NoPermissionToCreateDocumentException.java
+++ b/server/src/imcode/server/document/NoPermissionToCreateDocumentException.java
@@ -4,6 +4,6 @@
 
 public class NoPermissionToCreateDocumentException extends NoPermissionInternalException {
     public NoPermissionToCreateDocumentException(String message) {
-        super(message) ;
+        super(message);
     }
 }
diff --git a/server/src/imcode/server/document/NoPermissionToEditDocumentException.java b/server/src/imcode/server/document/NoPermissionToEditDocumentException.java
index 6308226f9a..e422483655 100644
--- a/server/src/imcode/server/document/NoPermissionToEditDocumentException.java
+++ b/server/src/imcode/server/document/NoPermissionToEditDocumentException.java
@@ -4,6 +4,6 @@
 
 public class NoPermissionToEditDocumentException extends NoPermissionInternalException {
     public NoPermissionToEditDocumentException(String message) {
-        super(message) ;
+        super(message);
     }
 }
diff --git a/server/src/imcode/server/document/RoleIdToDocumentPermissionSetTypeMappings.java b/server/src/imcode/server/document/RoleIdToDocumentPermissionSetTypeMappings.java
index c227a8b39d..a21fa0b932 100644
--- a/server/src/imcode/server/document/RoleIdToDocumentPermissionSetTypeMappings.java
+++ b/server/src/imcode/server/document/RoleIdToDocumentPermissionSetTypeMappings.java
@@ -1,58 +1,48 @@
 package imcode.server.document;
 
 import imcode.server.user.RoleId;
-import imcode.util.ShouldNotBeThrownException;
 import imcode.util.LazilyLoadedObject;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Transformer;
+import imcode.util.ShouldNotBeThrownException;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.Map;
+import java.util.Optional;
 
-public class RoleIdToDocumentPermissionSetTypeMappings implements Serializable, Cloneable, LazilyLoadedObject.Copyable {
+public class RoleIdToDocumentPermissionSetTypeMappings implements Serializable, Cloneable, LazilyLoadedObject.Copyable<RoleIdToDocumentPermissionSetTypeMappings> {
 
-    HashMap map = new HashMap() ;
+    private HashMap<RoleId, DocumentPermissionSetTypeDomainObject> map = new HashMap<>();
 
-    protected Object clone() {
+    protected RoleIdToDocumentPermissionSetTypeMappings clone() {
         try {
             RoleIdToDocumentPermissionSetTypeMappings clone = (RoleIdToDocumentPermissionSetTypeMappings) super.clone();
-            clone.map = (HashMap) map.clone() ;
+            clone.map = (HashMap<RoleId, DocumentPermissionSetTypeDomainObject>) map.clone();
             return clone;
-        } catch ( CloneNotSupportedException e ) {
+        } catch (CloneNotSupportedException e) {
             throw new ShouldNotBeThrownException(e);
         }
     }
 
     public void setPermissionSetTypeForRole(RoleId roleId, DocumentPermissionSetTypeDomainObject documentPermissionSetType) {
-        if ( null == documentPermissionSetType ) {
-            map.remove(roleId) ;
+        if (null == documentPermissionSetType) {
+            map.remove(roleId);
         } else {
-            map.put(roleId, documentPermissionSetType) ;
+            map.put(roleId, documentPermissionSetType);
         }
     }
 
     public DocumentPermissionSetTypeDomainObject getPermissionSetTypeForRole(RoleId roleId) {
-        DocumentPermissionSetTypeDomainObject documentPermissionSetType = (DocumentPermissionSetTypeDomainObject) map.get(roleId);
-        if (null == documentPermissionSetType) {
-            documentPermissionSetType = DocumentPermissionSetTypeDomainObject.NONE;
-        }
-        return documentPermissionSetType ;
+        return Optional.ofNullable(map.get(roleId))
+                .orElse(DocumentPermissionSetTypeDomainObject.NONE);
     }
 
     public Mapping[] getMappings() {
-        Collection pairs = CollectionUtils.collect(map.entrySet(), new Transformer() {
-            public Object transform(Object object) {
-                Map.Entry entry = (Map.Entry) object ;
-                return new Mapping((RoleId)entry.getKey(), (DocumentPermissionSetTypeDomainObject)entry.getValue()) ;
-            }
-        });
-        return (Mapping[]) pairs.toArray(new Mapping[pairs.size()]);
+        return CollectionUtils.collect(map.entrySet(), entry -> new Mapping(entry.getKey(), entry.getValue()))
+                .toArray(new Mapping[0]);
     }
 
-    public LazilyLoadedObject.Copyable copy() {
-        return (LazilyLoadedObject.Copyable) clone() ;
+    public RoleIdToDocumentPermissionSetTypeMappings copy() {
+        return clone();
     }
 
     public static class Mapping {
@@ -75,10 +65,10 @@ public RoleId getRoleId() {
         }
 
         public boolean equals(Object o) {
-            if ( this == o ) {
+            if (this == o) {
                 return true;
             }
-            if ( o == null || getClass() != o.getClass() ) {
+            if (o == null || getClass() != o.getClass()) {
                 return false;
             }
 
diff --git a/server/src/imcode/server/document/SectionDomainObject.java b/server/src/imcode/server/document/SectionDomainObject.java
index d8f0827b32..f21d38f897 100644
--- a/server/src/imcode/server/document/SectionDomainObject.java
+++ b/server/src/imcode/server/document/SectionDomainObject.java
@@ -4,12 +4,12 @@
 
 public class SectionDomainObject extends IdNamePair {
 
-    public SectionDomainObject( int id, String name ) {
+    public SectionDomainObject(int id, String name) {
         super(id, name);
     }
 
     public String toString() {
-        return getName() ;
+        return getName();
     }
 
 }
diff --git a/server/src/imcode/server/document/TemplateDomainObject.java b/server/src/imcode/server/document/TemplateDomainObject.java
index 75752e4c28..4fed6a3b50 100644
--- a/server/src/imcode/server/document/TemplateDomainObject.java
+++ b/server/src/imcode/server/document/TemplateDomainObject.java
@@ -5,7 +5,7 @@ public class TemplateDomainObject implements Comparable<TemplateDomainObject> {
     private final String fileName;
 
     public TemplateDomainObject(String name, String fileName) {
-        this.name = name ;
+        this.name = name;
         this.fileName = fileName;
     }
 
@@ -18,14 +18,14 @@ public String getName() {
     }
 
     public int compareTo(TemplateDomainObject o) {
-        return name.compareToIgnoreCase(o.getName()) ;
+        return name.compareToIgnoreCase(o.getName());
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
diff --git a/server/src/imcode/server/document/TemplateGroupDomainObject.java b/server/src/imcode/server/document/TemplateGroupDomainObject.java
index ec76a51d03..b65b4aeb5e 100644
--- a/server/src/imcode/server/document/TemplateGroupDomainObject.java
+++ b/server/src/imcode/server/document/TemplateGroupDomainObject.java
@@ -4,7 +4,7 @@
 
 public class TemplateGroupDomainObject extends IdNamePair {
 
-    public TemplateGroupDomainObject( int id, String name ) {
+    public TemplateGroupDomainObject(int id, String name) {
         super(id, name);
     }
 
diff --git a/server/src/imcode/server/document/TemplateMapper.java b/server/src/imcode/server/document/TemplateMapper.java
index a15bfc9304..d528f902ac 100644
--- a/server/src/imcode/server/document/TemplateMapper.java
+++ b/server/src/imcode/server/document/TemplateMapper.java
@@ -26,7 +26,15 @@
 import java.io.InputStream;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 public class TemplateMapper {
 
@@ -37,59 +45,59 @@ public class TemplateMapper {
     private Database database;
     private ImcmsServices services;
 
-    public TemplateMapper( ImcmsServices service ) {
+    public TemplateMapper(ImcmsServices service) {
         database = service.getDatabase();
-        services = service ;
+        services = service;
     }
 
-    public void addTemplateToGroup( TemplateDomainObject template, TemplateGroupDomainObject templateGroup ) {
-        database.execute( new SqlUpdateCommand( "INSERT INTO templates_cref (group_id,template_name) VALUES(?,?)",
-                                                new Object[]{templateGroup.getId(), template.getName()} ) );
+    public void addTemplateToGroup(TemplateDomainObject template, TemplateGroupDomainObject templateGroup) {
+        database.execute(new SqlUpdateCommand("INSERT INTO templates_cref (group_id,template_name) VALUES(?,?)",
+                new Object[]{templateGroup.getId(), template.getName()}));
     }
 
-    public List<TemplateDomainObject> getAllTemplatesExceptOne( TemplateDomainObject template ) {
+    public List<TemplateDomainObject> getAllTemplatesExceptOne(TemplateDomainObject template) {
         List<TemplateDomainObject> allTemplates = getAllTemplates();
-        allTemplates.remove(template) ;
-        return allTemplates ;
+        allTemplates.remove(template);
+        return allTemplates;
     }
 
-    public String createHtmlOptionListOfTemplateGroups( TemplateGroupDomainObject selectedTemplateGroup ) {
+    public String createHtmlOptionListOfTemplateGroups(TemplateGroupDomainObject selectedTemplateGroup) {
         TemplateGroupDomainObject[] templateGroups = services.getTemplateMapper().getAllTemplateGroups();
-        return createHtmlOptionListOfTemplateGroups( Arrays.asList(templateGroups), selectedTemplateGroup );
+        return createHtmlOptionListOfTemplateGroups(Arrays.asList(templateGroups), selectedTemplateGroup);
     }
 
-    public String createHtmlOptionListOfTemplateGroups( Collection<TemplateGroupDomainObject> templateGroups,
-                                                        TemplateGroupDomainObject selectedTemplateGroup ) {
+    public String createHtmlOptionListOfTemplateGroups(Collection<TemplateGroupDomainObject> templateGroups,
+                                                       TemplateGroupDomainObject selectedTemplateGroup) {
         String temps = "";
-        for ( TemplateGroupDomainObject templateGroup : templateGroups ) {
+        for (TemplateGroupDomainObject templateGroup : templateGroups) {
             boolean selected = null != selectedTemplateGroup && selectedTemplateGroup.equals(templateGroup);
-            temps += "<option value=\"" + templateGroup.getId() + "\"" + ( selected ? " selected" : "" ) + ">"
-                     + templateGroup.getName() + "</option>";
+            temps += "<option value=\"" + templateGroup.getId() + "\"" + (selected ? " selected=\"selected\"" : "") + ">"
+                    + templateGroup.getName() + "</option>";
         }
         return temps;
     }
 
-    public String createHtmlOptionListOfTemplates( Iterable<TemplateDomainObject> templates,
-                                                   TemplateDomainObject selectedTemplate ) throws IOException {
+    public String createHtmlOptionListOfTemplates(Iterable<TemplateDomainObject> templates,
+                                                  TemplateDomainObject selectedTemplate) throws IOException {
         String temps = "";
-        for ( TemplateDomainObject template : templates ) {
-            
-            boolean selected = selectedTemplate != null && selectedTemplate.equals( template );
+        for (TemplateDomainObject template : templates) {
+
+            boolean selected = selectedTemplate != null && selectedTemplate.equals(template);
             temps += "<option value=\""
-                     + StringEscapeUtils.escapeHtml(template.getName())
-                     + "\""
-                     + ( selected ? " selected" : "" )
-                     + ">"
-                     + StringEscapeUtils.escapeHtml(template.getName()) + "</option>";
+                    + StringEscapeUtils.escapeHtml(template.getName())
+                    + "\""
+                    + (selected ? " selected=\"selected\"" : "")
+                    + ">"
+                    + StringEscapeUtils.escapeHtml(template.getName()) + "</option>";
         }
         return temps;
     }
 
-    public String createHtmlOptionListOfTemplatesWithDocumentCount( UserDomainObject user ) {
+    public String createHtmlOptionListOfTemplatesWithDocumentCount(UserDomainObject user) {
         String htmlStr = "";
         TemplateMapper templateMapper = services.getTemplateMapper();
         List<TemplateDomainObject> templates = templateMapper.getAllTemplates();
-        for ( TemplateDomainObject template : templates ) {
+        for (TemplateDomainObject template : templates) {
             List tags = new ArrayList();
             tags.add("#template_name#");
             tags.add(StringEscapeUtils.escapeHtml(template.getName()));
@@ -105,13 +113,13 @@ public String createHtmlOptionListOfTemplatesWithDocumentCount( UserDomainObject
     /**
      * delete template from db/disk
      */
-    public void deleteTemplate( TemplateDomainObject template ) {
+    public void deleteTemplate(TemplateDomainObject template) {
 
-        database.execute( new SqlUpdateCommand( "delete from templates_cref where template_name = ?", new String[]{template.getName()} ) );
+        database.execute(new SqlUpdateCommand("delete from templates_cref where template_name = ?", new String[]{template.getName()}));
 
         // test if template exists and delete it
         File f = getTemplateFile(template);
-        if ( f.exists() ) {
+        if (f.exists()) {
             f.delete();
         }
     }
@@ -120,7 +128,7 @@ private File getTemplateFile(TemplateDomainObject template) {
         return new File(getTemplateDirectory(), template.getFileName());
     }
 
-    public void deleteTemplateGroup( int grp_id ) {
+    public void deleteTemplateGroup(int grp_id) {
         final Object[] parameters1 = new String[]{"" + grp_id};
         database.execute(new SqlUpdateCommand("delete from templates_cref where group_id = ?", parameters1));
         final Object[] parameters = new String[]{"" + grp_id};
@@ -130,88 +138,92 @@ public void deleteTemplateGroup( int grp_id ) {
     public TemplateGroupDomainObject[] getAllTemplateGroups() {
         final Object[] parameters = new String[]{};
         String[][] sprocResult = (String[][]) services.getProcedureExecutor().executeProcedure(SPROC_GET_TEMPLATE_GROUPS, parameters, new StringArrayArrayResultSetHandler());
-        return createTemplateGroupsFromSqlResult( sprocResult );
+        return createTemplateGroupsFromSqlResult(sprocResult);
     }
 
-    public TemplateGroupDomainObject[] getAllTemplateGroupsAvailableForUserOnDocument( UserDomainObject user,
-                                                                                       int metaId ) {
-        String[][] sprocResult = sprocGetTemplateGroupsForUser(user, metaId );
-        return createTemplateGroupsFromSqlResult( sprocResult );
+    public TemplateGroupDomainObject[] getAllTemplateGroupsAvailableForUserOnDocument(UserDomainObject user,
+                                                                                      int metaId) {
+        String[][] sprocResult = sprocGetTemplateGroupsForUser(user, metaId);
+        return createTemplateGroupsFromSqlResult(sprocResult);
     }
 
     public Set getAllTemplateGroupIds() {
         return (Set) database.execute(new SqlQueryCommand("SELECT group_id FROM templategroups", null, new CollectionHandler(new HashSet(), new RowTransformer() {
             public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
-                return new Integer(resultSet.getInt(1)) ;
+                return resultSet.getInt(1);
             }
 
             public Class getClassOfCreatedObjects() {
-                return Integer.class ;
+                return Integer.class;
             }
-        }))) ;
+        })));
     }
 
     public List<TemplateDomainObject> getAllTemplates() {
         File[] templateFiles = getTemplateDirectory().listFiles(new FileFilter() {
             public boolean accept(File pathname) {
                 String fileName = pathname.getName().toLowerCase();
-                return pathname.isFile() && (fileName.endsWith(".jsp") || fileName.endsWith(".jspx") || fileName.endsWith(".html")) ; 
+                return pathname.isFile() && (fileName.endsWith(".jsp") || fileName.endsWith(".jspx") || fileName.endsWith(".html"));
             }
         });
-        SortedSet<TemplateDomainObject> templates = new TreeSet<TemplateDomainObject>();
-        for ( File templateFile : templateFiles ) {
+        SortedSet<TemplateDomainObject> templates = new TreeSet<>();
+        for (File templateFile : templateFiles) {
             String nameWithoutExtension = StringUtils.substringBeforeLast(templateFile.getName(), ".");
-            templates.add(new TemplateDomainObject(nameWithoutExtension, templateFile.getName())) ;
+            templates.add(new TemplateDomainObject(nameWithoutExtension, templateFile.getName()));
         }
-        return new ArrayList<TemplateDomainObject>(templates);
+        return new ArrayList<>(templates);
     }
 
-    private int getCountOfDocumentsUsingTemplate( TemplateDomainObject template ) {
+    private int getCountOfDocumentsUsingTemplate(TemplateDomainObject template) {
         String queryResult = (String) database.execute(new SqlQueryCommand("SELECT COUNT(meta_id)" + " FROM text_docs"
-                                                                           + " WHERE template_name = ?", new String[]{"" + template.getName()}, Utility.SINGLE_STRING_HANDLER));
-        return Integer.parseInt( queryResult );
+                + " WHERE template_name = ?", new String[]{"" + template.getName()}, Utility.SINGLE_STRING_HANDLER));
+        return Integer.parseInt(queryResult);
     }
 
-    public DocumentDomainObject[] getDocumentsUsingTemplate( TemplateDomainObject template ) {
-        String[][] temp = (String[][]) database.execute(new SqlQueryCommand("select td.meta_id, meta_headline from text_docs td join meta m on td.meta_id = m.meta_id where template_name = ? order by td.meta_id", new String[]{template.getName()}, Utility.STRING_ARRAY_ARRAY_HANDLER));
+    public DocumentDomainObject[] getDocumentsUsingTemplate(TemplateDomainObject template) {
+        String[][] temp = (String[][]) database.execute(new SqlQueryCommand("" +
+                "SELECT td.meta_id, m.meta_headline\n" +
+                "FROM text_docs td JOIN meta m ON td.meta_id = m.meta_id\n" +
+                "WHERE td.template_name = ? OR td.default_template = ? OR td.default_template_1 = ? OR td.default_template_2 = ?\n" +
+                "ORDER BY td.meta_id", new String[]{template.getName(), template.getName(), template.getName(), template.getName()}, Utility.STRING_ARRAY_ARRAY_HANDLER));
         DocumentMapper documentMapper = services.getDocumentMapper();
         DocumentDomainObject[] documents = new DocumentDomainObject[temp.length];
-        for ( int i = 0; i < documents.length; i++ ) {
-            int documentId = Integer.parseInt( temp[i][0] );
-            documents[i] = documentMapper.getDocument( documentId );
+        for (int i = 0; i < documents.length; i++) {
+            int documentId = Integer.parseInt(temp[i][0]);
+            documents[i] = documentMapper.getDocument(documentId);
         }
         return documents;
     }
 
-    public TemplateDomainObject getTemplateByName( String templateName ) {
-        String[] extensions = new String[] { "jsp", "jspx", "html" } ;
-        for ( String extension : extensions ) {
+    public TemplateDomainObject getTemplateByName(String templateName) {
+        String[] extensions = new String[]{"jsp", "jspx", "html"};
+        for (String extension : extensions) {
             String templateFileName = templateName + "." + extension;
             File templateFile = new File(getTemplateDirectory(), templateFileName);
             if (templateFile.exists()) {
                 return new TemplateDomainObject(templateName, templateFileName);
             }
         }
-        return null ;
+        return null;
     }
 
-    public TemplateGroupDomainObject getTemplateGroupById( int templateGroupId ) {
+    public TemplateGroupDomainObject getTemplateGroupById(int templateGroupId) {
         String sqlStr = "SELECT group_id,group_name FROM templategroups WHERE group_id = ?";
         final Object[] parameters = new String[]{"" + templateGroupId};
         String[] queryResult = (String[]) database.execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_HANDLER));
 
-        return createTemplateGroupFromSqlResultRow( queryResult );
+        return createTemplateGroupFromSqlResultRow(queryResult);
     }
 
-    public TemplateGroupDomainObject getTemplateGroupByName( String name ) {
+    public TemplateGroupDomainObject getTemplateGroupByName(String name) {
         final Object[] parameters = new String[]{name};
         String[] sqlResultRow = (String[]) database.execute(new SqlQueryCommand("select group_id, group_name from templategroups where group_name = ?", parameters, Utility.STRING_ARRAY_HANDLER));
-        return createTemplateGroupFromSqlResultRow( sqlResultRow );
+        return createTemplateGroupFromSqlResultRow(sqlResultRow);
     }
 
-    public List<TemplateDomainObject> getTemplatesInGroup( TemplateGroupDomainObject templateGroup ) {
-        return (List<TemplateDomainObject>) CollectionUtils.select((Collection) services.getProcedureExecutor().executeProcedure(SPROC_GET_TEMPLATES_IN_GROUP, new String[] {
-                "" + templateGroup.getId() }, new CollectionHandler(new ArrayList(), new RowTransformer() {
+    public List<TemplateDomainObject> getTemplatesInGroup(TemplateGroupDomainObject templateGroup) {
+        return (List<TemplateDomainObject>) CollectionUtils.select((Collection) services.getProcedureExecutor().executeProcedure(SPROC_GET_TEMPLATES_IN_GROUP, new String[]{
+                "" + templateGroup.getId()}, new CollectionHandler(new ArrayList(), new RowTransformer() {
             public Object createObjectFromResultSetRow(ResultSet resultSet) throws SQLException {
                 return getTemplateByName(resultSet.getString(1));
             }
@@ -222,25 +234,26 @@ public Class getClassOfCreatedObjects() {
         })), NotPredicate.getInstance(NullPredicate.INSTANCE));
     }
 
-    public List<TemplateDomainObject> getTemplatesNotInGroup( TemplateGroupDomainObject templateGroup ) {
-        List<TemplateDomainObject> templatesInGroup = getTemplatesInGroup( templateGroup );
-        Set<TemplateDomainObject> allTemplates = new HashSet<TemplateDomainObject>( getAllTemplates() ) ;
-        allTemplates.removeAll( templatesInGroup );
-        List<TemplateDomainObject> templatesNotInGroup = new ArrayList<TemplateDomainObject>(allTemplates);
-        Collections.sort(templatesNotInGroup) ;
+    public List<TemplateDomainObject> getTemplatesNotInGroup(TemplateGroupDomainObject templateGroup) {
+        List<TemplateDomainObject> templatesInGroup = getTemplatesInGroup(templateGroup);
+        Set<TemplateDomainObject> allTemplates = new HashSet<>(getAllTemplates());
+        allTemplates.removeAll(templatesInGroup);
+        List<TemplateDomainObject> templatesNotInGroup = new ArrayList<>(allTemplates);
+        Collections.sort(templatesNotInGroup);
         return templatesNotInGroup;
     }
 
-    public void removeTemplateFromGroup( TemplateDomainObject template, TemplateGroupDomainObject templateGroup ) {
-        database.execute( new SqlUpdateCommand( "DELETE FROM templates_cref WHERE group_id = ? AND template_name = ?",
-                                                new String[]{"" + templateGroup.getId(), template.getName()} ) );
+    public void removeTemplateFromGroup(TemplateDomainObject template, TemplateGroupDomainObject templateGroup) {
+        database.execute(new SqlUpdateCommand("DELETE FROM templates_cref WHERE group_id = ? AND template_name = ?",
+                new String[]{"" + templateGroup.getId(), template.getName()}));
     }
 
-    public boolean renameTemplate( String templateName, String newNameForTemplate ) {
+    public boolean renameTemplate(String templateName, String newNameForTemplate) {
         if (null != getTemplateByName(newNameForTemplate)) {
             return false;
         }
-        for (TemplateDomainObject template = getTemplateByName(templateName); null != template; template = getTemplateByName(templateName)) {
+        for (TemplateDomainObject template = getTemplateByName(templateName); null != template; template = getTemplateByName(templateName))
+        {
             File templateFile = getTemplateFile(template);
             String extension = StringUtils.substringAfterLast(template.getFileName(), ".");
             String newFilename = newNameForTemplate + "." + extension;
@@ -256,21 +269,24 @@ private File getTemplateDirectory() {
         return new File(Imcms.getPath(), "WEB-INF/templates/text");
     }
 
-    public void renameTemplateGroup( TemplateGroupDomainObject templateGroup, String newName ) {
+    public void renameTemplateGroup(TemplateGroupDomainObject templateGroup, String newName) {
         String sqlStr = "update templategroups\n"
-                        + "set group_name = ?\n"
-                        + "where group_id = ?\n";
+                + "set group_name = ?\n"
+                + "where group_id = ?\n";
         final Object[] parameters = new String[]{newName, "" + templateGroup.getId()};
         database.execute(new SqlUpdateCommand(sqlStr, parameters));
     }
 
-    public void replaceAllUsagesOfTemplate( TemplateDomainObject template, TemplateDomainObject newTemplate ) {
-        if ( null != template && null != newTemplate ) {
+    public void replaceAllUsagesOfTemplate(TemplateDomainObject template, TemplateDomainObject newTemplate) {
+        if (null != template && null != newTemplate) {
             DocumentDomainObject[] documentsUsingTemplate = getDocumentsUsingTemplate(template);
-            String sqlStr = "update text_docs set template_name = ? where template_name = ?";
-            final Object[] parameters = new String[]{"" + newTemplate.getName(), "" + template.getName()};
-            database.execute(new SqlUpdateCommand(sqlStr, parameters));
-            for ( DocumentDomainObject document : documentsUsingTemplate ) {
+            String[] columns = {"template_name", "default_template", "default_template_1", "default_template_2"};
+            for (String columnName : columns) {
+                String sqlStr = "UPDATE text_docs SET " + columnName + " = ? WHERE " + columnName + " = ?";
+                final Object[] parameters = new String[]{"" + newTemplate.getName(), "" + template.getName()};
+                database.execute(new SqlUpdateCommand(sqlStr, parameters));
+            }
+            for (DocumentDomainObject document : documentsUsingTemplate) {
                 services.getDocumentMapper().invalidateDocument(document);
             }
         }
@@ -278,49 +294,49 @@ public void replaceAllUsagesOfTemplate( TemplateDomainObject template, TemplateD
 
     private String[][] sprocGetTemplateGroupsForUser(UserDomainObject user,
                                                      int meta_id) {
-        final Object[] parameters = new String[]{String.valueOf( meta_id ), String.valueOf( user.getId() )};
+        final Object[] parameters = new String[]{String.valueOf(meta_id), String.valueOf(user.getId())};
         return (String[][]) services.getProcedureExecutor().executeProcedure(SPROC_GET_TEMPLATE_GROUPS_FOR_USER, parameters, new StringArrayArrayResultSetHandler());
     }
 
-    private TemplateGroupDomainObject createTemplateGroupFromSqlResultRow( String[] sqlResultRow ) {
-        if ( 0 == sqlResultRow.length ) {
+    private TemplateGroupDomainObject createTemplateGroupFromSqlResultRow(String[] sqlResultRow) {
+        if (0 == sqlResultRow.length) {
             return null;
         }
 
-        int templateGroupId = Integer.parseInt( sqlResultRow[0] );
+        int templateGroupId = Integer.parseInt(sqlResultRow[0]);
         String templateGroupName = sqlResultRow[1];
-        return new TemplateGroupDomainObject( templateGroupId,
-                                              templateGroupName );
+        return new TemplateGroupDomainObject(templateGroupId,
+                templateGroupName);
     }
 
-    private TemplateGroupDomainObject[] createTemplateGroupsFromSqlResult( String[][] sprocResult ) {
+    private TemplateGroupDomainObject[] createTemplateGroupsFromSqlResult(String[][] sprocResult) {
         TemplateGroupDomainObject[] templateGroups = new TemplateGroupDomainObject[sprocResult.length];
-        for ( int i = 0; i < sprocResult.length; i++ ) {
-            templateGroups[i] = createTemplateGroupFromSqlResultRow( sprocResult[i] );
+        for (int i = 0; i < sprocResult.length; i++) {
+            templateGroups[i] = createTemplateGroupFromSqlResultRow(sprocResult[i]);
         }
         return templateGroups;
     }
 
-    public void createTemplateGroup( String name ) {
-        database.execute(new InsertIntoTableDatabaseCommand("templategroups", new Object[][] {
-                { "group_name", name },
-        })) ;
+    public void createTemplateGroup(String name) {
+        database.execute(new InsertIntoTableDatabaseCommand("templategroups", new Object[][]{
+                {"group_name", name},
+        }));
     }
 
     public int saveTemplate(String name, String file_name, InputStream templateData, boolean overwrite) {
 
-        File f = new File( getTemplateDirectory(), name+"."+StringUtils.substringAfterLast(file_name,".") );
+        File f = new File(getTemplateDirectory(), name + "." + StringUtils.substringAfterLast(file_name, "."));
         if (f.exists() && !overwrite) {
-            return -1 ;
+            return -1;
         }
-        
+
         try {
-            FileOutputStream fw = new FileOutputStream( f );
+            FileOutputStream fw = new FileOutputStream(f);
             IOUtils.copy(templateData, fw);
             fw.flush();
             fw.close();
 
-        } catch ( IOException e ) {
+        } catch (IOException e) {
             return -2;
         }
 
@@ -330,31 +346,31 @@ public int saveTemplate(String name, String file_name, InputStream templateData,
         return 0;
     }
 
-    public String getTemplateData( String templateName ) throws IOException {
-        return services.getFileCache().getCachedFileString( getTemplateFile(getTemplateByName(templateName)) );
+    public String getTemplateData(String templateName) throws IOException {
+        return services.getFileCache().getCachedFileString(getTemplateFile(getTemplateByName(templateName)));
     }
 
     public List getTemplateGroups(Set<Integer> templateGroupIds) {
         List<TemplateGroupDomainObject> allowedTemplateGroups = new ArrayList(templateGroupIds.size());
-        for ( Integer allowedTemplateGroupId : templateGroupIds ) {
-            TemplateGroupDomainObject templateGroup = getTemplateGroupById(allowedTemplateGroupId.intValue());
-            if ( null != templateGroup ) {
+        for (Integer allowedTemplateGroupId : templateGroupIds) {
+            TemplateGroupDomainObject templateGroup = getTemplateGroupById(allowedTemplateGroupId);
+            if (null != templateGroup) {
                 allowedTemplateGroups.add(templateGroup);
             }
         }
-        Collections.sort(allowedTemplateGroups) ;
+        Collections.sort(allowedTemplateGroups);
         return allowedTemplateGroups;
     }
 
     public boolean templateGroupContains(TemplateGroupDomainObject templateGroup,
                                          TemplateDomainObject template) {
         List<TemplateDomainObject> templates = getTemplatesInGroup(templateGroup);
-        for ( TemplateDomainObject t : templates ) {
-            if ( t.getName().equals(template.getName()) ) {
+        for (TemplateDomainObject t : templates) {
+            if (t.getName().equals(template.getName())) {
                 return true;
             }
         }
-        return false ;
+        return false;
     }
 
 }
diff --git a/server/src/imcode/server/document/TextDocumentPermissionSetDomainObject.java b/server/src/imcode/server/document/TextDocumentPermissionSetDomainObject.java
index d23126a77c..41da1c8185 100644
--- a/server/src/imcode/server/document/TextDocumentPermissionSetDomainObject.java
+++ b/server/src/imcode/server/document/TextDocumentPermissionSetDomainObject.java
@@ -1,111 +1,117 @@
 package imcode.server.document;
 
+import imcode.server.ImcmsConstants;
+
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import imcode.server.ImcmsConstants;
-
 public class TextDocumentPermissionSetDomainObject extends DocumentPermissionSetDomainObject {
 
-    private HashSet allowedTemplateGroupIds = new HashSet();
-    private HashSet allowedDocumentTypeIds = new HashSet();
-    public static final DocumentPermission EDIT_TEXTS = new DocumentPermission( "editTexts" );
-    public static final DocumentPermission EDIT_MENUS = new DocumentPermission( "editMenus" );
-    public static final DocumentPermission EDIT_TEMPLATE = new DocumentPermission( "editTemplates" );
-    public static final DocumentPermission EDIT_INCLUDES = new DocumentPermission( "editIncludes" ) ;
-    public static final DocumentPermission EDIT_IMAGES = new DocumentPermission( "editImages" );
+    public static final DocumentPermission EDIT_TEXTS = new DocumentPermission("editTexts");
+    public static final DocumentPermission EDIT_MENUS = new DocumentPermission("editMenus");
+    public static final DocumentPermission EDIT_TEMPLATE = new DocumentPermission("editTemplates");
+    public static final DocumentPermission EDIT_INCLUDES = new DocumentPermission("editIncludes");
+    public static final DocumentPermission EDIT_IMAGES = new DocumentPermission("editImages");
     public final static int EDIT_TEXT_DOCUMENT_TEXTS_PERMISSION_ID = EDIT_DOCUMENT_PERMISSION_ID;
     public final static int EDIT_TEXT_DOCUMENT_IMAGES_PERMISSION_ID = ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_IMAGES;
     public final static int EDIT_TEXT_DOCUMENT_MENUS_PERMISSION_ID = ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_MENUS;
     public final static int EDIT_TEXT_DOCUMENT_TEMPLATE_PERMISSION_ID = ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEMPLATE;
     public final static int EDIT_TEXT_DOCUMENT_INCLUDES_PERMISSION_ID = ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_INCLUDES;
+    private HashSet allowedTemplateGroupIds = new HashSet();
+    private HashSet allowedDocumentTypeIds = new HashSet();
 
-    public TextDocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject typeId ) {
-        super( typeId );
+    public TextDocumentPermissionSetDomainObject(DocumentPermissionSetTypeDomainObject typeId) {
+        super(typeId);
     }
 
     public boolean getEditTexts() {
-        return hasPermission( EDIT_TEXTS ) ;
+        return hasPermission(EDIT_TEXTS);
     }
 
-    public void setEditTexts( boolean editTexts ) {
-        setPermission( EDIT_TEXTS, editTexts );
+    public void setEditTexts(boolean editTexts) {
+        setPermission(EDIT_TEXTS, editTexts);
     }
 
     public boolean getEditMenus() {
-        return hasPermission( EDIT_MENUS );
+        return hasPermission(EDIT_MENUS);
     }
 
-    public void setEditMenus( boolean editMenus ) {
-        setPermission( EDIT_MENUS, editMenus);
+    public void setEditMenus(boolean editMenus) {
+        setPermission(EDIT_MENUS, editMenus);
     }
 
     public boolean getEditTemplates() {
-        return hasPermission( EDIT_TEMPLATE );
+        return hasPermission(EDIT_TEMPLATE);
     }
 
-    public void setEditTemplates( boolean editTemplates ) {
-        setPermission( EDIT_TEMPLATE, editTemplates );
+    public void setEditTemplates(boolean editTemplates) {
+        setPermission(EDIT_TEMPLATE, editTemplates);
     }
 
     public boolean getEditIncludes() {
-        return hasPermission( EDIT_INCLUDES );
+        return hasPermission(EDIT_INCLUDES);
     }
 
-    public void setEditIncludes( boolean editIncludes ) {
-        setPermission( EDIT_INCLUDES, editIncludes );
+    public void setEditIncludes(boolean editIncludes) {
+        setPermission(EDIT_INCLUDES, editIncludes);
     }
 
     public boolean getEditImages() {
-        return hasPermission( EDIT_IMAGES );
+        return hasPermission(EDIT_IMAGES);
     }
 
-    public void setEditImages( boolean editImages ) {
-        setPermission( EDIT_IMAGES, editImages );
+    public void setEditImages(boolean editImages) {
+        setPermission(EDIT_IMAGES, editImages);
     }
 
     public void setFromBits(int permissionBits) {
-        setEditDocumentInformation(0 != ( permissionBits & EDIT_DOCINFO_PERMISSION_ID ));
-        setEditPermissions(0 != ( permissionBits & EDIT_PERMISSIONS_PERMISSION_ID ));
-        setEdit(0 != ( permissionBits & EDIT_DOCUMENT_PERMISSION_ID ));
-        setEditTexts(0 != ( permissionBits & EDIT_TEXT_DOCUMENT_TEXTS_PERMISSION_ID ));
-        setEditImages(0 != ( permissionBits & EDIT_TEXT_DOCUMENT_IMAGES_PERMISSION_ID ));
-        setEditMenus(0 != ( permissionBits & EDIT_TEXT_DOCUMENT_MENUS_PERMISSION_ID ));
+        setEditDocumentInformation(0 != (permissionBits & EDIT_DOCINFO_PERMISSION_ID));
+        setEditPermissions(0 != (permissionBits & EDIT_PERMISSIONS_PERMISSION_ID));
+        setEdit(0 != (permissionBits & EDIT_DOCUMENT_PERMISSION_ID));
+        setEditTexts(0 != (permissionBits & EDIT_TEXT_DOCUMENT_TEXTS_PERMISSION_ID));
+        setEditImages(0 != (permissionBits & EDIT_TEXT_DOCUMENT_IMAGES_PERMISSION_ID));
+        setEditMenus(0 != (permissionBits & EDIT_TEXT_DOCUMENT_MENUS_PERMISSION_ID));
         setEditIncludes(0
-                        != ( permissionBits & EDIT_TEXT_DOCUMENT_INCLUDES_PERMISSION_ID ));
+                != (permissionBits & EDIT_TEXT_DOCUMENT_INCLUDES_PERMISSION_ID));
         setEditTemplates(0
-                         != ( permissionBits & EDIT_TEXT_DOCUMENT_TEMPLATE_PERMISSION_ID ));
-    }
-
-    public void setAllowedTemplateGroupIds( Set allowedTemplateGroupIds ) {
-        this.allowedTemplateGroupIds = new HashSet(allowedTemplateGroupIds);
+                != (permissionBits & EDIT_TEXT_DOCUMENT_TEMPLATE_PERMISSION_ID));
     }
 
     public Set getAllowedTemplateGroupIds() {
         return Collections.unmodifiableSet(allowedTemplateGroupIds);
     }
 
-    public void setAllowedDocumentTypeIds( Set allowedDocumentTypeIds ) {
-        this.allowedDocumentTypeIds = new HashSet(allowedDocumentTypeIds);
+    public void setAllowedTemplateGroupIds(Set allowedTemplateGroupIds) {
+        this.allowedTemplateGroupIds = new HashSet(allowedTemplateGroupIds);
     }
 
     public Set getAllowedDocumentTypeIds() {
         return Collections.unmodifiableSet(allowedDocumentTypeIds);
     }
 
+    /**
+     * Sets the document type ids(file, text, url etc) allowed to be created based on the text document possessing this
+     * permission set(parent document when creating new document).
+     *
+     * @param allowedDocumentTypeIds allowed document type ids
+     */
+    public void setAllowedDocumentTypeIds(Set allowedDocumentTypeIds) {
+        this.allowedDocumentTypeIds = new HashSet(allowedDocumentTypeIds);
+    }
+
     public void addAllowedTemplateGroupId(int templateGroupId) {
-        allowedTemplateGroupIds.add(new Integer(templateGroupId)) ;
+        allowedTemplateGroupIds.add(templateGroupId);
     }
 
     public void addAllowedDocumentTypeId(int documentTypeId) {
-        allowedDocumentTypeIds.add(new Integer(documentTypeId)) ;
+        allowedDocumentTypeIds.add(documentTypeId);
     }
 
     protected Object clone() throws CloneNotSupportedException {
         TextDocumentPermissionSetDomainObject clone = (TextDocumentPermissionSetDomainObject) super.clone();
         clone.allowedDocumentTypeIds = (HashSet) allowedDocumentTypeIds.clone();
-        clone.allowedTemplateGroupIds = (HashSet) allowedTemplateGroupIds.clone() ;
+        clone.allowedTemplateGroupIds = (HashSet) allowedTemplateGroupIds.clone();
         return clone;
     }
 }
diff --git a/server/src/imcode/server/document/UrlDocumentDomainObject.java b/server/src/imcode/server/document/UrlDocumentDomainObject.java
index 39ccd4fdd6..d3608dc656 100644
--- a/server/src/imcode/server/document/UrlDocumentDomainObject.java
+++ b/server/src/imcode/server/document/UrlDocumentDomainObject.java
@@ -1,33 +1,36 @@
 package imcode.server.document;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.imcode.imcms.domain.dto.export.URLDocumentSerializer;
 import org.apache.oro.text.perl.Perl5Util;
 
+@JsonSerialize(using = URLDocumentSerializer.class)
 public class UrlDocumentDomainObject extends DocumentDomainObject {
 
     private String url = "";
 
     public String getUrl() {
         Perl5Util regexp = new Perl5Util();
-        if ( !regexp.match( "m!^\\w+:|^[/.]!", url ) ) {
+        if (!regexp.match("m!^\\w+:|^[/.]!", url)) {
             String scheme = "http";
-            if (url.toLowerCase().startsWith( "ftp." )) {
-                scheme = "ftp" ;
+            if (url.toLowerCase().startsWith("ftp.")) {
+                scheme = "ftp";
             }
-            return scheme + "://" + url ;
+            return scheme + "://" + url;
         }
         return url;
     }
 
-    public void setUrl( String url ) {
+    public void setUrl(String url) {
         this.url = url;
     }
 
     public DocumentTypeDomainObject getDocumentType() {
-        return DocumentTypeDomainObject.URL ;
+        return DocumentTypeDomainObject.URL;
     }
 
-    public void accept( DocumentVisitor documentVisitor ) {
-        documentVisitor.visitUrlDocument( this );
+    public void accept(DocumentVisitor documentVisitor) {
+        documentVisitor.visitUrlDocument(this);
     }
 
-}
\ No newline at end of file
+}
diff --git a/server/src/imcode/server/document/XmlDocumentBuilder.java b/server/src/imcode/server/document/XmlDocumentBuilder.java
index ddb813ff29..7a11f56bfe 100644
--- a/server/src/imcode/server/document/XmlDocumentBuilder.java
+++ b/server/src/imcode/server/document/XmlDocumentBuilder.java
@@ -1,7 +1,19 @@
 package imcode.server.document;
 
-import imcode.server.document.textdocument.*;
+import com.imcode.imcms.mapping.CategoryMapper;
+import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
+import imcode.server.document.textdocument.ImageDomainObject;
+import imcode.server.document.textdocument.MenuDomainObject;
+import imcode.server.document.textdocument.MenuItemDomainObject;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
+import imcode.server.document.textdocument.TextDomainObject;
+import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
+import imcode.server.user.RoleDomainObject;
+import imcode.server.user.RoleGetter;
 import imcode.server.user.UserDomainObject;
+import imcode.util.DateConstants;
+import imcode.util.Utility;
 import org.apache.commons.lang.UnhandledException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -10,8 +22,11 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 public class XmlDocumentBuilder {
 
@@ -24,12 +39,12 @@ public XmlDocumentBuilder(UserDomainObject user) {
         currentUser = user;
         try {
             xmlDocument = createXmlDocument();
-            Element imcmsElement = xmlDocument.createElement( "imcms" );
-            documentsElement = xmlDocument.createElement( "documents" ) ;
-            imcmsElement.appendChild( documentsElement ) ;
-            xmlDocument.appendChild( imcmsElement );
-        } catch ( ParserConfigurationException e ) {
-            throw new UnhandledException( e );
+            Element imcmsElement = xmlDocument.createElement("imcms");
+            documentsElement = xmlDocument.createElement("documents");
+            imcmsElement.appendChild(documentsElement);
+            xmlDocument.appendChild(imcmsElement);
+        } catch (ParserConfigurationException e) {
+            throw new UnhandledException(e);
         }
 
     }
@@ -40,12 +55,105 @@ private Document createXmlDocument() throws ParserConfigurationException {
         return documentBuilder.newDocument();
     }
 
+    private void createMetaElements(DocumentDomainObject document, Element metaElement) {
+        createSimpleElement("linkheading", document.getHeadline(), metaElement);
+        createSimpleElement("linktext", document.getMenuText(), metaElement);
+        createSimpleElement("linkimage", document.getMenuImage(), metaElement);
+        createSimpleElement("alias", document.getAlias(), metaElement);
+        ImcmsServices service = Imcms.getServices();
+        ImcmsAuthenticatorAndUserAndRoleMapper userMapper = service.getImcmsAuthenticatorAndUserAndRoleMapper();
+        UserDomainObject creator = userMapper.getUser(document.getCreatorId());
+        createSimpleElement("creator", Utility.formatUser(creator), metaElement);
+        if (document.getPublisherId() != null) {
+            UserDomainObject publisher = userMapper.getUser(document.getPublisherId());
+            createSimpleElement("publisher", Utility.formatUser(publisher), metaElement);
+        }
+        SimpleDateFormat dateTimeFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
+        createSimpleElement("createdate",
+                dateTimeFormat.format(document.getCreatedDatetime()), metaElement);
+        if (document.getModifiedDatetime() != null) {
+            createSimpleElement("changedate",
+                    dateTimeFormat.format(document.getModifiedDatetime()), metaElement);
+        }
+        if (document.getArchivedDatetime() != null) {
+            createSimpleElement("archivedate",
+                    dateTimeFormat.format(document.getArchivedDatetime()), metaElement);
+        }
+        if (document.getPublicationEndDatetime() != null) {
+            createSimpleElement("expiredate",
+                    dateTimeFormat.format(document.getPublicationEndDatetime()), metaElement);
+        }
+        if (document.getPublicationStartDatetime() != null) {
+            createSimpleElement("publishingdate",
+                    dateTimeFormat.format(document.getPublicationStartDatetime()), metaElement);
+        }
+        Set<Integer> catIds = document.getCategoryIds();
+        CategoryMapper categoryMapper = service.getCategoryMapper();
+        for (Integer catId : catIds) {
+            Element categoryElement = xmlDocument.createElement("category");
+            CategoryDomainObject category = categoryMapper.getCategoryById(catId);
+            categoryElement.setAttribute("type", category.getType().getName());
+            categoryElement.setTextContent(category.getName());
+            metaElement.appendChild(categoryElement);
+        }
+
+        Set keywords = document.getKeywords();
+        if (!keywords.isEmpty()) {
+            Iterator keywordsIterator = keywords.iterator();
+            Element keywordsElement = xmlDocument.createElement("keywords");
+            keywordsElement.setAttribute("blocked", document.isSearchDisabled() + "");
+            while (keywordsIterator.hasNext()) {
+                String kw = (String) keywordsIterator.next();
+                createSimpleElement("keyword", kw, keywordsElement);
+            }
+            metaElement.appendChild(keywordsElement);
+        }
+
+        RoleIdToDocumentPermissionSetTypeMappings r2pMappings = document
+                .getRoleIdsMappedToDocumentPermissionSetTypes();
+
+        if (r2pMappings != null) {
+            RoleGetter roleGetter = service.getRoleGetter();
+            Element rolesElement = xmlDocument.createElement("roles");
+            RoleIdToDocumentPermissionSetTypeMappings.Mapping[] mappings = r2pMappings.getMappings();
+            for (RoleIdToDocumentPermissionSetTypeMappings.Mapping m : mappings) {
+                RoleDomainObject role = roleGetter.getRole(m.getRoleId());
+                Element roleElement = xmlDocument.createElement("role");
+                roleElement.setAttribute("type", m.getDocumentPermissionSetType().name());
+                roleElement.setTextContent(role.getName());
+                rolesElement.appendChild(roleElement);
+            }
+            metaElement.appendChild(rolesElement);
+        }
+
+        if (document.getDocumentTypeId() == DocumentTypeDomainObject.TEXT_ID) {
+            TextDocumentDomainObject textDocument = (TextDocumentDomainObject) document;
+            createSimpleElement("template", textDocument.getTemplateName(), metaElement);
+        }
+
+        Element shareElement = xmlDocument.createElement("share");
+        createSimpleElement("showLink", document.isLinkedForUnauthorizedUsers() + "", shareElement);
+        createSimpleElement("shareDocument", document.isLinkableByOtherUsers() + "", shareElement);
+        metaElement.appendChild(shareElement);
+
+        createSimpleElement("target", document.getTarget(), metaElement);
+    }
+
+    private void createSimpleElement(String elementName, String textContent, Element parentElement) {
+        Element element = xmlDocument.createElement(elementName);
+        element.setTextContent(textContent);
+        parentElement.appendChild(element);
+    }
+
     public void addDocument(DocumentDomainObject document) {
-        XmlBuildingDocumentVisitor documentVisitor = new XmlBuildingDocumentVisitor( xmlDocument, currentUser);
-        document.accept( documentVisitor );
+        XmlBuildingDocumentVisitor documentVisitor = new XmlBuildingDocumentVisitor(xmlDocument, currentUser);
+        document.accept(documentVisitor);
         Element documentElement = documentVisitor.getDocumentElement();
-        documentElement.setAttribute( "id", "" + document.getId() );
-        documentsElement.appendChild( documentElement ) ;
+        documentElement.setAttribute("id", "" + document.getId());
+        Element metaElement = xmlDocument.createElement("meta");
+        createMetaElements(document, metaElement);
+        documentElement.appendChild(metaElement);
+        documentsElement.appendChild(documentElement);
     }
 
     public Document getXmlDocument() {
@@ -60,7 +168,7 @@ private static class XmlBuildingDocumentVisitor extends DocumentVisitor {
 
 
         XmlBuildingDocumentVisitor(Document xmlDocument, UserDomainObject currentUser) {
-            this.xmlDocument = xmlDocument ;
+            this.xmlDocument = xmlDocument;
             this.currentUser = currentUser;
         }
 
@@ -68,87 +176,146 @@ public Element getDocumentElement() {
             return documentElement;
         }
 
-        public void visitTextDocument( TextDocumentDomainObject textDocument ) {
-            Element documentElement = xmlDocument.createElement( "textdocument" ) ;
-            createTextElements( textDocument, documentElement );
-            createImageElements( textDocument, documentElement );
-            createMenuElements( textDocument, documentElement );
+        public void visitTextDocument(TextDocumentDomainObject textDocument) {
+            Element documentElement = xmlDocument.createElement("document");
+            documentElement.setAttribute("type", "text");
+            Element contentElement = xmlDocument.createElement("content");
+
+            createTextElements(textDocument, contentElement);
+            createImageElements(textDocument, contentElement);
+            createMenuElements(textDocument, contentElement);
+
+            documentElement.appendChild(contentElement);
+            this.documentElement = documentElement;
+        }
+
+        public void visitFileDocument(FileDocumentDomainObject fileDocument) {
+            Element documentElement = xmlDocument.createElement("document");
+            documentElement.setAttribute("type", "file");
+
+            Element contentElement = xmlDocument.createElement("content");
+            createFileElements(fileDocument, contentElement);
+            documentElement.appendChild(contentElement);
+
+            this.documentElement = documentElement;
+        }
+
+        public void visitUrlDocument(UrlDocumentDomainObject urlDocument) {
+            Element documentElement = xmlDocument.createElement("document");
+            documentElement.setAttribute("type", "link");
+
+            Element contentElement = xmlDocument.createElement("content");
+            createLinkElements(urlDocument, contentElement);
+            documentElement.appendChild(contentElement);
 
-            this.documentElement = documentElement ;
+            this.documentElement = documentElement;
         }
 
-        private void createTextElements( TextDocumentDomainObject textDocument, Element textDocumentElement ) {
+        private void createTextElements(TextDocumentDomainObject textDocument, Element contentElement) {
             Map texts = textDocument.getTexts();
-            for ( Iterator iterator = texts.entrySet().iterator(); iterator.hasNext(); ) {
-                Map.Entry entry = (Map.Entry)iterator.next();
-                Integer textIndex = (Integer)entry.getKey();
-                TextDomainObject text = (TextDomainObject)entry.getValue();
-                Element textElement = createTextElement( textIndex, text );
-                textDocumentElement.appendChild( textElement );
+            for (Iterator iterator = texts.entrySet().iterator(); iterator.hasNext(); ) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                Integer textIndex = (Integer) entry.getKey();
+                TextDomainObject text = (TextDomainObject) entry.getValue();
+                Element textElement = createTextElement(textIndex, text);
+                contentElement.appendChild(textElement);
             }
         }
 
-        private Element createTextElement( Integer textIndex, TextDomainObject text ) {
-            Element textElement = xmlDocument.createElement( "text" );
-            textElement.setAttribute( "index", "" + textIndex );
-            textElement.setAttribute( "type", TextDomainObject.TEXT_TYPE_PLAIN == text.getType() ? "text" : "html" );
-            Text textNode = xmlDocument.createTextNode( text.getText() );
-            textElement.appendChild( textNode );
+        private Element createTextElement(Integer textIndex, TextDomainObject text) {
+            Element textElement = xmlDocument.createElement("text");
+            textElement.setAttribute("index", "" + textIndex);
+            textElement.setAttribute("type", TextDomainObject.TEXT_TYPE_PLAIN == text.getType() ? "text" : "html");
+            Text textNode = xmlDocument.createTextNode(text.getText());
+            textElement.appendChild(textNode);
             return textElement;
         }
 
-        private void createImageElements( TextDocumentDomainObject textDocument, Element textDocumentElement ) {
+        private void createImageElements(TextDocumentDomainObject textDocument, Element contentElement) {
             Map images = textDocument.getImages();
-            for ( Iterator iterator = images.entrySet().iterator(); iterator.hasNext(); ) {
-                Map.Entry entry = (Map.Entry)iterator.next();
-                Integer imageIndex = (Integer)entry.getKey();
-                ImageDomainObject image = (ImageDomainObject)entry.getValue();
-                Element imageElement = createImageElement( imageIndex, image);
-                textDocumentElement.appendChild( imageElement );
+            for (Iterator iterator = images.entrySet().iterator(); iterator.hasNext(); ) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                Integer imageIndex = (Integer) entry.getKey();
+                ImageDomainObject image = (ImageDomainObject) entry.getValue();
+                Element imageElement = createImageElement(imageIndex, image);
+                contentElement.appendChild(imageElement);
             }
         }
 
         private Element createImageElement(Integer imageIndex, ImageDomainObject image) {
-            Element imageElement = xmlDocument.createElement( "image" );
-            imageElement.setAttribute( "index", "" + imageIndex );
-            imageElement.setAttribute( "path", image.getUrlPath( "" )  );
+            Element imageElement = xmlDocument.createElement("image");
+            imageElement.setAttribute("index", "" + imageIndex);
+            imageElement.setAttribute("path", image.getUrlPath(""));
+            imageElement.setAttribute("alt-text", image.getAlternateText());
+
             return imageElement;
         }
 
-        private void createMenuElements(TextDocumentDomainObject textDocument, Element textDocumentElement) {
-            Map menus = textDocument.getMenus() ;
-            for ( Iterator iterator = menus.entrySet().iterator(); iterator.hasNext(); ) {
-                Map.Entry entry = (Map.Entry)iterator.next();
-                Integer menuIndex = (Integer)entry.getKey();
-                MenuDomainObject menu = (MenuDomainObject)entry.getValue();
-                Element menuElement = createMenuElement( menuIndex, menu);
-                textDocumentElement.appendChild( menuElement );
+        private void createMenuElements(TextDocumentDomainObject textDocument, Element contentElement) {
+            Map menus = textDocument.getMenus();
+            for (Iterator iterator = menus.entrySet().iterator(); iterator.hasNext(); ) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                Integer menuIndex = (Integer) entry.getKey();
+                MenuDomainObject menu = (MenuDomainObject) entry.getValue();
+                Element menuElement = createMenuElement(menuIndex, menu);
+                contentElement.appendChild(menuElement);
             }
         }
 
         private Element createMenuElement(Integer menuIndex, MenuDomainObject menu) {
-            Element menuElement = xmlDocument.createElement( "menu" );
-            menuElement.setAttribute( "index", "" + menuIndex );
+            Element menuElement = xmlDocument.createElement("menu");
+            menuElement.setAttribute("index", "" + menuIndex);
             createMenuItemElements(menu, menuElement);
             return menuElement;
         }
 
         private void createMenuItemElements(MenuDomainObject menu, Element menuElement) {
-            MenuItemDomainObject[] menuItems = menu.getMenuItems() ;
+            MenuItemDomainObject[] menuItems = menu.getMenuItems();
             for (int i = 0; i < menuItems.length; i++) {
                 MenuItemDomainObject menuItem = menuItems[i];
                 DocumentDomainObject document = menuItem.getDocument();
-                if ( currentUser.canAccess(document) && document.isPublished() || currentUser.canEdit(document) ) {
-                    Element menuItemElement = createMenuItemElement( menuItem.getDocument());
-                    menuElement.appendChild( menuItemElement );
+                if (currentUser.canAccess(document) && document.isPublished() || currentUser.canEdit(document)) {
+                    Element menuItemElement = createMenuItemElement(menuItem.getDocument());
+                    menuElement.appendChild(menuItemElement);
                 }
             }
         }
 
         private Element createMenuItemElement(DocumentDomainObject document) {
-            Element menuItemElement = xmlDocument.createElement( "menuItem" );
-            menuItemElement.setAttribute( "documentid", "" + document.getId() );
+            Element menuItemElement = xmlDocument.createElement("menuItem");
+            menuItemElement.setAttribute("documentid", "" + document.getId());
             return menuItemElement;
         }
+
+        private void createFileElements(FileDocumentDomainObject file, Element contentElement) {
+            Map files = file.getFiles();
+
+            for (Object key : files.keySet()) {
+                FileDocumentDomainObject.FileDocumentFile docFile =
+                        (FileDocumentDomainObject.FileDocumentFile) files.get(key);
+
+                Element fileElement = xmlDocument.createElement("file");
+                fileElement.setAttribute("id", docFile.getId() + "");
+                fileElement.setAttribute("mime", docFile.getMimeType());
+                long size;
+                try {
+                    size = docFile.getInputStreamSource().getSize();
+                } catch (IOException ex) {
+                    size = -1;
+                }
+                fileElement.setAttribute("size", size + "");
+                fileElement.setAttribute("default",
+                        (docFile.getId().equals(file.getDefaultFileId())) + "");
+                fileElement.setTextContent(docFile.getFilename());
+
+                contentElement.appendChild(fileElement);
+            }
+        }
+
+        private void createLinkElements(UrlDocumentDomainObject urlDocument, Element contentElement) {
+            Element linkElement = xmlDocument.createElement("link");
+            linkElement.setTextContent(urlDocument.getUrl());
+            contentElement.appendChild(linkElement);
+        }
     }
 }
diff --git a/server/src/imcode/server/document/index/AnalyzerImpl.java b/server/src/imcode/server/document/index/AnalyzerImpl.java
index d283d8dbe9..4f27a1bc24 100644
--- a/server/src/imcode/server/document/index/AnalyzerImpl.java
+++ b/server/src/imcode/server/document/index/AnalyzerImpl.java
@@ -1,41 +1,37 @@
 package imcode.server.document.index;
 
-import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.LowerCaseFilter;
+import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.util.CharTokenizer;
 
-import java.io.Reader;
+public class AnalyzerImpl extends Analyzer {
 
-class AnalyzerImpl extends Analyzer {
-
-    public TokenStream tokenStream( String fieldName, Reader reader ) {
+    @Override
+    protected TokenStreamComponents createComponents(String fieldName) {
         Tokenizer tokenizer;
-        if ( DocumentIndex.FIELD__SECTION.equals( fieldName )
-             || DocumentIndex.FIELD__KEYWORD.equals( fieldName ) ) {
-            tokenizer = new NullTokenizer( reader );
+        if (DocumentIndex.FIELD__SECTION.equals(fieldName)
+                || DocumentIndex.FIELD__KEYWORD.equals(fieldName)) {
+            tokenizer = new NullTokenizer();
         } else {
-            tokenizer = new LetterOrDigitTokenizer( reader );
+            tokenizer = new LetterOrDigitTokenizer();
         }
-        return new LowerCaseFilter( tokenizer );
+
+        return new TokenStreamComponents(tokenizer, new LowerCaseFilter(tokenizer));
     }
 
     private static class NullTokenizer extends CharTokenizer {
 
-        private NullTokenizer( Reader reader ) {
-            super( reader );
-        }
-
-        protected boolean isTokenChar( char c ) {
+        protected boolean isTokenChar(int c) {
             return true;
         }
     }
 
     private static class LetterOrDigitTokenizer extends CharTokenizer {
 
-        private LetterOrDigitTokenizer( Reader reader ) {
-            super( reader );
+        protected boolean isTokenChar(int c) {
+            return Character.isLetterOrDigit(c) || '_' == c;
         }
 
-        protected boolean isTokenChar( char c ) {
-            return Character.isLetterOrDigit( c ) || '_' == c;
-        }
     }
 }
diff --git a/server/src/imcode/server/document/index/BackgroundIndexBuilder.java b/server/src/imcode/server/document/index/BackgroundIndexBuilder.java
index 519fcbe0b4..0181ee71ec 100644
--- a/server/src/imcode/server/document/index/BackgroundIndexBuilder.java
+++ b/server/src/imcode/server/document/index/BackgroundIndexBuilder.java
@@ -6,13 +6,14 @@
 import imcode.util.Utility;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.lang.ClassUtils;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 
 public class BackgroundIndexBuilder {
-    private final static Logger log = Logger.getLogger(BackgroundIndexBuilder.class);
+    private final static Logger log = LogManager.getLogger(BackgroundIndexBuilder.class);
 
     private final File indexParentDirectory;
     private final RebuildingDirectoryIndex rebuildingDirectoryIndex;
@@ -25,84 +26,83 @@ public BackgroundIndexBuilder(File indexParentDirectory, RebuildingDirectoryInde
                                   IndexDocumentFactory indexDocumentFactory) {
         this.indexParentDirectory = indexParentDirectory;
         this.rebuildingDirectoryIndex = rebuildingDirectoryIndex;
-        indexParentDirectory.setLastModified(System.currentTimeMillis()) ;
-        previousIndexParentDirectoryLastModified = indexParentDirectory.lastModified() ;
+        indexParentDirectory.setLastModified(System.currentTimeMillis());
+        previousIndexParentDirectoryLastModified = indexParentDirectory.lastModified();
         this.indexDocumentFactory = indexDocumentFactory;
     }
 
+    private static File getNewIndexDirectory(File indexParentDirectory) {
+        return (File) Utility.findMatch(new CounterFileFactory(indexParentDirectory), new UniqueFilePredicate());
+    }
+
     public synchronized void start() {
-        try {
-            NDC.push(ClassUtils.getShortClassName(getClass())+"-"+Utility.numberToAlphaNumerics(System.identityHashCode(this)));
+	    try (CloseableThreadContext.Instance ignored =
+			         CloseableThreadContext.push(
+					         ClassUtils.getShortClassName(getClass()) + "-" + Utility.numberToAlphaNumerics(System.identityHashCode(this)));) {
 
             touchIndexParentDirectory();
 
-            if ( null != indexBuildingThread && indexBuildingThread.isAlive() ) {
-                log.debug("Ignoring request to build new index. Already in progress.");
+            if (null != indexBuildingThread && indexBuildingThread.isAlive()) {
+                log.info("Ignoring request to build new index. Already in progress.");
                 return;
             }
 
             File indexDirectory = getNewIndexDirectory(indexParentDirectory);
-            if ( !indexDirectory.mkdirs() ) {
+            if (!indexDirectory.mkdirs()) {
                 log.warn("Failed to create new index directory. Will try again next time.");
                 return;
             }
 
-            log.debug("Created directory "+indexDirectory);
-            
+            log.info("Created directory " + indexDirectory);
+
             rememberIndexParentDirectoryLastModified();
 
             try {
-                log.debug("Starting index rebuild thread.") ;
+                log.info("Starting index rebuild thread.");
                 indexBuildingThread = new IndexBuildingThread(this, indexDirectory, indexDocumentFactory);
                 indexBuildingThread.start();
-            } catch ( IllegalThreadStateException itse ) {
+            } catch (IllegalThreadStateException itse) {
                 throw new ShouldNotBeThrownException(itse);
             }
-        } finally {
-            NDC.pop();
         }
     }
 
     boolean otherProcessModifiedIndexDirectory() {
-        if (previousIndexParentDirectoryLastModified != 0 ) {
+        if (previousIndexParentDirectoryLastModified != 0) {
             long lastModified = indexParentDirectory.lastModified();
-            if (lastModified > previousIndexParentDirectoryLastModified ) {
-                log.trace("Expected last modified "+previousIndexParentDirectoryLastModified+" but got "+lastModified);
+            if (lastModified > previousIndexParentDirectoryLastModified) {
+                log.trace("Expected last modified " + previousIndexParentDirectoryLastModified + " but got " + lastModified);
                 rememberIndexParentDirectoryLastModified();
-                return true ;
+                return true;
             }
         }
-        return false ;
+        return false;
     }
 
     void touchIndexParentDirectory() {
-        indexParentDirectory.setLastModified(System.currentTimeMillis()) ;
+        indexParentDirectory.setLastModified(System.currentTimeMillis());
         rememberIndexParentDirectoryLastModified();
     }
 
-    public synchronized void addDocument(DocumentDomainObject document) {
-        if ( null != indexBuildingThread ) {
-            indexBuildingThread.addDocument(document);
-        }
+    public synchronized boolean addDocument(DocumentDomainObject document) {
+        return indexBuildingThread != null && indexBuildingThread.addDocument(document);
     }
 
-    public synchronized void removeDocument(DocumentDomainObject document) {
-        if ( null != indexBuildingThread ) {
-            indexBuildingThread.removeDocument(document);
-        }
-    }
-
-    private static File getNewIndexDirectory(File indexParentDirectory) {
-        return (File) Utility.findMatch(new CounterFileFactory(indexParentDirectory), new UniqueFilePredicate()) ;
+    public synchronized boolean removeDocument(DocumentDomainObject document) {
+        return indexBuildingThread != null && indexBuildingThread.removeDocument(document);
     }
 
     public synchronized void notifyRebuildComplete(DefaultDirectoryIndex newIndex) {
-        rebuildingDirectoryIndex.notifyRebuildComplete(newIndex) ;
+        rebuildingDirectoryIndex.notifyRebuildComplete(newIndex);
         rememberIndexParentDirectoryLastModified();
     }
 
+    public boolean isIndexBuildingThreadAlive(){
+        return null != indexBuildingThread && indexBuildingThread.isAlive();
+    }
+
     private void rememberIndexParentDirectoryLastModified() {
-        previousIndexParentDirectoryLastModified = indexParentDirectory.lastModified() ;
+        previousIndexParentDirectoryLastModified = indexParentDirectory.lastModified();
     }
 
     private static class CounterFileFactory extends CounterStringFactory {
@@ -110,7 +110,7 @@ private static class CounterFileFactory extends CounterStringFactory {
         private File parentDirectory;
 
         CounterFileFactory(File parentDirectory) {
-            super(1) ;
+            super(1);
             this.parentDirectory = parentDirectory;
         }
 
diff --git a/server/src/imcode/server/document/index/DefaultDirectoryIndex.java b/server/src/imcode/server/document/index/DefaultDirectoryIndex.java
index 5ecb0cf011..2614feb9b7 100644
--- a/server/src/imcode/server/document/index/DefaultDirectoryIndex.java
+++ b/server/src/imcode/server/document/index/DefaultDirectoryIndex.java
@@ -1,228 +1,296 @@
 package imcode.server.document.index;
 
-import com.imcode.imcms.mapping.DocumentMapper;
+import com.imcode.imcms.api.SearchResult;
 import com.imcode.imcms.mapping.DocumentGetter;
 import com.imcode.util.HumanReadable;
 import imcode.server.Imcms;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.IntervalSchedule;
+import lombok.Getter;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang.time.StopWatch;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Hits;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
+import org.apache.lucene.index.*;
+import org.apache.lucene.search.*;
+import org.apache.lucene.store.FSDirectory;
 
 import java.io.File;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.AbstractList;
+import java.util.*;
+import java.util.function.Predicate;
 
-class DefaultDirectoryIndex implements DirectoryIndex {
+public class DefaultDirectoryIndex implements DirectoryIndex {
 
-    private final static Logger log = Logger.getLogger( DefaultDirectoryIndex.class.getName() );
-    private final static int INDEXING_LOG_PERIOD__MILLISECONDS = DateUtils.MILLIS_IN_MINUTE ;
+    private static final Logger log = LogManager.getLogger(DefaultDirectoryIndex.class.getName());
+    private static final long INDEXING_LOG_PERIOD__MILLISECONDS = DateUtils.MILLIS_PER_MINUTE;
 
-    private final File directory;
-    private final IndexDocumentFactory indexDocumentFactory;
-
-    private boolean inconsistent;
+    private static final Map<String, DocumentRepository> nameToCustomDocRepository = new HashMap<>();
 
     static {
-        // FIXME: Set to something lower, like imcmsDocumentCount to prevent slow or memoryconsuming queries?
+        // FIXME: Set to something lower, like imcmsDocumentCount to prevent slow or memory consuming queries?
         BooleanQuery.setMaxClauseCount(Integer.MAX_VALUE);
     }
 
-    DefaultDirectoryIndex(File directory, IndexDocumentFactory indexDocumentFactory) {
+    private final File directory;
+    private final IndexDocumentFactory indexDocumentFactory;
+    private final IndexWriterCloseable indexWriter;
+    private boolean isIndexBuildingThreadAlive;
+
+    DefaultDirectoryIndex(File directory, IndexDocumentFactory indexDocumentFactory) throws IOException {
         this.directory = directory;
         this.indexDocumentFactory = indexDocumentFactory;
+        this.indexWriter = createIndexWriter(IndexWriterConfig.OpenMode.CREATE_OR_APPEND);
     }
 
-    public List search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
-        try {
-            IndexSearcher indexSearcher = new IndexSearcher( directory.toString() );
-            try {
-                StopWatch searchStopWatch = new StopWatch();
-                searchStopWatch.start();
-                Hits hits = indexSearcher.search( query.getQuery(), query.getSort() );
-                long searchTime = searchStopWatch.getTime();
-                List documentList = getDocumentListForHits( hits, searchingUser );
-                if (log.isDebugEnabled()) {
-                    log.debug( "Search for " + query.getQuery().toString() + ": " + searchTime + "ms. Total: "
-                           + searchStopWatch.getTime()
-                           + "ms." );
-                }
-                return documentList ;
-            } finally {
-                indexSearcher.close();
-            }
-        } catch ( IOException e ) {
-            throw new IndexException( e ) ;
+    public static void addCustomDocRepository(String name, DocumentRepository documentRepository) {
+        nameToCustomDocRepository.put(name, documentRepository);
+    }
+
+    @SuppressWarnings("unused")
+    public static void removeCustomDocRepository(String name, DocumentRepository documentRepository) {
+        nameToCustomDocRepository.remove(name);
+    }
+
+    public List<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
+        return search(query, searchingUser, 0, -1).getResult();
+    }
+
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser, int startPosition, int maxResults) throws IndexException {
+        return search(query, searchingUser, startPosition, maxResults, null);
+    }
+
+    @Override
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                                     UserDomainObject searchingUser,
+                                                     int startPosition,
+                                                     int maxResults,
+                                                     Predicate<DocumentDomainObject> filterPredicate)
+            throws IndexException {
+
+        try (IndexReaderCloseable indexReaderCloseable = new IndexReaderCloseable(directory)) {
+
+            final IndexReader indexReader = indexReaderCloseable.getReader();
+            final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+            final Sort sort = query.getSort();
+            final TopDocs topDocs = sort == null
+                    ? indexSearcher.search(query.getQuery(), indexReader.numDocs())
+                    : indexSearcher.search(query.getQuery(), indexReader.numDocs(), sort);
+            final ScoreDoc[] hits = topDocs.scoreDocs;
+
+            filterPredicate = Optional.ofNullable(filterPredicate)
+                    .map(predicate -> predicate.and(searchingUser::canSearchFor))
+                    .orElse(searchingUser::canSearchFor);
+
+            return getDocumentListForHits(hits, indexSearcher, filterPredicate, startPosition, maxResults);
+
+        } catch (Exception e) {
+            throw new IndexException(e);
         }
     }
 
     public void rebuild() {
         try {
-            indexAllDocuments();
-        } catch ( IOException e ) {
-            throw new IndexException( e );
+            indexDocuments();
+        } catch (IOException e) {
+            throw new IndexException(e);
         }
     }
 
-    private List getDocumentListForHits( final Hits hits, final UserDomainObject searchingUser ) {
-        DocumentGetter documentGetter = Imcms.getServices().getDocumentMapper().getDocumentGetter();
-        List documentIds = new DocumentIdHitsList(hits) ;
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start();
-        List documentList = documentGetter.getDocuments(documentIds) ;
-        stopWatch.stop();
-        if (log.isDebugEnabled()) {
-            log.debug("Got "+documentList.size()+" documents in "+stopWatch.getTime()+"ms.");
-        }
-        if (documentList.size() != hits.length()) {
-            inconsistent = true ;
-        }
-        CollectionUtils.filter(documentList, new Predicate() {
-            public boolean evaluate(Object object) {
-                DocumentDomainObject document = (DocumentDomainObject) object;
-                return searchingUser.canSearchFor(document) ;
-            }
-        });
-        return documentList ;
+    @Override
+    public boolean isIndexBuildingThreadAlive() {
+        return isIndexBuildingThreadAlive;
     }
 
-    public void indexDocument( DocumentDomainObject document ) throws IndexException {
+    public void indexDocument(DocumentDomainObject document) throws IndexException {
         try {
-            removeDocument( document );
-            addDocument( document );
-        } catch ( IOException e ) {
-            throw new IndexException( e );
+            indexWriter.updateDocument(new Term("meta_id", "" + document.getId()),
+                    indexDocumentFactory.createIndexDocument(document));
+            indexWriter.commit();
+        } catch (IOException e) {
+            throw new IndexException(e);
         }
     }
 
-    public void removeDocument( DocumentDomainObject document ) throws IndexException {
+    public void removeDocument(DocumentDomainObject document) throws IndexException {
         try {
-            IndexReader indexReader = IndexReader.open( directory );
-            try {
-                indexReader.delete( new Term( "meta_id", "" + document.getId() ) );
-            } finally {
-                indexReader.close();
+            indexWriter.deleteDocuments(new Term("meta_id", "" + document.getId()));
+            indexWriter.commit();
+        } catch (Exception e) {
+            throw new IndexException(e);
+        }
+    }
+
+    private SearchResult<DocumentDomainObject> getDocumentListForHits(ScoreDoc[] hits,
+                                                                      IndexSearcher searcher,
+                                                                      Predicate<DocumentDomainObject> searchingPredicate,
+                                                                      int startPosition,
+                                                                      int maxResults) {
+
+        int nextSkip = startPosition;
+        final DocumentGetter documentGetter = Imcms.getServices().getDocumentMapper().getDocumentGetter();
+        List<Integer> documentIds = new DocumentIdHitsList(hits, searcher);
+
+        final int totalCount = documentIds.size();
+
+        if (totalCount < startPosition) {
+            return new SearchResult<>(Collections.emptyList(), totalCount, nextSkip);
+        }
+
+        documentIds = documentIds.subList(startPosition, totalCount);
+        final List<DocumentDomainObject> documentList = new ArrayList<>();
+        final int cutResultSize = documentIds.size();
+
+        if ((maxResults <= 0) || (maxResults >= cutResultSize)) { // no limit
+            nextSkip = totalCount;
+
+            for (DocumentDomainObject documentDomainObject : documentGetter.getDocuments(documentIds)) {
+                if (searchingPredicate.test(documentDomainObject)) {
+                    documentList.add(documentDomainObject);
+                }
+            }
+        } else {
+            for (Integer documentId : documentIds) {
+
+                if (documentList.size() == maxResults) break;
+
+                nextSkip++;
+
+                final DocumentDomainObject document = documentGetter.getDocument(documentId);
+
+                if (searchingPredicate.test(document)) documentList.add(document);
             }
-        } catch ( IOException e ) {
-            throw new IndexException( e );
         }
+
+        return new SearchResult<>(documentList, totalCount, nextSkip);
     }
 
-    private void addDocument( DocumentDomainObject document ) throws IOException {
-        IndexWriter indexWriter = createIndexWriter( false );
+    private void addDocument(DocumentDomainObject document) {
         try {
-            addDocumentToIndex( document, indexWriter );
-        } finally {
-            indexWriter.close();
+            addDocumentToIndex(document, indexWriter);
+            indexWriter.commit();
+        }catch (Exception e){
+            throw new IndexException(e);
         }
     }
 
-    private IndexWriter createIndexWriter( boolean createIndex ) throws IOException {
-        return new IndexWriter( directory, new AnalyzerImpl(), createIndex );
+    private IndexWriterCloseable createIndexWriter(IndexWriterConfig.OpenMode openMode) throws IOException {
+        final IndexWriterConfig config = new IndexWriterConfig(new AnalyzerImpl());
+        config.setOpenMode(openMode);
+
+        return new IndexWriterCloseable(directory, config);
+    }
+
+    private void addDocumentToIndex(DocumentDomainObject document, IndexWriter indexWriter) throws IOException {
+        Document indexDocument = indexDocumentFactory.createIndexDocument(document);
+        indexWriter.addDocument(indexDocument);
     }
 
-    private void indexAllDocuments() throws IOException {
-        IndexWriter indexWriter = createIndexWriter( true );
+    private void indexDocuments() throws IOException {
         try {
-            indexAllDocumentsToIndexWriter( indexWriter );
-        } finally {
-            indexWriter.close();
+            isIndexBuildingThreadAlive = true;
+            for (Map.Entry<String, DocumentRepository> nameToRepositoryEntry : nameToCustomDocRepository.entrySet()) {
+                final String repositoryName = nameToRepositoryEntry.getKey();
+                log.info("Indexing docs from " + repositoryName + " document repository started.");
+
+                final Set<DocumentDomainObject> docForIndexing = nameToRepositoryEntry.getValue().getDocs();
+                indexDocuments(docForIndexing, indexWriter);
+
+                log.info("Indexing docs from " + repositoryName + " document repository finished.");
+            }
+        }finally {
+            indexWriter.commit();
+            isIndexBuildingThreadAlive = false;
         }
     }
 
-    private void addDocumentToIndex( DocumentDomainObject document, IndexWriter indexWriter ) throws IOException {
-        Document indexDocument = indexDocumentFactory.createIndexDocument( document );
-        indexWriter.addDocument( indexDocument );
-    }
+    private void indexDocuments(Set<DocumentDomainObject> docsForIndexing, IndexWriter indexWriter) {
+        final int docsSize = docsForIndexing.size();
+        final IntervalSchedule indexingLogSchedule = new IntervalSchedule(INDEXING_LOG_PERIOD__MILLISECONDS);
+        int i = 0;
+
+        logIndexingStarting(docsSize);
 
-    private void indexAllDocumentsToIndexWriter( IndexWriter indexWriter ) throws IOException {
-        DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
-        int[] documentIds = documentMapper.getAllDocumentIds();
+        for (DocumentDomainObject documentForIndex : docsForIndexing) {
+            i++;
 
-        logIndexingStarting( documentIds.length );
-        IntervalSchedule indexingLogSchedule = new IntervalSchedule( INDEXING_LOG_PERIOD__MILLISECONDS );
+            if (documentForIndex == null) {
+                continue;
+            }
 
-        for ( int i = 0; i < documentIds.length; i++ ) {
             try {
-                addDocumentToIndex( documentMapper.getDocument( documentIds[i] ), indexWriter );
-            } catch ( Exception ex ) {
-                log.error( "Could not index document with meta_id " + documentIds[i] + ", trying next document.", ex );
+                addDocumentToIndex(documentForIndex, indexWriter);
+
+            } catch (Exception ex) {
+                log.error("Could not index document with meta_id " + documentForIndex.getId() + ", trying next document.", ex);
             }
 
-            if ( indexingLogSchedule.isTime() ) {
-                logIndexingProgress( i, documentIds.length, indexingLogSchedule.getStopWatch().getTime());
+            if (indexingLogSchedule.isTime()) {
+                logIndexingProgress(i, docsSize, indexingLogSchedule.getStopWatch().getTime());
             }
-            Thread.yield(); // To make sure other threads with the same priority get a chance to run something once in a while.
         }
 
-        logIndexingCompleted( documentIds.length, indexingLogSchedule.getStopWatch() );
-        optimizeIndex( indexWriter );
+        logIndexingCompleted(docsSize, indexingLogSchedule.getStopWatch());
     }
 
-    private void logIndexingStarting( int documentCount ) {
-        log.debug( "Building index of all " + documentCount + " documents" );
+    private void logIndexingStarting(int documentCount) {
+        log.info("Building index of all " + documentCount + " documents");
     }
 
     private void logIndexingProgress(int documentsCompleted, int numberOfDocuments, long elapsedTime) {
-        int indexPercentageCompleted = (int)( documentsCompleted * ( 100F / numberOfDocuments ) );
-        long estimatedTime = numberOfDocuments * elapsedTime / documentsCompleted;
-        long estimatedTimeLeft = estimatedTime - elapsedTime ;
-        Date eta = new Date(System.currentTimeMillis() + estimatedTimeLeft) ;
-        DateFormat dateFormat = new SimpleDateFormat( "HH:mm:ss");
-        log.info( "Indexed " + documentsCompleted + " documents (" + indexPercentageCompleted + "%). ETA "+dateFormat.format( eta ) );
+        int indexPercentageCompleted = (int) (documentsCompleted * (100F / numberOfDocuments));
+        int documentsCompletedFixed = (documentsCompleted == 0) ? 1 : documentsCompleted;
+        long estimatedTime = numberOfDocuments * elapsedTime / documentsCompletedFixed;
+        long estimatedTimeLeft = estimatedTime - elapsedTime;
+        Date eta = new Date(System.currentTimeMillis() + estimatedTimeLeft);
+        DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+        log.info("Indexed " + documentsCompleted + " documents (" + indexPercentageCompleted + "%). ETA " + dateFormat.format(eta));
     }
 
-    private void logIndexingCompleted( int numberOfDocuments, StopWatch indexingStopWatch ) {
+    private void logIndexingCompleted(int numberOfDocuments, StopWatch indexingStopWatch) {
         long time = indexingStopWatch.getTime();
-        String humanReadableTime = HumanReadable.getHumanReadableTimeSpan( time ) ;
-        long timePerDocument = time/numberOfDocuments ;
-        log.debug( "Indexed " + numberOfDocuments + " documents in " + humanReadableTime+". "+timePerDocument+"ms per document." );
-    }
-
-    private void optimizeIndex( IndexWriter indexWriter ) throws IOException {
-        StopWatch optimizeStopWatch = new StopWatch();
-        optimizeStopWatch.start();
-        indexWriter.optimize();
-        optimizeStopWatch.stop();
-        log.debug( "Optimized index in " + optimizeStopWatch.getTime() + "ms" );
+        String humanReadableTime = HumanReadable.getHumanReadableTimeSpan(time);
+        long timePerDocument = time / (numberOfDocuments + 1); // to prevent division by zero
+        log.info("Indexed " + numberOfDocuments + " documents in " + humanReadableTime + ". " + timePerDocument + "ms per document.");
     }
 
     public boolean isInconsistent() {
-        return inconsistent;
+        return false; //inconsistent;
     }
 
     public void delete() {
         try {
-            log.debug("Deleting index directory "+directory) ;
-            FileUtils.forceDelete(directory);
-        } catch ( IOException e ) {
+            log.info("Deleting index directory " + directory);
+
+            close();
+            if (directory.exists()) {
+                FileUtils.forceDelete(directory);
+            }
+        } catch (IOException e) {
             throw new IndexException(e);
         }
     }
 
+    public void close() {
+        try {
+            if (indexWriter.isOpen()) {
+                indexWriter.close();
+            }
+        } catch (IOException e) {
+            log.error("Exception while closing directory index", e);
+        }
+    }
+
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
@@ -236,24 +304,66 @@ public int hashCode() {
         return directory.hashCode();
     }
 
-    private static class DocumentIdHitsList extends AbstractList {
-
-        private final Hits hits;
-
-        DocumentIdHitsList(Hits hits) {
+    /**
+     * Read only non-caching view of found meta ids.
+     * <p>
+     * Please note that {@link #get(int)} method call is expensive since it always perform additional computation.
+     * If you need a reusable sub-list of this view please consider copying its elements explicitly -
+     * for example {@code new java.util.ArrayList(DocumentIdHitsList.subList(n, k))}
+     */
+    // DON'T DO THIS!!
+    // This class implementation in almedalen_alpha23_r4 contains overridden {@link java.util.List#subList} method
+    // which violates behavioral contract by returning a copy of backing (this) list elements instead of a view.
+    private static class DocumentIdHitsList extends AbstractList<Integer> {
+
+        private final ScoreDoc[] hits;
+        private final IndexSearcher indexSearcher;
+
+        DocumentIdHitsList(ScoreDoc[] hits, IndexSearcher indexSearcher) {
             this.hits = hits;
+            this.indexSearcher = indexSearcher;
         }
 
-        public Object get(int index) {
+        @Override
+        public Integer get(int index) {
             try {
-                return new Integer(Integer.parseInt( hits.doc( index ).get( DocumentIndex.FIELD__META_ID ) )) ;
-            } catch ( IOException e ) {
+                return Integer.valueOf(indexSearcher.doc(hits[index].doc).get(DocumentIndex.FIELD__META_ID));
+            } catch (IOException e) {
                 throw new IndexException(e);
             }
         }
 
+        @Override
         public int size() {
-            return hits.length() ;
+            return hits.length;
+        }
+    }
+
+    /**
+     * Wrapper used just to make it automatically closeable
+     */
+    private static class IndexWriterCloseable extends IndexWriter implements AutoCloseable {
+        IndexWriterCloseable(File file, IndexWriterConfig config) throws IOException {
+            super(FSDirectory.open(file.toPath()), config);
+        }
+    }
+
+    /**
+     * Wrapper used just to make it automatically closeable
+     */
+    @Getter
+    private static class IndexReaderCloseable implements AutoCloseable {
+        IndexReader reader;
+
+        IndexReaderCloseable(File path) throws IOException {
+            this.reader = DirectoryReader.open(FSDirectory.open(path.toPath()));
+        }
+
+        @Override
+        public void close() throws Exception {
+            if (reader != null) {
+                reader.close();
+            }
         }
     }
 }
diff --git a/server/src/imcode/server/document/index/DefaultQueryParser.java b/server/src/imcode/server/document/index/DefaultQueryParser.java
index 5938e420d3..f0f5d54012 100644
--- a/server/src/imcode/server/document/index/DefaultQueryParser.java
+++ b/server/src/imcode/server/document/index/DefaultQueryParser.java
@@ -1,21 +1,28 @@
 package imcode.server.document.index;
 
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.MultiFieldQueryParser;
+
+import java.util.Arrays;
+
+import static org.apache.lucene.search.BooleanClause.Occur;
 
 public class DefaultQueryParser implements QueryParser {
 
-    public Query parse( String queryString ) throws ParseException {
-        return MultiFieldQueryParser.parse( queryString,
-                                            new String[]{
-                                                DocumentIndex.FIELD__META_ID,
-                                                DocumentIndex.FIELD__META_HEADLINE,
-                                                DocumentIndex.FIELD__META_TEXT,
-                                                DocumentIndex.FIELD__TEXT,
-                                                DocumentIndex.FIELD__KEYWORD,
-                                                DocumentIndex.FIELD__ALIAS
-                                            },
-                                            new AnalyzerImpl() );
+    public Query parse(String queryString) throws ParseException {
+        String[] fields = new String[]{
+                DocumentIndex.FIELD__META_ID,
+                DocumentIndex.FIELD__META_HEADLINE,
+                DocumentIndex.FIELD__META_TEXT,
+                DocumentIndex.FIELD__TEXT,
+                DocumentIndex.FIELD__KEYWORD,
+                DocumentIndex.FIELD__ALIAS
+        };
+
+        final Occur[] flags = new Occur[fields.length];
+        Arrays.fill(flags, Occur.SHOULD);
+
+        return MultiFieldQueryParser.parse(queryString, fields, flags, new AnalyzerImpl());
     }
 }
diff --git a/server/src/imcode/server/document/index/DefaultReindexingDocumentRepository.java b/server/src/imcode/server/document/index/DefaultReindexingDocumentRepository.java
new file mode 100644
index 0000000000..da50250e3c
--- /dev/null
+++ b/server/src/imcode/server/document/index/DefaultReindexingDocumentRepository.java
@@ -0,0 +1,30 @@
+package imcode.server.document.index;
+
+import com.imcode.imcms.mapping.DocumentMapper;
+import imcode.server.document.DocumentDomainObject;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Default implementation to receive docs for reindexing.
+ * <p>
+ * Created by Serhii Maksymchuk from Ubrainians for imCode
+ * 10.03.17.
+ */
+public class DefaultReindexingDocumentRepository implements DocumentRepository {
+
+    private final DocumentMapper documentMapper;
+
+    public DefaultReindexingDocumentRepository(DocumentMapper documentMapper) {
+        this.documentMapper = documentMapper;
+    }
+
+    @Override
+    public Set<DocumentDomainObject> getDocs() {
+        return documentMapper.getDocumentIdsForIndexing()
+                .stream()
+                .map(docId -> documentMapper.getDocument(docId, true))
+                .collect(Collectors.toSet());
+    }
+}
diff --git a/server/src/imcode/server/document/index/DirectoryIndex.java b/server/src/imcode/server/document/index/DirectoryIndex.java
index 5e66a42601..b91b796264 100644
--- a/server/src/imcode/server/document/index/DirectoryIndex.java
+++ b/server/src/imcode/server/document/index/DirectoryIndex.java
@@ -1,8 +1,12 @@
 package imcode.server.document.index;
 
-public interface DirectoryIndex extends DocumentIndex {
+import java.io.Closeable;
+
+public interface DirectoryIndex extends DocumentIndex, Closeable {
 
     boolean isInconsistent();
 
     void delete();
-}
\ No newline at end of file
+
+    void close();
+}
diff --git a/server/src/imcode/server/document/index/DocumentIndex.java b/server/src/imcode/server/document/index/DocumentIndex.java
index 4cb8774957..dfadb88ab3 100644
--- a/server/src/imcode/server/document/index/DocumentIndex.java
+++ b/server/src/imcode/server/document/index/DocumentIndex.java
@@ -1,11 +1,11 @@
 package imcode.server.document.index;
 
+import com.imcode.imcms.api.SearchResult;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
 
 import java.util.List;
+import java.util.function.Predicate;
 
 public interface DocumentIndex {
 
@@ -33,7 +33,7 @@ public interface DocumentIndex {
     String FIELD__PUBLICATION_END_DATETIME = "publication_end_datetime";
     String FIELD__PUBLICATION_START_DATETIME = "publication_start_datetime";
     String FIELD__STATUS = "status";
-    String FIELD__PHASE = "phase" ;
+    String FIELD__PHASE = "phase";
     String FIELD__MIME_TYPE = "mime_type";
     String FIELD__CREATOR_ID = "creator_id";
     String FIELD__PUBLISHER_ID = "publisher_id";
@@ -41,12 +41,27 @@ public interface DocumentIndex {
     String FIELD__ALIAS = "alias";
     String FIELD__TEMPLATE = "template";
     String FIELD__CHILD_ID = "child_id";
-    
-    void indexDocument( DocumentDomainObject document ) throws IndexException ;
 
-    void removeDocument( DocumentDomainObject document ) throws IndexException;
+    void indexDocument(DocumentDomainObject document) throws IndexException;
 
-    List search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException;
+    void removeDocument(DocumentDomainObject document) throws IndexException;
+
+    List<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException;
+
+    SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                              UserDomainObject searchingUser,
+                                              int startPosition,
+                                              int maxResults)
+            throws IndexException;
+
+    SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                              UserDomainObject searchingUser,
+                                              int startPosition,
+                                              int maxResults,
+                                              Predicate<DocumentDomainObject> filterPredicate)
+            throws IndexException;
 
     void rebuild() throws IndexException;
-}
\ No newline at end of file
+
+    boolean isIndexBuildingThreadAlive();
+}
diff --git a/server/src/imcode/server/document/index/DocumentIndexWrapper.java b/server/src/imcode/server/document/index/DocumentIndexWrapper.java
index eb4fb44ab7..6258fb99c7 100644
--- a/server/src/imcode/server/document/index/DocumentIndexWrapper.java
+++ b/server/src/imcode/server/document/index/DocumentIndexWrapper.java
@@ -1,16 +1,18 @@
 package imcode.server.document.index;
 
+import com.imcode.imcms.api.SearchResult;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 
 import java.util.List;
+import java.util.function.Predicate;
 
 public class DocumentIndexWrapper implements DocumentIndex {
 
     private final DocumentIndex index;
 
     public DocumentIndexWrapper(DocumentIndex index) {
-        this.index = index ;
+        this.index = index;
     }
 
     public void indexDocument(DocumentDomainObject document) throws IndexException {
@@ -21,11 +23,34 @@ public void rebuild() throws IndexException {
         index.rebuild();
     }
 
+    @Override
+    public boolean isIndexBuildingThreadAlive() {
+        return index.isIndexBuildingThreadAlive();
+    }
+
     public void removeDocument(DocumentDomainObject document) throws IndexException {
         index.removeDocument(document);
     }
 
-    public List search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
-        return index.search(query, searchingUser) ;
+    public List<DocumentDomainObject> search(DocumentQuery query,
+                                             UserDomainObject searchingUser) throws IndexException {
+        return index.search(query, searchingUser);
+    }
+
+    @Override
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                                     UserDomainObject searchingUser,
+                                                     int startPosition,
+                                                     int maxResults) throws IndexException {
+        return index.search(query, searchingUser, startPosition, maxResults);
+    }
+
+    @Override
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                                     UserDomainObject searchingUser,
+                                                     int startPosition,
+                                                     int maxResults,
+                                                     Predicate<DocumentDomainObject> filterPredicate) throws IndexException {
+        return index.search(query, searchingUser, startPosition, maxResults, filterPredicate);
     }
 }
diff --git a/server/src/imcode/server/document/index/DocumentQuery.java b/server/src/imcode/server/document/index/DocumentQuery.java
index 2e6b15f007..76bad3c036 100644
--- a/server/src/imcode/server/document/index/DocumentQuery.java
+++ b/server/src/imcode/server/document/index/DocumentQuery.java
@@ -6,7 +6,9 @@
 public interface DocumentQuery {
 
     Query getQuery();
+
     Sort getSort();
+
     boolean isLogged();
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/document/index/DocumentRepository.java b/server/src/imcode/server/document/index/DocumentRepository.java
new file mode 100644
index 0000000000..642aebb39f
--- /dev/null
+++ b/server/src/imcode/server/document/index/DocumentRepository.java
@@ -0,0 +1,11 @@
+package imcode.server.document.index;
+
+import imcode.server.document.DocumentDomainObject;
+
+import java.util.Set;
+
+public interface DocumentRepository {
+
+    Set<DocumentDomainObject> getDocs();
+
+}
diff --git a/server/src/imcode/server/document/index/IndexBuildingThread.java b/server/src/imcode/server/document/index/IndexBuildingThread.java
index 2cbf9b5933..c8a71effaa 100644
--- a/server/src/imcode/server/document/index/IndexBuildingThread.java
+++ b/server/src/imcode/server/document/index/IndexBuildingThread.java
@@ -2,83 +2,87 @@
 
 import imcode.server.document.DocumentDomainObject;
 import org.apache.commons.lang.ClassUtils;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 class IndexBuildingThread extends Thread {
 
-    private final Set documentsToAddToNewIndex = Collections.synchronizedSet(new LinkedHashSet());
-    private final Set documentsToRemoveFromNewIndex = Collections.synchronizedSet(new LinkedHashSet());
-    private final static Logger log = Logger.getLogger(IndexBuildingThread.class.getName());
+    private final static Logger log = LogManager.getLogger(IndexBuildingThread.class.getName());
+    private final Map<Integer, DocumentDomainObject> idToDocumentsToAddToNewIndex = Collections.synchronizedMap(new LinkedHashMap<>());
+    private final Map<Integer, DocumentDomainObject> idToDocumentsToRemoveFromNewIndex = Collections.synchronizedMap(new LinkedHashMap<>());
     private final BackgroundIndexBuilder backgroundIndexBuilder;
     private final File indexDirectory;
 
-    private boolean indexing;
+    private final AtomicBoolean acceptUpdatesRef = new AtomicBoolean();
     private IndexDocumentFactory indexDocumentFactory;
 
     IndexBuildingThread(BackgroundIndexBuilder backgroundIndexBuilder, File indexDirectory,
                         IndexDocumentFactory indexDocumentFactory) {
         this.indexDirectory = indexDirectory;
         this.backgroundIndexBuilder = backgroundIndexBuilder;
-        setName(ClassUtils.getShortClassName(getClass())+"-"+getName());
-        setPriority(Thread.MIN_PRIORITY);
+        setName(ClassUtils.getShortClassName(getClass()) + "-" + getName());
         setDaemon(true);
         this.indexDocumentFactory = indexDocumentFactory;
     }
 
     public void run() {
-        NDC.push(Thread.currentThread().getName());
-        DefaultDirectoryIndex newIndex = new DefaultDirectoryIndex(indexDirectory, indexDocumentFactory) ;
-        try {
-            synchronized ( this ) {
-                indexing = true ;
-            }
+        DefaultDirectoryIndex newIndex = null;
+        try(CloseableThreadContext.Instance ignored=CloseableThreadContext.push(Thread.currentThread().getName());) {
+            newIndex = new DefaultDirectoryIndex(indexDirectory, indexDocumentFactory);
+            acceptUpdatesRef.set(true);
             newIndex.rebuild();
-            synchronized ( this ) {
-                indexing = false ;
-                considerDocumentsAddedOrRemovedDuringIndexing(newIndex);
-            }
+            considerDocumentsAddedOrRemovedDuringIndexing(newIndex);
             log.info("Index rebuild completed.");
-        } catch ( Throwable e ) {
+        } catch (Throwable e) {
             log.fatal("Failed to index all documents.", e);
         } finally {
-            synchronized ( this ) {
-                indexing = false ;
+            acceptUpdatesRef.set(false);
+            if(newIndex != null){
+                backgroundIndexBuilder.notifyRebuildComplete(newIndex);
             }
-            backgroundIndexBuilder.notifyRebuildComplete(newIndex);
-            NDC.pop() ;
         }
     }
 
-    private synchronized void considerDocumentsAddedOrRemovedDuringIndexing(DirectoryIndex index) throws IndexException {
-        log.debug( "Considering documents added and removed during index rebuild.");
-        for (Iterator iterator = documentsToAddToNewIndex.iterator(); iterator.hasNext(); ) {
-            DocumentDomainObject document = (DocumentDomainObject)iterator.next();
+    private void considerDocumentsAddedOrRemovedDuringIndexing(DirectoryIndex index) throws IndexException {
+        log.debug("Considering documents added and removed during index rebuild.");
+
+        synchronized (acceptUpdatesRef) {
+            acceptUpdatesRef.set(false);
+        }
+
+        for (DocumentDomainObject document : idToDocumentsToAddToNewIndex.values()) {
             index.indexDocument(document);
-            iterator.remove();
         }
-        for (Iterator iterator = documentsToRemoveFromNewIndex.iterator(); iterator.hasNext(); ) {
-            DocumentDomainObject document = (DocumentDomainObject)iterator.next();
+
+        for (DocumentDomainObject document : idToDocumentsToRemoveFromNewIndex.values()) {
             index.removeDocument(document);
-            iterator.remove();
         }
     }
 
-    public synchronized void addDocument(DocumentDomainObject document) {
-        if (indexing) {
-            documentsToAddToNewIndex.add(document) ;
-        }
+    public boolean addDocument(DocumentDomainObject document) {
+        return insertDocToProcessByNewIndex(document, idToDocumentsToAddToNewIndex);
+    }
+
+    public boolean removeDocument(DocumentDomainObject document) {
+        return insertDocToProcessByNewIndex(document, idToDocumentsToRemoveFromNewIndex);
     }
 
-    public synchronized void removeDocument(DocumentDomainObject document) {
-        if (indexing) {
-            documentsToRemoveFromNewIndex.add(document) ;
+    private boolean insertDocToProcessByNewIndex(DocumentDomainObject document, Map<Integer, DocumentDomainObject> mapToAdd) {
+        synchronized (acceptUpdatesRef) {
+            boolean acceptUpdates = acceptUpdatesRef.get();
+
+            if (acceptUpdates) {
+                mapToAdd.put(document.getId(), document);
+            }
+
+            return acceptUpdates;
         }
     }
 }
diff --git a/server/src/imcode/server/document/index/IndexDocumentAdaptingVisitor.java b/server/src/imcode/server/document/index/IndexDocumentAdaptingVisitor.java
index 445490829b..be11ffabb8 100644
--- a/server/src/imcode/server/document/index/IndexDocumentAdaptingVisitor.java
+++ b/server/src/imcode/server/document/index/IndexDocumentAdaptingVisitor.java
@@ -1,98 +1,161 @@
 package imcode.server.document.index;
 
+import imcode.server.Config;
+import imcode.server.Imcms;
 import imcode.server.document.DocumentVisitor;
 import imcode.server.document.FileDocumentDomainObject;
-import imcode.server.document.textdocument.ImageDomainObject;
-import imcode.server.document.textdocument.TextDocumentDomainObject;
-import imcode.server.document.textdocument.TextDomainObject;
-import imcode.server.document.textdocument.MenuDomainObject;
-import imcode.server.document.textdocument.MenuItemDomainObject;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-
-import java.io.IOException;
-import java.util.HashMap;
+import imcode.server.document.textdocument.*;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.document.*;
+import org.apache.lucene.util.BytesRef;
+import org.apache.tika.Tika;
+import org.apache.tika.metadata.Metadata;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 class IndexDocumentAdaptingVisitor extends DocumentVisitor {
 
-    private static final String MIME_TYPE__WORD = "application/msword";
-    private static final String MIME_TYPE__EXCEL = "application/vnd.ms-excel";
-    private static final String MIME_TYPE__POWERPOINT = "application/vnd.ms-powerpoint";
-    private static final String MIME_TYPE__PDF = "application/pdf";
+//    private static final String MIME_TYPE__WORD = "application/msword";
+//    private static final String MIME_TYPE__EXCEL = "application/vnd.ms-excel";
+//    private static final String MIME_TYPE__POWERPOINT = "application/vnd.ms-powerpoint";
+//    private static final String MIME_TYPE__PDF = "application/pdf";
 
+    private final static Logger log = LogManager.getLogger(IndexDocumentFactory.class.getName());
     Document indexDocument;
+	Tika tikaAutodetect;
+	Tika tikaHtml;
 
-    IndexDocumentAdaptingVisitor(Document indexDocument) {
+	IndexDocumentAdaptingVisitor(Document indexDocument, Tika tikaAutodetect, Tika tikaHtml) {
         this.indexDocument = indexDocument;
+        this.tikaAutodetect = tikaAutodetect;
+        this.tikaHtml = tikaHtml;
     }
 
     public void visitTextDocument(TextDocumentDomainObject textDocument) {
         indexDocument.add(IndexDocumentFactory.unStoredKeyword(DocumentIndex.FIELD__TEMPLATE, textDocument.getTemplateName()));
 
-        for ( Map.Entry<Integer,TextDomainObject> textEntry : textDocument.getTexts().entrySet() ) {
+        for (Map.Entry<Integer, TextDomainObject> textEntry : textDocument.getTexts().entrySet()) {
             Integer textIndex = textEntry.getKey();
             TextDomainObject text = textEntry.getValue();
-            indexDocument.add(Field.UnStored(DocumentIndex.FIELD__NONSTRIPPED_TEXT, text.getText()));
-            String htmlStrippedText = stripHtml(text);
-            indexDocument.add(Field.UnStored(DocumentIndex.FIELD__TEXT, htmlStrippedText));
-            indexDocument.add(Field.UnStored(DocumentIndex.FIELD__TEXT + textIndex, htmlStrippedText));
+            indexDocument.add(new TextField(DocumentIndex.FIELD__NONSTRIPPED_TEXT, text.getText(), Field.Store.NO));
+            String htmlStrippedText = stripHtml(textDocument, text);
+            indexDocument.add(new TextField(DocumentIndex.FIELD__TEXT, htmlStrippedText, Field.Store.NO));
+            indexDocument.add(new TextField(DocumentIndex.FIELD__TEXT + textIndex, htmlStrippedText, Field.Store.NO));
+
+	        //to use SortedDocValuesField length of text have to be <= 32766
+	        if (htmlStrippedText.length() > SORTED_DOC_VALUES_FIELD_MAX_SIZE) {
+		        String limitedText = new String(htmlStrippedText.getBytes(), 0, SORTED_DOC_VALUES_FIELD_MAX_SIZE);
+		        indexDocument.add(new SortedDocValuesField(DocumentIndex.FIELD__TEXT + textIndex, new BytesRef(limitedText)));
+			} else
+		        indexDocument.add(new SortedDocValuesField(DocumentIndex.FIELD__TEXT + textIndex, new BytesRef(htmlStrippedText)));
         }
 
-        for ( MenuDomainObject menu : textDocument.getMenus().values() ) {
-            for ( MenuItemDomainObject menuItem : menu.getMenuItems() ) {
-                indexDocument.add(Field.Keyword(DocumentIndex.FIELD__CHILD_ID, ""+menuItem.getDocumentId()));
+        for (MenuDomainObject menu : textDocument.getMenus().values()) {
+            for (MenuItemDomainObject menuItem : menu.getMenuItems()) {
+                indexDocument.add(new StringField(DocumentIndex.FIELD__CHILD_ID, "" + menuItem.getDocumentId(), Field.Store.YES));
             }
         }
 
-        for ( ImageDomainObject image : textDocument.getImages().values() ) {
+        for (ImageDomainObject image : textDocument.getImages().values()) {
             String imageLinkUrl = image.getLinkUrl();
-            if ( null != imageLinkUrl && imageLinkUrl.length() > 0 ) {
+            if (null != imageLinkUrl && imageLinkUrl.length() > 0) {
                 indexDocument.add(IndexDocumentFactory.unStoredKeyword(DocumentIndex.FIELD__IMAGE_LINK_URL, imageLinkUrl));
             }
         }
     }
 
-    private String stripHtml(TextDomainObject text) {
+//    private String stripHtml(TextDomainObject text) {
+//        String string = text.getText();
+//        if ( TextDomainObject.TEXT_TYPE_HTML == text.getType() ) {
+//            string = string.replaceAll("<[^>]+?>", "");
+//        }
+//        return string;
+//    }
+
+    private String stripHtml(TextDocumentDomainObject textDocument, TextDomainObject text) {
         String string = text.getText();
-        if ( TextDomainObject.TEXT_TYPE_HTML == text.getType() ) {
-            string = string.replaceAll("<[^>]+?>", "");
+
+        if (text.getType() != TextDomainObject.TEXT_TYPE_HTML) {
+	        try (InputStream in = IOUtils.toInputStream(string, StandardCharsets.UTF_8);) {
+		        String stripped = tikaHtml.parseToString(in);
+		        log.trace(String.format("Text doc id: %d. Stripped html to plain text: '%s' -> '%s'", textDocument.getId(), string, stripped));
+		        string = stripped;
+	        } catch (Exception e) {
+		        log.error(String.format("Text doc id: %d. Unable to strip html '%s'", textDocument.getId(), string), e);
+	        }
         }
+
         return string;
     }
 
     public void visitFileDocument(FileDocumentDomainObject fileDocument) {
         FileDocumentDomainObject.FileDocumentFile file = fileDocument.getDefaultFile();
-        if ( null == file ) {
+        if (null == file) {
             return;
         }
-        indexDocument.add(IndexDocumentFactory.unStoredKeyword(DocumentIndex.FIELD__MIME_TYPE, file.getMimeType()));
-        indexFileContents(file);
-    }
 
-    private final static Map EXTRACTORS = new HashMap(ArrayUtils.toMap(new Object[][] {
-            { MIME_TYPE__WORD, new MicrosoftWordTextExtractor() },
-            { MIME_TYPE__EXCEL, new MicrosoftExcelTextExtractor() },
-            { MIME_TYPE__POWERPOINT, new MicrosoftPowerPointTextExtractor() },
-            { MIME_TYPE__PDF, new PdfTextExtractor() },
-    }));
-
-    private void indexFileContents(FileDocumentDomainObject.FileDocumentFile file) {
-        String mimeType = file.getMimeType();
-        StreamTextsExtractor extractor = (StreamTextsExtractor) EXTRACTORS.get(mimeType);
-        if ( null == extractor ) {
-            return;
-        }
-        String[] texts;
-        try {
-            texts = extractor.extractTexts(file.getInputStreamSource().getInputStream());
-        } catch ( IOException ioe ) {
-            throw new RuntimeException(ioe);
-        }
-        for ( String text : texts ) {
-            indexDocument.add(Field.UnStored(DocumentIndex.FIELD__TEXT, text));
+        String ext = StringUtils.trimToEmpty(FilenameUtils.getExtension(file.getFilename())).toLowerCase();
+        String mime = StringUtils.trimToEmpty(file.getMimeType()).toLowerCase();
+        Config config = Imcms.getServices().getConfig();
+
+        if (config.getIndexDisabledFileExtensionsAsSet().contains(ext)
+                || config.getIndexDisabledFileMimesAsSet().contains(mime))
+        {
+            log.info(String.format("File [%s] will not be indexed. Index is disabled for filename extension [%s] or MIME [%s].", file.getFilename(), ext, mime));
+        } else {
+            indexDocument.add(IndexDocumentFactory.unStoredKeyword(DocumentIndex.FIELD__MIME_TYPE, mime));
+            indexFileContents(fileDocument, file);
         }
     }
 
+//    private final static Map EXTRACTORS = new HashMap(ArrayUtils.toMap(new Object[][] {
+//            { MIME_TYPE__WORD, new MicrosoftWordTextExtractor() },
+//            { MIME_TYPE__EXCEL, new MicrosoftExcelTextExtractor() },
+//            { MIME_TYPE__POWERPOINT, new MicrosoftPowerPointTextExtractor() },
+//            { MIME_TYPE__PDF, new PdfTextExtractor() },
+//    }));
+
+//    private void indexFileContents(FileDocumentDomainObject.FileDocumentFile file) {
+//        String mimeType = file.getMimeType();
+//        StreamTextsExtractor extractor = (StreamTextsExtractor) EXTRACTORS.get(mimeType);
+//        if ( null == extractor ) {
+//            return;
+//        }
+//        String[] texts;
+//        InputStream in = null;
+//        try {
+//            in = file.getInputStreamSource().getInputStream();
+//
+//            texts = extractor.extractTexts(in);
+//        } catch ( IOException ioe ) {
+//            throw new RuntimeException(ioe);
+//        } finally {
+//            IOUtils.closeQuietly(in);
+//        }
+//
+//        for ( String text : texts ) {
+//            indexDocument.add(Field.UnStored(DocumentIndex.FIELD__TEXT, text));
+//        }
+//    }
+
+    private void indexFileContents(FileDocumentDomainObject fileDocument, FileDocumentDomainObject.FileDocumentFile file) {
+	    final Metadata metadata = new Metadata();
+        metadata.set(Metadata.CONTENT_DISPOSITION, file.getFilename());
+        metadata.set(Metadata.CONTENT_TYPE, file.getMimeType());
+
+	    try (InputStream in = file.getInputStreamSource().getInputStream()) {
+		    final Reader reader = tikaAutodetect.parse(in, metadata);
+
+		    indexDocument.add(new TextField(DocumentIndex.FIELD__TEXT, reader));
+	    } catch (Exception e) {
+		    log.error(String.format("File doc id: %d. Unable to index content of file-doc-file '%s'", fileDocument.getId(), file), e);
+	    }
+    }
 }
diff --git a/server/src/imcode/server/document/index/IndexDocumentFactory.java b/server/src/imcode/server/document/index/IndexDocumentFactory.java
index a6fef0e0e4..2e7275ab08 100644
--- a/server/src/imcode/server/document/index/IndexDocumentFactory.java
+++ b/server/src/imcode/server/document/index/IndexDocumentFactory.java
@@ -9,130 +9,150 @@
 import imcode.server.document.SectionDomainObject;
 import imcode.util.DateConstants;
 import imcode.util.Utility;
-import org.apache.log4j.Logger;
-import org.apache.lucene.document.DateField;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.document.*;
+import org.apache.tika.Tika;
+import org.apache.tika.detect.Detector;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.html.HtmlParser;
+
+import java.io.InputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 
 public class IndexDocumentFactory {
 
-    private CategoryMapper categoryMapper ;
-
-    private final static Logger log = Logger.getLogger( IndexDocumentFactory.class.getName() );
+    private final static Logger log = LogManager.getLogger(IndexDocumentFactory.class.getName());
+    private CategoryMapper categoryMapper;
+    private Tika tikaAutodetect;
+    private Tika tikaHtml;
 
     public IndexDocumentFactory(CategoryMapper categoryMapper) {
         this.categoryMapper = categoryMapper;
+	    this.tikaAutodetect = new Tika();
+	    this.tikaAutodetect.setMaxStringLength(-1);
+
+        HtmlParser parser = new HtmlParser();
+        Detector detector = new Detector() {
+            MediaType mediaType = MediaType.parse("text/html");
+
+            public MediaType detect(InputStream input, Metadata metadata) {
+                return mediaType;
+            }
+        };
+	    this.tikaHtml = new Tika(detector, parser);
+		this.tikaHtml.setMaxStringLength(-1);
     }
 
-    public Document createIndexDocument( DocumentDomainObject document ) {
-        log.trace("Indexing document "+document.getId());
+    static Field unStoredKeyword(String fieldName, String fieldValue) {
+        return new StringField(fieldName, fieldValue.toLowerCase(), Field.Store.NO);
+    }
+
+    private static Field unStoredKeyword(String fieldName, Date fieldValue) {
+        Date truncatedDate = Utility.truncateDateToMinutePrecision(fieldValue);
+        return new StringField(fieldName, DateTools.dateToString(truncatedDate, DateTools.Resolution.MINUTE),  Field.Store.NO);
+    }
+
+    public Document createIndexDocument(DocumentDomainObject document) {
+        log.trace("Indexing document " + document.getId());
         Document indexDocument = new Document();
 
         int documentId = document.getId();
-        indexDocument.add( Field.Keyword( DocumentIndex.FIELD__META_ID, "" + documentId ) );
-        indexDocument.add( Field.UnStored( DocumentIndex.FIELD__META_HEADLINE, document.getHeadline() ) );
-        indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__META_HEADLINE_KEYWORD, document.getHeadline() ) );
-        indexDocument.add( Field.UnStored( DocumentIndex.FIELD__META_TEXT, document.getMenuText() ) );
-        indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__DOC_TYPE_ID, "" + document.getDocumentTypeId() ) );
-        indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__CREATOR_ID, "" + document.getCreatorId()) );
-        if ( null != document.getPublisherId() ){
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__PUBLISHER_ID, "" + document.getPublisherId()) );
+        indexDocument.add(new StringField(DocumentIndex.FIELD__META_ID, "" + documentId, Field.Store.YES));
+        indexDocument.add(new TextField(DocumentIndex.FIELD__META_HEADLINE, document.getHeadline(), Field.Store.NO));
+        indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__META_HEADLINE_KEYWORD, document.getHeadline()));
+        indexDocument.add(new TextField(DocumentIndex.FIELD__META_TEXT, document.getMenuText(), Field.Store.NO));
+        indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__DOC_TYPE_ID, "" + document.getDocumentTypeId()));
+        indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__CREATOR_ID, "" + document.getCreatorId()));
+        if (null != document.getPublisherId()) {
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__PUBLISHER_ID, "" + document.getPublisherId()));
         }
         Set sectionIds = document.getSectionIds();
-        for ( Iterator iterator = sectionIds.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = sectionIds.iterator(); iterator.hasNext(); ) {
             Integer sectionId = (Integer) iterator.next();
-            SectionDomainObject section = Imcms.getServices().getDocumentMapper().getSectionById(sectionId.intValue());
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__SECTION, section.getName() ) );
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__SECTION_ID, sectionId.toString())) ;
+            SectionDomainObject section = Imcms.getServices().getDocumentMapper().getSectionById(sectionId);
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__SECTION, section.getName()));
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__SECTION_ID, sectionId.toString()));
         }
 
-        addDateFieldToIndexDocument( documentId, indexDocument, DocumentIndex.FIELD__CREATED_DATETIME, document.getCreatedDatetime() );
-        addDateFieldToIndexDocument( documentId, indexDocument, DocumentIndex.FIELD__MODIFIED_DATETIME, document.getModifiedDatetime() );
-        addDateFieldToIndexDocument( documentId, indexDocument, DocumentIndex.FIELD__ACTIVATED_DATETIME, document.getPublicationStartDatetime() );
-        addDateFieldToIndexDocument( documentId, indexDocument, DocumentIndex.FIELD__PUBLICATION_START_DATETIME, document.getPublicationStartDatetime() );
-        addDateFieldToIndexDocument( documentId, indexDocument, DocumentIndex.FIELD__PUBLICATION_END_DATETIME, document.getPublicationEndDatetime() );
-        addDateFieldToIndexDocument( documentId, indexDocument, DocumentIndex.FIELD__ARCHIVED_DATETIME, document.getArchivedDatetime() );
+        addDateFieldToIndexDocument(documentId, indexDocument, DocumentIndex.FIELD__CREATED_DATETIME, document.getCreatedDatetime());
+        addDateFieldToIndexDocument(documentId, indexDocument, DocumentIndex.FIELD__MODIFIED_DATETIME, document.getModifiedDatetime());
+        addDateFieldToIndexDocument(documentId, indexDocument, DocumentIndex.FIELD__ACTIVATED_DATETIME, document.getPublicationStartDatetime());
+        addDateFieldToIndexDocument(documentId, indexDocument, DocumentIndex.FIELD__PUBLICATION_START_DATETIME, document.getPublicationStartDatetime());
+        addDateFieldToIndexDocument(documentId, indexDocument, DocumentIndex.FIELD__PUBLICATION_END_DATETIME, document.getPublicationEndDatetime());
+        addDateFieldToIndexDocument(documentId, indexDocument, DocumentIndex.FIELD__ARCHIVED_DATETIME, document.getArchivedDatetime());
 
-        indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__STATUS, "" + document.getPublicationStatus() ) );
+        indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__STATUS, "" + document.getPublicationStatus()));
 
-        for ( Map.Entry<String, String> entry : document.getProperties().entrySet() ) {
+        for (Map.Entry<String, String> entry : document.getProperties().entrySet()) {
             indexDocument.add(unStoredKeyword(entry.getKey(), entry.getValue()));
         }
 
         DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
 
         try {
-            document.accept( new IndexDocumentAdaptingVisitor( indexDocument ) );
+            document.accept(new IndexDocumentAdaptingVisitor(indexDocument, tikaAutodetect, tikaHtml));
         } catch (RuntimeException re) {
-            log.error( "Error indexing document-type-specific data of document "+document.getId(), re) ;
+            log.error("Error indexing document-type-specific data of document " + document.getId(), re);
         }
 
         Set categories = categoryMapper.getCategories(document.getCategoryIds());
-        for ( Iterator iterator = categories.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = categories.iterator(); iterator.hasNext(); ) {
             CategoryDomainObject category = (CategoryDomainObject) iterator.next();
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__CATEGORY, category.getName() )) ;
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__CATEGORY_ID, "" + category.getId() ) );
-            CategoryTypeDomainObject categoryType = category.getType() ;
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__CATEGORY_TYPE, categoryType.getName() )) ;
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__CATEGORY_TYPE_ID, ""+categoryType.getId() )) ;
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__CATEGORY, category.getName()));
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__CATEGORY_ID, "" + category.getId()));
+            CategoryTypeDomainObject categoryType = category.getType();
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__CATEGORY_TYPE, categoryType.getName()));
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__CATEGORY_TYPE_ID, "" + categoryType.getId()));
         }
 
         Set documentKeywords = document.getKeywords();
-        for ( Iterator iterator = documentKeywords.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = documentKeywords.iterator(); iterator.hasNext(); ) {
             String documentKeyword = (String) iterator.next();
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__KEYWORD, documentKeyword ) );
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__KEYWORD, documentKeyword));
         }
 
-        String[][] parentDocumentAndMenuIds = documentMapper.getParentDocumentAndMenuIdsForDocument( document );
-        for ( int i = 0; i < parentDocumentAndMenuIds.length; i++ ) {
+        String[][] parentDocumentAndMenuIds = documentMapper.getParentDocumentAndMenuIdsForDocument(document);
+        for (int i = 0; i < parentDocumentAndMenuIds.length; i++) {
             String parentId = parentDocumentAndMenuIds[i][0];
             String menuId = parentDocumentAndMenuIds[i][1];
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__PARENT_ID, parentId ) );
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__PARENT_MENU_ID, parentId + "_" + menuId ) );
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__PARENT_ID, parentId));
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__PARENT_MENU_ID, parentId + "_" + menuId));
         }
 
-        if (document.getAlias() != null ) {
+        if (document.getAlias() != null) {
             indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__ALIAS, document.getAlias()));
         }
 
         Map<String, String> documentProperties = document.getProperties();
         for (Map.Entry<String, String> propertyEntry : documentProperties.entrySet()) {
-            indexDocument.add( unStoredKeyword( DocumentIndex.FIELD__PROPERTY_PREFIX +propertyEntry.getKey(), "" + propertyEntry.getValue() ) );
+            indexDocument.add(unStoredKeyword(DocumentIndex.FIELD__PROPERTY_PREFIX + propertyEntry.getKey(), "" + propertyEntry.getValue()));
         }
 
         return indexDocument;
     }
 
-    private void addDateFieldToIndexDocument( int documentId, Document indexDocument, String fieldName,
-                                              Date date ) {
-        if ( null != date ) {
+    private void addDateFieldToIndexDocument(int documentId, Document indexDocument, String fieldName,
+                                             Date date) {
+        if (null != date) {
             try {
-                indexDocument.add( unStoredKeyword( fieldName, date ) );
-                return ;
-            } catch ( RuntimeException re ) {
-                DateFormat dateFormat = new SimpleDateFormat( DateConstants.DATETIME_FORMAT_STRING );
-                log.warn( "Failed to index datetime '" + dateFormat.format( date ) + "' in field '" + fieldName
-                          + "' of document "
-                          + documentId, re );
+                indexDocument.add(unStoredKeyword(fieldName, date));
+                return;
+            } catch (RuntimeException re) {
+                DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
+                log.warn("Failed to index datetime '" + dateFormat.format(date) + "' in field '" + fieldName
+                        + "' of document "
+                        + documentId, re);
             }
         }
-        indexDocument.add( unStoredKeyword( fieldName, "" ));
-    }
-
-    static Field unStoredKeyword( String fieldName, String fieldValue ) {
-        return new Field( fieldName, fieldValue.toLowerCase(), false, true, false );
-    }
-
-    private static Field unStoredKeyword( String fieldName, Date fieldValue ) {
-        Date truncatedDate = Utility.truncateDateToMinutePrecision( fieldValue );
-        return new Field( fieldName, DateField.dateToString( truncatedDate ), false, true, false );
+        indexDocument.add(unStoredKeyword(fieldName, ""));
     }
 
 }
diff --git a/server/src/imcode/server/document/index/IndexException.java b/server/src/imcode/server/document/index/IndexException.java
index 1724641fcd..3e7e660b33 100644
--- a/server/src/imcode/server/document/index/IndexException.java
+++ b/server/src/imcode/server/document/index/IndexException.java
@@ -2,8 +2,8 @@
 
 public class IndexException extends RuntimeException {
 
-    public IndexException( Throwable cause ) {
-        super( cause );
+    public IndexException(Throwable cause) {
+        super(cause);
     }
 
 }
diff --git a/server/src/imcode/server/document/index/IndexRebuildTimerTask.java b/server/src/imcode/server/document/index/IndexRebuildTimerTask.java
index f4ded764a5..791e3ca05b 100644
--- a/server/src/imcode/server/document/index/IndexRebuildTimerTask.java
+++ b/server/src/imcode/server/document/index/IndexRebuildTimerTask.java
@@ -1,13 +1,15 @@
 package imcode.server.document.index;
 
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.Date;
 import java.util.TimerTask;
 
 class IndexRebuildTimerTask extends TimerTask {
 
-    private final static Logger log = Logger.getLogger(IndexRebuildTimerTask.class);
+    private final static Logger log = LogManager.getLogger(IndexRebuildTimerTask.class);
 
     private final long indexRebuildSchedulePeriodInMilliseconds;
     private final BackgroundIndexBuilder backgroundIndexBuilder;
@@ -22,12 +24,12 @@ public void run() {
         try {
             log.info("Starting scheduled index rebuild.");
             if (backgroundIndexBuilder.otherProcessModifiedIndexDirectory()) {
-                log.debug("Another process modified index directory. Aborting.") ;
-                cancel() ;
-                return ;
+                log.debug("Another process modified index directory. Aborting.");
+                cancel();
+                return;
             }
             backgroundIndexBuilder.start();
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             log.warn("Caught exception during scheduled index rebuild.", e);
         }
         Date nextTime = new Date(scheduledExecutionTime() + indexRebuildSchedulePeriodInMilliseconds);
diff --git a/server/src/imcode/server/document/index/MicrosoftExcelTextExtractor.java b/server/src/imcode/server/document/index/MicrosoftExcelTextExtractor.java
index d6c4e27c9b..cc14188bf8 100644
--- a/server/src/imcode/server/document/index/MicrosoftExcelTextExtractor.java
+++ b/server/src/imcode/server/document/index/MicrosoftExcelTextExtractor.java
@@ -1,31 +1,31 @@
 package imcode.server.document.index;
 
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellType;
 
-import java.io.InputStream;
 import java.io.IOException;
-import java.util.List;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 class MicrosoftExcelTextExtractor implements StreamTextsExtractor {
     public String[] extractTexts(InputStream in) throws IOException {
         List texts = new ArrayList();
         HSSFWorkbook workbook = new HSSFWorkbook(in);
         int sheetCount = workbook.getNumberOfSheets();
-        for ( int i = 0; i < sheetCount; ++i ) {
+        for (int i = 0; i < sheetCount; ++i) {
             HSSFSheet sheet = workbook.getSheetAt(i);
             Iterator rowIterator = sheet.rowIterator();
-            while ( rowIterator.hasNext() ) {
+            while (rowIterator.hasNext()) {
                 HSSFRow row = (HSSFRow) rowIterator.next();
                 Iterator cellIterator = row.cellIterator();
-                while ( cellIterator.hasNext() ) {
-                    HSSFCell cell = (HSSFCell) cellIterator.next();
-                    int cellType = cell.getCellType();
-                    if ( cellType == HSSFCell.CELL_TYPE_STRING ) {
+                while (cellIterator.hasNext()) {
+	                HSSFCell cell = (HSSFCell) cellIterator.next();
+	                if (cell.getCellType() == CellType.STRING) {
                         texts.add(cell.getStringCellValue());
                     }
                 }
diff --git a/server/src/imcode/server/document/index/MicrosoftPowerPointTextExtractor.java b/server/src/imcode/server/document/index/MicrosoftPowerPointTextExtractor.java
index 4d35a3bee1..bf969ee0dd 100644
--- a/server/src/imcode/server/document/index/MicrosoftPowerPointTextExtractor.java
+++ b/server/src/imcode/server/document/index/MicrosoftPowerPointTextExtractor.java
@@ -1,14 +1,14 @@
-package imcode.server.document.index;
-
-import org.apache.poi.hslf.extractor.PowerPointExtractor;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-class MicrosoftPowerPointTextExtractor implements StreamTextsExtractor {
-
-    public String[] extractTexts(InputStream in) throws IOException {
-        PowerPointExtractor extractor = new PowerPointExtractor(in);
-        return new String[] {extractor.getText(), extractor.getNotes()} ;
-    }
-}
+//package imcode.server.document.index;
+//
+//import org.apache.poi.hslf.extractor.PowerPointExtractor;
+//
+//import java.io.IOException;
+//import java.io.InputStream;
+//
+//class MicrosoftPowerPointTextExtractor implements StreamTextsExtractor {
+//
+//    public String[] extractTexts(InputStream in) throws IOException {
+//        PowerPointExtractor extractor = new PowerPointExtractor(in);
+//        return new String[]{extractor.getText(), extractor.getNotes()};
+//    }
+//}
diff --git a/server/src/imcode/server/document/index/MicrosoftWordTextExtractor.java b/server/src/imcode/server/document/index/MicrosoftWordTextExtractor.java
index d27825f0a9..ca74e44965 100644
--- a/server/src/imcode/server/document/index/MicrosoftWordTextExtractor.java
+++ b/server/src/imcode/server/document/index/MicrosoftWordTextExtractor.java
@@ -1,14 +1,14 @@
 package imcode.server.document.index;
 
 import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.model.TextPieceTable;
 import org.apache.poi.hwpf.model.TextPiece;
+import org.apache.poi.hwpf.model.TextPieceTable;
 
-import java.io.InputStream;
 import java.io.IOException;
-import java.util.List;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 class MicrosoftWordTextExtractor implements StreamTextsExtractor {
 
@@ -17,7 +17,7 @@ public String[] extractTexts(InputStream in) throws IOException {
         HWPFDocument wordDocument = new HWPFDocument(in);
         TextPieceTable textTable = wordDocument.getTextTable();
         List textPieces = textTable.getTextPieces();
-        for ( Iterator iterator = textPieces.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = textPieces.iterator(); iterator.hasNext(); ) {
             TextPiece textPiece = (TextPiece) iterator.next();
             String text = textPiece.getStringBuffer().toString();
             text = text.replaceAll("\\x13.*\\x14", "");
diff --git a/server/src/imcode/server/document/index/PdfTextExtractor.java b/server/src/imcode/server/document/index/PdfTextExtractor.java
index 00a2a5cedb..678eb87d92 100644
--- a/server/src/imcode/server/document/index/PdfTextExtractor.java
+++ b/server/src/imcode/server/document/index/PdfTextExtractor.java
@@ -1,19 +1,22 @@
 package imcode.server.document.index;
 
-import org.pdfbox.pdmodel.PDDocument;
-import org.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+//import org.pdfbox.pdmodel.PDDocument;
+//import org.pdfbox.util.PDFTextStripper;
+
 class PdfTextExtractor implements StreamTextsExtractor {
 
     public String[] extractTexts(InputStream in) throws IOException {
         PDDocument pdf = PDDocument.load(in);
         try {
             PDFTextStripper stripper = new PDFTextStripper();
-            String text = stripper.getText(pdf) ;
-            return new String[] {text} ;
+            String text = stripper.getText(pdf);
+            return new String[]{text};
         } finally {
             pdf.close();
         }
diff --git a/server/src/imcode/server/document/index/QueryParser.java b/server/src/imcode/server/document/index/QueryParser.java
index cae2f265e1..67422755ec 100644
--- a/server/src/imcode/server/document/index/QueryParser.java
+++ b/server/src/imcode/server/document/index/QueryParser.java
@@ -1,12 +1,12 @@
 package imcode.server.document.index;
 
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.queryParser.ParseException;
 
 import java.io.Serializable;
 
 public interface QueryParser extends Serializable {
 
-    Query parse(String queryString) throws ParseException ;
+    Query parse(String queryString) throws ParseException;
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/document/index/RebuildingDirectoryIndex.java b/server/src/imcode/server/document/index/RebuildingDirectoryIndex.java
index 3cae3f39a6..5079e37742 100644
--- a/server/src/imcode/server/document/index/RebuildingDirectoryIndex.java
+++ b/server/src/imcode/server/document/index/RebuildingDirectoryIndex.java
@@ -1,126 +1,101 @@
 package imcode.server.document.index;
 
+import com.imcode.imcms.api.SearchResult;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.DateConstants;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.commons.lang.time.DateUtils;
-import org.apache.log4j.Logger;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.store.FSDirectory;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.function.Predicate;
 
 public class RebuildingDirectoryIndex implements DocumentIndex {
 
-    private final static Logger log = Logger.getLogger(RebuildingDirectoryIndex.class.getName());
+    private final static Logger log = LogManager.getLogger(RebuildingDirectoryIndex.class.getName());
 
     private final BackgroundIndexBuilder backgroundIndexBuilder;
     private final long indexRebuildSchedulePeriodInMilliseconds;
     private final Timer scheduledIndexRebuildTimer = new Timer(true);
-    private IndexRebuildTimerTask currentIndexRebuildTimerTask ;
+    private IndexRebuildTimerTask currentIndexRebuildTimerTask;
 
-    private DirectoryIndex index = new NullDirectoryIndex();
+    private volatile DirectoryIndex index = new NullDirectoryIndex();
 
     public RebuildingDirectoryIndex(File indexParentDirectory, float indexRebuildSchedulePeriodInMinutes,
                                     IndexDocumentFactory indexDocumentFactory) {
-        indexRebuildSchedulePeriodInMilliseconds = (long) ( indexRebuildSchedulePeriodInMinutes * DateUtils.MILLIS_IN_MINUTE );
+        indexRebuildSchedulePeriodInMilliseconds = (long) (indexRebuildSchedulePeriodInMinutes * DateUtils.MILLIS_IN_MINUTE);
         backgroundIndexBuilder = new BackgroundIndexBuilder(indexParentDirectory, this, indexDocumentFactory);
 
         File indexDirectory = findLatestIndexDirectory(indexParentDirectory);
         long indexModifiedTime = 0;
-        if ( null != indexDirectory ) {
+        if (null != indexDirectory) {
             indexModifiedTime = indexDirectory.lastModified();
-            index = new DefaultDirectoryIndex(indexDirectory, indexDocumentFactory);
+            try{
+                index = new DefaultDirectoryIndex(indexDirectory, indexDocumentFactory);
+            }catch (IOException e){
+                rebuildBecauseOfError("Exception while creating directory index", new IndexException(e));
+            }
+
         } else {
             rebuildBecauseOfError("No existing index.", null);
         }
 
-        if ( isSchedulingIndexRebuilds() ) {
+        if (isSchedulingIndexRebuilds()) {
             log.info("First index rebuild scheduled at " + formatDatetime(restartIndexRebuildScheduling(indexModifiedTime)));
         } else {
             log.info("Scheduling of index rebuilds is disabled.");
         }
     }
 
-    private synchronized Date restartIndexRebuildScheduling(long indexModifiedTime) {
-        if ( !isSchedulingIndexRebuilds() ) {
-            return null ;
-        }
-        long time = System.currentTimeMillis();
-        Date nextTime = new Date(indexModifiedTime + indexRebuildSchedulePeriodInMilliseconds);
-        if ( nextTime.getTime() < time ) {
-            nextTime.setTime(time);
-        }
-        restartIndexRebuildScheduling(nextTime);
-        return nextTime;
-    }
-
-    private synchronized void restartIndexRebuildScheduling(Date nextTime) {
-        if (null != currentIndexRebuildTimerTask) {
-            currentIndexRebuildTimerTask.cancel() ;
-            log.trace("Canceled existing index rebuild timer task.") ;
-        }
-        try {
-            log.debug("Restarting scheduling of index rebuilds. First rebuild at "+formatDatetime(nextTime)+".") ;
-            backgroundIndexBuilder.touchIndexParentDirectory();
-            currentIndexRebuildTimerTask = new IndexRebuildTimerTask(indexRebuildSchedulePeriodInMilliseconds, backgroundIndexBuilder);
-            scheduledIndexRebuildTimer.scheduleAtFixedRate(currentIndexRebuildTimerTask, nextTime, indexRebuildSchedulePeriodInMilliseconds);
-        } catch ( IllegalStateException ise ) {
-            log.error("Failed to start index rebuild scheduling.", ise);
-        }
-    }
-
-    private boolean isSchedulingIndexRebuilds() {
-        return indexRebuildSchedulePeriodInMilliseconds > 0;
-    }
-
     static File findLatestIndexDirectory(File indexParentDirectory) {
         try {
-            if ( indexParentDirectory.exists() && !indexParentDirectory.isDirectory() ) {
-                log.debug("Deleting non-directory " + indexParentDirectory);
+            if (indexParentDirectory.exists() && !indexParentDirectory.isDirectory()) {
+                log.info("Deleting non-directory " + indexParentDirectory);
                 FileUtils.forceDelete(indexParentDirectory);
             }
-            if ( !indexParentDirectory.exists() ) {
-                log.debug("Creating directory " + indexParentDirectory);
+            if (!indexParentDirectory.exists()) {
+                log.info("Creating directory " + indexParentDirectory);
                 FileUtils.forceMkdir(indexParentDirectory);
             }
             File[] indexDirectories = indexParentDirectory.listFiles((FileFilter) FileFilterUtils.directoryFileFilter());
             sortFilesByLastModifiedWithLatestFirst(indexDirectories);
             File indexDirectory = null;
-            for ( int i = 0; i < indexDirectories.length; i++ ) {
+            for (int i = 0; i < indexDirectories.length; i++) {
                 File directory = indexDirectories[i];
-                if ( IndexReader.indexExists(directory) ) {
-                    if ( null == indexDirectory ) {
-                        log.debug("Found index in directory " + directory);
+                final FSDirectory fsDirectory = FSDirectory.open(directory.toPath());
+                if (DirectoryReader.indexExists(fsDirectory)) {
+                    if (null == indexDirectory) {
+                        log.info("Found index in directory " + directory);
                         indexDirectory = directory;
                     } else {
-                        log.debug("Deleting old index directory " + directory);
+                        log.info("Deleting old index directory " + directory);
                         FileUtils.forceDelete(directory);
                     }
                 } else {
-                    log.debug("Deleting non-index directory " + directory);
+                    log.info("Deleting non-index directory " + directory);
                     FileUtils.forceDelete(directory);
                 }
             }
             return indexDirectory;
-        } catch ( IOException ioe ) {
+        } catch (IOException ioe) {
             throw new IndexException(ioe);
         }
     }
 
     private static void sortFilesByLastModifiedWithLatestFirst(File[] indexDirectories) {
-        Arrays.sort(indexDirectories, new Comparator() {
-            public int compare(Object o1, Object o2) {
-                File f1 = (File) o1;
-                File f2 = (File) o2;
-                return new Long(f2.lastModified()).compareTo(new Long(f1.lastModified()));
+        Arrays.sort(indexDirectories, new Comparator<File>() {
+            public int compare(File f1, File f2) {
+                return Long.compare(f2.lastModified(), f1.lastModified());
             }
         });
     }
@@ -129,13 +104,48 @@ static String formatDatetime(Date nextExecutionTime) {
         return new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING).format(nextExecutionTime);
     }
 
+    private synchronized Date restartIndexRebuildScheduling(long indexModifiedTime) {
+        if (!isSchedulingIndexRebuilds()) {
+            return null;
+        }
+        long time = System.currentTimeMillis();
+        Date nextTime = new Date(indexModifiedTime + indexRebuildSchedulePeriodInMilliseconds);
+        if (nextTime.getTime() < time) {
+            nextTime.setTime(time);
+        }
+        restartIndexRebuildScheduling(nextTime);
+        return nextTime;
+    }
+
+    private synchronized void restartIndexRebuildScheduling(Date nextTime) {
+        if (null != currentIndexRebuildTimerTask) {
+            currentIndexRebuildTimerTask.cancel();
+            log.trace("Canceled existing index rebuild timer task.");
+        }
+        try {
+            log.info("Restarting scheduling of index rebuilds. First rebuild at " + formatDatetime(nextTime) + ".");
+            backgroundIndexBuilder.touchIndexParentDirectory();
+            currentIndexRebuildTimerTask = new IndexRebuildTimerTask(indexRebuildSchedulePeriodInMilliseconds, backgroundIndexBuilder);
+            scheduledIndexRebuildTimer.scheduleAtFixedRate(currentIndexRebuildTimerTask, nextTime, indexRebuildSchedulePeriodInMilliseconds);
+        } catch (IllegalStateException ise) {
+            log.error("Failed to start index rebuild scheduling.", ise);
+        }
+    }
+
+    private boolean isSchedulingIndexRebuilds() {
+        return indexRebuildSchedulePeriodInMilliseconds > 0;
+    }
+
     public void indexDocument(DocumentDomainObject document) {
         log.debug("Adding document.");
         backgroundIndexBuilder.addDocument(document);
         try {
             index.indexDocument(document);
-        } catch ( IndexException e ) {
-            rebuildBecauseOfError("Failed to add document " + document.getId() + " to index.", e);
+        } catch (IndexException e) {
+            log.error("Failed to add document " + document.getId() + " to index.", e);
+            //rebuildBecauseOfError("Failed to add document " + document.getId() + " to index.", e);
+        } catch (Exception e) {
+            log.error(String.format("Failed to add document %d to index.", document.getId()), e);
         }
     }
 
@@ -144,41 +154,90 @@ public void removeDocument(DocumentDomainObject document) {
         backgroundIndexBuilder.removeDocument(document);
         try {
             index.removeDocument(document);
-        } catch ( IndexException e ) {
-            rebuildBecauseOfError("Failed to remove document " + document.getId() + " from index.", e);
+        } catch (IndexException e) {
+            log.error("Failed to remove document " + document.getId() + " from index.", e);
+            //rebuildBecauseOfError("Failed to remove document " + document.getId() + " from index.", e);
+        } catch (Exception e) {
+            log.error(String.format("Failed to remove document %d from index.", document.getId()), e);
         }
     }
 
-    public List search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
+    public List<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
+        return search(query, searchingUser, 1);
+    }
+
+
+    private List<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser, int retryCount) throws IndexException {
         try {
-            List documents = index.search(query, searchingUser);
-            if ( index.isInconsistent() ) {
-                rebuildBecauseOfError("Index is inconsistent.", null);
-            }
+            List<DocumentDomainObject> documents = index.search(query, searchingUser);
+//            if ( index.isInconsistent() ) {
+//                rebuildBecauseOfError("Index is inconsistent.", null);
+//            }
             return documents;
-        } catch ( IndexException ex ) {
+        } catch (IndexException ex) {
+            if (ex.getCause() instanceof FileNotFoundException) {
+                log.error("Index directory does not exists. Index swapped?", ex.getCause());
+                if (retryCount > 0) {
+                    log.debug(String.format("Retrying search: Query: %s, User: %s", query, searchingUser));
+                    search(query, searchingUser, retryCount - 1);
+                }
+            } else {
+                rebuildBecauseOfError(String.format("Search failed. Query: %s, User: %s", query, searchingUser), ex);
+            }
+
+            return Collections.emptyList();
+        } catch (Exception e) {
+            log.error(String.format("Search failed. Query: %s, User: %s", query, searchingUser), e);
+            return Collections.emptyList();
+        }
+    }
+
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                                     UserDomainObject searchingUser,
+                                                     int startPosition,
+                                                     int maxResults) {
+
+        return index.search(query, searchingUser, startPosition, maxResults);
+    }
+
+    @Override
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                                     UserDomainObject searchingUser,
+                                                     int startPosition,
+                                                     int maxResults,
+                                                     Predicate<DocumentDomainObject> filterPredicate) throws IndexException {
+        try {
+            return index.search(query, searchingUser, startPosition, maxResults, filterPredicate);
+        } catch (IndexException ex) {
             rebuildBecauseOfError("Search failed.", ex);
-            return Collections.EMPTY_LIST;
+            return SearchResult.empty();
         }
     }
 
+
     private void rebuildBecauseOfError(String message, IndexException ex) {
-        log.error(message+" Starting index rebuild.", ex);
+        log.error(message + " Starting index rebuild.", ex);
         rebuild();
     }
 
     public void rebuild() {
         if (isSchedulingIndexRebuilds()) {
-            restartIndexRebuildScheduling(new Date()) ;
+            restartIndexRebuildScheduling(new Date());
         } else {
             backgroundIndexBuilder.start();
         }
     }
 
+    @Override
+    public boolean isIndexBuildingThreadAlive() {
+        return backgroundIndexBuilder.isIndexBuildingThreadAlive();
+    }
+
     void notifyRebuildComplete(DirectoryIndex newIndex) {
         DirectoryIndex oldIndex = index;
         index = newIndex;
-        if (!oldIndex.equals(index) ) {
+        if (!oldIndex.equals(index)) {
+            oldIndex.close();
             oldIndex.delete();
         }
     }
@@ -193,17 +252,34 @@ public void delete() {
 
         }
 
+        public void close() {
+
+        }
+
         public void indexDocument(DocumentDomainObject document) throws IndexException {
         }
 
         public void removeDocument(DocumentDomainObject document) throws IndexException {
         }
 
-        public List search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
-            return Collections.EMPTY_LIST;
+        public List<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
+            return Collections.emptyList();
+        }
+
+        public SearchResult<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser, int startPosition, int maxResults) throws IndexException {
+            return SearchResult.empty();
+        }
+
+        public SearchResult<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser, int startPosition, int maxResults, Predicate<DocumentDomainObject> filterPredicate) throws IndexException {
+            return SearchResult.empty();
         }
 
         public void rebuild() throws IndexException {
         }
+
+        @Override
+        public boolean isIndexBuildingThreadAlive() {
+            return false;
+        }
     }
 }
diff --git a/server/src/imcode/server/document/index/ReindexingDocumentIdsGetter.java b/server/src/imcode/server/document/index/ReindexingDocumentIdsGetter.java
new file mode 100644
index 0000000000..af3028a2b1
--- /dev/null
+++ b/server/src/imcode/server/document/index/ReindexingDocumentIdsGetter.java
@@ -0,0 +1,11 @@
+package imcode.server.document.index;
+
+/**
+ * Interface for client app realisation of which documents should be reindex
+ * <p>
+ * Created by Serhii Maksymchuk from Ubrainians for imCode
+ * 09.03.17.
+ */
+public interface ReindexingDocumentIdsGetter {
+    int[] getDocumentIds();
+}
diff --git a/server/src/imcode/server/document/index/SimpleDocumentQuery.java b/server/src/imcode/server/document/index/SimpleDocumentQuery.java
index 558185b2cf..69bbc3fbdb 100644
--- a/server/src/imcode/server/document/index/SimpleDocumentQuery.java
+++ b/server/src/imcode/server/document/index/SimpleDocumentQuery.java
@@ -2,7 +2,6 @@
 
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.BooleanQuery;
 
 public class SimpleDocumentQuery implements DocumentQuery {
 
@@ -17,7 +16,7 @@ public SimpleDocumentQuery(Query query, Sort sort, boolean logged) {
     }
 
     public SimpleDocumentQuery(Query query) {
-        this(query,null,false);
+        this(query, null, false);
     }
 
     public Query getQuery() {
@@ -31,4 +30,13 @@ public Sort getSort() {
     public boolean isLogged() {
         return logged;
     }
+
+    @Override
+    public String toString() {
+        return "SimpleDocumentQuery{" +
+                "query=" + query +
+                ", sort=" + sort +
+                ", logged=" + logged +
+                '}';
+    }
 }
diff --git a/server/src/imcode/server/document/index/StreamTextsExtractor.java b/server/src/imcode/server/document/index/StreamTextsExtractor.java
index a93d4321f5..2b5623f86e 100644
--- a/server/src/imcode/server/document/index/StreamTextsExtractor.java
+++ b/server/src/imcode/server/document/index/StreamTextsExtractor.java
@@ -1,7 +1,7 @@
 package imcode.server.document.index;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 interface StreamTextsExtractor {
     String[] extractTexts(InputStream in) throws IOException;
diff --git a/server/src/imcode/server/document/textdocument/CopyableHashMap.java b/server/src/imcode/server/document/textdocument/CopyableHashMap.java
index 29aeab5849..6b51290d9a 100644
--- a/server/src/imcode/server/document/textdocument/CopyableHashMap.java
+++ b/server/src/imcode/server/document/textdocument/CopyableHashMap.java
@@ -5,16 +5,16 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class CopyableHashMap extends HashMap implements LazilyLoadedObject.Copyable<CopyableHashMap> {
+public class CopyableHashMap<K, V> extends HashMap<K, V> implements LazilyLoadedObject.Copyable<CopyableHashMap<K, V>> {
 
     public CopyableHashMap() {
     }
 
-    public CopyableHashMap(Map m) {
+    public CopyableHashMap(Map<K, V> m) {
         super(m);
     }
 
-    public CopyableHashMap copy() {
-        return new CopyableHashMap(this) ;
+    public CopyableHashMap<K, V> copy() {
+        return new CopyableHashMap<>(this);
     }
 }
diff --git a/server/src/imcode/server/document/textdocument/FileDocumentImageSource.java b/server/src/imcode/server/document/textdocument/FileDocumentImageSource.java
index 1a9c94a363..82ca263cc6 100644
--- a/server/src/imcode/server/document/textdocument/FileDocumentImageSource.java
+++ b/server/src/imcode/server/document/textdocument/FileDocumentImageSource.java
@@ -1,8 +1,8 @@
 package imcode.server.document.textdocument;
 
 import imcode.server.document.DocumentDomainObject;
-import imcode.server.document.FileDocumentDomainObject;
 import imcode.server.document.DocumentReference;
+import imcode.server.document.FileDocumentDomainObject;
 import imcode.util.Utility;
 import imcode.util.io.EmptyInputStreamSource;
 import imcode.util.io.InputStreamSource;
@@ -12,45 +12,49 @@
 public class FileDocumentImageSource extends ImageSource {
     private DocumentReference fileDocumentReference;
 
-    public FileDocumentImageSource( DocumentReference fileDocumentReference ) {
+    public FileDocumentImageSource(DocumentReference fileDocumentReference) {
         this.fileDocumentReference = fileDocumentReference;
-        DocumentDomainObject document = fileDocumentReference.getDocument( );
-        if ( !( document instanceof FileDocumentDomainObject ) ) {
-            throw new IllegalArgumentException( "Not a file document: " + document.getId( ) );
+        DocumentDomainObject document = fileDocumentReference.getDocument();
+        if (!(document instanceof FileDocumentDomainObject)) {
+            throw new IllegalArgumentException("Not a file document: " + document.getId());
         }
     }
 
-    public InputStreamSource getInputStreamSource( ) {
-        if ( null == getFileDocument() ) {
-            return new EmptyInputStreamSource( );
+    public InputStreamSource getInputStreamSource() {
+        if (null == getFileDocument()) {
+            return new EmptyInputStreamSource();
         }
-        return getFileDocument( ).getDefaultFile( ).getInputStreamSource( );
+        return getFileDocument().getDefaultFile().getInputStreamSource();
     }
 
-    public FileDocumentDomainObject getFileDocument( ) {
-        return (FileDocumentDomainObject)fileDocumentReference.getDocument( );
+    public FileDocumentDomainObject getFileDocument() {
+        return (FileDocumentDomainObject) fileDocumentReference.getDocument();
     }
 
-    public String getUrlPathRelativeToContextPath( ) {
-        return Utility.getContextRelativePathToDocument( getFileDocument() ) ;
+    public String getUrlPathRelativeToContextPath() {
+        return Utility.getContextRelativePathToDocument(getFileDocument());
     }
 
-    public String toStorageString( ) {
+    public String toStorageString() {
         if (isEmpty()) {
-            return "" ;
+            return "";
         }
-        return ""+getFileDocument().getId() ;
+        return "" + getFileDocument().getId();
     }
 
-    public int getTypeId( ) {
+    public int getTypeId() {
         return ImageSource.IMAGE_TYPE_ID__FILE_DOCUMENT;
     }
 
-    public Date getModifiedDatetime( ) {
+    public Date getModifiedDatetime() {
         if (isEmpty()) {
-            return null ;
+            return null;
         }
-        return getFileDocument().getModifiedDatetime( );
+        return getFileDocument().getModifiedDatetime();
+    }
+
+    public String getName() {
+        return Integer.toString(fileDocumentReference.getDocumentId());
     }
 
 }
diff --git a/server/src/imcode/server/document/textdocument/ImageArchiveImageSource.java b/server/src/imcode/server/document/textdocument/ImageArchiveImageSource.java
new file mode 100644
index 0000000000..8e04f4dc67
--- /dev/null
+++ b/server/src/imcode/server/document/textdocument/ImageArchiveImageSource.java
@@ -0,0 +1,68 @@
+package imcode.server.document.textdocument;
+
+import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
+import imcode.util.io.FileInputStreamSource;
+import imcode.util.io.InputStreamSource;
+
+import java.io.File;
+import java.util.Date;
+
+public class ImageArchiveImageSource extends ImageSource {
+    private static final long serialVersionUID = -1520182526108369695L;
+
+    private String path;
+
+
+    public ImageArchiveImageSource(String path) {
+        this.path = path.replace('\\', '/');
+    }
+
+    public static String getImagesUrlPath() {
+        return Imcms.getServices().getConfig().getImageArchiveImageUrl();
+    }
+
+    @Override
+    public InputStreamSource getInputStreamSource() {
+        return new FileInputStreamSource(getFile());
+    }
+
+    private File getFile() {
+        ImcmsServices service = Imcms.getServices();
+        File basePath = isAbsolute() ? Imcms.getPath() : service.getConfig().getImageArchiveImagePath();
+
+        return new File(basePath, path);
+    }
+
+    @Override
+    public String getUrlPathRelativeToContextPath() {
+        if (!isAbsolute()) {
+            return getImagesUrlPath() + path;
+        }
+
+        return path;
+    }
+
+    private boolean isAbsolute() {
+        return path.startsWith("/");
+    }
+
+    @Override
+    public String toStorageString() {
+        return path;
+    }
+
+    @Override
+    public int getTypeId() {
+        return ImageSource.IMAGE_TYPE_ID__IMAGE_ARCHIVE;
+    }
+
+    @Override
+    public Date getModifiedDatetime() {
+        return new Date(getFile().lastModified());
+    }
+
+    public String getName() {
+        return new File(path).getName();
+    }
+}
diff --git a/server/src/imcode/server/document/textdocument/ImageCacheDomainObject.java b/server/src/imcode/server/document/textdocument/ImageCacheDomainObject.java
new file mode 100644
index 0000000000..afb92ee332
--- /dev/null
+++ b/server/src/imcode/server/document/textdocument/ImageCacheDomainObject.java
@@ -0,0 +1,229 @@
+package imcode.server.document.textdocument;
+
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.server.document.textdocument.ImageDomainObject.RotateDirection;
+import imcode.util.image.Format;
+import imcode.util.image.Resize;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+public class ImageCacheDomainObject implements Serializable {
+    public static final short TYPE_PATH = 1;
+    public static final short TYPE_FILE_DOCUMENT = 2;
+    public static final short TYPE_URL = 3;
+    private static final long serialVersionUID = -2547384841538448930L;
+    CropRegion cropRegion;
+    private String id;
+    private String resource;
+    private Integer metaId;
+    private Integer no;
+    private String fileNo;
+    private short type;
+    private int fileSize;
+    private int frequency;
+    private Format format;
+    private int width;
+    private int height;
+    private Resize resize;
+    private RotateDirection rotateDirection;
+    private Timestamp createdDate = new Timestamp(new Date().getTime());
+
+
+    public ImageCacheDomainObject() {
+    }
+
+    public ImageCacheDomainObject(String id, String resource,
+                                  short type, int fileSize, int frequency, Format format, int width, int height, Resize resize,
+                                  CropRegion cropRegion, RotateDirection rotateDirection, Timestamp createdDate) {
+        this.id = id;
+        this.resource = resource;
+        this.type = type;
+        this.fileSize = fileSize;
+        this.frequency = frequency;
+        this.format = format;
+        this.width = width;
+        this.height = height;
+        this.cropRegion = cropRegion;
+        this.rotateDirection = rotateDirection;
+        this.createdDate = createdDate;
+    }
+
+    public void generateId() {
+        StringBuilder builder = new StringBuilder();
+        builder.append(resource);
+        builder.append(type);
+        builder.append((format != null ? format.getOrdinal() : null));
+        builder.append(width);
+        builder.append(height);
+
+        if (resize != null) {
+            builder.append(resize.getOrdinal());
+        }
+
+        if (cropRegion.isValid()) {
+            builder.append(cropRegion.getCropX1());
+            builder.append(cropRegion.getCropY1());
+            builder.append(cropRegion.getCropX2());
+            builder.append(cropRegion.getCropY2());
+        } else {
+            builder.append("-1-1-1-1");
+        }
+
+        if (rotateDirection != RotateDirection.NORTH) {
+            builder.append(rotateDirection.getAngle());
+        }
+
+        id = DigestUtils.shaHex(builder.toString());
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getResource() {
+        return resource;
+    }
+
+    public void setResource(String resource) {
+        this.resource = resource;
+    }
+
+    public short getType() {
+        return type;
+    }
+
+    public void setType(short type) {
+        this.type = type;
+    }
+
+    public Format getFormat() {
+        return format;
+    }
+
+    public void setFormat(Format format) {
+        this.format = format;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public Resize getResize() {
+        return resize;
+    }
+
+    public void setResize(Resize resize) {
+        this.resize = resize;
+    }
+
+    public CropRegion getCropRegion() {
+        return cropRegion;
+    }
+
+    public void setCropRegion(CropRegion cropRegion) {
+        this.cropRegion = cropRegion;
+    }
+
+    public Timestamp getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Timestamp createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public int getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public int getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(int frequency) {
+        this.frequency = frequency;
+    }
+
+    public RotateDirection getRotateDirection() {
+        return rotateDirection;
+    }
+
+    public void setRotateDirection(RotateDirection rotateDirection) {
+        this.rotateDirection = rotateDirection;
+    }
+
+    public String getFileNo() {
+        return fileNo;
+    }
+
+    public void setFileNo(String fileNo) {
+        this.fileNo = fileNo;
+    }
+
+    public Integer getMetaId() {
+        return metaId;
+    }
+
+    public void setMetaId(Integer metaId) {
+        this.metaId = metaId;
+    }
+
+    public Integer getNo() {
+        return no;
+    }
+
+    public void setNo(Integer no) {
+        this.no = no;
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(id)
+                .toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ImageCacheDomainObject)) {
+            return false;
+        }
+
+        final ImageCacheDomainObject o = (ImageCacheDomainObject) obj;
+
+        return new EqualsBuilder()
+                .append(id, o.getId())
+                .isEquals();
+    }
+
+    @Override
+    public String toString() {
+        return String.format("imcode.server.document.textdocument.ImageCacheDomainObject" +
+                "[id: %s, resource: %s, type: %d, format: %s]", id, resource, type, format);
+    }
+}
diff --git a/server/src/imcode/server/document/textdocument/ImageDomainObject.java b/server/src/imcode/server/document/textdocument/ImageDomainObject.java
index 0823f23297..8a15d7203c 100644
--- a/server/src/imcode/server/document/textdocument/ImageDomainObject.java
+++ b/server/src/imcode/server/document/textdocument/ImageDomainObject.java
@@ -1,17 +1,28 @@
 package imcode.server.document.textdocument;
 
 import com.imcode.util.ImageSize;
-import org.apache.commons.lang.StringUtils;
+import imcode.server.Imcms;
+import imcode.util.image.Format;
+import imcode.util.image.ImageInfo;
+import imcode.util.image.Resize;
 import org.apache.commons.lang.NullArgumentException;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 public class ImageDomainObject implements Serializable {
+    public static final int GEN_FILE_LENGTH = 255;
+
     private ImageSource source = new NullImageSource();
 
+    private Integer imageIndex;
     private String name = "";
     private int width;
     private int height;
@@ -23,187 +34,423 @@ public class ImageDomainObject implements Serializable {
     private int horizontalSpace;
     private String target = "";
     private String linkUrl = "";
+    private Long archiveImageId;
+    private Format format;
+    private CropRegion cropRegion = new CropRegion();
+    private RotateDirection rotateDirection = RotateDirection.NORTH;
+    private String generatedFilename;
+    private Resize resize;
 
     public String getName() {
         return name;
     }
 
+    public void setName(String image_name) {
+        this.name = image_name;
+    }
+
     public ImageSize getDisplayImageSize() {
-        ImageSize realImageSize = getRealImageSize( );
+        ImageSize realImageSize = getRealImageSize();
+
+        int w = realImageSize.getWidth();
+        int h = realImageSize.getHeight();
+
+        if (w == 0 && h == 0) {
+            return realImageSize;
+        }
+
+        if (rotateDirection != null && (rotateDirection == RotateDirection.EAST || rotateDirection == RotateDirection.WEST)) {
+            int temp = h;
+            h = w;
+            w = temp;
+        }
 
-        int wantedWidth = getWidth( );
-        int wantedHeight = getHeight( );
-        if ( 0 == wantedWidth && 0 != wantedHeight && 0 != realImageSize.getHeight( ) ) {
-            wantedWidth = (int)( realImageSize.getWidth( ) * ( (double)wantedHeight / realImageSize.getHeight( ) ) );
-        } else if ( 0 == wantedHeight && 0 != wantedWidth && 0 != realImageSize.getWidth( ) ) {
-            wantedHeight = (int)( realImageSize.getHeight( ) * ( (double)wantedWidth / realImageSize.getWidth( ) ) );
-        } else if ( 0 == wantedWidth && 0 == wantedHeight ) {
-            wantedWidth = realImageSize.getWidth( );
-            wantedHeight = realImageSize.getHeight( );
+        if (cropRegion != null && cropRegion.isValid()) {
+            w = cropRegion.getWidth();
+            h = cropRegion.getHeight();
         }
-        return new ImageSize( wantedWidth, wantedHeight );
+
+        if (width > 0 || height > 0) {
+            Resize res = resize;
+            if (res == null) {
+                res = (width > 0 && height > 0 ? Resize.FORCE : Resize.DEFAULT);
+            }
+
+            double ratio = w / (double) h;
+            double targetRatio;
+
+            int finalWidth;
+            int finalHeight;
+
+            switch (res) {
+                case DEFAULT:
+                    if (width > 0 && height > 0) {
+                        targetRatio = width / (double) height;
+
+                        if (ratio > targetRatio) {
+                            finalWidth = width;
+                            finalHeight = (int) Math.round(width / ratio);
+                        } else {
+                            finalWidth = (int) Math.round(height * ratio);
+                            finalHeight = height;
+                        }
+
+                    } else if (width > 0) {
+                        finalWidth = width;
+                        finalHeight = (int) Math.round(width / ratio);
+                    } else {
+                        finalWidth = (int) Math.round(height * ratio);
+                        finalHeight = height;
+                    }
+                    break;
+                case FORCE:
+                    if (width > 0 && height > 0) {
+                        finalWidth = width;
+                        finalHeight = height;
+                    } else if (width > 0) {
+                        finalWidth = width;
+                        finalHeight = h;
+                    } else {
+                        finalWidth = w;
+                        finalHeight = height;
+                    }
+                    break;
+                case GREATER_THAN:
+                    if (width > 0 && height > 0) {
+                        if (w > width && h > height) {
+                            targetRatio = width / (double) height;
+
+                            if (ratio > targetRatio) {
+                                finalWidth = width;
+                                finalHeight = (int) Math.round(width / ratio);
+                            } else {
+                                finalWidth = (int) Math.round(height * ratio);
+                                finalHeight = height;
+                            }
+                        } else if (w > width) {
+                            finalWidth = width;
+                            finalHeight = (int) Math.round(width / ratio);
+                        } else if (h > height) {
+                            finalWidth = (int) Math.round(height * ratio);
+                            finalHeight = height;
+                        } else {
+                            finalWidth = w;
+                            finalHeight = h;
+                        }
+                    } else if (width > 0) {
+                        if (w > width) {
+                            finalWidth = width;
+                            finalHeight = (int) Math.round(width / ratio);
+                        } else {
+                            finalWidth = w;
+                            finalHeight = h;
+                        }
+                    } else {
+                        if (h > height) {
+                            finalWidth = (int) Math.round(height * ratio);
+                            finalHeight = height;
+                        } else {
+                            finalWidth = w;
+                            finalHeight = h;
+                        }
+                    }
+                    break;
+                default:
+                    throw new IllegalStateException("Unhandled resize = " + res);
+            }
+
+            return new ImageSize(finalWidth, finalHeight);
+        }
+
+        return new ImageSize(w, h);
     }
 
     public ImageSize getRealImageSize() {
-        ImageSize imageSize = new ImageSize( 0, 0 );
-        if ( !isEmpty( ) ) {
+        ImageSize imageSize = new ImageSize(0, 0);
+        if (!isEmpty()) {
             try {
-                imageSize = source.getImageSize( );
-            } catch ( IOException ignored ) {}
+                imageSize = source.getImageSize();
+            } catch (IOException ignored) {
+            }
         }
         return imageSize;
     }
 
+    public ImageInfo getImageInfo() {
+        if (!isEmpty()) {
+            try {
+                return source.getImageInfo();
+            } catch (IOException ex) {
+            }
+        }
+
+        return null;
+    }
+
+    public Integer getImageIndex() {
+        return imageIndex;
+    }
+
+    public void setImageIndex(Integer imageIndex) {
+        this.imageIndex = imageIndex;
+    }
+
     public int getWidth() {
         return width;
     }
 
+    public void setWidth(int image_width) {
+        this.width = image_width;
+    }
+
     public int getHeight() {
         return height;
     }
 
+    public void setHeight(int image_height) {
+        this.height = image_height;
+    }
+
     public int getBorder() {
         return border;
     }
 
+    public void setBorder(int image_border) {
+        this.border = image_border;
+    }
+
     public String getAlign() {
         return align;
     }
 
+    public void setAlign(String image_align) {
+        this.align = image_align;
+    }
+
     public String getAlternateText() {
         return alternateText;
     }
 
+    public void setAlternateText(String alt_text) {
+        this.alternateText = alt_text;
+    }
+
     public String getLowResolutionUrl() {
         return lowResolutionUrl;
     }
 
+    public void setLowResolutionUrl(String low_scr) {
+        this.lowResolutionUrl = low_scr;
+    }
+
     public int getVerticalSpace() {
         return verticalSpace;
     }
 
+    public void setVerticalSpace(int v_space) {
+        this.verticalSpace = v_space;
+    }
+
     public int getHorizontalSpace() {
         return horizontalSpace;
     }
 
+    public void setHorizontalSpace(int h_space) {
+        this.horizontalSpace = h_space;
+    }
+
     public String getTarget() {
         return target;
     }
 
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
     public String getLinkUrl() {
         return linkUrl;
     }
 
-    public void setName(String image_name) {
-        this.name = image_name;
+    public void setLinkUrl(String image_ref_link) {
+        this.linkUrl = image_ref_link;
     }
 
-    public void setWidth(int image_width) {
-        this.width = image_width;
+    public Format getFormat() {
+        return format;
     }
 
-    public void setHeight(int image_height) {
-        this.height = image_height;
+    public void setFormat(Format format) {
+        this.format = format;
     }
 
-    public void setBorder(int image_border) {
-        this.border = image_border;
+    public RotateDirection getRotateDirection() {
+        return rotateDirection;
     }
 
-    public void setAlign(String image_align) {
-        this.align = image_align;
+    public void setRotateDirection(RotateDirection rotateDirection) {
+        this.rotateDirection = rotateDirection;
     }
 
-    public void setAlternateText(String alt_text) {
-        this.alternateText = alt_text;
+    public Long getArchiveImageId() {
+        return archiveImageId;
     }
 
-    public void setLowResolutionUrl(String low_scr) {
-        this.lowResolutionUrl = low_scr;
+    public void setArchiveImageId(Long archiveImageId) {
+        this.archiveImageId = archiveImageId;
     }
 
-    public void setVerticalSpace(int v_space) {
-        this.verticalSpace = v_space;
+    public void setSourceAndClearSize(ImageSource source) {
+        setSource(source);
+        setWidth(0);
+        setHeight(0);
     }
 
-    public void setHorizontalSpace(int h_space) {
-        this.horizontalSpace = h_space;
+    public boolean isEmpty() {
+        return source.isEmpty();
     }
 
-    public void setTarget(String target) {
-        this.target = target;
+    public String getUrlPath(String contextPath) {
+        String urlPathRelativeToContextPath = getUrlPathRelativeToContextPath();
+        if (StringUtils.isBlank(urlPathRelativeToContextPath)) {
+            return "";
+        }
+        return contextPath + urlPathRelativeToContextPath;
     }
 
-    public void setLinkUrl(String image_ref_link) {
-        this.linkUrl = image_ref_link;
+    public String getUrlPathRelativeToContextPath() {
+        return source.getUrlPathRelativeToContextPath();
     }
 
-    public void setSourceAndClearSize(ImageSource source) {
-        setSource( source );
-        setWidth( 0 );
-        setHeight( 0 );
+    public File getGeneratedFile() {
+        File basePath = Imcms.getServices().getConfig().getImagePath();
+
+        return new File(basePath, "generated/" + getGeneratedFilename());
     }
 
-    public void setSource(ImageSource source) {
-        if (null == source) {
-            throw new NullArgumentException("source");
-        }
-        this.source = source;
+    public String getGeneratedUrlPath(String contextPath) {
+        return contextPath + getGeneratedUrlPathRelativeToContextPath();
     }
 
-    public boolean isEmpty() {
-        return source.isEmpty( );
+    public String getGeneratedUrlPathRelativeToContextPath() {
+        String imagesUrl = Imcms.getServices().getConfig().getImageUrl();
+
+        return imagesUrl + "generated/" + getGeneratedFilename();
     }
 
-    public String getUrlPath(String contextPath) {
-        String urlPathRelativeToContextPath = getUrlPathRelativeToContextPath( );
-        if ( StringUtils.isBlank( urlPathRelativeToContextPath ) ) {
-            return "";
+    public String getGeneratedFilename() {
+        return generatedFilename;
+    }
+
+    public void setGeneratedFilename(String generatedFilename) {
+        this.generatedFilename = generatedFilename;
+    }
+
+    public void generateFilename() {
+        String suffix = "_" + UUID.randomUUID().toString();
+
+        Format fmt = getFormat();
+        if (fmt != null) {
+            suffix += "." + fmt.getExtension();
         }
-        return contextPath + urlPathRelativeToContextPath;
+
+        int maxlength = GEN_FILE_LENGTH - suffix.length();
+
+        String filename = source.getNameWithoutExt();
+
+        if (filename.length() > maxlength) {
+            filename = filename.substring(0, maxlength);
+        }
+
+        String[][] specialCharacterReplacements = {
+                {"\u00e5", "a"},// å
+                {"\u00c5", "A"},
+                {"\u00e4", "a"},// ä
+                {"\u00c4", "A"},
+                {"\u00f6", "o"},// ö
+                {"\u00d6", "O"},
+                {"\u00e9", "e"},// é
+                {"\u00c9", "E"},
+                {"\u00f8", "o"},// ø
+                {"\u00d8", "O"},
+                {"\u00e6", "ae"},// æ
+                {"\u00c6", "AE"},
+                {"\u0020", "_"} // space
+        };
+        for (String[] replacement : specialCharacterReplacements) {
+            filename = filename.replace(replacement[0], replacement[1]);
+        }
+
+        generatedFilename = filename + suffix;
     }
 
-    public String getUrlPathRelativeToContextPath() {
-        return source.getUrlPathRelativeToContextPath( );
+    public Resize getResize() {
+        return resize;
+    }
+
+    public void setResize(Resize resize) {
+        this.resize = resize;
     }
 
     public long getSize() {
-        if ( isEmpty( ) ) {
+        if (isEmpty()) {
             return 0;
         }
         try {
-            return source.getInputStreamSource( ).getSize( );
-        } catch ( IOException e ) {
+            return source.getInputStreamSource().getSize();
+        } catch (IOException e) {
             return 0;
         }
     }
 
     public ImageSource getSource() {
-        if ( isEmpty( ) ) {
-            return new NullImageSource( );
+        if (isEmpty()) {
+            return new NullImageSource();
         }
         return source;
     }
 
-    public boolean equals( Object obj ) {
-        if ( !( obj instanceof ImageDomainObject ) ) {
+    public void setSource(ImageSource source) {
+        if (null == source) {
+            throw new NullArgumentException("source");
+        }
+        this.source = source;
+    }
+
+    public CropRegion getCropRegion() {
+        return cropRegion;
+    }
+
+    public void setCropRegion(CropRegion cropRegion) {
+        this.cropRegion = cropRegion;
+    }
+
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ImageDomainObject)) {
             return false;
         }
-        final ImageDomainObject o = (ImageDomainObject)obj;
+        final ImageDomainObject o = (ImageDomainObject) obj;
+        CropRegion otherCropRegion = o.getCropRegion();
         return new EqualsBuilder().append(source.toStorageString(), o.getSource().toStorageString())
                 .append(name, o.getName())
                 .append(width, o.getWidth())
                 .append(height, o.getHeight())
-                .append(border, o .getBorder())
+                .append(border, o.getBorder())
                 .append(align, o.getAlign())
-                .append(alternateText,o.getAlternateText())
+                .append(alternateText, o.getAlternateText())
                 .append(lowResolutionUrl, o.getLowResolutionUrl())
                 .append(verticalSpace, o.getVerticalSpace())
                 .append(horizontalSpace, o.getHorizontalSpace())
                 .append(target, o.getTarget())
                 .append(linkUrl, o.getLinkUrl())
+                .append(format, o.getFormat())
+                .append(cropRegion.getCropX1(), otherCropRegion.getCropX1())
+                .append(cropRegion.getCropY1(), otherCropRegion.getCropY1())
+                .append(cropRegion.getCropX2(), otherCropRegion.getCropX2())
+                .append(cropRegion.getCropY2(), otherCropRegion.getCropY2())
+                .append(rotateDirection, o.getRotateDirection())
+                .append(resize, o.getResize())
                 .isEquals();
-   }
+    }
 
     public int hashCode() {
         return new HashCodeBuilder()
@@ -211,8 +458,188 @@ public int hashCode() {
                 .append(name).append(width).append(height)
                 .append(border).append(align).append(alternateText)
                 .append(lowResolutionUrl).append(verticalSpace).append(horizontalSpace)
-                .append(target).append(linkUrl)
+                .append(target).append(linkUrl).append(format)
+                .append(cropRegion.getCropX1()).append(cropRegion.getCropY1())
+                .append(cropRegion.getCropX2()).append(cropRegion.getCropY2())
+                .append(rotateDirection)
+                .append(resize)
                 .toHashCode();
     }
 
+
+    public enum RotateDirection {
+        NORTH(0, -90, 90),
+        EAST(90, 0, 180),
+        SOUTH(180, 90, -90),
+        WEST(-90, 180, 0);
+
+        private static final Map<Integer, RotateDirection> ANGLE_MAP =
+                new HashMap<>(RotateDirection.values().length);
+
+        static {
+            for (RotateDirection direction : RotateDirection.values()) {
+                ANGLE_MAP.put(direction.getAngle(), direction);
+            }
+        }
+
+        private final int angle;
+        private final int leftAngle;
+        private final int rightAngle;
+
+        private RotateDirection(int angle, int leftAngle, int rightAngle) {
+            this.angle = angle;
+            this.leftAngle = leftAngle;
+            this.rightAngle = rightAngle;
+        }
+
+        public static RotateDirection getByAngle(int angle) {
+            return ANGLE_MAP.get(angle);
+        }
+
+        public static RotateDirection getByAngleDefaultIfNull(int angle) {
+            RotateDirection direction = getByAngle(angle);
+
+            return (direction != null ? direction : RotateDirection.NORTH);
+        }
+
+        public int getAngle() {
+            return angle;
+        }
+
+        public RotateDirection getLeftDirection() {
+            return getByAngle(leftAngle);
+        }
+
+        public RotateDirection getRightDirection() {
+            return getByAngle(rightAngle);
+        }
+
+        public boolean isDefault() {
+            return this == RotateDirection.NORTH;
+        }
+    }
+
+    public static class CropRegion implements Serializable {
+        private static final long serialVersionUID = -586488435877347784L;
+
+        private int cropX1;
+        private int cropY1;
+        private int cropX2;
+        private int cropY2;
+
+        private boolean valid;
+
+
+        public CropRegion() {
+            cropX1 = -1;
+            cropY1 = -1;
+            cropX2 = -1;
+            cropY2 = -1;
+        }
+
+        public CropRegion(int cropX1, int cropY1, int cropX2, int cropY2) {
+            if (cropX1 > cropX2) {
+                this.cropX1 = cropX2;
+                this.cropX2 = cropX1;
+            } else {
+                this.cropX1 = cropX1;
+                this.cropX2 = cropX2;
+            }
+
+            if (cropY1 > cropY2) {
+                this.cropY1 = cropY2;
+                this.cropY2 = cropY1;
+            } else {
+                this.cropY1 = cropY1;
+                this.cropY2 = cropY2;
+            }
+
+            updateValid();
+        }
+
+        public void updateValid() {
+            valid = (cropX1 >= 0 && cropY1 >= 0 && cropX2 >= 0 && cropY2 >= 0
+                    && cropX1 != cropX2 && cropY1 != cropY2);
+        }
+
+        public boolean isValid() {
+            return valid;
+        }
+
+        public int getCropX1() {
+            return cropX1;
+        }
+
+        public void setCropX1(int cropX1) {
+            this.cropX1 = cropX1;
+        }
+
+        public int getCropY1() {
+            return cropY1;
+        }
+
+        public void setCropY1(int cropY1) {
+            this.cropY1 = cropY1;
+        }
+
+        public int getCropX2() {
+            return cropX2;
+        }
+
+        public void setCropX2(int cropX2) {
+            this.cropX2 = cropX2;
+        }
+
+        public int getCropY2() {
+            return cropY2;
+        }
+
+        public void setCropY2(int cropY2) {
+            this.cropY2 = cropY2;
+        }
+
+        public int getWidth() {
+            return isValid() ? cropX2 - cropX1 : 0;
+        }
+
+        public int getHeight() {
+            return isValid() ? cropY2 - cropY1 : 0;
+        }
+
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + cropX1;
+            result = prime * result + cropY1;
+            result = prime * result + cropX2;
+            result = prime * result + cropY2;
+
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            } else if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+
+            CropRegion other = (CropRegion) obj;
+            if (cropX1 != other.cropX1 || cropY1 != other.cropY1 ||
+                    cropX2 != other.cropX2 || cropY2 != other.cropY2)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s(%d, %d, %d, %d)", CropRegion.class.getName(), cropX1, cropY1, cropX2, cropY2);
+        }
+    }
 }
diff --git a/server/src/imcode/server/document/textdocument/ImageSource.java b/server/src/imcode/server/document/textdocument/ImageSource.java
index fc6a9fbfb3..3b0764fab1 100644
--- a/server/src/imcode/server/document/textdocument/ImageSource.java
+++ b/server/src/imcode/server/document/textdocument/ImageSource.java
@@ -1,8 +1,13 @@
 package imcode.server.document.textdocument;
 
 import com.imcode.util.ImageSize;
+import imcode.server.Imcms;
+import imcode.util.image.ImageInfo;
+import imcode.util.image.ImageOp;
+import imcode.util.io.FileInputStreamSource;
 import imcode.util.io.InputStreamSource;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Date;
@@ -11,42 +16,93 @@ public abstract class ImageSource implements Serializable {
     public static final int IMAGE_TYPE_ID__NULL = -1;
     public static final int IMAGE_TYPE_ID__IMAGES_PATH_RELATIVE_PATH = 0;
     public static final int IMAGE_TYPE_ID__FILE_DOCUMENT = 1;
+    public static final int IMAGE_TYPE_ID__IMAGE_ARCHIVE = 2;
 
-    private ImageSize cachedImageSize;
-    private Date cachedImageSizeTime;
+    private ImageInfo cachedImageInfo;
+    private Date cachedImageInfoTime;
 
-    abstract InputStreamSource getInputStreamSource( );
+    public abstract InputStreamSource getInputStreamSource();
 
-    abstract String getUrlPathRelativeToContextPath( );
+    abstract String getUrlPathRelativeToContextPath();
 
-    public abstract String toStorageString( );
+    public abstract String toStorageString();
 
-    public abstract int getTypeId( );
+    public abstract int getTypeId();
 
-    public abstract Date getModifiedDatetime( );
+    public abstract Date getModifiedDatetime();
 
-    ImageSize getImageSize( ) throws IOException {
-        if ( getInputStreamSource().getSize( ) > 0 ) {
-            Date modifiedDatetime = getModifiedDatetime( );
-            if ( cachedImageSizeTime == null || modifiedDatetime.after(cachedImageSizeTime) ) {
-                cachedImageSize = getNonCachedImageSize();
-                cachedImageSizeTime = modifiedDatetime;
+    ImageSize getImageSize() throws IOException {
+        ImageInfo imageInfo = getImageInfo();
+        if (imageInfo != null) {
+            return new ImageSize(imageInfo.getWidth(), imageInfo.getHeight());
+        }
+
+        return new ImageSize(0, 0);
+    }
+
+    ImageInfo getImageInfo() throws IOException {
+        if (getInputStreamSource().getSize() > 0) {
+            Date modifiedDatetime = getModifiedDatetime();
+            if (cachedImageInfoTime == null || modifiedDatetime.after(cachedImageInfoTime)) {
+                cachedImageInfo = getNonCachedImageInfo();
+                cachedImageInfoTime = modifiedDatetime;
             }
-            return cachedImageSize;
+
+            return cachedImageInfo;
         }
-        return new ImageSize( 0, 0 );
+
+        return null;
     }
 
-    ImageSize getNonCachedImageSize( ) throws IOException {
-        return ImageSize.fromInputStream( getInputStreamSource( ).getInputStream( ) );
+    ImageInfo getNonCachedImageInfo() throws IOException {
+        InputStreamSource source = getInputStreamSource();
+
+        if (source instanceof FileInputStreamSource) {
+            File file = ((FileInputStreamSource) source).getFile();
+
+            return ImageOp.getImageInfo(Imcms.getServices().getConfig(), file);
+        }
+
+        return ImageOp.getImageInfo(Imcms.getServices().getConfig(), source.getInputStream());
     }
 
-    public boolean isEmpty( ) {
+    public String getCacheId() {
+        String id = getUrlPathRelativeToContextPath();
+
+        Date modified = getModifiedDatetime();
+
+        id += "_" + (modified != null ? modified.getTime() : "0");
+
+        InputStreamSource source = getInputStreamSource();
         try {
-            return getInputStreamSource().getSize() <= 0 ;
-        } catch ( IOException e ) {
-            return true ;
+            id += "_" + source.getSize();
+
+        } catch (IOException ex) {
+            id += "_0";
+        }
+
+        return id;
+    }
+
+    public boolean isEmpty() {
+        try {
+            return getInputStreamSource().getSize() <= 0;
+        } catch (IOException e) {
+            return true;
         }
     }
+
+    public String getNameWithoutExt() {
+        String name = getName();
+
+        int periodIndex = name.lastIndexOf('.');
+        if (periodIndex != -1) {
+            name = name.substring(0, periodIndex);
+        }
+
+        return name;
+    }
+
+    public abstract String getName();
 }
 
diff --git a/server/src/imcode/server/document/textdocument/ImagesPathRelativePathImageSource.java b/server/src/imcode/server/document/textdocument/ImagesPathRelativePathImageSource.java
index 4ad4cd0b67..268c78cbdc 100644
--- a/server/src/imcode/server/document/textdocument/ImagesPathRelativePathImageSource.java
+++ b/server/src/imcode/server/document/textdocument/ImagesPathRelativePathImageSource.java
@@ -11,23 +11,27 @@
 public class ImagesPathRelativePathImageSource extends ImageSource {
     private String path;
 
-    public ImagesPathRelativePathImageSource( String path ) {
-        this.path = path.replace('\\','/');
+    public ImagesPathRelativePathImageSource(String path) {
+        this.path = path.replace('\\', '/');
     }
 
-    public InputStreamSource getInputStreamSource( ) {
-        return new FileInputStreamSource( getFile( ) );
+    public static String getImagesUrlPath() {
+        return Imcms.getServices().getConfig().getImageUrl();
+    }
+
+    public InputStreamSource getInputStreamSource() {
+        return new FileInputStreamSource(getFile());
     }
 
-    private File getFile( ) {
-        ImcmsServices service = Imcms.getServices( );
-        File basePath = isAbsolute() ? Imcms.getPath() : service.getConfig( ).getImagePath( ); 
-        return new File( basePath, path );
+    private File getFile() {
+        ImcmsServices service = Imcms.getServices();
+        File basePath = isAbsolute() ? Imcms.getPath() : service.getConfig().getImagePath();
+        return new File(basePath, path);
     }
 
-    public String getUrlPathRelativeToContextPath( ) {
+    public String getUrlPathRelativeToContextPath() {
         if (!isAbsolute()) {
-            return getImagesUrlPath() + path ;
+            return getImagesUrlPath() + path;
         }
         return path;
     }
@@ -36,19 +40,19 @@ private boolean isAbsolute() {
         return path.startsWith("/");
     }
 
-    public static String getImagesUrlPath() {
-        return Imcms.getServices( ).getConfig( ).getImageUrl( );
-    }
-
-    public String toStorageString( ) {
+    public String toStorageString() {
         return path;
     }
 
-    public int getTypeId( ) {
+    public int getTypeId() {
         return ImageSource.IMAGE_TYPE_ID__IMAGES_PATH_RELATIVE_PATH;
     }
 
-    public Date getModifiedDatetime( ) {
-        return new Date( getFile( ).lastModified( ) );
+    public Date getModifiedDatetime() {
+        return new Date(getFile().lastModified());
+    }
+
+    public String getName() {
+        return new File(path).getName();
     }
 }
diff --git a/server/src/imcode/server/document/textdocument/MenuDomainObject.java b/server/src/imcode/server/document/textdocument/MenuDomainObject.java
index b91de794e4..91e3a080e2 100644
--- a/server/src/imcode/server/document/textdocument/MenuDomainObject.java
+++ b/server/src/imcode/server/document/textdocument/MenuDomainObject.java
@@ -1,21 +1,33 @@
 package imcode.server.document.textdocument;
 
+import imcode.server.document.DocumentComparator;
+import imcode.server.document.textdocument.MenuItemComparator.MenuItemDocumentComparator;
 import imcode.server.user.UserDomainObject;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.UnhandledException;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class MenuDomainObject implements Cloneable, Serializable {
 
-    private int id;
-    private int sortOrder;
-    private HashMap menuItems;
+    private static final MenuItemComparator ID = new MenuItemDocumentComparator(DocumentComparator.ID);
+    private static final MenuItemComparator HEADLINE = new MenuItemDocumentComparator(DocumentComparator.HEADLINE);
+    private static final MenuItemComparator MODIFIED_DATETIME = new MenuItemDocumentComparator(DocumentComparator.MODIFIED_DATETIME);
+    private static final MenuItemComparator PUBLISHED_DATETIME = new MenuItemDocumentComparator(DocumentComparator.PUBLICATION_START_DATETIME);
+    private static final MenuItemComparator SORT_KEY = new MenuItemComparator.SortKeyComparator();
+    private static final MenuItemComparator TREE_SORT_KEY = new MenuItemComparator.TreeSortKeyComparator();
 
     public final static int MENU_SORT_ORDER__BY_HEADLINE = 1;
     public final static int MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED = 2;
@@ -23,41 +35,42 @@ public class MenuDomainObject implements Cloneable, Serializable {
     public final static int MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER = 4;
     public final static int MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED = 5;
     public final static int MENU_SORT_ORDER__DEFAULT = MENU_SORT_ORDER__BY_HEADLINE;
-
     public final static int DEFAULT_SORT_KEY = 500;
     private static final int DEFAULT_SORT_KEY_INCREMENT = 10;
+    private int id;
+    private int sortOrder;
+    private HashMap<Integer, MenuItemDomainObject> menuItems;
 
     public MenuDomainObject() {
-        this( 0, MENU_SORT_ORDER__DEFAULT );
+        this(0, MENU_SORT_ORDER__DEFAULT);
     }
 
-    public Object clone() throws CloneNotSupportedException {
+    public MenuDomainObject(int id, int sortOrder) {
+        this.id = id;
+        this.sortOrder = sortOrder;
+        menuItems = new HashMap<>();
+    }
+
+    public MenuDomainObject clone() {
         try {
-            MenuDomainObject clone = (MenuDomainObject)super.clone() ;
-            clone.menuItems = new HashMap() ;
-            for ( Iterator iterator = menuItems.entrySet().iterator(); iterator.hasNext(); ) {
-                Map.Entry entry = (Map.Entry)iterator.next();
-                Integer documentId = (Integer)entry.getKey();
-                MenuItemDomainObject menuItem = (MenuItemDomainObject)entry.getValue();
-                clone.menuItems.put(documentId, menuItem.clone()) ;
+            MenuDomainObject clone = (MenuDomainObject) super.clone();
+            clone.menuItems = new HashMap<>();
+            for (Map.Entry<Integer, MenuItemDomainObject> entry : menuItems.entrySet()) {
+                Integer documentId = entry.getKey();
+                MenuItemDomainObject menuItem = entry.getValue();
+                clone.menuItems.put(documentId, menuItem.clone());
             }
-            return clone ;
-        } catch ( CloneNotSupportedException e ) {
-            throw new UnhandledException( e );
+            return clone;
+        } catch (CloneNotSupportedException e) {
+            throw new UnhandledException(e);
         }
     }
 
-    public MenuDomainObject( int id, int sortOrder ) {
-        this.id = id;
-        this.sortOrder = sortOrder;
-        menuItems = new HashMap();
-    }
-
     public int getId() {
         return id;
     }
 
-    public void setId( int id ) {
+    public void setId(int id) {
         this.id = id;
     }
 
@@ -65,54 +78,62 @@ public int getSortOrder() {
         return sortOrder;
     }
 
-    public MenuItemDomainObject[] getMenuItemsUserCanSee( UserDomainObject user ) {
-        List menuItemsUserCanSee = getMenuItemsVisibleToUser( user );
-        return (MenuItemDomainObject[])menuItemsUserCanSee.toArray( new MenuItemDomainObject[menuItemsUserCanSee.size()] );
+    public void setSortOrder(int sortOrder) {
+        switch (sortOrder) {
+            case MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED:
+            case MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER:
+            case MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED:
+            case MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED:
+            case MENU_SORT_ORDER__BY_HEADLINE:
+                this.sortOrder = sortOrder;
+                break;
+            default:
+                throw new IllegalArgumentException("Bad sort order. Use one of the constants.");
+        }
+    }
+
+    public MenuItemDomainObject[] getMenuItemsUserCanSee(UserDomainObject user) {
+        List menuItemsUserCanSee = getMenuItemsVisibleToUser(user);
+        return (MenuItemDomainObject[]) menuItemsUserCanSee.toArray(new MenuItemDomainObject[0]);
     }
 
-    List getMenuItemsVisibleToUser( UserDomainObject user ) {
+    List<MenuItemDomainObject> getMenuItemsVisibleToUser(UserDomainObject user) {
         MenuItemDomainObject[] menuItemsArray = getMenuItems();
-        List menuItemsUserCanSee = new ArrayList(this.menuItems.size()) ;
-        for ( int i = 0; i < menuItemsArray.length; i++ ) {
-            MenuItemDomainObject menuItem = menuItemsArray[i];
-            if (user.canSeeDocumentWhenEditingMenus( menuItem.getDocument() )) {
-                menuItemsUserCanSee.add(menuItem) ;
+        List<MenuItemDomainObject> menuItemsUserCanSee = new ArrayList<>(this.menuItems.size());
+        for (MenuItemDomainObject menuItem : menuItemsArray) {
+            if (user.canSeeDocumentWhenEditingMenus(menuItem.getDocument())) {
+                menuItemsUserCanSee.add(menuItem);
             }
         }
-        Collections.sort( menuItemsUserCanSee, getMenuItemComparatorForSortOrder( sortOrder ) );
+        menuItemsUserCanSee.sort(getMenuItemComparatorForSortOrder(sortOrder));
         return menuItemsUserCanSee;
     }
 
-    public MenuItemDomainObject[] getPublishedMenuItemsUserCanSee( UserDomainObject user ) {
-        List menuItems = getMenuItemsVisibleToUser( user ) ;
-        CollectionUtils.filter( menuItems, new Predicate() {
-            public boolean evaluate( Object object ) {
-                return ((MenuItemDomainObject)object).getDocument().isActive() ;
-            }
-        } );
-        return (MenuItemDomainObject[])menuItems.toArray( new MenuItemDomainObject[menuItems.size()] );
+    public MenuItemDomainObject[] getPublishedMenuItemsUserCanSee(UserDomainObject user) {
+        List<MenuItemDomainObject> menuItems = getMenuItemsVisibleToUser(user);
+        CollectionUtils.filter(menuItems, object -> object.getDocument().isActive());
+        return menuItems.toArray(new MenuItemDomainObject[0]);
     }
 
     public MenuItemDomainObject[] getMenuItems() {
         Set menuItemsUnsorted = getMenuItemsUnsorted();
-        MenuItemDomainObject[] menuItemsArray = (MenuItemDomainObject[]) menuItemsUnsorted.toArray(new MenuItemDomainObject[menuItemsUnsorted.size()]);
-        Arrays.sort( menuItemsArray, getMenuItemComparatorForSortOrder( sortOrder ) );
+        MenuItemDomainObject[] menuItemsArray = (MenuItemDomainObject[]) menuItemsUnsorted.toArray(new MenuItemDomainObject[0]);
+        Arrays.sort(menuItemsArray, getMenuItemComparatorForSortOrder(sortOrder));
         return menuItemsArray;
     }
 
     public Set getMenuItemsUnsorted() {
-        HashSet set = new HashSet();
-        for ( Iterator iterator = menuItems.values().iterator(); iterator.hasNext(); ) {
-            MenuItemDomainObject menuItem = (MenuItemDomainObject) iterator.next();
+        HashSet<MenuItemDomainObject> set = new HashSet<>();
+        for (MenuItemDomainObject menuItem : menuItems.values()) {
             if (null != menuItem.getDocument()) {
-                set.add(menuItem) ;
+                set.add(menuItem);
             }
         }
         return set;
     }
 
-    public void addMenuItem( MenuItemDomainObject menuItem ) {
-        if ( null == menuItem.getSortKey() ) {
+    public void addMenuItem(MenuItemDomainObject menuItem) {
+        if (null == menuItem.getSortKey()) {
             generateSortKey(menuItem);
         }
         if (null != menuItem.getDocument()) {
@@ -121,76 +142,57 @@ public void addMenuItem( MenuItemDomainObject menuItem ) {
     }
 
     public void addMenuItemUnchecked(MenuItemDomainObject menuItem) {
-        menuItems.put( new Integer(menuItem.getDocumentId()), menuItem );
+        menuItems.put(menuItem.getDocumentId(), menuItem);
     }
 
     private void generateSortKey(MenuItemDomainObject menuItem) {
         Integer maxSortKey = getMaxSortKey();
-        Integer sortKey;
-        if ( null != maxSortKey ) {
-            sortKey = new Integer( maxSortKey.intValue() + DEFAULT_SORT_KEY_INCREMENT );
+        int sortKey;
+        if (null != maxSortKey) {
+            sortKey = maxSortKey + DEFAULT_SORT_KEY_INCREMENT;
         } else {
-            sortKey = new Integer( DEFAULT_SORT_KEY );
+            sortKey = DEFAULT_SORT_KEY;
         }
         menuItem.setSortKey(sortKey);
     }
 
     private Integer getMaxSortKey() {
-        Collection menuItemSortKeys = CollectionUtils.collect( menuItems.values(), new Transformer() {
-            public Object transform( Object o ) {
-                return ( (MenuItemDomainObject)o ).getSortKey();
-            }
-        } );
-        if ( menuItemSortKeys.isEmpty() ) {
+        Collection<Integer> menuItemSortKeys = CollectionUtils.collect(menuItems.values(), MenuItemDomainObject::getSortKey);
+        if (menuItemSortKeys.isEmpty()) {
             return null;
         }
-        return (Integer)Collections.max( menuItemSortKeys );
-    }
-
-    private Comparator getMenuItemComparatorForSortOrder( int sortOrder ) {
-
-        Comparator comparator = MenuItemComparator.HEADLINE.chain( MenuItemComparator.ID );
-        if ( sortOrder == MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER ) {
-            comparator = MenuItemComparator.TREE_SORT_KEY.chain( comparator );
-        } else if ( sortOrder == MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED ) {
-            comparator = MenuItemComparator.SORT_KEY.reversed().chain( comparator );
-        } else if ( sortOrder == MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED ) {
-            comparator = MenuItemComparator.MODIFIED_DATETIME.reversed().chain( comparator );
-        } else if ( sortOrder == MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED ) {
-            comparator = MenuItemComparator.PUBLISHED_DATETIME.reversed().chain( comparator ) ;
+        return Collections.max(menuItemSortKeys);
+    }
+
+    private Comparator<MenuItemDomainObject> getMenuItemComparatorForSortOrder(int sortOrder) {
+        Comparator<MenuItemDomainObject> comparator = HEADLINE.chain(ID);
+        if (sortOrder == MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER) {
+            comparator = TREE_SORT_KEY.chain(comparator);
+        } else if (sortOrder == MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED) {
+            comparator = SORT_KEY.reversed().chain(comparator);
+        } else if (sortOrder == MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED) {
+            comparator = MODIFIED_DATETIME.reversed().chain(comparator);
+        } else if (sortOrder == MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED) {
+            comparator = PUBLISHED_DATETIME.reversed().chain(comparator);
         }
         return comparator;
     }
 
-    public void setSortOrder( int sortOrder ) {
-        switch ( sortOrder ) {
-            case MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED:
-            case MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER:
-            case MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED:
-            case MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED:
-            case MENU_SORT_ORDER__BY_HEADLINE:
-                this.sortOrder = sortOrder;
-                break;
-            default:
-                throw new IllegalArgumentException( "Bad sort order. Use one of the constants." );
-        }
-    }
-
-    public void removeMenuItemByDocumentId( int childId ) {
-        menuItems.remove( new Integer( childId )) ;
+    public void removeMenuItemByDocumentId(int childId) {
+        menuItems.remove(childId);
     }
 
-    public boolean equals( Object obj ) {
+    public boolean equals(Object obj) {
         if (!(obj instanceof MenuDomainObject)) {
-            return false ;
+            return false;
         }
-        MenuDomainObject otherMenu = (MenuDomainObject)obj;
-        return  new EqualsBuilder().append(sortOrder, otherMenu.sortOrder)
+        MenuDomainObject otherMenu = (MenuDomainObject) obj;
+        return new EqualsBuilder().append(sortOrder, otherMenu.sortOrder)
                 .append(menuItems, otherMenu.menuItems).isEquals();
     }
 
     public int hashCode() {
-        return new HashCodeBuilder().append(sortOrder).append(menuItems).toHashCode() ;
+        return new HashCodeBuilder().append(sortOrder).append(menuItems).toHashCode();
     }
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/document/textdocument/MenuItemComparator.java b/server/src/imcode/server/document/textdocument/MenuItemComparator.java
index 59dbe6aee0..8dc8707e75 100644
--- a/server/src/imcode/server/document/textdocument/MenuItemComparator.java
+++ b/server/src/imcode/server/document/textdocument/MenuItemComparator.java
@@ -3,54 +3,47 @@
 import com.imcode.util.ChainableReversibleNullComparator;
 import imcode.server.document.DocumentComparator;
 
-public abstract class MenuItemComparator extends ChainableReversibleNullComparator {
-
-    static final MenuItemComparator ID = new MenuItemDocumentComparator( DocumentComparator.ID );
-    static final MenuItemComparator HEADLINE = new MenuItemDocumentComparator( DocumentComparator.HEADLINE );
-    static final MenuItemComparator MODIFIED_DATETIME = new MenuItemDocumentComparator( DocumentComparator.MODIFIED_DATETIME );
-    static final MenuItemComparator PUBLISHED_DATETIME = new MenuItemDocumentComparator( DocumentComparator.PUBLICATION_START_DATETIME );
-    static final MenuItemComparator SORT_KEY = new SortKeyComparator();
-    static final MenuItemComparator TREE_SORT_KEY = new TreeSortKeyComparator();
+public abstract class MenuItemComparator extends ChainableReversibleNullComparator<MenuItemDomainObject> {
 
     public String toString() {
-        return getClass().getName() ;
+        return getClass().getName();
     }
 
-    public int compare( Object o1, Object o2 ) {
-        return compareMenuItems( (MenuItemDomainObject)o1, (MenuItemDomainObject)o2 );
+    public int compare(MenuItemDomainObject o1, MenuItemDomainObject o2) {
+        return compareMenuItems(o1, o2);
     }
 
-    abstract int compareMenuItems( MenuItemDomainObject menuItem1, MenuItemDomainObject menuItem2 );
+    abstract int compareMenuItems(MenuItemDomainObject menuItem1, MenuItemDomainObject menuItem2);
 
-    private static class TreeSortKeyComparator extends MenuItemComparator {
+    static class TreeSortKeyComparator extends MenuItemComparator {
 
-        int compareMenuItems( MenuItemDomainObject menuItem1, MenuItemDomainObject menuItem2 ) {
-            return menuItem1.getTreeSortKey().compareTo( menuItem2.getTreeSortKey() );
+        int compareMenuItems(MenuItemDomainObject menuItem1, MenuItemDomainObject menuItem2) {
+            return menuItem1.getTreeSortKey().compareTo(menuItem2.getTreeSortKey());
         }
     }
 
-    private static class SortKeyComparator extends MenuItemComparator {
+    static class SortKeyComparator extends MenuItemComparator {
 
-        int compareMenuItems( MenuItemDomainObject menuItem1, MenuItemDomainObject menuItem2 ) {
-            return menuItem1.getSortKey().compareTo( menuItem2.getSortKey() );
+        int compareMenuItems(MenuItemDomainObject menuItem1, MenuItemDomainObject menuItem2) {
+            return menuItem1.getSortKey().compareTo(menuItem2.getSortKey());
         }
     }
 
-    private static class MenuItemDocumentComparator extends MenuItemComparator {
+    static class MenuItemDocumentComparator extends MenuItemComparator {
 
         private DocumentComparator documentComparator;
 
-        private MenuItemDocumentComparator( DocumentComparator documentComparator ) {
+        MenuItemDocumentComparator(DocumentComparator documentComparator) {
             this.documentComparator = documentComparator;
         }
 
-        int compareMenuItems( MenuItemDomainObject menuItem1,
-                              MenuItemDomainObject menuItem2 ) {
-            return documentComparator.compare( menuItem1.getDocument(), menuItem2.getDocument() );
+        int compareMenuItems(MenuItemDomainObject menuItem1,
+                             MenuItemDomainObject menuItem2) {
+            return documentComparator.compare(menuItem1.getDocument(), menuItem2.getDocument());
         }
 
         public String toString() {
-            return getClass().getName()+": "+documentComparator.toString() ;
+            return getClass().getName() + ": " + documentComparator.toString();
         }
 
     }
diff --git a/server/src/imcode/server/document/textdocument/MenuItemDomainObject.java b/server/src/imcode/server/document/textdocument/MenuItemDomainObject.java
index 79992811db..1e4954625d 100644
--- a/server/src/imcode/server/document/textdocument/MenuItemDomainObject.java
+++ b/server/src/imcode/server/document/textdocument/MenuItemDomainObject.java
@@ -11,8 +11,8 @@ public class MenuItemDomainObject implements Cloneable, Serializable {
     private Integer sortKey;
     private TreeSortKeyDomainObject treeSortKey;
 
-    public MenuItemDomainObject( DocumentReference documentReference,
-                                 Integer sortKey, TreeSortKeyDomainObject treeSortKey ) {
+    public MenuItemDomainObject(DocumentReference documentReference,
+                                Integer sortKey, TreeSortKeyDomainObject treeSortKey) {
         this.documentReference = documentReference;
         this.sortKey = sortKey;
         this.treeSortKey = treeSortKey;
@@ -22,19 +22,19 @@ public MenuItemDomainObject(DocumentReference documentReference) {
         this(documentReference, null, new TreeSortKeyDomainObject(""));
     }
 
-    public boolean equals( Object o ) {
-        if ( this == o ) {
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof MenuItemDomainObject ) ) {
+        if (!(o instanceof MenuItemDomainObject)) {
             return false;
         }
 
-        final MenuItemDomainObject otherMenuItem = (MenuItemDomainObject)o;
+        final MenuItemDomainObject otherMenuItem = (MenuItemDomainObject) o;
 
         return sortKey.equals(otherMenuItem.sortKey)
-               && treeSortKey.equals(otherMenuItem.treeSortKey)
-               && documentReference.equals(otherMenuItem.documentReference);
+                && treeSortKey.equals(otherMenuItem.treeSortKey)
+                && documentReference.equals(otherMenuItem.documentReference);
     }
 
     public int hashCode() {
@@ -45,16 +45,24 @@ public Integer getSortKey() {
         return sortKey;
     }
 
+    public void setSortKey(Integer sortKey) {
+        this.sortKey = sortKey;
+    }
+
     public TreeSortKeyDomainObject getTreeSortKey() {
         return treeSortKey;
     }
 
+    public void setTreeSortKey(TreeSortKeyDomainObject treeSortKey) {
+        this.treeSortKey = treeSortKey;
+    }
+
     public DocumentReference getDocumentReference() {
         return documentReference;
     }
-    
-    protected Object clone() throws CloneNotSupportedException {
-        return super.clone();
+
+    protected MenuItemDomainObject clone() throws CloneNotSupportedException {
+        return (MenuItemDomainObject) super.clone();
     }
 
     public DocumentDomainObject getDocument() {
@@ -64,12 +72,4 @@ public DocumentDomainObject getDocument() {
     public int getDocumentId() {
         return documentReference.getDocumentId();
     }
-
-    public void setSortKey(Integer sortKey) {
-        this.sortKey = sortKey;
-    }
-
-    public void setTreeSortKey(TreeSortKeyDomainObject treeSortKey) {
-        this.treeSortKey = treeSortKey;
-    }
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/document/textdocument/NullImageSource.java b/server/src/imcode/server/document/textdocument/NullImageSource.java
index 07ccd1b9dd..3da092e28d 100644
--- a/server/src/imcode/server/document/textdocument/NullImageSource.java
+++ b/server/src/imcode/server/document/textdocument/NullImageSource.java
@@ -1,29 +1,33 @@
 package imcode.server.document.textdocument;
 
-import imcode.util.io.InputStreamSource;
 import imcode.util.io.EmptyInputStreamSource;
+import imcode.util.io.InputStreamSource;
 
 import java.util.Date;
 
 public class NullImageSource extends ImageSource {
-    public InputStreamSource getInputStreamSource( ) {
+    public InputStreamSource getInputStreamSource() {
         return new EmptyInputStreamSource();
     }
 
-    public String getUrlPathRelativeToContextPath( ) {
+    public String getUrlPathRelativeToContextPath() {
         return "";
     }
 
-    public String toStorageString( ) {
+    public String toStorageString() {
         return "";
     }
 
-    public int getTypeId( ) {
+    public int getTypeId() {
         return ImageSource.IMAGE_TYPE_ID__NULL;
     }
 
-    public Date getModifiedDatetime( ) {
+    public Date getModifiedDatetime() {
         return null;
     }
+
+    public String getName() {
+        return "";
+    }
 }
  
diff --git a/server/src/imcode/server/document/textdocument/TextDocumentDomainObject.java b/server/src/imcode/server/document/textdocument/TextDocumentDomainObject.java
index 5d980c8560..4ff91ea87e 100644
--- a/server/src/imcode/server/document/textdocument/TextDocumentDomainObject.java
+++ b/server/src/imcode/server/document/textdocument/TextDocumentDomainObject.java
@@ -1,5 +1,10 @@
 package imcode.server.document.textdocument;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+import com.imcode.imcms.domain.dto.export.FileDocumentSerializer;
+import com.imcode.imcms.domain.dto.export.TextDocumentSerializer;
 import com.imcode.imcms.mapping.DocumentMenusMap;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.DocumentTypeDomainObject;
@@ -7,36 +12,33 @@
 import imcode.util.LazilyLoadedObject;
 import org.apache.commons.lang.UnhandledException;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
+@JsonSerialize(using = TextDocumentSerializer.class)
 public class TextDocumentDomainObject extends DocumentDomainObject {
-	
-	/** 
-	 * Modified text indexes. 
-	 * 
-	 * Every modified text can be saved to history. 
-	 * This controlled by setting boolean flag.
-	 * 
-	 * Required when saving only particular set of text fields.
-	 */
-	private Map<Integer, Boolean> modifiedTextIndexes = new TreeMap<Integer, Boolean>();
-
-    private LazilyLoadedObject<CopyableHashMap> texts = new LazilyLoadedObject<CopyableHashMap>(new CopyableHashMapLoader());
-    private LazilyLoadedObject<CopyableHashMap> images = new LazilyLoadedObject<CopyableHashMap>(new CopyableHashMapLoader());
-    private LazilyLoadedObject<CopyableHashMap> includes = new LazilyLoadedObject<CopyableHashMap>(new CopyableHashMapLoader());
-    private LazilyLoadedObject<DocumentMenusMap> menus = new LazilyLoadedObject<DocumentMenusMap>(new LazilyLoadedObject.Loader<DocumentMenusMap>() {
-        public DocumentMenusMap load() {
-            return new DocumentMenusMap();
-        }
-    });
-    private LazilyLoadedObject<TemplateNames> templateNames = new LazilyLoadedObject<TemplateNames>(new LazilyLoadedObject.Loader<TemplateNames>() {
-        public TemplateNames load() {
-            return new TemplateNames();
-        }
-    });
+
+    /**
+     * Modified text indexes.
+     * <p>
+     * Every modified text can be saved to history.
+     * This controlled by setting boolean flag.
+     * <p>
+     * Required when saving only particular set of text fields.
+     */
+    private Map<Integer, Boolean> modifiedTextIndexes = new TreeMap<>();
+
+    private LazilyLoadedObject<CopyableHashMap<Integer, TextDomainObject>> texts = new LazilyLoadedObject<>(new Attributes.CopyableHashMapLoader<>());
+    private LazilyLoadedObject<CopyableHashMap<Integer, ImageDomainObject>> images = new LazilyLoadedObject<>(new Attributes.CopyableHashMapLoader<>());
+    private LazilyLoadedObject<CopyableHashMap<Integer, Integer>> includes = new LazilyLoadedObject<>(new Attributes.CopyableHashMapLoader<>());
+    private LazilyLoadedObject<DocumentMenusMap> menus = new LazilyLoadedObject<>(DocumentMenusMap::new);
+    private LazilyLoadedObject<TemplateNames> templateNames = new LazilyLoadedObject<>(TemplateNames::new);
 
     public TextDocumentDomainObject() {
-        this(ID_NEW) ;
+        this(ID_NEW);
     }
 
     public TextDocumentDomainObject(int documentId) {
@@ -54,174 +56,158 @@ public void loadAllLazilyLoaded() {
     }
 
     public Object clone() throws CloneNotSupportedException {
-        TextDocumentDomainObject clone = (TextDocumentDomainObject)super.clone();
-        clone.texts = (LazilyLoadedObject) texts.clone();
-        clone.images = (LazilyLoadedObject) images.clone();
-        clone.includes = (LazilyLoadedObject) includes.clone();
-        clone.menus = (LazilyLoadedObject) menus.clone() ;
-        clone.templateNames = (LazilyLoadedObject) templateNames.clone() ;
+        TextDocumentDomainObject clone = (TextDocumentDomainObject) super.clone();
+        clone.texts = texts.clone();
+        clone.images = images.clone();
+        clone.includes = includes.clone();
+        clone.menus = menus.clone();
+        clone.templateNames = templateNames.clone();
         return clone;
     }
 
     public DocumentTypeDomainObject getDocumentType() {
-        return DocumentTypeDomainObject.TEXT ;
+        return DocumentTypeDomainObject.TEXT;
     }
 
     public Set getChildDocumentIds() {
-        Set childDocuments = new HashSet() ;
-        for ( Iterator iterator = getMenus().values().iterator(); iterator.hasNext(); ) {
-            MenuDomainObject menu = (MenuDomainObject)iterator.next();
-            MenuItemDomainObject[] menuItems = menu.getMenuItems() ;
-            for ( int i = 0; i < menuItems.length; i++ ) {
-                MenuItemDomainObject menuItem = menuItems[i];
-                childDocuments.add( new Integer(menuItem.getDocumentId()) ) ;
+        Set<Integer> childDocuments = new HashSet<>();
+
+        for (MenuDomainObject menu : getMenus().values()) {
+            MenuItemDomainObject[] menuItems = menu.getMenuItems();
+            for (MenuItemDomainObject menuItem : menuItems) {
+                childDocuments.add(menuItem.getDocumentId());
             }
         }
-        return childDocuments ;
+        return childDocuments;
     }
 
-    public ImageDomainObject getImage( int imageIndex ) {
-        ImageDomainObject image = (ImageDomainObject)getImagesMap().get( new Integer( imageIndex )) ;
+    public ImageDomainObject getImage(int imageIndex) {
+        ImageDomainObject image = images.get().get(imageIndex);
         if (null == image) {
-            image = new ImageDomainObject() ;
+            image = new ImageDomainObject();
         }
-        return image ;
-    }
-
-    private Map getImagesMap() {
-        return (Map) images.get();
+        return image;
     }
 
-    public Integer getIncludedDocumentId( int includeIndex ) {
-        return (Integer)getIncludesMap().get( new Integer( includeIndex ) );
+    public Integer getIncludedDocumentId(int includeIndex) {
+        return includes.get().get(includeIndex);
     }
 
-    private Map getIncludesMap() {
-        return (Map) includes.get();
-    }
-
-    public MenuDomainObject getMenu( int menuIndex ) {
-        Map menusMap = (Map) menus.get();
-        MenuDomainObject menu = (MenuDomainObject) menusMap.get( new Integer( menuIndex ) );
+    public MenuDomainObject getMenu(int menuIndex) {
+        Map menusMap = menus.get();
+        MenuDomainObject menu = (MenuDomainObject) menusMap.get(menuIndex);
         if (null == menu) {
-            menu = new MenuDomainObject() ;
-            setMenu( menuIndex, menu );
+            menu = new MenuDomainObject();
+            setMenu(menuIndex, menu);
         }
         return menu;
     }
 
-    public TextDomainObject getText( int textFieldIndex ) {
-        return (TextDomainObject)getTextsMap().get( new Integer( textFieldIndex ) );
-    }
-
-    private Map getTextsMap() {
-        return (Map)texts.get();
+    public TextDomainObject getText(int textFieldIndex) {
+        return texts.get().get(textFieldIndex);
     }
 
-    public void accept( DocumentVisitor documentVisitor ) {
-        documentVisitor.visitTextDocument(this) ;
+    public void accept(DocumentVisitor documentVisitor) {
+        documentVisitor.visitTextDocument(this);
     }
 
     public void removeAllImages() {
-        getImagesMap().clear();
+        images.get().clear();
     }
 
     public void removeAllIncludes() {
-        getIncludesMap().clear();
+        includes.get().clear();
     }
 
     public void removeAllMenus() {
-        getMenusMap().clear();
-    }
-
-    private Map getMenusMap() {
-        return (Map) menus.get();
+        menus.get().clear();
     }
 
     public void removeAllTexts() {
-        getTextsMap().clear();
+        texts.get().clear();
     }
 
-    public void setInclude( int includeIndex, int includedDocumentId ) {
-        getIncludesMap().put( new Integer( includeIndex ), new Integer( includedDocumentId ) );
+    public void setInclude(int includeIndex, int includedDocumentId) {
+        includes.get().put(includeIndex, includedDocumentId);
     }
 
-    public void setMenu( int menuIndex, MenuDomainObject menu ) {
-        getMenusMap().put( new Integer( menuIndex ), menu );
+    public void setMenu(int menuIndex, MenuDomainObject menu) {
+        menus.get().put(menuIndex, menu);
     }
 
-    public void setText( int textIndex, TextDomainObject text ) {
-        getTextsMap().put( new Integer( textIndex ), text );
+    public void setText(int textIndex, TextDomainObject text) {
+        texts.get().put(textIndex, text);
     }
 
     /**
-     * @return Map<Integer, {@link ImageDomainObject} *
-     */
+     * @return Map<Integer ,   { @ link   ImageDomainObject }   *
+          */
     public Map<Integer, ImageDomainObject> getImages() {
-        return Collections.unmodifiableMap( getImagesMap() );
+        return Collections.unmodifiableMap(images.get());
     }
 
     public Map getIncludes() {
-        return Collections.unmodifiableMap( getIncludesMap() );
+        return Collections.unmodifiableMap(includes.get());
     }
 
     public Map<Integer, MenuDomainObject> getMenus() {
-        return Collections.unmodifiableMap( getMenusMap() );
+        return Collections.unmodifiableMap(menus.get());
     }
 
     public String getTemplateName() {
         return getTemplateNames().getTemplateName();
     }
 
+    public void setTemplateName(String templateName) {
+        getTemplateNames().setTemplateName(templateName);
+    }
+
     private TemplateNames getTemplateNames() {
-        return (TemplateNames) templateNames.get();
+        return templateNames.get();
     }
 
     public int getTemplateGroupId() {
         return getTemplateNames().getTemplateGroupId();
     }
 
-    public Map<Integer, TextDomainObject> getTexts() {
-        return Collections.unmodifiableMap( getTextsMap() );
-    }
-
-    public void setTemplateName( String templateName ) {
-        getTemplateNames().setTemplateName(templateName);
+    public void setTemplateGroupId(int v) {
+        getTemplateNames().setTemplateGroupId(v);
     }
 
-    public void setTemplateGroupId( int v ) {
-        getTemplateNames().setTemplateGroupId(v);
+    public Map<Integer, TextDomainObject> getTexts() {
+        return Collections.unmodifiableMap(texts.get());
     }
 
-    public void setImage( int imageIndex, ImageDomainObject image ) {
-        getImagesMap().put( new Integer( imageIndex ), image ) ;
+    public void setImage(int imageIndex, ImageDomainObject image) {
+        image.setImageIndex(imageIndex);
+        images.get().put(imageIndex, image);
     }
 
     public String getDefaultTemplateName() {
         return getTemplateNames().getDefaultTemplateName();
     }
 
-    public void setDefaultTemplateId( String defaultTemplateId ) {
+    public void setDefaultTemplateId(String defaultTemplateId) {
         getTemplateNames().setDefaultTemplateName(defaultTemplateId);
     }
 
-    public void removeInclude( int includeIndex ) {
-        getIncludesMap().remove( new Integer( includeIndex )) ;
+    public void removeInclude(int includeIndex) {
+        includes.get().remove(includeIndex);
     }
 
-    public void setLazilyLoadedMenus(LazilyLoadedObject menus) {
+    public void setLazilyLoadedMenus(LazilyLoadedObject<DocumentMenusMap> menus) {
         this.menus = menus;
     }
 
     public void setLazilyLoadedImages(LazilyLoadedObject images) {
-        this.images = images ;
+        this.images = images;
     }
 
     public void setLazilyLoadedIncludes(LazilyLoadedObject includes) {
-        this.includes = includes ;
+        this.includes = includes;
     }
 
-    public void setLazilyLoadedTexts(LazilyLoadedObject texts) {
+    public void setLazilyLoadedTexts(LazilyLoadedObject<CopyableHashMap<Integer, TextDomainObject>> texts) {
         this.texts = texts;
     }
 
@@ -241,32 +227,42 @@ public void setDefaultTemplateIdForRestricted2(String defaultTemplateIdForRestri
         getTemplateNames().setDefaultTemplateNameForRestricted2(defaultTemplateIdForRestricted2);
     }
 
-    public void setLazilyLoadedTemplateIds(LazilyLoadedObject templateIds) {
+    public void setLazilyLoadedTemplateIds(LazilyLoadedObject<TemplateNames> templateIds) {
         this.templateNames = templateIds;
     }
 
-    private static class CopyableHashMapLoader implements LazilyLoadedObject.Loader<CopyableHashMap> {
+    public Map<Integer, Boolean> getModifiedTextIndexes() {
+        return modifiedTextIndexes;
+    }
 
-        public CopyableHashMap load() {
-            return new CopyableHashMap();
-        }
+    public void addModifiedTextIndex(int index, boolean saveToHistory) {
+        modifiedTextIndexes.put(index, saveToHistory);
+    }
+
+    public void removeModifiedTextIndex(int index) {
+        modifiedTextIndexes.remove(index);
     }
 
+    public void removeAllModifiedTextIndexs() {
+        modifiedTextIndexes.clear();
+    }
+
+
     public static class TemplateNames implements LazilyLoadedObject.Copyable<TemplateNames>, Cloneable {
         private String templateName;
         private int templateGroupId;
         private String defaultTemplateName;
-        private String defaultTemplateNameForRestricted1 ;
-        private String defaultTemplateNameForRestricted2 ;
+        private String defaultTemplateNameForRestricted1;
+        private String defaultTemplateNameForRestricted2;
 
         public TemplateNames copy() {
-            return (TemplateNames) clone() ;
+            return (TemplateNames) clone();
         }
 
         public Object clone() {
             try {
                 return super.clone();
-            } catch ( CloneNotSupportedException e ) {
+            } catch (CloneNotSupportedException e) {
                 throw new UnhandledException(e);
             }
         }
@@ -311,21 +307,4 @@ public void setDefaultTemplateNameForRestricted2(String defaultTemplateNameForRe
             this.defaultTemplateNameForRestricted2 = defaultTemplateNameForRestricted2;
         }
     }
-
-    
-	public Map<Integer, Boolean> getModifiedTextIndexes() {
-		return modifiedTextIndexes;
-	}
-	
-	public void addModifiedTextIndex(int index, boolean saveToHistory) {
-		modifiedTextIndexes.put(index, saveToHistory);
-	}
-	
-	public void removeModifiedTextIndex(int index) {
-		modifiedTextIndexes.remove(index);
-	}
-	
-	public void removeAllModifiedTextIndexs() {
-		modifiedTextIndexes.clear();
-	}	
-}
\ No newline at end of file
+}
diff --git a/server/src/imcode/server/document/textdocument/TextDomainObject.java b/server/src/imcode/server/document/textdocument/TextDomainObject.java
index 47b1650768..df6b470d4f 100644
--- a/server/src/imcode/server/document/textdocument/TextDomainObject.java
+++ b/server/src/imcode/server/document/textdocument/TextDomainObject.java
@@ -1,29 +1,26 @@
 package imcode.server.document.textdocument;
 
 import imcode.util.Parser;
-
-import java.io.Serializable;
-
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-public class TextDomainObject implements Serializable {
-
-    String text;
-    int type;
+import java.io.Serializable;
 
-    /* Text-types. */
+public class TextDomainObject implements Serializable {
 
     /**
      * Plain text, with linebreaks. *
      */
     public final static int TEXT_TYPE_PLAIN = 0;
-
     /**
      * HTML-code. *
      */
     public final static int TEXT_TYPE_HTML = 1;
 
+    /* Text-types. */
+    String text;
+    int type;
+
     public TextDomainObject(String text) {
         this(text, TEXT_TYPE_PLAIN);
     }
@@ -34,9 +31,9 @@ public TextDomainObject(String text) {
      * @param text The text
      * @param type The type of the text.
      */
-    public TextDomainObject( String text, int type ) {
-        setText( text );
-        setType( type );
+    public TextDomainObject(String text, int type) {
+        setText(text);
+        setType(type);
     }
 
     /**
@@ -53,7 +50,7 @@ public String getText() {
      *
      * @param text Value to assign to text
      */
-    public void setText( String text ) {
+    public void setText(String text) {
         this.text = text;
     }
 
@@ -71,14 +68,14 @@ public int getType() {
      *
      * @param type Value to assign to type
      */
-    public void setType( int type ) {
-        switch ( type ) {
+    public void setType(int type) {
+        switch (type) {
             case TEXT_TYPE_PLAIN:
             case TEXT_TYPE_HTML:
                 this.type = type;
                 break;
             default:
-                throw new IllegalArgumentException( "Illegal text-type." );
+                throw new IllegalArgumentException("Illegal text-type.");
         }
     }
 
@@ -91,29 +88,29 @@ public String toString() {
 
     public String toHtmlString() {
         String result = getText();
-        if ( getType() == TEXT_TYPE_PLAIN ) {
+        if (getType() == TEXT_TYPE_PLAIN) {
             String[] vp = new String[]{
-                "&", "&amp;",
-                "<", "&lt;",
-                ">", "&gt;",
-                "\"", "&quot;",
-                "\r\n", "\n",
-                "\r", "\n",
-                "\n", "<br />\n",
+                    "&", "&amp;",
+                    "<", "&lt;",
+                    ">", "&gt;",
+                    "\"", "&quot;",
+                    "\r\n", "\n",
+                    "\r", "\n",
+                    "\n", "<br />\n",
             };
-            result = Parser.parseDoc( result, vp );
+            result = Parser.parseDoc(result, vp);
         }
         return result;
     }
 
-    public boolean equals( Object obj ) {
-        if ( !( obj instanceof TextDomainObject ) ) {
+    public boolean equals(Object obj) {
+        if (!(obj instanceof TextDomainObject)) {
             return false;
         }
-        final TextDomainObject o = (TextDomainObject)obj;
+        final TextDomainObject o = (TextDomainObject) obj;
         return new EqualsBuilder().append(text, o.getText())
                 .append(type, o.getType()).isEquals();
-        }
+    }
 
     public int hashCode() {
         return new HashCodeBuilder().append(type)
diff --git a/server/src/imcode/server/document/textdocument/TreeSortKeyDomainObject.java b/server/src/imcode/server/document/textdocument/TreeSortKeyDomainObject.java
index 154055ad21..bed5f45879 100644
--- a/server/src/imcode/server/document/textdocument/TreeSortKeyDomainObject.java
+++ b/server/src/imcode/server/document/textdocument/TreeSortKeyDomainObject.java
@@ -1,8 +1,8 @@
 package imcode.server.document.textdocument;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.NullArgumentException;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
@@ -15,58 +15,63 @@ public class TreeSortKeyDomainObject implements Comparable, Serializable {
 
     private final int[] keys;
 
-    public TreeSortKeyDomainObject( String treeSortKey ) {
+    public TreeSortKeyDomainObject(String treeSortKey) {
         if (null == treeSortKey) {
             throw new NullArgumentException("treeSortKey");
         }
-        String[] keyStrings = treeSortKey.trim().split( "\\D+",0 ) ;
-        List keyList = new ArrayList() ;
+        String[] keyStrings = treeSortKey.trim().split("\\D+", 0);
+        List keyList = new ArrayList();
         for (int i = 0; i < keyStrings.length; ++i) {
             String keyString = keyStrings[i];
             try {
-                Integer key = Integer.valueOf(keyString) ;
-                keyList.add( key );
-            } catch( NumberFormatException ignored ) {}
+                Integer key = Integer.valueOf(keyString);
+                keyList.add(key);
+            } catch (NumberFormatException ignored) {
+            }
         }
-        keys = ArrayUtils.toPrimitive( (Integer[])keyList.toArray( new Integer[keyList.size()] )) ;
+        keys = ArrayUtils.toPrimitive((Integer[]) keyList.toArray(new Integer[keyList.size()]));
     }
 
     public int getLevelCount() {
-        return keys.length ;
+        return keys.length;
     }
 
-    public int getLevelKey( int level ) {
+    public int getLevelKey(int level) {
         try {
-            return keys[level] ;
+            return keys[level];
         } catch (ArrayIndexOutOfBoundsException e) {
-            throw new NoSuchElementException() ;
+            throw new NoSuchElementException();
         }
     }
 
     public String toString() {
-        return StringUtils.join( ArrayUtils.toObject( keys ), '.' );
+        return StringUtils.join(ArrayUtils.toObject(keys), '.');
     }
 
-    public int compareTo( Object o ) {
-        int[] keys1 = keys ;
-        int[] keys2 = ((TreeSortKeyDomainObject)o).keys ;
+    public int compareTo(Object o) {
+        int[] keys1 = keys;
+        int[] keys2 = ((TreeSortKeyDomainObject) o).keys;
 
-        return compareIntArrays( keys1, keys2 );
+        return compareIntArrays(keys1, keys2);
     }
 
-    private int compareIntArrays( int[] keys1, int[] keys2 ) {
-        for ( int i = 0; i < keys1.length && i < keys2.length; i++ ) {
-            int difference = keys1[i] - keys2[i] ;
+    private int compareIntArrays(int[] keys1, int[] keys2) {
+        for (int i = 0; i < keys1.length && i < keys2.length; i++) {
+            int difference = keys1[i] - keys2[i];
             if (0 != difference) {
-                return difference ;
+                return difference;
             }
         }
-        return keys1.length - keys2.length ;
+        return keys1.length - keys2.length;
     }
 
     public boolean equals(Object o) {
-        if (this == o) { return true; }
-        if (o == null || getClass() != o.getClass()) { return false;}
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         final TreeSortKeyDomainObject that = (TreeSortKeyDomainObject) o;
 
diff --git a/server/src/imcode/server/kerberos/EstablishContextAction.java b/server/src/imcode/server/kerberos/EstablishContextAction.java
new file mode 100644
index 0000000000..c6eff12122
--- /dev/null
+++ b/server/src/imcode/server/kerberos/EstablishContextAction.java
@@ -0,0 +1,64 @@
+package imcode.server.kerberos;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.GSSManager;
+
+import java.security.PrivilegedAction;
+
+
+class EstablishContextAction implements PrivilegedAction<EstablishContextResult> {
+    private static final Logger log = LogManager.getLogger(EstablishContextAction.class);
+
+    private final byte[] requestToken;
+
+
+    public EstablishContextAction(byte[] requestToken) {
+        this.requestToken = requestToken;
+    }
+
+
+    public EstablishContextResult run() {
+        GSSContext context = null;
+
+        try {
+            GSSManager manager = GSSManager.getInstance();
+            context = manager.createContext((GSSCredential) null);
+
+            byte[] responseToken = context.acceptSecContext(requestToken, 0, requestToken.length);
+
+            EstablishContextResult result = new EstablishContextResult();
+            result.setSpnegoResponseToken(responseToken);
+            result.setEstablished(context.isEstablished());
+
+            if (context.isEstablished()) {
+                result.setClientPrincipalName(context.getSrcName().toString());
+            }
+
+            return result;
+
+        } catch (GSSException ex) {
+            if (ex.getMajor() == GSSException.DEFECTIVE_TOKEN) {
+                log.warn("Major: " + ex.getMajorString());
+                log.warn("Minor: " + ex.getMinorString());
+                return null;
+            }
+
+            log.error(ex.getMessage(), ex);
+
+        } finally {
+            if (context != null) {
+                try {
+                    context.dispose();
+                } catch (GSSException ex) {
+                    log.error(ex.getMessage(), ex);
+                }
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/server/src/imcode/server/kerberos/EstablishContextResult.java b/server/src/imcode/server/kerberos/EstablishContextResult.java
new file mode 100644
index 0000000000..28d59f801a
--- /dev/null
+++ b/server/src/imcode/server/kerberos/EstablishContextResult.java
@@ -0,0 +1,37 @@
+package imcode.server.kerberos;
+
+
+class EstablishContextResult {
+    private boolean established;
+    private byte[] spnegoResponseToken;
+    private String clientPrincipalName;
+
+
+    public EstablishContextResult() {
+    }
+
+
+    public String getClientPrincipalName() {
+        return clientPrincipalName;
+    }
+
+    public void setClientPrincipalName(String clientPrincipalName) {
+        this.clientPrincipalName = clientPrincipalName;
+    }
+
+    public boolean isEstablished() {
+        return established;
+    }
+
+    public void setEstablished(boolean established) {
+        this.established = established;
+    }
+
+    public byte[] getSpnegoResponseToken() {
+        return spnegoResponseToken;
+    }
+
+    public void setSpnegoResponseToken(byte[] spnegoResponseToken) {
+        this.spnegoResponseToken = spnegoResponseToken;
+    }
+}
diff --git a/server/src/imcode/server/kerberos/KerberosLoginResult.java b/server/src/imcode/server/kerberos/KerberosLoginResult.java
new file mode 100644
index 0000000000..b8de635707
--- /dev/null
+++ b/server/src/imcode/server/kerberos/KerberosLoginResult.java
@@ -0,0 +1,28 @@
+package imcode.server.kerberos;
+
+import com.imcode.imcms.api.ContentManagementSystem;
+
+public class KerberosLoginResult {
+    private KerberosLoginStatus status;
+    private ContentManagementSystem contentManagementSystem;
+
+    public KerberosLoginResult(KerberosLoginStatus status) {
+        this.status = status;
+    }
+
+    public ContentManagementSystem getContentManagementSystem() {
+        return contentManagementSystem;
+    }
+
+    public void setContentManagementSystem(ContentManagementSystem contentManagementSystem) {
+        this.contentManagementSystem = contentManagementSystem;
+    }
+
+    public KerberosLoginStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(KerberosLoginStatus status) {
+        this.status = status;
+    }
+}
diff --git a/server/src/imcode/server/kerberos/KerberosLoginService.java b/server/src/imcode/server/kerberos/KerberosLoginService.java
new file mode 100644
index 0000000000..b2ef3a17e3
--- /dev/null
+++ b/server/src/imcode/server/kerberos/KerberosLoginService.java
@@ -0,0 +1,320 @@
+package imcode.server.kerberos;
+
+import com.imcode.imcms.api.ContentManagementSystem;
+import com.imcode.imcms.api.User;
+import imcode.server.Config;
+import imcode.server.Imcms;
+import imcode.server.ImcmsServices;
+import imcode.server.user.UserDomainObject;
+import imcode.util.Utility;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.security.auth.Subject;
+import javax.security.auth.kerberos.KerberosPrincipal;
+import javax.security.auth.kerberos.KerberosTicket;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public class KerberosLoginService {
+    private static final Logger log = LogManager.getLogger(KerberosLoginService.class);
+
+    private static final String NEGOTIATE_PREFIX = "Negotiate ";
+
+    private static final String AUTHORIZATION_HEADER = "Authorization";
+
+    private static final String AUTHENTICATE_HEADER = "WWW-Authenticate";
+
+
+    private Config config;
+
+    private transient boolean loggedIn;
+
+    private transient LoginContext loginContext;
+
+
+    public KerberosLoginService(Config config) {
+        this.config = config;
+
+        if (config.isSsoEnabled()) {
+            initLoginContext();
+        }
+    }
+
+    private static KerberosLoginResult resultNegotiate(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        response.setHeader(AUTHENTICATE_HEADER, "Negotiate");
+
+        return resultContinue(request, response);
+    }
+
+    private static KerberosLoginResult resultContinue(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        Utility.forwardToLogin(request, response, HttpServletResponse.SC_UNAUTHORIZED);
+
+        return new KerberosLoginResult(KerberosLoginStatus.CONTINUE);
+    }
+
+    private static KerberosLoginResult resultFailed(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        Utility.forwardToLogin(request, response);
+
+        return new KerberosLoginResult(KerberosLoginStatus.FAILED);
+    }
+
+    private synchronized void initLoginContext() {
+        dispose();
+
+        if (log.isDebugEnabled()) {
+            log.debug("Logging in to the KDC");
+        }
+
+//        if (loggedIn) {
+//            if (log.isDebugEnabled()) {
+//                log.debug("Already logged in to the KDC");
+//            }
+//
+//            return;
+//        }
+
+        try {
+            LoginCallbackHandler callback = new LoginCallbackHandler(config.getSsoJaasPrincipalPassword());
+            loginContext = new LoginContext(config.getSsoJaasConfigName(), callback);
+            loginContext.login();
+
+            loggedIn = true;
+
+            Subject serviceSubject = loginContext.getSubject();
+
+            for (KerberosTicket ticket : serviceSubject.getPrivateCredentials(KerberosTicket.class)) {
+                log.info("AuthTime: " + ticket.getAuthTime());
+                log.info("StartTime: " + ticket.getStartTime());
+                log.info("EndTime: " + ticket.getEndTime());
+                log.info("RenewTill: " + ticket.getRenewTill());
+
+                KerberosPrincipal client = ticket.getClient();
+                log.info("Client: name=" + client.getName() + ", realm=" + client.getRealm());
+
+                KerberosPrincipal server = ticket.getServer();
+                log.info("Server: name=" + server.getName() + ", realm=" + server.getRealm());
+            }
+
+            if (log.isDebugEnabled()) {
+                log.debug("Successfully logged in to the KDC");
+            }
+        } catch (LoginException ex) {
+            log.error("Failed to login to the KDC" + ex.getMessage(), ex);
+        }
+    }
+
+    public void dispose() {
+        disposeLoginContext();
+    }
+
+    private void disposeLoginContext() {
+        if (loginContext != null && loggedIn) {
+            log.debug("Logging out from KDC");
+            try {
+                loginContext.logout();
+                loginContext = null;
+                loggedIn = false;
+            } catch (LoginException ex) {
+                log.error("KDC logout failed: " + ex.getMessage(), ex);
+            }
+        }
+    }
+
+    public KerberosLoginResult login(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        if (log.isDebugEnabled()) {
+            log.debug("Authenticating web user");
+        }
+
+        initLoginContext();
+
+        if (!loggedIn) {
+            if (log.isDebugEnabled()) {
+                log.error("Unable to authenticating web user - not logged it to the KDC");
+            }
+
+            // Couldn't authenticate to KDC as a Kerberos service.
+            return resultFailed(request, response);
+        }
+
+        String auth = StringUtils.trimToNull(request.getHeader(AUTHORIZATION_HEADER));
+
+        if (auth == null || !auth.startsWith(NEGOTIATE_PREFIX)) {
+            // Missing SPNEGO Negotiate token
+            log.info(String.format("Missing SPNEGO Negotiate token, returning NEGOTIATE. %s is %s",
+                    AUTHORIZATION_HEADER, auth));
+            return resultNegotiate(request, response);
+        }
+
+        auth = auth.substring(NEGOTIATE_PREFIX.length());
+
+        byte[] spnegoReqToken = Base64.decodeBase64(auth.getBytes(StandardCharsets.UTF_8));
+
+        if (spnegoReqToken == null || spnegoReqToken.length == 0) {
+            // Missing SPNEGO Negotiate token
+            log.info("Missing SPNEGO Negotiate token, returning NEGOTIATE");
+            return resultNegotiate(request, response);
+        }
+
+        if (isNTLMSSPBlob(spnegoReqToken, 0)) {
+            log.warn("Client sent an NTLMSSP security blob");
+        }
+
+        EstablishContextResult authResult = authenticate(spnegoReqToken);
+
+        if (authResult == null) {
+            log.warn("Web user authentication failed (authResult is null)");
+            return resultFailed(request, response);
+        }
+
+        if (authResult.getSpnegoResponseToken() != null) {
+            // Send back the SPNEGO response token if we have one
+            byte[] data = Base64.encodeBase64(authResult.getSpnegoResponseToken());
+            String authenticateHeader = NEGOTIATE_PREFIX + new String(data, StandardCharsets.UTF_8);
+            response.setHeader(AUTHENTICATE_HEADER, authenticateHeader);
+
+            if (log.isDebugEnabled()) {
+                log.debug(String.format("Sending back SPNEGO response token: %s=%s ", AUTHENTICATE_HEADER, authenticateHeader));
+            }
+        }
+
+        if (!authResult.isEstablished()) {
+            log.warn("Web user authentication failed (authResult.isEstablished() is false)");
+            return resultContinue(request, response);
+        }
+
+        return loginToImcms(authResult, request, response);
+    }
+
+    private KerberosLoginResult loginToImcms(EstablishContextResult authResult, HttpServletRequest request,
+                                             HttpServletResponse response) throws ServletException, IOException {
+
+        String principalName = authResult.getClientPrincipalName();
+        log.info("web user (client) principal name: " + principalName);
+
+        ImcmsServices services = Imcms.getServices();
+        UserDomainObject user = services.verifyUser(principalName);
+
+        if (user == null || user.isDefaultUser()) {
+            log.warn(String.format("Unable to authenticate web user (principal) %s. Outcome: %s", principalName, user));
+            return resultFailed(request, response);
+        }
+
+        ContentManagementSystem cms = Utility.initRequestWithApi(request, user);
+
+        if (config.isDenyMultipleUserLogin()) {
+            User currentUser = cms.getCurrentUser();
+            currentUser.setSessionId(request.getSession().getId());
+            cms.getUserService().updateUserSession(currentUser);
+        }
+
+        Utility.makeUserLoggedIn(request, response, user);
+
+        KerberosLoginResult loginResult = new KerberosLoginResult(KerberosLoginStatus.SUCCESS);
+        loginResult.setContentManagementSystem(cms);
+
+        return loginResult;
+    }
+
+    private EstablishContextResult authenticate(byte[] spnegoReqToken) {
+        try {
+            EstablishContextAction action = new EstablishContextAction(spnegoReqToken);
+
+            return Subject.doAs(loginContext.getSubject(), action);
+
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if a security blob starts with the NTLMSSP signature
+     *
+     * @param byts   byte[]
+     * @param offset int
+     * @return boolean
+     */
+    private boolean isNTLMSSPBlob(byte[] byts, int offset) {
+        // Check if the blob has the NTLMSSP signature
+
+        boolean isNTLMSSP = false;
+
+        if ((byts.length - offset) >= NTLM.Signature.length) {
+
+            if (log.isDebugEnabled())
+                log.debug("Checking if the blob has the NTLMSSP signature.");
+            // Check for the NTLMSSP signature
+
+            int idx = 0;
+            while (idx < NTLM.Signature.length && byts[offset + idx] == NTLM.Signature[idx])
+                idx++;
+
+            if (idx == NTLM.Signature.length)
+                isNTLMSSP = true;
+        }
+
+        return isNTLMSSP;
+    }
+
+    private static class NTLM {
+
+        // Signature
+
+        public static final byte[] Signature = "NTLMSSP\u0000".getBytes();
+
+        // Message types
+
+        public static final int Type1 = 1;
+        public static final int Type2 = 2;
+        public static final int Type3 = 3;
+
+        // NTLM flags
+
+        public static final int FlagNegotiateUnicode = 0x00000001;
+        public static final int FlagNegotiateOEM = 0x00000002;
+        public static final int FlagRequestTarget = 0x00000004;
+        public static final int FlagNegotiateSign = 0x00000010;
+        public static final int FlagNegotiateSeal = 0x00000020;
+        public static final int FlagDatagramStyle = 0x00000040;
+        public static final int FlagLanManKey = 0x00000080;
+        public static final int FlagNegotiateNetware = 0x00000100;
+        public static final int FlagNegotiateNTLM = 0x00000200;
+        public static final int FlagDomainSupplied = 0x00001000;
+        public static final int FlagWorkstationSupplied = 0x00002000;
+        public static final int FlagLocalCall = 0x00004000;
+        public static final int FlagAlwaysSign = 0x00008000;
+        public static final int FlagChallengeInit = 0x00010000;
+        public static final int FlagChallengeAccept = 0x00020000;
+        public static final int FlagChallengeNonNT = 0x00040000;
+        public static final int FlagNTLM2Key = 0x00080000;
+        public static final int FlagTargetInfo = 0x00800000;
+        public static final int FlagRequestVersion = 0x02000000;
+        public static final int Flag128Bit = 0x20000000;
+        public static final int FlagKeyExchange = 0x40000000;
+        public static final int Flag56Bit = 0x80000000;
+
+        // Target information types
+
+        public static final int TargetServer = 0x0001;
+        public static final int TargetDomain = 0x0002;
+        public static final int TargetFullDNS = 0x0003;
+        public static final int TargetDNSDomain = 0x0004;
+    }
+}
diff --git a/server/src/imcode/server/kerberos/KerberosLoginStatus.java b/server/src/imcode/server/kerberos/KerberosLoginStatus.java
new file mode 100644
index 0000000000..01f0dedb2a
--- /dev/null
+++ b/server/src/imcode/server/kerberos/KerberosLoginStatus.java
@@ -0,0 +1,7 @@
+package imcode.server.kerberos;
+
+public enum KerberosLoginStatus {
+    CONTINUE,
+    SUCCESS,
+    FAILED;
+}
diff --git a/server/src/imcode/server/kerberos/LoginCallbackHandler.java b/server/src/imcode/server/kerberos/LoginCallbackHandler.java
new file mode 100644
index 0000000000..f2dadb7cd7
--- /dev/null
+++ b/server/src/imcode/server/kerberos/LoginCallbackHandler.java
@@ -0,0 +1,36 @@
+package imcode.server.kerberos;
+
+import javax.security.auth.callback.*;
+import java.io.IOException;
+
+
+class LoginCallbackHandler implements CallbackHandler {
+    private String username;
+    private String password;
+
+    public LoginCallbackHandler(String password) {
+        this(null, password);
+    }
+
+    public LoginCallbackHandler(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+        for (Callback callback : callbacks) {
+            if (callback instanceof NameCallback && username != null) {
+                NameCallback nc = (NameCallback) callback;
+                nc.setName(username);
+            } else if (callback instanceof PasswordCallback) {
+                PasswordCallback pc = (PasswordCallback) callback;
+                pc.setPassword(password.toCharArray());
+
+            } else {
+                throw new UnsupportedCallbackException(callback, "Unrecognized callback");
+
+            }
+        }
+    }
+
+}
diff --git a/server/src/imcode/server/parser/Element.java b/server/src/imcode/server/parser/Element.java
index c7724b2ee7..d8b06a80dd 100644
--- a/server/src/imcode/server/parser/Element.java
+++ b/server/src/imcode/server/parser/Element.java
@@ -1,22 +1,32 @@
-package imcode.server.parser ;
+package imcode.server.parser;
 
-import java.util.List ;
-import java.util.Properties ;
+import java.util.List;
+import java.util.Properties;
 
 public interface Element extends Node {
 
-    /** @return The name of this element. **/
-    public String getName() ;
+    /**
+     * @return The name of this element.
+     **/
+    public String getName();
 
-    /** @return A Properties containing the attributes of this element. **/
-    public Properties getAttributes() ;
+    /**
+     * @return A Properties containing the attributes of this element.
+     **/
+    public Properties getAttributes();
 
-    /** @return A List of Nodes below this Node. **/
-    public List getChildren() ;
+    /**
+     * @return A List of Nodes below this Node.
+     **/
+    public List getChildren();
 
-    /** @return The first child-element with the given name, or null. **/
-    public Element getChildElement(String name) ;
+    /**
+     * @return The first child-element with the given name, or null.
+     **/
+    public Element getChildElement(String name);
 
-    /** @return The plain text-content of this element and all child-elements, without tags. **/
-    public String getTextContent() ;
+    /**
+     * @return The plain text-content of this element and all child-elements, without tags.
+     **/
+    public String getTextContent();
 }
diff --git a/server/src/imcode/server/parser/MapSubstitution.java b/server/src/imcode/server/parser/MapSubstitution.java
index 44390b6aa3..629edf83b6 100644
--- a/server/src/imcode/server/parser/MapSubstitution.java
+++ b/server/src/imcode/server/parser/MapSubstitution.java
@@ -42,27 +42,27 @@ public class MapSubstitution implements Substitution {
     private Map map;
     private boolean removeNulls;
 
-    public MapSubstitution( Map map, boolean removeNulls ) {
-        setMap( map, removeNulls );
+    public MapSubstitution(Map map, boolean removeNulls) {
+        setMap(map, removeNulls);
     }
 
-    private void setMap( Map map, boolean removeNulls ) {
+    private void setMap(Map map, boolean removeNulls) {
         this.map = map;
         this.removeNulls = removeNulls;
     }
 
-    public void appendSubstitution( StringBuffer sb, MatchResult matres, int sc, PatternMatcherInput originalInput,
-                                    PatternMatcher patMat, Pattern pat ) {
-        String match = matres.group( 0 );
-        String replace = (String)map.get( match );
-        if ( replace == null ) {
-            if ( removeNulls ) {
+    public void appendSubstitution(StringBuffer sb, MatchResult matres, int sc, PatternMatcherInput originalInput,
+                                   PatternMatcher patMat, Pattern pat) {
+        String match = matres.group(0);
+        String replace = (String) map.get(match);
+        if (replace == null) {
+            if (removeNulls) {
                 replace = "";
             } else {
                 replace = match;
             }
         }
-        sb.append( replace );
+        sb.append(replace);
     }
 
 }
diff --git a/server/src/imcode/server/parser/MenuParser.java b/server/src/imcode/server/parser/MenuParser.java
index 743527ea18..6b35fae060 100644
--- a/server/src/imcode/server/parser/MenuParser.java
+++ b/server/src/imcode/server/parser/MenuParser.java
@@ -7,114 +7,115 @@
 import imcode.server.document.textdocument.MenuDomainObject;
 import imcode.server.document.textdocument.MenuItemDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
-import imcode.server.user.UserDomainObject;
 import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
+import imcode.server.user.UserDomainObject;
 import imcode.util.Utility;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.iterators.FilterIterator;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.oro.text.regex.PatternMatcher;
-import org.apache.oro.text.regex.StringSubstitution;
-import org.apache.oro.text.regex.Substitution;
-import org.apache.oro.text.regex.Util;
-import org.apache.oro.text.regex.Perl5Matcher;
+import org.apache.oro.text.regex.*;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.io.Writer;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.io.Writer;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 public class MenuParser {
 
-    private final static Substitution NULLSUBSTITUTION = new StringSubstitution( "" );
+    private final static Substitution NULLSUBSTITUTION = new StringSubstitution("");
 
     private int[] implicitMenus = {1};
     private ParserParameters parserParameters;
 
-    MenuParser( ParserParameters parserParameters ) {
+    MenuParser(ParserParameters parserParameters) {
         this.parserParameters = parserParameters;
     }
 
+    public static String addMenuAdmin(int menuIndex, boolean menuMode, String content,
+                                      MenuDomainObject menu,
+                                      HttpServletRequest request, HttpServletResponse response, String label) throws ServletException, IOException {
+        if (!menuMode) {
+            return content;
+        }
+        ImcmsAuthenticatorAndUserAndRoleMapper userMapper = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
+        UserDomainObject defaultUser = userMapper.getDefaultUser();
+        MenuItemDomainObject[] defaultUserMenuItems = menu.getPublishedMenuItemsUserCanSee(defaultUser);
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        MenuItemDomainObject[] menuItemsUserCanSee = menu.getMenuItemsUserCanSee(user);
+        request.setAttribute("content", content);
+        request.setAttribute("label", label);
+        request.setAttribute("defaultUserCount", defaultUserMenuItems.length);
+        request.setAttribute("userCount", menuItemsUserCanSee.length);
+        request.setAttribute("menuIndex", menuIndex);
+        return Utility.getContents("/imcms/" + user.getLanguageIso639_2() + "/jsp/docadmin/text/edit_menu.jsp",
+                request, response);
+    }
+
+    public static String getPathToDocument(HttpServletRequest request, DocumentDomainObject document, String template) {
+        String href = Utility.getAbsolutePathToDocument(request, document);
+        if (StringUtils.isNotBlank(template)) {
+            href += -1 != href.indexOf('?') ? '&' : '?';
+            href += "template=" + URLEncoder.encode(template);
+        }
+        return href;
+    }
+
     private String parseMenuNode(int menuIndex, String menuTemplate, Properties menuAttributes,
                                  TagParser tagParser) {
-        String modeAttribute = menuAttributes.getProperty( "mode" );
-        boolean modeIsRead = "read".equalsIgnoreCase( modeAttribute );
-        boolean modeIsWrite = "write".equalsIgnoreCase( modeAttribute );
+        String modeAttribute = menuAttributes.getProperty("mode");
+        boolean modeIsRead = "read".equalsIgnoreCase(modeAttribute);
+        boolean modeIsWrite = "write".equalsIgnoreCase(modeAttribute);
         boolean menuMode = parserParameters.isMenuMode();
-        if ( menuMode && modeIsRead || !menuMode && modeIsWrite ) {
+        if (menuMode && modeIsRead || !menuMode && modeIsWrite) {
             return "";
         }
 
         try {
-            NodeList menuNodes = new NodeList( menuTemplate, parserParameters.getDocumentRequest().getHttpServletRequest(), tagParser );
+            NodeList menuNodes = new NodeList(menuTemplate, parserParameters.getDocumentRequest().getHttpServletRequest(), tagParser);
             DocumentRequest documentRequest = parserParameters.getDocumentRequest();
-            TextDocumentDomainObject document = (TextDocumentDomainObject) documentRequest.getDocument() ;
-            final MenuDomainObject menu = document.getMenu(menuIndex) ;
+            TextDocumentDomainObject document = (TextDocumentDomainObject) documentRequest.getDocument();
+            final MenuDomainObject menu = document.getMenu(menuIndex);
             StringWriter contentWriter = new StringWriter();
-            nodeMenu( new SimpleElement( "menu", menuAttributes, menuNodes ), contentWriter, menu, new Perl5Matcher(), menuIndex, tagParser );
+            nodeMenu(new SimpleElement("menu", menuAttributes, menuNodes), contentWriter, menu, new Perl5Matcher(), menuIndex, tagParser);
             String content = contentWriter.toString();
             return addMenuAdmin(menuIndex, menuMode, content, menu, documentRequest.getHttpServletRequest(), documentRequest.getHttpServletResponse(), menuAttributes.getProperty("label"));
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             throw new UnhandledException(e);
         }
     }
 
-    public static String addMenuAdmin(int menuIndex, boolean menuMode, String content,
-                                MenuDomainObject menu,
-                                HttpServletRequest request, HttpServletResponse response, String label) throws ServletException, IOException {
-        if (!menuMode) {
-            return content;
-        }
-        ImcmsAuthenticatorAndUserAndRoleMapper userMapper = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
-        UserDomainObject defaultUser = userMapper.getDefaultUser() ;
-        MenuItemDomainObject[] defaultUserMenuItems = menu.getPublishedMenuItemsUserCanSee( defaultUser );
-        UserDomainObject user = Utility.getLoggedOnUser(request);
-        MenuItemDomainObject[] menuItemsUserCanSee = menu.getMenuItemsUserCanSee(user ) ;
-        request.setAttribute("content", content);
-        request.setAttribute("label", label);
-        request.setAttribute("defaultUserCount", defaultUserMenuItems.length) ;
-        request.setAttribute("userCount", menuItemsUserCanSee.length);
-        request.setAttribute("menuIndex", new Integer(menuIndex));
-        return Utility.getContents("/imcms/"+user.getLanguageIso639_2()+"/jsp/docadmin/text/edit_menu.jsp",
-                                   request, response) ;
-    }
-
     /**
      * Handle an imcms:menu element.
      */
-    public void nodeMenu( Element menuNode, Writer result, MenuDomainObject currentMenu,
-                          PatternMatcher patMat, int menuIndex, TagParser tagParser ) throws IOException {
-        if ( currentMenu == null || 0 == currentMenu.getMenuItems().length ) {
+    public void nodeMenu(Element menuNode, Writer result, MenuDomainObject currentMenu,
+                         PatternMatcher patMat, int menuIndex, TagParser tagParser) throws IOException {
+        if (currentMenu == null || 0 == currentMenu.getMenuItems().length) {
             return; // Don't output anything
         }
         Properties menuAttributes = menuNode.getAttributes(); // Get the attributes from the imcms:menu-element. This will be passed down, to allow attributes of the imcms:menu-element to affect the menuitems.
-        if ( menuNode.getChildElement( "menuloop" ) == null ) {
-            nodeMenuLoop( new SimpleElement( "menuloop", null, menuNode.getChildren() ), result, currentMenu, menuAttributes, patMat, tagParser ); // The imcms:menu contained no imcms:menuloop, so let's create one, passing the children from the imcms:menu
+        if (menuNode.getChildElement("menuloop") == null) {
+            nodeMenuLoop(new SimpleElement("menuloop", null, menuNode.getChildren()), result, currentMenu, menuAttributes, patMat, tagParser); // The imcms:menu contained no imcms:menuloop, so let's create one, passing the children from the imcms:menu
         } else {
             // The imcms:menu contained at least one imcms:menuloop.
             Iterator menuNodeChildrenIterator = menuNode.getChildren().iterator();
-            while ( menuNodeChildrenIterator.hasNext() ) {
-                Node menuNodeChild = (Node)menuNodeChildrenIterator.next();
-                switch ( menuNodeChild.getNodeType() ) { // Check the type of the child-node.
+            while (menuNodeChildrenIterator.hasNext()) {
+                Node menuNodeChild = (Node) menuNodeChildrenIterator.next();
+                switch (menuNodeChild.getNodeType()) { // Check the type of the child-node.
                     case Node.TEXT_NODE: // A text-node
-                        result.write( tagParser.replaceTags(( (Text)menuNodeChild ).getContent(), false) ); // Append the contents to our result.
+                        result.write(tagParser.replaceTags(((Text) menuNodeChild).getContent(), false)); // Append the contents to our result.
                         break;
                     case Node.ELEMENT_NODE: // An element-node
-                        if ( "menuloop".equals( ( (Element)menuNodeChild ).getName() ) ) { // Is it an imcms:menuloop?
-                            nodeMenuLoop( (Element)menuNodeChild, result, currentMenu, menuAttributes, patMat, tagParser );
+                        if ("menuloop".equals(((Element) menuNodeChild).getName())) { // Is it an imcms:menuloop?
+                            nodeMenuLoop((Element) menuNodeChild, result, currentMenu, menuAttributes, patMat, tagParser);
                         } else {
-                            result.append( tagParser.replaceTags(menuNodeChild.toString(), false) );  // No? Just append it (almost)verbatim.
+                            result.append(tagParser.replaceTags(menuNodeChild.toString(), false));  // No? Just append it (almost)verbatim.
                         }
                         break;
                 }
@@ -134,18 +135,18 @@ public void nodeMenu( Element menuNode, Writer result, MenuDomainObject currentM
      */
     private void nodeMenuLoop(Element menuLoopNode, Writer result, MenuDomainObject menu,
                               Properties menuAttributes, PatternMatcher patMat, TagParser tagParser) throws IOException {
-        if ( null == menu ) {
+        if (null == menu) {
             return;
         }
         List menuLoopNodeChildren = menuLoopNode.getChildren();
-        if ( null == menuLoopNode.getChildElement( "menuitem" ) ) {
-            Element menuItemNode = new SimpleElement( "menuitem", null, menuLoopNodeChildren );  // The imcms:menuloop contained no imcms:menuitem, so let's create one.
-            menuLoopNodeChildren = new ArrayList( 1 );
-            menuLoopNodeChildren.add( menuItemNode );
+        if (null == menuLoopNode.getChildElement("menuitem")) {
+            Element menuItemNode = new SimpleElement("menuitem", null, menuLoopNodeChildren);  // The imcms:menuloop contained no imcms:menuitem, so let's create one.
+            menuLoopNodeChildren = new ArrayList(1);
+            menuLoopNodeChildren.add(menuItemNode);
         }
         // The imcms:menuloop contained at least one imcms:menuitem.
-        loopOverMenuItemsAndMenuItemTemplateElementsAndAddToResult( menu, menuLoopNodeChildren,
-                                                                    result, menuAttributes, patMat, tagParser );
+        loopOverMenuItemsAndMenuItemTemplateElementsAndAddToResult(menu, menuLoopNodeChildren,
+                result, menuAttributes, patMat, tagParser);
     }
 
     private void loopOverMenuItemsAndMenuItemTemplateElementsAndAddToResult(MenuDomainObject menu,
@@ -155,39 +156,39 @@ private void loopOverMenuItemsAndMenuItemTemplateElementsAndAddToResult(MenuDoma
                                                                             PatternMatcher patMat,
                                                                             TagParser tagParser) throws IOException {
         final UserDomainObject user = parserParameters.getDocumentRequest().getUser();
-        Iterator menuItemsIterator = new FilterIterator( Arrays.asList( menu.getMenuItems() ).iterator(), new UserCanSeeMenuItemPredicate(user) );
+        Iterator menuItemsIterator = new FilterIterator(Arrays.asList(menu.getMenuItems()).iterator(), new UserCanSeeMenuItemPredicate(user));
 
         int menuItemIndexStart = 0;
         try {
-            menuItemIndexStart = Integer.parseInt( menuAttributes.getProperty( "indexstart" ) );
-        } catch ( NumberFormatException nfe ) {
+            menuItemIndexStart = Integer.parseInt(menuAttributes.getProperty("indexstart"));
+        } catch (NumberFormatException nfe) {
             // already set
         }
         int menuItemIndexStep = 1;
         try {
-            menuItemIndexStep = Integer.parseInt( menuAttributes.getProperty( "indexstep" ) );
-        } catch ( NumberFormatException nfe ) {
+            menuItemIndexStep = Integer.parseInt(menuAttributes.getProperty("indexstep"));
+        } catch (NumberFormatException nfe) {
             // already set
         }
         int menuItemIndex = menuItemIndexStart;
-        while ( menuItemsIterator.hasNext() ) { // While there still are more menuitems from the db.
+        while (menuItemsIterator.hasNext()) { // While there still are more menuitems from the db.
             Iterator menuLoopChildrenIterator = menuLoopNodeChildren.iterator();
-            while ( menuLoopChildrenIterator.hasNext() ) {  // While there still are more imcms:menuloop-children
-                Node menuLoopChild = (Node)menuLoopChildrenIterator.next();
-                switch ( menuLoopChild.getNodeType() ) { // Check the type of the child-node.
+            while (menuLoopChildrenIterator.hasNext()) {  // While there still are more imcms:menuloop-children
+                Node menuLoopChild = (Node) menuLoopChildrenIterator.next();
+                switch (menuLoopChild.getNodeType()) { // Check the type of the child-node.
                     case Node.TEXT_NODE: // A text-node
-                        result.write( tagParser.replaceTags(( (Text)menuLoopChild ).getContent(), false) ); // Append the contents to our result.
+                        result.write(tagParser.replaceTags(((Text) menuLoopChild).getContent(), false)); // Append the contents to our result.
                         break;
                     case Node.ELEMENT_NODE: // An element-node
-                        if ( "menuitem".equals( ( (Element)menuLoopChild ).getName() ) ) { // Is it an imcms:menuitem?
+                        if ("menuitem".equals(((Element) menuLoopChild).getName())) { // Is it an imcms:menuitem?
                             MenuItemDomainObject menuItem = menuItemsIterator.hasNext()
-                                                            ? (MenuItemDomainObject)menuItemsIterator.next()
-                                                            : null; // If there are more menuitems from the db, put the next in 'menuItem', otherwise put null.
-                            nodeMenuItem( (Element)menuLoopChild, result, menuItem,
-                                          menuAttributes, patMat, menuItemIndex, tagParser ); // Parse one menuitem.
+                                    ? (MenuItemDomainObject) menuItemsIterator.next()
+                                    : null; // If there are more menuitems from the db, put the next in 'menuItem', otherwise put null.
+                            nodeMenuItem((Element) menuLoopChild, result, menuItem,
+                                    menuAttributes, patMat, menuItemIndex, tagParser); // Parse one menuitem.
                             menuItemIndex += menuItemIndexStep;
                         } else {
-                            result.append( tagParser.replaceTags(menuLoopChild.toString(), false) );  // No? Just append the elements verbatim into the result.
+                            result.append(tagParser.replaceTags(menuLoopChild.toString(), false));  // No? Just append the elements verbatim into the result.
                         }
                         break;
                 }
@@ -209,50 +210,51 @@ private void nodeMenuItem(Element menuItemNode, Writer result, MenuItemDomainObj
                               Properties menuAttributes, PatternMatcher patMat, int menuItemIndex,
                               TagParser tagParser) throws IOException {
         Substitution menuItemSubstitution;
-        if ( menuItem != null ) {
-            Properties menuItemAttributes = new Properties( menuAttributes ); // Make a copy of the menuAttributes, so we don't override them permanently.
-            menuItemAttributes.putAll( menuItemNode.getAttributes() ); // Let all attributes of the menuItemNode override the attributes of the menu.
+        if (menuItem != null) {
+            Properties menuItemAttributes = new Properties(menuAttributes); // Make a copy of the menuAttributes, so we don't override them permanently.
+            menuItemAttributes.putAll(menuItemNode.getAttributes()); // Let all attributes of the menuItemNode override the attributes of the menu.
             menuItemSubstitution = getMenuItemSubstitution(menuItem, menuItemAttributes, menuItemIndex);
         } else {
             menuItemSubstitution = NULLSUBSTITUTION;
         }
         Iterator menuItemChildrenIterator = menuItemNode.getChildren().iterator();
-        while ( menuItemChildrenIterator.hasNext() ) { // For each node that is a child of this imcms:menuitem-element
-            Node menuItemChild = (Node)menuItemChildrenIterator.next();
-            switch ( menuItemChild.getNodeType() ) { // Check the type of the child-node.
+        while (menuItemChildrenIterator.hasNext()) { // For each node that is a child of this imcms:menuitem-element
+            Node menuItemChild = (Node) menuItemChildrenIterator.next();
+            switch (menuItemChild.getNodeType()) { // Check the type of the child-node.
                 case Node.ELEMENT_NODE: // An element-node
-                    Element menuItemChildElement = (Element)menuItemChild;
-                    if ( !"menuitemhide".equals( menuItemChildElement.getName() )
-                         || menuItem != null ) { // if the child-element isn't a imcms:menuitemhide-element or there is a child...
-                        parseMenuItem( result, menuItemChildElement.getTextContent(),
-                                       menuItemSubstitution, patMat, tagParser ); // parse it
+                    Element menuItemChildElement = (Element) menuItemChild;
+                    if (!"menuitemhide".equals(menuItemChildElement.getName())
+                            || menuItem != null)
+                    { // if the child-element isn't a imcms:menuitemhide-element or there is a child...
+                        parseMenuItem(result, menuItemChildElement.getTextContent(),
+                                menuItemSubstitution, patMat, tagParser); // parse it
                     }
                     break;
                 case Node.TEXT_NODE: // A text-node
-                    parseMenuItem( result, ( (Text)menuItemChild ).getContent(), menuItemSubstitution,
-                                   patMat, tagParser ); // parse it
+                    parseMenuItem(result, ((Text) menuItemChild).getContent(), menuItemSubstitution,
+                            patMat, tagParser); // parse it
                     break;
             }
         }
     }
 
-    private void parseMenuItem( Writer result, String template, Substitution substitution,
-                                PatternMatcher patMat, TagParser tagParser ) throws IOException {
-        String tagsReplaced = tagParser.replaceTags(template, false) ;
-        result.write( Util.substitute( patMat, TextDocumentParser.hashtagPattern, substitution,
-                                       tagsReplaced,
-                                       Util.SUBSTITUTE_ALL ) );
+    private void parseMenuItem(Writer result, String template, Substitution substitution,
+                               PatternMatcher patMat, TagParser tagParser) throws IOException {
+        String tagsReplaced = tagParser.replaceTags(template, false);
+        result.write(Util.substitute(patMat, TextDocumentParser.hashtagPattern, substitution,
+                tagsReplaced,
+                Util.SUBSTITUTE_ALL));
     }
 
-    public String tag( Properties menuattributes, String menutemplate,
-                       PatternMatcher patMat, TagParser tagParser ) {
+    public String tag(Properties menuattributes, String menutemplate,
+                      PatternMatcher patMat, TagParser tagParser) {
         int menuIndex;
         try {
-            menuIndex = Integer.parseInt( menuattributes.getProperty( "no" ) );
-        } catch ( NumberFormatException ex ) {
+            menuIndex = Integer.parseInt(menuattributes.getProperty("no"));
+        } catch (NumberFormatException ex) {
             menuIndex = implicitMenus[0]++;
         }
-        return parseMenuNode( menuIndex, menutemplate, menuattributes, tagParser );
+        return parseMenuNode(menuIndex, menutemplate, menuattributes, tagParser);
     }
 
     /**
@@ -268,73 +270,64 @@ private Substitution getMenuItemSubstitution(MenuItemDomainObject menuItem,
         final String imagesRoot = contextPath + Imcms.getServices().getConfig().getImageUrl();
 
         String imageTag = imageUrl != null && imageUrl.length() > 0
-                          ? "<img src=\"" + imagesRoot + StringEscapeUtils.escapeHtml( imageUrl ) + "\" border=\"0\">" : "";
-        String headline = document.getHeadline() ;
-        if ( StringUtils.isBlank( headline ) ) {
+                ? "<img src=\"" + imagesRoot + StringEscapeUtils.escapeHtml(imageUrl) + "\" border=\"0\">" : "";
+        String headline = document.getHeadline();
+        if (StringUtils.isBlank(headline)) {
             headline = "&nbsp;";
         } else {
-            if ( !document.isPublished() ) {
+            if (!document.isPublished()) {
                 headline = "<em><i>" + headline;
                 headline += "</i></em>";
             }
-            if ( document.isArchived() ) {
+            if (document.isArchived()) {
                 headline = "<strike>" + headline;
                 headline += "</strike>";
             }
         }
-        SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
-        String createdDate = dateFormat.format( document.getCreatedDatetime() );
-        String modifiedDate = dateFormat.format( document.getModifiedDatetime() );
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String createdDate = dateFormat.format(document.getCreatedDatetime());
+        String modifiedDate = dateFormat.format(document.getModifiedDatetime());
 
         Properties tags = new Properties();
-        tags.setProperty( "#childMetaId#", "" + document.getId() );
-        tags.setProperty( "#childMetaHeadline#", headline );
-        tags.setProperty( "#childMetaText#", document.getMenuText() );
-        tags.setProperty( "#childMetaImage#", imageTag );
-        tags.setProperty( "#childCreatedDate#", createdDate );
-        tags.setProperty( "#childModifiedDate#", modifiedDate );
-        tags.setProperty( "#menuitemindex#", "" + menuItemIndex );
-        tags.setProperty( "#menuitemtreesortkey#", menuItem.getTreeSortKey().toString() );
-        tags.setProperty( "#menuitemmetaid#", "" + document.getId() );
-        tags.setProperty( "#menuitemheadline#", headline );
-        tags.setProperty( "#menuitemtext#", document.getMenuText() );
-        tags.setProperty( "#menuitemimage#", imageTag );
-        tags.setProperty( "#menuitemimageurl#", StringEscapeUtils.escapeHtml( imageUrl ) );
-        tags.setProperty( "#menuitemtarget#", document.getTarget() );
-        tags.setProperty( "#menuitemdatecreated#", createdDate );
-        tags.setProperty( "#menuitemdatemodified#", modifiedDate );
-
-        String template = parameters.getProperty( "template" );
+        tags.setProperty("#childMetaId#", "" + document.getId());
+        tags.setProperty("#childMetaHeadline#", headline);
+        tags.setProperty("#childMetaText#", document.getMenuText());
+        tags.setProperty("#childMetaImage#", imageTag);
+        tags.setProperty("#childCreatedDate#", createdDate);
+        tags.setProperty("#childModifiedDate#", modifiedDate);
+        tags.setProperty("#menuitemindex#", "" + menuItemIndex);
+        tags.setProperty("#menuitemtreesortkey#", menuItem.getTreeSortKey().toString());
+        tags.setProperty("#menuitemmetaid#", "" + document.getId());
+        tags.setProperty("#menuitemheadline#", headline);
+        tags.setProperty("#menuitemtext#", document.getMenuText());
+        tags.setProperty("#menuitemimage#", imageTag);
+        tags.setProperty("#menuitemimageurl#", StringEscapeUtils.escapeHtml(imageUrl));
+        tags.setProperty("#menuitemtarget#", document.getTarget());
+        tags.setProperty("#menuitemdatecreated#", createdDate);
+        tags.setProperty("#menuitemdatemodified#", modifiedDate);
+
+        String template = parameters.getProperty("template");
         HttpServletRequest request = documentRequest.getHttpServletRequest();
         String href = getPathToDocument(request, document, template);
 
-        List menuItemAHref = new ArrayList( 4 );
-        menuItemAHref.add( "#href#" );
-        menuItemAHref.add( href );
-        menuItemAHref.add( "#target#" );
-        menuItemAHref.add( document.getTarget() );
+        List menuItemAHref = new ArrayList(4);
+        menuItemAHref.add("#href#");
+        menuItemAHref.add(href);
+        menuItemAHref.add("#target#");
+        menuItemAHref.add(document.getTarget());
 
         UserDomainObject user = documentRequest.getUser();
 
         ImcmsServices serverObject = documentRequest.getServices();
-        String a_href = serverObject.getAdminTemplate( "textdoc/menuitem_a_href.frag", user, menuItemAHref );
+        String a_href = serverObject.getAdminTemplate("textdoc/menuitem_a_href.frag", user, menuItemAHref);
 
-        tags.setProperty( "#menuitemlinkonly#", a_href );
-        tags.setProperty( "#/menuitemlinkonly#", "</a>" );
+        tags.setProperty("#menuitemlinkonly#", a_href);
+        tags.setProperty("#/menuitemlinkonly#", "</a>");
 
-        tags.setProperty( "#menuitemlink#", a_href );
-        tags.setProperty( "#/menuitemlink#", "</a>" );
+        tags.setProperty("#menuitemlink#", a_href);
+        tags.setProperty("#/menuitemlink#", "</a>");
 
-        return new MapSubstitution( tags, true );
-    }
-
-    public static String getPathToDocument(HttpServletRequest request, DocumentDomainObject document, String template) {
-        String href = Utility.getAbsolutePathToDocument( request, document );
-        if (StringUtils.isNotBlank(template)) {
-            href += -1 != href.indexOf( '?' ) ? '&' : '?' ;
-            href += "template=" + URLEncoder.encode( template ) ;
-        }
-        return href;
+        return new MapSubstitution(tags, true);
     }
 
     public static class UserCanSeeMenuItemPredicate implements Predicate {
@@ -345,8 +338,8 @@ public UserCanSeeMenuItemPredicate(UserDomainObject user) {
             this.user = user;
         }
 
-        public boolean evaluate( Object o ) {
-            DocumentDomainObject document = ( (MenuItemDomainObject)o ).getDocument();
+        public boolean evaluate(Object o) {
+            DocumentDomainObject document = ((MenuItemDomainObject) o).getDocument();
             return user.canSeeDocumentInMenus(document);
         }
     }
diff --git a/server/src/imcode/server/parser/Node.java b/server/src/imcode/server/parser/Node.java
index 8dc562148e..7e5d081b0c 100644
--- a/server/src/imcode/server/parser/Node.java
+++ b/server/src/imcode/server/parser/Node.java
@@ -1,10 +1,10 @@
-package imcode.server.parser ;
+package imcode.server.parser;
 
 public interface Node {
 
-    final static short TEXT_NODE    = 0 ;
-    final static short ELEMENT_NODE = 1 ;
+    final static short TEXT_NODE = 0;
+    final static short ELEMENT_NODE = 1;
 
-    short getNodeType() ;
+    short getNodeType();
 
 }
diff --git a/server/src/imcode/server/parser/NodeList.java b/server/src/imcode/server/parser/NodeList.java
index 1cb35a663f..89c7e88c27 100644
--- a/server/src/imcode/server/parser/NodeList.java
+++ b/server/src/imcode/server/parser/NodeList.java
@@ -12,9 +12,9 @@ public class NodeList extends LinkedList {
     static {
         try {
             Perl5Compiler patternCompiler = new Perl5Compiler();
-            elementPattern = patternCompiler.compile( "<\\?imcms:(\\w+)\\b(.*?)\\s*\\?>(.*?)<\\?\\/imcms:\\1\\s*\\?>", Perl5Compiler.SINGLELINE_MASK
-                                                                                                                    | Perl5Compiler.READ_ONLY_MASK );
-        } catch ( MalformedPatternException ignored ) {
+            elementPattern = patternCompiler.compile("<\\?imcms:(\\w+)\\b(.*?)\\s*\\?>(.*?)<\\?\\/imcms:\\1\\s*\\?>", Perl5Compiler.SINGLELINE_MASK
+                    | Perl5Compiler.READ_ONLY_MASK);
+        } catch (MalformedPatternException ignored) {
             // I ignore the exception because i know that these patterns work, and that the exception will never be thrown.
         }
     }
@@ -22,31 +22,31 @@ public class NodeList extends LinkedList {
     /**
      * Parse a String of data into nodes. *
      */
-    public NodeList( String data, HttpServletRequest request, TagParser tagParser ) {
+    public NodeList(String data, HttpServletRequest request, TagParser tagParser) {
         PatternMatcher patternMatcher = new Perl5Matcher();
-        PatternMatcherInput input = new PatternMatcherInput( data );
+        PatternMatcherInput input = new PatternMatcherInput(data);
         int lastEndOffset = 0;
-        while ( patternMatcher.contains( input, elementPattern ) ) {
+        while (patternMatcher.contains(input, elementPattern)) {
             MatchResult matchResult = patternMatcher.getMatch();
-            if ( matchResult.beginOffset( 0 ) > lastEndOffset ) { // If the part before the first child element has a length longer than 0...
-                add( new SimpleText( data.substring( lastEndOffset, matchResult.beginOffset( 0 ) ) ) ); // ... put it in a text node.
+            if (matchResult.beginOffset(0) > lastEndOffset) { // If the part before the first child element has a length longer than 0...
+                add(new SimpleText(data.substring(lastEndOffset, matchResult.beginOffset(0)))); // ... put it in a text node.
             }
-            lastEndOffset = matchResult.endOffset( 0 );
-            add( createElementNode( patternMatcher, request, tagParser ) );
+            lastEndOffset = matchResult.endOffset(0);
+            add(createElementNode(patternMatcher, request, tagParser));
         }
-        if ( data.length() > lastEndOffset ) { // Add whatever was left after the last element, and the whole piece if there wasn't any elements.
-            add( new SimpleText( data.substring( lastEndOffset ) ) );
+        if (data.length() > lastEndOffset) { // Add whatever was left after the last element, and the whole piece if there wasn't any elements.
+            add(new SimpleText(data.substring(lastEndOffset)));
         }
     }
 
-    private Element createElementNode( PatternMatcher patternMatcher, HttpServletRequest request, TagParser tagParser ) {
+    private Element createElementNode(PatternMatcher patternMatcher, HttpServletRequest request, TagParser tagParser) {
         MatchResult matchResult = patternMatcher.getMatch();
 
-        String name = matchResult.group( 1 );
-        String attributes_string = matchResult.group( 2 );
-        String content = matchResult.group( 3 );
+        String name = matchResult.group(1);
+        String attributes_string = matchResult.group(2);
+        String content = matchResult.group(3);
 
-        return new SimpleElement( name, tagParser.parseAttributes( attributes_string, patternMatcher, request ), new NodeList( content, request, tagParser ) );
+        return new SimpleElement(name, tagParser.parseAttributes(attributes_string, patternMatcher, request), new NodeList(content, request, tagParser));
     }
 
 }
diff --git a/server/src/imcode/server/parser/ParserParameters.java b/server/src/imcode/server/parser/ParserParameters.java
index bdca5e895c..cf84a39e60 100644
--- a/server/src/imcode/server/parser/ParserParameters.java
+++ b/server/src/imcode/server/parser/ParserParameters.java
@@ -2,31 +2,39 @@
 
 import imcode.server.DocumentRequest;
 import imcode.server.ImcmsConstants;
-import imcode.server.document.*;
+import imcode.server.document.DocumentPermission;
+import imcode.server.document.TextDocumentPermissionSetDomainObject;
 
 import javax.servlet.http.HttpServletRequest;
 
 public class ParserParameters implements Cloneable {
 
-    private String template;	//used to store the template if not default is wanted
-    private String param;		//used to store the parameter param
+    private final static String ATTRIBUTE_NAME = ParserParameters.class.getName();
+    private String template;    //used to store the template if not default is wanted
+    private String param;        //used to store the parameter param
     private Integer editingMenuIndex;
     private DocumentRequest documentRequest;
     private int flags;
-    private boolean adminButtonsVisible = true ;
-    private final static String ATTRIBUTE_NAME = ParserParameters.class.getName();
+    private boolean adminButtonsVisible = true;
     private int includeLevel = 5;
 
-    public ParserParameters( DocumentRequest documentRequest ) {
+    public ParserParameters(DocumentRequest documentRequest) {
         this.documentRequest = documentRequest;
     }
 
-    public void setTemplate( String template ) {
-        this.template = template;
+    public static ParserParameters putInRequest(ParserParameters parserParameters) {
+        HttpServletRequest request = parserParameters.getDocumentRequest().getHttpServletRequest();
+        Object attribute = request.getAttribute(ATTRIBUTE_NAME);
+        request.setAttribute(ATTRIBUTE_NAME, parserParameters);
+        return (ParserParameters) attribute;
     }
 
-    public void setParameter( String param ) {
-        this.param = param;
+    public static ParserParameters fromRequest(HttpServletRequest request) {
+        return (ParserParameters) request.getAttribute(ATTRIBUTE_NAME);
+    }
+
+    public void setTemplate(String template) {
+        this.template = template;
     }
 
     public String getTemplateName() {
@@ -37,11 +45,15 @@ public String getParameter() {
         return param == null ? "" : param;
     }
 
+    public void setParameter(String param) {
+        this.param = param;
+    }
+
     public Integer getEditingMenuIndex() {
-        return editingMenuIndex ;
+        return editingMenuIndex;
     }
 
-    public void setEditingMenuIndex( Integer editingMenuIndex ) {
+    public void setEditingMenuIndex(Integer editingMenuIndex) {
         this.editingMenuIndex = editingMenuIndex;
     }
 
@@ -53,66 +65,55 @@ public int getFlags() {
         return flags;
     }
 
-    public void setFlags( int flags ) {
+    public void setFlags(int flags) {
         this.flags = flags;
     }
 
     public Object clone() throws CloneNotSupportedException {
-        ParserParameters clone = (ParserParameters)super.clone();
-        clone.documentRequest = (DocumentRequest)documentRequest.clone() ;
-        return clone ;
-    }
-
-    public void setAdminButtonsVisible( boolean adminButtonsVisible ) {
-        this.adminButtonsVisible = adminButtonsVisible;
+        ParserParameters clone = (ParserParameters) super.clone();
+        clone.documentRequest = (DocumentRequest) documentRequest.clone();
+        return clone;
     }
 
     public boolean isAdminButtonsVisible() {
         return adminButtonsVisible;
     }
 
+    public void setAdminButtonsVisible(boolean adminButtonsVisible) {
+        this.adminButtonsVisible = adminButtonsVisible;
+    }
+
     private TextDocumentPermissionSetDomainObject getPermissionSet() {
-        return (TextDocumentPermissionSetDomainObject)documentRequest.getUser().getPermissionSetFor( documentRequest.getDocument() );
+        return (TextDocumentPermissionSetDomainObject) documentRequest.getUser().getPermissionSetFor(documentRequest.getDocument());
     }
 
     public boolean isTextMode() {
-        return isMode( ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEXTS, TextDocumentPermissionSetDomainObject.EDIT_TEXTS );
+        return isMode(ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEXTS, TextDocumentPermissionSetDomainObject.EDIT_TEXTS);
     }
 
     public boolean isMenuMode() {
-        return isMode( ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_MENUS, TextDocumentPermissionSetDomainObject.EDIT_MENUS );
+        return isMode(ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_MENUS, TextDocumentPermissionSetDomainObject.EDIT_MENUS);
     }
 
     public boolean isImageMode() {
-        return isMode( ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_IMAGES, TextDocumentPermissionSetDomainObject.EDIT_IMAGES );
+        return isMode(ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_IMAGES, TextDocumentPermissionSetDomainObject.EDIT_IMAGES);
     }
 
     public boolean isIncludesMode() {
-        return isMode( ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_INCLUDES, TextDocumentPermissionSetDomainObject.EDIT_INCLUDES );
+        return isMode(ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_INCLUDES, TextDocumentPermissionSetDomainObject.EDIT_INCLUDES);
     }
 
     public boolean isTemplateMode() {
-        return isMode( ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEMPLATE, TextDocumentPermissionSetDomainObject.EDIT_TEMPLATE );
+        return isMode(ImcmsConstants.PERM_EDIT_TEXT_DOCUMENT_TEMPLATE, TextDocumentPermissionSetDomainObject.EDIT_TEMPLATE);
     }
 
-    private boolean isMode( int flag,
-                            DocumentPermission permission ) {
-        return ( flags & flag ) != 0 && getPermissionSet().hasPermission(permission);
+    private boolean isMode(int flag,
+                           DocumentPermission permission) {
+        return (flags & flag) != 0 && getPermissionSet().hasPermission(permission);
     }
 
     public boolean isAnyMode() {
-        return isTextMode() || isImageMode() || isMenuMode() || isIncludesMode() || isTemplateMode() ;
-    }
-
-    public static ParserParameters putInRequest(ParserParameters parserParameters) {
-        HttpServletRequest request = parserParameters.getDocumentRequest().getHttpServletRequest();
-        Object attribute = request.getAttribute(ATTRIBUTE_NAME);
-        request.setAttribute(ATTRIBUTE_NAME, parserParameters);
-        return (ParserParameters) attribute ;
-    }
-    
-    public static ParserParameters fromRequest(HttpServletRequest request) {
-        return (ParserParameters) request.getAttribute(ATTRIBUTE_NAME) ;
+        return isTextMode() || isImageMode() || isMenuMode() || isIncludesMode() || isTemplateMode();
     }
 
     public int getIncludeLevel() {
diff --git a/server/src/imcode/server/parser/SimpleElement.java b/server/src/imcode/server/parser/SimpleElement.java
index d7048eaa74..1c48ed9753 100644
--- a/server/src/imcode/server/parser/SimpleElement.java
+++ b/server/src/imcode/server/parser/SimpleElement.java
@@ -1,88 +1,84 @@
-package imcode.server.parser ;
+package imcode.server.parser;
 
-import java.util.List ;
-import java.util.LinkedList ;
-import java.util.Properties ;
-import java.util.Enumeration ;
-import java.util.Iterator ;
+import java.util.*;
 
 public class SimpleElement implements Element {
 
-    private String name ;
-    private Properties attributes ;
-    private List children ;
+    private String name;
+    private Properties attributes;
+    private List children;
 
     public SimpleElement(String name, Properties attributes, List children) {
-	this.name = name != null ? name : "" ;
-	this.attributes = attributes != null ? attributes : new Properties() ;
-	this.children = children != null ? children : new LinkedList() ;
+        this.name = name != null ? name : "";
+        this.attributes = attributes != null ? attributes : new Properties();
+        this.children = children != null ? children : new LinkedList();
     }
 
     public short getNodeType() {
-	return Node.ELEMENT_NODE ;
+        return Node.ELEMENT_NODE;
     }
 
     public String getName() {
-	return name ;
+        return name;
     }
 
     public Properties getAttributes() {
-	return attributes ;
+        return attributes;
     }
 
     public List getChildren() {
-	return children ;
+        return children;
     }
 
     public Element getChildElement(String name) {
-	Iterator childrenIterator = children.iterator() ;
-	while (childrenIterator.hasNext()) {
-	    Node childNode = (Node) childrenIterator.next() ;
-	    if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-		if (((Element)childNode).getName().equals(name)) {
-		    return (Element)childNode ;
-		}
-	    }
-	}
-	return null ;
+        Iterator childrenIterator = children.iterator();
+        while (childrenIterator.hasNext()) {
+            Node childNode = (Node) childrenIterator.next();
+            if (childNode.getNodeType() == Node.ELEMENT_NODE) {
+                if (((Element) childNode).getName().equals(name)) {
+                    return (Element) childNode;
+                }
+            }
+        }
+        return null;
     }
 
     public String getTextContent() {
-	StringBuffer result = new StringBuffer() ;
-	getTextContent(this,result) ;
-	return result.toString() ;
+        StringBuffer result = new StringBuffer();
+        getTextContent(this, result);
+        return result.toString();
     }
 
     private void getTextContent(Node node, StringBuffer result) {
-	if (node.getNodeType() == TEXT_NODE) {
-	    result.append(((Text)node).getContent()) ;
-	    return ;
-	} else if (node.getNodeType() == ELEMENT_NODE) {
-	    Iterator childIterator = ((Element)node).getChildren().iterator() ;
-	    while ( childIterator.hasNext() ) {
-		getTextContent((Node)childIterator.next(),result) ;
-	    }
-	}
+        if (node.getNodeType() == TEXT_NODE) {
+            result.append(((Text) node).getContent());
+            return;
+        } else if (node.getNodeType() == ELEMENT_NODE) {
+            Iterator childIterator = ((Element) node).getChildren().iterator();
+            while (childIterator.hasNext()) {
+                getTextContent((Node) childIterator.next(), result);
+            }
+        }
     }
 
     public String toString() {
 
-	StringBuffer string = new StringBuffer() ;
+        StringBuffer string = new StringBuffer();
 
-	string.append("<?imcms:").append(getName()) ;
-	Enumeration enumeration = getAttributes().propertyNames() ;
-	while(enumeration.hasMoreElements()) {
-	    String key = (String)enumeration.nextElement() ;
-	    String value = getAttributes().getProperty(key) ;
-	    char quote = (value.indexOf('"') == -1) ? '"' : '\'' ;
-	    string.append(' ').append(key).append('=').append(quote).append(value).append(quote) ;
-	}
-	string.append("?>") ;
-	Iterator childIterator = children.iterator() ;
-	while(childIterator.hasNext()) {
-	    string.append(childIterator.next().toString()) ;
-	}
-	string.append("<?/imcms:").append(getName()).append("?>") ;
-	return string.toString() ;
+        string.append("<?imcms:").append(getName());
+        Enumeration enumeration = getAttributes().propertyNames();
+        while (enumeration.hasMoreElements()) {
+            String key = (String) enumeration.nextElement();
+            String value = getAttributes().getProperty(key);
+            char quote = (value.indexOf('"') == -1) ? '"' : '\'';
+            string.append(' ').append(key).append('=').append(quote).append(value).append(quote);
+        }
+        string.append("?>");
+        Iterator childIterator = children.iterator();
+        while (childIterator.hasNext()) {
+            string.append(childIterator.next().toString());
+        }
+        string.append("<?/imcms:").append(getName()).append("?>");
+        return string.toString();
     }
 }
diff --git a/server/src/imcode/server/parser/SimpleText.java b/server/src/imcode/server/parser/SimpleText.java
index 0a4e836bc4..7fc396ca6e 100644
--- a/server/src/imcode/server/parser/SimpleText.java
+++ b/server/src/imcode/server/parser/SimpleText.java
@@ -1,25 +1,23 @@
-package imcode.server.parser ;
-
-import java.util.List ;
+package imcode.server.parser;
 
 public class SimpleText implements Text {
 
-    private String content ;
+    private String content;
 
     public SimpleText(String text) {
-	content = text ;
+        content = text;
     }
 
     public String getContent() {
-	return content ;
+        return content;
     }
 
     public String toString() {
-	return getContent() ;
+        return getContent();
     }
 
     public short getNodeType() {
-	return Node.TEXT_NODE ;
+        return Node.TEXT_NODE;
     }
 
 }
diff --git a/server/src/imcode/server/parser/TagParser.java b/server/src/imcode/server/parser/TagParser.java
index 94da6b4300..595984fa62 100644
--- a/server/src/imcode/server/parser/TagParser.java
+++ b/server/src/imcode/server/parser/TagParser.java
@@ -1,32 +1,31 @@
 package imcode.server.parser;
 
 import com.imcode.imcms.api.TextDocumentViewing;
-import com.imcode.imcms.servlet.ImcmsSetupFilter;
-import com.imcode.imcms.mapping.SectionFromIdTransformer;
 import com.imcode.imcms.mapping.CategoryMapper;
+import com.imcode.imcms.mapping.SectionFromIdTransformer;
+import com.imcode.imcms.servlet.ImcmsSetupFilter;
 import com.imcode.util.CountingIterator;
 import imcode.server.DocumentRequest;
+import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.LanguageMapper;
-import imcode.server.Imcms;
 import imcode.server.document.CategoryDomainObject;
 import imcode.server.document.CategoryTypeDomainObject;
-import imcode.server.document.textdocument.FileDocumentImageSource;
-import imcode.server.document.textdocument.ImageDomainObject;
-import imcode.server.document.textdocument.ImageSource;
-import imcode.server.document.textdocument.TextDocumentDomainObject;
-import imcode.server.document.textdocument.TextDomainObject;
-import imcode.server.user.UserDomainObject;
+import imcode.server.document.textdocument.*;
 import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
+import imcode.server.user.UserDomainObject;
 import imcode.util.DateConstants;
 import imcode.util.Html;
 import imcode.util.ImcmsImageUtils;
 import imcode.util.Utility;
+import lombok.SneakyThrows;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.iterators.TransformIterator;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.commons.collections.iterators.TransformIterator;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.oro.text.regex.*;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
@@ -36,25 +35,28 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
+import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.*;
+import java.util.regex.Matcher;
 
 public class TagParser {
 
+    private static final java.util.regex.Pattern REMOVE_ATTRS_PATTERN = java.util.regex.Pattern.compile(
+            "(?<!-)(?:max-width|max-height|width|height)\\s*:\\s*\\d+\\s*px\\s*;?", java.util.regex.Pattern.CASE_INSENSITIVE);
+    private final static Logger LOG = LogManager.getLogger(TagParser.class.getName());
+    private final static Substitution NULL_SUBSTITUTION = new StringSubstitution("");
     private static Pattern htmlPrebodyPattern;
     private static Pattern htmlPostbodyPattern;
     private static Pattern imcmsTagPattern;
     private static Pattern imcmsEndTagPattern;
     private static Pattern attributesPattern;
-
-    private final static Logger LOG = Logger.getLogger(TagParser.class.getName());
+    private static Pattern widthPattern;
+    private static Pattern heightPattern;
+    private static Pattern maxWidthPattern;
+    private static Pattern maxHeightPattern;
 
     static {
         Perl5Compiler patComp = new Perl5Compiler();
@@ -62,23 +64,30 @@ public class TagParser {
         try {
 
             htmlPrebodyPattern = patComp.compile("^.*?<[Bb][Oo][Dd][Yy].*?>", Perl5Compiler.SINGLELINE_MASK
-                                                                              | Perl5Compiler.READ_ONLY_MASK);
+                    | Perl5Compiler.READ_ONLY_MASK);
             htmlPostbodyPattern = patComp.compile("<\\/[Bb][Oo][Dd][Yy]>.*$", Perl5Compiler.SINGLELINE_MASK
-                                                                              | Perl5Compiler.READ_ONLY_MASK);
+                    | Perl5Compiler.READ_ONLY_MASK);
             imcmsTagPattern = patComp.compile("<\\?imcms:(\\w+)\\b(.*?)\\s*\\?>", Perl5Compiler.SINGLELINE_MASK
-                                                                                  | Perl5Compiler.READ_ONLY_MASK);
+                    | Perl5Compiler.READ_ONLY_MASK);
             imcmsEndTagPattern = patComp.compile("<\\?/imcms:(\\w+)\\s*\\?>", Perl5Compiler.SINGLELINE_MASK
-                                                                              | Perl5Compiler.READ_ONLY_MASK);
+                    | Perl5Compiler.READ_ONLY_MASK);
             attributesPattern = patComp.compile("\\s+(\\w+)\\s*=\\s*([\"'])(.*?)\\2", Perl5Compiler.SINGLELINE_MASK
-                                                                                      | Perl5Compiler.READ_ONLY_MASK);
-        } catch ( MalformedPatternException ignored ) {
+                    | Perl5Compiler.READ_ONLY_MASK);
+
+            widthPattern = patComp.compile("(?:^|[\\s;])width\\s*:\\s*(\\d+)\\s*px", Perl5Compiler.CASE_INSENSITIVE_MASK);
+
+            heightPattern = patComp.compile("(?:^|[\\s;])height\\s*:\\s*(\\d+)\\s*px", Perl5Compiler.CASE_INSENSITIVE_MASK);
+
+            maxWidthPattern = patComp.compile("(?:^|[\\s;])max-width\\s*:\\s*(\\d+)\\s*px", Perl5Compiler.CASE_INSENSITIVE_MASK);
+
+            maxHeightPattern = patComp.compile("(?:^|[\\s;])max-height\\s*:\\s*(\\d+)\\s*px", Perl5Compiler.CASE_INSENSITIVE_MASK);
+
+        } catch (MalformedPatternException ignored) {
             // I ignore the exception because i know that these patterns work, and that the exception will never be thrown.
             LOG.fatal("Danger, Will Robinson!", ignored);
         }
     }
 
-    private final static Substitution NULL_SUBSTITUTION = new StringSubstitution("");
-
     private TextDocumentParser textDocParser;
 
     private boolean includeMode;
@@ -88,7 +97,7 @@ public class TagParser {
     private int implicitTextNumber = 1;
 
     private boolean imageMode;
-    private int[] implicitImageIndex = new int[] { 1 };
+    private int[] implicitImageIndex = new int[]{1};
 
     private ImcmsServices service;
     private ParserParameters parserParameters;
@@ -105,7 +114,7 @@ public TagParser(TextDocumentParser textdocparser, ParserParameters parserParame
         this.document = (TextDocumentDomainObject) documentRequest.getDocument();
         this.service = documentRequest.getServices();
 
-        this.includeMode = parserParameters.isIncludesMode() ;
+        this.includeMode = parserParameters.isIncludesMode();
 
         this.textMode = parserParameters.isTextMode();
 
@@ -115,17 +124,66 @@ public TagParser(TextDocumentParser textdocparser, ParserParameters parserParame
 
     }
 
-    /** Handle a <?imcms:metaid?> tag. */
+    private static boolean shouldOutputNothingAccordingToMode(Properties attributes, boolean mode) {
+        String modeAttribute = attributes.getProperty("mode");
+        return StringUtils.isNotBlank(modeAttribute)
+                && (mode && "read".startsWith(modeAttribute) // With mode="read", we don't want anything in textMode.
+                || !mode
+                && "write".startsWith(modeAttribute)// With mode="write", we don't want anything unless we're in textMode.
+        );
+    }
+
+    private static String getLabel(Properties attributes) {
+        return attributes.getProperty("label", "").replaceAll("\\s+", " ");
+    }
+
+    private static String[] getLabelTags(Properties attributes, int no,
+                                         String finalresult, TextDocumentDomainObject document) {
+        String label = getLabel(attributes);
+        String label_urlparam = "";
+        if (!"".equals(label)) {
+            label_urlparam = removeHtmlTagsAndUrlEncode(label);
+        }
+        return new String[]{
+                "#meta_id#", String.valueOf(document.getId()),
+                "#content_id#", "" + no,
+                "#content#", finalresult,
+                "#label_url#", label_urlparam,
+                "#label#", label
+        };
+    }
+
+    @SneakyThrows
+    private static String removeHtmlTagsAndUrlEncode(String label) {
+        return URLEncoder.encode(Html.removeTags(label), Imcms.UTF_8_ENCODING);
+    }
+
+    public static String addPreAndPost(Properties attributes, String tagResult) {
+        if (0 == tagResult.length()) {
+            return "";
+        }
+        String preAttribute = StringUtils.defaultString(attributes.getProperty("pre"));
+        String postAttribute = StringUtils.defaultString(attributes.getProperty("post"));
+        return preAttribute + tagResult + postAttribute;
+    }
+
+    /**
+     * Handle a <?imcms:metaid?> tag.
+     */
     private String tagMetaId() {
         return "" + document.getId();
     }
 
-    /** Handle a <?imcms:section?> tag. */
+    /**
+     * Handle a <?imcms:section?> tag.
+     */
     private String tagSection(Properties attributes) {
         return tagSections(attributes);
     }
 
-    /** Handle a <?imcms:section?> tag. */
+    /**
+     * Handle a <?imcms:section?> tag.
+     */
     private String tagSections(Properties attributes) {
         Set sectionIds = document.getSectionIds();
         Iterator sectionsIterator = new TransformIterator(sectionIds.iterator(), new SectionFromIdTransformer(service));
@@ -140,32 +198,36 @@ private String tagSections(Properties attributes) {
      * @param attributes The attributes of the include tag
      */
     public String tagInclude(Properties attributes) {
-        if ( shouldOutputNothingAccordingToMode(attributes, includeMode) ) {
+        if (shouldOutputNothingAccordingToMode(attributes, includeMode)) {
             return "";
         }
 
         int no;
         String attributevalue;
 
-        if ( null
-             != ( attributevalue = attributes.getProperty("no") ) ) {        // If we have the attribute no="number"...
+        if (null
+                != (attributevalue = attributes.getProperty("no")))
+        {        // If we have the attribute no="number"...
             // Set the number of this include-tag
             try {
                 no = Integer.parseInt(attributevalue.trim()); // Then set the number wanted
                 implicitIncludeNumber = no + 1;
-            } catch ( NumberFormatException ex ) {
+            } catch (NumberFormatException ex) {
                 return "<!-- imcms:include no failed: " + ex + " -->";
             }
-        } else if ( null != ( attributevalue = attributes.getProperty("path") ) ) {
+        } else if (null != (attributevalue = attributes.getProperty("path"))) {
             return includePath(attributevalue);
-        } else if ( null
-                    != ( attributevalue = attributes.getProperty("file") ) ) { // If we have the attribute file="filename"...
+        } else if (null
+                != (attributevalue = attributes.getProperty("file")))
+        { // If we have the attribute file="filename"...
             return includeFile(attributevalue);
-        } else if ( null
-                    != ( attributevalue = attributes.getProperty("document") ) ) { // If we have the attribute document="meta-id"
+        } else if (null
+                != (attributevalue = attributes.getProperty("document")))
+        { // If we have the attribute document="meta-id"
             return includeDocument(attributevalue, attributes);
-        } else if ( null
-                    != ( attributevalue = attributes.getProperty("url") ) ) { // If we have an attribute of the form url="url:url"
+        } else if (null
+                != (attributevalue = attributes.getProperty("url")))
+        { // If we have an attribute of the form url="url:url"
             return includeUrl(attributevalue, attributes);
         } else { // If we have none of the attributes no, file, url, or document
             no = implicitIncludeNumber++; // Implicitly use the next number.
@@ -178,8 +240,8 @@ private String includePath(String path) {
         HttpServletRequestWrapper metaIdHeaderHttpServletRequest = new MetaIdHeaderHttpServletRequest(request, document.getId());
         try {
             return Utility.getContents(path, metaIdHeaderHttpServletRequest, documentRequest.getHttpServletResponse());
-        } catch ( Exception ex ) {
-            LOG.warn("imcms:include path "+path+" failed.",ex);
+        } catch (Exception ex) {
+            LOG.warn("imcms:include path " + path + " failed.", ex);
             return "<!-- imcms:include path failed: " + StringEscapeUtils.escapeHtml(ex.toString()) + " -->";
         }
     }
@@ -188,7 +250,7 @@ private String includeEditing(Properties attributes, int no) {
         try {
             String label = getLabel(attributes);
             Integer includedDocumentId = document.getIncludedDocumentId(no);
-            if ( includeMode ) {
+            if (includeMode) {
                 HttpServletRequest request = documentRequest.getHttpServletRequest();
                 HttpServletResponse response = documentRequest.getHttpServletResponse();
                 UserDomainObject user = documentRequest.getUser();
@@ -196,17 +258,17 @@ private String includeEditing(Properties attributes, int no) {
                     request.setAttribute("includingDocument", document);
                     request.setAttribute("includedDocumentId", includedDocumentId);
                     request.setAttribute("label", label);
-                    request.setAttribute("includeIndex", new Integer(no));
+                    request.setAttribute("includeIndex", no);
                     return Utility.getContents("/imcms/" + user.getLanguageIso639_2()
-                                               + "/jsp/docadmin/text/edit_include.jsp", request, response);
-                } catch ( Exception e ) {
+                            + "/jsp/docadmin/text/edit_include.jsp", request, response);
+                } catch (Exception e) {
                     throw new UnhandledException(e);
                 }
-            } else if ( parserParameters.getIncludeLevel() > 0 ) {
-                if ( null == includedDocumentId ) {
+            } else if (parserParameters.getIncludeLevel() > 0) {
+                if (null == includedDocumentId) {
                     return "";
                 }
-                ParserParameters includedDocumentParserParameters = createIncludedDocumentParserParameters(parserParameters, includedDocumentId.intValue(), attributes);
+                ParserParameters includedDocumentParserParameters = createIncludedDocumentParserParameters(parserParameters, includedDocumentId, attributes);
                 StringWriter writer = new StringWriter();
                 textDocParser.untimedParsePage(includedDocumentParserParameters, writer);
                 PatternMatcher patMat = new Perl5Matcher();
@@ -216,7 +278,7 @@ private String includeEditing(Properties attributes, int no) {
             } else {
                 return "<!-- imcms:include failed: max include-level reached. -->";
             }
-        } catch ( IOException ex ) {
+        } catch (IOException ex) {
             return "<!-- imcms:include failed: " + ex + " -->";
         }
     }
@@ -230,71 +292,65 @@ private String includeUrl(String attribute, Properties attributes) {
             Set parameterNamesToSend = createSetFromCommaSeparatedString(commaSeparatedNamesOfParametersToSend);
             urlStr += createQueryStringFromRequest(documentRequest.getHttpServletRequest(), parameterNamesToSend);
 
-            if ( urlStr.startsWith("/") ) {  // lets add hostname if we got a relative path
+            if (urlStr.startsWith("/")) {  // lets add hostname if we got a relative path
                 urlStr = documentRequest.getHttpServletRequest().getScheme()
-                         + "://" + documentRequest.getHttpServletRequest().getServerName()
-                         + ':'
-                         + documentRequest.getHttpServletRequest().getServerPort()
-                         + urlStr;
+                        + "://" + documentRequest.getHttpServletRequest().getServerName()
+                        + ':'
+                        + documentRequest.getHttpServletRequest().getServerPort()
+                        + urlStr;
             }
             URL url = new URL(urlStr);
             String urlProtocol = url.getProtocol();
-            if ( "file".equalsIgnoreCase(urlProtocol) ) { // Make sure we don't have to defend against file://urls...
+            if ("file".equalsIgnoreCase(urlProtocol)) { // Make sure we don't have to defend against file://urls...
                 return "<!-- imcms:include url failed: file-url not allowed -->";
             }
             String sessionId = documentRequest.getHttpServletRequest().getSession().getId();
             URLConnection urlConnection = url.openConnection();
             urlConnection.setRequestProperty("User-Agent",
-                                             documentRequest.getHttpServletRequest().getHeader("User-agent"));
-            if ( null != attributes.getProperty("sendsessionid") ) {
+                    documentRequest.getHttpServletRequest().getHeader("User-agent"));
+            if (null != attributes.getProperty("sendsessionid")) {
                 urlConnection.addRequestProperty("Cookie", ImcmsSetupFilter.JSESSIONID_COOKIE_NAME + "="
-                                                           + sessionId);
+                        + sessionId);
             }
-            if ( null != attributes.getProperty("sendcookies") ) {
+            if (null != attributes.getProperty("sendcookies")) {
                 Cookie[] requestCookies = documentRequest.getHttpServletRequest().getCookies();
-                for ( int i = 0; requestCookies != null && i < requestCookies.length; ++i ) {
+                for (int i = 0; requestCookies != null && i < requestCookies.length; ++i) {
                     Cookie theCookie = requestCookies[i];
-                    if ( !ImcmsSetupFilter.JSESSIONID_COOKIE_NAME.equals(theCookie.getName()) ) {
+                    if (!ImcmsSetupFilter.JSESSIONID_COOKIE_NAME.equals(theCookie.getName())) {
                         urlConnection.addRequestProperty("Cookie", theCookie.getName() + "="
-                                                                   + theCookie.getValue());
+                                + theCookie.getValue());
                     }
                 }
             }
-            if ( null != attributes.getProperty("sendmetaid") ) {
+            if (null != attributes.getProperty("sendmetaid")) {
                 urlConnection.setRequestProperty("X-Meta-Id", "" + document.getId());
             }
 
             InputStream connectionInputStream = urlConnection.getInputStream();
             String contentType = urlConnection.getContentType();
             String contentEncoding = StringUtils.substringAfter(contentType, "charset=");
-            if ( StringUtils.isBlank(contentEncoding) ) {
+            if (StringUtils.isBlank(contentEncoding)) {
                 contentEncoding = Imcms.DEFAULT_ENCODING;
             }
-            InputStreamReader urlInput = null;
-            try {
-                urlInput = new InputStreamReader(connectionInputStream, contentEncoding);
+            try (InputStreamReader urlInput = new InputStreamReader(connectionInputStream, contentEncoding)) {
                 int charsRead;
                 final int URL_BUFFER_LEN = 16384;
                 char[] buffer = new char[URL_BUFFER_LEN];
                 StringBuffer urlResult = new StringBuffer();
-                while ( -1 != ( charsRead = urlInput.read(buffer, 0, URL_BUFFER_LEN) ) ) {
+                while (-1 != (charsRead = urlInput.read(buffer, 0, URL_BUFFER_LEN))) {
                     urlResult.append(buffer, 0, charsRead);
                 }
                 return urlResult.toString();
-            } finally {
-                if ( null != urlInput ) {
-                    urlInput.close();
-                }
             }
-        } catch ( Exception ex ) {
-            LOG.warn("imcms:include url "+urlStr+" failed.",ex);
+        } catch (Exception ex) {
+            LOG.warn("imcms:include url " + urlStr + " failed.", ex);
             return "<!-- imcms:include url failed: " + StringEscapeUtils.escapeHtml(ex.toString()) + " -->";
         }
     }
 
     private String includeDocument(String attributevalue, Properties attributes) {
         try {
-            if ( parserParameters.getIncludeLevel() > 0 ) {
+            if (parserParameters.getIncludeLevel() > 0) {
                 int included_meta_id = Integer.parseInt(attributevalue);
                 ParserParameters includedDocumentParserParameters = createIncludedDocumentParserParameters(parserParameters, included_meta_id, attributes);
                 StringWriter writer = new StringWriter();
@@ -304,11 +360,11 @@ private String includeDocument(String attributevalue, Properties attributes) {
                 documentStr = Util.substitute(patMat, htmlPostbodyPattern, NULL_SUBSTITUTION, documentStr);
                 return documentStr;
             }
-        } catch ( NumberFormatException ex ) {
+        } catch (NumberFormatException ex) {
             return "<!-- imcms:include document failed: " + ex + " -->";
-        } catch ( IOException ex ) {
+        } catch (IOException ex) {
             return "<!-- imcms:include document failed: " + ex + " -->";
-        } catch ( RuntimeException ex ) {
+        } catch (RuntimeException ex) {
             return "<!-- imcms:include document failed: " + ex + " -->";
         }
         return "";
@@ -317,7 +373,7 @@ private String includeDocument(String attributevalue, Properties attributes) {
     private String includeFile(String attributevalue) {// Fetch a file from the disk
         try {
             return replaceTags(service.getFileCache().getCachedFileString(new File(service.getIncludePath(), attributevalue)), false); // Get a file from the include directory
-        } catch ( IOException ex ) {
+        } catch (IOException ex) {
             return "<!-- imcms:include file failed: " + ex + " -->";
         }
     }
@@ -334,7 +390,7 @@ private ParserParameters createIncludedDocumentParserParameters(ParserParameters
             includedParserParameters.setFlags(0);
             includedParserParameters.setIncludeLevel(parserParameters.getIncludeLevel() - 1);
             includedParserParameters.setAdminButtonsVisible(false);
-        } catch ( CloneNotSupportedException e ) {
+        } catch (CloneNotSupportedException e) {
             // ignored, supported
         }
         return includedParserParameters;
@@ -343,14 +399,14 @@ private ParserParameters createIncludedDocumentParserParameters(ParserParameters
     private String createQueryStringFromRequest(HttpServletRequest httpServletRequest, Set parameterNamesToSend) {
         List parameterNameValuePairs = new ArrayList();
         Enumeration parameterNames = httpServletRequest.getParameterNames();
-        while ( parameterNames.hasMoreElements() ) {
+        while (parameterNames.hasMoreElements()) {
             String parameterName = (String) parameterNames.nextElement();
-            if ( null == parameterNamesToSend || parameterNamesToSend.contains(parameterName) ) {
+            if (null == parameterNamesToSend || parameterNamesToSend.contains(parameterName)) {
                 String[] parameterValues = httpServletRequest.getParameterValues(parameterName);
-                for ( int i = 0; i < parameterValues.length; i++ ) {
+                for (int i = 0; i < parameterValues.length; i++) {
                     String parameterValue = parameterValues[i];
                     parameterNameValuePairs.add(URLEncoder.encode(parameterName) + '='
-                                                + URLEncoder.encode(parameterValue));
+                            + URLEncoder.encode(parameterValue));
                 }
             }
         }
@@ -358,12 +414,12 @@ private String createQueryStringFromRequest(HttpServletRequest httpServletReques
     }
 
     private Set createSetFromCommaSeparatedString(String commaSeparatedNames) {
-        if ( null == commaSeparatedNames ) {
+        if (null == commaSeparatedNames) {
             return null;
         }
         StringTokenizer commaAndWhitespaceSeparatedTokenizer = new StringTokenizer(commaSeparatedNames, ", \t\r\n");
         Set names = new HashSet();
-        while ( commaAndWhitespaceSeparatedTokenizer.hasMoreTokens() ) {
+        while (commaAndWhitespaceSeparatedTokenizer.hasMoreTokens()) {
             String parameterName = commaAndWhitespaceSeparatedTokenizer.nextToken();
             names.add(parameterName);
         }
@@ -385,14 +441,14 @@ private Set createSetFromCommaSeparatedString(String commaSeparatedNames) {
      */
     public String tagText(Properties attributes) {
         TextDocumentDomainObject textDocumentToUse = getTextDocumentToUse(attributes);
-        if ( shouldOutputNothingAccordingToMode(attributes, textMode) || textDocumentToUse==null || textDocumentToUse.getId() != document.getId() && textMode ) {
+        if (shouldOutputNothingAccordingToMode(attributes, textMode) || textDocumentToUse == null) {
             return "";
         }
         // Get the 'no'-attribute of the <?imcms:text no="..."?>-tag
         String noStr = attributes.getProperty("no");
         int no;
         TextDomainObject text;
-        if ( null == noStr ) {
+        if (null == noStr) {
             no = implicitTextNumber++;
             text = textDocumentToUse.getText(no);
         } else {
@@ -402,20 +458,20 @@ public String tagText(Properties attributes) {
             implicitTextNumber = no + 1;
         }
         String result = "";
-        if ( text != null ) {
+        if (text != null) {
             result = text.toHtmlString();
-            if ( text.getType() == TextDomainObject.TEXT_TYPE_HTML ) {
+            if (text.getType() == TextDomainObject.TEXT_TYPE_HTML) {
                 result = replaceTags(result, true);
             }
         }
 
-        if ( textMode ) {
+        if (textMode && (textDocumentToUse.getId() == document.getId())) {
             HttpServletRequest request = documentRequest.getHttpServletRequest();
             HttpServletResponse response = documentRequest.getHttpServletResponse();
             String formatsAttribute = attributes.getProperty("formats", "");
             String[] formats = null != formatsAttribute ? formatsAttribute.split("\\W+") : null;
             request.setAttribute("document", documentRequest.getDocument());
-            request.setAttribute("textIndex", new Integer(no));
+            request.setAttribute("textIndex", no);
             String label = getLabel(attributes);
             request.setAttribute("label", label);
             request.setAttribute("content", result);
@@ -424,10 +480,10 @@ public String tagText(Properties attributes) {
 
             try {
                 result = Utility.getContents("/imcms/" + documentRequest.getUser().getLanguageIso639_2()
-                                             + "/jsp/docadmin/text/edit_text.jsp", request, response);
-            } catch ( ServletException e ) {
+                        + "/jsp/docadmin/text/edit_text.jsp", request, response);
+            } catch (ServletException e) {
                 throw new UnhandledException(e);
-            } catch ( IOException e ) {
+            } catch (IOException e) {
                 throw new UnhandledException(e);
             }
         }
@@ -435,39 +491,6 @@ public String tagText(Properties attributes) {
         return result;
     }
 
-    private static boolean shouldOutputNothingAccordingToMode(Properties attributes, boolean mode) {
-        String modeAttribute = attributes.getProperty("mode");
-        return StringUtils.isNotBlank(modeAttribute)
-               && ( mode && "read".startsWith(modeAttribute) // With mode="read", we don't want anything in textMode.
-                    || !mode
-                       && "write".startsWith(modeAttribute)// With mode="write", we don't want anything unless we're in textMode.
-        );
-    }
-
-    private static String getLabel(Properties attributes) {
-        return attributes.getProperty("label", "").replaceAll("\\s+", " ");
-    }
-
-    private static String[] getLabelTags(Properties attributes, int no,
-                                  String finalresult, TextDocumentDomainObject document) {
-        String label = getLabel(attributes);
-        String label_urlparam = "";
-        if ( !"".equals(label) ) {
-            label_urlparam = removeHtmlTagsAndUrlEncode(label);
-        }
-        return new String[] {
-                "#meta_id#", String.valueOf(document.getId()),
-                "#content_id#", "" + no,
-                "#content#", finalresult,
-                "#label_url#", label_urlparam,
-                "#label#", label
-        };
-    }
-
-    private static String removeHtmlTagsAndUrlEncode(String label) {
-        return URLEncoder.encode(Html.removeTags(label));
-    }
-
     /**
      * Handle a <?imcms:image...?> tag
      *
@@ -482,38 +505,86 @@ public String tagImage(Properties attributes, boolean imageMode, int[] implicitI
                            HttpServletRequest httpServletRequest, ImcmsServices service) {
 
         TextDocumentDomainObject textDocumentToUse = getTextDocumentToUse(attributes);
-        if ( shouldOutputNothingAccordingToMode(attributes, imageMode) || textDocumentToUse==null || textDocumentToUse.getId() != document.getId() && imageMode ) {
+        if (shouldOutputNothingAccordingToMode(attributes, imageMode) || textDocumentToUse == null) {
             return "";
         }
         // Get the 'no'-attribute of the <?imcms:text no="..."?>-tag
         String noStr = attributes.getProperty("no");
         int imageIndex;
-        if ( null == noStr ) {
+        if (null == noStr) {
             imageIndex = implicitImageIndex[0]++;
         } else {
             noStr = noStr.trim();
             imageIndex = Integer.parseInt(noStr);
             implicitImageIndex[0] = imageIndex + 1;
         }
-        ImageDomainObject image = textDocumentToUse.getImage(imageIndex) ;
+        ImageDomainObject image = textDocumentToUse.getImage(imageIndex);
         ImageSource imageSource = image.getSource();
-        String imageTag = "" ;
-        if ( !( imageSource instanceof FileDocumentImageSource )
-             || imageMode
-             || user.canAccess(( (FileDocumentImageSource) imageSource ).getFileDocument()) ) {
-            imageTag = ImcmsImageUtils.getImageHtmlTag(image, httpServletRequest, attributes);
+        String imageTag = "";
+        String style = (String) attributes.getProperty("style");
+        if (!(imageSource instanceof FileDocumentImageSource)
+                || imageMode
+                || user.canAccess(((FileDocumentImageSource) imageSource).getFileDocument()))
+        {
+
+            if (style != null) {
+                Matcher matcher = REMOVE_ATTRS_PATTERN.matcher(style);
+
+                String cleanedStyle = matcher.replaceAll(" ");
+
+                attributes.put("style", cleanedStyle);
+            }
+
+            imageTag = ImcmsImageUtils.getImageHtmlTag(textDocumentToUse.getId(), image, httpServletRequest, attributes);
         }
 
-        if ( imageMode ) {
+        if (imageMode && (textDocumentToUse.getId() == document.getId())) {
             String[] replace_tags = getLabelTags(attributes, imageIndex, imageTag, textDocumentToUse);
             String admin_template_file;
-            if ( "".equals(imageTag) ) { // no data in the db-field.
+            if ("".equals(imageTag)) { // no data in the db-field.
                 admin_template_file = "textdoc/admin_no_image.frag";
             } else {               // data in the db-field.
                 admin_template_file = "textdoc/admin_image.frag";
             }
 
-            imageTag = service.getAdminTemplate(admin_template_file, user, Arrays.asList(replace_tags));
+            String imageWidth = "0";
+            String imageHeight = "0";
+            String maxWidth = "0";
+            String maxHeight = "0";
+
+            if (style != null) {
+                PatternMatcher matcher = new Perl5Matcher();
+
+                if (matcher.contains(style, widthPattern)) {
+                    imageWidth = matcher.getMatch().group(1);
+                }
+                if (matcher.contains(style, heightPattern)) {
+                    imageHeight = matcher.getMatch().group(1);
+                }
+                if (matcher.contains(style, maxWidthPattern)) {
+                    maxWidth = matcher.getMatch().group(1);
+                }
+                if (matcher.contains(style, maxHeightPattern)) {
+                    maxHeight = matcher.getMatch().group(1);
+                }
+            }
+
+            String linkable = attributes.getProperty("linkable", "true");
+
+            List<String> replaceTags = new ArrayList<>(replace_tags.length + 8);
+            CollectionUtils.addAll(replaceTags, replace_tags);
+            replaceTags.add("#image_width#");
+            replaceTags.add(imageWidth);
+            replaceTags.add("#image_height#");
+            replaceTags.add(imageHeight);
+            replaceTags.add("#max_width#");
+            replaceTags.add(maxWidth);
+            replaceTags.add("#max_height#");
+            replaceTags.add(maxHeight);
+            replaceTags.add("#is_linkable#");
+            replaceTags.add(linkable);
+
+            imageTag = service.getAdminTemplate(admin_template_file, user, replaceTags);
         }
 
         return imageTag;
@@ -529,23 +600,23 @@ public String tagImage(Properties attributes, boolean imageMode, int[] implicitI
      */
     private String tagDatetime(Properties attributes) {
         String format = attributes.getProperty("format") == null
-                        ? DateConstants.DATETIME_NO_SECONDS_FORMAT_STRING : attributes.getProperty("format");
+                ? DateConstants.DATETIME_NO_SECONDS_FORMAT_STRING : attributes.getProperty("format");
         String type = attributes.getProperty("type");
         String lang = attributes.getProperty("lang");
 
         Date date;
 
-        if ( type != null ) {
+        if (type != null) {
             type = type.toLowerCase();
-            if ( "now".startsWith(type) ) {
+            if ("now".startsWith(type)) {
                 date = new Date();
-            } else if ( "created".startsWith(type) ) {
+            } else if ("created".startsWith(type)) {
                 date = document.getCreatedDatetime();
-            } else if ( "modified".startsWith(type) ) {
+            } else if ("modified".startsWith(type)) {
                 date = document.getModifiedDatetime();
-            } else if ( "archived".startsWith(type) ) {
+            } else if ("archived".startsWith(type)) {
                 date = document.getArchivedDatetime();
-            } else if ( "activated".startsWith(type) ) {
+            } else if ("activated".startsWith(type)) {
                 date = document.getPublicationStartDatetime();
             } else {
                 return "<!-- <?imcms:datetime ... type=\"" + type + "\" is empty, wrong or does not exist! -->";
@@ -555,38 +626,40 @@ private String tagDatetime(Properties attributes) {
         }
 
         java.text.SimpleDateFormat formatter;
-        if ( lang == null ) {
+        if (lang == null) {
             formatter = new java.text.SimpleDateFormat(format);
         } else {
             formatter = new java.text.SimpleDateFormat(format, new Locale(lang, ""));
         }
 
         try {
-            if ( null == date ) {
+            if (null == date) {
                 return ""; // There was no date of the requested type (activated/archived?)
             } else {
                 return formatter.format(date);
             }
-        } catch ( IllegalArgumentException ex ) {
+        } catch (IllegalArgumentException ex) {
             return "<!-- imcms:datetime failed: " + ex.getMessage() + " -->";
         }
     }
 
-    /** Handle a <?imcms:user who='...' get='xxxxxxx'?> tag. */
+    /**
+     * Handle a <?imcms:user who='...' get='xxxxxxx'?> tag.
+     */
     private String tagUser(Properties attributes) {
 
         UserDomainObject user;
         String who = attributes.getProperty("who");
 
         ImcmsAuthenticatorAndUserAndRoleMapper userMapper = service.getImcmsAuthenticatorAndUserAndRoleMapper();
-        if ( null != who && "creator".equalsIgnoreCase(who) ) {
+        if (null != who && "creator".equalsIgnoreCase(who)) {
             user = userMapper.getUser(documentRequest.getDocument().getCreatorId());
-        } else if ( null != who && "publisher".equalsIgnoreCase(who) ) {
+        } else if (null != who && "publisher".equalsIgnoreCase(who)) {
             Integer publisherId = documentRequest.getDocument().getPublisherId();
             if (null == publisherId) {
-                return "" ;
+                return "";
             }
-            user = userMapper.getUser(publisherId.intValue()) ;
+            user = userMapper.getUser(publisherId);
         } else {
             user = documentRequest.getUser();
         }
@@ -594,28 +667,28 @@ private String tagUser(Properties attributes) {
         String result = "";
         String get = attributes.getProperty("get");
 
-        if ( get != null && !"".equals(get) ) {
-            if ( "name".equalsIgnoreCase(get) ) {
+        if (get != null && !"".equals(get)) {
+            if ("name".equalsIgnoreCase(get)) {
                 result = user.getFullName();
-            } else if ( "firstname".equalsIgnoreCase(get) ) {
+            } else if ("firstname".equalsIgnoreCase(get)) {
                 result = user.getFirstName();
-            } else if ( "lastname".equalsIgnoreCase(get) ) {
+            } else if ("lastname".equalsIgnoreCase(get)) {
                 result = user.getLastName();
-            } else if ( "company".equalsIgnoreCase(get) ) {
+            } else if ("company".equalsIgnoreCase(get)) {
                 result = user.getCompany();
-            } else if ( "address".equalsIgnoreCase(get) ) {
+            } else if ("address".equalsIgnoreCase(get)) {
                 result = user.getAddress();
-            } else if ( "zip".equalsIgnoreCase(get) ) {
+            } else if ("zip".equalsIgnoreCase(get)) {
                 result = user.getZip();
-            } else if ( "city".equalsIgnoreCase(get) ) {
+            } else if ("city".equalsIgnoreCase(get)) {
                 result = user.getCity();
-            } else if ( "workphone".equalsIgnoreCase(get) ) {
+            } else if ("workphone".equalsIgnoreCase(get)) {
                 result = user.getWorkPhone();
-            } else if ( "mobilephone".equalsIgnoreCase(get) ) {
+            } else if ("mobilephone".equalsIgnoreCase(get)) {
                 result = user.getMobilePhone();
-            } else if ( "homephone".equalsIgnoreCase(get) ) {
+            } else if ("homephone".equalsIgnoreCase(get)) {
                 result = user.getHomePhone();
-            } else if ( "email".equalsIgnoreCase(get) ) {
+            } else if ("email".equalsIgnoreCase(get)) {
                 result = user.getEmailAddress();
             }
         }
@@ -627,26 +700,26 @@ private String tagCategories(Properties attributes) {
         String categoryTypeName = attributes.getProperty("type");
         final String shouldOutputDescription = attributes.getProperty("outputdescription");
         CategoryMapper categoryMapper = service.getCategoryMapper();
-        Set categories ;
-        if ( null == categoryTypeName ) {
+        Set categories;
+        if (null == categoryTypeName) {
             categories = categoryMapper.getCategories(document.getCategoryIds());
         } else {
             CategoryTypeDomainObject categoryType = categoryMapper.getCategoryTypeByName(categoryTypeName);
             categories = categoryMapper.getCategoriesOfType(categoryType, document.getCategoryIds());
         }
         String[] categoryStrings = new String[categories.size()];
-        for ( CountingIterator iterator = new CountingIterator(categories.iterator()); iterator.hasNext(); ) {
+        for (CountingIterator iterator = new CountingIterator(categories.iterator()); iterator.hasNext(); ) {
             CategoryDomainObject category = (CategoryDomainObject) iterator.next();
             String categoryString = category.getName();
-            if ( null == categoryTypeName ) {
+            if (null == categoryTypeName) {
                 categoryString = category.getType() + ": " + categoryString;
             }
-            if ( "only".equalsIgnoreCase(shouldOutputDescription) ) {
+            if ("only".equalsIgnoreCase(shouldOutputDescription)) {
                 categoryString = category.getDescription();
-            } else if ( "true".equalsIgnoreCase(shouldOutputDescription) ) {
+            } else if ("true".equalsIgnoreCase(shouldOutputDescription)) {
                 categoryString += " - " + category.getDescription();
             }
-            categoryStrings[iterator.getCount()-1] = categoryString;
+            categoryStrings[iterator.getCount() - 1] = categoryString;
         }
         String separator = attributes.getProperty("separator", ",");
         return StringUtils.join(categoryStrings, separator);
@@ -654,13 +727,13 @@ private String tagCategories(Properties attributes) {
 
     private String tagLanguage(Properties attributes) {
         String representation = attributes.getProperty("representation");
-        if ( null == representation ) {
+        if (null == representation) {
             return service.getLanguageMapper().getCurrentLanguageNameInUsersLanguage(documentRequest.getUser(), document.getLanguageIso639_2());
-        } else if ( LanguageMapper.ISO639_2.equalsIgnoreCase(representation) ) {
+        } else if (LanguageMapper.ISO639_2.equalsIgnoreCase(representation)) {
             return document.getLanguageIso639_2();
         } else {
             return "<!-- <?imcms:language ... representation=\"" + representation
-                   + "\" is empty, wrong or does not exist! -->";
+                    + "\" is empty, wrong or does not exist! -->";
         }
     }
 
@@ -668,28 +741,28 @@ private String singleTag(String tagname, Properties attributes, String entireMat
                              PatternMatcher patMat, boolean insideText) {
         String tagResult = entireMatch;
 
-        if ( "contextpath".equals(tagname) ) {
+        if ("contextpath".equals(tagname)) {
             tagResult = tagContextPath();
-        } else if ( !insideText ) {
-            if ( "text".equals(tagname) ) {
+        } else if (!insideText) {
+            if ("text".equals(tagname)) {
                 tagResult = tagText(attributes);
-            } else if ( "image".equals(tagname) ) {
+            } else if ("image".equals(tagname)) {
                 tagResult = tagImage(attributes);
-            } else if ( "include".equals(tagname) ) {
+            } else if ("include".equals(tagname)) {
                 tagResult = tagInclude(attributes);
-            } else if ( "metaid".equals(tagname) ) {
+            } else if ("metaid".equals(tagname)) {
                 tagResult = tagMetaId();
-            } else if ( "datetime".equals(tagname) ) {
+            } else if ("datetime".equals(tagname)) {
                 tagResult = tagDatetime(attributes);
-            } else if ( "section".equals(tagname) ) {
+            } else if ("section".equals(tagname)) {
                 tagResult = tagSection(attributes);
-            } else if ( "sections".equals(tagname) ) {
+            } else if ("sections".equals(tagname)) {
                 tagResult = tagSections(attributes);
-            } else if ( "user".equals(tagname) ) {
+            } else if ("user".equals(tagname)) {
                 tagResult = tagUser(attributes);
-            } else if ( "documentlanguage".equals(tagname) ) {
+            } else if ("documentlanguage".equals(tagname)) {
                 tagResult = tagLanguage(attributes);
-            } else if ( "documentcategories".equals(tagname) ) {
+            } else if ("documentcategories".equals(tagname)) {
                 tagResult = tagCategories(attributes);
             }
         }
@@ -706,7 +779,7 @@ public String replaceTags(String template, boolean insideText) {
         PatternMatcherInput input = new PatternMatcherInput(template);
         int lastMatchEndOffset = 0;
         PatternMatcher patMat = new Perl5Matcher();
-        while ( patMat.contains(input, imcmsTagPattern) ) {
+        while (patMat.contains(input, imcmsTagPattern)) {
             result.append(input.substring(lastMatchEndOffset, input.getMatchBeginOffset()));
 
             MatchResult matres = patMat.getMatch();
@@ -717,12 +790,12 @@ public String replaceTags(String template, boolean insideText) {
 
             String tagResult = entireTag;
 
-            if ( "menu".equals(tagName) || "velocity".equals(tagName) ) {
+            if ("menu".equals(tagName) || "velocity".equals(tagName)) {
                 tagResult = findEndTag(tagName, attributes, tagResult, patMat, input);
             } else {
                 tagResult = singleTag(tagName, attributes, entireTag, patMat, insideText);
             }
-            result.append(addPreAndPost(attributes, tagResult)) ;
+            result.append(addPreAndPost(attributes, tagResult));
             lastMatchEndOffset = input.getCurrentOffset();
         }
         result.append(template.substring(lastMatchEndOffset));
@@ -734,10 +807,10 @@ private String findEndTag(String tagName, Properties attributes, String entireTa
                               PatternMatcherInput input) {
         String tagResult = entireTag;
         PatternMatcherInput endTagInput = new PatternMatcherInput(input.getBuffer(), input.getMatchEndOffset(),
-                                                                  input.getEndOffset() - input.getMatchEndOffset());
-        while ( patMat.contains(endTagInput, imcmsEndTagPattern) ) {
+                input.getEndOffset() - input.getMatchEndOffset());
+        while (patMat.contains(endTagInput, imcmsEndTagPattern)) {
             String endTagName = patMat.getMatch().group(1);
-            if ( endTagName.equals(tagName) ) {
+            if (endTagName.equals(tagName)) {
                 String elementContent = endTagInput.preMatch();
                 input.setCurrentOffset(endTagInput.getMatchEndOffset());
                 tagResult = blockTag(tagName, attributes, elementContent, patMat);
@@ -747,21 +820,12 @@ private String findEndTag(String tagName, Properties attributes, String entireTa
         return tagResult;
     }
 
-    public static String addPreAndPost(Properties attributes, String tagResult) {
-        if ( 0 == tagResult.length() ) {
-            return "" ;
-        }
-        String preAttribute = StringUtils.defaultString(attributes.getProperty("pre"));
-        String postAttribute = StringUtils.defaultString(attributes.getProperty("post"));
-        return preAttribute+tagResult+postAttribute;
-    }
-
     String blockTag(String tagname, Properties attributes, String content,
                     PatternMatcher patternMatcher) {
         String result = content;
-        if ( "menu".equals(tagname) ) {
+        if ("menu".equals(tagname)) {
             result = tagMenu(attributes, content, patternMatcher);
-        } else if ( "velocity".equals(tagname) ) {
+        } else if ("velocity".equals(tagname)) {
             result = tagVelocity(content);
         }
         return result;
@@ -784,7 +848,7 @@ private String tagVelocity(String content) {
         try {
             velocityEngine.init();
             velocityEngine.evaluate(velocityContext, stringWriter, null, content);
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             throw new UnhandledException(e);
         }
         return stringWriter.toString();
@@ -793,39 +857,24 @@ private String tagVelocity(String content) {
     private TextDocumentDomainObject getTextDocumentToUse(Properties attributes) {
         String documentName = attributes.getProperty("document");
         TextDocumentDomainObject textDocumentToUse = document;
-        if(StringUtils.isNotBlank(documentName)) {
+        if (StringUtils.isNotBlank(documentName)) {
             textDocumentToUse = null;
-            try{
-                textDocumentToUse = (TextDocumentDomainObject)service.getDocumentMapper().getDocument(documentName);
-            }catch(ClassCastException e ){/* return null */}
-        }
-       return textDocumentToUse;
-    }
-
-    public class MetaIdHeaderHttpServletRequest extends HttpServletRequestWrapper {
-
-        private int metaId;
-
-        public MetaIdHeaderHttpServletRequest(HttpServletRequest request, int metaId) {
-            super(request);
-            this.metaId = metaId;
-        }
-
-        public String getHeader(String headerName) {
-            if ( "x-meta-id".equalsIgnoreCase(headerName) ) {
-                return "" + metaId;
-            }
-            return super.getHeader(headerName);
+            try {
+                textDocumentToUse = (TextDocumentDomainObject) service.getDocumentMapper().getDocument(documentName);
+            } catch (ClassCastException e) {/* return null */}
         }
+        return textDocumentToUse;
     }
 
-    /** Take a String of attributes, as may be found inside a tag, (name="...", and so on...) and transform it into a Properties. */
+    /**
+     * Take a String of attributes, as may be found inside a tag, (name="...", and so on...) and transform it into a Properties.
+     */
     public Properties parseAttributes(String attributes_string, PatternMatcher patternMatcher,
                                       HttpServletRequest request) {
         Properties attributes = new Properties();
 
         PatternMatcherInput attributes_input = new PatternMatcherInput(attributes_string);
-        while ( patternMatcher.contains(attributes_input, attributesPattern) ) {
+        while (patternMatcher.contains(attributes_input, attributesPattern)) {
             MatchResult attribute_matres = patternMatcher.getMatch();
             String escapedValue = attribute_matres.group(3);
             String value = StringEscapeUtils.unescapeHtml(escapedValue);
@@ -843,4 +892,21 @@ public String escapeHtml(String s) {
         }
     }
 
+    public class MetaIdHeaderHttpServletRequest extends HttpServletRequestWrapper {
+
+        private int metaId;
+
+        public MetaIdHeaderHttpServletRequest(HttpServletRequest request, int metaId) {
+            super(request);
+            this.metaId = metaId;
+        }
+
+        public String getHeader(String headerName) {
+            if ("x-meta-id".equalsIgnoreCase(headerName)) {
+                return "" + metaId;
+            }
+            return super.getHeader(headerName);
+        }
+    }
+
 }
diff --git a/server/src/imcode/server/parser/Text.java b/server/src/imcode/server/parser/Text.java
index 97968b9468..40a29dc2de 100644
--- a/server/src/imcode/server/parser/Text.java
+++ b/server/src/imcode/server/parser/Text.java
@@ -1,8 +1,10 @@
-package imcode.server.parser ;
+package imcode.server.parser;
 
 public interface Text extends Node {
 
-    /** @return A String containing the contents of this element. **/
-    public String getContent() ;
+    /**
+     * @return A String containing the contents of this element.
+     **/
+    public String getContent();
 
 }
diff --git a/server/src/imcode/server/parser/TextDocumentParser.java b/server/src/imcode/server/parser/TextDocumentParser.java
index a9689436f7..ec9fb910e3 100644
--- a/server/src/imcode/server/parser/TextDocumentParser.java
+++ b/server/src/imcode/server/parser/TextDocumentParser.java
@@ -14,9 +14,9 @@
 import imcode.util.ShouldNotBeThrownException;
 import imcode.util.Utility;
 import org.apache.commons.lang.time.StopWatch;
-import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.oro.text.regex.*;
 
 import javax.servlet.ServletException;
@@ -25,69 +25,119 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
 
 public class TextDocumentParser {
 
-    private final static Logger LOG = Logger.getLogger( TextDocumentParser.class );
+    private final static Logger LOG = LogManager.getLogger(TextDocumentParser.class);
 
     static Pattern hashtagPattern;
     private static Pattern htmlTagPattern;
     private static Pattern htmlTagHtmlPattern;
+    private static Pattern headEndTagHtmlPattern;
 
     static {
         Perl5Compiler patComp = new Perl5Compiler();
         try {
             // OK, so this pattern is simple, ugly, and prone to give a lot of errors.
             // Very good. Very good. Know something? NO SOUP FOR YOU!
-            htmlTagPattern = patComp.compile( "<[^>]+?>", Perl5Compiler.READ_ONLY_MASK );
+            htmlTagPattern = patComp.compile("<[^>]+?>", Perl5Compiler.READ_ONLY_MASK);
 
-            htmlTagHtmlPattern = patComp.compile( "<[hH][tT][mM][lL]\\b", Perl5Compiler.READ_ONLY_MASK );
+            htmlTagHtmlPattern = patComp.compile("<[hH][tT][mM][lL]\\b", Perl5Compiler.READ_ONLY_MASK);
 
-            hashtagPattern = patComp.compile( "#[^ #\"<>&;\\t\\r\\n]+#", Perl5Compiler.READ_ONLY_MASK );
-        } catch ( MalformedPatternException ignored ) {
+            headEndTagHtmlPattern = patComp.compile("<\\/[hH][eE][aA][dD]\\b", Perl5Compiler.READ_ONLY_MASK);
+
+            hashtagPattern = patComp.compile("#[^ #\"<>&;\\t\\r\\n]+#", Perl5Compiler.READ_ONLY_MASK);
+        } catch (MalformedPatternException ignored) {
             // I ignore the exception because i know that these patterns work, and that the exception will never be thrown.
-            LOG.fatal( "Bad pattern.", ignored );
+            LOG.fatal("Bad pattern.", ignored);
         }
     }
 
     private ImcmsServices service;
 
-    public TextDocumentParser( ImcmsServices service ) {
+    public TextDocumentParser(ImcmsServices service) {
         this.service = service;
     }
 
+    public static String createChangeTemplateUi(boolean templatemode, UserDomainObject user,
+                                                TextDocumentDomainObject document, ImcmsServices service) throws IOException {
+        String changeTemplateUi = "";
+        if (templatemode) {    //Templatemode! :)
+
+            TemplateMapper templateMapper = service.getTemplateMapper();
+
+            TemplateGroupDomainObject selectedTemplateGroup = user.getTemplateGroup();
+            if (null == selectedTemplateGroup) {
+                selectedTemplateGroup = templateMapper.getTemplateGroupById(document.getTemplateGroupId());
+            }
+
+            TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject) user.getPermissionSetFor(document);
+
+            Set allowedTemplateGroupIds = textDocumentPermissionSet.getAllowedTemplateGroupIds();
+            List allowedTemplateGroups = templateMapper.getTemplateGroups(allowedTemplateGroupIds);
+            String templateGroupsHtmlOptionList = templateMapper.createHtmlOptionListOfTemplateGroups(allowedTemplateGroups, selectedTemplateGroup);
+
+            List<TemplateDomainObject> templates = new ArrayList<>();
+            if (allowedTemplateGroupIds.contains(selectedTemplateGroup.getId())) {
+                templates = templateMapper.getTemplatesInGroup(selectedTemplateGroup);
+            }
+            String templateId = document.getTemplateName();
+            TemplateDomainObject template = templateMapper.getTemplateByName(templateId);
+            String templatesHtmlOptionList = templateMapper.createHtmlOptionListOfTemplates(templates, template);
+
+            // Oh! I need a set of tags to be replaced in the templatefiles we'll load...
+            List temptags = new ArrayList();
+
+            temptags.add("#getMetaId#");
+            temptags.add("" + document.getId());
+            temptags.add("#group#");
+            temptags.add(selectedTemplateGroup.getName());
+            temptags.add("#getTemplateGroups#");
+            temptags.add(templateGroupsHtmlOptionList);
+            temptags.add("#simple_name#");
+            temptags.add(template.getName());
+            temptags.add("#getTemplatesInGroup#");
+            temptags.add(templatesHtmlOptionList);
+
+            // Put templateadmintemplate in list of files to load.
+            changeTemplateUi = service.getAdminTemplate("textdoc/inPage_admin.html", user, temptags);
+        }  // if (templatemode)
+        return changeTemplateUi;
+    }
+
     public void parsePage(ParserParameters paramsToParse,
                           Writer out) throws IOException {
-        NDC.push( "parsePage" );
-        try {
+
+	    try (CloseableThreadContext.Instance ignored = CloseableThreadContext.push("parsePage");) {
             StopWatch stopWatch = new StopWatch();
             stopWatch.start();
-            untimedParsePage( paramsToParse, out);
+            untimedParsePage(paramsToParse, out);
             stopWatch.stop();
-            LOG.trace("Parsing template took "+stopWatch.getTime()+"ms.");
-        } finally {
-            NDC.pop();
+            LOG.trace("Parsing template took " + stopWatch.getTime() + "ms.");
         }
     }
 
     public void untimedParsePage(ParserParameters parserParameters,
                                  Writer out) throws IOException {
-        TextDocumentViewing viewing = new TextDocumentViewing( parserParameters );
-        TextDocumentViewing previousViewing = TextDocumentViewing.putInRequest( viewing );
+        TextDocumentViewing viewing = new TextDocumentViewing(parserParameters);
+        TextDocumentViewing previousViewing = TextDocumentViewing.putInRequest(viewing);
         ParserParameters previousParameters = ParserParameters.putInRequest(parserParameters);
         try {
             DocumentRequest documentRequest = parserParameters.getDocumentRequest();
 
-            TextDocumentDomainObject document = (TextDocumentDomainObject)documentRequest.getDocument();
+            TextDocumentDomainObject document = (TextDocumentDomainObject) documentRequest.getDocument();
             UserDomainObject user = documentRequest.getUser();
 
             String templateName = document.getTemplateName();
 
             TemplateMapper templateMapper = service.getTemplateMapper();
-            if ( parserParameters.getTemplateName() != null ) {
-                TemplateDomainObject template1 = templateMapper.getTemplateByName( parserParameters.getTemplateName() );
-                if ( null != template1 ) {
+            if (parserParameters.getTemplateName() != null) {
+                TemplateDomainObject template1 = templateMapper.getTemplateByName(parserParameters.getTemplateName());
+                if (null != template1) {
                     templateName = template1.getName();
                 }
             }
@@ -96,183 +146,157 @@ public void untimedParsePage(ParserParameters parserParameters,
 
             Perl5Matcher patMat = new Perl5Matcher();
 
-            final String imcmsMessage = service.getAdminTemplate( "textdoc/imcms_message.html", user, null );
+            final String imcmsMessage = service.getAdminTemplate("textdoc/imcms_message.html", user, null);
+            final String imcmsAdminScript = (viewing.isEditingTexts()) ?
+                    service.getAdminTemplate("textdoc/imcms_admin_headtag_mode_text.html", user, null) :
+                    service.getAdminTemplate("textdoc/imcms_admin_headtag.html", user, null);
+            HttpServletRequest request = null;
+            HttpServletResponse response = null;
+            boolean hasAdminPanel = false;
+            try {
+                request = documentRequest.getHttpServletRequest();
+                response = documentRequest.getHttpServletResponse();
+                hasAdminPanel = !"".equals(Html.getAdminButtons(user, document, request, response));
+            } catch (Exception e) {
+            }
             if (null == template) {
-                throw new RuntimeException("Template not found: "+templateName);
+                throw new RuntimeException("Template not found: " + templateName);
             } else if (template.getFileName().endsWith(".jsp") || template.getFileName().endsWith(".jspx")) {
                 try {
-                    HttpServletRequest request = documentRequest.getHttpServletRequest();
-                    HttpServletResponse response = documentRequest.getHttpServletResponse();
                     String contents = Utility.getContents("/WEB-INF/templates/text/" + template.getFileName(), request, response);
-                    contents = Util.substitute( patMat, htmlTagHtmlPattern, new Substitution() {
-                    public void appendSubstitution( StringBuffer stringBuffer, MatchResult matchResult, int i,
-                                                    PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher,
-                                                    Pattern pattern ) {
-                          stringBuffer.append( imcmsMessage ).append( matchResult.group( 0 ) );
-                       }
-                    }, contents ) ;
-	                  out.write(contents);
-                } catch ( ServletException e ) {
-                    throw new UnhandledException(e);
+                    contents = Util.substitute(patMat, htmlTagHtmlPattern, new Substitution() {
+                        public void appendSubstitution(StringBuffer stringBuffer, MatchResult matchResult, int i, PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher, Pattern pattern) {
+                            stringBuffer.append(imcmsMessage).append(matchResult.group(0));
+                        }
+                    }, contents);
+                    if (hasAdminPanel) {
+                        contents = Util.substitute(patMat, headEndTagHtmlPattern, new Substitution() {
+                            public void appendSubstitution(StringBuffer stringBuffer, MatchResult matchResult, int i, PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher, Pattern pattern) {
+                                stringBuffer.append(imcmsAdminScript).append(matchResult.group(0));
+                            }
+                        }, contents);
+                    }
+                    out.write(contents);
+                } catch (ServletException e) {
+                    Utility.invokeInternalErrorServletWith(request, response, e);
                 }
             } else {
                 String templateContent = service.getTemplateMapper().getTemplateData(templateName);
 
-                SimpleDateFormat datetimeFormatWithSeconds = new SimpleDateFormat( DateConstants.DATETIME_FORMAT_STRING );
+                SimpleDateFormat datetimeFormatWithSeconds = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
 
-                Properties hashTags = getHashTags( user, datetimeFormatWithSeconds, document, viewing.isEditingTemplate(), parserParameters );
-                MapSubstitution hashtagsubstitution = new MapSubstitution( hashTags, true );
-                TagParser tagParser = new TagParser( this, parserParameters);
+                Properties hashTags = getHashTags(user, datetimeFormatWithSeconds, document, viewing.isEditingTemplate(), parserParameters);
+                MapSubstitution hashtagsubstitution = new MapSubstitution(hashTags, true);
+                TagParser tagParser = new TagParser(this, parserParameters);
 
                 String tagsReplaced = tagParser.replaceTags(templateContent, false);
-                tagsReplaced = Util.substitute( patMat, hashtagPattern, hashtagsubstitution, tagsReplaced, Util.SUBSTITUTE_ALL );
-
-                String emphasizedAndTagsReplaced = applyEmphasis( documentRequest, user, tagsReplaced, patMat );
-                out.write(Util.substitute( patMat, htmlTagHtmlPattern, new Substitution() {
-                    public void appendSubstitution( StringBuffer stringBuffer, MatchResult matchResult, int i,
-                                                    PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher,
-                                                    Pattern pattern ) {
-                        stringBuffer.append( imcmsMessage ).append( matchResult.group( 0 ) );
+                tagsReplaced = Util.substitute(patMat, hashtagPattern, hashtagsubstitution, tagsReplaced, Util.SUBSTITUTE_ALL);
+
+                String emphasizedAndTagsReplaced = applyEmphasis(documentRequest, user, tagsReplaced, patMat);
+                String cont = Util.substitute(patMat, htmlTagHtmlPattern, new Substitution() {
+                    public void appendSubstitution(StringBuffer stringBuffer, MatchResult matchResult, int i, PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher, Pattern pattern) {
+                        stringBuffer.append(imcmsMessage).append(matchResult.group(0));
                     }
-                }, emphasizedAndTagsReplaced ));
+                }, emphasizedAndTagsReplaced);
+                if (hasAdminPanel) {
+                    cont = Util.substitute(patMat, headEndTagHtmlPattern, new Substitution() {
+                        public void appendSubstitution(StringBuffer stringBuffer, MatchResult matchResult, int i, PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher, Pattern pattern) {
+                            stringBuffer.append(imcmsAdminScript).append(matchResult.group(0));
+                        }
+                    }, cont);
+                }
+                out.write(cont);
             }
         } finally {
             if (null != previousViewing) {
-                TextDocumentViewing.putInRequest( previousViewing ) ;
+                TextDocumentViewing.putInRequest(previousViewing);
             }
             if (null != previousParameters) {
-                ParserParameters.putInRequest(previousParameters) ;
+                ParserParameters.putInRequest(previousParameters);
             }
         }
     }
-	 
 
-    private String applyEmphasis( DocumentRequest documentRequest, UserDomainObject user, String string,
-                                  Perl5Matcher patMat ) {
+    private String applyEmphasis(DocumentRequest documentRequest, UserDomainObject user, String string,
+                                 Perl5Matcher patMat) {
         String[] emp = documentRequest.getEmphasize();
-        if ( emp != null ) { // If we have something to emphasize...
-            String emphasize_string = service.getAdminTemplate( "textdoc/emphasize.html", user, null );
-            Perl5Substitution emphasize_substitution = new Perl5Substitution( emphasize_string );
-            StringBuffer result = new StringBuffer( string.length() ); // A StringBuffer to hold the result
-            PatternMatcherInput emp_input = new PatternMatcherInput( string );    // A PatternMatcherInput to match on
+        if (emp != null) { // If we have something to emphasize...
+            String emphasize_string = service.getAdminTemplate("textdoc/emphasize.html", user, null);
+            Perl5Substitution emphasize_substitution = new Perl5Substitution(emphasize_string);
+            StringBuffer result = new StringBuffer(string.length()); // A StringBuffer to hold the result
+            PatternMatcherInput emp_input = new PatternMatcherInput(string);    // A PatternMatcherInput to match on
             int last_html_offset = 0;
             String non_html_tag_string;
-            while ( patMat.contains( emp_input, htmlTagPattern ) ) {
+            while (patMat.contains(emp_input, htmlTagPattern)) {
                 int current_html_offset = emp_input.getMatchBeginOffset();
-                non_html_tag_string = result.substring( last_html_offset, current_html_offset );
+                non_html_tag_string = result.substring(last_html_offset, current_html_offset);
                 last_html_offset = emp_input.getMatchEndOffset();
                 String html_tag_string = result.substring(current_html_offset, last_html_offset);
-                non_html_tag_string = emphasizeString( non_html_tag_string, emp, emphasize_substitution, patMat );
+                non_html_tag_string = emphasizeString(non_html_tag_string, emp, emphasize_substitution, patMat);
                 // for each string to emphasize
-                result.append( non_html_tag_string );
-                result.append( html_tag_string );
+                result.append(non_html_tag_string);
+                result.append(html_tag_string);
             } // while
-            non_html_tag_string = result.substring( last_html_offset );
-            non_html_tag_string = emphasizeString( non_html_tag_string, emp, emphasize_substitution, patMat );
-            result.append( non_html_tag_string );
+            non_html_tag_string = result.substring(last_html_offset);
+            non_html_tag_string = emphasizeString(non_html_tag_string, emp, emphasize_substitution, patMat);
+            result.append(non_html_tag_string);
             return result.toString();
         }
         return string;
     }
 
-    private Properties getHashTags( UserDomainObject user, SimpleDateFormat datetimeFormatWithSeconds,
-                                    TextDocumentDomainObject document,
-                                    boolean templatemode, ParserParameters parserParameters ) throws IOException {
+    private Properties getHashTags(UserDomainObject user, SimpleDateFormat datetimeFormatWithSeconds,
+                                   TextDocumentDomainObject document,
+                                   boolean templatemode, ParserParameters parserParameters) throws IOException {
 
-        Properties tags = new Properties();	// A properties object to hold the results from the db...
+        Properties tags = new Properties();    // A properties object to hold the results from the db...
         // Put tags and corresponding data in Properties
-        tags.setProperty( "#userName#", user.getFullName() );
-        tags.setProperty( "#session_counter#", String.valueOf( service.getSessionCounter() ) );
-        tags.setProperty( "#session_counter_date#", service.getSessionCounterDateAsString() );
-        tags.setProperty( "#lastDate#", datetimeFormatWithSeconds.format( document.getModifiedDatetime() ) );
-        tags.setProperty( "#metaHeadline#", document.getHeadline() );
-        tags.setProperty( "#metaText#", document.getMenuText() );
+        tags.setProperty("#userName#", user.getFullName());
+        tags.setProperty("#session_counter#", String.valueOf(service.getSessionCounter()));
+        tags.setProperty("#session_counter_date#", service.getSessionCounterDateAsString());
+        tags.setProperty("#lastDate#", datetimeFormatWithSeconds.format(document.getModifiedDatetime()));
+        tags.setProperty("#metaHeadline#", document.getHeadline());
+        tags.setProperty("#metaText#", document.getMenuText());
 
         String meta_image = document.getMenuImage();
-        if ( !"".equals( meta_image ) ) {
+        if (!"".equals(meta_image)) {
             meta_image = "<img src=\"" + meta_image + "\" border=\"0\">";
         }
-        tags.setProperty( "#metaImage#", meta_image );
-        tags.setProperty( "#sys_message#", service.getSystemData().getSystemMessage() );
-        tags.setProperty( "#webMaster#", service.getSystemData().getWebMaster() );
-        tags.setProperty( "#webMasterEmail#", service.getSystemData().getWebMasterAddress() );
-        tags.setProperty( "#serverMaster#", service.getSystemData().getServerMaster() );
-        tags.setProperty( "#serverMasterEmail#", service.getSystemData().getServerMasterAddress() );
+        tags.setProperty("#metaImage#", meta_image);
+        tags.setProperty("#sys_message#", service.getSystemData().getSystemMessage());
+        tags.setProperty("#webMaster#", service.getSystemData().getWebMaster());
+        tags.setProperty("#webMasterEmail#", service.getSystemData().getWebMasterAddress());
+        tags.setProperty("#serverMaster#", service.getSystemData().getServerMaster());
+        tags.setProperty("#serverMasterEmail#", service.getSystemData().getServerMasterAddress());
 
-        tags.setProperty( "#param#", parserParameters.getParameter() );
+        tags.setProperty("#param#", parserParameters.getParameter());
 
-        if ( parserParameters.getFlags() >= 0 && parserParameters.isAdminButtonsVisible() ) {
-            tags.setProperty( "#adminMode#", Html.getAdminButtons( user, document, parserParameters.getDocumentRequest().getHttpServletRequest(), parserParameters.getDocumentRequest().getHttpServletResponse() ) );
+        if (parserParameters.getFlags() >= 0 && parserParameters.isAdminButtonsVisible()) {
+            tags.setProperty("#adminMode#", Html.getAdminButtons(user, document, parserParameters.getDocumentRequest().getHttpServletRequest(), parserParameters.getDocumentRequest().getHttpServletResponse()));
         }
 
-        String changeTemplateUi = createChangeTemplateUi( templatemode, user, document, service);
-        tags.setProperty( "#changePage#", changeTemplateUi );
+        String changeTemplateUi = createChangeTemplateUi(templatemode, user, document, service);
+        tags.setProperty("#changePage#", changeTemplateUi);
         return tags;
     }
 
-    public static String createChangeTemplateUi(boolean templatemode, UserDomainObject user,
-                                          TextDocumentDomainObject document, ImcmsServices service) throws IOException {
-        String changeTemplateUi = "";
-        if ( templatemode ) {	//Templatemode! :)
-
-            TemplateMapper templateMapper = service.getTemplateMapper();
-
-            TemplateGroupDomainObject selectedTemplateGroup = user.getTemplateGroup();
-            if ( null == selectedTemplateGroup ) {
-                selectedTemplateGroup = templateMapper.getTemplateGroupById( document.getTemplateGroupId() );
-            }
-
-            TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor( document );
-
-            Set allowedTemplateGroupIds = textDocumentPermissionSet.getAllowedTemplateGroupIds();
-            List allowedTemplateGroups = templateMapper.getTemplateGroups(allowedTemplateGroupIds);
-            String templateGroupsHtmlOptionList = templateMapper.createHtmlOptionListOfTemplateGroups( allowedTemplateGroups, selectedTemplateGroup );
-
-            List<TemplateDomainObject> templates = new ArrayList<TemplateDomainObject>();
-            if ( allowedTemplateGroupIds.contains(new Integer(selectedTemplateGroup.getId()) ) ) {
-                templates = templateMapper.getTemplatesInGroup( selectedTemplateGroup );
-            }
-            String templateId = document.getTemplateName();
-            TemplateDomainObject template = templateMapper.getTemplateByName(templateId) ;
-            String templatesHtmlOptionList = templateMapper.createHtmlOptionListOfTemplates( templates, template );
-
-            // Oh! I need a set of tags to be replaced in the templatefiles we'll load...
-            List temptags = new ArrayList();
-
-            temptags.add( "#getMetaId#" );
-            temptags.add( "" + document.getId() );
-            temptags.add( "#group#" );
-            temptags.add( selectedTemplateGroup.getName() );
-            temptags.add( "#getTemplateGroups#" );
-            temptags.add( templateGroupsHtmlOptionList );
-            temptags.add( "#simple_name#" );
-            temptags.add( template.getName() );
-            temptags.add( "#getTemplatesInGroup#" );
-            temptags.add( templatesHtmlOptionList );
-
-            // Put templateadmintemplate in list of files to load.
-            changeTemplateUi = service.getAdminTemplate( "textdoc/inPage_admin.html", user, temptags );
-        }  // if (templatemode)
-        return changeTemplateUi;
-    }
-
     private String emphasizeString(String string, String[] emp, Substitution emphasize_substitution,
                                    PatternMatcher patMat) {
         String emphasizedString = string;
 
         Perl5Compiler empCompiler = new Perl5Compiler();
         // for each string to emphasize
-        for ( String anEmp : emp ) {
+        for (String anEmp : emp) {
             try {
                 Pattern empPattern = empCompiler.compile(
                         "(" + Perl5Compiler.quotemeta(anEmp) + ")", Perl5Compiler.CASE_INSENSITIVE_MASK);
                 emphasizedString = Util.substitute(patMat, empPattern, emphasize_substitution, emphasizedString, Util.SUBSTITUTE_ALL);
-            } catch ( MalformedPatternException ex ) {
+            } catch (MalformedPatternException ex) {
                 throw new ShouldNotBeThrownException(ex);
             }
         }
         return emphasizedString;
     }
 
-    
+
 }
diff --git a/server/src/imcode/server/user/Authenticator.java b/server/src/imcode/server/user/Authenticator.java
index a2f332326d..35f8b37add 100644
--- a/server/src/imcode/server/user/Authenticator.java
+++ b/server/src/imcode/server/user/Authenticator.java
@@ -1,5 +1,5 @@
 package imcode.server.user;
 
 public interface Authenticator {
-   boolean authenticate( String loginName, String password );
+    boolean authenticate(String loginName, String password);
 }
diff --git a/server/src/imcode/server/user/ChainedLdapUserAndRoleRegistry.java b/server/src/imcode/server/user/ChainedLdapUserAndRoleRegistry.java
index f53692dee6..856746f3d5 100644
--- a/server/src/imcode/server/user/ChainedLdapUserAndRoleRegistry.java
+++ b/server/src/imcode/server/user/ChainedLdapUserAndRoleRegistry.java
@@ -1,24 +1,24 @@
 package imcode.server.user;
 
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.util.Collection;
 import java.util.LinkedList;
 
-/**
- * Created by IntelliJ IDEA.
- * User: Anton
- * Date: 8.11.2007
- * Time: 14:53:53
- * To change this template use File | Settings | File Templates.
- */
 public class ChainedLdapUserAndRoleRegistry implements Authenticator, UserAndRoleRegistry {
 
     public static final String[] DEFAULT_ROLES = {LdapUserAndRoleRegistry.DEFAULT_LDAP_ROLE};
 
-    private Collection<Authenticator> authenticators = new LinkedList<Authenticator>();
+    private Collection<Authenticator> authenticators = new LinkedList<>();
+
+    private Collection<UserAndRoleRegistry> userAndRoleRegistries = new LinkedList<>();
 
-    private Collection<UserAndRoleRegistry> userAndRoleRegistries = new LinkedList<UserAndRoleRegistry>();
+    private Logger logger = LogManager.getLogger(getClass());
 
-    public ChainedLdapUserAndRoleRegistry() {}
+    public ChainedLdapUserAndRoleRegistry() {
+    }
 
     public ChainedLdapUserAndRoleRegistry(Authenticator authenticator, UserAndRoleRegistry userAndRoleRegistry) {
         addLink(authenticator, userAndRoleRegistry);
@@ -34,7 +34,7 @@ public boolean authenticate(String loginName, String password) {
         boolean result = false;
 
         for (Authenticator authenticator : authenticators) {
-            
+
             if (result = authenticator.authenticate(loginName, password)) {
                 break;
             }
@@ -60,7 +60,7 @@ public UserDomainObject getUser(String loginName) {
 
     public String[] getRoleNames(UserDomainObject user) {
         String[] roleNames = DEFAULT_ROLES;
-        
+
         for (UserAndRoleRegistry userAndRoleRegistry : userAndRoleRegistries) {
             try {
                 roleNames = userAndRoleRegistry.getRoleNames(user);
@@ -76,8 +76,16 @@ public String[] getRoleNames(UserDomainObject user) {
         return roleNames;
     }
 
-    
+
     public String[] getAllRoleNames() {
+        for (UserAndRoleRegistry userAndRoleRegistry : userAndRoleRegistries) {
+            try {
+                return userAndRoleRegistry.getAllRoleNames();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+
         return DEFAULT_ROLES;
     }
 }
diff --git a/server/src/imcode/server/user/ExternalizedImcmsAuthenticatorAndUserRegistry.java b/server/src/imcode/server/user/ExternalizedImcmsAuthenticatorAndUserRegistry.java
index 95ff09d1c6..a9a96ae4aa 100644
--- a/server/src/imcode/server/user/ExternalizedImcmsAuthenticatorAndUserRegistry.java
+++ b/server/src/imcode/server/user/ExternalizedImcmsAuthenticatorAndUserRegistry.java
@@ -1,12 +1,16 @@
 package imcode.server.user;
 
+import com.google.common.collect.Sets;
 import imcode.server.ImcmsConstants;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashSet;
+import java.util.Set;
 
 public class ExternalizedImcmsAuthenticatorAndUserRegistry implements UserAndRoleRegistry, Authenticator {
 
@@ -15,14 +19,14 @@ public class ExternalizedImcmsAuthenticatorAndUserRegistry implements UserAndRol
     private UserAndRoleRegistry externalUserRegistry;
     private String defaultLanguage;
 
-    private Logger log = Logger.getLogger( ExternalizedImcmsAuthenticatorAndUserRegistry.class );
+    private Logger log = LogManager.getLogger(ExternalizedImcmsAuthenticatorAndUserRegistry.class);
 
-    public ExternalizedImcmsAuthenticatorAndUserRegistry( ImcmsAuthenticatorAndUserAndRoleMapper imcmsAndRole,
-                                                          Authenticator externalAuthenticator,
-                                                          UserAndRoleRegistry externalUserRegistry,
-                                                          String defaultLanguage ) throws IllegalArgumentException {
-        if ( ( null == externalAuthenticator ) != ( null == externalUserRegistry ) ) {
-            throw new IllegalArgumentException( "External authenticator and external usermapper should both be either set or not set." );
+    public ExternalizedImcmsAuthenticatorAndUserRegistry(ImcmsAuthenticatorAndUserAndRoleMapper imcmsAndRole,
+                                                         Authenticator externalAuthenticator,
+                                                         UserAndRoleRegistry externalUserRegistry,
+                                                         String defaultLanguage) throws IllegalArgumentException {
+        if ((null == externalAuthenticator) != (null == externalUserRegistry)) {
+            throw new IllegalArgumentException("External authenticator and external usermapper should both be either set or not set.");
         }
 
         this.imcmsAuthenticatorAndUserMapperAndRole = imcmsAndRole;
@@ -32,126 +36,184 @@ public ExternalizedImcmsAuthenticatorAndUserRegistry( ImcmsAuthenticatorAndUserA
     }
 
     public void synchRolesWithExternal() {
-        if ( null != externalUserRegistry ) {
+        if (null != externalUserRegistry) {
             String[] externalRoleNames = externalUserRegistry.getAllRoleNames();
-            imcmsAuthenticatorAndUserMapperAndRole.addRoleNames( externalRoleNames );
+            imcmsAuthenticatorAndUserMapperAndRole.addRoleNames(externalRoleNames);
         }
     }
 
-    public boolean authenticate( String loginName, String password ) {
-        NDC.push( "authenticate" );
-        boolean userAuthenticatesInImcms = false;
-        if ( password.length() >= ImcmsConstants.PASSWORD_MINIMUM_LENGTH ) {
-            userAuthenticatesInImcms = imcmsAuthenticatorAndUserMapperAndRole.authenticate( loginName, password );
-        }
-        boolean userAuthenticatesInExternal = false;
-        if ( !userAuthenticatesInImcms && null != externalAuthenticator && password.length() > 0 ) {
-            userAuthenticatesInExternal = externalAuthenticator.authenticate( loginName, password );
-        }
-        NDC.pop();
-        return userAuthenticatesInImcms || userAuthenticatesInExternal;
-    }
+    public boolean authenticate(String loginName, String password) {
+	    try (CloseableThreadContext.Instance ignored = CloseableThreadContext.push("authenticate")) {
 
-    public UserDomainObject getUser( String loginName ) {
-        NDC.push( "getUser" );
-        UserDomainObject imcmsUser = imcmsAuthenticatorAndUserMapperAndRole.getUser( loginName );
-        boolean imcmsUserExists = null != imcmsUser;
-        boolean imcmsUserIsInternal = imcmsUserExists && !imcmsUser.isImcmsExternal();
-        UserDomainObject result;
+		    boolean userAuthenticatesInImcms = false;
 
-        if ( imcmsUserIsInternal ) {
-            result = imcmsUser;
-        } else {
-            result = getExternalUser( loginName, imcmsUser );
-        }
-        NDC.pop();
-        return result;
+		    if (password.length() >= ImcmsConstants.PASSWORD_MINIMUM_LENGTH) {
+			    userAuthenticatesInImcms = imcmsAuthenticatorAndUserMapperAndRole.authenticate(loginName, password);
+
+			    if (userAuthenticatesInImcms) {
+				    final UserDomainObject user = imcmsAuthenticatorAndUserMapperAndRole.getUser(loginName);
+				    user.setLastLoginDate(new Date());
+				    imcmsAuthenticatorAndUserMapperAndRole.saveUser(user);
+			    }
+		    }
+
+		    boolean userAuthenticatesInExternal = false;
+		    if (!userAuthenticatesInImcms && null != externalAuthenticator && password.length() > 0) {
+			    userAuthenticatesInExternal = externalAuthenticator.authenticate(loginName, password);
+		    }
+
+		    return userAuthenticatesInImcms || userAuthenticatesInExternal;
+	    }
+    }
+
+    public UserDomainObject getUser(String loginName) {
+	    try (CloseableThreadContext.Instance ignored = CloseableThreadContext.push("getUser")) {
+		    UserDomainObject imcmsUser = imcmsAuthenticatorAndUserMapperAndRole.getUser(loginName);
+		    boolean imcmsUserExists = null != imcmsUser;
+		    boolean imcmsUserIsInternal = imcmsUserExists && !imcmsUser.isImcmsExternal();
+		    UserDomainObject result;
+
+		    if (imcmsUserIsInternal) {
+			    result = imcmsUser;
+		    } else {
+			    result = getExternalUser(loginName, imcmsUser);
+		    }
+		    return result;
+	    }
     }
 
-    private UserDomainObject getExternalUser( String loginName, UserDomainObject imcmsUser ) {
+    private UserDomainObject getExternalUser(String loginName, UserDomainObject imcmsUser) {
         UserDomainObject result;
-        UserDomainObject externalUser = getUserFromOtherUserMapper( loginName );
+        UserDomainObject externalUser = getUserFromOtherUserMapper(loginName);
         boolean externalUserExists = null != externalUser;
 
-        if ( externalUserExists ) {
-            result = synchExternalUserInImcms( loginName, externalUser, imcmsUser );
+        if (externalUserExists) {
+            result = synchExternalUserInImcms(loginName, externalUser, imcmsUser);
         } else {
-            if ( null != imcmsUser ) {
-                deactivateExternalUserInImcms( loginName, imcmsUser );
+            if (null != imcmsUser) {
+                deactivateExternalUserInImcms(loginName, imcmsUser);
             }
             result = null;
         }
         return result;
     }
 
-    private UserDomainObject getUserFromOtherUserMapper( String loginName ) {
+    private UserDomainObject getUserFromOtherUserMapper(String loginName) {
         UserDomainObject result = null;
-        if ( null != externalUserRegistry ) {
-            result = externalUserRegistry.getUser( loginName );
+        if (null != externalUserRegistry) {
+            result = externalUserRegistry.getUser(loginName);
         }
-        if ( null != result && null == result.getLanguageIso639_2() ) {
-            result.setLanguageIso639_2( defaultLanguage );
+        if (null != result && null == result.getLanguageIso639_2()) {
+            result.setLanguageIso639_2(defaultLanguage);
         }
         return result;
     }
 
-    private UserDomainObject synchExternalUserInImcms( String loginName, UserDomainObject externalUser,
-                                                       UserDomainObject imcmsUser ) {
-        externalUser.setImcmsExternal( true );
-        addExternalRolesToUser( externalUser );
+    private UserDomainObject synchExternalUserInImcms(String loginName, UserDomainObject externalUser,
+                                                      UserDomainObject internalUser) {
+        externalUser.setImcmsExternal(true);
 
-        if ( null != imcmsUser ) {
-            externalUser.setRoleIds( imcmsUser.getRoleIds() );
-            imcmsAuthenticatorAndUserMapperAndRole.saveUser( loginName, externalUser);
+        syncUserExternalRoles(externalUser, internalUser);
+
+        if (internalUser != null) {
+            imcmsAuthenticatorAndUserMapperAndRole.saveUser(loginName, externalUser);
         } else {
             try {
-                imcmsAuthenticatorAndUserMapperAndRole.addUser( externalUser);
-            } catch ( UserAlreadyExistsException shouldNotBeThrown ) {
-                throw new UnhandledException( shouldNotBeThrown );
+                imcmsAuthenticatorAndUserMapperAndRole.addUser(externalUser);
+            } catch (UserAlreadyExistsException shouldNotBeThrown) {
+                throw new UnhandledException(shouldNotBeThrown);
             }
         }
 
-        return imcmsAuthenticatorAndUserMapperAndRole.getUser( loginName );
+        return imcmsAuthenticatorAndUserMapperAndRole.getUser(loginName);
     }
 
-    private void addExternalRolesToUser( UserDomainObject user ) {
-        String[] externalRoleNames = externalUserRegistry.getRoleNames( user );
-        for ( int i = 0; i < externalRoleNames.length; i++ ) {
-            String externalRoleName = externalRoleNames[i];
-            RoleDomainObject externalRole = imcmsAuthenticatorAndUserMapperAndRole.getRoleByName( externalRoleName );
-            if ( null == externalRole ) {
-                externalRole = imcmsAuthenticatorAndUserMapperAndRole.addRole( externalRoleName );
+    private void syncUserExternalRoles(UserDomainObject externalUser, UserDomainObject internalUser) {
+        Set<String> externalRolesNamesLCase = Sets.newHashSet();
+        Set<String> userExternalRolesNamesLCase = Sets.newHashSet();
+
+        for (String roleName : externalUserRegistry.getAllRoleNames()) {
+            externalRolesNamesLCase.add(roleName.toLowerCase());
+        }
+
+        for (String roleName : externalUserRegistry.getRoleNames(externalUser)) {
+            userExternalRolesNamesLCase.add(roleName.toLowerCase());
+        }
+
+
+        log.debug(String.format("Syncing user %s externally mapped roles.", externalUser.getLoginName()));
+
+        for (String roleName : userExternalRolesNamesLCase) {
+            RoleDomainObject role = imcmsAuthenticatorAndUserMapperAndRole.getRoleByName(roleName);
+            log.debug(String.format("Syncing user %s external role %s.", externalUser.getLoginName(), roleName));
+
+            if (null == role) {
+                log.debug(String.format("Role %s is new and will be stored internally.", roleName));
+                role = imcmsAuthenticatorAndUserMapperAndRole.addRole(roleName);
             }
-            if ( !externalRole.isAdminRole() ) {
-                user.addRoleId(externalRole.getId());
+
+            if (role.isAdminRole()) {
+                log.debug(String.format("External role %s is marked as an admin role and can not be granted to user %s.", role.getName(), externalUser.getLoginName()));
+            } else {
+                log.debug(String.format("User %s is a member-of externally mapped role %s. The role will be granted.", externalUser.getLoginName(), role.getName()));
+                externalUser.addRoleId(role.getId());
             }
         }
+
+
+        if (internalUser != null) {
+            log.debug(String.format("Syncing user %s all previously assigned roles.", externalUser.getLoginName()));
+
+            for (RoleId roleId : internalUser.getRoleIds()) {
+                RoleDomainObject role = imcmsAuthenticatorAndUserMapperAndRole.getRole(roleId);
+                String roleName = role.getName();
+
+                log.debug(String.format("Syncing user %s previously assigned role %s.", externalUser.getLoginName(), role.getName()));
+                boolean add = false;
+
+                if (!externalRolesNamesLCase.contains(roleName.toLowerCase())) {
+                    log.debug(String.format("User %s role %s is not mapped externally and not need to be synced. The role will be granted.", externalUser.getLoginName(), role.getName()));
+                    add = true;
+                } else {
+                    log.debug(String.format("User %s role %s is mapped externally and need to be synced.", externalUser.getLoginName(), role.getName()));
+                    if (!userExternalRolesNamesLCase.contains(roleName.toLowerCase())) {
+                        log.debug(String.format("User %s is NOT ANY MORE a member-of externally mapped role %s. The role will be revoked.", externalUser.getLoginName(), role.getName()));
+                    } else {
+                        log.debug(String.format("User %s is a member-of mapped role %s. The role will be granted.", externalUser.getLoginName(), role.getName()));
+                    }
+                }
+
+                if (add) externalUser.addRoleId(roleId);
+            }
+        }
+
+        log.debug(String.format("User %s roles have been synced. Granted roles ids %s.", externalUser.getLoginName(), Arrays.toString(externalUser.getRoleIds())));
     }
 
-    private void deactivateExternalUserInImcms( String loginName, UserDomainObject imcmsUser ) {
-        imcmsUser.setActive( false );
-        imcmsAuthenticatorAndUserMapperAndRole.saveUser( loginName, imcmsUser);
+    private void deactivateExternalUserInImcms(String loginName, UserDomainObject imcmsUser) {
+        imcmsUser.setActive(false);
+        imcmsAuthenticatorAndUserMapperAndRole.saveUser(loginName, imcmsUser);
     }
 
-    public String[] getRoleNames( UserDomainObject user ) {
-        String[] imcmsRoleNames = imcmsAuthenticatorAndUserMapperAndRole.getRoleNames( user );
-        String[] externalRoleNames = externalUserRegistry.getRoleNames( user );
+    public String[] getRoleNames(UserDomainObject user) {
+        String[] imcmsRoleNames = imcmsAuthenticatorAndUserMapperAndRole.getRoleNames(user);
+        String[] externalRoleNames = externalUserRegistry.getRoleNames(user);
 
-        String[] result = mergeAndDeleteDuplicates( imcmsRoleNames, externalRoleNames );
-        log.debug( "Roles from imcms and external: " + Arrays.asList( result ) );
+        String[] result = mergeAndDeleteDuplicates(imcmsRoleNames, externalRoleNames);
+        log.debug("Roles from imcms and external: " + Arrays.asList(result));
         return result;
     }
 
-    private String[] mergeAndDeleteDuplicates( String[] imcmsRoleNames, String[] externalRoleNames ) {
-        HashSet roleNames = new HashSet( Arrays.asList( imcmsRoleNames ) );
-        roleNames.addAll( Arrays.asList( externalRoleNames ) );
-        return (String[])roleNames.toArray( new String[roleNames.size()] );
+    private String[] mergeAndDeleteDuplicates(String[] imcmsRoleNames, String[] externalRoleNames) {
+        HashSet roleNames = new HashSet(Arrays.asList(imcmsRoleNames));
+        roleNames.addAll(Arrays.asList(externalRoleNames));
+        return (String[]) roleNames.toArray(new String[roleNames.size()]);
     }
 
     public String[] getAllRoleNames() {
         String[] imcmsRoleNames = imcmsAuthenticatorAndUserMapperAndRole.getAllRoleNames();
         String[] externalRoleNames = externalUserRegistry.getAllRoleNames();
-        return mergeAndDeleteDuplicates( imcmsRoleNames, externalRoleNames );
+        return mergeAndDeleteDuplicates(imcmsRoleNames, externalRoleNames);
     }
 
 }
diff --git a/server/src/imcode/server/user/ImcmsAuthenticatorAndUserAndRoleMapper.java b/server/src/imcode/server/user/ImcmsAuthenticatorAndUserAndRoleMapper.java
index d5100bb9be..d6915621a7 100644
--- a/server/src/imcode/server/user/ImcmsAuthenticatorAndUserAndRoleMapper.java
+++ b/server/src/imcode/server/user/ImcmsAuthenticatorAndUserAndRoleMapper.java
@@ -6,86 +6,236 @@
 import com.imcode.db.commands.*;
 import com.imcode.db.exceptions.IntegrityConstraintViolationException;
 import com.imcode.db.exceptions.StringTruncationException;
+import com.imcode.imcms.db.DatabaseUtils;
 import com.imcode.imcms.db.StringArrayResultSetHandler;
+import com.imcode.imcms.servlet.LoginPasswordManager;
+import com.imcode.imcms.servlet.RoleIpRange;
+import com.imcode.imcms.servlet.UserIpIsNotAllowedException;
+import com.imcode.imcms.servlet.superadmin.AdminIpWhiteList;
 import imcode.server.ImcmsServices;
 import imcode.util.DateConstants;
 import imcode.util.Utility;
+import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
-
+import org.apache.commons.validator.routines.InetAddressValidator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.joda.time.DateTime;
+import org.joda.time.Hours;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.jstl.core.Config;
+import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-public class ImcmsAuthenticatorAndUserAndRoleMapper implements UserAndRoleRegistry, Authenticator, RoleGetter {
+import static javax.servlet.jsp.jstl.core.Config.FMT_LOCALIZATION_CONTEXT;
 
-    private final static Logger log = Logger.getLogger(ImcmsAuthenticatorAndUserAndRoleMapper.class);
+public class ImcmsAuthenticatorAndUserAndRoleMapper implements UserAndRoleRegistry, Authenticator, RoleGetter {
 
+    public static final String SQL_ROLES_COLUMNS = "roles.role_id, roles.role_name, roles.admin_role, roles.permissions";
+    public static final String SQL_INSERT_INTO_ROLES = "INSERT INTO roles (role_name, permissions, admin_role) VALUES(?,?,0)";
+    private final static Logger log = LogManager.getLogger(ImcmsAuthenticatorAndUserAndRoleMapper.class);
     private static final String SPROC_GET_ALL_ROLES = "GetAllRoles";
     private static final String SPROC_GET_USER_ROLES = "GetUserRoles";
     private static final String SPROC_GET_USERS_WHO_BELONGS_TO_ROLE = "GetUsersWhoBelongsToRole";
-
     private static final String SPROC_DEL_PHONE_NR = "DelPhoneNr";
-
     private static final int USER_EXTERN_ID = 2;
-
-    private static final String SQL_SELECT_USERS = "SELECT user_id, login_name, login_password, first_name, last_name, "
-                                                   + "title, company, address, city, zip, country, county_council, "
-                                                   + "email, language, active, "
-                                                   + "create_date, external, session_id "
-                                                   + "FROM users";
-
-    public static final String SQL_ROLES_COLUMNS = "roles.role_id, roles.role_name, roles.admin_role, roles.permissions";
     private static final String SQL_SELECT_ALL_ROLES = "SELECT " + SQL_ROLES_COLUMNS + " FROM roles";
-    private static final String SQL_SELECT_ALL_ROLES_EXCEPT_USERS_ROLE = SQL_SELECT_ALL_ROLES
-                                                                         + " WHERE roles.role_id != " + RoleId.USERS_ID;
-
     public static final String SQL_SELECT_ROLE_BY_NAME = SQL_SELECT_ALL_ROLES + " WHERE role_name = ?";
+    private static final String SQL_SELECT_ALL_ROLES_EXCEPT_USERS_ROLE = SQL_SELECT_ALL_ROLES
+            + " WHERE roles.role_id != " + RoleId.USERS_ID + " ORDER BY roles.role_name";
     private static final String SQL_SELECT_ROLE_BY_ID = SQL_SELECT_ALL_ROLES + " WHERE role_id = ?";
-
-    public static final String SQL_INSERT_INTO_ROLES = "INSERT INTO roles (role_name, permissions, admin_role) VALUES(?,?,0)";
     private static final String TABLE__USERADMIN_ROLE_CROSSREF = "useradmin_role_crossref";
-    private static final String SQL__SELECT_USER_BY_ID = SQL_SELECT_USERS
-                                                         + " WHERE user_id = ?";
 
     private static final String SQL_UPDATE_USER_SESSION = "update users set session_id = ? where user_id = ?";
 
     private static final String SQL_SELECT_USER_SESSION = "select session_id from users where user_id = ?";
 
+    private static final String SQL_UPDATE_USER_REMEMBER_CD = "UPDATE users SET remember_cd = ? WHERE user_id = ?";
+    private static final String SQL_GET_USER_PROPERTIES = "SELECT key_name, value FROM user_properties WHERE user_id=?";
+
+    private static final ResultSetHandler<Map<String, String>> USER_PROPERTIES_HANDLER = new ResultSetHandler<Map<String, String>>() {
+        public Map<String, String> handle(ResultSet rs) throws SQLException {
+            Map<String, String> userProperties = new HashMap<>();
+
+            while (rs.next()) {
+                String keyName = rs.getString(1);
+                String value = rs.getString(2);
+                userProperties.put(keyName, value);
+            }
+            return userProperties;
+        }
+    };
+
     private final ImcmsServices services;
 
-    public ImcmsAuthenticatorAndUserAndRoleMapper(ImcmsServices services) {
+    /**
+     * @since 4.0.7
+     */
+    private LoginPasswordManager loginPasswordManager;
+
+    public ImcmsAuthenticatorAndUserAndRoleMapper(ImcmsServices services, LoginPasswordManager userLoginPasswordManager) {
         this.services = services;
+        this.loginPasswordManager = userLoginPasswordManager;
+    }
+
+    private static String sqlSelectUsers(ImcmsServices services) {
+        return "SELECT user_id, login_name, login_password, first_name, last_name, "
+                + "title, company, address, city, zip, country, county_council, "
+                + "email, language, active, "
+                + "create_date, " + (DatabaseUtils.isDatabaseMSSql(services) ? "[external]" : "external")
+                + ", session_id, remember_cd"
+                + ", login_password_is_encrypted"
+                + ", login_password_reset_id"
+                + ", login_password_reset_ts"
+                + ", last_login"
+                + " FROM users";
+    }
+
+    private static String sqlSelectUserById(ImcmsServices services) {
+        return sqlSelectUsers(services) + " WHERE user_id = ?";
+    }
+
+    private static String sqlSelectUserByPasswordResetId(ImcmsServices services) {
+        return sqlSelectUsers(services) + " WHERE login_password_reset_id = ?";
+    }
+
+    private static String sqlSelectUserByEmail(ImcmsServices services) {
+        return sqlSelectUsers(services) + " WHERE email = ?";
     }
 
+    /**
+     * Authenticates internal user.
+     * The user being authenticated must be internal and his account must be active.
+     *
+     * @param loginName user's login name
+     * @param password  user's plain text or encrypted password
+     * @return if user has been authenticated.
+     */
     public boolean authenticate(String loginName, String password) {
-        boolean userExistsAndPasswordIsCorrect = false;
         UserDomainObject user = getUser(loginName);
-        if ( null != user ) {
-            String password_from_db = user.getPassword();
 
-            userExistsAndPasswordIsCorrect = password_from_db.equals(password) && user.isActive();
-        }
+        return user != null && user.isActive() && !user.isImcmsExternal() &&
+                (user.isPasswordEncrypted()
+                        ? loginPasswordManager.validatePassword(password, user.getPassword())
+                        : password.equals(user.getPassword()));
+    }
+
+    /**
+     * Create and assign a new PasswordReset to the existing user.
+     * User must exist and must not be default, external or superadmin when password reset is not allowed for superadmins.
+     *
+     * @param id existing user's id.
+     * @return user with assigned PasswordReset
+     * @throws IllegalStateException if PasswordReset can not be created.
+     * @since 4.1.3
+     */
+    // todo: save only reset!!
+    public UserDomainObject createPasswordReset(int id) {
+        UserDomainObject user = getUser(id);
+
+        if (user == null)
+            throw new IllegalStateException(String.format("User with id %s does not exist.", id));
+
+        String illegalState = user.isDefaultUser()
+                ? "default"
+                : user.isImcmsExternal()
+                ? "external"
+                : user.isSuperAdmin() && !services.getConfig().isSuperadminLoginPasswordResetAllowed()
+                ? "superuser"
+                : null;
+
+        if (illegalState != null)
+            throw new IllegalStateException(String.format(
+                    "Can't create password reset for [%s] user %s. User must not be default, external or superadmin when password reset is not allowed for superadmins.",
+                    illegalState, user));
+
+        user.setPasswordReset(UUID.randomUUID().toString(), System.currentTimeMillis());
+        saveUser(user);
 
-        return userExistsAndPasswordIsCorrect;
+        return user;
     }
 
+
+    /**
+     * @param resetId password reset id
+     * @return user or null if user can not be found, password-reset has been expired, or user is superadmin when password reset is not allowed for superadmins.
+     * @since 4.1.3
+     */
+    public UserDomainObject getUserByPasswordResetId(String resetId) {
+        UserDomainObject user = getUserFromSqlRow(sqlSelectUserByPasswordResetId(resetId));
+
+        return (user == null || isPasswordResetExpired(user.getPasswordReset().getTime())
+                || (user.isSuperAdmin() && !services.getConfig().isSuperadminLoginPasswordResetAllowed()))
+                ? null
+                : user;
+    }
+
+
     public UserDomainObject getUser(String loginName) {
-        return getUserFromSqlRow(sqlSelectUserByName(loginName));
+        return StringUtils.isBlank(loginName) ? null : getUserFromSqlRow(sqlSelectUserByName(loginName));
+    }
+
+    public UserDomainObject getActiveUser(String loginName) {
+        return StringUtils.isBlank(loginName) ? null : getUserFromSqlRow(sqlSelectActiveUserByName(loginName));
+    }
+
+
+    /**
+     * @param login
+     * @return user or null if user can not be found.
+     * @since 4.1.3
+     */
+    public UserDomainObject getUserByLoginIgnoreCase(String login) {
+        return StringUtils.isBlank(login) ? null : getUserFromSqlRow(sqlSelectUserByLoginIgnoreCase(login));
+    }
+
+
+    /**
+     * @param time password reset time
+     * @return if password reset has been expired.
+     * @since 4.0.7
+     */
+    private boolean isPasswordResetExpired(long time) {
+        int interval = Hours.hoursBetween(new DateTime(time), new DateTime()).getHours();
+
+        return interval > services.getSystemData().getUserLoginPasswordResetExpirationInterval();
     }
 
     private String[] sqlSelectUserByName(String loginName) {
-        final Object[] parameters = new String[] { loginName.trim() };
-        return (String[]) services.getDatabase().execute(new SqlQueryCommand(SQL_SELECT_USERS
-                                                                             + " WHERE login_name = ?", parameters, Utility.STRING_ARRAY_HANDLER));
+        final Object[] parameters = new String[]{loginName.trim()};
+        return (String[]) services.getDatabase().execute(new SqlQueryCommand(sqlSelectUsers(services)
+                + " WHERE login_name = ?", parameters, Utility.STRING_ARRAY_HANDLER));
+    }
+
+    private String[] sqlSelectActiveUserByName(String loginName) {
+        final Object[] parameters = new String[]{loginName.trim()};
+        return (String[]) services.getDatabase().execute(new SqlQueryCommand(sqlSelectUsers(services)
+                + " WHERE login_name = ? AND active = 1", parameters, Utility.STRING_ARRAY_HANDLER));
+    }
+
+    private String[] sqlSelectUserByLoginIgnoreCase(String login) {
+        final Object[] parameters = new String[]{login.trim().toLowerCase()};
+        return (String[]) services.getDatabase().execute(
+                new SqlQueryCommand(
+                        sqlSelectUsers(services) + " WHERE LOWER(login_name) = ?", parameters, Utility.STRING_ARRAY_HANDLER));
     }
 
     private UserDomainObject getUserFromSqlRow(String[] sqlResult) {
         UserDomainObject user;
 
-        if ( sqlResult.length == 0 ) {
+        if (sqlResult.length == 0) {
             user = null;
         } else {
             user = new UserDomainObject(Integer.parseInt(sqlResult[0]));
@@ -93,13 +243,18 @@ private UserDomainObject getUserFromSqlRow(String[] sqlResult) {
             initUserRoles(user);
             initUserPhoneNumbers(user);
             initUserUserAdminRoles(user);
+            initUserProperties(user);
         }
         return user;
     }
 
     void initUserFromSqlData(UserDomainObject user, String[] sqlResult) {
+        final DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
+
         user.setLoginName(sqlResult[1]);
-        user.setPassword(sqlResult[2].trim());
+        user.setPassword(sqlResult[2].trim(), "1".equals(sqlResult[19])
+                ? UserDomainObject.PasswordType.ENCRYPTED
+                : UserDomainObject.PasswordType.UNENCRYPTED);
         user.setFirstName(sqlResult[3]);
         user.setLastName(sqlResult[4]);
         user.setTitle(sqlResult[5]);
@@ -112,65 +267,119 @@ void initUserFromSqlData(UserDomainObject user, String[] sqlResult) {
         user.setEmailAddress(sqlResult[12]);
         user.setLanguageIso639_2((String) ObjectUtils.defaultIfNull(sqlResult[13], services.getLanguageMapper().getDefaultLanguage()));
         user.setActive(0 != Integer.parseInt(sqlResult[14]));
-        DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING);
         user.setCreateDate(Utility.parseDateFormat(dateFormat, sqlResult[15]));
         user.setImcmsExternal(0 != Integer.parseInt(sqlResult[16]));
         user.setSessionId(sqlResult[17]);
+        user.setRememberCd(sqlResult[18]);
+
+        final String passwordResetId = sqlResult[20];
+        final String passwordResetTs = sqlResult[21];
+        final String lastLogin = sqlResult[22];
+
+        if (lastLogin != null) {
+            final Date lastLoginDate = Utility.parseDateFormat(dateFormat, lastLogin);
+            user.setLastLoginDate(lastLoginDate);
+        }
+
+        if (passwordResetId != null && passwordResetTs != null) {
+            user.setPasswordReset(passwordResetId, Long.parseLong(passwordResetTs));
+        }
     }
 
+
     private RoleId[] getRoleReferencesForUser(UserDomainObject user) {
         try {
             String sqlStr = SQL_SELECT_ALL_ROLES + ", user_roles_crossref"
-                            + " WHERE user_roles_crossref.role_id = roles.role_id"
-                            + " AND user_roles_crossref.user_id = ?";
-            final Object[] parameters = new String[] { "" + user.getId() };
+                    + " WHERE user_roles_crossref.role_id = roles.role_id"
+                    + " AND user_roles_crossref.user_id = ?";
+            final Object[] parameters = new String[]{"" + user.getId()};
             String[][] sqlResult = (String[][]) services.getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
             RoleId[] roleReferences = new RoleId[sqlResult.length];
-            for ( int i = 0; i < sqlResult.length; i++ ) {
+            for (int i = 0; i < sqlResult.length; i++) {
                 String[] sqlRow = sqlResult[i];
                 roleReferences[i] = getRoleReferenceFromSqlResult(sqlRow);
             }
             return roleReferences;
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
+    public void updateUserRememberCd(final UserDomainObject user) {
+        services.getDatabase().execute(new SqlUpdateCommand(SQL_UPDATE_USER_REMEMBER_CD,
+                new Object[]{user.getRememberCd(), user.getId()}));
+    }
+
     private RoleId getRoleReferenceFromSqlResult(String[] sqlRow) {
         return new RoleId(Integer.parseInt(sqlRow[0]));
     }
 
-    /** @return An object representing the user with the given id. */
+    /**
+     * @return An object representing the user with the given id.
+     */
     public UserDomainObject getUser(int userId) {
         return getUserFromSqlRow(sqlSelectUserById(userId));
     }
 
     private String[][] sqlSelectAllUsers(boolean includeUserExtern, boolean includeInactiveUsers) {
         List whereTests = new ArrayList();
-        if ( !includeUserExtern ) {
+        if (!includeUserExtern) {
             whereTests.add("user_id != " + USER_EXTERN_ID);
         }
-        if ( !includeInactiveUsers ) {
+        if (!includeInactiveUsers) {
             whereTests.add("active = 1");
         }
-        String sqlStr = SQL_SELECT_USERS;
-        if ( whereTests.size() > 0 ) {
+        String sqlStr = sqlSelectUsers(services);
+        if (whereTests.size() > 0) {
             sqlStr += " WHERE " + StringUtils.join(whereTests.iterator(), " AND ");
         }
         try {
             final Object[] parameters = new String[0];
             return (String[][]) services.getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
+            throw new UnhandledException(e);
+        }
+    }
+
+    private String[][] sqlSelectUsersByEmail(String email) {
+        List<String> whereTests = new ArrayList<>();
+
+        whereTests.add("LOWER(email) = '" + email.trim().toLowerCase() + "'");
+
+        String sqlStr = sqlSelectUsers(services);
+        sqlStr += " WHERE " + StringUtils.join(whereTests.iterator(), " AND ");
+
+        try {
+            final Object[] parameters = new String[0];
+            return (String[][]) services.getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     String[] sqlSelectUserById(int userId) {
+        try {
+            final Object[] parameters = new String[]{"" + userId};
+            return (String[]) services.getDatabase().execute(new SqlQueryCommand(sqlSelectUserById(services), parameters, Utility.STRING_ARRAY_HANDLER));
+        } catch (DatabaseException e) {
+            throw new UnhandledException(e);
+        }
+    }
 
+    String[] sqlSelectUserByPasswordResetId(String resetId) {
         try {
-            final Object[] parameters = new String[] { "" + userId };
-            return (String[]) services.getDatabase().execute(new SqlQueryCommand(SQL__SELECT_USER_BY_ID, parameters, Utility.STRING_ARRAY_HANDLER));
-        } catch ( DatabaseException e ) {
+            final Object[] parameters = new String[]{resetId};
+            return (String[]) services.getDatabase().execute(new SqlQueryCommand(sqlSelectUserByPasswordResetId(services), parameters, Utility.STRING_ARRAY_HANDLER));
+        } catch (DatabaseException e) {
+            throw new UnhandledException(e);
+        }
+    }
+
+    String[] sqlSelectUserByEmail(String email) {
+        try {
+            final Object[] parameters = new String[]{email};
+            return (String[]) services.getDatabase().execute(new SqlQueryCommand(sqlSelectUserByEmail(services), parameters, Utility.STRING_ARRAY_HANDLER));
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
@@ -185,23 +394,42 @@ public void saveUser(String loginName, UserDomainObject userToSave) {
 
     public void updateUserSessionId(final UserDomainObject loggedInUser) {
         services.getDatabase().execute(new SqlUpdateCommand(SQL_UPDATE_USER_SESSION,
-                new Object[] { loggedInUser.getSessionId(), loggedInUser.getId() }
+                new Object[]{loggedInUser.getSessionId(), loggedInUser.getId()}
         ));
     }
 
 
     public String getUserSessionId(final UserDomainObject loggedInUser) {
-        return (String)services.getDatabase().execute(new SqlQueryCommand(SQL_SELECT_USER_SESSION,
-                new Object[] { loggedInUser.getId() },
+        return (String) services.getDatabase().execute(new SqlQueryCommand(SQL_SELECT_USER_SESSION,
+                new Object[]{loggedInUser.getId()},
                 Utility.SINGLE_STRING_HANDLER
         ));
     }
-    
+
+    /**
+     * If user is external sets the password to blank.
+     * Otherwise encrypts the password if it was modified.
+     *
+     * @param user
+     * @since 4.0.7
+     */
+    private void modifyPasswordIfNecessary(UserDomainObject user) {
+        if (user.isImcmsExternal()) {
+            user.setPassword("");
+        } else if (!user.isPasswordEncrypted() && services.getConfig().isLoginPasswordEncryptionEnabled()) {
+            String password = user.getPassword();
+            if (StringUtils.isNotBlank(password)) {
+                user.setPassword(loginPasswordManager.encryptPassword(password), UserDomainObject.PasswordType.ENCRYPTED);
+            }
+        }
+    }
+
     public void saveUser(UserDomainObject user) {
+        modifyPasswordIfNecessary(user);
 
         String[] params = {
-                user.getLoginName(),
-                null == user.getPassword() ? "" : user.getPassword(),
+                getSafeTrimmedString(user.getLoginName()),
+                null == user.getPassword() ? "" : user.getPassword().trim(),
                 user.getFirstName(),
                 user.getLastName(),
                 user.getTitle(),
@@ -215,43 +443,85 @@ public void saveUser(UserDomainObject user) {
                 user.isImcmsExternal() ? "1" : "0",
                 user.isActive() ? "1" : "0",
                 user.getLanguageIso639_2(),
-                "" + user.getId(),
+                user.isPasswordEncrypted() ? "1" : "0",
+                user.hasPasswordReset() ? user.getPasswordReset().getId() : null,
+                user.hasPasswordReset() ? Long.toString(user.getPasswordReset().getTime()) : null,
+                "" + user.getId()
         };
         try {
+            String externalColumn = DatabaseUtils.isDatabaseMSSql(services) ? "[external]" : "external";
             services.getDatabase().execute(new SqlUpdateCommand("UPDATE users \n"
-                                                                + "SET login_name = ?,\n"
-                                                                + "login_password = ?,\n"
-                                                                + "first_name = ?,\n"
-                                                                + "last_name = ?,\n"
-                                                                + "title = ?,\n"
-                                                                + "company = ?,\n"
-                                                                + "address =  ?,\n"
-                                                                + "city = ?,\n"
-                                                                + "zip = ?,\n"
-                                                                + "country = ?,\n"
-                                                                + "county_council = ?,\n"
-                                                                + "email = ?,\n"
-                                                                + "external = ?,\n"
-                                                                + "active = ?,\n"
-                                                                + "language = ?\n"
-                                                                + "WHERE user_id = ?", params));
-        } catch ( DatabaseException e ) {
+                    + "SET login_name = ?,\n"
+                    + "login_password = ?,\n"
+                    + "first_name = ?,\n"
+                    + "last_name = ?,\n"
+                    + "title = ?,\n"
+                    + "company = ?,\n"
+                    + "address =  ?,\n"
+                    + "city = ?,\n"
+                    + "zip = ?,\n"
+                    + "country = ?,\n"
+                    + "county_council = ?,\n"
+                    + "email = ?,\n"
+                    + externalColumn + " = ?,\n"
+                    + "active = ?,\n"
+                    + "language = ?,\n"
+                    + "login_password_is_encrypted = ?,\n"
+                    + "login_password_reset_id = ?,\n"
+                    + "login_password_reset_ts = ?\n"
+                    + "WHERE user_id = ?", params));
+
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
 
+        updateUserLastLogin(user);
         updateUserRoles(user);
         removePhoneNumbers(user);
         addPhoneNumbers(user);
+        updateUserProperties(user);
+    }
+
+    private void updateUserLastLogin(UserDomainObject user) {
+        final String[] params = new String[]{
+                Utility.makeSqlStringFromDate(user.getLastLoginDate()),
+                String.valueOf(user.getId())
+        };
+
+        services.getDatabase().execute(new SqlUpdateCommand(
+                "UPDATE users SET last_login = ? WHERE user_id = ?", params
+        ));
+    }
+
+    private void updateUserProperties(UserDomainObject user) {
+        int userId = user.getId();
+        deleteUserProperties(userId);
+
+        final Map<String, String> properties = user.getProperties();
+
+        for (Map.Entry<String, String> entry : properties.entrySet()) {
+            String[] params = new String[]{userId + "", entry.getKey(), entry.getValue()};
+            services.getDatabase().execute(new SqlUpdateCommand(
+                    "INSERT INTO user_properties (user_id, key_name, value) VALUES(?,?,?)", params
+            ));
+        }
+    }
+
+    private void deleteUserProperties(int userId) {
+        final String[] params = new String[]{userId + ""};
+        services.getDatabase().execute(new SqlUpdateCommand(
+                "DELETE FROM user_properties WHERE user_id = ?", params
+        ));
     }
 
     private void updateUserRoles(UserDomainObject newUser) {
-        Set<RoleId> newUserRoleIds = new HashSet(Arrays.asList(newUser.getRoleIds()));
+        Set<RoleId> newUserRoleIds = new HashSet<>(Arrays.asList(newUser.getRoleIds()));
         newUserRoleIds.add(RoleId.USERS);
-        CompositeDatabaseCommand updateUserRolesCommand = new CompositeDatabaseCommand(new DeleteWhereColumnsEqualDatabaseCommand("user_roles_crossref", "user_id", new Integer(newUser.getId())));
-        for ( RoleId roleId : newUserRoleIds ) {
-            updateUserRolesCommand.add(new InsertIntoTableDatabaseCommand("user_roles_crossref", new String[][] {
-                    { "user_id", "" + newUser.getId() },
-                    { "role_id", "" + roleId.intValue() }
+        CompositeDatabaseCommand updateUserRolesCommand = new CompositeDatabaseCommand(new DeleteWhereColumnsEqualDatabaseCommand("user_roles_crossref", "user_id", newUser.getId()));
+        for (RoleId roleId : newUserRoleIds) {
+            updateUserRolesCommand.add(new InsertIntoTableDatabaseCommand("user_roles_crossref", new String[][]{
+                    {"user_id", "" + newUser.getId()},
+                    {"role_id", "" + roleId.intValue()}
             }));
         }
         services.getDatabase().execute(updateUserRolesCommand);
@@ -260,63 +530,80 @@ private void updateUserRoles(UserDomainObject newUser) {
 
     private void sqlUpdateUserUserAdminRoles(UserDomainObject user) {
         DeleteWhereColumnsEqualDatabaseCommand deleteAllUserAdminRolesForUserCommand = new DeleteWhereColumnsEqualDatabaseCommand(TABLE__USERADMIN_ROLE_CROSSREF, "user_id",
-                                                                                                                                  ""
-                                                                                                                                  + user.getId());
+                ""
+                        + user.getId());
         CompositeDatabaseCommand updateUserAdminRolesCommand = new CompositeDatabaseCommand(deleteAllUserAdminRolesForUserCommand);
         RoleId[] userAdminRolesReferences = user.getUserAdminRoleIds();
-        for ( RoleId userAdminRoleId : userAdminRolesReferences ) {
-            updateUserAdminRolesCommand.add(new InsertIntoTableDatabaseCommand(TABLE__USERADMIN_ROLE_CROSSREF, new String[][] {
-                    { "user_id", "" + user.getId() },
-                    { "role_id", "" + userAdminRoleId.intValue() }
+        for (RoleId userAdminRoleId : userAdminRolesReferences) {
+            updateUserAdminRolesCommand.add(new InsertIntoTableDatabaseCommand(TABLE__USERADMIN_ROLE_CROSSREF, new String[][]{
+                    {"user_id", "" + user.getId()},
+                    {"role_id", "" + userAdminRoleId.intValue()}
             }));
         }
         services.getDatabase().execute(updateUserAdminRolesCommand);
     }
 
+    private String getSafeTrimmedString(String notSafeString) {
+        return (notSafeString == null) ? null : notSafeString.trim();
+    }
+
     public synchronized void addUser(UserDomainObject user) throws UserAlreadyExistsException {
-        if ( null != getUser(user.getLoginName()) ) {
+        if (null != getActiveUser(user.getLoginName())) {
             throw new UserAlreadyExistsException(
                     "A user with the name \"" + user.getLoginName() + "\" already exists.");
         }
         try {
-            if ( user.isImcmsExternal() ) {
-                user.setPassword("");
+            UserDomainObject deactivatedUser = getUser(user.getLoginName());
+            if (null != deactivatedUser && !deactivatedUser.isActive()) {
+                deactivatedUser.setLoginName(deactivatedUser.getLoginName() + "_" + System.currentTimeMillis());
+                deactivatedUser.setEmailAddress(deactivatedUser.getEmailAddress() + "_" + System.currentTimeMillis());
+                saveUser(deactivatedUser);
             }
-            Number newUserId = (Number) services.getDatabase().execute(new InsertIntoTableDatabaseCommand("users", new String[][] {
-                    { "login_name", user.getLoginName() },
-                    { "login_password", user.getPassword() },
-                    { "first_name", user.getFirstName() },
-                    { "last_name", user.getLastName() },
-                    { "title", user.getTitle() },
-                    { "company", user.getCompany() },
-                    { "address", user.getAddress() },
-                    { "city", user.getCity() },
-                    { "zip", user.getZip() },
-                    { "country", user.getCountry() },
-                    { "county_council", user.getProvince() },
-                    { "email", user.getEmailAddress() },
-                    { "external", user.isImcmsExternal() ? "1" : "0" },
-                    { "active", user.isActive() ? "1" : "0" },
-                    { "language", user.getLanguageIso639_2() },
-                    { "create_date", Utility.makeSqlStringFromDate(new Date()) }
+
+            modifyPasswordIfNecessary(user);
+
+            String externalColumn = DatabaseUtils.isDatabaseMSSql(services) ? "[external]" : "external";
+            Number newUserId = services.getDatabase().execute(new InsertIntoTableDatabaseCommand("users", new String[][]{
+                    {"login_name", getSafeTrimmedString(user.getLoginName())},
+                    {"login_password", getSafeTrimmedString(user.getPassword())},
+                    {"first_name", user.getFirstName()},
+                    {"last_name", user.getLastName()},
+                    {"title", user.getTitle()},
+                    {"company", user.getCompany()},
+                    {"address", user.getAddress()},
+                    {"city", user.getCity()},
+                    {"zip", user.getZip()},
+                    {"country", user.getCountry()},
+                    {"county_council", user.getProvince()},
+                    {"email", user.getEmailAddress()},
+                    {externalColumn, user.isImcmsExternal() ? "1" : "0"},
+                    {"active", user.isActive() ? "1" : "0"},
+                    {"language", user.getLanguageIso639_2()},
+                    {"create_date", Utility.makeSqlStringFromDate(new Date())},
+
+                    {"login_password_is_encrypted", BooleanUtils.toString(user.isPasswordEncrypted(), "1", "0")},
+                    {"login_password_reset_id", user.hasPasswordReset() ? user.getPasswordReset().getId() : null},
+                    {"login_password_reset_ts", user.hasPasswordReset() ? Long.toString(user.getPasswordReset().getTime()) : null}
             }));
             int newIntUserId = newUserId.intValue();
             user.setId(newIntUserId);
 
             updateUserRoles(user);
             addPhoneNumbers(user);
-        } catch ( IntegrityConstraintViolationException e ) {
+            updateUserProperties(user);
+
+        } catch (IntegrityConstraintViolationException e) {
             throw new UserAlreadyExistsException(e);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     private void removePhoneNumbers(UserDomainObject newUser) {
-        String[] sprocParameters = new String[] { String.valueOf(newUser.getId()) };
+        String[] sprocParameters = new String[]{String.valueOf(newUser.getId())};
         try {
             services.getProcedureExecutor().executeUpdateProcedure(SPROC_DEL_PHONE_NR, sprocParameters);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
@@ -324,34 +611,36 @@ private void removePhoneNumbers(UserDomainObject newUser) {
     private void addPhoneNumbers(UserDomainObject newUser) {
         CompositeDatabaseCommand addPhoneNumbersCommand = new CompositeDatabaseCommand();
         Set phoneNumbers = newUser.getPhoneNumbers();
-        for ( Iterator iterator = phoneNumbers.iterator(); iterator.hasNext(); ) {
+        for (Iterator iterator = phoneNumbers.iterator(); iterator.hasNext(); ) {
             PhoneNumber phoneNumber = (PhoneNumber) iterator.next();
-            addPhoneNumbersCommand.add(new InsertIntoTableDatabaseCommand("phones", new String[][] {
-                    { "user_id", "" + newUser.getId() },
-                    { "number", phoneNumber.getNumber() },
-                    { "phonetype_id", "" + phoneNumber.getType().getId() }
+            addPhoneNumbersCommand.add(new InsertIntoTableDatabaseCommand("phones", new String[][]{
+                    {"user_id", "" + newUser.getId()},
+                    {"number", phoneNumber.getNumber()},
+                    {"phonetype_id", "" + phoneNumber.getType().getId()}
             }));
         }
         services.getDatabase().execute(addPhoneNumbersCommand);
     }
 
-    /** @deprecated  */
+    /**
+     * @deprecated
+     */
     public String[] getRoleNames(UserDomainObject user) {
         try {
-            final Object[] parameters = new String[] { "" + user.getId() };
+            final Object[] parameters = new String[]{"" + user.getId()};
             return (String[]) services.getProcedureExecutor().executeProcedure(SPROC_GET_USER_ROLES, parameters, new StringArrayResultSetHandler());
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     public String[] getAllRoleNames() {
         try {
-            final Object[] parameters = new String[] { };
+            final Object[] parameters = new String[]{};
             String[] roleNamesMinusUsers = (String[]) services.getProcedureExecutor().executeProcedure(SPROC_GET_ALL_ROLES, parameters, new StringArrayResultSetHandler());
 
             Set roleNamesSet = new HashSet();
-            for ( int i = 0; i < roleNamesMinusUsers.length; i += 2 ) {
+            for (int i = 0; i < roleNamesMinusUsers.length; i += 2) {
                 String roleName = roleNamesMinusUsers[i + 1];
                 roleNamesSet.add(roleName);
             }
@@ -362,13 +651,13 @@ public String[] getAllRoleNames() {
             Arrays.sort(roleNames);
 
             return roleNames;
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     public void addRoleNames(String[] externalRoleNames) {
-        for ( int i = 0; i < externalRoleNames.length; i++ ) {
+        for (int i = 0; i < externalRoleNames.length; i++) {
             String externalRoleName = externalRoleNames[i];
             addRole(externalRoleName);
         }
@@ -379,32 +668,41 @@ public UserDomainObject[] getUsers(boolean includeUserExtern, boolean includeIna
         return getUsersFromSqlRows(allUsersSqlResult);
     }
 
+    /**
+     * @since 4.1.3
+     */
+    public UserDomainObject[] getUsersByEmail(String email) {
+        return StringUtils.isBlank(email)
+                ? new UserDomainObject[]{}
+                : getUsersFromSqlRows(sqlSelectUsersByEmail(email));
+    }
+
     public UserDomainObject[] getAllUsersWithRole(RoleDomainObject role) {
         try {
-            if ( null == role ) {
-                return new UserDomainObject[] { };
+            if (null == role) {
+                return new UserDomainObject[]{};
             }
-            final Object[] parameters = new String[] { "" + role.getId() };
+            final Object[] parameters = new String[]{"" + role.getId()};
             String[] usersWithRole = (String[]) services.getProcedureExecutor().executeProcedure(SPROC_GET_USERS_WHO_BELONGS_TO_ROLE, parameters, new StringArrayResultSetHandler());
             UserDomainObject[] result = new UserDomainObject[usersWithRole.length / 2];
 
-            for ( int i = 0; i < result.length; i++ ) {
+            for (int i = 0; i < result.length; i++) {
                 String userIdStr = usersWithRole[i * 2];
                 result[i] = getUser(Integer.parseInt(userIdStr));
             }
             return result;
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     public synchronized RoleDomainObject addRole(String roleName) {
         RoleDomainObject role = getRoleByName(roleName);
-        if ( null == role ) {
+        if (null == role) {
             role = new RoleDomainObject(roleName);
             try {
                 addRole(role);
-            } catch ( UserAndRoleRegistryException e ) {
+            } catch (UserAndRoleRegistryException e) {
                 throw new UnhandledException(e);
             }
         }
@@ -414,21 +712,21 @@ public synchronized RoleDomainObject addRole(String roleName) {
     void addRole(final RoleDomainObject role) throws RoleAlreadyExistsException, NameTooLongException {
         try {
             final int unionOfPermissionSetIds = getUnionOfRolePermissionIds(role);
-            final int newRoleId = ( (Number) services.getDatabase().execute(new TransactionDatabaseCommand() {
+            final int newRoleId = ((Number) services.getDatabase().execute(new TransactionDatabaseCommand() {
                 public Object executeInTransaction(DatabaseConnection connection) throws DatabaseException {
-                    return connection.executeUpdateAndGetGeneratedKey(SQL_INSERT_INTO_ROLES, new String[] {
+                    return connection.executeUpdateAndGetGeneratedKey(SQL_INSERT_INTO_ROLES, new String[]{
                             role.getName(),
                             ""
-                            + unionOfPermissionSetIds });
+                                    + unionOfPermissionSetIds});
                 }
-            }) ).intValue();
+            })).intValue();
             role.setId(new RoleId(newRoleId));
-        } catch ( IntegrityConstraintViolationException icvse ) {
+        } catch (IntegrityConstraintViolationException icvse) {
             throw new RoleAlreadyExistsException("A role with the name \"" + role.getName()
-                                                 + "\" already exists.");
-        } catch ( StringTruncationException stse ) {
+                    + "\" already exists.");
+        } catch (StringTruncationException stse) {
             throw new NameTooLongException("Role name too long: " + role.getName());
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
@@ -436,7 +734,7 @@ public Object executeInTransaction(DatabaseConnection connection) throws Databas
     private int getUnionOfRolePermissionIds(RoleDomainObject role) {
         int unionOfPermissionSetIds = 0;
         RolePermissionDomainObject[] rolePermissions = role.getPermissions();
-        for ( int i = 0; i < rolePermissions.length; i++ ) {
+        for (int i = 0; i < rolePermissions.length; i++) {
             RolePermissionDomainObject rolePermission = rolePermissions[i];
             unionOfPermissionSetIds |= rolePermission.getId();
         }
@@ -444,17 +742,18 @@ private int getUnionOfRolePermissionIds(RoleDomainObject role) {
     }
 
     public void deleteRole(RoleDomainObject role) {
-        if ( null == role ) {
+        if (null == role) {
             return;
         }
         try {
-            DatabaseCommand databaseCommand = new CompositeDatabaseCommand(new DatabaseCommand[] {
+            DatabaseCommand databaseCommand = new CompositeDatabaseCommand(new DatabaseCommand[]{
                     new DeleteWhereColumnsEqualDatabaseCommand("roles_rights", "role_id", "" + role.getId()),
                     new DeleteWhereColumnsEqualDatabaseCommand("user_roles_crossref", "role_id", "" + role.getId()),
+                    new DeleteWhereColumnsEqualDatabaseCommand("useradmin_role_crossref", "role_id", "" + role.getId()),
                     new DeleteWhereColumnsEqualDatabaseCommand("roles", "role_id", "" + role.getId()),
             });
             services.getDatabase().execute(databaseCommand);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
@@ -472,38 +771,38 @@ private RoleDomainObject[] getRoles(String rolesSql) {
             final Object[] parameters = new String[0];
             String[][] sqlRows = (String[][]) services.getDatabase().execute(new SqlQueryCommand(rolesSql, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
             RoleDomainObject[] roles = new RoleDomainObject[sqlRows.length];
-            for ( int i = 0; i < sqlRows.length; i++ ) {
+            for (int i = 0; i < sqlRows.length; i++) {
                 roles[i] = getRoleFromSqlResult(sqlRows[i]);
             }
             return roles;
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     public RoleDomainObject getRoleById(int roleId) {
         try {
-            final Object[] parameters = new String[] { "" + roleId };
+            final Object[] parameters = new String[]{"" + roleId};
             String[] sqlResult = (String[]) services.getDatabase().execute(new SqlQueryCommand(SQL_SELECT_ROLE_BY_ID, parameters, Utility.STRING_ARRAY_HANDLER));
             return getRoleFromSqlResult(sqlResult);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     public RoleDomainObject getRoleByName(String wantedRoleName) {
         try {
-            final Object[] parameters = new String[] { wantedRoleName };
+            final Object[] parameters = new String[]{wantedRoleName};
             String[] sqlResult = (String[]) services.getDatabase().execute(new SqlQueryCommand(SQL_SELECT_ROLE_BY_NAME, parameters, Utility.STRING_ARRAY_HANDLER));
             return getRoleFromSqlResult(sqlResult);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     public RoleDomainObject getRoleFromSqlResult(String[] sqlResult) {
         RoleDomainObject role = null;
-        if ( sqlResult.length > 0 ) {
+        if (sqlResult.length > 0) {
             int roleId = Integer.parseInt(sqlResult[0]);
             String roleName = sqlResult[1];
             int adminRoleId = Integer.parseInt(sqlResult[2]);
@@ -520,24 +819,24 @@ public UserDomainObject[] getAllUsers() {
 
     public UserDomainObject[] findUsersByNamePrefix(String namePrefix, boolean includeInactiveUsers) {
         try {
-            String sql = SQL_SELECT_USERS + " WHERE user_id != " + USER_EXTERN_ID
-                         + " AND ( login_name LIKE ? OR first_name LIKE ? OR last_name LIKE ? OR title LIKE ? OR email LIKE ? OR company LIKE ? )";
-            if ( !includeInactiveUsers ) {
+            String sql = sqlSelectUsers(services) + " WHERE user_id != " + USER_EXTERN_ID
+                    + " AND ( login_name LIKE ? OR first_name LIKE ? OR last_name LIKE ? OR title LIKE ? OR email LIKE ? OR company LIKE ? )";
+            if (!includeInactiveUsers) {
                 sql += " AND active = 1";
             }
             sql += " ORDER BY last_name, first_name";
             String like = namePrefix + "%";
-            final Object[] parameters = new String[] { like, like, like, like, like, like };
+            final Object[] parameters = new String[]{like, like, like, like, like, like};
             String[][] sqlRows = (String[][]) services.getDatabase().execute(new SqlQueryCommand(sql, parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
             return getUsersFromSqlRows(sqlRows);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     private UserDomainObject[] getUsersFromSqlRows(String[][] sqlRows) {
         UserDomainObject[] users = new UserDomainObject[sqlRows.length];
-        for ( int i = 0; i < sqlRows.length; i++ ) {
+        for (int i = 0; i < sqlRows.length; i++) {
             users[i] = getUserFromSqlRow(sqlRows[i]);
         }
         return users;
@@ -545,7 +844,7 @@ private UserDomainObject[] getUsersFromSqlRows(String[][] sqlRows) {
 
     public void initUserPhoneNumbers(UserDomainObject user) {
         PhoneNumber[] phoneNbr = getUserPhoneNumbers(user.getId());
-        for ( int i = 0; i < phoneNbr.length; i++ ) {
+        for (int i = 0; i < phoneNbr.length; i++) {
             PhoneNumberType type = phoneNbr[i].getType();
             String number = phoneNbr[i].getNumber();
 
@@ -557,12 +856,16 @@ public void initUserRoles(UserDomainObject user) {
         user.setRoleIds(getRoleReferencesForUser(user));
     }
 
+    public void initUserProperties(UserDomainObject user) {
+        user.setProperties(getUserPropertiesReferencesForUser(user));
+    }
+
     public void initUserUserAdminRoles(UserDomainObject user) {
         user.setUserAdminRolesIds(getUserAdminRolesReferencesForUser(user));
     }
 
     public void saveRole(RoleDomainObject role) throws NameTooLongException, RoleAlreadyExistsException {
-        if ( 0 == role.getId().intValue() ) {
+        if (0 == role.getId().intValue()) {
             addRole(role);
         } else {
             saveExistingRole(role);
@@ -572,25 +875,25 @@ public void saveRole(RoleDomainObject role) throws NameTooLongException, RoleAlr
     private void saveExistingRole(RoleDomainObject role) {
         int unionOfRolePermissionIds = getUnionOfRolePermissionIds(role);
         try {
-            final Object[] parameters = new String[] {
+            final Object[] parameters = new String[]{
                     role.getName(),
-                    "" + unionOfRolePermissionIds, "" + role.getId() };
+                    "" + unionOfRolePermissionIds, "" + role.getId()};
             services.getDatabase().execute(new SqlUpdateCommand("UPDATE roles SET role_name = ?, permissions = ? WHERE role_id = ?", parameters));
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     public PhoneNumber[] getUserPhoneNumbers(int userToChangeId) {
         try {
-            final Object[] parameters = new String[] {
-                    "" + userToChangeId };
+            final Object[] parameters = new String[]{
+                    "" + userToChangeId};
             String[][] phoneNumberData = (String[][]) services.getDatabase().execute(new SqlQueryCommand(
                     "SELECT   phones.number, phones.phonetype_id\n"
-                    + "FROM   phones\n"
-                    + "WHERE  phones.user_id = ?", parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
+                            + "FROM   phones\n"
+                            + "WHERE  phones.user_id = ?", parameters, Utility.STRING_ARRAY_ARRAY_HANDLER));
             List phoneNumbers = new ArrayList();
-            for ( int i = 0; i < phoneNumberData.length; i++ ) {
+            for (int i = 0; i < phoneNumberData.length; i++) {
                 String[] row = phoneNumberData[i];
                 String phoneNumberString = row[0];
                 int phoneTypeId = Integer.parseInt(row[1]);
@@ -599,25 +902,38 @@ public PhoneNumber[] getUserPhoneNumbers(int userToChangeId) {
                 phoneNumbers.add(phoneNumber);
             }
             return (PhoneNumber[]) phoneNumbers.toArray(new PhoneNumber[phoneNumbers.size()]);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
+            throw new UnhandledException(e);
+        }
+    }
+
+    private Map<String, String> getUserPropertiesReferencesForUser(UserDomainObject loggedOnUser) {
+        try {
+            final String[] parameters = {String.valueOf(loggedOnUser.getId())};
+
+            return services.getDatabase().execute(new SqlQueryCommand<>(
+                    SQL_GET_USER_PROPERTIES, parameters, USER_PROPERTIES_HANDLER
+            ));
+
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
 
     private RoleId[] getUserAdminRolesReferencesForUser(UserDomainObject loggedOnUser) {
         try {
-            final Object[] parameters = new String[] {
-                    "" + loggedOnUser.getId() };
+            final Object[] parameters = new String[]{
+                    "" + loggedOnUser.getId()};
             String[] roleIds = (String[]) services.getDatabase().execute(new SqlQueryCommand("SELECT role_id\n"
-                                                                                             + "FROM useradmin_role_crossref\n"
-                                                                                             + "WHERE user_id = ?", parameters, Utility.STRING_ARRAY_HANDLER));
+                    + "FROM useradmin_role_crossref\n"
+                    + "WHERE user_id = ?", parameters, Utility.STRING_ARRAY_HANDLER));
 
             List useradminPermissibleRolesList = new ArrayList(roleIds.length);
-            for ( int i = 0; i < roleIds.length; i++ ) {
+            for (int i = 0; i < roleIds.length; i++) {
                 useradminPermissibleRolesList.add(new RoleId(Integer.parseInt(roleIds[i])));
             }
             return (RoleId[]) useradminPermissibleRolesList.toArray(new RoleId[useradminPermissibleRolesList.size()]);
-        } catch ( DatabaseException e ) {
+        } catch (DatabaseException e) {
             throw new UnhandledException(e);
         }
     }
@@ -635,24 +951,133 @@ public UserDomainObject getUserByIpAddress(String ipAddress) {
         long ip;
         try {
             ip = Utility.ipStringToLong(ipAddress);
-        } catch ( IllegalArgumentException nfe ) {
+        } catch (IllegalArgumentException nfe) {
             log.debug("Failed to parse ip address " + ipAddress);
             return null;
         }
 
         String sqlStr = "select users.user_id from users,ip_accesses"
-                        + " where users.user_id = ip_accesses.user_id"
-                        + " and ip_accesses.ip_start <= ?"
-                        + " and ip_accesses.ip_end >= ?";
+                + " where users.user_id = ip_accesses.user_id"
+                + " and ip_accesses.ip_start <= ?"
+                + " and ip_accesses.ip_end >= ?";
 
-        final Object[] parameters = new String[] { "" + ip,
-                "" + ip };
+        final Object[] parameters = new String[]{"" + ip,
+                "" + ip};
         String userIdString = (String) services.getDatabase().execute(new SqlQueryCommand(sqlStr, parameters, Utility.SINGLE_STRING_HANDLER));
 
-        if ( null != userIdString ) {
+        if (null != userIdString) {
             return getUser(Integer.parseInt(userIdString));
         }
         return null;
     }
 
+
+    /**
+     * @since 4.0.17
+     */
+    public LoginPasswordManager getLoginPasswordManager() {
+        return loginPasswordManager;
+    }
+
+
+    /**
+     * Encrypts every internal user's unencrypted non-blank login password if encryption is enabled.
+     *
+     * @since 4.0.17
+     */
+    public void encryptUnencryptedUsersLoginPasswords() {
+        if (services.getConfig().isLoginPasswordEncryptionEnabled()) {
+            for (UserDomainObject user : getAllUsers()) {
+                if (!user.isImcmsExternal() && !user.isPasswordEncrypted() && StringUtils.isNotBlank(user.getPassword())) {
+                    saveUser(user);
+                }
+            }
+        }
+    }
+
+    public void forwardDeniedUserToMessagePage(UserDomainObject user,
+                                               HttpServletRequest request,
+                                               ServletResponse response) throws ServletException, IOException {
+
+        final String lang = user.getLanguageIso639_2();
+        final String accessDeniedPage = "/WEB-INF/templates/" + lang + "/admin/accessDeniedForUserIP.jsp";
+        final UserDomainObject defaultUser = getDefaultUser();
+
+        defaultUser.setLanguageIso639_2(lang);
+        Utility.makeUserLoggedIn(request, (HttpServletResponse) response, defaultUser);
+        Config.set(request, FMT_LOCALIZATION_CONTEXT, new LocalizationContext(Utility.getResourceBundle(request)));
+        request.getRequestDispatcher(accessDeniedPage).forward(request, response);
+    }
+
+    /**
+     * Checks is user's IP and role in white list and throws Exception if not.
+     *
+     * @param user    to be checked
+     * @param request to get user's IP
+     * @throws UserIpIsNotAllowedException if user's IP for role is not in white list
+     * @since 4.2.29
+     */
+    public void checkUserIpAllowed(UserDomainObject user, HttpServletRequest request) throws UserIpIsNotAllowedException {
+
+        if (isUserIpAllowed(user, request)) {
+            return;
+        }
+
+        throw new UserIpIsNotAllowedException(user, request);
+    }
+
+    /**
+     * Checks is user's IP and role in white list.
+     *
+     * @param user    to be checked
+     * @param request to get user's IP
+     * @return true if user's IP and role is in white list or if no such
+     * list in DB, or if user is null or default
+     * @since 4.2.29
+     */
+    private boolean isUserIpAllowed(UserDomainObject user, HttpServletRequest request) {
+        final List<RoleIpRange> roleIpRanges = AdminIpWhiteList.getRoleIpRanges();
+
+        if (user == null || user.isDefaultUser() || roleIpRanges.isEmpty()) {
+            return true; // only non-default users have to be checked
+        }
+
+        if (!request.isSecure() && AdminIpWhiteList.isHttpsRequired()) {
+            return false;
+        }
+
+        final String userIP = request.getRemoteAddr();
+
+        if ("0:0:0:0:0:0:0:1".equals(userIP)) {
+            return true; //userIP = "127.0.0.1"; // localhost handled here
+        }
+
+        if (isNotValidInet4Address(userIP)) {
+            return false;
+        }
+
+        final boolean isUserNotSuperAdmin = !user.isSuperAdmin();
+        final long userIpLong = Utility.ipStringToLong(userIP);
+        boolean atLeastOnceInWhiteList = false;
+
+        for (RoleIpRange roleIpRange : roleIpRanges) {
+            if (roleIpRange.isAdmin() || (!roleIpRange.isAdmin() && isUserNotSuperAdmin)) {
+                final String ipFrom = roleIpRange.getIpFrom();
+                final String ipTo = roleIpRange.getIpTo();
+
+                final long ipFromLong = Utility.ipStringToLong(ipFrom);
+                final long ipToLong = Utility.ipStringToLong(ipTo);
+
+                if (ipFromLong <= userIpLong && userIpLong <= ipToLong) {
+                    atLeastOnceInWhiteList = true;
+                }
+            }
+        }
+
+        return atLeastOnceInWhiteList;
+    }
+
+    private boolean isNotValidInet4Address(String ip) {
+        return !InetAddressValidator.getInstance().isValidInet4Address(ip);
+    }
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/user/LdapUserAndRoleRegistry.java b/server/src/imcode/server/user/LdapUserAndRoleRegistry.java
index 82f34d5d5b..382886ba98 100644
--- a/server/src/imcode/server/user/LdapUserAndRoleRegistry.java
+++ b/server/src/imcode/server/user/LdapUserAndRoleRegistry.java
@@ -1,22 +1,24 @@
 package imcode.server.user;
 
+import com.google.common.collect.ImmutableSet;
+import com.imcode.net.ldap.LdapClient;
+import com.imcode.net.ldap.LdapClientException;
+import com.imcode.net.ldap.LdapConnection;
+import com.imcode.net.ldap.LdapConnectionPool;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.collections.ExtendedProperties;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import javax.naming.CommunicationException;
 import javax.naming.directory.SearchControls;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
-
-import com.imcode.net.ldap.LdapClient;
-import com.imcode.net.ldap.LdapConnection;
-import com.imcode.net.ldap.LdapClientException;
+import java.util.concurrent.TimeUnit;
 
 /**
  * The documentMapper maps LDAP attributes to Imcms internal user object.
@@ -28,29 +30,26 @@
 
 public class LdapUserAndRoleRegistry implements Authenticator, UserAndRoleRegistry {
 
-    private final static Logger LOG = Logger.getLogger( LdapUserAndRoleRegistry.class );
-
     public static final String DEFAULT_LDAP_ROLE = "LDAP";
+    static final String INETORGPERSON_USER_IDENTITY = "uid";
 
     /** The following constanst are mapped to the Imcms internal user tables.
      /* Where the loginname is mapped to the attribute attribute
      /* and the password is ignored */
-
+    private final static Logger LOG = LogManager.getLogger(LdapUserAndRoleRegistry.class);
     /**
      * From person oid=2.5.6.6
      */
     private static final String PERSON_SURNAME = "sn";
     private static final String PERSON_TELEPHONE_NUMBER = "telephoneNumber";
-
     /**
      * From organizationalPerson oid=2.5.6.7
      */
     private static final String ORGANIZATIONALPERSON_TITLE = "title";
     private static final String ORGANIZATIONALPERSON_STATE_OR_PROVINCE_NAME = "st";
     private static final String ORGANIZATIONALPERSON_POSTAL_CODE = "postalCode";
-    private static final String ORGANIZATIONALPERSON_STREET_ADRESS = "streetAddress";
     //   static final String ORGANIZATIONALPERSON_ORGANIZATIONAL_UNIT_NAME = "ou";
-
+    private static final String ORGANIZATIONALPERSON_STREET_ADRESS = "streetAddress";
     /**
      * From inetOrgPerson oid=2.16.840.1.113730.3.2.2
      */
@@ -60,229 +59,371 @@ public class LdapUserAndRoleRegistry implements Authenticator, UserAndRoleRegist
     private static final String INETORGPERSON_MOBILE = "mobile";
     private static final String INETORGPERSON_LOCALITY_NAME = "l";
     private static final String INETORGPERSON_ORGANIZATION = "o";
-    static final String INETORGPERSON_USER_IDENTITY = "uid";
-
-    private final LdapClient ldapClient ;
-    private LdapConnection ldapConnection ;
-
-    private final String ldapUserObjectClass ;
+    private final static Map DEFAULT_USER_PROPERTY_NAME_TO_LDAP_ATTRIBUTE_NAME_MAP = ArrayUtils.toMap(new String[][]{
+            {"LoginName", INETORGPERSON_USER_IDENTITY},
+            {"FirstName", INETORGPERSON_GIVEN_NAME},
+            {"LastName", PERSON_SURNAME},
+            {"Title", ORGANIZATIONALPERSON_TITLE},
+            {"Company", INETORGPERSON_ORGANIZATION},
+            {"Address", ORGANIZATIONALPERSON_STREET_ADRESS},
+            {"City", INETORGPERSON_LOCALITY_NAME},
+            {"Zip", ORGANIZATIONALPERSON_POSTAL_CODE},
+            {"Province", ORGANIZATIONALPERSON_STATE_OR_PROVINCE_NAME},
+            {"EmailAddress", INETORGPERSON_MAIL},
+            {"WorkPhone", PERSON_TELEPHONE_NUMBER},
+            {"MobilePhone", INETORGPERSON_MOBILE},
+            {"HomePhone", INETORGPERSON_HOME_PHONE},
+    });
+    private static final String LDAP_USER_OBJECTCLASS__INETORGPERSON = "inetOrgPerson";
+    private static final String LDAP_USER_OBJECTCLASS_DEFAULT = LDAP_USER_OBJECTCLASS__INETORGPERSON;
+    private final LdapClient ldapClient;
+    private final String ldapReadTimeoutMillis;
+    private final int ldapMaxConnections;
+    private final int ldapConnectionExpirySeconds;
+    private final String ldapUserObjectClass;
     private final String[] ldapAttributesAutoMappedToRoles;
-
+    private LdapConnectionPool ldapConnectionPool;
     private Properties userPropertyNameToLdapAttributeNameMap = new Properties();
-
-    private final static Map DEFAULT_USER_PROPERTY_NAME_TO_LDAP_ATTRIBUTE_NAME_MAP = ArrayUtils.toMap( new String[][]{
-        {"LoginName", INETORGPERSON_USER_IDENTITY},
-        {"FirstName", INETORGPERSON_GIVEN_NAME},
-        {"LastName", PERSON_SURNAME},
-        {"Title", ORGANIZATIONALPERSON_TITLE},
-        {"Company", INETORGPERSON_ORGANIZATION},
-        {"Address", ORGANIZATIONALPERSON_STREET_ADRESS},
-        {"City", INETORGPERSON_LOCALITY_NAME},
-        {"Zip", ORGANIZATIONALPERSON_POSTAL_CODE},
-        {"Province", ORGANIZATIONALPERSON_STATE_OR_PROVINCE_NAME},
-        {"EmailAddress", INETORGPERSON_MAIL},
-        {"WorkPhone", PERSON_TELEPHONE_NUMBER},
-        {"MobilePhone", INETORGPERSON_MOBILE},
-        {"HomePhone", INETORGPERSON_HOME_PHONE},
-    } );
-    
     private String ldapUsername;
     private String ldapPassword;
 
-    private static final String LDAP_USER_OBJECTCLASS__INETORGPERSON = "inetOrgPerson";
-    private static final String LDAP_USER_OBJECTCLASS_DEFAULT = LDAP_USER_OBJECTCLASS__INETORGPERSON;
-
-    public LdapUserAndRoleRegistry( Properties ldapConfig ) throws LdapClientException {
-        this( ldapConfig.getProperty( "LdapUrl", "ldap://localhost/" ),
-              ldapConfig.getProperty( "LdapUserObjectClass", LDAP_USER_OBJECTCLASS_DEFAULT ),
-              ldapConfig.getProperty( "LdapBindDn", "" ),
-              ldapConfig.getProperty( "LdapPassword", "" ),
-              buildAttributesMappedToRoles(ldapConfig),
-              buildUserAttributes(ldapConfig) );
-    }
-
-    private static String[] buildAttributesMappedToRoles(Properties ldapConfig) {
-        String ldapStringOfAttributesMappedToRoles = ldapConfig.getProperty( "LdapAttributesMappedToRoles", "" );
-        return splitStringOnCommasAndSpaces( ldapStringOfAttributesMappedToRoles );
-    }
-
-    private static Properties buildUserAttributes(Properties ldapConfig) {
-        Properties ldapUserAttributes = new Properties();
-        ExtendedProperties ldapUserAttributesSubset = ExtendedProperties.convertProperties( ldapConfig ).subset( "LdapUserAttribute" );
-        if ( null != ldapUserAttributesSubset ) {
-            ldapUserAttributes.putAll( ldapUserAttributesSubset );
-        }
-        return ldapUserAttributes;
+    public LdapUserAndRoleRegistry(Properties ldapConfig) throws LdapClientException {
+        this(ldapConfig.getProperty("LdapUrl", "ldap://localhost/"),
+                ldapConfig.getProperty("LdapUserObjectClass", LDAP_USER_OBJECTCLASS_DEFAULT),
+                ldapConfig.getProperty("LdapBindDn", ""),
+                ldapConfig.getProperty("LdapPassword", ""),
+                ldapConfig.getProperty("LdapReadTimeoutMillis", "5000"),
+                ldapConfig.getProperty("LdapMaxConnections", "20"),
+                ldapConfig.getProperty("LdapConnectionExpirySeconds", "120"),
+                buildAttributesMappedToRoles(ldapConfig),
+                buildUserAttributes(ldapConfig)
+        );
     }
 
     /**
+     * @param ldapUrl                     The full path to where the ldap-service is located _and_ the node where to start the searches, e.g.  "ldap://computername:389/CN=Users,DC=companyName,DC=com"
+     * @param ldapUserName                A name that is used to log in (bind) to the ldap server
+     * @param ldapPassword                A password that i used to log in (bind) to the ldap server
+     * @param ldapReadTimeoutMillis
+     * @param ldapMaxConnections
+     * @param ldapConnectionExpirySeconds
      * @param ldapUserAttributes
-     * @param ldapUrl                The full path to where the ldap-service is located _and_ the node where to start the searches, e.g.  "ldap://computername:389/CN=Users,DC=companyName,DC=com"
-     * @param ldapUserName           A name that is used to log in (bind) to the ldap server
-     * @param ldapPassword           A password that i used to log in (bind) to the ldap server
      */
-
     public LdapUserAndRoleRegistry(String ldapUrl,
                                    String ldapUserObjectClass,
                                    String ldapUserName,
                                    String ldapPassword,
-                                   String[] ldapAttributesMappedToRoles, Properties ldapUserAttributes) throws LdapClientException {
+                                   String ldapReadTimeoutMillis,
+                                   String ldapMaxConnections,
+                                   String ldapConnectionExpirySeconds,
+                                   String[] ldapAttributesMappedToRoles,
+                                   Properties ldapUserAttributes) throws LdapClientException {
+
         ldapAttributesAutoMappedToRoles = ldapAttributesMappedToRoles;
-        initLdapUserAttributesMap( ldapUserAttributes );
+        initLdapUserAttributesMap(ldapUserAttributes);
 
         this.ldapUserObjectClass = ldapUserObjectClass;
         ldapClient = new LdapClient(ldapUrl);
-        
+
         this.ldapUsername = ldapUserName;
-        this.ldapPassword = ldapPassword;        
-        
+        this.ldapPassword = ldapPassword;
+        this.ldapReadTimeoutMillis = ldapReadTimeoutMillis;
+        this.ldapMaxConnections = Integer.parseInt(ldapMaxConnections);
+        this.ldapConnectionExpirySeconds = Integer.parseInt(ldapConnectionExpirySeconds);
+
         createLdapConnection();
     }
-    
-    private void createLdapConnection() 
-    throws LdapClientException {
-    	ldapConnection = ldapClient.bind(ldapUsername, ldapPassword);    	
+
+    private static String[] buildAttributesMappedToRoles(Properties ldapConfig) {
+        String ldapStringOfAttributesMappedToRoles = ldapConfig.getProperty("LdapAttributesMappedToRoles", "");
+        return splitStringOnCommasAndSpaces(ldapStringOfAttributesMappedToRoles);
+    }
+
+    private static Properties buildUserAttributes(Properties ldapConfig) {
+        Properties ldapUserAttributes = new Properties();
+        ExtendedProperties ldapUserAttributesSubset = ExtendedProperties.convertProperties(ldapConfig).subset("LdapUserAttribute");
+        if (null != ldapUserAttributesSubset) {
+            ldapUserAttributes.putAll(ldapUserAttributesSubset);
+        }
+        return ldapUserAttributes;
+    }
+
+    private static String[] splitStringOnCommasAndSpaces(String stringToSplit) {
+        StringTokenizer attributesTokenizer = new StringTokenizer(stringToSplit, ", ");
+        String[] tokens = new String[attributesTokenizer.countTokens()];
+        for (int i = 0; i < tokens.length; ++i) {
+            tokens[i] = attributesTokenizer.nextToken();
+        }
+        return tokens;
+    }
+
+    private static String[] getCapitalizedSettableBeanPropertyNames(Class beanClass) {
+        PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(beanClass);
+        List settableBeanPropertyNames = new ArrayList();
+        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (null == propertyDescriptor.getWriteMethod()) {
+                continue;
+            }
+            String uncapitalizedPropertyName = propertyDescriptor.getName();
+            String capitalizedPropertyName = StringUtils.capitalize(uncapitalizedPropertyName);
+            settableBeanPropertyNames.add(capitalizedPropertyName);
+        }
+        return (String[]) settableBeanPropertyNames.toArray(new String[settableBeanPropertyNames.size()]);
+    }
+
+    private void createLdapConnection()
+            throws LdapClientException {
+        ldapConnectionPool = ldapClient.bind(ldapUsername, ldapPassword, ldapReadTimeoutMillis, ldapMaxConnections, ldapConnectionExpirySeconds, TimeUnit.SECONDS);
     }
 
     public String[] getAllRoleNames() {
         return new String[]{DEFAULT_LDAP_ROLE};
     }
 
-    private void initLdapUserAttributesMap( Properties ldapUserAttributes ) throws LdapClientException {
-        userPropertyNameToLdapAttributeNameMap.putAll( DEFAULT_USER_PROPERTY_NAME_TO_LDAP_ATTRIBUTE_NAME_MAP );
-        userPropertyNameToLdapAttributeNameMap.putAll( ldapUserAttributes );
-        Set badUserAttributes = new TreeSet( userPropertyNameToLdapAttributeNameMap.keySet() );
-        String[] capitalizedSettableUserPropertyNames = getCapitalizedSettableBeanPropertyNames( UserDomainObject.class );
-        badUserAttributes.removeAll( Arrays.asList( capitalizedSettableUserPropertyNames ) );
-        if ( !badUserAttributes.isEmpty() ) {
-            throw new LdapClientException( "Unrecognized LdapUserAttributes: "
-                                           + StringUtils.join( badUserAttributes.iterator(), ", " ) );
+    @SuppressWarnings("unchecked")
+    private void initLdapUserAttributesMap(Properties ldapUserAttributes) throws LdapClientException {
+        userPropertyNameToLdapAttributeNameMap.putAll(DEFAULT_USER_PROPERTY_NAME_TO_LDAP_ATTRIBUTE_NAME_MAP);
+        userPropertyNameToLdapAttributeNameMap.putAll(ldapUserAttributes);
+        Set<String> badUserAttributes = new TreeSet(userPropertyNameToLdapAttributeNameMap.keySet());
+        String[] capitalizedSettableUserPropertyNames = getCapitalizedSettableBeanPropertyNames(UserDomainObject.class);
+        badUserAttributes.removeAll(Arrays.asList(capitalizedSettableUserPropertyNames));
+
+        if (!badUserAttributes.isEmpty()) {
+            throw new LdapClientException("Unrecognized LdapUserAttributes: "
+                    + StringUtils.join(badUserAttributes.iterator(), ", "));
         }
     }
 
-    public boolean authenticate( String loginName, String password ) {
+    public boolean authenticate(String loginName, String password) {
         try {
-            Map userAttributes = searchForUserAttributes( loginName,
-                                                          new String[]{LdapConnection.DISTINGUISHED_NAME } );
-            if ( null != userAttributes ) {
-                String userDistinguishedName = (String)userAttributes.get( LdapConnection.DISTINGUISHED_NAME );
+            Map userAttributes = searchForUserAttributes(loginName,
+                    new String[]{LdapConnection.DISTINGUISHED_NAME});
+            if (null != userAttributes) {
+                String userDistinguishedName = (String) userAttributes.get(LdapConnection.DISTINGUISHED_NAME);
                 return ldapClient.canBind(userDistinguishedName, password);
             }
-        } catch ( LdapClientException ex ) {
-            LOG.warn( "Failed to get ldap context.", ex );
+        } catch (LdapClientException ex) {
+            LOG.warn("Failed to get ldap context.", ex);
         }
         return false;
     }
 
-    public UserDomainObject getUser( String loginName ) {
+    public UserDomainObject getUser(String loginName) {
         UserDomainObject result = null;
 
-        Map<String,String> attributeMap = searchForUserAttributes( loginName, null );
+        Map<String, String> attributeMap = searchForUserAttributes(loginName, null);
 
-        if ( null != attributeMap ) {
-            result = createUserFromLdapAttributes( attributeMap );
+        if (null != attributeMap) {
+            result = createUserFromLdapAttributes(attributeMap);
 
-            result.setLoginName( loginName );
-            result.setActive( true );
+            result.setLoginName(loginName);
+            result.setActive(true);
         }
         return result;
     }
 
-    private UserDomainObject createUserFromLdapAttributes( Map<String,String> ldapAttributeValues ) {
+    private UserDomainObject createUserFromLdapAttributes(Map<String, String> ldapAttributeValues) {
         UserDomainObject newlyFoundLdapUser = new UserDomainObject();
 
-        PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors( newlyFoundLdapUser );
+        PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(newlyFoundLdapUser);
         try {
-            for ( PropertyDescriptor propertyDescriptor : propertyDescriptors ) {
-                if ( null == propertyDescriptor.getWriteMethod() ) {
+            for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+                if (null == propertyDescriptor.getWriteMethod()) {
                     continue;
                 }
                 String uncapitalizedPropertyName = propertyDescriptor.getName();
                 String capitalizedPropertyName = StringUtils.capitalize(uncapitalizedPropertyName);
                 String ldapAttributeName = userPropertyNameToLdapAttributeNameMap.getProperty(capitalizedPropertyName);
-                if ( null != ldapAttributeName ) {
+                if (null != ldapAttributeName) {
                     String ldapAttributeValue = ldapAttributeValues.get(ldapAttributeName);
-                    if ( null != ldapAttributeValue ) {
+                    if (null != ldapAttributeValue) {
                         BeanUtils.setProperty(newlyFoundLdapUser, uncapitalizedPropertyName, ldapAttributeValue);
                     }
                 }
             }
-        } catch ( IllegalAccessException e ) {
-            throw new UnhandledException( e );
-        } catch ( InvocationTargetException e ) {
-            throw new UnhandledException( e );
+        } catch (IllegalAccessException e) {
+            throw new UnhandledException(e);
+        } catch (InvocationTargetException e) {
+            throw new UnhandledException(e);
         }
 
         return newlyFoundLdapUser;
     }
 
-    public String[] getRoleNames( UserDomainObject user ) {
+    public String[] getRoleNames(UserDomainObject user) {
         String loginName = user.getLoginName();
+        Map<String, String> attributeMappedRoles = searchForUserAttributes(loginName, ldapAttributesAutoMappedToRoles);
 
-        Map attributeMappedRoles = searchForUserAttributes( loginName, ldapAttributesAutoMappedToRoles );
-        Set<String> roles = new HashSet( attributeMappedRoles.values() );
+        Set<String> roles = new HashSet<>();
         roles.add(DEFAULT_LDAP_ROLE);
-        return roles.toArray(new String[roles.size()]);
+        roles.addAll(attributeMappedRoles.values());
+	    roles.addAll(getADUserGroups(loginName));
+
+		return roles.toArray(new String[0]);
     }
 
-    private Map<String,String> searchForUserAttributes( String loginName, String[] attributesToReturn ) {
-        Map<String,String> attributeMap = null;
+	private Set<String> getADUserGroups(String loginName){
+		final Set<String> groups = new HashSet<>();
+		try {
+			LdapConnection connection = null;
+			try {
+				connection = ldapConnectionPool.getConnection();
+				groups.addAll(connection.getUserGroups(loginName));
+			} finally {
+				if (connection != null) {
+					connection.close();
+				}
+			}
+		} catch (LdapClientException e) {
+			LOG.warn("Could not find user " + loginName, e);
+		}
+
+		return groups;
+	}
+
+    /**
+     * @since 4.1.6
+     */
+//    private Set<String> getMappedRoleNames(String loginName) {
+//        Map<String, Set<String>> mappedAttributes = searchForUserMultiAttributes(
+//                loginName, mappedRoles.rolesToAttributes().attributesNames().toArray(new String[]{}));
+//
+//        List<P.P2<String, String>> attributeNameValuePairs = Lists.newLinkedList();
+//
+//        for (Map.Entry<String, Set<String>> mappedAttribute : mappedAttributes.entrySet()) {
+//            String attributeName = mappedAttribute.getKey();
+//            for (String attributeValue : mappedAttribute.getValue()) {
+//                attributeNameValuePairs.add(P.of(attributeName, attributeValue));
+//            }
+//        }
+//
+//        if (LOG.isDebugEnabled()) {
+//            LOG.debug(String.format("Found %s LDAP roles mapped to attributes for user %s: %s.",
+//                    attributeNameValuePairs.size(), loginName, Joiner.on(", ").join(attributeNameValuePairs)));
+//        }
+//
+//        Set<String> usersAdGroups = getADUserGroups(loginName, mappedRoles.rolesToAdGroups().groups());
+//        Set<String> rolesNamesMappedToAttributes = mappedRoles.rolesToAttributes().roles(attributeNameValuePairs);
+//        Set<String> rolesNamesMappedToAdGroups = mappedRoles.rolesToAdGroups().roles(usersAdGroups);
+//        ImmutableSet.Builder<String> rolesNamesBuilder = ImmutableSet.builder();
+//
+//        rolesNamesBuilder.addAll(rolesNamesMappedToAttributes);
+//        rolesNamesBuilder.addAll(rolesNamesMappedToAdGroups);
+//
+//        return rolesNamesBuilder.build();
+//    }
+
+    private Map<String, String> searchForUserAttributes(String loginName, String[] attributesToReturn) {
+        Map<String, String> attributeMap = null;
 
         try {
-            String ldapUserIdentifyingAttribute = userPropertyNameToLdapAttributeNameMap.getProperty( "LoginName" );
+            String ldapUserIdentifyingAttribute = userPropertyNameToLdapAttributeNameMap.getProperty("LoginName");
 
             SearchControls searchControls = new SearchControls();
-            searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            searchControls.setReturningAttributes( attributesToReturn );
-            searchControls.setReturningObjFlag( true );
-
-            // Quick fix:
+            searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+            searchControls.setReturningAttributes(attributesToReturn);
+            searchControls.setReturningObjFlag(true);
+            LdapConnection connection = null;
             try {
-            	attributeMap = ldapConnection.search("(&(objectClass={0})({1}={2}))",
-            			new Object[] { ldapUserObjectClass, ldapUserIdentifyingAttribute, loginName },
-                    		searchControls);
-            } catch (LdapClientException e) {
-            	// in case of communication exception recreate connection and retry last operation.
-            	if (e.getCause() instanceof CommunicationException) {
-            		createLdapConnection();
-                	attributeMap = ldapConnection.search("(&(objectClass={0})({1}={2}))",
-                            new Object[] { ldapUserObjectClass, ldapUserIdentifyingAttribute, loginName },
-                            searchControls);            		
-            	} else {
-            		throw e;
-            	}
+                connection = ldapConnectionPool.getConnection();
+                Iterator<Map<String, String>> searchResult = connection.search("(&(objectClass={0})({1}={2}))",
+                        new Object[]{ldapUserObjectClass, ldapUserIdentifyingAttribute, loginName},
+                        searchControls);
+
+                if (searchResult.hasNext()) attributeMap = searchResult.next();
+            } finally {
+                if (connection != null) {
+                    connection.close();
+                }
             }
-        } catch ( LdapClientException e ) {
-            LOG.warn( "Could not find user " + loginName, e );
+        } catch (LdapClientException e) {
+            LOG.warn("Could not find user " + loginName, e);
         }
+
         return attributeMap;
     }
 
-    private static String[] splitStringOnCommasAndSpaces( String stringToSplit ) {
-        StringTokenizer attributesTokenizer = new StringTokenizer( stringToSplit, ", " );
-        String[] tokens = new String[attributesTokenizer.countTokens()];
-        for ( int i = 0; i < tokens.length; ++i ) {
-            tokens[i] = attributesTokenizer.nextToken();
+    /**
+     * @return a map containing attribute name mapped to values.
+     * @since 4.1.6
+     */
+    private Map<String, Set<String>> searchForUserMultiAttributes(String loginName, String[] attributesToReturn) {
+        Map<String, Set<String>> attributeMap = null;
+
+        try {
+            String ldapUserIdentifyingAttribute = userPropertyNameToLdapAttributeNameMap.getProperty("LoginName");
+
+            SearchControls searchControls = new SearchControls();
+            searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+            searchControls.setReturningAttributes(attributesToReturn);
+
+            LdapConnection connection = null;
+            try {
+                connection = ldapConnectionPool.getConnection();
+                Iterator<Map<String, Set<String>>> searchResult = connection.searchMultivalues(
+                        "(&(objectClass={0})({1}={2}))",
+                        new Object[]{ldapUserObjectClass, ldapUserIdentifyingAttribute, loginName},
+                        searchControls);
+                if (searchResult.hasNext()) attributeMap = searchResult.next();
+            } finally {
+                if (connection != null) {
+                    connection.close();
+                }
+            }
+
+        } catch (LdapClientException e) {
+            LOG.error("LDAP search error. User: " + loginName, e);
         }
-        return tokens;
+
+        return attributeMap;
     }
 
-    private static String[] getCapitalizedSettableBeanPropertyNames( Class beanClass ) {
-        PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors( beanClass );
-        List settableBeanPropertyNames = new ArrayList();
-        for ( PropertyDescriptor propertyDescriptor : propertyDescriptors ) {
-            if ( null == propertyDescriptor.getWriteMethod() ) {
-                continue;
+    /**
+     * Returns user's Active Directory groups sAMAccountName-s.
+     * If LDAP service provider is not an AD then the empty set will be returned.
+     *
+     * @param returningGroups groups sAMAccountName-s to return.
+     * @return groups sAMAccountName-s
+     * @since 4.1.11
+     */
+    private Set<String> getADUserGroups(String loginName, Set<String> returningGroups) {
+        if (userPropertyNameToLdapAttributeNameMap.getProperty("LoginName").trim().compareToIgnoreCase("sAMAccountName") != 0) {
+            LOG.debug("Underlying LDAP service is not an Active Directory. No search will be performed.");
+            return Collections.emptySet();
+        }
+
+        ImmutableSet.Builder<String> groupsBuilder = ImmutableSet.builder();
+
+        try {
+
+            LdapConnection connection = null;
+            Set<String> adUserGroups;
+            try {
+                connection = ldapConnectionPool.getConnection();
+                adUserGroups = connection.getADUserGroups(loginName);
+            } finally {
+                if (connection != null) {
+                    connection.close();
+                }
             }
-            String uncapitalizedPropertyName = propertyDescriptor.getName();
-            String capitalizedPropertyName = StringUtils.capitalize(uncapitalizedPropertyName);
-            settableBeanPropertyNames.add(capitalizedPropertyName);
+
+            for (String group : adUserGroups) {
+                if (returningGroups.contains(group.toLowerCase())) {
+                    groupsBuilder.add(group);
+                }
+
+                if (LOG.isDebugEnabled()) {
+                    LOG.info(String.format("User '%s' is a member of AD group '%s'.", loginName, group));
+                }
+            }
+        } catch (LdapClientException e) {
+            LOG.error("LDAP search error. User: " + loginName, e);
         }
-        return (String[])settableBeanPropertyNames.toArray( new String[settableBeanPropertyNames.size()] );
-    }
 
-    public void setUserPropertyLdapAttribute( String userPropertyName, String ldapAttribute ) {
-        userPropertyNameToLdapAttributeNameMap.put( userPropertyName, ldapAttribute ) ;
+        return groupsBuilder.build();
     }
 
+    public void setUserPropertyLdapAttribute(String userPropertyName, String ldapAttribute) {
+        userPropertyNameToLdapAttributeNameMap.put(userPropertyName, ldapAttribute);
+    }
 }
diff --git a/server/src/imcode/server/user/MissingLoginDataException.java b/server/src/imcode/server/user/MissingLoginDataException.java
new file mode 100644
index 0000000000..fc33fd73e0
--- /dev/null
+++ b/server/src/imcode/server/user/MissingLoginDataException.java
@@ -0,0 +1,18 @@
+package imcode.server.user;
+
+/**
+ * Exception that throws when user's password is {@code null} for some reasons.
+ * <p/>
+ * Created by Serhii Maksymchuk from Ubrainians for imCode
+ * Updated by Ruslan Popenko from Ubrainians for imCode
+ * 1.06.17.
+ */
+public class MissingLoginDataException extends RuntimeException {
+    public MissingLoginDataException() {
+        super();
+    }
+
+    public MissingLoginDataException(MissingLoginDataException e) {
+        super(e);
+    }
+}
diff --git a/server/src/imcode/server/user/NameTooLongException.java b/server/src/imcode/server/user/NameTooLongException.java
index 8aff7236bb..1e842c0610 100644
--- a/server/src/imcode/server/user/NameTooLongException.java
+++ b/server/src/imcode/server/user/NameTooLongException.java
@@ -2,7 +2,7 @@
 
 public class NameTooLongException extends UserAndRoleRegistryException {
 
-    public NameTooLongException( String message ) {
-        super(message) ;
+    public NameTooLongException(String message) {
+        super(message);
     }
 }
diff --git a/server/src/imcode/server/user/PhoneNumber.java b/server/src/imcode/server/user/PhoneNumber.java
index b8c241008a..ddb9070451 100644
--- a/server/src/imcode/server/user/PhoneNumber.java
+++ b/server/src/imcode/server/user/PhoneNumber.java
@@ -10,9 +10,9 @@ public class PhoneNumber implements Serializable {
 
     public PhoneNumber(String number, PhoneNumberType type) {
         if (null == number) {
-            throw new NullArgumentException("number") ;
+            throw new NullArgumentException("number");
         } else if (null == type) {
-            throw new NullArgumentException("type") ;
+            throw new NullArgumentException("type");
         }
         this.number = number;
         this.type = type;
@@ -27,10 +27,10 @@ public PhoneNumberType getType() {
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
@@ -45,6 +45,6 @@ public int hashCode() {
     }
 
     public String toString() {
-        return number ;
+        return number;
     }
 }
diff --git a/server/src/imcode/server/user/PhoneNumberType.java b/server/src/imcode/server/user/PhoneNumberType.java
index abc26e5848..f79474a63e 100644
--- a/server/src/imcode/server/user/PhoneNumberType.java
+++ b/server/src/imcode/server/user/PhoneNumberType.java
@@ -1,7 +1,7 @@
 package imcode.server.user;
 
-import imcode.util.IdLocalizedNamePair;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
+import imcode.util.IdLocalizedNamePair;
 
 public class PhoneNumberType extends IdLocalizedNamePair {
     public final static PhoneNumberType OTHER = new PhoneNumberType(0, new LocalizedMessage("phone_type/name/other"));
@@ -27,7 +27,7 @@ public static PhoneNumberType[] getAllPhoneNumberTypes() {
     }
 
     public static PhoneNumberType getPhoneNumberTypeById(int phoneTypeId) {
-        return ALL_PHONE_TYPES[phoneTypeId] ;
+        return ALL_PHONE_TYPES[phoneTypeId];
     }
 
 }
diff --git a/server/src/imcode/server/user/RoleAlreadyExistsException.java b/server/src/imcode/server/user/RoleAlreadyExistsException.java
index 8cfff72287..961647ad94 100644
--- a/server/src/imcode/server/user/RoleAlreadyExistsException.java
+++ b/server/src/imcode/server/user/RoleAlreadyExistsException.java
@@ -2,7 +2,7 @@
 
 public class RoleAlreadyExistsException extends UserAndRoleRegistryException {
 
-    public RoleAlreadyExistsException( String message ) {
-        super(message) ;
+    public RoleAlreadyExistsException(String message) {
+        super(message);
     }
 }
diff --git a/server/src/imcode/server/user/RoleDomainObject.java b/server/src/imcode/server/user/RoleDomainObject.java
index 5eafffd0bf..cd832d3d30 100644
--- a/server/src/imcode/server/user/RoleDomainObject.java
+++ b/server/src/imcode/server/user/RoleDomainObject.java
@@ -1,64 +1,72 @@
 package imcode.server.user;
 
 import com.imcode.imcms.util.l10n.LocalizedMessage;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
+@NoArgsConstructor
+@AllArgsConstructor
 public class RoleDomainObject implements Serializable, Comparable {
 
-    public final static RolePermissionDomainObject PASSWORD_MAIL_PERMISSION = new RolePermissionDomainObject( 1, new LocalizedMessage( "role_permission/password_by_email/description" ) ) ;
-    public static final RolePermissionDomainObject ADMIN_PAGES_PERMISSION = new RolePermissionDomainObject( 4, new LocalizedMessage( "role_permission/admin_pages_access/desciption" ) );
+    public final static RolePermissionDomainObject PASSWORD_MAIL_PERMISSION = new RolePermissionDomainObject(1, new LocalizedMessage("role_permission/password_by_email/description"));
+    public static final RolePermissionDomainObject ADMIN_PAGES_PERMISSION = new RolePermissionDomainObject(4, new LocalizedMessage("role_permission/admin_pages_access/desciption"));
 
     private final static RolePermissionDomainObject[] ALL_ROLE_PERMISSIONS = new RolePermissionDomainObject[]{
-        PASSWORD_MAIL_PERMISSION,
-        ADMIN_PAGES_PERMISSION,
+            PASSWORD_MAIL_PERMISSION,
+            ADMIN_PAGES_PERMISSION,
     };
 
     private RoleId id;
     private String name;
     private int adminRoleId;
-    private Set permissions = new HashSet() ;
+    private Set permissions = new HashSet();
 
 
-    public RoleDomainObject( String name ) {
-        this(new RoleId(0), name,0) ;
+    public RoleDomainObject(String name) {
+        this(new RoleId(0), name, 0);
     }
 
-    public RoleDomainObject( RoleId roleId, String roleName, int adminRoleId ) {
+    public RoleDomainObject(RoleId roleId, String roleName, int adminRoleId) {
         this.id = roleId;
         this.name = roleName;
         this.adminRoleId = adminRoleId;
     }
 
-    public void setId( RoleId id ) {
-        this.id = id;
+    public static RolePermissionDomainObject[] getAllRolePermissions() {
+        return ALL_ROLE_PERMISSIONS;
     }
 
     public RoleId getId() {
         return id;
     }
 
+    public void setId(RoleId id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }
 
     public void setName(String name) {
-        this.name = name ;
+        this.name = name;
     }
 
-    public boolean equals( Object o ) {
-        if ( this == o ) {
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof RoleDomainObject ) ) {
+        if (!(o instanceof RoleDomainObject)) {
             return false;
         }
 
-        final RoleDomainObject roleDomainObject = (RoleDomainObject)o;
+        final RoleDomainObject roleDomainObject = (RoleDomainObject) o;
 
-        if ( isAdminRole() || roleDomainObject.isAdminRole() ) {
+        if (isAdminRole() || roleDomainObject.isAdminRole()) {
             return adminRoleId == roleDomainObject.adminRoleId;
         }
 
@@ -66,7 +74,7 @@ public boolean equals( Object o ) {
     }
 
     public int hashCode() {
-        if ( isAdminRole() ) {
+        if (isAdminRole()) {
             return -adminRoleId;
         }
 
@@ -78,44 +86,40 @@ public String toString() {
     }
 
     public boolean isAdminRole() {
-        return 0 != adminRoleId ;
+        return 0 != adminRoleId;
     }
 
-    public int compareTo( Object o ) {
-        return name.compareToIgnoreCase(((RoleDomainObject)o).name) ;
+    public int compareTo(Object o) {
+        return name.compareToIgnoreCase(((RoleDomainObject) o).name);
     }
 
     public void addPermission(RolePermissionDomainObject permission) {
-        permissions.add( permission ) ;
+        permissions.add(permission);
     }
 
     public boolean hasPermission(RolePermissionDomainObject permission) {
-        return permissions.contains( permission ) ;
+        return permissions.contains(permission);
     }
 
     public void removePermission(RolePermissionDomainObject permission) {
-        permissions.remove( permission ) ;
+        permissions.remove(permission);
     }
 
     public RolePermissionDomainObject[] getPermissions() {
-        return (RolePermissionDomainObject[])permissions.toArray( new RolePermissionDomainObject[permissions.size()] );
+        return (RolePermissionDomainObject[]) permissions.toArray(new RolePermissionDomainObject[permissions.size()]);
     }
 
-    public void addUnionOfPermissionIdsToRole( int unionOfRolePermissionIds ) {
-        for ( int i = 0; i < RoleDomainObject.ALL_ROLE_PERMISSIONS.length; i++ ) {
+    public void addUnionOfPermissionIdsToRole(int unionOfRolePermissionIds) {
+        for (int i = 0; i < RoleDomainObject.ALL_ROLE_PERMISSIONS.length; i++) {
             RolePermissionDomainObject permission = RoleDomainObject.ALL_ROLE_PERMISSIONS[i];
-            if ( bitIsSet( unionOfRolePermissionIds, permission.getId() ) ) {
-                addPermission( permission );
+            if (bitIsSet(unionOfRolePermissionIds, permission.getId())) {
+                addPermission(permission);
             }
         }
     }
 
-    private boolean bitIsSet( int unionOfRolePermissionIds, int bitValue ) {
-        return 0 != ( unionOfRolePermissionIds & bitValue );
-    }
-
-    public static RolePermissionDomainObject[] getAllRolePermissions() {
-        return ALL_ROLE_PERMISSIONS;
+    private boolean bitIsSet(int unionOfRolePermissionIds, int bitValue) {
+        return 0 != (unionOfRolePermissionIds & bitValue);
     }
 
 }
diff --git a/server/src/imcode/server/user/RoleGetter.java b/server/src/imcode/server/user/RoleGetter.java
index 5832fd75a1..bdadc84479 100644
--- a/server/src/imcode/server/user/RoleGetter.java
+++ b/server/src/imcode/server/user/RoleGetter.java
@@ -2,6 +2,6 @@
 
 public interface RoleGetter {
 
-    RoleDomainObject getRole(RoleId roleId) ;
+    RoleDomainObject getRole(RoleId roleId);
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/user/RoleId.java b/server/src/imcode/server/user/RoleId.java
index 56b8b4bf2c..3c0e419b2b 100644
--- a/server/src/imcode/server/user/RoleId.java
+++ b/server/src/imcode/server/user/RoleId.java
@@ -4,25 +4,25 @@
 
 public class RoleId implements Serializable {
 
-    public static final int SUPERADMIN_ID = 0 ;
-    public static final int USERADMIN_ID = 1 ;
-    public static final int USERS_ID = 2 ;
+    public static final int SUPERADMIN_ID = 0;
+    public static final int USERADMIN_ID = 1;
+    public static final int USERS_ID = 2;
 
     public final static RoleId SUPERADMIN = new RoleId(SUPERADMIN_ID);
     public final static RoleId USERADMIN = new RoleId(USERADMIN_ID);
     public final static RoleId USERS = new RoleId(USERS_ID);
 
-    private final int roleId ;
+    private final int roleId;
 
     public RoleId(int roleId) {
         this.roleId = roleId;
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
@@ -41,7 +41,7 @@ public int intValue() {
     }
 
     public String toString() {
-        return ""+roleId;
+        return "" + roleId;
     }
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/user/RoleIds.java b/server/src/imcode/server/user/RoleIds.java
index 4d32b4632d..88fecb6c94 100644
--- a/server/src/imcode/server/user/RoleIds.java
+++ b/server/src/imcode/server/user/RoleIds.java
@@ -16,7 +16,7 @@ public RoleIds() {
     }
 
     public RoleIds(RoleId[] roleReferences) {
-        set.addAll(Arrays.asList(roleReferences)) ;
+        set.addAll(Arrays.asList(roleReferences));
     }
 
     public void add(RoleId roleId) {
@@ -28,7 +28,7 @@ protected Object clone() {
             RoleIds clone = (RoleIds) super.clone();
             clone.set = (HashSet) set.clone();
             return clone;
-        } catch ( CloneNotSupportedException e ) {
+        } catch (CloneNotSupportedException e) {
             throw new ShouldNotBeThrownException(e);
         }
     }
@@ -46,10 +46,10 @@ public RoleId[] toArray() {
     }
 
     public Set asSet() {
-        return Collections.unmodifiableSet(set) ;
+        return Collections.unmodifiableSet(set);
     }
 
     public boolean isEmpty() {
-        return set.isEmpty() ;
+        return set.isEmpty();
     }
 }
diff --git a/server/src/imcode/server/user/RolePermissionDomainObject.java b/server/src/imcode/server/user/RolePermissionDomainObject.java
index 8856d3efe1..702c18d41b 100644
--- a/server/src/imcode/server/user/RolePermissionDomainObject.java
+++ b/server/src/imcode/server/user/RolePermissionDomainObject.java
@@ -5,10 +5,10 @@
 import java.io.Serializable;
 
 public class RolePermissionDomainObject implements Serializable {
-    private int id ;
-    private LocalizedMessage description ;
+    private int id;
+    private LocalizedMessage description;
 
-    RolePermissionDomainObject( int id, LocalizedMessage description ) {
+    RolePermissionDomainObject(int id, LocalizedMessage description) {
         this.id = id;
         this.description = description;
     }
@@ -18,11 +18,11 @@ public int getId() {
     }
 
     public int hashCode() {
-        return id ;
+        return id;
     }
 
-    public boolean equals( Object obj ) {
-        return obj instanceof RolePermissionDomainObject && ((RolePermissionDomainObject)obj).id == id ;
+    public boolean equals(Object obj) {
+        return obj instanceof RolePermissionDomainObject && ((RolePermissionDomainObject) obj).id == id;
     }
 
     public LocalizedMessage getDescription() {
diff --git a/server/src/imcode/server/user/UserAlreadyExistsException.java b/server/src/imcode/server/user/UserAlreadyExistsException.java
index 14a0eea5b4..5a3995e62f 100644
--- a/server/src/imcode/server/user/UserAlreadyExistsException.java
+++ b/server/src/imcode/server/user/UserAlreadyExistsException.java
@@ -2,11 +2,11 @@
 
 public class UserAlreadyExistsException extends UserAndRoleRegistryException {
 
-    public UserAlreadyExistsException( Throwable e ) {
+    public UserAlreadyExistsException(Throwable e) {
         super(e);
     }
 
     public UserAlreadyExistsException(String message) {
-        super(message) ;
+        super(message);
     }
 }
diff --git a/server/src/imcode/server/user/UserAndRoleRegistry.java b/server/src/imcode/server/user/UserAndRoleRegistry.java
index 1d350356c4..3fb6f22e9f 100644
--- a/server/src/imcode/server/user/UserAndRoleRegistry.java
+++ b/server/src/imcode/server/user/UserAndRoleRegistry.java
@@ -2,9 +2,9 @@
 
 public interface UserAndRoleRegistry {
 
-    UserDomainObject getUser( String loginName );
+    UserDomainObject getUser(String loginName);
 
-    String[] getRoleNames( UserDomainObject user );
+    String[] getRoleNames(UserDomainObject user);
 
     String[] getAllRoleNames();
 
diff --git a/server/src/imcode/server/user/UserAndRoleRegistryException.java b/server/src/imcode/server/user/UserAndRoleRegistryException.java
index ff825c75ab..4a1e4cbf61 100644
--- a/server/src/imcode/server/user/UserAndRoleRegistryException.java
+++ b/server/src/imcode/server/user/UserAndRoleRegistryException.java
@@ -2,11 +2,11 @@
 
 public class UserAndRoleRegistryException extends Exception {
 
-    public UserAndRoleRegistryException( String message ) {
-        super(message) ;
+    public UserAndRoleRegistryException(String message) {
+        super(message);
     }
 
-    public UserAndRoleRegistryException( Throwable e ) {
-        super(e) ;
+    public UserAndRoleRegistryException(Throwable e) {
+        super(e);
     }
 }
diff --git a/server/src/imcode/server/user/UserDomainObject.java b/server/src/imcode/server/user/UserDomainObject.java
index 41748f68bc..9683881fa1 100644
--- a/server/src/imcode/server/user/UserDomainObject.java
+++ b/server/src/imcode/server/user/UserDomainObject.java
@@ -1,49 +1,78 @@
 package imcode.server.user;
 
 import imcode.server.Imcms;
-import imcode.server.document.*;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.NotPredicate;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.DocumentPermissionSetDomainObject;
+import imcode.server.document.DocumentPermissionSetTypeDomainObject;
+import imcode.server.document.RoleIdToDocumentPermissionSetTypeMappings;
+import imcode.server.document.TemplateGroupDomainObject;
+import imcode.server.document.TextDocumentPermissionSetDomainObject;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.NotPredicate;
 import org.apache.commons.lang.UnhandledException;
 
 import java.io.Serializable;
-import java.util.*;
-
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+@Getter
+@Setter
+@SuppressWarnings({"unused", "WeakerAccess"})
 public class UserDomainObject implements Cloneable, Serializable {
-
     public static final int DEFAULT_USER_ID = 2;
+    private static final long serialVersionUID = -9176465092502055012L;
 
-    protected int id;
+    protected volatile int id;
+    protected volatile RoleIds userAdminRoleIds = new RoleIds();
+    private volatile String loginName = "";
 
-    private String loginName = "" ;
-    private String password;
-    private String firstName = "";
-    private String lastName = "";
-    private String title = "";
-    private String company = "";
-    private String address = "";
-    private String city = "";
-    private String zip = "";
-    private String country = "";
-    private String province = "";
-    private String emailAddress = "";
-    private boolean active = true;
-    private Date createDate;
+    private volatile String password;
+    private volatile String firstName = "";
+    private volatile String lastName = "";
+    private volatile String title = "";
+    private volatile String company = "";
+    private volatile String address = "";
+    private volatile String city = "";
+    private volatile String zip = "";
+    private volatile String country = "";
+    private volatile String province = "";
+    private volatile String emailAddress = "";
+    private volatile boolean active = true;
+    private volatile Date createDate;
+    private volatile String languageIso639_2;
+    private volatile TemplateGroupDomainObject templateGroup;
+    private volatile boolean imcmsExternal;
+    private String externalProviderId = "";
+    private volatile HashSet<PhoneNumber> phoneNumbers = new HashSet<>();
+    private RoleIds roleIds = createRolesSetWithUserRole();
+    /**
+     * Http session id.
+     */
+    private volatile String sessionId;
+    private volatile boolean authenticatedByIp;
 
-    private String languageIso639_2;
+    private String rememberCd;
 
-    private TemplateGroupDomainObject templateGroup;
+    private Map<String, String> properties = new HashMap<>();
 
-    private boolean imcmsExternal ;
+    private Date lastLogin;
 
-    private HashSet phoneNumbers = new HashSet();
-    
-    RoleIds roleIds = createRolesSetWithUserRole();
-    protected RoleIds userAdminRoleIds = new RoleIds();
+    private volatile PasswordType passwordType = PasswordType.UNENCRYPTED;
 
-    /** Http session id.*/
-    private String sessionId;
+    private volatile PasswordReset passwordReset = null;
+    /**
+     * FIXME - Kludge to get context path into template methods *
+     */
+    private String currentContextPath;
 
     public UserDomainObject() {
     }
@@ -54,72 +83,22 @@ public UserDomainObject(int id) {
 
     private RoleIds createRolesSetWithUserRole() {
         RoleIds newRoleIds = new RoleIds();
-        newRoleIds.add( RoleId.USERS );
+        newRoleIds.add(RoleId.USERS);
         return newRoleIds;
     }
 
-    public Object clone() {
+    @Override
+    public UserDomainObject clone() {
         try {
             UserDomainObject clone = (UserDomainObject) super.clone();
             clone.roleIds = (RoleIds) roleIds.clone();
             clone.userAdminRoleIds = (RoleIds) userAdminRoleIds.clone();
             clone.phoneNumbers = (HashSet) phoneNumbers.clone();
             return clone;
-        } catch ( CloneNotSupportedException e ) {
+        } catch (CloneNotSupportedException e) {
             throw new UnhandledException(e);
         }
     }
-
-    /**
-     * FIXME - Kludge to get context path into template methods *
-     */
-    private String currentContextPath;
-
-    /**
-     * get user-id
-     */
-    public int getId() {
-        return id;
-    }
-
-    /**
-     * set user-id
-     */
-    public void setId( int id ) {
-        this.id = id;
-    }
-
-    /**
-     * get login name (username)
-     */
-    public String getLoginName() {
-        return loginName;
-    }
-
-    /**
-     * set login name (username)
-     */
-    public void setLoginName( String loginName ) {
-        this.loginName = loginName;
-    }
-
-    /**
-     * get password
-     */
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * set password
-     */
-    public void setPassword( String password ) {
-        this.password = password;
-    }
-
-    /**
-     * get full name
-     */
     public String getFullName() {
         return getFirstName() + " " + getLastName();
     }
@@ -134,7 +113,7 @@ public String getFirstName() {
     /**
      * set first name
      */
-    public void setFirstName( String firstName ) {
+    public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
@@ -148,17 +127,10 @@ public String getLastName() {
     /**
      * set last name
      */
-    public void setLastName( String lastName ) {
+    public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
-    /**
-     * set title
-     */
-    public void setTitle( String title ) {
-        this.title = title;
-    }
-
     /**
      * get title
      */
@@ -167,10 +139,10 @@ public String getTitle() {
     }
 
     /**
-     * set company
+     * set title
      */
-    public void setCompany( String company ) {
-        this.company = company;
+    public void setTitle(String title) {
+        this.title = title;
     }
 
     /**
@@ -181,10 +153,10 @@ public String getCompany() {
     }
 
     /**
-     * set address
+     * set company
      */
-    public void setAddress( String address ) {
-        this.address = address;
+    public void setCompany(String company) {
+        this.company = company;
     }
 
     /**
@@ -195,10 +167,10 @@ public String getAddress() {
     }
 
     /**
-     * set city
+     * set address
      */
-    public void setCity( String city ) {
-        this.city = city;
+    public void setAddress(String address) {
+        this.address = address;
     }
 
     /**
@@ -209,10 +181,10 @@ public String getCity() {
     }
 
     /**
-     * set zip
+     * set city
      */
-    public void setZip( String zip ) {
-        this.zip = zip;
+    public void setCity(String city) {
+        this.city = city;
     }
 
     /**
@@ -223,10 +195,10 @@ public String getZip() {
     }
 
     /**
-     * set country
+     * set zip
      */
-    public void setCountry( String country ) {
-        this.country = country;
+    public void setZip(String zip) {
+        this.zip = zip;
     }
 
     /**
@@ -236,14 +208,21 @@ public String getCountry() {
         return country;
     }
 
-    public void setProvince( String province ) {
-        this.province = province;
+    /**
+     * set country
+     */
+    public void setCountry(String country) {
+        this.country = country;
     }
 
     public String getProvince() {
         return province;
     }
 
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
     /**
      * Return the users e-mail address
      */
@@ -254,21 +233,31 @@ public String getEmailAddress() {
     /**
      * Set the users e-mail address
      */
-    public void setEmailAddress( String emailAddress ) {
+    public void setEmailAddress(String emailAddress) {
         this.emailAddress = emailAddress;
     }
 
     /**
      * Get the users workphone
+     *
      * @deprecated
      */
     public String getWorkPhone() {
         return getFirstPhoneNumberOfTypeAsString(PhoneNumberType.WORK);
     }
 
-    private String getFirstPhoneNumberOfTypeAsString(PhoneNumberType phoneNumberType) {
+    /**
+     * Set the users workphone
+     *
+     * @deprecated Use {@link #addPhoneNumber(PhoneNumber)}
+     */
+    public void setWorkPhone(String workPhone) {
+        replacePhoneNumbersOfType(workPhone, PhoneNumberType.WORK);
+    }
+
+    public String getFirstPhoneNumberOfTypeAsString(PhoneNumberType phoneNumberType) {
         PhoneNumber firstPhoneNumberOfType = getFirstPhoneNumberOfType(phoneNumberType);
-        String number = null ;
+        String number = null;
         if (null != firstPhoneNumberOfType) {
             number = firstPhoneNumberOfType.getNumber();
         }
@@ -277,28 +266,20 @@ private String getFirstPhoneNumberOfTypeAsString(PhoneNumberType phoneNumberType
 
     private PhoneNumber getFirstPhoneNumberOfType(PhoneNumberType phoneNumberType) {
         Collection phoneNumbersOfType = getPhoneNumbersOfType(phoneNumberType);
-        Iterator iterator = phoneNumbersOfType.iterator() ;
+        Iterator iterator = phoneNumbersOfType.iterator();
         if (iterator.hasNext()) {
-            return (PhoneNumber) iterator.next() ;
+            return (PhoneNumber) iterator.next();
         }
-        return null ;
+        return null;
     }
 
     public Set getPhoneNumbersOfType(final PhoneNumberType phoneNumberType) {
         return new HashSet(CollectionUtils.select(phoneNumbers, new PhoneNumberOfTypePredicate(phoneNumberType)));
     }
 
-    /**
-     * Set the users workphone
-     * @deprecated Use {@link #addPhoneNumber(PhoneNumber)}
-     */
-    public void setWorkPhone( String workphone ) {
-        replacePhoneNumbersOfType(workphone, PhoneNumberType.WORK);
-    }
-
     public void replacePhoneNumbersOfType(String number, PhoneNumberType type) {
         removePhoneNumbersOfType(type);
-        addPhoneNumber( new PhoneNumber(number, type));
+        addPhoneNumber(new PhoneNumber(number, type));
     }
 
     private void removePhoneNumbersOfType(PhoneNumberType phoneNumberType) {
@@ -307,22 +288,25 @@ private void removePhoneNumbersOfType(PhoneNumberType phoneNumberType) {
 
     /**
      * Get the users mobilephone
+     *
      * @deprecated Use {@link #getPhoneNumbersOfType(PhoneNumberType)}
      */
     public String getMobilePhone() {
-        return getFirstPhoneNumberOfTypeAsString(PhoneNumberType.MOBILE) ;
+        return getFirstPhoneNumberOfTypeAsString(PhoneNumberType.MOBILE);
     }
 
     /**
      * Set the users mobilephone
+     *
      * @deprecated Use {@link #addPhoneNumber(PhoneNumber)}
      */
-    public void setMobilePhone( String mobilephone ) {
-        replacePhoneNumbersOfType(mobilephone, PhoneNumberType.MOBILE);
+    public void setMobilePhone(String mobilePhone) {
+        replacePhoneNumbersOfType(mobilePhone, PhoneNumberType.MOBILE);
     }
 
     /**
      * Get the users homephone
+     *
      * @deprecated Use {@link #getPhoneNumbersOfType(PhoneNumberType)}
      */
     public String getHomePhone() {
@@ -331,14 +315,16 @@ public String getHomePhone() {
 
     /**
      * Set the users homephone
+     *
      * @deprecated Use {@link #addPhoneNumber(PhoneNumber)}
      */
-    public void setHomePhone( String homephone ) {
-        replacePhoneNumbersOfType(homephone, PhoneNumberType.HOME);
+    public void setHomePhone(String homePhone) {
+        replacePhoneNumbersOfType(homePhone, PhoneNumberType.HOME);
     }
 
     /**
      * Get the users faxphone
+     *
      * @deprecated Use {@link #getPhoneNumbersOfType(PhoneNumberType)}
      */
     public String getFaxPhone() {
@@ -347,14 +333,16 @@ public String getFaxPhone() {
 
     /**
      * Set the users faxpohne
+     *
      * @deprecated Use {@link #addPhoneNumber(PhoneNumber)}
      */
-    public void setFaxPhone( String faxphone ) {
-        replacePhoneNumbersOfType(faxphone, PhoneNumberType.FAX);
+    public void setFaxPhone(String faxPhone) {
+        replacePhoneNumbersOfType(faxPhone, PhoneNumberType.FAX);
     }
 
     /**
      * Get the users otherphone
+     *
      * @deprecated Use {@link #getPhoneNumbersOfType(PhoneNumberType)}
      */
     public String getOtherPhone() {
@@ -363,17 +351,11 @@ public String getOtherPhone() {
 
     /**
      * Set the users otherpohne
+     *
      * @deprecated Use {@link #addPhoneNumber(PhoneNumber)}
      */
-    public void setOtherPhone( String otherphone ) {
-        replacePhoneNumbersOfType(otherphone, PhoneNumberType.OTHER);
-    }
-
-    /**
-     * Set whether the user is allowed to log in
-     */
-    public void setActive( boolean active ) {
-        this.active = active;
+    public void setOtherPhone(String otherPhone) {
+        replacePhoneNumbersOfType(otherPhone, PhoneNumberType.OTHER);
     }
 
     /**
@@ -384,25 +366,26 @@ public boolean isActive() {
     }
 
     /**
-     * set create_date
-     * @param createDate
+     * Set whether the user is allowed to log in
      */
-    public void setCreateDate( Date createDate ) {
-        this.createDate = (Date) createDate.clone();
+    public void setActive(boolean active) {
+        this.active = active;
     }
 
     /**
      * get create_date
      */
     public Date getCreateDate() {
-        return (Date) ( null == createDate ? null : createDate.clone() ) ;
+        return (Date) (null == createDate ? null : createDate.clone());
     }
 
     /**
-     * set template group
+     * set create_date
+     *
+     * @param createDate
      */
-    public void setTemplateGroup( TemplateGroupDomainObject templateGroup ) {
-        this.templateGroup = templateGroup;
+    public void setCreateDate(Date createDate) {
+        this.createDate = (Date) createDate.clone();
     }
 
     /**
@@ -412,6 +395,13 @@ public TemplateGroupDomainObject getTemplateGroup() {
         return templateGroup;
     }
 
+    /**
+     * set template group
+     */
+    public void setTemplateGroup(TemplateGroupDomainObject templateGroup) {
+        this.templateGroup = templateGroup;
+    }
+
     /**
      * Return the users language
      */
@@ -422,7 +412,7 @@ public String getLanguageIso639_2() {
     /**
      * Set the users language
      */
-    public void setLanguageIso639_2( String languageIso639_2 ) {
+    public void setLanguageIso639_2(String languageIso639_2) {
         this.languageIso639_2 = languageIso639_2;
     }
 
@@ -433,49 +423,55 @@ public String getSessionId() {
     public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
-    
+
+    public String getRememberCd() {
+        return rememberCd;
+    }
+
+    public void setRememberCd(String rememberCd) {
+        this.rememberCd = rememberCd;
+    }
+
     public boolean isImcmsExternal() {
         return imcmsExternal;
     }
 
-    public void setImcmsExternal( boolean imcmsExternal ) {
+    public void setImcmsExternal(boolean imcmsExternal) {
         this.imcmsExternal = imcmsExternal;
     }
 
-    public void addRoleId( RoleId role ) {
-        roleIds.add( role );
+    public void addRoleId(RoleId role) {
+        roleIds.add(role);
     }
 
-    public void removeRoleId( RoleId roleId ) {
-        if ( !RoleId.USERS.equals( roleId ) ) {
-            roleIds.remove( roleId );
+    public void removeRoleId(RoleId roleId) {
+        if (!RoleId.USERS.equals(roleId)) {
+            roleIds.remove(roleId);
         }
     }
 
-    public void setRoleIds( RoleId[] roleIds ) {
-        this.roleIds = new RoleIds(roleIds) ;
-        this.roleIds.add( RoleId.USERS );
+    public boolean hasRoleId(RoleId roleId) {
+        return roleIds.contains(roleId);
     }
 
-
-
-    public boolean hasRoleId( RoleId roleId ) {
-        return roleIds.contains( roleId );
+    public RoleId[] getRoleIds() {
+        return roleIds.toArray();
     }
 
-    public RoleId[] getRoleIds() {
-        return roleIds.toArray() ;
+    public void setRoleIds(RoleId[] roleIds) {
+        this.roleIds = new RoleIds(roleIds);
+        this.roleIds.add(RoleId.USERS);
     }
 
-    public boolean equals( Object o ) {
-        if ( this == o ) {
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if ( !( o instanceof UserDomainObject ) ) {
+        if (!(o instanceof UserDomainObject)) {
             return false;
         }
 
-        final UserDomainObject userDomainObject = (UserDomainObject)o;
+        final UserDomainObject userDomainObject = (UserDomainObject) o;
 
         return id == userDomainObject.id;
 
@@ -490,42 +486,42 @@ public boolean isDefaultUser() {
     }
 
     public boolean isSuperAdmin() {
-        return hasRoleId( RoleId.SUPERADMIN );
+        return hasRoleId(RoleId.SUPERADMIN);
     }
 
     public boolean isUserAdminAndCanEditAtLeastOneRole() {
-        return isUserAdmin() && !userAdminRoleIds.isEmpty() ;
+        return isUserAdmin() && !userAdminRoleIds.isEmpty();
     }
 
-    public boolean canEdit( DocumentDomainObject document ) {
-        return hasAtLeastPermissionSetIdOn( DocumentPermissionSetTypeDomainObject.RESTRICTED_2, document );
+    public boolean canEdit(DocumentDomainObject document) {
+        return hasAtLeastPermissionSetIdOn(DocumentPermissionSetTypeDomainObject.RESTRICTED_2, document);
     }
 
-    public boolean canAccess( DocumentDomainObject document ) {
-        return hasAtLeastPermissionSetIdOn( DocumentPermissionSetTypeDomainObject.READ, document );
+    public boolean canAccess(DocumentDomainObject document) {
+        return hasAtLeastPermissionSetIdOn(DocumentPermissionSetTypeDomainObject.READ, document);
     }
 
-    public boolean isSuperAdminOrHasFullPermissionOn( DocumentDomainObject document ) {
-        return isSuperAdminOrHasAtLeastPermissionSetIdOn( DocumentPermissionSetTypeDomainObject.FULL, document );
+    public boolean isSuperAdminOrHasFullPermissionOn(DocumentDomainObject document) {
+        return isSuperAdminOrHasAtLeastPermissionSetIdOn(DocumentPermissionSetTypeDomainObject.FULL, document);
     }
 
-    public boolean canDefineRestrictedOneFor( DocumentDomainObject document ) {
-        return isSuperAdminOrHasFullPermissionOn( document );
+    public boolean canDefineRestrictedOneFor(DocumentDomainObject document) {
+        return isSuperAdminOrHasFullPermissionOn(document);
     }
 
-    public boolean canDefineRestrictedTwoFor( DocumentDomainObject document ) {
-        boolean hasFullPermission = isSuperAdminOrHasFullPermissionOn( document );
-        boolean canEditPermissionsForDocument = canEditPermissionsFor( document );
-        boolean hasAtLeastRestrictedOne = hasAtLeastRestrictedOnePermissionOn( document );
+    public boolean canDefineRestrictedTwoFor(DocumentDomainObject document) {
+        boolean hasFullPermission = isSuperAdminOrHasFullPermissionOn(document);
+        boolean canEditPermissionsForDocument = canEditPermissionsFor(document);
+        boolean hasAtLeastRestrictedOne = hasAtLeastRestrictedOnePermissionOn(document);
         boolean hasAtLeastRestrictedOnePermissionAndIsMorePrivilegedThanRestrictedTwo = hasAtLeastRestrictedOne
-                                                                                        && document.isRestrictedOneMorePrivilegedThanRestrictedTwo();
+                && document.isRestrictedOneMorePrivilegedThanRestrictedTwo();
         return hasFullPermission
-               || canEditPermissionsForDocument
-                  && hasAtLeastRestrictedOnePermissionAndIsMorePrivilegedThanRestrictedTwo;
+                || canEditPermissionsForDocument
+                && hasAtLeastRestrictedOnePermissionAndIsMorePrivilegedThanRestrictedTwo;
     }
 
-    private boolean hasAtLeastRestrictedOnePermissionOn( DocumentDomainObject document ) {
-        return hasAtLeastPermissionSetIdOn( DocumentPermissionSetTypeDomainObject.RESTRICTED_1, document );
+    private boolean hasAtLeastRestrictedOnePermissionOn(DocumentDomainObject document) {
+        return hasAtLeastPermissionSetIdOn(DocumentPermissionSetTypeDomainObject.RESTRICTED_1, document);
     }
 
     public String toString() {
@@ -533,87 +529,87 @@ public String toString() {
     }
 
     public void addPhoneNumber(PhoneNumber number) {
-        phoneNumbers.add(number) ;
+        phoneNumbers.add(number);
     }
 
     public void removePhoneNumber(PhoneNumber number) {
         phoneNumbers.remove(number);
     }
 
-    /* FIXME: Current context path should be sent in a HttpServletRequest, not in an UserDomainObject. */
-    public void setCurrentContextPath( String currentContextPath ) {
-        this.currentContextPath = currentContextPath;
-    }
-
     public String getCurrentContextPath() {
         return currentContextPath;
     }
 
-    public boolean isSuperAdminOrHasAtLeastPermissionSetIdOn( DocumentPermissionSetTypeDomainObject documentPermissionSetType, DocumentDomainObject document ) {
-        return isSuperAdmin() || hasAtLeastPermissionSetIdOn( documentPermissionSetType, document );
+    /* FIXME: Current context path should be sent in a HttpServletRequest, not in an UserDomainObject. */
+    public void setCurrentContextPath(String currentContextPath) {
+        this.currentContextPath = currentContextPath;
     }
 
-    public boolean canEditPermissionsFor( DocumentDomainObject document ) {
-        return getPermissionSetFor( document ).getEditPermissions();
+    public boolean isSuperAdminOrHasAtLeastPermissionSetIdOn(DocumentPermissionSetTypeDomainObject documentPermissionSetType, DocumentDomainObject document) {
+        return isSuperAdmin() || hasAtLeastPermissionSetIdOn(documentPermissionSetType, document);
     }
 
-    public boolean canSetDocumentPermissionSetTypeForRoleIdOnDocument( DocumentPermissionSetTypeDomainObject documentPermissionSetType, RoleId roleId,
-                                                                       DocumentDomainObject document ) {
-        if ( !canEditPermissionsFor( document ) ) {
+    public boolean canEditPermissionsFor(DocumentDomainObject document) {
+        return getPermissionSetFor(document).getEditPermissions();
+    }
+
+    public boolean canSetDocumentPermissionSetTypeForRoleIdOnDocument(DocumentPermissionSetTypeDomainObject documentPermissionSetType, RoleId roleId,
+                                                                      DocumentDomainObject document) {
+        if (!canEditPermissionsFor(document)) {
             return false;
         }
-        DocumentPermissionSetTypeDomainObject currentPermissionSetType = document.getDocumentPermissionSetTypeForRoleId( roleId );
-        boolean userIsSuperAdminOrHasAtLeastTheCurrentPermissionSet = isSuperAdminOrHasAtLeastPermissionSetIdOn( currentPermissionSetType, document );
-        boolean userIsSuperAdminOrHasAtLeastTheWantedPermissionSet = isSuperAdminOrHasAtLeastPermissionSetIdOn( documentPermissionSetType, document );
-        boolean userHasAtLeastRestrictedOne = hasAtLeastRestrictedOnePermissionOn( document );
+        DocumentPermissionSetTypeDomainObject currentPermissionSetType = document.getDocumentPermissionSetTypeForRoleId(roleId);
+        boolean userIsSuperAdminOrHasAtLeastTheCurrentPermissionSet = isSuperAdminOrHasAtLeastPermissionSetIdOn(currentPermissionSetType, document);
+        boolean userIsSuperAdminOrHasAtLeastTheWantedPermissionSet = isSuperAdminOrHasAtLeastPermissionSetIdOn(documentPermissionSetType, document);
+        boolean userHasAtLeastRestrictedOne = hasAtLeastRestrictedOnePermissionOn(document);
         boolean changingRestrictedTwo = DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(documentPermissionSetType)
-                                        || DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(currentPermissionSetType);
-        boolean canDefineRestrictedTwoForDocument = canDefineRestrictedTwoFor( document );
+                || DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(currentPermissionSetType);
+        boolean canDefineRestrictedTwoForDocument = canDefineRestrictedTwoFor(document);
 
         return userIsSuperAdminOrHasAtLeastTheWantedPermissionSet
-               && userIsSuperAdminOrHasAtLeastTheCurrentPermissionSet
-               && ( !changingRestrictedTwo || !userHasAtLeastRestrictedOne
-                    || canDefineRestrictedTwoForDocument );
+                && userIsSuperAdminOrHasAtLeastTheCurrentPermissionSet
+                && (!changingRestrictedTwo || !userHasAtLeastRestrictedOne
+                || canDefineRestrictedTwoForDocument);
 
     }
 
-    public boolean canCreateDocumentOfTypeIdFromParent( int documentTypeId, DocumentDomainObject parent ) {
-        TextDocumentPermissionSetDomainObject documentPermissionSet = (TextDocumentPermissionSetDomainObject)getPermissionSetFor( parent );
+    public boolean canCreateDocumentOfTypeIdFromParent(int documentTypeId, DocumentDomainObject parent) {
+        TextDocumentPermissionSetDomainObject documentPermissionSet = (TextDocumentPermissionSetDomainObject) getPermissionSetFor(parent);
         Set allowedDocumentTypeIds = documentPermissionSet.getAllowedDocumentTypeIds();
-        return allowedDocumentTypeIds.contains(new Integer(documentTypeId) );
+        return allowedDocumentTypeIds.contains(documentTypeId);
     }
 
-    public DocumentPermissionSetDomainObject getPermissionSetFor( DocumentDomainObject document ) {
-        DocumentPermissionSetTypeDomainObject permissionSetId = getDocumentPermissionSetTypeFor( document );
-        if ( DocumentPermissionSetTypeDomainObject.FULL.equals(permissionSetId) ) {
+    public DocumentPermissionSetDomainObject getPermissionSetFor(DocumentDomainObject document) {
+        DocumentPermissionSetTypeDomainObject permissionSetId = getDocumentPermissionSetTypeFor(document);
+        if (DocumentPermissionSetTypeDomainObject.FULL.equals(permissionSetId)) {
             return DocumentPermissionSetDomainObject.FULL;
-        } else if ( DocumentPermissionSetTypeDomainObject.READ.equals(permissionSetId) ) {
+        } else if (DocumentPermissionSetTypeDomainObject.READ.equals(permissionSetId)) {
             return DocumentPermissionSetDomainObject.READ;
-        } else if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(permissionSetId) ) {
+        } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_1.equals(permissionSetId)) {
             return document.getPermissionSets().getRestricted1();
-        } else if ( DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(permissionSetId) ) {
+        } else if (DocumentPermissionSetTypeDomainObject.RESTRICTED_2.equals(permissionSetId)) {
             return document.getPermissionSets().getRestricted2();
         } else {
             return DocumentPermissionSetDomainObject.NONE;
         }
     }
 
-    public DocumentPermissionSetTypeDomainObject getDocumentPermissionSetTypeFor( DocumentDomainObject document ) {
-        if ( null == document ) {
+    public DocumentPermissionSetTypeDomainObject getDocumentPermissionSetTypeFor(DocumentDomainObject document) {
+        if (null == document) {
             return DocumentPermissionSetTypeDomainObject.NONE;
         }
-        if ( isSuperAdmin() ) {
+        if (isSuperAdmin()) {
             return DocumentPermissionSetTypeDomainObject.FULL;
         }
-        RoleIdToDocumentPermissionSetTypeMappings roleIdsMappedToDocumentPermissionSetTypes = document.getRoleIdsMappedToDocumentPermissionSetTypes() ;
+        RoleIdToDocumentPermissionSetTypeMappings roleIdsMappedToDocumentPermissionSetTypes = document.getRoleIdsMappedToDocumentPermissionSetTypes();
         RoleId[] usersRoleIds = getRoleIds();
         DocumentPermissionSetTypeDomainObject mostPrivilegedPermissionSetIdFoundYet = DocumentPermissionSetTypeDomainObject.NONE;
-        for ( int i = 0; i < usersRoleIds.length; i++ ) {
+        for (int i = 0; i < usersRoleIds.length; i++) {
             RoleId roleId = usersRoleIds[i];
-            DocumentPermissionSetTypeDomainObject documentPermissionSetType = roleIdsMappedToDocumentPermissionSetTypes.getPermissionSetTypeForRole( roleId );
-            if ( documentPermissionSetType.isMorePrivilegedThan(mostPrivilegedPermissionSetIdFoundYet) ) {
-                mostPrivilegedPermissionSetIdFoundYet = documentPermissionSetType ;
-                if ( DocumentPermissionSetTypeDomainObject.FULL.equals(mostPrivilegedPermissionSetIdFoundYet) ) {
+            DocumentPermissionSetTypeDomainObject documentPermissionSetType = roleIdsMappedToDocumentPermissionSetTypes.getPermissionSetTypeForRole(roleId);
+            if (documentPermissionSetType.isMorePrivilegedThan(mostPrivilegedPermissionSetIdFoundYet)) {
+                mostPrivilegedPermissionSetIdFoundYet = documentPermissionSetType;
+                if (DocumentPermissionSetTypeDomainObject.FULL.equals(mostPrivilegedPermissionSetIdFoundYet)) {
                     break;
                 }
             }
@@ -621,64 +617,56 @@ public DocumentPermissionSetTypeDomainObject getDocumentPermissionSetTypeFor( Do
         return mostPrivilegedPermissionSetIdFoundYet;
     }
 
-    public boolean hasAtLeastPermissionSetIdOn( DocumentPermissionSetTypeDomainObject leastPrivilegedPermissionSetIdWanted,
-                                                DocumentDomainObject document ) {
+    public boolean hasAtLeastPermissionSetIdOn(DocumentPermissionSetTypeDomainObject leastPrivilegedPermissionSetIdWanted,
+                                               DocumentDomainObject document) {
         DocumentPermissionSetTypeDomainObject usersDocumentPermissionSetType = getDocumentPermissionSetTypeFor(document);
         return usersDocumentPermissionSetType.isAtLeastAsPrivilegedAs(leastPrivilegedPermissionSetIdWanted);
     }
 
-    public boolean canAddDocumentToAnyMenu( DocumentDomainObject document ) {
+    public boolean canAddDocumentToAnyMenu(DocumentDomainObject document) {
         if (null == document) {
-            return false ;
+            return false;
         }
         boolean canEdit = canEdit(document);
         boolean linkableByOtherUsers = document.isLinkableByOtherUsers();
         return canEdit || linkableByOtherUsers;
     }
 
-    public boolean canSearchFor( DocumentDomainObject document ) {
-        boolean canSearchForDocument = false;
-        if ( document.isSearchDisabled() ) {
-            if ( isSuperAdmin() ) {
-                canSearchForDocument = true;
-            }
-        } else {
-            if ( document.isPublished() ) {
-                canSearchForDocument = document.isLinkedForUnauthorizedUsers() || canAccess( document );
-            } else {
-                canSearchForDocument = canEdit( document );
-            }
-        }
-        return canSearchForDocument;
+    public boolean canSearchFor(DocumentDomainObject document) {
+        return
+                isSuperAdmin()
+                        || (!document.isSearchDisabled()
+                        && (canEdit(document)
+                        || (document.isPublished() && (document.isLinkedForUnauthorizedUsers() || canAccess(document)))));
     }
 
-    public boolean canEditDocumentInformationFor( DocumentDomainObject document ) {
-        return getPermissionSetFor( document ).getEditDocumentInformation();
+    public boolean canEditDocumentInformationFor(DocumentDomainObject document) {
+        return getPermissionSetFor(document).getEditDocumentInformation();
     }
 
     public boolean canAccessAdminPages() {
         RolePermissionDomainObject rolePermissionToAccessAdminPages = RoleDomainObject.ADMIN_PAGES_PERMISSION;
-        return isSuperAdmin() || isUserAdminAndCanEditAtLeastOneRole() || hasRoleWithPermission( rolePermissionToAccessAdminPages );
+        return isSuperAdmin() || isUserAdminAndCanEditAtLeastOneRole() || hasRoleWithPermission(rolePermissionToAccessAdminPages);
     }
 
-    public boolean hasRoleWithPermission( RolePermissionDomainObject rolePermission ) {
+    public boolean hasRoleWithPermission(RolePermissionDomainObject rolePermission) {
         ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
         RoleId[] roleReferencesArray = roleIds.toArray();
-        for ( int i = 0; i < roleReferencesArray.length; i++ ) {
+        for (int i = 0; i < roleReferencesArray.length; i++) {
             RoleId roleId = roleReferencesArray[i];
-            if ( imcmsAuthenticatorAndUserAndRoleMapper.getRole(roleId).hasPermission( rolePermission ) ) {
+            if (imcmsAuthenticatorAndUserAndRoleMapper.getRole(roleId).hasPermission(rolePermission)) {
                 return true;
             }
         }
         return false;
     }
 
-    public boolean canSeeDocumentInMenus( DocumentDomainObject document ) {
-        return document.isActive() && canSeeDocumentWhenEditingMenus( document );
+    public boolean canSeeDocumentInMenus(DocumentDomainObject document) {
+        return document.isActive() && canSeeDocumentWhenEditingMenus(document);
     }
 
-    public boolean canSeeDocumentWhenEditingMenus( DocumentDomainObject document ) {
-        return document.isLinkedForUnauthorizedUsers() || canAccess( document );
+    public boolean canSeeDocumentWhenEditingMenus(DocumentDomainObject document) {
+        return document.isLinkedForUnauthorizedUsers() || canAccess(document);
     }
 
     public Set getPhoneNumbers() {
@@ -694,23 +682,23 @@ public void setUserAdminRolesIds(RoleId[] userAdminRoleReferences) {
     }
 
     public boolean isUserAdminAndNotSuperAdmin() {
-        return isUserAdmin() && !isSuperAdmin() ;
+        return isUserAdmin() && !isSuperAdmin();
     }
 
     public boolean canEditRolesFor(UserDomainObject editedUser) {
-        return isSuperAdmin() || canEditAsUserAdmin(editedUser) && !equals(editedUser) ;
+        return isSuperAdmin() || canEditAsUserAdmin(editedUser) && !equals(editedUser);
     }
 
     public void removeUserAdminRoleId(RoleId role) {
-        userAdminRoleIds.remove(role) ;
+        userAdminRoleIds.remove(role);
     }
 
     public boolean canEdit(UserDomainObject editedUser) {
-        return equals(editedUser) || isSuperAdmin() || canEditAsUserAdmin(editedUser) ;
+        return equals(editedUser) || isSuperAdmin() || canEditAsUserAdmin(editedUser);
     }
 
     public boolean canEditAsUserAdmin(UserDomainObject editedUser) {
-        return isUserAdminAndNotSuperAdmin() && (editedUser.isNew() || canEditRolesAccordingToUserAdminRoles(editedUser) ) ;
+        return isUserAdminAndNotSuperAdmin() && (editedUser.isNew() || canEditRolesAccordingToUserAdminRoles(editedUser));
     }
 
     public boolean canEditRolesAccordingToUserAdminRoles(UserDomainObject editedUser) {
@@ -718,13 +706,113 @@ public boolean canEditRolesAccordingToUserAdminRoles(UserDomainObject editedUser
     }
 
     public boolean isUserAdmin() {
-        return hasRoleId( RoleId.USERADMIN ) ;
+        return hasRoleId(RoleId.USERADMIN);
     }
 
     public boolean isNew() {
         return 0 == id;
     }
 
+    public boolean isPasswordEncrypted() {
+        return passwordType == PasswordType.ENCRYPTED;
+    }
+
+    public PasswordReset getPasswordReset() {
+        return passwordReset;
+    }
+
+    public boolean hasPasswordReset() {
+        return passwordReset != null;
+    }
+
+    /**
+     * Returns password.
+     * The password might be a plain text or encrypted.
+     * Use {@link #isPasswordEncrypted()} to test if password is encrypted.
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Assign a new unencrypted password to the user and clears password reset (if present).
+     *
+     * @param password plain text password.
+     * @see #setPassword(String, PasswordType)
+     */
+    public void setPassword(String password) {
+        setPassword(password, PasswordType.UNENCRYPTED);
+        this.passwordReset = null;
+    }
+
+    /**
+     * @since 4.0.7
+     */
+    void setPassword(String password, PasswordType passwordType) {
+        this.password = password;
+        this.passwordType = passwordType;
+    }
+
+    /**
+     * @since 4.0.7
+     */
+    void setPasswordReset(String resetId, long time) {
+        this.passwordReset = new PasswordReset(resetId, time);
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // The following package private methods are used internally by ImcmsAuthenticatorAndUserAndRoleMapper
+    //------------------------------------------------------------------------------------------------------------------
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
+
+    public Date getLastLoginDate() {
+        return lastLogin;
+    }
+
+    public void setLastLoginDate(Date lastLoginDate) {
+        this.lastLogin = lastLoginDate;
+    }
+
+    /**
+     * @since 4.0.7
+     */
+    enum PasswordType {
+        UNENCRYPTED, ENCRYPTED
+    }
+
+    /**
+     * @since 4.0.7
+     */
+    public static final class PasswordReset {
+        private final String id;
+        private final long time;
+
+        private PasswordReset(String id, long time) {
+            this.id = id;
+            this.time = time;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public long getTime() {
+            return time;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("User.PasswordReset(id=%s, time=%s)", id, time);
+        }
+    }
+
     private static class PhoneNumberOfTypePredicate implements Predicate {
         private final PhoneNumberType phoneNumberType;
 
@@ -733,8 +821,8 @@ private static class PhoneNumberOfTypePredicate implements Predicate {
         }
 
         public boolean evaluate(Object object) {
-            PhoneNumber phoneNumber = (PhoneNumber) object ;
-            return phoneNumber.getType().equals(phoneNumberType) ;
+            PhoneNumber phoneNumber = (PhoneNumber) object;
+            return phoneNumber.getType().equals(phoneNumberType);
         }
     }
 }
diff --git a/server/src/imcode/server/user/ldap/MappedRole.java b/server/src/imcode/server/user/ldap/MappedRole.java
new file mode 100644
index 0000000000..e3789852ae
--- /dev/null
+++ b/server/src/imcode/server/user/ldap/MappedRole.java
@@ -0,0 +1,59 @@
+package imcode.server.user.ldap;
+
+public abstract class MappedRole {
+
+    private final String role;
+
+    private MappedRole(String role) {
+        this.role = role;
+    }
+
+    public String role() {
+        return role;
+    }
+
+    public static final class RoleToAttribute extends MappedRole {
+        protected final String attributeName;
+        protected final String attributeValue;
+
+        public RoleToAttribute(String role, String attributeName, String attributeValue) {
+            super(role);
+            this.attributeName = attributeName;
+            this.attributeValue = attributeValue;
+        }
+
+        public String attributeName() {
+            return attributeName;
+        }
+
+        public String attributeValue() {
+            return attributeValue;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("MappedRole.RoleToAttribute{" +
+                    "role='%s', " +
+                    "attributeName='%s', " +
+                    "attributeValue='%s'}", role(), attributeName(), attributeValue());
+        }
+    }
+
+    public static final class RoleToAdGroup extends MappedRole {
+        private final String group;
+
+        public RoleToAdGroup(String role, String group) {
+            super(role);
+            this.group = group;
+        }
+
+        public String group() {
+            return group;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("MappedRole.RoleToAdGroup{role='%s', group='%s'}", role(), group());
+        }
+    }
+}
\ No newline at end of file
diff --git a/server/src/imcode/server/user/ldap/MappedRoles.java b/server/src/imcode/server/user/ldap/MappedRoles.java
new file mode 100644
index 0000000000..3ae4cebd45
--- /dev/null
+++ b/server/src/imcode/server/user/ldap/MappedRoles.java
@@ -0,0 +1,128 @@
+package imcode.server.user.ldap;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableTable;
+import com.google.common.collect.Table;
+import com.imcode.imcms.api.P;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public class MappedRoles {
+
+    private final RolesToAdGroups rolesToAdGroups;
+    private final RolesToAttributes rolesToAttributes;
+
+    public MappedRoles(Collection<MappedRole.RoleToAttribute> rolesToAttributesColl,
+                       Collection<MappedRole.RoleToAdGroup> rolesToAdGroupsColl) {
+
+        this.rolesToAttributes = new RolesToAttributes(rolesToAttributesColl);
+        this.rolesToAdGroups = new RolesToAdGroups(rolesToAdGroupsColl);
+    }
+
+
+    public Set<String> roles() {
+        ImmutableSet.Builder<String> rolesBuilder = ImmutableSet.builder();
+
+        rolesBuilder.addAll(rolesToAdGroups.roles());
+        rolesBuilder.addAll(rolesToAttributes.roles());
+
+        return rolesBuilder.build();
+    }
+
+    public RolesToAdGroups rolesToAdGroups() {
+        return rolesToAdGroups;
+    }
+
+    public RolesToAttributes rolesToAttributes() {
+        return rolesToAttributes;
+    }
+
+
+    public static class RolesToAttributes {
+        private final Set<String> roles;
+        private final Table<String, String, String> mappedRolesTable;
+
+        private RolesToAttributes(Collection<MappedRole.RoleToAttribute> rolesToAttributesColl) {
+            ImmutableTable.Builder<String, String, String> rolesTableBuilder = ImmutableTable.builder();
+            ImmutableSet.Builder<String> rolesBuilder = ImmutableSet.builder();
+
+            for (MappedRole.RoleToAttribute mr : rolesToAttributesColl) {
+                rolesBuilder.add(mr.role());
+                rolesTableBuilder.put(mr.attributeName(), mr.attributeValue(), mr.role());
+            }
+
+            this.roles = rolesBuilder.build();
+            this.mappedRolesTable = rolesTableBuilder.build();
+        }
+
+        public String role(String attributeName, String attributeValue) {
+            return mappedRolesTable.get(attributeName, attributeValue);
+        }
+
+        public Set<String> roles(List<P.P2<String, String>> attributesNameValuePairs) {
+            ImmutableSet.Builder<String> rolesBuilder = ImmutableSet.builder();
+
+            for (P.P2<String, String> nameAndValue : attributesNameValuePairs) {
+                String role = role(nameAndValue._1(), nameAndValue._2());
+                if (role != null) rolesBuilder.add(role);
+            }
+
+            return rolesBuilder.build();
+        }
+
+        public Set<String> roles() {
+            return roles;
+        }
+
+        public Set<String> attributesNames() {
+            return mappedRolesTable.rowKeySet();
+        }
+    }
+
+
+    public static class RolesToAdGroups {
+        private final Table<String, String, MappedRole.RoleToAdGroup> mappedRolesTable;
+
+        private RolesToAdGroups(Collection<MappedRole.RoleToAdGroup> rolesToAdGroupsColl) {
+            ImmutableTable.Builder<String, String, MappedRole.RoleToAdGroup> mappedRolesTableBuilder = ImmutableTable.builder();
+            ImmutableSet.Builder<String> groupsBuilder = ImmutableSet.builder();
+            ImmutableSet.Builder<String> rolesBuilder = ImmutableSet.builder();
+
+            for (MappedRole.RoleToAdGroup mr : rolesToAdGroupsColl) {
+                rolesBuilder.add(mr.role());
+                groupsBuilder.add(mr.group());
+
+                mappedRolesTableBuilder.put(mr.role(), mr.group(), mr);
+            }
+
+            this.mappedRolesTable = mappedRolesTableBuilder.build();
+        }
+
+        public Set<String> groups() {
+            return mappedRolesTable.columnKeySet();
+        }
+
+        public Set<String> roles() {
+            return mappedRolesTable.rowKeySet();
+        }
+
+        public Set<String> roles(Set<String> groups) {
+            ImmutableSet.Builder<String> rolesBuilder = ImmutableSet.builder();
+            ImmutableSet.Builder<String> lowerCasedGroupsBuilder = ImmutableSet.builder();
+
+            for (String group : groups) {
+                lowerCasedGroupsBuilder.add(group.toLowerCase());
+            }
+
+            Set<String> lowerCasedGroups = lowerCasedGroupsBuilder.build();
+
+            for (MappedRole.RoleToAdGroup mappedRole : mappedRolesTable.values()) {
+                if (lowerCasedGroups.contains(mappedRole.group())) rolesBuilder.add(mappedRole.role());
+            }
+
+            return rolesBuilder.build();
+        }
+    }
+}
\ No newline at end of file
diff --git a/server/src/imcode/server/user/ldap/jaxb/LdapElement.java b/server/src/imcode/server/user/ldap/jaxb/LdapElement.java
new file mode 100644
index 0000000000..3327b30d9a
--- /dev/null
+++ b/server/src/imcode/server/user/ldap/jaxb/LdapElement.java
@@ -0,0 +1,13 @@
+package imcode.server.user.ldap.jaxb;
+
+import javax.xml.bind.annotation.XmlElement;
+
+public class LdapElement {
+
+    @XmlElement(name = "mapped-roles", required = true)
+    private MappedRolesElement mappedRolesElement;
+
+    public MappedRolesElement mappedRolesElement() {
+        return mappedRolesElement;
+    }
+}
diff --git a/server/src/imcode/server/user/ldap/jaxb/MappedRolesElement.java b/server/src/imcode/server/user/ldap/jaxb/MappedRolesElement.java
new file mode 100644
index 0000000000..95a731a148
--- /dev/null
+++ b/server/src/imcode/server/user/ldap/jaxb/MappedRolesElement.java
@@ -0,0 +1,26 @@
+package imcode.server.user.ldap.jaxb;
+
+import javax.xml.bind.annotation.XmlElement;
+import java.util.Collections;
+import java.util.List;
+
+public class MappedRolesElement {
+
+    @XmlElement(name = "role-to-ad-group")
+    private List<RoleToAdGroupElement> rolesToAdGroupsElements;
+
+    @XmlElement(name = "role-to-attribute")
+    private List<RoleToAttributeElement> rolesToAttributesElements;
+
+    public List<RoleToAdGroupElement> rolesToAdGroupsElements() {
+        return rolesToAdGroupsElements != null
+                ? rolesToAdGroupsElements
+                : Collections.<RoleToAdGroupElement>emptyList();
+    }
+
+    public List<RoleToAttributeElement> rolesToAttributesElements() {
+        return rolesToAttributesElements != null
+                ? rolesToAttributesElements
+                : Collections.<RoleToAttributeElement>emptyList();
+    }
+}
diff --git a/server/src/imcode/server/user/ldap/jaxb/RoleToAdGroupElement.java b/server/src/imcode/server/user/ldap/jaxb/RoleToAdGroupElement.java
new file mode 100644
index 0000000000..94eda0eb7c
--- /dev/null
+++ b/server/src/imcode/server/user/ldap/jaxb/RoleToAdGroupElement.java
@@ -0,0 +1,25 @@
+package imcode.server.user.ldap.jaxb;
+
+import org.apache.commons.lang.StringUtils;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+/**
+ * Represents mapping of a Role to an Active Directory Group
+ */
+public class RoleToAdGroupElement {
+
+    @XmlAttribute(name = "role", required = true)
+    private String role;
+
+    @XmlAttribute(name = "group", required = false)
+    private String group;
+
+    public String role() {
+        return role.trim();
+    }
+
+    public String group() {
+        return StringUtils.defaultIfBlank(StringUtils.trimToNull(group), role()).toLowerCase();
+    }
+}
diff --git a/server/src/imcode/server/user/ldap/jaxb/RoleToAttributeElement.java b/server/src/imcode/server/user/ldap/jaxb/RoleToAttributeElement.java
new file mode 100644
index 0000000000..f5651c45e9
--- /dev/null
+++ b/server/src/imcode/server/user/ldap/jaxb/RoleToAttributeElement.java
@@ -0,0 +1,27 @@
+package imcode.server.user.ldap.jaxb;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+public class RoleToAttributeElement {
+
+    @XmlAttribute(name = "role", required = true)
+    private String role;
+
+    @XmlAttribute(name = "attribute-name", required = true)
+    private String attributeName;
+
+    @XmlAttribute(name = "attribute-value", required = true)
+    private String attributeValue;
+
+    public String attributeName() {
+        return attributeName.trim().toLowerCase();
+    }
+
+    public String attributeValue() {
+        return attributeValue.trim().toLowerCase();
+    }
+
+    public String role() {
+        return role.trim();
+    }
+}
diff --git a/server/src/imcode/server/user/ldap/jaxb/ServerElement.java b/server/src/imcode/server/user/ldap/jaxb/ServerElement.java
new file mode 100644
index 0000000000..450b509540
--- /dev/null
+++ b/server/src/imcode/server/user/ldap/jaxb/ServerElement.java
@@ -0,0 +1,15 @@
+package imcode.server.user.ldap.jaxb;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "server")
+public class ServerElement {
+
+    @XmlElement(name = "ldap", required = false)
+    private LdapElement ldapElement;
+
+    public LdapElement ldapElement() {
+        return ldapElement;
+    }
+}
diff --git a/server/src/imcode/server/user/saml2/FilterConfig.java b/server/src/imcode/server/user/saml2/FilterConfig.java
new file mode 100644
index 0000000000..80f879d070
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/FilterConfig.java
@@ -0,0 +1,102 @@
+package imcode.server.user.saml2;
+
+import imcode.server.Config;
+import imcode.server.Imcms;
+import imcode.server.user.saml2.utils.OpenSamlBootstrap;
+import org.opensaml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml2.metadata.IDPSSODescriptor;
+import org.opensaml.saml2.metadata.SingleLogoutService;
+import org.opensaml.saml2.metadata.SingleSignOnService;
+import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
+import org.opensaml.saml2.metadata.provider.MetadataProviderException;
+import org.opensaml.xml.parse.BasicParserPool;
+
+import java.util.Iterator;
+
+public class FilterConfig {
+    public static final String EXCLUDED_URL_PATTERN_PARAMETER = "excludedUrlPattern";
+    public static final String SP_ACS_URL_PARAMETER = "acsUrl";
+    public static final String SP_ID_PARAMETER = "spProviderId";
+    public static final String SP_LOGOUT_URL_PARAMETER = "logoutUrl";
+    public static final String AUTHENTICATION_METHOD_NAME_PROP = "cgi";
+    private static FilterConfig instance;
+    private String excludedUrlPattern;
+    private String acsUrl;
+    private String spProviderId;
+    private String logoutUrl;
+    private String idpSSOLoginUrl;
+    private String idpSSOLogoutUrl;
+    private boolean isEnabled;
+
+    private FilterConfig(javax.servlet.FilterConfig config) {
+        Config serverConfig = Imcms.getServices().getConfig();
+        isEnabled = serverConfig.getAuthenticationConfiguration().containsKey(AUTHENTICATION_METHOD_NAME_PROP);
+        if (isEnabled) {
+            OpenSamlBootstrap.init();
+
+            excludedUrlPattern = config.getInitParameter(EXCLUDED_URL_PATTERN_PARAMETER);
+            spProviderId = serverConfig.getServerName();
+            acsUrl = spProviderId + config.getServletContext().getContextPath() + "/acs";
+            logoutUrl = "/servlet/LogOut";
+            try { // code was decompiled because some guy made deploy but forgot to commit...
+                HTTPMetadataProvider provider = new HTTPMetadataProvider(serverConfig.getCgiMetadataUrl(), 99999999);
+                provider.setParserPool(new BasicParserPool());
+                provider.initialize();
+                EntityDescriptor entityDescriptor = (EntityDescriptor) provider.getMetadata();
+                IDPSSODescriptor idpssoDescriptor = entityDescriptor.getIDPSSODescriptor("urn:oasis:names:tc:SAML:2.0:protocol");
+                Iterator services = idpssoDescriptor.getSingleSignOnServices().iterator();
+                if (services.hasNext()) {
+                    SingleSignOnService singleLogoutService = (SingleSignOnService) services.next();
+                    idpSSOLoginUrl = singleLogoutService.getLocation();
+                }
+
+                services = idpssoDescriptor.getSingleLogoutServices().iterator();
+                if (services.hasNext()) {
+                    SingleLogoutService singleLogoutService1 = (SingleLogoutService) services.next();
+                    idpSSOLogoutUrl = singleLogoutService1.getLocation();
+                }
+            } catch (MetadataProviderException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static synchronized FilterConfig getInstance(javax.servlet.FilterConfig config) {
+        if (instance == null) {
+            instance = new FilterConfig(config);
+        }
+        return instance;
+    }
+
+    public String getExcludedUrlPattern() {
+        return excludedUrlPattern;
+    }
+
+    public String getSpProviderId() {
+        return spProviderId;
+    }
+
+    public String getIdpSSOLoginUrl() {
+        return idpSSOLoginUrl;
+    }
+
+    public String getLogoutUrl() {
+        return logoutUrl;
+    }
+
+    public String getAcsUrl() {
+        return acsUrl;
+    }
+
+    public Boolean isEnabled() {
+        return isEnabled;
+    }
+
+    public String getIdpSSOLogoutUrl() {
+        return idpSSOLogoutUrl;
+    }
+
+    public void setIdpSSOLogoutUrl(String idpSSOLogoutUrl) {
+        this.idpSSOLogoutUrl = idpSSOLogoutUrl;
+    }
+}
diff --git a/server/src/imcode/server/user/saml2/SAMLRequestSender.java b/server/src/imcode/server/user/saml2/SAMLRequestSender.java
new file mode 100644
index 0000000000..021d6e4e65
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/SAMLRequestSender.java
@@ -0,0 +1,132 @@
+package imcode.server.user.saml2;
+
+import imcode.server.user.saml2.store.SAMLRequestStore;
+import imcode.server.user.saml2.store.SAMLSessionInfo;
+import imcode.server.user.saml2.utils.SAMLUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.joda.time.DateTime;
+import org.opensaml.common.SAMLObject;
+import org.opensaml.common.SAMLVersion;
+import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.saml2.binding.encoding.HTTPRedirectDeflateEncoder;
+import org.opensaml.saml2.core.*;
+import org.opensaml.saml2.core.impl.*;
+import org.opensaml.util.URLBuilder;
+import org.opensaml.ws.message.encoder.MessageEncodingException;
+import org.opensaml.ws.transport.http.HTTPTransportUtils;
+import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
+import org.opensaml.xml.util.Pair;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+public class SAMLRequestSender {
+    private static Logger log = LogManager.getLogger(SAMLRequestSender.class);
+    private SAMLAuthnRequestBuilder samlAuthnRequestBuilder =
+            new SAMLAuthnRequestBuilder();
+    private MessageEncoder messageEncoder = new MessageEncoder();
+    private SAMLLogoutRequestBuilder samlLogoutRequestBuilder = new SAMLLogoutRequestBuilder();
+
+    public void sendSAMLAuthRequest(HttpServletRequest request, HttpServletResponse
+            servletResponse, String spId, String acsUrl, String idpSSOUrl) throws Exception {
+        String redirectURL;
+        AuthnRequest authnRequest = samlAuthnRequestBuilder.buildRequest(spId, acsUrl,
+                idpSSOUrl);
+        // store SAML 2.0 authentication request
+        String key = SAMLRequestStore.getInstance().storeRequest();
+        authnRequest.setID(key);
+        log.debug("SAML Authentication message : {} ",
+                SAMLUtils.SAMLObjectToString(authnRequest));
+        redirectURL = messageEncoder.encode(authnRequest, idpSSOUrl, request.getRequestURI());
+
+        HttpServletResponseAdapter responseAdapter =
+                new HttpServletResponseAdapter(servletResponse, request.isSecure());
+        HTTPTransportUtils.addNoCacheHeaders(responseAdapter);
+        HTTPTransportUtils.setUTF8Encoding(responseAdapter);
+        responseAdapter.sendRedirect(redirectURL);
+    }
+
+    public void sendSAMLLogoutRequest(HttpServletRequest request, HttpServletResponse servletResponse, String spId, String idpSSOLogoutUrl, SAMLSessionInfo sessionInfo) throws Exception {
+        LogoutRequest logoutRequest = this.samlLogoutRequestBuilder.buildRequest(spId, sessionInfo);
+        String key = SAMLRequestStore.getInstance().storeRequest();
+        logoutRequest.setID(key);
+        log.debug("SAML Logout message : {} ", SAMLUtils.SAMLObjectToString(logoutRequest));
+        String redirectURL = this.messageEncoder.encode(logoutRequest, idpSSOLogoutUrl, request.getRequestURI());
+        HttpServletResponseAdapter responseAdapter = new HttpServletResponseAdapter(servletResponse, request.isSecure());
+        HTTPTransportUtils.addNoCacheHeaders(responseAdapter);
+        HTTPTransportUtils.setUTF8Encoding(responseAdapter);
+        responseAdapter.sendRedirect(redirectURL);
+    }
+
+    private static class SAMLAuthnRequestBuilder {
+
+        public AuthnRequest buildRequest(String spProviderId, String acsUrl, String idpUrl) {
+            /* Building Issuer object */
+            IssuerBuilder issuerBuilder = new IssuerBuilder();
+            Issuer issuer =
+                    issuerBuilder.buildObject("urn:oasis:names:tc:SAML:2.0:assertion",
+                            "Issuer", "saml2p");
+            issuer.setValue(spProviderId);
+
+            /* Creation of AuthRequestObject */
+            DateTime issueInstant = new DateTime();
+            AuthnRequestBuilder authRequestBuilder = new AuthnRequestBuilder();
+
+            AuthnRequest authRequest =
+                    authRequestBuilder.buildObject(SAMLConstants.SAML20P_NS,
+                            "AuthnRequest", "saml2p");
+            authRequest.setForceAuthn(false);
+            authRequest.setIssueInstant(issueInstant);
+            authRequest.setProtocolBinding(SAMLConstants.SAML2_POST_BINDING_URI);
+            authRequest.setAssertionConsumerServiceURL(acsUrl);
+            authRequest.setIssuer(issuer);
+            authRequest.setVersion(SAMLVersion.VERSION_20);
+            authRequest.setDestination(idpUrl);
+
+            return authRequest;
+        }
+    }
+
+    private static class MessageEncoder extends HTTPRedirectDeflateEncoder {
+        public String encode(SAMLObject message, String endpointURL, String relayState)
+                throws MessageEncodingException {
+            String encodedMessage = deflateAndBase64Encode(message);
+            return buildRedirectURL(endpointURL, relayState, encodedMessage);
+        }
+
+        public String buildRedirectURL(String endpointURL, String relayState, String message) {
+            URLBuilder urlBuilder = new URLBuilder(endpointURL);
+            List<Pair<String, String>> queryParams = urlBuilder.getQueryParams();
+            queryParams.clear();
+            queryParams.add(new Pair<>("mgvhostparam", "0"));
+            queryParams.add(new Pair<>("SAMLRequest", message));
+            if (checkRelayState(relayState)) {
+                queryParams.add(new Pair<>("RelayState", relayState));
+            }
+            return urlBuilder.buildURL();
+        }
+    }
+
+    private static class SAMLLogoutRequestBuilder {
+        public LogoutRequest buildRequest(String spProviderId, SAMLSessionInfo info) {
+            IssuerBuilder issuerBuilder = new IssuerBuilder();
+            Issuer issuer = issuerBuilder.buildObject("urn:oasis:names:tc:SAML:2.0:assertion", "Issuer", "saml2p");
+            issuer.setValue(spProviderId);
+            DateTime issueInstant = new DateTime();
+            LogoutRequest logoutRequest = (new LogoutRequestBuilder()).buildObject("urn:oasis:names:tc:SAML:2.0:protocol", "LogoutRequest", "saml2p");
+            logoutRequest.setIssueInstant(issueInstant);
+            logoutRequest.setIssuer(issuer);
+            NameID nameID = (new NameIDBuilder()).buildObject("urn:oasis:names:tc:SAML:2.0:assertion", "NameID", "saml2");
+            nameID.setFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
+            nameID.setValue(info.getNameId());
+            SessionIndex sessionIndex = (new SessionIndexBuilder()).buildObject();
+            sessionIndex.setSessionIndex(info.getSessionIndex());
+            logoutRequest.setNameID(nameID);
+            logoutRequest.getSessionIndexes().add(sessionIndex);
+            logoutRequest.setVersion(SAMLVersion.VERSION_20);
+            return logoutRequest;
+        }
+    }
+}
diff --git a/server/src/imcode/server/user/saml2/SAMLResponseVerifier.java b/server/src/imcode/server/user/saml2/SAMLResponseVerifier.java
new file mode 100644
index 0000000000..29fa1242bb
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/SAMLResponseVerifier.java
@@ -0,0 +1,84 @@
+package imcode.server.user.saml2;
+
+import imcode.server.user.saml2.store.SAMLRequestStore;
+import imcode.server.user.saml2.utils.SAMLUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.opensaml.common.SAMLException;
+import org.opensaml.common.SAMLObject;
+import org.opensaml.common.binding.SAMLMessageContext;
+import org.opensaml.saml2.core.*;
+
+/**
+ * Created by Shadowgun on 20.11.2014.
+ */
+public class SAMLResponseVerifier {
+    private static Logger log = LogManager.getLogger(SAMLResponseVerifier.class);
+    private SAMLRequestStore samlRequestStore = SAMLRequestStore.getInstance();
+
+    public void verify(SAMLMessageContext<Response, SAMLObject, NameID> samlMessageContext)
+            throws SAMLException {
+        Response samlResponse = samlMessageContext.getInboundSAMLMessage();
+        log.debug("SAML Response message : {}", SAMLUtils.SAMLObjectToString(samlResponse));
+        verifyInResponseTo(samlResponse);
+        Status status = samlResponse.getStatus();
+        StatusCode statusCode = status.getStatusCode();
+        String statusCodeURI = statusCode.getValue();
+        if (!statusCodeURI.equals(StatusCode.SUCCESS_URI)) {
+            log.warn("Incorrect SAML message code : {} ",
+                    statusCode.getStatusCode().getValue());
+            throw new SAMLException("Incorrect SAML message code : " + statusCode.getValue());
+        }
+        if (samlResponse.getAssertions().size() == 0) {
+            log.error("Response does not contain any acceptable assertions");
+            throw new SAMLException("Response does not contain any acceptable assertions");
+        }
+
+        Assertion assertion = samlResponse.getAssertions().get(0);
+        NameID nameId = assertion.getSubject().getNameID();
+        if (nameId == null) {
+            log.error("Name ID not present in subject");
+            throw new SAMLException("Name ID not present in subject");
+        }
+        log.debug("SAML authenticated user " + nameId.getValue());
+        verifyConditions(assertion.getConditions(), samlMessageContext);
+    }
+
+    private void verifyInResponseTo(Response samlResponse) {
+        String key = samlResponse.getInResponseTo();
+        if (!samlRequestStore.exists(key)) {
+            log.error("Response does not match an authentication request");
+            throw new RuntimeException("Response does not match an authentication request");
+        }
+        samlRequestStore.removeRequest(samlResponse.getInResponseTo());
+    }
+
+    private void verifyConditions(Conditions conditions, SAMLMessageContext samlMessageContext) throws SAMLException {
+        verifyExpirationConditions(conditions);
+        // verifyAudienceRestrictions(conditions.getAudienceRestrictions(), samlMessageContext);
+    }
+
+    private void verifyExpirationConditions(Conditions conditions) throws SAMLException {
+        log.debug("Verifying conditions");
+        DateTime currentTime = new DateTime(DateTimeZone.UTC);
+        log.debug("Current time in UTC : " + currentTime);
+        DateTime notBefore = conditions.getNotBefore();
+        log.debug("Not before condition : " + notBefore);
+        if ((notBefore != null) && currentTime.isBefore(notBefore))
+            throw new SAMLException("Assertion is not conformed with notBefore condition");
+
+        DateTime notOnOrAfter = conditions.getNotOnOrAfter();
+        log.debug("Not on or after condition : " + notOnOrAfter);
+        if ((notOnOrAfter != null) && currentTime.isAfter(notOnOrAfter))
+            throw new SAMLException("Assertion is not conformed with notOnOrAfter condition");
+    }
+
+   /* private void verifyAudienceRestrictions(
+			List<AudienceRestriction> audienceRestrictions,
+            SAMLMessageContext<?, ?, ?> samlMessageContext)
+            throws SAMLException {
+    }*/
+}
+
diff --git a/server/src/imcode/server/user/saml2/SAMLSPFilter.java b/server/src/imcode/server/user/saml2/SAMLSPFilter.java
new file mode 100644
index 0000000000..01eae3c20b
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/SAMLSPFilter.java
@@ -0,0 +1,172 @@
+package imcode.server.user.saml2;
+
+import com.imcode.imcms.servlet.VerifyUser;
+import imcode.server.user.UserDomainObject;
+import imcode.server.user.saml2.store.SAMLSessionInfo;
+import imcode.server.user.saml2.store.SAMLSessionManager;
+import imcode.server.user.saml2.utils.SAMLUtils;
+import imcode.util.Utility;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensaml.common.SAMLObject;
+import org.opensaml.common.binding.SAMLMessageContext;
+import org.opensaml.saml2.core.NameID;
+import org.opensaml.saml2.core.Response;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static com.imcode.imcms.servlet.VerifyUser.REQUEST_PARAMETER__NEXT_URL;
+
+/**
+ * This class provide filtering all request, which reference to CGI-IDP
+ */
+public class SAMLSPFilter implements Filter {
+    private static final String SAML_AUTHN_RESPONSE_PARAMETER_NAME = "SAMLResponse";
+    private static Logger log = LogManager.getLogger(SAMLSPFilter.class);
+    private FilterConfig filterConfig;
+    private SAMLResponseVerifier checkSAMLResponse;
+    private SAMLRequestSender samlRequestSender;
+
+    @Override
+    public void init(javax.servlet.FilterConfig config) {
+        filterConfig = FilterConfig.getInstance(config);
+        if (filterConfig.isEnabled()) {
+            checkSAMLResponse = new SAMLResponseVerifier();
+            samlRequestSender = new SAMLRequestSender();
+        }
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
+                         FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        /*
+         * Check if request is not refer to CGI-IDP - ignore it;
+         */
+        if (!filterConfig.isEnabled() || !isFilteredRequest(request)) {
+            log.debug("According to {} configuration parameter request is ignored + {}",
+                    new Object[]{FilterConfig.EXCLUDED_URL_PATTERN_PARAMETER, request.getRequestURI()});
+            chain.doFilter(servletRequest, servletResponse);
+            return;
+        }
+
+        log.debug("Attempt to secure resource  is intercepted : {}", request.getRequestURL().toString());
+		/*
+		  Check if response message is received from identity provider;
+          In case of successful response system redirects user to relayState (initial) request
+        */
+        String responseMessage = servletRequest.getParameter(SAML_AUTHN_RESPONSE_PARAMETER_NAME);
+        String spProviderId = filterConfig.getSpProviderId();
+        if (responseMessage != null) {
+            log.debug("Response from Identity Provider is received");
+            try {
+                log.debug("Decoding of SAML message");
+                SAMLMessageContext<Response, SAMLObject, NameID> samlMessageContext =
+                        SAMLUtils.decodeSamlMessage(request, response);
+                log.debug("SAML message has been decoded successfully");
+                samlMessageContext.setLocalEntityId(spProviderId);
+                checkSAMLResponse.verify(samlMessageContext);
+                log.debug("Starting and store SAML session..");
+                SAMLSessionManager.getInstance().createSAMLSession(request, response,
+                        samlMessageContext);
+                if (!response.isCommitted()) {
+                    new VerifyUser.GoToLoginSuccessfulPageCommand().dispatch(request, response);
+                } else {
+                    return;
+                }
+            } catch (Exception e) {
+                throw new ServletException(e);
+            }
+        }
+
+        String nextUrl = request.getParameter(REQUEST_PARAMETER__NEXT_URL);
+        if (null != nextUrl && !nextUrl.isEmpty()) {
+            request.getSession().setAttribute(REQUEST_PARAMETER__NEXT_URL, nextUrl);
+        }
+        /*
+         * Check if request is logout request
+         */
+        if (this.getCorrectURL(request).equals(this.filterConfig.getLogoutUrl())) {
+
+            SAMLSessionInfo samlSessionInfo = SAMLSessionManager.getInstance().getSAMLSession(request.getSession(true));
+            if (samlSessionInfo != null) {
+                log.debug("Logout action: destroying SAML session.");
+                try {
+                    samlRequestSender.sendSAMLLogoutRequest(request, response, spProviderId, filterConfig.getIdpSSOLogoutUrl(), samlSessionInfo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                SAMLSessionManager.getInstance().destroySAMLSession(request.getSession(true));
+                Utility.makeUserLoggedOut(request);
+            } else {
+                chain.doFilter(servletRequest, servletResponse);
+            }
+
+            return;
+        }
+        /*
+         *   Check if user has already authorised
+         */
+        if (SAMLSessionManager.getInstance().isSAMLSessionValid(request.getSession(true))) {
+            SAMLSessionInfo samlSessionInfo = SAMLSessionManager.getInstance().getSAMLSession(request.getSession(true));
+            SAMLSessionManager.getInstance().loginUser(samlSessionInfo, request, response);
+            log.debug("SAML session exists and valid: grant access to secure resource");
+            //chain.doFilter(request, response);
+            if (!response.isCommitted()) {
+                new VerifyUser.GoToLoginSuccessfulPageCommand().dispatch(request, response);
+            } else {
+                return;
+            }
+        }
+        /*
+         * Create SAML request and redirect user to CGI service for authentication
+         */
+        log.debug("Sending authentication request to idP");
+        try {
+            UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
+            if (loggedOnUser != null && loggedOnUser.isDefaultUser()) {
+                samlRequestSender.sendSAMLAuthRequest(request, response,
+                        spProviderId, filterConfig.getAcsUrl(),
+                        filterConfig.getIdpSSOLoginUrl());
+            } else if (!response.isCommitted()) {
+                new VerifyUser.GoToLoginSuccessfulPageCommand().dispatch(request, response);
+            } else {
+                return;
+            }
+
+        } catch (Exception e) {
+            throw new ServletException(e);
+        }
+    }
+
+    private boolean isFilteredRequest(HttpServletRequest request) {
+        return !(filterConfig.getExcludedUrlPattern() != null &&
+                getCorrectURL(request).matches(filterConfig.getExcludedUrlPattern()));
+    }
+
+    // Check if URL is correct
+    private String getCorrectURL(HttpServletRequest request) {
+        String contextPath = request.getContextPath();
+        String requestUri = request.getRequestURI();
+        int contextBeg = requestUri.indexOf(contextPath);
+        int contextEnd = contextBeg + contextPath.length();
+        String slash = "/";
+        String url = (contextBeg < 0 || contextEnd == (requestUri.length() - 1))
+                ? requestUri : requestUri.substring(contextEnd);
+        if (!url.startsWith(slash)) {
+            url = slash + url;
+        }
+
+        return url;
+    }
+
+    @Override
+    public void destroy() {
+        log = null;
+    }
+}
diff --git a/server/src/imcode/server/user/saml2/store/SAMLRequestStore.java b/server/src/imcode/server/user/saml2/store/SAMLRequestStore.java
new file mode 100644
index 0000000000..8b0c27486e
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/store/SAMLRequestStore.java
@@ -0,0 +1,51 @@
+package imcode.server.user.saml2.store;
+
+import org.opensaml.common.IdentifierGenerator;
+import org.opensaml.common.impl.RandomIdentifierGenerator;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Created by Shadowgun on 20.11.2014.
+ */
+final public class SAMLRequestStore {
+    private static SAMLRequestStore instance = new SAMLRequestStore();
+    private Set<String> samlRequestStorage = new HashSet<>();
+    private IdentifierGenerator identifierGenerator = new RandomIdentifierGenerator();
+
+    private SAMLRequestStore() {
+    }
+
+    public static SAMLRequestStore getInstance() {
+        return instance;
+    }
+
+    public synchronized void storeRequest(String key) {
+        if (samlRequestStorage.contains(key))
+            throw new RuntimeException("SAML request storage has already contains key " + key);
+
+        samlRequestStorage.add(key);
+    }
+
+    public synchronized String storeRequest() {
+        String key = null;
+        while (true) {
+            key = identifierGenerator.generateIdentifier(20);
+            if (!samlRequestStorage.contains(key)) {
+                storeRequest(key);
+                break;
+            }
+        }
+        return key;
+    }
+
+    public synchronized boolean exists(String key) {
+        return samlRequestStorage.contains(key);
+    }
+
+    public synchronized void removeRequest(String key) {
+        samlRequestStorage.remove(key);
+    }
+}
+
diff --git a/server/src/imcode/server/user/saml2/store/SAMLSessionInfo.java b/server/src/imcode/server/user/saml2/store/SAMLSessionInfo.java
new file mode 100644
index 0000000000..c28637d160
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/store/SAMLSessionInfo.java
@@ -0,0 +1,34 @@
+package imcode.server.user.saml2.store;
+
+import java.util.Date;
+import java.util.Map;
+
+public class SAMLSessionInfo {
+    private String nameId;
+    private Map<String, String> attributes;
+    private Date validTo;
+    private String sessionIndex;
+
+    public SAMLSessionInfo(String nameId, Map<String, String> attributes, Date validTo, String sessionIndex) {
+        this.nameId = nameId;
+        this.attributes = attributes;
+        this.validTo = validTo;
+        this.sessionIndex = sessionIndex;
+    }
+
+    public Date getValidTo() {
+        return this.validTo;
+    }
+
+    public String getNameId() {
+        return this.nameId;
+    }
+
+    public Map<String, String> getAttributes() {
+        return this.attributes;
+    }
+
+    public String getSessionIndex() {
+        return this.sessionIndex;
+    }
+}
diff --git a/server/src/imcode/server/user/saml2/store/SAMLSessionManager.java b/server/src/imcode/server/user/saml2/store/SAMLSessionManager.java
new file mode 100644
index 0000000000..30928eaaa9
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/store/SAMLSessionManager.java
@@ -0,0 +1,171 @@
+package imcode.server.user.saml2.store;
+
+import com.imcode.imcms.api.ContentManagementSystem;
+import com.imcode.imcms.api.User;
+import imcode.server.Imcms;
+import imcode.server.user.*;
+import imcode.util.Utility;
+import org.apache.commons.lang.StringUtils;
+import org.opensaml.common.SAMLObject;
+import org.opensaml.common.binding.SAMLMessageContext;
+import org.opensaml.saml2.core.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.*;
+
+public class SAMLSessionManager {
+    private static final String SESSION_ATTRIBUTE__NEXT_URL = "next_url";
+    private static String SAML_SESSION_INFO = "SAML_SESSION_INFO";
+    private static SAMLSessionManager instance = new SAMLSessionManager();
+
+    private SAMLSessionManager() {
+    }
+
+    public static SAMLSessionManager getInstance() {
+        return instance;
+    }
+
+    public void createSAMLSession(HttpServletRequest request, HttpServletResponse response, SAMLMessageContext<Response,
+            SAMLObject, NameID> samlMessageContext) {
+        List<Assertion> assertions = samlMessageContext.getInboundSAMLMessage().getAssertions();
+
+        NameID nameId = (assertions.size() != 0 && assertions.get(0).getSubject() != null)
+                ? assertions.get(0).getSubject().getNameID()
+                : null;
+
+        String nameValue = nameId == null
+                ? null
+                : nameId.getValue();
+
+        SAMLSessionInfo samlSessionInfo = new SAMLSessionInfo(nameValue,
+                getAttributesMap(getSAMLAttributes(assertions)),
+                getSAMLSessionValidTo(assertions),
+                getSamlSessionIndex(assertions));
+
+        request.getSession().setAttribute(SAML_SESSION_INFO, samlSessionInfo);
+        loginUser(samlSessionInfo, request, response);
+    }
+
+    public void loginUser(SAMLSessionInfo samlSessionInfo, HttpServletRequest request, HttpServletResponse response) {
+        UserDomainObject user = this.prepareUser(samlSessionInfo);
+        ImcmsAuthenticatorAndUserAndRoleMapper userAndRoleMapper = Imcms.getServices().getImcmsAuthenticatorAndUserAndRoleMapper();
+        UserDomainObject dbUser = userAndRoleMapper.getUser(user.getLoginName());
+
+        if (dbUser != null) {
+
+            for (RoleId roleId : dbUser.getRoleIds()) {
+                user.addRoleId(roleId);
+            }
+
+            user.setId(dbUser.getId());
+        } else {
+            try {
+                String cgiUserRoleName = Imcms.getServices().getConfig().getCgiUserRoleName();
+                RoleDomainObject role = userAndRoleMapper.getRoleByName(cgiUserRoleName);
+
+                RoleId roleId = role == null
+                        ? userAndRoleMapper.addRole(cgiUserRoleName).getId()
+                        : role.getId();
+
+                user.addRoleId(roleId);
+                userAndRoleMapper.addUser(user);
+            } catch (UserAlreadyExistsException e) {
+                e.printStackTrace();
+            }
+        }
+
+        ContentManagementSystem cms = Utility.initRequestWithApi(request, user);
+        if (Imcms.getServices().getConfig().isDenyMultipleUserLogin()) {
+            User currentUser = cms.getCurrentUser();
+            currentUser.setSessionId(request.getSession().getId());
+            cms.getUserService().updateUserSession(currentUser);
+        }
+        String rememberCd = user.getRememberCd();
+        if (StringUtils.isEmpty(rememberCd)) {
+            cms.getUserService().updateUserRememberCd(user);
+        }
+
+        Utility.makeUserLoggedIn(request, response, user);
+    }
+
+    private String getSamlSessionIndex(Collection<Assertion> assertions) {
+
+        for (Assertion assertion : assertions) {
+            for (Statement statement : assertion.getStatements()) {
+                if (statement instanceof AuthnStatement) {
+                    return ((AuthnStatement) statement).getSessionIndex();
+                }
+            }
+        }
+
+        return "";
+    }
+
+    private UserDomainObject prepareUser(SAMLSessionInfo sessionInfo) {
+        UserDomainObject user = new UserDomainObject();
+        Map<String, String> attributes = sessionInfo.getAttributes();
+        user.setActive(true);
+        user.setCompany(attributes.get("Subject_OrganisationName"));
+        user.setSessionId(attributes.get("CertificateSerialNumber"));
+        user.setCountry(attributes.get("Subject_CountryName"));
+        user.setFirstName(attributes.get("Subject_GivenName"));
+        user.setLastName(attributes.get("Subject_Surname"));
+        user.setLoginName(attributes.get("Subject_SerialNumber"));
+        user.setImcmsExternal(true);
+        user.isImcmsExternal();
+        user.setLanguageIso639_2("swe");
+        return user;
+    }
+
+    public boolean isSAMLSessionValid(HttpSession session) {
+        SAMLSessionInfo samlSessionInfo = (SAMLSessionInfo)
+                session.getAttribute(SAML_SESSION_INFO);
+        return samlSessionInfo != null && (samlSessionInfo.getValidTo() == null || new
+                Date().before(samlSessionInfo.getValidTo()));
+    }
+
+    public SAMLSessionInfo getSAMLSession(HttpSession session) {
+        return (SAMLSessionInfo)
+                session.getAttribute(SAML_SESSION_INFO);
+    }
+
+    public void destroySAMLSession(HttpSession session) {
+        session.removeAttribute(SAML_SESSION_INFO);
+    }
+
+    public List<Attribute> getSAMLAttributes(List<Assertion> assertions) {
+        List<Attribute> attributes = new ArrayList<>();
+        if (assertions != null) {
+            for (Assertion assertion : assertions) {
+                for (AttributeStatement attributeStatement : assertion.getAttributeStatements()) {
+                    attributes.addAll(attributeStatement.getAttributes());
+                }
+            }
+        }
+        return attributes;
+    }
+
+    public Date getSAMLSessionValidTo(List<Assertion> assertions) {
+        org.joda.time.DateTime sessionNotOnOrAfter = null;
+        if (assertions != null) {
+            for (Assertion assertion : assertions) {
+                for (AuthnStatement statement : assertion.getAuthnStatements()) {
+                    sessionNotOnOrAfter = statement.getSessionNotOnOrAfter();
+                }
+            }
+        }
+
+        return sessionNotOnOrAfter != null ?
+                sessionNotOnOrAfter.toCalendar(Locale.getDefault()).getTime() : null;
+    }
+
+    public Map<String, String> getAttributesMap(List<Attribute> attributes) {
+        Map<String, String> result = new HashMap<>();
+        for (Attribute attribute : attributes) {
+            result.put(attribute.getName(), attribute.getDOM().getTextContent());
+        }
+        return result;
+    }
+}
diff --git a/server/src/imcode/server/user/saml2/utils/OpenSamlBootstrap.java b/server/src/imcode/server/user/saml2/utils/OpenSamlBootstrap.java
new file mode 100644
index 0000000000..016e1b6ee7
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/utils/OpenSamlBootstrap.java
@@ -0,0 +1,43 @@
+package imcode.server.user.saml2.utils;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
+
+/**
+ * Created by Shadowgun on 20.11.2014.
+ */
+public class OpenSamlBootstrap extends DefaultBootstrap {
+    private static Logger log = LogManager.getLogger(OpenSamlBootstrap.class);
+    private static boolean initialized;
+    private static String[] xmlToolingConfigs = {
+            "/default-config.xml",
+            "/encryption-validation-config.xml",
+            "/saml2-assertion-config.xml",
+            "/saml2-assertion-delegation-restriction-config.xml",
+            "/saml2-core-validation-config.xml",
+            "/saml2-metadata-config.xml",
+            "/saml2-metadata-idp-discovery-config.xml",
+            "/saml2-metadata-query-config.xml",
+            "/saml2-metadata-validation-config.xml",
+            "/saml2-protocol-config.xml",
+            "/saml2-protocol-thirdparty-config.xml",
+            "/schema-config.xml",
+            "/signature-config.xml",
+            "/signature-validation-config.xml"
+    };
+
+    public static synchronized void init() {
+        if (!initialized) {
+            try {
+                initializeXMLTooling(xmlToolingConfigs);
+                bootstrap();
+            } catch (ConfigurationException e) {
+                log.error("Unable to initialize opensaml DefaultBootstrap", e);
+            }
+            initializeGlobalSecurityConfiguration();
+            initialized = true;
+        }
+    }
+}
diff --git a/server/src/imcode/server/user/saml2/utils/SAMLUtils.java b/server/src/imcode/server/user/saml2/utils/SAMLUtils.java
new file mode 100644
index 0000000000..7696e640e4
--- /dev/null
+++ b/server/src/imcode/server/user/saml2/utils/SAMLUtils.java
@@ -0,0 +1,80 @@
+package imcode.server.user.saml2.utils;
+
+import org.opensaml.Configuration;
+import org.opensaml.common.SAMLObject;
+import org.opensaml.common.binding.BasicSAMLMessageContext;
+import org.opensaml.common.binding.SAMLMessageContext;
+import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.saml2.binding.decoding.HTTPPostDecoder;
+import org.opensaml.saml2.core.NameID;
+import org.opensaml.saml2.core.Response;
+import org.opensaml.saml2.metadata.IDPSSODescriptor;
+import org.opensaml.ws.security.SecurityPolicy;
+import org.opensaml.ws.security.SecurityPolicyResolver;
+import org.opensaml.ws.security.SecurityPolicyRule;
+import org.opensaml.ws.security.provider.BasicSecurityPolicy;
+import org.opensaml.ws.security.provider.HTTPRule;
+import org.opensaml.ws.security.provider.MandatoryIssuerRule;
+import org.opensaml.ws.security.provider.StaticSecurityPolicyResolver;
+import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
+import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.io.Marshaller;
+import org.opensaml.xml.util.XMLHelper;
+import org.w3c.dom.Element;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.StringWriter;
+import java.util.List;
+
+/**
+ * Created by Shadowgun on 20.11.2014.
+ */
+public class SAMLUtils {
+
+    public static SAMLMessageContext<Response, SAMLObject, NameID> decodeSamlMessage(HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        SAMLMessageContext<Response, SAMLObject, NameID> samlMessageContext =
+                new BasicSAMLMessageContext<>();
+
+        HttpServletRequestAdapter httpServletRequestAdapter =
+                new HttpServletRequestAdapter(request);
+        samlMessageContext.setInboundMessageTransport(httpServletRequestAdapter);
+        samlMessageContext.setInboundSAMLProtocol(SAMLConstants.SAML20P_NS);
+        HttpServletResponseAdapter httpServletResponseAdapter =
+                new HttpServletResponseAdapter(response, request.isSecure());
+        samlMessageContext.setOutboundMessageTransport(httpServletResponseAdapter);
+        samlMessageContext.setPeerEntityRole(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
+
+        SecurityPolicyResolver securityPolicyResolver = getSecurityPolicyResolver(request.isSecure());
+
+        samlMessageContext.setSecurityPolicyResolver(securityPolicyResolver);
+        HTTPPostDecoder samlMessageDecoder = new HTTPPostDecoder();
+        samlMessageDecoder.decode(samlMessageContext);
+        return samlMessageContext;
+    }
+
+    private static SecurityPolicyResolver getSecurityPolicyResolver(boolean isSecured) {
+        SecurityPolicy securityPolicy = new BasicSecurityPolicy();
+        HTTPRule httpRule = new HTTPRule(null, null, isSecured);
+        MandatoryIssuerRule mandatoryIssuerRule = new MandatoryIssuerRule();
+        List<SecurityPolicyRule> securityPolicyRules = securityPolicy.getPolicyRules();
+        securityPolicyRules.add(httpRule);
+        securityPolicyRules.add(mandatoryIssuerRule);
+        return new StaticSecurityPolicyResolver(securityPolicy);
+    }
+
+    public static String SAMLObjectToString(XMLObject samlObject) {
+        try {
+            Marshaller marshaller = Configuration.getMarshallerFactory().getMarshaller(samlObject);
+            Element authDOM = marshaller.marshall(samlObject);
+            StringWriter rspWrt = new StringWriter();
+            XMLHelper.writeNode(authDOM, rspWrt);
+            return rspWrt.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
diff --git a/server/src/imcode/util/ArraySet.java b/server/src/imcode/util/ArraySet.java
index 60993da429..02d4741f8f 100644
--- a/server/src/imcode/util/ArraySet.java
+++ b/server/src/imcode/util/ArraySet.java
@@ -13,7 +13,7 @@ public ArraySet(Object[] array) {
     }
 
     public int size() {
-        return array.length ;
+        return array.length;
     }
 
     public Iterator iterator() {
diff --git a/server/src/imcode/util/CachingFileLoader.java b/server/src/imcode/util/CachingFileLoader.java
index 5562a91c34..ab2e82b120 100644
--- a/server/src/imcode/util/CachingFileLoader.java
+++ b/server/src/imcode/util/CachingFileLoader.java
@@ -16,14 +16,16 @@ public class CachingFileLoader {
 
     private static final int FILE_CACHE_SIZE = 100;
 
-    private Map fileCache = Collections.synchronizedMap( new LRUMap( FILE_CACHE_SIZE ) );
+    private Map fileCache = Collections.synchronizedMap(new LRUMap(FILE_CACHE_SIZE));
 
-    /** Fetch a file from the cache, if it hasn't changed on disk. */
-    public String getCachedFileString( File file ) throws IOException {
-        String cachedContents = getCachedFileStringIfRecent( file );
-        if ( null == cachedContents ) {
+    /**
+     * Fetch a file from the cache, if it hasn't changed on disk.
+     */
+    public String getCachedFileString(File file) throws IOException {
+        String cachedContents = getCachedFileStringIfRecent(file);
+        if (null == cachedContents) {
             cachedContents = decodeFile(file);
-            cacheFile( file, cachedContents );
+            cacheFile(file, cachedContents);
         }
         return cachedContents;
     }
@@ -32,13 +34,13 @@ private String decodeFile(File file) throws IOException {
         Charset utf8Charset = Charset.forName(Imcms.UTF_8_ENCODING);
         Charset fallbackCharset = Charset.defaultCharset();
         if (fallbackCharset.equals(utf8Charset) || fallbackCharset.equals(Charset.forName(Imcms.ASCII_ENCODING))) {
-            fallbackCharset = Charset.forName(Imcms.ISO_8859_1_ENCODING) ;
+            fallbackCharset = Charset.forName(Imcms.ISO_8859_1_ENCODING);
         }
         return decodeFile(file, utf8Charset, fallbackCharset);
     }
 
     private String decodeFile(File file, Charset charset, Charset fallbackCharset) throws IOException {
-        return new FallbackDecoder(charset, fallbackCharset).decodeBytes(readFile(file), "file "+file.toString());
+        return new FallbackDecoder(charset, fallbackCharset).decodeBytes(readFile(file), "file " + file.toString());
     }
 
     private byte[] readFile(File file) throws IOException {
@@ -48,14 +50,14 @@ private byte[] readFile(File file) throws IOException {
         return os.toByteArray();
     }
 
-    private void cacheFile( File file, String contents ) {
-        fileCache.put( file, new Object[] {contents, new Long( System.currentTimeMillis() )} );
+    private void cacheFile(File file, String contents) {
+        fileCache.put(file, new Object[]{contents, System.currentTimeMillis()});
     }
 
-    public String getCachedFileStringIfRecent( File file ) {
-        Object[] file_and_date = (Object[])fileCache.get( file );
-        if ( file_and_date != null && file.lastModified() <= ( (Long)file_and_date[1] ).longValue() ) {
-            return (String)file_and_date[0];
+    public String getCachedFileStringIfRecent(File file) {
+        Object[] file_and_date = (Object[]) fileCache.get(file);
+        if (file_and_date != null && file.lastModified() <= (Long) file_and_date[1]) {
+            return (String) file_and_date[0];
         }
         return null;
     }
diff --git a/server/src/imcode/util/ClientHttpRequest.java b/server/src/imcode/util/ClientHttpRequest.java
new file mode 100644
index 0000000000..ed1f8fb7e6
--- /dev/null
+++ b/server/src/imcode/util/ClientHttpRequest.java
@@ -0,0 +1,359 @@
+package imcode.util;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * <p>Title: Client HTTP Request class</p>
+ * <p>Description: this class helps to send POST HTTP requests with various form data,
+ * including files. Cookies can be added to be included in the request.</p>
+ *
+ * @author Vlad Patryshev
+ * @version 1.0
+ */
+public class ClientHttpRequest {
+    private static Random random = new Random();
+    URLConnection connection;
+    OutputStream os = null;
+    Map cookies = new HashMap();
+    String boundary = "---------------------------" + randomString() + randomString() + randomString();
+
+    /**
+     * Creates a new multipart POST HTTP request on a freshly opened URLConnection
+     */
+    public ClientHttpRequest(URLConnection connection) throws IOException {
+        this.connection = connection;
+        connection.setDoOutput(true);
+        connection.setRequestProperty("Content-Type",
+                "multipart/form-data; boundary=" + boundary);
+    }
+
+    /**
+     * Creates a new multipart POST HTTP request for a specified URL
+     */
+    public ClientHttpRequest(URL url) throws IOException {
+        this(url.openConnection());
+    }
+
+    /**
+     * Creates a new multipart POST HTTP request for a specified URL string
+     */
+    public ClientHttpRequest(String urlString) throws IOException {
+        this(new URL(urlString));
+    }
+
+    protected static String randomString() {
+        return Long.toString(random.nextLong(), 36);
+    }
+
+    private static void pipe(InputStream in, OutputStream out) throws IOException {
+        byte[] buf = new byte[500000];
+        int nread;
+        int navailable;
+        int total = 0;
+        synchronized (in) {
+            while ((nread = in.read(buf, 0, buf.length)) >= 0) {
+                out.write(buf, 0, nread);
+                total += nread;
+            }
+        }
+        out.flush();
+        buf = null;
+    }
+
+    /**
+     * posts a new request to specified URL, with parameters that are passed in the argument
+     */
+    public static InputStream post(URL url, Map parameters) throws IOException {
+        return new ClientHttpRequest(url).post(parameters);
+    }
+
+    /**
+     * posts a new request to specified URL, with parameters that are passed in the argument
+     */
+    public static InputStream post(URL url, Object[] parameters) throws IOException {
+        return new ClientHttpRequest(url).post(parameters);
+    }
+
+    /**
+     * posts a new request to specified URL, with cookies and parameters that are passed in the argument
+     */
+    public static InputStream post(URL url, Map cookies, Map parameters) throws IOException {
+        return new ClientHttpRequest(url).post(cookies, parameters);
+    }
+
+    /**
+     * posts a new request to specified URL, with cookies and parameters that are passed in the argument
+     */
+    public static InputStream post(URL url, String[] cookies, Object[] parameters) throws IOException {
+        return new ClientHttpRequest(url).post(cookies, parameters);
+    }
+
+    /**
+     * post the POST request specified URL, with the specified parameter
+     */
+    public static InputStream post(URL url, String name1, Object value1) throws IOException {
+        return new ClientHttpRequest(url).post(name1, value1);
+    }
+
+    /**
+     * post the POST request to specified URL, with the specified parameters
+     */
+    public static InputStream post(URL url, String name1, Object value1, String name2, Object value2) throws IOException {
+        return new ClientHttpRequest(url).post(name1, value1, name2, value2);
+    }
+
+    /**
+     * post the POST request to specified URL, with the specified parameters
+     */
+    public static InputStream post(URL url, String name1, Object value1, String name2, Object value2, String name3, Object value3) throws IOException {
+        return new ClientHttpRequest(url).post(name1, value1, name2, value2, name3, value3);
+    }
+
+    /**
+     * post the POST request to specified URL, with the specified parameters
+     */
+    public static InputStream post(URL url, String name1, Object value1, String name2, Object value2, String name3, Object value3, String name4, Object value4) throws IOException {
+        return new ClientHttpRequest(url).post(name1, value1, name2, value2, name3, value3, name4, value4);
+    }
+
+    protected void connect() throws IOException {
+        if (os == null) {
+            os = connection.getOutputStream();
+        }
+    }
+
+    protected void write(char c) throws IOException {
+        connect();
+        os.write(c);
+    }
+
+    protected void write(String s) throws IOException {
+        connect();
+        os.write(s.getBytes());
+    }
+
+    protected void newline() throws IOException {
+        connect();
+        write("\r\n");
+    }
+
+    protected void writeln(String s) throws IOException {
+        connect();
+        write(s);
+        newline();
+    }
+
+    private void boundary() throws IOException {
+        write("--");
+        write(boundary);
+    }
+
+    private void postCookies() {
+        StringBuffer cookieList = new StringBuffer();
+
+        for (Iterator i = cookies.entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry entry = (Map.Entry) (i.next());
+            cookieList.append(entry.getKey().toString() + "=" + entry.getValue());
+
+            if (i.hasNext()) {
+                cookieList.append("; ");
+            }
+        }
+        if (cookieList.length() > 0) {
+            connection.setRequestProperty("Cookie", cookieList.toString());
+        }
+    }
+
+    /**
+     * adds a cookie to the requst
+     */
+    public void setCookie(String name, String value) throws IOException {
+        cookies.put(name, value);
+    }
+
+    /**
+     * adds cookies to the request
+     */
+    public void setCookies(Map cookies) throws IOException {
+        if (cookies == null) {
+            return;
+        }
+        this.cookies.putAll(cookies);
+    }
+
+    /**
+     * adds cookies to the request
+     */
+    public void setCookies(String[] cookies) throws IOException {
+        if (cookies == null) {
+            return;
+        }
+        for (int i = 0; i < cookies.length - 1; i += 2) {
+            setCookie(cookies[i], cookies[i + 1]);
+        }
+    }
+
+    private void writeName(String name) throws IOException {
+        newline();
+        write("Content-Disposition: form-data; name=\"");
+        write(name);
+        write('"');
+    }
+
+    /**
+     * adds a string parameter to the request
+     */
+    public void setParameter(String name, String value) throws IOException {
+        boundary();
+        writeName(name);
+        newline();
+        newline();
+        writeln(value);
+    }
+
+    /**
+     * adds a file parameter to the request
+     */
+    public void setParameter(String name, String filename, InputStream is) throws IOException {
+        boundary();
+        writeName(name);
+        write("; filename=\"");
+        write(filename);
+        write('"');
+        newline();
+        write("Content-Type: ");
+        String type = connection.guessContentTypeFromName(filename);
+        if (type == null) {
+            type = "application/octet-stream";
+        }
+        writeln(type);
+        newline();
+        pipe(is, os);
+        newline();
+    }
+
+    /**
+     * adds a file parameter to the request
+     */
+    public void setParameter(String name, File file) throws IOException {
+        setParameter(name, file.getName(), new FileInputStream(file));
+    }
+
+    /**
+     * adds a parameter to the request; if the parameter is a File, the file is uploaded, otherwise the string value of the parameter is passed in the request
+     */
+    public void setParameter(String name, Object object) throws IOException {
+        if (object instanceof File) {
+            setParameter(name, (File) object);
+        } else {
+            setParameter(name, object.toString());
+        }
+    }
+
+    /**
+     * adds parameters to the request
+     */
+    public void setParameters(Map parameters) throws IOException {
+        if (parameters == null) {
+            return;
+        }
+        for (Iterator i = parameters.entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry entry = (Map.Entry) i.next();
+            setParameter(entry.getKey().toString(), entry.getValue());
+        }
+    }
+
+    /**
+     * adds parameters to the request
+     */
+    public void setParameters(Object[] parameters) throws IOException {
+        if (parameters == null) {
+            return;
+        }
+        for (int i = 0; i < parameters.length - 1; i += 2) {
+            setParameter(parameters[i].toString(), parameters[i + 1]);
+        }
+    }
+
+    /**
+     * posts the requests to the server, with all the cookies and parameters that were added
+     */
+    public InputStream post() throws IOException {
+        boundary();
+        writeln("--");
+        os.close();
+        return connection.getInputStream();
+    }
+
+    /**
+     * posts the requests to the server, with all the cookies and parameters that were added before (if any), and with parameters that are passed in the argument
+     */
+    public InputStream post(Map parameters) throws IOException {
+        setParameters(parameters);
+        return post();
+    }
+
+    /**
+     * posts the requests to the server, with all the cookies and parameters that were added before (if any), and with parameters that are passed in the argument
+     */
+    public InputStream post(Object[] parameters) throws IOException {
+        setParameters(parameters);
+        return post();
+    }
+
+    /**
+     * posts the requests to the server, with all the cookies and parameters that were added before (if any), and with cookies and parameters that are passed in the arguments
+     */
+    public InputStream post(Map cookies, Map parameters) throws IOException {
+        setCookies(cookies);
+        setParameters(parameters);
+        return post();
+    }
+
+    /**
+     * posts the requests to the server, with all the cookies and parameters that were added before (if any), and with cookies and parameters that are passed in the arguments
+     */
+    public InputStream post(String[] cookies, Object[] parameters) throws IOException {
+        setCookies(cookies);
+        setParameters(parameters);
+        return post();
+    }
+
+    /**
+     * post the POST request to the server, with the specified parameter
+     */
+    public InputStream post(String name, Object value) throws IOException {
+        setParameter(name, value);
+        return post();
+    }
+
+    /**
+     * post the POST request to the server, with the specified parameters
+     */
+    public InputStream post(String name1, Object value1, String name2, Object value2) throws IOException {
+        setParameter(name1, value1);
+        return post(name2, value2);
+    }
+
+    /**
+     * post the POST request to the server, with the specified parameters
+     */
+    public InputStream post(String name1, Object value1, String name2, Object value2, String name3, Object value3) throws IOException {
+        setParameter(name1, value1);
+        return post(name2, value2, name3, value3);
+    }
+
+    /**
+     * post the POST request to the server, with the specified parameters
+     */
+    public InputStream post(String name1, Object value1, String name2, Object value2, String name3, Object value3, String name4, Object value4) throws IOException {
+        setParameter(name1, value1);
+        return post(name2, value2, name3, value3, name4, value4);
+    }
+}
diff --git a/server/src/imcode/util/CollectingHttpServletResponse.java b/server/src/imcode/util/CollectingHttpServletResponse.java
index 02cdd497a9..c085aa164c 100644
--- a/server/src/imcode/util/CollectingHttpServletResponse.java
+++ b/server/src/imcode/util/CollectingHttpServletResponse.java
@@ -6,36 +6,39 @@
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 public class CollectingHttpServletResponse extends HttpServletResponseWrapper {
 
-    StringWriter stringWriter = new StringWriter() ;
-    PrintWriter printWriter = new PrintWriter( stringWriter ) ;
+    StringWriter stringWriter = new StringWriter();
+    PrintWriter printWriter = new PrintWriter(stringWriter);
 
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
     ServletOutputStream servletOutputStream = new ServletOutputStream() {
-        public void write( int b ) {
-            byteArrayOutputStream.write( b );
+        public void write(int b) {
+            byteArrayOutputStream.write(b);
         }
     };
 
-    private boolean alreadyCalled ;
+    private boolean alreadyCalled;
 
-    public CollectingHttpServletResponse( HttpServletResponse response ) {
-        super( response );
+    public CollectingHttpServletResponse(HttpServletResponse response) {
+        super(response);
     }
 
     private void checkCalled() throws IOException {
-        if ( alreadyCalled ) {
-            throw new IOException( "getOutputStream() or getWriter() already called." );
+        if (alreadyCalled) {
+            throw new IOException("getOutputStream() or getWriter() already called.");
         }
         alreadyCalled = true;
     }
 
     public PrintWriter getWriter() throws IOException {
         checkCalled();
-        return printWriter ;
+        return printWriter;
     }
 
     public ServletOutputStream getOutputStream() throws IOException {
@@ -50,12 +53,12 @@ public String toString() {
             printWriter.flush();
             stringWriter.flush();
             if (byteArrayOutputStream.size() > 0) {
-                return byteArrayOutputStream.toString(Imcms.DEFAULT_ENCODING ) ;
+                return byteArrayOutputStream.toString(Imcms.DEFAULT_ENCODING);
             } else {
                 return stringWriter.toString();
             }
-        } catch ( IOException e ) {
-            throw new UnhandledException( e );
+        } catch (IOException e) {
+            throw new UnhandledException(e);
         }
     }
 }
diff --git a/server/src/imcode/util/CompositeList.java b/server/src/imcode/util/CompositeList.java
index ad8e2e3f5d..d19804fe49 100644
--- a/server/src/imcode/util/CompositeList.java
+++ b/server/src/imcode/util/CompositeList.java
@@ -1,11 +1,7 @@
 package imcode.util;
 
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
 import java.io.Serializable;
+import java.util.*;
 
 public class CompositeList extends AbstractList implements Serializable {
 
@@ -36,15 +32,15 @@ public Object operate(List list, int index) {
     }
 
     private Object operateOnIndex(int index, ListIndexOperation listIndexOperation) {
-        if ( index < 0 ) {
+        if (index < 0) {
             throw new IndexOutOfBoundsException("" + index);
         }
-        synchronized ( lists ) {
+        synchronized (lists) {
             int firstIndexInList = 0;
-            for ( Iterator iterator = lists.iterator(); iterator.hasNext(); ) {
+            for (Iterator iterator = lists.iterator(); iterator.hasNext(); ) {
                 List list = (List) iterator.next();
                 int indexInList = index - firstIndexInList;
-                if ( indexInList < list.size() ) {
+                if (indexInList < list.size()) {
                     return listIndexOperation.operate(list, indexInList);
                 }
                 firstIndexInList += list.size();
@@ -54,9 +50,9 @@ private Object operateOnIndex(int index, ListIndexOperation listIndexOperation)
     }
 
     public int size() {
-        synchronized ( lists ) {
+        synchronized (lists) {
             int size = 0;
-            for ( Iterator iterator = lists.iterator(); iterator.hasNext(); ) {
+            for (Iterator iterator = lists.iterator(); iterator.hasNext(); ) {
                 List list = (List) iterator.next();
                 size += list.size();
             }
@@ -66,7 +62,7 @@ public int size() {
 
     public boolean contains(Object o) {
         synchronized (lists) {
-            for ( Iterator iterator = lists.iterator(); iterator.hasNext(); ) {
+            for (Iterator iterator = lists.iterator(); iterator.hasNext(); ) {
                 List list = (List) iterator.next();
                 if (list.contains(o)) {
                     return true;
diff --git a/server/src/imcode/util/CounterStringFactory.java b/server/src/imcode/util/CounterStringFactory.java
index ea418d80e3..7956f56776 100644
--- a/server/src/imcode/util/CounterStringFactory.java
+++ b/server/src/imcode/util/CounterStringFactory.java
@@ -4,14 +4,14 @@
 
 public class CounterStringFactory implements Factory {
 
-    int counter ;
+    int counter;
 
     public CounterStringFactory() {
-        this(0) ;
+        this(0);
     }
 
-    public CounterStringFactory( int counterStartValue ) {
-        counter = counterStartValue ;
+    public CounterStringFactory(int counterStartValue) {
+        counter = counterStartValue;
     }
 
     public Object create() {
diff --git a/server/src/imcode/util/DateConstants.java b/server/src/imcode/util/DateConstants.java
index 657fd3024a..deaa139e37 100644
--- a/server/src/imcode/util/DateConstants.java
+++ b/server/src/imcode/util/DateConstants.java
@@ -1,8 +1,8 @@
 package imcode.util;
 
 public class DateConstants {
-    public final static String DATE_FORMAT_STRING = "yyyy-MM-dd" ;
+    public final static String DATE_FORMAT_STRING = "yyyy-MM-dd";
     public final static String TIME_NO_SECONDS_FORMAT_STRING = "HH:mm";
-    public final static String DATETIME_NO_SECONDS_FORMAT_STRING = DATE_FORMAT_STRING + " "+ TIME_NO_SECONDS_FORMAT_STRING ;
-    public final static String DATETIME_FORMAT_STRING = DATETIME_NO_SECONDS_FORMAT_STRING+":ss";
+    public final static String DATETIME_NO_SECONDS_FORMAT_STRING = DATE_FORMAT_STRING + " " + TIME_NO_SECONDS_FORMAT_STRING;
+    public final static String DATETIME_FORMAT_STRING = DATETIME_NO_SECONDS_FORMAT_STRING + ":ss";
 }
diff --git a/server/src/imcode/util/FallbackDecoder.java b/server/src/imcode/util/FallbackDecoder.java
index 3e4e60db7d..1c99ab0cb5 100644
--- a/server/src/imcode/util/FallbackDecoder.java
+++ b/server/src/imcode/util/FallbackDecoder.java
@@ -1,52 +1,53 @@
 package imcode.util;
 
-import org.apache.log4j.Logger;
 
-import java.nio.charset.Charset;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.nio.ByteBuffer;
 import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
-import java.nio.ByteBuffer;
 
 public class FallbackDecoder {
 
+    private final static Logger LOG = LogManager.getLogger(FallbackDecoder.class);
     private Charset charset;
     private Charset fallbackCharset;
 
-    private final static Logger LOG = Logger.getLogger(FallbackDecoder.class);
-    
     public FallbackDecoder(Charset charset, Charset fallbackCharset) {
         this.charset = charset;
         this.fallbackCharset = fallbackCharset;
     }
 
+    private static CharsetDecoder createReportingDecoder(Charset charset) {
+        return charset.newDecoder().onMalformedInput(CodingErrorAction.REPORT);
+    }
+
     public String decodeBytes(byte[] inputBytes,
                               String sourceName) {
-        if ( 0 == inputBytes.length ) {
-            return "" ;
+        if (0 == inputBytes.length) {
+            return "";
         }
         String result;
         try {
             result = createReportingDecoder(charset).decode(ByteBuffer.wrap(inputBytes)).toString();
-        } catch ( CharacterCodingException e1 ) {
-            if ( LOG.isDebugEnabled() ) {
+        } catch (CharacterCodingException e1) {
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("Failed to decode " + sourceName + " using " + charset + ", falling back to "
-                          + fallbackCharset + ".");
+                        + fallbackCharset + ".");
             }
             try {
                 result = createReportingDecoder(fallbackCharset).decode(ByteBuffer.wrap(inputBytes)).toString();
-            } catch ( CharacterCodingException e2 ) {
-                LOG.warn("Failed to decode "+sourceName +" using "+charset +" and "+fallbackCharset +", using broken "+charset+" result.", e2);
-                result = charset.decode(ByteBuffer.wrap(inputBytes)).toString() ;
+            } catch (CharacterCodingException e2) {
+                LOG.warn("Failed to decode " + sourceName + " using " + charset + " and " + fallbackCharset + ", using broken " + charset + " result.", e2);
+                result = charset.decode(ByteBuffer.wrap(inputBytes)).toString();
             }
         }
         return result;
     }
 
-    private static CharsetDecoder createReportingDecoder(Charset charset) {
-        return charset.newDecoder().onMalformedInput(CodingErrorAction.REPORT) ;
-    }
-
     public Charset getFallbackCharset() {
         return fallbackCharset;
     }
diff --git a/server/src/imcode/util/Html.java b/server/src/imcode/util/Html.java
index 1398fabfcd..1dc8809b84 100644
--- a/server/src/imcode/util/Html.java
+++ b/server/src/imcode/util/Html.java
@@ -11,6 +11,7 @@
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.LifeCyclePhase;
 import imcode.server.user.UserDomainObject;
+import lombok.NonNull;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.UnhandledException;
 import org.apache.oro.text.perl.Perl5Util;
@@ -19,10 +20,25 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class Html {
 
+    private static final Object[][] STATUS_TEMPLATE_PAIRS = {
+            {LifeCyclePhase.NEW, "status/new.frag"},
+            {LifeCyclePhase.DISAPPROVED, "status/disapproved.frag"},
+            {LifeCyclePhase.PUBLISHED, "status/published.frag"},
+            {LifeCyclePhase.UNPUBLISHED, "status/unpublished.frag"},
+            {LifeCyclePhase.ARCHIVED, "status/archived.frag"},
+            {LifeCyclePhase.APPROVED, "status/approved.frag"},
+    };
+
     private Html() {
 
     }
@@ -30,37 +46,37 @@ private Html() {
     /**
      * @deprecated
      */
-    public static String createOptionList( List allValues, List selectedValues ) {
+    public static String createOptionList(List allValues, List selectedValues) {
         StringBuffer htmlStr = new StringBuffer();
 
-        Set selectedValuesSet = new HashSet( selectedValues );
-        for ( int i = 0; i < allValues.size(); i += 2 ) {
-            String value = allValues.get( i ).toString();
-            String name = allValues.get( i + 1 ).toString();
-            boolean valueSelected = selectedValuesSet.contains( value );
-            htmlStr.append( option( value, name, valueSelected ) );
+        Set selectedValuesSet = new HashSet(selectedValues);
+        for (int i = 0; i < allValues.size(); i += 2) {
+            String value = allValues.get(i).toString();
+            String name = allValues.get(i + 1).toString();
+            boolean valueSelected = selectedValuesSet.contains(value);
+            htmlStr.append(option(value, name, valueSelected));
         } // end for
 
         return htmlStr.toString();
     }
 
     public static String createOptionList(Collection allValues, ToStringPairTransformer transformer) {
-        return createOptionList(allValues,(Collection)null,transformer) ;
+        return createOptionList(allValues, (Collection) null, transformer);
     }
 
-    public static String createOptionList( Collection allValues, Object selectedValue,
-                                           ToStringPairTransformer objectToStringPairTransformer ) {
-        return createOptionList( allValues, new Object[]{selectedValue}, objectToStringPairTransformer );
+    public static String createOptionList(Collection allValues, Object selectedValue,
+                                          ToStringPairTransformer objectToStringPairTransformer) {
+        return createOptionList(allValues, new Object[]{selectedValue}, objectToStringPairTransformer);
     }
 
-    public static String createOptionList( Collection allValues, Object[] selectedValues,
-                                           ToStringPairTransformer objectToStringPairTransformer ) {
-        return createOptionList(allValues, Arrays.asList(selectedValues), objectToStringPairTransformer) ;
+    public static String createOptionList(Collection allValues, Object[] selectedValues,
+                                          ToStringPairTransformer objectToStringPairTransformer) {
+        return createOptionList(allValues, Arrays.asList(selectedValues), objectToStringPairTransformer);
     }
 
-    public static String createOptionList( Collection allValues, Collection selectedValues,
-                                           ToStringPairTransformer objectToStringPairTransformer ) {
-        Set selectedValuesSet = null != selectedValues ? new HashSet( selectedValues ) : new HashSet();
+    public static String createOptionList(Collection allValues, Collection selectedValues,
+                                          ToStringPairTransformer objectToStringPairTransformer) {
+        Set selectedValuesSet = null != selectedValues ? new HashSet(selectedValues) : new HashSet();
 
         return createOptionList(allValues, selectedValuesSet, objectToStringPairTransformer);
     }
@@ -73,165 +89,216 @@ public static String createOptionList(Collection allValues, Set selectedValues,
     private static String createOptionList(Iterator iterator, Set selectedValuesSet,
                                            ToStringPairTransformer objectToStringPairTransformer) {
         StringBuffer htmlStr = new StringBuffer();
-        while ( iterator.hasNext() ) {
+        while (iterator.hasNext()) {
             Object valueObject = iterator.next();
-            String[] valueAndNameStringPair = (String[])objectToStringPairTransformer.transform( valueObject );
+            String[] valueAndNameStringPair = (String[]) objectToStringPairTransformer.transform(valueObject);
             String value = valueAndNameStringPair[0];
             String name = valueAndNameStringPair[1];
-            boolean valueSelected = selectedValuesSet.contains( valueObject );
-            htmlStr.append( option( value, name, valueSelected ) );
+            boolean valueSelected = selectedValuesSet.contains(valueObject);
+            htmlStr.append(option(value, name, valueSelected));
         }
 
         return htmlStr.toString();
     }
 
-    /** @deprecated */
-    public static String createOptionList( List data, String selected ) {
-        return createOptionList( data, Arrays.asList( new String[]{selected} ) );
+    /**
+     * @deprecated
+     */
+    public static String createOptionList(List data, String selected) {
+        return createOptionList(data, Arrays.asList(new String[]{selected}));
     }
 
     public static String createOptionListOfCategoriesOfTypeForDocument(CategoryMapper categoryMapper,
                                                                        CategoryTypeDomainObject categoryType,
                                                                        DocumentDomainObject document, HttpServletRequest request) {
-        CategoryDomainObject[] categories = categoryMapper.getAllCategoriesOfType( categoryType );
-        Arrays.sort( categories );
-        Set documentSelectedCategories = categoryMapper.getCategoriesOfType( categoryType, document.getCategoryIds() );
+        CategoryDomainObject[] categories = categoryMapper.getAllCategoriesOfType(categoryType);
+        Arrays.sort(categories);
+        Set documentSelectedCategories = categoryMapper.getCategoriesOfType(categoryType, document.getCategoryIds());
 
         ToStringPairTransformer categoryToStringPairTransformer = new ToStringPairTransformer() {
             protected String[] transformToStringPair(Object o) {
-                CategoryDomainObject category = (CategoryDomainObject)o;
+                CategoryDomainObject category = (CategoryDomainObject) o;
                 return new String[]{"" + category.getId(), category.getName()};
             }
         };
-        String categoryOptionList = createOptionList( Arrays.asList( categories ), documentSelectedCategories, categoryToStringPairTransformer );
+        String categoryOptionList = createOptionList(Arrays.asList(categories), documentSelectedCategories, categoryToStringPairTransformer);
 
-        if ( 1 == categoryType.getMaxChoices() ) {
+        if (1 == categoryType.getMaxChoices()) {
             categoryOptionList = "<option>- " + (new LocalizedMessage("global/None")).toLocalizedString(request) + " -</option>" + categoryOptionList;
         }
         return categoryOptionList;
     }
 
-	public static String createOptionListOfCategoriesOfTypeNotSelectedForDocument ( DocumentMapper documentMapper,
-                                                                        CategoryTypeDomainObject categoryType,
-                                                                        DocumentDomainObject document ) {
+    public static String createOptionListOfCategoriesOfTypeNotSelectedForDocument(DocumentMapper documentMapper,
+                                                                                  CategoryTypeDomainObject categoryType,
+                                                                                  DocumentDomainObject document) {
         CategoryMapper categoryMapper = documentMapper.getCategoryMapper();
-        CategoryDomainObject[] categories = categoryMapper.getAllCategoriesOfType( categoryType );
-        Set documentSelectedCategories = categoryMapper.getCategoriesOfType( categoryType, document.getCategoryIds() );
-		Set notSelectedCategories = new HashSet(Arrays.asList(categories)) ;
-		notSelectedCategories.removeAll(documentSelectedCategories);
+        CategoryDomainObject[] categories = categoryMapper.getAllCategoriesOfType(categoryType);
+        Set documentSelectedCategories = categoryMapper.getCategoriesOfType(categoryType, document.getCategoryIds());
+        Set notSelectedCategories = new HashSet(Arrays.asList(categories));
+        notSelectedCategories.removeAll(documentSelectedCategories);
 
-		return createOptionListOfCategories(new TreeSet(notSelectedCategories), categoryType);
+        return createOptionListOfCategories(new TreeSet(notSelectedCategories), categoryType);
     }
 
-	public static String createOptionListOfCategories(Collection categories, CategoryTypeDomainObject categoryType){
+    public static String createOptionListOfCategories(Collection categories, CategoryTypeDomainObject categoryType) {
         ToStringPairTransformer categoryToStringPairTransformer = new ToStringPairTransformer() {
             protected String[] transformToStringPair(Object object) {
-                CategoryDomainObject category = (CategoryDomainObject)object;
+                CategoryDomainObject category = (CategoryDomainObject) object;
                 return new String[]{"" + category.getId(), category.getName()};
             }
         };
-		String categoryOptionList = createOptionList( categories, Arrays.asList( new String[]{}  ), categoryToStringPairTransformer );
-
-		if ( 1 == categoryType.getMaxChoices() ) {
-			categoryOptionList = "<option></option>" + categoryOptionList;
-		}
-		return categoryOptionList;
-	}
-
-	public static String getLinkedStatusIconTemplate( DocumentDomainObject document, UserDomainObject user,
-                                                      HttpServletRequest request ) {
-        String statusIconTemplate = getStatusIconTemplate( document, user );
-        if ( user.canEditDocumentInformationFor( document ) ) {
+        String categoryOptionList = createOptionList(categories, Arrays.asList(new String[]{}), categoryToStringPairTransformer);
+
+        if (1 == categoryType.getMaxChoices()) {
+            categoryOptionList = "<option></option>" + categoryOptionList;
+        }
+        return categoryOptionList;
+    }
+
+    public static String getLinkedStatusIconTemplate(DocumentDomainObject document, UserDomainObject user,
+                                                     HttpServletRequest request) {
+        String statusIconTemplate = getStatusIconTemplate(document, user);
+        if (user.canEditDocumentInformationFor(document)) {
             statusIconTemplate = "<a href=\"" + request.getContextPath() + "/servlet/AdminDoc?meta_id="
-                                 + document.getId()
-                                 + "&"
-                                 + AdminDoc.PARAMETER__DISPATCH_FLAGS
-                                 + "=1\" target=\"_blank\">" +
-                                 statusIconTemplate +
-                                 "</a>";
+                    + document.getId()
+                    + "&amp;"
+                    + AdminDoc.PARAMETER__DISPATCH_FLAGS
+                    + "=1\" target=\"_blank\">" +
+                    statusIconTemplate +
+                    "</a>";
         }
         return statusIconTemplate;
     }
 
-    private static final Object[][] STATUS_TEMPLATE_PAIRS = {
-        { LifeCyclePhase.NEW, "status/new.frag"},
-        { LifeCyclePhase.DISAPPROVED, "status/disapproved.frag"},
-        { LifeCyclePhase.PUBLISHED, "status/published.frag"},
-        { LifeCyclePhase.UNPUBLISHED, "status/unpublished.frag"},
-        { LifeCyclePhase.ARCHIVED, "status/archived.frag"},
-        { LifeCyclePhase.APPROVED, "status/approved.frag"},
-    };
-
-    public static String getStatusIconTemplate( DocumentDomainObject document, UserDomainObject user ) {
+    public static String getStatusIconTemplate(DocumentDomainObject document, UserDomainObject user) {
         LifeCyclePhase lifeCyclePhase = document.getLifeCyclePhase();
         String statusIconTemplateName = null;
-        for ( Object[] statusTemplatePair : STATUS_TEMPLATE_PAIRS ) {
-            if ( lifeCyclePhase.equals(statusTemplatePair[0]) ) {
+        for (Object[] statusTemplatePair : STATUS_TEMPLATE_PAIRS) {
+            if (lifeCyclePhase.equals(statusTemplatePair[0])) {
                 statusIconTemplateName = (String) statusTemplatePair[1];
                 break;
             }
         }
-        return Imcms.getServices().getAdminTemplate( statusIconTemplateName, user, null );
+        return Imcms.getServices().getAdminTemplate(statusIconTemplateName, user, null);
     }
 
-    public static String option( String elementValue, String content, boolean selected ) {
+    public static String option(String elementValue, String content, boolean selected) {
 
         StringBuffer option = new StringBuffer();
 
         option.append("<option value=\"").append(StringEscapeUtils.escapeHtml(elementValue)).append("\"");
-        if ( selected ) {
-            option.append( " selected" );
+        if (selected) {
+            option.append(" selected");
         }
         option.append(">").append(StringEscapeUtils.escapeHtml(content)).append("</option>");
         return option.toString();
     }
 
-    public static String hidden( String name, String value ) {
-        return "<input type=\"hidden\" name=\"" + StringEscapeUtils.escapeHtml( name ) + "\" value=\""
-               + StringEscapeUtils.escapeHtml( value )
-               + "\">";
+    public static String hidden(String name, String value) {
+        return "<input type=\"hidden\" name=\"" + StringEscapeUtils.escapeHtml(name) + "\" value=\""
+                + StringEscapeUtils.escapeHtml(value)
+                + "\">";
+    }
+
+    public static String checkBoxWrapLabel(String name, String id, String value,
+                                           List<String> linkRolesIdsWithExternal,
+                                           boolean isOnClick, @NonNull String nameFuncOnClick) {
+        final StringBuffer htmlCheckBoxBuilder = new StringBuffer();
+        htmlCheckBoxBuilder.append("<label for=\"")
+                .append(StringEscapeUtils.escapeHtml(id))
+                .append("\"><input type=\"checkbox\" name=\"")
+                .append(StringEscapeUtils.escapeHtml(name))
+                .append("\" value=\"")
+                .append(StringEscapeUtils.escapeHtml(id))
+                .append("\" id=\"").append(StringEscapeUtils.escapeHtml(id)).append("\"");
+        if (isOnClick) {
+            htmlCheckBoxBuilder.append(" onclick=")
+                    .append("\"")
+                    .append(StringEscapeUtils.escapeHtml(nameFuncOnClick)).append("()")
+                    .append("\"");
+        }
+        if (linkRolesIdsWithExternal.contains(id)) {
+            htmlCheckBoxBuilder.append(" checked");
+        }
+        htmlCheckBoxBuilder.append(">").append(StringEscapeUtils.escapeHtml(value)).append("</label>");
+
+        return htmlCheckBoxBuilder.toString();
     }
 
-    public static String radio( String name, String value, boolean selected ) {
+    public static String radio(String name, String value, boolean selected) {
         return
-                "<input type=\"radio\" name=\"" + StringEscapeUtils.escapeHtml( name ) + "\" value=\""
-                + StringEscapeUtils.escapeHtml( value ) + "\"" + ( selected ? " checked" : "" ) + ">";
+                "<input type=\"radio\" name=\"" + StringEscapeUtils.escapeHtml(name) + "\" value=\""
+                        + StringEscapeUtils.escapeHtml(value) + "\"" + (selected ? " checked" : "") + ">";
 
     }
 
     /**
      * Returns the menubuttonrow
      */
-    public static String getAdminButtons( UserDomainObject user, DocumentDomainObject document, HttpServletRequest request,
-                                          HttpServletResponse response ) {
-        if ( null == document || !( user.canEdit( document ) || user.isUserAdminAndCanEditAtLeastOneRole() || user.canAccessAdminPages() ) ) {
+    public static String getAdminButtons(UserDomainObject user, DocumentDomainObject document, HttpServletRequest request,
+                                         HttpServletResponse response) {
+        if (null == document || !(user.canEdit(document) || user.isUserAdminAndCanEditAtLeastOneRole() || user.canAccessAdminPages())) {
             return "";
         }
 
         try {
-            request.setAttribute( "document", document );
-            request.setAttribute( "user", user );
-            return Utility.getContents( "/imcms/" + user.getLanguageIso639_2() + "/jsp/admin/adminbuttons.jsp", request, response );
-        } catch ( ServletException e ) {
-            throw new UnhandledException( e );
-        } catch ( IOException e ) {
-            throw new UnhandledException( e );
+            request.setAttribute("document", document);
+            request.setAttribute("user", user);
+            return Utility.getContents("/imcms/" + user.getLanguageIso639_2() + "/jsp/admin/adminbuttons.jsp", request, response);
+        } catch (ServletException e) {
+            throw new UnhandledException(e);
+        } catch (IOException e) {
+            throw new UnhandledException(e);
         }
     }
 
-    public static String removeTags( String html ) {
+    public static String createSimpleUlList(List values) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("<ul>");
+
+        for (int i = 0; i < values.size(); i += 2) {
+            String value = values.get(i).toString();
+            String content = values.get(i + 1).toString();
+            stringBuilder.append("<li value=\"")
+                    .append(StringEscapeUtils.escapeHtml(value))
+                    .append("\">")
+                    .append(content)
+                    .append("</li>");
+        }
+        stringBuilder.append("</ul>");
+
+        return stringBuilder.toString();
+    }
+
+    public static String createDropDownList(List values, List<String> linkRolesIdsWithExternal,
+                                            boolean isOnClick, @NonNull String nameFuncOnClick) {
+        StringBuffer stringBuffer = new StringBuffer();
+        final String nameCheckBoxes = "role";
+
+        for (int i = 0; i < values.size(); i += 2) {
+            String id = values.get(i).toString();
+            String value = values.get(i + 1).toString();
+            stringBuffer.append(checkBoxWrapLabel(nameCheckBoxes, id, value,
+                    linkRolesIdsWithExternal, isOnClick, nameFuncOnClick));
+        }
+
+        return stringBuffer.toString();
+    }
+
+    public static String removeTags(String html) {
         Perl5Util perl5util = new Perl5Util();
         return perl5util.substitute("s!<.+?>!!g", html);
     }
 
-    public static String createUsersOptionList( ImcmsServices imcref ) {
-        UserDomainObject[] users = imcref.getImcmsAuthenticatorAndUserAndRoleMapper().getUsers( true, false );
-        return createOptionList(Arrays.asList( users ), new ToStringPairTransformer() {
-            public String[] transformToStringPair( Object input ) {
-                UserDomainObject user = (UserDomainObject)input ;
-                return new String[] {""+user.getId(), user.getLastName()+", "+user.getFirstName()} ;
+    public static String createUsersOptionList(ImcmsServices imcref) {
+        UserDomainObject[] users = imcref.getImcmsAuthenticatorAndUserAndRoleMapper().getUsers(true, false);
+        return createOptionList(Arrays.asList(users), new ToStringPairTransformer() {
+            public String[] transformToStringPair(Object input) {
+                UserDomainObject user = (UserDomainObject) input;
+                return new String[]{"" + user.getId(), user.getLastName() + ", " + user.getFirstName()};
             }
-        } );
+        });
     }
 
 }
diff --git a/server/src/imcode/util/HttpSessionAttribute.java b/server/src/imcode/util/HttpSessionAttribute.java
index 871f85af10..0036067ce1 100644
--- a/server/src/imcode/util/HttpSessionAttribute.java
+++ b/server/src/imcode/util/HttpSessionAttribute.java
@@ -2,8 +2,8 @@
 
 public interface HttpSessionAttribute {
 
-    void setSessionAttributeName( String sessionAttributeName ) ;
+    String getSessionAttributeName();
 
-    String getSessionAttributeName() ;
+    void setSessionAttributeName(String sessionAttributeName);
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/util/HttpSessionUtils.java b/server/src/imcode/util/HttpSessionUtils.java
index 8c4df87315..7cbf3f5ef7 100644
--- a/server/src/imcode/util/HttpSessionUtils.java
+++ b/server/src/imcode/util/HttpSessionUtils.java
@@ -2,7 +2,8 @@
 
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.commons.lang.RandomStringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -12,7 +13,7 @@
 
 public class HttpSessionUtils {
 
-    private final static Logger log = Logger.getLogger( HttpSessionUtils.class.getName() );
+    private final static Logger log = LogManager.getLogger(HttpSessionUtils.class.getName());
 
     private static final String SESSION_ATTRIBUTE_NAME__SESSION_MAP = HttpSessionUtils.class.getName() + ".sessionMap";
 
@@ -21,81 +22,81 @@ public class HttpSessionUtils {
     private HttpSessionUtils() {
     }
 
-    public static void setSessionAttributeAndSetNameInRequestAttribute( final Serializable objectToAddToSession,
-                                                                        HttpServletRequest request,
-                                                                        final String sessionAttributeNameRequestAttributeName ) {
-        String sessionAttributeName ;
+    public static void setSessionAttributeAndSetNameInRequestAttribute(final Serializable objectToAddToSession,
+                                                                       HttpServletRequest request,
+                                                                       final String sessionAttributeNameRequestAttributeName) {
+        String sessionAttributeName;
         if (objectToAddToSession instanceof HttpSessionAttribute) {
-            sessionAttributeName = ((HttpSessionAttribute)objectToAddToSession).getSessionAttributeName() ;
+            sessionAttributeName = ((HttpSessionAttribute) objectToAddToSession).getSessionAttributeName();
         } else {
-            sessionAttributeName = getSessionAttributeNameFromRequest( request, sessionAttributeNameRequestAttributeName );
+            sessionAttributeName = getSessionAttributeNameFromRequest(request, sessionAttributeNameRequestAttributeName);
         }
-        if ( null == sessionAttributeName || !objectToAddToSession.equals( get( request, sessionAttributeName ) ) ) {
-            sessionAttributeName = createUniqueNameForObject( objectToAddToSession );
-            put( request, sessionAttributeName, objectToAddToSession );
+        if (null == sessionAttributeName || !objectToAddToSession.equals(get(request, sessionAttributeName))) {
+            sessionAttributeName = createUniqueNameForObject(objectToAddToSession);
+            put(request, sessionAttributeName, objectToAddToSession);
         }
-        request.setAttribute( sessionAttributeNameRequestAttributeName, sessionAttributeName );
+        request.setAttribute(sessionAttributeNameRequestAttributeName, sessionAttributeName);
     }
 
-    private static Object get( HttpServletRequest request, String sessionAttributeName ) {
-        return getSessionMap(request).get( sessionAttributeName );
+    private static Object get(HttpServletRequest request, String sessionAttributeName) {
+        return getSessionMap(request).get(sessionAttributeName);
     }
 
-    public static void put( HttpServletRequest request, String sessionAttributeName,
-                             final Serializable objectToAddToSession ) {
-        Map sessionMap = getSessionMap( request );
-        if ( MAX_COUNT__SESSION_OBJECTS == sessionMap.size() ) {
-            log.debug( "SessionMap is full. Least recently used object will be evicted.") ;
+    public static void put(HttpServletRequest request, String sessionAttributeName,
+                           final Serializable objectToAddToSession) {
+        Map sessionMap = getSessionMap(request);
+        if (MAX_COUNT__SESSION_OBJECTS == sessionMap.size()) {
+            log.debug("SessionMap is full. Least recently used object will be evicted.");
         }
         if (objectToAddToSession instanceof HttpSessionAttribute) {
-            ((HttpSessionAttribute)objectToAddToSession).setSessionAttributeName(sessionAttributeName) ;
+            ((HttpSessionAttribute) objectToAddToSession).setSessionAttributeName(sessionAttributeName);
         }
-        sessionMap.put( sessionAttributeName, objectToAddToSession );
-        log.debug( "Put in session: \"" + sessionAttributeName + "\": " + objectToAddToSession.getClass() + ". Size: "
-                   + sessionMap.size() );
+        sessionMap.put(sessionAttributeName, objectToAddToSession);
+        log.debug("Put in session: \"" + sessionAttributeName + "\": " + objectToAddToSession.getClass() + ". Size: "
+                + sessionMap.size());
     }
 
-    private static Map getSessionMap( HttpServletRequest request ) {
+    private static Map getSessionMap(HttpServletRequest request) {
         HttpSession session = request.getSession();
-        Map sessionMap = (Map)session.getAttribute( SESSION_ATTRIBUTE_NAME__SESSION_MAP );
-        if ( null == sessionMap ) {
-            sessionMap = Collections.synchronizedMap( new LRUMap(MAX_COUNT__SESSION_OBJECTS) );
-            session.setAttribute( SESSION_ATTRIBUTE_NAME__SESSION_MAP, sessionMap );
+        Map sessionMap = (Map) session.getAttribute(SESSION_ATTRIBUTE_NAME__SESSION_MAP);
+        if (null == sessionMap) {
+            sessionMap = Collections.synchronizedMap(new LRUMap(MAX_COUNT__SESSION_OBJECTS));
+            session.setAttribute(SESSION_ATTRIBUTE_NAME__SESSION_MAP, sessionMap);
         }
         return sessionMap;
     }
 
-    public static String createUniqueNameForObject( Object object ) {
-        return Integer.toString( object.getClass().hashCode(), Character.MAX_RADIX )
-               + RandomStringUtils.randomAlphanumeric( 4 );
+    public static String createUniqueNameForObject(Object object) {
+        return Integer.toString(object.getClass().hashCode(), Character.MAX_RADIX)
+                + RandomStringUtils.randomAlphanumeric(4);
     }
 
-    public static Object getSessionAttributeWithNameInRequest( HttpServletRequest request,
-                                                               String requestAttributeOrParameterName ) {
-        String sessionAttributeName = getSessionAttributeNameFromRequest( request, requestAttributeOrParameterName );
-        Map sessionMap = getSessionMap( request );
-        Object sessionAttribute = sessionMap.get( sessionAttributeName );
-        if ( null == sessionAttribute ) {
-            removeSessionAttribute( request, sessionAttributeName );
+    public static Object getSessionAttributeWithNameInRequest(HttpServletRequest request,
+                                                              String requestAttributeOrParameterName) {
+        String sessionAttributeName = getSessionAttributeNameFromRequest(request, requestAttributeOrParameterName);
+        Map sessionMap = getSessionMap(request);
+        Object sessionAttribute = sessionMap.get(sessionAttributeName);
+        if (null == sessionAttribute) {
+            removeSessionAttribute(request, sessionAttributeName);
         }
         return sessionAttribute;
     }
 
-    public static Object removeSessionAttribute( HttpServletRequest request, String sessionAttributeName ) {
-        Map sessionMap = getSessionMap( request );
-        Object object = sessionMap.remove( sessionAttributeName );
-        if ( null != object ) {
-            log.debug( "Removed from session: \"" + sessionAttributeName + "\": " + object.getClass()
-                       + ". Size: " + sessionMap.size() );
+    public static Object removeSessionAttribute(HttpServletRequest request, String sessionAttributeName) {
+        Map sessionMap = getSessionMap(request);
+        Object object = sessionMap.remove(sessionAttributeName);
+        if (null != object) {
+            log.debug("Removed from session: \"" + sessionAttributeName + "\": " + object.getClass()
+                    + ". Size: " + sessionMap.size());
         }
         return object;
     }
 
-    public static String getSessionAttributeNameFromRequest( HttpServletRequest request,
-                                                             String requestAttributeOrParameterName ) {
-        String sessionAttributeName = (String)request.getAttribute( requestAttributeOrParameterName );
-        if ( null == sessionAttributeName ) {
-            sessionAttributeName = request.getParameter( requestAttributeOrParameterName );
+    public static String getSessionAttributeNameFromRequest(HttpServletRequest request,
+                                                            String requestAttributeOrParameterName) {
+        String sessionAttributeName = (String) request.getAttribute(requestAttributeOrParameterName);
+        if (null == sessionAttributeName) {
+            sessionAttributeName = request.getParameter(requestAttributeOrParameterName);
         }
         return sessionAttributeName;
     }
diff --git a/server/src/imcode/util/IdLocalizedNamePair.java b/server/src/imcode/util/IdLocalizedNamePair.java
index b011caff7d..0b65d7410c 100644
--- a/server/src/imcode/util/IdLocalizedNamePair.java
+++ b/server/src/imcode/util/IdLocalizedNamePair.java
@@ -6,7 +6,7 @@
 
 public class IdLocalizedNamePair implements Serializable {
 
-    private final IdObjectPair idObjectPair ;
+    private final IdObjectPair idObjectPair;
 
     public IdLocalizedNamePair(int id, LocalizedMessage name) {
         idObjectPair = new IdObjectPair(id, name);
@@ -21,10 +21,10 @@ public LocalizedMessage getName() {
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
diff --git a/server/src/imcode/util/IdLocalizedNamePairToOptionTransformer.java b/server/src/imcode/util/IdLocalizedNamePairToOptionTransformer.java
index bc207546be..c404ac9b13 100644
--- a/server/src/imcode/util/IdLocalizedNamePairToOptionTransformer.java
+++ b/server/src/imcode/util/IdLocalizedNamePairToOptionTransformer.java
@@ -7,11 +7,11 @@ public class IdLocalizedNamePairToOptionTransformer implements Transformer {
     private String language;
 
     public IdLocalizedNamePairToOptionTransformer(String language) {
-        this.language = language ;
+        this.language = language;
     }
 
     public Object transform(Object input) {
-        IdLocalizedNamePair pair = (IdLocalizedNamePair) input ;
-        return new String[] {pair.getId()+"", pair.getName().toLocalizedString(language)};
+        IdLocalizedNamePair pair = (IdLocalizedNamePair) input;
+        return new String[]{pair.getId() + "", pair.getName().toLocalizedString(language)};
     }
 }
diff --git a/server/src/imcode/util/IdNamePair.java b/server/src/imcode/util/IdNamePair.java
index 29c8625b4a..14586f2b0f 100644
--- a/server/src/imcode/util/IdNamePair.java
+++ b/server/src/imcode/util/IdNamePair.java
@@ -6,7 +6,7 @@
 
 public class IdNamePair implements Comparable, Serializable {
 
-    private final IdObjectPair idObjectPair ;
+    private final IdObjectPair idObjectPair;
 
     public IdNamePair(int id, String name) {
         idObjectPair = new IdObjectPair(id, name);
@@ -21,10 +21,10 @@ public String getName() {
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
@@ -38,11 +38,11 @@ public int hashCode() {
         return idObjectPair.hashCode();
     }
 
-    public int compareTo( Object o ) {
-        return getName().compareToIgnoreCase( ( (IdNamePair)o ).getName() );
+    public int compareTo(Object o) {
+        return getName().compareToIgnoreCase(((IdNamePair) o).getName());
     }
 
     public String toString() {
-        return "("+ ClassUtils.getShortClassName(getClass())+" "+idObjectPair+")";
+        return "(" + ClassUtils.getShortClassName(getClass()) + " " + idObjectPair + ")";
     }
 }
diff --git a/server/src/imcode/util/IdObjectPair.java b/server/src/imcode/util/IdObjectPair.java
index 33929693fe..e2b1807c34 100644
--- a/server/src/imcode/util/IdObjectPair.java
+++ b/server/src/imcode/util/IdObjectPair.java
@@ -6,11 +6,11 @@
 
 public class IdObjectPair implements Serializable {
 
-    private final int id ;
+    private final int id;
     private final Object object;
 
     public IdObjectPair(int id, Object object) {
-        this.id = id ;
+        this.id = id;
         this.object = object;
     }
 
@@ -23,14 +23,14 @@ public Object getObject() {
     }
 
     public String toString() {
-        return "("+ ClassUtils.getShortClassName(getClass()) +" "+id+" "+object.toString()+")" ;
+        return "(" + ClassUtils.getShortClassName(getClass()) + " " + id + " " + object.toString() + ")";
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
diff --git a/server/src/imcode/util/ImageExtensionFilenameFilter.java b/server/src/imcode/util/ImageExtensionFilenameFilter.java
index 9865ed860c..86233a89d1 100644
--- a/server/src/imcode/util/ImageExtensionFilenameFilter.java
+++ b/server/src/imcode/util/ImageExtensionFilenameFilter.java
@@ -5,12 +5,18 @@
 
 public class ImageExtensionFilenameFilter implements FilenameFilter {
 
-    public boolean accept( File file, String filename ) {
+    public boolean accept(File file, String filename) {
         String name = filename.toLowerCase();
-        boolean jpeg = name.endsWith( ".jpg" ) || name.endsWith( ".jpeg" );
-        boolean gif = name.endsWith( ".gif" );
-        boolean png = name.endsWith( ".png" );
-        return jpeg || gif || png ;
+        boolean jpeg = name.endsWith(".jpg") || name.endsWith(".jpeg");
+        boolean gif = name.endsWith(".gif");
+        boolean png = name.endsWith(".png");
+        boolean psd = name.endsWith(".psd");
+        boolean svg = name.endsWith(".svg");
+        boolean tiff = name.endsWith(".tif");
+        boolean xcf = name.endsWith(".xcf");
+        boolean pict = name.endsWith(".pct");
+
+        return jpeg || gif || png || psd || svg || tiff || xcf || pict;
     }
 
 }
diff --git a/server/src/imcode/util/ImageForWebExtensionFilenameFilter.java b/server/src/imcode/util/ImageForWebExtensionFilenameFilter.java
new file mode 100644
index 0000000000..17e8a63f5e
--- /dev/null
+++ b/server/src/imcode/util/ImageForWebExtensionFilenameFilter.java
@@ -0,0 +1,18 @@
+package imcode.util;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+public class ImageForWebExtensionFilenameFilter implements FilenameFilter {
+
+    public boolean accept(File file, String filename) {
+        String name = filename.toLowerCase();
+        boolean jpeg = name.endsWith(".jpg") || name.endsWith(".jpeg");
+        boolean gif = name.endsWith(".gif");
+        boolean png = name.endsWith(".png");
+
+        return jpeg || gif || png;
+    }
+
+}
+
diff --git a/server/src/imcode/util/ImcmsImageUtils.java b/server/src/imcode/util/ImcmsImageUtils.java
index 4936f1ce95..534536dcf4 100644
--- a/server/src/imcode/util/ImcmsImageUtils.java
+++ b/server/src/imcode/util/ImcmsImageUtils.java
@@ -7,44 +7,88 @@
 import imcode.server.ImcmsServices;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.FileDocumentDomainObject;
-import imcode.server.document.textdocument.FileDocumentImageSource;
-import imcode.server.document.textdocument.ImageDomainObject;
-import imcode.server.document.textdocument.ImageSource;
-import imcode.server.document.textdocument.ImagesPathRelativePathImageSource;
-import imcode.server.document.textdocument.NullImageSource;
+import imcode.server.document.textdocument.*;
+import imcode.server.document.textdocument.ImageDomainObject.CropRegion;
+import imcode.server.document.textdocument.ImageDomainObject.RotateDirection;
+import imcode.util.image.Filter;
+import imcode.util.image.Format;
+import imcode.util.image.ImageOp;
+import imcode.util.image.Resize;
+import imcode.util.io.FileInputStreamSource;
+import imcode.util.io.InputStreamSource;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.collections.map.LRUMap;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Properties;
+import java.io.*;
+import java.util.*;
 
 public class ImcmsImageUtils {
+    private static final Logger log = LogManager.getLogger(ImcmsImageUtils.class);
+
+    // Set of file paths of images being currently generated.
+    private static final Set<String> IMAGES_BEING_GENERATED = Collections.synchronizedSet(new HashSet<>());
+
+    private static Map<String, ImageSize> IMAGE_SIZE_CACHE;
+
 
     private ImcmsImageUtils() {
     }
 
-    public static String getImageHtmlTag(ImageDomainObject image, HttpServletRequest request, Properties attributes) {
-        return getImageHtmlTag(image, request, attributes, false);
+    public static String getImageHtmlTag(Integer metaId, ImageDomainObject image, HttpServletRequest request, Properties attributes) {
+        return getImageHtmlTag(metaId, image, request, attributes, false);
+    }
+
+    public static String getImageHtmlTag(Integer metaId, ImageDomainObject image, HttpServletRequest request, Properties attributes, boolean absoluteUrl) {
+        return getImageHtmlTag(metaId, image, request, attributes, absoluteUrl, false);
     }
-    
-    public static String getImageHtmlTag(ImageDomainObject image, HttpServletRequest request, Properties attributes, boolean absoluteUrl) {
+
+    public static String getImagePreviewHtmlTag(ImageDomainObject image, HttpServletRequest request, Properties attributes) {
+        return getImageHtmlTag(null, image, request, attributes, false, true);
+    }
+
+    private static String getImageHtmlTag(Integer metaId, ImageDomainObject image, HttpServletRequest request, Properties attributes,
+                                          boolean absoluteUrl, boolean forPreview) {
+
         StringBuffer imageTagBuffer = new StringBuffer(96);
-        if ( image.getSize() > 0 ) {
+        if (image.getSize() > 0) {
 
-            if ( StringUtils.isNotBlank(image.getLinkUrl()) ) {
-                imageTagBuffer.append("<a href=\"").append(StringEscapeUtils.escapeHtml(image.getLinkUrl())).append("\"");
-                if ( !"".equals(image.getTarget()) ) {
+            if (StringUtils.isNotBlank(image.getLinkUrl())) {
+                String linkUrl = image.getLinkUrl().trim();
+                try {
+                    if (linkUrl.matches("^\\d+$")) { // metaId
+                        linkUrl = request.getContextPath() + "/" + linkUrl;
+                    } else if (!linkUrl.contains(":") && !"".equals(request.getContextPath()) && linkUrl.startsWith("/") && !linkUrl.startsWith(request.getContextPath())) { // /pathOrMetaIdWithoutCp
+                        linkUrl = request.getContextPath() + linkUrl;
+                    } else if (!linkUrl.contains(":") && linkUrl.toLowerCase().matches("^[\\w].*")) { // alias no slashOrCp
+                        linkUrl = request.getContextPath() + "/" + linkUrl;
+                    }
+                } catch (Exception ignore) {
+                }
+                imageTagBuffer.append("<a href=\"").append(StringEscapeUtils.escapeHtml(linkUrl)).append("\"");
+                if (!"".equals(image.getTarget())) {
                     imageTagBuffer.append(" target=\"").append(StringEscapeUtils.escapeHtml(image.getTarget())).append("\"");
                 }
                 imageTagBuffer.append('>');
             }
 
-            String urlEscapedImageUrl = Utility.escapeUrl(request.getContextPath() + image.getUrlPathRelativeToContextPath());
+            String urlEscapedImageUrl;
+            if (forPreview) {
+                urlEscapedImageUrl = getImagePreviewUrl(image, request.getContextPath());
+            } else {
+                urlEscapedImageUrl = getImageUrl(metaId, image, request.getContextPath());
+            }
+
             if (absoluteUrl) {
                 StringBuffer requestURL = request.getRequestURL();
-                urlEscapedImageUrl = requestURL.substring(0,StringUtils.ordinalIndexOf(requestURL.toString(), "/", 3))+urlEscapedImageUrl;
+                urlEscapedImageUrl = requestURL.substring(0, StringUtils.ordinalIndexOf(requestURL.toString(), "/", 3)) + urlEscapedImageUrl;
             }
-            
+
             imageTagBuffer.append("<img src=\"").append(StringEscapeUtils.escapeHtml(urlEscapedImageUrl)).append("\"");
 
             imageTagBuffer.append(" alt=\"").append(StringEscapeUtils.escapeHtml(image.getAlternateText())).append("\"");
@@ -52,20 +96,20 @@ public static String getImageHtmlTag(ImageDomainObject image, HttpServletRequest
 
             String id = image.getName();
             String idAttribute = attributes.getProperty("id");
-            if ( StringUtils.isNotBlank(idAttribute) ) {
+            if (StringUtils.isNotBlank(idAttribute)) {
                 id = idAttribute;
             }
-            if ( StringUtils.isNotBlank(id) ) {
+            if (StringUtils.isNotBlank(id)) {
                 imageTagBuffer.append(" id=\"").append(StringEscapeUtils.escapeHtml(id)).append("\"");
             }
 
             String classAttribute = attributes.getProperty("class");
-            if ( null != classAttribute ) {
+            if (null != classAttribute) {
                 imageTagBuffer.append(" class=\"").append(StringEscapeUtils.escapeHtml(classAttribute)).append("\"");
             }
 
             String usemapAttribute = attributes.getProperty("usemap");
-            if ( null != usemapAttribute ) {
+            if (null != usemapAttribute) {
                 imageTagBuffer.append(" usemap=\"").append(StringEscapeUtils.escapeHtml(usemapAttribute)).append("\"");
             }
 
@@ -73,64 +117,369 @@ public static String getImageHtmlTag(ImageDomainObject image, HttpServletRequest
 
             styleBuffer.append("border-width: ").append(image.getBorder()).append("px;");
 
-            ImageSize displayImageSize = image.getDisplayImageSize();
-            int width = displayImageSize.getWidth();
-            int height = displayImageSize.getHeight();
-            if ( 0 != width ) {
-                imageTagBuffer.append(" width=\"").append(width).append("\"");
-                styleBuffer.append(" width: ").append(width).append("px;");
-            }
-            if ( 0 != height ) {
-                imageTagBuffer.append(" height=\"").append(height).append("\"");
-                styleBuffer.append(" height: ").append(height).append("px;");
-            }
-
             styleBuffer.append(" margin: ")
                     .append(image.getVerticalSpace()).append("px ")
                     .append(image.getHorizontalSpace()).append("px;");
 
-            if ( StringUtils.isNotBlank(image.getAlign()) && "left".equals(image.getAlign()) ) {
+            if (StringUtils.isNotBlank(image.getAlign()) && "left".equals(image.getAlign())) {
                 styleBuffer.append(" align: ").append(StringEscapeUtils.escapeHtml(image.getAlign())).append(";");
             }
-            if ( StringUtils.isNotBlank(image.getAlign()) && "right".equals(image.getAlign()) ) {
+            if (StringUtils.isNotBlank(image.getAlign()) && "right".equals(image.getAlign())) {
                 styleBuffer.append(" align: ").append(StringEscapeUtils.escapeHtml(image.getAlign())).append(";");
             }
-            if ( StringUtils.isNotBlank(image.getAlign()) && !"none".equals(image.getAlign()) ) {
+            if (StringUtils.isNotBlank(image.getAlign()) && !"none".equals(image.getAlign())) {
                 styleBuffer.append(" vertical-align: ").append(StringEscapeUtils.escapeHtml(image.getAlign())).append(";");
             }
 
             String styleAttribute = attributes.getProperty("style");
-            if ( null != styleAttribute ) {
+            if (null != styleAttribute) {
                 styleBuffer.append(" ").append(styleAttribute);
             }
 
             imageTagBuffer.append(" style=\"").append(StringEscapeUtils.escapeHtml(styleBuffer.toString())).append("\"");
 
             imageTagBuffer.append(" />");
-            if ( StringUtils.isNotBlank(image.getLinkUrl()) ) {
+            if (StringUtils.isNotBlank(image.getLinkUrl())) {
                 imageTagBuffer.append("</a>");
             }
         }
         return imageTagBuffer.toString();
     }
 
+    public static String getImageUrl(Integer metaId, ImageDomainObject image, String contextPath) {
+        return getImageUrl(metaId, image, contextPath, false);
+    }
+
+    public static String getImageUrl(Integer metaId, ImageDomainObject image, String contextPath, boolean includeQueryParams) {
+        String generatedFilename = image.getGeneratedFilename();
+
+        if (generatedFilename == null) {
+            return getImageHandlingUrl(metaId, image, contextPath);
+        }
+
+        File generatedFile = image.getGeneratedFile();
+
+        if (!generatedFile.exists()) {
+            generateImage(image, false);
+
+        } else if (isImageModified(image, generatedFile)) {
+            generateImage(image, true);
+
+        }
+
+        String url = image.getGeneratedUrlPath(contextPath);
+
+        if (includeQueryParams) {
+            url += getImageQueryString(metaId, image, false);
+        }
+
+        return url;
+    }
+
+    public static String getImageHandlingUrl(Integer metaId, ImageDomainObject image, String contextPath) {
+
+        return contextPath + "/imagehandling" + getImageQueryString(metaId, image, false);
+    }
+
+    public static String getImagePreviewUrl(ImageDomainObject image, String contextPath) {
+
+        return contextPath + "/servlet/ImagePreview" + getImageQueryString(null, image, true);
+    }
+
+    private static String getImageQueryString(Integer metaId, ImageDomainObject image, boolean forPreview) {
+        StringBuilder builder = new StringBuilder("?");
+
+        if (!forPreview && image.getSource() instanceof FileDocumentImageSource) {
+            FileDocumentImageSource source = (FileDocumentImageSource) image.getSource();
+            FileDocumentDomainObject fileDocument = source.getFileDocument();
+            builder.append("file_id=");
+            builder.append(fileDocument.getId());
+            builder.append("&file_no=");
+            builder.append(fileDocument.getDefaultFileId());
+        } else {
+            builder.append("path=");
+            builder.append(Utility.encodeUrl(image.getUrlPathRelativeToContextPath()));
+        }
+
+        if (!forPreview) {
+            builder.append("&meta_id=");
+            builder.append(metaId);
+
+            Integer imageIndex = image.getImageIndex();
+            if (imageIndex != null) {
+                builder.append("&no=");
+                builder.append(imageIndex);
+            }
+        }
+
+        if (image.getWidth() > 0) {
+            builder.append("&width=");
+            builder.append(image.getWidth());
+        }
+        if (image.getHeight() > 0) {
+            builder.append("&height=");
+            builder.append(image.getHeight());
+        }
+
+        if (image.getFormat() != null) {
+            builder.append("&format=");
+            builder.append(image.getFormat().getExtension());
+        }
+
+        CropRegion region = image.getCropRegion();
+        if (region.isValid()) {
+            builder.append("&crop_x1=");
+            builder.append(region.getCropX1());
+            builder.append("&crop_y1=");
+            builder.append(region.getCropY1());
+            builder.append("&crop_x2=");
+            builder.append(region.getCropX2());
+            builder.append("&crop_y2=");
+            builder.append(region.getCropY2());
+        }
+
+        RotateDirection rotateDir = image.getRotateDirection();
+        if (!rotateDir.isDefault()) {
+            builder.append("&rangle=");
+            builder.append(rotateDir.getAngle());
+        }
+
+        if (!forPreview && image.getGeneratedFilename() != null) {
+            builder.append("&gen_file=");
+            builder.append(image.getGeneratedFilename());
+        }
+
+        if (image.getResize() != null) {
+            builder.append("&resize=");
+            builder.append(image.getResize().name().toLowerCase());
+        }
+
+        return builder.toString();
+    }
+
+    private static boolean isImageModified(ImageDomainObject image, File generatedFile) {
+        Date sourceModDate = image.getSource().getModifiedDatetime();
+
+        if (sourceModDate == null) {
+            return true;
+        }
+
+        long lastModified = generatedFile.lastModified();
+        if (lastModified == 0L) {
+            return true;
+        }
+        Date generatedModDate = new Date(lastModified);
+
+        return sourceModDate.after(generatedModDate);
+    }
+
+    public static void generateImage(ImageDomainObject image, boolean overwrite) {
+        File genFile = image.getGeneratedFile();
+
+        if (!overwrite && genFile.exists()) {
+            return;
+        }
+
+        ImageSource source = image.getSource();
+
+        if (source instanceof NullImageSource) {
+            if (overwrite && genFile.exists()) {
+                genFile.delete();
+            }
+            return;
+        }
+
+        InputStream input = null;
+        OutputStream output = null;
+        File tempFile = null;
+
+        try {
+            File imagePath = Imcms.getServices().getConfig().getImagePath();
+            String imagePathCanon = imagePath.getCanonicalPath();
+            boolean isPathContainSymlink = !genFile.getAbsolutePath().equals(genFile.getCanonicalPath());
+            String genFileCanon = isPathContainSymlink ? genFile.getAbsolutePath() : genFile.getCanonicalPath();
+
+            if (!genFileCanon.startsWith(imagePathCanon)) {
+                return;
+            }
+
+            File parentFile = genFile.getParentFile();
+            if (!parentFile.exists()) {
+                parentFile.mkdir();
+            }
+
+            File inputFile;
+
+            InputStreamSource inputSource = source.getInputStreamSource();
+            if (inputSource instanceof FileInputStreamSource) {
+                inputFile = ((FileInputStreamSource) inputSource).getFile();
+
+            } else {
+                tempFile = File.createTempFile("genimg", null);
+                inputFile = tempFile;
+
+                input = source.getInputStreamSource().getInputStream();
+                output = new BufferedOutputStream(new FileOutputStream(tempFile));
+
+                IOUtils.copy(input, output);
+                IOUtils.closeQuietly(output);
+
+            }
+
+
+            generateImage(inputFile, genFile, image.getFormat(), image.getWidth(), image.getHeight(), image.getResize(),
+                    image.getCropRegion(), image.getRotateDirection());
+
+        } catch (Exception ex) {
+            log.warn(ex.getMessage(), ex);
+
+            genFile.delete();
+
+        } finally {
+            IOUtils.closeQuietly(input);
+            IOUtils.closeQuietly(output);
+
+            if (tempFile != null) {
+                tempFile.delete();
+            }
+        }
+    }
+
+    public static boolean generateImage(File imageFile, File destFile, Format format, int width, int height,
+                                        Resize resize, CropRegion cropRegion, RotateDirection rotateDir) {
+
+        String destPath;
+        try {
+            destPath = destFile.getCanonicalPath();
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+
+        if (!IMAGES_BEING_GENERATED.add(destPath)) {
+            return true;
+        }
+
+        try {
+            ImageOp operation = new ImageOp(Imcms.getServices().getConfig()).input(imageFile);
+
+
+            if (!rotateDir.isDefault()) {
+                operation.rotate(rotateDir.getAngle());
+            }
+
+            if (cropRegion.isValid()) {
+                int cropWidth = cropRegion.getWidth();
+                int cropHeight = cropRegion.getHeight();
+
+                operation.crop(cropRegion.getCropX1(), cropRegion.getCropY1(), cropWidth, cropHeight);
+            }
+
+            if (width > 0 || height > 0) {
+                Integer w = (width > 0 ? width : null);
+                Integer h = (height > 0 ? height : null);
+
+                if (resize == null) {
+                    resize = (width > 0 && height > 0 ? Resize.FORCE : Resize.DEFAULT);
+                }
+
+                operation.filter(Filter.LANCZOS);
+                operation.resize(w, h, resize);
+            }
+
+            if (format != null) {
+                operation.outputFormat(format);
+            }
+
+            return operation.processToFile(destFile);
+
+        } finally {
+            IMAGES_BEING_GENERATED.remove(destPath);
+
+        }
+    }
+
+    public static String getImageETag(String path, File imageFile, int fileId, String fileNo,
+                                      Format format, int width, int height, CropRegion cropRegion,
+                                      RotateDirection rotateDirection) {
+
+        StringBuilder builder = new StringBuilder();
+        builder.append(path);
+        if (imageFile != null) {
+            builder.append(imageFile.length());
+            builder.append(imageFile.lastModified());
+        }
+        builder.append(width);
+        builder.append(height);
+        builder.append(rotateDirection.name());
+
+        if (format != null) {
+            builder.append(format.getOrdinal());
+        }
+        if (cropRegion != null) {
+            builder.append(cropRegion.getCropX1());
+            builder.append(cropRegion.getCropY1());
+            builder.append(cropRegion.getCropX2());
+            builder.append(cropRegion.getCropY2());
+        }
+
+        if (fileId > 0) {
+            builder.append(fileId);
+        }
+        if (fileNo != null) {
+            builder.append(fileNo);
+        }
+
+        return "W/\"" + DigestUtils.md5Hex(builder.toString()) + "\"";
+    }
+
     public static ImageSource createImageSourceFromString(String imageUrl) {
         ImageSource imageSource = new NullImageSource();
-        if ( StringUtils.isNotBlank(imageUrl) ) {
+        if (StringUtils.isNotBlank(imageUrl)) {
             ImcmsServices services = Imcms.getServices();
             DocumentMapper documentMapper = services.getDocumentMapper();
             String documentIdString = ImcmsSetupFilter.getDocumentIdString(services, imageUrl);
             DocumentDomainObject document = documentMapper.getDocument(documentIdString);
-            if ( document instanceof FileDocumentDomainObject ) {
+            if (document instanceof FileDocumentDomainObject) {
                 imageSource = new FileDocumentImageSource(documentMapper.getDocumentReference(document));
             } else {
+                String imageArchiveImageUrl = ImageArchiveImageSource.getImagesUrlPath();
                 String imagesPath = ImagesPathRelativePathImageSource.getImagesUrlPath();
-                if (imageUrl.startsWith(imagesPath)) {
-                    imageUrl = imageUrl.substring(imagesPath.length());
+
+                if (imageUrl.startsWith(imageArchiveImageUrl)) {
+                    imageUrl = imageUrl.substring(imageArchiveImageUrl.length());
+
+                    imageSource = new ImageArchiveImageSource(imageUrl);
+                } else {
+                    if (imageUrl.startsWith(imagesPath)) {
+                        imageUrl = imageUrl.substring(imagesPath.length());
+                    }
+
+                    imageSource = new ImagesPathRelativePathImageSource(imageUrl);
                 }
-                imageSource = new ImagesPathRelativePathImageSource(imageUrl);
             }
         }
         return imageSource;
     }
+
+    public static ImageSize getCachedRealSize(ImageDomainObject image) {
+        ImageSource source = image.getSource();
+
+        String cacheId = source.getCacheId();
+
+        ImageSize imageSize = IMAGE_SIZE_CACHE.get(cacheId);
+
+        if (imageSize != null) {
+            return imageSize;
+        }
+
+        imageSize = image.getRealImageSize();
+
+        IMAGE_SIZE_CACHE.put(cacheId, imageSize);
+
+        return imageSize;
+    }
+
+    public static void setImageSizeCacheObjects(int cacheSize) {
+        IMAGE_SIZE_CACHE = Collections.synchronizedMap(new LRUMap(cacheSize));
+    }
 }
diff --git a/server/src/imcode/util/IntegerSet.java b/server/src/imcode/util/IntegerSet.java
index be1084db93..f0249cfee2 100644
--- a/server/src/imcode/util/IntegerSet.java
+++ b/server/src/imcode/util/IntegerSet.java
@@ -9,34 +9,35 @@ public class IntegerSet extends AbstractSet {
     private final int[] ints;
 
     public IntegerSet(int integer) {
-        this(new int[] { integer }) ;
+        this(new int[]{integer});
     }
-    
+
     public IntegerSet(int[] ints) {
         this.ints = ints;
     }
 
     public int size() {
-        return ints.length ;
+        return ints.length;
     }
 
     public Iterator iterator() {
         return new Iterator() {
-            int arrayIndex = 0 ;
+            int arrayIndex = 0;
+
             public void remove() {
                 throw new UnsupportedOperationException();
             }
 
             public boolean hasNext() {
-                return arrayIndex < size() ;
+                return arrayIndex < size();
             }
 
             public Object next() {
                 if (!hasNext()) {
-                    throw new NoSuchElementException() ;
+                    throw new NoSuchElementException();
                 }
-                return new Integer(ints[arrayIndex++]) ;
+                return ints[arrayIndex++];
             }
-        } ;
+        };
     }
 }
diff --git a/server/src/imcode/util/IntervalSchedule.java b/server/src/imcode/util/IntervalSchedule.java
index 550a6deb21..625a0e9b77 100644
--- a/server/src/imcode/util/IntervalSchedule.java
+++ b/server/src/imcode/util/IntervalSchedule.java
@@ -8,7 +8,7 @@ public class IntervalSchedule {
     private long scheduleInterval;
     private long scheduledTime;
 
-    public IntervalSchedule( long scheduleInterval ) {
+    public IntervalSchedule(long scheduleInterval) {
         this.scheduleInterval = scheduleInterval;
         this.scheduledTime = scheduleInterval;
         this.stopWatch = new StopWatch();
@@ -16,7 +16,7 @@ public IntervalSchedule( long scheduleInterval ) {
     }
 
     public boolean isTime() {
-        if ( stopWatch.getTime() < scheduledTime ) {
+        if (stopWatch.getTime() < scheduledTime) {
             return false;
         }
         scheduledTime += scheduleInterval;
diff --git a/server/src/imcode/util/LazilyLoadedObject.java b/server/src/imcode/util/LazilyLoadedObject.java
index 629ec918b1..f53f27aca5 100644
--- a/server/src/imcode/util/LazilyLoadedObject.java
+++ b/server/src/imcode/util/LazilyLoadedObject.java
@@ -1,8 +1,8 @@
 package imcode.util;
 
-import java.io.Serializable;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 public class LazilyLoadedObject<E extends LazilyLoadedObject.Copyable<E>> implements Serializable, Cloneable {
 
@@ -10,18 +10,18 @@ public class LazilyLoadedObject<E extends LazilyLoadedObject.Copyable<E>> implem
     private E object;
 
     public LazilyLoadedObject(Loader<E> loader) {
-        this.loader = loader ;
+        this.loader = loader;
     }
 
-    public Object get() {
-        load() ;
+    public E get() {
+        load();
         return object;
     }
 
     public void load() {
         if (!isLoaded()) {
             E loaded = loader.load();
-            object = loaded.copy() ;
+            object = loaded.copy();
             setLoaded();
         }
     }
@@ -30,33 +30,33 @@ private boolean isLoaded() {
         return null == loader;
     }
 
-    public Object clone() throws CloneNotSupportedException {
-        LazilyLoadedObject clone = (LazilyLoadedObject) super.clone();
+    public LazilyLoadedObject<E> clone() throws CloneNotSupportedException {
+        LazilyLoadedObject<E> clone = (LazilyLoadedObject<E>) super.clone();
         if (null != object) {
-            clone.object = object.copy() ;
+            clone.object = object.copy();
         }
-        return clone ;
+        return clone;
     }
 
     public void set(E o) {
         setLoaded();
-        object = o ;
+        object = o;
     }
 
     private void setLoaded() {
-        loader = null ;
+        loader = null;
     }
 
-    public interface Loader<L extends Copyable> extends Serializable {
-        L load() ;
+    private void writeObject(ObjectOutputStream out) throws IOException {
+        load();
+        out.defaultWriteObject();
     }
 
-    public interface Copyable<C extends Copyable> extends Serializable {
-        C copy() ;
+    public interface Loader<L extends Copyable> extends Serializable {
+        L load();
     }
 
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        load();
-        out.defaultWriteObject();
+    public interface Copyable<C extends Copyable> extends Serializable {
+        C copy();
     }
 }
diff --git a/server/src/imcode/util/Parser.java b/server/src/imcode/util/Parser.java
index 1b09157673..0c78990fa4 100644
--- a/server/src/imcode/util/Parser.java
+++ b/server/src/imcode/util/Parser.java
@@ -1,7 +1,5 @@
 package imcode.util;
 
-import java.util.Map;
-
 public class Parser {
 
     /**
@@ -28,14 +26,15 @@ public static String parseDoc(String doc, String[] tagsAndData) {
      */
     private static void parseDoc(StringBuffer sb, String[] tagsAndData) {
         if (sb == null) {
-            return ;
+            return;
         }
         int length;
         for (int i = 0; i < tagsAndData.length; i += 2) {
             length = tagsAndData[i].length();
             if (length > 0) {
                 String replacement = (null == tagsAndData[i + 1]) ? "" : tagsAndData[i + 1];
-                for (int start = 0; (start = sb.toString().indexOf(tagsAndData[i], start)) != -1; start += replacement.length()) {
+                for (int start = 0; (start = sb.toString().indexOf(tagsAndData[i], start)) != -1; start += replacement.length())
+                {
                     sb.replace(start, start + length, replacement);
                 }
             }
diff --git a/server/src/imcode/util/Prefs.java b/server/src/imcode/util/Prefs.java
index 34b9f7b919..ffbec32fe7 100644
--- a/server/src/imcode/util/Prefs.java
+++ b/server/src/imcode/util/Prefs.java
@@ -1,4 +1,4 @@
-package imcode.util ;
+package imcode.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -14,20 +14,22 @@
  */
 public class Prefs {
 
-    private final static Map CACHE = Collections.synchronizedMap(new HashMap());
+    private final static Map<File, Properties> CACHE = Collections.synchronizedMap(new HashMap<>());
     private static File configPath;
 
     private Prefs() {
     }
 
-    /*
+    /**
      * This static method must be called before any of the other static methods
      */
     public static void setConfigPath(File confPath) {
         configPath = confPath;
     }
 
-    /** Flushes the cache, causing the files to be loaded again, when they are needed. */
+    /**
+     * Flushes the cache, causing the files to be loaded again, when they are needed.
+     */
     public static void flush() {
         CACHE.clear();
     }
@@ -48,22 +50,15 @@ public static Properties getProperties(String file) throws IOException {
      * @param file The file to load from.
      * @return The properties in the file.
      */
-
     private static Properties getProperties(File file) throws IOException {
-        Properties properties = (Properties) CACHE.get(file);
-        if ( properties == null ) {
-            FileInputStream in = null;
-            try {
-                in = new FileInputStream(file);
+        Properties properties = CACHE.get(file);
+        if (properties == null) {
+            try (FileInputStream in = new FileInputStream(file)) {
                 properties = new Properties();
                 properties.load(in);
                 CACHE.put(file, properties);
-            } catch ( IOException ex ) {
+            } catch (IOException ex) {
                 throw new IOException("Prefs: File not found: " + file.getAbsolutePath());
-            } finally {
-                if (null != in) {
-                    in.close();
-                }
             }
         }
         return properties;
diff --git a/server/src/imcode/util/ShouldNotBeThrownException.java b/server/src/imcode/util/ShouldNotBeThrownException.java
index 1ba8c0de56..de002cdb61 100644
--- a/server/src/imcode/util/ShouldNotBeThrownException.java
+++ b/server/src/imcode/util/ShouldNotBeThrownException.java
@@ -4,6 +4,6 @@
 
 public class ShouldNotBeThrownException extends UnhandledException {
     public ShouldNotBeThrownException(Throwable cause) {
-        super(cause) ;
+        super(cause);
     }
 }
diff --git a/server/src/imcode/util/ToDoubleObjectStringPairTransformer.java b/server/src/imcode/util/ToDoubleObjectStringPairTransformer.java
index 150430e9a9..a2087f0ed5 100644
--- a/server/src/imcode/util/ToDoubleObjectStringPairTransformer.java
+++ b/server/src/imcode/util/ToDoubleObjectStringPairTransformer.java
@@ -3,7 +3,7 @@
 public class ToDoubleObjectStringPairTransformer extends ToStringPairTransformer {
 
     protected String[] transformToStringPair(Object object) {
-        return new String[] {""+object,""+object} ;
+        return new String[]{"" + object, "" + object};
     }
 
 }
diff --git a/server/src/imcode/util/ToStringPairTransformer.java b/server/src/imcode/util/ToStringPairTransformer.java
index cf59ea50a9..237aa790a8 100644
--- a/server/src/imcode/util/ToStringPairTransformer.java
+++ b/server/src/imcode/util/ToStringPairTransformer.java
@@ -7,5 +7,5 @@ public final Object transform(Object object) {
         return transformToStringPair(object);
     }
 
-    protected abstract String[] transformToStringPair(Object object) ;
+    protected abstract String[] transformToStringPair(Object object);
 }
diff --git a/server/src/imcode/util/Utility.java b/server/src/imcode/util/Utility.java
index 555aa066db..e22d02bd8a 100644
--- a/server/src/imcode/util/Utility.java
+++ b/server/src/imcode/util/Utility.java
@@ -1,48 +1,47 @@
 package imcode.util;
 
+import com.imcode.db.handlers.SingleObjectHandler;
 import com.imcode.imcms.api.ContentManagementSystem;
 import com.imcode.imcms.api.DefaultContentManagementSystem;
+import com.imcode.imcms.db.*;
 import com.imcode.imcms.servlet.VerifyUser;
-import com.imcode.imcms.db.StringFromRowFactory;
-import com.imcode.imcms.db.StringArrayResultSetHandler;
-import com.imcode.imcms.db.StringArrayArrayResultSetHandler;
+import com.imcode.imcms.servlet.beans.SessionInfoDTO;
 import com.imcode.imcms.util.l10n.LocalizedMessage;
-import com.imcode.db.handlers.SingleObjectHandler;
 import imcode.server.Imcms;
 import imcode.server.ImcmsServices;
 import imcode.server.document.DocumentDomainObject;
 import imcode.server.user.UserDomainObject;
 import imcode.util.io.FileUtility;
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.MultiMap;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.SetUtils;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections.*;
 import org.apache.commons.collections.iterators.ObjectArrayIterator;
 import org.apache.commons.collections.iterators.TransformIterator;
+import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.validator.routines.EmailValidator;
+import org.apache.logging.log4j.CloseableThreadContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.w3c.dom.Document;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import javax.servlet.http.*;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.net.URLEncoder;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -51,20 +50,28 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public class Utility {
 
-   private final static Logger log = Logger.getLogger( Utility.class.getName() );
+    public static final ResultSetHandler<String> SINGLE_STRING_HANDLER = new SingleObjectHandler<>(new StringFromRowFactory());
+    public static final ResultSetHandler<String[]> STRING_ARRAY_HANDLER = new StringArrayResultSetHandler();
+    public static final ResultSetHandler<List<String>> STRING_LIST_HANDLER = new StringListResultSetHandler();
+    public static final ResultSetHandler<List<Integer>> INTEGER_LIST_HANDLER = new IntegerListResultSetHandler();
+    public static final ResultSetHandler<String[][]> STRING_ARRAY_ARRAY_HANDLER = new StringArrayArrayResultSetHandler();
+    public static final String IM_TOKEN = "im_token";
+    public static final String IM_TOKEN_DATE = "im_token_date";
 
+    private final static Logger log = LogManager.getLogger(Utility.class.getName());
     private final static String CONTENT_MANAGEMENT_SYSTEM_REQUEST_ATTRIBUTE = "com.imcode.imcms.ImcmsSystem";
-
     private final static LocalizedMessage ERROR__NO_PERMISSION = new LocalizedMessage("templates/login/no_permission.html/4");
-    public static final ResultSetHandler SINGLE_STRING_HANDLER = new SingleObjectHandler(new StringFromRowFactory());
-    public static final ResultSetHandler STRING_ARRAY_HANDLER = new StringArrayResultSetHandler();
-    public static final ResultSetHandler STRING_ARRAY_ARRAY_HANDLER = new StringArrayArrayResultSetHandler();
     private static final String LOGGED_IN_USER = "logon.isDone";
+    private static final Pattern DOMAIN_PATTERN = Pattern.compile("^.*?([^.]+?\\.[^.]+)$");
+    private static final Pattern IP_PATTERN = Pattern.compile("^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$");
+    private static final int STATIC_FINAL_MODIFIER_MASK = Modifier.STATIC | Modifier.FINAL;
+    private static final Map<String, SessionInfoDTO> sessions = new HashMap<>();
 
     private Utility() {
 
@@ -73,249 +80,273 @@ private Utility() {
     /**
      * Transforms a long containing an ip into a String.
      */
-    public static String ipLongToString( long ip ) {
-        return ( ip >>> 24 & 255 ) + "." + ( ip >>> 16 & 255 ) + "." + ( ip >>> 8 & 255 ) + "."
-               + ( ip & 255 );
+    public static String ipLongToString(long ip) {
+        return (ip >>> 24 & 255) + "." + (ip >>> 16 & 255) + "." + (ip >>> 8 & 255) + "."
+                + (ip & 255);
     }
 
     /**
      * Transforms a String containing an ip into a long.
-     * 
+     *
      * @throws IllegalArgumentException if the input is not a valid IPv4 address.
      */
-    public static long ipStringToLong( String ip ) throws IllegalArgumentException {
+    public static long ipStringToLong(String ip) throws IllegalArgumentException {
         long ipInt = 0;
-        StringTokenizer ipTok = new StringTokenizer( ip, "." );
-        if ( 4 != ipTok.countTokens() ) {
-            throw new IllegalArgumentException("Not a valid IPv4 address.") ;
+
+        StringTokenizer ipTok = new StringTokenizer(ip, ".");
+
+        if (4 != ipTok.countTokens()) {
+            throw new IllegalArgumentException("Not a valid IPv4 address: " + ip);
         }
-        for ( int exp = 3; ipTok.hasMoreTokens(); --exp ) {
-            int ipNum = Integer.parseInt( ipTok.nextToken() );
-            ipInt += ipNum * Math.pow( 256, exp );
+
+        for (int exp = 3; ipTok.hasMoreTokens(); --exp) {
+            int ipNum = Integer.parseInt(ipTok.nextToken());
+            ipInt += ipNum * Math.pow(256, exp);
         }
+
         return ipInt;
     }
 
     /**
      * Make a HttpServletResponse non-cacheable
      */
-    public static void setNoCache( HttpServletResponse res ) {
-        res.setHeader( "Cache-Control", "no-cache; must-revalidate;" );
-        res.setHeader( "Pragma", "no-cache;" );
-        res.setDateHeader( "Expires", 0 );
+    public static void setNoCache(HttpServletResponse res) {
+        res.setHeader("Cache-Control", "no-cache; must-revalidate;");
+        res.setHeader("Pragma", "no-cache;");
+        res.setDateHeader("Expires", 0);
     }
 
-    public static UserDomainObject getLoggedOnUser( HttpServletRequest req ) {
-        return (UserDomainObject)req.getSession().getAttribute( LOGGED_IN_USER );
+    public static UserDomainObject getLoggedOnUser(HttpServletRequest req) {
+        return (UserDomainObject) req.getSession().getAttribute(LOGGED_IN_USER);
     }
 
-    public static int compareDatesWithNullFirst( Date date1, Date date2 ) {
-        if ( null == date1 && null == date2 ) {
+    public static int compareDatesWithNullFirst(Date date1, Date date2) {
+        if (null == date1 && null == date2) {
             return 0;
-        } else if ( null == date1 ) {
+        } else if (null == date1) {
             return -1;
-        } else if ( null == date2 ) {
+        } else if (null == date2) {
             return +1;
         } else {
-            return date1.compareTo( date2 );
+            return date1.compareTo(date2);
         }
     }
 
-    public static void setDefaultHtmlContentType( HttpServletResponse res ) {
-        res.setContentType( "text/html; charset=" + Imcms.DEFAULT_ENCODING );
+    public static void setDefaultHtmlContentType(HttpServletResponse res) {
+        res.setContentType("text/html; charset=" + Imcms.DEFAULT_ENCODING);
     }
 
-    public static void redirectToStartDocument( HttpServletRequest req, HttpServletResponse res ) throws IOException {
-        res.sendRedirect( req.getContextPath() + "/servlet/StartDoc" );
+    public static void redirectToStartDocument(HttpServletRequest req, HttpServletResponse res) throws IOException {
+        res.sendRedirect(req.getContextPath() + "/servlet/StartDoc");
     }
 
-    public static boolean isValidEmail( String email ) {
-        return Pattern.compile( "\\w+@\\w+" ).matcher( email ).find();
+    public static boolean isValidEmail(String email) {
+        return EmailValidator.getInstance().isValid(email);
     }
 
-    public static void removeNullValuesFromMap( Map map ) {
+    public static void removeNullValuesFromMap(Map map) {
         Collection values = map.values();
-        for ( Iterator iterator = values.iterator(); iterator.hasNext(); ) {
-            if ( null == iterator.next() ) {
+        for (Iterator iterator = values.iterator(); iterator.hasNext(); ) {
+            if (null == iterator.next()) {
                 iterator.remove();
             }
         }
     }
 
-    public static String createQueryStringFromParameterMultiMap( MultiMap requestParameters ) {
-        Set requestParameterStrings = SetUtils.orderedSet( new HashSet() );
-        for ( Iterator iterator = requestParameters.entrySet().iterator(); iterator.hasNext(); ) {
-            Map.Entry entry = (Map.Entry)iterator.next();
-            String parameterName = (String)entry.getKey();
-            Collection parameterValues = (Collection)entry.getValue();
-            for ( Iterator valuesIterator = parameterValues.iterator(); valuesIterator.hasNext(); ) {
-                String parameterValue = (String)valuesIterator.next();
-                requestParameterStrings.add( URLEncoder.encode( parameterName ) + "="
-                                             + URLEncoder.encode( parameterValue ) );
+    public static String createQueryStringFromParameterMultiMap(MultiMap requestParameters) {
+        Set requestParameterStrings = SetUtils.orderedSet(new HashSet());
+        for (Iterator iterator = requestParameters.entrySet().iterator(); iterator.hasNext(); ) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            String parameterName = (String) entry.getKey();
+            Collection parameterValues = (Collection) entry.getValue();
+            for (Iterator valuesIterator = parameterValues.iterator(); valuesIterator.hasNext(); ) {
+                String parameterValue = (String) valuesIterator.next();
+                requestParameterStrings.add(URLEncoder.encode(parameterName) + "="
+                        + URLEncoder.encode(parameterValue));
             }
         }
-        return StringUtils.join( requestParameterStrings.iterator(), "&" );
+        return StringUtils.join(requestParameterStrings.iterator(), "&");
     }
 
     public static Collection collectImageDirectories() {
         ImcmsServices service = Imcms.getServices();
         final File imagePath = service.getConfig().getImagePath();
-        return FileUtility.collectRelativeSubdirectoriesStartingWith( imagePath );
+        return FileUtility.collectRelativeSubdirectoriesStartingWith(imagePath);
     }
 
-    public static Object firstElementOfSetByOrderOf( Set set, Comparator comparator ) {
-        SortedSet sortedSet = new TreeSet( comparator );
-        sortedSet.addAll( set );
+    public static Object firstElementOfSetByOrderOf(Set set, Comparator comparator) {
+        SortedSet sortedSet = new TreeSet(comparator);
+        sortedSet.addAll(set);
         return sortedSet.iterator().next();
     }
 
-    public static boolean parameterIsSet( HttpServletRequest request, String parameter ) {
-        return null != request.getParameter( parameter );
+    public static boolean parameterIsSet(HttpServletRequest request, String parameter) {
+        return null != request.getParameter(parameter);
     }
 
-    public static int[] getParameterInts( HttpServletRequest request, String parameterName ) {
-        String[] parameterValues = request.getParameterValues( parameterName );
+    public static int[] getParameterInts(HttpServletRequest request, String parameterName) {
+        String[] parameterValues = request.getParameterValues(parameterName);
         if (null == parameterValues) {
-            return new int[0] ;
+            return new int[0];
         }
-        return convertStringArrayToIntArray( parameterValues );
+        return convertStringArrayToIntArray(parameterValues);
     }
 
-    public static int[] convertStringArrayToIntArray( String[] strings ) {
-        int[] parameterInts = new int[strings.length] ;
-        for ( int i = 0; i < strings.length; i++ ) {
+    public static int[] convertStringArrayToIntArray(String[] strings) {
+        int[] parameterInts = new int[strings.length];
+        for (int i = 0; i < strings.length; i++) {
             parameterInts[i] = Integer.parseInt(strings[i]);
         }
         return parameterInts;
     }
 
-    public static String getContents( String path, HttpServletRequest request,
-                                      HttpServletResponse response ) throws ServletException, IOException {
-        RequestDispatcher requestDispatcher = request.getRequestDispatcher( path );
-        if ( null == requestDispatcher ) {
-            throw new ServletException( "No RequestDispatcher for path \"" + path + "\". Maybe the path doesn't exist?" );
+    public static String getContents(String path, HttpServletRequest request,
+                                     HttpServletResponse response) throws ServletException, IOException {
+        RequestDispatcher requestDispatcher = request.getRequestDispatcher(path);
+        if (null == requestDispatcher) {
+            throw new ServletException("No RequestDispatcher for path \"" + path + "\". Maybe the path doesn't exist?");
         }
 
-        HttpServletResponseWrapper collectingHttpServletResponse = new CollectingHttpServletResponse( response );
-        requestDispatcher.include( request, collectingHttpServletResponse );
+        HttpServletResponseWrapper collectingHttpServletResponse = new CollectingHttpServletResponse(response);
+        requestDispatcher.include(request, collectingHttpServletResponse);
         return collectingHttpServletResponse.toString();
     }
 
-    public static String formatDate( Date oneWeekAgo ) {
-        return new SimpleDateFormat( DateConstants.DATE_FORMAT_STRING ).format( oneWeekAgo );
+    public static String formatDate(Date oneWeekAgo) {
+        return new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING).format(oneWeekAgo);
     }
 
-    public static String formatUser( UserDomainObject user ) {
-        return StringEscapeUtils.escapeHtml( user.getLastName() + ", " + user.getFirstName() + " (" + user.getLoginName() + ")" );
+    public static String formatUser(UserDomainObject user) {
+        return StringEscapeUtils.escapeHtml(user.getLastName() + ", " + user.getFirstName() + " (" + user.getLoginName() + ")");
     }
 
     public static String getAbsolutePathToDocument(HttpServletRequest request, DocumentDomainObject document) {
         if (null == document) {
-            return null ;
+            return null;
         }
-        return request.getContextPath() + getContextRelativePathToDocument( document ) ;
+        return request.getContextPath() + getContextRelativePathToDocument(document);
     }
 
-    public static String getContextRelativePathToDocument( DocumentDomainObject document ) {
+    public static String getContextRelativePathToDocument(DocumentDomainObject document) {
         if (null == document) {
-            return null ;
+            return null;
         }
         return getContextRelativePathToDocumentWithName(document.getName());
     }
 
     public static String getContextRelativePathToDocumentWithName(String name) {
-        String documentPathPrefix = Imcms.getServices().getConfig().getDocumentPathPrefix() ;
-        if (StringUtils.isBlank( documentPathPrefix )) {
-            documentPathPrefix = "/" ;
+        String documentPathPrefix = Imcms.getServices().getConfig().getDocumentPathPrefix();
+        if (StringUtils.isBlank(documentPathPrefix)) {
+            documentPathPrefix = "/";
         }
         return documentPathPrefix + name;
     }
 
-    public static String formatHtmlDatetime( Date datetime ) {
-        if ( null == datetime ) {
+    public static String formatHtmlDatetime(Date datetime) {
+        if (null == datetime) {
             return "";
         }
-        DateFormat dateFormat = new SimpleDateFormat( DateConstants.DATE_FORMAT_STRING + "'&nbsp;'"
-                                                      + DateConstants.TIME_NO_SECONDS_FORMAT_STRING );
-        return dateFormat.format( datetime );
+        DateFormat dateFormat = new SimpleDateFormat(DateConstants.DATE_FORMAT_STRING + "'&nbsp;'"
+                + DateConstants.TIME_NO_SECONDS_FORMAT_STRING);
+        return dateFormat.format(datetime);
+    }
+
+    public static void forwardToLogin(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        forwardToLogin(request, response, HttpServletResponse.SC_FORBIDDEN);
     }
 
-    public static void forwardToLogin( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException {
-        UserDomainObject user = getLoggedOnUser( request );
-        StringBuffer loginTarget = request.getRequestURL() ;
+    public static void forwardToLogin(HttpServletRequest request, HttpServletResponse response, int responseStatus) throws ServletException, IOException {
+        UserDomainObject user = getLoggedOnUser(request);
+        StringBuffer loginTarget = request.getRequestURL();
         String queryString = request.getQueryString();
         if (null != queryString) {
-            loginTarget.append( "?" ).append( queryString );
+            loginTarget.append("?").append(queryString);
         }
 
-        response.setStatus( HttpServletResponse.SC_FORBIDDEN );
-        request.setAttribute( VerifyUser.REQUEST_ATTRIBUTE__ERROR, ERROR__NO_PERMISSION );
-        request.getRequestDispatcher( "/imcms/" + user.getLanguageIso639_2() + "/login/index.jsp?"+VerifyUser.REQUEST_PARAMETER__NEXT_URL+"="+URLEncoder.encode( loginTarget.toString() ) ).forward( request,response );
+        response.setStatus(responseStatus);
+        request.setAttribute(VerifyUser.REQUEST_ATTRIBUTE__ERROR, ERROR__NO_PERMISSION);
+        request.getRequestDispatcher("/imcms/" + user.getLanguageIso639_2() + "/login/index.jsp?" + VerifyUser.REQUEST_PARAMETER__NEXT_URL + "=" + URLEncoder.encode(loginTarget.toString())).forward(request, response);
     }
 
-    public static String[] getParameterValues( HttpServletRequest request, String parameterName ) {
-        String[] parameterValues = request.getParameterValues( parameterName );
+    public static String[] getParameterValues(HttpServletRequest request, String parameterName) {
+        String[] parameterValues = request.getParameterValues(parameterName);
         if (null == parameterValues) {
             parameterValues = new String[0];
         }
-        return parameterValues ;
+        return parameterValues;
     }
 
-    public static Date truncateDateToMinutePrecision( Date fieldValue ) {
+    public static Date truncateDateToMinutePrecision(Date fieldValue) {
         if (null == fieldValue) {
-            return null ;
+            return null;
         }
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime( fieldValue );
-        calendar.set( Calendar.MILLISECOND, 0 );
-        calendar.set( Calendar.SECOND, 0 );
+        calendar.setTime(fieldValue);
+        calendar.set(Calendar.MILLISECOND, 0);
+        calendar.set(Calendar.SECOND, 0);
         return calendar.getTime();
     }
 
-    public static String getRequestURLWithoutPath( HttpServletRequest request ) {
+    public static String getRequestURLWithoutPath(HttpServletRequest request) {
         String requestUrl = request.getRequestURL().toString();
-        int requestUrlStartOfHost = requestUrl.indexOf( "://" ) + 3;
-        int requestUrlStartOfPath = requestUrl.indexOf( '/', requestUrlStartOfHost );
-        return StringUtils.left( requestUrl, requestUrlStartOfPath );
+        int requestUrlStartOfHost = requestUrl.indexOf("://") + 3;
+        int requestUrlStartOfPath = requestUrl.indexOf('/', requestUrlStartOfHost);
+        return StringUtils.left(requestUrl, requestUrlStartOfPath);
     }
 
-    public static boolean throwableContainsMessageContaining( Throwable t, String s ) {
-        Throwable throwable = t ;
+    public static boolean throwableContainsMessageContaining(Throwable t, String s) {
+        Throwable throwable = t;
         while (null != throwable) {
             String message = throwable.getMessage();
-            log.debug( throwable+": "+message ) ;
-            if (null != message && -1 != message.indexOf( s )) {
-                return true ;
+            log.debug(throwable + ": " + message);
+            if (null != message && message.contains(s)) {
+                return true;
             }
-            throwable = throwable.getCause() ;
+            throwable = throwable.getCause();
+        }
+        return false;
+    }
+
+    public static void invokeInternalErrorServletWith(HttpServletRequest request, HttpServletResponse response, Exception e) {
+        if (request == null) {
+            throw new UnhandledException(e);
+        }
+
+        request.setAttribute("javax.servlet.error.exception", e);
+        final com.imcode.imcms.servlet.InternalError internalErrorServlet = new com.imcode.imcms.servlet.InternalError();
+        try {
+            internalErrorServlet.doGet(request, response);
+        } catch (Exception e2) {
+            log.error("Error in error handler.....", e2);
+            log.error("Cause of error in error handler:", e);
+            e.printStackTrace();
         }
-        return false ;
     }
 
-    public static boolean classIsSignedByCertificatesInKeyStore( Class clazz, KeyStore keyStore ) {
+    public static boolean classIsSignedByCertificatesInKeyStore(Class clazz, KeyStore keyStore) {
         Object[] signers = clazz.getSigners();
-        if ( null == signers ) {
+        if (null == signers) {
             return false;
         }
-        for ( int i = 0; i < signers.length; i++ ) {
+        for (int i = 0; i < signers.length; i++) {
             Object signer = signers[i];
-            if ( !( signer instanceof Certificate ) ) {
+            if (!(signer instanceof Certificate)) {
                 return false;
             }
-            Certificate certificate = (Certificate)signer;
+            Certificate certificate = (Certificate) signer;
             try {
-                if ( null == keyStore.getCertificateAlias( certificate ) ) {
+                if (null == keyStore.getCertificateAlias(certificate)) {
                     return false;
                 }
-            } catch ( KeyStoreException e ) {
-                throw new UnhandledException( e );
+            } catch (KeyStoreException e) {
+                throw new UnhandledException(e);
             }
         }
-        return true ;
+        return true;
     }
 
     public static Map getMapViewOfObjectPairArray(final Object[][] array) {
-        return new ArrayMap(array, new ObjectPairToMapEntryTransformer() );
+        return new ArrayMap(array, new ObjectPairToMapEntryTransformer());
     }
 
     public static String makeSqlStringFromDate(Date date) {
@@ -330,7 +361,7 @@ public static Date parseDateFormat(DateFormat dateFormat, String dateString) {
             return dateFormat.parse(dateString);
         } catch (NullPointerException npe) {
             return null;
-        } catch ( ParseException pe) {
+        } catch (ParseException pe) {
             return null;
         }
     }
@@ -339,16 +370,16 @@ public static Object findMatch(Factory factory, Predicate predicate) {
         Object unique;
         do {
             unique = factory.create();
-        } while ( !predicate.evaluate( unique ) );
+        } while (!predicate.evaluate(unique));
         return unique;
     }
 
     public static String numberToAlphaNumerics(long identityHashCode) {
-        return Long.toString(identityHashCode,Character.MAX_RADIX);
+        return Long.toString(identityHashCode, Character.MAX_RADIX);
     }
 
     public static Integer getInteger(Object object) {
-        return null == object ? null : new Integer(( (Number) object ).intValue());
+        return null == object ? null : ((Number) object).intValue();
     }
 
     public static String escapeUrl(String imageUrl) {
@@ -365,116 +396,219 @@ public static Date addDate(Date date, int i) {
         return calendar.getTime();
     }
 
-    private static class ObjectPairToMapEntryTransformer implements Transformer {
-        public Object transform(Object input) {
-            final Object[] pair = (Object[])input ;
-            return new Map.Entry() {
-                public Object getKey() {
-                    return pair[0] ;
-                }
-
-                public Object getValue() {
-                    return pair[1] ;
-                }
-
-                public Object setValue(Object value) {
-                    throw new UnsupportedOperationException() ;
-                }
-            } ;
-        }
-    }
-
-    private static class ArrayMap extends AbstractMap {
-
-        private final Object[] array;
-        private Transformer transformer;
-
-        ArrayMap(Object[] array, Transformer transformer) {
-            this.array = array;
-            this.transformer = transformer;
-        }
-
-        public Set entrySet() {
-            return new AbstractSet() {
-                public int size() {
-                    return array.length ;
-                }
-                public Iterator iterator() {
-                    return new TransformIterator( new ObjectArrayIterator( array ), transformer );
-                }
-            };
-        }
-    }
-
-    public static void outputXmlDocument( HttpServletResponse response, Document xmlDocument ) throws IOException {
-        response.setContentType( "text/xml; charset=UTF-8" );
-        writeXmlDocument( xmlDocument, new StreamResult( response.getOutputStream() ));
+    public static void outputXmlDocument(HttpServletResponse response, Document xmlDocument) throws IOException {
+        response.setContentType("text/xml; charset=UTF-8");
+        writeXmlDocument(xmlDocument, new StreamResult(response.getOutputStream()));
     }
 
     public static void writeXmlDocument(Document xmlDocument,
-                                         StreamResult streamResult) {
+                                        StreamResult streamResult) {
         try {
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
             javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
-            transformer.setOutputProperty( OutputKeys.INDENT, "yes" );
-            DOMSource xmlSource = new DOMSource( xmlDocument );
-            transformer.transform( xmlSource, streamResult );
-        } catch ( TransformerConfigurationException e ) {
-            throw new UnhandledException( e );
-        } catch ( TransformerException e ) {
-            throw new UnhandledException( e );
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            DOMSource xmlSource = new DOMSource(xmlDocument);
+            transformer.transform(xmlSource, streamResult);
+        } catch (TransformerConfigurationException e) {
+            throw new UnhandledException(e);
+        } catch (TransformerException e) {
+            throw new UnhandledException(e);
         }
     }
 
-    public static void makeUserLoggedIn(HttpServletRequest req, UserDomainObject user) {
-        if ( null != user && !user.isDefaultUser() && !req.isSecure() && Imcms.getServices().getConfig().getSecureLoginRequired() ) {
+    public static void makeUserLoggedIn(HttpServletRequest req, HttpServletResponse res, UserDomainObject user) {
+
+        if (null != user && !user.isDefaultUser() && !req.isSecure() && Imcms.getServices().getConfig().getSecureLoginRequired()) {
             return;
         }
         req.getSession().setAttribute(LOGGED_IN_USER, user);
+        final HttpSession currentSession = req.getSession();
+        final Date loginDate = null != user.getLastLoginDate() ? user.getLastLoginDate() : new Date();
+
+        SessionInfoDTO sessionInfoDTO = new SessionInfoDTO();
+        sessionInfoDTO.setUserId(user.getId());
+        sessionInfoDTO.setSessionId(currentSession.getId());
+        sessionInfoDTO.setUserAgent(req.getHeader("User-Agent"));
+        sessionInfoDTO.setIp(req.getRemoteAddr());
+        sessionInfoDTO.setLoginDate(loginDate);
+        sessionInfoDTO.setExpireDate(DateUtils.addSeconds(loginDate, req.getSession().getMaxInactiveInterval()));
+        sessions.put(currentSession.getId(), sessionInfoDTO);
+
+        setUserToken(req, res, user);
+
         if (null != user) {
             // FIXME: Ugly hack to get the contextpath into DefaultImcmsServices.getVelocityContext()
-            user.setCurrentContextPath( req.getContextPath() );
+            user.setCurrentContextPath(req.getContextPath());
         }
     }
 
     public static void makeUserLoggedOut(HttpServletRequest req) {
-        req.getSession().removeAttribute(LOGGED_IN_USER);
+        HttpSession session = req.getSession();
+        sessions.remove(session.getId());
+        session.removeAttribute(LOGGED_IN_USER);
+        removeTokenSession(req);
+        session.invalidate();
     }
 
     public static ContentManagementSystem initRequestWithApi(ServletRequest request, UserDomainObject currentUser) {
-        NDC.push( "initRequestWithApi" );
-        ImcmsServices service = Imcms.getServices();
-        ContentManagementSystem imcmsSystem = DefaultContentManagementSystem.create( service, currentUser, Imcms.getApiDataSource());
-        request.setAttribute( CONTENT_MANAGEMENT_SYSTEM_REQUEST_ATTRIBUTE, imcmsSystem );
-        NDC.pop();
-        return imcmsSystem ;
+	    try (CloseableThreadContext.Instance ignored = CloseableThreadContext.push("initRequestWithApi")) {
+		    ImcmsServices service = Imcms.getServices();
+		    ContentManagementSystem imcmsSystem = DefaultContentManagementSystem.create(service, currentUser, Imcms.getApiDataSource());
+		    request.setAttribute(CONTENT_MANAGEMENT_SYSTEM_REQUEST_ATTRIBUTE, imcmsSystem);
+		    return imcmsSystem;
+	    }
     }
 
     public static ContentManagementSystem getContentManagementSystemFromRequest(ServletRequest request) {
-        return (ContentManagementSystem)request.getAttribute( CONTENT_MANAGEMENT_SYSTEM_REQUEST_ATTRIBUTE );
+        return (ContentManagementSystem) request.getAttribute(CONTENT_MANAGEMENT_SYSTEM_REQUEST_ATTRIBUTE);
     }
 
     public static String fallbackUrlDecode(String input, FallbackDecoder fallbackDecoder) {
         Pattern p = Pattern.compile("%[0-9a-zA-Z]{2}|.", Pattern.DOTALL);
         Matcher matcher = p.matcher(input);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        while(matcher.find()) {
+        while (matcher.find()) {
             String match = matcher.group();
             if (match.length() == 1) {
                 char c = match.charAt(0);
                 if (c < 256) {
-                    out.write(c) ;
-                } 
+                    out.write(c);
+                }
             } else {
                 int byteValue = Integer.parseInt(match.substring(1), 16);
                 out.write(byteValue);
             }
         }
-        return fallbackDecoder.decodeBytes(out.toByteArray(), null) ;
+        return fallbackDecoder.decodeBytes(out.toByteArray(), null);
     }
 
     public static ResourceBundle getResourceBundle(HttpServletRequest request) {
         return Imcms.getServices().getLocalizedMessageProvider().getResourceBundle(Utility.getLoggedOnUser(request).getLanguageIso639_2());
     }
 
+    public static void setUserToken(HttpServletRequest request, HttpServletResponse response, UserDomainObject user) {
+        if(!user.isDefaultUser()){
+            String token = getContentManagementSystemFromRequest(request).getUserService().generateNewRememberCd(user);
+            Utility.setTokenToSession(request, token);
+            Utility.setRememberCdCookie(request, response, token);
+        }
+    }
+
+    private static void setTokenToSession(HttpServletRequest request, String token) {
+        final HttpSession currentSession = request.getSession();
+        currentSession.setAttribute(IM_TOKEN, token);
+        currentSession.setAttribute(IM_TOKEN_DATE, System.currentTimeMillis());
+    }
+
+    private static void removeTokenSession(HttpServletRequest request) {
+        final HttpSession currentSession = request.getSession();
+        currentSession.setAttribute(IM_TOKEN, "");
+        currentSession.setAttribute(IM_TOKEN_DATE, "");
+    }
+
+    private static void setRememberCdCookie(HttpServletRequest request, HttpServletResponse response, String token) {
+        Cookie cookie = new Cookie(IM_TOKEN, token);
+        cookie.setMaxAge(60 * 60 * 2);
+        cookie.setPath("/");
+
+        setCookieDomain(request, cookie);
+        response.addCookie(cookie);
+    }
+
+    public static void removeRememberCdCookie(HttpServletRequest request, HttpServletResponse response) {
+        Cookie cookie = new Cookie(IM_TOKEN, "");
+        cookie.setMaxAge(0);
+        cookie.setPath("/");
+
+        setCookieDomain(request, cookie);
+        response.addCookie(cookie);
+    }
+
+    public static void setCookieDomain(HttpServletRequest request, Cookie cookie) {
+        String serverName = request.getServerName();
+        if (!IP_PATTERN.matcher(serverName).matches()) {
+            Matcher matcher = DOMAIN_PATTERN.matcher(serverName);
+
+            if (matcher.matches()) {
+                cookie.setDomain(serverName);
+            }
+        }
+    }
+
+    // collects a set of "public static final" constants from a class into a map,
+    // which then can be exposed to an JSP as a scoped variable
+    public static Map<String, Object> getConstants(Class<?> klass) {
+        Map<String, Object> constants = new HashMap<>();
+        for (Field field : klass.getFields()) {
+            if ((field.getModifiers() & STATIC_FINAL_MODIFIER_MASK) == STATIC_FINAL_MODIFIER_MASK) {
+                try {
+                    constants.put(field.getName(), field.get(null));
+                } catch (Exception ex) {
+                    log.warn(ex.getMessage(), ex);
+                }
+            }
+        }
+
+        return constants;
+    }
+
+    public static String encodeUrl(String value) {
+        try {
+            return URLEncoder.encode(value, "UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            log.warn(ex.getMessage(), ex);
+
+            throw new RuntimeException(ex.getMessage(), ex);
+        }
+    }
+
+    public static List<SessionInfoDTO> getActiveSessions() {
+        Date currentDate = new Date();
+        return sessions.values().stream()
+                .filter(info -> info.getExpireDate().after(currentDate))
+                .collect(Collectors.toList());
+    }
+
+    private static class ObjectPairToMapEntryTransformer implements Transformer {
+        public Object transform(Object input) {
+            final Object[] pair = (Object[]) input;
+            return new Map.Entry() {
+                public Object getKey() {
+                    return pair[0];
+                }
+
+                public Object getValue() {
+                    return pair[1];
+                }
+
+                public Object setValue(Object value) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+    }
+
+    private static class ArrayMap extends AbstractMap {
+
+        private final Object[] array;
+        private Transformer transformer;
+
+        ArrayMap(Object[] array, Transformer transformer) {
+            this.array = array;
+            this.transformer = transformer;
+        }
+
+        public Set entrySet() {
+            return new AbstractSet() {
+                public int size() {
+                    return array.length;
+                }
+
+                public Iterator iterator() {
+                    return new TransformIterator(new ObjectArrayIterator(array), transformer);
+                }
+            };
+        }
+    }
+
 }
diff --git a/server/src/imcode/util/VelocityTag.java b/server/src/imcode/util/VelocityTag.java
index eb1eb0ae2e..edd2f90bf2 100644
--- a/server/src/imcode/util/VelocityTag.java
+++ b/server/src/imcode/util/VelocityTag.java
@@ -7,21 +7,20 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTag;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
 public class VelocityTag extends BodyTagSupport {
 
     public int doEndTag() throws JspException {
         try {
-            UserDomainObject user = Utility.getLoggedOnUser( (HttpServletRequest)pageContext.getRequest() );
+            UserDomainObject user = Utility.getLoggedOnUser((HttpServletRequest) pageContext.getRequest());
             ImcmsServices service = Imcms.getServices();
-            VelocityContext context = service.getVelocityContext( user );
-            service.getVelocityEngine( user ).evaluate( context, pageContext.getOut(), "velocity", bodyContent.getReader() );
-        } catch ( Exception e ) {
-            throw new JspException( e ) ;
+            VelocityContext context = service.getVelocityContext(user);
+            service.getVelocityEngine(user).evaluate(context, pageContext.getOut(), "velocity", bodyContent.getReader());
+        } catch (Exception e) {
+            throw new JspException(e);
         }
-        return super.doEndTag() ;
+        return super.doEndTag();
     }
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/util/image/ByteArrayInputStreamHandler.java b/server/src/imcode/util/image/ByteArrayInputStreamHandler.java
new file mode 100644
index 0000000000..57c8d29684
--- /dev/null
+++ b/server/src/imcode/util/image/ByteArrayInputStreamHandler.java
@@ -0,0 +1,36 @@
+package imcode.util.image;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ByteArrayInputStreamHandler extends Thread {
+    private static final Logger log = LogManager.getLogger(ByteArrayInputStreamHandler.class);
+
+    private InputStream inputStream;
+    private byte[] data;
+
+
+    public ByteArrayInputStreamHandler(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+
+    @Override
+    public void run() {
+        try {
+            data = IOUtils.toByteArray(inputStream);
+        } catch (IOException ex) {
+            log.warn(ex.getMessage(), ex);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+    }
+
+    public byte[] getData() {
+        return data;
+    }
+}
diff --git a/server/src/imcode/util/image/Color.java b/server/src/imcode/util/image/Color.java
new file mode 100644
index 0000000000..0c6c2276bc
--- /dev/null
+++ b/server/src/imcode/util/image/Color.java
@@ -0,0 +1,17 @@
+package imcode.util.image;
+
+public enum Color {
+    WHITE("white"),
+    BLACK("black"),
+    TRANSPARENT("transparent");
+
+    private final String color;
+
+    private Color(String color) {
+        this.color = color;
+    }
+
+    public String getColor() {
+        return color;
+    }
+}
\ No newline at end of file
diff --git a/server/src/imcode/util/image/Filter.java b/server/src/imcode/util/image/Filter.java
new file mode 100644
index 0000000000..930c842287
--- /dev/null
+++ b/server/src/imcode/util/image/Filter.java
@@ -0,0 +1,33 @@
+package imcode.util.image;
+
+public enum Filter {
+    POINT("Point"),
+    HERMITE("Hermite"),
+    CUBIC("Cubic"),
+    BOX("Box"),
+    GAUSSIAN("Gaussian"),
+    CATROM("Catrom"),
+    TRIANGLE("Triangle"),
+    QUADRATIC("Quadratic"),
+    MITCHELL("Mitchell"),
+
+    LANCZOS("Lanczos"),
+    HAMMING("Hamming"),
+    PARZEN("Parzen"),
+    BLACKMAN("Blackman"),
+    KAISER("Kaiser"),
+    WELSH("Welsh"),
+    HANNING("Hanning"),
+    BARTLET("Bartlet"),
+    BOHMAN("Bohman");
+
+    private final String filter;
+
+    private Filter(String filter) {
+        this.filter = filter;
+    }
+
+    public String getFilter() {
+        return filter;
+    }
+}
\ No newline at end of file
diff --git a/server/src/imcode/util/image/Format.java b/server/src/imcode/util/image/Format.java
new file mode 100644
index 0000000000..64fe151472
--- /dev/null
+++ b/server/src/imcode/util/image/Format.java
@@ -0,0 +1,76 @@
+package imcode.util.image;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum Format {
+    BMP("BMP", 1, "bmp", "image/bmp", true),
+    GIF("GIF", 2, "gif", "image/gif", true),
+    JPEG("JPEG", 3, "jpg", "image/jpeg", true),
+    PNG("PNG", 4, "png", "image/png", true),
+    PSD("PSD", 5, "psd", "image/x-psd", true),
+    SVG("SVG", 6, "svg", "image/svg+xml", false),
+    TIFF("TIFF", 7, "tif", "image/tiff", true),
+    XCF("XCF", 8, "xcf", "image/x-xcf", false),
+    PICT("PICT", 9, "pct", "image/pict", true);
+
+
+    private static final Map<String, Format> FORMAT_MAP = new HashMap<>(Format.values().length);
+    private static final Map<String, Format> EXTENSION_MAP = new HashMap<>(Format.values().length);
+    private static final Map<Integer, Format> ORDINAL_MAP = new HashMap<>(Format.values().length);
+
+    static {
+        for (Format format : Format.values()) {
+            FORMAT_MAP.put(format.getFormat(), format);
+            EXTENSION_MAP.put(format.getExtension(), format);
+            ORDINAL_MAP.put(format.getOrdinal(), format);
+        }
+    }
+
+    private final String format;
+    private final int ordinal;
+    private final String extension;
+    private final String mimeType;
+    private final boolean writable;
+
+
+    private Format(String format, int ordinal, String extension, String mimeType, boolean writable) {
+        this.format = format;
+        this.ordinal = ordinal;
+        this.extension = extension;
+        this.mimeType = mimeType;
+        this.writable = writable;
+    }
+
+    public static Format findFormat(String format) {
+        return FORMAT_MAP.get(format);
+    }
+
+    public static Format findFormatByExtension(String extension) {
+        return EXTENSION_MAP.get(extension);
+    }
+
+    public static Format findFormat(int ordinal) {
+        return ORDINAL_MAP.get(ordinal);
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public int getOrdinal() {
+        return ordinal;
+    }
+
+    public String getExtension() {
+        return extension;
+    }
+
+    public boolean isWritable() {
+        return writable;
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+}
\ No newline at end of file
diff --git a/server/src/imcode/util/image/Gravity.java b/server/src/imcode/util/image/Gravity.java
new file mode 100644
index 0000000000..0fac2693f4
--- /dev/null
+++ b/server/src/imcode/util/image/Gravity.java
@@ -0,0 +1,23 @@
+package imcode.util.image;
+
+public enum Gravity {
+    NORTH_WEST("NorthWest"),
+    NORTH("North"),
+    NORTH_EAST("NorthEast"),
+    WEST("West"),
+    CENTER("Center"),
+    EAST("East"),
+    SOUTH_WEST("SouthWest"),
+    SOUTH("South"),
+    SOUTH_EAST("SouthEast");
+
+    private final String gravity;
+
+    private Gravity(String gravity) {
+        this.gravity = gravity;
+    }
+
+    public String getGravity() {
+        return gravity;
+    }
+}
diff --git a/server/src/imcode/util/image/ImageInfo.java b/server/src/imcode/util/image/ImageInfo.java
new file mode 100644
index 0000000000..69b6fcde01
--- /dev/null
+++ b/server/src/imcode/util/image/ImageInfo.java
@@ -0,0 +1,55 @@
+package imcode.util.image;
+
+import java.io.Serializable;
+
+public class ImageInfo implements Serializable {
+    private static final long serialVersionUID = 8901634883271727973L;
+
+    private Format format;
+    private int width;
+    private int height;
+
+
+    public ImageInfo() {
+    }
+
+    public ImageInfo(Format format) {
+        this.format = format;
+    }
+
+    public ImageInfo(int width, int height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    public ImageInfo(Format format, int width, int height) {
+        this.format = format;
+        this.width = width;
+        this.height = height;
+    }
+
+
+    public Format getFormat() {
+        return format;
+    }
+
+    public void setFormat(Format format) {
+        this.format = format;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/server/src/imcode/util/image/ImageOp.java b/server/src/imcode/util/image/ImageOp.java
new file mode 100644
index 0000000000..f294eeb4d9
--- /dev/null
+++ b/server/src/imcode/util/image/ImageOp.java
@@ -0,0 +1,383 @@
+package imcode.util.image;
+
+import imcode.server.Config;
+import imcode.server.Imcms;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ImageOp {
+    private static final Logger log = LogManager.getLogger(ImageOp.class);
+
+    private static final boolean PLATFORM_WINDOWS = System.getProperty("os.name").contains("Windows");
+
+    private static final Pattern FORMAT_PATTERN = Pattern.compile("format:'([^']+)'");
+    private static final Pattern WIDTH_PATTERN = Pattern.compile("width:'([^']+)'");
+    private static final Pattern HEIGHT_PATTERN = Pattern.compile("height:'([^']+)'");
+
+    private List<String> args = new ArrayList<>();
+    private byte[] inputData;
+    private InputStream dataStream;
+    private Format outputFormat;
+
+
+    public ImageOp(Config config) {
+        args.add(addQuotes(getApplicationPath(config, "convert")));
+    }
+
+    private static final String getApplicationPath(Config config, String appName) {
+        File magickPath = config.getImageMagickPath();
+
+        if (magickPath != null && !magickPath.equals(Imcms.getPath())) {
+            return new File(magickPath, appName).getAbsolutePath();
+        }
+
+        return appName;
+    }
+
+    private static final String addQuotes(String input) {
+        if (PLATFORM_WINDOWS) {
+            return "\"" + input + "\"";
+        }
+
+        return input;
+    }
+
+    public static ImageInfo getImageInfo(Config config, InputStream inputStream) {
+        try {
+            Process process = new ProcessBuilder(getIdentifyProcessArgs(config, "-[0]")).start();
+            StringInputStreamHandler errorHandler = new StringInputStreamHandler(process.getErrorStream());
+            StringInputStreamHandler inputHandler = new StringInputStreamHandler(process.getInputStream());
+            errorHandler.start();
+            inputHandler.start();
+
+            OutputStream output = null;
+            try {
+                output = process.getOutputStream();
+                IOUtils.copy(inputStream, output);
+            } finally {
+                IOUtils.closeQuietly(output);
+            }
+
+            inputHandler.join();
+
+            return processImageInfo(inputHandler);
+        } catch (Exception ex) {
+            log.fatal(ex.getMessage(), ex);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+
+        return null;
+    }
+
+    public static ImageInfo getImageInfo(Config config, File file) {
+        try {
+            String fileToIdentify = addQuotes(file.getAbsolutePath() + "[0]");
+            Process process = new ProcessBuilder(getIdentifyProcessArgs(config, fileToIdentify)).start();
+            StringInputStreamHandler errorHandler = new StringInputStreamHandler(process.getErrorStream());
+            StringInputStreamHandler inputHandler = new StringInputStreamHandler(process.getInputStream());
+            errorHandler.start();
+            inputHandler.start();
+
+            inputHandler.join();
+
+            return processImageInfo(inputHandler);
+        } catch (Exception ex) {
+            log.fatal(ex.getMessage(), ex);
+        }
+
+        return null;
+    }
+
+    private static String[] getIdentifyProcessArgs(Config config, String... arguments) {
+        String[] args = new String[4 + arguments.length];
+
+        args[0] = addQuotes(getApplicationPath(config, "identify"));
+
+        args[1] = "-quiet";
+        args[2] = "-format";
+        args[3] = "format:'%m'width:'%w'height:'%h'";
+
+        int startIndex = 4;
+
+        for (String arg : arguments) {
+            args[startIndex++] = arg;
+        }
+
+        return args;
+    }
+
+    private static ImageInfo processImageInfo(StringInputStreamHandler inputHandler) throws InterruptedException {
+        if (inputHandler.getData() != null) {
+            String input = inputHandler.getData();
+
+            Matcher formatMatcher = FORMAT_PATTERN.matcher(input);
+            Format format = null;
+            if (formatMatcher.find()) {
+                format = Format.findFormat(formatMatcher.group(1));
+            }
+
+            Matcher widthMatcher = WIDTH_PATTERN.matcher(input);
+            int width = 0;
+            if (widthMatcher.find()) {
+                try {
+                    width = Integer.parseInt(widthMatcher.group(1), 10);
+                } catch (Exception ex) {
+                    log.warn(ex.getMessage(), ex);
+                }
+            }
+
+            Matcher heightMatcher = HEIGHT_PATTERN.matcher(input);
+            int height = 0;
+            if (heightMatcher.find()) {
+                try {
+                    height = Integer.parseInt(heightMatcher.group(1), 10);
+                } catch (Exception ex) {
+                    log.warn(ex.getMessage(), ex);
+                }
+            }
+
+            if (format == null) {
+                return null;
+            }
+
+            return new ImageInfo(format, width, height);
+        }
+
+        return null;
+    }
+
+    public ImageOp input(byte[] data) {
+        inputData = data;
+        args.add("-[0]");
+
+        return this;
+    }
+
+    public ImageOp input(InputStream input) {
+        dataStream = input;
+        args.add(addQuotes("-[0]"));
+
+        return this;
+    }
+
+    public ImageOp input(File file) {
+        args.add(addQuotes(file.getAbsolutePath() + "[0]"));
+
+        return this;
+    }
+
+    public ImageOp filter(Filter filter) {
+        args.add("-filter");
+        args.add(addQuotes(filter.getFilter()));
+
+        return this;
+    }
+
+    public ImageOp strip() {
+        args.add("-strip");
+
+        return this;
+    }
+
+    public ImageOp size(int width, int height) {
+        args.add("-size");
+        args.add(addQuotes(String.format("%dx%d", width, height)));
+
+        return this;
+    }
+
+    public ImageOp rawImage(Color color, int width, int height) {
+        this.size(width, height);
+        args.add(addQuotes("xc:" + color.getColor()));
+
+        return this;
+    }
+
+    public ImageOp swap(int index1, int index2) {
+        args.add("-swap");
+        args.add(addQuotes(String.format("%d,%d", index1, index2)));
+
+        return this;
+    }
+
+    public ImageOp swapLastTwo() {
+        args.add("+swap");
+
+        return this;
+    }
+
+    public ImageOp composite() {
+        args.add("-composite");
+
+        return this;
+    }
+
+    public ImageOp gravity(Gravity gravity) {
+        args.add("-gravity");
+        args.add(addQuotes(gravity.getGravity()));
+
+        return this;
+    }
+
+    public ImageOp quality(int quality) {
+        quality = Math.max(quality, 0);
+        quality = Math.min(quality, 100);
+
+        args.add("-quality");
+        args.add(addQuotes(Integer.toString(quality, 10)));
+
+        return this;
+    }
+
+    public ImageOp crop(int x, int y, int width, int height) {
+        args.add("-crop");
+
+        String cropParam = String.format("%dx%d+%d+%d!", width, height, x, y);
+        args.add(addQuotes(cropParam));
+
+        return this;
+    }
+
+    public ImageOp rotate(int angle) {
+        args.add("-rotate");
+        args.add(addQuotes(Integer.toString(angle)));
+
+        return this;
+    }
+
+    public ImageOp resize(Integer width, Integer height, Resize type) {
+        args.add("-resize");
+
+        String size = "";
+
+        if (width != null) {
+            size = width.toString();
+        }
+        if (height != null) {
+            size += String.format("x%d", height);
+        }
+
+        size += type.getModifier();
+        args.add(addQuotes(size));
+
+        return this;
+    }
+
+    public ImageOp resizeProportional(int width, int height, Color backgroundColor, Gravity gravity) {
+        this.filter(Filter.LANCZOS);
+        this.resize(width, height, Resize.GREATER_THAN);
+        this.rawImage(backgroundColor, width, height);
+        this.swapLastTwo();
+        this.gravity(Gravity.CENTER);
+        this.composite();
+
+        return this;
+    }
+
+    public ImageOp outputFormat(Format format) {
+        this.outputFormat = format;
+
+        return this;
+    }
+
+    public byte[] processToByteArray() {
+        String out = (outputFormat != null ? outputFormat.getFormat() + ":-" : "-");
+
+        List<String> arguments = new ArrayList<>(args);
+        arguments.add(addQuotes(out));
+
+        try {
+            Process process = new ProcessBuilder(arguments).start();
+
+            StringInputStreamHandler errorHandler = new StringInputStreamHandler(process.getErrorStream());
+            ByteArrayInputStreamHandler dataHandler = new ByteArrayInputStreamHandler(process.getInputStream());
+            errorHandler.start();
+            dataHandler.start();
+
+            copyData(process);
+
+            if (process.waitFor() != 0) {
+                errorHandler.join();
+                log.error(errorHandler.getData());
+            } else {
+                errorHandler.join();
+                dataHandler.join();
+
+                return dataHandler.getData();
+            }
+        } catch (Exception ex) {
+            log.fatal(ex.getMessage(), ex);
+        } finally {
+            IOUtils.closeQuietly(dataStream);
+        }
+
+        return null;
+    }
+
+    public boolean processToFile(File outputFile) {
+        String out = null;
+        if (outputFormat != null) {
+            out = outputFormat.getFormat() + ":" + outputFile.getAbsolutePath();
+        } else {
+            out = outputFile.getAbsolutePath();
+        }
+
+        List<String> arguments = new ArrayList<>(args);
+        arguments.add(addQuotes(out));
+
+        try {
+            Process process = new ProcessBuilder(arguments).start();
+            StringInputStreamHandler errorHandler = new StringInputStreamHandler(process.getErrorStream());
+            errorHandler.start();
+
+            copyData(process);
+
+            if (process.waitFor() != 0) {
+                errorHandler.join();
+                log.error(errorHandler.getData());
+
+                if (outputFile.exists()) {
+                    outputFile.delete();
+                }
+            } else {
+                return true;
+            }
+        } catch (Exception ex) {
+            log.fatal(ex.getMessage(), ex);
+
+            if (outputFile.exists()) {
+                outputFile.delete();
+            }
+        } finally {
+            IOUtils.closeQuietly(dataStream);
+        }
+
+        return false;
+    }
+
+    private void copyData(Process process) throws IOException {
+        if (inputData != null || dataStream != null) {
+            OutputStream output = null;
+            try {
+                output = new BufferedOutputStream(process.getOutputStream());
+
+                if (inputData != null) {
+                    output.write(inputData);
+                } else if (dataStream != null) {
+                    IOUtils.copy(dataStream, output);
+                }
+                IOUtils.closeQuietly(dataStream);
+            } finally {
+                IOUtils.closeQuietly(output);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/server/src/imcode/util/image/Resize.java b/server/src/imcode/util/image/Resize.java
new file mode 100644
index 0000000000..fadb1e9514
--- /dev/null
+++ b/server/src/imcode/util/image/Resize.java
@@ -0,0 +1,67 @@
+package imcode.util.image;
+
+public enum Resize {
+    /**
+     * Always resize by width x height, preserves aspect ratio. One of the dimensions can be optional.
+     */
+    DEFAULT("", 1),
+    /**
+     * Always resize by width x height, ignores aspect ratio.
+     */
+    FORCE("!", 2),
+    /**
+     * Resize by width x height, only if both of the dimensions are larger than requested, preserves aspect ratio.
+     */
+    LESS_THAN("<", 3),
+    /**
+     * Resize by width x height, only if one of the dimensions is larger than requested, preserves aspect ratio.
+     */
+    GREATER_THAN(">", 4),
+    /**
+     * Dimensions scaled by percentage. If only width is specified, then both width and height will be scaled.
+     * Otherwise each dimension will be scaled by a individual percentage.
+     */
+    PERCENT("%", 5);
+
+    private final String modifier;
+    private final int ordinal;
+
+    private Resize(String modifier, int ordinal) {
+        this.modifier = modifier;
+        this.ordinal = ordinal;
+    }
+
+    public static Resize getByName(String value) {
+        if (value == null) {
+            return null;
+        }
+
+        value = value.toLowerCase();
+
+        for (Resize resize : Resize.values()) {
+            if (value.equals(resize.name().toLowerCase())) {
+                return resize;
+            }
+        }
+
+        return null;
+    }
+
+    public static Resize getByOrdinal(int ord) {
+        for (Resize resize : Resize.values()) {
+            if (resize.getOrdinal() == ord) {
+                return resize;
+            }
+        }
+
+        return null;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public int getOrdinal() {
+        return ordinal;
+    }
+}
diff --git a/server/src/imcode/util/image/StringInputStreamHandler.java b/server/src/imcode/util/image/StringInputStreamHandler.java
new file mode 100644
index 0000000000..8f11a0c8e1
--- /dev/null
+++ b/server/src/imcode/util/image/StringInputStreamHandler.java
@@ -0,0 +1,34 @@
+package imcode.util.image;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class StringInputStreamHandler extends Thread {
+    private static final Logger log = LogManager.getLogger(StringInputStreamHandler.class);
+
+    private InputStream inputStream;
+    private String data;
+
+    public StringInputStreamHandler(InputStream input) {
+        inputStream = input;
+    }
+
+    @Override
+    public void run() {
+        try {
+            data = IOUtils.toString(inputStream);
+        } catch (IOException ex) {
+            log.warn(ex.getMessage(), ex);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+    }
+
+    public String getData() {
+        return data;
+    }
+}
diff --git a/server/src/imcode/util/io/EmptyInputStream.java b/server/src/imcode/util/io/EmptyInputStream.java
index d0c63c0477..1acf774036 100644
--- a/server/src/imcode/util/io/EmptyInputStream.java
+++ b/server/src/imcode/util/io/EmptyInputStream.java
@@ -4,7 +4,7 @@
 import java.io.InputStream;
 
 public class EmptyInputStream extends InputStream {
-    public int read( ) throws IOException {
+    public int read() throws IOException {
         return -1;
     }
 }
diff --git a/server/src/imcode/util/io/EmptyInputStreamSource.java b/server/src/imcode/util/io/EmptyInputStreamSource.java
index fb1792380e..c3ae111959 100644
--- a/server/src/imcode/util/io/EmptyInputStreamSource.java
+++ b/server/src/imcode/util/io/EmptyInputStreamSource.java
@@ -4,11 +4,11 @@
 import java.io.InputStream;
 
 public class EmptyInputStreamSource implements InputStreamSource {
-    public InputStream getInputStream( ) throws IOException {
-        return new EmptyInputStream( );
+    public InputStream getInputStream() throws IOException {
+        return new EmptyInputStream();
     }
 
-    public long getSize( ) throws IOException {
+    public long getSize() throws IOException {
         return 0;
     }
 }
diff --git a/server/src/imcode/util/io/ExceptionFreeInputStreamSource.java b/server/src/imcode/util/io/ExceptionFreeInputStreamSource.java
index 49970c731f..8860938f19 100644
--- a/server/src/imcode/util/io/ExceptionFreeInputStreamSource.java
+++ b/server/src/imcode/util/io/ExceptionFreeInputStreamSource.java
@@ -12,16 +12,16 @@ public ExceptionFreeInputStreamSource(InputStreamSource inputStreamSource) {
     public InputStream getInputStream() {
         try {
             return super.getInputStream();
-        } catch(IOException ioe) {
-            return new EmptyInputStream() ;
+        } catch (IOException ioe) {
+            return new EmptyInputStream();
         }
     }
 
     public long getSize() {
         try {
             return super.getSize();
-        } catch(IOException ioe) {
-            return 0 ;
+        } catch (IOException ioe) {
+            return 0;
         }
     }
 }
diff --git a/server/src/imcode/util/io/FileInputStreamSource.java b/server/src/imcode/util/io/FileInputStreamSource.java
index 7c1db31de4..1d8cd71cbe 100644
--- a/server/src/imcode/util/io/FileInputStreamSource.java
+++ b/server/src/imcode/util/io/FileInputStreamSource.java
@@ -9,23 +9,27 @@ public class FileInputStreamSource implements InputStreamSource {
 
     private final File file;
 
-    public FileInputStreamSource( File file ) {
+    public FileInputStreamSource(File file) {
         this.file = file;
     }
 
     public InputStream getInputStream() throws IOException {
-        return new FileInputStream( file );
+        return new FileInputStream(file);
     }
 
     public long getSize() throws IOException {
-        return file.length() ;
+        return file.length();
+    }
+
+    public File getFile() {
+        return file;
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() ) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
diff --git a/server/src/imcode/util/io/FileUtility.java b/server/src/imcode/util/io/FileUtility.java
index 417d03aae8..3caffe1c7f 100644
--- a/server/src/imcode/util/io/FileUtility.java
+++ b/server/src/imcode/util/io/FileUtility.java
@@ -1,6 +1,7 @@
 package imcode.util.io;
 
 import com.imcode.util.FileTreeTraverser;
+import imcode.server.Imcms;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.io.FileUtils;
@@ -11,47 +12,51 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.util.*;
-
-import imcode.server.Imcms;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
 
 public class FileUtility {
 
-    private FileUtility() {}
+    private FileUtility() {
+    }
 
     /**
      * Takes a path-string and returns a file. The path is prepended with the webapp dir if the path is relative.
      */
-    public static File getFileFromWebappRelativePath( String pathString ) {
-        if ( null == pathString ) {
-            return null ;
+    public static File getFileFromWebappRelativePath(String pathString) {
+        if (null == pathString) {
+            return null;
         }
-        File path = new File( pathString );
-        if ( !path.isAbsolute() ) {
-            path = new File( Imcms.getPath(), pathString );
+        File path = new File(pathString);
+        if (!path.isAbsolute()) {
+            path = new File(Imcms.getPath(), pathString);
         }
         return path;
     }
 
-    public static File relativizeFile( File ancestorDirectory, File file ) throws IOException {
-        File currentParent = file.getCanonicalFile();
+    public static File relativizeFile(File ancestorDirectory, File file) throws IOException {
+        boolean isPathContainSymlink = !file.getAbsolutePath().equals(file.getCanonicalPath());
+        File currentParent = isPathContainSymlink ? file : file.getCanonicalFile();
+
         ancestorDirectory = ancestorDirectory.getCanonicalFile();
-        LinkedList fileParents = new LinkedList();
-        while ( !currentParent.equals( ancestorDirectory ) ) {
-            fileParents.addFirst( currentParent.getName() );
+        LinkedList<String> fileParents = new LinkedList();
+        while (null != currentParent && !currentParent.equals(ancestorDirectory)) {
+            fileParents.addFirst(currentParent.getName());
             currentParent = currentParent.getParentFile();
         }
-        File relativeFile = new File( (String)fileParents.removeFirst() );
-        for ( Iterator iterator = fileParents.iterator(); iterator.hasNext(); ) {
-            relativeFile = new File( relativeFile, (String)iterator.next() );
+        File relativeFile = new File(fileParents.removeFirst());
+        for (String fileParent : fileParents) {
+            relativeFile = new File(relativeFile, fileParent);
         }
         return relativeFile;
     }
 
-    public static boolean directoryIsAncestorOfOrEqualTo( File dir, File file ) throws IOException {
-        dir = dir.getCanonicalFile() ;
-        for ( File currentFile = file.getCanonicalFile(); null != currentFile; currentFile = currentFile.getParentFile() ) {
-            if ( currentFile.equals( dir ) ) {
+    public static boolean directoryIsAncestorOfOrEqualTo(File dir, File file) throws IOException {
+        dir = dir.getCanonicalFile();
+        for (File currentFile = Files.isSymbolicLink(file.toPath()) ? file.getAbsoluteFile() : file.getCanonicalFile(); null != currentFile; currentFile = currentFile.getParentFile()) {
+            if (currentFile.getAbsoluteFile().equals(dir.getAbsoluteFile())) {
                 return true;
             }
         }
@@ -59,42 +64,42 @@ public static boolean directoryIsAncestorOfOrEqualTo( File dir, File file ) thro
     }
 
     public static String[] splitFile(File file) {
-        LinkedList list = new LinkedList() ;
+        LinkedList list = new LinkedList();
         for (File parent = file; null != parent; parent = parent.getParentFile()) {
-            list.addFirst( parent.getName() );
+            list.addFirst(parent.getName());
         }
-        return (String[])list.toArray( new String[list.size()] );
+        return (String[]) list.toArray(new String[list.size()]);
     }
 
     public static String relativeFileToString(File file) {
-        return StringUtils.join( splitFile( file ), '/') ;
+        return StringUtils.join(splitFile(file), '/');
     }
 
-    public static Collection collectRelativeSubdirectoriesStartingWith( final File directory ) {
-        Collection directories = CollectionUtils.transformedCollection( new ArrayList(), new FileRelativizingTransformer( directory.getParentFile() ) );
-        FileTreeTraverser fileTreeTraverser = new FileTreeTraverser( new DirectoryCollectingFileFilter( directories ) );
-        fileTreeTraverser.traverse( new File[]{directory} );
+    public static Collection collectRelativeSubdirectoriesStartingWith(final File directory) {
+        Collection directories = CollectionUtils.transformedCollection(new ArrayList(), new FileRelativizingTransformer(directory.getParentFile()));
+        FileTreeTraverser fileTreeTraverser = new FileTreeTraverser(new DirectoryCollectingFileFilter(directories));
+        fileTreeTraverser.traverse(new File[]{directory});
         return directories;
     }
 
-    public static String escapeFilename( String filename ) {
-        StringBuffer escapedFilename = new StringBuffer() ;
+    public static String escapeFilename(String filename) {
+        StringBuffer escapedFilename = new StringBuffer();
         for (int i = 0; i < filename.length(); ++i) {
-            char c = filename.charAt( i ) ;
-            if ( c > 127 || !Character.isLetterOrDigit( c ) ) {
-                escapedFilename.append( '_' ).append( StringUtils.leftPad( Integer.toHexString( c ), 4, '0' ) ) ;
+            char c = filename.charAt(i);
+            if (c > 127 || !Character.isLetterOrDigit(c)) {
+                escapedFilename.append('_').append(StringUtils.leftPad(Integer.toHexString(c), 4, '0'));
             } else {
-                escapedFilename.append( c ) ;
+                escapedFilename.append(c);
             }
         }
-        return escapedFilename.toString() ;
+        return escapedFilename.toString();
     }
 
-    public static String unescapeFilename( String escapedFilename ) {
+    public static String unescapeFilename(String escapedFilename) {
         try {
-            return Util.substitute(new Perl5Matcher(), new Perl5Compiler().compile( "_([A-Fa-f0-9]{4})"), new UnescapeFilenameSubstitution(), escapedFilename,Util.SUBSTITUTE_ALL) ;
-        } catch ( MalformedPatternException e ) {
-            throw new UnhandledException( e );
+            return Util.substitute(new Perl5Matcher(), new Perl5Compiler().compile("_([A-Fa-f0-9]{4})"), new UnescapeFilenameSubstitution(), escapedFilename, Util.SUBSTITUTE_ALL);
+        } catch (MalformedPatternException e) {
+            throw new UnhandledException(e);
         }
     }
 
@@ -115,10 +120,10 @@ public static void backupRename(File source, File destination) throws IOExceptio
     }
 
     private static void fatalRename(File source, File destination) throws IOException {
-        if ( !source.renameTo(destination) ) {
+        if (!source.renameTo(destination)) {
             throw new IOException("Failed to rename \"" + source + "\" to \""
-                                  + destination
-                                  + "\".");
+                    + destination
+                    + "\".");
         }
     }
 
@@ -126,13 +131,13 @@ private static class DirectoryCollectingFileFilter implements FileFilter {
 
         private final Collection directories;
 
-        private DirectoryCollectingFileFilter( Collection directories ) {
+        private DirectoryCollectingFileFilter(Collection directories) {
             this.directories = directories;
         }
 
-        public boolean accept( File file ) {
-            if ( file.isDirectory() ) {
-                directories.add( file );
+        public boolean accept(File file) {
+            if (file.isDirectory()) {
+                directories.add(file);
                 return true;
             } else {
                 return false;
@@ -144,14 +149,14 @@ private static class FileRelativizingTransformer implements Transformer {
 
         private final File directory;
 
-        public FileRelativizingTransformer( File directory ) {
+        public FileRelativizingTransformer(File directory) {
             this.directory = directory;
         }
 
-        public Object transform( Object input ) {
+        public Object transform(Object input) {
             try {
-                return relativizeFile( directory, (File)input );
-            } catch ( IOException e ) {
+                return relativizeFile(directory, (File) input);
+            } catch (IOException e) {
                 throw new RuntimeException(e);
             }
         }
@@ -159,12 +164,12 @@ public Object transform( Object input ) {
 
     private static class UnescapeFilenameSubstitution implements Substitution {
 
-        public void appendSubstitution( StringBuffer stringBuffer, MatchResult matchResult, int i,
-                                        PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher,
-                                        Pattern pattern ) {
-            String hex = matchResult.group( 1 ) ;
-            char c = (char)Integer.parseInt( hex, 16 ) ;
-            stringBuffer.append( c ) ;
+        public void appendSubstitution(StringBuffer stringBuffer, MatchResult matchResult, int i,
+                                       PatternMatcherInput patternMatcherInput, PatternMatcher patternMatcher,
+                                       Pattern pattern) {
+            String hex = matchResult.group(1);
+            char c = (char) Integer.parseInt(hex, 16);
+            stringBuffer.append(c);
         }
     }
 }
diff --git a/server/src/imcode/util/io/InputStreamSource.java b/server/src/imcode/util/io/InputStreamSource.java
index a8811ef0ab..fd8d96ced4 100644
--- a/server/src/imcode/util/io/InputStreamSource.java
+++ b/server/src/imcode/util/io/InputStreamSource.java
@@ -8,6 +8,6 @@ public interface InputStreamSource extends Serializable {
 
     InputStream getInputStream() throws IOException;
 
-    long getSize() throws IOException ;
+    long getSize() throws IOException;
 
 }
\ No newline at end of file
diff --git a/server/src/imcode/util/io/InputStreamSourceWrapper.java b/server/src/imcode/util/io/InputStreamSourceWrapper.java
index 37fcb32048..ef47d835c8 100644
--- a/server/src/imcode/util/io/InputStreamSourceWrapper.java
+++ b/server/src/imcode/util/io/InputStreamSourceWrapper.java
@@ -5,7 +5,7 @@
 
 public class InputStreamSourceWrapper implements InputStreamSource {
 
-    private final InputStreamSource inputStreamSource ;
+    private final InputStreamSource inputStreamSource;
 
     public InputStreamSourceWrapper(InputStreamSource inputStreamSource) {
         this.inputStreamSource = inputStreamSource;
@@ -20,15 +20,15 @@ public InputStream getInputStream() throws IOException {
     }
 
     public boolean equals(Object o) {
-        if ( this == o ) {
+        if (this == o) {
             return true;
         }
-        if ( o == null || !(o instanceof InputStreamSource) ) {
+        if (o == null || !(o instanceof InputStreamSource)) {
             return false;
         }
-        InputStreamSource otherInputStreamSource = (InputStreamSource) o ;
+        InputStreamSource otherInputStreamSource = (InputStreamSource) o;
         while (o instanceof InputStreamSourceWrapper) {
-            otherInputStreamSource = ((InputStreamSourceWrapper)o).getInputStreamSource() ;
+            otherInputStreamSource = ((InputStreamSourceWrapper) o).getInputStreamSource();
         }
 
         return inputStreamSource.equals(otherInputStreamSource);
diff --git a/server/src/imcode/util/jscalendar/JSCalendar.java b/server/src/imcode/util/jscalendar/JSCalendar.java
index adf183fe0d..e262350c75 100644
--- a/server/src/imcode/util/jscalendar/JSCalendar.java
+++ b/server/src/imcode/util/jscalendar/JSCalendar.java
@@ -3,61 +3,64 @@
 import javax.servlet.http.HttpServletRequest;
 
 public class JSCalendar {
-    public String dateFieldId ;
-    public String timeFieldId ;
-    public String langIso639_2 ;
-    public HttpServletRequest request ;
+    private static final String PATH_CALENDAR = "/imcms/jscalendar/";
+    public String dateFieldId;
+    public String timeFieldId;
+    public String langIso639_2;
+    public HttpServletRequest request;
 
-    private static final String PATH_CALENDAR = "/imcms/jscalendar/" ;
-
-    public JSCalendar( String langIso639_2, HttpServletRequest request ) {
-        this.langIso639_2 = langIso639_2 ;
-        this.request     = request ;
+    public JSCalendar(String langIso639_2, HttpServletRequest request) {
+        this.langIso639_2 = langIso639_2;
+        this.request = request;
     }
-    public JSCalendar getInstance( String dateFieldId, String timeFieldId ) {
-        this.dateFieldId = dateFieldId ;
-        this.timeFieldId = timeFieldId ;
-        return this ;
+
+    public JSCalendar getInstance(String dateFieldId, String timeFieldId) {
+        this.dateFieldId = dateFieldId;
+        this.timeFieldId = timeFieldId;
+        return this;
     }
-    public JSCalendar getInstance( String dateFieldId ) {
-        this.dateFieldId = dateFieldId ;
-        this.timeFieldId = null ;
-        return this ;
+
+    public JSCalendar getInstance(String dateFieldId) {
+        this.dateFieldId = dateFieldId;
+        this.timeFieldId = null;
+        return this;
     }
+
     public String getHeadTagScripts() {
         String scripts =
-            "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"" + request.getContextPath() + PATH_CALENDAR + "skins/aqua/theme.css.jsp\" />\n" +
-            "<script type=\"text/javascript\" src=\"" + request.getContextPath() + PATH_CALENDAR + "calendar.js\"></script>\n" +
-            "<script type=\"text/javascript\" src=\"" + request.getContextPath() + PATH_CALENDAR + "lang/calendar-" + langIso639_2 + ".js\"></script>\n" +
-            "<script type=\"text/javascript\" src=\"" + request.getContextPath() + PATH_CALENDAR + "calendar-setup.js\"></script>\n"  ;
-        return scripts ;
+                "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"" + request.getContextPath() + PATH_CALENDAR + "skins/aqua/theme.css.jsp\" />\n" +
+                        "<script type=\"text/javascript\" src=\"" + request.getContextPath() + PATH_CALENDAR + "calendar.js\"></script>\n" +
+                        "<script type=\"text/javascript\" src=\"" + request.getContextPath() + PATH_CALENDAR + "lang/calendar-" + langIso639_2 + ".js\"></script>\n" +
+                        "<script type=\"text/javascript\" src=\"" + request.getContextPath() + PATH_CALENDAR + "calendar-setup.js\"></script>\n";
+        return scripts;
     }
+
     public String getButton(String title) {
 
         String calenderTitle = title;
         String button =
-            "<img" +
-            " src=\"" + request.getContextPath() + PATH_CALENDAR + "images/img.gif\"" +
-            " id=\"" + dateFieldId + "_btn\"" +
-            " style=\"cursor: pointer; cursor: hand;\"" +
-            " onmouseover=\"this.style.background='#000099';\"" +
-            " onmouseout=\"this.style.background=''\"" +
-            " title=\"" + calenderTitle + "\" />" ;
+                "<img" +
+                        " src=\"" + request.getContextPath() + PATH_CALENDAR + "images/img.gif\"" +
+                        " id=\"" + dateFieldId + "_btn\"" +
+                        " style=\"cursor: pointer; cursor: hand;\"" +
+                        " onmouseover=\"this.style.background='#000099';\"" +
+                        " onmouseout=\"this.style.background=''\"" +
+                        " title=\"" + calenderTitle + "\" />";
 
         button += "<script type=\"text/javascript\">\n" +
-        "Calendar.setup({\n" +
-        "	inputField   : \"" + dateFieldId + "\",\n" ;
+                "Calendar.setup({\n" +
+                "	inputField   : \"" + dateFieldId + "\",\n";
         if (timeFieldId != null && timeFieldId.length() > 0) {
             button +=
-        "	inputFieldTime : \"" + timeFieldId + "\",\n" +
-        "	showsTime   : true,\n" ;
+                    "	inputFieldTime : \"" + timeFieldId + "\",\n" +
+                            "	showsTime   : true,\n";
         }
         button +=
-        "	button     : \"" + dateFieldId + "_btn\"\n" +
-        "}) ;\n" +
-        "</script>"  ;
+                "	button     : \"" + dateFieldId + "_btn\"\n" +
+                        "}) ;\n" +
+                        "</script>";
 
-        return button ;
+        return button;
     }
 }
 
diff --git a/server/src/imcode/util/log/DailyRollingFileAppender.java b/server/src/imcode/util/log/DailyRollingFileAppender.java
deleted file mode 100644
index 191abf9e94..0000000000
--- a/server/src/imcode/util/log/DailyRollingFileAppender.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package imcode.util.log ;
-
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.spi.LoggingEvent;
-
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
-    Complete ripoff of org.apache.log4j.DailyRollingFileAppender in log4j 1.2.8,
-    since it has bugs and was impossible to subclass.
- */
-public class DailyRollingFileAppender extends FileAppender {
-
-
-    // The code assumes that the following constants are in a increasing
-    // sequence.
-    static final int TOP_OF_TROUBLE = -1;
-    static final int TOP_OF_MINUTE = 0;
-    static final int TOP_OF_HOUR = 1;
-    static final int HALF_DAY = 2;
-    static final int TOP_OF_DAY = 3;
-    static final int TOP_OF_WEEK = 4;
-    static final int TOP_OF_MONTH = 5;
-
-
-    /**
-     The date pattern. By default, the pattern is set to
-     "'.'yyyy-MM-dd" meaning daily rollover.
-     */
-    private String datePattern = "'.'yyyy-MM-dd";
-
-    /**
-     The log file will be renamed to the value of the
-     scheduledFilename variable when the next interval is entered. For
-     example, if the rollover period is one hour, the log file will be
-     renamed to the value of "scheduledFilename" at the beginning of
-     the next hour.
-
-     The precise time when a rollover occurs depends on logging
-     activity.
-     */
-    private String scheduledFilename;
-
-    /**
-     The next time we estimate a rollover should occur. */
-    private long nextCheck = System.currentTimeMillis() - 1;
-
-    private Date now = new Date();
-
-    private SimpleDateFormat sdf;
-
-    private RollingCalendar rc = new RollingCalendar();
-
-    int checkPeriod = TOP_OF_TROUBLE;
-
-    // The gmtTimeZone is used only in computeCheckPeriod() method.
-    private static final TimeZone GMT_TIME_ZONE = TimeZone.getTimeZone( "GMT" );
-
-
-    /**
-     The default constructor does nothing. */
-    public DailyRollingFileAppender() {
-    }
-
-    /**
-     Instantiate a <code>DailyRollingFileAppender</code> and open the
-     file designated by <code>filename</code>. The opened filename will
-     become the ouput destination for this appender.
-
-     */
-    public DailyRollingFileAppender( Layout layout, String filename,
-                                     String datePattern ) throws IOException {
-        super( layout, filename, true );
-        this.datePattern = datePattern;
-        activateOptions();
-    }
-
-    /**
-     The <b>DatePattern</b> takes a string in the same format as
-     expected by {@link SimpleDateFormat}. This options determines the
-     rollover schedule.
-     */
-    public void setDatePattern( String pattern ) {
-        datePattern = pattern;
-    }
-
-    /** Returns the value of the <b>DatePattern</b> option. */
-    private String getDatePattern() {
-        return datePattern;
-    }
-
-    public void activateOptions() {
-        super.activateOptions();
-        if ( datePattern != null && fileName != null ) {
-            now.setTime( System.currentTimeMillis() );
-            sdf = new SimpleDateFormat( datePattern );
-            int type = computeCheckPeriod();
-            printPeriodicity( type );
-            rc.setType( type );
-            File file = new File( fileName );
-            scheduledFilename = fileName + sdf.format( new Date( file.lastModified() ) );
-
-        } else {
-            LogLog.error( "Either File or DatePattern options are not set for appender ["
-                          + name + "]." );
-        }
-    }
-
-    private void printPeriodicity( int type ) {
-        switch ( type ) {
-            case TOP_OF_MINUTE:
-                LogLog.debug( "Appender [" + name + "] to be rolled every minute." );
-                break;
-            case TOP_OF_HOUR:
-                LogLog.debug( "Appender [" + name
-                              + "] to be rolled on top of every hour." );
-                break;
-            case HALF_DAY:
-                LogLog.debug( "Appender [" + name
-                              + "] to be rolled at midday and midnight." );
-                break;
-            case TOP_OF_DAY:
-                LogLog.debug( "Appender [" + name
-                              + "] to be rolled at midnight." );
-                break;
-            case TOP_OF_WEEK:
-                LogLog.debug( "Appender [" + name
-                              + "] to be rolled at start of week." );
-                break;
-            case TOP_OF_MONTH:
-                LogLog.debug( "Appender [" + name
-                              + "] to be rolled at start of every month." );
-                break;
-            default:
-                LogLog.warn( "Unknown periodicity for appender [" + name + "]." );
-        }
-    }
-
-
-    // This method computes the roll over period by looping over the
-    // periods, starting with the shortest, and stopping when the r0 is
-    // different from from r1, where r0 is the epoch formatted according
-    // the datePattern (supplied by the user) and r1 is the
-    // epoch+nextMillis(i) formatted according to datePattern. All date
-    // formatting is done in GMT and not local format because the test
-    // logic is based on comparisons relative to 1970-01-01 00:00:00
-    // GMT (the epoch).
-
-    private int computeCheckPeriod() {
-        RollingCalendar rollingCalendar = new RollingCalendar( GMT_TIME_ZONE, Locale.ENGLISH );
-        // set sate to 1970-01-01 00:00:00 GMT
-        Date epoch = new Date( 0 );
-        if ( datePattern != null ) {
-            for ( int i = TOP_OF_MINUTE; i <= TOP_OF_MONTH; i++ ) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat( datePattern );
-                simpleDateFormat.setTimeZone( GMT_TIME_ZONE ); // do all date formatting in GMT
-                String r0 = simpleDateFormat.format( epoch );
-                rollingCalendar.setType( i );
-                Date next = new Date( rollingCalendar.getNextCheckMillis( epoch ) );
-                String r1 = simpleDateFormat.format( next );
-                //System.out.println("Type = "+i+", r0 = "+r0+", r1 = "+r1);
-                if ( r0 != null && r1 != null && !r0.equals( r1 ) ) {
-                    return i;
-                }
-            }
-        }
-        return TOP_OF_TROUBLE; // Deliberately head for trouble...
-    }
-
-    /**
-     Rollover the current file to a new file.
-     */
-    private void rollOver() {
-
-        /* Compute filename, but only if datePattern is specified */
-        if ( getDatePattern() == null ) {
-            errorHandler.error( "Missing DatePattern option in rollOver()." );
-            return;
-        }
-
-        Date now = new Date();
-
-        String datedFilename = fileName + sdf.format( now );
-        // It is too early to roll over because we are still within the
-        // bounds of the current interval. Rollover will occur once the
-        // next interval is reached.
-        if ( scheduledFilename.equals( datedFilename ) ) {
-            return;
-        }
-
-        // close current file, and rename it to datedFilename
-        this.closeFile();
-
-        File scheduledFile = new File( scheduledFilename );
-        if ( scheduledFile.exists() ) {
-            scheduledFile.delete();
-        }
-
-        File file = new File( fileName );
-        boolean copyWasSuccessful = copyFile( file, scheduledFile );
-        if ( copyWasSuccessful ) {
-            LogLog.debug( "Copied " + fileName + " -> " + scheduledFilename );
-        } else {
-            LogLog.error( "Failed to copy [" + fileName + "] to [" + scheduledFilename + "]." );
-        }
-
-        try {
-            boolean appendToFile = !copyWasSuccessful;
-            // This will also close the file. This is OK since multiple
-            // close operations are safe.
-            this.setFile( fileName, appendToFile, this.bufferedIO, this.bufferSize );
-        } catch ( IOException e ) {
-            errorHandler.error( "setFile(" + fileName + ", false) call failed." );
-        }
-        scheduledFilename = datedFilename;
-    }
-
-    private static boolean copyFile( File from, File to ) {
-        try {
-            InputStream in = new BufferedInputStream(new FileInputStream( from )) ;
-            OutputStream out = new BufferedOutputStream(new FileOutputStream( to )) ;
-            int b;
-            while ( ( b = in.read() ) != -1 ) {
-                out.write( b );
-            }
-            out.flush();
-            out.close();
-            return true;
-        } catch ( FileNotFoundException e ) {
-            return false;
-        } catch ( IOException e ) {
-            return false;
-        }
-    }
-
-    /**
-     * This method differentiates DailyRollingFileAppender from its
-     * super class.
-     *
-     * <p>Before actually logging, this method will check whether it is
-     * time to do a rollover. If it is, it will schedule the next
-     * rollover time and then rollover.
-     * */
-    protected void subAppend( LoggingEvent event ) {
-        long n = System.currentTimeMillis();
-        if ( n >= nextCheck ) {
-            now.setTime( n );
-            nextCheck = rc.getNextCheckMillis( now );
-            rollOver();
-        }
-        super.subAppend( event );
-    }
-}
-
-/**
- *  RollingCalendar is a helper class to DailyRollingFileAppender.
- *  Given a periodicity type and the current time, it computes the
- *  start of the next interval.
- * */
-class RollingCalendar extends GregorianCalendar {
-
-    private int type = DailyRollingFileAppender.TOP_OF_TROUBLE;
-
-    RollingCalendar() {
-        super();
-    }
-
-    RollingCalendar( TimeZone tz, Locale locale ) {
-        super( tz, locale );
-    }
-
-    void setType( int type ) {
-        this.type = type;
-    }
-
-    public long getNextCheckMillis( Date now ) {
-        return getNextCheckDate( now ).getTime();
-    }
-
-    private Date getNextCheckDate( Date now ) {
-        this.setTime( now );
-
-        switch ( type ) {
-            case DailyRollingFileAppender.TOP_OF_MINUTE:
-                this.set( Calendar.SECOND, 0 );
-                this.set( Calendar.MILLISECOND, 0 );
-                this.add( Calendar.MINUTE, 1 );
-                break;
-            case DailyRollingFileAppender.TOP_OF_HOUR:
-                this.set( Calendar.MINUTE, 0 );
-                this.set( Calendar.SECOND, 0 );
-                this.set( Calendar.MILLISECOND, 0 );
-                this.add( Calendar.HOUR_OF_DAY, 1 );
-                break;
-            case DailyRollingFileAppender.HALF_DAY:
-                this.set( Calendar.MINUTE, 0 );
-                this.set( Calendar.SECOND, 0 );
-                this.set( Calendar.MILLISECOND, 0 );
-                int hour = get( Calendar.HOUR_OF_DAY );
-                if ( hour < 12 ) {
-                    this.set( Calendar.HOUR_OF_DAY, 12 );
-                } else {
-                    this.set( Calendar.HOUR_OF_DAY, 0 );
-                    this.add( Calendar.DAY_OF_MONTH, 1 );
-                }
-                break;
-            case DailyRollingFileAppender.TOP_OF_DAY:
-                this.set( Calendar.HOUR_OF_DAY, 0 );
-                this.set( Calendar.MINUTE, 0 );
-                this.set( Calendar.SECOND, 0 );
-                this.set( Calendar.MILLISECOND, 0 );
-                this.add( Calendar.DATE, 1 );
-                break;
-            case DailyRollingFileAppender.TOP_OF_WEEK:
-                this.set( Calendar.DAY_OF_WEEK, getFirstDayOfWeek() );
-                this.set( Calendar.HOUR_OF_DAY, 0 );
-                this.set( Calendar.SECOND, 0 );
-                this.set( Calendar.MILLISECOND, 0 );
-                this.add( Calendar.WEEK_OF_YEAR, 1 );
-                break;
-            case DailyRollingFileAppender.TOP_OF_MONTH:
-                this.set( Calendar.DATE, 1 );
-                this.set( Calendar.HOUR_OF_DAY, 0 );
-                this.set( Calendar.SECOND, 0 );
-                this.set( Calendar.MILLISECOND, 0 );
-                this.add( Calendar.MONTH, 1 );
-                break;
-            default:
-                throw new IllegalStateException( "Unknown periodicity type." );
-        }
-        return getTime();
-    }
-}
diff --git a/server/src/imcode/util/log/DocumentRequestRenderer.java b/server/src/imcode/util/log/DocumentRequestRenderer.java
new file mode 100644
index 0000000000..3d5896f0ad
--- /dev/null
+++ b/server/src/imcode/util/log/DocumentRequestRenderer.java
@@ -0,0 +1,102 @@
+package imcode.util.log;
+
+import com.imcode.imcms.mapping.SectionFromIdTransformer;
+import imcode.server.DocumentRequest;
+import imcode.server.Imcms;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
+import org.apache.commons.collections.iterators.TransformIterator;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Iterator;
+import java.util.Set;
+
+
+public final class DocumentRequestRenderer {
+
+	private final static String REDIRECT_PREFIX = "/RD";
+
+	/**
+	 * Render a DocumentRequest as a String.
+	 */
+	public static String render(final DocumentRequest documentRequest) {
+		final StringBuilder message = new StringBuilder();
+		final DocumentDomainObject document = documentRequest.getDocument();
+		final DocumentDomainObject referrer = documentRequest.getReferrer();
+
+		message.append(documentRequest.getHttpServletRequest().getRemoteAddr());
+		message.append(' ').append(documentRequest.getUser().getId());
+
+		message.append(" sessionID=").append(documentRequest.getHttpServletRequest().getSession().getId());
+
+		message.append(' ').append(documentRequest.getHttpServletRequest().getContextPath()).append(REDIRECT_PREFIX).append(renderDocument(document));
+		if (null != referrer) {
+			message.append(' ').append(documentRequest.getHttpServletRequest().getContextPath()).append(REDIRECT_PREFIX).append(renderDocument(referrer));
+		}
+
+		return message.toString();
+	}
+
+	private static String renderDocument(DocumentDomainObject document) {
+
+        Set sectionIds = document.getSectionIds();
+        int metaId = document.getId();
+        int docType = document.getDocumentTypeId();
+        String headline = document.getHeadline();
+
+        StringBuffer result = new StringBuffer();
+        result.append('/');
+        if (!sectionIds.isEmpty()) {
+            Iterator sectionsIterator = new TransformIterator(sectionIds.iterator(), new SectionFromIdTransformer(Imcms.getServices()));
+            result.append(lossyUrlEncode(StringUtils.join(sectionsIterator, ",")));
+        } else {
+            result.append('_');
+        }
+        result.append('/');
+        result.append(metaId);
+        result.append('/');
+        result.append(docType);
+        result.append('/');
+        result.append(lossyUrlEncode(headline));
+        result.append('/');
+        if (document instanceof TextDocumentDomainObject) {
+            String templateName = ((TextDocumentDomainObject) document).getTemplateName();
+            result.append(lossyUrlEncode(templateName));
+        }
+        result.append('/');
+
+        return result.toString();
+    }
+
+    private static String lossyUrlEncode(String url) {
+        StringBuffer result = new StringBuffer();
+        for (int i = 0; i < url.length(); ++i) {
+            char c = url.charAt(i);
+            if (' ' == c) {
+                // Spaces convert to '_'
+                result.append('_');
+            } else if (',' == c || '.' == c || '-' == c || '_' == c) {
+                // We explicitly allow some punctuation that are known safe url-characters.
+                // Everything else is likely to break somewhere, somehow.
+                result.append(c);
+            } else if (c < 32 || c >= 128 && c < 160) {
+                // We strip control chars (including newlines and tabs),
+                // and unassigned characters in iso-8859-1.
+            } else if (c < 256 && Character.isLetterOrDigit(c)) {
+                // It's a letter or digit in iso-8859-1.
+                result.append(c);
+            } else {
+                try {
+                    // Otherwise, url-encode it.
+                    // Note that UTF-8 is the W3C-recommended standard.
+                    result.append(URLEncoder.encode("" + c, "UTF-8"));
+                } catch (UnsupportedEncodingException uee) {
+                    // All JVMs are required to support UTF-8.
+                }
+            }
+        }
+        return result.toString();
+    }
+}
diff --git a/server/src/imcode/util/log/FakeRequestRenderer.java b/server/src/imcode/util/log/FakeRequestRenderer.java
deleted file mode 100644
index c0e664aa7a..0000000000
--- a/server/src/imcode/util/log/FakeRequestRenderer.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package imcode.util.log;
-
-import imcode.server.DocumentRequest;
-import imcode.server.Revisits;
-import imcode.server.Imcms;
-import com.imcode.imcms.mapping.SectionFromIdTransformer;
-import imcode.server.document.DocumentDomainObject;
-import imcode.server.document.textdocument.TextDocumentDomainObject;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.collections.iterators.TransformIterator;
-import org.apache.log4j.or.ObjectRenderer;
-
-import java.net.URLEncoder;
-import java.io.UnsupportedEncodingException;
-import java.util.Set;
-import java.util.Iterator;
-
-public class FakeRequestRenderer implements ObjectRenderer {
-
-    private final static String REDIRECT_PREFIX = "/RD";
-
-    /**
-     * Render a DocumentRequest as a String.
-     */
-    public String doRender( Object o ) {
-
-        DocumentRequest docReq = (DocumentRequest)o;
-
-        DocumentDomainObject document = docReq.getDocument();
-        DocumentDomainObject referrer = docReq.getReferrer();
-
-        StringBuffer result = new StringBuffer( docReq.getHttpServletRequest().getRemoteAddr() );
-        result.append( ' ' ).append( docReq.getUser().getId() );
-
-        result.append( " sessionID=" ).append( docReq.getHttpServletRequest().getSession().getId() );
-        Revisits revisits = docReq.getRevisits();
-
-        result.append( ";imVisits=" ).append( revisits.getRevisitsId() );
-        if ( null != revisits.getRevisitsDate() ) {
-            result.append( revisits.getRevisitsDate() );
-        }
-        result.append( ' ' ).append( docReq.getHttpServletRequest().getContextPath() ).append( REDIRECT_PREFIX ).append( renderDocument( document ) );
-        if ( null != referrer ) {
-            result.append( ' ' ).append( docReq.getHttpServletRequest().getContextPath() ).append( REDIRECT_PREFIX ).append( renderDocument( referrer ) );
-        }
-        return result.toString();
-    }
-
-    private String renderDocument( DocumentDomainObject document ) {
-
-        Set sectionIds = document.getSectionIds();
-        int metaId = document.getId();
-        int docType = document.getDocumentTypeId();
-        String headline = document.getHeadline();
-
-        StringBuffer result = new StringBuffer();
-        result.append( '/' );
-        if ( !sectionIds.isEmpty() ) {
-            Iterator sectionsIterator = new TransformIterator(sectionIds.iterator(), new SectionFromIdTransformer(Imcms.getServices()));
-            result.append( lossyUrlEncode( StringUtils.join( sectionsIterator, "," ) ) );
-        } else {
-            result.append( '_' );
-        }
-        result.append( '/' );
-        result.append( metaId );
-        result.append( '/' );
-        result.append( docType );
-        result.append( '/' );
-        result.append( lossyUrlEncode( headline ) );
-        result.append( '/' );
-        if ( document instanceof TextDocumentDomainObject ) {
-            String templateName = ( (TextDocumentDomainObject) document ).getTemplateName();
-            result.append( lossyUrlEncode( templateName ) );
-        }
-        result.append( '/' );
-
-        return result.toString();
-    }
-
-    private String lossyUrlEncode( String url ) {
-        StringBuffer result = new StringBuffer();
-        for ( int i = 0; i < url.length(); ++i ) {
-            char c = url.charAt( i );
-            if ( ' ' == c ) {
-                // Spaces convert to '_'
-                result.append( '_' );
-            } else if ( ',' == c || '.' == c || '-' == c || '_' == c ) {
-                // We explicitly allow some punctuation that are known safe url-characters.
-                // Everything else is likely to break somewhere, somehow.
-                result.append( c );
-            } else if ( c < 32 || c >= 128 && c < 160 ) {
-                // We strip control chars (including newlines and tabs),
-                // and unassigned characters in iso-8859-1.
-            } else if ( c < 256 && Character.isLetterOrDigit( c ) ) {
-                // It's a letter or digit in iso-8859-1.
-                result.append( c );
-            } else {
-                try {
-                    // Otherwise, url-encode it.
-                    // Note that UTF-8 is the W3C-recommended standard.
-                    result.append( URLEncoder.encode( "" + c, "UTF-8" ) );
-                } catch ( UnsupportedEncodingException uee ) {
-                    // All JVMs are required to support UTF-8.
-                }
-            }
-        }
-        return result.toString();
-    }
-}
diff --git a/server/src/imcode/util/log/TestDailyRollingFileAppender.java b/server/src/imcode/util/log/TestDailyRollingFileAppender.java
deleted file mode 100644
index fd7879022e..0000000000
--- a/server/src/imcode/util/log/TestDailyRollingFileAppender.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package imcode.util.log;
-
-import junit.framework.TestCase;
-import org.apache.log4j.*;
-import org.apache.log4j.spi.LoggingEvent;
-
-import java.io.File;
-import java.io.IOException;
-
-public class TestDailyRollingFileAppender extends TestCase {
-
-    private static final String DATE_PATTERN = ".yyyy-MM-dd-HH-mm";
-
-    public TestDailyRollingFileAppender(String name) {
-        super(name) ;
-    }
-
-    public void setUp() {
-        getTempFile().delete() ;
-    }
-
-    public void testLogFileCreated() throws IOException {
-        createAppender( getTempFile() );
-        assertTrue(getTempFile().exists()) ;
-    }
-
-    public void testLineLogged() throws IOException {
-        DailyRollingFileAppender appender = createAppender( getTempFile() ) ;
-        appender.doAppend(getLoggingEvent() );
-        appender.close();
-        assertTrue(getTempFile().length() > 0) ;
-    }
-
-    /*
-        Takes too long.
-    public void testRollOver() throws IOException, InterruptedException {
-        File tempFile = getTempFile();
-        DailyRollingFileAppender appender = createAppender( tempFile ) ;
-        appender.doAppend(getLoggingEvent()) ;
-        waitForMinuteRollOver() ;
-        appender.doAppend(getLoggingEvent()) ;
-        appender.close();
-
-        File rolledOverFile = getRolledOverFile( tempFile );
-
-        assertTrue("Checking that log file '"+tempFile.getPath()+"' exists", tempFile.exists());
-        assertTrue("Checking that log file '"+tempFile.getPath()+"' is non-empty", tempFile.length() > 0) ;
-        assertTrue("Checking that rolled over file '"+rolledOverFile.getPath()+"' exists",rolledOverFile.exists()) ;
-        assertTrue("Checking that rolled over file '"+rolledOverFile.getPath()+"' is non-empty",rolledOverFile.length() > 0) ;
-    }
-
-    private static File getRolledOverFile( File tempFile ) {
-        DateFormat dateFormat = new SimpleDateFormat(DATE_PATTERN) ;
-        Calendar gregorianCalendar = new GregorianCalendar() ;
-        gregorianCalendar.add(Calendar.MINUTE, -1) ;
-        String rolledOverFileName = tempFile.getPath()+dateFormat.format(gregorianCalendar.getTime()) ;
-        File rolledOverFile = new File(rolledOverFileName) ;
-        return rolledOverFile;
-    }
-
-    private static void waitForMinuteRollOver() throws InterruptedException {
-        Calendar gregorianCalendar = new GregorianCalendar() ;
-        int secondsOfMinute = gregorianCalendar.get(Calendar.SECOND) ;
-        Thread.sleep((60-secondsOfMinute)*1000);
-    }
-    */
-
-    private LoggingEvent getLoggingEvent() {
-        return new LoggingEvent(MockLogger.class.getName(),new MockLogger("mock"),Priority.DEBUG,"Test",null);
-    }
-
-    private static DailyRollingFileAppender createAppender( File filePath ) throws IOException {
-        String fileName = filePath.getPath() ;
-        Layout layout = new SimpleLayout() ;
-        DailyRollingFileAppender appender = new DailyRollingFileAppender(layout, fileName, DATE_PATTERN ) ;
-        return appender;
-    }
-
-    private static File getTempFile() {
-        String tmpDir = "tmp" ;
-        File filePath = new File(tmpDir, TestDailyRollingFileAppender.class.getName()+".test") ;
-        return filePath;
-    }
-
-    private class MockLogger extends Logger {
-        private MockLogger(String name) {
-            super(name) ;
-        }
-    }
-
-}
diff --git a/server/src/imcode/util/net/SMTP.java b/server/src/imcode/util/net/SMTP.java
index 2d54a970d1..7a9552148e 100644
--- a/server/src/imcode/util/net/SMTP.java
+++ b/server/src/imcode/util/net/SMTP.java
@@ -1,18 +1,25 @@
 package imcode.util.net;
 
+import com.imcode.imcms.util.l10n.LocalizedMessage;
+import imcode.server.Imcms;
 import imcode.util.Utility;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.UnhandledException;
+import org.apache.commons.mail.Email;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.HtmlEmail;
 
 import javax.activation.DataSource;
+import javax.mail.Authenticator;
+import javax.mail.PasswordAuthentication;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import java.io.IOException;
 import java.util.Arrays;
-import com.imcode.imcms.util.l10n.LocalizedMessage;
+import java.util.Collection;
+import java.util.Map;
 
 /**
  * class SMTP - Provides methods for sending mail.
@@ -28,126 +35,158 @@ public class SMTP {
     /**
      * Connects to an SMTP-server
      *
+     * @param host The address of the server.
+     * @param port The port of the server, usually 25.
      * @throws IllegalArgumentException Thrown when given a timeout of zero or less.
-     * @param	host		The address of the server.
-     * @param	port		The port of the server, usually 25.
      */
-    public SMTP( String host, int port ) {
+    public SMTP(String host, int port) {
         this.host = host;
         this.port = port;
     }
 
-    public void sendMail( Mail mail )
-            throws IOException {
-        HtmlEmail email = mail.getMail();
-
+    public void sendMail(Mail email) throws IOException {
         try {
-            email.setHostName( host );
-            email.setSmtpPort( port );
+            setEncryption(email);
+
+            email.setHostName(host);
+            email.setSmtpPort(port);
             email.setCharset("UTF-8");
             email.send();
-        } catch ( EmailException e ) {
-            if (Utility.throwableContainsMessageContaining( e, "no object DCH")) {
-                throw new UnhandledException( "\"no object DCH\" Likely cause: the activation jar-file cannot see the mail jar-file. Different ClassLoaders?", e ) ;
+        } catch (EmailException e) {
+            if (Utility.throwableContainsMessageContaining(e, "no object DCH")) {
+                throw new UnhandledException("\"no object DCH\" Likely cause: the activation jar-file cannot see the mail jar-file. Different ClassLoaders?", e);
+            } else {
+                throw new UnhandledException(e);
+            }
+        }
+    }
+
+    private void setEncryption(Email mail) {
+        final String encryptionProtocol = getServerProperty("encryption.protocol");
+        final String accountMail = getServerProperty("mail.address");
+        final String accountMailPassword = getServerProperty("mail.password");
+
+        if ((encryptionProtocol != null) && (accountMail != null) && (accountMailPassword != null)) {
+            if (encryptionProtocol.toLowerCase().equals("tls")) {
+                mail.setStartTLSEnabled(true);
+
+            } else if (encryptionProtocol.toLowerCase().equals("ssl")) {
+                mail.setSSLOnConnect(true);
+
             } else {
-                throw new UnhandledException( e ) ;
+                return;
             }
+
+            mail.setAuthenticator(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(accountMail, accountMailPassword);
+                }
+            });
         }
     }
 
-    public static class Mail {
+    private String getServerProperty(String key) {
+        return StringUtils.trimToNull(Imcms.getServerProperties().getProperty(key));
+    }
+
+    public static class Mail extends HtmlEmail {
 
-        private HtmlEmail mail = new HtmlEmail();
-        private String textBody ;
+        private String textBody;
 
-        public Mail( String fromAddress ) {
+        public Mail(String fromAddress) {
             try {
-                mail.setFrom( fromAddress );
-            } catch ( EmailException e ) {
+                setFrom(fromAddress);
+            } catch (EmailException e) {
                 LocalizedMessage errorMessage = new LocalizedMessage("error/missing_email_fromAdress");
-                throw new UnhandledException( errorMessage.toLocalizedString("eng")  , e );
+                throw new UnhandledException(errorMessage.toLocalizedString("eng"), e);
             }
         }
 
-        public Mail( String fromAddress, String[] toAddresses, String subject, String body ) {
-            this( fromAddress );
-            setToAddresses( toAddresses );
-            setSubject( subject );
-            setBody( body );
+        public Mail(String fromAddress, String[] toAddresses, String subject, String body) {
+            this(fromAddress);
+            setToAddresses(toAddresses);
+            setSubject(subject);
+            setBody(body);
         }
 
-        public void setBccAddresses( String[] bccAddresses ) {
+        public void setBccAddresses(String[] bccAddresses) {
             try {
-                mail.setBcc( CollectionUtils.collect( Arrays.asList( bccAddresses ), new StringToInternetAddressTransformer() ) );
-            } catch ( EmailException e ) {
-                throw new UnhandledException( e );
+                setBcc(transformToInternetAddress(bccAddresses));
+            } catch (EmailException e) {
+                throw new UnhandledException(e);
             }
         }
 
-        public void setBody( String body ) {
+        public void setBody(String body) {
             try {
-                textBody = body ;
-                mail.setTextMsg( body );
-            } catch ( EmailException e ) {
-                throw new UnhandledException( e );
+                textBody = body;
+                setTextMsg(body);
+            } catch (EmailException e) {
+                throw new UnhandledException(e);
             }
         }
 
-        public void setHtmlBody( String htmlBody ) {
+        public void setHtmlBody(String htmlBody) {
             try {
-                mail.setHtmlMsg(htmlBody) ;
+                setHtmlMsg(htmlBody);
                 if (null == textBody) {
                     setBody(htmlBody.replaceAll("<[^>]*>", ""));
                 }
-            } catch ( EmailException e ) {
+            } catch (EmailException e) {
                 throw new UnhandledException(e);
             }
         }
 
-        public void setCcAddresses( String[] ccAddresses ) {
+        public void setCcAddresses(String[] ccAddresses) {
             try {
-                mail.setCc( CollectionUtils.collect( Arrays.asList( ccAddresses ), new StringToInternetAddressTransformer() ) );
-            } catch ( EmailException e ) {
-                throw new UnhandledException( e );
+                setCc(transformToInternetAddress(ccAddresses));
+            } catch (EmailException e) {
+                throw new UnhandledException(e);
             }
         }
 
-        public void setSubject( String subject ) {
-            mail.setSubject( subject );
+        public void setToAddresses(String[] toAddresses) {
+            try {
+                setTo(transformToInternetAddress(toAddresses));
+            } catch (EmailException e) {
+                throw new UnhandledException(e);
+            }
         }
 
-        public void setToAddresses( String[] toAddresses ) {
+        public void setReplyToAddresses(String[] replyToAddresses) {
             try {
-                mail.setTo( CollectionUtils.collect( Arrays.asList( toAddresses ), new StringToInternetAddressTransformer() ) );
-            } catch ( EmailException e ) {
-                throw new UnhandledException( e );
+                setReplyTo(transformToInternetAddress(replyToAddresses));
+            } catch (EmailException e) {
+                throw new UnhandledException(e);
             }
         }
 
-        public void setAttachments( DataSource[] attachments ) {
+        public void setAttachments(DataSource[] attachments) {
             try {
-                for ( int i = 0; i < attachments.length; i++ ) {
-                    DataSource attachment = attachments[i];
-                    mail.attach( attachment, attachment.getName(), "" );
+                for (DataSource attachment : attachments) {
+                    attach(attachment, attachment.getName(), "");
                 }
-            } catch ( EmailException e ) {
-                throw new UnhandledException( e );
+            } catch (EmailException e) {
+                throw new UnhandledException(e);
             }
         }
 
-        private HtmlEmail getMail() {
-            return mail;
+        public Map<String, String> getHeaders() {
+            return headers;
         }
 
-        private static class StringToInternetAddressTransformer implements Transformer {
+        private Collection<InternetAddress> transformToInternetAddress(String[] stringArray) {
+            return CollectionUtils.collect(Arrays.asList(stringArray), new Transformer<String, InternetAddress>() {
 
-            public Object transform( Object input ) {
-                try {
-                    return new InternetAddress( (String)input, false );
-                } catch ( AddressException e ) {
-                    throw new UnhandledException( e );
+                public InternetAddress transform(String input) {
+                    try {
+                        return new InternetAddress(input, false);
+                    } catch (AddressException e) {
+                        throw new UnhandledException(e);
+                    }
                 }
-            }
+            });
         }
     }
 }
diff --git a/sql/data/init.sql b/sql/data/init.sql
index b80f111021..723e8dd777 100644
--- a/sql/data/init.sql
+++ b/sql/data/init.sql
@@ -9,7 +9,7 @@ INSERT INTO lang_prefixes VALUES(1,'swe');
 INSERT INTO lang_prefixes VALUES(2,'eng');
 
 INSERT INTO doc_types VALUES(2, 'swe', 'Textsida');
-INSERT INTO doc_types VALUES(5, 'swe', 'Extern länk');
+INSERT INTO doc_types VALUES(5, 'swe', 'Extern l�nk');
 INSERT INTO doc_types VALUES(6, 'swe', 'Browserkontroll');
 INSERT INTO doc_types VALUES(7, 'swe', 'HTML-dokument');
 INSERT INTO doc_types VALUES(8, 'swe', 'Fil');
@@ -20,17 +20,17 @@ INSERT INTO doc_types VALUES(6, 'eng', 'Browser controlled link');
 INSERT INTO doc_types VALUES(7, 'eng', 'HTML-document');
 INSERT INTO doc_types VALUES(8, 'eng', 'File');
 
-INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,2,'swe','Ändra text');
+INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,2,'swe','�ndra text');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,5,'swe','Redigera');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,6,'swe','Redigera');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,7,'swe','Redigera');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,8,'swe','Redigera');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,101,'swe','Redigera');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,102,'swe','Redigera');
-INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(131072,2,'swe','Ändra bild');
-INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(262144,2,'swe','Ändra meny');
-INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(524288,2,'swe','Ändra utseende');
-INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(1048576,2,'swe','Ändra include');
+INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(131072,2,'swe','�ndra bild');
+INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(262144,2,'swe','�ndra meny');
+INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(524288,2,'swe','�ndra utseende');
+INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(1048576,2,'swe','�ndra include');
 
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,2,'eng','Edit texts');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(65536,5,'eng','Edit');
@@ -44,9 +44,9 @@ INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description)
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(524288,2,'eng','Change template');
 INSERT INTO doc_permissions (permission_id, doc_type, lang_prefix, description) VALUES(1048576,2,'eng','Change include');
 
-INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(1,'swe','Ändra rubrik');
-INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(2,'swe','Ändra dokinfo');
-INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(4,'swe','Ändra rättigheter för roller');
+INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(1,'swe','�ndra rubrik');
+INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(2,'swe','�ndra dokinfo');
+INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(4,'swe','�ndra r�ttigheter f�r roller');
 INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(8,'swe','Skapa dokument');
 
 INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(1,'eng','Edit headline');
@@ -55,9 +55,9 @@ INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(4,'eng'
 INSERT INTO permissions (permission_id, lang_prefix, description) VALUES(8,'eng','Create document');
 
 INSERT INTO permission_sets (set_id, description) VALUES(0,'Full');
-INSERT INTO permission_sets (set_id, description) VALUES(1,'Begränsad 1');
-INSERT INTO permission_sets (set_id, description) VALUES(2,'Begränsad 2');
-INSERT INTO permission_sets (set_id, description) VALUES(3,'Läs');
+INSERT INTO permission_sets (set_id, description) VALUES(1,'Begr�nsad 1');
+INSERT INTO permission_sets (set_id, description) VALUES(2,'Begr�nsad 2');
+INSERT INTO permission_sets (set_id, description) VALUES(3,'L�s');
 
 INSERT INTO browsers (browser_id, name, user_agent, value) VALUES(1,'Internet Explorer','%MSIE%',2);
 INSERT INTO browsers (browser_id, name, user_agent, value) VALUES(2,'Netscape','Mozilla%(%;%[UIN][);]%',2);
@@ -107,7 +107,7 @@ INSERT INTO sys_types (type_id,name) VALUES(7,'WebMasterAddress');
 INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(0,'Annan...','other','swe');
 INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(1,'Vanlig text','text/plain','swe');
 INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(2,'HTML-dokument','text/html','swe');
-INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(3,'Binärfil','application/octet-stream','swe');
+INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(3,'Bin�rfil','application/octet-stream','swe');
 INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(4,'Shockwave Flash','application/x-shockwave-flash','swe');
 INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(5,'Shockwave Director','application/x-director','swe');
 INSERT INTO mime_types (mime_id, mime_name, mime, lang_prefix) VALUES(6,'PNG-bild','image/png','swe');
@@ -188,6 +188,7 @@ VALUES (2,'user', 'user', 'User', 'Extern','','','','','','','','',0,1,
 INSERT INTO roles (role_id, role_name, permissions, admin_role) VALUES(0, 'Superadmin', 0, 1);
 INSERT INTO roles (role_id, role_name, permissions, admin_role) VALUES(1, 'Useradmin', 0, 2);
 INSERT INTO roles (role_id, role_name, permissions, admin_role) VALUES(2, 'Users', 1, 0);
+INSERT INTO roles (role_id, role_name, permissions, admin_role) VALUES(3, 'CGIUsers', 1, 0);
 -- mssql SET IDENTITY_INSERT roles OFF
 
 INSERT INTO user_roles_crossref VALUES(1,0);
diff --git a/sql/data/issue_6733.sql b/sql/data/issue_6733.sql
deleted file mode 100644
index 5cf431902d..0000000000
--- a/sql/data/issue_6733.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- -------------------------------
--- Manual update. Fixes isuue 6773
--- -------------------------------
-
--- Document's search keyword column
-alter table classification modify code varchar(128);
-
--- User's data columns
-alter table users
-    modify login_name     varchar(128),
-    modify first_name     varchar(64),
-    modify last_name      varchar(64),
-    modify title          varchar(64),
-    modify company        varchar(64),
-    modify address        varchar(128),
-    modify city           varchar(64),
-    modify zip            varchar(64),
-    modify country        varchar(64),
-    modify county_council varchar(128),
-    modify email          varchar(128);
\ No newline at end of file
diff --git a/sql/data/mysql-schema-diff-4.10.sql b/sql/data/mysql-schema-diff-4.10.sql
deleted file mode 100644
index e91fd12b69..0000000000
--- a/sql/data/mysql-schema-diff-4.10.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table users add column session_id varchar(128) null;
-
-update database_version set major = 4, minor = 10;
-commit;
diff --git a/sql/data/mysql-schema-diff-4.9.sql b/sql/data/mysql-schema-diff-4.9.sql
deleted file mode 100644
index 38caca5bdf..0000000000
--- a/sql/data/mysql-schema-diff-4.9.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Document's search keyword column
-alter table classification modify code varchar(128);
-
--- User's data columns
-alter table users
-    modify login_name     varchar(128),
-    modify first_name     varchar(64),
-    modify last_name      varchar(64),
-    modify title          varchar(64),
-    modify company        varchar(64),
-    modify address        varchar(128),
-    modify city           varchar(64),
-    modify zip            varchar(64),
-    modify country        varchar(64),
-    modify county_council varchar(128),
-    modify email          varchar(128);
-
-update database_version set major = 4, minor = 9;
-commit;    
diff --git a/sql/diff/diff-4.10-4.11-mssql.sql b/sql/diff/diff-4.10-4.11-mssql.sql
new file mode 100644
index 0000000000..46d614d837
--- /dev/null
+++ b/sql/diff/diff-4.10-4.11-mssql.sql
@@ -0,0 +1,160 @@
+-- Extends image handling and adds support for image archive
+
+-- --------------
+-- IMAGE HANDLING
+-- --------------
+CREATE TABLE images_cache (
+    id varchar(40) NOT NULL,
+    meta_id integer NOT NULL,
+    image_index integer NOT NULL,
+    resource nvarchar(255) NOT NULL,
+    cache_type smallint NOT NULL, -- '1-path, 2-file document, 3-URL',
+    file_size integer NOT NULL,
+    frequency integer NOT NULL,
+    format smallint NOT NULL, -- '1-BMP, 2-GIF, 3-JPEG, 4-PNG, 5-PSD, 6-SVG, 7-TIFF, 8-XCF, 9-PICT'
+    rotate_angle smallint NOT NULL,
+    width integer NOT NULL,
+    height integer NOT NULL,
+    crop_x1 integer NOT NULL,
+    crop_y1 integer NOT NULL,
+    crop_x2 integer NOT NULL,
+    crop_y2 integer NOT NULL,
+    created_dt datetime NOT NULL DEFAULT getdate(),
+
+    CONSTRAINT images_cache_pk PRIMARY KEY (id, meta_id, image_index)
+);
+
+ALTER TABLE images ADD format smallint; -- '1-BMP, 2-GIF, 3-JPEG, 4-PNG, 5-PSD, 6-SVG, 7-TIFF, 8-XCF, 9-PICT'
+ALTER TABLE images ADD rotate_angle smallint;
+ALTER TABLE images ADD crop_x1 integer;
+ALTER TABLE images ADD crop_y1 integer;
+ALTER TABLE images ADD crop_x2 integer;
+ALTER TABLE images ADD crop_y2 integer;
+
+ALTER TABLE images_history ADD format smallint; -- '1-BMP, 2-GIF, 3-JPEG, 4-PNG, 5-PSD, 6-SVG, 7-TIFF, 8-XCF, 9-PICT'
+ALTER TABLE images_history ADD rotate_angle smallint;
+ALTER TABLE images_history ADD crop_x1 integer;
+ALTER TABLE images_history ADD crop_y1 integer;
+ALTER TABLE images_history ADD crop_x2 integer;
+ALTER TABLE images_history ADD crop_y2 integer;
+
+EXEC('UPDATE images SET format = 0, rotate_angle = 0, crop_x1 = -1, crop_y1 = -1, crop_x2 = -1, crop_y2 = -1');
+EXEC('UPDATE images_history SET format = 0, rotate_angle = 0, crop_x1 = -1, crop_y1 = -1, crop_x2 = -1, crop_y2 = -1');
+
+ALTER TABLE images ALTER COLUMN format smallint NOT NULL;
+ALTER TABLE images ALTER COLUMN rotate_angle smallint NOT NULL;
+ALTER TABLE images ALTER COLUMN crop_x1 integer NOT NULL;
+ALTER TABLE images ALTER COLUMN crop_y1 integer NOT NULL;
+ALTER TABLE images ALTER COLUMN crop_x2 integer NOT NULL;
+ALTER TABLE images ALTER COLUMN crop_y2 integer NOT NULL;
+
+ALTER TABLE images_history ALTER COLUMN format smallint NOT NULL;
+ALTER TABLE images_history ALTER COLUMN rotate_angle smallint NOT NULL;
+ALTER TABLE images_history ALTER COLUMN crop_x1 integer NOT NULL;
+ALTER TABLE images_history ALTER COLUMN crop_y1 integer NOT NULL;
+ALTER TABLE images_history ALTER COLUMN crop_x2 integer NOT NULL;
+ALTER TABLE images_history ALTER COLUMN crop_y2 integer NOT NULL;
+
+-- -------------
+-- IMAGE ARCHIVE
+-- -------------
+CREATE TABLE archive_images (
+    id int identity NOT NULL,
+    image_nm nvarchar(255) NOT NULL DEFAULT '',
+    format smallint NOT NULL,
+    width integer NOT NULL,
+    height integer NOT NULL,
+    file_size integer NOT NULL,
+    uploaded_by nvarchar(130) NOT NULL DEFAULT '',
+    users_id integer NOT NULL,
+    status smallint NOT NULL DEFAULT 0,
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    updated_dt datetime NOT NULL DEFAULT GETDATE(),
+    license_dt datetime,
+    license_end_dt datetime,
+    publish_dt datetime,
+    archive_dt datetime,
+    publish_end_dt datetime,
+    CONSTRAINT archive_images_pk PRIMARY KEY (id),
+    CONSTRAINT archive_images_users_id_fk FOREIGN KEY (users_id) REFERENCES users(user_id)
+);
+
+CREATE TABLE archive_exif (
+    image_id int NOT NULL,
+    exif_type smallint NOT NULL DEFAULT 0,
+    resolution integer NOT NULL,
+    description nvarchar(255) NOT NULL DEFAULT '',
+    artist nvarchar(255) NOT NULL DEFAULT '',
+    copyright nvarchar(255) NOT NULL DEFAULT '',
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    updated_dt datetime NOT NULL DEFAULT GETDATE(),
+    CONSTRAINT archive_exif_pk PRIMARY KEY (image_id, exif_type),
+    CONSTRAINT archive_image_id_fk FOREIGN KEY (image_id) REFERENCES archive_images(id)
+);
+
+CREATE TABLE archive_keywords (
+    id int identity,
+    keyword_nm nvarchar(50) NOT NULL,
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    CONSTRAINT archive_keywords_pk PRIMARY KEY (id)
+);
+
+CREATE TABLE archive_image_keywords (
+    image_id int NOT NULL,
+    keyword_id int NOT NULL,
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    CONSTRAINT archive_image_keywords_pk PRIMARY KEY (image_id, keyword_id),
+    CONSTRAINT archive_image_keywords_image_id_fk FOREIGN KEY (image_id) REFERENCES archive_images(id),
+    CONSTRAINT archive_image_keywords_keyword_id_fk FOREIGN KEY (keyword_id) REFERENCES archive_keywords(id)
+);
+
+CREATE TABLE category_roles (
+    category_id integer NOT NULL,
+    role_id integer NOT NULL,
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    CONSTRAINT category_roles_pk PRIMARY KEY (category_id, role_id),
+    CONSTRAINT category_roles_category_id_fk FOREIGN KEY (category_id) REFERENCES categories(category_id),
+    CONSTRAINT category_roles_role_id_fk FOREIGN KEY (role_id) REFERENCES roles(role_id)
+);
+
+CREATE TABLE image_categories (
+    image_id int NOT NULL,
+    category_id integer NOT NULL,
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    CONSTRAINT image_categories_pk PRIMARY KEY (image_id, category_id),
+    CONSTRAINT image_categories_image_id_fk FOREIGN KEY (image_id) REFERENCES archive_images(id),
+    CONSTRAINT image_categories_category_id_fk FOREIGN KEY (category_id) REFERENCES categories(category_id)
+);
+
+CREATE TABLE archive_libraries (
+    id int identity NOT NULL ,
+    library_nm nvarchar(120) NOT NULL,
+    folder_nm nvarchar(255) NOT NULL,
+    filepath nvarchar(255),
+    library_type smallint NOT NULL DEFAULT 0,
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    updated_dt datetime NOT NULL DEFAULT GETDATE(),
+    CONSTRAINT archive_libraries_pk PRIMARY KEY (id)--,
+    --CONSTRAINT archive_libraries_folder_nm_filepath_unq UNIQUE (folder_nm, filepath)
+);
+
+CREATE TABLE archive_library_roles (
+    library_id integer NOT NULL,
+    role_id integer NOT NULL,
+    permissions integer NOT NULL,
+    created_dt datetime NOT NULL DEFAULT GETDATE(),
+    updated_dt datetime NOT NULL DEFAULT GETDATE(),
+    CONSTRAINT archive_library_roles_pk PRIMARY KEY (library_id, role_id),
+    CONSTRAINT archive_library_roles_library_id_fk FOREIGN KEY (library_id) REFERENCES archive_libraries(id),
+    CONSTRAINT archive_library_roles_role_id_fk FOREIGN KEY (role_id) REFERENCES roles(role_id)
+);
+
+ALTER TABLE users ADD remember_cd varchar(40);
+-- ALTER TABLE users ADD CONSTRAINT users_remember_cd_unq UNIQUE (remember_cd);
+
+ALTER TABLE images ADD archive_image_id bigint;
+ALTER TABLE images_history ADD archive_image_id bigint;
+
+ALTER TABLE category_types ADD is_image_archive tinyint NOT NULL DEFAULT 0;
+
+UPDATE database_version SET major = 4, minor = 11;
diff --git a/sql/diff/diff-4.10-4.11-mysql.sql b/sql/diff/diff-4.10-4.11-mysql.sql
new file mode 100644
index 0000000000..0ea50178e4
--- /dev/null
+++ b/sql/diff/diff-4.10-4.11-mysql.sql
@@ -0,0 +1,164 @@
+-- Extends image handling and adds support for image archive
+
+-- --------------
+-- IMAGE HANDLING
+-- --------------
+CREATE TABLE images_cache (
+    id varchar(40) NOT NULL,
+    meta_id integer NOT NULL,
+    image_index integer NOT NULL,
+    resource varchar(255) NOT NULL,
+    cache_type smallint NOT NULL,
+-- '1-path, 2-file document, 3-URL',
+    file_size integer NOT NULL,
+    frequency integer NOT NULL,
+    format smallint NOT NULL,
+-- '1-BMP, 2-GIF, 3-JPEG, 4-PNG, 5-PSD, 6-SVG, 7-TIFF, 8-XCF, 9-PICT'
+    rotate_angle smallint NOT NULL,
+    width integer NOT NULL,
+    height integer NOT NULL,
+    crop_x1 integer NOT NULL,
+    crop_y1 integer NOT NULL,
+    crop_x2 integer NOT NULL,
+    crop_y2 integer NOT NULL,
+    created_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT images_cache_pk PRIMARY KEY (id, meta_id, image_index)
+) ENGINE='InnoDB' DEFAULT CHARSET='utf8';
+
+ALTER TABLE images ADD format smallint;
+-- '1-BMP, 2-GIF, 3-JPEG, 4-PNG, 5-PSD, 6-SVG, 7-TIFF, 8-XCF, 9-PICT'
+ALTER TABLE images ADD rotate_angle smallint;
+ALTER TABLE images ADD crop_x1 integer;
+ALTER TABLE images ADD crop_y1 integer;
+ALTER TABLE images ADD crop_x2 integer;
+ALTER TABLE images ADD crop_y2 integer;
+
+ALTER TABLE images_history ADD format smallint;
+-- '1-BMP, 2-GIF, 3-JPEG, 4-PNG, 5-PSD, 6-SVG, 7-TIFF, 8-XCF, 9-PICT'
+ALTER TABLE images_history ADD rotate_angle smallint;
+ALTER TABLE images_history ADD crop_x1 integer;
+ALTER TABLE images_history ADD crop_y1 integer;
+ALTER TABLE images_history ADD crop_x2 integer;
+ALTER TABLE images_history ADD crop_y2 integer;
+
+UPDATE images SET format = 0, rotate_angle = 0, crop_x1 = -1, crop_y1 = -1, crop_x2 = -1, crop_y2 = -1;
+UPDATE images_history SET format = 0, rotate_angle = 0, crop_x1 = -1, crop_y1 = -1, crop_x2 = -1, crop_y2 = -1;
+
+ALTER TABLE images MODIFY COLUMN format smallint NOT NULL;
+ALTER TABLE images MODIFY COLUMN rotate_angle smallint NOT NULL;
+ALTER TABLE images MODIFY COLUMN crop_x1 integer NOT NULL;
+ALTER TABLE images MODIFY COLUMN crop_y1 integer NOT NULL;
+ALTER TABLE images MODIFY COLUMN crop_x2 integer NOT NULL;
+ALTER TABLE images MODIFY COLUMN crop_y2 integer NOT NULL;
+
+ALTER TABLE images_history MODIFY COLUMN format smallint NOT NULL;
+ALTER TABLE images_history MODIFY COLUMN rotate_angle smallint NOT NULL;
+ALTER TABLE images_history MODIFY COLUMN crop_x1 integer NOT NULL;
+ALTER TABLE images_history MODIFY COLUMN crop_y1 integer NOT NULL;
+ALTER TABLE images_history MODIFY COLUMN crop_x2 integer NOT NULL;
+ALTER TABLE images_history MODIFY COLUMN crop_y2 integer NOT NULL;
+
+-- -------------
+-- IMAGE ARCHIVE
+-- -------------
+CREATE TABLE archive_images (
+    id bigint NOT NULL AUTO_INCREMENT,
+    image_nm varchar(255) NOT NULL DEFAULT '',
+    format smallint NOT NULL COMMENT '0-BMP, 1-GIF, 2-JPEG, 3-PNG, 4-PDF, 5-PS, 6-PSD, 7-SVG, 8-TIFF, 9-XCF, 10-PICT',
+    width integer NOT NULL,
+    height integer NOT NULL,
+    file_size integer NOT NULL COMMENT 'in bytes',
+    uploaded_by varchar(130) NOT NULL DEFAULT '',
+    users_id integer NOT NULL,
+    status smallint NOT NULL DEFAULT 0 COMMENT '0-uploaded, 1-active, 2-archived',
+    created_dt timestamp NOT NULL DEFAULT 0,
+    updated_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    license_dt date,
+    license_end_dt date,
+    publish_dt date,
+    archive_dt date,
+    publish_end_dt date,
+    CONSTRAINT archive_images_pk PRIMARY KEY (id),
+    CONSTRAINT archive_images_users_id_fk FOREIGN KEY (users_id) REFERENCES users(user_id)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+CREATE TABLE archive_exif (
+    image_id bigint NOT NULL,
+    exif_type smallint NOT NULL DEFAULT 0 COMMENT '0-original, 1-changed',
+    resolution integer NOT NULL COMMENT 'in DPI (dots per inch)',
+    description varchar(255) NOT NULL DEFAULT '',
+    artist varchar(255) NOT NULL DEFAULT '',
+    copyright varchar(255) NOT NULL DEFAULT '',
+    created_dt timestamp NOT NULL DEFAULT 0,
+    updated_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    CONSTRAINT archive_exif_pk PRIMARY KEY (image_id, exif_type),
+    CONSTRAINT archive_image_id_fk FOREIGN KEY (image_id) REFERENCES archive_images(id)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+CREATE TABLE archive_keywords (
+    id bigint NOT NULL AUTO_INCREMENT,
+    keyword_nm varchar(50) NOT NULL,
+    created_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT archive_keywords_pk PRIMARY KEY (id)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+CREATE TABLE archive_image_keywords (
+    image_id bigint NOT NULL,
+    keyword_id bigint NOT NULL,
+    created_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT archive_image_keywords_pk PRIMARY KEY (image_id, keyword_id),
+    CONSTRAINT archive_image_keywords_image_id_fk FOREIGN KEY (image_id) REFERENCES archive_images(id),
+    CONSTRAINT archive_image_keywords_keyword_id_fk FOREIGN KEY (keyword_id) REFERENCES archive_keywords(id)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+CREATE TABLE category_roles (
+    category_id integer NOT NULL,
+    role_id integer NOT NULL,
+    created_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT category_roles_pk PRIMARY KEY (category_id, role_id),
+    CONSTRAINT category_roles_category_id_fk FOREIGN KEY (category_id) REFERENCES categories(category_id),
+    CONSTRAINT category_roles_role_id_fk FOREIGN KEY (role_id) REFERENCES roles(role_id)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+CREATE TABLE image_categories (
+    image_id bigint NOT NULL,
+    category_id integer NOT NULL,
+    created_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT image_categories_pk PRIMARY KEY (image_id, category_id),
+    CONSTRAINT image_categories_image_id_fk FOREIGN KEY (image_id) REFERENCES archive_images(id),
+    CONSTRAINT image_categories_category_id_fk FOREIGN KEY (category_id) REFERENCES categories(category_id)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+CREATE TABLE archive_libraries (
+    id integer NOT NULL AUTO_INCREMENT,
+    library_nm varchar(120) NOT NULL,
+    folder_nm varchar(255) NOT NULL,
+    filepath varchar(255),
+    library_type smallint NOT NULL DEFAULT 0 COMMENT '0-standard, 1-old library',
+    created_dt timestamp NOT NULL DEFAULT 0,
+    updated_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    CONSTRAINT archive_libraries_pk PRIMARY KEY (id),
+    CONSTRAINT archive_libraries_folder_nm_filepath_unq UNIQUE (folder_nm, filepath)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+CREATE TABLE archive_library_roles (
+    library_id integer NOT NULL,
+    role_id integer NOT NULL,
+    permissions integer NOT NULL,
+    created_dt timestamp NOT NULL DEFAULT 0,
+    updated_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    CONSTRAINT archive_library_roles_pk PRIMARY KEY (library_id, role_id),
+    CONSTRAINT archive_library_roles_library_id_fk FOREIGN KEY (library_id) REFERENCES archive_libraries(id),
+    CONSTRAINT archive_library_roles_role_id_fk FOREIGN KEY (role_id) REFERENCES roles(role_id)
+) ENGINE='InnoDB' DEFAULT CHARACTER SET='utf8';
+
+ALTER TABLE users ADD COLUMN remember_cd varchar(40) AFTER session_id;
+ALTER TABLE users ADD CONSTRAINT users_remember_cd_unq UNIQUE (remember_cd);
+
+ALTER TABLE images ADD COLUMN archive_image_id bigint;
+ALTER TABLE images_history ADD COLUMN archive_image_id bigint;
+
+ALTER TABLE category_types ADD COLUMN is_image_archive tinyint(1) NOT NULL DEFAULT FALSE COMMENT 'is image category type, can be used in image archive'  AFTER inherited;
+
+UPDATE database_version SET major = 4, minor = 11;
diff --git a/sql/diff/diff-4.11-4.12-mssql.sql b/sql/diff/diff-4.11-4.12-mssql.sql
new file mode 100644
index 0000000000..81a2ee20b8
--- /dev/null
+++ b/sql/diff/diff-4.11-4.12-mssql.sql
@@ -0,0 +1,8 @@
+DELETE FROM images_cache WHERE meta_id > 0;
+ALTER TABLE images_cache DROP CONSTRAINT images_cache_pk;
+ALTER TABLE images_cache DROP COLUMN meta_id;
+ALTER TABLE images_cache DROP COLUMN image_index;
+
+ALTER TABLE images_cache ADD CONSTRAINT images_cache_pk PRIMARY KEY (id);
+
+UPDATE database_version SET major = 4, minor = 12;
diff --git a/sql/diff/diff-4.11-4.12-mysql.sql b/sql/diff/diff-4.11-4.12-mysql.sql
new file mode 100644
index 0000000000..7cac0c406a
--- /dev/null
+++ b/sql/diff/diff-4.11-4.12-mysql.sql
@@ -0,0 +1,8 @@
+DELETE FROM images_cache WHERE meta_id > 0;
+ALTER TABLE images_cache DROP PRIMARY KEY;
+ALTER TABLE images_cache DROP COLUMN meta_id;
+ALTER TABLE images_cache DROP COLUMN image_index;
+
+ALTER TABLE images_cache ADD CONSTRAINT images_cache_pk PRIMARY KEY (id);
+
+UPDATE database_version SET major = 4, minor = 12;
diff --git a/sql/diff/diff-4.12-4.13-mssql.sql b/sql/diff/diff-4.12-4.13-mssql.sql
new file mode 100644
index 0000000000..d79c41e63a
--- /dev/null
+++ b/sql/diff/diff-4.12-4.13-mssql.sql
@@ -0,0 +1,5 @@
+ALTER TABLE images ADD gen_file nvarchar(255);
+ALTER TABLE images_history ADD gen_file nvarchar(255);
+
+UPDATE database_version SET major = 4, minor = 13;
+
diff --git a/sql/diff/diff-4.12-4.13-mysql.sql b/sql/diff/diff-4.12-4.13-mysql.sql
new file mode 100644
index 0000000000..77771d6513
--- /dev/null
+++ b/sql/diff/diff-4.12-4.13-mysql.sql
@@ -0,0 +1,4 @@
+ALTER TABLE images ADD COLUMN gen_file varchar(255);
+ALTER TABLE images_history ADD COLUMN gen_file varchar(255);
+
+UPDATE database_version SET major = 4, minor = 13;
\ No newline at end of file
diff --git a/sql/diff/diff-4.13-4.14-mssql.sql b/sql/diff/diff-4.13-4.14-mssql.sql
new file mode 100644
index 0000000000..35fb48a383
--- /dev/null
+++ b/sql/diff/diff-4.13-4.14-mssql.sql
@@ -0,0 +1,7 @@
+ALTER TABLE images_cache ADD meta_id integer;
+ALTER TABLE images_cache ADD no integer;
+ALTER TABLE images_cache ADD file_no nvarchar(100);
+-- 1-default, 2-force, 3-less_than, 4-greater_than, 5-percent
+ALTER TABLE images_cache ADD resize integer;
+
+UPDATE database_version SET major = 4, minor = 14;
\ No newline at end of file
diff --git a/sql/diff/diff-4.13-4.14-mysql.sql b/sql/diff/diff-4.13-4.14-mysql.sql
new file mode 100644
index 0000000000..376e85e89a
--- /dev/null
+++ b/sql/diff/diff-4.13-4.14-mysql.sql
@@ -0,0 +1,7 @@
+ALTER TABLE images_cache ADD meta_id integer;
+ALTER TABLE images_cache ADD no integer;
+ALTER TABLE images_cache ADD file_no varchar(100);
+-- 1-default, 2-force, 3-less_than, 4-greater_than, 5-percent
+ALTER TABLE images_cache ADD resize integer;
+
+UPDATE database_version SET major = 4, minor = 14;
\ No newline at end of file
diff --git a/sql/diff/diff-4.14-4.15-mssql.sql b/sql/diff/diff-4.14-4.15-mssql.sql
new file mode 100644
index 0000000000..b468aad8a8
--- /dev/null
+++ b/sql/diff/diff-4.14-4.15-mssql.sql
@@ -0,0 +1,11 @@
+ALTER TABLE images ADD resize integer;
+ALTER TABLE images_history ADD resize integer;
+
+EXEC('UPDATE images SET resize = 0');
+EXEC('UPDATE images_history SET resize = 0');
+
+-- 1-default, 2-force, 3-less_than, 4-greater_than, 5-percent
+ALTER TABLE images ALTER COLUMN resize integer NOT NULL;
+ALTER TABLE images_history ALTER COLUMN resize integer NOT NULL;
+
+UPDATE database_version SET major = 4, minor = 15;
\ No newline at end of file
diff --git a/sql/diff/diff-4.14-4.15-mysql.sql b/sql/diff/diff-4.14-4.15-mysql.sql
new file mode 100644
index 0000000000..0b8420597f
--- /dev/null
+++ b/sql/diff/diff-4.14-4.15-mysql.sql
@@ -0,0 +1,11 @@
+ALTER TABLE images ADD resize integer;
+ALTER TABLE images_history ADD resize integer;
+
+UPDATE images SET resize = 0;
+UPDATE images_history SET resize = 0;
+
+-- 1-default, 2-force, 3-less_than, 4-greater_than, 5-percent
+ALTER TABLE images MODIFY resize integer NOT NULL;
+ALTER TABLE images_history MODIFY resize integer NOT NULL;
+
+UPDATE database_version SET major = 4, minor = 15;
\ No newline at end of file
diff --git a/sql/diff/diff-4.15-4.16-mssql.sql b/sql/diff/diff-4.15-4.16-mssql.sql
new file mode 100644
index 0000000000..34e0d47bc9
--- /dev/null
+++ b/sql/diff/diff-4.15-4.16-mssql.sql
@@ -0,0 +1,22 @@
+ALTER TABLE users
+   ALTER COLUMN login_password NVARCHAR(128) NOT NULL;
+ALTER TABLE users
+   ADD login_password_is_encrypted BIT DEFAULT 0;
+
+ALTER TABLE users ADD login_password_reset_id CHAR(36) DEFAULT NEWID();
+GO
+UPDATE users SET login_password_reset_id = NEWID();
+GO
+CREATE UNIQUE NONCLUSTERED INDEX ux__users__login_password_reset_id ON users ( login_password_reset_id )
+ALTER TABLE users
+   ADD login_password_reset_ts BIGINT;
+
+SET IDENTITY_INSERT sys_types ON
+INSERT INTO sys_types (type_id, name) VALUES (9, 'UserLoginPasswordResetExpirationInterval');
+SET IDENTITY_INSERT sys_types OFF
+
+SET IDENTITY_INSERT sys_data ON
+INSERT INTO sys_data (sys_id, type_id, value) VALUES (9, 9, '24');
+SET IDENTITY_INSERT sys_data OFF
+
+UPDATE database_version SET major = 4, minor = 16;
\ No newline at end of file
diff --git a/sql/diff/diff-4.15-4.16-mysql.sql b/sql/diff/diff-4.15-4.16-mysql.sql
new file mode 100644
index 0000000000..4b8e61335a
--- /dev/null
+++ b/sql/diff/diff-4.15-4.16-mysql.sql
@@ -0,0 +1,11 @@
+ALTER TABLE users
+  MODIFY COLUMN login_password VARCHAR(128) NOT NULL,
+  ADD COLUMN login_password_is_encrypted BOOLEAN DEFAULT FALSE,
+  ADD COLUMN login_password_reset_id CHAR(36),
+  ADD COLUMN login_password_reset_ts BIGINT,
+  ADD UNIQUE INDEX ux__users__login_password_reset_id (login_password_reset_id);
+
+INSERT INTO sys_types (type_id, name) VALUES (9, "UserLoginPasswordResetExpirationInterval");
+INSERT INTO sys_data (sys_id, type_id, value) VALUES (9, 9, "24");
+
+UPDATE database_version SET major = 4, minor = 16;
\ No newline at end of file
diff --git a/sql/diff/diff-4.16-4.17-mssql.sql b/sql/diff/diff-4.16-4.17-mssql.sql
new file mode 100644
index 0000000000..373fe804b8
--- /dev/null
+++ b/sql/diff/diff-4.16-4.17-mssql.sql
@@ -0,0 +1,4 @@
+ALTER TABLE url_docs
+   ALTER COLUMN url_ref NVARCHAR(2000) NOT NULL;
+
+UPDATE database_version SET major = 4, minor = 17;
\ No newline at end of file
diff --git a/sql/diff/diff-4.16-4.17-mysql.sql b/sql/diff/diff-4.16-4.17-mysql.sql
new file mode 100644
index 0000000000..cbc7b350ee
--- /dev/null
+++ b/sql/diff/diff-4.16-4.17-mysql.sql
@@ -0,0 +1,4 @@
+ALTER TABLE url_docs
+  MODIFY COLUMN url_ref TEXT NOT NULL;
+
+UPDATE database_version SET major = 4, minor = 17;
\ No newline at end of file
diff --git a/sql/diff/diff-4.17-4.18-mysql.sql b/sql/diff/diff-4.17-4.18-mysql.sql
new file mode 100644
index 0000000000..39b6bddc78
--- /dev/null
+++ b/sql/diff/diff-4.17-4.18-mysql.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `database_version`
+    DROP PRIMARY KEY,
+  ADD COLUMN `client` int(11) DEFAULT 0,
+  ADD PRIMARY KEY (`major`,`minor`,`client`);
+
+UPDATE database_version SET major = 4, minor = 18, client = 0;
diff --git a/sql/diff/diff-4.18-4.19-mysql.sql b/sql/diff/diff-4.18-4.19-mysql.sql
new file mode 100644
index 0000000000..bcdf5a4e22
--- /dev/null
+++ b/sql/diff/diff-4.18-4.19-mysql.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `imcms_ip_white_list` (
+  id bigint NOT NULL AUTO_INCREMENT,
+  is_admin TINYINT(1) NOT NULL,
+  ip_range_from VARCHAR(15) NOT NULL,
+  ip_range_to VARCHAR(15) NOT NULL,
+  UNIQUE (is_admin, ip_range_from, ip_range_to),
+  CONSTRAINT imcms_ip_white_list_pk PRIMARY KEY (id)
+);
+
+UPDATE database_version SET major = 4, minor = 19;
diff --git a/sql/diff/diff-4.19-4.20-mysql.sql b/sql/diff/diff-4.19-4.20-mysql.sql
new file mode 100644
index 0000000000..70c83bdb35
--- /dev/null
+++ b/sql/diff/diff-4.19-4.20-mysql.sql
@@ -0,0 +1,14 @@
+CREATE TABLE user_properties
+(
+  id       INT AUTO_INCREMENT PRIMARY KEY,
+  user_id  INT          NOT NULL,
+  key_name VARCHAR(255) NOT NULL,
+  value    VARCHAR(255) NOT NULL,
+  CONSTRAINT UQ_user_properties__user_id__key_name
+  UNIQUE (user_id, key_name),
+  CONSTRAINT user_properties_FK_user_id_users
+  FOREIGN KEY (user_id) REFERENCES users (user_id)
+);
+
+UPDATE database_version
+SET major = 4, minor = 20;
diff --git a/sql/diff/diff-4.20-4.21-mysql.sql b/sql/diff/diff-4.20-4.21-mysql.sql
new file mode 100644
index 0000000000..91a63d0077
--- /dev/null
+++ b/sql/diff/diff-4.20-4.21-mysql.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `users`
+  ADD COLUMN `last_login` TIMESTAMP NULL;
+
+UPDATE database_version
+SET major = 4, minor = 21;
diff --git a/sql/diff/diff-4.21-4.22-mysql.sql b/sql/diff/diff-4.21-4.22-mysql.sql
new file mode 100644
index 0000000000..99d1812afe
--- /dev/null
+++ b/sql/diff/diff-4.21-4.22-mysql.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `imcms_ip_white_list`
+  ADD COLUMN `description` VARCHAR(256) NULL;
+
+UPDATE database_version
+SET major = 4, minor = 22;
diff --git a/sql/diff/diff-4.22-4.23-mysql.sql b/sql/diff/diff-4.22-4.23-mysql.sql
new file mode 100644
index 0000000000..21d79460dc
--- /dev/null
+++ b/sql/diff/diff-4.22-4.23-mysql.sql
@@ -0,0 +1,14 @@
+# new table for local<->external roles linking
+CREATE TABLE `external_to_local_roles_links` (
+  id                   int(11)      not null auto_increment primary key,
+  provider_id          varchar(256) not null,
+  external_role_id     varchar(256) not null,
+  linked_local_role_id int(11)      not null,
+  unique (provider_id, external_role_id, linked_local_role_id),
+  constraint role_id_fk foreign key (linked_local_role_id) references roles (role_id)
+    on delete cascade
+);
+
+UPDATE database_version
+SET major = 4,
+    minor = 23;
\ No newline at end of file
diff --git a/sql/diff/diff-4.23-4.24-mysql.sql b/sql/diff/diff-4.23-4.24-mysql.sql
new file mode 100644
index 0000000000..8b2a0a7b87
--- /dev/null
+++ b/sql/diff/diff-4.23-4.24-mysql.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `users`
+    MODIFY COLUMN `login_name` VARCHAR(256) NOT NULL;
+
+ALTER TABLE `users`
+    MODIFY COLUMN `login_password` VARCHAR(256) NOT NULL;
+
+UPDATE database_version
+SET major = 4, minor = 24;
\ No newline at end of file
diff --git a/sql/diff/diff-4.24-4.25-mysql.sql b/sql/diff/diff-4.24-4.25-mysql.sql
new file mode 100644
index 0000000000..c093934f1c
--- /dev/null
+++ b/sql/diff/diff-4.24-4.25-mysql.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `meta`
+	ADD COLUMN `export_allowed` boolean default true,
+	ADD COLUMN `exported`       boolean default false;
+
+UPDATE database_version
+SET major = 4,
+    minor = 25;
diff --git a/sql/diff/diff-4.25-4.26-mysql.sql b/sql/diff/diff-4.25-4.26-mysql.sql
new file mode 100644
index 0000000000..643217e534
--- /dev/null
+++ b/sql/diff/diff-4.25-4.26-mysql.sql
@@ -0,0 +1,6 @@
+ALTER TABLE fileupload_docs
+    MODIFY COLUMN mime VARCHAR(255) NOT NULL;
+
+UPDATE database_version
+SET major = 4,
+    minor = 25;
diff --git a/sql/diff/diff-4.8-4.9-mssql.sql b/sql/diff/diff-4.8-4.9-mssql.sql
new file mode 100644
index 0000000000..931d7fa4d8
--- /dev/null
+++ b/sql/diff/diff-4.8-4.9-mssql.sql
@@ -0,0 +1,17 @@
+-- Document's search keyword column
+ALTER TABLE classification ALTER COLUMN code NVARCHAR(128);
+
+-- User's data columns
+ALTER TABLE users ALTER COLUMN login_name     NVARCHAR(128);
+ALTER TABLE users ALTER COLUMN first_name     NVARCHAR(64);
+ALTER TABLE users ALTER COLUMN last_name      NVARCHAR(64);
+ALTER TABLE users ALTER COLUMN title          NVARCHAR(64);
+ALTER TABLE users ALTER COLUMN company        NVARCHAR(64);
+ALTER TABLE users ALTER COLUMN address        NVARCHAR(128);
+ALTER TABLE users ALTER COLUMN city           NVARCHAR(64);
+ALTER TABLE users ALTER COLUMN zip            NVARCHAR(64);
+ALTER TABLE users ALTER COLUMN country        NVARCHAR(64);
+ALTER TABLE users ALTER COLUMN county_council NVARCHAR(128);
+ALTER TABLE users ALTER COLUMN email          NVARCHAR(128);
+
+UPDATE database_version SET major = 4, minor = 9;
diff --git a/sql/diff/diff-4.8-4.9-mysql.sql b/sql/diff/diff-4.8-4.9-mysql.sql
new file mode 100644
index 0000000000..065bf50f23
--- /dev/null
+++ b/sql/diff/diff-4.8-4.9-mysql.sql
@@ -0,0 +1,18 @@
+-- Document's search keyword column
+ALTER TABLE classification MODIFY code VARCHAR(128);
+
+-- User's data columns
+ALTER TABLE users
+    modify login_name     VARCHAR(128),
+    modify first_name     VARCHAR(64),
+    modify last_name      VARCHAR(64),
+    modify title          VARCHAR(64),
+    modify company        VARCHAR(64),
+    modify address        VARCHAR(128),
+    modify city           VARCHAR(64),
+    modify zip            VARCHAR(64),
+    modify country        VARCHAR(64),
+    modify county_council VARCHAR(128),
+    modify email          VARCHAR(128);
+
+UPDATE database_version SET major = 4, minor = 9;
diff --git a/sql/diff/diff-4.9-4.10-mssql.sql b/sql/diff/diff-4.9-4.10-mssql.sql
new file mode 100644
index 0000000000..bd41bb244c
--- /dev/null
+++ b/sql/diff/diff-4.9-4.10-mssql.sql
@@ -0,0 +1,3 @@
+ALTER TABLE users ADD session_id NVARCHAR(128);
+
+UPDATE database_version SET major = 4, minor = 10;
diff --git a/sql/diff/diff-4.9-4.10-mysql.sql b/sql/diff/diff-4.9-4.10-mysql.sql
new file mode 100644
index 0000000000..c87754b6b5
--- /dev/null
+++ b/sql/diff/diff-4.9-4.10-mysql.sql
@@ -0,0 +1,3 @@
+ALTER TABLE users ADD COLUMN session_id VARCHAR(128) null;
+
+UPDATE database_version SET major = 4, minor = 10;
diff --git a/sql/diff/schema-upgrade.xml b/sql/diff/schema-upgrade.xml
new file mode 100644
index 0000000000..7d3bea047f
--- /dev/null
+++ b/sql/diff/schema-upgrade.xml
@@ -0,0 +1,119 @@
+<schema-upgrade>
+    <diff version="4.9">
+        <vendor name="mysql">
+            <script location="diff-4.8-4.9-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.8-4.9-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.10">
+        <vendor name="mysql">
+            <script location="diff-4.9-4.10-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.9-4.10-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.11">
+        <vendor name="mysql">
+            <script location="diff-4.10-4.11-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.10-4.11-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.12">
+        <vendor name="mysql">
+            <script location="diff-4.11-4.12-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.11-4.12-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.13">
+        <vendor name="mysql">
+            <script location="diff-4.12-4.13-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.12-4.13-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.14">
+        <vendor name="mysql">
+            <script location="diff-4.13-4.14-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.13-4.14-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.15">
+        <vendor name="mysql">
+            <script location="diff-4.14-4.15-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.14-4.15-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.16">
+        <vendor name="mysql">
+            <script location="diff-4.15-4.16-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.15-4.16-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.17">
+        <vendor name="mysql">
+            <script location="diff-4.16-4.17-mysql.sql"/>
+        </vendor>
+        <vendor name="mssql">
+            <script location="diff-4.16-4.17-mssql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.18">
+        <vendor name="mysql">
+            <script location="diff-4.17-4.18-mysql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.19">
+        <vendor name="mysql">
+            <script location="diff-4.18-4.19-mysql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.20">
+        <vendor name="mysql">
+            <script location="diff-4.19-4.20-mysql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.21">
+        <vendor name="mysql">
+            <script location="diff-4.20-4.21-mysql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.22">
+        <vendor name="mysql">
+            <script location="diff-4.21-4.22-mysql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.23">
+        <vendor name="mysql">
+            <script location="diff-4.22-4.23-mysql.sql"/>
+        </vendor>
+    </diff>
+    <diff version="4.24">
+        <vendor name="mysql">
+            <script location="diff-4.23-4.24-mysql.sql"/>
+        </vendor>
+    </diff>
+	<diff version="4.25">
+		<vendor name="mysql">
+			<script location="diff-4.24-4.25-mysql.sql"/>
+		</vendor>
+	</diff>
+    <diff version="4.26">
+        <vendor name="mysql">
+            <script location="diff-4.25-4.26-mysql.sql"/>
+        </vendor>
+    </diff>
+</schema-upgrade>
diff --git a/sql/diff/delete_foreignkeys_from_table.sql b/sql/diff/version3.0/delete_foreignkeys_from_table.sql
similarity index 100%
rename from sql/diff/delete_foreignkeys_from_table.sql
rename to sql/diff/version3.0/delete_foreignkeys_from_table.sql
diff --git a/sql/diff/delete_foreignkeys_from_table_to_table.sql b/sql/diff/version3.0/delete_foreignkeys_from_table_to_table.sql
similarity index 100%
rename from sql/diff/delete_foreignkeys_from_table_to_table.sql
rename to sql/diff/version3.0/delete_foreignkeys_from_table_to_table.sql
diff --git a/sql/diff/delete_foreignkeys_to_table.sql b/sql/diff/version3.0/delete_foreignkeys_to_table.sql
similarity index 100%
rename from sql/diff/delete_foreignkeys_to_table.sql
rename to sql/diff/version3.0/delete_foreignkeys_to_table.sql
diff --git a/sql/diff/diff-1.10.1-1.10.2.sql b/sql/diff/version3.0/diff-1.10.1-1.10.2.sql
similarity index 100%
rename from sql/diff/diff-1.10.1-1.10.2.sql
rename to sql/diff/version3.0/diff-1.10.1-1.10.2.sql
diff --git a/sql/diff/diff-1.10.2-1.11.sql b/sql/diff/version3.0/diff-1.10.2-1.11.sql
similarity index 100%
rename from sql/diff/diff-1.10.2-1.11.sql
rename to sql/diff/version3.0/diff-1.10.2-1.11.sql
diff --git a/sql/diff/diff-1.11-2.0.sql b/sql/diff/version3.0/diff-1.11-2.0.sql
similarity index 100%
rename from sql/diff/diff-1.11-2.0.sql
rename to sql/diff/version3.0/diff-1.11-2.0.sql
diff --git a/sql/diff/diff-1.7.0-1.7.1.sql b/sql/diff/version3.0/diff-1.7.0-1.7.1.sql
similarity index 100%
rename from sql/diff/diff-1.7.0-1.7.1.sql
rename to sql/diff/version3.0/diff-1.7.0-1.7.1.sql
diff --git a/sql/diff/diff-1.7.0.sql b/sql/diff/version3.0/diff-1.7.0.sql
similarity index 100%
rename from sql/diff/diff-1.7.0.sql
rename to sql/diff/version3.0/diff-1.7.0.sql
diff --git a/sql/diff/diff-1.7.1-1.7.2.sql b/sql/diff/version3.0/diff-1.7.1-1.7.2.sql
similarity index 100%
rename from sql/diff/diff-1.7.1-1.7.2.sql
rename to sql/diff/version3.0/diff-1.7.1-1.7.2.sql
diff --git a/sql/diff/diff-1.7.2-1.7.3.sql b/sql/diff/version3.0/diff-1.7.2-1.7.3.sql
similarity index 100%
rename from sql/diff/diff-1.7.2-1.7.3.sql
rename to sql/diff/version3.0/diff-1.7.2-1.7.3.sql
diff --git a/sql/diff/diff-1.7.3-1.7.4.sql b/sql/diff/version3.0/diff-1.7.3-1.7.4.sql
similarity index 100%
rename from sql/diff/diff-1.7.3-1.7.4.sql
rename to sql/diff/version3.0/diff-1.7.3-1.7.4.sql
diff --git a/sql/diff/diff-1.7.4-1.7.5.sql b/sql/diff/version3.0/diff-1.7.4-1.7.5.sql
similarity index 100%
rename from sql/diff/diff-1.7.4-1.7.5.sql
rename to sql/diff/version3.0/diff-1.7.4-1.7.5.sql
diff --git a/sql/diff/diff-1.7.5-1.8.0.sql b/sql/diff/version3.0/diff-1.7.5-1.8.0.sql
similarity index 100%
rename from sql/diff/diff-1.7.5-1.8.0.sql
rename to sql/diff/version3.0/diff-1.7.5-1.8.0.sql
diff --git a/sql/diff/diff-1.8.0-1.8.1.sql b/sql/diff/version3.0/diff-1.8.0-1.8.1.sql
similarity index 100%
rename from sql/diff/diff-1.8.0-1.8.1.sql
rename to sql/diff/version3.0/diff-1.8.0-1.8.1.sql
diff --git a/sql/diff/diff-1.8.1-1.8.2.sql b/sql/diff/version3.0/diff-1.8.1-1.8.2.sql
similarity index 100%
rename from sql/diff/diff-1.8.1-1.8.2.sql
rename to sql/diff/version3.0/diff-1.8.1-1.8.2.sql
diff --git a/sql/diff/diff-1.8.2-1.8.3.sql b/sql/diff/version3.0/diff-1.8.2-1.8.3.sql
similarity index 100%
rename from sql/diff/diff-1.8.2-1.8.3.sql
rename to sql/diff/version3.0/diff-1.8.2-1.8.3.sql
diff --git a/sql/diff/diff-1.8.3-1.8.4.sql b/sql/diff/version3.0/diff-1.8.3-1.8.4.sql
similarity index 100%
rename from sql/diff/diff-1.8.3-1.8.4.sql
rename to sql/diff/version3.0/diff-1.8.3-1.8.4.sql
diff --git a/sql/diff/diff-1.8.4-1.9.0.sql b/sql/diff/version3.0/diff-1.8.4-1.9.0.sql
similarity index 100%
rename from sql/diff/diff-1.8.4-1.9.0.sql
rename to sql/diff/version3.0/diff-1.8.4-1.9.0.sql
diff --git a/sql/diff/diff-1.9.0-1.10.sql b/sql/diff/version3.0/diff-1.9.0-1.10.sql
similarity index 100%
rename from sql/diff/diff-1.9.0-1.10.sql
rename to sql/diff/version3.0/diff-1.9.0-1.10.sql
diff --git a/sql/diff/diff-2-2a.sql b/sql/diff/version3.0/diff-2-2a.sql
similarity index 100%
rename from sql/diff/diff-2-2a.sql
rename to sql/diff/version3.0/diff-2-2a.sql
diff --git a/sql/diff/diff-2-3.sql b/sql/diff/version3.0/diff-2-3.sql
similarity index 100%
rename from sql/diff/diff-2-3.sql
rename to sql/diff/version3.0/diff-2-3.sql
diff --git a/sql/diff/diff-2a-3.sql b/sql/diff/version3.0/diff-2a-3.sql
similarity index 100%
rename from sql/diff/diff-2a-3.sql
rename to sql/diff/version3.0/diff-2a-3.sql
diff --git a/sql/diff/diff_update.sql b/sql/diff/version3.0/diff_update.sql
similarity index 100%
rename from sql/diff/diff_update.sql
rename to sql/diff/version3.0/diff_update.sql
diff --git a/sql/sprocs/startdocset.prc b/sql/sprocs/startdocset.prc
index 24dbe9914b..378d5e26a3 100644
--- a/sql/sprocs/startdocset.prc
+++ b/sql/sprocs/startdocset.prc
@@ -3,4 +3,4 @@ CREATE PROCEDURE StartDocSet @meta_id INT AS
 	Changes the start document
 **/
 
-UPDATE sys_data SET value = @meta_id WHERE sys_id = 0
+UPDATE sys_data SET value = @meta_id WHERE type_id = 0
diff --git a/sql/tables/classification.tab b/sql/tables/classification.tab
index bce994ef98..1e6ab9d544 100644
--- a/sql/tables/classification.tab
+++ b/sql/tables/classification.tab
@@ -1,4 +1,4 @@
     <table name="classification">
         <column autoIncrement="true" name="class_id" primaryKey="true" required="true" type="INTEGER" />
-        <column name="code" required="true" size="128" type="VARCHAR" />
+        <column name="code" required="true" size="30" type="VARCHAR" />
     </table>
diff --git a/sql/tables/users.tab b/sql/tables/users.tab
index 0a194e56f3..01df20ff80 100644
--- a/sql/tables/users.tab
+++ b/sql/tables/users.tab
@@ -1,23 +1,22 @@
     <table name="users">
         <column name="user_id" autoIncrement="true" primaryKey="true" required="true" type="INTEGER" />
-        <column name="login_name" required="true" size="128" type="VARCHAR" />
+        <column name="login_name" required="true" size="50" type="VARCHAR" />
         <column name="login_password" required="true" size="15" type="VARCHAR" />
-        <column name="first_name" required="true" size="64" type="VARCHAR" />
-        <column name="last_name" required="true" size="64" type="VARCHAR" />
-        <column default="" name="title" required="true" size="64" type="VARCHAR" />
-        <column default="" name="company" required="true" size="64" type="VARCHAR" />
-        <column name="address" required="true" size="128" type="VARCHAR" />
-        <column name="city" required="true" size="64" type="VARCHAR" />
-        <column name="zip" required="true" size="64" type="VARCHAR" />
-        <column name="country" required="true" size="64" type="VARCHAR" />
-        <column name="county_council" required="true" size="128" type="VARCHAR" />
-        <column name="email" required="true" size="128" type="VARCHAR" />
+        <column name="first_name" required="true" size="25" type="VARCHAR" />
+        <column name="last_name" required="true" size="30" type="VARCHAR" />
+        <column default="" name="title" required="true" size="30" type="VARCHAR" />
+        <column default="" name="company" required="true" size="30" type="VARCHAR" />
+        <column name="address" required="true" size="40" type="VARCHAR" />
+        <column name="city" required="true" size="30" type="VARCHAR" />
+        <column name="zip" required="true" size="15" type="VARCHAR" />
+        <column name="country" required="true" size="30" type="VARCHAR" />
+        <column name="county_council" required="true" size="30" type="VARCHAR" />
+        <column name="email" required="true" size="50" type="VARCHAR" />
         <column name="external" required="true" type="INTEGER" />
         <column default="1" name="active" required="true" type="INTEGER" />
         <column name="create_date" required="true" type="TIMESTAMP" />
         <column name="language" required="true" size="3" type="VARCHAR" />
-        <column name="session_id" required="false" size="128" type="VARCHAR" />
         <unique name="UQ__users__login_name">
             <unique-column name="login_name"/>
         </unique>
-    </table>
+    </table>
\ No newline at end of file
diff --git a/server/src/com/imcode/imcms/api/MockContentManagementSystem.java b/src/test/java/com/imcode/imcms/api/MockContentManagementSystem.java
similarity index 100%
rename from server/src/com/imcode/imcms/api/MockContentManagementSystem.java
rename to src/test/java/com/imcode/imcms/api/MockContentManagementSystem.java
diff --git a/server/src/com/imcode/imcms/api/TestDefaultContentManagementSystem.java b/src/test/java/com/imcode/imcms/api/TestDefaultContentManagementSystem.java
similarity index 100%
rename from server/src/com/imcode/imcms/api/TestDefaultContentManagementSystem.java
rename to src/test/java/com/imcode/imcms/api/TestDefaultContentManagementSystem.java
diff --git a/server/src/com/imcode/imcms/api/TestDocument.java b/src/test/java/com/imcode/imcms/api/TestDocument.java
similarity index 100%
rename from server/src/com/imcode/imcms/api/TestDocument.java
rename to src/test/java/com/imcode/imcms/api/TestDocument.java
diff --git a/server/src/com/imcode/imcms/api/TestDocumentService.java b/src/test/java/com/imcode/imcms/api/TestDocumentService.java
similarity index 89%
rename from server/src/com/imcode/imcms/api/TestDocumentService.java
rename to src/test/java/com/imcode/imcms/api/TestDocumentService.java
index 8b2f056f79..454ec0f2ff 100644
--- a/server/src/com/imcode/imcms/api/TestDocumentService.java
+++ b/src/test/java/com/imcode/imcms/api/TestDocumentService.java
@@ -41,20 +41,20 @@ public void setUp() throws Exception {
     }
 
     public void testSaveCategory() throws CategoryAlreadyExistsException, NoPermissionException {
-        ResultSet allCategoryTypesResult = new MockResultSet(new Object[][] { { new Integer(1), "test", new Integer(0), new Integer(0) } });
+        ResultSet allCategoryTypesResult = new MockResultSet(new Object[][] { {1, "test", 0, 0, 0} });
         database.addExpectedSqlCall( new MockDatabase.MatchesRegexSqlCallPredicate( "SELECT category_types.category_type_id"), allCategoryTypesResult );
         CategoryType categoryType = documentService.getAllCategoryTypes()[0] ;
-        assertEquals( false, categoryType.isInherited()) ;
+        assertFalse(categoryType.isInherited());
         String categoryName = "name";
         Category category = new Category( categoryName, categoryType );
         category.setDescription( "description" );
         category.setImage( "image" );
         user.addRole( new Role( imcmsServices.getRoleGetter().getRole(RoleId.SUPERADMIN) ) );
-        database.addExpectedSqlCall( new MockDatabase.InsertIntoTableSqlCallPredicate( "categories" ), new Integer(1) );
+        database.addExpectedSqlCall( new MockDatabase.InsertIntoTableSqlCallPredicate( "categories" ), 1);
         documentService.saveCategory(category);
         database.assertExpectedSqlCalls();
 
-        ResultSet categoryResult = new MockResultSet(new Object[][] { { new Integer(1), category.getName(), category.getDescription(), category.getImage(), new Integer(categoryType.getId()), categoryType.getName(), new Integer(categoryType.getInternal().getMaxChoices()), new Integer(categoryType.isInherited() ? 1 : 0)}});
+        ResultSet categoryResult = new MockResultSet(new Object[][] { {1, category.getName(), category.getDescription(), category.getImage(), categoryType.getId(), categoryType.getName(), categoryType.getInternal().getMaxChoices(), categoryType.isInherited() ? 1 : 0, categoryType.isImageArchive() ? 1 : 0}});
         database.addExpectedSqlCall( new MockDatabase.EqualsSqlCallPredicate(CategoryMapper.SQL__GET_CATEGORY_BY_NAME_AND_CATEGORY_TYPE_ID), categoryResult );
         Category otherCategory = new Category( categoryName, categoryType );
         try {
diff --git a/server/src/com/imcode/imcms/api/TestTextDocument.java b/src/test/java/com/imcode/imcms/api/TestTextDocument.java
similarity index 100%
rename from server/src/com/imcode/imcms/api/TestTextDocument.java
rename to src/test/java/com/imcode/imcms/api/TestTextDocument.java
diff --git a/server/src/com/imcode/imcms/api/TestUserService.java b/src/test/java/com/imcode/imcms/api/TestUserService.java
similarity index 95%
rename from server/src/com/imcode/imcms/api/TestUserService.java
rename to src/test/java/com/imcode/imcms/api/TestUserService.java
index 3b9ee47006..de3cb3d612 100644
--- a/server/src/com/imcode/imcms/api/TestUserService.java
+++ b/src/test/java/com/imcode/imcms/api/TestUserService.java
@@ -3,6 +3,7 @@
 import com.imcode.db.DatabaseException;
 import com.imcode.db.mock.MockDatabase;
 import com.imcode.imcms.db.ProcedureExecutor;
+import com.imcode.imcms.servlet.LoginPasswordManager;
 import imcode.server.LanguageMapper;
 import imcode.server.MockImcmsServices;
 import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
@@ -35,7 +36,8 @@ protected void setUp() throws Exception {
         mockImcmsServices.setDatabase( database );
         mockImcmsServices.setLanguageMapper(new LanguageMapper(database, "eng")) ;
         mockImcmsServices.setProcedureExecutor(new MockProcedureExecutor(database));
-        ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper = new ImcmsAuthenticatorAndUserAndRoleMapper( mockImcmsServices );
+        LoginPasswordManager userLoginPasswordManager = new LoginPasswordManager();
+        ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper = new ImcmsAuthenticatorAndUserAndRoleMapper( mockImcmsServices , userLoginPasswordManager);
         mockImcmsServices.setImcmsAuthenticatorAndUserAndRoleMapper( imcmsAuthenticatorAndUserAndRoleMapper );
         contentManagementSystem.setInternal(mockImcmsServices) ;
         mockImcmsServices.setRoleGetter(new MockRoleGetter());
@@ -49,7 +51,7 @@ public void testGetUser() throws NoPermissionException {
     public void testNewUserCanHaveRoles() throws SaveException, NoPermissionException {
 
         internalUser.addRoleId( RoleId.USERADMIN );
-        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableWithParameterSqlCallPredicate("users", "test"), new Integer(HIGHEST_USER_ID+1)) ;
+        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableWithParameterSqlCallPredicate("users", "test"), HIGHEST_USER_ID + 1) ;
 
         User user = userService.createNewUser( "test", "test" );
         user.addRole( new Role( mockImcmsServices.getRoleGetter().getRole(RoleId.SUPERADMIN) ) );
@@ -91,7 +93,7 @@ public void testUserCanEditSelf() throws SaveException, NoPermissionException {
 
     public void testCreateNewRole() throws SaveException, NoPermissionException {
         internalUser.addRoleId( RoleId.SUPERADMIN );
-        database.addExpectedSqlCall( new MockDatabase.EqualsSqlCallPredicate( ImcmsAuthenticatorAndUserAndRoleMapper.SQL_INSERT_INTO_ROLES ), new Integer(3) );
+        database.addExpectedSqlCall( new MockDatabase.EqualsSqlCallPredicate( ImcmsAuthenticatorAndUserAndRoleMapper.SQL_INSERT_INTO_ROLES ), 3);
         String roleName = "test role";
         Role newRole = userService.createNewRole( roleName ) ;
         userService.saveRole( newRole );
diff --git a/server/src/com/imcode/imcms/api/contrib/TestDateTextFieldTextDocumentComparator.java b/src/test/java/com/imcode/imcms/api/contrib/TestDateTextFieldTextDocumentComparator.java
similarity index 97%
rename from server/src/com/imcode/imcms/api/contrib/TestDateTextFieldTextDocumentComparator.java
rename to src/test/java/com/imcode/imcms/api/contrib/TestDateTextFieldTextDocumentComparator.java
index 6e2b844008..c316898b8b 100644
--- a/server/src/com/imcode/imcms/api/contrib/TestDateTextFieldTextDocumentComparator.java
+++ b/src/test/java/com/imcode/imcms/api/contrib/TestDateTextFieldTextDocumentComparator.java
@@ -29,7 +29,7 @@ protected void setUp() throws Exception {
         imcmsServices.setDocumentMapper( new DocumentMapper( imcmsServices, null) {
             public DocumentDomainObject getDocument( Integer metaId ) {
                 TextDocumentDomainObject textDocument = new TextDocumentDomainObject();
-                textDocument.setId( metaId.intValue() );
+                textDocument.setId(metaId);
                 return textDocument;
             }
         });
diff --git a/server/src/com/imcode/imcms/db/TestDefaultProcedureExecutor.java b/src/test/java/com/imcode/imcms/db/TestDefaultProcedureExecutor.java
similarity index 100%
rename from server/src/com/imcode/imcms/db/TestDefaultProcedureExecutor.java
rename to src/test/java/com/imcode/imcms/db/TestDefaultProcedureExecutor.java
diff --git a/server/src/com/imcode/imcms/flow/TestEditBrowserDocumentPageFlow.java b/src/test/java/com/imcode/imcms/flow/TestEditBrowserDocumentPageFlow.java
similarity index 92%
rename from server/src/com/imcode/imcms/flow/TestEditBrowserDocumentPageFlow.java
rename to src/test/java/com/imcode/imcms/flow/TestEditBrowserDocumentPageFlow.java
index 1ad983782a..cbf9d738d8 100644
--- a/server/src/com/imcode/imcms/flow/TestEditBrowserDocumentPageFlow.java
+++ b/src/test/java/com/imcode/imcms/flow/TestEditBrowserDocumentPageFlow.java
@@ -33,8 +33,8 @@ public void testGetAddedBrowsersFromRequest() throws Exception {
         request.setupAddParameter( EditBrowserDocumentPageFlow.REQUEST_PARAMETER_PREFIX__DESTINATION
                                    + otherBrowser.getId(), "1002" );
         Map addedBrowsers = editBrowserDocumentPageFlow.getAddedBrowsersFromRequest(request, documentMapper ) ;
-        assertEquals( new Integer( 1002 ), addedBrowsers.get( otherBrowser ) );
-        assertEquals( new Integer( 1001 ), addedBrowsers.get( BrowserDocumentDomainObject.Browser.DEFAULT ));
+        assertEquals(1002, addedBrowsers.get( otherBrowser ) );
+        assertEquals(1001, addedBrowsers.get( BrowserDocumentDomainObject.Browser.DEFAULT ));
     }
 
     public class MockDocumentMapper extends DocumentMapper {
diff --git a/src/test/java/com/imcode/imcms/mapping/MockDocumentIndex.java b/src/test/java/com/imcode/imcms/mapping/MockDocumentIndex.java
new file mode 100644
index 0000000000..2723a879bd
--- /dev/null
+++ b/src/test/java/com/imcode/imcms/mapping/MockDocumentIndex.java
@@ -0,0 +1,61 @@
+package com.imcode.imcms.mapping;
+
+import com.imcode.imcms.api.SearchResult;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.index.DocumentIndex;
+import imcode.server.document.index.DocumentQuery;
+import imcode.server.document.index.IndexException;
+import imcode.server.user.UserDomainObject;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+
+public class MockDocumentIndex implements DocumentIndex {
+    private boolean indexDocumentCalled;
+    private boolean removeDocumentCalled;
+
+    public void indexDocument( DocumentDomainObject document ) throws IndexException {
+        this.indexDocumentCalled = true ;
+    }
+
+    public void removeDocument( DocumentDomainObject document ) throws IndexException {
+        this.removeDocumentCalled = true ;
+    }
+
+    public List<DocumentDomainObject> search(DocumentQuery query, UserDomainObject searchingUser) throws IndexException {
+        return Arrays.asList(new DocumentDomainObject[0]);
+    }
+
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                                     UserDomainObject searchingUser,
+                                                     int startPosition,
+                                                     int maxResults) throws IndexException {
+        return SearchResult.empty();
+    }
+
+    @Override
+    public SearchResult<DocumentDomainObject> search(DocumentQuery query,
+                                                     UserDomainObject searchingUser,
+                                                     int startPosition,
+                                                     int maxResults,
+                                                     Predicate<DocumentDomainObject> filterPredicate) throws IndexException {
+        return SearchResult.empty();
+    }
+
+    public void rebuild() {
+    }
+
+    @Override
+    public boolean isIndexBuildingThreadAlive() {
+        return false;
+    }
+
+    public boolean isRemoveDocumentCalled() {
+        return removeDocumentCalled;
+    }
+
+    public boolean isIndexDocumentCalled() {
+        return indexDocumentCalled;
+    }
+}
diff --git a/server/src/com/imcode/imcms/mapping/TestDocumentMapper.java b/src/test/java/com/imcode/imcms/mapping/TestDocumentMapper.java
similarity index 90%
rename from server/src/com/imcode/imcms/mapping/TestDocumentMapper.java
rename to src/test/java/com/imcode/imcms/mapping/TestDocumentMapper.java
index 2b843fa167..fbe752824a 100644
--- a/server/src/com/imcode/imcms/mapping/TestDocumentMapper.java
+++ b/src/test/java/com/imcode/imcms/mapping/TestDocumentMapper.java
@@ -2,6 +2,9 @@
 
 import com.imcode.db.mock.MockDatabase;
 import com.imcode.db.mock.MockResultSet;
+import com.imcode.imcms.domain.dto.export.DocumentExportService;
+import com.imcode.imcms.servlet.LoginPasswordManager;
+import imcode.server.Imcms;
 import imcode.server.MockImcmsServices;
 import imcode.server.document.*;
 import imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException;
@@ -12,9 +15,9 @@
 import imcode.server.user.UserDomainObject;
 import imcode.util.IntegerSet;
 import junit.framework.TestCase;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.varia.NullAppender;
+import org.apache.commons.io.FileUtils;
 
+import java.io.File;
 import java.io.Serializable;
 import java.sql.ResultSet;
 
@@ -28,11 +31,11 @@ public class TestDocumentMapper extends TestCase {
     private TextDocumentDomainObject textDocument;
     private TextDocumentDomainObject oldDocument;
     private MockDocumentIndex documentIndex;
-    private static final Integer ONE = new Integer(1);
+    private static final Integer ONE = 1;
 
     protected void setUp() throws Exception {
-        BasicConfigurator.configure(new NullAppender());
         super.setUp();
+	    Imcms.setPath(new File("tmp"));
         user = new UserDomainObject(0);
         userRole = new RoleId( 3 );
         user.addRoleId( userRole );
@@ -42,7 +45,8 @@ protected void setUp() throws Exception {
         database = new MockDatabase();
         MockImcmsServices mockImcmsServices = new MockImcmsServices();
         mockImcmsServices.setDatabase(database);
-        ImcmsAuthenticatorAndUserAndRoleMapper userRegistry = new ImcmsAuthenticatorAndUserAndRoleMapper(mockImcmsServices) {
+        LoginPasswordManager userLoginPasswordManager = new LoginPasswordManager();
+        ImcmsAuthenticatorAndUserAndRoleMapper userRegistry = new ImcmsAuthenticatorAndUserAndRoleMapper(mockImcmsServices, userLoginPasswordManager) {
             public UserDomainObject getUser( int userId ) {
                 return user ;
             }
@@ -51,12 +55,15 @@ public UserDomainObject getUser( int userId ) {
         MockImcmsServices services = new MockImcmsServices() ;
         services.setImcmsAuthenticatorAndUserAndRoleMapper(userRegistry);
         services.setTemplateMapper(new TemplateMapper(new MockImcmsServices())) ;
+	    services.setDocumentExportService(new DocumentExportService(new MockImcmsServices()));
         documentIndex = new MockDocumentIndex();
         CategoryMapper categoryMapper = new CategoryMapper(database);
         documentMapper = new DocumentMapper( services, database);
         documentMapper.setDocumentIndex(documentIndex);
         services.setDocumentMapper(documentMapper);
         services.setCategoryMapper(categoryMapper);
+        ImageCacheMapper imageCacheMapper = new ImageCacheMapper(database);
+        services.setImageCacheMapper(imageCacheMapper);
     }
 
     private TextDocumentDomainObject createTextDocument(int documentId) {
@@ -71,13 +78,13 @@ public void testNotSerializable() {
         }
     }
 
-    public void testUpdateDocumentRolePermissionsWithNoPermissions() throws Exception {
+    public void testUpdateDocumentRolePermissionsWithNoPermissions() {
         textDocument.setDocumentPermissionSetTypeForRoleId(testRole.getId(), DocumentPermissionSetTypeDomainObject.READ);
         documentMapper.getDocumentSaver().updateDocumentRolePermissions( textDocument, user, oldDocument );
         assertEquals( 0, database.getSqlCallCount() );
     }
 
-    public void testUpdateDocumentRolePermissionsWithRestricted1Permission() throws Exception {
+    public void testUpdateDocumentRolePermissionsWithRestricted1Permission() {
         oldDocument.setDocumentPermissionSetTypeForRoleId(userRole, DocumentPermissionSetTypeDomainObject.RESTRICTED_1);
         textDocument.setRoleIdsMappedToDocumentPermissionSetTypes(oldDocument.getRoleIdsMappedToDocumentPermissionSetTypes());
         textDocument.setDocumentPermissionSetTypeForRoleId(testRole.getId(), DocumentPermissionSetTypeDomainObject.READ);
@@ -101,7 +108,7 @@ public void setFromBits(
         database.assertCalled(new MockDatabase.EqualsSqlCallPredicate(DocumentSaver.SQL_SET_ROLE_DOCUMENT_PERMISSION_SET_ID));
     }
 
-    public void testUpdateDocumentRolePermissionsWithFullPermission() throws Exception {
+    public void testUpdateDocumentRolePermissionsWithFullPermission() {
         oldDocument.setDocumentPermissionSetTypeForRoleId(userRole, DocumentPermissionSetTypeDomainObject.FULL);
         textDocument.setDocumentPermissionSetTypeForRoleId(testRole.getId(), DocumentPermissionSetTypeDomainObject.READ);
         textDocument.setRoleIdsMappedToDocumentPermissionSetTypes(oldDocument.getRoleIdsMappedToDocumentPermissionSetTypes());
@@ -132,7 +139,7 @@ public void testUpdateDocumentRolePermissionsRemovesPermission() {
         assertEquals(1, database.getSqlCallCount());
     }
 
-    public void testUpdateDocumentRolePermissionsAllowsNullOldDocument() throws Exception {
+    public void testUpdateDocumentRolePermissionsAllowsNullOldDocument() {
         documentMapper.getDocumentSaver().updateDocumentRolePermissions( textDocument, user, null );
         assertTrue(true);
     }
@@ -142,7 +149,7 @@ public void testSaveNewBrowserDocument() throws Exception {
         browserDocument.setDocumentPermissionSetTypeForRoleId(userRole, DocumentPermissionSetTypeDomainObject.FULL);
         browserDocument.setBrowserDocumentId(BrowserDocumentDomainObject.Browser.DEFAULT, 1001);
         browserDocument.setCreator(new UserDomainObject(0));
-        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableSqlCallPredicate("meta"), new Integer(1002));
+        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableSqlCallPredicate("meta"), 1002);
         documentMapper.saveNewDocument(browserDocument, user, false);
         database.assertExpectedSqlCalls();
         database.assertCallCount(1, new MockDatabase.InsertIntoTableSqlCallPredicate("browser_docs"));
@@ -150,11 +157,11 @@ public void testSaveNewBrowserDocument() throws Exception {
     }
 
     public void testDeleteDocument() {
-        Object[][] documentResultRows = new Object[1][19];
-        documentResultRows[0][0] = new Integer(textDocument.getId()) ;
-        documentResultRows[0][1] = new Integer(textDocument.getDocumentTypeId()) ;
-        documentResultRows[0][5] = new Integer(user.getId()) ;
-        documentResultRows[0][16] = new Integer(DocumentSaver.convertPublicationStatusToInt(textDocument.getPublicationStatus())) ;
+        Object[][] documentResultRows = new Object[1][21];
+        documentResultRows[0][0] = textDocument.getId();
+        documentResultRows[0][1] = textDocument.getDocumentTypeId();
+        documentResultRows[0][5] = user.getId();
+        documentResultRows[0][16] = textDocument.getPublicationStatus().hashCode();
         database.addExpectedSqlCall( new MockDatabase.StartsWithSqlCallPredicate( DatabaseDocumentGetter.SQL_GET_DOCUMENTS ), new MockResultSet(documentResultRows) );
         ResultSet textDocsResultRow = new MockResultSet(new Object[][] { { ONE, ONE, ONE, ONE, ONE } } ) ;
         database.addExpectedSqlCall( new MockDatabase.MatchesRegexSqlCallPredicate( "FROM text_docs"), textDocsResultRow );
@@ -180,7 +187,7 @@ public void testCreateTextDocument() throws NoPermissionToAddDocumentToMenuExcep
         user.addRoleId( RoleId.SUPERADMIN );
         TextDocumentDomainObject document = (TextDocumentDomainObject)documentMapper.createDocumentOfTypeFromParent( DocumentTypeDomainObject.TEXT_ID, textDocument, user );
         document.setTemplateName( "1" );
-        database.addExpectedSqlCall( new MockDatabase.InsertIntoTableSqlCallPredicate( "meta" ), new Integer(1002));
+        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableSqlCallPredicate("meta"), 1002);
         documentMapper.saveNewDocument( document, user, false);
         database.assertExpectedSqlCalls();
     }
@@ -188,7 +195,7 @@ public void testCreateTextDocument() throws NoPermissionToAddDocumentToMenuExcep
     public void testCreateHtmlDocument() throws NoPermissionToAddDocumentToMenuException, NoPermissionToCreateDocumentException, DocumentSaveException {
         user.addRoleId( RoleId.SUPERADMIN );
         DocumentDomainObject document = documentMapper.createDocumentOfTypeFromParent( DocumentTypeDomainObject.HTML_ID, textDocument, user );
-        database.addExpectedSqlCall( new MockDatabase.InsertIntoTableSqlCallPredicate( "meta" ), new Integer(1002));
+        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableSqlCallPredicate("meta"), 1002);
         documentMapper.saveNewDocument( document, user, false);
         database.assertExpectedSqlCalls();
     }
@@ -196,13 +203,13 @@ public void testCreateHtmlDocument() throws NoPermissionToAddDocumentToMenuExcep
     public void testCreateUrlDocument() throws NoPermissionToAddDocumentToMenuException, NoPermissionToCreateDocumentException, DocumentSaveException {
         user.addRoleId( RoleId.SUPERADMIN );
         DocumentDomainObject document = documentMapper.createDocumentOfTypeFromParent( DocumentTypeDomainObject.URL_ID, textDocument, user );
-        database.addExpectedSqlCall( new MockDatabase.InsertIntoTableSqlCallPredicate( "meta" ), new Integer(1002));
+        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableSqlCallPredicate("meta"), 1002);
         documentMapper.saveNewDocument( document, user, false);
         database.assertExpectedSqlCalls();
     }
 
 
-    public void testSetTemplateForNewTextDocument() throws Exception {
+    public void testSetTemplateForNewTextDocument() {
         String templateId1 = "1";
         String templateId2 = "2";
         String templateId3 = "3";
@@ -241,4 +248,4 @@ public void testSetTemplateForNewTextDocument() throws Exception {
         assertEquals(templateId2, newDocument.getTemplateName());
     }
 
-}
\ No newline at end of file
+}
diff --git a/server/src/com/imcode/imcms/mapping/TestDocumentPermissionSetMapper.java b/src/test/java/com/imcode/imcms/mapping/TestDocumentPermissionSetMapper.java
similarity index 93%
rename from server/src/com/imcode/imcms/mapping/TestDocumentPermissionSetMapper.java
rename to src/test/java/com/imcode/imcms/mapping/TestDocumentPermissionSetMapper.java
index b0f476fb0c..e10b6b566b 100644
--- a/server/src/com/imcode/imcms/mapping/TestDocumentPermissionSetMapper.java
+++ b/src/test/java/com/imcode/imcms/mapping/TestDocumentPermissionSetMapper.java
@@ -1,9 +1,9 @@
 package com.imcode.imcms.mapping;
 
 import com.imcode.db.mock.MockDatabase;
+import imcode.server.document.DocumentPermissionSetDomainObject;
 import imcode.server.document.DocumentPermissionSetTypeDomainObject;
 import imcode.server.document.TextDocumentPermissionSetDomainObject;
-import imcode.server.document.DocumentPermissionSetDomainObject;
 import imcode.server.document.textdocument.TextDocumentDomainObject;
 import junit.framework.TestCase;
 
@@ -23,8 +23,8 @@ public void setUp() throws Exception {
         textDocumentPermissionSet = new TextDocumentPermissionSetDomainObject( DocumentPermissionSetTypeDomainObject.RESTRICTED_1 );
     }
 
-    public void testSetTextDocumentPermissionSetFromBits() throws Exception {
-        database.addExpectedSqlCall( new MockDatabase.StartsWithSqlCallPredicate( DatabaseDocumentGetter.SQL_SELECT_PERMISSON_DATA__PREFIX ), null );
+    public void testSetTextDocumentPermissionSetFromBits() {
+        database.addExpectedSqlCall(new MockDatabase.StartsWithSqlCallPredicate(DatabaseDocumentGetter.SQL_SELECT_PERMISSION_DATA__PREFIX), null);
         textDocumentPermissionSet.setEditDocumentInformation(0 != ( DocumentPermissionSetDomainObject.EDIT_DOCUMENT_PERMISSION_ID & DocumentPermissionSetDomainObject.EDIT_DOCINFO_PERMISSION_ID ));
         textDocumentPermissionSet.setEditPermissions(0 != ( DocumentPermissionSetDomainObject.EDIT_DOCUMENT_PERMISSION_ID & DocumentPermissionSetDomainObject.EDIT_PERMISSIONS_PERMISSION_ID ));
         textDocumentPermissionSet.setEdit(0 != ( DocumentPermissionSetDomainObject.EDIT_DOCUMENT_PERMISSION_ID & DocumentPermissionSetDomainObject.EDIT_DOCUMENT_PERMISSION_ID ));
diff --git a/server/src/com/imcode/imcms/mapping/TestDocumentSaver.java b/src/test/java/com/imcode/imcms/mapping/TestDocumentSaver.java
similarity index 100%
rename from server/src/com/imcode/imcms/mapping/TestDocumentSaver.java
rename to src/test/java/com/imcode/imcms/mapping/TestDocumentSaver.java
diff --git a/src/test/java/com/imcode/imcms/mapping/TestTextDocumentInitializer.java b/src/test/java/com/imcode/imcms/mapping/TestTextDocumentInitializer.java
new file mode 100644
index 0000000000..b31cf0215a
--- /dev/null
+++ b/src/test/java/com/imcode/imcms/mapping/TestTextDocumentInitializer.java
@@ -0,0 +1,45 @@
+package com.imcode.imcms.mapping;
+
+import com.imcode.db.mock.MockDatabase;
+import com.imcode.db.mock.MockResultSet;
+import imcode.server.document.DocumentDomainObject;
+import imcode.server.document.textdocument.MenuDomainObject;
+import imcode.server.document.textdocument.TextDocumentDomainObject;
+import junit.framework.TestCase;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class TestTextDocumentInitializer extends TestCase {
+
+    public void testInitDocumentsMenuItems() {
+        List<Integer> documentIds = Arrays.asList(1001, 1002);
+        MockDatabase database = new MockDatabase();
+
+        database.addExpectedSqlCall(new MockDatabase.StartsWithSqlCallPredicate(TextDocumentInitializer.SQL_GET_MENU_ITEMS),
+                new MockResultSet(new Object[][]{
+                        {1001, 1, 1, 1, 1002, 500, ""},
+                        {1001, 1, 1, 1, 1003, 510, ""},
+                        {1001, 1, 1, 1, 1005, 500, ""},
+                        {1001, 2, 2, 1, 1002, 500, ""},
+                }));
+
+        MapDocumentGetter documentGetter = new MapDocumentGetter(new DocumentDomainObject[]{
+                new TextDocumentDomainObject(1001),
+                new TextDocumentDomainObject(1002),
+                new TextDocumentDomainObject(1003),
+                new TextDocumentDomainObject(1004),
+        });
+        TextDocumentInitializer initializer = new TextDocumentInitializer(database, documentGetter, documentIds);
+        TextDocumentDomainObject textDocument = (TextDocumentDomainObject) documentGetter.getDocument(1001);
+        initializer.initialize(textDocument);
+        assertEquals(2, textDocument.getMenus().size());
+
+        MenuDomainObject menu1 = textDocument.getMenu(1);
+        assertEquals(2, menu1.getMenuItems().length);
+
+        MenuDomainObject menu2 = textDocument.getMenu(2);
+        assertEquals(1, menu2.getMenuItems().length);
+
+    }
+}
diff --git a/src/test/java/com/imcode/imcms/servlet/LoginPasswordManagerTest.java b/src/test/java/com/imcode/imcms/servlet/LoginPasswordManagerTest.java
new file mode 100644
index 0000000000..f03ac8660b
--- /dev/null
+++ b/src/test/java/com/imcode/imcms/servlet/LoginPasswordManagerTest.java
@@ -0,0 +1,47 @@
+package com.imcode.imcms.servlet;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.*;
+
+@RunWith(value=Parameterized.class)
+public class LoginPasswordManagerTest {
+
+    private LoginPasswordManager manager;
+
+    public LoginPasswordManagerTest(String sharedSalt) {
+        manager = new LoginPasswordManager(sharedSalt);
+    }
+
+    @Parameterized.Parameters
+    static public Collection<String[]> parameters() {
+        return Arrays.asList(new String[][] {{null}, {""}, {"secret"}});
+    }
+
+    @Test
+    public void encryptPassword() {
+        String password = "abcdefg";
+        String encryptedPassword = manager.encryptPassword(password);
+    }
+
+
+    @Test
+    public void validatePasswordUsingSamePassword() {
+        String password = "abcdefg";
+        String encryptedPassword = manager.encryptPassword(password);
+        assertTrue("Password is valid", manager.validatePassword(password, encryptedPassword));
+    }
+
+    @Test
+    public void validatePasswordUsingDifferentPassword() {
+        String password = "abcdefg";
+        String differentPassword = "abcdefgx";
+        String encryptedPassword = manager.encryptPassword(password);
+        assertFalse("Password is not valid", manager.validatePassword(differentPassword, encryptedPassword));
+    }
+}
diff --git a/server/src/com/imcode/imcms/servlet/TestHelpDocLinks.java b/src/test/java/com/imcode/imcms/servlet/TestHelpDocLinks.java
similarity index 82%
rename from server/src/com/imcode/imcms/servlet/TestHelpDocLinks.java
rename to src/test/java/com/imcode/imcms/servlet/TestHelpDocLinks.java
index 1a08b9ef32..61253f5c90 100644
--- a/server/src/com/imcode/imcms/servlet/TestHelpDocLinks.java
+++ b/src/test/java/com/imcode/imcms/servlet/TestHelpDocLinks.java
@@ -1,16 +1,12 @@
 package com.imcode.imcms.servlet;
 
-import junit.framework.*;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.io.*;
-
 import com.imcode.imcms.test.casual.TestLanguagePropertiesInUse;
 import com.imcode.util.FileTreeTraverser;
-import org.apache.oro.text.perl.Perl5Util;
-import org.apache.oro.text.regex.PatternMatcherInput;
-import org.apache.commons.lang.UnhandledException;
+import junit.framework.TestCase;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
 
 public class TestHelpDocLinks extends TestCase {
 
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/TestFileAdmin.java b/src/test/java/com/imcode/imcms/servlet/superadmin/TestFileAdmin.java
similarity index 100%
rename from server/src/com/imcode/imcms/servlet/superadmin/TestFileAdmin.java
rename to src/test/java/com/imcode/imcms/servlet/superadmin/TestFileAdmin.java
diff --git a/server/src/com/imcode/imcms/servlet/superadmin/TestLinkCheck.java b/src/test/java/com/imcode/imcms/servlet/superadmin/TestLinkCheck.java
similarity index 100%
rename from server/src/com/imcode/imcms/servlet/superadmin/TestLinkCheck.java
rename to src/test/java/com/imcode/imcms/servlet/superadmin/TestLinkCheck.java
diff --git a/server/src/com/imcode/imcms/test/TestLanguagePropertyFilesInSync.java b/src/test/java/com/imcode/imcms/test/TestLanguagePropertyFilesInSync.java
similarity index 100%
rename from server/src/com/imcode/imcms/test/TestLanguagePropertyFilesInSync.java
rename to src/test/java/com/imcode/imcms/test/TestLanguagePropertyFilesInSync.java
diff --git a/server/src/com/imcode/imcms/test/casual/TestLanguagePropertiesInUse.java b/src/test/java/com/imcode/imcms/test/casual/TestLanguagePropertiesInUse.java
similarity index 100%
rename from server/src/com/imcode/imcms/test/casual/TestLanguagePropertiesInUse.java
rename to src/test/java/com/imcode/imcms/test/casual/TestLanguagePropertiesInUse.java
diff --git a/server/src/com/imcode/imcms/test/external/TestLdapUserAndRoleRegistry.java b/src/test/java/com/imcode/imcms/test/external/TestLdapUserAndRoleRegistry.java
similarity index 82%
rename from server/src/com/imcode/imcms/test/external/TestLdapUserAndRoleRegistry.java
rename to src/test/java/com/imcode/imcms/test/external/TestLdapUserAndRoleRegistry.java
index b475151bb5..8af5e511aa 100644
--- a/server/src/com/imcode/imcms/test/external/TestLdapUserAndRoleRegistry.java
+++ b/src/test/java/com/imcode/imcms/test/external/TestLdapUserAndRoleRegistry.java
@@ -4,13 +4,8 @@
 import imcode.server.user.UserDomainObject;
 import junit.framework.TestCase;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.SimpleLayout;
 
-import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Properties;
 
@@ -23,18 +18,15 @@ public class TestLdapUserAndRoleRegistry extends TestCase {
     private static final String DEFAULT_LDAP_PROPERTIES_FILE = "build.properties";
     private LdapUserAndRoleRegistry ldapUserAndRoleRegistry;
 
-    private void initLog4J() throws IOException {
-        String tmpDir = System.getProperty( "java.io.tmpdir" );
-        File tmpFile = new File( tmpDir, "log4joutput.log" );
-        BasicConfigurator.configure( new FileAppender( new SimpleLayout(), tmpFile.toString() ) );
-    }
-
     LdapUserAndRoleRegistry getLdapUserAndRoleRegistry( String[] ldapAttributesMappedToRoles ) throws Exception {
         String propertyFileName = System.getProperty( LDAP_PROPERTIES_SYSTEM_PROPERTY, DEFAULT_LDAP_PROPERTIES_FILE );
         ldapProperties.load( new FileInputStream( propertyFileName ) );
         String ldapUrl = ldapProperties.getProperty( "ldap-url" );
         String ldapPassword = ldapProperties.getProperty( "ldap-password" );
         String ldapBindDN = ldapProperties.getProperty( "ldap-bind-dn" );
+        String ldapReadTimeoutMillis = ldapProperties.getProperty("ldap-read-timeout-millis");
+        String ldapMaxConnections = ldapProperties.getProperty("ldap-max-connections");
+        String ldapConnectionExpirySeconds = ldapProperties.getProperty( "ldap-connection-expiry-seconds" );
         String ldapUserObjectClass = ldapProperties.getProperty( "ldap-user-object-class") ;
         String ldapAttributeLoginName = ldapProperties.getProperty( "ldap-attribute-login-name" );
 
@@ -44,16 +36,17 @@ LdapUserAndRoleRegistry getLdapUserAndRoleRegistry( String[] ldapAttributesMappe
             throw new Exception( "Set ldap-test-user in " + propertyFileName );
         }
 
-        LdapUserAndRoleRegistry ldapUserAndRoleRegistry = new LdapUserAndRoleRegistry( ldapUrl,
-                                                                                       ldapUserObjectClass,
-                                                                                       ldapBindDN, ldapPassword, ldapAttributesMappedToRoles, new Properties());
+        LdapUserAndRoleRegistry ldapUserAndRoleRegistry = new LdapUserAndRoleRegistry(ldapUrl,
+                ldapUserObjectClass,
+                ldapBindDN, ldapPassword,
+                ldapReadTimeoutMillis, ldapMaxConnections, ldapConnectionExpirySeconds,
+                ldapAttributesMappedToRoles, new Properties());
         ldapUserAndRoleRegistry.setUserPropertyLdapAttribute("LoginName", ldapAttributeLoginName) ;
         return ldapUserAndRoleRegistry;
     }
 
     public void setUp() throws Exception {
         super.setUp();
-        initLog4J();
         this.ldapUserAndRoleRegistry = getLdapUserAndRoleRegistry( new String[]{} );
     }
 
diff --git a/server/src/com/imcode/imcms/test/external/TestSMTP.java b/src/test/java/com/imcode/imcms/test/external/TestSMTP.java
similarity index 98%
rename from server/src/com/imcode/imcms/test/external/TestSMTP.java
rename to src/test/java/com/imcode/imcms/test/external/TestSMTP.java
index fd77b9a775..d31e17becd 100644
--- a/server/src/com/imcode/imcms/test/external/TestSMTP.java
+++ b/src/test/java/com/imcode/imcms/test/external/TestSMTP.java
@@ -11,7 +11,7 @@ public class TestSMTP extends TestCase {
 
     private String fromAddress;
     private String toAddress;
-    private static final String TEST_MAIL = "Testing swedish characters: ÅÄÖ\n" 
+    private static final String TEST_MAIL = "Testing swedish characters: ÅÄÖ\n" 
                                             + "There should be an empty line below\n" + "\n" +
                                             "There should be a single dot below\n" + ".\n";
     private SMTP smtp;
@@ -92,7 +92,7 @@ public void testHtml() throws IOException {
         SMTP.Mail mail = new SMTP.Mail( fromAddress );
         mail.setSubject("HTML "+TEST_SUBJECT);
         mail.setToAddresses(new String[]{toAddress});
-        mail.setHtmlBody("<html><body>This mail should have an <strong>HTML</strong> <em>alternative</em> and these swedish characters should be OK: ÅÄÖ.</body></html>");
+        mail.setHtmlBody("<html><body>This mail should have an <strong>HTML</strong> <em>alternative</em> and these swedish characters should be OK: ÅÄÖ.</body></html>");
         smtp.sendMail( mail );
     }
 }
diff --git a/server/src/com/imcode/imcms/test/external/TestStartupDatabaseUpgrade.java b/src/test/java/com/imcode/imcms/test/external/TestStartupDatabaseUpgrade.java
similarity index 81%
rename from server/src/com/imcode/imcms/test/external/TestStartupDatabaseUpgrade.java
rename to src/test/java/com/imcode/imcms/test/external/TestStartupDatabaseUpgrade.java
index 142857008b..8c07617c59 100644
--- a/server/src/com/imcode/imcms/test/external/TestStartupDatabaseUpgrade.java
+++ b/src/test/java/com/imcode/imcms/test/external/TestStartupDatabaseUpgrade.java
@@ -1,23 +1,29 @@
 package com.imcode.imcms.test.external;
 
 import com.imcode.db.DataSourceDatabase;
-import com.imcode.db.DatabaseException;
-import com.imcode.db.commands.SqlUpdateCommand;
 import com.imcode.imcms.db.ImcmsDatabaseCreator;
 import com.imcode.imcms.db.StartupDatabaseUpgrade;
 import com.imcode.imcms.db.refactoring.DatabasePlatform;
-import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
 import com.imcode.imcms.util.EmptyEnumeration;
+import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
 import imcode.server.Imcms;
-import imcode.util.ShouldNotBeThrownException;
 import junit.framework.TestCase;
 import org.apache.commons.io.CopyUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.ddlutils.io.DatabaseIO;
 import org.apache.ddlutils.model.Database;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.Enumeration;
+import java.util.ResourceBundle;
 
 public class TestStartupDatabaseUpgrade extends TestCase {
 
@@ -69,11 +75,7 @@ private Database getOldDdl() {
     }
 
     private Reader getOldDdlXmlReader() {
-        try {
-            return new InputStreamReader(getClass().getResourceAsStream("/com/imcode/imcms/test/external/imcms-ddl-3.0.xml"), "UTF-8") ;
-        } catch ( UnsupportedEncodingException e ) {
-            throw new ShouldNotBeThrownException(e);
-        }
+        return new InputStreamReader(getClass().getResourceAsStream("/com/imcode/imcms/test/external/imcms-ddl-3.0.xml"), StandardCharsets.UTF_8);
     }
 
     private Database getWantedDdl() throws IOException {
@@ -81,16 +83,12 @@ private Database getWantedDdl() throws IOException {
     }
 
     private ImcmsDatabaseCreator createDatabaseCreator() {
-        try {
-            InputStreamReader initScriptReader = new InputStreamReader(getClass().getResourceAsStream("/com/imcode/imcms/test/external/imcms-init-3.0.sql"), "UTF-8");
-            return new ImcmsDatabaseCreator(initScriptReader, new LocalizedMessageProvider() {
-                public ResourceBundle getResourceBundle(String languageIso639_2) {
-                    return new NullResourceBundle();
-                }
-            });
-        } catch ( UnsupportedEncodingException e ) {
-            throw new ShouldNotBeThrownException(e);
-        }
+        InputStreamReader initScriptReader = new InputStreamReader(getClass().getResourceAsStream("/com/imcode/imcms/test/external/imcms-init-3.0.sql"), StandardCharsets.UTF_8);
+        return new ImcmsDatabaseCreator(initScriptReader, new LocalizedMessageProvider() {
+            public ResourceBundle getResourceBundle(String languageIso639_2) {
+                return new NullResourceBundle();
+            }
+        });
     }
 
     private Database getDdl(Reader reader) {
@@ -113,7 +111,7 @@ public boolean accept(File pathname) {
             }
         });
         for ( File tableFile : tableFiles ) {
-            Reader reader = new InputStreamReader(new FileInputStream(tableFile), "iso-8859-1");
+            Reader reader = new InputStreamReader(new FileInputStream(tableFile), StandardCharsets.ISO_8859_1);
             CopyUtils.copy(reader, ddlXmlWriter) ;
         }
         ddlXmlWriter.write("</database>") ;
diff --git a/src/test/java/com/imcode/imcms/util/UtilityTest.java b/src/test/java/com/imcode/imcms/util/UtilityTest.java
new file mode 100644
index 0000000000..437da6d727
--- /dev/null
+++ b/src/test/java/com/imcode/imcms/util/UtilityTest.java
@@ -0,0 +1,86 @@
+package com.imcode.imcms.util;
+
+import imcode.util.Utility;
+import junit.framework.TestCase;
+
+public class UtilityTest extends TestCase {
+
+    public void testIpConvert_Expect_CorrectConverting() {
+        final String ip = "150.150.140.130";
+        final long ipLong = Utility.ipStringToLong(ip);
+        final String convertedIp = Utility.ipLongToString(ipLong);
+
+        assertEquals(ip, convertedIp);
+    }
+
+    public void test_IpStringToLong_When_LastDecadeDiffers_Expect_OneLessThanOther() {
+        final String lowerIp = "100.100.100.100";
+        final String higherIp = "100.100.100.101";
+
+        final long lowerIpLong = Utility.ipStringToLong(lowerIp);
+        final long higherIpLong = Utility.ipStringToLong(higherIp);
+
+        assertTrue(lowerIpLong < higherIpLong);
+    }
+
+    public void test_IpStringToLong_When_LastDecadeDiffers_Expect_IpBetweenTwoOthers() {
+        final String lowerIp = "100.100.100.100";
+        final String middleIp = "100.100.100.101";
+        final String higherIp = "100.100.100.102";
+
+        final long lowerIpLong = Utility.ipStringToLong(lowerIp);
+        final long middleIpLong = Utility.ipStringToLong(middleIp);
+        final long higherIpLong = Utility.ipStringToLong(higherIp);
+
+        assertTrue((lowerIpLong < middleIpLong) && (middleIpLong < higherIpLong));
+    }
+
+    public void test_IpStringToLong_When_ThirdDecadeDiffers_Expect_IpBetweenTwoOthers() {
+        final String lowerIp = "100.100.100.100";
+        final String middleIp = "100.100.101.100";
+        final String higherIp = "100.100.102.100";
+
+        final long lowerIpLong = Utility.ipStringToLong(lowerIp);
+        final long middleIpLong = Utility.ipStringToLong(middleIp);
+        final long higherIpLong = Utility.ipStringToLong(higherIp);
+
+        assertTrue((lowerIpLong < middleIpLong) && (middleIpLong < higherIpLong));
+    }
+
+    public void test_IpStringToLong_When_SecondDecadeDiffers_Expect_IpBetweenTwoOthers() {
+        final String lowerIp = "100.100.100.100";
+        final String middleIp = "100.101.100.100";
+        final String higherIp = "100.102.100.100";
+
+        final long lowerIpLong = Utility.ipStringToLong(lowerIp);
+        final long middleIpLong = Utility.ipStringToLong(middleIp);
+        final long higherIpLong = Utility.ipStringToLong(higherIp);
+
+        assertTrue((lowerIpLong < middleIpLong) && (middleIpLong < higherIpLong));
+    }
+
+    public void test_IpStringToLong_When_FirstDecadeDiffers_Expect_IpBetweenTwoOthers() {
+        final String lowerIp = "100.100.100.100";
+        final String middleIp = "101.100.100.100";
+        final String higherIp = "102.100.100.100";
+
+        final long lowerIpLong = Utility.ipStringToLong(lowerIp);
+        final long middleIpLong = Utility.ipStringToLong(middleIp);
+        final long higherIpLong = Utility.ipStringToLong(higherIp);
+
+        assertTrue((lowerIpLong < middleIpLong) && (middleIpLong < higherIpLong));
+    }
+
+    public void test_IpStringToLong_When_AllDecadesDiffers_Expect_IpBetweenTwoOthers() {
+        final String lowerIp = "100.100.100.100";
+        final String middleIp = "101.101.101.101";
+        final String higherIp = "102.102.102.102";
+
+        final long lowerIpLong = Utility.ipStringToLong(lowerIp);
+        final long middleIpLong = Utility.ipStringToLong(middleIp);
+        final long higherIpLong = Utility.ipStringToLong(higherIp);
+
+        assertTrue((lowerIpLong < middleIpLong) && (middleIpLong < higherIpLong));
+    }
+
+}
diff --git a/server/src/com/imcode/imcms/util/rss/Rss20DocumentFactoryTest.java b/src/test/java/com/imcode/imcms/util/rss/Rss20DocumentFactoryTest.java
similarity index 96%
rename from server/src/com/imcode/imcms/util/rss/Rss20DocumentFactoryTest.java
rename to src/test/java/com/imcode/imcms/util/rss/Rss20DocumentFactoryTest.java
index 7176bc45b6..c9174b4375 100644
--- a/server/src/com/imcode/imcms/util/rss/Rss20DocumentFactoryTest.java
+++ b/src/test/java/com/imcode/imcms/util/rss/Rss20DocumentFactoryTest.java
@@ -3,14 +3,17 @@
 import com.imcode.imcms.util.rss.dc.DublinCoreEntity;
 import com.imcode.imcms.util.rss.dc.DublinCoreItem;
 import com.imcode.imcms.util.rss.dc.DublinCoreTerms;
-import com.imcode.imcms.util.rss.dc.DublinCoreChannel;
 import imcode.util.Utility;
 import junit.framework.TestCase;
-import org.w3c.dom.Document;
 import org.apache.commons.beanutils.DynaBean;
+import org.w3c.dom.Document;
 
 import javax.xml.transform.stream.StreamResult;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Map;
 
 public class Rss20DocumentFactoryTest extends TestCase {
 
diff --git a/server/src/com/imcode/test/mock/MockHttpServletRequest.java b/src/test/java/com/imcode/test/mock/MockHttpServletRequest.java
similarity index 100%
rename from server/src/com/imcode/test/mock/MockHttpServletRequest.java
rename to src/test/java/com/imcode/test/mock/MockHttpServletRequest.java
diff --git a/src/test/java/imcode/server/IsMemberOfTest.java b/src/test/java/imcode/server/IsMemberOfTest.java
new file mode 100644
index 0000000000..f2d57fad97
--- /dev/null
+++ b/src/test/java/imcode/server/IsMemberOfTest.java
@@ -0,0 +1,45 @@
+package imcode.server;
+
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import java.util.Hashtable;
+
+public class IsMemberOfTest {
+    public static void main(String[] args) throws Exception {
+        if (args.length != 3) {
+            System.out.println("Usage: IsMemberOf <user-id> <group-dn> <recursive: true|false>");
+            System.exit(0);
+        }
+
+        Hashtable<String, String> env = new Hashtable<>();
+
+        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+        env.put(Context.PROVIDER_URL, "ldap://imadsrv.d01.imcode.com:389/CN=Users,DC=d01,DC=imcode,DC=com");
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "CN=administrator,CN=Users,DC=d01,DC=imcode,DC=com");
+        env.put(Context.SECURITY_CREDENTIALS, "nonac-ad01");
+        env.put(Context.REFERRAL, "follow");
+
+        InitialDirContext ctx = new InitialDirContext(env);
+
+        SearchControls searchControls = new SearchControls();
+        searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+        searchControls.setReturningAttributes(new String[]{"sAMAccountName"});
+
+        String filter = Boolean.valueOf(args[2])
+                ? String.format("(&(objectClass=user)(sAMAccountName=%s)(memberOf:1.2.840.113556.1.4.1941:=%s))", args)
+                : String.format("(&(objectClass=user)(sAMAccountName=%s)(memberOf=%s))", args);
+
+        System.out.println(">> Searching using filter: " + filter);
+
+        NamingEnumeration<SearchResult> results = ctx.search(
+                "",
+                filter,
+                searchControls);
+
+        System.out.println(">> " + (results.hasMore() ? "YES" : "NO"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/imcode/server/MockImcmsServices.java b/src/test/java/imcode/server/MockImcmsServices.java
new file mode 100644
index 0000000000..e3b715b316
--- /dev/null
+++ b/src/test/java/imcode/server/MockImcmsServices.java
@@ -0,0 +1,276 @@
+package imcode.server;
+
+import com.imcode.db.Database;
+import com.imcode.db.mock.MockDatabase;
+import com.imcode.imcms.db.ProcedureExecutor;
+import com.imcode.imcms.domain.dto.export.DocumentExportService;
+import com.imcode.imcms.domain.repository.ExternalToLocalRoleLinkComponent;
+import com.imcode.imcms.domain.services.AuthenticationProviderService;
+import com.imcode.imcms.domain.services.api.DefaultExternalToLocalRoleLinkService;
+import com.imcode.imcms.mapping.CategoryMapper;
+import com.imcode.imcms.mapping.DocumentMapper;
+import com.imcode.imcms.mapping.ImageCacheMapper;
+import com.imcode.imcms.util.l10n.LocalizedMessageProvider;
+import imcode.server.document.TemplateMapper;
+import imcode.server.kerberos.KerberosLoginService;
+import imcode.server.parser.ParserParameters;
+import imcode.server.user.ImcmsAuthenticatorAndUserAndRoleMapper;
+import imcode.server.user.RoleGetter;
+import imcode.server.user.UserDomainObject;
+import imcode.util.CachingFileLoader;
+import imcode.util.net.SMTP;
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.security.KeyStore;
+import java.text.Collator;
+import java.util.Date;
+import java.util.List;
+
+public class MockImcmsServices implements ImcmsServices {
+
+    private ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper;
+
+    private Database database = new MockDatabase();
+    private KeyStore keyStore;
+    private TemplateMapper templateMapper;
+	private DocumentExportService documentExportService;
+    private DocumentMapper documentMapper;
+    private CategoryMapper categoryMapper;
+    private LanguageMapper languageMapper = new LanguageMapper(null, null);
+    private ImageCacheMapper imageCacheMapper;
+    private RoleGetter roleGetter;
+    private ProcedureExecutor procedureExecutor;
+    private Config config = new Config();
+    private KerberosLoginService kerberosLoginService;
+    private AuthenticationProviderService authenticationProviderService;
+    private ExternalToLocalRoleLinkComponent externalToLocalRoleLinkComponent;
+    private DefaultExternalToLocalRoleLinkService defaultExternalToLocalRoleLinkService;
+
+    public UserDomainObject verifyUser( String login, String password ) {
+        return null;
+    }
+    
+    public UserDomainObject verifyUser(String clientPrincipalName) {
+        return null;
+    }
+
+    public void parsePage(ParserParameters paramsToParse, Writer out) throws IOException {
+
+    }
+
+    public void incrementSessionCounter() {
+
+    }
+
+    // set session counter
+    public void setSessionCounter( int value ) {
+
+    }
+
+    // set  session counter date
+    public void setSessionCounterDate( Date date ) {
+
+    }
+
+    // set  session counter date
+    public Date getSessionCounterDate() {
+        return null;
+    }
+
+    // parsedoc use template
+    public String getAdminTemplate( String adminTemplateName, UserDomainObject user, List tagsWithReplacements ) {
+        return null;
+    }
+
+    // parseExternaldoc use template
+    public String getTemplateFromDirectory( String adminTemplateName, UserDomainObject user, List variables,
+                                            String directory ) {
+        return null;
+    }
+
+    // get doctype
+    public int getDocType( int meta_id ) {
+        return 0;
+    }
+
+    public SystemData getSystemData() {
+        return null;
+    }
+
+    public void setSystemData( SystemData sd ) {
+
+    }
+
+    public String[][] getAllDocumentTypes( String langPrefixStr ) {
+        return new String[0][];
+    }
+
+    public int getSessionCounter() {
+        return 0;
+    }
+
+    public String getSessionCounterDateAsString() {
+        return null;
+    }
+
+    public void updateMainLog( String logMessage ) {
+
+    }
+
+    public DocumentMapper getDocumentMapper() {
+        return documentMapper;
+    }
+
+    public ImcmsAuthenticatorAndUserAndRoleMapper getImcmsAuthenticatorAndUserAndRoleMapper() {
+        return imcmsAuthenticatorAndUserAndRoleMapper ;
+    }
+
+    public TemplateMapper getTemplateMapper() {
+        return templateMapper;
+    }
+
+    public SMTP getSMTP() {
+        return null;
+    }
+
+    public File getIncludePath() {
+        return null;
+    }
+
+    public Collator getDefaultLanguageCollator() {
+        return null;
+    }
+
+    public VelocityEngine getVelocityEngine( UserDomainObject user ) {
+        return null;
+    }
+
+    public VelocityContext getVelocityContext( UserDomainObject user ) {
+        return null;
+    }
+
+    public Config getConfig() {
+        return this.config;
+    }
+
+    public Database getDatabase() {
+        return database ;
+    }
+
+    public CategoryMapper getCategoryMapper() {
+        return categoryMapper ;
+    }
+
+    public LanguageMapper getLanguageMapper() {
+        return languageMapper;
+    }
+    
+    public ImageCacheMapper getImageCacheMapper() {
+    	return imageCacheMapper;
+    }
+
+    public CachingFileLoader getFileCache() {
+        return null ;
+    }
+
+    public RoleGetter getRoleGetter() {
+        return roleGetter ;
+    }
+
+    public ProcedureExecutor getProcedureExecutor() {
+        return procedureExecutor;
+    }
+
+    public UserDomainObject verifyUserByIpOrDefault(String remoteAddr) {
+        return null;
+    }
+
+    public LocalizedMessageProvider getLocalizedMessageProvider() {
+        throw new NotImplementedException("imcode.server.MockImcmsServices.getLocalizedMessageFactory");
+    }
+
+    public KeyStore getKeyStore() {
+        return keyStore;
+    }
+    
+    public KerberosLoginService getKerberosLoginService() {
+        return kerberosLoginService;
+    }
+
+    public AuthenticationProviderService getAuthenticationProviderService() {
+        return authenticationProviderService;
+    }
+
+    public void setAuthenticationProviderService(AuthenticationProviderService authenticationProviderService) {
+        this.authenticationProviderService = authenticationProviderService;
+    }
+
+    @Override
+    public ExternalToLocalRoleLinkComponent getExternalToLocalRoleLinkComponent() {
+        return externalToLocalRoleLinkComponent;
+    }
+
+    @Override
+    public DefaultExternalToLocalRoleLinkService getExternalToLocalRoleLinkService() {
+        return defaultExternalToLocalRoleLinkService;
+    }
+
+	@Override
+	public DocumentExportService getDocumentExportService() {
+		return documentExportService;
+	}
+
+	public void setImcmsAuthenticatorAndUserAndRoleMapper(
+            ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper ) {
+        this.imcmsAuthenticatorAndUserAndRoleMapper = imcmsAuthenticatorAndUserAndRoleMapper;
+    }
+
+    public void setDatabase( Database database ) {
+        this.database = database;
+    }
+
+    public void setKeyStore( KeyStore keyStore ) {
+        this.keyStore = keyStore;
+    }
+
+    public void setTemplateMapper( TemplateMapper templateMapper ) {
+        this.templateMapper = templateMapper;
+    }
+
+	public void setDocumentExportService(DocumentExportService documentExportService){
+		this.documentExportService = documentExportService;
+	}
+
+    public void setDocumentMapper( DocumentMapper documentMapper ) {
+        this.documentMapper = documentMapper;
+    }
+
+    public void setCategoryMapper(CategoryMapper categoryMapper) {
+        this.categoryMapper = categoryMapper;
+    }
+
+    public void setLanguageMapper(LanguageMapper languageMapper) {
+        this.languageMapper = languageMapper;
+    }
+
+    public void setRoleGetter(RoleGetter roleGetter) {
+        this.roleGetter = roleGetter;
+    }
+
+    public void setProcedureExecutor(ProcedureExecutor procedureExecutor) {
+        this.procedureExecutor = procedureExecutor;
+    }
+    
+    public void setImageCacheMapper(ImageCacheMapper mapper) {
+        this.imageCacheMapper = mapper;
+    }
+    
+    public void setKerberosLoginService(KerberosLoginService kerberosLoginService) {
+        this.kerberosLoginService = kerberosLoginService;
+    }
+}
diff --git a/server/src/imcode/server/TestPhaseQueryFixingDocumentIndex.java b/src/test/java/imcode/server/TestPhaseQueryFixingDocumentIndex.java
similarity index 100%
rename from server/src/imcode/server/TestPhaseQueryFixingDocumentIndex.java
rename to src/test/java/imcode/server/TestPhaseQueryFixingDocumentIndex.java
diff --git a/src/test/java/imcode/server/XMLConfigTest.java b/src/test/java/imcode/server/XMLConfigTest.java
new file mode 100644
index 0000000000..c6a397e301
--- /dev/null
+++ b/src/test/java/imcode/server/XMLConfigTest.java
@@ -0,0 +1,24 @@
+package imcode.server;
+
+import com.google.common.collect.Sets;
+import imcode.server.user.ldap.MappedRoles;
+import org.junit.Test;
+
+public class XMLConfigTest {
+
+    @Test
+    public void constructor() throws Exception {
+        String configFilePath = ClassLoader.getSystemClassLoader().getResource("test-server.xml").getFile();
+        XMLConfig config = new XMLConfig(configFilePath);
+
+        MappedRoles mappedRoles = config.getLdapMappedRoles();
+        System.out.println(mappedRoles.roles());
+        System.out.println(mappedRoles.rolesToAttributes().attributesNames());
+        System.out.println(mappedRoles.rolesToAdGroups().roles());
+        System.out.println(mappedRoles.rolesToAttributes().role("title", "manager"));
+        System.out.println(mappedRoles.rolesToAdGroups().roles(Sets.newHashSet(
+                "CN=imGrpGlobalSec,CN=Users,DC=d01,DC=imcode,DC=com",
+                "CN=imGrpUniversalSec,CN=Users,DC=d01,DC=imcode,DC=com",
+                "CN=imGrpUniversalSec,CN=Users,DC=d01,DC=imcode,DC=com")));
+    }
+}
diff --git a/server/src/imcode/server/document/TestDocumentDomainObject.java b/src/test/java/imcode/server/document/TestDocumentDomainObject.java
similarity index 98%
rename from server/src/imcode/server/document/TestDocumentDomainObject.java
rename to src/test/java/imcode/server/document/TestDocumentDomainObject.java
index 9c249d4a35..4a4f9cdffb 100644
--- a/server/src/imcode/server/document/TestDocumentDomainObject.java
+++ b/src/test/java/imcode/server/document/TestDocumentDomainObject.java
@@ -87,6 +87,6 @@ public void testGetDocumentProperties() throws Exception {
         assertEquals(document.getProperty("imcms:document:foo"), "baa");
         assertNotSame(document.getProperty("imcms:document:fide"), "hide");
         assertNull(document.getProperty("hej"));
-        assertTrue(document.getProperties().size()==3);
+        assertEquals(3, document.getProperties().size());
     }
 }
\ No newline at end of file
diff --git a/server/src/imcode/server/document/TestDocumentPermissionSetDomainObject.java b/src/test/java/imcode/server/document/TestDocumentPermissionSetDomainObject.java
similarity index 100%
rename from server/src/imcode/server/document/TestDocumentPermissionSetDomainObject.java
rename to src/test/java/imcode/server/document/TestDocumentPermissionSetDomainObject.java
diff --git a/server/src/imcode/server/document/TestUrlDocumentDomainObject.java b/src/test/java/imcode/server/document/TestUrlDocumentDomainObject.java
similarity index 100%
rename from server/src/imcode/server/document/TestUrlDocumentDomainObject.java
rename to src/test/java/imcode/server/document/TestUrlDocumentDomainObject.java
diff --git a/server/src/imcode/server/document/textdocument/TestMenuDomainObject.java b/src/test/java/imcode/server/document/textdocument/TestMenuDomainObject.java
similarity index 93%
rename from server/src/imcode/server/document/textdocument/TestMenuDomainObject.java
rename to src/test/java/imcode/server/document/textdocument/TestMenuDomainObject.java
index f598772a3e..d6ea1fdd75 100644
--- a/server/src/imcode/server/document/textdocument/TestMenuDomainObject.java
+++ b/src/test/java/imcode/server/document/textdocument/TestMenuDomainObject.java
@@ -1,19 +1,16 @@
 package imcode.server.document.textdocument;
 
-import imcode.server.document.DocumentDomainObject;
 import com.imcode.imcms.mapping.DocumentGetter;
+import com.imcode.imcms.mapping.MapDocumentGetter;
+import imcode.server.document.DocumentDomainObject;
 import imcode.server.document.GetterDocumentReference;
 import imcode.server.user.RoleId;
 import imcode.server.user.UserDomainObject;
 import junit.framework.TestCase;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.varia.NullAppender;
 
 import java.util.List;
 import java.util.Set;
 
-import com.imcode.imcms.mapping.MapDocumentGetter;
-
 public class TestMenuDomainObject extends TestCase {
 
     private MenuDomainObject menu;
@@ -21,7 +18,6 @@ public class TestMenuDomainObject extends TestCase {
 
     protected void setUp() throws Exception {
         super.setUp();
-        BasicConfigurator.configure(new NullAppender());
         user = new UserDomainObject();
         user.addRoleId( RoleId.SUPERADMIN );
         menu = new MenuDomainObject() ;
diff --git a/server/src/imcode/server/document/textdocument/TestTreeSortKeyDomainObject.java b/src/test/java/imcode/server/document/textdocument/TestTreeSortKeyDomainObject.java
similarity index 100%
rename from server/src/imcode/server/document/textdocument/TestTreeSortKeyDomainObject.java
rename to src/test/java/imcode/server/document/textdocument/TestTreeSortKeyDomainObject.java
diff --git a/server/src/imcode/server/parser/MockParserParameters.java b/src/test/java/imcode/server/parser/MockParserParameters.java
similarity index 100%
rename from server/src/imcode/server/parser/MockParserParameters.java
rename to src/test/java/imcode/server/parser/MockParserParameters.java
diff --git a/server/src/imcode/server/parser/TestMenuParser.java b/src/test/java/imcode/server/parser/TestMenuParser.java
similarity index 94%
rename from server/src/imcode/server/parser/TestMenuParser.java
rename to src/test/java/imcode/server/parser/TestMenuParser.java
index 21a924a11b..c9b7796ffc 100644
--- a/server/src/imcode/server/parser/TestMenuParser.java
+++ b/src/test/java/imcode/server/parser/TestMenuParser.java
@@ -59,19 +59,19 @@ public void testAdminCantSeeUnpublishedDocumentWhenInMenuModeButNotEditingMenu()
 
     public void testAdminCantSeeUnpublishedDocumentWhenNotInMenuModeButEditingMenu() {
         user.addRoleId( editRole );
-        parserParameters.setEditingMenuIndex( new Integer( MENU_INDEX ) );
+        parserParameters.setEditingMenuIndex(MENU_INDEX);
         assertCanNotSeeDocumentInMenu();
     }
 
     public void testAdminCanSeeUnpublishedDocumentWhenEditing() {
         user.addRoleId( editRole );
-        parserParameters.setEditingMenuIndex( new Integer( MENU_INDEX ) );
+        parserParameters.setEditingMenuIndex(MENU_INDEX);
         parserParameters.setMenuMode(true) ;
         assertCanSeeDocumentInMenuWhenEditingMenu();
     }
 
     public void testUserCantSeeUnpublishedDocumentInMenuWhenEditing() throws Exception {
-        parserParameters.setEditingMenuIndex( new Integer( MENU_INDEX ) );
+        parserParameters.setEditingMenuIndex(MENU_INDEX);
         parserParameters.setMenuMode( true );
         assertCanNotSeeDocumentInMenu();
     }
diff --git a/server/src/imcode/server/user/MockRoleGetter.java b/src/test/java/imcode/server/user/MockRoleGetter.java
similarity index 100%
rename from server/src/imcode/server/user/MockRoleGetter.java
rename to src/test/java/imcode/server/user/MockRoleGetter.java
diff --git a/server/src/imcode/server/user/TestImcmsAuthenticatorAndUserAndRoleMapper.java b/src/test/java/imcode/server/user/TestImcmsAuthenticatorAndUserAndRoleMapper.java
similarity index 79%
rename from server/src/imcode/server/user/TestImcmsAuthenticatorAndUserAndRoleMapper.java
rename to src/test/java/imcode/server/user/TestImcmsAuthenticatorAndUserAndRoleMapper.java
index 91ffd849bf..a0d57e520c 100644
--- a/server/src/imcode/server/user/TestImcmsAuthenticatorAndUserAndRoleMapper.java
+++ b/src/test/java/imcode/server/user/TestImcmsAuthenticatorAndUserAndRoleMapper.java
@@ -1,6 +1,7 @@
 package imcode.server.user;
 
 import com.imcode.db.mock.MockDatabase;
+import com.imcode.imcms.servlet.LoginPasswordManager;
 import imcode.server.MockImcmsServices;
 import junit.framework.TestCase;
 
@@ -8,10 +9,11 @@ public class TestImcmsAuthenticatorAndUserAndRoleMapper extends TestCase {
 
     public void testAddExternalUser() throws UserAlreadyExistsException {
         MockDatabase database = new MockDatabase();
-        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableWithParameterSqlCallPredicate("users", "Test"), new Integer(1));
+        database.addExpectedSqlCall(new MockDatabase.InsertIntoTableWithParameterSqlCallPredicate("users", "Test"), 1);
         MockImcmsServices mockImcmsServices = new MockImcmsServices();
         mockImcmsServices.setDatabase(database);
-        ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper = new ImcmsAuthenticatorAndUserAndRoleMapper(mockImcmsServices);
+        LoginPasswordManager userLoginPasswordManager = new LoginPasswordManager();
+        ImcmsAuthenticatorAndUserAndRoleMapper imcmsAuthenticatorAndUserAndRoleMapper = new ImcmsAuthenticatorAndUserAndRoleMapper(mockImcmsServices, userLoginPasswordManager);
         UserDomainObject user = new UserDomainObject();
         user.setLoginName( "Test" );
         user.setImcmsExternal( true );
diff --git a/server/src/imcode/server/user/TestRoleDomainObject.java b/src/test/java/imcode/server/user/TestRoleDomainObject.java
similarity index 100%
rename from server/src/imcode/server/user/TestRoleDomainObject.java
rename to src/test/java/imcode/server/user/TestRoleDomainObject.java
diff --git a/server/src/imcode/server/user/TestUserDomainObject.java b/src/test/java/imcode/server/user/TestUserDomainObject.java
similarity index 96%
rename from server/src/imcode/server/user/TestUserDomainObject.java
rename to src/test/java/imcode/server/user/TestUserDomainObject.java
index 92e98c1d03..4d0d99f661 100644
--- a/server/src/imcode/server/user/TestUserDomainObject.java
+++ b/src/test/java/imcode/server/user/TestUserDomainObject.java
@@ -16,7 +16,7 @@ protected void setUp() throws Exception {
 
     public void testClone() {
         UserDomainObject clone = (UserDomainObject)user.clone() ;
-        assertNotSame( "Roles cloned", clone.roleIds, user.roleIds);
+        assertNotSame("Roles cloned", clone.getRoleIds(), user.getRoleIds());
         assertNotSame( "Useradmin roles cloned", clone.userAdminRoleIds, user.userAdminRoleIds);
     }
 
diff --git a/server/src/imcode/util/TestCompositeList.java b/src/test/java/imcode/util/TestCompositeList.java
similarity index 100%
rename from server/src/imcode/util/TestCompositeList.java
rename to src/test/java/imcode/util/TestCompositeList.java
diff --git a/server/src/imcode/util/TestUtility.java b/src/test/java/imcode/util/TestUtility.java
similarity index 85%
rename from server/src/imcode/util/TestUtility.java
rename to src/test/java/imcode/util/TestUtility.java
index a2449a5bd2..0a172cf7cb 100644
--- a/server/src/imcode/util/TestUtility.java
+++ b/src/test/java/imcode/util/TestUtility.java
@@ -12,12 +12,11 @@ public void testCreateQueryStringFromParameterMultiMap() {
         assertEquals( "foo=bar", Utility.createQueryStringFromParameterMultiMap( map1 ) ) ;
         map1.put( "foo", "baz" ) ;
         assertEquals( "foo=bar&foo=baz", Utility.createQueryStringFromParameterMultiMap( map1 ) );
-        map1.put( "bar", "foo" ) ;
-        assertEquals( "foo=bar&foo=baz&bar=foo", Utility.createQueryStringFromParameterMultiMap( map1 ) );
     }
 
     public void testIsValidEmail() throws Exception {
-        assertTrue(Utility.isValidEmail( "test@test.test") ) ;
+        assertTrue(Utility.isValidEmail( "test@test.se") ) ;
+        assertTrue(Utility.isValidEmail( "test@imcode.se.org.com") ) ;
         assertFalse( Utility.isValidEmail( "test" ) );
     }
 
diff --git a/server/src/imcode/util/io/TestFileUtility.java b/src/test/java/imcode/util/io/TestFileUtility.java
similarity index 86%
rename from server/src/imcode/util/io/TestFileUtility.java
rename to src/test/java/imcode/util/io/TestFileUtility.java
index 7f6bd2b91c..d4242d4828 100644
--- a/server/src/imcode/util/io/TestFileUtility.java
+++ b/src/test/java/imcode/util/io/TestFileUtility.java
@@ -31,17 +31,17 @@ protected void tearDown() throws Exception {
 
     public void testUnescapeFilename() throws Exception {
         assertEquals("Space", " ",FileUtility.unescapeFilename( "_0020")) ;
-        assertEquals( "ÅÄÖåäö", "ÅÄÖåäö", FileUtility.unescapeFilename( "_00c5_00c4_00d6_00e5_00e4_00f6" ) );
+        assertEquals( "ÅÄÖåäö", "ÅÄÖåäö", FileUtility.unescapeFilename( "_00c5_00c4_00d6_00e5_00e4_00f6" ) );
     }
 
     public void testEscapeFilename() throws Exception {
         assertEquals( "Space", "_0020", FileUtility.escapeFilename( " " ) );
-        assertEquals( "ÅÄÖåäö", "_00c5_00c4_00d6_00e5_00e4_00f6", FileUtility.escapeFilename( "ÅÄÖåäö" ) );
+        assertEquals( "ÅÄÖåäö", "_00c5_00c4_00d6_00e5_00e4_00f6", FileUtility.escapeFilename( "ÅÄÖåäö" ) );
     }
 
     public void testEscapes() {
         assertEquals( "Space", " ", FileUtility.unescapeFilename( FileUtility.escapeFilename( " " ) ) );
-        assertEquals( "ÅÄÖ_åäö", "ÅÄÖ_åäö", FileUtility.unescapeFilename( FileUtility.escapeFilename( "ÅÄÖ_åäö" ) ) );
+        assertEquals( "ÅÄÖ_åäö", "ÅÄÖ_åäö", FileUtility.unescapeFilename( FileUtility.escapeFilename( "ÅÄÖ_åäö" ) ) );
     }
 
     public void testDirectoryIsAncestorOfOrEqualTo() throws IOException {
diff --git a/src/test/resources/test-server.xml b/src/test/resources/test-server.xml
new file mode 100644
index 0000000000..8012a78551
--- /dev/null
+++ b/src/test/resources/test-server.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <ldap>
+        <mapped-roles>
+            <!--<role-to-attribute role-name="LDAP-EMERGENCY" attribute-name="phone" attribute-value="112"/>-->
+            <!--<role-to-attribute role-name="LDAP-MANAGER" attribute-name="title" attribute-value="manager"/>-->
+            <!--<role-to-attribute role-name="LDAP-DYNAMIC" attribute-name="dynamicGroupId" attribute-value="514"/>-->
+
+            <!--<role-to-ad-group role-name="imGrpLocSec" group-dn="CN=imGrpLocalSec,CN=Users,DC=d01,DC=imcode,DC=com"/>-->
+            <!--<role-to-ad-group role-name="imGrpGloSec" group-dn="CN=imGrpGlobalSec,CN=Users,DC=d01,DC=imcode,DC=com"/>-->
+            <!--<role-to-ad-group role-name="imGrpUniSec" group-dn="CN=imGrpUniversalSec,CN=Users,DC=d01,DC=imcode,DC=com"/>-->
+            <!--<role-to-ad-group role-name="imGrpLocDist" group-dn="CN=imGrpLocalDistribution,CN=Users,DC=d01,DC=imcode,DC=com"/>-->
+            <!--<role-to-ad-group role-name="imGrpGloDist" group-dn="CN=imGrpGlobalDistribution,CN=Users,DC=d01,DC=imcode,DC=com"/>-->
+            <!--<role-to-ad-group role-name="imGrpUniDist" group-dn="CN=imGrpUniversalDistribution,CN=Users,DC=d01,DC=imcode,DC=com"/>-->
+        </mapped-roles>
+    </ldap>
+</server>
\ No newline at end of file
diff --git a/tools/java/tool9755/lib/log4j-1.2.9.jar b/tools/java/tool9755/lib/log4j-1.2.9.jar
new file mode 100644
index 0000000000..a6568b01a2
Binary files /dev/null and b/tools/java/tool9755/lib/log4j-1.2.9.jar differ
diff --git a/tools/java/tool9755/src/com/imcode/imcms/tools/Issue9755Fixer.java b/tools/java/tool9755/src/com/imcode/imcms/tools/Issue9755Fixer.java
new file mode 100644
index 0000000000..04b1930663
--- /dev/null
+++ b/tools/java/tool9755/src/com/imcode/imcms/tools/Issue9755Fixer.java
@@ -0,0 +1,158 @@
+package com.imcode.imcms.tools;
+
+import java.io.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.regex.*;
+import org.apache.log4j.Logger;
+
+public class Issue9755Fixer {
+
+    private Logger logger = Logger.getLogger(Issue9755Fixer.class);
+
+    private static final String NEW_LINE = System.getProperty("line.separator");
+
+    private Pattern localizationPattern = Pattern.compile("<\\?(.+?)\\?>",
+            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+    private Pattern pagePattern = Pattern.compile("<%@.*page.+?%>",
+            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+
+    private String source;
+    private String destination;
+
+    private static final String[] structureToBeChecked = {
+        "web/imcms/lang/",
+        "web/WEB-INF/templates/lang/admin/",
+    };
+
+    public Issue9755Fixer (String source, String destination){
+        this.source = source;
+        this.destination = destination;
+    }
+
+    public void initialize() throws IllegalArgumentException {
+        for(String path : structureToBeChecked) {
+            File f = new File(source, path);
+            if (!f.exists()) {
+                throw new IllegalArgumentException(
+                    String.format ("The required path '%s' not found. Please, specify the correct source directory.",
+                            f.getAbsolutePath()));
+            }
+        }
+    }
+
+    private void listFilesRecursively(File directory, FileFilter filter, List<File> result) {
+        File[] jspFiles = directory.listFiles(filter);
+        result.addAll(Arrays.asList(jspFiles));
+
+        File[] dirs = directory.listFiles(new FileFilter() {
+            public boolean accept(File pathname) {
+                return pathname.isDirectory();  
+            }
+        });
+        for (File d: dirs)
+            listFilesRecursively(d, filter, result);
+    }
+
+    private String getFileContent(File file) throws IOException {
+        BufferedReader reader = new BufferedReader(new FileReader(file));
+        StringBuffer buffer = new StringBuffer();
+        String line;
+        do {
+            line = reader.readLine();
+            buffer.append(line).append(NEW_LINE);
+        }
+        while (line != null);
+
+        reader.close();
+
+        return buffer.toString();
+    }
+
+    private void saveToDestination(String path, String postDirs, String filename, String content) throws IOException {
+        File target = new File(destination, path);
+        target = new File(target, postDirs);
+        target.mkdirs();
+        File targetFile = new File(target, filename);
+        logger.info("Saving destination '" + targetFile.getAbsolutePath() + "' ...");
+        FileWriter writer = new FileWriter(targetFile);
+        writer.append(content);
+        writer.close();
+    }
+
+    private void processListOfFiles(List<File> list, String root, boolean isJsp) throws IOException {
+        for (File file: list) {
+            String content = getFileContent(file);
+
+            logger.info("Processing file '" + file.getAbsolutePath() + "' ...");
+            Matcher m = localizationPattern.matcher(content);
+
+            StringBuffer contentBuffer = new StringBuffer(content);
+            while (m.find()) {
+                String key = m.group(1).trim();
+                String message = String.format("<fmt:message key=\"%s\"/>", key);
+                logger.debug("Replace '" + contentBuffer.substring(m.start(), m.end()) + "' with '" + message + "'");
+                contentBuffer.replace(m.start(), m.end(), message);
+                m.reset(contentBuffer.toString());
+            }
+
+            m = pagePattern.matcher(contentBuffer.toString());
+            int pageEndIndex = 0;
+            while (m.find()) {
+                pageEndIndex = m.end();
+            }
+
+            logger.debug("Insert <%@taglib prefix=\"fmt\" uri=\"http://java.sun.com/jsp/jstl/fmt\" %>");
+
+            contentBuffer.insert(pageEndIndex,
+                    NEW_LINE + "<%@taglib prefix=\"fmt\" uri=\"http://java.sun.com/jsp/jstl/fmt\" %>" + NEW_LINE);
+
+            if (!isJsp) {
+                contentBuffer.insert(0,
+                        "<%@ page contentType=\"text/html; charset=UTF-8\"%>" + NEW_LINE +
+                        "<%@taglib prefix=\"fmt\" uri=\"http://java.sun.com/jsp/jstl/fmt\" %>" + NEW_LINE);
+            }
+
+            String absolutePath = file.getAbsolutePath().replace('\\', '/');
+            int index = absolutePath.indexOf(root);
+            String filename = absolutePath.substring(index + root.length());
+            String postDirs = filename.replace(file.getName(), "");
+            String fn = file.getName();
+            if (!isJsp) {
+                int dotIndex = fn.lastIndexOf(".");
+                fn = fn.substring(0, dotIndex) + ".jsp";
+            }
+            saveToDestination(root, postDirs, fn, contentBuffer.toString());
+        }
+    }
+
+    public void fixJspPages() throws IOException {
+         List<File> result = new ArrayList<File>();
+         listFilesRecursively(new File (source, structureToBeChecked[0]), new FileFilter() {
+            public boolean accept(File file) {
+                return !file.isDirectory() && file.getName().toLowerCase().endsWith(".jsp");
+            }
+        }, result);
+
+        
+        processListOfFiles(result, structureToBeChecked[0], true);
+    }
+
+    public void fixHtmlTemplates() throws IOException {
+        List<File> result = new ArrayList<File>();
+        listFilesRecursively(new File (source, structureToBeChecked[1]), new FileFilter() {
+            public boolean accept(File file) {
+                String filename = file.getName().toLowerCase();
+                return !file.isDirectory() && (filename.endsWith(".html") ||
+                        filename.endsWith(".htm") || filename.endsWith(".txt"));
+            }
+        }, result);
+
+        processListOfFiles(result, structureToBeChecked[1], false);
+    }
+
+    public void fixReferences() {
+
+    }
+}
diff --git a/tools/java/tool9755/src/com/imcode/imcms/tools/Tool9755Dialog.form b/tools/java/tool9755/src/com/imcode/imcms/tools/Tool9755Dialog.form
new file mode 100644
index 0000000000..edfaf828b0
--- /dev/null
+++ b/tools/java/tool9755/src/com/imcode/imcms/tools/Tool9755Dialog.form
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.imcode.imcms.tools.Tool9755Dialog">
+  <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="10" left="10" bottom="10" right="10"/>
+    <constraints>
+      <xy x="48" y="54" width="520" height="186"/>
+    </constraints>
+    <properties/>
+    <border type="none">
+      <font/>
+    </border>
+    <children>
+      <grid id="94766" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <hspacer id="98af6">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </hspacer>
+          <grid id="9538f" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="true" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="e7465" class="javax.swing.JButton" binding="buttonRun">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Run"/>
+                </properties>
+              </component>
+              <component id="5723f" class="javax.swing.JButton" binding="buttonClose">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Close"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <grid id="e3588" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <grid id="84de3" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none" title="Specify source and destination directories"/>
+            <children>
+              <component id="d4619" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Source directory: "/>
+                </properties>
+              </component>
+              <component id="3e924" class="javax.swing.JTextField" binding="sourceField" default-binding="true">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="150" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <editable value="true"/>
+                  <enabled value="true"/>
+                </properties>
+              </component>
+              <component id="cf5d5" class="javax.swing.JButton" binding="browseSourceButton" default-binding="true">
+                <constraints>
+                  <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Browse"/>
+                </properties>
+              </component>
+              <component id="11b35" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Destination directory:"/>
+                </properties>
+              </component>
+              <component id="41f57" class="javax.swing.JTextField" binding="destinationField" default-binding="true">
+                <constraints>
+                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="150" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <editable value="true"/>
+                  <enabled value="true"/>
+                </properties>
+              </component>
+              <component id="8e76a" class="javax.swing.JButton" binding="browseDestinationButton" default-binding="true">
+                <constraints>
+                  <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <enabled value="true"/>
+                  <text value="Browse"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+          <component id="7a0a8" class="javax.swing.JLabel" binding="statusLabel">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Press run to start conversion. "/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>
diff --git a/tools/java/tool9755/src/com/imcode/imcms/tools/Tool9755Dialog.java b/tools/java/tool9755/src/com/imcode/imcms/tools/Tool9755Dialog.java
new file mode 100644
index 0000000000..d5a72573e1
--- /dev/null
+++ b/tools/java/tool9755/src/com/imcode/imcms/tools/Tool9755Dialog.java
@@ -0,0 +1,122 @@
+package com.imcode.imcms.tools;
+
+import javax.swing.*;
+import java.awt.event.*;
+import java.awt.*;
+
+public class Tool9755Dialog extends JDialog {
+    private JPanel contentPane;
+    private JButton buttonRun;
+    private JButton buttonClose;
+    private JTextField sourceField;
+    private JButton browseSourceButton;
+    private JTextField destinationField;
+    private JButton browseDestinationButton;
+    private JLabel statusLabel;
+    private JFileChooser directoryChooser;
+
+    public Tool9755Dialog() {
+        setTitle("Eliminate build time I18n templates");
+        setPreferredSize(new Dimension(500, 200));
+        setResizable(false);
+        setContentPane(contentPane);
+        setModal(true);
+        getRootPane().setDefaultButton(buttonRun);
+
+        buttonRun.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                onRun();
+            }
+        });
+
+        buttonClose.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                onCancel();
+            }
+        });
+
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent e) {
+                onCancel();
+            }
+        });
+
+        contentPane.registerKeyboardAction(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                onCancel();
+            }
+        }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+
+        browseSourceButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                directoryChooser = new JFileChooser();
+                directoryChooser.setDialogTitle("Select source directory");
+                directoryChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                if (directoryChooser.showDialog(Tool9755Dialog.this, "Select") == JFileChooser.APPROVE_OPTION)
+                {
+                    sourceField.setText(directoryChooser.getSelectedFile().getAbsolutePath());
+                }
+            }
+        });
+
+        browseDestinationButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                directoryChooser = new JFileChooser();
+                directoryChooser.setDialogTitle("Select destination directory");
+                directoryChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                if (directoryChooser.showDialog(Tool9755Dialog.this, "Select") == JFileChooser.APPROVE_OPTION)
+                {
+                    destinationField.setText(directoryChooser.getSelectedFile().getAbsolutePath());
+                }
+            }
+        });
+    }
+
+    private void onRun() {
+        try {
+            String source = sourceField.getText().trim();
+            String destination = destinationField.getText().trim();
+            boolean valid = true;
+            if (source == null || source.length() == 0) {
+                valid = false;
+                JOptionPane.showMessageDialog(this, "The source directory must be selected",
+                       "Validation error", JOptionPane.ERROR_MESSAGE);
+            }
+            else if (destination == null || destination.length() == 0) {
+                valid = false;
+                JOptionPane.showMessageDialog(this, "The destination directory must be selected",
+                       "Validation error", JOptionPane.ERROR_MESSAGE);
+            }
+
+            if (valid) {
+                statusLabel.setText("Migration has beed started");
+                setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+                Issue9755Fixer fixer = new Issue9755Fixer(source, destination);
+                fixer.initialize();
+                fixer.fixJspPages();
+                statusLabel.setText("Migration done!");
+//                fixer.fixHtmlTemplates();
+//                fixer.fixReferences();
+                setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+            }
+        }
+        catch(Throwable t){
+            JOptionPane.showMessageDialog(this, t.getMessage(),
+                       "Aplication error", JOptionPane.ERROR_MESSAGE);
+        }
+
+    }
+
+    private void onCancel() {
+        dispose();
+    }
+
+    public static void main(String[] args) {
+        Tool9755Dialog dialog = new Tool9755Dialog();
+        dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        dialog.pack();
+        dialog.setVisible(true);
+        System.exit(0);
+    }
+}
diff --git a/tools/java/tool9755/src/log4j.xml b/tools/java/tool9755/src/log4j.xml
new file mode 100644
index 0000000000..47165549e1
--- /dev/null
+++ b/tools/java/tool9755/src/log4j.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="US-ASCII" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+    <appender name="file" class="org.apache.log4j.FileAppender">
+        <param name="File" value="tool9755.log" />
+        <param name="Append" value="false" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern"
+                   value="%-4r [%t] %-6p %c %x - %m%n"/>
+        </layout>
+    </appender>
+
+    <root>
+        <priority value ="debug" />
+        <appender-ref ref="file" />
+    </root>
+</log4j:configuration>
\ No newline at end of file
diff --git a/tools/java/tool9755/tool9755.iml b/tools/java/tool9755/tool9755.iml
new file mode 100644
index 0000000000..ecf912f202
--- /dev/null
+++ b/tools/java/tool9755/tool9755.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="lib" level="project" />
+  </component>
+</module>
+
diff --git a/tools/java/tool9755/tool9755.ipr b/tools/java/tool9755/tool9755.ipr
new file mode 100644
index 0000000000..4402c422c4
--- /dev/null
+++ b/tools/java/tool9755/tool9755.ipr
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="AntConfiguration">
+    <defaultAnt bundledAnt="true" />
+  </component>
+  <component name="BuildJarProjectSettings">
+    <option name="BUILD_JARS_ON_MAKE" value="false" />
+  </component>
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS" />
+    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+  </component>
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <option name="DEPLOY_AFTER_MAKE" value="0" />
+    <resourceExtensions>
+      <entry name=".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=".+\.(gif|png|jpeg|jpg)" />
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+      <entry name="?*.ftl" />
+    </wildcardResourcePatterns>
+  </component>
+  <component name="CopyrightManager" default="">
+    <module2copyright />
+  </component>
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="IdProvider" IDEtalkID="A28DB9E34583BAE0933DD0B870E3FBC0" />
+  <component name="InspectionProjectProfileManager">
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <profiles>
+      <profile version="1.0" is_locked="false">
+        <option name="myName" value="Project Default" />
+        <option name="myLocal" value="false" />
+      </profile>
+    </profiles>
+    <list size="0" />
+  </component>
+  <component name="JavacSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="DEPRECATION" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JFileChooser" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+    </group>
+  </component>
+  <component name="ProjectDetails">
+    <option name="projectName" value="tool9755" />
+  </component>
+  <component name="ProjectFileVersion" converted="true" />
+  <component name="ProjectKey">
+    <option name="state" value="project://D:\Omertex\Hillar\imCMS\branches\RB-4\tools\java\tool9755\tool9755.ipr" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/tool9755.iml" filepath="$PROJECT_DIR$/tool9755.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="ResourceManagerContainer">
+    <option name="myResourceBundles">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
+  </component>
+  <component name="RmicSettings">
+    <option name="IS_EANABLED" value="false" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="GENERATE_IIOP_STUBS" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="mySupportsUserInfoFilter" value="true" />
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+  </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
+  <component name="libraryTable">
+    <library name="lib">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.9.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+  </component>
+</project>
+
diff --git a/tools/java/tool9755/tool9755.iws b/tools/java/tool9755/tool9755.iws
new file mode 100644
index 0000000000..705b962855
--- /dev/null
+++ b/tools/java/tool9755/tool9755.iws
@@ -0,0 +1,620 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="ChangeListManager">
+    <list default="true" name="Default" comment="" />
+    <ignored path=".idea/workspace.xml" />
+    <ignored path="tool9755.iws" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="Commander">
+    <leftPanel />
+    <rightPanel />
+    <splitter proportion="0.5" />
+  </component>
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+    <option name="REVERSE_PATCH" value="false" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="DebuggerManager">
+    <breakpoint_any>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="tool9755" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="Issue9755Fixer.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/imcode/imcms/tools/Issue9755Fixer.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="84" column="23" selection-start="2925" selection-end="2925" vertical-scroll-proportion="0.0">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Tool9755Dialog.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/com/imcode/imcms/tools/Tool9755Dialog.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="24" column="12" selection-start="759" selection-end="759" vertical-scroll-proportion="0.8242894">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="JDialog.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/javax/swing/JDialog.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="697" column="72" selection-start="29411" selection-end="29443" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindManager">
+    <FindUsagesManager>
+      <setting name="OPEN_NEW_TAB" value="false" />
+    </FindUsagesManager>
+  </component>
+  <component name="ModuleEditorState">
+    <option name="LAST_EDITED_MODULE_NAME" />
+    <option name="LAST_EDITED_TAB_NAME" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectPane">
+    <subPane>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tools" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Tool9755Dialog" />
+          <option name="myItemType" value="com.intellij.uiDesigner.projectView.FormNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tool9755" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="tools" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="0.5" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <showStructure ProjectPane="false" />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="RunManagerConfig.showSettingsBeforeRunnig" value="true" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="dynamic.classpath" value="false" />
+  </component>
+  <component name="RunManager" selected="Application.Tool9755Dialog">
+    <tempConfiguration default="false" name="Tool9755Dialog" type="Application" factoryName="Application" enabled="false" merge="false" sample_coverage="true" runner="emma">
+      <option name="MAIN_CLASS_NAME" value="com.imcode.imcms.tools.Tool9755Dialog" />
+      <option name="VM_PARAMETERS" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="tool9755" />
+      <envs />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="3143" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method>
+        <option name="Make" value="true" />
+      </method>
+    </tempConfiguration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false" runner="emma">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+    </configuration>
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="Application.Tool9755Dialog" />
+    </list>
+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="StructureViewFactory">
+    <option name="AUTOSCROLL_MODE" value="true" />
+    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
+    <option name="ACTIVE_ACTIONS" value="" />
+  </component>
+  <component name="SvnConfiguration">
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="LAST_MERGED_REVISION" />
+    <option name="UPDATE_RUN_STATUS" value="false" />
+    <option name="MERGE_DRY_RUN" value="false" />
+    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+    <configuration useDefault="true">C:\Documents and Settings\Dima\Application Data\Subversion</configuration>
+    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+    <supportedVersion>125</supportedVersion>
+  </component>
+  <component name="TodoView" selected-index="0">
+    <todo-panel id="selected-file">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="default-changelist">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-4" y="-4" width="1288" height="778" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2289644" sideWeight="0.6576433" order="3" side_tool="false" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32961783" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39968154" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32923076" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.6576433" order="1" side_tool="false" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.6576433" order="0" side_tool="false" />
+      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3312102" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19902913" sideWeight="0.6576433" order="2" side_tool="false" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
+    </layout>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+  <component name="XPathView.XPathProjectComponent">
+    <history />
+    <find-history />
+  </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/javax/swing/JFileChooser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1264" column="33" selection-start="41848" selection-end="41848" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/java/nio/CharBuffer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/java/util/regex/Pattern.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/java/util/regex/Matcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="519" column="19" selection-start="18972" selection-end="18972" vertical-scroll-proportion="0.79635257">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/java/io/File.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/imcode/imcms/tools/Tool9755Dialog.form">
+      <provider selected="true" editor-type-id="ui-designer">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/imcode/imcms/tools/Issue9755Fixer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="84" column="23" selection-start="2925" selection-end="2925" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_10/src.zip!/javax/swing/JDialog.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="697" column="72" selection-start="29411" selection-end="29443" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/imcode/imcms/tools/Tool9755Dialog.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="24" column="12" selection-start="759" selection-end="759" vertical-scroll-proportion="0.8242894">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <option name="states">
+      <map>
+        <entry key="Copyright.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="Errors.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ProjectJDKs.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl>
+                  <option name="proportions">
+                    <list>
+                      <option value="0.2" />
+                    </list>
+                  </option>
+                </SplitterProportionsDataImpl>
+              </option>
+              <option name="lastEditedConfigurable" value="1.6" />
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ScopeChooserConfigurable.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="myStates">
+      <map>
+        <entry key="Copyright.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="Errors.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ProjectJDKs.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl>
+                  <option name="proportions">
+                    <list>
+                      <option value="0.2" />
+                    </list>
+                  </option>
+                </SplitterProportionsDataImpl>
+              </option>
+              <option name="lastEditedConfigurable" value="1.6" />
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ScopeChooserConfigurable.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
+
diff --git a/web/WEB-INF/conf/imcms_eng.properties b/web/WEB-INF/conf/imcms_eng.properties
index 8e7bdfbad4..31000cb28b 100644
--- a/web/WEB-INF/conf/imcms_eng.properties
+++ b/web/WEB-INF/conf/imcms_eng.properties
@@ -4,10 +4,14 @@ error/servlet/AdminDeleteDoc/no_metaid_in_db = The metaid could not be found in
 
 error/servlet/AdminDeleteDoc/no_valid_metaid = The metaid was not correct. Please add a valid metaid.
 
+error/servlet/AdminDeleteDoc/protected_document = It is not allowed to delete this page.
+
 error/servlet/AdminIpAccess/no_session = A session could not be created. Please try again.
 
 error/servlet/AdminIpAccess/vaidate_form_parameters = Values was missing for some requested fields.
 
+error/servlet/AdminIpWhiteList/validate_form_parameters = Wrong values for some required fields.
+
 error/servlet/AdminRoles/new_rolename_missing = You have to fill in an new role name.
 
 error/servlet/AdminRoles/role_missing = You have to select the role to be changed.
@@ -28,7 +32,9 @@ error/servlet/AdminUser/user_have_no_permission = The user has no permission to
 
 error/servlet/global/no_administrator = The user is not an administrator.
 
-error/servlet/images/only_allowed_to_upload_images = You can only upload an image of type gif, jpeg, or png.
+error/servlet/images/only_allowed_to_upload_images = You can only upload an image of type gif, jpeg or png.
+
+error/servlet/images/file_not_image = This file does not seem to be an image.
 
 error/servlet/images/image_file_exists = A file with that name already exists.
 
@@ -40,7 +46,7 @@ error/servlet/AdminManager/parent_must_be_text_document = The document with the
 
 error/template_with_name_exists = There is already a template with that name.
 
-error/password_length = The password must be 4 to 15 characters long.
+error/password_length = The password must be 4 to 250 characters long.
 
 error/passwords_did_not_match = The passwords did not match.
 
@@ -62,6 +68,8 @@ global/back = Back
 
 global/cancel = Cancel
 
+global/close = Close
+
 global/create = Create
 
 global/Created_by = Created by
@@ -70,6 +78,8 @@ global/Publisher = Publisher
 
 global/Page_alias = Page alias
 
+global/Suggest_alias = Suggest
+
 global/Search = Search
 
 global/Reset = Reset
@@ -82,6 +92,8 @@ global/edit = Edit
 
 global/help = Help
 
+global/download = Download
+
 global/imcms_administration = imCMS Administration
 
 global/Name = Name
@@ -92,6 +104,10 @@ global/remove = Remove
 
 global/save = Save
 
+global/export = Export
+
+global/exclude_exported = Exclude exported
+
 global/OK = OK
 
 global/select = Select
@@ -104,6 +120,10 @@ global/message = Message
 
 global/modified = Modified
 
+global/created = Created
+
+global/new = New
+
 global/Dates = Dates
 
 global/Copy = Copy
@@ -112,6 +132,20 @@ global/addToRight = Add &raquo;
 
 global/removeToLeft = &laquo; Remove
 
+global/AdvancedSettings = Advanced settings
+
+scripts/imcms4_admin_script.js.jsp/context_menu/open_normal = Open text edit
+
+scripts/imcms4_admin_script.js.jsp/context_menu/open_inline = Open inline edit
+
+scripts/imcms4_admin_script.js.jsp/context_menu/use_inline = Use inline editing (DblClick)
+
+scripts/imcms4_admin_script.js.jsp/context_menu/use_inline_formatted = Use inline editing (formatted)
+
+scripts/imcms4_admin_script.js.jsp/context_menu/use_width = Use width
+
+scripts/imcms4_admin_script.js.jsp/context_menu/show_help = Show help about this
+
 edit/link/dialog/title = Edit link
 
 edit/link/href = Link:
@@ -120,6 +154,14 @@ edit/link/title = Popup text:
 
 edit/link/target = Open in:
 
+edit/link/cssClass = CSS class:
+
+edit/link/cssStyle = CSS style:
+
+edit/link/otherParams = Other parameters:
+
+edit/link/otherParamsExample = Eg: onclick=&quot;openEvent()&quot; - Approved parameters:
+
 document_type/name/text = Textpage
 
 document_type/name/url = External link
@@ -150,6 +192,16 @@ imcms/lang/jsp/document_list.jsp/heading_child_documents = Child documents
 
 imcms/lang/jsp/document_list.jsp/title = List documents
 
+imcms/lang/jsp/export/export_document_list.jsp/title = Export documents
+
+imcms/lang/jsp/export/export_document_list.jsp/skip_exported = Skip exported
+
+imcms/lang/jsp/export/export_document_list.jsp/export_images = Export images
+
+imcms/lang/jsp/export/export_document_list.jsp/export_files = Export files
+
+imcms/lang/jsp/export/export_summary.jsp/title = Export summary
+
 imcms/lang/jsp/document_list.jsp/1003 = List between:
 
 imcms/lang/jsp/document_list.jsp/1004 = &#8211;
@@ -208,10 +260,10 @@ install/htdocs/imcms/html/link_editor.jsp/19 = Other frame
 
 install/htdocs/imcms/html/link_editor.jsp/21/1 = Write number!
 
-install/htdocs/imcms/html/link_editor.jsp/22 = Ev. CSS-class:
-
 install/htdocs/imcms/html/link_editor.jsp/25/1 = Copy this code and paste it into position!
 
+install/htdocs/imcms/html/link_editor.jsp/search/title = Search documents in imCMS
+
 install/htdocs/imcms/html/link_editor.jsp/1001 = Show link in:
 
 install/htdocs/imcms/html/link_editor.jsp/1002 = URL, address<br>\n\
@@ -924,6 +976,8 @@ install/htdocs/sv/jsp/category_admin/multi_choice = Multi select
 
 install/htdocs/sv/jsp/category_admin/inherited = Inherited to new documents
 
+install/htdocs/sv/jsp/category_admin/image_archive = Used by image archive
+
 install/htdocs/sv/jsp/category_admin/remove_category = Remove category
 
 install/htdocs/sv/jsp/category_admin/remove_category_type = Remove category type
@@ -1243,6 +1297,8 @@ install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/7 = #-tags
 
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/8 = other
 
+install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/9 = Now there's support for indent/outdent with [Tab] / [Shift] + [Tab] in some browsers. Even over multiple rows.
+
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2001 = Search!
 
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2002 = Save!
@@ -1297,6 +1353,8 @@ install/htdocs/sv/jsp/ImageBrowse.html/2006 = Preview
 
 install/htdocs/sv/jsp/ImageBrowse.html/2007 = Cancel
 
+install/htdocs/sv/jsp/ImageBrowse.html/No_files = No files
+
 install/htdocs/sv/jsp/internalerrorpage.jsp/1 = Error page
 
 install/htdocs/sv/jsp/internalerrorpage.jsp/2 = An internal error has occured.
@@ -1310,13 +1368,23 @@ install/htdocs/sv/jsp/internalerrorpage.jsp/4 = If it did not work out on your s
 
 install/htdocs/sv/jsp/internalerrorpage.jsp/5 = /The development team.
 
-install/htdocs/sv/jsp/internalerrorpage.jsp/6 = Internal error:
+install/htdocs/sv/jsp/internalerrorpage.jsp/6 = Internal error id:
 
-install/htdocs/sv/jsp/internalerrorpage.jsp/7 = Error code:
+install/htdocs/sv/jsp/internalerrorpage.jsp/7 = Error cause:
 
 install/htdocs/sv/jsp/internalerrorpage.jsp/8 = Error message:
 
-install/htdocs/sv/jsp/internalerrorpage.jsp/exception = Exception:
+install/htdocs/sv/jsp/internalerrorpage.jsp/9 = Error placement:
+
+install/htdocs/sv/jsp/internalerrorpage.jsp/10 = Show (hide) details
+
+install/htdocs/sv/jsp/internalerrorpage.jsp/11 = Error url:
+
+install/htdocs/sv/jsp/internalerrorpage.jsp/12 = Message:
+
+install/htdocs/sv/jsp/internalerrorpage.jsp/13 = Cause:
+
+install/htdocs/sv/jsp/internalerrorpage.jsp/14 = Stack trace:
 
 install/htdocs/sv/jsp/no_category_type_by_that_name.jsp/1 = Unvalid category name
 
@@ -1324,20 +1392,20 @@ install/htdocs/sv/jsp/no_category_type_by_that_name.jsp/2/1 = There is no catego
 
 start_document/headline = Start page
 
-start_document/text1 = <h3>Welcome to imCMS</h3>
-
-start_document/text2 = <a href="<?imcms:contextpath?>/login/" title="Link to login-page"><b>Log in!</b></a><br><br><br>\
-                                <a href="<?imcms:contextpath?>/servlet/SearchDocuments" target="_blank" title="Link to search-page"><b>Search-page</b></a><br>\
-                                Opens in new window.<br><br>\
-                                <a href="@documentationwebappurl@/" target="_blank" title="Link to documentation-site"><b>Documentation</b></a><br>\
-                                External site, opens in new window.<br><br>\
-                                <a href="http://www.imcms.net" target="_blank" title="Link to www.imcms.net"><b>More about imCMS</b></a><br>\
-                                imCMS Product-site. External site, opens in new window.<br><br>\
-                                <a href="<?imcms:contextpath?>/imcms/docs/" target="_blank" title="Link to included documentation."><b>Included documentation.</b></a><br>\
-                                For administrators and developers, in english. Opens in new window.<br><br>\
-                                <a href="<?imcms:contextpath?>/imcms/docs/apisamples/" target="_blank" title="Link to API-samples"><b>API examples</b></a><br>\
-                                Only for developers, in english. Opens in new window.<br>\
-                                Note! Only to be used in test environment - not sites for public use.
+start_document/text1 = Welcome to imCMS
+
+start_document/text2 = <p><a href="<?imcms:contextpath?>/login/" title="Link to login-page"><b>Log in!</b></a></p>\
+<p><a href="<?imcms:contextpath?>/servlet/SearchDocuments" target="_blank" title="Link to search-page"><b>Search-page</b></a><br/>\
+Opens in new window.</p>\
+<p><a href="@documentationwebappurl@/" target="_blank" title="Link to documentation-site"><b>Documentation</b></a><br/>\
+External site, opens in new window.</p>\
+<p><a href="http://www.imcms.net" target="_blank" title="Link to www.imcms.net"><b>More about imCMS</b></a><br/>\
+imCMS Product-site. External site, opens in new window.</p>\
+<p><a href="<?imcms:contextpath?>/imcms/docs/" target="_blank" title="Link to included documentation."><b>Included documentation.</b></a><br/>\
+For administrators and developers, in english. Opens in new window.</p>\
+<p><a href="<?imcms:contextpath?>/imcms/docs/apisamples/" target="_blank" title="Link to API-samples"><b>API examples</b></a><br/>\
+Only for developers, in english. Opens in new window.<br/>\
+Note! Only to be used in test environment - not sites for public use.</p>
 
 templates/Back = Back
 
@@ -1349,6 +1417,10 @@ templates/global/pageinfo/ShowLinkToUnuthorizedUser = Show link to unauthorized
 
 templates/login/access_denied.html/4 = Your username or password is not correct.<br>Please try again.
 
+templates/login/access_denied.html/5 = There is no valid mobil phone number in order to complete the login procedure. <br>Please contact the administrator.
+
+templates/login/access_denied.html/6 = The code you have entered is not correct, a new code has been sent to you.
+
 templates/login/TooManySessions = You have been logged out!<br>\
     An other user with the same identity and password has logged in from another computer or browser.<br>\
     The system does not allow 2 simultanous user with the same identity.<br><br>\
@@ -1364,6 +1436,10 @@ templates/login/index.html/5 = Username
 
 templates/login/index.html/6 = Password
 
+templates/login/index.html/7 = Login code
+
+templates/login/index.html/8 = Write the login code that have been sent to your mobile device<br>
+
 templates/login/index.html/1001 = <br>\n\
 		\t&nbsp; &#8226; Click [Log&nbsp;in] to enter the system.<br>\n\
 		\t&nbsp; &#8226; Click [Edit profile] to edit your personal data/properties.
@@ -1380,6 +1456,10 @@ templates/login/index.html/2005 = Log in
 
 templates/login/index.html/2006 = Edit profile
 
+templates/login/index.html/2008 = Default
+
+templates/login/index.html/2009 = BankId
+
 templates/login/logged_out.html/1 = You have been logged out
 
 templates/login/logged_out.html/2 = Message
@@ -1397,6 +1477,8 @@ templates/Startpage = Startpage
 
 web/imcms/lang/jsp/admin/adminbuttons.jsp/title_id = MetaId of the document
 
+web/imcms/lang/jsp/admin/adminbuttons.jsp/title_alias = Alias of the document
+
 web/imcms/lang/jsp/admin/adminbuttons.jsp/title_type = Type of the document
 
 templates/sv/adminbuttons/adminbutton_1.html/2001 = Document info
@@ -1503,6 +1585,8 @@ templates/sv/AdminChangeUser.htm/2006 = Edit
 
 templates/sv/AdminChangeUser.htm/2007 = Select
 
+templates/sv/AdminChangeUser.htm/2008 = Archive user
+
 templates/sv/AdminChangeUser.htm/3001 = You have to select a user first!
 
 templates/sv/AdminDeleteDoc.htm/4 = Meta-id:
@@ -1541,6 +1625,16 @@ templates/sv/AdminIpAccess_Add.htm/6 = 2. From IP:
 templates/sv/AdminIpAccess_Add.htm/7 = 3. To IP:
 
 templates/sv/AdminIpAccess_Add.htm/8 = Note! IP no must be written as e.g: 192.168.98.54
+templates/sv/AdminIpAccess_Add.htm/9=Description
+
+templates/sv/AdminIpWhiteList_Add.jsp/1 = Add IP whitelist address
+
+templates/sv/AdminIpWhiteList_Add.jsp/2 = Select \n\
+		\t\tuser role and IP number (or range of numbers) for white list.
+
+templates/sv/AdminIpWhiteList_Add.jsp/3 = 1. Select role:
+templates/sv/AdminIpWhiteList.jsp/4=Add the IP numbers from where one should be able to login. Note that Superadmin must be defined separately.\n\
+   If no IP numbers are defined, the white list is not active, i.e. everybody can login no matter their IP number.
 
 templates/sv/AdminIpAccess_Add.htm/2001 = Save
 
@@ -1551,11 +1645,13 @@ templates/sv/AdminIpAccess_Delete2.htm/1 = Administer IP Access
 templates/sv/AdminIpAccess_Delete2.htm/3 = You are removing one or several IP accesses. Continue?
 
 templates/sv/AdminIpAccess_Delete2.htm/2001 = OK
-
-templates/sv/AdminIpAccess.htm/3 = Users from a specific IP number or an intervall of numbers \n\
+templates/sv/AdminIpAccess.htm/3=Users from a specific IP number or an intervall of numbers \n\
 		\t\tare given direct access to the system (so that the user \n\
 		\t\tdoes not have to log in).
 
+templates/sv/AdminIpAccess.htm/4=Your IP:
+templates/sv/AdminIpAccess.htm/5=Login must be done via https.
+
 templates/sv/AdminIpAccess.htm/2001 = Add
 
 templates/sv/AdminIpAccess.htm/2002 = Update selected
@@ -1572,6 +1668,16 @@ templates/sv/AdminIpAccess.htm/3003 = IP range from
 
 templates/sv/AdminIpAccess.htm/3004 = IP range to
 
+templates/sv/AdminIpWhiteList.jsp/1 = Registered IP whitelist addresses
+
+templates/sv/AdminIpWhiteList.jsp/2 = Role
+templates/sv/AdminIpWhiteList.jsp/3=Description
+
+# user role and IP white list feature
+# since 4.2.29
+accessDeniedForUserIP.title = Access denied.
+accessDeniedForUserIP.message = You are not permitted to login. Please contact the system administrator.
+
 templates/sv/AdminManager_adminTask_element.htm/1 = -- Select Administrative Task --
 
 templates/sv/AdminManager_adminTask_element.htm/2 = Users
@@ -1580,9 +1686,11 @@ templates/sv/AdminManager_adminTask_element.htm/3 = Sections
 
 templates/sv/AdminManager_adminTask_element.htm/5 = File manager
 
+templates/sv/AdminManager_adminTask_element.htm/6 = IP whitelist
+
 templates/sv/AdminManager_adminTask_element.htm/7 = IP accesses
 
-templates/sv/AdminManager_adminTask_element.htm/10 = Templates
+templates/sv/AdminManager_adminTask_element.htm/10 = Templates Group
 
 templates/sv/AdminManager_adminTask_element.htm/11 = Roles
 
@@ -1593,6 +1701,7 @@ templates/sv/AdminManager_adminTask_element.htm/14 = System properties
 templates/sv/AdminManager_adminTask_element.htm/15 = Remove page
 
 templates/sv/AdminManager_adminTask_element.htm/17 = Categories
+templates/sv/AdminManager_adminTask_element.htm/18 = Export docs
 
 templates/sv/AdminManager_adminTask_element.htm/AdminSearchTerms = Search terms
 
@@ -1641,6 +1750,8 @@ templates/sv/AdminRoles_Rename.htm/3 = Edit name for role
 templates/sv/AdminRoles_roles.htm/1 = Edit roles
 
 templates/sv/AdminRoles_roles.htm/2 = Current roles:
+templates/sv/AdminRoles_external_roles.htm/3=Azure external roles:
+templates/sv/AdminRoles_select_roles.htm/1=Select values
 
 templates/sv/AdminRoles_roles.htm/2001 = Add new role
 
@@ -1666,6 +1777,12 @@ templates/sv/AdminSystemMessage.htm/21 = E-mail:
 
 templates/sv/AdminSystemMessage.htm/22 = Web master
 
+# @since 4.0.17
+templates/sv/AdminSystemMessage.htm/23 = Login password reset
+
+templates/sv/AdminSystemMessage.htm/24 = Link expiration interval (in hours)
+# end of @since 4.0.17
+
 templates/sv/AdminSystemMessage.htm/2001 = Change
 
 templates/sv/AdminUserResp_admin_part.htm/2 = Activated
@@ -1747,6 +1864,8 @@ templates/sv/AdminUserResp_superadmin_part.htm/2 = Activated
 
 templates/sv/AdminUserResp_superadmin_part.htm/3/1 = Role assignment
 
+templates/sv/AdminUserResp_superadmin_part.htm/4 = Disable two-factor authentication
+
 templates/sv/AdminUserResp_superadmin_part.htm/8 = Edit users / roles
 
 templates/sv/AdminUserResp_superadmin_part.htm/10 = Select user roles
@@ -1765,6 +1884,8 @@ templates/sv/change_img.html/1 = Edit images
 
 templates/sv/change_img.html/4/1 = Add new image
 
+templates/sv/change_img.html/4/2 = Choose existing image
+
 image/edit_image_on_page = Edit image {0} on page {1}
 
 templates/sv/change_img.html/12 = Image path (src)
@@ -1823,7 +1944,7 @@ templates/sv/change_img.html/2002 = Help
 
 templates/sv/change_img.html/2003 = Open the help page
 
-templates/sv/change_img.html/2004 = Choose from image archive
+templates/sv/change_img.html/2004 = Choose file
 
 templates/sv/change_img.html/2005 = Upload
 
@@ -1835,10 +1956,50 @@ templates/sv/change_img.html/2008 = Cancel
 
 templates/sv/change_img.html/2009 = Clear
 
+templates/sv/change_img.html/2010 = Choose from image archive
+
 templates/sv/change_img.html/4000 = Internal
 
 templates/sv/change_img.html/4001 = External
 
+templates/sv/change_img.html/4002 = Change crop
+
+templates/sv/change_img.html/4003 = Cropped image
+
+templates/sv/change_img.html/4004 = X1
+
+templates/sv/change_img.html/4005 = Y1
+
+templates/sv/change_img.html/4006 = X2
+
+templates/sv/change_img.html/4007 = Y2
+
+templates/sv/change_img.html/4008 = Reset
+
+templates/sv/change_img.html/4009 = File format
+
+templates/sv/change_img.html/4010 = Cropped size
+
+templates/sv/change_img.html/4011 = Original image size
+
+templates/sv/change_img.html/4012 = <b>Max-width</b>
+
+templates/sv/change_img.html/4013 = <b>Max-height</b>
+
+templates/sv/change_img.html/use_fixed_btn_text = Use fixed dimensions
+
+templates/sv/change_img.html/use_fixed_info = (Better when cropping)
+
+templates/sv/change_img.html/best_fit = Best fit
+
+templates/sv/change_img.html/actual_size = Actual size
+
+templates/sv/change_img.html/zoom_in = Zoom in
+
+templates/sv/change_img.html/zoom_out = Zoom out
+
+templates/sv/change_img.html/zoom = Zoom
+
 templates/sv/change_include.html/1 = Include
 
 templates/sv/change_include.html/1001 = Edit&nbsp;page
@@ -1885,6 +2046,8 @@ templates/sv/change_text.html/2006 = Save &amp; close
 
 templates/sv/change_text.html/save = Save
 
+templates/sv/change_text.html/reload = Reload
+
 templates/sv/change_text.html/2007 = Reset
 
 templates/sv/change_text.html/2008 = Close
@@ -2218,74 +2381,70 @@ templates/sv/no_page.html/1 = The page is missing!
 templates/sv/no_page.html/2 = Can not find page. Please contact <a href="mailto:{0}">the server master</a>, \n  \
 		or try again.
 
-templates/sv/password_error_input.txt/1 = Please fill in your username.
-
-templates/sv/password_no_email.txt/1 = Subject: Password, no e-mail adress\n\
-		\n\
-		Message from host: #host#\n\
-		\n\
-		A request on password from user #username# could not be fulfilled, because there is no registered e-mail address.
-
-templates/sv/password_no_right.txt/1 = Subject: Password, no permission\n\
-		\n\
-		Message from host: #host#\n\
-		\n\
-		The user #username# has no permission to receive password via e-mail.
-
-templates/sv/password_no_user.txt/1 = Subject: Password, No username in system\n\
-		\n\
-		Messag from host: #host#\n\
-		\n\
-		Username #username# does not exist.
-
-templates/sv/password_sent.html/1 = Password via e-mail
-
-templates/sv/password_sent.html/4 = <b>Done!</b><br><br>\n\
-		\tYour password has been sent to the registered e-mail adress.
-
-templates/sv/password_sent.html/2001 = Start page
-
-templates/sv/password_sent.html/2002 = Log in
-
-templates/sv/password_sent.txt/1 = Subject: Reminder on password sent\n\
-		\n\
-		\n\
-		Message from host: #host#\n\
-		\n\
-		The user #username# has requested a reminder on his/her password. It has been sent to the e-mail address: #email#.
-
-templates/sv/password_not_sent.html = <b>No password sent!</b><br><br>\n\
-        Your request could not be fulfilled, depending on any of following reason: <br> \n\
-        - there is no registered e-mail address. <br>\n\
-        - we do not have that username registered. <br>\n\
-        - you do not have permission to receive password via e-mail.\n\
-
-templates/sv/password_submit.html/1 = Password via e-mail
-
-templates/sv/password_submit.html/5 = E-mail/Username
-
-templates/sv/password_submit.html/2001 = Start page
-
-templates/sv/password_submit.html/2002 = Log in
-
-templates/sv/password_submit.html/2003 = Help
-
-templates/sv/password_submit.html/2004 = Open the help page
-
-templates/sv/password_submit.html/2005 = Send
-
-templates/sv/password_user_mail.txt/1 = Subject: Login reminder\n\
-        \n\
-        \n\
-        This is your login to host: #host#\n\
-        \n\
-        \n\
-        UserID: #username#\n\
-        Password: #password#\n\
-        \n\
-        \n\
-        Kind regards\n\
-        #host#\n\
+# Missing login data error page
+# @since 4.2.27
+missinglogindata.title = Problem with sending data
+missinglogindata.login.page = Log in
+missinglogindata.message = Due to an error in the browser the login doesn't work. \
+  Please restart the browser and try again. \
+  If you are using Internet Explorer, you can try another browser for this session.
+
+# Password reset
+# @since 4.0.17
+passwordreset.title = Password assistance
+passwordreset.title.validation_errors = There was a problem with your request
+passwordreset.error.missing_identity = Missing e-mail address / login name
+passwordreset.identity_form_info = \
+  Enter the e-mail address or login name associated with your account, then click Continue. \
+  We'll email you a link to a page where you can easily create a new password.
+
+passwordreset.identity_form.lbl_identity = E-mail or login
+passwordreset.identity_form.submit = Send
+
+# params:
+#   {0} - email address entered by an user
+#   {1} - web master address
+passwordreset.confirmation.email_sent = \
+  Check your e-mail. \
+  If the e-mail address or login name you entered <span style="font-weight: bold; color: #708090;"> {0} </span> \
+  is associated with a customer account in our records, \
+  you will receive an e-mail from us with instructions for resetting your password. \
+  If you don''t receive this e-mail, please check your junk mail folder \
+  or contact our web site administrator {1} for further assistance.
+
+passwordreset.password_reset_form_info = \
+  Create your new password. \
+  We'll ask you for this password when you want to login into the system.\
+
+passwordreset.password_reset_form.lbl_password = New password
+passwordreset.password_reset_form.lbl_password_check = Reenter new password
+passwordreset.password_reset_form.submit = Save
+passwordreset.confirmation.password_changed = You have successfully changed your password
+
+passwordreset.link.start_page = Go to start page
+
+# params:
+#   {0} - server/host name
+passwordreset.password_reset_email.subject = {0}: Request to reset password. -- DO NOT REPLY --
+
+# params:
+#   {0} - server/host name
+#   {1} - password reset URL
+passwordreset.password_reset_email.body = \
+  We have received a request to reset the password connected with this e-mail address on {0}. \n\
+  If you have made this request, please follow the instruction below. \n\
+  If you did not make a request you can safely ignore this email. Your account is not comprimised. \n\
+  \n\
+  TO RESET YOUR PASSWORD please click on the link below: \n\
+  \n\
+  {1} \n\
+  \n\
+  If clicking the link does not seem to work, you can copy and paste the link into your browser's address bar, or retype it there. \n\
+  Once you have followed the link, you will find instructions for resetting your password. \n\
+  \n\
+  Best regards, \n\
+  The system administrator
+# end of 'Password reset'
 
 templates/sv/permissions/define_permission_1.html/1 = Permission to edit page meta data
 
@@ -3015,6 +3174,8 @@ templates/sv/textdoc/archive_del_button.html/title_archive = Archive selected
 
 templates/sv/textdoc/archive_del_button.html/title_remove = Remove selected links
 
+templates/sv/textdoc/archive_del_button.html/drag_drop = Drag/drop
+
 templates/sv/textdoc/existing_doc_name.html/internal_link = Internal link
 
 templates/sv/textdoc/inPage_admin.html/1001 = Appearance
@@ -3067,6 +3228,10 @@ web/imcms/lang/jsp/heading_status = Status
 
 web/imcms/lang/jsp/heading_type = Type
 
+web/imcms/lang/jsp/export_allowed = Export
+
+web/imcms/lang/jsp/exported = Exported
+
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading = Validate links
 
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/only_broken = List only broken links
@@ -3237,3 +3402,27 @@ profile/save = Save
 profile/name = Name
 
 profile/document_name = Document name
+
+web/imcms/lang/jsp/crop_img.jsp/title = Crop image
+web/imcms/lang/jsp/crop_img.jsp/crop = Crop
+web/imcms/lang/jsp/crop_img.jsp/cancel = Cancel
+web/imcms/lang/jsp/crop_img.jsp/x1 = X1
+web/imcms/lang/jsp/crop_img.jsp/y1 = Y1
+web/imcms/lang/jsp/crop_img.jsp/x2 = X2
+web/imcms/lang/jsp/crop_img.jsp/y2 = Y2
+web/imcms/lang/jsp/crop_img.jsp/width = Width
+web/imcms/lang/jsp/crop_img.jsp/height = Height
+web/imcms/lang/jsp/crop_img.jsp/rotate_left = Rotate left
+web/imcms/lang/jsp/crop_img.jsp/rotate_right = Rotate right
+web/imcms/lang/jsp/crop_img.jsp/best_fit = Best fit
+web/imcms/lang/jsp/crop_img.jsp/actual_size = Actual size
+web/imcms/lang/jsp/crop_img.jsp/zoom_in = Zoom in
+web/imcms/lang/jsp/crop_img.jsp/zoom_out = Zoom out
+web/imcms/lang/jsp/crop_img.jsp/zoom = Zoom
+
+image_browser.usage=Double click image to use. Single click to select.
+image_browser.recent=Yellow marked images on top are the last added ones.
+
+sms/authorize_code/message = Login code: 
+
+web/imcms/login/back = Back
diff --git a/web/WEB-INF/conf/imcms_swe.properties b/web/WEB-INF/conf/imcms_swe.properties
index 1c2bd71435..2217b9feb2 100644
--- a/web/WEB-INF/conf/imcms_swe.properties
+++ b/web/WEB-INF/conf/imcms_swe.properties
@@ -1,2153 +1,1199 @@
+# \u00e4 = ä
+# \u00c4 = Ä
+# \u00e5 = å
+# \u00c5 = Ã…
+# \u00f6 = ö
+# \u00d6 = Ö
 error/servlet/AdminCounter/no_valid_date = Datumet \u00e4r felaktigt, var v\u00e4nlig ange nytt datum ( \u00e5\u00e5\u00e5\u00e5-mm-dd )
-
 error/servlet/AdminDeleteDoc/no_metaid_in_db = Angivet metaid saknas i databasen.
-
 error/servlet/AdminDeleteDoc/no_valid_metaid = Angivet metaid \u00e4r felaktigt. Var v\u00e4nlig ange ett nytt metaid.
-
+error/servlet/AdminDeleteDoc/protected_document = Det \u00e4r inte till\u00e5tet att radera denna sida.
 error/servlet/AdminIpAccess/no_session = Gick inte att skapa en session. Var v\u00e4nlig f\u00f6rs\u00f6k igen.
-
 error/servlet/AdminIpAccess/vaidate_form_parameters = Samtliga f\u00e4lt var inte korrekt ifyllda.
-
+error/servlet/AdminIpWhiteList/validate_form_parameters = Felaktiga v\u00e4rden f\u00f6r vissa obligatoriska f\u00e4lt.
 error/servlet/AdminRoles/new_rolename_missing = Du m\u00e5ste ange ett nytt rollnamn.
-
 error/servlet/AdminRoles/role_missing = Du m\u00e5ste ange vilken roll som skall redigeras.
-
 error/servlet/AdminRoles/rolename_already_exists = Rollnamnet finns redan. Var v\u00e4nlig v\u00e4lj ett nytt namn.
-
 error/servlet/AdminRoles/rolename_missing = Du m\u00e5ste ange vilken roll som skall \u00e4ndras.
-
 error/servlet/AdminRoles/role_to_delete_missing = Du m\u00e5ste ange en roll som skall tas bort.
-
 error/servlet/AdminSection/section_exists = Avdelningsnamnet finns redan, var v\u00e4nlig v\u00e4lj ett nytt namn!
-
 error/servlet/AdminSystemInfo/validate_form_parameters = Alla parameterar fanns inte tillg\u00e4ngliga.
-
 error/servlet/AdminUserProps/username_already_exists = Anv\u00e4ndarnamnet finns redan. Var v\u00e4nlig v\u00e4lj ett nytt namn.
-
 error/servlet/AdminUser/user_have_no_permission = Inloggad anv\u00e4ndare saknar r\u00e4ttigheter att editera anv\u00e4ndardata.
-
 error/servlet/global/no_administrator = Inloggad anv\u00e4ndare \u00e4r inte en administrat\u00f6r.
-
-error/servlet/images/only_allowed_to_upload_images = Du kan bara ladda upp en bild av typen gif, jpeg, eller png.
-
+error/servlet/images/only_allowed_to_upload_images = Du kan bara ladda upp en bild av typen gif, jpeg eller png.
+error/servlet/images/file_not_image = This file does not seem to be an image.
 error/servlet/images/image_file_exists = Det finns redan en fil med det namnet.
-
 error/servlet/AdminManager/no_create_permission = Du har inte r\u00e4tt att skapa ett dokument baserat p\u00e5 det valda dokumentet.
-
 error/servlet/AdminManager/no_parent_id = Du m\u00e5ste ange ett id f\u00f6r ett dokument som du vill basera det nya dokumentet p\u00e5.
-
 error/servlet/AdminManager/parent_must_be_text_document = Dokumentet med det angivna id:t \u00e4r inte en textsida. Du kan bara skapa nya dokument baserade p\u00e5 textsidor.<br>Om du vill kan du g\u00f6ra en kopia i st\u00e4llet.
-
 error/template_with_name_exists = Det finns redan en mall med det namnet.
-
-error/password_length = L\u00f6senordet m\u00e5ste vara 4 till 15 tecken l\u00e5ngt.
-
+error/password_length = L\u00f6senordet m\u00e5ste vara 4 till 250 tecken l\u00e5ngt.
 error/passwords_did_not_match = L\u00f6senorden st\u00e4mde inte \u00f6verens.
-
 error/password_too_weak = L\u00f6senordet \u00e4r f\u00f6r enkelt.
-
 error/user_must_have_at_least_one_role = Du m\u00e5ste ange minst en roll.
-
 error/missing_email_fromAdress = Fr\u00e5n adress saknas i e-mail.
-
 global/Date = Datum
-
 global/Now = Nu
-
 global/on = P\u00e5
-
 global/off = Av
-
 global/back = Tillbaka
-
 global/cancel = Avbryt
-
+global/close = St\u00e4ng
 global/create = Skapa
-
 global/Created_by = Skapad av
-
 global/Publisher = Ansvarig utgivare
-
 global/Page_alias = F\u00f6renklad adress
-
+global/Suggest_alias = F\u00f6rslag
 global/Search = S\u00f6k
-
 global/Reset = \u00c5terst\u00e4ll
-
 global/document = dokument
-
 global/None = Ingen
-
 global/edit = Redigera
-
 global/help = Hj\u00e4lp
-
+global/download = Ladda ner
 global/imcms_administration = imCMS Administration
-
 global/Name = Namn
-
 global/openthehelppage = \u00d6ppna hj\u00e4lpsidan
-
 global/remove = Ta bort
-
 global/save = Spara
-
+global/export = Exportera
+global/exclude_exported = Uteslut exporterade
 global/OK = OK
-
 global/select = V\u00e4lj
-
 global/warning = Varning!
-
 global/view = Visa
-
 global/message = Meddelande
-
 global/modified = \u00c4ndrad
-
+global/created = Skapad
+global/new = Ny
 global/Dates = Datum
-
 global/Copy = Kopia
-
 global/addToRight = L\u00e4gg till &raquo;
-
 global/removeToLeft = &laquo; Ta bort
-
+global/AdvancedSettings = Avancerade inst\u00e4llningar
+scripts/imcms4_admin_script.js.jsp/context_menu/open_normal = \u00d6ppna textredigering
+scripts/imcms4_admin_script.js.jsp/context_menu/open_inline = \u00d6ppna inline-redigering
+scripts/imcms4_admin_script.js.jsp/context_menu/use_inline = Anv\u00e4nd inline-redigering (DblClick)
+scripts/imcms4_admin_script.js.jsp/context_menu/use_inline_formatted = Anv\u00e4nd inline-redigering (formaterad)
+scripts/imcms4_admin_script.js.jsp/context_menu/use_width = Anv\u00e4nd bredd
+scripts/imcms4_admin_script.js.jsp/context_menu/show_help = Visa hj\u00e4lp om detta
 edit/link/dialog/title = Redigera l\u00e4nk
-
 edit/link/href = L\u00e4nk:
-
 edit/link/title = Popup-text:
-
 edit/link/target = \u00d6ppna i:
-
+edit/link/cssClass = CSS-class:
+edit/link/cssStyle = CSS-style:
+edit/link/otherParams = \u00d6vriga parametrar:
+edit/link/otherParamsExample = Ex: onclick=&quot;openEvent()&quot; - Till\u00e5tna parametrar:
 document_type/name/text = Textsida
-
 document_type/name/url = Extern l\u00e4nk
-
 document_type/name/browser = Browserkontroll
-
 document_type/name/html = HTML
-
 document_type/name/file = Fil
-
 phone_type/name/home = Hem
-
 phone_type/name/mobile = Mobil
-
 phone_type/name/work = Arbete
-
 phone_type/name/fax = Fax
-
 phone_type/name/other = Annat
-
 role_permission/password_by_email/description = R\u00e4tt att f\u00e5 l\u00f6senord per mail
-
 role_permission/admin_pages_access/desciption = R\u00e4tt att komma \u00e5t "Mina sidor".
-
 web/imcms/lang/jsp/search_documents_form.jsp/sections = Avdelningar
-
 imcms/lang/jsp/document_list.jsp/heading_child_documents = Underdokument
-
 imcms/lang/jsp/document_list.jsp/title = Lista dokument
-
+imcms/lang/jsp/export/export_document_list.jsp/title = Exportera document
+imcms/lang/jsp/export/export_document_list.jsp/skip_exported = Hoppa över exporterat
+imcms/lang/jsp/export/export_document_list.jsp/export_images = Exportera bilder
+imcms/lang/jsp/export/export_document_list.jsp/export_files = Exportera filer
+imcms/lang/jsp/export/export_summary.jsp/title = Exportöversikt
 imcms/lang/jsp/document_list.jsp/1003 = Lista mellan:
-
 imcms/lang/jsp/document_list.jsp/1004 = &#8211;
-
 imcms/lang/jsp/document_list.jsp/2002 = Lista
-
 imcms/lang/jsp/document_alias_list.jsp/title = Lista dokument alias
-
 imcms/lang/jsp/search_documents.jsp/document_id = Id
-
 imcms/lang/jsp/search_documents.jsp/document_type = Sidtyp
-
 imcms/lang/jsp/search_documents.jsp/document_headline = Rubrik
-
 imcms/lang/jsp/search_documents.jsp/select_document = V\u00e4lj
-
 install/htdocs/global/pageinfo/browse = Bl\u00e4ddra
-
 install/htdocs/global/pageinfo/share = Dela ut dokumentet f\u00f6r andra administrat\u00f6rer
-
 install/htdocs/global/pageinfo/show_link_to_unauthorized_user = Visa l\u00e4nk \u00e4ven om anv\u00e4ndaren \u00e4r obeh\u00f6rig
-
 install/htdocs/imcms/html/link_editor.jsp/1 = L\u00e4nk-editor
-
 install/htdocs/imcms/html/link_editor.jsp/4/1 = Skapa l\u00e4nk
-
 install/htdocs/imcms/html/link_editor.jsp/5 = Beskrivning:
-
 install/htdocs/imcms/html/link_editor.jsp/6/1 = Det som syns p\u00e5 sidan!
-
 install/htdocs/imcms/html/link_editor.jsp/7 = L\u00e4nktyp:
-
 install/htdocs/imcms/html/link_editor.jsp/8 = Intern l\u00e4nk
-
 install/htdocs/imcms/html/link_editor.jsp/9 = Annan webbsida
-
 install/htdocs/imcms/html/link_editor.jsp/10 = Mailadress
-
 install/htdocs/imcms/html/link_editor.jsp/11 = FTP l\u00e4nk
-
 install/htdocs/imcms/html/link_editor.jsp/12 = L\u00e4nk till &quot;ankare&quot;
-
 install/htdocs/imcms/html/link_editor.jsp/13 = Skapa &quot;ankare&quot;
-
 install/htdocs/imcms/html/link_editor.jsp/14 = Samma f\u00f6nster (Standard)
-
 install/htdocs/imcms/html/link_editor.jsp/15 = Nytt f\u00f6nster
-
 install/htdocs/imcms/html/link_editor.jsp/16 = Hela f\u00f6nstret (utan frames)
-
 install/htdocs/imcms/html/link_editor.jsp/17 = Samma frame
-
 install/htdocs/imcms/html/link_editor.jsp/18 = Parent frameset
-
 install/htdocs/imcms/html/link_editor.jsp/19 = Annan frame
-
 install/htdocs/imcms/html/link_editor.jsp/21/1 = Skriv nummer!
-
-install/htdocs/imcms/html/link_editor.jsp/22 = Ev. CSS-class:
-
 install/htdocs/imcms/html/link_editor.jsp/25/1 = Kod att kopiera och klistra in p\u00e5 r\u00e4tt plats
-
+install/htdocs/imcms/html/link_editor.jsp/search/title = S\u00f6k dokument i imCMS
 install/htdocs/imcms/html/link_editor.jsp/1001 = Visa l\u00e4nken i:
-
 install/htdocs/imcms/html/link_editor.jsp/1002 = URL, adress<br>\n\
 		\t\teller meta_id:
-
 install/htdocs/imcms/html/link_editor.jsp/2001 = St\u00e4ng
-
 install/htdocs/imcms/html/link_editor.jsp/2002 = Generera l\u00e4nk
-
 install/htdocs/imcms/html/link_editor.jsp/2003 = \u00c5terst\u00e4ll
-
 install/htdocs/imcms/html/link_editor.jsp/3002 = Skriv adressen!
-
 install/htdocs/imcms/html/link_editor.jsp/3003 = Skriv ankarnamn!
-
 install/htdocs/imcms/html/link_editor.jsp/3004 = Det som syns p\u00e5 sidan!
-
 install/htdocs/imcms/html/link_editor.jsp/3005 = Du m\u00e5ste v\u00e4lja HTML l\u00e4ge f\u00f6r att\\nl\u00e4gga in en l\u00e4nk i texten!\\n\\nVill du g\u00f6ra detta nu?
-
 install/htdocs/imcms/html/link_editor.jsp/3006 = L\u00e4nkexempel
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/1 = Redigera extern anv\u00e4ndare
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/2 = <b>Redigera extern anv\u00e4ndare</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/3 = Informationen\n\
 		\tsom ej g\u00e5r att \u00e4ndra \u00e4r h\u00e4mtad fr\u00e5n ett system\n\
 		\tutanf\u00f6r imCMS. Informationen \u00e4ndras i det systemet.
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/4 = <b>Anv\u00e4ndarnamn:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/5 = <b>F\u00f6rnamn:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/6 = <b>Efternamn:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/7 = <b>Titel:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/8 = <b>F\u00f6retag:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/9 = <b>Gatuadress:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/10 = <b>Postnummer:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/11 = <b>Postort:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/12 = <b>Telefon, arbetet:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/13 = <b>Telefon, mobil:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/14 = <b>Telefon, hem:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/15 = <b>L\u00e4n:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/16 = <b>Land:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/17 = <b>Email:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/18 = <b>Aktiv:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/19 = <b>Anv\u00e4ndarens Roller:</b>
-
 install/htdocs/sv/adminuser/changeexternaluser.jsp/21 = (Varning!\n\
 		\t\tEndast de roller som hanteras internt i Imcms blir varaktigt lagrade\n\
 		\t\tp\u00e5 anv\u00e4ndaren. Roller som hanteras av det externa systemet\n\
 		\t\tuppdateras vid inloggning.)
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2/1 = Redigera text
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2/2 = p\u00e5 sida
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/3/1 = Hj\u00e4lp
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/5/1 = HTML Av/P\u00e5
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/5/2 = Enkel/Avancerad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/5/3 = Avancerad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/7 = Funktioner
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/8/1 = V\u00e4lj funktion:
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/8/2 = Skapa l\u00e4nk
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/8/3 = Skapa lista
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/8/4 = Transparent pixel
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/9 = <b>Skapa l\u00e4nk</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/10 = <br><b>L\u00e4nktyp:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/11 = Intern l\u00e4nk
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/12 = Annan webbsida
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/13 = Mailadress
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/14 = FTP l\u00e4nk
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/15 = <br><b>Target:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/16 = - Standard
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/17 = Samma f\u00f6nster
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/18 = Nytt f\u00f6nster
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/19 = Samma frame
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/20 = Parent frameset
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/21 = Annan frame
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/22 = <b>Meta_id:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/23 = <br><b>CSS class:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/24/1 = - V\u00e4lj class
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/25 = Gl\u00f6m inte att markera l\u00e4nktexten innan du klickar &quot;Skapa&quot;. L\u00e4nkar blir inte klickbara i editorn. V\u00e4lj &quot;F\u00f6rhandsgranska&quot; f\u00f6r att se den verkliga funktionen.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/26 = <b>Skapa tom lista</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/27 = <br><b>Listtyp:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/28 = Punktlista
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/29 = Numrerad lista
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/30 = Definitionslista
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/31 = <br><b>Numrering:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/32 = 1 2 3 4 5 (Standard)
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/33 = A B C D E
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/34 = a b c d e
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/35 = I II III IV V
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/36 = i ii iii iv v
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/37 = <b>Antal punkter:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/39 = <br><b>CSS class:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/40/1 = - V\u00e4lj class
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/41 = Gl\u00f6m inte att st\u00e4lla mark\u00f6ren d\u00e4r du vill ha listan innan du klickar &quot;Skapa&quot;.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/42 = <b>L\u00e4gg in transparent pixel</b><br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/43 = <b>Bredd:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/44 = <b>H\u00f6jd:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/45 = <b>Border:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/46 = <b>Align:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/47 = - Standard
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/48 = left
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/49 = right
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/50 = top
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/51 = middle
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/52 = bottom
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/53 = texttop
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/54 = absmiddle
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/55 = baseline
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/56 = absbottom
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/57/1 = Radbryt:
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/58 = <b>F\u00f6re</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/59 = <b>Efter</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/60 = <b>Anv\u00e4nds till:</b><br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/61/1 = Avancerade funktioner
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/62/1 = V\u00e4lj funktion:
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/62/2 = Valfri kod
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/62/3 = Inst\u00e4llningar
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/62/4 = Standard
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/63 = <b>Skapa tabell:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/64 = <b>HTML block:</b><br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/65 = - V\u00e4lj format
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/66 = &lt;P&gt; Stycke (Normal)
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/67 = &lt;DIV&gt; Block/Layer
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/68 = &lt;H1&gt; Rubrik (st\u00f6rsta)
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/69 = &lt;H2&gt; Rubrik
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/70 = &lt;H3&gt; Rubrik
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/71 = &lt;H4&gt; Rubrik
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/72 = &lt;H5&gt; Rubrik
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/73 = &lt;H6&gt; Rubrik (minsta)
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/74 = &lt;PRE&gt; F\u00f6rformaterad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/75 = &lt;ADDRESS&gt;
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/76 = &lt;BLOCKQUOTE&gt;
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/77 = <b>Skapa linje:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/78 = <b>Utfyllnadstext:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/79 = <b>CSS klasser:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/81 = <b>Annan:</b><br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/82/1 = - V\u00e4lj class
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/83 = <b>Format:</b><br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/84 = - Standard
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/85 = Verdana,sans-serif...
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/86 = Arial,sans-serif...
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/87 = Times New Roman...
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/88 = Courier,monospace
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/89 = Comic Sans MS...
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/90 = <b>Stil:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/91 = - Standard
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/92 = Normal
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/93 = Fet
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/94 = Kursiv
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/95 = Fet/Kursiv
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/96 = <b>Storlek:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/97 = - Standard
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/98 = 9px (IE)
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/99 = 9pt
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/101 = - Standard
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/103/1 = Anv\u00e4nd f\u00e4rg
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/104/1 = Start-kod
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/105/1 = Slut-kod
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/106/1 = Bredd p\u00e5 inneh\u00e5ll:
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/107 = 1
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/108/1 = Bakgrundsf\u00e4rg:
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/109/1 = Standard textf\u00e4rg:
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/110 = \u00c5terst\u00e4ll
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/111 = Om man \u00f6nskar se inneh\u00e5llet mer realistiskt enligt sidans utformning.<br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/112/1 = Dessa v\u00e4rden sparas inte, utan anv\u00e4nds bara vid editering.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/113 = 1
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/116/1 = Fixa Word-kod
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/116/2 = St\u00e4ng
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/116/3 = Vill du ta bort allt inneh\u00e5ll?
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/116/4 = Rensa
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/116/5 = Spara
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/117 = <b style="color:#ffffff">HTML editering</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/118 = H\u00e4r kan du editera din HTML-kod.<br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/119/1 = \u00c4ndringar sl\u00e5r igenom n\u00e4r man byter till &quot;Editor-l\u00e4ge&quot; igen.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/120 = <b style="color:#ffffff">Hj\u00e4lp</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/121 = Klicka p\u00e5 den knapp du vill ha hj\u00e4lp om.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/122/1 = Vill du ha hj\u00e4lp om det h\u00f6gra f\u00e4ltet, \u00f6ppnar du den vanliga hj\u00e4lpen.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/123 = <b style="color:#ffffff">Hj\u00e4lp</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/124 = Funktionerna \u00e4r bortkopplade s\u00e5 l\u00e4nge hj\u00e4lpen \u00e4r \u00f6ppen.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/129 = Hj\u00e4lp - imCMS Text Editor
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/130 = St\u00e4ng
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/131 = Hj\u00e4lp - imCMS Text Editor
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/132 = St\u00e4ng
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/133 = Allm\u00e4nt
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/134 = Allm\u00e4nt
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/136 = Hj\u00e4lp - imCMS Text Editor
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/137 = St\u00e4ng
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/138 = \u00d6vre verktygsrad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/139 = \u00d6vre verktygsrad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/141 = Hj\u00e4lp - imCMS Text Editor
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/142 = St\u00e4ng
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/143 = H\u00f6gra funktionsf\u00e4ltet
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/144 = H\u00f6gra funktionsf\u00e4ltet
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/146 = <b>V\u00e4nta...</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1001 = imCMS - Text Editor
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1002 = &laquo;&nbsp;Skapa
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1003 = &laquo;&nbsp;Skapa
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1004 = &laquo;&nbsp;L\u00e4gg in
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1005/1 = Exakta indrag
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1005/2 = Exakt radh\u00f6jd
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1005/3 = Utfyllnad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1005/4 = F\u00f6rskjutning
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1006/1 = Gl\u00f6m inte att st\u00e4lla mark\u00f6ren p\u00e5 r\u00e4tt plats innan du klickar &quot;L\u00e4gg&nbsp;in&quot;.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1007 = &laquo;&nbsp;Tilldela
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1008 = <b>L\u00e4gg in bild:&nbsp;</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1009 = &laquo;&nbsp;Tilldela
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1010 = <b>Radh\u00f6jd:</b>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1011 = &laquo;&nbsp;Tilldela
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1012 = &laquo;&nbsp;Tilldela
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1013 = <b>Avancerade&nbsp;inst\u00e4llningar</b><br>
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1014 = &laquo;&nbsp;Genomf\u00f6r
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1015 = V\u00e4rden st\u00f6rre \u00e4n 525 eller procentv\u00e4rden visas inte i editorn. Dessa visas endast vid f\u00f6rhandsgranskning.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1016 = <b>Obs!</b> &nbsp;Viss HTML-kod \u00e4ndrar editorn automatiskt till n\u00e5got annat p&nbsp;g&nbsp;a de inbyggda editeringsfunktionerna i Internet Explorer. Detta kan man inte g\u00f6ra n\u00e5got \u00e5t<br>\n\
 		\t&#8211; f\u00f6rutom att redigera ev. felaktigheter i efterhand.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1018/1 = \u00d6vre verktygsrad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1018/2 = H\u00f6gra funktionsf\u00e4ltet
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1019/1 = Allm\u00e4nt
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1020/1 = H\u00f6gra funktionsf\u00e4ltet
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1021/1 = Allm\u00e4nt
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/1021/2 = \u00d6vre verktygsrad
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2001 = Skapa l\u00e4nk
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2002 = Skapa lista
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2003 = L\u00e4gg in transparent pixel
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2004 = tabell
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2005 = Insert Rule
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2006 = Bild
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/2007 = Lorem ipsum... (Latinsk text) - L\u00e4ggs in sist i dokumentet.
-
 install/htdocs/sv/htmleditor/editor/editor.jsp/3000 = \u00d6ppna editorn automatiskt:
-
 install/htdocs/sv/htmleditor/editor/input_table.html/2 = Skapa tabell
-
 install/htdocs/sv/htmleditor/editor/input_table.html/3 = Border:
-
 install/htdocs/sv/htmleditor/editor/input_table.html/1001 = Antal&nbsp;rader:
-
 install/htdocs/sv/htmleditor/editor/input_table.html/1002 = Cell&nbsp;Spacing:
-
 install/htdocs/sv/htmleditor/editor/input_table.html/1003 = Antal&nbsp;kolumner:
-
 install/htdocs/sv/htmleditor/editor/input_table.html/1004 = Cell&nbsp;Padding:
-
 install/htdocs/sv/htmleditor/editor/input_table.html/1005 = Bredd&nbsp;(pixlar/procent):
-
 install/htdocs/sv/htmleditor/editor/input_table.html/2001 = Avbryt
-
 install/htdocs/sv/htmleditor/editor/input_table.html/2002 = OK
-
 install/htdocs/sv/htmleditor/editor/preview.html/1 = Text Editor - Browser preview
-
 install/htdocs/sv/htmleditor/editor/preview.html/4 = imCMS - Text Editor
-
 install/htdocs/sv/htmleditor/editor/preview.html/5 = F\u00f6rhandsgranskning
-
 install/htdocs/sv/htmleditor/editor/preview.html/6 = <b>\u00c4ndra bredd:</b>
-
 install/htdocs/sv/htmleditor/editor/preview.html/7 = (ex: 415 / 325px / 80%)
-
 install/htdocs/sv/htmleditor/editor/preview.html/8 = Copy HTML
-
 install/htdocs/sv/htmleditor/editor/preview.html/9 = Copy Text
-
 install/htdocs/sv/htmleditor/editor/preview.html/10 = St\u00e4ng
-
 install/htdocs/sv/htmleditor/editor/preview.html/2001 = OK
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/1 = Fetstil
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/2 = Kursiv stil
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/3 = Understruken text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/4 = Genomstruken text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/5 = V\u00e4nsterjusterad text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/6 = Centrerad text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/7 = H\u00f6gerjusterad text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/8 = Upph\u00f6jd text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/9 = Ners\u00e4nkt text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/10 = Numrerad lista
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/11 = Punktlista
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/12 = Minska indrag
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/13 = \u00d6ka indrag
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/14 = Klipp ut
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/15 = Kopiera
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/16 = Klistra in
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/17 = F\u00f6rhandsgranska
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/18 = S\u00f6k efter text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/19 = \u00c5ngra
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/20 = G\u00f6r om
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/21 = \u00c5terst\u00e4ll senast sparade text
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/22 = Radera all formatering utom radbrytningar
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/23 = Teckenf\u00e4rg
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/24 = V\u00e4lj
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/25 = V\u00e4lj format
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/26 = \u00d6verstrykningsf\u00e4rg
-
 install/htdocs/sv/htmleditor/scripts/editor_config_buttons.js/27 = V\u00e4lj Word format
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.js/1 = Vill du spara dina \u00e4ndringar?\\n\\nEv. tidigare inneh\u00e5ll kommer att skrivas \u00f6ver!
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.js/2 = Vill du st\u00e4nga f\u00f6nstret?\\n\\nEv. \u00e4ndringar du inte sparat kommer att g\u00e5 f\u00f6rlorade!
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.js/3 = S\u00f6k efter ord eller fras i texten!
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.js/10 = Meta_id
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.js/11 = Webbadress
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.js/12 = Mailadress
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.js/13 = FTP adress
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.vbs/1 = Du m\u00e5ste markera n\u00e5got som skall vara l\u00e4nkat
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.vbs/2 = eller st\u00e4lla mark\u00f6ren d\u00e4r l\u00e4nken skall ligga
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.vbs/3 = Du m\u00e5ste st\u00e4lla mark\u00f6ren d\u00e4r bilden skall ligga
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.vbs/4 = S\u00f6k efter ord eller fras i texten!","S\u00f6kning","s\u00f6kord
-
 install/htdocs/sv/htmleditor/scripts/editor_functions.vbs/5 = Hittades ej
-
 install/htdocs/sv/htmleditor/scripts/editor_functions_wordsupport.js/1 = OBS!
-
 install/htdocs/sv/htmleditor/scripts/editor_functions_wordsupport.js/2 = Du har klistrat in Wordformaterad text
-
 install/htdocs/sv/htmleditor/scripts/editor_functions_wordsupport.js/3 = F\u00f6r att denna text skall fungera i en webl\u00e4sare f\u00f6r andra \u00e4n de som har Windows, Internet Explorer och MS-Word, m\u00e5ste formateringen fixas till
-
 install/htdocs/sv/htmleditor/scripts/editor_functions_wordsupport.js/4 = Formateringen kan ta mellan 3 och 30 sekunder, beroende p\u00e5 hur mycket och hur avancerad texten \u00e4r. Texten kan komma att se lite konstig ut, fr\u00e4mst n\u00e4r det g\u00e4ller radbrytningar. En styckebrytning i Word (Enter) ger en enkel radbrytning, medans den i en webl\u00e4sare ger en dubbel
-
 install/htdocs/sv/htmleditor/scripts/editor_functions_wordsupport.js/5 = En vanlig radbrytning i Word (Shift + Enter), ger dock samma resultat i b\u00e5da fallen
-
 install/htdocs/sv/htmleditor/scripts/editor_functions_wordsupport.js/6 = Syftet med rensningen i koden \u00e4r att resultatet skall bli s\u00e5 lika som m\u00f6jligt f\u00f6r de som inte har Windows/MS-Word
-
 install/htdocs/sv/htmleditor/scripts/editor_functions_wordsupport.js/7 = Om du klistrar in mer Word-text senare, kan du v\u00e4lja att klicka p\u00e5 knappen [Fixa Word-kod], som nu dykt upp i din nedre knapprad
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/1 = Knappen &quot;Klipp ut&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/2 = Anv\u00e4nds f\u00f6r att klippa ut markerad text till <i>Urklipp/Klippbordet</i>. Inneh\u00e5llet kan sedan klistras in p\u00e5 annan plats eller i annat program.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/3 = Knappen &quot;Kopiera&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/4 = Anv\u00e4nds f\u00f6r att kopiera markerad text till <i>Urklipp/Klippbordet</i>. Inneh\u00e5llet kan sedan klistras in p\u00e5 annan plats eller i annat program.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/5 = Knappen &quot;Klistra in&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/6 = Anv\u00e4nds f\u00f6r att klistra in det senast kopierade eller urklippta inneh\u00e5llet i <i>Urklipp/Klippbordet</i>.<br><br>Inneh\u00e5llet klistras in d\u00e4r mark\u00f6ren st\u00e5r.<br>Om n\u00e5gon text \u00e4r markerad, byts den ut mot det inklistrade inneh\u00e5llet.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/7 = Knappen &quot;F\u00f6rhandsgranska&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/8/1 = \u00d6ppnar och visar hur HTML-koden ser ut, i ett nytt f\u00f6nster.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/8/2 = I f\u00f6rhandsgranskningsf\u00f6nstret f\u00e5r man se hur koden verkligen genereras av en webl\u00e4sare, n\u00e4r man v\u00e4l har sparat sin kod.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/8/3 = Vidare kan man justera inneh\u00e5llsbredden, om man vet denna, f\u00f6r att \u00e5terspegla den bredd man anv\u00e4nder d\u00e4r sj\u00e4lva texten/koden skall ligga. D\u00e4rmed f\u00e5r man en exakt uppfattning om radbrytningar och ev. f\u00f6rskjutningar som kan uppst\u00e5 p\u00e5 fel st\u00e4lle.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/9 = Knappen &quot;\u00c5ngra&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/10 = \u00c5ngrar/\u00e5terst\u00e4ller senast utf\u00f6rda \u00e5tg\u00e4rd.<br><br><b>OBS! G\u00e4ller inte alla funktioner.</b><br><br>Vissa funktioner kan man bara \u00e5terst\u00e4lla genom att g\u00f6ra n\u00e5got av f\u00f6ljande:<ul><li>Ladda om senast sparade version<li>Manuellt editera bort koden i HTML-l\u00e4ge.<li>V\u00e4lja att radera all formatering (tar bort all HTML)</ul>
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/11 = Knappen &quot;G\u00f6r om&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/12 = \u00c5terst\u00e4ller senast \u00e5ngrade \u00e5tg\u00e4rd.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/13 = Knappen &quot;Ladda om texten&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/14 = \u00c5terst\u00e4ller originalversionen, eller senast sparade version (om man sparat), fr\u00e5n imCMS textinmatningsformul\u00e4r.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/15 = Knappen &quot;Radera all formatering&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/16 = Raderar alla HTML taggar i texten och \u00e5terst\u00e4ller formateringen till ren text.<br><br><b>OBS!</b> Raderar inte radbrytningar men ev. styckeformatering bibeh\u00e5lls inte.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/17 = Formatv\u00e4ljare
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/18 = \u00c4ndrar stilen p\u00e5 markerad text till det valda formatet.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/19 = <b>Notera!&nbsp;&nbsp;</b>Det \u00e4r b\u00e4ttre att markera texten som skall \u00e4ndras genom att dra med muspekaren, \u00e4n att dubbel- eller trippelklicka som i ordbehandlingsprogrammen. I bland f\u00f6rsvinner radbrytningen efter markeringen om man markerar s\u00e5 och anv\u00e4nder funktionen. (Microsofts fel)
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/20 = Det \u00e4r ingen fara dock. Bara att st\u00e4lla sig efter markeringen och g\u00f6ra en ny radbrytning.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/21 = Teckensnittsf\u00e4rg
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/22 = \u00c4ndrar f\u00e4rgen p\u00e5 <font style="color:blue">markerad</font> text till den valda f\u00e4rgen.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/23 = \u00d6verstrykningsf\u00e4rg
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/24 = \u00c4ndrar \u00f6verstrykningsf\u00e4rgen p\u00e5 <font style="background-color:#bbffbb">markerad</font> text till den valda f\u00e4rgen.<br>Simulerar en \u00f6verstrykningspenna.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/25 = Knappen &quot;V\u00e4xla editeringsl\u00e4ge&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/26 = V\u00e4xlar mellan l\u00e4gena WYSIWYG editor (What You See Is What You Get) och Text editor.<br><br>I l\u00e4get Text editor kan man allts\u00e5 finjustera sin HTML-kod, eller r\u00e4tta till ev. felaktigheter, om man har den kunskapen.<br>I l\u00e4get WYSIWYG editor fungerar editeringen n\u00e4stan som en ordbehandlare.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/27 = Knappen &quot;Fetstil&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/28 = Formaterar <b>markerad</b> text som fetstil.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/29 = Knappen &quot;Kursiv stil&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/30 = Formaterar <i>markerad</i> text som kursiv (lutande).
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/31 = Knappen &quot;Understrykning&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/32 = Stryker under <u>markerad</u> text.<br><br>B\u00f6r anv\u00e4ndas med f\u00f6rsiktighet, eftersom understruken text l\u00e4tt kan f\u00f6rv\u00e4xlas med en l\u00e4nk p\u00e5 Internet.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/33 = Knappen &quot;\u00d6verstrykning&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/34 = Stryker \u00f6ver <strike>markerad</strike> text.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/35 = Knappen &quot;V\u00e4nster justera&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/36 = V\u00e4nster justerar markerat stycke. (standard)
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/37 = Knappen &quot;Centrera&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/38 = Centrerar markerat stycke.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/39 = Knappen &quot;H\u00f6ger justera&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/40 = H\u00f6ger justerar markerat stycke.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/41 = Knappen &quot;Upph\u00f6jd text&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/42 = Formaterar markerad text som upph\u00f6jd text. Ex: m<sup>2</sup>.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/43 = Knappen &quot;Ners\u00e4nkt text&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/44 = Formaterar markerad text som ners\u00e4nkt text. Ex: H<sub>2</sub>O.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/45 = Knappen &quot;Skapa numrerad lista&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/46 = Skapar en numrerad lista (1,2,3...) av alla markerade stycken.<br><br>Ytterligare punkter kan l\u00e4ggas till genom att klicka p\u00e5 <i>Enter</i>.<br>F\u00f6r att byta rad utan att skapa ny punkt - klicka <i>Shift + Enter</i>.<br><br>F\u00f6r att b\u00f6rja skriva utanf\u00f6r listan:<br>Klicka utanf\u00f6r listtexten p\u00e5 det st\u00e4lle du vill b\u00f6rja skriva - eller...<br>klicka p\u00e5 <i>Enter</i> och sedan p\u00e5 &quot;Skapa numrerad lista&quot; igen.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/47 = Knappen &quot;Skapa punktlista&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/48 = Skapar en punktlista av alla markerade stycken.<br><br>Ytterligare punkter kan l\u00e4ggas till genom att klicka p\u00e5 <i>Enter</i>.<br>F\u00f6r att byta rad utan att skapa ny punkt - klicka <i>Shift + Enter</i>.<br><br>F\u00f6r att b\u00f6rja skriva utanf\u00f6r listan:<br>Klicka utanf\u00f6r listtexten p\u00e5 det st\u00e4lle du vill b\u00f6rja skriva - eller...<br>klicka p\u00e5 <i>Enter</i> och sedan p\u00e5 &quot;Skapa punktlista&quot; igen.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/49 = Knappen &quot;\u00d6ka indrag&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/50 = \u00d6kar indraget (v\u00e4nstermarginalen) p\u00e5 markerade stycken med ett steg.<br><br>Hur stort indraget \u00e4r beror p\u00e5 vilken webl\u00e4sare man har. Det brukar vara ungef\u00e4r 40 pixlar. Man kan justera detta v\u00e4rde genom att l\u00e4gga in <nobr class="imEditHelpCode">BLOCKQUOTE { margin-left: <i>nytt v\u00e4rde</i> }</nobr> i sitt stylesheet.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/51 = Knappen &quot;Minska indrag&quot;
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/52 = Minskar indraget (v\u00e4nstermarginalen) p\u00e5 markerade stycken med ett steg.<br><br>Hur stort indraget \u00e4r beror p\u00e5 vilken webl\u00e4sare man har. Det brukar vara ungef\u00e4r 40 pixlar. Man kan justera detta v\u00e4rde genom att l\u00e4gga in <nobr class="imEditHelpCode">BLOCKQUOTE { margin-left: <i>nytt v\u00e4rde</i> }</nobr> i sitt stylesheet.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/53 = Funktions beskrivning
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/54 = Klicka p\u00e5 knappen/funktionen du vill veta mer om. G\u00e4ller f\u00f6r knappar/funktioner d\u00e4r muspekaren blir till ett fr\u00e5getecken n\u00e4r man f\u00f6r musen \u00f6ver densamma.
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/55 = Ingen hj\u00e4lp till detta!
-
 install/htdocs/sv/htmleditor/scripts/editor_help.js/56 = Klicka p\u00e5 en knapp som har en hj\u00e4lp-muspekare...
-
 install/htdocs/sv/jsp/category_admin/add_to_category_type = Koppla till kategorityp
-
 install/htdocs/sv/jsp/category_admin/administer_categories = Administrera kategorier
-
 install/htdocs/sv/jsp/category_admin/category = Kategori
-
 install/htdocs/sv/jsp/category_admin/category_id = ID
-
 install/htdocs/sv/jsp/category_admin/category_name = Kategori namn
-
 install/htdocs/sv/jsp/category_admin/category_type = Kategorityp
-
 install/htdocs/sv/jsp/category_admin/create_category = Skapa kategori
-
 install/htdocs/sv/jsp/category_admin/create_category_type = Skapa kategori typ
-
 install/htdocs/sv/jsp/category_admin/description = Beskrivning
-
 install/htdocs/sv/jsp/category_admin/edit_category = Editera kategori
-
 install/htdocs/sv/jsp/category_admin/edit_category_type = Editera kategori typ
-
 install/htdocs/sv/jsp/category_admin/icon = Ikon
-
 install/htdocs/sv/jsp/category_admin/message_delete_category_type/1 = Kategoritypen
-
 install/htdocs/sv/jsp/category_admin/message_delete_category_type/2 = inneh\u00e5ller
-
 install/htdocs/sv/jsp/category_admin/message_delete_category_type/3 = kategorier
-
 install/htdocs/sv/jsp/category_admin/message_delete_category_type/4 = Det \u00e4r inte till\u00e5tet att ta bort kategoritypen
-
 install/htdocs/sv/jsp/category_admin/message_delete_category/1 = Kategorin
-
 install/htdocs/sv/jsp/category_admin/message_delete_category/2 = anv\u00e4nds av
-
 install/htdocs/sv/jsp/category_admin/message_delete_category/3 = Vill du verkligen ta bort kategorin fr\u00e5n databasen
-
 install/htdocs/sv/jsp/category_admin/message_name_already_exists/1 = Det finns redan en kategori med namn
-
 install/htdocs/sv/jsp/category_admin/message_name_already_exists/2 = i kategoritypen
-
 install/htdocs/sv/jsp/category_admin/message_name_already_exists/3 = Var v\u00e4nlig v\u00e4lj ett nytt namn
-
 install/htdocs/sv/jsp/category_admin/message_create_category_type_first =  Du m\u00e5ste f\u00f6rst skapa minst en kategori typ innan du kan skapa en kategori.
-
 install/htdocs/sv/jsp/category_admin/multi_choice = Till\u00e5t flerval
-
 install/htdocs/sv/jsp/category_admin/inherited = \u00c4rvs till nya dokument
-
+install/htdocs/sv/jsp/category_admin/image_archive = Used by image archive
 install/htdocs/sv/jsp/category_admin/remove_category = Ta bort kategori
-
 install/htdocs/sv/jsp/category_admin/remove_category_type = Ta bort kategorityp
-
 install/htdocs/sv/jsp/category_admin/select_function = V\u00e4lj funktion
-
 install/htdocs/sv/jsp/category_admin/singel_choice = Till\u00e5t enkelval
-
 install/htdocs/sv/jsp/category_admin/thereIsAlreadyaCategoryTypeWithTheName = Det finns redan en kategorityp med namn
-
 install/htdocs/sv/jsp/category_admin/view_categories = Visa kategorier
-
 install/htdocs/sv/jsp/category_descriptions.jsp/1/1 = Beskrivningar f\u00f6r kategorier av typen
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/other_browsers = \u00d6vriga
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/1 = V\u00e4lj webl\u00e4sare f\u00f6r browserkontroll
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/4/1 = V\u00e4lj browser / datormilj\u00f6
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/7 = Fyll i dokumentnummer f\u00f6r dokument som ska visas i resp milj\u00f6.<br>\n\
 		\tAnge alltid \u00f6vriga - visas i alla webbl\u00e4sare som inte specificerats separat.
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/2001 = Tillbaka
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/2002 = Hj\u00e4lp
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/2003 = \u00d6ppna hj\u00e4lpsidan
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/2004 = L\u00e4gg till &gt;&gt;
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/2005 = OK
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/2006 = Rensa
-
 install/htdocs/sv/jsp/docadmin/browser_document.jsp/2007 = Avbryt
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button = Visa avancerat
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button_hide = D\u00f6lj avancerat
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/copy_headline_and_text_to_textfields = Kopiera rubrik/text till text 1 resp. text 2
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/created_by = av
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/create_document_heading = Skapa dokument
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/created = Skapad
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/current_language = Nuvarande:
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/current_section = Nuvarande:
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/document_ceased_to_be_published_at = Dokumentets publicering upph\u00f6rde
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/document_information_title = Dokumentinformation
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/document_was_archived_at = Dokumentet arkiverades
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/document_was_published_at = Dokumentet publicerades
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/document_will_be_archived_at = Dokumentet kommer att arkiveras
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/document_will_be_published_at = Dokumentet kommer att publiceras<br>(om "Publicering godk\u00e4nd" \u00e4r vald ovan)
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/document_will_cease_to_be_published_at = Dokumentets publicering kommer att upph\u00f6ra
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/edit_document_heading = \u00c4ndra DokumentInformation f\u00f6r sida
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/keywords_explanation = Samla ord i fraser med "citationstecken".
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/no_publisher = Ingen ansvarig utgivare vald
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/no_section = Ingen avdelning vald
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/select_creator_button = \u00c4ndra skapare...
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/select_publisher_button = \u00c4ndra ansvarig utgivare...
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/status = Status
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/status_new = Ny
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/status_publication_approved = Publicering godk\u00e4nd
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/status_publication_disapproved = Publicering ej godk\u00e4nd
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/time = kl:
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/6 = L\u00e4nkrubrik
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/10 = L\u00e4nkbild
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/21/1 = Avancerat (\u00e4ndra vid behov)
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/22 = Avdelning
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/26 = Spr\u00e5k
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/29 = Kategorier
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/32 = Dela ut
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/35 = S\u00f6kord
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/37 = Blockera s\u00f6kning p\u00e5 detta dokument
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/39 = Visa i
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/46 = B\u00f6r inte l\u00e4mnas tom. Man ser d\u00e5 inte dokumentet i menyer eller n\u00e4r man s\u00f6ker.
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/1002 = L\u00e4nktext<br>
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/1007 = kl:
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/1009 = kl:
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/1015 = Samma frame
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/1016 = Nytt f\u00f6nster
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/1017 = Ers\u00e4tt allt
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/1018 = Annan frame:
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/2001 = Tillbaka
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/2002 = Hj\u00e4lp
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/2003 = \u00d6ppna hj\u00e4lpsidan
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/2004 = OK
-
 install/htdocs/sv/jsp/docadmin/document_information.jsp/2006 = Avbryt
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/autodetect_or_fill_in_below = K\u00e4nn av automatiskt / Fyll i nedan...
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/1 = Byt ut fil/dokument
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/4/1 = V\u00e4lj fil/dokument
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/4/2 = \u00c4ndra fil/dokument
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/select_file_button = Redigera
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/delete_file_button = Ta bort
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/default_label = Default
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/file_id_label = Fil-id
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/save_file_button = Spara
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/filename_label = Filnamn
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/size_label = Storlek
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/mime_type_label = Mime-typ
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/other_mime_type_label = Annan
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/target_label = \u00d6ppna&nbsp;i
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/2001 = Tillbaka
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/2002 = Hj\u00e4lp
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/2003 = \u00d6ppna hj\u00e4lpsidan
-
 install/htdocs/sv/jsp/docadmin/file_document.jsp/heading_added_files = Inlagda filer
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/1 = Skapa HTML-dokument
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/5 = Skall inledas och avslutas med &lt;HTML&gt; resp. &lt;/HTML&gt;
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/6 = \u00c4ndra HTML-kod
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/2001 = Tillbaka
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/2002 = Hj\u00e4lp
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/2003 = \u00d6ppna hj\u00e4lpsidan
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/2004 = OK
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/2005 = \u00c5terst\u00e4ll
-
 install/htdocs/sv/jsp/docadmin/html_document.jsp/2006 = Avbryt
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/1 = Skapa URL
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/4/1 = L\u00e4gg till extern l\u00e4nk(URL)
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/1001 = L\u00e4nk/URL
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/1002 = \u00d6ppna&nbsp;i<br>
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/1003 = Samma frame
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/1004 = Nytt f\u00f6nster
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/1005 = Ers\u00e4tt allt
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/1006 = Annan frame:
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/2001 = Tillbaka
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/2002 = Hj\u00e4lp
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/2003 = \u00d6ppna hj\u00e4lpsidan
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/2004 = OK
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/2005 = Rensa
-
 install/htdocs/sv/jsp/docadmin/url_document.jsp/2006 = Avbryt
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/1 = Vill du spara och skriva \u00f6ver den gamla filen?\\n\u00c5tg\u00e4rden g\u00e5r att \u00e5ngra s\u00e5 l\u00e4nge du har f\u00f6nstret\\n\u00f6ppet, genom att \u00e5terst\u00e4lla filen.
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/2 = originalfilen, s\u00e5 som den s\u00e5g ut n\u00e4r du \u00f6ppnade detta f\u00f6nster?
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/3 = den senast sparade versionen av denna fil?
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/4 = Vill du l\u00e4sa in
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/5 = Filen som laddas om sparas inte p\u00e5 servern\\nf\u00f6rr\u00e4n du klickar p\u00e5 spara-knappen.
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/6 = <b>Tips!</b> Dubbelklicka p\u00e5
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/7 = Visa
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/8 = Redigera
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/9 = formatmall
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/10 = textfil
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/11 = f\u00f6r att byta textstorlek. V\u00e4rden mellan 10-17px.
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/12 = H\u00e5ll ner <i>Shift</i> f\u00f6r att v\u00e4xla Courier/Verdana.
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/13 = <b>Tips!</b> Du kan alltid \u00e5terst\u00e4lla allt du gjort, s\u00e5 l\u00e4nge du inte st\u00e4ngt f\u00f6nstret och sessionen \u00e4r aktiv.
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2/14 = <b>Tips!</b> S\u00f6k enkelt efter text i koden m h a s\u00f6kfunktionen. Klicka [Enter] f\u00f6r att s\u00f6ka n\u00e4sta.
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/4 = \u00c5terst\u00e4ll:
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/5 = - V\u00e4lj -
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/6 = Senast sparade
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/7 = Original filen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/1 = Inga imCMS text taggar i mallen!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/2 = Inga imCMS image taggar i mallen!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/3 = Inga imCMS menu taggar i mallen!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/4 = Inga imCMS includes i mallen!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/5 = Inga imCMS #-taggar i mallen!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/6 = Inga imCMS date-taggar i mallen!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/7 = Inga \u00f6vriga imCMS-taggar i mallen!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/8 = St\u00e4ng med [Enter]
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/9 = (OBS! Denna funktion kan generera felaktiga listor i Netscape 4.X)
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/10 = imCMS text-taggar i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/11 = Sorterade enligt ordning i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/12 = Sorterade i nummerordning
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/13 = imCMS image-taggar i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/14 = imCMS menu-taggar i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/15 = imCMS includes i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/16 = imCMS #-taggar i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/17 = imCMS date-taggar i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/18 = \u00d6vriga imCMS-taggar i mallen
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1001/1 = <b>OBS!</b> Filen fanns inte l\u00e4ngre s\u00e5 den blev skapad.
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1001/2 = <b>FEL!</b> Filen \u00e4r skrivskyddad eller g\u00e5r inte att spara!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1001/3 = <b>FEL!</b> Ett fel har uppst\u00e5tt!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1002/1 = Visa
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1002/2 = Redigera
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1002/3 = formatmall
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1002/4 = textfil
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/1 = Visa imCMS-taggar i mallen:
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/2 = text
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/3 = image
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/4 = menu
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/5 = include
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/6 = date
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/7 = #-taggar
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/8 = \u00f6vriga
-
+install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/9 = Nu finns st\u00f6d f\u00f6r indent/outdent med [Tab] / [Shift] + [Tab] i vissa webbl\u00e4sare. \u00c4ven \u00f6ver flera rader.
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2001 = S\u00f6k!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2002 = Spara!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2003 = St\u00e4ng och \u00e5terg\u00e5!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2004 = St\u00e4ng och \u00e5terg\u00e5!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2005 = St\u00e4ng och \u00e5terg\u00e5!
-
 install/htdocs/sv/jsp/FileAdmin_edit.jsp/2006 = St\u00e4ng och \u00e5terg\u00e5!
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/16 = Zooma:
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/26 = :: imCMS ::
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/1002/1 = Statistikrapport
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/1002/2 = F\u00f6rhandsgranska
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/1004/1 = Kantlinje:
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/1004/2 = P\u00e5
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/1004/3 = Av
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/1004/4 = St\u00e4ng &amp; \u00e5terg\u00e5
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/2001 = S\u00f6k!
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/2002 = Skriv ut!
-
 install/htdocs/sv/jsp/FileAdmin_preview.jsp/2003 = St\u00e4ng och \u00e5terg\u00e5!
-
 install/htdocs/sv/jsp/ImageBrowse.html/1 = Bildarkiv
-
 install/htdocs/sv/jsp/ImageBrowse.html/5 = Kataloger
-
 install/htdocs/sv/jsp/ImageBrowse.html/7 = Bilder
-
 install/htdocs/sv/jsp/ImageBrowse.html/2001 = Tillbaka
-
 install/htdocs/sv/jsp/ImageBrowse.html/2002 = Hj\u00e4lp
-
 install/htdocs/sv/jsp/ImageBrowse.html/2003 = \u00d6ppna hj\u00e4lpsidan
-
 install/htdocs/sv/jsp/ImageBrowse.html/2004 = Byt katalog
-
 install/htdocs/sv/jsp/ImageBrowse.html/2005 = Anv\u00e4nd
-
 install/htdocs/sv/jsp/ImageBrowse.html/2006 = F\u00f6rhandsgranska
-
 install/htdocs/sv/jsp/ImageBrowse.html/2007 = Avbryt
-
+install/htdocs/sv/jsp/ImageBrowse.html/No_files = Inga bilder
 install/htdocs/sv/jsp/internalerrorpage.jsp/1 = Felsida
-
 install/htdocs/sv/jsp/internalerrorpage.jsp/2 = Ett internt fel har intr\u00e4ffat.
-
 install/htdocs/sv/jsp/internalerrorpage.jsp/3 = Ber s\u00e5 hemskt mycket om urs\u00e4kt.<br>\n\
 		Det kan vara ett tillf\u00e4lligt fel, s\u00e5 backa g\u00e4rna och f\u00f6rs\u00f6k en g\u00e5ng till.
-
 install/htdocs/sv/jsp/internalerrorpage.jsp/4 = Om det inte fungerade andra g\u00e5ngen s\u00e5 meddela g\u00e4rna din systemadministrat\u00f6r,\n  \
 		eller om du sj\u00e4lv \u00e4r s\u00e5dan, meddela g\u00e4rna oss p\u00e5 imCode.<br>\n  \
 		Se informationen p\u00e5 <a href="@documentationurl@/GetDoc?meta_id=1048">@documentationurl@/GetDoc?meta_id=1048</a> f\u00f6r\n  \
 		mer information om hur du kan rapportera fel.
-
 install/htdocs/sv/jsp/internalerrorpage.jsp/5 = /Utvecklingsteamet.
-
-install/htdocs/sv/jsp/internalerrorpage.jsp/6 = Internt felmeddelande:
-
-install/htdocs/sv/jsp/internalerrorpage.jsp/7 = Felkod:
-
+install/htdocs/sv/jsp/internalerrorpage.jsp/6 = Internt fel id:
+install/htdocs/sv/jsp/internalerrorpage.jsp/7 = Felorsaken:
 install/htdocs/sv/jsp/internalerrorpage.jsp/8 = Felmeddelande:
-
-install/htdocs/sv/jsp/internalerrorpage.jsp/exception = Exception:
-
+install/htdocs/sv/jsp/internalerrorpage.jsp/9 = Error placering:
+install/htdocs/sv/jsp/internalerrorpage.jsp/10 = Visa (d\u00F6lj) detaljer
+install/htdocs/sv/jsp/internalerrorpage.jsp/11 = Fel url:
+install/htdocs/sv/jsp/internalerrorpage.jsp/12 = Meddelande:
+install/htdocs/sv/jsp/internalerrorpage.jsp/13 = Orsak:
+install/htdocs/sv/jsp/internalerrorpage.jsp/14 = Stack trace:
 install/htdocs/sv/jsp/no_category_type_by_that_name.jsp/1 = Ogiltigt kategorinamn
-
 install/htdocs/sv/jsp/no_category_type_by_that_name.jsp/2/1 = Det finns ingen kategori-typ med namnet
-
 start_document/headline = Startsidan
-
-start_document/text1 = <h3>V\u00e4lkommen till imCMS</h3>
-
-start_document/text2 = <a href="<?imcms:contextpath?>/login/" title="L\u00e4nk till inloggningssida"><b>Logga in!</b></a><br><br><br>\
-                                <a href="<?imcms:contextpath?>/servlet/SearchDocuments" target="_blank" title="L\u00e4nk till s\u00f6ksida"><b>S\u00f6ksida</b></a><br>\
-                                \u00d6ppnas i nytt f\u00f6nster.<br><br>\
-                                <a href="@documentationwebappurl@/" target="_blank" title="L\u00e4nk till dokumentationssajt"><b>Dokumentation</b></a><br>\
-                                Extern sajt, \u00f6ppnas i nytt f\u00f6nster.<br><br>\
-                                <a href="http://www.imcms.net" target="_blank" title="L\u00e4nk till www.imcms.net"><b>Mer om imCMS</b></a><br>\
-                                Produktsajt om imCMS. Extern sajt, \u00f6ppnas i nytt f\u00f6nster.<br><br>\
-                                <a href="<?imcms:contextpath?>/imcms/docs/" target="_blank" title="L\u00e4nk till medf\u00f6ljande dokumentation."><b>Medf\u00f6ljande dokumentation</b></a><br>\
-                                F\u00f6r administrat\u00f6rer och utvecklare, p\u00e5 engelska. \u00d6ppnas i nytt f\u00f6nster.<br><br>\
-                                <a href="<?imcms:contextpath?>/imcms/docs/apisamples/" target="_blank" title="L\u00e4nk till API-exempel"><b>API-exempel</b></a><br>\
-                                Endast f\u00f6r utvecklare, p\u00e5 engelska. \u00d6ppnas i nytt f\u00f6nster.<br>\
-                                OBS! Endast f\u00f6r testmilj\u00f6 - anv\u00e4nd inte p\u00e5 publika sajter.
-
+start_document/text1 = V\u00e4lkommen till imCMS
+start_document/text2 = <p><a href="<?imcms:contextpath?>/login/" title="L\u00e4nk till inloggningssida"><b>Logga in!</b></a></p>\
+<p><a href="<?imcms:contextpath?>/servlet/SearchDocuments" target="_blank" title="L\u00e4nk till s\u00f6ksida"><b>S\u00f6ksida</b></a><br/>\
+\u00d6ppnas i nytt f\u00f6nster.</p>\
+<p><a href="@documentationwebappurl@/" target="_blank" title="L\u00e4nk till dokumentationssajt"><b>Dokumentation</b></a><br/>\
+Extern sajt, \u00f6ppnas i nytt f\u00f6nster.</p>\
+<p><a href="http://www.imcms.net" target="_blank" title="L\u00e4nk till www.imcms.net"><b>Mer om imCMS</b></a><br/>\
+Produktsajt om imCMS. Extern sajt, \u00f6ppnas i nytt f\u00f6nster.</p>\
+<p><a href="<?imcms:contextpath?>/imcms/docs/" target="_blank" title="L\u00e4nk till medf\u00f6ljande dokumentation."><b>Medf\u00f6ljande dokumentation</b></a><br/>\
+F\u00f6r administrat\u00f6rer och utvecklare, p\u00e5 engelska. \u00d6ppnas i nytt f\u00f6nster.</p>\
+<p><a href="<?imcms:contextpath?>/imcms/docs/apisamples/" target="_blank" title="L\u00e4nk till API-exempel"><b>API-exempel</b></a><br/>\
+Endast f\u00f6r utvecklare, p\u00e5 engelska. \u00d6ppnas i nytt f\u00f6nster.<br/>\
+OBS! Endast f\u00f6r testmilj\u00f6 - anv\u00e4nd inte p\u00e5 publika sajter.</p>
 templates/Back = Tillbaka
-
 templates/default_lang = swe
-
 templates/global/pageinfo/share = Dela ut dokumentet f\u00f6r andra administrat\u00f6rer
-
 templates/global/pageinfo/ShowLinkToUnuthorizedUser = Visa l\u00e4nk \u00e4ven om anv\u00e4ndaren \u00e4r obeh\u00f6rig
-
 templates/login/access_denied.html/4 = Ditt anv\u00e4ndarnamn eller l\u00f6senord st\u00e4mmer inte.<br>Var v\u00e4nlig och f\u00f6rs\u00f6k igen.
-
+templates/login/access_denied.html/5 = Det saknas ett giltigt mobilnummer f\u00f6r att inloggningen ska kunna genomf\u00f6ras. <br> V\u00e4nligen kontakta administrat\u00f6ren.
+templates/login/access_denied.html/6 = Du har skrivit en felaktig kod, en ny kod har automatiskt skickats till dig.
 templates/login/TooManySessions = Du har blivit utloggad!<br>\
-    En användare med samma identitet och lösenord har<br>\
-    loggat in från en annan dator eller webbläsare.<br>\
-    Systemet tillåter inte 2 samtidiga användare med samma identitet.<br><br>\
-    Om du misstänker ett intrång på ditt konto, informera webbmastern!
-
+    En anv\u00ef\u00bf\u00bdndare med samma identitet och l\u00ef\u00bf\u00bdsenord har<br>\
+    loggat in fr\u00ef\u00bf\u00bdn en annan dator eller webbl\u00ef\u00bf\u00bdsare.<br>\
+    Systemet till\u00ef\u00bf\u00bdter inte 2 samtidiga anv\u00ef\u00bf\u00bdndare med samma identitet.<br><br>\
+    Om du misst\u00ef\u00bf\u00bdnker ett intr\u00ef\u00bf\u00bdng p\u00ef\u00bf\u00bd ditt konto, informera webbmastern!
 templates/login/index.html/1 = Logga in
-
 templates/login/index.html/2 = Logga in
-
 templates/login/index.html/4 = Ange Ditt anv\u00e4ndarnamn och l\u00f6senord<br>
-
 templates/login/index.html/5 = Anv\u00e4ndarnamn
-
 templates/login/index.html/6 = L\u00f6senord
-
+templates/login/index.html/7 = Inloggningskod
+templates/login/index.html/8 = Skriv in den inloggningskod som skickats till din mobila enhet<br>
 templates/login/index.html/1001 = <br>\n\
 		\t&nbsp; &#8226; Klicka p\u00e5 [Logga&nbsp;in] f\u00f6r att logga in i systemet.<br>\n\
 		\t&nbsp; &#8226; Klicka p\u00e5 [\u00c4ndra] f\u00f6r att redigera dina personliga uppgifter.
-
 templates/login/index.html/2001 = Startsidan
-
 templates/login/index.html/2002 = Gl\u00f6mt l\u00f6senordet?
-
 templates/login/index.html/2003 = Hj\u00e4lp
-
 templates/login/index.html/2004 = \u00d6ppna hj\u00e4lpsidan
-
 templates/login/index.html/2005 = Logga in
-
 templates/login/index.html/2006 = \u00c4ndra
-
+templates/login/index.html/2008 = Default
+templates/login/index.html/2009 = BankId
 templates/login/logged_out.html/1 = Du \u00e4r nu utloggad
-
 templates/login/logged_out.html/2 = Meddelande
-
 templates/login/logged_out.html/4 = <b>Du \u00e4r nu utloggad.</b><br>\n\
 		\tTack f\u00f6r bes\u00f6ket!
-
 templates/login/logged_out.html/2001 = Startsidan
-
 templates/login/logged_out.html/2002 = Logga in
-
 templates/login/no_permission.html/4 = F\u00f6r att komma vidare m\u00e5ste Du logga in.
-
 templates/Startpage = Startsidan
-
 web/imcms/lang/jsp/admin/adminbuttons.jsp/title_id = MetaId p\u00e5 dokumentet
-
+web/imcms/lang/jsp/admin/adminbuttons.jsp/title_alias = Alias p\u00e5 dokumentet
 web/imcms/lang/jsp/admin/adminbuttons.jsp/title_type = Typ p\u00e5 dokumentet
-
 templates/sv/adminbuttons/adminbutton_1.html/2001 = Dok.info
-
 templates/sv/adminbuttons/adminbutton_4.html/2001 = R\u00e4ttigheter
-
 templates/sv/adminbuttons/adminbuttons.html/1 = <b>imCMS</b>
-
 templates/sv/adminbuttons/adminbuttons.html/1001 = Typ
-
 templates/sv/adminbuttons/adminbuttons.html/2001 = F\u00f6reg\u00e5ende
-
 templates/sv/adminbuttons/adminbuttons.html/2002 = Logga ut
-
 templates/sv/adminbuttons/adminbuttons.html/2003 = \u00d6ppna hj\u00e4lpsidan
-
 templates/sv/adminbuttons/adminbuttons5_description.html/1/1 = Administrationssida f\u00f6r extern webbsida
-
 templates/sv/adminbuttons/adminbuttons5_description.html/2 = Ang\u00e5ende knapparna nedan:
-
 templates/sv/adminbuttons/adminbuttons5_description.html/4 = (F\u00f6reg\u00e5ende) tar dig tillbaka till senast bes\u00f6kt sida.
-
 templates/sv/adminbuttons/adminbuttons5_description.html/5 = <b>Normal</b> f\u00f6ljer l\u00e4nken till den externa webbsidan.
-
 templates/sv/adminbuttons/adminbuttons5_description.html/6 = <b>Redigera</b> till\u00e5ter dig att ers\u00e4tta den nuvarande l\u00e4nken (URL) med en ny URL-adress.
-
 templates/sv/adminbuttons/adminbuttons5_description.html/7 = De andra knapparna fungerar som vanligt.<br><br>\n\
 		\t<b>OBS! Om du \u00f6nskar \u00e5terbes\u00f6ka denna administrationssida, klicka p\u00e5 l\u00e4nk-knappen och sedan p\u00e5 den r\u00f6da pilen bredvid den aktuella l\u00e4nken.</b>
-
 templates/sv/adminbuttons/adminbuttons6_description.html/1/1 = Administrationssida f\u00f6r &quot;browserkontroll&quot;-dokumentet
-
 templates/sv/adminbuttons/adminbuttons6_description.html/2 = Ang\u00e5ende knapparna nedan:
-
 templates/sv/adminbuttons/adminbuttons6_description.html/4 = (F\u00f6reg\u00e5ende) tar dig tillbaka till senast bes\u00f6kt sida.
-
 templates/sv/adminbuttons/adminbuttons6_description.html/5 = <b>Normal</b> till\u00e5ter Dig att g\u00e5 genom B-C dokumentet till den sidan du definerade f\u00f6r din webbl\u00e4sare.
-
 templates/sv/adminbuttons/adminbuttons6_description.html/6 = <b>Redigera</b> till\u00e5ter dig att redigera B-C dokumentet.
-
 templates/sv/adminbuttons/adminbuttons6_description.html/7 = De andra knapparna fungerar som vanligt.<br><br>\n\
 		\t<b>OBS! Om du \u00f6nskar \u00e5terbes\u00f6ka denna administrationssida, klicka p\u00e5 l\u00e4nk-knappen och sedan p\u00e5 den r\u00f6da pilen bredvid den aktuella l\u00e4nken.</b>
-
 templates/sv/adminbuttons/adminbuttons7_description.html/1/1 = Administrationssida f\u00f6r HTML-dokumentet
-
 templates/sv/adminbuttons/adminbuttons7_description.html/2 = Ang\u00e5ende knapparna nedan:
-
 templates/sv/adminbuttons/adminbuttons7_description.html/4 = (F\u00f6reg\u00e5ende) tar dig tillbaka till senast bes\u00f6kt sida.
-
 templates/sv/adminbuttons/adminbuttons7_description.html/5 = <b>Normal</b> till\u00e5ter dig att se dokumentet i normalt l\u00e4ge.
-
 templates/sv/adminbuttons/adminbuttons7_description.html/6 = <b>Redigera</b> till\u00e5ter dig att redigera dokumentet.
-
 templates/sv/adminbuttons/adminbuttons7_description.html/7 = De andra knapparna fungerar som vanligt.<br><br>\n\
 		\t<b>OBS! Om du \u00f6nskar \u00e5terbes\u00f6ka denna administrationssida, klicka p\u00e5 l\u00e4nk-knappen och sedan p\u00e5 den r\u00f6da pilen bredvid den aktuella l\u00e4nken.</b>
-
 templates/sv/adminbuttons/adminbuttons8_description.html/1/1 = Administrationssida f\u00f6r den uppladdade filen
-
 templates/sv/adminbuttons/adminbuttons8_description.html/2 = Ang\u00e5ende knapparna nedan:
-
 templates/sv/adminbuttons/adminbuttons8_description.html/4 = (F\u00f6reg\u00e5ende) tar dig tillbaka till senast bes\u00f6kt sida.
-
 templates/sv/adminbuttons/adminbuttons8_description.html/5 = <b>Normal</b> till\u00e5ter dig att ladda ner filen till din h\u00e5rddisk.
-
 templates/sv/adminbuttons/adminbuttons8_description.html/6 = <b>Redigera</b> till\u00e5ter dig att ers\u00e4tta filen.
-
 templates/sv/adminbuttons/adminbuttons8_description.html/7 = De andra knapparna fungerar som vanligt.<br><br>\n\
 		\t<b>OBS! Om du \u00f6nskar \u00e5terbes\u00f6ka denna administrationssida, klicka p\u00e5 l\u00e4nk-knappen och sedan p\u00e5 den r\u00f6da pilen bredvid den aktuella l\u00e4nken.</b>
-
 templates/sv/adminbuttons/adminbutton2_0.html/2001 = Normal
-
 templates/sv/adminbuttons/adminbutton2_65536.html/2001 = Text
-
 templates/sv/adminbuttons/adminbutton2_131072.html/2001 = Bild
-
 templates/sv/adminbuttons/adminbutton2_262144.html/2001 = L\u00e4nk
-
 templates/sv/adminbuttons/adminbutton2_524288.html/2001 = Utseende
-
 templates/sv/adminbuttons/adminbutton2_1048576.html/2001 = Include
-
 templates/sv/adminbuttons/adminbutton7_65536.html/2001 = Redigera
-
 templates/sv/adminbuttons/superadminbutton.html/2001 = Admin
-
 templates/sv/AdminChangeUser.htm/4/1 = \u00c4ndra anv\u00e4ndaregenskaper
-
 templates/sv/AdminChangeUser.htm/10 = S\u00f6k anv\u00e4ndare
-
 templates/sv/AdminChangeUser.htm/12 = Visa \u00e4ven EJ aktiva anv\u00e4ndare.
-
 templates/sv/AdminChangeUser.htm/14 = Anv\u00e4ndare
-
 templates/sv/AdminChangeUser.htm/15 = Antal listade anv\u00e4ndare
-
 templates/sv/AdminChangeUser.htm/16 = Anv\u00e4ndare med roll
-
 templates/sv/AdminChangeUser.htm/1001 = (Tomt f\u00e4lt visar alla!)
-
 templates/sv/AdminChangeUser.htm/2004 = Lista anv\u00e4ndare
-
 templates/sv/AdminChangeUser.htm/2005 = L\u00e4gg till ny
-
 templates/sv/AdminChangeUser.htm/2006 = Redigera
-
 templates/sv/AdminChangeUser.htm/2007 = V\u00e4lj
-
+templates/sv/AdminChangeUser.htm/2008 = Arkiv anv\u00e4ndaren
 templates/sv/AdminChangeUser.htm/3001 = Du m\u00e5ste f\u00f6rst v\u00e4lja en anv\u00e4ndare!
-
 templates/sv/AdminDeleteDoc.htm/4 = Meta-id:
-
 templates/sv/AdminDeleteDoc.htm/2001 = Ta bort
-
 templates/sv/AdminDeleteDoc.htm/2010 = Varning! Dokumentet kommer att raderas! Forts\u00e4tta?
-
 templates/sv/Admin_Error2.htm/1 = ConfAdd
-
 templates/sv/Admin_Error2.htm/2 = <b>INFORMATION! \n      \
 		</b><br>
-
 templates/sv/Admin_Error2.htm/3 = F\u00f6ljande intr\u00e4ffade
-
 templates/sv/Admin_Error2.htm/4 = BACKA
-
 templates/sv/Admin_Error2.htm/6 = FELKOD
-
 templates/sv/AdminError.htm/1 = Meddelande fr\u00e5n Servern
-
 templates/sv/AdminError.htm/2 = Administrator error.
-
 templates/sv/AdminError.htm/4 = F\u00f6ljande fel intr\u00e4ffade
-
 templates/sv/AdminIpAccess_Add.htm/2 = L\u00e4gg till ny IP-access
-
 templates/sv/AdminIpAccess_Add.htm/3 = V\u00e4lj \n\
 		\t\tanv\u00e4ndare samt IP-nummer eller intervall av IP-nummer f\u00f6r de \n\
 		\t\tsom ej ska beh\u00f6va logga in.
-
 templates/sv/AdminIpAccess_Add.htm/4 = 1. \n\
 		\t\tAnge anv\u00e4ndare:
-
 templates/sv/AdminIpAccess_Add.htm/6 = 2. \n\
 		\t\tAnge from vilket IP:
-
 templates/sv/AdminIpAccess_Add.htm/7 = 3. Ange tom vilket IP:
-
 templates/sv/AdminIpAccess_Add.htm/8 = Obs! IP skall anges i formen: 192.168.98.54
-
+templates/sv/AdminIpAccess_Add.htm/9=Beskrivning
+templates/sv/AdminIpWhiteList_Add.jsp/1 = L\u00e4gg till IP whitelist-adress
+templates/sv/AdminIpWhiteList_Add.jsp/2 = V\u00e4lj \n\
+   \t\tanv\u00e4ndarroll och IP-nummer (eller antal siffror) f\u00f6r vitlista.
+templates/sv/AdminIpWhiteList_Add.jsp/3 = V\u00e4lj roll
+templates/sv/AdminIpWhiteList.jsp/4=L\u00e4gg till de IP-nummer varifr\u00e5n man ska kunna logga in. Observera att Superadmin m\u00e5ste definieras separat.\n\
+Om inga IP-nummer \u00e4r definierade \u00e4r funktionen inte aktiv, dvs man kan logga in oavsett IP-nummer.
 templates/sv/AdminIpAccess_Add.htm/2001 = Spara
-
 templates/sv/AdminIpAccess_Add.htm/2002 = Avbryt
-
 templates/sv/AdminIpAccess_Delete2.htm/1 = Admin IP-Access
-
 templates/sv/AdminIpAccess_Delete2.htm/3 = Du \u00e4r p\u00e5 v\u00e4g att ta bort en/flera IP-accesser. Vill du forts\u00e4tta?
-
 templates/sv/AdminIpAccess_Delete2.htm/2001 = OK
-
-templates/sv/AdminIpAccess.htm/3 = H\u00e4r \n\
+templates/sv/AdminIpAccess.htm/3=H\u00e4r \n\
 		\t\tger man anv\u00e4ndare med ett specifikt IP-nummer eller inom ett intervall \n\
 		\t\tav IP-nummer direkt tillg\u00e5ng till systemet s\u00e5 att de inte \n\
 		\t\tbeh\u00f6ver logga in sig.
-
+templates/sv/AdminIpAccess.htm/4=Din IP:
+templates/sv/AdminIpAccess.htm/5=Inloggning m\u00e5ste ske via https.
 templates/sv/AdminIpAccess.htm/2001 = L\u00e4gg till
-
 templates/sv/AdminIpAccess.htm/2002 = Spara om markerad
-
 templates/sv/AdminIpAccess.htm/2003 = Ta bort markerad
-
 templates/sv/AdminIpAccess.htm/3000 = Registrade IP-accesser
-
 templates/sv/AdminIpAccess.htm/3001 = Uppdatera
-
 templates/sv/AdminIpAccess.htm/3002 = Anv\u00e4ndarnamn
-
 templates/sv/AdminIpAccess.htm/3003 = IP start
-
 templates/sv/AdminIpAccess.htm/3004 = IP slut
-
+templates/sv/AdminIpWhiteList.jsp/1 = Registrerade IP-whitelist-adresser
+templates/sv/AdminIpWhiteList.jsp/2 = Roll
+templates/sv/AdminIpWhiteList.jsp/3=Beskrivning
+
+# user role and IP white list feature
+# since 4.2.29
+accessDeniedForUserIP.title = Tilltr\u00e4de beviljas ej.
+accessDeniedForUserIP.message = Du har inte r\u00e4ttighet att logga in. Var v\u00e4nlig kontakta systemadministrat\u00f6ren.
 templates/sv/AdminManager_adminTask_element.htm/1 = -- V\u00e4lj Administrat\u00f6rsfunktion --
-
 templates/sv/AdminManager_adminTask_element.htm/2 = Anv\u00e4ndare
-
 templates/sv/AdminManager_adminTask_element.htm/3 = Avdelningar
-
 templates/sv/AdminManager_adminTask_element.htm/5 = Filhantering
-
+templates/sv/AdminManager_adminTask_element.htm/6 = IP vitlista
 templates/sv/AdminManager_adminTask_element.htm/7 = IP-accesser
-
-templates/sv/AdminManager_adminTask_element.htm/10 = Mallar
-
+templates/sv/AdminManager_adminTask_element.htm/10 = Mallar Grupp
 templates/sv/AdminManager_adminTask_element.htm/11 = Roller
-
 templates/sv/AdminManager_adminTask_element.htm/12 = R\u00e4knare
-
 templates/sv/AdminManager_adminTask_element.htm/14 = Systeminst\u00e4llningar
-
 templates/sv/AdminManager_adminTask_element.htm/15 = Ta bort ett dokument
-
 templates/sv/AdminManager_adminTask_element.htm/17 = Kategorier
-
+templates/sv/AdminManager_adminTask_element.htm/18 = Exportera dokument
 templates/sv/AdminManager_adminTask_element.htm/AdminSearchTerms = S\u00f6kord
-
 templates/sv/AdminManager_useradminTask_element.htm/1 = -- V\u00e4lj Administrat\u00f6rsfunktion --
-
 templates/sv/AdminManager_useradminTask_element.htm/2 = Anv\u00e4ndare
-
 templates/sv/AdminRoles_Add.htm/1 = L\u00e4gg till ny roll
-
 templates/sv/AdminRoles_Add.htm/3 = Ange \n        \
 		det nya rollnamnet:
-
 templates/sv/AdminRoles_Delete1.htm/1 = Radera roll
-
 templates/sv/AdminRoles_Delete1.htm/2 = Varning!
-
 templates/sv/AdminRoles_Delete1.htm/3 = Om \n\
 		\t\tdu tar bort den valda rollen s\u00e5 kommer befintliga anv\u00e4ndare \n\
 		\t\toch dokument att p\u00e5verkas. \u00c4r du s\u00e4ker p\u00e5 att du \n\
 		\t\tvill ta bort rollen?
-
 templates/sv/AdminRoles_Delete1.htm/4 = De 50 f\u00f6rsta <b>anv\u00e4ndarna</b> som p\u00e5verkas vid borttagning. (Totalt
-
 templates/sv/AdminRoles_Delete1.htm/6 = De 50 f\u00f6rsta <b>dokumenten</b> som p\u00e5verkas vid borttagning. (Totalt
-
 templates/sv/AdminRoles_Delete2.htm/1 = Radera roll
-
 templates/sv/AdminRoles_Delete2.htm/2 = Varning!
-
 templates/sv/AdminRoles_Delete2.htm/3 = &Auml;r du s&auml;ker p&aring; att du vill ta bort rollen?
-
 templates/sv/AdminRoles_Edit.html/1 = Redigera r&auml;ttigheter f&ouml;r roll
-
 templates/sv/AdminRoles_Edit.html/2 = Roll
-
 templates/sv/AdminRoles_Edit_Permissions_List.html/1 = R&auml;ttigheter
-
 templates/sv/AdminRoles.htm/1 = Administrera roller
-
 templates/sv/AdminRoles.htm/2 = Administrera anv&auml;ndar - roller
-
 templates/sv/AdminRoles_Rename.htm/1 = Byt namn p&aring; roll
-
 templates/sv/AdminRoles_Rename.htm/3 = Ange nytt rollnamn f\u00f6r
-
 templates/sv/AdminRoles_roles.htm/1 = Administrera roller
-
 templates/sv/AdminRoles_roles.htm/2 = Befintliga roller:
-
+templates/sv/AdminRoles_external_roles.htm/3=Azure externa roller
+templates/sv/AdminRoles_select_roles.htm/1=Välj värden
 templates/sv/AdminRoles_roles.htm/2001 = L\u00e4gg till ny roll
-
 templates/sv/AdminRoles_roles.htm/2002 = Byt namn
-
 templates/sv/AdminRoles_roles.htm/2003 = Redigera
-
 templates/sv/AdminRoles_roles.htm/2004 = Ta bort roll
-
 templates/sv/AdminSystemMessage.htm/3 = Startsida
-
 templates/sv/AdminSystemMessage.htm/7 = Sidnummer:
-
 templates/sv/AdminSystemMessage.htm/8 = System-meddelande
-
 templates/sv/AdminSystemMessage.htm/12 = Meddelande:
-
 templates/sv/AdminSystemMessage.htm/14 = Servermaster
-
 templates/sv/AdminSystemMessage.htm/18 = Namn:
-
 templates/sv/AdminSystemMessage.htm/21 = E-post:
-
 templates/sv/AdminSystemMessage.htm/22 = Webmaster
-
+# @since 4.0.17
+templates/sv/AdminSystemMessage.htm/23 = \u00c5terst\u00e4llning av l\u00f6senord
+templates/sv/AdminSystemMessage.htm/24 = L\u00e4nkens gilltighets tid (i timmar)
+# end of @since 4.0.17
 templates/sv/AdminSystemMessage.htm/2001 = \u00c4ndra
-
-
 templates/sv/AdminUserResp_admin_part.htm/2 = Aktiverad
-
 templates/sv/AdminUserResp_admin_part.htm/3/1 = Rolltillh\u00f6righet
-
 templates/sv/AdminUserResp_admin_part.htm/8 = V\u00e4lj vilka roller anv\u00e4ndaren<br>skall tillh\u00f6ra.
-
 templates/sv/AdminUserResp_admin_part.htm/9 = Inl\u00e4ggningsdatum
-
 templates/sv/AdminUserResp_admin_part.htm/1001 = Anv\u00e4ndarens Roller <b class="red">*</b>
-
 templates/sv/AdminUserResp.htm/1 = L\u00e4gg till/redigera anv\u00e4ndare
-
 templates/sv/AdminUserResp.htm/2/1 = Du har inte fyllt i ett obligatoriskt f\u00e4lt! Fyll i alla obligatoriska f\u00e4lt
-
 templates/sv/AdminUserResp.htm/2/2 = Obs! Verifieringen av l\u00f6senordet misslyckades!
-
-
-
 templates/sv/AdminUserResp.htm/2/5 = Du har valt roller f\u00f6r useradmin utan att dela ut rollen 'Useradmin' !
-
 templates/sv/AdminUserResp.htm/2/6 = Valda roller f\u00f6r Useradmin kommer EJ att sparas!
-
 templates/sv/AdminUserResp.htm/5/1 = L\u00e4gg till / redigera anv\u00e4ndare
-
 templates/sv/AdminUserResp.htm/6 = Observera att samtliga obligatoriska f\u00e4lt m\u00e5ste vara ifyllda \n\
 		\tf\u00f6r att en anv\u00e4ndare skall kunna skapas!
-
 templates/sv/AdminUserResp.htm/8 = Anv\u00e4ndarnamn <b class="red">*</b>
-
 templates/sv/AdminUserResp.htm/10 = L\u00f6senord <b class="red">*</b>
-
 templates/sv/AdminUserResp.htm/11 = (Min 4 - Max 15 tkn)
-
 templates/sv/AdminUserResp.htm/14 = F\u00f6rnamn
-
 templates/sv/AdminUserResp.htm/16 = Efternamn
-
 templates/sv/AdminUserResp.htm/18 = Titel
-
 templates/sv/AdminUserResp.htm/20 = F\u00f6retag
-
 templates/sv/AdminUserResp.htm/22 = Gatuadress
-
 templates/sv/AdminUserResp.htm/24 = Postnummer / ort
-
 templates/sv/AdminUserResp.htm/27 = L\u00e4n
-
 templates/sv/AdminUserResp.htm/29 = Land
-
 templates/sv/AdminUserResp.htm/30 = Spr\u00e5k
-
 templates/sv/AdminUserResp.htm/32 = Telefonnummer
-
 templates/sv/AdminUserResp.htm/36 = Email
-
 templates/sv/AdminUserResp.htm/40 = <b class="red">*</b> Inneb\u00e4r att f\u00e4ltet \u00e4r obligatoriskt
-
 templates/sv/AdminUserResp.htm/1001 = Verifiera l\u00f6senord <b class="red">*</b>
-
 templates/sv/AdminUserResp.htm/2001 = Tillbaka
-
 templates/sv/AdminUserResp.htm/2002 = Hj\u00e4lp
-
 templates/sv/AdminUserResp.htm/2003 = \u00d6ppna hj\u00e4lpsidan
-
 templates/sv/AdminUserResp.htm/2004 = L\u00e4gg till
-
 templates/sv/AdminUserResp.htm/2005 = \u00c4ndra
-
 templates/sv/AdminUserResp.htm/2006 = Ta bort
-
 templates/sv/AdminUserResp.htm/2007 = Spara
-
 templates/sv/AdminUserResp.htm/2008 = \u00c5terst\u00e4ll
-
 templates/sv/AdminUserResp.htm/2009 = Avbryt
-
 templates/sv/AdminUserResp_superadmin_part.htm/2 = Aktiverad
-
 templates/sv/AdminUserResp_superadmin_part.htm/3/1 = Rolltillh\u00f6righet
-
+templates/sv/AdminUserResp_superadmin_part.htm/4 = Inaktivera tv\u00e5faktors autentisering
 templates/sv/AdminUserResp_superadmin_part.htm/8 = Useradmin - Roller
-
 templates/sv/AdminUserResp_superadmin_part.htm/10 = V\u00e4lj vilka roller anv\u00e4ndaren<br>skall tillh\u00f6ra.
-
 templates/sv/AdminUserResp_superadmin_part.htm/11 = V\u00e4lj vilka roller som kan administreras<br>om anv\u00e4ndaren har rollen Useradmin.
-
 templates/sv/AdminUserResp_superadmin_part.htm/12 = Inl\u00e4ggningsdatum:
-
 templates/sv/AdminUserResp_superadmin_part.htm/1001 = Anv\u00e4ndarens Roller <b class="red">*</b>
-
 templates/sv/back_button.html/2001 = Tillbaka
-
 templates/sv/change_img.html/originalSize = (Egentlig storlek)
-
 templates/sv/change_img.html/1 = \u00c4ndra bild
-
 templates/sv/change_img.html/4/1 = L\u00e4gg till ny bild
-
+templates/sv/change_img.html/4/2 = V\u00e4lj befintlig bild
 image/edit_image_on_page = Redigera bild {0} p\u00e5 sida {1}
-
 templates/sv/change_img.html/12 = Bilds\u00f6kv\u00e4g (src)
-
 templates/sv/change_img.html/14 = Bildnamn (name)
-
 templates/sv/change_img.html/16 = Format/storlek
-
 templates/sv/change_img.html/size_explanation = Ny storlek: ange bredd eller h\u00f6jd
-
 templates/sv/change_img.html/17 = <b>Bredd</b>
-
 templates/sv/change_img.html/18 = <b>H\u00f6jd</b>
-
 templates/sv/change_img.html/19 = <b>Kant</b>
-
 templates/sv/change_img.html/25 = &quot;Luft&quot; kring bilden (h/vspace)
-
 templates/sv/change_img.html/27 = px ovan/under
-
 templates/sv/change_img.html/29 = px p\u00e5 sidorna
-
 templates/sv/change_img.html/30 = N\u00e4sta textf\u00e4lts placering (align)
-
 templates/sv/change_img.html/31 = Ingen
-
 templates/sv/change_img.html/33 = Toppen
-
 templates/sv/change_img.html/34 = Mitten
-
 templates/sv/change_img.html/35 = Botten
-
 templates/sv/change_img.html/39 = Bild v\u00e4nster
-
 templates/sv/change_img.html/40 = Bild h\u00f6ger
-
 templates/sv/change_img.html/41 = Text i textversion (alt)
-
 templates/sv/change_img.html/43/1 = L\u00e4nkad bild
-
 templates/sv/change_img.html/44 = S\u00f6kv\u00e4g/URL (href)
-
 templates/sv/change_img.html/46 = L\u00e4nk \u00f6ppnas i (target)
-
 templates/sv/change_img.html/47 = Aktuellt f\u00f6nster
-
 templates/sv/change_img.html/48 = Nytt f\u00f6nster
-
 templates/sv/change_img.html/49 = Moderram
-
 templates/sv/change_img.html/50 = Samma ram
-
 templates/sv/change_img.html/51 = Annan ram
-
 templates/sv/change_img.html/2002 = Hj\u00e4lp
-
 templates/sv/change_img.html/2003 = \u00d6ppna hj\u00e4lpsidan
-
-templates/sv/change_img.html/2004 = V\u00e4lj fr\u00e5n bildarkiv
-
+templates/sv/change_img.html/2004 = V\u00e4lj filer
 templates/sv/change_img.html/2005 = Ladda upp
-
 templates/sv/change_img.html/2006 = F\u00f6rhandsgranska
-
 templates/sv/change_img.html/2007 = Spara
-
 templates/sv/change_img.html/2008 = Avbryt
-
 templates/sv/change_img.html/2009 = Ta bort
-
+templates/sv/change_img.html/2010 = V\u00e4lj fr\u00e5n bildarkiv
 templates/sv/change_img.html/4000 = Intern
-
 templates/sv/change_img.html/4001 = Extern
-
+templates/sv/change_img.html/4002 = \u00c4ndra besk\u00e4rning
+templates/sv/change_img.html/4003 = Bildbesk\u00e4rning
+templates/sv/change_img.html/4004 = X1
+templates/sv/change_img.html/4005 = Y1
+templates/sv/change_img.html/4006 = X2
+templates/sv/change_img.html/4007 = Y2
+templates/sv/change_img.html/4008 = \u00c5terst\u00e4ll
+templates/sv/change_img.html/4009 = Filformat
+templates/sv/change_img.html/4010 = Beskuren storlek
+templates/sv/change_img.html/4011 = Original storlek
+templates/sv/change_img.html/4012 = <b>Maxbredd</b>
+templates/sv/change_img.html/4013 = <b>Maxh\u00f6jd</b>
+templates/sv/change_img.html/use_fixed_btn_text = Anv\u00e4nd fasta m\u00e5tt
+templates/sv/change_img.html/use_fixed_info = (B\u00e4ttre vid besk\u00e4rning)
+templates/sv/change_img.html/best_fit = Best fit
+templates/sv/change_img.html/actual_size = Actual size
+templates/sv/change_img.html/zoom_in = Zoom in
+templates/sv/change_img.html/zoom_out = Zoom out
+templates/sv/change_img.html/zoom = Zoom
 templates/sv/change_include.html/1 = Include
-
 templates/sv/change_include.html/1001 = Redigera&nbsp;sidan
-
 templates/sv/change_include.html/2001 = OK
-
 templates/sv/change_text.html/1 = Redigera text
-
 templates/sv/change_text.html/4/1 = Redigera text $textIndex p\u00e5 sida $documentId
-
 templates/sv/change_text.html/8/1 = \u00d6vriga funktioner
-
 templates/sv/change_text.html/8/2 = (G\u00e4ller endast HTML-format)
-
 templates/sv/change_text.html/9 = Byt ut radbrytningar mot &lt;BR&gt;
-
 templates/sv/change_text.html/10 = Skapa en l\u00e4nk med l\u00e4nk-editorn
-
 templates/sv/change_text.html/12 = Du m\u00e5ste v\u00e4lja HTML l\u00e4ge f\u00f6r att\\nl\u00e4gga in \\"Break-taggar\\" i texten!\\n\\nVill du g\u00f6ra detta nu?
-
 templates/sv/change_text.html/13 = Du m\u00e5ste ha
-
 templates/sv/change_text.html/14 = Windows och
-
 templates/sv/change_text.html/15 = Internet Explorer 5.5+ f\u00f6r att kunna anv\u00e4nda Text-editorn.
-
 templates/sv/change_text.html/1001 = Format:
-
 templates/sv/change_text.html/1002 = Vanlig text
-
 templates/sv/change_text.html/1003 = HTML
-
 templates/sv/change_text.html/2001 = Tillbaka
-
 templates/sv/change_text.html/2002 = Text-editor
-
 templates/sv/change_text.html/2003 = \u00d6ppna Text-editorn.
-
 templates/sv/change_text.html/2004 = Hj\u00e4lp
-
 templates/sv/change_text.html/2005 = \u00d6ppna hj\u00e4lpsidan
-
 templates/sv/change_text.html/2006 = Spara &amp; st\u00e4ng
-
 templates/sv/change_text.html/save = Spara
-
+templates/sv/change_text.html/reload = Ladda om
 templates/sv/change_text.html/2007 = \u00c5terst\u00e4ll
-
 templates/sv/change_text.html/2008 = St\u00e4ng
-
 templates/sv/change_text.html/2009 = Koda radbrytningar
-
 templates/sv/change_text.html/2010 = Skapa l\u00e4nk
-
 templates/sv/change_text.html/2020 = Du har redan \\"<BR>\\" i texten!\\nRadbrytningar kommer att l\u00e4ggas in\\noberoende av dessa, vid varje radslut.\\n\\nVill du g\u00f6ra det?
-
 templates/sv/copy_file_warning.html/1 = Varning!
-
 templates/sv/copy_file_warning.html/2 = Varning!
-
 templates/sv/copy_file_warning.html/3 = Nedanst\u00e5ende dokument \u00e4r filer och g\u00e5r tyv\u00e4rr inte att kopiera.
-
 templates/sv/copy_file_warning.html/4 = Dokument<br>
-
 templates/sv/copy_file_warning.html/2001 = Tillbaka
-
 templates/sv/copy_prefix.html/1 = (Kopia)
-
 templates/sv/docinfo/change_meta_rights.html/1 = \u00c4ndra r\u00e4ttigheter
-
 templates/sv/docinfo/change_meta_rights.html/5/1 = \u00c4ndra r\u00e4ttigheter f\u00f6r sida
-
 templates/sv/docinfo/change_meta_rights.html/7 = Roller utan beh\u00f6righet
-
 templates/sv/docinfo/change_meta_rights.html/9/1 = Definiera begr\u00e4nsade beh\u00f6righeter
-
 templates/sv/docinfo/change_meta_rights.html/12 = Dela ut
-
 templates/sv/docinfo/change_meta_rights.html/1001 = Beh\u00f6righet&nbsp;(Roller)
-
 templates/sv/docinfo/change_meta_rights.html/1002 = (V\u00e4lj &quot;Ingen&quot; f\u00f6r att v\u00e4lja bort en roll)
-
 templates/sv/docinfo/change_meta_rights.html/2001 = Tillbaka
-
 templates/sv/docinfo/change_meta_rights.html/2002 = Hj\u00e4lp
-
 templates/sv/docinfo/change_meta_rights.html/2003 = \u00d6ppna hj\u00e4lpsidan
-
 templates/sv/docinfo/change_meta_rights.html/2004 = ^ L\u00e4gg till / Uppdatera ^
-
 templates/sv/docinfo/change_meta_rights.html/2005 = Spara
-
 templates/sv/docinfo/change_meta_rights.html/2006 = \u00c5terst\u00e4ll
-
 templates/sv/docinfo/change_meta_rights.html/2007 = Avbryt
-
 templates/sv/docinfo/default_templates_1.html/1 = Begr. 1:
-
 templates/sv/docinfo/default_templates_1.html/2 = - Ingen mall -
-
 templates/sv/docinfo/default_templates.html/2 = Standardmall f\u00f6r nya sidor
-
 templates/sv/docinfo/default_templates.html/4 = - Ingen mall -
-
 templates/sv/docinfo/default_templates.html/5 = Begr. 2:
-
 templates/sv/docinfo.html/1 = imCMS - Admin
-
 templates/sv/docinfo.html/2001 = Tillbaka
-
 templates/sv/existing_doc.html/1 = Skapa l\u00e4nk till intern sida
-
 templates/sv/existing_doc.html/5/1 = S\u00f6k befintliga sidor
-
 templates/sv/existing_doc.html/8 = Inkludera sidor av typen
-
 templates/sv/existing_doc.html/17 = Inkludera sidor mellan dessa datum
-
 templates/sv/existing_doc.html/18 = Start datum:
-
 templates/sv/existing_doc.html/20 = Slut datum:
-
 templates/sv/existing_doc.html/22 = G\u00e4ller skapat datum:
-
 templates/sv/existing_doc.html/23 = G\u00e4ller \u00e4ndrat datum:
-
 templates/sv/existing_doc.html/1002 = S\u00f6kord / sidans id:
-
 templates/sv/existing_doc.html/1003 = Alla m\u00e5ste finnas
-
 templates/sv/existing_doc.html/1004 = N\u00e5got m\u00e5ste finnas
-
 templates/sv/existing_doc.html/1005 = Sortera efter
-
 templates/sv/existing_doc.html/sort_by/headline = Rubrik
-
 templates/sv/existing_doc.html/sort_by/id = Dokument-id
-
 templates/sv/existing_doc.html/sort_by/type = Dokument-typ
-
 templates/sv/existing_doc.html/sort_by/modified_datetime = \u00c4ndrad datum/tid
-
 templates/sv/existing_doc.html/sort_by/created_datetime = Skapad datum/tid
-
 templates/sv/existing_doc.html/sort_by/archived_datetime = Arkiverad datum/tid
-
 templates/sv/existing_doc.html/sort_by/published_datetime = Publicerad datum/tid
-
 templates/sv/existing_doc.html/2007 = S\u00f6k / L\u00e4gg till
-
 templates/sv/existing_doc_res.html/1/1 = V\u00e4lj befintliga sidor
-
 templates/sv/existing_doc_res.html/2 = Vald
-
 templates/sv/existing_doc_res.html/3 = MetaId
-
 templates/sv/existing_doc_res.html/4 = Rubrik
-
 templates/sv/existing_doc_res.html/5 = Text
-
 templates/sv/existing_doc_res.html/6 = Sidtyp
-
 templates/sv/existing_doc_res.html/7 = Skapad
-
 templates/sv/existing_doc_res.html/8 = \u00c4ndrad
-
 templates/sv/existing_doc_res.html/2001 = Skapa l\u00e4nk till markerade sidor
-
 templates/sv/existing_doc_res.html/2002 = Avbryt
-
 templates/sv/FileAdminCopyOverwriteWarning.html/1 = Varning!
-
 templates/sv/FileAdminCopyOverwriteWarning.html/3 = F\u00f6ljande filer kommer att skrivas \u00f6ver:
-
 templates/sv/FileAdminCopyOverwriteWarning.html/5 = Vill du forts\u00e4tta?
-
 templates/sv/FileAdminCopyOverwriteWarning.html/2001 = Ja
-
 templates/sv/FileAdminCopyOverwriteWarning.html/2002 = Nej
-
 templates/sv/FileAdminDeleteWarning.html/1 = Varning!
-
 templates/sv/FileAdminDeleteWarning.html/3 = F\u00f6ljande filer kommer att raderas:
-
 templates/sv/FileAdminDeleteWarning.html/5 = Vill du forts\u00e4tta?
-
 templates/sv/FileAdminDeleteWarning.html/2001 = Ja
-
 templates/sv/FileAdminDeleteWarning.html/2002 = Nej
-
 templates/sv/FileAdminFileBlank.html/1 = Varning!
-
 templates/sv/FileAdminFileBlank.html/2 = <b>Varning!</b>
-
 templates/sv/FileAdminFileBlank.html/3 = Du gl\u00f6mde v\u00e4lja en fil.
-
 templates/sv/FileAdminFileBlank.html/2001 = Tillbaka
-
 templates/sv/FileAdminFileExisted.html/1 = Varning!
-
 templates/sv/FileAdminFileExisted.html/2 = <b>Varning!</b>
-
 templates/sv/FileAdminFileExisted.html/3 = Det fanns redan en fil med det namnet. Den befintliga filen bytte namn till &quot;#filename#&quot;.
-
 templates/sv/FileAdminFileExisted.html/2001 = Tillbaka
-
 templates/sv/FileAdmin.html/3 = <b>Aktuell katalog:</b><br>#dir1#
-
 templates/sv/FileAdmin.html/4 = <b>Aktuell katalog:</b><br>#dir2#
-
 templates/sv/FileAdmin.html/6 = <b>Radera</b>
-
 templates/sv/FileAdmin.html/7 = <br>\n\
 		\t\t<b>Flytta</b>
-
 templates/sv/FileAdmin.html/8 = <br>\n\
 		\t\t<b>Kopiera</b>
-
 templates/sv/FileAdmin.html/9 = <br>\n\
 		\t\t<b>Visa</b>
-
 templates/sv/FileAdmin.html/10 = <br>\n\
 		\t\t<b>Redigera</b>
-
 templates/sv/FileAdmin.html/13 = <b>Nytt namn / Ny katalog:</b><br>
-
 templates/sv/FileAdmin.html/1002 = <br>\n\
 		\t\t<b>Ladda&nbsp;ner</b>
-
 templates/sv/FileAdmin.html/1003 = <b>Ny fil:</b>
-
 templates/sv/FileAdmin.html/2001 = Byt katalog
-
 templates/sv/FileAdmin.html/2002 = &laquo;
-
 templates/sv/FileAdmin.html/2003 = &raquo;
-
 templates/sv/FileAdmin.html/2004 = &laquo;&laquo;
-
 templates/sv/FileAdmin.html/2005 = &raquo;&raquo;
-
 templates/sv/FileAdmin.html/2006 = &laquo;
-
 templates/sv/FileAdmin.html/2007 = &raquo;
-
 templates/sv/FileAdmin.html/2008 = &laquo;
-
 templates/sv/FileAdmin.html/2009 = &raquo;
-
 templates/sv/FileAdmin.html/2010 = &laquo;
-
 templates/sv/FileAdmin.html/2011 = &raquo;
-
 templates/sv/FileAdmin.html/2012 = &laquo;
-
 templates/sv/FileAdmin.html/2013 = &raquo;
-
 templates/sv/FileAdmin.html/2014 = Byt katalog
-
 templates/sv/FileAdmin.html/2015 = Ladda upp
-
 templates/sv/FileAdmin.html/2016 = Ladda upp
-
 templates/sv/FileAdmin.html/2017 = Byt namn
-
 templates/sv/FileAdmin.html/2018 = Skapa katalog
-
 templates/sv/FileAdmin.html/2019 = Byt namn
-
 templates/sv/FileAdmin.html/2020 = Skapa katalog
-
 templates/sv/FileAdmin.html/2022 = Tillbaka
-
 templates/sv/FileAdminMoveOverwriteWarning.html/1 = Varning!
-
 templates/sv/FileAdminMoveOverwriteWarning.html/3 = F\u00f6ljande filer kommer att skrivas \u00f6ver:
-
 templates/sv/FileAdminMoveOverwriteWarning.html/5 = Vill du forts\u00e4tta?
-
 templates/sv/FileAdminMoveOverwriteWarning.html/2001 = Ja
-
 templates/sv/FileAdminMoveOverwriteWarning.html/2002 = Nej
-
 templates/sv/FileAdminNameBlank.html/1 = Varning!
-
 templates/sv/FileAdminNameBlank.html/2 = <b>Varning!</b>
-
 templates/sv/FileAdminNameBlank.html/3 = Du gl\u00f6mde fylla i ett namn.
-
 templates/sv/FileAdminNameBlank.html/2001 = Tillbaka
-
 templates/sv/include_bad_id.html/1 = Felaktigt dokument-id
-
 templates/sv/include_bad_id.html/3 = Du skrev in ett felaktigt dokument-id, eller s\u00e5 var dokumentet inte en rext sida, utan en l\u00e4nk till ett externt\n     \
 		dokument eller liknande.<br>
-
 templates/sv/include_bad_id.html/2001 = Tillbaka
-
 templates/sv/include_permission_denied.html/1 = R\u00e4ttighet saknas
-
 templates/sv/include_permission_denied.html/3 = Du kan inte \u00e4ndra p\u00e5 denna include. Detta\n  \
 		kan bero p\u00e5 flera saker:<br><br>\n     \
 		1. Du har inte r\u00e4tt att \u00e4ndra includes p\u00e5 denna sida.<br><br>\n     \
@@ -2157,18 +1203,12 @@ templates/sv/include_permission_denied.html/3 = Du kan inte \u00e4ndra p\u00e5 d
 		<br>\n\
 		3. Dokumentet du f\u00f6rs\u00f6ker inkludera finns inte.<br>\n\
 		<br>
-
 templates/sv/include_permission_denied.html/2001 = OK
-
 templates/sv/inPage_admin_no_template.html/1 = Varning!
-
 templates/sv/inPage_admin_no_template.html/2 = Varning!
-
 templates/sv/inPage_admin_no_template.html/3 = Du gl\u00f6mde ange en mall. V\u00e4nligen f\u00f6rs\u00f6k \n\
 		\t\tigen.
-
 templates/sv/inPage_admin_no_template.html/2001 = Tillbaka
-
 templates/sv/mail_body.html/1 = Hej #mailText6#!\n  \
 		\n  \
 		\n\
@@ -2179,7 +1219,6 @@ templates/sv/mail_body.html/1 = Hej #mailText6#!\n  \
 		\n  \
 		\n\
 		#mailLink#
-
 templates/sv/mail_body_shop.html/1 = Best\u00e4llning ur shoppen!\n\
 		------------------------------------\n \
 		\n\
@@ -2195,7 +1234,6 @@ templates/sv/mail_body_shop.html/1 = Best\u00e4llning ur shoppen!\n\
 		#mailText3# #mailText4#\n \
 		\n\
 		E-post: #mailFrom#
-
 templates/sv/mail_body_to_admin.html/1 = \u00c4mne: #mailSubject#\n \
 		\n\
 		Namn: #mailText1#\n\
@@ -2206,951 +1244,519 @@ templates/sv/mail_body_to_admin.html/1 = \u00c4mne: #mailSubject#\n \
 		\n\
 		Text: \n\
 		#mailText5#
-
 templates/sv/mail_subject.html/1 = Ett tips fr\u00e5n #mailText1#
-
 templates/sv/no_active_document.html/1 = Sidan \u00e4r inte publicerad
-
 templates/sv/no_active_document.html/2 = Meddelande
-
 templates/sv/no_active_document.html/3 = Startsidan
-
 templates/sv/no_active_document.html/4 = Tillbaka
-
 templates/sv/no_active_document.html/5 = Sidan som efterfr\u00e5gas \u00e4r inte publicerad
-
 templates/sv/no_demotemplate.html/1 = Mallexempel Saknas!
-
 templates/sv/no_demotemplate.html/2 = Det finns tyv\u00e4rr inget mallexempel f\u00f6r den h\u00e4r mallen.
-
 templates/sv/no_page.html/1 = Sidan Saknas!
-
 templates/sv/no_page.html/2 = Kan inte hitta sidan. Kontakta <a href="mailto:{0}">systemansvarig</a>, \n  \
 		eller f\u00f6rs\u00f6k igen.
-
-templates/sv/password_error_input.txt/1 = Var v\u00e4nlig och fyll i anv\u00e4ndarnamn.
-
-templates/sv/password_no_email.txt/1 = Subject: L\u00f6senord, ingen e-post adress\n\
-		\n\
-		Meddelande fr\u00e5n host: #host#\n\
-		\n\
-		F\u00f6rfr\u00e5gan om l\u00f6senord fr\u00e5n anv\u00e4ndaren #username# kunde inte utf\u00f6ras pga att ingen giltig e-post adress finns registrerad.
-
-templates/sv/password_no_right.txt/1 = Subject: L\u00f6senord, ingen r\u00e4ttighet\n\
-		\n\
-		Meddelande fr\u00e5n host: #host#\n\
-		\n\
-		Anv\u00e4ndare #username# har inte r\u00e4ttighet att f\u00e5 l\u00f6senordet skickat via e-post.
-
-templates/sv/password_no_user.txt/1 = Subject: L\u00f6senord, anv\u00e4ndarnamnet existerar ej\n\
-		\n\
-		Meddelande fr\u00e5n host: #host#\n\
-		\n\
-		Anv\u00e4ndar namnet #username# finns ej.
-
-templates/sv/password_sent.html/1 = L\u00f6senord via e-post
-
-templates/sv/password_sent.html/4 = <b>Utf\u00f6rt!</b><br><br>\n\
-		\tL\u00f6senordet har skickats till den registrerade e-post adressen.
-
-templates/sv/password_sent.html/2001 = Startsidan
-
-templates/sv/password_sent.html/2002 = Logga in
-
-templates/sv/password_sent.txt/1 = Subject: L\u00f6senord skickat\n\
-		\n\
-		\n\
-		Meddelande fr\u00e5n host: #host#\n\
-		\n\
-		P\u00e5 beg\u00e4ran av anv\u00e4ndare #username# har l\u00f6senordet skickats till e-post adressen: #email#.
-
-templates/sv/password_not_sent.html = <b>Kunde ej skicka l\u00f6senord!</b><br><br>\n\
-		Tyv\u00e4rr kunde inte din f\u00f6rfr\u00e5gan utf\u00f6ras p\u00e5 grund av n\u00e5gon av f\u00f6ljande anledningar: <br> \n\
-        - e-post adress finns ej registrerad. <br> \n\
-        - anv\u00e4ndarnamnet saknas. <br> \n\
-        - r\u00e4ttighet att f\u00e5 l\u00f6senord med e-post saknas.\n\
-
-templates/sv/password_submit.html/1 = L\u00f6senord via e-post
-
-templates/sv/password_submit.html/5 = E-post/Anv\u00e4ndarnamn
-
-templates/sv/password_submit.html/2001 = Startsidan
-
-templates/sv/password_submit.html/2002 = Logga in
-
-templates/sv/password_submit.html/2003 = Hj\u00e4lp
-
-templates/sv/password_submit.html/2004 = \u00d6ppna hj\u00e4lpsidan
-
-templates/sv/password_submit.html/2005 = S\u00e4nd
-
-templates/sv/password_user_mail.txt/1 = Subject: Inloggningsuppgifter\n\
-  \n\
-  \n\
-  H\u00e4r \u00e4r dina inloggningsuppgifter till webbplatsen: #host# \n\
-  \n\
-  \n\
-  Anv\u00e4ndarID: #username# \n\
-  L\u00f6senord: #password# \n\
-  \n\
-  \n\
-  H\u00e4lsningar \n\
-  #host# \n
-
+# Missing login data error page
+# @since 4.2.27
+missinglogindata.title = Problem att skicka data
+missinglogindata.login.page = Logga in
+missinglogindata.message = Pga ett fel i webbl\u00E4saren fungerade inte din inloggning. \
+  Det \u00E4r ett tempor\u00E4rt fel s\u00E5 du kan starta om och prova igen. \
+  Om du anv\u00E4nder Internet Explorer s\u00E5 kan du prova med en annan webbl\u00E4saren.
+# Password reset
+# @since 4.0.17
+passwordreset.title = \u00c5terst\u00e4ll l\u00f6senord
+passwordreset.title.validation_errors =  Vi saknar information!
+passwordreset.error.missing_identity = E-postadress eller anv\u00e4ndarnamnet saknas
+passwordreset.identity_form_info = \
+  Skriv in e-postadressen eller anv\u00e4ndarnamnet som h\u00f6r till ditt konto, klicka sen p\u00e5 Skicka. \
+  Vi kommer att e-posta dig en l\u00e4nk till en \u00e5terst\u00e4llningssida d\u00e4r du l\u00e4tt kan skapa ett nytt l\u00f6senord.
+passwordreset.identity_form.lbl_identity = E-post eller anv\u00e4ndarnamnet
+passwordreset.identity_form.submit = Skicka
+# params:
+#   {0} - email address entered by an user
+#   {1} - web master address
+passwordreset.confirmation.email_sent = \
+  Titta i din e-post!. \
+  Om e-postadressen eller anv\u00e4ndarnamnet <span style="font-weight: bold; color: #708090;"> {0} </span> finns registrerad p\u00e5 ditt konto, \
+  kommer du att f\u00e5 ett meddelande med instruktioner om hur du \u00e5terst\u00e4ller l\u00f6senordet.  \
+  Om du inte f\u00e5r ett e-postmeddelande, titta i ditt spamfilter eller skr\u00e4ppostkatalog \
+  eller kontakta webbplatsens administrat\u00f6r {1} f\u00f6r att f\u00e5 hj\u00e4lp.
+passwordreset.password_reset_form_info = \
+  Skriv ditt nya l\u00f6senord. \
+  Vi kommer att fr\u00e5ga efter l\u00f6senordet n\u00e4r du villl logga in i systemet.\
+
+passwordreset.password_reset_form.lbl_password = Nytt l\u00f6senord
+passwordreset.password_reset_form.lbl_password_check = Nytt l\u00f6senord igen
+passwordreset.password_reset_form.submit = Spara
+passwordreset.confirmation.password_changed = Ditt nya l\u00f6senord \u00e4r sparat!
+passwordreset.link.start_page = G\u00e5 till startsidan
+# params:
+#   {0} - server/host name
+passwordreset.password_reset_email.subject = {0}: Beg\u00e4ran om att \u00e5terst\u00e4lla l\u00f6senord. -- DU KAN INTE SVARA P\u00c5 DETTA MAIL --
+# params:
+#   {0} - server/host name
+#   {1} - password reset URL
+passwordreset.password_reset_email.body = \
+    Vi har f\u00e5tt en beg\u00e4ran om att \u00e5terst\u00e4lla ett l\u00f6senord som \u00e4r kopplat till den h\u00e4r e-postadressen p\u00e5 {0}. \n\
+    Om du har beg\u00e4rt \u00e5terst\u00e4llningen, f\u00f6lj instruktionerna nedan. \n\
+    Om du inte har beg\u00e4rt \u00e5terst\u00e4llning kan du ignorera det h\u00e4r meddelandet. Ditt konto \u00e4r s\u00e4kert och fungerar som tidigare. \n\
+    \n\
+    \u00c5TERST\u00c4LL DITT L\u00d6SENORD\n\
+    Klicka p\u00e5 l\u00e4nken nedan f\u00f6r att \u00e5terst\u00e4lla ditt l\u00f6senord p\u00e5 webbplatsens server: \n\
+    \n\
+    {1} \n\
+    \n\
+    Om l\u00e4nken inte fungerar i ditt e-postprogram, kan du klippa ur den och klistra in den i din webbl\u00e4sare (eller skriva in den d\u00e4r manuellt). \n\
+    \n\
+    N\u00e4r du klickat p\u00e5 l\u00e4nken f\u00e5r du vidare instruktioner om hur du \u00e5terst\u00e4ller ditt l\u00f6senord. \n\
+    \n\
+    Med v\u00e4nlig h\u00e4lsning, \n\
+    Systemadministrat\u00f6ren
+# end of 'Password reset'
 templates/sv/permissions/define_permission_1.html/1 = R\u00e4tt att \u00e4ndra dokumentinformation
-
 templates/sv/permissions/define_permission_2_65536.html/1 = R\u00e4tt att \u00e4ndra texter
-
 templates/sv/permissions/define_permission_2_131072.html/1 = R\u00e4tt att \u00e4ndra bilder
-
 templates/sv/permissions/define_permission_2_262144.html/1 = R\u00e4tt att \u00e4ndra menyer
-
 templates/sv/permissions/define_permission_2_262144.html/1001 = Till\u00e5tna&nbsp;dokumenttyper:
-
 templates/sv/permissions/define_permission_2_524288.html/1 = R\u00e4tt att \u00e4ndra mallar
-
 templates/sv/permissions/define_permission_2_524288.html/1001 = Till\u00e5tna&nbsp;mallgrupper:
-
 templates/sv/permissions/define_permission_2_1048576.html/1 = R\u00e4tt att \u00e4ndra includes
-
 templates/sv/permissions/define_permission_4.html/1 = R\u00e4tt att \u00e4ndra r\u00e4ttigheter
-
 templates/sv/permissions/define_permission_5_65536.html/1 = R\u00e4tt att \u00e4ndra inneh\u00e5ll
-
 templates/sv/permissions/define_permissions.html/permissions_for_restricted = R\u00e4ttigheter f\u00f6r begr\u00e4nsad beh\u00f6righet
-
 templates/sv/permissions/define_permissions.html/permissions_for_restricted/new = f\u00f6r nya dokument
-
 templates/sv/permissions/define_permissions.html/permissions_for_restricted/this = f\u00f6r detta dokument
-
 templates/sv/permissions/define_permissions.html/1 = R\u00e4ttigheter f\u00f6r begr\u00e4nsad beh\u00f6righet
-
 templates/sv/permissions/define_permissions.html/2004 = OK
-
 templates/sv/permissions/define_permissions.html/2005 = \u00c5terst\u00e4ll
-
 templates/sv/permissions/define_permissions.html/2006 = Avbryt
-
 templates/sv/permissions/new_set_1_button.html/2001 = Definiera f\u00f6r nya dokument
-
 templates/sv/permissions/new_set_2_button.html/2001 = Definiera f\u00f6r nya dokument
-
 templates/sv/permissions/roles_rights_table_head.html/1 = <b>Dina Roller</b>
-
 templates/sv/permissions/roles_rights_table_head.html/2 = <b>Ingen</b>
-
 templates/sv/permissions/roles_rights_table_head.html/3 = <b>L\u00e4sa</b>
-
 templates/sv/permissions/roles_rights_table_head.html/4 = <b>Begr. 2</b>
-
 templates/sv/permissions/roles_rights_table_head.html/5 = <b>Begr. 1</b>
-
 templates/sv/permissions/roles_rights_table_head.html/6 = <b>Full</b>
-
 templates/sv/permissions/set_1_button.html/1 = Begr\u00e4nsad 1
-
 templates/sv/permissions/set_1_button.html/2001 = Definiera
-
 templates/sv/permissions/set_2_button.html/1 = Begr\u00e4nsad 2
-
 templates/sv/permissions/set_2_button.html/2001 = Definiera
-
 templates/sv/permissions/sets_precedence.html/precedence = F\u00f6retr\u00e4de
-
 templates/sv/permissions/sets_precedence.html/1001 = Begr. 1 \u00e4r mer priviligerad \u00e4n begr. 2 f\u00f6r detta dokument.
-
 templates/sv/return.html/1 = Untitled Document
-
 templates/sv/return.html/2001 = Back
-
 templates/sv/search/search_documents.html/1 = S\u00f6k
-
 templates/sv/search/search_nav_next.html/1001 = N\u00e4sta&nbsp;&raquo;
-
 templates/sv/search/search_nav_prev.html/1001 = &laquo;&nbsp;F\u00f6reg\u00e5ende
-
 templates/sv/search/search_result.html/7 = S\u00f6kresultat
-
 templates/sv/search/search_result.html/1003 = Tr\u00e4ffar:
-
 templates/sv/search/search_result_no_hit.html/1 = <b>Du fick inga tr\u00e4ffar!</b>
-
 templates/sv/sections/admin_section_add.html/1 = Administrera avdelningar (Index ord)
-
 templates/sv/sections/admin_section_add.html/2 = L\u00e4gg till ny avdelning
-
 templates/sv/sections/admin_section_add.html/3 = Ny avdelning:
-
 templates/sv/sections/admin_section_add.html/4 = Lista \u00f6ver befintliga:
-
 templates/sv/sections/admin_section_add.html/2001 = L\u00e4gg till
-
 templates/sv/sections/admin_section_delete_confirm.html/1 = Ta bort avdelning!
-
 templates/sv/sections/admin_section_delete_confirm.html/2 = Varning!
-
 templates/sv/sections/admin_section_delete_confirm.html/3 = Avdelningen\n\
 		\t  har [#docs#] dokument kopplade till sig.<br>Om ni \n      \
 		vill ta bort avdelningskopplingar f\u00f6r dessa dokument, v\u00e4lj "ta bort kopplingar" \n      \
 		fr\u00e5n listan, annars v\u00e4lj en ny avdelning f\u00f6r dessa dokument.
-
 templates/sv/sections/admin_section_delete_confirm.html/4 = V\u00e4lj
-
 templates/sv/sections/admin_section_delete_confirm.html/5 = Ta bort kopplingar
-
 templates/sv/sections/admin_section_delete.html/3 = Avdelningar:
-
 templates/sv/sections/admin_section_delete.html/2001 = Ta bort
-
 templates/sv/sections/admin_section.html/2001 = L\u00e4gg till
-
 templates/sv/sections/admin_section.html/2002 = Ta bort
-
 templates/sv/sections/admin_section.html/2003 = Byt namn
-
 templates/sv/sections/admin_section_name.html/1 = \u00c4ndra avdelningars namn
-
 templates/sv/sections/admin_section_name.html/3 = V\u00e4lj:
-
 templates/sv/sections/admin_section_name.html/5 = Nytt namn:
-
 templates/sv/sections/admin_section_name.html/2001 = Byt namn
-
 templates/sv/sections/admin_section_no_one_msg.html/1 = Ingen avdelning vald
-
 templates/sv/template_admin.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/template_admin.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/template_admin.html/6/1 = Administrera formatmallar
-
 templates/sv/template_admin.html/7 = V\u00e4lj funktion.
-
 templates/sv/template_admin.html/2001 = L\u00e4gg till
-
 templates/sv/template_admin.html/2002 = Ta bort
-
 templates/sv/template_admin.html/2003 = Byt namn
-
 templates/sv/template_admin.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_admin.html/2005 = Redigera
-
 templates/sv/template_admin.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_admin.html/2007 = Visa formatmallar
-
 templates/sv/template_admin.html/2008 = Skapa
-
 templates/sv/template_admin.html/2009 = Ta bort
-
 templates/sv/template_admin.html/2010 = Byt namn
-
 templates/sv/template_admin.html/2011 = Tilldela formatmallar
-
 templates/sv/template_assign.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/template_assign.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/template_assign.html/6/1 = Tilldela formatmallar till grupper
-
 templates/sv/template_assign.html/8 = Aktiv grupp
-
 templates/sv/template_assign.html/10 = Tillg\u00e4ngliga mallar:
-
 templates/sv/template_assign.html/11 = Mallar i gruppen:
-
 templates/sv/template_assign.html/1001 = Formatgrupper:
-
 templates/sv/template_assign.html/1002 = <b>*</b>&nbsp;=&nbsp;Exempelmall finns
-
 templates/sv/template_assign.html/2001 = L\u00e4gg till
-
 templates/sv/template_assign.html/2002 = Ta bort
-
 templates/sv/template_assign.html/2003 = Byt namn
-
 templates/sv/template_assign.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_assign.html/2005 = Redigera
-
 templates/sv/template_assign.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_assign.html/2007 = Visa formatmallar
-
 templates/sv/template_assign.html/2008 = Skapa
-
 templates/sv/template_assign.html/2009 = Ta bort
-
 templates/sv/template_assign.html/2010 = Byt namn
-
 templates/sv/template_assign.html/2011 = Tilldela formatmallar
-
 templates/sv/template_assign.html/2014 = Visa mallar
-
 templates/sv/template_assign.html/2015 = L\u00e4gg till &gt;&gt;
-
 templates/sv/template_assign.html/2016 = &lt;&lt; Ta bort
-
 templates/sv/template_assign.html/2017 = Tillbaka
-
 templates/sv/template_delete.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/template_delete.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/template_delete.html/6/1 = Ta bort formatmall
-
 templates/sv/template_delete.html/1001 = Formatmall
-
 templates/sv/template_delete.html/2001 = L\u00e4gg till
-
 templates/sv/template_delete.html/2002 = Ta bort
-
 templates/sv/template_delete.html/2003 = Byt namn
-
 templates/sv/template_delete.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_delete.html/2005 = Redigera
-
 templates/sv/template_delete.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_delete.html/2007 = Visa formatmallar
-
 templates/sv/template_delete.html/2008 = Skapa
-
 templates/sv/template_delete.html/2009 = Ta bort
-
 templates/sv/template_delete.html/2010 = Byt namn
-
 templates/sv/template_delete.html/2011 = Tilldela formatmallar
-
 templates/sv/template_delete.html/2014 = Ta bort
-
 templates/sv/template_delete.html/2015 = Tillbaka
-
 templates/sv/template_delete_warning.html/1 = Varning
-
 templates/sv/template_delete_warning.html/1001 = <b>Ett dokument m\u00e5ste ha en formatmall!</b><br>\n\
 		\tFormatmallen anv\u00e4nds i nedanst\u00e5ende dokument. V\u00e4lj l\u00e4mplig mall fr\u00e5n listan som ers\u00e4ttning till dokumenten.<br>
-
 templates/sv/template_delete_warning.html/1002 = Dokument
-
 templates/sv/template_delete_warning.html/1003 = Ny mall
-
 templates/sv/template_delete_warning.html/2001 = Tillbaka
-
 templates/sv/template_delete_warning.html/2002 = Hj\u00e4lp
-
 templates/sv/template_delete_warning.html/2003 = \u00d6ppna hj\u00e4lpsidan
-
 templates/sv/template_delete_warning.html/2004 = OK
-
 templates/sv/template_delete_warning.html/2005 = Avbryt
-
 templates/sv/templatedemo_upload_done.html/1 = Meddelande
-
 templates/sv/templatedemo_upload_done.html/4 = <b>Klart!</b><br>\n\
 		\tUppladdningen lyckades.
-
 templates/sv/templatedemo_upload_done.html/2001 = Tillbaka
-
 templates/sv/templatedemo_upload_error.html/1 = Varning
-
 templates/sv/templatedemo_upload_error.html/4 = <b>Ett fel uppstod vid uppladdningen.</b><br>\n\
 		\tKontakta systemadministrat\u00f6ren.
-
 templates/sv/templatedemo_upload_error.html/2001 = Tillbaka
-
 templates/sv/templatedemo_upload_file_blank.html/1 = Varning
-
 templates/sv/templatedemo_upload_file_blank.html/4 = <b>Du gl\u00f6mde ange en fil.</b><br>\n\
 		\tV\u00e4nligen f\u00f6rs\u00f6k igen.
-
 templates/sv/templatedemo_upload_file_blank.html/2001 = Tillbaka
-
 templates/sv/templatedemo_upload.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/templatedemo_upload.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/templatedemo_upload.html/6/1 = Ladda upp ny exemplemall
-
 templates/sv/templatedemo_upload.html/9 = Existerande exempelmall kommer att skrivas \u00f6ver.
-
 templates/sv/templatedemo_upload.html/1001 = Ange exempelmall
-
 templates/sv/templatedemo_upload.html/1002 = V\u00e4lj mall
-
 templates/sv/templatedemo_upload.html/1003 = <b>*</b> = Exempelmall finns
-
 templates/sv/templatedemo_upload.html/2001 = L\u00e4gg till
-
 templates/sv/templatedemo_upload.html/2002 = Ta bort
-
 templates/sv/templatedemo_upload.html/2003 = Byt namn
-
 templates/sv/templatedemo_upload.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/templatedemo_upload.html/2005 = Redigera
-
 templates/sv/templatedemo_upload.html/2006 = Ladda upp exempelmallar
-
 templates/sv/templatedemo_upload.html/2007 = Visa formatmallar
-
 templates/sv/templatedemo_upload.html/2008 = Skapa
-
 templates/sv/templatedemo_upload.html/2009 = Ta bort
-
 templates/sv/templatedemo_upload.html/2010 = Byt namn
-
 templates/sv/templatedemo_upload.html/2011 = Tilldela formatmallar
-
 templates/sv/templatedemo_upload.html/2014 = Ladda upp
-
 templates/sv/templatedemo_upload.html/2015 = Visa exempelmall
-
 templates/sv/templatedemo_upload.html/2016 = Ta bort exempelmall
-
 templates/sv/templatedemo_upload.html/2017 = Tillbaka
-
 templates/sv/templatedemo_upload_template_blank.html/1 = Varning
-
 templates/sv/templatedemo_upload_template_blank.html/4 = <b>Du gl\u00f6mde v\u00e4lja en mall.</b><br>\n\
 		\tV\u00e4nligen f\u00f6rs\u00f6k igen.
-
 templates/sv/templatedemo_upload_template_blank.html/2001 = Tillbaka
-
 templates/sv/template_edit.html/2 = Formatmallar:
-
 templates/sv/template_edit.html/3 = Formatgrupp:
-
 templates/sv/template_edit.html/4 = Redigera formatmall
-
 templates/sv/template_edit.html/1005 = Formatmall
-
 templates/sv/template_edit.html/1006 = #templates#
-
 templates/sv/template_edit.html/2001 = L\u00e4gg till
-
 templates/sv/template_edit.html/2002 = Ta bort
-
 templates/sv/template_edit.html/2003 = Byt namn
-
 templates/sv/template_edit.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_edit.html/2005 = Redigera
-
 templates/sv/template_edit.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_edit.html/2007 = Visa formatmallar
-
 templates/sv/template_edit.html/2008 = Skapa
-
 templates/sv/template_edit.html/2009 = Ta bort
-
 templates/sv/template_edit.html/2010 = Byt namn
-
 templates/sv/template_edit.html/2011 = Tilldela formatmallar
-
 templates/sv/template_edit.html/2014 = Redigera
-
 templates/sv/template_edit.html/2015 = Tillbaka
-
 templates/sv/template_get.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/template_get.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/template_get.html/6/1 = H\u00e4mta uppladdad formatmall
-
 templates/sv/template_get.html/1001 = Formatmall
-
 templates/sv/template_get.html/2001 = L\u00e4gg till
-
 templates/sv/template_get.html/2002 = Ta bort
-
 templates/sv/template_get.html/2003 = Byt namn
-
 templates/sv/template_get.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_get.html/2005 = Redigera
-
 templates/sv/template_get.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_get.html/2007 = Visa formatmallar
-
 templates/sv/template_get.html/2008 = Skapa
-
 templates/sv/template_get.html/2009 = Ta bort
-
 templates/sv/template_get.html/2010 = Byt namn
-
 templates/sv/template_get.html/2011 = Tilldela formatmallar
-
 templates/sv/template_get.html/2014 = H\u00e4mta
-
 templates/sv/template_get.html/2015 = Tillbaka
-
 templates/sv/templategroup_add_exists.html/1 = Varning
-
 templates/sv/templategroup_add_exists.html/4 = <b>En formatmallgrupp med samma namn finns redan.</b><br>\n\
 		\tByt namn och f\u00f6rs\u00f6k igen.
-
 templates/sv/templategroup_add_exists.html/2001 = Tillbaka
-
 templates/sv/templategroup_add.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/templategroup_add.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/templategroup_add.html/6/1 = Skapa formatgrupp
-
 templates/sv/templategroup_add.html/1001 = Namn
-
 templates/sv/templategroup_add.html/2001 = L\u00e4gg till
-
 templates/sv/templategroup_add.html/2002 = Ta bort
-
 templates/sv/templategroup_add.html/2003 = Byt namn
-
 templates/sv/templategroup_add.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/templategroup_add.html/2005 = Redigera
-
 templates/sv/templategroup_add.html/2006 = Ladda upp exempelmallar
-
 templates/sv/templategroup_add.html/2007 = Visa formatmallar
-
 templates/sv/templategroup_add.html/2008 = Skapa
-
 templates/sv/templategroup_add.html/2009 = Ta bort
-
 templates/sv/templategroup_add.html/2010 = Byt namn
-
 templates/sv/templategroup_add.html/2011 = Tilldela formatmallar
-
 templates/sv/templategroup_add.html/2014 = Skapa
-
 templates/sv/templategroup_add.html/2015 = Tillbaka
-
 templates/sv/templategroup_add_name_blank.html/1 = Varning
-
 templates/sv/templategroup_add_name_blank.html/4 = <b>Du gl\u00f6mde fylla i ett namn.</b><br>\n\
 		\tV\u00e4nligen f\u00f6rs\u00f6k igen.
-
 templates/sv/templategroup_add_name_blank.html/2001 = Tillbaka
-
 templates/sv/templategroup_delete.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/templategroup_delete.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/templategroup_delete.html/6/1 = Ta bort formatgrupp
-
 templates/sv/templategroup_delete.html/1001 = Formatgrupp
-
 templates/sv/templategroup_delete.html/2001 = L\u00e4gg till
-
 templates/sv/templategroup_delete.html/2002 = Ta bort
-
 templates/sv/templategroup_delete.html/2003 = Byt namn
-
 templates/sv/templategroup_delete.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/templategroup_delete.html/2005 = Redigera
-
 templates/sv/templategroup_delete.html/2006 = Ladda upp exempelmallar
-
 templates/sv/templategroup_delete.html/2007 = Visa formatmallar
-
 templates/sv/templategroup_delete.html/2008 = Skapa
-
 templates/sv/templategroup_delete.html/2009 = Ta bort
-
 templates/sv/templategroup_delete.html/2010 = Byt namn
-
 templates/sv/templategroup_delete.html/2011 = Tilldela formatmallar
-
 templates/sv/templategroup_delete.html/2014 = Ta bort
-
 templates/sv/templategroup_delete.html/2015 = Tillbaka
-
 templates/sv/templategroup_delete_warning.html/1 = Varning
-
 templates/sv/templategroup_delete_warning.html/4 = <b>\u00c4r du s\u00e4ker p\u00e5 att formatgruppen skall tas bort?</b><br>\n\
 		Formatgruppen inneh\u00e5ller f\u00f6ljande mallar:
-
 templates/sv/templategroup_delete_warning.html/2001 = Tillbaka
-
 templates/sv/templategroup_delete_warning.html/2002 = Hj\u00e4lp
-
 templates/sv/templategroup_delete_warning.html/2003 = \u00d6ppna hj\u00e4lpsidan
-
 templates/sv/templategroup_delete_warning.html/2004 = OK
-
 templates/sv/templategroup_delete_warning.html/2005 = Avbryt
-
 templates/sv/templategroup_delete_documents_assigned_warning.html/1 = Formatgruppen kan inte raderas!<br>Inneh\u00e5ller f\u00f6ljande mallar som \u00e4r kopplade till sidor.
-
 templates/sv/templategroup_rename.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/templategroup_rename.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/templategroup_rename.html/6/1 = Byt namn p\u00e5 formatgrupp
-
 templates/sv/templategroup_rename.html/1001 = Befintliga grupper
-
 templates/sv/templategroup_rename.html/1002 = Nytt namn
-
 templates/sv/templategroup_rename.html/2001 = L\u00e4gg till
-
 templates/sv/templategroup_rename.html/2002 = Ta bort
-
 templates/sv/templategroup_rename.html/2003 = Byt namn
-
 templates/sv/templategroup_rename.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/templategroup_rename.html/2005 = Redigera
-
 templates/sv/templategroup_rename.html/2006 = Ladda upp exempelmallar
-
 templates/sv/templategroup_rename.html/2007 = Visa formatmallar
-
 templates/sv/templategroup_rename.html/2008 = Skapa
-
 templates/sv/templategroup_rename.html/2009 = Ta bort
-
 templates/sv/templategroup_rename.html/2010 = Byt namn
-
 templates/sv/templategroup_rename.html/2011 = Tilldela formatmallar
-
 templates/sv/templategroup_rename.html/2014 = OK
-
 templates/sv/templategroup_rename.html/2015 = Tillbaka
-
 templates/sv/templategroup_rename_name_blank.html/1 = Varning
-
 templates/sv/templategroup_rename_name_blank.html/4 = <b>Du gl\u00f6mde fylla i ett namn.</b><br>V\u00e4nligen f\u00f6rs\u00f6k igen.
-
 templates/sv/templategroup_rename_name_blank.html/2001 = Tillbaka
-
 templates/sv/template_list.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/template_list.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/template_list.html/6/1 = Visa formatmallar
-
 templates/sv/template_list.html/7 = Tillg\u00e4ngliga mallar:</b>
-
 templates/sv/template_list.html/8 = Sidor som anv\u00e4nder mallen:</b>
-
 templates/sv/template_list.html/2001 = L\u00e4gg till
-
 templates/sv/template_list.html/2002 = Ta bort
-
 templates/sv/template_list.html/2003 = Byt namn
-
 templates/sv/template_list.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_list.html/2005 = Redigera
-
 templates/sv/template_list.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_list.html/2007 = Visa formatmallar
-
 templates/sv/template_list.html/2008 = Skapa
-
 templates/sv/template_list.html/2009 = Ta bort
-
 templates/sv/template_list.html/2010 = Byt namn
-
 templates/sv/template_list.html/2011 = Tilldela formatmallar
-
 templates/sv/template_list.html/2014 = Lista &gt;&gt;
-
 templates/sv/template_list.html/2015 = Lista dokument som anv\u00e4nder mallen
-
 templates/sv/template_list.html/2016 = Lista dokument som anv\u00e4nder mallen
-
 templates/sv/template_list.html/2017 = Visa markerad sida
-
 templates/sv/template_list.html/2018 = Tillbaka
-
 templates/sv/template_no_langtemplates.html/1 = Varning!
-
 templates/sv/template_no_langtemplates.html/2 = Varning!
-
 templates/sv/template_no_langtemplates.html/3 = Det finns inga mallar med det h\u00e4r spr\u00e5ket.
-
 templates/sv/template_no_langtemplates.html/2001 = Tillbaka
-
 templates/sv/template_rename.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/template_rename.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/template_rename.html/6/1 = Byt namn p\u00e5 formatmall
-
 templates/sv/template_rename.html/1001 = Formatmall
-
 templates/sv/template_rename.html/1002 = Nytt namn
-
 templates/sv/template_rename.html/2001 = L\u00e4gg till
-
 templates/sv/template_rename.html/2002 = Ta bort
-
 templates/sv/template_rename.html/2003 = Byt namn
-
 templates/sv/template_rename.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_rename.html/2005 = Redigera
-
 templates/sv/template_rename.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_rename.html/2007 = Visa formatmallar
-
 templates/sv/template_rename.html/2008 = Skapa
-
 templates/sv/template_rename.html/2009 = Ta bort
-
 templates/sv/template_rename.html/2010 = Byt namn
-
 templates/sv/template_rename.html/2011 = Tilldela formatmallar
-
 templates/sv/template_rename.html/2014 = Byt namn
-
 templates/sv/template_rename.html/2015 = Tillbaka
-
 templates/sv/template_rename_name_blank.html/1 = Varning
-
 templates/sv/template_rename_name_blank.html/4 = <b>Du gl\u00f6mde fylla i ett namn.</b><br>\n\
 		\tV\u00e4nligen f\u00f6rs\u00f6k igen.
-
 templates/sv/template_rename_name_blank.html/2001 = Tillbaka
-
 templates/sv/template_upload_done.html/1 = Meddelande
-
 templates/sv/template_upload_done.html/4 = <b>Klart!</b><br>\n\
 		\tUppladdningen lyckades.
-
 templates/sv/template_upload_done.html/2001 = Tillbaka
-
 templates/sv/template_upload_done.html/2002 = Hj\u00e4lp
-
 templates/sv/template_upload_done.html/2003 = \u00d6ppna hj\u00e4lpsidan
-
 templates/sv/template_upload_error.html/1 = Varning
-
 templates/sv/template_upload_error.html/4 = <b>Ett fel uppstod vid uppladdningen.</b><br>\n\
 		\tKontakta systemadministrat\u00f6ren.
-
 templates/sv/template_upload_error.html/2001 = Tillbaka
-
 templates/sv/template_upload_file_blank.html/1 = Varning
-
 templates/sv/template_upload_file_blank.html/4 = <b>Du gl\u00f6mde ange en fil.</b><br>\n\
 		\tV\u00e4nligen f\u00f6rs\u00f6k igen.
-
 templates/sv/template_upload_file_blank.html/2001 = Tillbaka
-
 templates/sv/template_upload_file_exists.html/1 = Varning
-
 templates/sv/template_upload_file_exists.html/4 = <b>En formatmall med samma namn finns redan.</b><br>\n\
 		\tKryssa i rutan &quot;Skriv \u00f6ver existerande&quot;<br>\n\
 		\tom du vill skriva \u00f6ver den.
-
 templates/sv/template_upload_file_exists.html/2001 = Tillbaka
-
 templates/sv/template_upload.html/3 = <b class="white">Formatmallar:</b>
-
 templates/sv/template_upload.html/4 = <b class="white">Formatgrupp:</b>
-
 templates/sv/template_upload.html/6/1 = Ladda upp ny mall
-
 templates/sv/template_upload.html/10 = Skriv \u00f6ver existerande
-
 templates/sv/template_upload.html/11 = Tilldela till grupper
-
 templates/sv/template_upload.html/13 = Valfritt, men en mall m\u00e5ste tilldelas till<br>\n\
 		\t\ten grupp f\u00f6r att kunna anv\u00e4ndas.<br>\n\
 		\t\tDu kan \u00e4ven tilldela mallen till en grupp senare.
-
 templates/sv/template_upload.html/1001 = Ange mallfil
-
 templates/sv/template_upload.html/1002 = V\u00e4lj namn
-
 templates/sv/template_upload.html/2001 = L\u00e4gg till
-
 templates/sv/template_upload.html/2002 = Ta bort
-
 templates/sv/template_upload.html/2003 = Byt namn
-
 templates/sv/template_upload.html/2004 = H\u00e4mta uppladdad
-
 templates/sv/template_upload.html/2005 = Redigera
-
 templates/sv/template_upload.html/2006 = Ladda upp exempelmallar
-
 templates/sv/template_upload.html/2007 = Visa formatmallar
-
 templates/sv/template_upload.html/2008 = Skapa
-
 templates/sv/template_upload.html/2009 = Ta bort
-
 templates/sv/template_upload.html/2010 = Byt namn
-
 templates/sv/template_upload.html/2011 = Tilldela formatmallar
-
 templates/sv/template_upload.html/2014 = Ladda upp
-
 templates/sv/template_upload.html/2015 = Tillbaka
-
 templates/sv/template_upload.html/2020 = Kopiera&nbsp;filnamnet
-
 templates/sv/template_upload_name_blank.html/1 = Varning
-
 templates/sv/template_upload_name_blank.html/4 = <b>Du gl\u00f6mde fylla i ett namn.</b><br>\n\
 		\tV\u00e4nligen f\u00f6rs\u00f6k igen.
-
 templates/sv/template_upload_name_blank.html/2001 = Tillbaka
-
 templates/sv/textdoc/add_doc.html/2 = Skapa ny sida/l\u00e4nk
-
 templates/sv/textdoc/archive_del_button.html/1 = Sortera
-
 templates/sv/textdoc/archive_del_button.html/2001 = Kopia
-
 templates/sv/textdoc/archive_del_button.html/2002 = Arkiv
-
 templates/sv/textdoc/archive_del_button.html/2003 = Ta bort l\u00e4nk
-
 templates/sv/textdoc/archive_del_button.html/title_copy = Kopiera markerade
-
 templates/sv/textdoc/archive_del_button.html/title_archive = Arkivera markerade
-
 templates/sv/textdoc/archive_del_button.html/title_remove = Ta bort markerade l\u00e4nkar
-
+templates/sv/textdoc/archive_del_button.html/drag_drop = Dra/flytta
 templates/sv/textdoc/existing_doc_name.html/internal_link = Intern l\u00e4nk
-
 templates/sv/textdoc/inPage_admin.html/1001 = Utseende
-
 templates/sv/textdoc/inPage_admin.html/1002 = <span title="MetaId p\u00e5 dokumentet"><b>Id:</b> #getMetaId#</span> &nbsp; <span title="Aktiv mallgrupp"><b>Grupp:</b> (#group#)</span> &nbsp; <span title="Aktiv mall"><b>Mall:</b> (#simple_name#)</span>
-
 templates/sv/textdoc/inPage_admin.html/2001 = \u00c4ndra grupp
-
 templates/sv/textdoc/inPage_admin.html/2002 = Visa mall
-
 templates/sv/textdoc/inPage_admin.html/2003 = Spara
-
 templates/sv/textdoc/sort_order.html/1 = Sortera
-
 templates/sv/textdoc/sort_order.html/by_headline = Alfabetisk(abc)
-
 templates/sv/textdoc/sort_order.html/by_manual_key = Manuell(123)
-
 templates/sv/textdoc/sort_order.html/by_modified_datetime = \u00c4ndrad datum/tid
-
 templates/sv/textdoc/sort_order.html/by_manual_tree_key = Manuell-tr\u00e4d(1.2.1)
-
 templates/sv/textdoc/sort_order.html/by_published_datetime = Publicerad datum/tid
-
 templates/sv/textdoc/sort_order.html/6 = Sortera/Sortera om
-
 templates/sv/textdoc/status/approved.frag/description = Godk\u00e4nd men inte publicerad \u00e4nnu
-
 templates/sv/textdoc/status/archived.frag/description = Arkiverad
-
 templates/sv/textdoc/status/disapproved.frag/description = Ej godk\u00e4nd f\u00f6r publicering
-
 templates/sv/textdoc/status/new.frag/description = Ny
-
 templates/sv/textdoc/status/published.frag/description = Publicerad
-
 templates/sv/textdoc/status/unpublished.frag/description = Ej l\u00e4ngre publicerad
-
 web/imcms/lang/jsp/document_references.jsp/explanation = Detta dokument \u00e4r l\u00e4nkat fr\u00e5n f\u00f6ljande menyer:
-
 web/imcms/lang/jsp/document_references.jsp/heading = L\u00e4nkreferenser
-
 web/imcms/lang/jsp/document_references.jsp/heading_menu = Meny
-
 web/imcms/lang/jsp/heading_adminlink = Admin
-
 web/imcms/lang/jsp/heading_references = Ref.
-
 web/imcms/lang/jsp/heading_status = Status
-
 web/imcms/lang/jsp/heading_type = Typ
-
+web/imcms/lang/jsp/export_allowed = Exportera
+web/imcms/lang/jsp/exported = Exporterad
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading = Kontrollera l\u00e4nkar
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/only_broken = Lista endast brustna l\u00e4nkar
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/start_id = Fr\u00e5n id
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/end_id = Till id
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/start_check = Starta kontrollen
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading_host_found = Servern<br>finns
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading_host_reachable = Servern<br>svarade
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading_ok = Sidan<br>finns
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading_url = L\u00e4nk
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/image = Bild
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/text = Text
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/url_document = L\u00e4nk
-
 web/imcms/lang/jsp/linkcheck/linkcheck.jsp/uncheckable = Kan bara kontrollera http-l\u00e4nkar.
-
 web/imcms/lang/jsp/parent_count_unit = st
-
 web/imcms/lang/jsp/change_img.jsp/image_search = V\u00e4lj beh\u00f6righetsskyddad bild
-
 web/imcms/lang/jsp/change_img.jsp/add_restricted_image = L\u00e4gg till beh\u00f6righetsskyddad bild
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/heading_create_new = Skapa nytt dokument
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/create_new = Skapa ny
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/based_on = baserad p\u00e5 profil
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/with_document = med dokument
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/create_button = Skapa!
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/1 = Mina sidor
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/2 = G\u00e5 till Adminsida
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/3 = Till startsidan
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/4 = Hj\u00e4lp
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/5 = \u00d6ppna hj\u00e4lpsidan
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/6 = SuperAdmin
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/10 = st finns
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/11 = F\u00e4ll ut alla
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/12 = F\u00e4ll in alla
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/15 = Id
 web/imcms/lang/jsp/admin/admin_manager.jsp/16 = Status
 web/imcms/lang/jsp/admin/admin_manager.jsp/17 = Rubrik
 web/imcms/lang/jsp/admin/admin_manager.jsp/18 = Ingress
 web/imcms/lang/jsp/admin/admin_manager.jsp/21 = Typ
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/19 = Det finns fler dokument - Visa alla &raquo;
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/1 = Dokument skapade den senaste veckan
 web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/2 = Godk\u00e4nda och publicerade dokument som arkiveras inom en vecka
 web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/3 = Godk\u00e4nda, publicerade och arkiverade dokument f\u00f6r vilka publicering upph\u00f6r inom en vecka
 web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/4 = Nya, godk\u00e4nda, publicerade och arkiverade dokument som inte \u00e4ndrats de senaste sex m\u00e5naderna
 web/imcms/lang/jsp/admin/admin_manager.jsp/subreport_heading/5 = Dokument \u00e4ndrade, men inte skapade den senaste veckan
-
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/1 = S\u00f6k bland mina dokument
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/2 = Fritext
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/3 = Visa dokument
@@ -3163,16 +1769,13 @@ web/imcms/lang/jsp/admin/admin_manager_search.jsp/phase/archived = Arkiverade
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/7 = Sortera p\u00e5
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/8 = Tr\u00e4ffar/sida
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/9 = \u00e5\u00e5\u00e5\u00e5-mm-dd
-
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/permission_option1 = d\u00e4r jag st\u00e5r som skapare
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/permission_option2 = d\u00e4r jag st\u00e5r som ansvarig utgivare
-
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/publication_start = publicerade
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/publication_end = avpublicerade
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/created = skapade
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/archived = arkiverade
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/modified = \u00e4ndrade
-
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/sort_option1 = \u00e4ndringssdatum (nya f\u00f6rst)
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/sort_option2 = \u00e4ndringssdatum (gamla f\u00f6rst)
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/sort_option3 = publicering startdatum (nya f\u00f6rst)
@@ -3185,65 +1788,57 @@ web/imcms/lang/jsp/admin/admin_manager_search.jsp/sort_option9 = rubrik (A-\u00d
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/sort_option10 = rubrik (\u00d6-A)
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/sort_option11 = dokument_id (0-9)
 web/imcms/lang/jsp/admin/admin_manager_search.jsp/sort_option12 = dokument_id (9-0)
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/0 = Skapa ny sida
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/1 = Senaste \u00e4ndringarna
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/2 = P\u00e5minnelser
-
 web/imcms/lang/jsp/admin/admin_manager.jsp/tab_name/3 = \u00d6versikt
-
 server/src/com/imcode/imcms/servlet/admin/ChangeImage/search/image_thumbnail_label = Tumnagel
-
 web/WEB-INF/templates/lang/admin/images/thumbnail.frag/alt = Tumnagel
-
 server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/select_creator_headline = V\u00e4lj skapare
-
 server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/select_publisher_headline = V\u00e4lj ansvarig utgivare
-
 server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/alias_error__already_exist_message = ERROR! Ditt \u00f6nskade alias finns redan. Var v\u00e4nlig ange ett nytt!
-
 server/src/com/imcode/imcms/flow/EditDocumentInformationPageFlow/alias_error__used_by_system_message = ERROR! Ditt \u00f6nskade alias anv\u00e4nds av systemet. Var v\u00e4nlig ange ett nytt!
-
 server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/no_file_uploaded = Du valde ingen fil!
-
 server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/invalid_mimetype = <p>Jag k\u00e4nde tyv\u00e4rr inte igen typen som varken en \u00e4ndelse eller en mime-typ.</p> <p>En giltig mime-typ tar formen "typ/subtyp". Om du vill kan du leta i <a href="http://www.iana.org/assignments/media-types/">IANAs databas med registrerade mime-typer</a>.</p> <p>Om du \u00e4r os\u00e4ker, v\u00e4lj "Bin\u00e4rfil" i listan.</p>
-
 server/src/com/imcode/imcms/flow/EditFileDocumentPageFlow/unable_to_autodetect_mimetype = <p>Jag k\u00e4nde tyv\u00e4rr inte igen \u00e4ndelsen p\u00e5 filen, och kan tyv\u00e4rr inte avg\u00f6ra vad filen har f\u00f6r typ. V\u00e4nligen v\u00e4lj en typ i listan.</p> <p>Om du \u00e4r os\u00e4ker, v\u00e4lj "Bin\u00e4rfil".</p>
-
 web/imcms/lang/jsp/admin/admin_manager_expandable_dates_column.jsp/modified_abbreviation = \u00c4ndr:
 web/imcms/lang/jsp/admin/admin_manager_expandable_dates_column.jsp/created_abbreviation = Skap:
 web/imcms/lang/jsp/admin/admin_manager_expandable_dates_column.jsp/archived_abbreviation = Arki:
 web/imcms/lang/jsp/admin/admin_manager_expandable_dates_column.jsp/publication_start_abbreviation = Publ:
 web/imcms/lang/jsp/admin/admin_manager_expandable_dates_column.jsp/publication_end_abbreviation = Avpubl:
-
 web/imcms/lang/jscalendar/show_calendar_button = Visa kalender
-
 web/imcms/lang/jsp/admin_session_counter.jsp/value = V\u00e4rde:
-
 web/imcms/lang/jsp/admin_session_counter.jsp/startdate = Startdatum:
-
 web/imcms/lang/jsp/admin_session_counter.jsp/change = \u00c4ndra
-
 web/imcms/lang/jsp/document_search_terms.jsp/title = Popul\u00e4ra s\u00f6kord
-
 web/imcms/lang/jsp/document_search_terms.jsp/daterange = Datumintervall
-
 web/imcms/lang/jsp/document_search_terms.jsp/term = S\u00f6kord
-
 web/imcms/lang/jsp/document_search_terms.jsp/count = Antal
-
 profile/headline = Profiler
-
 profile/create = Skapa ny profil
-
 profile/delete = Radera
-
 profile/edit = Redigera
-
 profile/save = Spara
-
 profile/name = Namn
-
 profile/document_name = Dokumentnamn
+web/imcms/lang/jsp/crop_img.jsp/title = Crop image
+web/imcms/lang/jsp/crop_img.jsp/crop = Crop
+web/imcms/lang/jsp/crop_img.jsp/cancel = Avbryt
+web/imcms/lang/jsp/crop_img.jsp/x1 = X1
+web/imcms/lang/jsp/crop_img.jsp/y1 = Y1
+web/imcms/lang/jsp/crop_img.jsp/x2 = X2
+web/imcms/lang/jsp/crop_img.jsp/y2 = Y2
+web/imcms/lang/jsp/crop_img.jsp/width = Width
+web/imcms/lang/jsp/crop_img.jsp/height = Height
+web/imcms/lang/jsp/crop_img.jsp/rotate_left = Rotate left
+web/imcms/lang/jsp/crop_img.jsp/rotate_right = Rotate right
+web/imcms/lang/jsp/crop_img.jsp/best_fit = Best fit
+web/imcms/lang/jsp/crop_img.jsp/actual_size = Actual size
+web/imcms/lang/jsp/crop_img.jsp/zoom_in = Zoom in
+web/imcms/lang/jsp/crop_img.jsp/zoom_out = Zoom out
+web/imcms/lang/jsp/crop_img.jsp/zoom = Zoom
+image_browser.usage=Dubbelklicka f\u00f6r att anv\u00e4nda. Enkelklicka f\u00f6r att v\u00e4lja.
+image_browser.recent=Gulmarkerade bilder \u00f6verst \u00e4r de senast inlagda.
+
+sms/authorize_code/message = Inloggningskod: 
+web/imcms/login/back = Tillbaka
diff --git a/web/WEB-INF/conf/jaas.conf b/web/WEB-INF/conf/jaas.conf
new file mode 100644
index 0000000000..a4086b1eac
--- /dev/null
+++ b/web/WEB-INF/conf/jaas.conf
@@ -0,0 +1,7 @@
+
+@sso-jaas-config-name@ {
+    com.sun.security.auth.module.Krb5LoginModule required
+        useKeyTab="false"
+        storeKey="true"
+        principal="@sso-jaas-principal-name@";
+};
diff --git a/web/WEB-INF/conf/krb.conf b/web/WEB-INF/conf/krb.conf
new file mode 100644
index 0000000000..2021d1ab6d
--- /dev/null
+++ b/web/WEB-INF/conf/krb.conf
@@ -0,0 +1,10 @@
+
+[libdefaults]
+    default_tkt_enctypes = aes128-cts rc4-hmac des3-cbc-sha1
+    default_tgs_enctypes = aes128-cts rc4-hmac des3-cbc-sha1
+    permitted_enctypes   = aes128-cts rc4-hmac des3-cbc-sha1
+
+[realms]
+    @sso-krb-realm@ = {
+        kdc = @sso-krb-kdc@
+    }
diff --git a/web/WEB-INF/conf/log4j-debug.xml b/web/WEB-INF/conf/log4j-debug.xml
deleted file mode 100644
index b9853359cb..0000000000
--- a/web/WEB-INF/conf/log4j-debug.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-
-<!-- Start log4j configuration -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
-
-    <!-- Renderer for DocumentRequest -->
-    <renderer
-        renderingClass="imcode.util.log.FakeRequestRenderer"
-        renderedClass="imcode.server.DocumentRequest"/>
-
-    <!-- The accesslog (logs usermovements) -->
-    <appender name="ACCESS" class="imcode.util.log.DailyRollingFileAppender">
-        <param name="File" value="${com.imcode.imcms.path}/WEB-INF/logs/access.log"/>
-        <param name="DatePattern" value="'.'yyyy-MM"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{ISO8601} %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- The mainlog (captures edits and changes) -->
-    <appender name="MAIN" class="imcode.util.log.DailyRollingFileAppender">
-        <param name="File" value="${com.imcode.imcms.path}/WEB-INF/logs/main.log"/>
-        <param name="DatePattern" value="'.'yyyy-MM"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{ISO8601} %-5p %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- The errorlog (captures everything that doesn't go to one of the above. -->
-    <appender name="ERROR" class="imcode.util.log.DailyRollingFileAppender">
-        <param name="File" value="${com.imcode.imcms.path}/WEB-INF/logs/error.log"/>
-        <param name="DatePattern" value="'.'yyyy-MM"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{ISO8601} %-5p %c %x - %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- Set up accesslog with priority 'debug' -->
-    <category name="com.imcode.imcms.log.access" additivity="false">
-        <priority value="debug"/>
-        <appender-ref ref="ACCESS"/>
-    </category>
-
-    <!-- Set up mainlog with priority 'debug' -->
-    <category name="com.imcode.imcms.log.main" additivity="false">
-        <priority value="debug"/>
-        <appender-ref ref="MAIN"/>
-    </category>
-
-    <category name="org.apache" additivity="false">
-        <priority value="error"/>
-        <appender-ref ref="ERROR"/>
-    </category>
-
-    <!-- Set up the errorlog with priority 'debug' -->
-    <root>
-        <priority value="trace"/>
-        <appender-ref ref="ERROR"/>
-    </root>
-
-</log4j:configuration>
diff --git a/web/WEB-INF/conf/log4j-nodebug.xml b/web/WEB-INF/conf/log4j-nodebug.xml
deleted file mode 100644
index 7e01a9ee83..0000000000
--- a/web/WEB-INF/conf/log4j-nodebug.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-
-<!-- Start log4j configuration -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" threshold="debug">
-
-    <!-- Renderer for DocumentRequest -->
-    <renderer
-        renderingClass="imcode.util.log.FakeRequestRenderer"
-        renderedClass="imcode.server.DocumentRequest"/>
-
-    <!-- The accesslog (logs usermovements) -->
-    <appender name="ACCESS" class="imcode.util.log.DailyRollingFileAppender">
-        <param name="File" value="${com.imcode.imcms.path}/WEB-INF/logs/access.log"/>
-        <param name="DatePattern" value="'.'yyyy-MM"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{ISO8601} %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- The mainlog (captures edits and changes) -->
-    <appender name="MAIN" class="imcode.util.log.DailyRollingFileAppender">
-        <param name="File" value="${com.imcode.imcms.path}/WEB-INF/logs/main.log"/>
-        <param name="DatePattern" value="'.'yyyy-MM"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{ISO8601} %-5p %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- The errorlog (captures everything that doesn't go to one of the above. -->
-    <appender name="ERROR" class="imcode.util.log.DailyRollingFileAppender">
-        <param name="File" value="${com.imcode.imcms.path}/WEB-INF/logs/error.log"/>
-        <param name="DatePattern" value="'.'yyyy-MM"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{ISO8601} %-5p %c - %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- Set up accesslog with priority 'info' -->
-    <category name="com.imcode.imcms.log.access" additivity="false">
-        <priority value="info"/>
-        <appender-ref ref="ACCESS"/>
-    </category>
-
-    <!-- Set up mainlog with priority 'info' -->
-    <category name="com.imcode.imcms.log.main" additivity="false">
-        <priority value="info"/>
-        <appender-ref ref="MAIN"/>
-    </category>
-
-    <category name="org.apache" additivity="false">
-        <priority value="error"/>
-        <appender-ref ref="ERROR"/>
-    </category>
-
-    <!-- Set up the errorlog with priority 'info' -->
-    <root>
-        <priority value="info"/>
-        <appender-ref ref="ERROR"/>
-    </root>
-
-</log4j:configuration>
diff --git a/web/WEB-INF/conf/log4j2-debug.xml b/web/WEB-INF/conf/log4j2-debug.xml
new file mode 100644
index 0000000000..3a9110d664
--- /dev/null
+++ b/web/WEB-INF/conf/log4j2-debug.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Start log4j2 configuration -->
+<Configuration status="debug" strict="true">
+	<Appenders>
+		<!-- The accesslog (logs usermovements) -->
+		<RollingFile name="ACCESS"
+		             fileName="${WEB_APP_PATH}/WEB-INF/logs/access.log"
+		             filePattern="${WEB_APP_PATH}/WEB-INF/logs/access-%d{yyyy-MM}.log"
+		             ignoreExceptions="false">
+			<PatternLayout charset="UTF-8" pattern="%d{ISO8601} %m%n"/>
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+			</Policies>
+		</RollingFile>
+
+		<!-- The mainlog (captures edits and changes) -->
+		<RollingFile name="MAIN"
+		             fileName="${WEB_APP_PATH}/WEB-INF/logs/main.log"
+		             filePattern="${WEB_APP_PATH}/WEB-INF/logs/main-%d{yyyy-MM}.log"
+		             ignoreExceptions="false">
+			<PatternLayout charset="UTF-8" pattern="%d{ISO8601} %-5p %m%n"/>
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+			</Policies>
+		</RollingFile>
+
+		<!-- The errorlog (captures everything that doesn't go to one of the above. -->
+		<RollingFile name="ERROR"
+		             fileName="${WEB_APP_PATH}/WEB-INF/logs/error.log"
+		             filePattern="${WEB_APP_PATH}/WEB-INF/logs/error-%d{yyyy-MM}.log"
+		             ignoreExceptions="false">
+			<PatternLayout charset="UTF-8" pattern="%d{ISO8601} %-5p %c %x - %m%n"/>
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+			</Policies>
+		</RollingFile>
+
+		<Console name="STDOUT" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{ISO8601} %-5p %c %x - %m%n" charset="UTF-8"/>
+		</Console>
+	</Appenders>
+	<Loggers>
+		<!-- Set up accesslog with priority 'debug' -->
+		<Logger name="com.imcode.imcms.log.access" level="debug" additivity="false">
+			<AppenderRef ref="ACCESS"/>
+		</Logger>
+
+		<!-- Set up mainlog with priority 'debug' -->
+		<Logger name="com.imcode.imcms.log.main" level="debug" additivity="false">
+			<AppenderRef ref="MAIN"/>
+		</Logger>
+
+		<Logger name="org.apache" level="error" additivity="false">
+			<AppenderRef ref="ERROR"/>
+		</Logger>
+
+		<!-- Set up the errorlog with priority 'debug' -->
+		<Root level="trace">
+			<AppenderRef ref="ERROR"/>
+			<AppenderRef ref="STDOUT"/>
+		</Root>
+	</Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/web/WEB-INF/conf/log4j2-nodebug.xml b/web/WEB-INF/conf/log4j2-nodebug.xml
new file mode 100644
index 0000000000..d9d18ed3b9
--- /dev/null
+++ b/web/WEB-INF/conf/log4j2-nodebug.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Start log4j2 configuration -->
+<Configuration strict="true">
+	<Appenders>
+
+		<!-- The accesslog (logs usermovements) -->
+		<RollingFile name="ACCESS"
+		             fileName="${WEB_APP_PATH}/WEB-INF/logs/access.log"
+		             filePattern="${WEB_APP_PATH}/WEB-INF/logs/access-%d{yyyy-MM}.log"
+		             ignoreExceptions="false">
+			<PatternLayout>
+				<Pattern>%d{ISO8601} %m%n</Pattern>
+			</PatternLayout>
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+			</Policies>
+		</RollingFile>
+
+		<!-- The mainlog (captures edits and changes) -->
+		<RollingFile name="MAIN"
+		             fileName="${WEB_APP_PATH}/WEB-INF/logs/main.log"
+		             filePattern="${WEB_APP_PATH}/WEB-INF/logs/main-%d{yyyy-MM}.log"
+		             ignoreExceptions="false">
+			<PatternLayout>
+				<Pattern>%d{ISO8601} %-5p %m%n</Pattern>
+			</PatternLayout>
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+			</Policies>
+		</RollingFile>
+
+		<!-- The errorlog (captures everything that doesn't go to one of the above. -->
+		<RollingFile name="ERROR"
+		             fileName="${WEB_APP_PATH}/WEB-INF/logs/error.log"
+		             filePattern="${WEB_APP_PATH}/WEB-INF/logs/error-%d{yyyy-MM}.log"
+		             ignoreExceptions="false">
+			<PatternLayout>
+				<Pattern>%d{ISO8601} %-5p %c - %m%n</Pattern>
+			</PatternLayout>
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+			</Policies>
+		</RollingFile>
+	</Appenders>
+	<Loggers>
+		<!-- Set up accesslog with priority 'info' -->
+		<Logger name="com.imcode.imcms.log.access" level="info" additivity="false">
+			<AppenderRef ref="ACCESS"/>
+		</Logger>
+
+		<!-- Set up mainlog with priority 'info' -->
+		<Logger name="com.imcode.imcms.log.main" level="info" additivity="false">
+			<AppenderRef ref="MAIN"/>
+		</Logger>
+
+		<Logger name="org.apache" level="error" additivity="false">
+			<AppenderRef ref="ERROR"/>
+		</Logger>
+
+		<!-- Set up the errorlog with priority 'info' -->
+		<Root level="info">
+			<AppenderRef ref="ERROR"/>
+		</Root>
+
+	</Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/web/WEB-INF/conf/server.properties b/web/WEB-INF/conf/server.properties
index 82cb0a5003..0384dd162e 100644
--- a/web/WEB-INF/conf/server.properties
+++ b/web/WEB-INF/conf/server.properties
@@ -5,6 +5,9 @@ DenyMultipleUserLogin = @deny-multiple-user-login@
 
 # Uncomment and edit the settings for your database server of choice:
 
+# Database schema version.
+DatabaseVersion = @db-schema-version@
+
 # Database driver and url
 JdbcDriver = @db-driver@
 JdbcUrl = @db-url@
@@ -35,11 +38,11 @@ DefaultLanguage = @defaultlanguage@
 
 
 # Paths, relative to the webapp root.
-TemplatePath = WEB-INF/templates/
-IncludePath  = WEB-INF/includes/
-FilePath     = WEB-INF/uploads/
-ImcmsPath    = imcms/
-ImagePath    = images/
+TemplatePath 			= WEB-INF/templates/
+IncludePath  			= WEB-INF/includes/
+FilePath     			= WEB-INF/uploads/
+ImcmsPath    			= imcms/
+ImagePath    			= images/
 
 
 # What url-prefix to map document-id:s to, relative to the context path.
@@ -52,6 +55,12 @@ DocumentPathPrefix = /
 # Url, relative to the context path
 ImageUrl = /images/
 
+# settings used for login with bankId
+ServerName = @server-name@
+CgiMetadataUrl = @cgi-metadata-url@
+AuthenticationConfiguration = @authentication-configuration@
+CgiUserRoleName = @cgi-user-role-name@
+#AuthenticationConfiguration = loginPassword
 
 # If this is set, a JSESSIONID-cookie will be sent to clients, using this domain.
 SessionCookieDomain =
@@ -77,7 +86,7 @@ KeyStoreType =
 
 # The paths which may be accessed through FileAdmin, relative to the webapp root.
 # Separated by ';' or ':'.
-FileAdminRootPaths = css/;images/;imcms/;javascript/;jsp/;login/;user/;WEB-INF/includes/;WEB-INF/logs;WEB-INF/templates/
+FileAdminRootPaths = css/;images/;images_gui/;imcms/;javascript/;jsp/;login/;user/;WEB-INF/jsp/;WEB-INF/logs;WEB-INF/templates/
 
 
 # Workaround for servlet containers (e.g. Tomcat)
@@ -101,10 +110,16 @@ SecureLoginRequired = false
 # Set both of these to LDAP to enable LDAP
 ExternalAuthenticator = @external-authenticator@
 ExternalUserAndRoleMapper = @external-user-and-role-registry@
+aad.tenant.id=@aad.tenant.id@
+aad.client.id=@aad.client.id@
+aad.secret.key=@aad.secret.key@
 
 LdapUrl = @ldap-url@
 LdapBindDn = @ldap-bind-dn@
 LdapPassword = @ldap-password@
+LdapReadTimeoutMillis = @ldap-read-timeout-millis@
+LdapMaxConnections = @ldap-max-connections@
+LdapConnectionExpirySeconds = @ldap-connection-expiry-seconds@
 
 # By default, 'uid' is the user-identifying attribute, the login name.
 # MS Active Directory uses attribute 'sAMAccountName' instead of 'uid'.
@@ -153,3 +168,116 @@ SecondaryLdapUserObjectClass = @secondary-ldap-user-object-class@
 # This demonstrates using the two Active Directory attributes, "company" and "co" (country):
 #SecondaryLdapUserAttribute.Company = company
 #SecondaryLdapUserAttribute.Country = co
+
+
+SsoEnabled = @sso-enabled@
+SsoUseLocalJaasConfig = @sso-use-local-jaas-config@
+SsoJaasConfigName = @sso-jaas-config-name@
+SsoJaasPrincipalPassword = @sso-jaas-principal-password@
+SsoUseLocalKrbConfig = @sso-use-local-krb-config@
+SsoKerberosDebug = @sso-kerberos-debug@
+
+
+# URL to the separate image archive application, as seen by the clients browser.
+# For example: test.com/image-archive/archive
+# 
+# <host> [":" <port>] "/" <context-path> "/archive"
+ImageArchiveUrl = @image-archive-url@
+
+# IDs of the roles that are allowed to see the "Choose from image archive" button in image edit page, delimited by ",".
+# If not specified, everyone is allowed.
+ImageArchiveAllowedRoleIds = @image-archive-allowed-role-ids@
+
+# IDs of the roles that are allowed to see the "Choose file" (old archive) button in image edit page, delimited by ",".
+# If not specified, everyone is allowed.
+ChooseFileAllowedRoleIds = @choose-file-allowed-role-ids@
+
+# Path and the corresponding URL of where images from image archive will be stored and are accessible from.
+ImageArchiveImagePath = new_images/
+ImageArchiveImageUrl = /new_images/
+
+# ImageMagick is a software suite for creating, editing and composing images. It can be downloaded from http://www.imagemagick.org. 
+# It is used by both image archive and image handling. 
+# This path should lead to where ImageMagick is installed, and is required only on windows.
+# For example: c:/program files/imagemagick-6.4.9-q16
+ImageMagickPath = @image-magick-path@
+
+
+# Path for directory where images processed by image handling will be stored, can be absolute or relative.
+ImageCachePath = WEB-INF/image_cache
+
+# Paths, which image handling is allowed to access for retrieving images. 
+# These paths can be absolute or relative, and are separated by ";".
+ImageCacheAllowedPaths = images/;new_images/
+
+# Maximum size in bytes of cache for images created in the text editor (xinha). By default 500 MB.
+ImageCacheMaxSize = @image-cache-max-size@
+
+# Enables login passwords encryption
+# Type: boolean; optional; default: false
+# Any non-true value or absence of value is treated as false.
+# When enabled
+# --passwords are stored in encrypted form.
+# --any unencrypted passwords will be encrypted on system start/restart.
+# Since 4.0.7
+LoginPasswordEncryptionEnabled = @login-password-encryption-enabled@
+
+# Shared salt used in login passwords encryption.
+# Type: string; optional; default: blank
+# An additional, shared 'salt' used for all internal users' login passwords encryption.
+# WARNING!
+# Assigning a different value on a running system with enabled password encryption
+# will immediately lead to inability to login for all internal users whom passwords are already encrypted.
+# See description of [LoginPasswordEncryptionEnabled] property.
+# Since 4.0.7
+LoginPasswordEncryptionSalt = @login-password-encryption-salt@
+
+# Password reset lifespan in hours, after rest link is created and sent by email
+# Type: positive int; optional; default: 24 (hours)
+# Since 4.0.7
+LoginPasswordResetLifespan = @login-password-reset-lifespan@
+
+# Allows superadmins to reset their passwords.
+# Type: boolean; optional; default: false
+# Any non-true value or absence of value is treated as false.
+# Since 4.0.7
+SuperadminLoginPasswordResetAllowed = @superadmin-login-password-reset-allowed@
+
+# Maximum number of cached image size objects.
+ImageSizeCacheObjects = @image-size-cache-objects@
+
+# Comma separated list of mime types
+# Since 4.2.4
+IndexDisabledFileMimes = @index-disabled-file-mimes@
+
+# Comma separated list of filename extensions
+# Since 4.2.4
+IndexDisabledFileExtensions = @index-disabled-file-extensions@
+
+# Error logging settings
+ErrorLoggerUrl = @error-logger-url@
+
+sms.gateway.username = @sms.gateway.username@
+sms.gateway.password = @sms.gateway.password@
+sms.gateway.url = @sms.gateway.url@
+sms.gateway.originAddress = @sms.gateway.originAddress@
+sms.gateway.defaultCountryCode = @sms.gateway.defaultCountryCode@
+
+#2FA settings
+2fa.cookie.lifetime = @2fa.cookie.lifetime@
+
+# Filters
+
+# Type: boolean; optional; default: true
+csrf-include = true
+
+# Type: boolean; optional; default: true
+xss-include = true
+
+# comma separated user ids allowed to access FileAdmin
+AllowFileAdmin =
+
+# Document ids that cannot be deleted. Separate with a comma.
+DeleteProtectedMetaIds =
+
+w3c.validation = true
diff --git a/web/WEB-INF/conf/server.xml b/web/WEB-INF/conf/server.xml
new file mode 100644
index 0000000000..5e6ab35d32
--- /dev/null
+++ b/web/WEB-INF/conf/server.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+There are two ways to associate custom imCMS roles with a LDAP entries:
+  1.An imCMS role can be mapped to any LDAP user's context attribute.
+    An imCMS role specified in <role-to-attribute> will be assigned to an imCMS user at the login time if
+    user's LDAP context contains attribute with matching name-value pair.
+
+  2.An imCMS role can me mapped to any Active Directory group.
+    An imCMS role specified in <role-to-ad-group> will be assigned to an imCMS user at the login time if
+    LDAP service provider is Active Directory and the user is a (direct or indirect) member of a group
+    with matching aAMAccountName.
+-->
+<server>
+    <ldap>
+        <mapped-roles>
+            <role-to-attribute role="LDAP-EMERGENCY" attribute-name="phone" attribute-value="112"/>
+            <role-to-attribute role="LDAP-MANAGER" attribute-name="title" attribute-value="manager"/>
+            <role-to-attribute role="LDAP-SPECIAL" attribute-name="primaryGroupID" attribute-value="513"/>
+
+            <!--
+                If role name equals to group name (aAMAccountName) then 'group' attribute can be omitted.
+            -->
+            <role-to-ad-group role="imGrpGlobalsec" group="imGrpGlobalSec"/>
+            <role-to-ad-group role="imGrpLocalsec" group="imGrpLocalSec"/>
+            <role-to-ad-group role="imGrpUniSec"/>
+            <role-to-ad-group role="imGrpLocDist"/>
+            <role-to-ad-group role="imGrpGloDist"/>
+            <role-to-ad-group role="imGrpUniDist"/>
+        </mapped-roles>
+    </ldap>
+</server>
\ No newline at end of file
diff --git a/web/WEB-INF/image_cache/README b/web/WEB-INF/image_cache/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/WEB-INF/imcms/jsp/ajax_data.jsp b/web/WEB-INF/imcms/jsp/ajax_data.jsp
new file mode 100644
index 0000000000..720184ced8
--- /dev/null
+++ b/web/WEB-INF/imcms/jsp/ajax_data.jsp
@@ -0,0 +1,222 @@
+<%@ page
+
+	import="com.imcode.imcms.api.*,
+	        java.sql.Connection,
+	        java.sql.PreparedStatement,
+	        java.sql.ResultSet,
+	        java.text.SimpleDateFormat,
+	        java.util.Date,
+	        org.apache.commons.lang.StringUtils, org.json.simple.JSONObject, imcode.server.ImcmsServices, imcode.server.Imcms, imcode.server.user.UserDomainObject, imcode.util.Utility, com.imcode.imcms.mapping.DocumentMapper, imcode.server.document.textdocument.TextDocumentDomainObject, imcode.server.document.TextDocumentPermissionSetDomainObject, imcode.server.document.textdocument.TextDomainObject, imcode.server.document.NoPermissionToEditDocumentException, imcode.util.ShouldHaveCheckedPermissionsEarlierException, imcode.server.document.textdocument.NoPermissionToAddDocumentToMenuException, imcode.server.document.ConcurrentDocumentModificationException, com.imcode.imcms.mapping.DocumentSaveException, imcode.util.ShouldNotBeThrownException, org.apache.commons.lang.StringEscapeUtils, java.net.URLEncoder"
+
+	contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"
+
+%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
+%><%
+
+int truncateLength = 70 ;
+
+SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm") ;
+
+String action = StringUtils.defaultString(request.getParameter("action")) ;
+String value  = StringUtils.defaultString(request.getParameter("value")) ;
+
+if ("getHelpTextInlineEditing".equals(action)) {
+	
+	boolean isSwe = false ;
+	try {
+		isSwe =	ContentManagementSystem.fromRequest(request).getCurrentUser().getLanguage().getIsoCode639_2().equals("swe");
+	} catch (Exception e) {}
+	
+	if (isSwe) { %>
+	<h3>Redigera på stället</h3>
+	<ul>
+		<li>...</li>
+	</ul><%
+	} else { %>
+	<h3>Edit in place!</h3>
+	<ul>
+		<li>...</li>
+	</ul><%
+	}
+	return ;
+	
+} else if ("saveText".equals(action)) {
+	
+	JSONObject jsonObject = new JSONObject() ;
+	
+	int meta_id = Integer.parseInt(request.getParameter("meta_id")) ;
+	int txt_no  = Integer.parseInt(request.getParameter("txt_no")) ;
+	int format  = Integer.parseInt(request.getParameter("format")) ;
+	String text = request.getParameter("text") ;
+	boolean doLog = (null != request.getParameter("do_log")) ;
+	text = text
+		.replace(StringEscapeUtils.escapeHtml("<?imcms:contextpath?>"), "<?imcms:contextpath?>")
+		.replace(URLEncoder.encode("<?imcms:contextpath?>", Imcms.ISO_8859_1_ENCODING), "<?imcms:contextpath?>")
+		.replace(URLEncoder.encode("<?imcms:contextpath?>", Imcms.UTF_8_ENCODING), "<?imcms:contextpath?>")
+		.replace("%3C?imcms:contextpath?%3E", "<?imcms:contextpath?>") ;
+	
+	ImcmsServices imcref = Imcms.getServices() ;
+	UserDomainObject user = Utility.getLoggedOnUser(request) ;
+	DocumentMapper documentMapper = imcref.getDocumentMapper();
+	TextDocumentDomainObject document = (TextDocumentDomainObject)documentMapper.getDocument(meta_id) ;
+	TextDocumentPermissionSetDomainObject permissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor(document) ;
+	
+	if (permissionSet.getEditTexts()) {
+		TextDomainObject textDO = new TextDomainObject(text, format) ;
+		document.setText(txt_no, textDO) ;
+		document.addModifiedTextIndex(txt_no, true) ;
+		
+		try {
+			documentMapper.saveDocument(document, user) ;
+			if (doLog) {
+				imcref.updateMainLog("Text " + txt_no + " in [" + meta_id + "] modified by user: [" + user.getFullName() + "]") ;
+			}
+			jsonObject.put("isSaved", true) ;
+			jsonObject.put("error", "") ;
+		} catch (NoPermissionToEditDocumentException e ) {
+			jsonObject.put("isSaved", false) ;
+			jsonObject.put("error", e.getMessage()) ;
+		} catch ( NoPermissionToAddDocumentToMenuException e ) {
+			jsonObject.put("isSaved", false) ;
+			jsonObject.put("error", e.getMessage()) ;
+		} catch (DocumentSaveException e) {
+			jsonObject.put("isSaved", false) ;
+			jsonObject.put("error", e.getMessage()) ;
+		}
+	} else {
+		jsonObject.put("isSaved", false) ;
+		jsonObject.put("error", "No permission to save!") ;
+	}
+	out.print(jsonObject) ;
+	
+	return ;
+	
+} else if ("linkEditAutoCompleteSearch".equals(action)) {
+	
+	String cp = request.getContextPath() ;
+	
+	int truncateLengthPath = truncateLength - cp.length() ;
+	
+	boolean isStartsWithSearch = "".equals(StringUtils.defaultString(request.getParameter("isStartsWithSearch"))) ;
+	int limit = Integer.parseInt(request.getParameter("limit")) ;
+	
+	String query  = StringUtils.defaultString(request.getParameter("q"))
+					.toLowerCase().replaceFirst(cp + "\\/", "") ;
+	
+	//out.print("query: " + query) ;
+	int iCount = 0 ;
+	try {
+		ContentManagementSystem imcmsSystem = ContentManagementSystem.fromRequest(request) ;
+		DatabaseService databaseService = imcmsSystem.getDatabaseService() ;
+		Connection connection = null ;
+		PreparedStatement preparedStatement = null ;
+		ResultSet resultSet = null ;
+		try {
+			String sql =
+					"SELECT m.meta_id, (SELECT p.value FROM document_properties p WHERE p.meta_id = m.meta_id AND p.key_name = 'imcms.document.alias'), m.meta_headline, t.text, m.date_created, m.date_modified, m.status\n" +
+					"FROM meta m\n" +
+					"RIGHT JOIN texts t ON m.meta_id = t.meta_id\n" +
+					"WHERE\n" +
+					"  t.name = ? AND\n" +
+					"  (CONVERT(m.meta_id, CHAR(8)) LIKE ? OR\n" +
+					"  m.meta_headline LIKE ? OR\n" +
+					"  t.text LIKE ? OR\n" +
+					"  m.meta_id IN (\n" +
+					"    SELECT p.meta_id FROM document_properties p WHERE p.key_name = 'imcms.document.alias' AND p.value LIKE ?)\n" +
+					"  )\n" +
+					"LIMIT " + limit ;
+			connection = databaseService.getConnection() ;
+			preparedStatement = connection.prepareStatement(sql) ;
+			preparedStatement.setInt(1, 1) ;
+			preparedStatement.setString(2, query + '%') ;
+			preparedStatement.setString(3, isStartsWithSearch ? query + '%' : '%' + query + '%') ;
+			preparedStatement.setString(4, isStartsWithSearch ? query + '%' : '%' + query + '%') ;
+			preparedStatement.setString(5, isStartsWithSearch ? query + '%' : '%' + query + '%') ;
+			resultSet = preparedStatement.executeQuery() ;
+			while (resultSet.next()) {
+				String metaId   = resultSet.getInt(1) + "" ;
+				String alias    = StringUtils.defaultString(resultSet.getString(2)) ;
+				String headline = StringUtils.defaultString(resultSet.getString(3)) ;
+				String text1    = StringUtils.defaultString(resultSet.getString(4)) ;
+				Date dateCr     = resultSet.getTimestamp(5) ;
+				Date dateMo     = resultSet.getTimestamp(6) ;
+				int status      = resultSet.getInt(7) ;
+				boolean isNew   = (Document.PublicationStatus.NEW.toString().equals(status + "")) ;
+				String path     = (!"".equals(alias)) ? alias : metaId ;
+				String pathVis  = StringUtils.abbreviate(path, truncateLengthPath) ;
+				boolean matchMetaId   = metaId.startsWith(query) ;
+				boolean matchAlias    = (isStartsWithSearch) ? alias.toLowerCase().startsWith(query) : alias.toLowerCase().contains(query) ;
+				boolean matchHeadline = (isStartsWithSearch) ? headline.replaceAll("<[^>]+?>", "").toLowerCase().startsWith(query) : headline.toLowerCase().contains(query) ;
+				boolean matchText1    = (isStartsWithSearch) ? text1.replaceAll("<[^>]+?>", "").toLowerCase().startsWith(query)    : text1.toLowerCase().contains(query) ;
+				if (matchMetaId) {
+					metaId = metaId.replaceFirst("^(" + query + ")", "<b>$1</b>") ;
+					pathVis   = pathVis.replaceFirst("^(" + query + ")", "<b>$1</b>") ;
+				}
+				if (matchAlias) {
+					pathVis = pathVis.replaceAll("(" + query + ")", "<b>$1</b>") ;
+				}
+				headline = StringUtils.abbreviate(headline.replaceAll("<[^>]+?>", "").replaceAll("\\s+", " "), truncateLength) ;
+				text1  = StringUtils.abbreviate(text1.replaceAll("<[^>]+?>", "").replaceAll("\\s+", " "), truncateLength) ;
+				if (matchHeadline) {
+					headline = headline.replaceAll("(" + query + ")", "<b>$1</b>") ;
+				} else if (matchText1) {
+					text1  = text1.replaceAll("(" + query + ")", "<b>$1</b>") ;
+				}
+				headline += " (headline)" ;
+				text1 += " (text 1)" ;
+				
+				String textToShow = (matchHeadline || !matchText1) ? headline : text1 ;
+				
+				String tableStart = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\">" ;
+				String rowStart   = "<tr valign=\"top\"><td class=\"imcmsAdmDim\" style=\"font-weight:bold; padding-right:10px;\">" ;
+				String rowMid     = "</td><td style=\"white-space:pre-wrap; font-size:11px;\">" ;
+				String rowEnd     = "</td></tr>" ;
+				String tableEnd   = "</table>" ;
+				
+				out.print("\n") ;
+				%><!-- <%= path %> --><%
+				%><div id="valueShow<%= iCount %>" style="display:block;"><%
+					%><%= tableStart %><%
+					%><%= rowStart %>Id:<%=   rowMid %><%= metaId             %><%= rowEnd %><%
+					%><%= rowStart %>Href:<%= rowMid %><%= cp + "/" + pathVis %><%= rowEnd %><%
+					%><%= rowStart %>Text:<%= rowMid %><%= textToShow         %><%= rowEnd %><%
+					%><%= tableEnd %><%
+				%></div><%
+				%><div id="valueDefault<%= iCount %>" style="display:none;"><%
+					%><%= tableStart %><%
+					%><%= rowStart %>Id:<%=   rowMid %><%= metaId             %><%= rowEnd %><%
+					%><%= rowStart %>Href:<%= rowMid %><%= cp + "/" + pathVis %><%= rowEnd %><%
+					%><%= rowStart %>Text:<%= rowMid %><%= textToShow         %><%= rowEnd %><%
+					%><%= tableEnd %><%
+				%></div><%
+				%><div id="valueHover<%= iCount %>" style="display:none;"><%
+					%><%= tableStart %><%
+					%><%= rowStart %>Id:<%=   rowMid %><%= metaId %><%
+						%> - <fmt:message key="global/created"/>: <b><%= df.format(dateCr) %></b><%
+						%>, <fmt:message key="global/modified"/>: <b><%= df.format(dateMo) %></b><%
+						%><%= isNew ? " - <span style=\"color:#0b0; font-weight:bold; font-style:italic;\">" : "" %><%
+						if (isNew) {
+							%><fmt:message key="global/new"/>!<%
+						} %><%= isNew ? "</span>" : "" %><%= rowEnd %><%
+					%><%= rowStart %>Href:<%= rowMid %><%= cp + "/" + pathVis %><%= rowEnd %><%
+					%><%= rowStart %>Text:<%= rowMid %><%= textToShow         %><%= rowEnd %><%
+					%><%= tableEnd %><%
+				%></div><%
+				iCount++ ;
+			}
+		} catch(Exception e) {
+			out.print("\nerror1: " + e.getMessage()) ;
+		} finally {
+			try {
+				if (null != resultSet) resultSet.close() ;
+				if (null != preparedStatement) preparedStatement.close() ;
+				if (null != connection) connection.close() ;
+			} catch(Exception ex) {}
+		}
+	} catch (Exception ex) {
+		out.print("\nerror2: " + ex.getMessage()) ;
+	}
+	
+	return ;
+} %>
diff --git a/web/WEB-INF/imcms/jsp/edit_link.jsp b/web/WEB-INF/imcms/jsp/edit_link.jsp
index 6b43ad0078..eb4e150222 100644
--- a/web/WEB-INF/imcms/jsp/edit_link.jsp
+++ b/web/WEB-INF/imcms/jsp/edit_link.jsp
@@ -2,107 +2,535 @@
 	
 	import="com.imcode.imcms.flow.Page,
 	        static com.imcode.imcms.servlet.admin.LinkEditPage.Parameter.*,
-	        com.imcode.imcms.api.ContentManagementSystem, imcode.server.Imcms"
+	        com.imcode.imcms.api.ContentManagementSystem,
+	        com.imcode.imcms.flow.OkCancelPage,
+	        com.imcode.imcms.servlet.admin.LinkEditPage,
+	        org.apache.commons.lang.StringEscapeUtils, com.imcode.imcms.servlet.admin.EditLink, com.imcode.imcms.servlet.AjaxServlet, org.apache.commons.lang.StringUtils"
 	
 	contentType="text/html; charset=UTF-8"
+  pageEncoding="UTF-8"
 	
 %><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"
-%><%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
-%><%@ taglib prefix="ui" tagdir="/WEB-INF/tags/imcms/ui"
-%><%
+%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
+%><%@	taglib prefix="vel" uri="imcmsvelocity"
+%><%!
+
+boolean DEBUG = false ;
 
-response.setContentType( "text/html; charset=" + Imcms.DEFAULT_ENCODING );
+%><%
 
 boolean isSwe = false ;
 try {
 	isSwe =	ContentManagementSystem.fromRequest(request).getCurrentUser().getLanguage().getIsoCode639_2().equals("swe");
 } catch (Exception e) {}
 
-pageContext.setAttribute("linkEditPage", Page.fromRequest(request));
+String cp = request.getContextPath() ;
 
-%>
-<jsp:useBean id="linkEditPage" type="com.imcode.imcms.servlet.admin.LinkEditPage" />
+LinkEditPage linkEditPage = (LinkEditPage) Page.fromRequest(request) ;
+pageContext.setAttribute("linkEditPage", linkEditPage) ;
+
+
+EditLink.Link link = linkEditPage.getLink() ;
+String href        = link.getHref().replace("%3C?imcms:contextpath?%3E", cp).replace(cp, "").replaceFirst("^\\/", "") ;
+String target      = link.getTarget() ;
+String title       = link.getTitle() ;
+String cssClass    = link.getCssClass() ;
+String cssStyle    = link.getCssStyle() ;
+String otherParams = link.getOtherParams().trim() ;
+
+%><vel:velocity><html>
+<head>
+<title><fmt:message key="install/htdocs/sv/jsp/docadmin/document_information.jsp/document_information_title"/></title>
+
+<base target="_self"/>
+
+<meta http-equiv="pragma" content="no-cache">
+<meta http-equiv="Expires" content="-1">
+<meta http-equiv="Cache-Control" content="must-revalidate">
+<meta http-equiv="Cache-Control" content="no-cache">
+
+<link rel="stylesheet" type="text/css" href="<%= cp %>/imcms/css/imcms_admin.css.jsp" />
+<script type="text/javascript" src="<%= cp %>/imcms/$language/scripts/imcms_admin.js.jsp"></script>
+<link rel="stylesheet" type="text/css" href="<%= cp %>/imcms/css/imcms4_admin.css.jsp" />
+<script type="text/javascript" src="<%= cp %>/imcms/swe/scripts/imcms4_admin_script.js.jsp?loadJq=false"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.0/jquery.min.js"></script>
+<link rel="stylesheet" type="text/css" media="all" href="<%= cp %>/imcms/scripts/autocomplete/imcms_jquery.autocomplete.css.jsp" />
+<script type="text/javascript" src="<%= cp %>/imcms/scripts/autocomplete/imcms_jquery.autocomplete.min.js"></script>
+<script type="text/javascript" src="<%= cp %>/imcms/scripts/defaultvalue/imcms_jquery.defaultValue.js"></script>
+
+<style type="text/css">
+td.imcmsAdmText {
+	padding-right: 10px;
+}
+.lightgrey {
+	color: #999 !important;
+}
+</style>
+
+</head>
+<body id="theBody" bgcolor="#FFFFFF" onLoad="focusField(0,'typeSelect');">
+
+
+#gui_outer_start()
+#gui_head('<fmt:message key="edit/link/dialog/title" />')
+<form id="theForm" action="<%= cp %>/servlet/PageDispatcher">
+<%= Page.htmlHidden(request) %>
+<table border="0" cellspacing="0" cellpadding="0">
+<tr>
+	<td><input type="SUBMIT" class="imcmsFormBtn" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>" value="<fmt:message key="global/back"/>"></td>
+	<td>&nbsp;</td>
+	<td><input type="button" value="<fmt:message key="global/help"/>" title="<fmt:message key="global/openthehelppage"/>" class="imcmsFormBtn" onClick="openHelpW('EditLink')"></td>
+	<td>&nbsp;</td>
+	<td><input type="button" id="editLinkAdvancedSettingsBtn" value="<fmt:message key="global/AdvancedSettings"/>" title="<fmt:message key="global/AdvancedSettings"/>" class="imcmsFormBtn"></td>
+</tr>
+</table>
+
+#gui_mid()
+
+</vel:velocity><%
+if (DEBUG) { %>
+HREF:	<input type="text" id="<%= HREF.toString() %>" name="<%= HREF.toString() %>" value="<%= StringEscapeUtils.escapeHtml(href) %>" style="width:500px;" /><%
+} else { %>
+<input type="hidden" id="<%= HREF.toString() %>" name="<%= HREF.toString() %>" value="<%= StringEscapeUtils.escapeHtml(href) %>" /><%
+} %>
+<table border="0" cellspacing="2" cellpadding="0" style="width:630px;">
+<tr>
+	<td class="imcmsAdmText"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/7" /></td>
+	<td colspan="2">
+	<select id="typeSelect" onchange="setValue(jQ, this.selectedIndex);">
+		<option value="" selected="selected">-</option>
+		<option value="1"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/8" /></option>
+		<option value="2"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/9" /></option>
+		<option value="3"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/10" /></option>
+		<option value="4"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/11" /></option>
+		<option value="5"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/12" /></option>
+	</select></td>
+</tr>
+<tr>
+	<td class="imcmsAdmText" style="padding-right:0;">
+	<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
+	<tr>
+		<td><fmt:message key="edit/link/href" /></td>
+		<td align="right" id="pathStart" style="padding-right:3px;">&nbsp;</td>
+	</tr>
+	</table></td>
+	<td id="tdInput"><input type="text" id="<%= HREF.toString() %>dummy" value="<%= StringEscapeUtils.escapeHtml(href) %>"
+	           maxlength="300" size="60" style="width:100%;"/></td>
+	<td align="right"><input type="submit" class="imcmsFormBtnSmall toolTip" name="SEARCH" id="searchBtn"
+	                         value="<fmt:message key="global/Search"/>"
+	                         title="<fmt:message key="install/htdocs/imcms/html/link_editor.jsp/search/title"/>" /></td>
+</tr>
+<tr>
+	<td class="imcmsAdmText"><fmt:message key="edit/link/title" /></td>
+	<td><input type="text" id="<%= TITLE.toString() %>" name="<%= TITLE.toString() %>" value="<%= StringEscapeUtils.escapeHtml(title) %>"
+	           maxlength="300" size="60" style="width:100%;"/></td>
+	<td>&nbsp;</td>
+</tr><%
+if (linkEditPage.isTargetEditable()) { %>
+<tr>
+	<td class="imcmsAdmText"><fmt:message key="edit/link/target" /></td>
+	<td colspan="2">
+	<table border="0" cellspacing="0" cellpadding="0" id="<%= TARGET.toString() %>">
+	<tr>
+	<td><input type="radio" name="<%= TARGET.toString() %>" id="target_self" value="_self"<%
+	if ("_self".equalsIgnoreCase( target ) || "".equals( target )) {
+		%> checked<%
+		target = null;
+	} %>></td>
+	<td class="imcmsAdmText">&nbsp;<label for="target_self"><fmt:message key="install/htdocs/sv/jsp/docadmin/document_information.jsp/1015"/></label>&nbsp;</td>
+	<td><input type="radio" name="<%= TARGET.toString() %>" id="target_blank" value="_blank"<%
+	if ("_blank".equalsIgnoreCase( target ) ) {
+		%> checked<%
+		target = null;
+	} %>></td>
+	<td class="imcmsAdmText">&nbsp;<label for="target_blank"><fmt:message key="install/htdocs/sv/jsp/docadmin/document_information.jsp/1016"/></label>&nbsp;</td>
+	<td><input type="radio" name="<%= TARGET.toString() %>" id="target_top" value="_top"<%
+	if ("_top".equalsIgnoreCase( target ) ) {
+		%> checked<%
+		target = null;
+	} %>></td>
+	<td class="imcmsAdmText">&nbsp;<label for="target_blank"><fmt:message key="install/htdocs/sv/jsp/docadmin/document_information.jsp/1017"/></label>&nbsp;</td>
+	<td><input type="radio" name="<%= TARGET.toString() %>" id="target_other" value="" <% if (null != target) { %> checked<% } %>></td>
+	<td class="imcmsAdmText">&nbsp;<label for="target_other"><fmt:message key="install/htdocs/sv/jsp/docadmin/document_information.jsp/1018"/></label>&nbsp;</td>
+	<td>
+	<input type="text" name="<%= TARGET.toString() %>" size="9" maxlength="20" style="width:120px;" value="<%
+	if (null != target) {
+		%><%= StringEscapeUtils.escapeHtml( target ) %><%
+	} %>"></td>
+	</tr>
+	</table></td>
+</tr><%
+} %>
+<tr>
+	<td style="padding:0;"><img src="<%= cp %>/imcms/swe/images/admin/1x1.gif" width="110" height="1" alt="" /></td>
+	<td style="padding:0;"><img src="<%= cp %>/imcms/swe/images/admin/1x1.gif" width="450" height="1" alt="" /></td>
+	<td style="padding:0;"><img src="<%= cp %>/imcms/swe/images/admin/1x1.gif" width="70" height="1" alt="" /></td>
+</tr>
+</table>
+
+<div id="advancedSettingsDiv" style="display:none;">
+	<table border="0" cellspacing="2" cellpadding="0" style="width:630px;">
+	<tr><vel:velocity>
+		<td colspan="3" style="padding-top:10px;">#gui_heading( '<fmt:message key="global/AdvancedSettings"/>' )</td>
+	</tr></vel:velocity>
+	<tr>
+		<td class="imcmsAdmText" nowrap="nowrap"><fmt:message key="edit/link/cssClass" /></td>
+		<td><input type="text" id="<%= CLASS.toString() %>" name="<%= CLASS.toString() %>" size="20" maxlength="50" style="width:100%;"
+							 value="<%= StringEscapeUtils.escapeHtml(cssClass) %>" /></td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td class="imcmsAdmText" nowrap="nowrap"><fmt:message key="edit/link/cssStyle" /></td>
+		<td><input type="text" id="<%= STYLE.toString() %>" name="<%= STYLE.toString() %>" size="20" maxlength="50" style="width:100%;"
+							 value="<%= StringEscapeUtils.escapeHtml(cssStyle) %>" /></td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td class="imcmsAdmText" nowrap="nowrap"><fmt:message key="edit/link/otherParams" /></td>
+		<td><input type="text" id="<%= OTHER.toString() %>" name="<%= OTHER.toString() %>" size="20" maxlength="50" style="width:100%;"
+							 value="<%= StringEscapeUtils.escapeHtml(otherParams) %>" /></td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td colspan="2" class="imcmsAdmDim"><fmt:message key="edit/link/otherParamsExample" /> <%= StringUtils.join(EditLink.OTHER_PARAMETERS, ", ") %></td>
+	</tr>
+	<tr>
+		<td style="padding:0;"><img src="<%= cp %>/imcms/swe/images/admin/1x1.gif" width="110" height="1" alt="" /></td>
+		<td style="padding:0;"><img src="<%= cp %>/imcms/swe/images/admin/1x1.gif" width="450" height="1" alt="" /></td>
+		<td style="padding:0;"><img src="<%= cp %>/imcms/swe/images/admin/1x1.gif" width="70" height="1" alt="" /></td>
+	</tr>
+	</table>
+</div>
+
+<table border="0" cellspacing="2" cellpadding="0" style="width:630px;">
+<tr><vel:velocity>
+	<td style="padding-top:10px;">#gui_hr( 'blue' )</td>
+</tr></vel:velocity>
+<tr>
+	<td align="right"><input type="submit" class="imcmsFormBtn" name="<%= OkCancelPage.REQUEST_PARAMETER__OK %>" value="<fmt:message key="global/OK"/>" /></td>
+</tr>
+</table>
+</form>
+<vel:velocity>
+#gui_bottom()
+#gui_outer_end()
+</vel:velocity>
 
-<ui:dialog titlekey="edit/link/dialog/title" helpid="EditLink">
 
-    <ui:labeled idref="DEFVAL" key="install/htdocs/imcms/html/link_editor.jsp/7">
-        <select id="typeSelect" onchange="setValue(this.selectedIndex);">
-	        <option value="" selected="selected">-</option>
-	        <option value="1"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/8" /></option>
-	        <option value="2"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/9" /></option>
-	        <option value="3"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/10" /></option>
-	        <option value="4"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/11" /></option>
-	        <option value="5"><fmt:message key="install/htdocs/imcms/html/link_editor.jsp/12" /></option>
-        </select>
-    </ui:labeled>
-	
-    <ui:labeled idref="<%= HREF.toString() %>" key="edit/link/href">
-        <ui:text id="<%= HREF.toString() %>" value="${linkEditPage.link.href}" maxlength="300" size="60"/>
-        <input type="submit" class="imcmsFormBtnSmall" name="SEARCH" id="searchBtn" value="Search" />
-    </ui:labeled>
-    
-    <ui:labeled idref="<%= TITLE.toString() %>" key="edit/link/title">
-        <ui:text id="<%= TITLE.toString() %>" value="${linkEditPage.link.title}" maxlength="300" size="60"/>
-    </ui:labeled>
-    
-    <c:if test="${linkEditPage.targetEditable}">
-        <ui:separator/>
-        <ui:labeled idref="<%= TARGET.toString() %>" key="edit/link/target">
-            <ui:linktarget name="<%= TARGET.toString() %>" target="${linkEditPage.link.target}"/>
-        </ui:labeled>
-    </c:if>
-
-</ui:dialog>
 <script type="text/javascript">
-window.resizeTo(800,520);
-document.getElementById("searchBtn").value = "<%= isSwe ? "S\u00F6k" : "Search" %>" ;
-function setValue(idx) {
-	var oHref = document.getElementById("<%= HREF.toString() %>") ;
-	var oldVal = oHref.value ;
-	var arrValues = [
-		"<%= request.getContextPath() %>/MetaOrAlias",
-		"http://www.domain.com/path/",
-		"mailto:whoever@domain.com",
-		"ftp://ftp.domain.com/path/",
-		"#anchorName"
-	] ;
+window.resizeTo(<%= DEBUG ? "1600,900" : "800,600" %>) ;
+
+var defaultValueInitiated = false ;
+
+var defaultValueTextInternalLinks = "<%= StringEscapeUtils.escapeJavaScript(isSwe ?
+		"Skriv meta_id, alias eller del av rubrik så kommer förslag" :
+		"Write meta_id, alias or a part of the headline for suggestions") %>" ;
+
+var arrValues = [
+	defaultValueTextInternalLinks,
+	"http://www.domain.com/path/",
+	"mailto:whoever@domain.com",
+	"ftp://ftp.domain.com/path/",
+	"#anchorName"
+] ;
+
+var showConfirmOverWrite = true ;
+
+function setValue($, idx) {
+	var $objHrefDummy     = $('#<%= HREF.toString() %>dummy') ;
+	var $objHrefContainer = $('#tdInput') ;
 	if (idx > 0) {
-		var confirmed = true ;
-		if (oHref.value != "") {
-			confirmed = confirm("<%= isSwe ? "Vill du skriva \u00F6ver det gamla l\u00e4nkadress-v\u00e4rdet med ett exempel?" :
-			                                 "Do you want to overwrite the old link address value with an example?" %>") ;
+		var confirmed = showConfirmOverWrite ;
+		if (showConfirmOverWrite && '' != $objHrefDummy.val()) {
+			confirmed = confirm('<%= isSwe ? "Vill du skriva \u00F6ver det gamla l\u00e4nkadress-v\u00e4rdet med ett exempel?" :
+			                                 "Do you want to overwrite the old link address value with an example?" %>') ;
+		}
+		var isDefaultValue = (1 == idx) ;
+		if (confirmed) {
+			if (isDefaultValue) {
+				$objHrefDummy.addClass('defaultValue').val('').attr('title', arrValues[idx-1]) ;
+				$objHrefContainer.defaultValue('lightgrey') ;
+				defaultValueInitiated = true ;
+			} else {
+				$objHrefDummy.removeClass('defaultValue').removeClass('lightgrey').removeAttr('title').val(arrValues[idx-1]) ;
+				if (defaultValueInitiated) {
+					jQ.defaultValueRemove() ;
+				}
+			}
+		}
+		var deActivateTarget = (5 == idx) ;
+		if (deActivateTarget) {
+			$('input[name=<%= TARGET %>]').attr('disabled', 'disabled') ;
+			$('label[for^=target_]').attr('style', 'text-decoration:line-through !important;') ;
+		} else {
+			$('input[name=<%= TARGET %>]').removeAttr('disabled') ;
+			$('label[for^=target_]').removeAttr('style') ;
 		}
-		if (confirmed) oHref.value = arrValues[idx-1] ;
 	}
-	checkSearchEnabled() ;
+	showConfirmOverWrite = true ;
+	checkSearchEnabled($) ;
+	stripRealHref($) ;
+	copyRealHref($) ;
 }
-function checkSearchEnabled() {
-	var objType = document.getElementById("typeSelect") ;
-	var objBtn  = document.getElementById("searchBtn") ;
-	if (objType.selectedIndex != 1) {
-		objBtn.className = "imcmsFormBtnSmallDisabled" ;
-		objBtn.disabled  = true ;
+
+function checkSearchEnabled($) {
+	var $objType = $('#typeSelect') ;
+	var $objBtn  = $('#searchBtn') ;
+	if (1 != $objType.val()) {
+		$objBtn.attr('class', 'imcmsFormBtnSmallDisabled').attr('disabled', 'disabled') ;
+		disableAutoComplete($) ;
 	} else {
-		objBtn.className = "imcmsFormBtnSmall" ;
-		objBtn.disabled  = false ;
+		$objBtn.attr('class', 'imcmsFormBtnSmall').removeAttr('disabled') ;
+		enableAutoComplete($) ;
 	}
 }
-function setSelectToLinkType() {
-	var objType = document.getElementById("typeSelect") ;
-	var objHref = document.getElementById("<%= HREF.toString() %>") ;
-	var href = objHref.value ;
+
+function setSelectToLinkType($) {
+	var $objType = $('#typeSelect') ;
+	var $objHref = $('#<%= HREF.toString() %>') ;
+	var href = $objHref.val() ;
 	if (/^#.*/.test(href)) {
-		objType.selectedIndex = 5 ;
+		$objType.val(5) ;
 	} else if (/^ftp:.*/.test(href)) {
-		objType.selectedIndex = 4 ;
+		$objType.val(4) ;
 	} else if (/^mailto:.*/.test(href)) {
-		objType.selectedIndex = 3 ;
+		$objType.val(3) ;
 	} else if (href.indexOf(":") != -1) {
-		objType.selectedIndex = 2 ;
-	} else if (/^\/.*/.test(href)) {
-		objType.selectedIndex = 1 ;
+		$objType.val(2) ;
+	} else {
+		$objType.val(1) ;
+	}
+	stripRealHref($) ;
+	showConfirmOverWrite = false ;
+	$('#typeSelect').trigger('change') ;
+}
+
+function stripRealHref($) {
+	var $objHrefDummy = $('#<%= HREF.toString() %>dummy') ;
+	var $label        = $('#pathStart') ;
+	var $objType      = $('#typeSelect') ;
+	if (1 == $objType.val()) {
+		$label.html('<span class="imcmsAdmDim"><%= cp + "/" %></span>') ;
+		var re = new RegExp('<%= cp.replace("\\/", "\\\\/") + "\\/" %>', '') ;
+		$objHrefDummy.val($objHrefDummy.val().replace(re, '')) ;
+	} else {
+		$label.html('&nbsp;') ;
+	}
+}
+
+function copyRealHref($) {
+	var $objHrefDummy = $('#<%= HREF.toString() %>dummy') ;
+	var $objHref      = $('#<%= HREF.toString() %>') ;
+	var $objType      = $('#typeSelect') ;
+	var theValue      = $objHrefDummy.val().replace(defaultValueTextInternalLinks, '') ;
+	if (1 == $objType.val()) {
+		$objHref.val('<%= cp + "/" %>' + theValue) ;
+	} else {
+		$objHref.val(theValue) ;
+	}
+}
+
+var editLinkAdvancedSettingsActive = ('true' == getCookie('editLinkAdvancedSettingsActive')) ;
+
+jQ(document).ready(function($) {
+	
+	$('#theForm').submit(function() {
+		copyRealHref($) ;
+	}) ;
+	$('#<%= HREF.toString() %>dummy').live('change keyup mouseup', function() {
+		copyRealHref($) ;
+	}) ;
+	
+	$('#editLinkAdvancedSettingsBtn').click(function(event) {
+		event.preventDefault() ;
+		if (editLinkAdvancedSettingsActive) {
+			editLinkAdvancedSettingsActive = false ;
+			setCookie('editLinkAdvancedSettingsActive', null) ;
+		} else {
+			editLinkAdvancedSettingsActive = true ;
+			setCookie('editLinkAdvancedSettingsActive', 'true') ;
+		}
+		checkAdvancedDiv($) ;
+	}) ;
+	checkAdvancedDiv($) ;
+	
+	setSelectToLinkType($) ;
+	copyRealHref($) ;
+	
+}) ;
+
+function checkAdvancedDiv($) {
+	if (editLinkAdvancedSettingsActive) {
+		$('#advancedSettingsDiv').slideDown('slow') ;
+		$('#editLinkAdvancedSettingsBtn').addClass('imcmsFormBtnActive').removeClass('imcmsFormBtn') ;
+	} else {
+		$('#advancedSettingsDiv').slideUp('slow') ;
+		$('#editLinkAdvancedSettingsBtn').addClass('imcmsFormBtn').removeClass('imcmsFormBtnActive') ;
+	}
+}
+
+
+jQuery(document).ready(function($) {
+	
+	$('div[id^=valueShow]').live('mouseenter mouseleave', function(event) {
+		var idNbr  = $(this).attr('id').replace(/[^\d]/g, '') ;
+		if ('mouseenter' == event.type) {
+			hoverAutoCompleteItem($, idNbr, true) ;
+		} else {
+			hoverAutoCompleteItem($, idNbr, false) ;
+		}
+	}) ;
+	
+	$('#<%= HREF.toString() %>dummy').live(($.browser.opera ? "keypress" : "keydown"), function(event) {
+		var KEY = {
+			UP: 38,
+			DOWN: 40,
+			PAGEUP: 33,
+			PAGEDOWN: 34
+		} ;
+		switch(event.keyCode) {
+			case KEY.UP:
+			case KEY.DOWN:
+			case KEY.PAGEUP:
+			case KEY.PAGEDOWN:
+				checkActiveItemInAutoComplete($) ;
+				break;
+			default:
+				break;
+		}
+	}) ;
+	
+}) ;
+
+function hoverAutoCompleteItem($, idNbr, isHover) {
+	var oThis  = $('#valueShow' + idNbr) ;
+	var defVal = $('#valueDefault' + idNbr).html() ;
+	var hovVal = $('#valueHover' + idNbr).html() ;
+	if (isHover) {
+		oThis.height(oThis.height()) ;
+		oThis.html(hovVal) ;
+	} else {
+		oThis.html(defVal) ;
 	}
-	checkSearchEnabled() ;
 }
-setSelectToLinkType() ;
+
+function checkActiveItemInAutoComplete($) {
+	$('div.ac_results ul li').each(function() {
+		var $oThis = $(this) ;
+		var idNbr = $oThis.find('div[id^=valueShow]:first').attr('id').replace(/[^\d]/g, '') ;
+		if ($oThis.hasClass('ac_over')) {
+			hoverAutoCompleteItem($, idNbr, true) ;
+		} else {
+			hoverAutoCompleteItem($, idNbr, false) ;
+		}
+	}) ;
+}
+
+var autoCompleteEnabled = false ;
+
+function enableAutoComplete($) {
+	if (autoCompleteEnabled) {
+		return ;
+	}
+	autoCompleteEnabled = true ;
+	var isStartsWithSearch = false ;
+	
+	$('#<%= HREF.toString() %>dummy')<%-- http://view.jquery.com/trunk/plugins/autocomplete/demo/ --%>
+		.attr('autocomplete', 'off')
+		.autocomplete('<%= AjaxServlet.getPath(cp) %>',
+		{
+			matchSubset  : !isStartsWithSearch,
+			highlight    : false,
+			selectFirst  : false,
+			max          : 20,
+			minChars     : 1,
+			cacheLength  : 0,
+			width        : 520,
+			scroll       : true,
+			scrollHeight : 400,
+			autoFill     : isStartsWithSearch,
+			formatItem: function(array, i, max, value, term) {
+				try {
+					if (isStartsWithSearch) {
+						return value ;<%-- ('' == term) ? value : value.replace(new RegExp('^(' + term + ')(.*?)$', 'gi'), '<strong>$1</strong>$2') ;--%>
+					} else {
+						return value ;<%-- ('' == term) ? value : value.replace(new RegExp('(' + term + ')', 'gi'), '<strong>$1</strong>') ;--%>
+					}
+				} catch(e) {
+					return value ;
+				}
+			},
+			formatResult: function(array) {
+				try {
+					return array[0].replace(/<!-- (.+) -->.+/gi, '$1') ;
+				} catch(e) {
+					return array[0] ;
+				}
+			},
+			extraParams : {
+				action : 'linkEditAutoCompleteSearch',
+				isStartsWithSearch : isStartsWithSearch
+			}
+		}
+	) ;
+	
+	$('#<%= HREF.toString() %>dummy').result(function (event, data, formatted) {
+		if (data) {
+			var $objHref = $('#<%= HREF.toString() %>') ;
+			$objHref.val('<%= cp + "/" %>' + formatted.replace(/<!-- (.+) -->.+/gi, '$1')) ;
+		}
+	}) ;
+}
+
+function disableAutoComplete($) {
+	$('#<%= HREF.toString() %>dummy')
+		.attr('autocomplete', 'on')
+		.unautocomplete() ;
+	autoCompleteEnabled = false ;
+}
+
+/* *************************************
+ *            Set Cookie               *
+ ************************************* */
+
+function setCookie(name, value) {
+	var sPath = '/';
+	var today = new Date();
+	var expire = new Date();
+	if (null == value) {
+		expire.setTime(today.getTime() + 1000*60*60*24*-1); // yesterday
+	} else {
+		expire.setTime(today.getTime() + 1000*60*60*24*365); // 365 days
+	}
+	var sCookieCont = name + "=" + escape(value);
+	sCookieCont += (expire == null) ? "" : "\; expires=" + expire.toGMTString();
+	sCookieCont += "; path=" + sPath;
+	document.cookie = sCookieCont;
+}
+
+
+/* *************************************
+ *            Get Cookie               *
+ ************************************* */
+
+function getCookie(Name) {
+	var search = Name + "=";
+	if (document.cookie.length > 0) {
+		var offset = document.cookie.indexOf(search);
+		if (offset != -1) {
+			offset += search.length;
+			end = document.cookie.indexOf(";", offset);
+			if (end == -1) {
+				end = document.cookie.length;
+			}
+			return unescape(document.cookie.substring(offset, end));
+		}
+	}
+	return '' ;
+}
 </script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/includes/README b/web/WEB-INF/includes/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/WEB-INF/libraries/README b/web/WEB-INF/libraries/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/WEB-INF/logs/README b/web/WEB-INF/logs/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/WEB-INF/passwordreset/email_sent_confirmation.jsp b/web/WEB-INF/passwordreset/email_sent_confirmation.jsp
new file mode 100644
index 0000000000..45366f8d34
--- /dev/null
+++ b/web/WEB-INF/passwordreset/email_sent_confirmation.jsp
@@ -0,0 +1,14 @@
+<%@ page pageEncoding="UTF-8"%>
+<%@ page import="com.imcode.imcms.util.l10n.LocalizedMessageFormat" %>
+<%@ page import="com.imcode.imcms.servlet.PasswordReset" %>
+<%@ page import="imcode.server.Imcms" %>
+<jsp:include page="inc_header.jsp" flush="true"/>
+
+<div style="width:310px;">
+	<%= new LocalizedMessageFormat("passwordreset.confirmation.email_sent",
+					request.getParameter(PasswordReset.REQUEST_USER_IDENTITY),
+					Imcms.getServices().getSystemData().getServerMasterAddress()).toLocalizedString(request)
+	%>
+</div>
+
+<jsp:include page="inc_footer.jsp" flush="true"/>
\ No newline at end of file
diff --git a/web/WEB-INF/passwordreset/identity_form.jsp b/web/WEB-INF/passwordreset/identity_form.jsp
new file mode 100644
index 0000000000..d6a9fde5f0
--- /dev/null
+++ b/web/WEB-INF/passwordreset/identity_form.jsp
@@ -0,0 +1,34 @@
+<%@ page
+	
+	import="com.imcode.imcms.servlet.PasswordReset,
+	        com.imcode.imcms.util.l10n.LocalizedMessage"
+	
+  pageEncoding="UTF-8"
+%><%!
+
+static final LocalizedMessage formInfo = new LocalizedMessage("passwordreset.identity_form_info");
+static final LocalizedMessage formLabelEmail = new LocalizedMessage("passwordreset.identity_form.lbl_identity");
+static final LocalizedMessage formSubmit = new LocalizedMessage("passwordreset.identity_form.submit");
+
+%>
+<jsp:include page="inc_header.jsp" flush="true"/>
+
+<div style="width:310px;">
+	<p>
+		<%= formInfo.toLocalizedString(request) %>
+	</p>
+
+	<form method="POST" action="<%= request.getContextPath() %>/servlet/PasswordReset">
+		<input type="hidden" name="<%=PasswordReset.REQUEST_PARAM_OP%>" value="<%=PasswordReset.Op.SEND_RESET_URL%>"/>
+		
+		<table border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td width="20%"><%=formLabelEmail.toLocalizedString(request)%></td>
+			<td width="60%" style="padding: 0 10px;"><input type="text" name="<%=PasswordReset.REQUEST_USER_IDENTITY%>" style="width:100%;"></td>
+			<td width="20%" align="right"><input type="submit" class="imcmsFormBtnSmall" value="<%=formSubmit.toLocalizedString(request)%>" /></td>
+		</tr>
+		</table>
+	</form>
+</div>
+
+<jsp:include page="inc_footer.jsp" flush="true"/>
\ No newline at end of file
diff --git a/web/WEB-INF/passwordreset/inc_footer.jsp b/web/WEB-INF/passwordreset/inc_footer.jsp
new file mode 100644
index 0000000000..47dd4ada1d
--- /dev/null
+++ b/web/WEB-INF/passwordreset/inc_footer.jsp
@@ -0,0 +1,12 @@
+<%@ page
+	
+  pageEncoding="UTF-8"
+	
+%><%@ taglib prefix="vel" uri="imcmsvelocity"
+%><%!
+
+/* End of page */
+
+%><vel:velocity>
+#gui_end_of_page()
+</vel:velocity>
\ No newline at end of file
diff --git a/web/WEB-INF/passwordreset/inc_header.jsp b/web/WEB-INF/passwordreset/inc_header.jsp
new file mode 100644
index 0000000000..3fa32cfaa6
--- /dev/null
+++ b/web/WEB-INF/passwordreset/inc_header.jsp
@@ -0,0 +1,25 @@
+<%@ page
+	
+	import="com.imcode.imcms.servlet.PasswordReset,
+	        java.util.List"
+	
+  pageEncoding="UTF-8"
+	
+%><%@ taglib prefix="vel" uri="imcmsvelocity"
+%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%!
+
+/* Validation errors and common heading */
+
+%><vel:velocity>
+#gui_start_of_page( "<fmt:message key="passwordreset.title" />" "$contextPath/login" "<fmt:message key="global/back" />" "" "" )
+
+<%
+List<String> errors = (List<String>)request.getAttribute(PasswordReset.REQUEST_ATTR_VALIDATION_ERRORS);
+
+if (errors != null) { %>
+	<div style="border: 1px solid red; background-color: #ffc; padding: 5px 10px;">
+		<p><fmt:message key="passwordreset.title.validation_errors" /></p>
+		<p><%= errors.get(0) %></p>
+	</div><%
+} %>
+</vel:velocity>
\ No newline at end of file
diff --git a/web/WEB-INF/passwordreset/password_changed_confirmation.jsp b/web/WEB-INF/passwordreset/password_changed_confirmation.jsp
new file mode 100644
index 0000000000..ce7e6a9d06
--- /dev/null
+++ b/web/WEB-INF/passwordreset/password_changed_confirmation.jsp
@@ -0,0 +1,18 @@
+<%@ page
+        pageEncoding="UTF-8"
+        import="com.imcode.imcms.util.l10n.LocalizedMessage"
+%><%!
+
+static final LocalizedMessage confirmation = new LocalizedMessage("passwordreset.confirmation.password_changed");
+static final LocalizedMessage lnkStartPage = new LocalizedMessage("passwordreset.link.start_page");
+
+%>
+<jsp:include page="inc_header.jsp" flush="true"/>
+
+<div style="width:310px;">
+	<p><%= confirmation.toLocalizedString(request) %></p>
+
+	<a href="<%= request.getContextPath() %>/servlet/StartDoc"><%= lnkStartPage.toLocalizedString(request) %></a>
+</div>
+
+<jsp:include page="inc_footer.jsp" flush="true"/>
\ No newline at end of file
diff --git a/web/WEB-INF/passwordreset/password_reset_form.jsp b/web/WEB-INF/passwordreset/password_reset_form.jsp
new file mode 100644
index 0000000000..9a85e82aa0
--- /dev/null
+++ b/web/WEB-INF/passwordreset/password_reset_form.jsp
@@ -0,0 +1,51 @@
+<%@ page
+	
+	import="com.imcode.imcms.servlet.PasswordReset,
+	        com.imcode.imcms.util.l10n.LocalizedMessage"
+	
+  pageEncoding="UTF-8"
+  
+%><%!
+
+static final LocalizedMessage formInfo = new LocalizedMessage("passwordreset.password_reset_form_info");
+static final LocalizedMessage formLabelPassword = new LocalizedMessage("passwordreset.password_reset_form.lbl_password");
+static final LocalizedMessage formLabelPasswordCheck = new LocalizedMessage("passwordreset.password_reset_form.lbl_password_check");
+static final LocalizedMessage formSubmit = new LocalizedMessage("passwordreset.password_reset_form.submit");
+
+%><jsp:include page="inc_header.jsp" flush="true"/>
+
+<div style="width:310px;">
+	<p>
+		<%=formInfo.toLocalizedString(request)%>
+	</p>
+	
+	<form method="POST" action="<%= request.getContextPath() %>/servlet/PasswordReset">
+		<input type="hidden" name="<%=PasswordReset.REQUEST_PARAM_OP%>" value="<%=PasswordReset.Op.SAVE_NEW_PASSWORD%>"/>
+		<input type="hidden" name="<%=PasswordReset.REQUEST_PARAM_RESET_ID%>" value="<%=request.getParameter(PasswordReset.REQUEST_PARAM_RESET_ID)%>"/>
+	
+		<table border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td width="50%" style="white-space:nowrap;"><%=formLabelPassword.toLocalizedString(request)%></td>
+			<td width="50%" style="padding: 0 10px;"><input type="password" name="<%=PasswordReset.REQUEST_PARAM_PASSWORD%>" style="width:100%;"></td>
+		</tr>
+		<tr>
+			<td style="white-space:nowrap;"><%=formLabelPasswordCheck.toLocalizedString(request)%></td>
+			<td style="padding: 0 10px;"><input type="password" name="<%=PasswordReset.REQUEST_PARAM_PASSWORD_CHECK%>" style="width:100%;"></td>
+		</tr>
+		<tr>
+			<td colspan="2" align="right" style="padding-top:10px;"><input type="submit" class="imcmsFormBtnSmall" value="<%=formSubmit.toLocalizedString(request)%>"/></td>
+		</tr>
+		</table>
+	</form>
+	
+	<%--<p>--%>
+	<%--Secure password tips:--%>
+	<%--<ul>--%>
+		<%--<li>Use at least 8 characters, a combination of numbers and letters is best.</li>--%>
+		<%--<li>Do not use the same password you have used with us previously.</li>--%>
+		<%--<li>Do not use dictionary words, your name, e-mail address, or other personal information that can be easily obtained.</li>--%>
+		<%--<li>Do not use the same password for multiple online accounts.</li>--%>
+	<%--</ul>--%>
+</div>
+
+<jsp:include page="inc_footer.jsp" flush="true"/>
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/AdminDeleteDoc.htm b/web/WEB-INF/templates/lang/admin/AdminDeleteDoc.htm
index 50e5bb59e2..21784f1998 100644
--- a/web/WEB-INF/templates/lang/admin/AdminDeleteDoc.htm
+++ b/web/WEB-INF/templates/lang/admin/AdminDeleteDoc.htm
@@ -2,19 +2,23 @@
 
 <form method="post" action="AdminDeleteDoc" name="DeleteDoc" onSubmit="return confirmDeleteDoc(); return false;">
 <table border="0" cellspacing="0" cellpadding="2" width="400">
-<tr>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
 	<tr>
-		<td><? templates/sv/AdminDeleteDoc.htm/4 ?></td>
-		<td>&nbsp;&nbsp;</td>
-		<td><input type="text" name="delete_meta_id" maxlength="9" size="9"></td>
-		<td>&nbsp;&nbsp;</td>
-		<td><input type="submit" class="imcmsFormBtnSmall" name="DELETE_DOC" value="<? templates/sv/AdminDeleteDoc.htm/2001 ?>"></td>
-		<td></form></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><? templates/sv/AdminDeleteDoc.htm/4 ?></td>
+					<td>&nbsp;&nbsp;</td>
+					<td><input type="text" name="delete_meta_id" maxlength="9" size="9"></td>
+					<td>&nbsp;&nbsp;</td>
+					<td><input type="submit" class="imcmsFormBtnSmall" name="DELETE_DOC" value="<? templates/sv/AdminDeleteDoc.htm/2001 ?>"></td>
+					<td></form></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td style="color: red"><div>#ERROR_MESSAGE#</div></td>
 	</tr>
-	</table></td>
-</tr>
 </table>
 
 <script language="JavaScript">
diff --git a/web/WEB-INF/templates/lang/admin/AdminIpWhiteList.jsp b/web/WEB-INF/templates/lang/admin/AdminIpWhiteList.jsp
new file mode 100644
index 0000000000..4981a2e12a
--- /dev/null
+++ b/web/WEB-INF/templates/lang/admin/AdminIpWhiteList.jsp
@@ -0,0 +1,233 @@
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!-- gui_start_of_page -->
+<html>
+<head>
+    <title><? templates/sv/AdminManager_adminTask_element.htm/6 ?></title>
+    <link rel="stylesheet" type="text/css" href="${contextPath}/imcms/css/imcms_admin.css.jsp"/>
+    <script type="text/javascript" src="${contextPath}/imcms/${language}/scripts/imcms_admin.js.jsp"></script>
+    <script type="text/javascript">
+        $(function () {
+            $("#login-via-https").click(function () {
+                $("#login-via-https-hidden").val($(this).is(":checked"));
+                $("#white-list-form").submit();
+            });
+        });
+    </script>
+</head>
+<body><!-- gui_outer_start -->
+<table border="0" cellspacing="0" cellpadding="0" class="imcmsAdmTable" align="center">
+    <tr>
+        <td class="imcmsAdmTable">            <!-- /gui_outer_start -->            <!-- gui_head -->
+            <table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                            width="1" height="20" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1"
+                                         alt=""/></td>
+                    <td nowrap="nowrap"><span
+                            class="imcmsAdmHeadingTop"><? templates/sv/AdminManager_adminTask_element.htm/6 ?></span>
+                    </td>
+                    <td align="right"><a href="http://www.imcms.net/" target="_blank" title="www.imcms.net"><img
+                            src="${contextPath}/imcms/${language}/images/admin/logo_imcms_admin.gif" width="100"
+                            height="20"
+                            alt="www.imcms.net" border="0"/></a></td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1"
+                                         alt=""/></td>
+                </tr>
+                <tr>
+                    <td colspan="6" class="imcmsAdmBgHead"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                            width="1" height="20" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1"
+                                         alt=""/></td>
+                    <td colspan="2">                        <!-- /gui_head -->
+                        <!-- gui_head_help_and_back_buttons -->
+                        <form method="post" action="AdminManager">
+                            <table border="0" cellspacing="0" cellpadding="0">
+                                <tr>
+                                    <td><input type="submit" class="imcmsFormBtn" value="<? global/back ?>"/></td>
+                                    <td style="padding-left:10px;"><input type="button" value="<? global/help ?>"
+                                                                          title="<? global/openthehelppage ?>"
+                                                                          class="imcmsFormBtn"
+                                                                          onclick="openHelpW('IPAccess'); return false"/>
+                                    </td>
+                                </tr>
+                            </table>
+                        </form>                        <!-- /gui_head_help_and_back_buttons -->
+                        <!-- gui_mid -->                    </td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1"
+                                         alt=""/></td>
+                </tr>
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                            width="1" height="20" alt=""/></td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td class="imcmsAdmBgCont" colspan="4"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1"
+                                                    height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1"
+                                                    height="1" alt=""/></td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td colspan="2">                        <!-- /gui_mid -->
+                        <!-- /gui_start_of_page -->
+                        <form id="white-list-form" method="post" action="AdminIpWhiteList" name="argumentForm">
+                            <table border="0" cellspacing="0" cellpadding="2" width="400">
+                                <tr>
+                                    <td>
+                                        <!-- gui_heading -->
+                                        <span class="imcmsAdmHeading"><? templates/sv/AdminIpWhiteList.jsp/1 ?></span><br/>
+                                        <img src="${contextPath}/imcms/${language}/images/admin/1x1_20568d.gif"
+                                             width="100%"
+                                             height="1" style="margin: 8px 0;" alt=""/>
+                                        <!-- /gui_heading -->
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><? templates/sv/AdminIpWhiteList.jsp/4 ?><br> &nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td><? templates/sv/AdminIpAccess.htm/4 ?> ${userIP}<br> &nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td><input id="login-via-https" ${isHttpsRequired ? 'checked="checked" ' : ''}
+                                               type="checkbox"><? templates/sv/AdminIpAccess.htm/5 ?><br> &nbsp;
+                                        <input id="login-via-https-hidden" type="hidden" name="LOGIN_VIA_HTTPS"
+                                               value="${isHttpsRequired or false}">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <table border="0" cellspacing="0" cellpadding="2" width="100%">
+                                            <tr>
+                                                <td><b><? templates/sv/AdminIpAccess.htm/3001 ?></b></td>
+                                                <td><b><? templates/sv/AdminIpWhiteList.jsp/2 ?></b></td>
+                                                <td><b><? templates/sv/AdminIpAccess.htm/3003 ?></b></td>
+                                                <td>&nbsp;&nbsp;&nbsp;</td>
+                                                <td><b><? templates/sv/AdminIpAccess.htm/3004 ?></b></td>
+                                                <td>&nbsp;&nbsp;&nbsp;</td>
+                                                <td><b><? templates/sv/AdminIpWhiteList.jsp/3 ?></b></td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="7"><img
+                                                        src="${contextPath}/imcms/${language}/images/admin/1x1_cccccc.gif"
+                                                        width="100%" height="1" style="margin: 8px 0;" alt=""/></td>
+                                            </tr>
+                                            <c:forEach items="${roleIpRanges}" var="ipRange">
+                                                <tr>
+                                                    <td align="center"><input type="checkbox" name="EDIT_IP_RANGE_ID"
+                                                                              value="${ipRange.id}"></td>
+                                                    <td><c:if test="${ipRange.admin}">Superadmin</c:if> <c:if
+                                                            test="${not ipRange.admin}">Other roles</c:if></td>
+                                                    <td><input type="text" name="IP_START${ipRange.id}"
+                                                               value="${ipRange.ipFrom}" size="15" maxlength="15"></td>
+                                                    <td align="center">-</td>
+                                                    <td><input type="text" name="IP_END${ipRange.id}"
+                                                               value="${ipRange.ipTo}" size="15" maxlength="15"></td>
+                                                    <td align="center">-</td>
+                                                    <td><input type="text" name="IP_DESCRIPTION${ipRange.id}"
+                                                        <%--style="width: 320px;"--%>
+                                                               size="50" maxlength="256"
+                                                               value="${ipRange.description}"></td>
+                                                </tr>
+                                            </c:forEach></table>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1_20568d.gif"
+                                             width="100%"
+                                             height="1" style="margin: 8px 0;" alt=""/></td>
+                                </tr>
+                                <tr>
+                                    <td align="right">
+                                        <input type="submit" class="imcmsFormBtn" name="ADD_IP_RANGE"
+                                               value="<? templates/sv/AdminIpAccess.htm/2001 ?>">
+                                        <input type="submit" class="imcmsFormBtn" name="UPDATE_IP_RANGE"
+                                               value="<? templates/sv/AdminIpAccess.htm/2002 ?>">
+                                        <input type="submit" class="imcmsFormBtn" name="IP_WARN_DELETE"
+                                               value="<? templates/sv/AdminIpAccess.htm/2003 ?>">
+                                    </td>
+                                </tr>
+                            </table>
+                        </form>                        <!-- gui_end_of_page -->
+                        <!-- gui_bottom -->
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1"
+                                                    height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td colspan="4" class="imcmsAdmBgCont"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1"
+                                                    height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="24" height="1" alt=""/>
+                    </td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1"
+                                         alt=""/></td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="24" height="1" alt=""/>
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                </tr>
+            </table>            <!-- /gui_bottom -->            <!-- gui_outer_end -->
+        <td align="right" valign="top"
+            style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_right.gif) top left repeat-y;">
+            <img src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_right_top.gif" width="12"
+                 height="12"
+                 border="0" alt=""/></td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="0" width="100%">
+                <tr>
+                    <td style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;">
+                        <img src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom_left.gif"
+                             width="12" height="12" border="0" alt=""/></td>
+                    <td style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;"
+                        align="right"><img
+                            src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom_right.gif"
+                            width="12" height="12" border="0" alt=""/></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+<!-- /gui_outer_end -->
+</body>
+</html>
+<!-- /gui_end_of_page -->
diff --git a/web/WEB-INF/templates/lang/admin/AdminIpWhiteList_Add.jsp b/web/WEB-INF/templates/lang/admin/AdminIpWhiteList_Add.jsp
new file mode 100644
index 0000000000..f7c6b1239a
--- /dev/null
+++ b/web/WEB-INF/templates/lang/admin/AdminIpWhiteList_Add.jsp
@@ -0,0 +1,186 @@
+<%@ page pageEncoding="UTF-8" %>
+<html>
+<head><title><? templates/sv/AdminIpWhiteList_Add.jsp/1 ?></title>
+    <link rel="stylesheet" type="text/css" href="${contextPath}/imcms/css/imcms_admin.css.jsp">
+    <script src="${contextPath}/imcms/${language}/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+</head>
+<body><!-- gui_outer_start -->
+<table border="0" cellspacing="0" cellpadding="0" class="imcmsAdmTable" align="center">
+    <tr>
+        <td class="imcmsAdmTable">            <!-- /gui_outer_start -->            <!-- gui_head -->
+            <table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="20" alt=""/>
+                    </td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td nowrap="nowrap"><span class="imcmsAdmHeadingTop"><? global/imcms_administration ?></span></td>
+                    <td align="right"><a href="http://www.imcms.net/" target="_blank" title="www.imcms.net"><img
+                            src="${contextPath}/imcms/${language}/images/admin/logo_imcms_admin.gif" width="100"
+                            height="20" alt="www.imcms.net" border="0"/></a></td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td colspan="6" class="imcmsAdmBgHead"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="20" alt=""/>
+                    </td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td colspan="2">                        <!-- /gui_head -->
+                        <!-- gui_head_help_and_back_buttons -->
+                        <form method="post" action="AdminIpWhiteList">
+                            <table border="0" cellspacing="0" cellpadding="0">
+                                <tr>
+                                    <td><input type="submit" class="imcmsFormBtn" name="CANCEL_ADD_IP"
+                                               value="<? global/back ?>"/></td>
+                                    <td style="padding-left:10px;"><input type="button" value="<? global/help ?>"
+                                                                          title="<? global/openthehelppage ?>"
+                                                                          class="imcmsFormBtn"
+                                                                          onclick="openHelpW('IPAccess'); return false"/>
+                                    </td>
+                                </tr>
+                            </table>
+                        </form>                        <!-- /gui_head_help_and_back_buttons -->
+                        <!-- gui_mid -->                    </td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="20" alt=""/>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBgCont" colspan="4"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td colspan="2">                        <!-- /gui_mid -->
+                        <form method="post" action="AdminIpWhiteList" name="addIP">
+                            <table border="0" cellspacing="0" cellpadding="2" width="400">
+                                <tr>
+                                    <td colspan="2">                                        <!-- gui_heading --> <span
+                                            class="imcmsAdmHeading"><? templates/sv/AdminIpWhiteList_Add.jsp/1 ?></span><br/>
+                                        <img src="${contextPath}/imcms/${language}/images/admin/1x1_20568d.gif"
+                                             width="100%" height="1" style="margin: 8px 0;" alt=""/>
+                                        <!-- /gui_heading -->                                    </td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2"><? templates/sv/AdminIpWhiteList_Add.jsp/2 ?></td>
+                                </tr>
+                                <tr>
+                                    <td><? templates/sv/AdminIpAccess.htm/4 ?> ${userIP}<br> &nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2"><img
+                                            src="${contextPath}/imcms/${language}/images/admin/1x1_cccccc.gif"
+                                            width="100%" height="1" style="margin: 8px 0;" alt=""/></td>
+                                </tr>
+                                <tr>
+                                    <td><label for="roles-select"><? templates/sv/AdminIpWhiteList_Add.jsp/3 ?></label>
+                                    </td>
+                                    <td><select id="roles-select" name="IS_ADMIN" size="1">
+                                        <option value="1">Superadmin</option>
+                                        <option value="0">Other roles</option>
+                                    </select></td>
+                                </tr>
+                                <tr>
+                                    <td><? templates/sv/AdminIpAccess_Add.htm/6 ?></td>
+                                    <td><input type="text" name="IP_START" size="15" maxlength="15"></td>
+                                </tr>
+                                <tr>
+                                    <td><? templates/sv/AdminIpAccess_Add.htm/7 ?></td>
+                                    <td><input type="text" name="IP_END" size="15" maxlength="15"></td>
+                                </tr>
+                                <tr>
+                                    <td><? templates/sv/AdminIpAccess_Add.htm/9 ?></td>
+                                    <td><input type="text" name="IP_DESCRIPTION" size="50" maxlength="256"></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2"><img
+                                            src="${contextPath}/imcms/${language}/images/admin/1x1_cccccc.gif"
+                                            width="100%" height="1" style="margin: 8px 0;" alt=""/></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2"><? templates/sv/AdminIpAccess_Add.htm/8 ?></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2"><img
+                                            src="${contextPath}/imcms/${language}/images/admin/1x1_20568d.gif"
+                                            width="100%" height="1" style="margin: 8px 0;" alt=""/></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2" align="right"><input type="submit" class="imcmsFormBtn"
+                                                                         name="ADD_NEW_IP_RANGE"
+                                                                         value="<? templates/sv/AdminIpAccess_Add.htm/2001 ?>">
+                                        <input type="submit" class="imcmsFormBtn" name="CANCEL_ADD_IP"
+                                               value="<? templates/sv/AdminIpAccess_Add.htm/2002 ?>"></td>
+                                </tr>
+                            </table>
+                        </form>                        <!-- gui_bottom -->                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td colspan="4" class="imcmsAdmBgCont"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="24" height="1" alt=""/>
+                    </td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="24" height="1" alt=""/>
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                </tr>
+            </table>            <!-- /gui_bottom -->            <!-- gui_outer_end -->
+        <td align="right" valign="top"
+            style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_right.gif) top left repeat-y;">
+            <img src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_right_top.gif" width="12"
+                 height="12" border="0" alt=""/></td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="0" width="100%">
+                <tr>
+                    <td style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;">
+                        <img src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom_left.gif"
+                             width="12" height="12" border="0" alt=""/></td>
+                    <td style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;"
+                        align="right"><img
+                            src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom_right.gif"
+                            width="12" height="12" border="0" alt=""/></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table><!-- /gui_outer_end --></body>
+</html>
diff --git a/web/WEB-INF/templates/lang/admin/AdminIpWhiteList_Delete.jsp b/web/WEB-INF/templates/lang/admin/AdminIpWhiteList_Delete.jsp
new file mode 100644
index 0000000000..7af17a0b15
--- /dev/null
+++ b/web/WEB-INF/templates/lang/admin/AdminIpWhiteList_Delete.jsp
@@ -0,0 +1,153 @@
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head><title><? templates/sv/AdminIpAccess_Delete2.htm/1 ?> </title>
+    <link rel="stylesheet" type="text/css" href="${contextPath}/imcms/css/imcms_admin.css.jsp">
+    <script src="${contextPath}/imcms/${language}/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+</head>
+<body>
+<table border="0" cellspacing="0" cellpadding="0" class="imcmsAdmTable" align="center">
+    <tr>
+        <td class="imcmsAdmTable">
+            <table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="20" alt=""/>
+                    </td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td nowrap="nowrap"><span class="imcmsAdmHeadingTop"><? global/imcms_administration ?></span></td>
+                    <td align="right"><a href="http://www.imcms.net/" target="_blank" title="www.imcms.net"><img
+                            src="${contextPath}/imcms/${language}/images/admin/logo_imcms_admin.gif" width="100"
+                            height="20" alt="www.imcms.net" border="0"/></a></td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td colspan="6" class="imcmsAdmBgHead"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="20" alt=""/>
+                    </td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td colspan="2">
+                        <form method="post" action="AdminIpWhiteList">
+                            <table border="0" cellspacing="0" cellpadding="0">
+                                <tr>
+                                    <td><input type="submit" class="imcmsFormBtn" name="IP_CANCEL_DELETE"
+                                               value="<? global/back ?>"/></td>
+                                    <td style="padding-left:10px;"><input type="button" value="<? global/help ?>"
+                                                                          title="<? global/openthehelppage ?>"
+                                                                          class="imcmsFormBtn"
+                                                                          onclick="openHelpW('IPAccess'); return false"/>
+                                    </td>
+                                </tr>
+                            </table>
+                        </form>
+                    </td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="20" alt=""/>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBgCont" colspan="4"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td colspan="2">
+                        <form method="post" action="AdminIpWhiteList"><c:forEach items="${DELETE_IP_RANGE_ID}"
+                                                                                 var="rangeId"> <input type="hidden"
+                                                                                                       name="DELETE_IP_RANGE_ID"
+                                                                                                       value="${rangeId}"> </c:forEach>
+                            <table border="0" cellspacing="0" cellpadding="2" width="400">
+                                <tr>
+                                    <td>                                        <span
+                                            class="imcmsAdmHeading"><? global/warning ?></span><br/> <img
+                                            src="${contextPath}/imcms/${language}/images/admin/1x1_20568d.gif"
+                                            width="100%" height="1" style="margin: 8px 0;" alt=""/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><? templates/sv/AdminIpAccess_Delete2.htm/3 ?></td>
+                                </tr>
+                                <tr>
+                                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1_20568d.gif"
+                                             width="100%" height="1" style="margin: 8px 0;" alt=""/></td>
+                                </tr>
+                                <tr>
+                                    <td align="right"><input type="submit" class="imcmsFormBtn" name="DEL_IP_RANGE"
+                                                             value="<? templates/sv/AdminIpAccess_Delete2.htm/2001 ?>">
+                                        <input type="submit" class="imcmsFormBtn" name="IP_CANCEL_DELETE"
+                                               value="<? global/cancel ?>"></td>
+                                </tr>
+                            </table>
+                        </form>
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td colspan="4" class="imcmsAdmBgCont"><img
+                            src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td class="imcmsAdmBorder"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="24" height="1" alt=""/>
+                    </td>
+                    <td colspan="2"><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="24" height="1" alt=""/>
+                    </td>
+                    <td><img src="${contextPath}/imcms/${language}/images/admin/1x1.gif" width="1" height="1" alt=""/>
+                    </td>
+                </tr>
+            </table>
+        <td align="right" valign="top"
+            style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_right.gif) top left repeat-y;">
+            <img src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_right_top.gif" width="12"
+                 height="12" border="0" alt=""/></td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="0" width="100%">
+                <tr>
+                    <td style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;">
+                        <img src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom_left.gif"
+                             width="12" height="12" border="0" alt=""/></td>
+                    <td style="background: transparent url(${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;"
+                        align="right"><img
+                            src="${contextPath}/imcms/${language}/images/admin/imcms_admin_shadow_bottom_right.gif"
+                            width="12" height="12" border="0" alt=""/></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+</body>
+</html>
diff --git a/web/WEB-INF/templates/lang/admin/AdminManager_adminTask_element.htm b/web/WEB-INF/templates/lang/admin/AdminManager_adminTask_element.htm
index 0808c92ff4..46a406e506 100644
--- a/web/WEB-INF/templates/lang/admin/AdminManager_adminTask_element.htm
+++ b/web/WEB-INF/templates/lang/admin/AdminManager_adminTask_element.htm
@@ -1,27 +1,29 @@
 <select name="AdminTask">
-	  <option value="No_Choice" selected><? templates/sv/AdminManager_adminTask_element.htm/1 ?></option>
-		
-	  <option value="UserStart">         <? templates/sv/AdminManager_adminTask_element.htm/2 ?></option>
-	  <option value="AdminRoles">        <? templates/sv/AdminManager_adminTask_element.htm/11 ?></option>
-	  <option value="IP-access">         <? templates/sv/AdminManager_adminTask_element.htm/7 ?></option>
-		
-	  <option value="No_Choice">-------------------------------------</option>
-		
-	  <option value="ListDocuments">     <? imcms/lang/jsp/document_list.jsp/title ?></option>
-	  <option value="DeleteDocs">        <? templates/sv/AdminManager_adminTask_element.htm/15 ?></option>
-		
-	  <option value="No_Choice">-------------------------------------</option>
-		
-	  <option value="AddTemplates">      <? templates/sv/AdminManager_adminTask_element.htm/10 ?></option>
-	  <option value="FileAdmin">         <? templates/sv/AdminManager_adminTask_element.htm/5 ?></option>
-		
-	  <option value="No_Choice">-------------------------------------</option>
-		
-	  <option value="AdminSearchTerms">  <? templates/sv/AdminManager_adminTask_element.htm/AdminSearchTerms ?></option>
-	  <option value="LinkCheck">         <? web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading ?></option>
-	  <option value="AdminSection">      <? templates/sv/AdminManager_adminTask_element.htm/3 ?></option>
-	  <option value="AdminCategories">   <? templates/sv/AdminManager_adminTask_element.htm/17 ?></option>
-	  <option value="AdminProfiles">     <? profile/headline ?></option>
-	  <option value="CounterStart">      <? templates/sv/AdminManager_adminTask_element.htm/12 ?></option>
-	  <option value="SystemMessage">     <? templates/sv/AdminManager_adminTask_element.htm/14 ?></option>
-</select>
\ No newline at end of file
+    <option value="No_Choice" selected><? templates/sv/AdminManager_adminTask_element.htm/1 ?></option>
+
+    <option value="UserStart">         <? templates/sv/AdminManager_adminTask_element.htm/2 ?></option>
+    <option value="AdminRoles">        <? templates/sv/AdminManager_adminTask_element.htm/11 ?></option>
+    <option value="IP-whitelist">      <? templates/sv/AdminManager_adminTask_element.htm/6 ?></option>
+    <option value="IP-access">         <? templates/sv/AdminManager_adminTask_element.htm/7 ?></option>
+
+    <option value="No_Choice">-------------------------------------</option>
+
+    <option value="ListDocuments">     <? imcms/lang/jsp/document_list.jsp/title ?></option>
+	<option value="ExportDocuments">     <? templates/sv/AdminManager_adminTask_element.htm/18 ?></option>
+    <option value="DeleteDocs">        <? templates/sv/AdminManager_adminTask_element.htm/15 ?></option>
+
+    <option value="No_Choice">-------------------------------------</option>
+
+    <option value="AddTemplates">      <? templates/sv/AdminManager_adminTask_element.htm/10 ?></option>
+    <option value="FileAdmin" #hasUserAccess#>         <? templates/sv/AdminManager_adminTask_element.htm/5 ?></option>
+
+    <option value="No_Choice">-------------------------------------</option>
+
+    <option value="AdminSearchTerms">  <? templates/sv/AdminManager_adminTask_element.htm/AdminSearchTerms ?></option>
+    <option value="LinkCheck">         <? web/imcms/lang/jsp/linkcheck/linkcheck.jsp/heading ?></option>
+    <option value="AdminSection">      <? templates/sv/AdminManager_adminTask_element.htm/3 ?></option>
+    <option value="AdminCategories">   <? templates/sv/AdminManager_adminTask_element.htm/17 ?></option>
+    <option value="AdminProfiles">     <? profile/headline ?></option>
+    <option value="CounterStart">      <? templates/sv/AdminManager_adminTask_element.htm/12 ?></option>
+    <option value="SystemMessage">     <? templates/sv/AdminManager_adminTask_element.htm/14 ?></option>
+</select>
diff --git a/web/WEB-INF/templates/lang/admin/AdminRoles_Edit_Permission.html b/web/WEB-INF/templates/lang/admin/AdminRoles_Edit_Permission.html
index cba999604e..fc4eca1090 100644
--- a/web/WEB-INF/templates/lang/admin/AdminRoles_Edit_Permission.html
+++ b/web/WEB-INF/templates/lang/admin/AdminRoles_Edit_Permission.html
@@ -1,4 +1,4 @@
 <tr>
-	<td width="80%" class="imcmsAdmText">#PERMISSION_DESCRIPTION#</td>
-	<td width="20%"><input type="checkbox" name="PERMISSION_CHECKBOX" value="#PERMISSON_ID#" #PERMISSION_CHECKED#></td>
+	<td width="80%" class="imcmsAdmText"><label for="perm#PERMISSON_ID#">#PERMISSION_DESCRIPTION#</label></td>
+	<td width="20%"><input type="checkbox" id="perm#PERMISSON_ID#" name="PERMISSION_CHECKBOX" value="#PERMISSON_ID#" #PERMISSION_CHECKED#></td>
 </tr>
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/AdminRoles_roles.htm b/web/WEB-INF/templates/lang/admin/AdminRoles_roles.htm
index 871787df79..0814ed3e71 100644
--- a/web/WEB-INF/templates/lang/admin/AdminRoles_roles.htm
+++ b/web/WEB-INF/templates/lang/admin/AdminRoles_roles.htm
@@ -1,13 +1,50 @@
 #gui_start_of_page( "<? templates/sv/AdminRoles_roles.htm/1 ?>" "AdminRoles" "CANCEL_ROLE_ADMIN" "RoleAdmin" "" )
 
+<script>
+    var expanded = false;
 
+    function showCheckboxes() {
+        var checkboxes = document.getElementById("checkboxes");
+        if (!expanded) {
+            checkboxes.style.display = "block";
+            expanded = true;
+        } else {
+            checkboxes.style.display = "none";
+            expanded = false;
+        }
+    }
+
+    function selectedValue() {
+        var selectBox = document.getElementById("selectAzureBox");
+        var selectedValue = selectBox.options[selectBox.selectedIndex].value;
+        var xHttp = new XMLHttpRequest();
+        xHttp.open("PUT", `/servlet/AdminRoles?extRoleId=${selectedValue}`, true);
+        xHttp.send();
+
+        xHttp.onreadystatechange = function () {
+            if (this.status === 200) {
+                document.getElementById('checkboxes').innerHTML = "";
+                document.getElementById('checkboxes').innerHTML = this.responseText;
+            }
+        };
+    }
+
+    //don't change name function - this uses in the server!
+    function enableBtnSave() {
+        var selectBox = document.getElementById("selectAzureBox");
+        var selectedValue = selectBox.options[selectBox.selectedIndex].value;
+        var saveLinkRoleBtn = document.getElementById("linkSaveRoles");
+        if (null !== selectedValue) {
+            saveLinkRoleBtn.style.display = 'block';
+        }
+    }
+</script>
 <form method="post" action="AdminRoles" name="UserInfo">
 <table border="0" cellspacing="0" cellpadding="2" width="400">
 <tr>
 	<td>#gui_heading( "<? templates/sv/AdminRoles_roles.htm/1 ?>" )</td>
 </tr>
-<tr>
-	<td>
+    <td>
 	<table border="0" cellspacing="0" cellpadding="0">
 	<tr valign="top">
 		<td class="imcmsAdmText" nowrap><? templates/sv/AdminRoles_roles.htm/2 ?> &nbsp;</td>
@@ -15,9 +52,31 @@
 		<select name="ROLE_ID" size="10">
 			#ROLES_MENU#
 		</select></td>
+
+        <td style="display: #DISPLAY_AZURE#" class="imcmsAdmText" nowrap>&nbsp;<? templates/sv/AdminRoles_external_roles.htm/3 ?> &nbsp;</td>
+        <td style="display: #DISPLAY_AZURE#">
+            <select name="AZURE_ROLE_ID" size="10" id="selectAzureBox" onchange="selectedValue()">
+                #EXTERNAL_ROLES_MENU#
+            </select>
+        </td>
+        <td style="display: #DISPLAY_AZURE#">
+            <div class="multiselect">
+                <div class="selectBox" onclick="showCheckboxes()">
+                    <select>
+                        <option><? templates/sv/AdminRoles_select_roles.htm/1 ?></option>
+                    </select>
+                    <div class="overSelect"></div>
+                </div>
+                <div id="checkboxes">
+                    #LINKED_ROLES#
+                </div>
+            </div>
+        </td>
+        <td style="display: #DISPLAY_AZURE#"><input type="submit" class="imcmsFormBtnSmall" id="linkSaveRoles" name="SAVE_EXTERNAL_TO_LOCAL_ROLE"
+                   value="<? templates/sv/change_img.html/2007 ?>"></td>
 	</tr>
-	</table></td>
-</tr>
+    </table>
+    </td>
 <tr>
 	<td>#gui_hr( "blue" )</td>
 </tr>
@@ -26,7 +85,9 @@
 	<input type="submit" class="imcmsFormBtnSmall" name="VIEW_ADD_NEW_ROLE" value="<? templates/sv/AdminRoles_roles.htm/2001 ?>">
 	<input type="submit" class="imcmsFormBtnSmall" name="VIEW_RENAME_ROLE" value="<? templates/sv/AdminRoles_roles.htm/2002 ?>">
 	<input type="submit" class="imcmsFormBtnSmall" name="VIEW_EDIT_ROLE" value="<? templates/sv/AdminRoles_roles.htm/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSmall" name="VIEW_DELETE_ROLE" value="<? templates/sv/AdminRoles_roles.htm/2004 ?>"></td>
+        <input type="submit" class="imcmsFormBtnSmall" name="VIEW_DELETE_ROLE"
+               value="<? templates/sv/AdminRoles_roles.htm/2004 ?>">
+    </td>
 </tr>
 </table>
 </form>
diff --git a/web/WEB-INF/templates/lang/admin/AdminSystemMessage.htm b/web/WEB-INF/templates/lang/admin/AdminSystemMessage.htm
index f937b51026..f363774a86 100644
--- a/web/WEB-INF/templates/lang/admin/AdminSystemMessage.htm
+++ b/web/WEB-INF/templates/lang/admin/AdminSystemMessage.htm
@@ -1,6 +1,14 @@
 #gui_start_of_page( "<? templates/sv/AdminManager_adminTask_element.htm/14 ?>" "AdminManager" "" "SystemProperties" "" )
 
 <table width="600">
+  <tr>
+    <td colspan="4">#gui_heading( "imCMS data" ) </td>
+  </tr>
+  <tr>
+    <td colspan="4">
+	   <pre style="font-size:11px;">#IMCMS_DATA#</pre></td>
+  </tr>
+  <tr><td>&nbsp;</td></tr>
   <tr>
     <td colspan="4">#gui_heading( "<? templates/sv/AdminSystemMessage.htm/3 ?>" ) </td>
   </tr>
@@ -62,6 +70,19 @@
       <td><input type="submit"  class="imcmsFormBtnSmall" name="SetWebMasterInfo" value="<? templates/sv/AdminSystemMessage.htm/2001 ?>"></td>
     </tr>
   </form>
+  <tr><td>&nbsp;</td></tr>
+  <tr>
+    <td colspan="4">#gui_heading( "<? templates/sv/AdminSystemMessage.htm/23 ?>" ) </td>
+  </tr>
+  <form method="post" action="AdminSystemInfo">
+    <tr>
+      <td><? templates/sv/AdminSystemMessage.htm/24 ?></td>
+      <td>#PASSWORD_RESET_EXPIRATION_INTERVAL#</td>
+      <td><input type="text" name="PASSWORD_RESET_EXPIRATION_INTERVAL" value="#PASSWORD_RESET_EXPIRATION_INTERVAL#" maxlength="80" size="40"></td>
+      <td><input type="submit"  class="imcmsFormBtnSmall" name="SetPasswordResetExpirationInterval" value="<? templates/sv/AdminSystemMessage.htm/2001 ?>"></td>
+    </tr>
+  </form>
+
 </table>
 
 #gui_end_of_page()
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/FileAdmin.html b/web/WEB-INF/templates/lang/admin/FileAdmin.html
index d02fc94b19..c8e7017271 100644
--- a/web/WEB-INF/templates/lang/admin/FileAdmin.html
+++ b/web/WEB-INF/templates/lang/admin/FileAdmin.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
 <script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
 
-<script language="JavaScript">
+<script type="text/javascript">
 <!--
 
 /* *******************************************************************
@@ -31,14 +31,17 @@
 wDir[2] = "";
 
 /* ***** REGEXP PATTERNS ***** */
+
+var ren = "(\\.[\\d]+)?" ;
+
 	/* isImage - image types (change in "FileAdmin_preview.jsp" too) */
-var pai = "\\.(GIF|JPE?G|PNG)$";
+var pai = "\\.(GIF|JPE?G|PNG)" + ren + "$";
 	/* isViewFile - viewable file types (change in "FileAdmin_preview.jsp" too, if image) */
-var pa  = "(\\.(GIF|JPE?G|PNG|BMP|AVI|MPE?G|HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG)$)|(\\.LOG)";
+var pa  = "(\\.(GIF|JPE?G|PNG|BMP|AVI|MPE?G|HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG|PROPERTIES)" + ren + "$)|(\\.LOG)";
 	/* isEditFileText - viewable file types that will open in readonly mode in "FileAdmin_edit.jsp" */
-var pat = "(\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG)$)|(\\.LOG)";
+var pat = "(\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG|PROPERTIES)" + ren + "$)|(\\.LOG)";
 	/* isEditFile - editable file types (change in "FileAdmin_edit.jsp" too) */
-var pae = "\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG)$";
+var pae = "\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG|PROPERTIES)" + ren + "$";
 	/* isDir */
 var isDirectoryPattern = "(/|\\.|\\\\)$";
 	/* isSysFold */
@@ -46,7 +49,7 @@
 	/* isHiddenFold */
 var pao = "WEB-INF";
 	/* isHtmlFile */
-var pah = "\\.html?$";
+var pah = "\\.html?" + ren + "$";
 	/* isStatFile */
 var par = "(/|\\\\)stats(/|\\\\).+\\.html?";
 
@@ -233,7 +236,7 @@
 	sfile = wDir[iside] + sfile;
 	if (isStatFile(iside)) { // stat
 		//alert("1") ;
-		popWinOpen(800,570,JSP_PATH + "/FileAdmin_preview.jsp?isStat=1&file=" + escape(sfile),"filePreview",1,0);
+		popWinOpen(800,570,JSP_PATH + "/FileAdmin_preview.jsp?isStat=1&file=" + encodeURIComponent(sfile),"",1,0);
 	} else if (isHtmlFile(iside) && !isHiddenFold(iside)) { // html
 		//alert("2") ;
 		openFile(iside);
@@ -242,7 +245,7 @@
 		editFile(iside,1);
 	} else if (isImageFile(iside)) { // file
 		//alert("4") ;
-		popWinOpen(800,570,JSP_PATH + "/FileAdmin_preview.jsp?file=" + escape(sfile),"filePreview",1,0);
+		popWinOpen(800,570,JSP_PATH + "/FileAdmin_preview.jsp?file=" + encodeURIComponent(sfile),"",1,0);
 	} else if (isFile(iside)) { // other files
 		//alert("5") ;
 		var fBtn = eval('document.forms[0].download' + iside);
@@ -251,20 +254,16 @@
 }
 
 function openFile(iside) {
-	var f = document.forms[0];
-	var sdir = (iside == 2) ? f.dir2.value : f.dir1.value;
 	var sfile = getFile(iside);
 	sfile = wDir[iside] + sfile;
 	window.open(imC_PATH + "/" + sfile);
 }
 
 function editFile(iside,readonlyFlag) {
-	var f = document.forms[0];
-	var sdir = (iside == 2) ? f.dir2.value : f.dir1.value;
 	var sfile = getFile(iside);
 	sfile = wDir[iside] + sfile;
 	readonlyFlag = (readonlyFlag) ? "&readonly=1" : "";
-	popWinOpen(800,570,JSP_PATH + "/FileAdmin_edit.jsp?file=" + escape(sfile) + readonlyFlag,"fileEdit",1,0);
+	popWinOpen(800,570,JSP_PATH + "/FileAdmin_edit.jsp?file=" + encodeURIComponent(sfile) + readonlyFlag,"",1,0);
 }
 
 function getFile(iside) {
@@ -282,25 +281,27 @@
 }
 
 function setSelectedFolders() {
-    var f = document.forms[0];
-    for (var i = 0; i < f.files1.length; i++) {
-        var option = f.files1.options[i] ; 
-        var dir = f.dir1.value ;
-        if (option.value == dir) {
-            option.style.backgroundColor = "#FFFF99"; // the Dir
-        } else if ( dir.length > option.value.length && dir.substring(0, option.value.length) == option.value ) {
-            option.style.backgroundColor = "#FFFFDD"; // a subDir
-        }
-    }
-    for (var i = 0; i < f.files2.length; i++) {
-        var option = f.files2.options[i] ; 
-        var dir = f.dir2.value ;
-        if (option.value == dir) {
-            option.style.backgroundColor = "#FFFF99"; // the Dir
-        } else if ( dir.length > option.value.length && dir.substring(0, option.value.length) == option.value ) {
-            option.style.backgroundColor = "#FFFFDD"; // a subDir
-        }
-    }
+	var i, dir;
+	var option;
+	var f = document.forms[0];
+	for (i = 0; i < f.files1.length; i++) {
+		option = f.files1.options[i] ; 
+		dir = f.dir1.value ;
+		if (option.value == dir) {
+			option.style.backgroundColor = "#FFFF99"; // the Dir
+		} else if ( dir.length > option.value.length && dir.substring(0, option.value.length) == option.value ) {
+			option.style.backgroundColor = "#FFFFDD"; // a subDir
+		}
+	}
+	for (i = 0; i < f.files2.length; i++) {
+		option = f.files2.options[i] ; 
+		dir = f.dir2.value ;
+		if (option.value == dir) {
+			option.style.backgroundColor = "#FFFF99"; // the Dir
+		} else if ( dir.length > option.value.length && dir.substring(0, option.value.length) == option.value ) {
+			option.style.backgroundColor = "#FFFFDD"; // a subDir
+		}
+	}
 }
 //-->
 </script>
@@ -317,7 +318,7 @@
 <input type="hidden" name="dir2" value="#dir2#">
 
 <tr>
-	<td><input class="imcmsFormBtn" height="22" type="submit" name="cancel" value="<? templates/sv/FileAdmin.html/2022 ?>">
+	<td><input class="imcmsFormBtn imcmsFormBtnCancel" height="22" type="submit" name="cancel" value="<? templates/sv/FileAdmin.html/2022 ?>">
 	<input class="imcmsFormBtn" type="button" value="<? global/help ?>" onClick="openHelpW('FileManager'); return false;"></td>
 </tr>
 </table>
@@ -344,7 +345,7 @@
 	</tr>
 	<tr>
 		<td align="right"><span class="imcmsAdmForm">
-		<select name="files1" id="fileSel_1" size="20" class="imcmsAdmForm" style="width:330"
+		<select name="files1" id="fileSel_1" size="20" class="imcmsAdmForm" style="width:340px;"
 			onChange="checkFileType(1,false)"
 			onDblClick="dblClickAction(1)" multiple>
 	#files1#
@@ -352,7 +353,7 @@
 	</tr>
 	</table></td>
 
-  <td colspan="2" align="center">
+  <td colspan="2" align="center" valign="top" style="padding-top:20px;">
 	<table border="0" cellpadding="2" cellspacing="0">
 	<tr>
 		<td colspan="2" align="center" class="small"><? templates/sv/FileAdmin.html/6 ?></td>
@@ -415,7 +416,7 @@
 	<tr>
 		<td>
 		<span class="imcmsAdmForm">
-		<select name="files2" id="fileSel_2" size="20" class="imcmsAdmForm" style="width:330"
+		<select name="files2" id="fileSel_2" size="20" class="imcmsAdmForm" style="width:340px;"
 			onChange="checkFileType(2,false)"
 			onDblClick="dblClickAction(2)" multiple>
 	#files2#
@@ -426,44 +427,44 @@
 <tr>
 	<td colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="8" alt=""></td>
 </tr>
-<tr>
-  <td><input class="imcmsFormBtnSmall" height="22" style="width:90" type="submit" name="upload1" value="<? templates/sv/FileAdmin.html/2015 ?>"></td>
-  <td colspan="4" align="center"><span class="imcmsAdmForm"><? templates/sv/FileAdmin.html/1003 ?>&nbsp;
-    <input type="file" name="file" class="imcmsAdmForm" size="20"></span></td>
-  <td align="right"><input class="imcmsFormBtnSmall" height="22" style="width:90" type="submit" name="upload2" value="<? templates/sv/FileAdmin.html/2016 ?>"></td>
+<tr valign="bottom">
+  <td><input class="imcmsFormBtnSmall" height="22" style="width:90px;" type="submit" name="upload1" value="<? templates/sv/FileAdmin.html/2015 ?>"></td>
+  <td colspan="4" align="center"><span class="imcmsAdmForm"><? templates/sv/FileAdmin.html/1003 ?><br>
+    <input type="file" name="file" id="theFileField" class="imcmsAdmForm" size="25"></span></td>
+  <td align="right"><input class="imcmsFormBtnSmall" height="22" style="width:90px;" type="submit" name="upload2" value="<? templates/sv/FileAdmin.html/2016 ?>"></td>
 </tr>
 <tr>
   <td colspan="6">#gui_hr( "blue" )</td>
 </tr>
 <tr>
   <td align="left"><input
-	type="submit" name="rename1"class="imcmsFormBtnSmall" height="22" style="width:90"
+	type="submit" name="rename1"class="imcmsFormBtnSmall" height="22" style="width:90px;"
 		value="<? templates/sv/FileAdmin.html/2017 ?>"><br><img
 	src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2" alt=""><br><input
-	type="submit" name="mkdir1" class="imcmsFormBtnSmall" height="22" style="width:90"
+	type="submit" name="mkdir1" class="imcmsFormBtnSmall" height="22" style="width:90px;"
 		value="<? templates/sv/FileAdmin.html/2018 ?>"></td>
   <td colspan="4" align="center"><? templates/sv/FileAdmin.html/13 ?>
-	<span class="imcmsAdmForm"><input type="text" name="name" class="imcmsAdmForm"></span></td>
+	<span class="imcmsAdmForm"><input type="text" name="name" id="theNameField" class="imcmsAdmForm" size="30" style="width:300px;"></span></td>
   <td align="right"><input
-	type="submit" name="rename2" class="imcmsFormBtnSmall" height="22" style="width:90"
+	type="submit" name="rename2" class="imcmsFormBtnSmall" height="22" style="width:90px;"
 		value="<? templates/sv/FileAdmin.html/2019 ?>"><br><img
 	src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2" alt=""><br><input
-	type="submit" name="mkdir2" class="imcmsFormBtnSmall" height="22" style="width:90"
+	type="submit" name="mkdir2" class="imcmsFormBtnSmall" height="22" style="width:90px;"
 		value="<? templates/sv/FileAdmin.html/2020 ?>"></td>
 </tr>
 <tr>
-  <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="150" height="1" alt=""></td>
-  <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="180" height="1" alt=""></td>
-  <td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="80" height="1" alt=""></td>
-  <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="180" height="1" alt=""></td>
-  <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="150" height="1" alt=""></td>
+  <td width="130"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="130" height="1" alt=""></td>
+  <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="210" height="1" alt=""></td>
+  <td width="80" colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="80" height="1" alt=""></td>
+  <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="210" height="1" alt=""></td>
+  <td width="130"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="130" height="1" alt=""></td>
 </tr>
 </table>
 </form>
 #gui_bottom()
 #gui_outer_end()
 
-<script language="JavaScript">
+<script type="text/javascript">
 <!--
 /*
  * Figure out the webpath when knowing the absolute path.
@@ -478,12 +479,55 @@
  * if supported and > 800 in screen resolution.
  */
 
-if (document.getElementById) {
-	if (parseInt(screen.width) > 800) {
-		document.getElementById("fileSel_1").style.width = 400;
-		document.getElementById("fileSel_2").style.width = 400;
+function resizeFileSelectBoxes() {
+	if (document.getElementById) {
+		try {
+			var oSel1 = document.getElementById("fileSel_1") ;
+			var oSel2 = document.getElementById("fileSel_2") ;
+			var winW = (window.innerWidth) ? window.innerWidth  : (document.body && document.body.offsetWidth) ? document.body.offsetWidth - 20 : document.body.clientWidth ;
+			var winH = (window.innerHeight) ? window.innerHeight : (document.body && document.body.offsetHeight) ? document.body.offsetHeight - 4 : document.body.clientHeight ;
+			oSel1.style.width = ((winW > 1280) ? 500 : (winW > 1024) ? 400 : 340) + "px" ;
+			oSel2.style.width = ((winW > 1280) ? 500 : (winW > 1024) ? 400 : 340) + "px" ;
+			var newH = (winH - 400) ;
+			if (newH > 270 && newH < 1000) {
+				oSel1.style.height = newH + "px" ;
+				oSel2.style.height = newH + "px" ;
+			}
+		} catch (e) {}
 	}
 }
+if (window.attachEvent) {
+	window.attachEvent("onload",      function(){ resizeFileSelectBoxes(); }) ;
+	window.attachEvent("onresize",    function(){ resizeFileSelectBoxes(); }) ;
+} else if (window.addEventListener) {
+	window.addEventListener("load",   function(){ resizeFileSelectBoxes(); }, true) ;
+	window.addEventListener("resize", function(){ resizeFileSelectBoxes(); }, true) ;
+}
+
+if (document.getElementById) {
+	try {
+		document.getElementById("theFileField").size = (!isMac && (document.getElementById || document.all)) ? 80 : 50 ;
+	} catch (e) {}
+}
+
+jQ(document).ready(function($) {
+	
+	var actSide = 0 ;
+	
+	$('#fileSel_1').live('change', function() {
+		actSide = 1 ;
+	}) ;
+	$('#fileSel_2').live('change', function() {
+		actSide = 2 ;
+	}) ;
+	$('#theNameField').live('click', function() {
+		var oName = $('#theNameField') ;
+		if ('' == oName.val() && actSide > 0) {
+			oName.val($('#fileSel_' + actSide).val()).select() ;
+		}
+	}) ;
+	
+}) ;
 //-->
 </script>
 
diff --git a/web/WEB-INF/templates/lang/admin/accessDeniedForUserIP.jsp b/web/WEB-INF/templates/lang/admin/accessDeniedForUserIP.jsp
new file mode 100644
index 0000000000..21e7cd3938
--- /dev/null
+++ b/web/WEB-INF/templates/lang/admin/accessDeniedForUserIP.jsp
@@ -0,0 +1,40 @@
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@taglib prefix="vel" uri="imcmsvelocity" %>
+<vel:velocity>
+    <html>
+    <head>
+        <title><fmt:message key="accessDeniedForUserIP.title"/></title>
+
+        <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
+    </head>
+    <body bgcolor="#FFFFFF">
+    #gui_outer_start()
+    #gui_head( "<fmt:message key="accessDeniedForUserIP.title"/>" )
+    <table border="0" cellspacing="0" cellpadding="0">
+        <tr>
+            <td>
+                <table border="0" cellpadding="0" cellspacing="0">
+                    <form action="<%= request.getContextPath() %>/servlet/StartDoc">
+                        <tr>
+                            <td><input type="Submit" value="<fmt:message key="templates/Startpage"/>" class="imcmsFormBtn">
+                            </td>
+                        </tr>
+                    </form>
+                </table>
+            </td>
+        </tr>
+    </table>
+    #gui_mid()
+
+    <table border="0" cellspacing="0" cellpadding="2" width="310">
+        <tr>
+            <td align="center" class="imcmsAdmText"><b><fmt:message key="accessDeniedForUserIP.message"/></b><br>
+            </td>
+        </tr>
+    </table>
+    #gui_bottom()
+    #gui_outer_end()
+
+    </body>
+    </html>
+</vel:velocity>
diff --git a/web/WEB-INF/templates/lang/admin/existing_doc.html b/web/WEB-INF/templates/lang/admin/existing_doc.html
index ee07d838c5..eec0c46871 100644
--- a/web/WEB-INF/templates/lang/admin/existing_doc.html
+++ b/web/WEB-INF/templates/lang/admin/existing_doc.html
@@ -24,7 +24,9 @@
             </tr>
             <tr>
                 <td>&nbsp;</td>
-                <td class="imcmsAdmText" nowrap><input type="radio" value="and" name="search_prep" #search_prep_check_and#>&nbsp;<? templates/sv/existing_doc.html/1003 ?>&nbsp;&nbsp;<input type="radio" value="or" name="search_prep" #search_prep_check_or#>&nbsp;<? templates/sv/existing_doc.html/1004 ?></td>
+                <td class="imcmsAdmText" nowrap>
+	              <input type="radio" id="searchPrep0" value="and" name="search_prep" #search_prep_check_and#><label for="searchPrep0">&nbsp;<? templates/sv/existing_doc.html/1003 ?></label>&nbsp;
+	              <input type="radio" id="searchPrep1" value="or" name="search_prep" #search_prep_check_or#><label for="searchPrep1">&nbsp;<? templates/sv/existing_doc.html/1004 ?></label></td>
             </tr>
         </table>
     </td>
diff --git a/web/WEB-INF/templates/lang/admin/no_page.html b/web/WEB-INF/templates/lang/admin/no_page.html
index 11fd931789..48ff954236 100644
--- a/web/WEB-INF/templates/lang/admin/no_page.html
+++ b/web/WEB-INF/templates/lang/admin/no_page.html
@@ -1,9 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title><? templates/sv/no_page.html/1 ?></title>
 
 
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
+<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp" />
 
 
 
@@ -15,37 +16,36 @@
 <table border="0" cellspacing="0" cellpadding="0">
 <tr>
 	<td>
-	<table border="0" cellpadding="0" cellspacing="0">
 	<form action="$contextPath/servlet/StartDoc">
+	<table border="0" cellpadding="0" cellspacing="0">
 	<tr>
-		<td><input type="Submit" value="<? templates/Startpage ?>" class="imcmsFormBtn"></td>
+		<td><input type="Submit" value="<? templates/Startpage ?>" class="imcmsFormBtn" /></td>
 	</tr>
-	</form>
-	</table></td>
+	</table>
+	</form></td>
 	<td>&nbsp;</td>
 	<td>
-	<table border="0" cellpadding="0" cellspacing="0">
 	<form action="$contextPath/servlet/BackDoc">
+	<table border="0" cellpadding="0" cellspacing="0">
 	<tr>
-		<td><input type="Submit" value="<? templates/Back ?>" class="imcmsFormBtn"></td>
+		<td><input type="Submit" value="<? templates/Back ?>" class="imcmsFormBtn" /></td>
 	</tr>
-	</form>
-	</table></td>
+	</table>
+	</form></td>
 </tr>
 </table>
 #gui_mid()
 
 <table border="0" cellspacing="0" cellpadding="2" width="310">
 <tr>
-	<td align="center" class="imcmsAdmText"><b><? templates/sv/no_page.html/2 ?></b><br>
-	</td>
+	<td align="center" class="imcmsAdmText"><b><? templates/sv/no_page.html/2 ?></b><br></td>
 </tr>
 </table>
 #gui_bottom()
 #gui_outer_end()
 
 
-<script language="JavaScript">
+<script type="text/javascript">
 <!--
 if (document.forms[1]) {
 	var f = document.forms[1]
diff --git a/web/WEB-INF/templates/lang/admin/password_error_input.txt b/web/WEB-INF/templates/lang/admin/password_error_input.txt
deleted file mode 100644
index d09dbf6afc..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_error_input.txt
+++ /dev/null
@@ -1 +0,0 @@
-<? templates/sv/password_error_input.txt/1 ?>
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/password_no_email.txt b/web/WEB-INF/templates/lang/admin/password_no_email.txt
deleted file mode 100644
index 37a1688d9d..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_no_email.txt
+++ /dev/null
@@ -1 +0,0 @@
-<? templates/sv/password_no_email.txt/1 ?>
diff --git a/web/WEB-INF/templates/lang/admin/password_no_right.txt b/web/WEB-INF/templates/lang/admin/password_no_right.txt
deleted file mode 100644
index 5ede93406b..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_no_right.txt
+++ /dev/null
@@ -1 +0,0 @@
-<? templates/sv/password_no_right.txt/1 ?>
diff --git a/web/WEB-INF/templates/lang/admin/password_no_user.txt b/web/WEB-INF/templates/lang/admin/password_no_user.txt
deleted file mode 100644
index 4da3b5f691..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_no_user.txt
+++ /dev/null
@@ -1 +0,0 @@
-<? templates/sv/password_no_user.txt/1 ?>
diff --git a/web/WEB-INF/templates/lang/admin/password_not_sent.html b/web/WEB-INF/templates/lang/admin/password_not_sent.html
deleted file mode 100644
index ac1c93cc54..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_not_sent.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<head>
-
-<title><? templates/sv/password_sent.html/1 ?></title>
-
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
-
-</head>
-<body bgcolor="#FFFFFF" onLoad="focusField(1,'name')">
-
-#gui_outer_start()
-#gui_head( "<? global/message ?>" )
-
-<table border="0" cellspacing="0" cellpadding="0" width="310">
-<form>
-<tr>
-	<td>
-	<input type="button" class="imcmsFormBtn" style="width:90" name="Tillbaka" value="<? templates/sv/password_sent.html/2001 ?>" onClick="top.location='StartDoc';">
-	<input type="button" class="imcmsFormBtn" style="width:90" name="loginBtn" value="<? templates/sv/password_sent.html/2002 ?>" onClick="top.location='../login/';"></td>
-</tr>
-</form>
-</table>
-#gui_mid()
-
-<table border="0" cellspacing="0" cellpadding="2" width="310">
-<tr>
-	<td><? templates/sv/password_not_sent.html ?></td>
-</tr>
-</table>
-#gui_bottom()
-#gui_outer_end()
-
-
-</body>
-</html>
-
diff --git a/web/WEB-INF/templates/lang/admin/password_sent.html b/web/WEB-INF/templates/lang/admin/password_sent.html
deleted file mode 100644
index bbfe18bd8d..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_sent.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<head>
-
-<title><? templates/sv/password_sent.html/1 ?></title>
-
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
-
-</head>
-<body bgcolor="#FFFFFF" onLoad="focusField(1,'name')">
-
-#gui_outer_start()
-#gui_head( "<? global/message ?>" )
-
-<table border="0" cellspacing="0" cellpadding="0" width="310">
-<form>
-<tr>
-	<td>
-	<input type="button" class="imcmsFormBtn" style="width:90" name="Tillbaka" value="<? templates/sv/password_sent.html/2001 ?>" onClick="top.location='StartDoc';">
-	<input type="button" class="imcmsFormBtn" style="width:90" name="loginBtn" value="<? templates/sv/password_sent.html/2002 ?>" onClick="top.location='../login/';"></td>
-</tr>
-</form>
-</table>
-#gui_mid()
-
-<table border="0" cellspacing="0" cellpadding="2" width="310">
-<tr>
-	<td><? templates/sv/password_sent.html/4 ?></td>
-</tr>
-</table>
-#gui_bottom()
-#gui_outer_end()
-
-
-</body>
-</html>
-
diff --git a/web/WEB-INF/templates/lang/admin/password_sent.txt b/web/WEB-INF/templates/lang/admin/password_sent.txt
deleted file mode 100644
index 5d8eee0f20..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_sent.txt
+++ /dev/null
@@ -1 +0,0 @@
-<? templates/sv/password_sent.txt/1 ?>
diff --git a/web/WEB-INF/templates/lang/admin/password_submit.html b/web/WEB-INF/templates/lang/admin/password_submit.html
deleted file mode 100644
index 4bb99fee7d..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_submit.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-<head>
-
-<title><? templates/sv/password_submit.html/1 ?></title>
-
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
-
-</head>
-<body bgcolor="#FFFFFF" onLoad="focusField(1,'login_name')">
-
-#gui_outer_start()
-#gui_head( "<? global/message ?>" )
-
-<table border="0" cellspacing="0" cellpadding="0" width="310">
-<form>
-<tr>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td><input type="button" class="imcmsFormBtn" style="width:90" name="Tillbaka" value="<? templates/sv/password_submit.html/2001 ?>" onClick="top.location='StartDoc';"></td>
-		<td>&nbsp;</td>
-		<td><input type="button" class="imcmsFormBtn" style="width:90" name="loginBtn" value="<? templates/sv/password_submit.html/2002 ?>" onClick="top.location='../login/';"></td>
-		<td>&nbsp;</td>
-        <td><input type="button" value="<? templates/sv/password_submit.html/2003 ?>" title="<? templates/sv/password_submit.html/2004 ?>" class="imcmsFormBtn" onClick="openHelpW('PasswordByEmail')"></td>
-	</tr>
-	</table></td>
-</tr>
-</form>
-</table>
-#gui_mid()
-
-<table border="0" cellspacing="0" cellpadding="2" width="310">
-<form method="post" name="requset_password" action="PasswordMailReminder">
-<tr>
-	<td class="norm"><div style="padding: 3 0; font-weight:bold">#errorininput#</div><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-</tr>
-<tr>
-	<td align="center">
-	<table border="0" cellspacing="0" cellpadding="1">
-	<tr>
-		<td class="norm"><? templates/sv/password_submit.html/5 ?></td>
-		<td>&nbsp;</td>
-		<td><input type="text" name="login_name" value="" size="15" style="width:180"></td>
-	</tr>
-	<tr>
-		<td colspan="3">&nbsp;</td>
-	</tr>
-	<tr>
-		<td colspan="2">&nbsp;</td>
-		<td><input type="submit" value="<? templates/sv/password_submit.html/2005 ?>" class="imcmsFormBtn"></td>
-	</tr>
-	</table></td>
-</tr>
-</form>
-</table>
-#gui_bottom()
-#gui_outer_end()
-
-
-</body>
-</html>
diff --git a/web/WEB-INF/templates/lang/admin/password_user_mail.txt b/web/WEB-INF/templates/lang/admin/password_user_mail.txt
deleted file mode 100644
index fb0ed64a39..0000000000
--- a/web/WEB-INF/templates/lang/admin/password_user_mail.txt
+++ /dev/null
@@ -1 +0,0 @@
-<? templates/sv/password_user_mail.txt/1 ?>
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/status/approved.frag b/web/WEB-INF/templates/lang/admin/status/approved.frag
index f2b2f4e043..56e2069565 100644
--- a/web/WEB-INF/templates/lang/admin/status/approved.frag
+++ b/web/WEB-INF/templates/lang/admin/status/approved.frag
@@ -1 +1,3 @@
-<img src="$contextPath/imcms/$language/images/admin/status/approved.gif" border="0" alt="<? templates/sv/textdoc/status/approved.frag/description ?>" title="<? templates/sv/textdoc/status/approved.frag/description ?>" hspace="2">
\ No newline at end of file
+<img src="$contextPath/imcms/$language/images/admin/status/approved.gif"
+     alt="<? templates/sv/textdoc/status/approved.frag/description ?>"
+     title="<? templates/sv/textdoc/status/approved.frag/description ?>" style="border:0; margin: 0 2px;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/status/archived.frag b/web/WEB-INF/templates/lang/admin/status/archived.frag
index 84f300f36f..de8fb8c7f2 100644
--- a/web/WEB-INF/templates/lang/admin/status/archived.frag
+++ b/web/WEB-INF/templates/lang/admin/status/archived.frag
@@ -1 +1,3 @@
-<img src="$contextPath/imcms/$language/images/admin/status/archived.gif" border="0" alt="<? templates/sv/textdoc/status/archived.frag/description ?>" title="<? templates/sv/textdoc/status/archived.frag/description ?>" hspace="2">
\ No newline at end of file
+<img src="$contextPath/imcms/$language/images/admin/status/archived.gif"
+     alt="<? templates/sv/textdoc/status/archived.frag/description ?>"
+     title="<? templates/sv/textdoc/status/archived.frag/description ?>" style="border:0; margin: 0 2px;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/status/disapproved.frag b/web/WEB-INF/templates/lang/admin/status/disapproved.frag
index dfe8af0d32..872be36d8c 100644
--- a/web/WEB-INF/templates/lang/admin/status/disapproved.frag
+++ b/web/WEB-INF/templates/lang/admin/status/disapproved.frag
@@ -1 +1,3 @@
-<img src="$contextPath/imcms/$language/images/admin/status/disapproved.gif" border="0" alt="<? templates/sv/textdoc/status/disapproved.frag/description ?>" title="<? templates/sv/textdoc/status/disapproved.frag/description ?>" hspace="2">
\ No newline at end of file
+<img src="$contextPath/imcms/$language/images/admin/status/disapproved.gif"
+     alt="<? templates/sv/textdoc/status/disapproved.frag/description ?>"
+     title="<? templates/sv/textdoc/status/disapproved.frag/description ?>" style="border:0; margin: 0 2px;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/status/new.frag b/web/WEB-INF/templates/lang/admin/status/new.frag
index c0dc70ec72..93954f67d1 100644
--- a/web/WEB-INF/templates/lang/admin/status/new.frag
+++ b/web/WEB-INF/templates/lang/admin/status/new.frag
@@ -1 +1,3 @@
-<img src="$contextPath/imcms/$language/images/admin/status/new.gif" border="0" alt="<? templates/sv/textdoc/status/new.frag/description ?>" title="<? templates/sv/textdoc/status/new.frag/description ?>" hspace="2">
\ No newline at end of file
+<img src="$contextPath/imcms/$language/images/admin/status/new.gif"
+     alt="<? templates/sv/textdoc/status/new.frag/description ?>"
+     title="<? templates/sv/textdoc/status/new.frag/description ?>" style="border:0; margin: 0 2px;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/status/published.frag b/web/WEB-INF/templates/lang/admin/status/published.frag
index 4fb7261075..78b8a1a3db 100644
--- a/web/WEB-INF/templates/lang/admin/status/published.frag
+++ b/web/WEB-INF/templates/lang/admin/status/published.frag
@@ -1 +1,3 @@
-<img src="$contextPath/imcms/$language/images/admin/status/published.gif" border="0" alt="<? templates/sv/textdoc/status/published.frag/description ?>" title="<? templates/sv/textdoc/status/published.frag/description ?>" hspace="2">
\ No newline at end of file
+<img src="$contextPath/imcms/$language/images/admin/status/published.gif"
+     alt="<? templates/sv/textdoc/status/published.frag/description ?>"
+     title="<? templates/sv/textdoc/status/published.frag/description ?>" style="border:0; margin: 0 2px;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/status/unpublished.frag b/web/WEB-INF/templates/lang/admin/status/unpublished.frag
index 96a303302e..852c0c01e9 100644
--- a/web/WEB-INF/templates/lang/admin/status/unpublished.frag
+++ b/web/WEB-INF/templates/lang/admin/status/unpublished.frag
@@ -1 +1,3 @@
-<img src="$contextPath/imcms/$language/images/admin/status/unpublished.gif" border="0" alt="<? templates/sv/textdoc/status/unpublished.frag/description ?>" title="<? templates/sv/textdoc/status/unpublished.frag/description ?>" hspace="2">
\ No newline at end of file
+<img src="$contextPath/imcms/$language/images/admin/status/unpublished.gif"
+     alt="<? templates/sv/textdoc/status/unpublished.frag/description ?>"
+     title="<? templates/sv/textdoc/status/unpublished.frag/description ?>" style="border:0; margin: 0 2px;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/template_admin.html b/web/WEB-INF/templates/lang/admin/template_admin.html
index 66aed0a204..66d26b2775 100644
--- a/web/WEB-INF/templates/lang/admin/template_admin.html
+++ b/web/WEB-INF/templates/lang/admin/template_admin.html
@@ -20,22 +20,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('Templates')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_admin.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input TYPE="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/template_admin.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/template_admin.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/template_admin.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/template_admin.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/template_admin.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_admin.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/template_admin.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/template_admin.html/4 ?></td>
 </tr>
@@ -67,7 +53,5 @@
 </table>
 #gui_bottom()
 #gui_outer_end()
-
-
 </body>
 </html>
diff --git a/web/WEB-INF/templates/lang/admin/template_assign.html b/web/WEB-INF/templates/lang/admin/template_assign.html
index 4499055a18..296db3e782 100644
--- a/web/WEB-INF/templates/lang/admin/template_assign.html
+++ b/web/WEB-INF/templates/lang/admin/template_assign.html
@@ -21,22 +21,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateAssign')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_assign.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/template_assign.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/template_assign.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/template_assign.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/template_assign.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/template_assign.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_assign.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/template_assign.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/template_assign.html/4 ?></td>
 </tr>
@@ -79,8 +65,6 @@
 	<td colspan="2">
 	<table border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr>
-		<td width="45%" class="imcmsAdmText" align="right"><? templates/sv/template_assign.html/10 ?></td>
-		<td>&nbsp;</td>
 		<td width="45%" class="imcmsAdmText"><? templates/sv/template_assign.html/11 ?></td>
 	</tr>
 	<tr>
diff --git a/web/WEB-INF/templates/lang/admin/template_delete.html b/web/WEB-INF/templates/lang/admin/template_delete.html
index f09fd59f67..2d15403490 100644
--- a/web/WEB-INF/templates/lang/admin/template_delete.html
+++ b/web/WEB-INF/templates/lang/admin/template_delete.html
@@ -20,22 +20,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateRemove')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_delete.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/template_delete.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSubDisabled" name="delete_template" value="<? templates/sv/template_delete.html/2002 ?>" disabled="disabled">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/template_delete.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/template_delete.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/template_delete.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_delete.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/template_delete.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/template_delete.html/4 ?></td>
 </tr>
diff --git a/web/WEB-INF/templates/lang/admin/template_edit.html b/web/WEB-INF/templates/lang/admin/template_edit.html
index b703d710c6..efba54a890 100644
--- a/web/WEB-INF/templates/lang/admin/template_edit.html
+++ b/web/WEB-INF/templates/lang/admin/template_edit.html
@@ -6,16 +6,6 @@
 <link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
 <script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
 
-<script language="JavaScript">
-<!--
-function editFile() {
-	var f = document.forms.TemplateEdit;
-	var sTemplateUrl  = "/WEB-INF/templates/text/" + f.template.options[f.template.selectedIndex].value ;
-	var sTemplateName = f.template.options[f.template.selectedIndex].text;
-	popWinOpen(800,570,"$contextPath/imcms/$language/jsp/FileAdmin_edit.jsp?template=true&file=" + escape(sTemplateUrl) + "&templName=" + escape(sTemplateName),"templateEdit",0,0);
-}
-//-->
-</script>
 
 </head>
 <body bgcolor="#FFFFFF" onLoad="focusField(2,'template')">
@@ -31,22 +21,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateEdit')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><b class="white"><? templates/sv/template_edit.html/2 ?></b></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/template_edit.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/template_edit.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/template_edit.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/template_edit.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSubDisabled" name="edit_template" value="<? templates/sv/template_edit.html/2005 ?>" disabled="disabled"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_edit.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/template_edit.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><b class="white"><? templates/sv/template_edit.html/3 ?></b></td>
 </tr>
@@ -84,7 +60,6 @@
 </tr>
 <tr>
 	<td colspan="2" align="right">
-	<input type="button" class="imcmsFormBtn" name="template_edit" value="<? templates/sv/template_edit.html/2014 ?>" onClick="editFile(); return false">
 	<input type="button" class="imcmsFormBtn" name="back" value="<? templates/sv/template_edit.html/2015 ?>" onClick="document.location = 'TemplateAdmin'; return false"></td>
 </tr>
 </form>
diff --git a/web/WEB-INF/templates/lang/admin/template_get.html b/web/WEB-INF/templates/lang/admin/template_get.html
index a36cb61491..5f2dc2361e 100644
--- a/web/WEB-INF/templates/lang/admin/template_get.html
+++ b/web/WEB-INF/templates/lang/admin/template_get.html
@@ -21,22 +21,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateDownload')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_get.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/template_get.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/template_get.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/template_get.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSubDisabled" name="get_template" value="<? templates/sv/template_get.html/2004 ?>" disabled="disabled">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/template_get.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_get.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/template_get.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/template_get.html/4 ?></td>
 </tr>
diff --git a/web/WEB-INF/templates/lang/admin/template_list.html b/web/WEB-INF/templates/lang/admin/template_list.html
index 5564e4bbc8..e69de29bb2 100644
--- a/web/WEB-INF/templates/lang/admin/template_list.html
+++ b/web/WEB-INF/templates/lang/admin/template_list.html
@@ -1,101 +0,0 @@
-<html>
-<head>
-
-
-<title><? templates/sv/AdminManager_adminTask_element.htm/10 ?></title>
-
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
-
-</head>
-<body bgcolor="#FFFFFF" onLoad="focusField(2,'template')">
-
-#gui_outer_start()
-#gui_head( "<? templates/sv/AdminManager_adminTask_element.htm/10 ?>" )
-
-<table border="0" cellspacing="0" cellpadding="2" width="660" align="center">
-<form action="AdminManager">
-<tr>
-	<td>
-	<input type="submit" value="<? global/back ?>" title="<? global/back ?>" class="imcmsFormBtn">
-	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateList')"></td>
-</tr>
-</form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_list.html/3 ?></td>
-</tr>
-<form name="TemplateAdmin" action="TemplateAdmin" method="post">
-<input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/template_list.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/template_list.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/template_list.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/template_list.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/template_list.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_list.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSubDisabled" name="show_templates" value="<? templates/sv/template_list.html/2007 ?>" disabled="disabled"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_list.html/4 ?></td>
-</tr>
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_group" value="<? templates/sv/template_list.html/2008 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_group" value="<? templates/sv/template_list.html/2009 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_group" value="<? templates/sv/template_list.html/2010 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="assign_group" value="<? templates/sv/template_list.html/2011 ?>"></td>
-</tr>
-</form>
-</table>
-#gui_mid()
-
-<table border="0" cellspacing="0" cellpadding="2" width="660" align="center">
-<form name="TemplateChange" action="TemplateChange" method="post">
-<input type="hidden" name="group_id" value="#group_id#">
-<input type="hidden" name="language" value="#language#">
-<tr>
-	<td colspan="2">#gui_heading( "<? templates/sv/template_list.html/6/1 ?>" )</td>
-</tr>
-<tr>
-	<td colspan="2">
-	<table border="0" cellpadding="0" cellspacing="0" width="100%">
-	<tr>
-		<td width="45%" class="imcmsAdmText" align="right"><? templates/sv/template_list.html/7 ?></td>
-		<td>&nbsp;</td>
-		<td width="45%" class="imcmsAdmText"><? templates/sv/template_list.html/8 ?></td>
-	</tr>
-	<tr>
-		<td align="right">
-		<select name="template" size="10" style="width:100%" multiple>
-		#template_list#
-		</select></td>
-		<td align="center">
-		&nbsp;<input type="submit" class="imcmsFormBtnSmall" name="list_templates_docs" value="<? templates/sv/template_list.html/2014 ?>" alt="<? templates/sv/template_list.html/2015 ?>" title="<? templates/sv/template_list.html/2016 ?>" style="width:70">&nbsp;</td>
-		<td>
-		<select name="templates_doc" size="10" style="width:100%" multiple>
-		#templates_docs#
-		</select></td>
-	</tr>
-	<tr>
-		<td colspan="2">&nbsp;</td>
-		<td><input type="submit" class="imcmsFormBtnSmall" name="show_doc" value="<? templates/sv/template_list.html/2017 ?>"></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td colspan="2">#gui_hr( "blue" )</td>
-</tr>
-<tr>
-	<td colspan="2" align="right">
-	<input type="submit" class="imcmsFormBtn" name="cancel" value="<? templates/sv/template_list.html/2018 ?>"></td>
-</tr>
-</form>
-</table>
-#gui_bottom()
-#gui_outer_end()
-
-
-</body>
-</html>
diff --git a/web/WEB-INF/templates/lang/admin/template_rename.html b/web/WEB-INF/templates/lang/admin/template_rename.html
index 18b6057dfd..e7604e68bc 100644
--- a/web/WEB-INF/templates/lang/admin/template_rename.html
+++ b/web/WEB-INF/templates/lang/admin/template_rename.html
@@ -21,22 +21,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateName')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_rename.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/template_rename.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/template_rename.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSubDisabled" name="rename_template" value="<? templates/sv/template_rename.html/2003 ?>" disabled="disabled">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/template_rename.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/template_rename.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_rename.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/template_rename.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/template_rename.html/4 ?></td>
 </tr>
diff --git a/web/WEB-INF/templates/lang/admin/template_upload.html b/web/WEB-INF/templates/lang/admin/template_upload.html
index cfe905632d..e69de29bb2 100644
--- a/web/WEB-INF/templates/lang/admin/template_upload.html
+++ b/web/WEB-INF/templates/lang/admin/template_upload.html
@@ -1,162 +0,0 @@
-<html>
-<head>
-
-
-<title><? templates/sv/AdminManager_adminTask_element.htm/10 ?></title>
-
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-function checkForName() {
-	var theFile = document.forms.TemplateAdd.file.value;
-	var sFileName = '';
-	var re0 = /.(php|html?|jspx?)$/gi;
-	var re1 = /(\w+)\.(\w+)$/i;
-	var re2 = /\"/g; //"
-	sFileName = theFile.replace(re2, '');
-	if (re0.test(sFileName)) {
-		sFileName = sFileName.replace(re1, "$1");
-		arrFileName = sFileName.split("\/") ;
-		sFileName = arrFileName[arrFileName.length-1];
-		arrFileName = sFileName.split(":") ;
-		sFileName = arrFileName[arrFileName.length-1];
-		arrFileName = sFileName.split("\\") ;
-		sFileName = arrFileName[arrFileName.length-1];
-		if (!/[:;\/\.\\]+/gi.test(sFileName)) {
-			document.forms.TemplateAdd.name.value = sFileName;
-			document.forms.TemplateAdd.overwrite.checked = 1;
-		}
-	}
-}
-
-function regExpTest(what,pattern) {
-	var blnRetVal = (pattern.test(what)) ? true : false;
-	return blnRetVal;
-}
-
-function setSize() {
-	if(isGecko) {
-		document.getElementById("sfile").size = 85;
-		document.getElementById("sname").size = 65;
-	} else if (hasGetElementById) {
-		document.getElementById("sfile").style.width = 450;
-		document.getElementById("sname").style.width = 250;
-	}
-}
-//-->
-</SCRIPT>
-
-</head>
-<body bgcolor="#FFFFFF" onLoad="focusField(2,'file'); setSize();">
-
-#gui_outer_start()
-#gui_head( "<? templates/sv/AdminManager_adminTask_element.htm/10 ?>" )
-
-<table border="0" cellspacing="0" cellpadding="2" width="660" align="center">
-<form action="AdminManager">
-<tr>
-	<td>
-	<input type="submit" value="<? global/back ?>" title="<? global/back ?>" class="imcmsFormBtn">
-	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateUploadNew')"></td>
-</tr>
-</form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_upload.html/3 ?></td>
-</tr>
-<form name="TemplateAdmin" action="TemplateAdmin" method="post">
-<input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSubDisabled" name="add_template" value="<? templates/sv/template_upload.html/2001 ?>" disabled="disabled">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/template_upload.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/template_upload.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/template_upload.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/template_upload.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/template_upload.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/template_upload.html/2007 ?>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/template_upload.html/4 ?></td>
-</tr>
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_group" value="<? templates/sv/template_upload.html/2008 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_group" value="<? templates/sv/template_upload.html/2009 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_group" value="<? templates/sv/template_upload.html/2010 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="assign_group" value="<? templates/sv/template_upload.html/2011 ?>"></td>
-</tr>
-</form>
-</table>
-#gui_mid()
-
-<table border="0" cellspacing="0" cellpadding="2" width="660" align="center">
-<form name="TemplateAdd" method="post" action="TemplateAdd" enctype="multipart/form-data">
-<input type="HIDDEN" name="language" value="#language#">
-<tr>
-	<td colspan="2">#gui_heading( "<? templates/sv/template_upload.html/6/1 ?>" )</td>
-</tr>
-<tr>
-	<td width="20%" class="imcmsAdmText" nowrap><? templates/sv/template_upload.html/1001 ?> &nbsp;</td>
-	<td><input type="file" name="file" id="sfile" size="35"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText" nowrap><? templates/sv/template_upload.html/1002 ?> &nbsp;</td>
-	<td>
-	<table border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td><input type="text" name="name" id="sname" size="30" maxlength="255"></td>
-		<td>&nbsp;</td>
-		<td nowrap>
-		<script language="JavaScript">
-		<!--
-		if (hasGetElementById || hasDocumentLayers) {
-			document.write("<input type=\"button\" class=\"imcmsFormBtnSmall\" onClick=\"checkForName()\" value=\"&laquo;&nbsp;<? templates/sv/template_upload.html/2020 ?>\">");
-		}
-		//-->
-		</script></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-  <td>&nbsp;</td>
-  <td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td><input type="checkbox" name="overwrite"></td>
-		<td class="imcmsAdmText"><? templates/sv/template_upload.html/10 ?></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-  <td class="imcmsAdmText"><? templates/sv/template_upload.html/11 ?></td>
-  <td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td>
-		<select name="templategroup" size="5" multiple>
-		#templategroups#
-		</select></td>
-		<td>&nbsp;&nbsp;</td>
-		<td class="imcmsAdmDim"><? templates/sv/template_upload.html/13 ?></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td colspan="2">#gui_hr( "blue" )</td>
-</tr>
-<tr>
-  <td colspan="2" align="right">
-	<input type="submit" class="imcmsFormBtn" name="ok" value="<? templates/sv/template_upload.html/2014 ?>">
-	<input type="submit" class="imcmsFormBtn" name="cancel" value="<? templates/sv/template_upload.html/2015 ?>"></td>
-</tr>
-</form>
-</table>
-#gui_bottom()
-#gui_outer_end()
-
-
-</body>
-</html>
diff --git a/web/WEB-INF/templates/lang/admin/templatedemo_upload.html b/web/WEB-INF/templates/lang/admin/templatedemo_upload.html
index 7ee5e3cbdc..16f0ac989a 100644
--- a/web/WEB-INF/templates/lang/admin/templatedemo_upload.html
+++ b/web/WEB-INF/templates/lang/admin/templatedemo_upload.html
@@ -33,22 +33,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateDemoUpload')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/templatedemo_upload.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/templatedemo_upload.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/templatedemo_upload.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/templatedemo_upload.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/templatedemo_upload.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/templatedemo_upload.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSubDisabled" name="add_demotemplate" value="<? templates/sv/templatedemo_upload.html/2006 ?>" disabled="disabled">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/templatedemo_upload.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/templatedemo_upload.html/4 ?></td>
 </tr>
diff --git a/web/WEB-INF/templates/lang/admin/templategroup_add.html b/web/WEB-INF/templates/lang/admin/templategroup_add.html
index 8b2dcbecfc..fecd720156 100644
--- a/web/WEB-INF/templates/lang/admin/templategroup_add.html
+++ b/web/WEB-INF/templates/lang/admin/templategroup_add.html
@@ -21,22 +21,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateGroupCreate')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/templategroup_add.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/templategroup_add.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/templategroup_add.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/templategroup_add.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/templategroup_add.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/templategroup_add.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/templategroup_add.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/templategroup_add.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/templategroup_add.html/4 ?></td>
 </tr>
diff --git a/web/WEB-INF/templates/lang/admin/templategroup_delete.html b/web/WEB-INF/templates/lang/admin/templategroup_delete.html
index 36622bbde8..005ddab271 100644
--- a/web/WEB-INF/templates/lang/admin/templategroup_delete.html
+++ b/web/WEB-INF/templates/lang/admin/templategroup_delete.html
@@ -21,22 +21,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateGroupRemove')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/templategroup_delete.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/templategroup_delete.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/templategroup_delete.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/templategroup_delete.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/templategroup_delete.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/templategroup_delete.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/templategroup_delete.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/templategroup_delete.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/templategroup_delete.html/4 ?></td>
 </tr>
diff --git a/web/WEB-INF/templates/lang/admin/templategroup_rename.html b/web/WEB-INF/templates/lang/admin/templategroup_rename.html
index 03df930bf2..d6ae86ca87 100644
--- a/web/WEB-INF/templates/lang/admin/templategroup_rename.html
+++ b/web/WEB-INF/templates/lang/admin/templategroup_rename.html
@@ -21,22 +21,8 @@
 	<input type="button" value="<? global/help ?>" title="<? global/help ?>" class="imcmsFormBtn" onClick="openHelpW('TemplateGroupChangeName')"></td>
 </tr>
 </form>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/templategroup_rename.html/3 ?></td>
-</tr>
 <form name="TemplateAdmin" action="TemplateAdmin" method="post">
 <input type="HIDDEN" name="language" value="<? templates/default_lang ?>">
-<tr>
-	<td>
-	<input type="submit" class="imcmsFormBtnSub" name="add_template" value="<? templates/sv/templategroup_rename.html/2001 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="delete_template" value="<? templates/sv/templategroup_rename.html/2002 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="rename_template" value="<? templates/sv/templategroup_rename.html/2003 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="get_template" value="<? templates/sv/templategroup_rename.html/2004 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="edit_template" value="<? templates/sv/templategroup_rename.html/2005 ?>"><br>
-	<img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<input type="submit" class="imcmsFormBtnSub" name="add_demotemplate" value="<? templates/sv/templategroup_rename.html/2006 ?>">
-	<input type="submit" class="imcmsFormBtnSub" name="show_templates" value="<? templates/sv/templategroup_rename.html/2007 ?>"></td>
-</tr>
 <tr>
 	<td class="imcmsAdmText"><? templates/sv/templategroup_rename.html/4 ?></td>
 </tr>
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/admin_image.frag b/web/WEB-INF/templates/lang/admin/textdoc/admin_image.frag
index 5c3c32d167..10b6f027c5 100644
--- a/web/WEB-INF/templates/lang/admin/textdoc/admin_image.frag
+++ b/web/WEB-INF/templates/lang/admin/textdoc/admin_image.frag
@@ -1,3 +1,4 @@
-<a href="$contextPath/servlet/ChangeImage?meta_id=#meta_id#&img=#content_id#&label=#label_url#" class="imcms_label">#label#</a>
+<a href="$contextPath/servlet/ChangeImage?meta_id=#meta_id#&amp;img=#content_id#&amp;label=#label_url#&amp;linkable=#is_linkable#&amp;width=#image_width#&amp;height=#image_height#&amp;max-width=#max_width#&amp;max-height=#max_height#" class="imcms_label">#label#</a>
 #content#
-<a href="$contextPath/servlet/ChangeImage?meta_id=#meta_id#&img=#content_id#&label=#label_url#"><img src="$contextPath/imcms/$language/images/admin/ico_txt.gif" border="0"></a>
+<a href="$contextPath/servlet/ChangeImage?meta_id=#meta_id#&amp;img=#content_id#&amp;label=#label_url#&amp;linkable=#is_linkable#&amp;width=#image_width#&amp;height=#image_height#&amp;max-width=#max_width#&amp;max-height=#max_height#"><img
+   src="$contextPath/imcms/$language/images/admin/ico_txt.gif" style="border:0 !important;" alt="" /></a>
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem.frag b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem.frag
index e6ef71804b..b20f298c66 100644
--- a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem.frag
+++ b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem.frag
@@ -1 +1 @@
-&nbsp;<a href="$contextPath/servlet/AdminDoc?meta_id=#meta_id#"><img src="$contextPath/imcms/$language/images/admin/ico_txt.gif" border="0"></a>
+&nbsp;<a href="$contextPath/servlet/AdminDoc?meta_id=#meta_id#"><img src="$contextPath/imcms/$language/images/admin/ico_txt.gif" style="border:0 !important;" alt="" /></a>
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_checkbox.frag b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_checkbox.frag
index 7c3936645a..43c7835ea5 100644
--- a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_checkbox.frag
+++ b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_checkbox.frag
@@ -1 +1 @@
-<input type="checkbox" name="archiveDelBox" value="#meta_id#">
\ No newline at end of file
+<input type="checkbox" name="archiveDelBox" value="#meta_id#" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_manual_sortkey.frag b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_manual_sortkey.frag
index 9e27197fd3..3e569da947 100644
--- a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_manual_sortkey.frag
+++ b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_manual_sortkey.frag
@@ -1 +1 @@
-<input type="text" name="#meta_id#" value="#sortkey#" size="4" style="font: 11px Tahoma,Verdana,sans-serif;">
\ No newline at end of file
+<input type="text" name="#meta_id#" value="#sortkey#" size="4" style="font: 11px Tahoma,Verdana,sans-serif;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_treesortkey.frag b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_treesortkey.frag
index ae0bb4d894..1815022b32 100644
--- a/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_treesortkey.frag
+++ b/web/WEB-INF/templates/lang/admin/textdoc/admin_menuitem_treesortkey.frag
@@ -1 +1 @@
-<input type="text" name="#meta_id#" value="#sortkey#" size="10" maxlength="12" style="font: 11px Tahoma,Verdana,sans-serif;">
\ No newline at end of file
+<input type="text" name="#meta_id#" value="#sortkey#" size="10" maxlength="12" style="font: 11px Tahoma,Verdana,sans-serif;" />
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/admin_no_image.frag b/web/WEB-INF/templates/lang/admin/textdoc/admin_no_image.frag
index 54ac3b594d..6f0178e9e9 100644
--- a/web/WEB-INF/templates/lang/admin/textdoc/admin_no_image.frag
+++ b/web/WEB-INF/templates/lang/admin/textdoc/admin_no_image.frag
@@ -1,2 +1,2 @@
-<a href="$contextPath/servlet/ChangeImage?meta_id=#meta_id#&img=#content_id#&label=#label_url#" class="imcms_label">#label#
-<img src="$contextPath/imcms/$language/images/admin/ico_image.gif" border="0"><img src="$contextPath/imcms/$language/images/admin/ico_txt.gif" border="0"></a>
\ No newline at end of file
+<a href="$contextPath/servlet/ChangeImage?meta_id=#meta_id#&amp;img=#content_id#&amp;label=#label_url#&amp;linkable=#is_linkable#&amp;width=#image_width#&amp;height=#image_height#&amp;max-width=#max_width#&amp;max-height=#max_height#" class="imcms_label">#label#
+<img src="$contextPath/imcms/$language/images/admin/ico_image.gif" style="border:0 !important;" alt="" /><img src="$contextPath/imcms/$language/images/admin/ico_txt.gif" style="border:0 !important;" alt="" /></a>
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/imcms_admin_headtag.html b/web/WEB-INF/templates/lang/admin/textdoc/imcms_admin_headtag.html
new file mode 100644
index 0000000000..2d3b936aea
--- /dev/null
+++ b/web/WEB-INF/templates/lang/admin/textdoc/imcms_admin_headtag.html
@@ -0,0 +1,4 @@
+
+	<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms4_admin.css.jsp" />
+	<script type="text/javascript" src="$contextPath/imcms/$language/scripts/imcms4_admin_script.js.jsp"></script>
+    <script type="text/javascript">var imcmsJquery = jQ.noConflict(true);</script>
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/imcms_admin_headtag_mode_text.html b/web/WEB-INF/templates/lang/admin/textdoc/imcms_admin_headtag_mode_text.html
new file mode 100644
index 0000000000..163271998e
--- /dev/null
+++ b/web/WEB-INF/templates/lang/admin/textdoc/imcms_admin_headtag_mode_text.html
@@ -0,0 +1,11 @@
+
+	<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms4_admin.css.jsp?textMode=true" />
+	<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_jquery.contextMenu.css.jsp" />
+	
+	<script type="text/javascript" src="$contextPath/imcms/$language/scripts/imcms4_admin_script.js.jsp?textMode=true"></script>
+	<script type="text/javascript" src="$contextPath/imcms/ckeditor/ckeditor.js"></script>
+	<script type="text/javascript" src="$contextPath/imcms/ckeditor/plugins/imcms_integration/init.js.jsp"></script>
+	<script type="text/javascript" src="$contextPath/imcms/scripts/imcms_jquery.ipweditor-1.2.1.js"></script>
+	<script type="text/javascript" src="$contextPath/imcms/scripts/imcms_jquery.contextMenu.js"></script>
+	<script type="text/javascript" src="$contextPath/imcms/scripts/imcms_inline_textedit.js.jsp"></script>
+    <script type="text/javascript">var imcmsJquery = jQ.noConflict(true);</script>
\ No newline at end of file
diff --git a/web/WEB-INF/templates/lang/admin/textdoc/inPage_admin.html b/web/WEB-INF/templates/lang/admin/textdoc/inPage_admin.html
index ce370d9097..1764e7032f 100644
--- a/web/WEB-INF/templates/lang/admin/textdoc/inPage_admin.html
+++ b/web/WEB-INF/templates/lang/admin/textdoc/inPage_admin.html
@@ -1,92 +1,44 @@
-<style type="text/css">
-<!--
-/* changePage */
 
-#changePageDiv { padding: 0px 0px 10px 0px; }
-#changePageTable { border-right: 1px solid #000000; border-bottom: 1px solid #000000; background-color:#f5f5f7; }
-#changePageTdTop { padding: 2px; background-color:#20568D; }
-#changePageTd1, #changePageTd1 SPAN { font: 10px Verdana,Geneva,sans-serif; color:#ffffff; }
-#changePageTd2 {  }
-.changePageTdBottom TD { padding-top: 3px; }
-.changePageSelect { font: 10px Verdana,Geneva,sans-serif; color:#000000; }
-.changePageHeading { font: bold 11px Verdana,Geneva,sans-serif; color:#ccccee; }
-.changePageButton {
-	background-color:#e2e2e4;
-	font: 10px Tahoma, Arial, sans-serif;
-	color:#000000;
-	padding: 0px 4px;
-	border-width: 1px;
-	border-style: outset;
-	border-color: #cccccc #666666 #666666 #cccccc;
-    cursor:pointer;
-}
-INPUT.imcmsFormBtnSmall {
-	background-color: #20568D;
-	color: #ffffff;
-	font: 10px Tahoma, Arial, sans-serif;
-	border: 2px outset #668DB6;
-	border-color: #668DB6 #000000 #000000 #668DB6;
-    cursor:pointer;
-	padding: 0 2;
-}
-A.imLinkHelp:link, A.imLinkHelp:visited, A.imLinkHelp:active, A.imLinkHelp:hover {
-	font: bold 15px Arial, Tahoma,Verdana,sans-serif; color:#eeee00; text-decoration:none;
-}
-B { font-weight: bold; }
--->
-</style>
-
-<script language="JavaScript">
-<!--
-function targetNewWindow() {
-	var exampelWindow = window.open("", "Exempelmall", "scrollbars=yes,toolbar=0,resizable=yes,location=0,directories=0,status=0,menubar=0,height=500,width=800") ;
-	document.changePageForm.target = "Exempelmall" ;
-	exampelWindow.focus() ;
-}
-function resetTarget() {
-	document.changePageForm.target = "" ;
-}
-//-->
-</script>
 <div id="changePageDiv">
-<table border="0" cellspacing="0" cellpadding="2" id="changePageTable">
-<form name="changePageForm" method="POST" action="SaveInPage">
-<input type="HIDDEN" name="meta_id" value="#getMetaId#">
-<tr>
-	<td colspan="9" id="changePageTdTop">
-	<table border="0" cellspacing="0" cellpadding="0" width="100%">
+	<form name="changePageForm" method="post" action="SaveInPage">
+	<input type="hidden" name="meta_id" value="#getMetaId#" />
+	<table border="0" cellspacing="0" cellpadding="2" id="changePageTable">
 	<tr>
-		<td id="changePageTd1">&nbsp;<span class="changePageHeading"><? templates/sv/textdoc/inPage_admin.html/1001 ?>&nbsp;</span> <? templates/sv/textdoc/inPage_admin.html/1002 ?></td>
-		<td id="changePageTd2" align="right"><input type="button" value="<? global/help ?>" title="<? global/openthehelppage ?>" class="imcmsFormBtnSmall" onClick="openHelpW('Appearance')"></td>
+		<td colspan="7" id="changePageTdTop">
+		<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
+		<tr>
+			<td id="changePageTd1"><span class="changePageHeading"><? templates/sv/textdoc/inPage_admin.html/1001 ?>&nbsp;</span> <? templates/sv/textdoc/inPage_admin.html/1002 ?></td>
+			<td id="changePageTd2" align="right"><input type="button" value="<? global/help ?>" title="<? global/openthehelppage ?>" class="imcmsFormBtnSmall" onclick="openHelpW('Appearance')" /></td>
+		</tr>
+		</table></td>
+	</tr>
+	<tr class="changePageTdBottom">
+		<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+		
+		<td>
+		<select name="group" size="1" class="changePageSelect">
+			#getTemplateGroups#
+		</select></td>
+		
+		<td><input type="submit" name="change_group" value="<? templates/sv/textdoc/inPage_admin.html/2001 ?>" onclick="imcmsResetTarget()" class="changePageButton" style="width:90px" /></td>
+		
+		<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+		
+		<td>
+		<select name="template" size="1" class="changePageSelect">
+			#getTemplatesInGroup#
+			<option></option>
+		</select></td>
+		<!--
+		<td><input type="submit" name="preview" value="<? templates/sv/textdoc/inPage_admin.html/2002 ?>" onclick="imcmsTargetNewWindow()" class="changePageButton" /></td>
+		
+		<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+		-->
+		<td><input type="submit" name="update" value="  <? templates/sv/textdoc/inPage_admin.html/2003 ?>  " onclick="imcmsResetTarget()" class="changePageButton" /></td>
+		
+		<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 	</tr>
-	</table></td>
-</tr>
-<tr class="changePageTdBottom">
-	<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt=""></td>
-	
-	<td>
-	<select name="group" size="1" class="changePageSelect">
-		#getTemplateGroups#
-	</select></td>
-	
-	<td><input type="submit" name="change_group" value="<? templates/sv/textdoc/inPage_admin.html/2001 ?>" onClick="resetTarget()" class="changePageButton" width="90" style="width:90"></td>
-	
-	<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt=""></td>
-	
-	<td>
-	<select name="template" size="1" class="changePageSelect">
-		#getTemplatesInGroup#
-		<option></option>
-	</select></td>
-	
-	<td><input type="submit" name="preview" value="<? templates/sv/textdoc/inPage_admin.html/2002 ?>" onClick="targetNewWindow()" class="changePageButton"></td>
-	
-	<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt=""></td>
-	
-	<td><input type="submit" name="update" value="  <? templates/sv/textdoc/inPage_admin.html/2003 ?>  " onClick="resetTarget()" class="changePageButton"></td>
-	
-	<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt=""></td>
-</tr>
-</form>
-</table></div>
+	</table>
+	</form>
+</div>
 
diff --git a/web/WEB-INF/templates/lang/gui.vm b/web/WEB-INF/templates/lang/gui.vm
index 8ed72be965..babf97a3c0 100644
--- a/web/WEB-INF/templates/lang/gui.vm
+++ b/web/WEB-INF/templates/lang/gui.vm
@@ -1,30 +1,20 @@
 #macro( gui_bottom )
             <!-- gui_bottom -->
             </td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td class="imcmsAdmBorder"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		<tr>
-			<td height="10" class="imcmsAdmBorder"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td colspan="4" class="imcmsAdmBgCont"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td class="imcmsAdmBorder"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td height="10" class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td colspan="4" class="imcmsAdmBgCont"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		<tr class="imcmsAdmBgCont">
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1"></td>
-			<td colspan="2"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1" alt="" /></td>
+			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		</table>
         <!-- /gui_bottom -->
@@ -33,30 +23,20 @@
 #macro( gui_bottom_noshade )
             <!-- gui_bottom_noshade -->
             </td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		<tr>
-			<td height="10" class="imcmsAdmBorder"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td colspan="4" class="imcmsAdmBgCont"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td height="10" class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td colspan="4" class="imcmsAdmBgCont"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		<tr class="imcmsAdmBgCont">
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1"></td>
-			<td colspan="2"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1"></td>
-			<td><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1"></td>
+			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="24" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		</table>
         <!-- /gui_bottom_noshade -->
@@ -64,15 +44,14 @@
 
 #macro( gui_head_help_and_back_buttons $helpDocName $formAction $formName $cancelButtonName )
 <!-- gui_head_help_and_back_buttons -->
-<table border="0" cellspacing="0" cellpadding="0">
 <form method="post" action="$formAction">
+<table border="0" cellspacing="0" cellpadding="0">
 <tr>
-	<td><input type="submit"  class="imcmsFormBtn" name="$cancelButtonName" value="<? global/back ?>"></td>#if( '' != $helpDocName )
-	<td>&nbsp;</td>
-	<td><input type="button" value="<? global/help ?>" title="<? global/openthehelppage ?>" class="imcmsFormBtn" onClick="openHelpW('$helpDocName')"></td>#end
+	<td><input type="submit"  class="imcmsFormBtn" name="$cancelButtonName" value="<? global/back ?>" /></td>#if( '' != $helpDocName )
+	<td style="padding-left:10px;"><input type="button" value="<? global/help ?>" title="<? global/openthehelppage ?>" class="imcmsFormBtn" onclick="openHelpW('$helpDocName'); return false" /></td>#end
 </tr>
-</form>
 </table>
+</form>
 <!-- /gui_head_help_and_back_buttons -->
 #end
 
@@ -80,21 +59,19 @@
         <!-- gui_head -->
 		<table border="0" cellspacing="0" cellpadding="0">
 		<tr>
-			<td class="imcmsAdmBgHead" colspan="6"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20"></td>
+			<td class="imcmsAdmBgHead" colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20" alt="" /></td>
 		</tr>
 		<tr class="imcmsAdmBgHead">
-			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td nowrap><span class="imcmsAdmHeadingTop">$heading</span></td>
-			<td align="right"><a href="http://www.imcms.net/" target="_blank"><img src="$contextPath/imcms/$language/images/admin/logo_imcms_admin.gif" width="100" height="20" alt="www.imcms.net" border="0"></a></td>
-			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td nowrap="nowrap"><span class="imcmsAdmHeadingTop">$heading</span></td>
+			<td align="right"><a href="http://www.imcms.net/" target="_blank" title="www.imcms.net"><img src="$contextPath/imcms/$language/images/admin/logo_imcms_admin.gif" width="100" height="20" alt="www.imcms.net" border="0" /></a></td>
+			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		<tr>
-			<td colspan="6" class="imcmsAdmBgHead"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20"></td>
+			<td colspan="6" class="imcmsAdmBgHead"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20" alt="" /></td>
 		</tr>
 		<tr class="imcmsAdmBgHead">
-			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 			<td colspan="2">
         <!-- /gui_head -->
 #end
@@ -104,26 +81,21 @@
 		<table border="0" cellspacing="0" cellpadding="0" width="100%">
     <tr>
         <td class="imcmsAdmBgHead" colspan="6"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20"></td>
+				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20" alt="" /></td>
     </tr>
     <tr class="imcmsAdmBgHead">
-        <td colspan="2"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-        <td nowrap><span class="imcmsAdmHeadingTop">$heading</span></td>
-        <td align="right"><a
-				href="http://www.imcms.net/" target="_blank"><img
-				src="$contextPath/imcms/$language/images/admin/logo_imcms_admin.gif"
-				width="100" height="20" alt="www.imcms.net" border="0"></a></td>
-        <td colspan="2"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+        <td nowrap="nowrap"><span class="imcmsAdmHeadingTop">$heading</span></td>
+        <td align="right"><a href="http://www.imcms.net/" target="_blank"><img
+				        src="$contextPath/imcms/$language/images/admin/logo_imcms_admin.gif"
+				        width="100" height="20" alt="www.imcms.net" border="0" /></a></td>
+        <td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
     </tr>
     <tr>
-        <td class="imcmsAdmBgHead" colspan="6"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20"></td>
+        <td class="imcmsAdmBgHead" colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20" alt="" /></td>
     </tr>
     <tr class="imcmsAdmBgHead">
-        <td colspan="2"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
         <td colspan="2">
         <!-- /gui_head_noshade -->
 #end
@@ -131,26 +103,19 @@
 #macro( gui_mid )
         <!-- gui_mid -->
         </td>
-        <td colspan="2"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
     </tr>
     <tr>
-        <td class="imcmsAdmBgHead" colspan="6"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20"></td>
+        <td class="imcmsAdmBgHead" colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20" alt="" /></td>
     </tr>
     <tr>
-        <td height="10" class="imcmsAdmBorder"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-        <td class="imcmsAdmBgCont" colspan="4"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-        <td class="imcmsAdmBorder"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td height="10" class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+        <td class="imcmsAdmBgCont" colspan="4"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+        <td class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
     </tr>
     <tr class="imcmsAdmBgCont">
-        <td class="imcmsAdmBorder"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-        <td><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+        <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
         <td colspan="2">
         <!-- /gui_mid -->
 #end
@@ -158,12 +123,10 @@
 #macro( gui_mid_tabs1 )
         <!-- gui_mid_tabs1 -->
         </td>
-        <td colspan="2"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
     </tr>
     <tr>
-        <td class="imcmsAdmBgHead" colspan="6"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20">
+        <td class="imcmsAdmBgHead" colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20" alt="" />
         <!-- /gui_mid_tabs1 -->
 #end
 
@@ -173,18 +136,13 @@
         </td>
     </tr>
     <tr>
-        <td height="10" class="imcmsAdmBorder"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-        <td class="imcmsAdmBgCont" colspan="4"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-        <td class="imcmsAdmBorder"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td height="10" class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+        <td class="imcmsAdmBgCont" colspan="4"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+        <td class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
     </tr>
     <tr class="imcmsAdmBgCont">
-        <td class="imcmsAdmBorder"><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-        <td><img
-				src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+        <td class="imcmsAdmBorder"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+        <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
         <td colspan="2">
         <!-- gui_mid_tabs2 -->
 #end
@@ -192,42 +150,36 @@
 #macro( gui_mid_noshade )
             <!-- gui_mid_noshade -->
             </td>
-			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif"
-			width="1" height="1"></td>
+			<td colspan="2"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		<tr>
-			<td class="imcmsAdmBgHead" colspan="6"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20"></td>
+			<td class="imcmsAdmBgHead" colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="20" alt="" /></td>
 		</tr>
 		<tr>
-			<td height="10"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td class="imcmsAdmBgCont" colspan="4"><img
-			src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td height="10"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td class="imcmsAdmBgCont" colspan="4"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 		</tr>
 		<tr class="imcmsAdmBgCont">
-			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
-			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1"></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="1" alt="" /></td>
 			<td colspan="2">
             <!-- /gui_mid_noshade -->
 #end
 
 #macro( gui_outer_end )</td>
     <!-- gui_outer_end -->
-	<td align="right" valign="top" background="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_right.gif">
-	<img src="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_right_top.gif"
-	width="12" height="12" alt="" border="0"></td>
+	<td align="right" valign="top" style="background: transparent url($contextPath/imcms/$language/images/admin/imcms_admin_shadow_right.gif) top left repeat-y;">
+	<img src="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_right_top.gif" width="12" height="12" border="0" alt="" /></td>
 </tr>
 <tr>
 	<td colspan="2">
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
 	<tr>
-		<td background="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom.gif">
-		<img src="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom_left.gif"
-		width="12" height="12" alt="" border="0"></td>
-		<td background="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom.gif" align="right">
-		<img src="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom_right.gif"
-		width="12" height="12" alt="" border="0"></td>
+		<td style="background: transparent url($contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;">
+		<img src="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom_left.gif" width="12" height="12" border="0" alt="" /></td>
+		<td style="background: transparent url($contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;" align="right">
+		<img src="$contextPath/imcms/$language/images/admin/imcms_admin_shadow_bottom_right.gif" width="12" height="12" border="0" alt="" /></td>
 	</tr>
 	</table></td>
 </tr>
@@ -266,40 +218,41 @@
 #else
     #set( $color = $wantedcolor )
 #end
-<img src="$contextPath/imcms/$language/images/admin/1x1_${color}.gif" width="100%" height="1" vspace="8">
+<img src="$contextPath/imcms/$language/images/admin/1x1_${color}.gif" width="100%" height="1" style="margin: 8px 0;" alt="" />
     <!-- /gui_hr $wantedcolor -->
 #end
 
 #macro( gui_heading $heading )
     <!-- gui_heading -->
-<span class="imcmsAdmHeading">$heading</span><br>
+<span class="imcmsAdmHeading">$heading</span><br />
 #gui_hr( 'blue' )
     <!-- /gui_heading -->
 #end
 
 #macro( gui_start_of_page $titleAndHeading $backServlet $action $helpDocName $bodyOnLoad )
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!-- gui_start_of_page -->
 <html>
 <head>
 <title>$titleAndHeading</title>
 
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp" />
+<script type="text/javascript" src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp"></script>
 
 </head>
-<body onLoad="$bodyOnLoad">
+<body onload="$bodyOnLoad">
 	#gui_outer_start()
 	#gui_head( "$titleAndHeading" )
 	#gui_head_help_and_back_buttons( "$helpDocName"  "$backServlet" "" "$action" )
 	#gui_mid()
-    <!-- /gui_start_of_page -->
+<!-- /gui_start_of_page -->
 #end
 
 #macro( gui_end_of_page )
-    <!-- gui_end_of_page -->
+<!-- gui_end_of_page -->
 	#gui_bottom()
 	#gui_outer_end()
 </body>
 </html>
-    <!-- /gui_end_of_page -->
+<!-- /gui_end_of_page -->
 #end
diff --git a/web/WEB-INF/templates/text/demo.jsp b/web/WEB-INF/templates/text/demo.jsp
index 4a70af9c63..4104fd4c01 100644
--- a/web/WEB-INF/templates/text/demo.jsp
+++ b/web/WEB-INF/templates/text/demo.jsp
@@ -1,76 +1,91 @@
-<%@taglib prefix="imcms" uri="imcms"
-        %><%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" 
-        %><%@taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt"%><html>
+<%@ page
+	
+	contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"
+
+%><%@taglib prefix="imcms" uri="imcms"
+%><%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" 
+%><%@taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt"
+%><!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" xml:lang="en" lang="en">
 <imcms:variables/>
 <head>
-<title><c:out value="${document.headline}"/> - Powered by imCMS from imCode Partner AB</title>
-<style type="text/css">
-<!--
-.imcHeading { font: bold medium Verdana,Geneva,sans-serif; color:#000099; }
-TD { font: x-small Verdana,Geneva,sans-serif; color:#000000; }
-.small { font: xx-small Verdana,Geneva,sans-serif; color:#000000; }
-PRE, TT { font: x-small "Courier New", Courier, monospace; color:#888888; }
+	
+	<title><c:out value="${document.headline}"/> - Powered by imCMS from imCode Partner AB</title>
 
-A:link    { color:#000099; }
-A:visited { color:#000099; }
-A:active  { color:#cc0000; }
-A:hover   { color:#0000ff; }
-
-LI { padding-bottom:5; }
--->
+<style type="text/css">
+/*<![CDATA[*/
+BODY { height: 100%; margin: 10px; text-align:center; background-color: #f0f0ff; }
+H1 { margin-bottom:1em; font: bold medium Verdana,Geneva,sans-serif; color:#009; }
+TD, .text { font: x-small Verdana,Geneva,sans-serif; text-align:left; color:#000; }
+.small { font: xx-small Verdana,Geneva,sans-serif; color:#000; }
+PRE, TT { font: x-small "Courier New", Courier, monospace; color:#888; }
+A:link    { color:#009; }
+A:visited { color:#009; }
+A:active  { color:#c00; }
+A:hover   { color:#00f; }
+LI { padding-bottom:5px; }
+#container {
+	width: 770px;
+	margin: 0 auto;
+	border-width: 1px 2px 2px 1px;
+	border-style: solid;
+	border-color: #ccc #000 #000 #ccc;
+	background-color: #fff;
+}
+.adminPanelTable {
+	margin: 0 auto !important;
+}
+#changePageTable {
+	margin: 0 auto !important;
+}
+/*]]>*/
 </style>
 
 </head>
-<body bgcolor="#f0f0ff" style="margin: 10 0 10 10">
-<table border="0" cellspacing="0" cellpadding="5" height="100%" align="center" bgcolor="#ffffff">
-<tr>
-	<td valign="top">
-	<table border="0" cellspacing="0" cellpadding="0" width="760">
+<body>
+
+
+<div id="container">
+	<table border="0" cellspacing="0" cellpadding="5">
 	<tr>
-		<td colspan="5"><imcms:include url="@documentationwebappurl@/servlet/GetDoc?meta_id=1054&template=imcmsDemoTop"/></td>
+		<td valign="top">
+		<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
+		<tr>
+		</tr>
+		<tr valign="top">
+			<td>
+			<imcms:text no="1" label="Text (Rubrik)" pre='<h1>' post='</h1>' formats="text" rows="2" />
+			<imcms:text no='2' label='<br/>Text' pre='<div class="text">' post='</div>' />
+			<imcms:menu no='1' label='<br/><br/>Meny (punktlista)'>
+			<ul>
+			<imcms:menuloop>
+				<imcms:menuitem>
+					<li style="color:green;"><imcms:menuitemlink><c:out value="${menuitem.document.headline}"/></imcms:menuitemlink></li>
+				</imcms:menuitem>
+				<imcms:menuitem>
+					<imcms:menuitemhide>
+						<li style="color:red;"><imcms:menuitemlink><c:out value="${menuitem.document.headline}"/></imcms:menuitemlink></li>
+					</imcms:menuitemhide>
+				</imcms:menuitem>
+			</imcms:menuloop>
+			</ul>
+			</imcms:menu>
+			<imcms:image no='3' label='Bild' linkable="false" pre='<br/><br/>' post='<br/>'/><br/>
+			<imcms:include no='1' label='Dynamisk inkludering 1'/>
+			</td>
+	
+		</tr>
+		</table></td>
 	</tr>
 	<tr>
-		<td colspan="5" height="15">&nbsp;</td>
+		<td valign="bottom" style="text-align:center;"><imcms:admin/>
 	</tr>
-	<tr valign="top">
-		<td width="200"><imcms:include url="@documentationwebappurl@/servlet/GetDoc?meta_id=1054&template=imcmsDemoLeft"/></td>
-
-		<td width="15">&nbsp;</td>
+	</table>
+</div>
 
-		<td width="385">
-            <imcms:text no="1" label="Text (Rubrik)" pre='<span class="imcHeading">' post='</span><br><br>' />
-            <imcms:text no='2' label='<br>Text' post='<br><br>' />
-            <imcms:menu no='1' label='<br><br>Meny (punktlista)'>
-                <ul>
-                    <imcms:menuloop>
-                        <imcms:menuitem>
-                            <li style="padding-bottom:5; color: green;"><imcms:menuitemlink><c:out value="${menuitem.document.headline}"/></imcms:menuitemlink></li>
-                        </imcms:menuitem>
-                        <imcms:menuitem>
-                            <imcms:menuitemhide>
-                                <li style="padding-bottom:5; color: red;"><imcms:menuitemlink><c:out value="${menuitem.document.headline}"/></imcms:menuitemlink></li>
-                            </imcms:menuitemhide>
-                        </imcms:menuitem>
-                    </imcms:menuloop>
-                </ul>
-            </imcms:menu>
-            <imcms:include url="@documentationwebappurl@/servlet/GetDoc?meta_id=1054&template=imcmsDemoContent" pre='<hr>' post='<hr>'/>
-            <imcms:image no='3' label='Bild' pre='<br><br>' post='<br>'/><br>
-            <imcms:include no='1' label='Dynamisk inkludering 1'/>
-        </td>
-    
-		<td width="10">&nbsp;</td>
-
-		<td width="150"><imcms:include url="@documentationwebappurl@/servlet/GetDoc?meta_id=1054&template=imcmsDemoRight"/></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td align="center" valign="bottom">&nbsp;<br><imcms:admin/>
-        <imcms:include url="@documentationwebappurl@/servlet/GetDoc?meta_id=1054&template=imcmsDemoBottom"/>        
-    </td>
-</tr>
-</table>
 
 </body>
 </html>
diff --git a/web/WEB-INF/templates/text/demo/README b/web/WEB-INF/templates/text/demo/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/WEB-INF/tld/imcms.tld b/web/WEB-INF/tld/imcms.tld
index 1fa954a440..2f4b3f49eb 100644
--- a/web/WEB-INF/tld/imcms.tld
+++ b/web/WEB-INF/tld/imcms.tld
@@ -83,6 +83,10 @@ Library 1.2//EN"
             <name>label</name>
             <rtexprvalue>true</rtexprvalue>
         </attribute>
+        <attribute>
+            <name>linkable</name>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
         <attribute>
             <name>styleClass</name>
             <rtexprvalue>true</rtexprvalue>
@@ -168,6 +172,11 @@ Library 1.2//EN"
             <name>label</name>
             <rtexprvalue>true</rtexprvalue>
         </attribute>
+        <attribute>
+            <name>document</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
         <attribute>
             <name>pre</name>
             <rtexprvalue>true</rtexprvalue>
diff --git a/web/WEB-INF/uploads/README b/web/WEB-INF/uploads/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 3c9e45852c..fafe71466a 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -1,12 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
+<web-app
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+        id="WebApp_ID" version="2.5">
 
     <display-name>imCMS</display-name>
 
+	<filter>
+		<filter-name>EncodingFilter</filter-name>
+		<filter-class>
+			com.imcode.imcms.servlet.EncodingFilter
+		</filter-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>EncodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+    <filter>
+        <description>Checking for answer from IDP server</description>
+        <filter-name>SSOFilter</filter-name>
+        <filter-class>imcode.server.user.saml2.SAMLSPFilter</filter-class>
+        <init-param>
+            <param-name>excludedUrlPattern</param-name>
+            <param-value>.*\.jpg</param-value>
+        </init-param>
+        <init-param>
+            <param-name>idProviderSSOUrl</param-name>
+            <param-value>https://m00-mg-local.testidp.funktionstjanster.se/samlv2/idp/req/0/0</param-value>
+        </init-param>
+        <init-param>
+            <param-name>spProviderId</param-name>
+            <param-value>${server.name}</param-value>
+        </init-param>
+        <init-param>
+            <param-name>acsUrl</param-name>
+            <param-value>${server.name}/acs</param-value>
+        </init-param>
+        <init-param>
+            <param-name>logoutUrl</param-name>
+            <param-value>/logout</param-value>
+        </init-param>
+    </filter>
+
+    <filter>
+        <description> Protection for xss attacks</description>
+        <filter-name>XSSProtectionFilter</filter-name>
+        <filter-class>com.imcode.imcms.servlet.XssFilter</filter-class>
+    </filter>
+
     <filter>
         <description>Checks for multiple user login</description>
         <filter-name>ImcmsMultipleUserLoginFilter</filter-name>
@@ -19,24 +68,54 @@
         <filter-class>com.imcode.imcms.servlet.ImcmsSetupFilter</filter-class>
     </filter>
 
+    <filter>
+        <description>Protection from csrf attacks</description>
+        <filter-name>CSRFProtectionFilter</filter-name>
+        <filter-class>com.imcode.imcms.servlet.csrf.filter.CSRFProtectionFilter</filter-class>
+    </filter>
+
     <filter>
         <description>Restrict api samples to superadmin.</description>
         <filter-name>SuperAdminFilter</filter-name>
         <filter-class>com.imcode.imcms.servlet.SuperAdminFilter</filter-class>
     </filter>
 
-    
+    <filter-mapping>
+        <filter-name>SSOFilter</filter-name>
+        <url-pattern>/VerifyUserViaBankId</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>SSOFilter</filter-name>
+        <url-pattern>/servlet/LogOut</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>SSOFilter</filter-name>
+        <url-pattern>/acs</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>XSSProtectionFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>ImcmsMultipleUserLoginFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-    
-    
+
+
     <filter-mapping>
         <filter-name>ImcmsSetupFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-    
+
+    <filter-mapping>
+        <filter-name>CSRFProtectionFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>SuperAdminFilter</filter-name>
         <url-pattern>/imcms/docs/apisamples/*</url-pattern>
@@ -45,17 +124,12 @@
     <listener>
         <listener-class>com.imcode.imcms.servlet.ContextListener</listener-class>
     </listener>
-    
+
     <servlet>
         <servlet-name>RD</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.ReDirecter</servlet-class>
     </servlet>
 
-    <servlet>
-        <servlet-name>com.imcode.imcms.servlet.Help</servlet-name>
-        <servlet-class>com.imcode.imcms.servlet.Help</servlet-class>
-    </servlet>
-
     <servlet>
         <servlet-name>com.imcode.imcms.servlet.superadmin.AdminCategories</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.superadmin.AdminCategories</servlet-class>
@@ -81,6 +155,11 @@
         <servlet-class>com.imcode.imcms.servlet.superadmin.AdminIpAccess</servlet-class>
     </servlet>
 
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.superadmin.AdminIpWhiteList</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.superadmin.AdminIpWhiteList</servlet-class>
+    </servlet>
+
     <servlet>
         <servlet-name>com.imcode.imcms.servlet.superadmin.AdminManager</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.superadmin.AdminManager</servlet-class>
@@ -191,11 +270,6 @@
         <servlet-class>com.imcode.imcms.servlet.admin.PageDispatcher</servlet-class>
     </servlet>
 
-    <servlet>
-        <servlet-name>com.imcode.imcms.servlet.PasswordMailReminder</servlet-name>
-        <servlet-class>com.imcode.imcms.servlet.PasswordMailReminder</servlet-class>
-    </servlet>
-
     <servlet>
         <servlet-name>com.imcode.imcms.servlet.RebuildIndex</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.RebuildIndex</servlet-class>
@@ -216,6 +290,16 @@
         <servlet-class>com.imcode.imcms.servlet.superadmin.SanityCheckServlet</servlet-class>
     </servlet>
 
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.superadmin.EncryptPasswords</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.superadmin.EncryptPasswords</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.PasswordReset</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.PasswordReset</servlet-class>
+    </servlet>
+
     <servlet>
         <servlet-name>com.imcode.imcms.servlet.admin.SaveInclude</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.admin.SaveInclude</servlet-class>
@@ -270,6 +354,10 @@
         <servlet-name>com.imcode.imcms.servlet.VerifyUser</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.VerifyUser</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.SessionsInfo</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.SessionsInfo</servlet-class>
+    </servlet>
 
     <servlet>
         <servlet-name>com.imcode.imcms.servlet.Version</servlet-name>
@@ -280,22 +368,67 @@
         <servlet-name>com.imcode.imcms.servlet.XmlDoc</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.XmlDoc</servlet-class>
     </servlet>
-    
+
     <servlet>
         <servlet-name>com.imcode.imcms.servlet.superadmin.AdminProfiles</servlet-name>
         <servlet-class>com.imcode.imcms.servlet.superadmin.AdminProfiles</servlet-class>
     </servlet>
-    
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.ImageHandling</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.ImageHandling</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.ClearImageCache</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.ClearImageCache</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.ImagePreview</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.ImagePreview</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.AjaxServlet</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.AjaxServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.InternalError</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.InternalError</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.RequestExternalIdentifierToLoginServlet</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.RequestExternalIdentifierToLoginServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>com.imcode.imcms.servlet.ProcessAuthResponseServlet</servlet-name>
+        <servlet-class>com.imcode.imcms.servlet.ProcessAuthResponseServlet</servlet-class>
+    </servlet>
+
+	<servlet>
+		<servlet-name>com.imcode.imcms.servlet.superadmin.ExportDocuments</servlet-name>
+		<servlet-class>com.imcode.imcms.servlet.superadmin.ExportDocuments</servlet-class>
+	</servlet>
+
+	<servlet>
+		<servlet-name>com.imcode.imcms.servlet.W3CValidationServlet</servlet-name>
+		<servlet-class>com.imcode.imcms.servlet.W3CValidationServlet</servlet-class>
+	</servlet>
+
+	<servlet>
+		<servlet-name>com.imcode.imcms.servlet.superadmin.UpdateDocumentExportStatusServlet</servlet-name>
+		<servlet-class>com.imcode.imcms.servlet.superadmin.UpdateDocumentExportStatusServlet</servlet-class>
+	</servlet>
+
     <servlet-mapping>
         <servlet-name>com.imcode.imcms.servlet.superadmin.AdminProfiles</servlet-name>
         <url-pattern>/imcms/admin/profile/*</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>com.imcode.imcms.servlet.Help</servlet-name>
-        <url-pattern>/Help/*</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>RD</servlet-name>
         <url-pattern>/RD/*</url-pattern>
@@ -326,6 +459,11 @@
         <url-pattern>/servlet/AdminIpAccess</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.superadmin.AdminIpWhiteList</servlet-name>
+        <url-pattern>/servlet/AdminIpWhiteList</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>com.imcode.imcms.servlet.superadmin.AdminManager</servlet-name>
         <url-pattern>/servlet/AdminManager</url-pattern>
@@ -442,8 +580,8 @@
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>com.imcode.imcms.servlet.PasswordMailReminder</servlet-name>
-        <url-pattern>/servlet/PasswordMailReminder</url-pattern>
+        <servlet-name>com.imcode.imcms.servlet.PasswordReset</servlet-name>
+        <url-pattern>/servlet/PasswordReset</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
@@ -466,6 +604,11 @@
         <url-pattern>/servlet/SanityCheck</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.superadmin.EncryptPasswords</servlet-name>
+        <url-pattern>/servlet/EncryptPasswords</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>com.imcode.imcms.servlet.admin.SaveInclude</servlet-name>
         <url-pattern>/servlet/SaveInclude</url-pattern>
@@ -521,6 +664,11 @@
         <url-pattern>/servlet/VerifyUser</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.SessionsInfo</servlet-name>
+        <url-pattern>/servlet/SessionsInfo</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>com.imcode.imcms.servlet.Version</servlet-name>
         <url-pattern>/servlet/Version</url-pattern>
@@ -531,9 +679,59 @@
         <url-pattern>/servlet/XmlDoc</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.ImageHandling</servlet-name>
+        <url-pattern>/imagehandling/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.ClearImageCache</servlet-name>
+        <url-pattern>/servlet/ClearImageCache</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.ImagePreview</servlet-name>
+        <url-pattern>/servlet/ImagePreview</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.AjaxServlet</servlet-name>
+        <url-pattern>/servlet/AjaxServlet</url-pattern>
+    </servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>com.imcode.imcms.servlet.superadmin.ExportDocuments</servlet-name>
+		<url-pattern>/servlet/ExportDocuments</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>com.imcode.imcms.servlet.W3CValidationServlet</servlet-name>
+		<url-pattern>/servlet/w3cValidation</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>com.imcode.imcms.servlet.superadmin.UpdateDocumentExportStatusServlet</servlet-name>
+		<url-pattern>/servlet/UpdateDocumentExportStatusServlet</url-pattern>
+	</servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.InternalError</servlet-name>
+        <url-pattern>/servlet/InternalError</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.RequestExternalIdentifierToLoginServlet</servlet-name>
+        <url-pattern>/api/external-identifiers/login/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>com.imcode.imcms.servlet.ProcessAuthResponseServlet</servlet-name>
+        <url-pattern>/api/external-identifiers/logged-in/*</url-pattern>
+    </servlet-mapping>
+
     <session-config>
         <session-timeout>
-         30
+            30
         </session-timeout>
     </session-config>
 
@@ -628,14 +826,26 @@
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
 
+    <error-page>
+        <exception-type>imcode.server.user.MissingLoginDataException</exception-type>
+        <location>/imcms/missingLoginData.jsp</location>
+    </error-page>
+
     <error-page>
         <exception-type>java.lang.Throwable</exception-type>
-        <location>/imcms/internalerrorpage.jsp</location>
+        <location>/servlet/InternalError</location>
     </error-page>
-    
+
     <error-page>
         <error-code>404</error-code>
         <location>/imcms/404.jsp</location>
     </error-page>
 
+	<jsp-config>
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+		</jsp-property-group>
+	</jsp-config>
+
 </web-app>
diff --git a/web/css/editor_default.css b/web/css/editor_default.css
index 3250eed87b..1bc511cc32 100644
--- a/web/css/editor_default.css
+++ b/web/css/editor_default.css
@@ -5,10 +5,10 @@
 
 /*
 
-If you want to use your own CSS - remove the CSS-attibutes below and just use an @import statment. Eg:
+If you want to use your own CSS:
 
-@import url(my_css.css);
-@import url(default.css.jsp?editor=true);
+- Copy this file and rename it to: editor_site.css
+- If /css/editor_site.css exists it's used instead.
 
 */
 
diff --git a/web/document.jsp b/web/document.jsp
new file mode 100644
index 0000000000..3bc9ef7929
--- /dev/null
+++ b/web/document.jsp
@@ -0,0 +1,52 @@
+<%@ page import="imcode.server.user.UserDomainObject" %>
+<%@ page import="imcode.util.Utility" %>
+<%@ page import="com.imcode.imcms.api.ContentManagementSystem" %>
+<%@ page import="imcode.server.document.DocumentDomainObject" %>
+<%@ page import="com.imcode.imcms.api.Document" %>
+<%@ page import="java.text.DateFormat" %>
+<%@ page import="com.imcode.imcms.api.DocumentService" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="java.util.Calendar" %>
+<%@ page import="java.util.GregorianCalendar" %>
+<%@ page import="static java.util.GregorianCalendar.*" %>
+
+<%
+    UserDomainObject user = Utility.getLoggedOnUser(request) ;
+    ContentManagementSystem cms = ContentManagementSystem.fromRequest(request);
+    DocumentService docService = cms.getDocumentService();
+    Document doc = docService.getDocument(1001);
+    Calendar calendar = GregorianCalendar.getInstance();
+
+    if (request.getMethod().equalsIgnoreCase("POST")) {
+        calendar.set(DAY_OF_MONTH, Integer.parseInt(request.getParameter("DAY_OF_MONTH")));
+        calendar.set(MONTH, Integer.parseInt(request.getParameter("MONTH")) - 1);
+        calendar.set(YEAR, Integer.parseInt(request.getParameter("YEAR")));
+        calendar.set(HOUR_OF_DAY, Integer.parseInt(request.getParameter("HOUR_OF_DAY")));
+        calendar.set(MINUTE, Integer.parseInt(request.getParameter("MINUTE")));
+
+        doc.setModifiedDatetime(calendar.getTime());
+        docService.saveChanges(doc);
+        doc = docService.getDocument(1001);
+    }
+
+    calendar.setTime(doc.getModifiedDatetime());
+%>
+
+<html>
+    <body>
+        Last modified by <%=doc.getModifier()%>:<br/>
+        <form method="POST">
+            <input type="text" size="4" name="DAY_OF_MONTH" value="<%=calendar.get(Calendar.DAY_OF_MONTH)%>"/>
+            -
+            <input type="text" size="4" name="MONTH" value="<%=calendar.get(Calendar.MONTH) + 1%>"/>
+            -
+            <input type="text" size="4" name="YEAR" value="<%=calendar.get(Calendar.YEAR)%>"/>
+            #
+            <input type="text" size="4" name="HOUR_OF_DAY" value="<%=calendar.get(Calendar.HOUR_OF_DAY)%>"/>
+            :
+            <input type="text" size="4" name="MINUTE" value="<%=calendar.get(Calendar.MINUTE)%>"/>
+
+            <input type="submit" value="Update">
+        </form>
+    </body>
+</html>
\ No newline at end of file
diff --git a/web/imcms/500.jsp b/web/imcms/500.jsp
new file mode 100644
index 0000000000..5cf27441b9
--- /dev/null
+++ b/web/imcms/500.jsp
@@ -0,0 +1,175 @@
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<html>
+<head>
+    <title><fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/1"/></title>
+    <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<!-- gui_outer_start -->
+<table border="0" cellspacing="0" cellpadding="0" class="imcmsAdmTable" align="center">
+    <tr>
+        <td class="imcmsAdmTable">
+            <!-- /gui_outer_start -->
+            <!-- gui_head -->
+            <table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                            width="1" height="20" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td nowrap="nowrap"><span class="imcmsAdmHeadingTop"><fmt:message
+                            key="install/htdocs/sv/jsp/internalerrorpage.jsp/2"/></span></td>
+                    <td align="right"><a href="http://www.imcms.net/" target="_blank" title="www.imcms.net"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/logo_imcms_admin.gif"
+                            width="100" height="20" alt="www.imcms.net" border="0"/></a></td>
+                    <td colspan="2"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td colspan="6" class="imcmsAdmBgHead"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                            width="1" height="20" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgHead">
+                    <td colspan="2"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td colspan="2">
+                        <!-- /gui_head -->
+                        <table border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                                <td>
+                                    <table border="0" cellpadding="0" cellspacing="0">
+                                        <form action="<%= request.getContextPath() %>/servlet/StartDoc">
+                                            <tr>
+                                                <td><input type="Submit" class="imcmsFormBtn"
+                                                           value="<fmt:message key="templates/Startpage"/>"></td>
+                                            </tr>
+                                        </form>
+                                    </table>
+                                </td>
+                                <td>&nbsp;</td>
+                                <td>
+                                    <table border="0" cellpadding="0" cellspacing="0">
+                                        <form action="<%= request.getContextPath() %>/servlet/BackDoc">
+                                            <tr>
+                                                <td><input type="Submit" value="<fmt:message key="templates/Back"/>"
+                                                           class="imcmsFormBtn"></td>
+                                            </tr>
+                                        </form>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                        <!-- gui_mid -->
+                    </td>
+                    <td colspan="2"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td class="imcmsAdmBgHead" colspan="6"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                            width="1" height="20" alt=""/></td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td class="imcmsAdmBgCont" colspan="4"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td class="imcmsAdmBorder"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td class="imcmsAdmBorder"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                    <td><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1" height="1"
+                             alt=""/></td>
+                    <td colspan="2">
+                        <!-- /gui_mid -->
+                        <table border="0" cellspacing="0" cellpadding="2">
+                            <tr>
+                                <td align="left" class="imcmsAdmText">
+                                    <p><fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/3"/></p>
+                                    <p><fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/4"/></p>
+                                </td>
+                            </tr>
+                        </table>
+                        <h2><fmt:message
+                                key="install/htdocs/sv/jsp/internalerrorpage.jsp/6"/><%= request.getAttribute("error-id") %>
+                        </h2>
+                        <button class="imcmsFormBtn"
+                                onclick="$('#detail-info').is(':visible') ? $('#detail-info').hide() : $('#detail-info').show();">
+                            <fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/10"/>
+                        </button>
+                        <div id="detail-info" style="display: none;">
+                            <br/>
+                            <strong><fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/11"/></strong>
+                            <pre><%= request.getAttribute("error-url") %></pre>
+                            <strong><fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/12"/></strong>
+                            <pre><%= request.getAttribute("message") %></pre>
+                            <strong><fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/13"/></strong>
+                            <pre><%= request.getAttribute("cause") %></pre>
+                            <strong><fmt:message key="install/htdocs/sv/jsp/internalerrorpage.jsp/14"/></strong>
+                            <pre><%= request.getAttribute("stack-trace") %></pre>
+                        </div>
+                        <!-- gui_bottom -->
+                    </td>
+                    <td><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1" height="1"
+                             alt=""/></td>
+                    <td class="imcmsAdmBorder"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr>
+                    <td height="10" class="imcmsAdmBorder"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td colspan="4" class="imcmsAdmBgCont"><img
+                            src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                            width="1" height="1" alt=""/></td>
+                    <td class="imcmsAdmBorder"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif"
+                                                    width="1" height="1" alt=""/></td>
+                </tr>
+                <tr class="imcmsAdmBgCont">
+                    <td><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1" height="1"
+                             alt=""/></td>
+                    <td><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="24" height="1"
+                             alt=""/></td>
+                    <td colspan="2"><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1"
+                                         height="1" alt=""/></td>
+                    <td><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="24" height="1"
+                             alt=""/></td>
+                    <td><img src="<%= request.getContextPath() %>/imcms/eng/images/admin/1x1.gif" width="1" height="1"
+                             alt=""/></td>
+                </tr>
+            </table>
+            <!-- /gui_bottom -->
+            <!-- gui_outer_end -->
+        <td align="right" valign="top"
+            style="background: transparent url(<%= request.getContextPath() %>/imcms/eng/images/admin/imcms_admin_shadow_right.gif) top left repeat-y;">
+            <img src="<%= request.getContextPath() %>/imcms/eng/images/admin/imcms_admin_shadow_right_top.gif"
+                 width="12" height="12" border="0" alt=""/></td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="0" width="100%">
+                <tr>
+                    <td style="background: transparent url(<%= request.getContextPath() %>/imcms/eng/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;">
+                        <img src="<%= request.getContextPath() %>/imcms/eng/images/admin/imcms_admin_shadow_bottom_left.gif"
+                             width="12" height="12" border="0" alt=""/></td>
+                    <td style="background: transparent url(<%= request.getContextPath() %>/imcms/eng/images/admin/imcms_admin_shadow_bottom.gif) top left repeat-x;"
+                        align="right">
+                        <img src="<%= request.getContextPath() %>/imcms/eng/images/admin/imcms_admin_shadow_bottom_right.gif"
+                             width="12" height="12" border="0" alt=""/></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+<!-- /gui_outer_end -->
+</body>
+</html>
diff --git a/web/imcms/ckeditor/.htaccess b/web/imcms/ckeditor/.htaccess
new file mode 100644
index 0000000000..77f2be131e
--- /dev/null
+++ b/web/imcms/ckeditor/.htaccess
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+# For licensing, see LICENSE.html or http://ckeditor.com/license
+#
+
+#
+# On some specific Linux installations you could face problems with Firefox.
+# It could give you errors when loading the editor saying that some illegal
+# characters were found (three strange chars in the beginning of the file).
+# This could happen if you map the .js or .css files to PHP, for example.
+#
+# Those characters are the Byte Order Mask (BOM) of the Unicode encoded files.
+# All FCKeditor files are Unicode encoded.
+#
+
+AddType application/x-javascript .js
+AddType text/css .css
+
+#
+# If PHP is mapped to handle XML files, you could have some issues. The
+# following will disable it.
+#
+
+AddType text/xml .xml
diff --git a/web/imcms/ckeditor/CHANGES.html b/web/imcms/ckeditor/CHANGES.html
new file mode 100644
index 0000000000..2340c11edb
--- /dev/null
+++ b/web/imcms/ckeditor/CHANGES.html
@@ -0,0 +1,1591 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Changelog &mdash; CKEditor</title>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<style type="text/css">
+
+#footer hr
+{
+	margin: 10px 0 15px 0;
+	height: 1px;
+	border: solid 1px gray;
+	border-bottom: none;
+}
+
+#footer p
+{
+	margin: 0 10px 10px 10px;
+	float: left;
+}
+
+#footer #copy
+{
+	float: right;
+}
+
+	</style>
+</head>
+<body>
+	<h1>
+		CKEditor Changelog
+	</h1>
+	<h3>
+			CKEditor 3.6.6</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/9866">#9866</a> : [IE10] The full toolbar is displayed in two lines in RTL environment.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9483">#9483</a> : [IE10] Fixed script error on float panel opening.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6410">#6410</a> : SCAYT will show no suggestions when appropriate, instead of not appearing.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7533">#7533</a>, <a href="http://dev.ckeditor.com/ticket/9439">#9439</a> : Fixed SCAYT issues with setData().</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9167">#9167</a> : Improper HTML transformations happening on specific cases.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9553">#9553</a> : Properly handle dash values in the style field of dialogs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9787">#9787</a> : [IE9] onChange wasn't fired for checkboxes in dialogs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8888">#8888</a> : It was not possible to scroll dialogs on very small viewports.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9594">#9594</a> : The TAB key was having no effect on focused read-only editor.</li>
+	</ul>
+	<h3>
+			CKEditor 3.6.5</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/9195">#9195</a> : It is now possible to remove contextmenu.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/9132">#9132</a> : [IE8] Fixed js error when closing paste dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9101">#9101</a> : Tab key in smiley and special char dialog now moves focus to dialog buttons.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9209">#9209</a> : Fixed IE7 crash when switching list item type.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8995">#8995</a> : Fixed incorrect HTML escaping in bbcode plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6168">#6168</a> : Fixed style definition with styles defined as inline style attribute.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9097">#9097</a> : [IE] Fixed small selection flaw when select starts from the blank region outside body.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9129">#9129</a> : Fixed various Del/Backspace keystroke behaviors inside of HTML list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9117">#9117</a> : [FF] Fixed js error when calling setData() on a hidden editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9289">#9289</a> : Disallowed creating javascript links through the link dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9312">#9312</a> : Fixed table with multiple &lt;tbody&gt; output generated in wrong order.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8795">#8795</a> : Fixed table resize plugin not working when document overflows horizontally.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8888">#8888</a> : Fixed dialog dimension overflowing small view port.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9311">#9311</a> : Fixed vertical scroll being impossible when autogrow plugin is used during maximized editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/1961">#1961</a> : The "id" attribute will be appended to anchors alongside the "name" attribute.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9219">#9219</a> : The &lt;source&gt; element is now protected while parsing the contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9281">#9281</a> : [Safari] Fixed inline style breaking dialog advanced tab.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9281">#9281</a> : [IE8] Fixed not being able to remove border from the image dialog.</li>
+	</ul>
+	<h3>
+			CKEditor 3.6.4</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/8887">#8887</a> : Ugly hover effect for buttons in dialog windows due to slightly wrong background position.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8783">#8783</a> : <code>getAttribute( 'contenteditable' )</code> returns 'inherited' on IE7 and IE6 for elements created from code.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8463">#8463</a> : WebKit: <em>Cut/Copy</em> buttons didn't go on "enabled" state after selecting text in the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9043">#9043</a> : Command newpage didn't return its name when <code>afterCommandExec</code> event was fired.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9015">#9015</a> : Applied ARIA label on dialog file input element.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9016">#9016</a> : Applied the "presentation" role on the iframe element in dialog file field markup.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8949">#8949</a> : Image Properties does not show in context menu when the image is wrapped in a div with the width set.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9008">#9008</a> : Fixed list items order reversed when merging two lists.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9042">#9042</a> : [Safari] Fixed pasting left garbage html at the end of document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7745">#7745</a> : The list of frames on JAWS will not any more show the <em>"ALT+0 for help"</em> text for the editor entry.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8979">#8979</a> : Overriding matches will not any more interfere on the Font size combo.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5447">#5447</a> : Anchor names created by the Link dialog are now trimmed to protect against unwanted spaces.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8997">#8997</a> : Styles are lost on sub-lists when converting list type.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8971">#8971</a> : [IE7] Dialog size are stretched when long text field value is received.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8945">#8945</a> : Fake elements now show alternative text on High Contrast mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8985">#8985</a> : Better handling of <em>Enter</em> key events on dialogs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8925">#8925</a> : [Firefox] Unexpected page scroll on large floating block when editor is re-focused.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8978">#8978</a> : [IE] Saved editor text selection is lost after close menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9022">#9022</a> : [IE7] Fixed wrong selection introduced in empty editor document when click to the bottom-right of the document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9034">#9034</a> : [IE7] Fixed JavaScript error caused by drag-to-select at the bottom of the document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9057">#9057</a> : Unexpected block established when decreasing indent of a styled list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9063">#9063</a> : Styles on sub-list are lost when decreasing indent of the parent list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9047">#9047</a> : [Firefox] Anchors in the preview window will now work properly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8941">#8941</a> : [Webkit] Content region disappeared when resizing the browser.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8968">#8968</a> : [Firefox] The <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.forcePasteAsPlainText">forcePasteAsPlainText</a></code> configuration is not working when using <em>Ctrl/Cmd-V</em>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6217">#6217</a> : Handled <em>Del/Backspace</em> key at the boundary of table to unify the cursor position.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8950">#8950</a> : Changed the cursor position after calling <code>editor::insertElement</code> on block element.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9080">#9080</a> : Fixed <em>Backspace</em> key in front of the list item to join with previous line.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3592">#3592</a> : Removed the "title" field from flash dialog advanced tab.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9084">#9084</a> : [IE] Dragging absolute positioned elements is now enabled by default.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8879">#8879</a> : Corrected styling of labels used in dialog windows.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8921">#8921</a> : [Chrome] Paste on a newly created CKEditor instance does not work on Chrome.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9036">#9036</a> : Find feature cannot locate certain words while <em>Match Whole Word</em> is enabled.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/9069">#9069</a> : [Chrome] Issue with popups not opening properly on Chrome 20 makes it impossible to view the file browser window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5811">#5811</a> : Code for Image dialog is missing dialog dependency.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5810">#5810</a> : Code for Div Container is missing dialog dependency.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5809">#5809</a> : Dialog a11yhelp is missing dialog dependency.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4045">#4045</a> : "Field Name" Column in <code>sample_posteddata.php</code> is to narrow.</li>
+		<li>Updated the following language files as submitted to the <a href="https://www.transifex.net/projects/p/ckeditor/">CKEditor UI Translation Center</a>: Bulgarian, Chinese, Czech, Danish, Esperanto, Estonian, Greek, Italian, Norwegian, Portuguese, Romanian, Vietnamese.</li>
+	</ul>
+	<h3>
+			CKEditor 3.6.3</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/7430">#7430</a> : Justify commands now perform alignment on the element when an image is selected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8706">#8706</a> : Better ARIA accessibility for the color picker dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7366">#7366</a> : Editor paste function is now available on browser toolbar and context menu.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/8634">#8634</a> : [IE] Command execution always returns <code>true</code> in IE browsers.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8333">#8333</a> : Dialog windows can now be closed with the <em>Esc</em> key even if there is no Cancel button available.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8644">#8644</a> : Missing variable declaration in the dialog plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8699">#8699</a> : Focus is now moved to the clicked button and back to color picker dialog window opener (button) in all browsers after the dialog window is closed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8132">#8132</a> : [IE9] Link line gets broken when it contains a <code>br</code> tag.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8629">#8629</a> : Optimize float panel layout when there is not enough space in the viewport.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7955">#7955</a> : [FF] <em>Page Up</em> and <em>Page Down</em> in the WYSIWYG mode cause the selection to become lost.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8698">#8698</a> : <em>Esc</em> key does not close the color picker dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8413">#8413</a> : HTML comment nodes break content styling in tables.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7932">#7932</a>, <a href="http://dev.ckeditor.com/ticket/8643">#8643</a> : [IE] Clicking below the content region scrolls the page to the top.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5538">#5538</a>, <a href="http://dev.ckeditor.com/ticket/8729">#8729</a> : [IE] Focus jump results in incorrect context menu display.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6359">#6359</a> : [IE] Selectable area in blank WYSIWYG editor is too small.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7326">#7326</a>, <a href="http://dev.ckeditor.com/ticket/8074">#8074</a> : [FF] Scrolling does not work correctly in editor with large amount of text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8630">#8630</a> : HTML events are now disabled when loading data.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8433">#8433</a> : [IE9] Use W3C event model.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8691">#8691</a> : [IE] Pasting invalid HTML crashes the browser.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8345">#8345</a> : [IE] Selection is not properly restored after closing the Link dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6308">#6308</a> : Vertical-only resize imposes fixed width on editor chrome.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7360">#7360</a> : [WebKit] WYSIWYG area sometimes does not resize with the chrome.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5527">#5527</a> : Do not encode the <code>#</code> character sent from the file browser.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8014">#8014</a> : Autogrow now stretches to fit the content when switching editor modes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8249">#8249</a> : Inconsistent behavior with the <em>Backspace</em> key used at the start of a list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8617">#8617</a> : [WebKit] Selection becomes broken after an inline style is opened.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8527">#8527</a> : Insertion with cursor before an empty anchor is error-prone.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8632">#8632</a> : Cursor panic when the <em>Backspace</em> key is used in a list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8455">#8455</a> : Mousedown focus is too agressive.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8475">#8475</a> : Issue with deleting elements with inline styling in tables.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8324">#8324</a> : [IE8] Undo generates an error when a control type element is selected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7946">#7946</a> : Find and Replace dialog window result does not scroll into view when the editor is off the viewport.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8157">#8157</a> : Flash/IFrame dialog window cannot be closed when displayed over Flash/IFrame with <code>dialog_startupFocusTab</code> set to <code>true</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8305">#8305</a> : Text direction lost when converting a paragraph to a list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8379">#8379</a> : The cursor moves to the start of the document when inserting a row or column is undone.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6666">#6666</a> : Removed references to <code>element.all</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8732">#8732</a> : Issue when <code>CKEDITOR.range::enlarge</code> passes through comment nodes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7492">#7492</a> : The Style system can now use overrides with the same element (change classes instead of nesting).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6111">#6111</a> : Splitting table cells results in incorrect column spans.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8247">#8247</a> : [IE] Error when aligning a document with page breaks inside of contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8540">#8540</a> : Orphan texts inside a list or table are now properly fixed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8774">#8774</a> : The Entities plugin can now be configured to only output XML entities.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8602">#8602</a> : Image source is now properly hidden when running data through the data processor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8812">#8812</a> : [IE] Issues with the native range translation with comments in the DOM.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7907">#7907</a> : Decreasing indentation of a RTL block in a list item loses text direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8835">#8835</a> : Right margin on IE&lt;8 removed to avoid mouse click confusion.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8400">#8400</a> : [IE] Script error when closing the Cell Properties dialog window if the table cell text is selected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8248">#8248</a> : [IE8] Issues with <em>Backspace</em> and <em>Del</em> keys when used at the start or end of list items.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8855">#8855</a> : [Chrome] Issue with the popup window size in Chrome 18 makes it impossible to view the file browser window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8407">#8407</a> : Unneeded <code>aria-posinset</code> and <code>aria-setsize</code> for a list block are now removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8701">#8701</a> : Highlight field in the color picker does not show the correct color when keyboard navigation is used.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8509">#8509</a> : Table height gets copied from the width value when the Advanced tab is hidden.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8432">#8432</a> : [IE8] <code>openDialog('image')</code> error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8493">#8493</a> : [IE] It is impossible to add a link to the selected text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8528">#8528</a> : Redundant <code>imagePreviewBoxId</code> in the Image Properties dialog window is now removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8864">#8864</a> : [IE] Fix ARIA presentation of toolbar rich combo in JAWS.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8459">#8459</a> : Fix wrong undo step on enter key.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8895">#8895</a> : Editing anchors using the Link dialog window could not work in release version.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8876">#8876</a> : &lt;link&gt; element in the floating panels have been moved to &lt;head&gt;.</li>
+		<li>Updated the following language files as submitted to the <a href="https://www.transifex.net/projects/p/ckeditor/">CKEditor UI Translation Center</a>: Arabic, Bulgarian, Chinese, Croatian, Czech, Danish, Dutch, Esperanto, Estonian, Faroese, French, German, Greek, Gujarati, Hindi, Italian, Macedonian, Norwegian (Bokmål and Nynorsk), Polish, Portuguese, Turkish, Uighur, Ukrainian, Vietnamese, Welsh.</li>
+	</ul>
+	<h3>
+			CKEditor 3.6.2</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/6089">#6089</a> : The editor is now enabled on iOS 5 (iPad and iPhone).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6089">#7354</a> : It is now possible to exit from blockquotes by using the <em>Enter</em> key on empty paragraphs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7931">#7931</a> : The <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#event:mode">mode</a></code> event now carries the previous editor mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6161">#6161</a> : New <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.autoGrow_onStartup">autoGrow_onStartup</a></code> configuration option.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8052">#8052</a> : <code>autogrow</code> is now available as an editor <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#execCommand">command</a>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3457">#3457</a> : It is now possible to edit the contents of <code>&lt;textarea&gt;</code> elements through the dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8242">#8242</a> : The "&raquo;" character is now added to the Special Character dialog window.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/8171">#8171</a>, <a href="http://dev.ckeditor.com/ticket/8172">#8172</a> : Updated links to WebSpellChecker.net.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8155">#8155</a> : Tooltips in the Special Character dialog window corrected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8163">#8163</a> : The name of the <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.filebrowserWindowFeatures">filebrowserWindowFeatures</a></code> configuration setting corrected to match the documented name.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8124">#8124</a> : The Style fields in Advanced dialog window tabs are now validated according to CSS style attribute syntax.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8025">#8025</a> : The checkboxes in the Find and Replace dialog window are now part of a fieldset.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7943">#7943</a> : CSS conflict no longer appears when the page styles set the <code>float</code> property of <code>label</code> elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8016">#8016</a> : [WebKit] Flash content is not visible when previewing content.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6908">#6908</a> : Text color should always be applied to the linked text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7619">#7619</a> : [IE] IFrame shim now consolidates the editor dialog window to avoid having it masked by embedded objects.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7900">#7900</a> : [FF] Copy/Paste operations for table cells no longer break the Table Properties dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7243">#7243</a> : Inline JavaScript events may become corrupted.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7448">#7448</a> : List creation in RTL blocks is wrongly merged with the above LTR block.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6957">#6957</a> : Highlighting of searched terms does not reach read-only blocks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7948">#7948</a> : Tooltips with information about correct length units are now displayed for the Width/Height fields of the Table Properties dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6212">#6212</a> : [WebKit] Editor resize may scroll the host page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6540">#6540</a> : [Safari] Editor loses focus on resizing.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7908">#7908</a> : [IE] Unlink command is sometimes missing from the context menu of a link.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8159">#8159</a> : Editor fails to load if the browser has no default language set.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7490">#7490</a> : [IE] Block format leaks to the next unselected line when <code>enterMode</code> is set to <code>BR</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8087">#8087</a> : Indenting list items may add redundant text direction attributes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6200">#6200</a> : Add styling for certain dialog window element types that miss focus outline (like checkbox).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7894">#7894</a> : Fault tolerance when parsing a malformed link.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8049">#8049</a> : Bullets/Numbers are invisible for list items with LTR text direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8222">#8222</a> : [IE] Incorrect selection locking after opening a dialog window in some cases.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7002">#7002</a> : [IE] Undo operation when a table is selected results in an error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8232">#8232</a> : [IE] Unable to apply inline style that starts at the end of a link text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7153">#7153</a> : Fail to load the source version of the editor after the window is loaded.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8246">#8246</a> : Bad editing performance on certain document contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7912">#7912</a> : Cursor trapped in an invisible element after pressing the <em>Enter</em> key.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7645">#7645</a> : Full list or table deletion with the <em>Backspace/Delete</em> key.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8050">#8050</a> : AutoGrow feature better fits the content styles.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8349">#8349</a> : [IE9] Larger toolbar top offset on HTML5 pages.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8352">#8352</a> : [IE9] Toolbar wrapping is incorrect.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8080">#8080</a> : JavaScript error when inserting a new table row.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/8263">#8263</a> : Dutch;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8238">#8238</a> : Estonian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8193">#8193</a> : Finnish;</li>
+			<li>German;</li>
+			<li>Hebrew;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8179">#8179</a> : Hungarian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8128">#8128</a> : Italian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8371">#8371</a> : Lithuanian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8126">#8126</a>, <a href="http://dev.ckeditor.com/ticket/8256">#8256</a> : Norwegian (Bokmal and Nynorsk);</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8356">#8356</a> : Persian;</li>
+			<li>Polish;</li>
+			<li>Portuguese (Brazil);</li>
+			<li><a href="http://dev.ckeditor.com/ticket/8151">#8151</a>, <a href="http://dev.ckeditor.com/ticket/8298">#8298</a> : Russian;</li>
+			<li>Spanish;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.6.1</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4556">#4556</a> : Initial support for HTML5 elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6492">#6492</a> : The Find/Replace dialog window will now be populated with text selected in the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7323">#7323</a> : New <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.definition.uiElement.html#align">align</a></code> property in dialog window UI elements for field alignment.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6462">#6462</a> : A wider range of CSS length units (like pt and percentage) are now supported in related dialog window fields.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7911">#7911</a> : New Remove Anchor option is now available in the context menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7387">#7387</a> : Allow <code>styleDefinition</code> to be applied to a set of elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4345">#4345</a> : A new <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#event:langLoaded">langLoaded</a></code> event added to <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html">CKEDITOR.editor</a></code> in order to make it possible to perform "by code" language updates.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7959">#7959</a> : The cursor will now blink in the first cell after a table is inserted.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7885">#7885</a> : New <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#removeMenuItem">editor::removeMenuItem</a></code> API for removing plugin context menu items introduced.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7991">#7991</a> : Introduce the <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.definition.labeledElement.html#controlStyle">controlStyle</a></code> and <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.definition.labeledElement.html#inputStyle">inputStyle</a></code> definitions to allow fine-grained controlling of dialog window element styles.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/7914">#7914</a> : <strong>ATTENTION!</strong> The signature for the <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#setReadOnly">setReadOnly()</a></code> function has been changed, reversing the meaning of the parameter to be passed to it. Please make sure to update your code when upgrading.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7657">#7657</a> : Wrong margin mirroring when creating a list from RTL paragraphs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7620">#7620</a> : A glitch in list pasting from Microsoft Word caused by broken child references when filtering.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7811">#7811</a> : [IE] Deleting table row throws a JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6962">#6962</a> : Changed the <code>CKEDITOR.CTRL</code>, <code>CKEDITOR.SHIFT</code> and <code>CKEDITOR.ALT</code> constant values to avoid collision with any possible Unicode character.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6263">#6263</a> : Some table cell context menu options may be incorrectly disabled.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6247">#6247</a> : Focus is not restored properly after a drop-down menu is closed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7334">#7334</a> : [IE7] Indentation style does not apply to RTL lists.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6845">#6845</a> : Spaces inside the URL field in the Link dialog window will now be removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7840">#7840</a> : [IE] Opening the Table Properties dialog window via the context menu causes a JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7733">#7733</a> : Flash movies inserted with the Flash Properties dialog window are not displaying properly when injected into the page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7837">#7837</a> : [IE&lt;8] Inserting a page break results in an error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7804">#7804</a> : The HTML5 <a href="http://www.w3.org/TR/html-markup/wbr.html"><code>wbr</code></a> tag is now recognized by the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7867">#7867</a> : The file browser for the background image in the Document Properties plugin dialog window does not work.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7130">#7130</a> : The column resizer gripping area is invading adjacent table cells.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7844">#7844</a> : [FF] Calling <code>setData()</code> on a hidden editor caused editor not to display.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7860">#7860</a> : The BBCode plugin was stripping BBCode tags that were not implemented in the plugin, but from now on they will be handled as simple text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7321">#7321</a> : [IE6] Contents inside the RTL fields in dialog windows are overflowing.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7323">#7323</a> : [IE Quirks] Some fields are not centered in the dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5955">#5955</a> : Editor accessibility issue with JAWS when a drop-down menu is placed as the first item in the toolbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6671">#6671</a> : [FF] Selection of an item from the Styles drop-down list is not refreshed after the style is removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7879">#7879</a> : The Style and Height/Width fields of the Table Properties dialog window are not synchronized.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7581">#7581</a> : [IE] The <em>Enter</em> key pressed at the end of a list item containing the <code>start</code> attribute crashes the browser.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7266">#7266</a> : Dialog window fields that did not pass validation are now ARIA-compatible with <code>aria-invalid</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7742">#7742</a> : [WebKit] Indentation, alignment, and language direction are not applied on an empty document without the editor being in focus.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7801">#7801</a> : [Opera] Pasted paragraphs now split partially selected blocks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6663">#6663</a> : Table caption that contains rich text is corrupted after an edit done with the Table Properties dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7893">#7893</a> : [WebKit, Opera, IE&lt;8] It is impossible to link to anchors in the document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7637">#7637</a> : Cursor position might in some cases cause problems after inserting a page break.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5314">#5314</a> : The <code>aria-selected</code> attribute is not removed when toolbar drop-down menu items are deselected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7749">#7749</a> : Small check introduced to avoid issues with custom data processors and the <code>insertHtml</code> function.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7269">#7269</a> : [WebKit] Paste from Word is including the full <code>file://</code> URL path for anchor links.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7584">#7584</a> : Start number of the List dialog window now works with numbered list items.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6975">#6975</a> : [IE6, IE7] A definition list crashes Internet Explorer on HTML output.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7841">#7841</a> : Deleting a column with a cell deleted in one of the rows does not work.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7944">#7944</a> : The <em>Enter</em> key should not split or create new paragraphs inside caption elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7639">#7639</a> : [IE9] Browser might crash when an object is selected in the document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7847">#7847</a> : [IE8] Inserting an image with non-secure source in a HTTPS page breaks the dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7953">#7953</a> : [IE] Text selection lost after the browser context menu is opened.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5239">#5239</a> : Inconsistent focus behavior after closing a toolbar drop-down menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6470">#6470</a> : The Start attribute of a Numbered List is rendered incorrectly if the field is left empty.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7324">#7324</a> : [IE6 Quirks] Context menus are not displayed correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7566">#7566</a> : BiDi: Increasing indentation of a list item changes the language direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7839">#7839</a> : [IE] Pasting multi-level numbered lists from Microsoft Word does not work properly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/188">#188</a> : [IE] Object selection was making the toolbar inactive in some situations.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7869">#7869</a>, <a href="http://dev.ckeditor.com/ticket/7869">#7999</a> : Welsh;</li>
+			<li>Polish;</li>
+			<li>Hebrew;</li>
+			<li>German</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.6</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/7044">#7044</a> : New BBCode sample plugin that makes the editor output (one dialect of) BBCode format.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5647">#5647</a> : Accessibility enhancements to the structure of the toolbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5647">#5647</a> : The Kama skin now presents separators for the toolbar items, making it easier to group buttons and have a cleaner layout.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5647">#5647</a> : Usability enhancements to keyboard navigation on the toolbar. The <em>Tab</em> key is now used to jump between toolbar groups, while the <em>Arrow</em> keys can be used to cycle within the group. The new <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.toolbarGroupCycling">toolbarGroupCycling</a></code> setting can be used to change the <em>Arrow</em> keys behavior.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/1376">#1376</a> : It is now possible to put the editor in the "read-only" state, so that the users would not be able to introduce changes to the contents. Check out the new <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#setReadOnly">CKEDITOR.editor::setReadOnly</a></code> method, the <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#readOnly">CKEDITOR.editor::readOnly</a></code> property, the <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#event:readOnly">CKEDITOR.editor::readOnly</a></code> event, and the <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.readOnly">readOnly</a></code> setting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3582">#3582</a> : New presentation of anchor elements in the WYSIWYG mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6737">#6737</a> : The Format drop-down list will now display the preview of its contents exactly as defined in their style configurations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6654">#6654</a> : A new <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.autoParagraph">autoParagraph</a></code> configuration setting is added to disable the auto paragraphing feature.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/901">#901</a> : New Stylesheet Parser (<code>stylesheetparser</code>) plugin that fills the Styles drop-down list based on the CSS classes available for the content. Check the new sample to learn how to use it.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/2988">#2988</a> : New Document Properties (<code>docprops</code>) plugin that sets the metadata of the page in the Full Page mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7240">#7240</a> : New Developer Tools (<code>devtools</code>) plugin that shows information about dialog window UI elements to allow for easier customization.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6841">#6841</a> : Pressing the <em>Enter</em> key at the end of a pre-formatted block will now exit from it.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6850">#6850</a> : The About CKEditor dialog window now contains a link to CKEditor User's Guide.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5745">#5745</a> : Extra configuration options for the <code>iframeDialog</code> can now be passed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6589">#6589</a> : The <code>onDialogEvent</code> function will now be used automatically in the <code>iframeDialog</code> contents if no callback is used on creation.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7757">#7757</a> : Georgian localization added.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/6774">#6774</a> : Internal styles are not included in the <code>contents.css</code> sample.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6521">#6521</a> : Added sample for the TableResize plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6664">#6664</a> : Page break is sometimes merged into block-level elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7594">#7594</a> : Toolbar keyboard navigation is not possible after recreating the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6657">#6657</a> : Allow to style the entire dialog window field when the input element is disabled.</li>
+		<li>Updated the following language files:<ul>
+			<li>Hebrew;</li>
+			<li>Polish;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.5.4</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li>Added protection against XSS attacks in PHP samples when displaying element names.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7347">#7347</a> : The <em>Enter</em> key will no longer be caught by the dialog window covering the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6718">#6718</a> : Paste from Word command overrides the Force Paste as Plain Text configuration.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6629">#6629</a> : Padding body is no longer needed when the last block is pre-formatted.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4844">#4844</a> : [IE] Dialog windows fail to load if there are too many editor instances on the page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5788">#5788</a> : HTML parser trims empty spaces following <code>&lt;br&gt;</code> elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7513">#7513</a> : Invalid markup could cause the editor to hang.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6109">#6109</a> : Paste and Paste as Plain Text dialog windows now use the standard <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.html#commitContent">commitContent</a></code> and <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.html#setupContent">setupContent</a></code> methods.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7588">#7588</a> : The editor code now has a protection system to avoid issues when including <code>ckeditor.js</code> more than once in the page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7322">#7322</a> : Text font plugin now recognizes font family names that contain quotes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7540">#7540</a> : Paste from Word introduces wrong spaces.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7697">#7697</a> : Successive calls of the <code>replace()</code> method did not work after SCAYT context menu initialization.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/7647">#7647</a> : Slovak;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.5.3</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4890">#4890</a> : Added the possibility to edit the <code>rel</code> attribute for links.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7004">#7004</a> : Allow loading plugin translations even if they are not present in the plugin definition.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7315">#7315</a> : Firing the <code>resize</code> event on dialog window instances is now possible.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7259">#7259</a> : Dialog window definition allows to specify initial <code>width</code> and <code>height</code> values.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7131">#7131</a> : List item numbering is now supported on pasting from Microsoft Word.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/1272">#1272</a> : [WebKit] It is now possible to apply styles to collapsed selections in Safari and Chrome.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7054">#7054</a> : The tooltips for special characters are now lowercased, making them more readable.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7102">#7102</a> : "Replace DIV" sample did not work when double-clicking inside the formatted text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7088">#7088</a> : Loading of plugins failed on new instances of the editor after the Insert Special Character dialog window was used.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6215">#6215</a> : Removal of inline styles now also removes overrides.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6144">#6144</a> : Rich text drop-down lists have wrong height when toolbar is wrapped.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6387">#6387</a> : AutoGrow may cause an error when editor instance is destroyed too quickly after a height change.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6901">#6901</a> : Mixed direction content was not properly respected in a shared toolbar setting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4809">#4809</a> : Table-related tags are output in wrong order.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7092">#7092</a> : Corrupted toolbar button state for inline style after switching to Source.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6921">#6921</a> : Pasted text marked by SCAYT in one language is not re-checked if another spellchecking language is selected in the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6614">#6614</a> : Enhancement of the resize handle in RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5924">#5924</a> : Flash plugin now recognizes Flash content without an <code>embed</code> tag.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4475">#4475</a> : Protected source in attributes and inline CSS text is not handled correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6984">#6984</a> : [FF] Trailing line breaks are lost in <code>ENTER_BR</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6987">#6987</a> : [IE] Text selection lost when calling <code>editor::insertHtml</code> from a dialog window in some situations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6865">#6865</a> : BiDi mirroring does not work when a text direction change is done through a dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6966">#6966</a> : [IE] Unintended paragraph is created in an empty document in <code>enterMode</code> set for <code>BR</code> and <code>DIV</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7084">#7084</a> : SCAYT dialog window is now working properly with more than one editor instance in a page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6662">#6662</a> : [FF] List structure pasting error caused by a regression from FF3.5.x is now fixed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7300">#7300</a> : Link dialog window now loads numeric values correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7330">#7330</a> : New list items no longer inherit the <code>value</code> attribute from their sibling.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7293">#7293</a> : The "Automatic" color button is now presented correctly without focus inside the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7018">#7018</a> : [IE] Toolbar drop-down lists did not have a border around them.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7073">#7073</a> : Image dialog window no longer allows zero height and width value to be entered.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7316">#7316</a> : [FF] Clicking on "Paste" button incorrectly breaks the line at the cursor position.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6751">#6751</a> : Inline whitespaces are incorrectly stripped when pasting from Word.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6236">#6236</a> : [IE] Fixing malformed nested list structure which was introduced by the <em>Backspace</em> key.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6649">#6649</a> : [IE] Selection of the full table sometimes does not work.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6946">#6946</a> : HTML parser is now able to fix orphan list items.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6861">#6861</a> : Indenting a list item should retain the text direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6938">#6938</a> : Outdenting a list item should retain the text direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6849">#6849</a> : Correct <em>Enter</em> key behavior on list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7113">#7113</a> : [WebKit] Undesired document scroll on click after scrolling.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6491">#6491</a> : Undesired Image dialog window dimension lock reset on URL change.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7284">#7284</a> : [FF Quirks] Maximize now works correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6609">#6609</a> : [IE9] Browser in high contrast mode is not properly detected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7222">#7222</a> : [WebKit] Impossible to apply a single style to a collapsed selection without giving the editor focus.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7180">#7180</a> : [IE9] When using Kama skin and RTL layout dialog window buttons were not being displayed correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7182">#7182</a> : [IE9] When using Office2003/v2 skin and RTL layout dialog window shadows were corrupted.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6913">#6913</a> : Invalid escape sequence (<code>\b</code>) was used in the PHP integration.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5757">#5757</a> : [IE6] Text was not wrapping in the accessibility instructions dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/changeset/6604">[6604]</a> : <code>Xml.js</code> and <code>Ajax.js</code> are now available as plugins ('xml' and 'ajax').</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7304">#7304</a> : Microsoft Word cleanup function is not always invoked when clicking on the "Paste From Word" button.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6658">#6658</a> : [IE] Pasting text from Microsoft Word with one or more tabs between list items was failing.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7433">#7433</a> : [IE9] <code>ENTER_BR</code> at the end of a block breaks due to an IE9 regression.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7432">#7432</a> : [WebKit] Unable to create a new list in an empty document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4880">#4880</a> : CKEditor changes tag style inside HTML comment with <code>cke_protected</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7023">#7023</a> : [IE] JavaScript error when a Selection Field is inserted into a page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7034">#7034</a> : Inserting special characters into styled text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7132">#7132</a> : Paste toolbar buttons are becoming disabled.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7138">#7138</a> : The <code>api.html</code> sample in Opera does not work as expected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7160">#7160</a> : Cannot paste the form element on top of the page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7171">#7171</a> : Double-clicking an image in non-editable content opens the editing dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7455">#7455</a> : Extra line break is added automatically to the preformatted element.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7467">#7467</a> : [Firefox] Extra <code>br</code> element is added in a nested list.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/7124">#7124</a> : Czech;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7126">#7126</a> : French;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7140">#7140</a> : Catalan;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7215">#7215</a> : Faroese;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7177">#7177</a> : Finnish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7163">#7163</a> : Norwegian (no and nb);</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7219">#7219</a> : Swedish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7183">#7183</a> : Afrikaans;</li>
+			<li>Hebrew;</li>
+			<li>Spanish;</li>
+			<li>Polish;</li>
+			<li>German;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.5.2</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/7168">#7168</a> : [IE9] Destroying an editor instance throws an error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7169">#7169</a> : [IE9] Menu item has incorrect height.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7178">#7178</a> : [IE9] Read-only attributes do not work in IE9.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7181">#7181</a> : [IE9] Toolbar items are not aligned in v2 and Office2003 skins.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7174">#7174</a> : [IE9] Elements path does not load correctly when the editor is switched back from Source to WYSIWYG.</li>
+	</ul>
+	<h3>
+			CKEditor 3.5.1</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/6107">#6107</a> : It is now possible to remove block styles using Styles and Paragraph Format drop-down lists.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5590">#5590</a> : Remove Format command works in collapsed selections.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5755">#5755</a> : The <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.dialog_buttonsOrder">dialog_buttonsOrder</a></code> option now works in Internet Explorer.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6869">#6869</a> : The <code>data-cke-nostyle</code> attribute (which was introduced for escaping the element from been influenced by the style system since 3.5) is deprecated in favor of the new <code>data-nostyle</code> attribute.</li>
+		<li>Revised sample pages with code examples and clarifications.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5855">#5855</a> : Updating a link multiple times generates wrong <code>href</code> attribute.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6166">#6166</a> : Error on Maximize command, when the toolbar button is not shown.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6607">#6607</a> : Table cell "merge down" and "merge right" commands work only once.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6228">#6228</a> : Merge down does not work, throwing a JavasSript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6625">#6625</a> : BIDI: Mixed LTR/RTL direction causes incorrect behavior.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6881">#6881</a> : IFrame capitalization is now consistent throughout labels.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6686">#6686</a> : BIDI: [FF] When we apply explicit language direction to a numbered/bulleted list, the corresponding language direction toolbar icon is not highlighted.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6566">#6566</a> : It is now possible to exit a blockquote using <code>ENTER_BR</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6868">#6868</a> : Partial (invalid) list structure crashes the editor on load.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6804">#6804</a> : Buggy behavior when editing the <code>legend</code> element inside a <code>fieldset</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6724">#6724</a> : [IE7] Nested list display bug on empty list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6715">#6715</a> : List items do not create paragraphs after the list placed in a table cell is removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6695">#6695</a> : [Webkit] Display bug after the editor is restored from the full screen mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6661">#6661</a> : [IE] Pre-formatted style does not preserve applied text direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6655">#6655</a> : Using the editor resize grip causes small visual offsets.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6604">#6604</a> : The <code>div</code> element should be used as a formatting block in <code>ENTER_BR</code>.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6249">#6249</a> : BIDI: List item bullets are off viewport with RTL text direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6610">#6610</a> : BIDI: <code>ENTER_BR</code> change direction in one line out of multiple.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6872">#6872</a> : [IE] Link target field is not populated properly when no target is set.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6880">#6880</a> : Samples: Added a user-friendly message for users on servers without PHP support.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6628">#6628</a> : Setting <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enterMode">config.enterMode</a></code> from PHP fails.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6278">#6278</a> : Comments were moved above the <code>br</code> tags.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6687">#6687</a> : Empty tag should be removed in inline-style format.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6645">#6645</a> : Allow to configure whether &quot; (double quotes) characters should be encoded in the contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6336">#6336</a> : IE: (double)clicking an <code>input type="submit"</code> button submitted the form.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6646">#6646</a> : Context menu was not working for text inputs present in the initial content.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6641">#6641</a> : Copying and pasting links inside the editor was not working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4208">#4208</a> : The <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.disableObjectResizing">disableObjectResizing</a></code> setting now works in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6242">#6242</a> : [IE] Editing existing links with <code>href</code> of a relative path mangles containing text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5930">#5930</a> : [IE] Style definitions are no longer lowercased.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5361">#5361</a> : Preview window's title should reflect the title tag in full page mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5522">#5522</a> : [IE] In versions &lt; 8 or compatibility mode, <code>type="text"</code> was missing in text fields.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6126">#6126</a> : [IE] Avoid problems if there are two buttons named "submit".</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6791">#6791</a> : [IE7] Editor did not show up when the name of a replaced textarea matched the name of a <code>meta</code> tag in the page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5684">#5684</a> : [FF] When <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.forcePasteAsPlainText">forcePasteAsPlainText</a></code> is used, the cursor disappears after paste.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6390">#6390</a> : Prevent toolbar dialog window buttons from being clicked twice.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6684">#6684</a> : [Webkit] Toolbar buttons are not wrapping correctly when the editor is displayed inside a table.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6703">#6703</a> : [IE] editor <code>focus</code> event not fired in an instance, when a dialog window closes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6873">#6873</a> : Difficult to drag the resize grip of the spell checker dialog window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6896">#6896</a> : [Webkit] Unable to paste into source area when the editor is maximized.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6020">#6020</a> : The state of the Cut, Copy, and Paste toolbar now matches the state of the context menu buttons.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5256">#5256</a> : JavaScript error thrown when percent (%) sign is used in image URL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6577">#6577</a> : [FF] Selection error when an element containing the editor instance is hidden.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5500">#5500</a> : [IE] <code>value</code> attribute of text input dialog window field was missing.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6665">#6665</a> : [IE] <code>name</code> field of Link dialog window was missing.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6639">#6639</a> : Line-breaks inside pasted list item from Microsoft Word break the list structure.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6909">#6909</a> : [IE] GIF icons of toolbar button from custom plugins are not diplayed in zoom level 100%.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6860">#6860</a> : [FF] Double-clicking the placeholder element in order to open a Placeholder dialog window throws a JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6630">#6630</a> : Empty <code>pre</code> elements are output differently in various browsers.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6568">#6568</a> : Insert table row/column does not work with spanning.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6735">#6735</a> : Inaccurate read-only selection detection.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6728">#6728</a> : BIDI: Change direction does not work with list nested inside a blockquote.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6432">#6432</a> : Inserting a table in place of a fully selected list results in a JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6438">#6438</a> : [IE] Performance enhancement when typing inside an element with many child nodes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6970">#6970</a> : [IE] Dialog window shadows were presented inaccurately.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6672">#6672</a> : [IE] Unnecessary <code>br</code> element is no longer inserted after a form.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7087">#7087</a> : [FF] Sometimes it was not possible to move cursor out of link at the end of block.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/6981">#6981</a> : English (GB);</li>
+			<li><a href="http://dev.ckeditor.com/ticket/6991">#6991</a> : Finnish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/6357">#6357</a> : French;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7055">#7055</a> : Polish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/7068">#7068</a> : German;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.5</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4090">#4090</a> : Full Adobe AIR support.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5084">#5084</a> : Dialog windows are now resizable with a grip located in the footer.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5755">#5755</a> : Introduced the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.dialog_buttonsOrder">dialog_buttonsOrder</a> setting, making it possible to control the buttons order.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4648">#4648</a> : Added the new iFrame plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6010">#6010</a> : The Automatic option of the font/background color panel now represents the real color.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5654">#5654</a> : New "placeholder" plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6334">#6334</a> : CKEditor now uses <a href="http://www.w3.org/TR/2010/WD-html5-20101019/elements.html#embedding-custom-non-visible-data-with-the-data-attributes">HTML5's data-* attributes</a> for its internal attributes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6103">#6103</a> : It's now possible to control the styling of inline read-only elements with the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.disableReadonlyStyling">disableReadonlyStyling</a> setting. It's also possible to avoid inline-styling any element by setting its "data-cke-nostyle" attribute to "1".</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5404">#5404</a> : <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.fillEmptyBlocks">fillEmptyBlocks</a> configuration option of v2 is now available.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5367">#5367</a> : New <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#insertText">CKEDITOR.editor#insertText</a> method (check api.html sample page for usages) is now provided to insert plain text into editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5367">#5915</a> : New <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.removeDialogTabs">removeDialogTabs</a> configuration option to hide certain dialog tabs.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4821">#4821</a> : Icons in the toolbar were distorted with IE and zoom != 100%.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5587">#5587</a> : Visual improvements in dialogs, reinforce field label on separate line.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4652">#4652</a> : Now it's able to disable editor context menu by simply removing the "contextmenu" plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5599">#5599</a> : Labels of "specialchar" dialog are now translated.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6419">#6419</a> : [IE] List creation by merging problem.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6502">#6502</a> : Removed IE6 image preloading, which was used to defect the duplicate request of background images.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6822">#6822</a> : Added labels to fake objects.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6898">#6898</a> : [IE6] Toolbar icons becomes invisible in RTL.</li>
+		<li>Updated the following language files:<ul>
+			<li>Hebrew</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.4.3</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/6554">#6554</a> : [Webkit] cannot type after inserting Page Break.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6569">#6569</a> : Indentation now complies with text direction of the only item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6579">#6579</a> : The jQuery adapter was not working properly and was turned on in incompatible environments.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6644">#6644</a> : Restrict <code>onmousedown</code> handler to the toolbar area.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6656">#6656</a> : Panelbutton's buttons became active when clicking on Source.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6248">#6248</a> : Whitespaces (<code>nbsp</code> elements) were incorrectly added into empty table cells and list items.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6575">#6575</a> : Tabs disappearing in Link dialog window after a specific sequence of actions.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6510">#6510</a> : Margin mirroring does not respect style configuration.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6471">#6471</a> : BIDI: Pressing Decrease Indent in an RTL bulleted list causes incorrect behaviour.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6479">#6479</a> : BIDI: Language direction is not being preserved when pressing Enter after a Paragraph Format was applied.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6670">#6670</a> : BIDI: Indent &amp; List icons are not reversed when we apply RTL direction to a paragraph with any of Paragraph Formatting options.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6640">#6640</a> : Floating panels are now being closed when switching modes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4790">#4790</a> : Remove list with multiple items in <code>enterBr</code> doesnot preserve line breaks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6297">#6297</a> : Floated inline elements are not taking part in behavior of blocks anymore.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6171">#6171</a> : [Firefox] Opening rich content drop-down list scrolls host page to the top when editor has a vertical scrollbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6330">#6330</a> : List markers from MS Word with Roman numbering are not preserved.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6720">#6720</a> : Attribute protection might detect wrong elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6580">#6580</a> : [IE9] Flash dialog window does not get filled up.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6447">#6447</a> : Decreasing indentation of a list with <code>indentClasses</code> config does not work.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5894">#5894</a> : Adding custom buttons at the bottom of a dialog window does not cause it to expand to include its contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6513">#6513</a> : Wrong ARIA attributes created on list options of Styles drop-down list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6150">#6150</a> : [Safari] Color dialog window was broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6747">#6747</a> : Full screen layout issue caused by page element focus outside editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6779">#6779</a> : Clicking the <code>body</code> element on elements path turns the selection on and off immediately.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6781">#6781</a> : [IE7] Dialog windows are broken with RTL, Office 2003 and v2 skins.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6798">#6798</a> : [IE7] Dialog window buttons disappearing in RTL after dragging.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6806">#6806</a> : [IE7] Dialog window buttons invisible on focus.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6588">#6588</a> : Copy and paste adds <code>&lt;span&gt;</code> if SCAYT is enabled.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6673">#6673</a> : IE Target combo for Image Link shown as blank even when we select <code>&lt;not set&gt;</code> as an option.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/6756">#6756</a> : Hungarian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/6794">#6794</a> : Japanese;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.4.2</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5024">#5024</a> : Added a sample that shows how to output HTML that is valid for Flash.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5237">#5237</a> : English text in dialogs' title was flipped when using RTL language (office2003 and v2 skins).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6289">#6289</a> : Deleting nested table removed the parent cell.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6341">#6341</a> : The editor contents now have the text cursor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6153">#6153</a> : Chrome: tab focus is wrong.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6261">#6261</a> : Focus and infinite loop between multiple editors.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6170">#6170</a> : Dedicated class names are removed from floating panels when opening another panel.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6339">#6339</a> : Autogrow plugin now doesn't work on maximized editors.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6237">#6237</a> : BIDI: Applying same language direction to all paragraphs not working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6353">#6353</a> : [IE] Resize was broken with office2003 and v2 skins.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6375">#6375</a> : Avoiding errors when hiding the editor after the blur event.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6133">#6133</a> : Styled paragraphs result on buggy list creation.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5074">#5074</a> : Link target is not removed when changing to popup.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6408">#6408</a> : [IE] Autogrow now works correctly on Quirks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6420">#6420</a> : [IE] The table properties dialog now correctly retrieves the caption text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6141">#6141</a> : It was impossible to outdent a list when indentOffset was set to 0.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6377">#6377</a> : FF width and height are not shown for smiley in Image properties dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5399">#5399</a> : Lists pasted from Word do not maintain their nesting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6225">#6225</a> : [FF] Cannot transform several lines to list with enterMode BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6467">#6467</a> : [FF] It is now possible to disable the plugin command on "mode" event.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6461">#6461</a> : Attributes are now being kept when changing block formatting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6226">#6226</a> : BIDI: Language direction applied to a Paragraph is removed when we apply one of Paragraph formatting options.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5395">#5395</a> : [Opera] Native context menu incorrectly opened after Opera 10.2.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6444">#6444</a> : [Opera] Close panels and dialogs don't return focus to wysiwyg frame.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6332">#6332</a> : IE: V2 skin bottom dialog's border broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5646">#5646</a> : Parser incorrectly removes inline element when there's only one comment node enclosed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6189">#6189</a> : Minor code size reduction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5045">#5045</a> : uiColor behaved wrong if multiple editors were used with period in their names.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5766">#5766</a> : Config entry "ignoreEmptyParagraph" should only remove one single empty paragraph in document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5931">#5931</a> : Unable to apply inline style because of nested elements with same style name.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6083">#6083</a> : Dialog close sometimes cause collapsed editor selection before the insertion.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6253">#6253</a> : BIDI: creating a Numbered/Bulleted list causing improper behavior on bidi.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4023">#4023</a> : [Opera] Maximize plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6403">#6403</a> : [Opera] Font name options are not correctly marked in dropdown list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4534">#4534</a> : [Opera] Arrow key to navigate through combo list has side effects of window scrolling.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6534">#6534</a> : [Opera] Menu key brings up both CKEditor and browser context menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6534">#6534</a> : [Opera] Menu key brings up both CKEditor and browser context menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6416">#6416</a> : [IE9] Unable to make text selection with mouse in source area.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6417">#6417</a> : [IE9] Context menu opens at the upper-left corner always.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6501">#6501</a> : [IE9] Context menu item layout is broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6099">#6099</a> : BIDI: when we apply explicit language direction to Numbered/Bulleted List the corresponding BIDI Tool bar icon is not highlighted in the Toolbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6100">#6100</a> : BIDI: when we change Table language direction indentation of text in Table cells is not applied correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6376">#6376</a> : BIDI: buttons should not toggle the base language direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6235">#6235</a> : BIDI: Applying direction to multi-paragraph selection within a div.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6187">#6187</a> : [IE6] Multi-instance loading produces 404s on background images.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5446">#5446</a> : Setting config.filebrowserImageBrowseUrl results in displaying also Browser Server on links.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5626">#5626</a> : CKeditor 3.2.1 : html content attached makes ckeditor crash the browser FF/IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6508">#6508</a> : BiDi: Margin mirroring logic doesn't honor CSS direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6043">#6043</a> : BIDI: When we apply RTL direction to a right aligned Paragraph, Paragraph is not moved to the left &amp; Alignment of Paragraph is not changed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6485">#6485</a> : BIDI: When direction is applied on partial selected list, the style is been incorrectly applied to the entire list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6087">#6087</a> : Cursor of input fields in dialog isn't visible in RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5595">#5595</a> : Extra leading spaces added in preformatted block.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6094">#6094</a> : Match full word option doesn't stop on block boundaries.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5730">#5730</a> : [Safari] Continual pastes (holding paste key) breaks document contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5850">#5850</a> : [IE] Inline style misbehaviors at the beginning of numbered/bulleted list.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/6427">#6427</a> : Ukrainian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/6464">#6464</a> : Finnish;</li>
+			<li>Hebrew;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.4.1</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5308">#5308</a> : Introduced the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.filebrowserWindowFeatures">filebrowserWindowFeatures</a> setting, making it possible to have custom window features in the file browser window.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/6027">#6027</a> : Modifying Table Properties by selecting more than one cell caused issues.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6146">#6146</a> : IE: Floating panels were being opened in the wrong place in RTL pages with horizontal scrollbars.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6055">#6055</a> : The timestamp is now added only once to each loaded file.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6097">#6097</a> : The bookmarks now use the right name.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5717">#5717</a> : Removed the scayt_contextMenuOntop setting and the SCAYT context menu options are always on top.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5956">#5956</a> : [FF] It was impossible to create an editor inside an hidden container.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5753">#5753</a> : It was impossible to have a default value for the name field in the select dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6041">#6041</a> : BIDI: Direction of Increase Indent &amp; Decrease Indent icons are not reversed after changing Lang direction to RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6138">#6138</a> : List indentation is not working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5649">#5649</a> : Image dialog too wide when many styles are set.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5715">#5715</a> : Cell color picker dialog returns focus to document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6108">#6108</a> : Fixed div style.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5336">#5336</a> : Remove object style.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6155">#6155</a> : [[FF]] Modifying Table Header Properties by selecting first Row, causing several issues.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6163">#6163</a> : Focus not going to Tabs in Image dialog when we went to Edit the Image.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6177">#6177</a> : IE we can't start Numbered/Bulleted list on a Empty page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6034">#6034</a> : Horizontal Alignment applied to Table cell is not updated correctly in the Toolbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6112">#6112</a> : BIDI: Alignment set to text in Table cell is not shown in the Tool bar when we press Enter to start a new Paragraph.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6117">#6117</a> : BIDI: Language direction is changing when we come out of Numbered/Bulleted list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6182">#6182</a> : Language Direction field on the Advanced tab of Table Properties dialog has a fixed pixel width.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5487">#5487</a> : Fullpage writer problem with line-break.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6197">#6197</a> : The CKEDITOR.loader base path auto-detection was not working with the _source folder.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6240">#6240</a> : Font Names &amp; Font Sizes should be shown Left Align even for RTL Languages.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5975">#5975</a> : Page-break should have proper Alt Text instead of Unknown object. so that JAWS reads it properly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6255">#6255</a> : Inserting a page break as the first node triggered an error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6188">#6188</a> : [IE7] Automatic color button had the wrong cursor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6129">#6129</a> : The show blocks' labels are now shown in the right for RTL languages.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5421">#5421</a> : &amp;shy; entity not converted when config.entities=false.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5769">#5769</a> : xhtml code generation problem &amp;nbsp; instead of &amp;#160; (htmlentities, entities,entities_additional,..., configuration).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4472">#4472</a> : [FF3] Browser window scrolls to loaded CKEditor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6230">#6230</a> : Fixed invalid parameter count for setTimeout function call.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5335">#5335</a> : Several lines' formatted data will be merged to one line when we apply Numbers/Bullets.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5353">#5353</a> : wrong width of editor after resize() called in Firefox 3.6.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5778">#5778</a> : [IE] Unwanted scroll on first mouse right-click.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5218">#5218</a> : [FF] Copy/paste of an image from same domain changed URL to relative URL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6265">#6265</a> : Popup window properties were visible in the link dialog's target tab when nothing was selected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6075">#6075</a> : [FF] Newly created links didn't fill in information on edit.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6183">#6183</a> : The toolbar panels options sometimes had the contents' link color.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6192">#6192</a> : [WebKit] Inserting smileys was not working because of editor focus issues.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6178">#6178</a> : [WebKit] Inserting elements by code was failing if the editor didn't receive the focus first.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6179">#6179</a> : [WebKit] The Image dialog was not working if the editor didn't receive the focus first.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4657">#4657</a> : [Opera] Styles where not working with collapsed selections.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5839">#5839</a> : "Insert row after" was removing the ids of the elements from the clicked row.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6315">#6315</a> : DIV plugin TT #2885 regression.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/6246">#6246</a> : Chinese Simplified;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/6256">#6256</a> : Dutch;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/6271">#6271</a> : English;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.4</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/6118">#6118</a> : Initial focus is now set to the tabs in the table properties dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6135">#6135</a> : The dialogadvtab plugin now uses the correct label.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6125">#6125</a> : Focus was lost after applying commands in Opera.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6137">#6137</a> : The table dialog was missing the default width value on second opening.</li>
+	</ul>
+	<h3>
+			CKEditor 3.4 Beta</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5909">#5909</a> : New BiDi feature, making it possible to switch the base language direction of block elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5268">#5268</a> : Introducing the "tableresize" plugin, which makes it possible to resize tables columns by mouse drag. It's not enabled by default, so it must be enabled in the configurations file.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/979">#979</a> : New <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enableTabKeyTools">enableTabKeyTools</a> configuration to allow using the TAB key to navigate through table cells.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4606">#4606</a> : Introduce the "autogrow" plugin, which makes the editor resize automatically, based on the contents size.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5737">#5737</a> : Added support for the <a href="http://www.w3.org/TR/html5/editing.html#contenteditable">HTML5 contenteditable attribute</a>, making it possible to define read only regions into the editor contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5418">#5418</a> : New "Advanced" tab introduced on the Table Properties dialog. It's based on the new dialogadvtab plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6082">#6082</a> : Introduced the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.useComputedState">useComputedState</a> setting, making it possible to control whether toolbar features, like alignment and direction, should reflect the "computed" selection states, even when the effective feature value is not applied.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5911">#5911</a> : BiDi: List items should support and retain correct base language direction</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5689">#5689</a> : Make it possible to run CKEditor inside of Firefox chrome.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6042">#6042</a> : It wasn't possible to align a paragraph with the dir attribute to the opposite direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6058">#6058</a> : Fixed a small style glitch with file upload fields in IE+Quirks.</li>
+	</ul>
+	<h3>
+			CKEditor 3.3.2</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5882">#5882</a> : Introduce the dialog#selectPage event, replicating the OnDialogTabChange feature available in FCKeditor 2.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5927">#5927</a> : The native controls in ui.dialog.elements can be styled with the controlStyle definition.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/1644">#1644</a> : Removed references to cursor:hand in the stylesheets.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5411">#5411</a> : Anchor, hidden fields and Page-Break objects can no longer be resized.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5456">#5456</a> : Initial focus incorect in api_dialog sample page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5628">#5628</a> : Incorrect &lt;pre&gt; siblings merging.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5829">#5829</a> : Adding validation for start number field in list style dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5845">#5845</a> : Context menu on empty list item loses selection.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5860">#5860</a> : [IE] &gt; in attribute values are incorrectly escaped.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5905">#5905</a> : SCAYT is not any more enabled by default.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5736">#5736</a> : Improved the text generated for mailto: links if no text was selected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4779">#4779</a> : Adjust resize_minWidth and resize_minHeight if smaller than actual dimensions.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5687">#5687</a> : Navigation through colors is now compatible with RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4615">#4615</a> : [IE] Text fields are no longer disrupted in dialog with RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5887">#5887</a> : The number of columns in the smileys table is now configurable via the smiley_columns setting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5100">#5100</a> : It was possible to drag&amp;drop some elements like context menu items or dropdown entries.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5933">#5933</a> : Text color and background color panels don't have scrollbars anymore under office2003 and v2 skins.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5943">#5943</a> : An error is no longer generated when using percent or pixel values in the image dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5951">#5951</a> : Avoid problems with security systems due to the usage of UniversalXPConnect.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5441">#5441</a> : Avoid errors if the editor instance is removed from the DOM before calling its destroy() method.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4997">#4997</a> : Provide better access to the native input in the ui.dialog.file element.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5914">#5914</a> : Modified the Smileys dialog to make active only the images and not their borders.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5565">#5565</a> : The scrollbar does not behaves erratically when opening a rich combo in RTL page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5843">#5843</a> : In CKEditor 3.3: When we set the focus in the 'instanceReady' event, FF3.6 is giving js error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5902">#5902</a> : paste and pastetext dialogs cannot be skinned easily.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5959">#5959</a> : Dialog auto focus does not check for hidden tabs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5415">#5415</a> : Undo not working when we change the Table Properties for the table on a saved page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5435">#5435</a> : IE: we can't start Numbered/Bulleted list in Tables by Clicking on Insert/Remove Numbers/Bullets Icon.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5832">#5832</a> : The JQuery adapter sample is not working properly with SSL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5728">#5728</a> : Text field &amp; Upload Button in Upload Tab of Image Properties dialog are not shown Properly in Arabic.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5436">#5436</a> : IE: Cursor goes to next Table Cell after we insert a Smiley in the Table Cell.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5580">#5580</a> : Maximize does not work properly in the Office 2003 and V2 skins.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5495">#5495</a> : The link dialog was breaking the undo system on some situations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5775">#5775</a> : Required field's label to contain a CSS class to allow it to be styled differently.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5999">#5999</a> : Table dialog rows and columns fields are now marked as required.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5693">#5693</a> : baseHref detection in the flash dialog now works correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5690">#5690</a> : Table cell's width attribute is now respected properly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5819">#5819</a> : Introducing the new removeFormatCleanup event and making sure remove format doesn't break the showborder plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5558">#5558</a> : After pasting on WebKit based browsers the editor now scrolls to the end of the pasted content.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5799">#5799</a> : Correct plugin dependencies for the liststyle plugin with contextMenu and dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5436">#5436</a> : IE: The cursor was moving to the wrong position when inserting inline elements at the end of cells on tables.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5984">#5984</a> : Firefox: CTRL+HOME was creating an unwanted empty paragraph at the start of the document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5634">#5634</a> : IE: It was needed to click twice in the editor to make it editable on some situations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5338">#5338</a> : Pasting from Open Office could lead on error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5224">#5224</a> : Some invalid markup could break the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5455">#5455</a> : It was not possible to remove formatting from pasted content on specific cases.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5735">#5735</a> : IE: The editor was having focus issues when the previous selection got hidden by scroll operations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5563">#5563</a> : Firefox: The disableObjectResizing and disableNativeTableHandles settings stopped working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5781">#5781</a> : Firefox: Editing was not possible in an empty document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5293">#5293</a> : Firefox: Unwanted BR tags were being left in the editor output when it should be empty.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5280">#5280</a> : IE: Scrollbars where reacting improperly when clicking in the bar space.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5840">#5840</a> : Some dialog access keys are conflicting with "Ctrl + A", select all text behavior on text input.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6059">#6059</a> : Changing list type didn't preserve the list's attributes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5193">#5193</a> : In Firefox, the element path options had the text cursor instead of the arrow.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6073">#6073</a> : The list context menu was showing the wrong option when in a mixed list hierarchy.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6074">#6074</a> : The Insert Table Column command was duplicating the selected column cells ids.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6066">#6066</a> : The toolbar combos had the text cursor instead of the arrow.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6062">#6062</a> : The toolbar buttons had the text cursor instead of the arrow.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6068">#6068</a> : [IE7] A few labels were hidden in a RTL language.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6000">#6000</a> : Safari and Chrome where scrolling the contents to the top when moving the focus to the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6090">#6090</a> : IE: Textarea with selection inside causes Link dialog issues.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5079">#5079</a> : Page break in lists move to above the list when you switch from WYSIWYG to HTML mode and back.</li>
+		<li>Updated the following language files:<ul>
+			<li>Chinese Simplified;</li>
+			<li>Hebrew;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5962">#5962</a> : German;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5645">#5645</a> : Portuguese;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5797">#5797</a> : Turkish;</li>
+		</ul></li>
+	</ul>
+	<h3>
+			CKEditor 3.3.1</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5780">#5780</a> : Text selection lost when opening some of the dialogs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5787">#5787</a> : Liststyle plugin wasn't packaged into the core (CKEDITOR.resourceManager.load exception).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5637">#5637</a> : Fix wrong nesting that generated "&lt;head&gt; must be a child of &lt;html&gt;" warning in Webkit.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5790">#5790</a> : Internal only attributes output on fullpage &lt;html&gt; tag.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5761">#5761</a> : [IE] Color dialog matrix buttons are barely clickable in quirks mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5759">#5759</a> : [IE] Clicking on the scrollbar and then on the host page causes error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5772">#5772</a> : List style dialog is missing tab page ids.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5782">#5782</a> : [FF] Wysiwyg mode is broken by 'display' style changes on editor's parent DOM tree.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5801">#5801</a> : [IE] contentEditable="false" doesn't apply in effect on inline-elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5794">#5794</a> : Empty find matching twice results in JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5732">#5732</a> : If it isn't possible to connect to the SCAYT servers the dialogs might hang in Firefox. Fix for Firefox&gt;=3.6.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5807">#5807</a> : [FF2] New page command results in uneditable document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5807">#5807</a> : [FF2] SCAYT plugin is disabled in Firefox2 due to selection interference.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5772">#5772</a> : [IE] Some numbered list style types are not supported by IE6/7 and causes JavaScript error.</li>
+	</ul>
+	<h3>
+		CKEditor 3.3</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/635">#635</a> : The properties dialog will now open when double clicking on objects.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3893">#3893</a> : It's now possible to indent/outdent lists when selecting the first list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4968">#4968</a> : The <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.contentsLangDirection">contentsLangDirection</a> setting now has a default value 'ui' which inherit language direction from the editor UI language.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4649">#4649</a> : The color picker dialog is now accessible.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3593">#3593</a> : The editing area is now enabled by contentEditable="true" instead of designMode="on" to allow creating uneditable content elements in all browsers.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4056">#4056</a> : Hidden fields will now be displayed as fake element just like in FCKeditor 2.</li>
+	</ul>
+<h3>
+		CKEditor 3.2.2</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li>The SCAYT spell checker is now enabled by default through the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.scayt_autoStartup">autoStartup</a> setting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5631">#5631</a> : The SCAYT context menu options can now be reorganized through the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.scayt_contextMenuItemsOrder">scayt_contextMenuItemsOrder</a> setting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4231">#4231</a> : Introducing the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.resize_dir">resize_dir setting</a>, to be able to restrict manual resizing of the editor to only one direction (horizontal/vertical).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5479">#5479</a> : Introducing the classic ASP integration files and samples.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5024">#5024</a> : Added samples (<a href="http://nightly.ckeditor.com/latest/ckeditor/_samples/output_html.html">HTML</a> and <a href="http://nightly.ckeditor.com/latest/ckeditor/_samples/output_xhtml.html">XHTML</a>) to show how to output HTML using fonts and other attributes instead of styles.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4358">#4358</a> : Introduced the List Properties dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5485">#5485</a> : Adding the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.contentsLanguage">contentsLanguage</a> configuration option to be able to set the language for the editor contents.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5330">#5330</a> : Corrected detection of CTRL and META keys in Macs for the context menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5434">#5434</a> : Fixed access denied issues with IE when accessing web sites through IPv6 IP addresses.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4476">#4476</a> : [IE] Inaccessible empty list item contains sub list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4881">#4881</a> : [IE] Selection range broken because of cutting a single control type element from it.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5505">#5505</a> : Image dialog throw JavaScript error when click close dialog before preview area is loading.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5144">#5144</a> : [Chrome] Paste in Webkit sometimes leaves extra 'div' element.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5021">#5021</a> : [Firefox] Typing in empty document start from second line when <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enterMode">enterMode</a> = CKEDITOR.ENTER_BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5416">#5416</a> : [IE] Delete table throws a error when <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enterMode">enterMode</a> = CKEDITOR.ENTER_BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4459">#4459</a> : [IE] Select element is penetrating the maximized editor in IE6.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5559">#5559</a> : [IE] The first call to <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#setData">setData</a> is affected by iframe cache when loading the wysiwyg mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5567">#5567</a> : [IE] Remove inline styles in some case doesn't join identical siblings.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5450">#5450</a> : [FireFox] Press ENTER on 'replace' button result wrong.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5121">#5121</a> : Recognizes the &lt;br /&gt; tag as a separator when apply block styles and <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enterMode">enterMode</a> = CKEDITOR.ENTER_BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5575">#5575</a> : <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.html#.replaceAll">CKEDITOR.replaceAll</a> should consider all kind of white spaces between class names.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5582">#5582</a> : Prevent the default behavior when click the 'x' button to close dialog box.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5584">#5584</a> : ENTER key with <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.forceEnterMode">forceEnterMode</a> turns on doesn't inherit current block attributes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4797">#4797</a> : [Opera] Press ENTER key in dialog fields to close throws JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5578">#5578</a> : Add flash fake element align property when switch mode (source to wysiwyg).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5577">#5577</a> : Update delete column behavior when choose multiple cells in the same column.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5512">#5512</a> : Open context menu with SHIFT+F10 doesn't get correct editor selection.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5433">#5433</a> : English protocol text directions in Link dialog are not incorrect in 'rtl' UI languages.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5553">#5553</a> : Paste dialog clipboard area text direction is incorrect for 'rtl' content languages.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4734">#4734</a> : Font size resets when font name is changed in an empty numbered list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5237">#5237</a> : English text in dialogs' title is flipped when using RTL language.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3257">#3257</a> : Create list doesn't keep blocks as headings.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5111">#5111</a> : [Firefox] JAWS doesn't respect PC cursor mode (application role) on toolbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5530">#5530</a> : Page break for printing can't be removed with undo.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5381">#5381</a> : Unable to place cursor between two paragraphs in body.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5568">#5568</a> : [IE6/7] Selecting a entire table cell changes the original range.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5623">#5623</a> : [Firefox] Apply style that edges another inline style result incorrect.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5586">#5586</a> : [Firefox] Maximize the second editor ruins full screen mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5617">#5617</a> : HTML filter system does not allow two 'text' filter rules.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5663">#5663</a> : General memory clean up after destroying last instance.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5461">#5461</a> : [IE] Fix Paste from Word dialog doesn't accept imput problem.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5676">#5676</a> : Make color buttons use RRGGBB instead of RGB for better compatibility with IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4948">#4948</a> : [Safari] Select the first/last cell of table to open context menu may lead to undetected table.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5591">#5591</a> : [Firefox] Select a list item makes selected element broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5667">#5667</a> : Pasting in a RTL page content causes shows up the horizontal scrollbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5688">#5688</a> : Duplicate ids are used in dialog definition.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5719">#5719</a> : [IE] 'change' dialog event should not be triggered when dialog is already closed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5747">#5747</a> : [IE] Error thrown when IE input field editing mode is turned on.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5516">#5516</a> : IE8: Toolbar buttons have higher bottom padding.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5402">#5402</a> : SHIFT-ENTER could now be used to exit from preformat block.</li>
+		<li>SCAYT plugin related:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/4836">#4836</a> : Using SCAYT result in fragile elements when applying inline styles.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5425">#5425</a> : [Opera] Disable SCAYT plugin for Opera browser.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5632">#5632</a> : SCAYT word marker is not visible on text with background-color set.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4125">#4125</a> : Remove Format command incorrectly removes SCAYT word markers.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5671">#5671</a> : SCAYT bootstrap script could be added multiple times unnecessarily.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5573">#5573</a> : SCAYT move cursor position after insert element into marked word text.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5546">#5546</a> : SCAYT interferes with undo/redo commands.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5570">#5570</a> : [IE] First enabling SCAYT blind cursor in editor.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5741">#5741</a> : Enable SCAYT cause error in multiple editor instances.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5744">#5744</a> : Remove editor with SCAYT enabled in source mode throws error.</li>
+		</ul></li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/5432">#5432</a> : Dutch;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5619">#5619</a> : Finnish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5515">#5515</a> : Hebrew;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5588">#5588</a> : Turkish;</li>
+		</ul></li>
+	</ul>
+	<h3>
+		CKEditor 3.2.1</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4478">#4478</a> : Enable the SelectAll command in source mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5150">#5150</a> : Allow names in the CKEDITOR.config.colorButton_colors setting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4810">#4810</a> : Adding configuration option for image dialog preview area filling text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/536">#536</a> : Object style now could be applied on any parent element of current selection.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5290">#5290</a> : Unified stylesSet loading removing dependencies from the styles combo.
+					Now the configuration entry is named 'config.stylesSet' instead of config.stylesCombo_stylesSet and the default location
+					is under the 'styles' plugin instead of 'stylescombo'.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5352">#5352</a> : Allow to define the stylesSet array in the config object for the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5302">#5302</a> : Adding config option "forceEnterMode".</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5216">#5216</a> : Extend CKEDITOR.appendTo to allow a data parameter for the initial value.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5024">#5024</a> : Added sample to show how to output XHTML and avoid deprecated tags.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5152">#5152</a> : Indentation using class attribute doesn't work properly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4682">#4682</a> : It wasn't possible to edit block elements in IE that had styles like width, height or float.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4750">#4750</a> : Correcting default order of buttons layout in dialogs on Mac.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4932">#4932</a> : Fixed collapse button not clickable on simple toolbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5228">#5228</a> : Link dialog is automatically changes protocol when URLs that starts with '?'.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4877">#4877</a> : Fixed CKEditor displays source code in one long line (IE quirks mode + office2003 skin).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5132">#5132</a> : Apply inline style leaks into sibling words which are seperated spaces.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3599">#3599</a> : Background color style on sized text displayed as narrow band behind.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4661">#4661</a> : Translation missing in link dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5240">#5240</a> : Flash alignment property is not presented visually on fake element.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4910">#4910</a> : Pasting in IE scrolls document to the end.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5041">#5041</a> : Table summary attribute can't be removed with dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5124">#5124</a> : All inline styles cannot be applied on empty spaces.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3570">#3570</a> : SCAYT marker shouldn't appear inside elements path bar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4553">#4553</a> : Dirty check result incorrect when editor document is empty.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4555">#4555</a> : Unreleased memory when editor is created and destroyed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5118">#5118</a> : Arrow keys navigation in RTL languages is incorrect.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4721">#4721</a> : Remove attribute 'value' of checkbox in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5278">#5278</a> : IE: Add validation to check for bad window names of popup window.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5171">#5171</a> : Dialogs contains lists don't have proper voice labels.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4791">#4791</a> : Can't place cursor inside a form that end with a checkbox/radio.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4479">#4479</a> : StylesCombo doesn't reflect the selection state until it's first opened.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4717">#4717</a> : 'Unlink' and 'Outdent' command buttons should be disabled on editor startup.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5119">#5119</a> : Disabled command buttons are not being properly styled when focused.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5307">#5307</a> : Hide dialog page cause problem when there's two tab pages remain.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5343">#5343</a> : Active list item ARIA role is wrongly placed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3599">#3599</a> : Background color style applying to text with font size style has been narrowly rendered.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4711">#4711</a> : Line break character inside preformatted text makes it unable to type text at the end of previous line.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4829">#4829</a> : [IE] Apply style from combo has wrong result on manually created selection.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4830">#4830</a> : Retrieving selected element isn't always right, especially selecting using keyboard (SHIFT+ARROW).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5128">#5128</a> : Element attribute inside preformatted text is corrupted when converting to other blocks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5190">#5190</a> : Template list entry shouldn't gain initial focus open templates list dialog opens.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5238">#5238</a> : Menu button doesn't display arrow icon in high-contrast mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3576">#3576</a> : Non-attributed element of the same name with the applied style is incorrectly removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5221">#5221</a> : Insert table into empty document cause JavaScript error thrown.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5242">#5242</a> : Apply 'automatic' color option of text color incorrectly removes background-color style.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4719">#4719</a> : IE does not escape attribute values properly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5170">#5170</a> : Firefox does not insert text into styled element properly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4026">#4026</a> : Office2003 skin has no toolbar button borders in High Contrast in IE7.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4348">#4348</a> : There should have exception thrown when 'CKEDITOR_BASEPATH' couldn't be figured out automatically.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5364">#5364</a> : Focus may not be put into dialog correctly when dialog skin file is loading slow.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4016">#4016</a> : Justify the layout of forms select dialog in Chrome and IE7.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5373">#5373</a> : Variable 'pathBlockElements' defines wrong items in CKEDITOR.dom.elementPath.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5082">#5082</a> : Ctrl key should be described as Cmd key on Mac.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5182">#5182</a> : Context menu is not been announced correctly by ATs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4898">#4898</a> : Can't navigate outside table under the last paragraph of document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4950">#4950</a> : List commands could compromise list item attribute and styles.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5018">#5018</a> : Find result highlighting remove normal font color styles unintentionally.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5376">#5376</a> : Unable to exit list from within a empty block under list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5145">#5145</a> : Various SCAYT fixes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5319">#5319</a> : Match whole word doesn't work anymore after replacement has happened.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5363">#5363</a> : 'title' attribute now presents on all editor iframes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5374">#5374</a> : Unable to toggle inline style when the selection starts at the linefeed of the previous paragraph.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4513">#4513</a> : Selected link element is not always correctly detected when using keyboard arrows to perform such selection.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5372">#5372</a> : Newly created sub list should inherit nothing from the original (parent) list, except the list type.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5274">#5274</a> : [IE6] Templates preview image is displayed in wrong size.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5292">#5292</a> : Preview in font size and family doesn't work with custom styles.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5396">#5396</a> : Selection is lost when use cell properties dialog to change cell type to header.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4082">#4082</a> : [IE+Quirks] Preview text in the image dialog is not wrapping.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4197">#4197</a> : Fixing format combo don't hide when editor blur on Safari.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5401">#5401</a> : The context menu break layout with Office2003 and V2 skin on IE quirks mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4825">#4825</a> : Fixing browser context menu is opened when clicking right mouse button twice.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5356">#5356</a> : The SCAYT dialog had issues with Prototype enabled pages.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5266">#5266</a> : SCAYT was disturbing the rendering of TH elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4688">#4688</a> : SCAYT was interfering on checkDirty.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5429">#5429</a> : High Contrast mode was being mistakenly detected when loading the editor through Dojo's xhrGet.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5221">#5221</a> : Range is mangled when making collapsed selection in an empty paragraph.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5261">#5261</a> : Config option 'scayt_autoStartup' slow down editor loading.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3846">#3846</a> : Google Chrome - No Img properties after inserting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5465">#5465</a> : ShiftEnter=DIV doesn't respect list item when pressing ENTER at end of list item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5454">#5454</a> : After replaced success, the popup window couldn't be closed and a js error occured.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4784">#4784</a> : Incorrect cursor position after delete table cells.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5149">#5149</a> : [FF] Cursor disappears after maximize when the editor has focus.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5220">#5220</a> : DTD now shows tolerance to &lt;style&gt; appear inside content.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5440">#5440</a> : Mobile browsers (iPhone, Android...) are marked as incompatible as they don't support editing features.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5504">#5504</a> : [IE6/7] 'Paste' dialog will always get opened even when user allows the clipboard access dialog when using 'Paste' button.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/5326">#5326</a> : Catalan;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5370">#5370</a> : Faroese;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5392">#5392</a> : Finnish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4580">#4580</a> : Hungarian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5301">#5301</a> : Norwegian;</li>
+		</ul></li>
+	</ul>
+	<h3>
+		CKEditor 3.2</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li>Several accessibility enhancements:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/4502">#4502</a> : The editor accessibility is now totally based on <a href="http://www.w3.org/WAI/intro/aria">WAI-ARIA</a>.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5015">#5015</a> : Adding accessibility help dialog plugin.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5014">#5014</a> : Keyboard navigation compliance with screen reader suggested keys.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4595">#4595</a> : Better accessibility in the Templates dialog.</li>
+			<li><a href="http://dev.ckeditor.com/ticket/3389">#3389</a> : Esc/Arrow Key now works for closing sub menu.</li>
+		</ul></li>
+		<li><a href="http://dev.ckeditor.com/ticket/4973">#4973</a> : The Style field in the Div Container dialog is now loading the styles defined in the default styleset used by the Styles toolbar combo.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5049">#5049</a> : Form Field list command in JAWS incorrectly lists extra fields.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5008">#5008</a> : Lock/Unlock ratio buttons in the Image dialog was poorly designed in High Contrast mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3980">#3980</a> : All labels in dialogs now use &lt;label&gt; instead of &lt;div&gt;.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5213">#5213</a> : Reorganization of some entries in the language files to make it more consistent.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5199">#5199</a> : In IE, single row toolbars didn't have the bottom padding.</li>
+	</ul>
+	<h3>
+		CKEditor 3.1.1</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4399">#4399</a> : Improved support for external file browsers by allowing executing a callback function.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4612">#4612</a> : The text of links is now updated if it matches the URL to which it points to.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4936">#4936</a> : New localization support for the Welsh language.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4272">#4272</a> : Kama skin toolbar was broken in IE+Quirks+RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4987">#4987</a> : Changed the url which is called by the Browser Server button in the Link tab of Image Properties dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5030">#5030</a> : The CKEDITOR.timestamp wasn't been appended to the skin.js file.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4993">#4993</a> : Removed the float style from images when the user selects 'not set' for alignment.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4944">#4944</a> : Fixed a bug where nested list structures with inconsequent levels were not being pasted correctly from MS Word.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4637">#4637</a> : Table cells' 'nowrap' attribute was not being loaded by the cell property dialog. Thanks to pomu0325.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4724">#4724</a> : Using the mouse to insert a link in IE might create incorrect results.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4640">#4640</a> : Small optimizations for the fileBrowser plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4583">#4583</a> : The "Target Frame Name" field is now visible when target is set to 'frame' only.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4863">#4863</a> : Fixing iframedialog's height doesn't stretch to 100% (except IE Quirks).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4964">#4964</a> : The BACKSPACE key positioning was not correct in some cases with Firefox.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4980">#4980</a> : Setting border, vspace and hspace of images to zero was not working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4773">#4773</a> : The fileBrowser plugin was overwriting onClick functions eventually defined on fileButton elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4731">#4731</a> : The clipboard plugin was missing a reference to the dialog plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5051">#5051</a> : The about plugin was missing a reference to the dialog plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5146">#5146</a> : The wsc plugin was missing a reference to the dialog plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4632">#4632</a> : The print command will now properly break on the insertion point of page break for printing.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4862">#4862</a> : The English (United Kingdom) language file has been renamed to en-gb.js.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4618">#4618</a> : Selecting an emoticon or the lock and reset buttons in the image dialog fired the onBeforeUnload event in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4678">#4678</a> : It was not possible to set tables' width to empty value.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5012">#5012</a> : Fixed dependency issues with the menu plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5040">#5040</a> : The editor will not properly ignore font related settings that have extra item separators (semi-colons).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4046">#4046</a> : Justify should respect config.enterMode = CKEDITOR.ENTER_BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4622">#4622</a> : Inserting tables multiple times was corrupting the undo system.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4647">#4647</a> : [IE] Selection on an element within positioned container is lost after open context-menu then click one menu item.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4683">#4683</a> : Double-quote character in attribute values was not escaped in the editor output.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4762">#4762</a> : [IE] Unexpected vertical-scrolling behavior happens whenever focus is moving out of editor in source mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4772">#4772</a> : Text color was not being applied properly on links.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4795">#4795</a> : [IE] Press 'Del' key on horizontal line or table result in error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4824">#4824</a> : [IE] &lt;br/&gt; at the very first table cell breaks the editor selection.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4851">#4851</a> : [IE] Delete table rows with context-menu may cause error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4951">#4951</a> : Replacing text with empty string was throwing errors.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4963">#4963</a> : Link dialog was not opening properly for e-mail type links.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5043">#5043</a> : Removed the possibility of having an unwanted script tag being outputted with the editor contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3678">#3678</a> : There were issues when editing links inside floating divs with IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4763">#4763</a> : Pressing ENTER key with text selected was not deleting the text in some situations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5096">#5096</a> : Simple ampersand attribute value doesn't work for more than one occurrence.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3494">#3494</a> : Context menu is too narrow in some translations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5005">#5005</a> : Fixed HTML errors in PHP samples.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5123">#5123</a> : Fixed broken XHTML in User Interface Languages sample.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4893">#4893</a> : Editor now understands table cell inline styles.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4611">#4611</a> : Selection around &lt;select&gt; in editor doesn't cause error anymore.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4886">#4886</a> : Extra BR tags were being created in the output HTML.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4933">#4933</a> : Empty tags with BR were being left in the DOM.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5127">#5127</a> : There were errors when removing dialog definition pages through code.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4767">#4767</a> : CKEditor was not working when ckeditor_source.js is loaded in the &lt;body&gt; .</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5062">#5062</a> : Avoided security warning message when loading the wysiwyg area in IE6 under HTTPS.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5135">#5135</a> : The TAB key will now behave properly when in Source mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4988">#4988</a> : It wasn't possible to use forcePasteAsPlainText with Safari on Mac.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5095">#5095</a> : Safari on Mac deleted the current selection in the editor when Edit menu was clicked.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5140">#5140</a> : In High Contrast mode, arrows were now been displayed for menus with submenus.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5163">#5163</a> : The undo system was not working on some specific cases.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5162">#5162</a> : The ajax sample was throwing errors when loading data.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4999">#4999</a> : The Template dialog was not generating an undo snapshot.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/5006">#5006</a> : Dutch;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5039">#5039</a> : Finnish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5148">#5148</a> : Hebrew;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5071">#5071</a> : Russian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/5147">#5147</a> : Spanish;</li>
+		</ul></li>
+	</ul>
+	<h3>
+		CKEditor 3.1</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4067">#4067</a> : Introduced the full page editing support (from &lt;html&gt; to &lt;/html&gt;).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4228">#4228</a> : Introduced the Shared Spaces feature.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4379">#4379</a> : Introduced the new powerful pasting system and word cleanup procedure, including enhancements to the paste as plain text feature.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/2872">#2872</a> : Introduced the new native PHP API, the first standardized server side support.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4210">#4210</a> : Added CKEditor plugin for jQuery.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/2885">#2885</a> : Added 'div' dialog and corresponding context menu options.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4574">#4574</a> : Added the table merging tools and corresponding context menu options.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4340">#4340</a> : Added the email protection option for link dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4463">#4463</a> : Added inline CSS support in all places where custom stylesheet could apply.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3881">#3881</a> : Added color dialog for 'more color' option in color buttons.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4341">#4341</a> : Added the 'showborder' plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4549">#4549</a> : Make the anti-cache query string configurable.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4708">#4708</a> : Added the 'htmlEncodeOutput' config option.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4342">#4342</a> : Introduced the bodyId and bodyClass settings to specify the id and class. to be used in the editing area at runtime.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3401">#3401</a> : Introduced the baseHref setting so it's possible to set the URL to be used to resolve absolute and relative URLs in the contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4729">#4729</a> : Added support to fake elements for comments.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4707">#4707</a> : Fixed invalid link is requested in image preview.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4461">#4461</a> : Fixed toolbar separator line along side combo enlarging the toolbar height.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4596">#4596</a> : Fixed image re-size lock buttons aren't accessible in high-contrast mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4676">#4676</a> : Fixed editing tables using table properties dialog overwrites original style values.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4714">#4714</a> : Fixed IE6 JavaScript error when editing flash by commit 'Flash' dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3905">#3905</a> : Fixed 'wysiwyg' mode causes unauthenticated content warnings over SSL in FF 3.5.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4768">#4768</a> : Fixed open context menu in IE throws js error when focus is not inside document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4822">#4822</a> : Fixed applying 'Headers' to existing table does not work in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4855">#4855</a> : Fixed toolbar doesn't wrap well for 'v2' skin in all browsers.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4882">#4882</a> : Fixed auto detect paste from MS-Word is not working for Safari.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4882">#4882</a> : Fixed unexpected margin style left behind on content cleaning up from MS-Word.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4896">#4896</a> : Fixed paste nested list from MS-Word with measurement units set to cm is broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4899">#4899</a> : Fixed unable to undo pre-formatted style.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4900">#4900</a> : Fixed ratio-lock inconsistent between browsers.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4901">#4901</a> : Fixed unable to edit any link with popup window's features in Firefox.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4904">#4904</a> : Fixed when paste happen from dialog, it always throw JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4905">#4905</a> : Fixed paste plain text result incorrect when content from dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4889">#4889</a> : Fixed unable to undo 'New Page' command after typing inside editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4892">#4892</a> : Fixed table alignment style is not properly represented by the wrapping div.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4918">#4918</a> : Fixed switching mode when maximized is showing background page contents.</li>
+	</ul>
+	<h3>
+		CKEditor 3.0.2</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4343">#4343</a> : Added the configuration option &#39;browserContextMenuOnCtrl&#39; so it&#39;s possible to enable the default browser context menu by holding the CTRL key.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4552">#4552</a> : Fixed float panel doesn't show up since editor instanced been destroyed once.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3918">#3918</a> : Fixed fake object is editable with Image dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4053">#4053</a> : Fixed 'Form Properties' missing from context menu when selection collapsed inside form.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4401">#4401</a> : Fixed customized by removing 'upload' tab page from 'Link dialog' cause JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4477">#4477</a> : Adding missing tag names in object style elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4567">#4567</a> : Fixed IE throw error when pressing BACKSPACE in source mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4573">#4573</a> : Fixed 'IgnoreEmptyPargraph' config doesn't work with the config 'entities' is set to 'false'.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4614">#4614</a> : Fixed attribute protection fails because of line-break.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4546">#4546</a> : Fixed UIColor plugin doesn't work when editor id contains CSS selector preserved keywords.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4609">#4609</a> : Fixed flash object is lost when loading data from outside editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4625">#4625</a> : Fixed editor stays visible in a div with style 'visibility:hidden'.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4621">#4621</a> : Fixed clicking below table caused an empty table been generated.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3373">#3373</a> : Fixed empty context menu when there's no menu item at all.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4473">#4473</a> : Fixed setting rules on the same element tag name throws error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4514">#4514</a> : Fixed press 'Back' button breaks wysiwyg editing mode is Firefox.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4542">#4542</a> : Fixed unable to access buttons using tab key in Safari and Opera.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4577">#4577</a> : Fixed relative link url is broken after opening 'Link' dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4597">#4597</a> : Fixed custom style with same attribute name but different attribute value doesn't work.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4651">#4651</a> : Fixed 'Deleted' and 'Inserted' text style is not rendering in wysiwyg mode and is wrong is source mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4654">#4654</a> : Fixed 'CKEDITOR.config.font_defaultLabel(fontSize_defaultLabel)' is not working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3950">#3950</a> : Fixed table column insertion incorrect when selecting empty cell area.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3912">#3912</a> : Fixed UIColor not working in IE when page has more than 30+ editors.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4031">#4031</a> : Fixed mouse cursor on toolbar combo has more than 3 shapes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4041">#4041</a> : Fixed open context menu on multiple cells to remove them result in only one removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4185">#4185</a> : Fixed resize handler effect doesn't affect flash object on output.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4196">#4196</a> : Fixed 'Remove Numbered/Bulleted List' on nested list doesn't work well on nested list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4200">#4200</a> : Fixed unable to insert 'password' type filed with attributes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4530">#4530</a> : Fixed context menu couldn't open in Opera.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4536">#4536</a> : Fixed keyboard navigation doesn't work at all in IE quirks mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4584">#4584</a> : Fixed updated link Target field is not updating when updating to certain values.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4603">#4603</a> : Fixed unable to disable submenu items in contextmenu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4672">#4672</a> : Fixed unable to redo the insertion of horizontal line.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4677">#4677</a> : Fixed 'Tab' key is trapped by hidden dialog elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4073">#4073</a> : Fixed insert template with replace option could result in empty document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4455">#4455</a> : Fixed unable to start editing when image inside document not loaded.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4517">#4517</a> : Fixed 'dialog_backgroundCoverColor' doesn't work on IE6.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3165">#3165</a> : Fixed enter key in empty list item before nested one result in collapsed line.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4527">#4527</a> : Fixed checkbox generate invalid 'checked' attribute.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/1659">#1659</a> : Fixed unable to click below content to start editing in IE with 'config.docType' setting to standard compliant.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3933">#3933</a> : Fixed extra &lt;br&gt; left at the end of document when the last element is a table.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4736">#4736</a> : Fixed PAGE UP and PAGE DOWN keys in standards mode are not working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4725">#4725</a> : Fixed hitting 'enter' before html comment node produces a JavaScript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4522">#4522</a> : Fixed unable to redo when typing after insert an image with relative url.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4594">#4594</a> : Fixed context menu goes off-screen when mouse is at right had side of screen.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4673">#4673</a> : Fixed undo not available straight away if shift key is used to enter first character.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4690">#4690</a> : Fixed the parsing of nested inline elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4450">#4450</a> : Fixed selecting multiple table cells before apply justify commands generates spurious paragraph in Firefox.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4733">#4733</a> : Fixed dialog opening sometimes hang up Firefox and Safari.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4498">#4498</a> : Fixed toolbar collapse button missing tooltip.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4738">#4738</a> : Fixed inserting table inside bold/italic/underline generates error on ENTER_BR mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4246">#4246</a> : Fixed avoid XHTML deprecated attributes for image styling.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4543">#4543</a> : Fixed unable to move cursor between table and hr.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4764">#4764</a> : Fixed wrong exception message when CKEDITOR.editor.append() to non-existing elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4521">#4521</a> : Fixed dialog layout in IE6/7 may have scroll-bar and other weird effects.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4709">#4709</a> : Fixed inconsistent scroll-bar behavior on IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4776">#4776</a> : Fixed preview page failed to open when relative URl contains in document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4812">#4812</a> : Fixed 'Esc' key not working on dialogs in Opera.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/4346">#4346</a> : Dutch;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4837">#4837</a> : Finnish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4371">#4371</a> : Hebrew;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4371">#4607</a> <a href="http://dev.ckeditor.com/ticket/4713">#4713</a> : Japanese;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4660">#4660</a> : Norwegian.</li>
+		</ul></li>
+	</ul>
+	<h3>
+		CKEditor 3.0.1</h3>
+	<p>
+		New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/4219">#4219</a> : Added fallback mechanism for config.language.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4194">#4194</a> : Added support for using multiple css style sheets within the editor.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/3898">#3898</a> : Added validation for URL value in Image dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3528">#3528</a> : Fixed Context Menu issue when triggered using Shift+F10.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4028">#4028</a> : Maximize control's tool tip was wrong once it is maximized.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4237">#4237</a> : Toolbar is chopped off in Safari browser 3.x.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4241">#4241</a> : Float panels are left on screen while editor is destroyed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4274">#4274</a> : Double click event is incorrect handled in 'divreplace' sample.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4354">#4354</a> : Fixed TAB key on toolbar to not focus disabled buttons.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3856">#3856</a> : Fixed focus and blur events in source view mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3438">#3438</a> : Floating panels are off by (-1px, 0px) in RTL mode.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3370">#3370</a> : Refactored use of CKEDITOR.env.isCustomDomain().</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4230">#4230</a> : HC detection caused js error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3978">#3978</a> : Fixed setStyle float on IE7 strict.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4262">#4262</a> : Tab and Shift+Tab was not working to cycle through CTRL+SHIFT+F10 context menu in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3633">#3633</a> : Default context menu isn't disabled in toolbar, status bar, panels...</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3897">#3897</a> : Now there is no image previews when the URL is empty in image dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4048">#4048</a> : Context submenu was lacking uiColor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3568">#3568</a> : Dialogs now select all text when tabbing to text inputs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3727">#3727</a> : Cell Properties dialog was missing color selection option.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3517">#3517</a> : Fixed "Match cyclic" field in Find &amp; Replace dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4368">#4368</a> : borderColor table cell attribute haven't worked for none-IE</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4203">#4203</a> : In IE quirks mode + toolbar collapsed + source mode editing block height was incorrect.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4387">#4387</a> : Fixed: right clicking in Kama skin can lead to a javascript error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4397">#4397</a> : Wysiwyg mode caused the host page scroll.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4385">#4385</a> : Fixed editor's auto adjusting on DOM structure were confusing the dirty checking mechanism.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4397">#4397</a> : Fixed regression of [3816] where turn on design mode was causing Firefox3 to scroll the host page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4254">#4254</a> : Added basic API sample.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4107">#4107</a> : Normalize css font-family style text for correct comparision.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3664">#3664</a> : Insert block element in empty editor document should not create new paragraph.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4037">#4037</a> : 'id' attribute is missing with Flash dialog advanced page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4047">#4047</a> : Delete selected control type element when 'Backspace' is pressed on it.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4191">#4191</a> : Fixed: dialog changes confirmation on image dialog appeared even when no changes have been made.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4351">#4351</a> : Dash and dot could appear in attribute names.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4355">#4355</a> : 'maximize' and 'showblock' commands shouldn't take editor focus.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4504">#4504</a> : Fixed 'Enter'/'Esc' key is not working on dialog button.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4245">#4245</a> : 'Strange Template' now come with a style attribute for width.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4512">#4512</a> : Fixed styles plugin incorrectly adding semicolons to style text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3855">#3855</a> : Fixed loading unminified _source files when ckeditor_source.js is used.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3717">#3717</a> : Dialog settings defaults can now be overridden in-page through the CKEDITOR.config object.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4481">#4481</a> : The 'stylesCombo_stylesSet' configuration entry didn't work for full URLs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4480">#4480</a> : Fixed scope attribute in th.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4467">#4467</a> : Fixed bug to use custom icon in context menus. Thanks to george.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4190">#4190</a> : Fixed select field dialog layout in Safari.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4518">#4518</a> : Fixed unable to open dialog without editor focus in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4519">#4519</a> : Fixed maximize without editor focus throw error in IE.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/3947">#3947</a> : Arabic;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4466">#4466</a> : Czech;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4363">#4363</a> : Danish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4346">#4346</a> : Dutch;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4371">#4371</a> <a href="http://dev.ckeditor.com/ticket/4456">#4456</a> : Hebrew;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4382">#4382</a> : Polish.</li>
+		</ul></li>
+	</ul>
+	<h3>
+		CKEditor 3.0</h3>
+	<p>
+		New features:</p>
+	<ul>
+	<li><a href="http://dev.ckeditor.com/ticket/3188">#3188</a> : Introduce
+		&lt;pre&gt; formatting feature when converting from other blocks.</li>
+	<li><a href="http://dev.ckeditor.com/ticket/4445">#4445</a> : editor::setData now support an optional callback parameter.</li>
+	</ul>
+	<p>
+		Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/2856">#2856</a> : Fixed problem with inches in Paste From Word plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3929">#3929</a> : Using Paste dialog,
+			the text is pasted into current selection</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3920">#3920</a> : Mouse cursor over characters in
+			Special Character dialog now is correct</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3882">#3882</a> : Fixed an issue
+			with PasteFromWord dialog in which default values was ignored</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3859">#3859</a> : Fixed Flash dialog layout in Webkit</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3852">#3852</a> : Disabled textarea resizing in dialogs</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3831">#3831</a> : The attempt to remove the contextmenu plugin
+			will not anymore break the editor</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3781">#3781</a> : Colorbutton is now disabled in 'source' mode</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3848">#3848</a> : Fixed an issue with Webkit in witch
+			elements in the Image and Link dialogs had wrong dimensions.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3808">#3808</a> : Fixed UI Color Picker dialog size in example page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3658">#3658</a> : Editor had horizontal scrollbar in IE6.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3819">#3819</a> : The cursor was not visible
+			when applying style to collapsed selections in Firefox 2.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3809">#3809</a> : Fixed beam cursor
+			when mouse cursor is over text-only buttons in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3815">#3815</a> : Fixed an issue
+			with the form dialog in which the "enctype" attribute is outputted as "encoding".</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3785">#3785</a> : Fixed an issue
+			in CKEDITOR.tools.htmlEncode() which incorrectly outputs &amp;nbsp; in IE8.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3820">#3820</a> : Fixed an issue in
+			bullet list command in which a list created at the bottom of another gets merged to the top.
+			</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3830">#3830</a> : Table cell properties dialog
+			doesn't apply to all selected cells.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3835">#3835</a> : Element path is not refreshed
+			after click on 'newpage'; and safari is not putting focus on document also.
+			</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3821">#3821</a> : Fixed an issue with JAWS in which
+			toolbar items are read inconsistently between virtual cursor modes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3789">#3789</a> : The &quot;src&quot; attribute
+			was getting duplicated in some situations.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3591">#3591</a> : Protecting flash related elements
+			including '&lt;object&gt;', '&lt;embed&gt;' and '&lt;param&gt;'.
+			</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3759">#3759</a> : Fixed CKEDITOR.dom.element::scrollIntoView
+			logic bug which scroll even element is inside viewport.
+			</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3773">#3773</a> : Fixed remove list will merge lines.
+			</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3829">#3829</a> : Fixed remove empty link on output data.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3730">#3730</a> : Indent is performing on the whole
+			block instead of selected lines in enterMode = BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3844">#3844</a> : Fixed UndoManager register keydown on obsoleted document</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3805">#3805</a> : Enabled SCAYT plugin for IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3834">#3834</a> : Context menu on table caption was incorrect.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3812">#3812</a> : Fixed an issue in which the editor
+			may show up empty or uneditable in IE7, 8 and Firefox 3.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3825">#3825</a> : Fixed JS error when opening spellingcheck.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3862">#3862</a> : Fixed html parser infinite loop on certain malformed
+			source code.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3639">#3639</a> : Button size was inconsistent.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3874">#3874</a> : Paste as plain text in Safari loosing lines.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3849">#3849</a> : Fixed IE8 crashes when applying lists and indenting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3876">#3876</a> : Changed dialog checkbox and radio labels to explicit labels.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3843">#3843</a> : Fixed context submenu position in IE 6 &amp; 7 RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3864">#3864</a> : [FF]Document is not editable after inserting element on a fresh page.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3883">#3883</a> : Fixed removing inline style logic incorrect on Firefox2.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3884">#3884</a> : Empty "href" attribute was duplicated on output data.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3858">#3858</a> : Fixed the issue where toolbars
+			break up in IE6 and IE7 after the browser is resized.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3868">#3868</a> : [chrome] SCAYT toolbar options was in reversed order.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3875">#3875</a> : Fixed an issue in Safari where
+			table row/column/cell menus are not useable when table cells are selected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3896">#3896</a> : The editing area was
+			flashing when switching forth and back to source view.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3894">#3894</a> : Fixed an issue where editor failed to initialize when using the on-demand loading way.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3903">#3903</a> : Color button plugin doesn't read config entry from editor instance correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3801">#3801</a> : Comments at the start of the document was lost in IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3871">#3871</a> : Unable to redo when undos to the front of snapshots stack.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3909">#3909</a> : Move focus from editor into a text input control is broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3870">#3870</a> : The empty paragraph
+			desappears when hitting ENTER after &quot;New Page&quot;.</li>
+ 		<li><a href="http://dev.ckeditor.com/ticket/3887">#3887</a> : Fixed an issue in which the create
+ 			list command may leak outside of a selected table cell and into the rest of document.</li>
+ 		<li><a href="http://dev.ckeditor.com/ticket/3916">#3916</a> : Fixed maximize does not enlarge editor width when width is set.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3879">#3879</a> : [webkit] Color button panel had incorrect size on first open.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3839">#3839</a> : Update Scayt plugin to reflect the latest change from SpellChecker.net.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3742">#3742</a> : Fixed wrong dialog layout for dialogs without tab bar in IE RTL mode .</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3671">#3671</a> : Fixed body fixing should be applied to the real type under fake elements.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3836">#3836</a> : Fixed remove list in enterMode=BR will merge sibling text to one line.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3949">#3949</a> : Fixed enterKey within pre-formatted text introduce wrong line-break.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3878">#3878</a> : Whenever possible,
+		dialogs will not present scrollbars if the content is too big for its standard
+		size.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3782">#3782</a> : Remove empty list in table cell result in collapsed cell.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/4183">#4183</a> : Basque;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/3837">#3837</a> : Brazilian Portuguese;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4171">#4171</a> : Catalan;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4115">#4115</a> : Chinese (Simplified);</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4179">#4179</a> : Chinese (Traditional);</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4102">#4102</a> : Croatian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4105">#4105</a> : French;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4104">#4104</a> : German;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4116">#4116</a> : Italian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4091">#4091</a> : Japanese;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4120">#4120</a> : Polish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/3987">#3987</a> : Spanish;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4089">#4089</a> : Ukrainian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4166">#4166</a> : Vietnamese.</li>
+		</ul></li>
+		<li><a href="http://dev.ckeditor.com/ticket/3984">#3984</a> : [IE]The pre-formatted style is generating error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3946">#3946</a> : Fixed unable to hide contextmenu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3956">#3956</a> : Fixed About dialog in Source Mode for IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3953">#3953</a> : Fixed keystroke for close Paste dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3951">#3951</a> : Reset size and lock ratio options were not accessible in Image dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3921">#3921</a> : Fixed Container scroll issue on IE7.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3940">#3940</a> : Fixed list operation doesn't stop at table.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3891">#3891</a> : [IE] Fixed 'automatic' font color doesn't work.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3972">#3972</a> : Fixed unable to remove a single empty list in document in Firefox with enterMode=BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3973">#3973</a> : Fixed list creation error at the end of document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3959">#3959</a> : Pasting styled text from word result in content lost.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3793">#3793</a> : Combined images into sprites.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3783">#3783</a> : Fixed indenting command in table cells create collapsed paragraph.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3968">#3968</a> : About dialog layout was broken with IE+Standards+RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3991">#3991</a> : In IE quirks, text was not visible in v2 and office2003 skins.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3983">#3983</a> : In IE, we&#39;ll now
+			silently ignore wrong toolbar definition settings which have extra commas being
+			left around.</li>
+		<li>Fixed the following test cases:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/3992">#3992</a> : core/ckeditor2.html</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4138">#4138</a> : core/plugins.html</li>
+			<li><a href="http://dev.ckeditor.com/ticket/3801">#3801</a> : plugins/htmldataprocessor/htmldataprocessor.html</li>
+		</ul></li>
+		<li><a href="http://dev.ckeditor.com/ticket/3989">#3989</a> : Host page horizontal scrolling a lot when on having righ-to-left direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4001">#4001</a> : Create link around existing image result incorrect.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3988">#3988</a> : Destroy editor on form submit event cause error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3994">#3994</a> : Insert horizontal line at end of document cause error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4074">#4074</a> : Indent error with 'indentClasses' config specified.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4057">#4057</a> : Fixed anchor is lost after switch between editing modes.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3644">#3644</a> : Image dialog was missin radio lock.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4014">#4014</a> : Firefox2 had no dialog button backgrounds.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4018">#4018</a> : Firefox2 had no richcombo text visible.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4035">#4035</a> : [IE6] Paste dialog size was too small.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4049">#4049</a> : Kama skin was too wide with config.width.</li>
+		<li>The following released files now doesn't require the _source folder<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/4086">#4086</a> : _samples/ui_languages.html</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4093">#4093</a> : _tests/core/dom/document.html</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4094">#4094</a> : Smiley plugin file</li>
+			<li><a href="http://dev.ckeditor.com/ticket/4097">#4097</a> : No undo/redo support for fontColor and backgroundColor buttons.</li>
+		</ul></li>
+		<li><a href="http://dev.ckeditor.com/ticket/4085">#4085</a> : Paste and Paste from Word dialogs were not well styled in IE+RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3982">#3982</a> : Fixed enterKey on empty list item result in weird dom structure.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4101">#4101</a> : Now it is possible to close dialog before gets focus.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4075">#4075</a> : [IE6/7]Fixed apply custom inline style with "class" attribute failed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4087">#4087</a> : [Firefox]Fixed extra blocks created on create list when full document selected.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4097">#4097</a> : No undo/redo support for fontColor and backgroundColor buttons.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4111">#4111</a> : Fixed apply block style after inline style applied on full document error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3622">#3622</a> : Fixed shift enter with selection not deleting highlighted text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4092">#4092</a> : [IE6] Close button was missing for dialog without multiple tabs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4003">#4003</a> : Markup on the image dialog was disrupted when removing the border input.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4096">#4096</a> : Editor content area was pushed down in IE RTL quirks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4112">#4112</a> : [FF] Paste dialog had scrollbars in quirks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4118">#4118</a> : Dialog dragging was
+			occasionally behaving strangely .</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4077">#4077</a> : The toolbar combos
+			were rendering incorrectly in some languages, like Chinese.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3622">#3622</a> : The toolbar in the v2
+			skin was wrapping improperly in some languages.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4119">#4119</a> : Unable to edit image link with image dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4117">#4117</a> : Fixed dialog error when transforming image into button.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4058">#4058</a> : [FF] wysiwyg mode is sometimes not been activated.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4114">#4114</a> : [IE] RTE + IE6/IE7 Quirks = dialog mispositoned.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4123">#4123</a> : Some dialog buttons were broken in IE7 quirks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4122">#4122</a> : [IE] The image dialog
+			was being rendered improperly when loading an image with long URL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4144">#4144</a> : Fixed the white-spaces at the end of &lt;pre&gt; is incorrectly removed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4143">#4143</a> : Fixed element id is lost when extracting contents from the range.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4007">#4007</a> : [IE] Source area overflow from editor chrome.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4145">#4145</a> : Fixed the on demand
+			(&quot;basic&quot;) loading model of the editor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4139">#4139</a> : Fixed list plugin regression of [3903].</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4147">#4147</a> : Unify style text normalization logic when comparing styles.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4150">#4150</a> : Fixed enlarge list result incorrect at the inner boundary of block.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4164">#4164</a> : Now it is possible to paste text
+			in Source mode even if forcePasteAsPlainText = true.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4129">#4129</a> : [FF]Unable to remove list with Ctrl-A.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4172">#4172</a> : [Safari] The trailing
+			&lt;br&gt; was not been always added to blank lines ending with &amp;nbsp;.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4178">#4178</a> : It&#39;s now possible to
+			copy and paste Flash content among different editor instances.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4193">#4193</a> : Automatic font color produced empty span on Firefox 3.5.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4186">#4186</a> : [FF] Fixed First open float panel cause host page scrollbar blinking.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4227">#4227</a> : Fixed destroy editor instance created on textarea which is not within form cause error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4240">#4240</a> : Fixed editor name containing hyphen break editor completely.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/3828">#3828</a> : Malformed nested list is now corrected by the parser.</li>
+	</ul>
+	<h3>
+		CKEditor 3.0 RC</h3>
+	<p>
+		Changelog starts at this release.</p>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2013, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
+	</div>
+</body>
+</html>
diff --git a/web/imcms/ckeditor/INSTALL.html b/web/imcms/ckeditor/INSTALL.html
new file mode 100644
index 0000000000..7ac30d830c
--- /dev/null
+++ b/web/imcms/ckeditor/INSTALL.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Installation Guide - CKEditor</title>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<style type="text/css">
+		h3
+		{
+			border-bottom: 1px solid #AAAAAA;
+		}
+		pre
+		{
+			background-color: #F9F9F9;
+			border: 1px dashed #2F6FAB;
+			padding: 1em;
+			line-height: 1.1em;
+		}
+		#footer hr
+		{
+			margin: 10px 0 15px 0;
+			height: 1px;
+			border: solid 1px gray;
+			border-bottom: none;
+		}
+		#footer p
+		{
+			margin: 0 10px 10px 10px;
+			float: left;
+		}
+		#footer #copy
+		{
+			float: right;
+		}
+	</style>
+</head>
+<body>
+	<h1>
+		CKEditor Installation Guide</h1>
+	<h3>
+		What&#39;s CKEditor?</h3>
+	<p>
+		CKEditor is a text editor to be used inside web pages. It&#39;s not a replacement
+		for desktop text editors like Word or OpenOffice, but a component to be used as
+		part of web applications and web sites.</p>
+	<h3>
+		Installation</h3>
+	<p>
+		Installing CKEditor is an easy task. Just follow these simple steps:</p>
+	<ol>
+		<li><strong>Download</strong> the latest version of the editor from our web site: <a
+			href="http://ckeditor.com">http://ckeditor.com</a>. You should have already completed
+			this step, but be sure you have the very latest version.</li>
+		<li><strong>Extract</strong> (decompress) the downloaded file into the root of your
+			web site.</li>
+	</ol>
+	<p>
+		<strong>Note:</strong> CKEditor is by default installed in the &quot;ckeditor&quot;
+		folder. You can place the files in whichever you want though.</p>
+	<h3>
+		Checking Your Installation
+	</h3>
+	<p>
+		The editor comes with a few sample pages that can be used to verify that installation
+		proceeded properly. Take a look at the <a href="_samples">_samples</a> directory.</p>
+	<p>
+		To test your installation, just call the following page at your web site:</p>
+	<pre>
+http://&lt;your site&gt;/&lt;CKEditor installation path&gt;/_samples/index.html
+
+For example:
+http://www.example.com/ckeditor/_samples/index.html</pre>
+	<h3>
+		Documentation</h3>
+	<p>
+		The full editor documentation is available online at the following address:<br />
+		<a href="http://docs.cksource.com/ckeditor">http://docs.cksource.com/ckeditor</a></p>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2013, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
+	</div>
+</body>
+</html>
diff --git a/web/imcms/ckeditor/LICENSE.html b/web/imcms/ckeditor/LICENSE.html
new file mode 100644
index 0000000000..87fede21c5
--- /dev/null
+++ b/web/imcms/ckeditor/LICENSE.html
@@ -0,0 +1,1327 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+== BEGIN TEXT ONLY VERSION ==
+
+Software License Agreement
+==========================
+
+CKEditor - The text editor for Internet - http://ckeditor.com
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+
+Licensed under the terms of any of the following licenses at your
+choice:
+
+ - GNU General Public License Version 2 or later (the "GPL")
+   http://www.gnu.org/licenses/gpl.html
+   (See Appendix A)
+
+ - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+   http://www.gnu.org/licenses/lgpl.html
+   (See Appendix B)
+
+ - Mozilla Public License Version 1.1 or later (the "MPL")
+   http://www.mozilla.org/MPL/MPL-1.1.html
+   (See Appendix C)
+
+You are not required to, but if you want to explicitly declare the
+license you have chosen to be bound to when using, reproducing,
+modifying and distributing this software, just include a text file
+titled "legal.txt" in your version of this software, indicating your
+license choice.
+
+Sources of Intellectual Property Included in CKEditor
+=====================================================
+
+Where not otherwise indicated, all CKEditor content is authored by
+CKSource engineers and consists of CKSource-owned intellectual
+property. In some specific instances, CKEditor will incorporate work
+done by developers outside of CKSource with their express permission.
+
+Trademarks
+==========
+
+CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
+and product names are trademarks, registered trademarks or service
+marks of their respective holders.
+
+Appendix A: The GPL License
+===========================
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 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.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software-to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, 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 or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+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 give any other recipients of the Program a copy of this License
+along with the Program.
+
+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 Program or any portion
+of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+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 Program, 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 Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) 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; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, 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 executable.  However, as a
+special exception, the source code 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.
+
+If distribution of executable or 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 counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+  5. 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 Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program 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 to
+this License.
+
+  7. 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 Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program 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 Program.
+
+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.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program 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.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 Program
+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 Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, 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
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+Appendix B: The LGPL License
+============================
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  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
+
+
+Appendix C: The MPL License
+===========================
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ===============
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+== END TEXT ONLY VERSION ==
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>License - CKEditor</title>
+</head>
+<body>
+	<h1>
+		Software License Agreement
+	</h1>
+	<p>
+		<strong>CKEditor&trade;</strong> - The text editor for Internet&trade; - <a href="http://ckeditor.com">
+			http://ckeditor.com</a><br />
+		Copyright &copy; 2003-2013, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
+	</p>
+	<p>
+		Licensed under the terms of any of the following licenses at your choice:
+	</p>
+	<ul>
+		<li><a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a> Version
+			2 or later (the "GPL");</li>
+		<li><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>
+			Version 2.1 or later (the "LGPL");</li>
+		<li><a href="http://www.mozilla.org/MPL/MPL-1.1.html">Mozilla Public License</a> Version
+			1.1 or later (the "MPL").</li>
+	</ul>
+	<p>
+		You are not required to, but if you want to explicitly declare the license you have
+		chosen to be bound to when using, reproducing, modifying and distributing this software,
+		just include a text file titled "LEGAL" in your version of this software, indicating
+		your license choice. In any case, your choice will not restrict any recipient of
+		your version of this software to use, reproduce, modify and distribute this software
+		under any of the above licenses.
+	</p>
+	<h2>
+		Sources of Intellectual Property Included in CKEditor
+	</h2>
+	<p>
+		Where not otherwise indicated, all CKEditor content is authored by CKSource engineers
+		and consists of CKSource-owned intellectual property. In some specific instances,
+		CKEditor will incorporate work done by developers outside of CKSource with their
+		express permission.
+	</p>
+	<p>
+		<a href="http://developer.yahoo.com/yui/yuitest/">YUI Test</a>: At _source/tests/yuitest.js
+		can be found part of the source code of YUI, which is licensed under the terms of
+		the <a href="http://developer.yahoo.com/yui/license.txt">BSD License</a>. YUI is
+		Copyright &copy; 2008, Yahoo! Inc.
+	</p>
+	<h2>
+		Trademarks
+	</h2>
+	<p>
+		CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product
+		names are trademarks, registered trademarks or service marks of their respective
+		holders.
+	</p>
+</body>
+</html>
diff --git a/web/imcms/ckeditor/adapters/jquery.js b/web/imcms/ckeditor/adapters/jquery.js
new file mode 100644
index 0000000000..f57ee83725
--- /dev/null
+++ b/web/imcms/ckeditor/adapters/jquery.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){CKEDITOR.config.jqueryOverrideVal=typeof CKEDITOR.config.jqueryOverrideVal=='undefined'?true:CKEDITOR.config.jqueryOverrideVal;var a=window.jQuery;if(typeof a=='undefined')return;a.extend(a.fn,{ckeditorGet:function(){var b=this.eq(0).data('ckeditorInstance');if(!b)throw 'CKEditor not yet initialized, use ckeditor() with callback.';return b;},ckeditor:function(b,c){if(!CKEDITOR.env.isCompatible)return this;if(!a.isFunction(b)){var d=c;c=b;b=d;}c=c||{};this.filter('textarea, div, p').each(function(){var e=a(this),f=e.data('ckeditorInstance'),g=e.data('_ckeditorInstanceLock'),h=this;if(f&&!g){if(b)b.apply(f,[this]);}else if(!g){if(c.autoUpdateElement||typeof c.autoUpdateElement=='undefined'&&CKEDITOR.config.autoUpdateElement)c.autoUpdateElementJquery=true;c.autoUpdateElement=false;e.data('_ckeditorInstanceLock',true);f=CKEDITOR.replace(h,c);e.data('ckeditorInstance',f);f.on('instanceReady',function(i){var j=i.editor;setTimeout(function(){if(!j.element){setTimeout(arguments.callee,100);return;}i.removeListener('instanceReady',this.callee);j.on('dataReady',function(){e.trigger('setData.ckeditor',[j]);});j.on('getData',function(l){e.trigger('getData.ckeditor',[j,l.data]);},999);j.on('destroy',function(){e.trigger('destroy.ckeditor',[j]);});if(j.config.autoUpdateElementJquery&&e.is('textarea')&&e.parents('form').length){var k=function(){e.ckeditor(function(){j.updateElement();});};e.parents('form').submit(k);e.parents('form').bind('form-pre-serialize',k);e.bind('destroy.ckeditor',function(){e.parents('form').unbind('submit',k);e.parents('form').unbind('form-pre-serialize',k);});}j.on('destroy',function(){e.data('ckeditorInstance',null);});e.data('_ckeditorInstanceLock',null);e.trigger('instanceReady.ckeditor',[j]);if(b)b.apply(j,[h]);},0);},null,null,9999);}else CKEDITOR.on('instanceReady',function(i){var j=i.editor;setTimeout(function(){if(!j.element){setTimeout(arguments.callee,100);return;}if(j.element.$==h)if(b)b.apply(j,[h]);},0);},null,null,9999);});return this;}});if(CKEDITOR.config.jqueryOverrideVal)a.fn.val=CKEDITOR.tools.override(a.fn.val,function(b){return function(c,d){var e=typeof c!='undefined',f;this.each(function(){var g=a(this),h=g.data('ckeditorInstance');if(!d&&g.is('textarea')&&h){if(e)h.setData(c);else{f=h.getData();return null;}}else if(e)b.call(g,c);else{f=b.call(g);return null;}return true;});return e?this:f;};});})();
diff --git a/web/imcms/ckeditor/ckeditor.asp b/web/imcms/ckeditor/ckeditor.asp
new file mode 100644
index 0000000000..441a5d0333
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor.asp
@@ -0,0 +1,955 @@
+<%
+ '
+ ' Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ ' For licensing, see LICENSE.html or http://ckeditor.com/license
+
+' Shared variable for all instances ("static")
+dim CKEDITOR_initComplete
+dim CKEDITOR_returnedEvents
+
+ ''
+ ' \brief CKEditor class that can be used to create editor
+ ' instances in ASP pages on server side.
+ ' @see http://ckeditor.com
+ '
+ ' Sample usage:
+ ' @code
+ ' editor = new CKEditor
+ ' editor.editor "editor1", "<p>Initial value.</p>", empty, empty
+ ' @endcode
+
+Class CKEditor
+
+	''
+	' The version of %CKEditor.
+	private version
+
+	''
+	' A constant string unique for each release of %CKEditor.
+	private mTimeStamp
+
+	''
+	' URL to the %CKEditor installation directory (absolute or relative to document root).
+	' If not set, CKEditor will try to guess it's path.
+	'
+	' Example usage:
+	' @code
+	' editor.basePath = "/ckeditor/"
+	' @endcode
+	Public basePath
+
+	''
+	' A boolean variable indicating whether CKEditor has been initialized.
+	' Set it to true only if you have already included
+	' &lt;script&gt; tag loading ckeditor.js in your website.
+	Public initialized
+
+	''
+	' Boolean variable indicating whether created code should be printed out or returned by a function.
+	'
+	' Example 1: get the code creating %CKEditor instance and print it on a page with the "echo" function.
+	' @code
+	' editor = new CKEditor
+	' editor.returnOutput = true
+	' code = editor.editor("editor1", "<p>Initial value.</p>", empty, empty)
+	' response.write "<p>Editor 1:</p>"
+	' response.write code
+	' @endcode
+	Public returnOutput
+
+	''
+	' A Dictionary with textarea attributes.
+	'
+	' When %CKEditor is created with the editor() method, a HTML &lt;textarea&gt; element is created,
+	' it will be displayed to anyone with JavaScript disabled or with incompatible browser.
+	public textareaAttributes
+
+	''
+	' A string indicating the creation date of %CKEditor.
+	' Do not change it unless you want to force browsers to not use previously cached version of %CKEditor.
+	public timestamp
+
+	''
+	' A dictionary that holds the instance configuration.
+	private oInstanceConfig
+
+	''
+	' A dictionary that holds the configuration for all the instances.
+	private oAllInstancesConfig
+
+	''
+	' A dictionary that holds event listeners for the instance.
+	private oInstanceEvents
+
+	''
+	' A dictionary that holds event listeners for all the instances.
+	private oAllInstancesEvents
+
+	''
+	' A Dictionary that holds global event listeners (CKEDITOR object)
+	private oGlobalEvents
+
+
+	Private Sub Class_Initialize()
+		version = "3.6.6"
+		timeStamp = "D03G5XL"
+		mTimeStamp = "D03G5XL"
+
+		Set oInstanceConfig = CreateObject("Scripting.Dictionary")
+		Set oAllInstancesConfig = CreateObject("Scripting.Dictionary")
+
+		Set oInstanceEvents = CreateObject("Scripting.Dictionary")
+		Set oAllInstancesEvents = CreateObject("Scripting.Dictionary")
+		Set oGlobalEvents = CreateObject("Scripting.Dictionary")
+
+		Set textareaAttributes = CreateObject("Scripting.Dictionary")
+		textareaAttributes.Add "rows", 8
+		textareaAttributes.Add "cols", 60
+	End Sub
+
+	''
+	 ' Creates a %CKEditor instance.
+	 ' In incompatible browsers %CKEditor will downgrade to plain HTML &lt;textarea&gt; element.
+	 '
+	 ' @param name (string) Name of the %CKEditor instance (this will be also the "name" attribute of textarea element).
+	 ' @param value (string) Initial value.
+	 '
+	 ' Example usage:
+	 ' @code
+	 ' set editor = New CKEditor
+	 ' editor.editor "field1", "<p>Initial value.</p>"
+	 ' @endcode
+	 '
+	 ' Advanced example:
+	 ' @code
+	 ' set editor = new CKEditor
+	 ' set config = CreateObject("Scripting.Dictionary")
+	 ' config.Add "toolbar", Array( _
+	 '	Array( "Source", "-", "Bold", "Italic", "Underline", "Strike" ), _
+	 '	Array( "Image", "Link", "Unlink", "Anchor" ) _
+	 ' )
+	 ' set events = CreateObject("Scripting.Dictionary")
+	 ' events.Add "instanceReady", "function (evt) { alert('Loaded second editor: ' + evt.editor.name );}"
+
+	 ' editor.editor "field1", "<p>Initial value.</p>", config, events
+	 ' @endcode
+	 '
+	public function editor(name, value)
+		dim attr, out, js, customConfig, extraConfig
+		dim attribute
+
+		attr = ""
+
+		for each attribute in textareaAttributes
+			attr = attr & " " &  attribute & "=""" & replace( textareaAttributes( attribute ), """", "&quot" ) & """"
+		next
+
+		out = "<textarea name=""" & name & """" & attr & ">" & Server.HtmlEncode(value) & "</textarea>" & vbcrlf
+
+		if not(initialized) then
+			out = out & init()
+		end if
+
+		set customConfig = configSettings()
+		js = returnGlobalEvents()
+
+		extraConfig = (new JSON)( empty, customConfig, false )
+		if extraConfig<>"" then extraConfig = ", " & extraConfig
+		js = js & "CKEDITOR.replace('" & name & "'" & extraConfig & ");"
+
+		out = out & script(js)
+
+		if not(returnOutput) then
+			response.write out
+			out = ""
+		end if
+
+		editor = out
+
+		oInstanceConfig.RemoveAll
+		oInstanceEvents.RemoveAll
+	end function
+
+	''
+	 ' Replaces a &lt;textarea&gt; with a %CKEditor instance.
+	 '
+	 ' @param id (string) The id or name of textarea element.
+	 '
+	 ' Example 1: adding %CKEditor to &lt;textarea name="article"&gt;&lt;/textarea&gt; element:
+	 ' @code
+	 ' set editor = New CKEditor
+	 ' editor.replace "article"
+	 ' @endcode
+	 '
+	public function replaceInstance(id)
+		dim out, js, customConfig, extraConfig
+
+		out = ""
+		if not(initialized) then
+			out = out & init()
+		end if
+
+		set customConfig = configSettings()
+		js = returnGlobalEvents()
+
+		extraConfig = (new JSON)( empty, customConfig, false )
+		if extraConfig<>"" then extraConfig = ", " & extraConfig
+		js = js & "CKEDITOR.replace('" & id & "'" & extraConfig & ");"
+
+		out = out & script(js)
+
+		if not(returnOutput) then
+			response.write out
+			out = ""
+		end if
+
+		replaceInstance = out
+
+		oInstanceConfig.RemoveAll
+		oInstanceEvents.RemoveAll
+	end function
+
+	''
+	 ' Replace all &lt;textarea&gt; elements available in the document with editor instances.
+	 '
+	 ' @param className (string) If set, replace all textareas with class className in the page.
+	 '
+	 ' Example 1: replace all &lt;textarea&gt; elements in the page.
+	 ' @code
+	 ' editor = new CKEditor
+	 ' editor.replaceAll empty
+	 ' @endcode
+	 '
+	 ' Example 2: replace all &lt;textarea class="myClassName"&gt; elements in the page.
+	 ' @code
+	 ' editor = new CKEditor
+	 ' editor.replaceAll 'myClassName'
+	 ' @endcode
+	 '
+	function replaceAll(className)
+		dim out, js, customConfig
+
+		out = ""
+		if not(initialized) then
+			out = out & init()
+		end if
+
+		set customConfig = configSettings()
+		js = returnGlobalEvents()
+
+		if (customConfig.Count=0) then
+			if (isEmpty(className)) then
+				js = js & "CKEDITOR.replaceAll();"
+			else
+				js = js & "CKEDITOR.replaceAll('" & className & "');"
+			end if
+		else
+			js = js & "CKEDITOR.replaceAll( function(textarea, config) {\n"
+			if not(isEmpty(className)) then
+				js = js & "	var classRegex = new RegExp('(?:^| )' + '" & className & "' + '(?:$| )');\n"
+				js = js & "	if (!classRegex.test(textarea.className))\n"
+				js = js & "		return false;\n"
+			end if
+			js = js & "	CKEDITOR.tools.extend(config, " & (new JSON)( empty, customConfig, false ) & ", true);"
+			js = js & "} );"
+		end if
+
+		out = out & script(js)
+
+		if not(returnOutput) then
+			response.write out
+			out = ""
+		end if
+
+		replaceAll = out
+
+		oInstanceConfig.RemoveAll
+		oInstanceEvents.RemoveAll
+	end function
+
+
+	''
+	' A Dictionary that holds the %CKEditor configuration for all instances
+	' For the list of available options, see http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
+	'
+	' Example usage:
+	' @code
+	' editor.config("height") = 400
+	' // Use @@ at the beggining of a string to ouput it without surrounding quotes.
+	' editor.config("width") = "@@screen.width * 0.8"
+	' @endcode
+	Public Property Let Config( configKey, configValue )
+		oAllInstancesConfig.Add configKey, configValue
+	End Property
+
+	''
+	' Configuration options for the next instance
+	'
+	Public Property Let instanceConfig( configKey, configValue )
+		oInstanceConfig.Add configKey, configValue
+	End Property
+
+	''
+	 ' Adds event listener.
+	 ' Events are fired by %CKEditor in various situations.
+	 '
+	 ' @param eventName (string) Event name.
+	 ' @param javascriptCode (string) Javascript anonymous function or function name.
+	 '
+	 ' Example usage:
+	 ' @code
+	 ' editor.addEventHandler  "instanceReady", "function (ev) { " & _
+	 '    " alert('Loaded: ' + ev.editor.name); " & _
+	 ' "}"
+	 ' @endcode
+	 '
+	public sub addEventHandler(eventName, javascriptCode)
+		if not(oAllInstancesEvents.Exists( eventName ) ) then
+			oAllInstancesEvents.Add eventName, Array()
+		end if
+
+		dim listeners, size
+		listeners = oAllInstancesEvents( eventName )
+		size = ubound(listeners) + 1
+		redim preserve listeners(size)
+		listeners(size) = javascriptCode
+
+		oAllInstancesEvents( eventName ) = listeners
+'		'' Avoid duplicates. fixme...
+'		if (!in_array($javascriptCode, $this->_events[$event])) {
+'			$this->_events[$event][] = $javascriptCode;
+'		}
+	end sub
+
+	''
+	 ' Clear registered event handlers.
+	 ' Note: this function will have no effect on already created editor instances.
+	 '
+	 ' @param eventName (string) Event name, if set to 'empty' all event handlers will be removed.
+	 '
+	public sub clearEventHandlers( eventName )
+		if not(isEmpty( eventName )) then
+			oAllInstancesEvents.Remove eventName
+		else
+			oAllInstancesEvents.RemoveAll
+		end if
+	end sub
+
+
+	''
+	 ' Adds event listener only for the next instance.
+	 ' Events are fired by %CKEditor in various situations.
+	 '
+	 ' @param eventName (string) Event name.
+	 ' @param javascriptCode (string) Javascript anonymous function or function name.
+	 '
+	 ' Example usage:
+	 ' @code
+	 ' editor.addInstanceEventHandler  "instanceReady", "function (ev) { " & _
+	 '    " alert('Loaded: ' + ev.editor.name); " & _
+	 ' "}"
+	 ' @endcode
+	 '
+	public sub addInstanceEventHandler(eventName, javascriptCode)
+		if not(oInstanceEvents.Exists( eventName ) ) then
+			oInstanceEvents.Add eventName, Array()
+		end if
+
+		dim listeners, size
+		listeners = oInstanceEvents( eventName )
+		size = ubound(listeners) + 1
+		redim preserve listeners(size)
+		listeners(size) = javascriptCode
+
+		oInstanceEvents( eventName ) = listeners
+'		'' Avoid duplicates. fixme...
+'		if (!in_array($javascriptCode, $this->_events[$event])) {
+'			$this->_events[$event][] = $javascriptCode;
+'		}
+	end sub
+
+	''
+	 ' Clear registered event handlers.
+	 ' Note: this function will have no effect on already created editor instances.
+	 '
+	 ' @param eventName (string) Event name, if set to 'empty' all event handlers will be removed.
+	 '
+	public sub clearInstanceEventHandlers( eventName )
+		if not(isEmpty( eventName )) then
+			oInstanceEvents.Remove eventName
+		else
+			oInstanceEvents.RemoveAll
+		end if
+	end sub
+
+	''
+	 ' Adds global event listener.
+	 '
+	 ' @param event (string) Event name.
+	 ' @param javascriptCode (string) Javascript anonymous function or function name.
+	 '
+	 ' Example usage:
+	 ' @code
+	 ' editor.addGlobalEventHandler "dialogDefinition", "function (ev) { " & _
+	 '   "  alert('Loading dialog: ' + ev.data.name); " & _
+	 ' "}"
+	 ' @endcode
+	 '
+	public sub addGlobalEventHandler( eventName, javascriptCode)
+		if not(oGlobalEvents.Exists( eventName ) ) then
+			oGlobalEvents.Add eventName, Array()
+		end if
+
+		dim listeners, size
+		listeners = oGlobalEvents( eventName )
+		size = ubound(listeners) + 1
+		redim preserve listeners(size)
+		listeners(size) = javascriptCode
+
+		oGlobalEvents( eventName ) = listeners
+
+'		// Avoid duplicates.
+'		if (!in_array($javascriptCode, $this->_globalEvents[$event])) {
+'			$this->_globalEvents[$event][] = $javascriptCode;
+'		}
+	end sub
+
+	''
+	 ' Clear registered global event handlers.
+	 ' Note: this function will have no effect if the event handler has been already printed/returned.
+	 '
+	 ' @param eventName (string) Event name, if set to 'empty' all event handlers will be removed .
+	 '
+	public sub clearGlobalEventHandlers( eventName )
+		if not(isEmpty( eventName )) then
+			oGlobalEvents.Remove eventName
+		else
+			oGlobalEvents.RemoveAll
+		end if
+	end sub
+
+	''
+	 ' Prints javascript code.
+	 '
+	 ' @param string js
+	 '
+	private function script(js)
+		script = "<script type=""text/javascript"">" & _
+			"//<![CDATA[" & vbcrlf & _
+			js & vbcrlf & _
+			"//]]>" & _
+			"</script>" & vbcrlf
+	end function
+
+	''
+	 ' Returns the configuration array (global and instance specific settings are merged into one array).
+	 '
+	 ' @param instanceConfig (Dictionary) The specific configurations to apply to editor instance.
+	 ' @param instanceEvents (Dictionary) Event listeners for editor instance.
+	 '
+	private function configSettings()
+		dim mergedConfig, mergedEvents
+		set mergedConfig = cloneDictionary(oAllInstancesConfig)
+		set mergedEvents = cloneDictionary(oAllInstancesEvents)
+
+		if not(isEmpty(oInstanceConfig)) then
+			set mergedConfig = mergeDictionary(mergedConfig, oInstanceConfig)
+		end if
+
+		if not(isEmpty(oInstanceEvents)) then
+			for each eventName in oInstanceEvents
+				code = oInstanceEvents( eventName )
+
+				if not(mergedEvents.Exists( eventName)) then
+					mergedEvents.Add eventName, code
+				else
+
+					dim listeners, size
+					listeners = mergedEvents( eventName )
+					size = ubound(listeners)
+					if isArray( code ) then
+						addedCount = ubound(code)
+						redim preserve listeners( size + addedCount + 1 )
+						for i = 0 to addedCount
+							listeners(size + i + 1) = code (i)
+						next
+					else
+						size = size + 1
+						redim preserve listeners(size)
+						listeners(size) = code
+					end if
+
+					mergedEvents( eventName ) = listeners
+				end if
+			next
+
+		end if
+
+		dim i, eventName, handlers, configON, ub, code
+
+		if mergedEvents.Count>0 then
+			if mergedConfig.Exists( "on" ) then
+				set configON = mergedConfig.items( "on" )
+			else
+				set configON = CreateObject("Scripting.Dictionary")
+				mergedConfig.Add "on", configOn
+			end if
+
+			for each eventName in mergedEvents
+				handlers = mergedEvents( eventName )
+				code = ""
+
+				if isArray(handlers) then
+					uB = ubound(handlers)
+					if (uB = 0) then
+						code = handlers(0)
+					else
+						code = "function (ev) {"
+						for i=0 to uB
+							code = code & "(" & handlers(i) & ")(ev);"
+						next
+						code = code & "}"
+					end if
+				else
+					code = handlers
+				end if
+				' Using @@ at the beggining to signal JSON that we don't want this quoted.
+				configON.Add eventName, "@@" & code
+			next
+
+'			set mergedConfig.Item("on") = configOn
+		end if
+
+		set configSettings = mergedConfig
+	end function
+
+	 ''
+		' Returns a copy of a scripting.dictionary object
+		'
+	private function cloneDictionary( base )
+		dim newOne, tmpKey
+
+		Set newOne = CreateObject("Scripting.Dictionary")
+		for each tmpKey in base
+			newOne.Add tmpKey , base( tmpKey )
+		next
+
+		set cloneDictionary = newOne
+	end function
+
+	 ''
+		' Combines two scripting.dictionary objects
+		' The base object isn't modified, and extra gets all the properties in base
+		'
+	private function mergeDictionary(base, extra)
+		dim newOne, tmpKey
+
+		for each tmpKey in base
+			if not(extra.Exists( tmpKey )) then
+				extra.Add tmpKey, base( tmpKey )
+			end if
+		next
+
+		set mergeDictionary = extra
+	end function
+
+	''
+	 ' Return global event handlers.
+	 '
+	private function returnGlobalEvents()
+		dim out, eventName, handlers
+		dim handlersForEvent, handler, code, i
+		out = ""
+
+		if (isempty(CKEDITOR_returnedEvents)) then
+			set CKEDITOR_returnedEvents = CreateObject("Scripting.Dictionary")
+		end if
+
+		for each eventName in oGlobalEvents
+			handlers = oGlobalEvents( eventName )
+
+			if not(CKEDITOR_returnedEvents.Exists(eventName)) then
+				CKEDITOR_returnedEvents.Add eventName, CreateObject("Scripting.Dictionary")
+			end if
+
+				set handlersForEvent = CKEDITOR_returnedEvents.Item( eventName )
+
+				' handlersForEvent is another dictionary
+				' and handlers is an array
+
+				for i = 0 to ubound(handlers)
+					code = handlers( i )
+
+					' Return only new events
+					if not(handlersForEvent.Exists( code )) then
+						if (out <> "") then out = out & vbcrlf
+						out = out & "CKEDITOR.on('" &  eventName & "', " & code & ");"
+						handlersForEvent.Add code, code
+					end if
+				next
+		next
+
+		returnGlobalEvents = out
+	end function
+
+	''
+	 ' Initializes CKEditor (executed only once).
+	 '
+	private function init()
+		dim out, args, path, extraCode, file
+		out = ""
+
+		if (CKEDITOR_initComplete) then
+			init = ""
+			exit function
+		end if
+
+		if (initialized) then
+			CKEDITOR_initComplete = true
+			init = ""
+			exit function
+		end if
+
+		args = ""
+		path = ckeditorPath()
+
+		if (timestamp <> "") and (timestamp <> "%" & "TIMESTAMP%") then
+			args = "?t=" & timestamp
+		end if
+
+		' Skip relative paths...
+		if (instr(path, "..") <> 0) then
+			out = out & script("window.CKEDITOR_BASEPATH='" &  path  & "';")
+		end if
+
+		out = out & "<scr" & "ipt type=""text/javascript"" src=""" & path & ckeditorFileName() & args & """></scr" & "ipt>" & vbcrlf
+
+		extraCode = ""
+		if (timestamp <> mTimeStamp) then
+			extraCode = extraCode & "CKEDITOR.timestamp = '" & timestamp & "';"
+		end if
+		if (extraCode <> "") then
+			out = out & script(extraCode)
+		end if
+
+		CKEDITOR_initComplete = true
+		initialized = true
+
+		init = out
+	end function
+
+	private function ckeditorFileName()
+		ckeditorFileName = "ckeditor.js"
+	end function
+
+	''
+	 ' Return path to ckeditor.js.
+	 '
+	private function ckeditorPath()
+		if (basePath <> "") then
+			ckeditorPath = basePath
+		else
+			' In classic ASP we can't get the location of this included script
+			ckeditorPath = "/ckeditor/"
+		end if
+
+		' Try to check if that folder contains the CKEditor files:
+		' If it's a full URL avoid checking it as it might point to an external server.
+		if (instr(ckeditorPath, "://") <> 0) then exit function
+
+		dim filename, oFSO, exists
+		filename = server.mapPath(basePath & ckeditorFileName())
+		set oFSO = Server.CreateObject("Scripting.FileSystemObject")
+		exists = oFSO.FileExists(filename)
+		set oFSO = nothing
+
+		if not(exists) then
+			response.clear
+			response.write "<h1>CKEditor path validation failed</h1>"
+			response.write "<p>The path &quot;" & ckeditorPath & "&quot; doesn't include the CKEditor main file (" & ckeditorFileName() & ")</p>"
+			response.write "<p>Please, verify that you have set it correctly and/or adjust the 'basePath' property</p>"
+			response.write "<p>Checked for physical file: &quot;" & filename & "&quot;</p>"
+			response.end
+		end if
+	end function
+
+End Class
+
+
+
+' URL: http://www.webdevbros.net/2007/04/26/generate-json-from-asp-datatypes/
+'**************************************************************************************************************
+'' @CLASSTITLE:		JSON
+'' @CREATOR:		Michal Gabrukiewicz (gabru at grafix.at), Michael Rebec
+'' @CONTRIBUTORS:	- Cliff Pruitt (opensource at crayoncowboy.com)
+''					- Sylvain Lafontaine
+''					- Jef Housein
+''					- Jeremy Brown
+'' @CREATEDON:		2007-04-26 12:46
+'' @CDESCRIPTION:	Comes up with functionality for JSON (http://json.org) to use within ASP.
+''					Correct escaping of characters, generating JSON Grammer out of ASP datatypes and structures
+''					Some examples (all use the <em>toJSON()</em> method but as it is the class' default method it can be left out):
+''					<code>
+''					<%
+''					'simple number
+''					output = (new JSON)("myNum", 2, false)
+''					'generates {"myNum": 2}
+''
+''					'array with different datatypes
+''					output = (new JSON)("anArray", array(2, "x", null), true)
+''					'generates "anArray": [2, "x", null]
+''					'(note: the last parameter was true, thus no surrounding brackets in the result)
+''					% >
+''					</code>
+'' @REQUIRES:		-
+'' @OPTIONEXPLICIT:	yes
+'' @VERSION:		1.5.1
+
+'**************************************************************************************************************
+class JSON
+
+	'private members
+	private output, innerCall
+
+	'**********************************************************************************************************
+	'* constructor
+	'**********************************************************************************************************
+	public sub class_initialize()
+		newGeneration()
+	end sub
+
+	'******************************************************************************************
+	'' @SDESCRIPTION:	STATIC! takes a given string and makes it JSON valid
+	'' @DESCRIPTION:	all characters which needs to be escaped are beeing replaced by their
+	''					unicode representation according to the
+	''					RFC4627#2.5 - http://www.ietf.org/rfc/rfc4627.txt?number=4627
+	'' @PARAM:			val [string]: value which should be escaped
+	'' @RETURN:			[string] JSON valid string
+	'******************************************************************************************
+	public function escape(val)
+		dim cDoubleQuote, cRevSolidus, cSolidus
+		cDoubleQuote = &h22
+		cRevSolidus = &h5C
+		cSolidus = &h2F
+		dim i, currentDigit
+		for i = 1 to (len(val))
+			currentDigit = mid(val, i, 1)
+			if ascw(currentDigit) > &h00 and ascw(currentDigit) < &h1F then
+				currentDigit = escapequence(currentDigit)
+			elseif ascw(currentDigit) >= &hC280 and ascw(currentDigit) <= &hC2BF then
+				currentDigit = "\u00" + right(padLeft(hex(ascw(currentDigit) - &hC200), 2, 0), 2)
+			elseif ascw(currentDigit) >= &hC380 and ascw(currentDigit) <= &hC3BF then
+				currentDigit = "\u00" + right(padLeft(hex(ascw(currentDigit) - &hC2C0), 2, 0), 2)
+			else
+				select case ascw(currentDigit)
+					case cDoubleQuote: currentDigit = escapequence(currentDigit)
+					case cRevSolidus: currentDigit = escapequence(currentDigit)
+					case cSolidus: currentDigit = escapequence(currentDigit)
+				end select
+			end if
+			escape = escape & currentDigit
+		next
+	end function
+
+	'******************************************************************************************************************
+	'' @SDESCRIPTION:	generates a representation of a name value pair in JSON grammer
+	'' @DESCRIPTION:	It generates a name value pair which is represented as <em>{"name": value}</em> in JSON.
+	''					the generation is fully recursive. Thus the value can also be a complex datatype (array in dictionary, etc.) e.g.
+	''					<code>
+	''					<%
+	''					set j = new JSON
+	''					j.toJSON "n", array(RS, dict, false), false
+	''					j.toJSON "n", array(array(), 2, true), false
+	''					% >
+	''					</code>
+	'' @PARAM:			name [string]: name of the value (accessible with javascript afterwards). leave empty to get just the value
+	'' @PARAM:			val [variant], [int], [float], [array], [object], [dictionary]: value which needs
+	''					to be generated. Conversation of the data types is as follows:<br>
+	''					- <strong>ASP datatype -> JavaScript datatype</strong>
+	''					- NOTHING, NULL -> null
+	''					- INT, DOUBLE -> number
+	''					- STRING -> string
+	''					- BOOLEAN -> bool
+	''					- ARRAY -> array
+	''					- DICTIONARY -> Represents it as name value pairs. Each key is accessible as property afterwards. json will look like <code>"name": {"key1": "some value", "key2": "other value"}</code>
+	''					- <em>multidimensional array</em> -> Generates a 1-dimensional array (flat) with all values of the multidimensional array
+	''					- <em>request</em> object -> every property and collection (cookies, form, querystring, etc) of the asp request object is exposed as an item of a dictionary. Property names are <strong>lowercase</strong>. e.g. <em>servervariables</em>.
+	''					- OBJECT -> name of the type (if unknown type) or all its properties (if class implements <em>reflect()</em> method)
+	''					Implement a <strong>reflect()</strong> function if you want your custom classes to be recognized. The function must return
+	''					a dictionary where the key holds the property name and the value its value. Example of a reflect function within a User class which has firstname and lastname properties
+	''					<code>
+	''					<%
+	''					function reflect()
+	''					.	set reflect = server.createObject("scripting.dictionary")
+	''					.	reflect.add "firstname", firstname
+	''					.	reflect.add "lastname", lastname
+	''					end function
+	''					% >
+	''					</code>
+	''					Example of how to generate a JSON representation of the asp request object and access the <em>HTTP_HOST</em> server variable in JavaScript:
+	''					<code>
+	''					<script>alert(<%= (new JSON)(empty, request, false) % >.servervariables.HTTP_HOST);</script>
+	''					</code>
+	'' @PARAM:			nested [bool]: indicates if the name value pair is already nested within another? if yes then the <em>{}</em> are left out.
+	'' @RETURN:			[string] returns a JSON representation of the given name value pair
+	'******************************************************************************************************************
+	public default function toJSON(name, val, nested)
+		if not nested and not isEmpty(name) then write("{")
+		if not isEmpty(name) then write("""" & escape(name) & """: ")
+		generateValue(val)
+		if not nested and not isEmpty(name) then write("}")
+		toJSON = output
+
+		if innerCall = 0 then newGeneration()
+	end function
+
+	'******************************************************************************************************************
+	'* generate
+	'******************************************************************************************************************
+	private function generateValue(val)
+		if isNull(val) then
+			write("null")
+		elseif isArray(val) then
+			generateArray(val)
+		elseif isObject(val) then
+			dim tName : tName = typename(val)
+			if val is nothing then
+				write("null")
+			elseif tName = "Dictionary" or tName = "IRequestDictionary" then
+				generateDictionary(val)
+			elseif tName = "IRequest" then
+				set req = server.createObject("scripting.dictionary")
+				req.add "clientcertificate", val.ClientCertificate
+				req.add "cookies", val.cookies
+				req.add "form", val.form
+				req.add "querystring", val.queryString
+				req.add "servervariables", val.serverVariables
+				req.add "totalbytes", val.totalBytes
+				generateDictionary(req)
+			elseif tName = "IStringList" then
+				if val.count = 1 then
+					toJSON empty, val(1), true
+				else
+					generateArray(val)
+				end if
+			else
+				generateObject(val)
+			end if
+		else
+			'bool
+			dim varTyp
+			varTyp = varType(val)
+			if varTyp = 11 then
+				if val then write("true") else write("false")
+			'int, long, byte
+			elseif varTyp = 2 or varTyp = 3 or varTyp = 17 or varTyp = 19 then
+				write(cLng(val))
+			'single, double, currency
+			elseif varTyp = 4 or varTyp = 5 or varTyp = 6 or varTyp = 14 then
+				write(replace(cDbl(val), ",", "."))
+			else
+				' Using @@ at the beggining to signal JSON that we don't want this quoted.
+				if left(val, 2) = "@@" then
+					write( mid( val, 3 ) )
+				else
+					write("""" & escape(val & "") & """")
+				end if
+			end if
+		end if
+		generateValue = output
+	end function
+
+	'******************************************************************************************************************
+	'* generateArray
+	'******************************************************************************************************************
+	private sub generateArray(val)
+		dim item, i
+		write("[")
+		i = 0
+		'the for each allows us to support also multi dimensional arrays
+		for each item in val
+			if i > 0 then write(",")
+			generateValue(item)
+			i = i + 1
+		next
+		write("]")
+	end sub
+
+	'******************************************************************************************************************
+	'* generateDictionary
+	'******************************************************************************************************************
+	private sub generateDictionary(val)
+		innerCall = innerCall + 1
+		if val.count = 0 then
+			toJSON empty, null, true
+			exit sub
+		end if
+		dim key, i
+		write("{")
+		i = 0
+		for each key in val
+			if i > 0 then write(",")
+			toJSON key, val(key), true
+			i = i + 1
+		next
+		write("}")
+		innerCall = innerCall - 1
+	end sub
+
+	'******************************************************************************************************************
+	'* generateObject
+	'******************************************************************************************************************
+	private sub generateObject(val)
+		dim props
+		on error resume next
+		set props = val.reflect()
+		if err = 0 then
+			on error goto 0
+			innerCall = innerCall + 1
+			toJSON empty, props, true
+			innerCall = innerCall - 1
+		else
+			on error goto 0
+			write("""" & escape(typename(val)) & """")
+		end if
+	end sub
+
+	'******************************************************************************************************************
+	'* newGeneration
+	'******************************************************************************************************************
+	private sub newGeneration()
+		output = empty
+		innerCall = 0
+	end sub
+
+	'******************************************************************************************
+	'* JsonEscapeSquence
+	'******************************************************************************************
+	private function escapequence(digit)
+		escapequence = "\u00" + right(padLeft(hex(ascw(digit)), 2, 0), 2)
+	end function
+
+	'******************************************************************************************
+	'* padLeft
+	'******************************************************************************************
+	private function padLeft(value, totalLength, paddingChar)
+		padLeft = right(clone(paddingChar, totalLength) & value, totalLength)
+	end function
+
+	'******************************************************************************************
+	'* clone
+	'******************************************************************************************
+	private function clone(byVal str, n)
+		dim i
+		for i = 1 to n : clone = clone & str : next
+	end function
+
+	'******************************************************************************************
+	'* write
+	'******************************************************************************************
+	private sub write(val)
+		output = output & val
+	end sub
+
+end class
+%>
diff --git a/web/imcms/ckeditor/ckeditor.js b/web/imcms/ckeditor/ckeditor.js
new file mode 100644
index 0000000000..5af17c62d4
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor.js
@@ -0,0 +1,153 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'D03G5XL',version:'3.6.6',revision:'7689',rnd:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();var a=CKEDITOR;if(!a.event){a.event=function(){};a.event.implementOn=function(b){var c=a.event.prototype;for(var d in c){if(b[d]==undefined)b[d]=c[d];}};a.event.prototype=(function(){var b=function(d){var e=d.getPrivate&&d.getPrivate()||d._||(d._={});return e.events||(e.events={});},c=function(d){this.name=d;this.listeners=[];};c.prototype={getListenerIndex:function(d){for(var e=0,f=this.listeners;e<f.length;e++){if(f[e].fn==d)return e;}return-1;}};return{on:function(d,e,f,g,h){var i=b(this),j=i[d]||(i[d]=new c(d));if(j.getListenerIndex(e)<0){var k=j.listeners;if(!f)f=this;if(isNaN(h))h=10;var l=this,m=function(o,p,q,r){var s={name:d,sender:this,editor:o,data:p,listenerData:g,stop:q,cancel:r,removeListener:function(){l.removeListener(d,e);}};e.call(f,s);return s.data;};m.fn=e;m.priority=h;for(var n=k.length-1;n>=0;n--){if(k[n].priority<=h){k.splice(n+1,0,m);return;}}k.unshift(m);}},fire:(function(){var d=false,e=function(){d=true;},f=false,g=function(){f=true;};return function(h,i,j){var k=b(this)[h],l=d,m=f;d=f=false;if(k){var n=k.listeners;if(n.length){n=n.slice(0);for(var o=0;o<n.length;o++){var p=n[o].call(this,j,i,e,g);if(typeof p!='undefined')i=p;if(d||f)break;}}}var q=f||(typeof i=='undefined'?false:i);d=l;f=m;return q;};})(),fireOnce:function(d,e,f){var g=this.fire(d,e,f);delete b(this)[d];return g;},removeListener:function(d,e){var f=b(this)[d];if(f){var g=f.getListenerIndex(e);
+if(g>=0)f.listeners.splice(g,1);}},hasListeners:function(d){var e=b(this)[d];return e&&e.listeners.length>0;}};})();}if(!a.editor){a.ELEMENT_MODE_NONE=0;a.ELEMENT_MODE_REPLACE=1;a.ELEMENT_MODE_APPENDTO=2;a.editor=function(b,c,d,e){var f=this;f._={instanceConfig:b,element:c,data:e};f.elementMode=d||0;a.event.call(f);f._init();};a.editor.replace=function(b,c){var d=b;if(typeof d!='object'){d=document.getElementById(b);if(d&&d.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1})d=null;if(!d){var e=0,f=document.getElementsByName(b);while((d=f[e++])&&d.tagName.toLowerCase()!='textarea'){}}if(!d)throw '[CKEDITOR.editor.replace] The element with id or name "'+b+'" was not found.';}d.style.visibility='hidden';return new a.editor(c,d,1);};a.editor.appendTo=function(b,c,d){var e=b;if(typeof e!='object'){e=document.getElementById(b);if(!e)throw '[CKEDITOR.editor.appendTo] The element with id "'+b+'" was not found.';}return new a.editor(c,e,2,d);};a.editor.prototype={_init:function(){var b=a.editor._pending||(a.editor._pending=[]);b.push(this);},fire:function(b,c){return a.event.prototype.fire.call(this,b,c,this);},fireOnce:function(b,c){return a.event.prototype.fireOnce.call(this,b,c,this);}};a.event.implementOn(a.editor.prototype,true);}if(!a.env)a.env=(function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,d={ie:/*@cc_on!@*/false,opera:!!c&&c.version,webkit:b.indexOf(' applewebkit/')>-1,air:b.indexOf(' adobeair/')>-1,mac:b.indexOf('macintosh')>-1,quirks:document.compatMode=='BackCompat',mobile:b.indexOf('mobile')>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var g=document.domain,h=window.location.hostname;return g!=h&&g!='['+h+']';},secure:location.protocol=='https:'};d.gecko=navigator.product=='Gecko'&&!d.webkit&&!d.opera;var e=0;if(d.ie){e=parseFloat(b.match(/msie (\d+)/)[1]);d.ie8=!!document.documentMode;d.ie8Compat=document.documentMode==8;d.ie9Compat=document.documentMode==9;d.ie7Compat=e==7&&!document.documentMode||document.documentMode==7;d.ie6Compat=e<7||d.quirks;}if(d.gecko){var f=b.match(/rv:([\d\.]+)/);if(f){f=f[1].split('.');e=f[0]*10000+(f[1]||0)*100+ +(f[2]||0);}}if(d.opera)e=parseFloat(c.version());if(d.air)e=parseFloat(b.match(/ adobeair\/(\d+)/)[1]);if(d.webkit)e=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]);d.version=e;d.isCompatible=d.iOS&&e>=534||!d.mobile&&(d.ie&&e>=6||d.gecko&&e>=10801||d.opera&&e>=9.5||d.air&&e>=1||d.webkit&&e>=522||false);d.cssClass='cke_browser_'+(d.ie?'ie':d.gecko?'gecko':d.opera?'opera':d.webkit?'webkit':'unknown');
+if(d.quirks)d.cssClass+=' cke_browser_quirks';if(d.ie){d.cssClass+=' cke_browser_ie'+(d.version<7?'6':d.version>=8?document.documentMode:'7');if(d.quirks)d.cssClass+=' cke_browser_iequirks';if(document.documentMode&&document.documentMode>=9)d.cssClass+=' cke_browser_ie9plus';}if(d.gecko&&e<10900)d.cssClass+=' cke_browser_gecko18';if(d.air)d.cssClass+=' cke_browser_air';return d;})();var b=a.env;var c=b.ie;if(a.status=='unloaded')(function(){a.event.implementOn(a);a.loadFullCore=function(){if(a.status!='basic_ready'){a.loadFullCore._load=1;return;}delete a.loadFullCore;var e=document.createElement('script');e.type='text/javascript';e.src=a.basePath+'ckeditor.js';document.getElementsByTagName('head')[0].appendChild(e);};a.loadFullCoreTimeout=0;a.replaceClass='ckeditor';a.replaceByClassEnabled=1;var d=function(e,f,g,h){if(b.isCompatible){if(a.loadFullCore)a.loadFullCore();var i=g(e,f,h);a.add(i);return i;}return null;};a.replace=function(e,f){return d(e,f,a.editor.replace);};a.appendTo=function(e,f,g){return d(e,f,a.editor.appendTo,g);};a.add=function(e){var f=this._.pending||(this._.pending=[]);f.push(e);};a.replaceAll=function(){var e=document.getElementsByTagName('textarea');for(var f=0;f<e.length;f++){var g=null,h=e[f];if(!h.name&&!h.id)continue;if(typeof arguments[0]=='string'){var i=new RegExp('(?:^|\\s)'+arguments[0]+'(?:$|\\s)');if(!i.test(h.className))continue;}else if(typeof arguments[0]=='function'){g={};if(arguments[0](h,g)===false)continue;}this.replace(h,g);}};(function(){var e=function(){var f=a.loadFullCore,g=a.loadFullCoreTimeout;if(a.replaceByClassEnabled)a.replaceAll(a.replaceClass);a.status='basic_ready';if(f&&f._load)f();else if(g)setTimeout(function(){if(a.loadFullCore)a.loadFullCore();},g*1000);};if(window.addEventListener)window.addEventListener('load',e,false);else if(window.attachEvent)window.attachEvent('onload',e);})();a.status='basic_loaded';})();a.dom={};var d=a.dom;(function(){var e=[];a.on('reset',function(){e=[];});a.tools={arrayCompare:function(f,g){if(!f&&!g)return true;if(!f||!g||f.length!=g.length)return false;for(var h=0;h<f.length;h++){if(f[h]!=g[h])return false;}return true;},clone:function(f){var g;if(f&&f instanceof Array){g=[];for(var h=0;h<f.length;h++)g[h]=this.clone(f[h]);return g;}if(f===null||typeof f!='object'||f instanceof String||f instanceof Number||f instanceof Boolean||f instanceof Date||f instanceof RegExp)return f;g=new f.constructor();for(var i in f){var j=f[i];g[i]=this.clone(j);}return g;},capitalize:function(f){return f.charAt(0).toUpperCase()+f.substring(1).toLowerCase();
+},extend:function(f){var g=arguments.length,h,i;if(typeof (h=arguments[g-1])=='boolean')g--;else if(typeof (h=arguments[g-2])=='boolean'){i=arguments[g-1];g-=2;}for(var j=1;j<g;j++){var k=arguments[j];for(var l in k){if(h===true||f[l]==undefined)if(!i||l in i)f[l]=k[l];}}return f;},prototypedCopy:function(f){var g=function(){};g.prototype=f;return new g();},isArray:function(f){return!!f&&f instanceof Array;},isEmpty:function(f){for(var g in f){if(f.hasOwnProperty(g))return false;}return true;},cssStyleToDomStyle:(function(){var f=document.createElement('div').style,g=typeof f.cssFloat!='undefined'?'cssFloat':typeof f.styleFloat!='undefined'?'styleFloat':'float';return function(h){if(h=='float')return g;else return h.replace(/-./g,function(i){return i.substr(1).toUpperCase();});};})(),buildStyleHtml:function(f){f=[].concat(f);var g,h=[];for(var i=0;i<f.length;i++){g=f[i];if(/@import|[{}]/.test(g))h.push('<style>'+g+'</style>');else h.push('<link type="text/css" rel=stylesheet href="'+g+'">');}return h.join('');},htmlEncode:function(f){var g=function(k){var l=new d.element('span');l.setText(k);return l.getHtml();},h=g('\n').toLowerCase()=='<br>'?function(k){return g(k).replace(/<br>/gi,'\n');}:g,i=g('>')=='>'?function(k){return h(k).replace(/>/g,'&gt;');}:h,j=g('  ')=='&nbsp; '?function(k){return i(k).replace(/&nbsp;/g,' ');}:i;this.htmlEncode=j;return this.htmlEncode(f);},htmlEncodeAttr:function(f){return f.replace(/"/g,'&quot;').replace(/</g,'&lt;').replace(/>/g,'&gt;');},getNextNumber:(function(){var f=0;return function(){return++f;};})(),getNextId:function(){return 'cke_'+this.getNextNumber();},override:function(f,g){return g(f);},setTimeout:function(f,g,h,i,j){if(!j)j=window;if(!h)h=j;return j.setTimeout(function(){if(i)f.apply(h,[].concat(i));else f.apply(h);},g||0);},trim:(function(){var f=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(g){return g.replace(f,'');};})(),ltrim:(function(){var f=/^[ \t\n\r]+/g;return function(g){return g.replace(f,'');};})(),rtrim:(function(){var f=/[ \t\n\r]+$/g;return function(g){return g.replace(f,'');};})(),indexOf:Array.prototype.indexOf?function(f,g){return f.indexOf(g);}:function(f,g){for(var h=0,i=f.length;h<i;h++){if(f[h]===g)return h;}return-1;},bind:function(f,g){return function(){return f.apply(g,arguments);};},createClass:function(f){var g=f.$,h=f.base,i=f.privates||f._,j=f.proto,k=f.statics;if(i){var l=g;g=function(){var p=this;var m=p._||(p._={});for(var n in i){var o=i[n];m[n]=typeof o=='function'?a.tools.bind(o,p):o;
+}l.apply(p,arguments);};}if(h){g.prototype=this.prototypedCopy(h.prototype);g.prototype['constructor']=g;g.prototype.base=function(){this.base=h.prototype.base;h.apply(this,arguments);this.base=arguments.callee;};}if(j)this.extend(g.prototype,j,true);if(k)this.extend(g,k,true);return g;},addFunction:function(f,g){return e.push(function(){return f.apply(g||this,arguments);})-1;},removeFunction:function(f){e[f]=null;},callFunction:function(f){var g=e[f];return g&&g.apply(window,Array.prototype.slice.call(arguments,1));},cssLength:(function(){return function(f){return f+(!f||isNaN(Number(f))?'':'px');};})(),convertToPx:(function(){var f;return function(g){if(!f){f=d.element.createFromHtml('<div style="position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"></div>',a.document);a.document.getBody().append(f);}if(!/%$/.test(g)){f.setStyle('width',g);return f.$.clientWidth;}return g;};})(),repeat:function(f,g){return new Array(g+1).join(f);},tryThese:function(){var f;for(var g=0,h=arguments.length;g<h;g++){var i=arguments[g];try{f=i();break;}catch(j){}}return f;},genKey:function(){return Array.prototype.slice.call(arguments).join('-');},normalizeCssText:function(f,g){var h=[],i,j=a.tools.parseCssText(f,true,g);for(i in j)h.push(i+':'+j[i]);h.sort();return h.length?h.join(';')+';':'';},convertRgbToHex:function(f){return f.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(g,h,i,j){var k=[h,i,j];for(var l=0;l<3;l++)k[l]=('0'+parseInt(k[l],10).toString(16)).slice(-2);return '#'+k.join('');});},parseCssText:function(f,g,h){var i={};if(h){var j=new d.element('span');j.setAttribute('style',f);f=a.tools.convertRgbToHex(j.getAttribute('style')||'');}if(!f||f==';')return i;f.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(k,l,m){if(g){l=l.toLowerCase();if(l=='font-family')m=m.toLowerCase().replace(/["']/g,'').replace(/\s*,\s*/g,',');m=a.tools.trim(m);}i[l]=m;});return i;}};})();var e=a.tools;a.dtd=(function(){var f=e.extend,g={isindex:1,fieldset:1},h={input:1,button:1,select:1,textarea:1,label:1},i=f({a:1},h),j=f({iframe:1},i),k={hr:1,ul:1,menu:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1},l={ins:1,del:1,script:1,style:1},m=f({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1,wbr:1},l),n=f({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1,mark:1},m),o=f({p:1},n),p=f({iframe:1},n,h),q={img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1},r=f({a:1},p),s={tr:1},t={'#':1},u=f({param:1},q),v=f({form:1},g,j,k,o),w={li:1},x={style:1,script:1},y={base:1,link:1,meta:1,title:1},z=f(y,x),A={head:1,body:1},B={html:1},C={address:1,blockquote:1,center:1,dir:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1};
+return{$nonBodyContent:f(B,A,y),$block:C,$blockLimit:{body:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,td:1,th:1,caption:1,form:1},$inline:r,$body:f({script:1,style:1},C),$cdata:{script:1,style:1},$empty:{area:1,base:1,br:1,col:1,hr:1,img:1,input:1,link:1,meta:1,param:1,wbr:1},$listItem:{dd:1,dt:1,li:1},$list:{ul:1,ol:1,dl:1},$nonEditable:{applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1,param:1,audio:1,video:1},$captionBlock:{caption:1,legend:1},$removeEmpty:{abbr:1,acronym:1,address:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1,mark:1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},html:A,head:z,style:t,script:t,body:v,base:{},link:{},meta:{},title:t,col:{},tr:{td:1,th:1},img:{},colgroup:{col:1},noscript:v,td:v,br:{},wbr:{},th:v,center:v,kbd:r,button:f(o,k),basefont:{},h5:r,h4:r,samp:r,h6:r,ol:w,h1:r,h3:r,option:t,h2:r,form:f(g,j,k,o),select:{optgroup:1,option:1},font:r,ins:r,menu:w,abbr:r,label:r,table:{thead:1,col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1},code:r,tfoot:s,cite:r,li:v,input:{},iframe:v,strong:r,textarea:t,noframes:v,big:r,small:r,span:r,hr:{},dt:r,sub:r,optgroup:{option:1},param:{},bdo:r,'var':r,div:v,object:u,sup:r,dd:v,strike:r,area:{},dir:w,map:f({area:1,form:1,p:1},g,l,k),applet:u,dl:{dt:1,dd:1},del:r,isindex:{},fieldset:f({legend:1},q),thead:s,ul:w,acronym:r,b:r,a:p,blockquote:v,caption:r,i:r,u:r,tbody:s,s:r,address:f(j,o),tt:r,legend:r,q:r,pre:f(m,i),p:r,em:r,dfn:r,section:v,header:v,footer:v,nav:v,article:v,aside:v,figure:v,dialog:v,hgroup:v,mark:r,time:r,meter:r,menu:r,command:r,keygen:r,output:r,progress:u,audio:u,video:u,details:u,datagrid:u,datalist:u};})();var f=a.dtd;d.event=function(g){this.$=g;};d.event.prototype={getKey:function(){return this.$.keyCode||this.$.which;},getKeystroke:function(){var h=this;var g=h.getKey();if(h.$.ctrlKey||h.$.metaKey)g+=1114112;if(h.$.shiftKey)g+=2228224;if(h.$.altKey)g+=4456448;return g;},preventDefault:function(g){var h=this.$;if(h.preventDefault)h.preventDefault();else h.returnValue=false;if(g)this.stopPropagation();},stopPropagation:function(){var g=this.$;if(g.stopPropagation)g.stopPropagation();else g.cancelBubble=true;
+},getTarget:function(){var g=this.$.target||this.$.srcElement;return g?new d.node(g):null;},getPageOffset:function(){var j=this;var g=j.getTarget().getDocument().$,h=j.$.pageX||j.$.clientX+(g.documentElement.scrollLeft||g.body.scrollLeft),i=j.$.pageY||j.$.clientY+(g.documentElement.scrollTop||g.body.scrollTop);return{x:h,y:i};}};a.CTRL=1114112;a.SHIFT=2228224;a.ALT=4456448;d.domObject=function(g){if(g)this.$=g;};d.domObject.prototype=(function(){var g=function(h,i){return function(j){if(typeof a!='undefined')h.fire(i,new d.event(j));};};return{getPrivate:function(){var h;if(!(h=this.getCustomData('_')))this.setCustomData('_',h={});return h;},on:function(h){var k=this;var i=k.getCustomData('_cke_nativeListeners');if(!i){i={};k.setCustomData('_cke_nativeListeners',i);}if(!i[h]){var j=i[h]=g(k,h);if(k.$.addEventListener)k.$.addEventListener(h,j,!!a.event.useCapture);else if(k.$.attachEvent)k.$.attachEvent('on'+h,j);}return a.event.prototype.on.apply(k,arguments);},removeListener:function(h){var k=this;a.event.prototype.removeListener.apply(k,arguments);if(!k.hasListeners(h)){var i=k.getCustomData('_cke_nativeListeners'),j=i&&i[h];if(j){if(k.$.removeEventListener)k.$.removeEventListener(h,j,false);else if(k.$.detachEvent)k.$.detachEvent('on'+h,j);delete i[h];}}},removeAllListeners:function(){var k=this;var h=k.getCustomData('_cke_nativeListeners');for(var i in h){var j=h[i];if(k.$.detachEvent)k.$.detachEvent('on'+i,j);else if(k.$.removeEventListener)k.$.removeEventListener(i,j,false);delete h[i];}}};})();(function(g){var h={};a.on('reset',function(){h={};});g.equals=function(i){return i&&i.$===this.$;};g.setCustomData=function(i,j){var k=this.getUniqueId(),l=h[k]||(h[k]={});l[i]=j;return this;};g.getCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j];return k&&k[i];};g.removeCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j],l=k&&k[i];if(typeof l!='undefined')delete k[i];return l||null;};g.clearCustomData=function(){this.removeAllListeners();var i=this.$['data-cke-expando'];i&&delete h[i];};g.getUniqueId=function(){return this.$['data-cke-expando']||(this.$['data-cke-expando']=e.getNextNumber());};a.event.implementOn(g);})(d.domObject.prototype);d.window=function(g){d.domObject.call(this,g);};d.window.prototype=new d.domObject();e.extend(d.window.prototype,{focus:function(){if(b.webkit&&this.$.parent)this.$.parent.focus();this.$.focus();},getViewPaneSize:function(){var g=this.$.document,h=g.compatMode=='CSS1Compat';return{width:(h?g.documentElement.clientWidth:g.body.clientWidth)||0,height:(h?g.documentElement.clientHeight:g.body.clientHeight)||0};
+},getScrollPosition:function(){var g=this.$;if('pageXOffset' in g)return{x:g.pageXOffset||0,y:g.pageYOffset||0};else{var h=g.document;return{x:h.documentElement.scrollLeft||h.body.scrollLeft||0,y:h.documentElement.scrollTop||h.body.scrollTop||0};}}});d.document=function(g){d.domObject.call(this,g);};var g=d.document;g.prototype=new d.domObject();e.extend(g.prototype,{appendStyleSheet:function(h){if(this.$.createStyleSheet)this.$.createStyleSheet(h);else{var i=new d.element('link');i.setAttributes({rel:'stylesheet',type:'text/css',href:h});this.getHead().append(i);}},appendStyleText:function(h){var k=this;if(k.$.createStyleSheet){var i=k.$.createStyleSheet('');i.cssText=h;}else{var j=new d.element('style',k);j.append(new d.text(h,k));k.getHead().append(j);}},createElement:function(h,i){var j=new d.element(h,this);if(i){if(i.attributes)j.setAttributes(i.attributes);if(i.styles)j.setStyles(i.styles);}return j;},createText:function(h){return new d.text(h,this);},focus:function(){this.getWindow().focus();},getById:function(h){var i=this.$.getElementById(h);return i?new d.element(i):null;},getByAddress:function(h,i){var j=this.$.documentElement;for(var k=0;j&&k<h.length;k++){var l=h[k];if(!i){j=j.childNodes[l];continue;}var m=-1;for(var n=0;n<j.childNodes.length;n++){var o=j.childNodes[n];if(i===true&&o.nodeType==3&&o.previousSibling&&o.previousSibling.nodeType==3)continue;m++;if(m==l){j=o;break;}}}return j?new d.node(j):null;},getElementsByTag:function(h,i){if(!(c&&!(document.documentMode>8))&&i)h=i+':'+h;return new d.nodeList(this.$.getElementsByTagName(h));},getHead:function(){var h=this.$.getElementsByTagName('head')[0];if(!h)h=this.getDocumentElement().append(new d.element('head'),true);else h=new d.element(h);return(this.getHead=function(){return h;})();},getBody:function(){var h=new d.element(this.$.body);return(this.getBody=function(){return h;})();},getDocumentElement:function(){var h=new d.element(this.$.documentElement);return(this.getDocumentElement=function(){return h;})();},getWindow:function(){var h=new d.window(this.$.parentWindow||this.$.defaultView);return(this.getWindow=function(){return h;})();},write:function(h){var i=this;i.$.open('text/html','replace');b.isCustomDomain()&&(i.$.domain=document.domain);i.$.write(h);i.$.close();}});d.node=function(h){if(h){var i=h.nodeType==9?'document':h.nodeType==1?'element':h.nodeType==3?'text':h.nodeType==8?'comment':'domObject';return new d[i](h);}return this;};d.node.prototype=new d.domObject();a.NODE_ELEMENT=1;
+a.NODE_DOCUMENT=9;a.NODE_TEXT=3;a.NODE_COMMENT=8;a.NODE_DOCUMENT_FRAGMENT=11;a.POSITION_IDENTICAL=0;a.POSITION_DISCONNECTED=1;a.POSITION_FOLLOWING=2;a.POSITION_PRECEDING=4;a.POSITION_IS_CONTAINED=8;a.POSITION_CONTAINS=16;e.extend(d.node.prototype,{appendTo:function(h,i){h.append(this,i);return h;},clone:function(h,i){var j=this.$.cloneNode(h),k=function(l){if(l.nodeType!=1)return;if(!i)l.removeAttribute('id',false);l['data-cke-expando']=undefined;if(h){var m=l.childNodes;for(var n=0;n<m.length;n++)k(m[n]);}};k(j);return new d.node(j);},hasPrevious:function(){return!!this.$.previousSibling;},hasNext:function(){return!!this.$.nextSibling;},insertAfter:function(h){h.$.parentNode.insertBefore(this.$,h.$.nextSibling);return h;},insertBefore:function(h){h.$.parentNode.insertBefore(this.$,h.$);return h;},insertBeforeMe:function(h){this.$.parentNode.insertBefore(h.$,this.$);return h;},getAddress:function(h){var i=[],j=this.getDocument().$.documentElement,k=this.$;while(k&&k!=j){var l=k.parentNode;if(l)i.unshift(this.getIndex.call({$:k},h));k=l;}return i;},getDocument:function(){return new g(this.$.ownerDocument||this.$.parentNode.ownerDocument);},getIndex:function(h){var i=this.$,j=0;while(i=i.previousSibling){if(h&&i.nodeType==3&&(!i.nodeValue.length||i.previousSibling&&i.previousSibling.nodeType==3))continue;j++;}return j;},getNextSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getFirst&&this.getFirst(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getNext();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getNext();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&i!=l.type)return l.getNextSourceNode(false,i,j);return l;},getPreviousSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getLast&&this.getLast(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getPrevious();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getPrevious();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&l.type!=i)return l.getPreviousSourceNode(false,i,j);return l;},getPrevious:function(h){var i=this.$,j;do{i=i.previousSibling;j=i&&i.nodeType!=10&&new d.node(i);}while(j&&h&&!h(j));return j;},getNext:function(h){var i=this.$,j;do{i=i.nextSibling;j=i&&new d.node(i);}while(j&&h&&!h(j));return j;},getParent:function(){var h=this.$.parentNode;return h&&h.nodeType==1?new d.node(h):null;
+},getParents:function(h){var i=this,j=[];do j[h?'push':'unshift'](i);while(i=i.getParent());return j;},getCommonAncestor:function(h){var j=this;if(h.equals(j))return j;if(h.contains&&h.contains(j))return h;var i=j.contains?j:j.getParent();do{if(i.contains(h))return i;}while(i=i.getParent());return null;},getPosition:function(h){var i=this.$,j=h.$;if(i.compareDocumentPosition)return i.compareDocumentPosition(j);if(i==j)return 0;if(this.type==1&&h.type==1){if(i.contains){if(i.contains(j))return 16+4;if(j.contains(i))return 8+2;}if('sourceIndex' in i)return i.sourceIndex<0||j.sourceIndex<0?1:i.sourceIndex<j.sourceIndex?4:2;}var k=this.getAddress(),l=h.getAddress(),m=Math.min(k.length,l.length);for(var n=0;n<=m-1;n++){if(k[n]!=l[n]){if(n<m)return k[n]<l[n]?4:2;break;}}return k.length<l.length?16+4:8+2;},getAscendant:function(h,i){var j=this.$,k;if(!i)j=j.parentNode;while(j){if(j.nodeName&&(k=j.nodeName.toLowerCase(),typeof h=='string'?k==h:k in h))return new d.node(j);j=j.parentNode;}return null;},hasAscendant:function(h,i){var j=this.$;if(!i)j=j.parentNode;while(j){if(j.nodeName&&j.nodeName.toLowerCase()==h)return true;j=j.parentNode;}return false;},move:function(h,i){h.append(this.remove(),i);},remove:function(h){var i=this.$,j=i.parentNode;if(j){if(h)for(var k;k=i.firstChild;)j.insertBefore(i.removeChild(k),i);j.removeChild(i);}return this;},replace:function(h){this.insertBefore(h);h.remove();},trim:function(){this.ltrim();this.rtrim();},ltrim:function(){var k=this;var h;while(k.getFirst&&(h=k.getFirst())){if(h.type==3){var i=e.ltrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(j-i.length);k.$.removeChild(k.$.firstChild);}}break;}},rtrim:function(){var k=this;var h;while(k.getLast&&(h=k.getLast())){if(h.type==3){var i=e.rtrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(i.length);k.$.lastChild.parentNode.removeChild(k.$.lastChild);}}break;}if(!c&&!b.opera){h=k.$.lastChild;if(h&&h.type==1&&h.nodeName.toLowerCase()=='br')h.parentNode.removeChild(h);}},isReadOnly:function(){var h=this;if(this.type!=1)h=this.getParent();if(h&&typeof h.$.isContentEditable!='undefined')return!(h.$.isContentEditable||h.data('cke-editable'));else{var i=h;while(i){if(i.is('body')||!!i.data('cke-editable'))break;if(i.getAttribute('contentEditable')=='false')return true;else if(i.getAttribute('contentEditable')=='true')break;i=i.getParent();}return false;}}});d.nodeList=function(h){this.$=h;};d.nodeList.prototype={count:function(){return this.$.length;
+},getItem:function(h){var i=this.$[h];return i?new d.node(i):null;}};d.element=function(h,i){if(typeof h=='string')h=(i?i.$:document).createElement(h);d.domObject.call(this,h);};var h=d.element;h.get=function(i){return i&&(i.$?i:new h(i));};h.prototype=new d.node();h.createFromHtml=function(i,j){var k=new h('div',j);k.setHtml(i);return k.getFirst().remove();};h.setMarker=function(i,j,k,l){var m=j.getCustomData('list_marker_id')||j.setCustomData('list_marker_id',e.getNextNumber()).getCustomData('list_marker_id'),n=j.getCustomData('list_marker_names')||j.setCustomData('list_marker_names',{}).getCustomData('list_marker_names');i[m]=j;n[k]=1;return j.setCustomData(k,l);};h.clearAllMarkers=function(i){for(var j in i)h.clearMarkers(i,i[j],1);};h.clearMarkers=function(i,j,k){var l=j.getCustomData('list_marker_names'),m=j.getCustomData('list_marker_id');for(var n in l)j.removeCustomData(n);j.removeCustomData('list_marker_names');if(k){j.removeCustomData('list_marker_id');delete i[m];}};(function(){e.extend(h.prototype,{type:1,addClass:function(l){var m=this.$.className;if(m){var n=new RegExp('(?:^|\\s)'+l+'(?:\\s|$)','');if(!n.test(m))m+=' '+l;}this.$.className=m||l;},removeClass:function(l){var m=this.getAttribute('class');if(m){var n=new RegExp('(?:^|\\s+)'+l+'(?=\\s|$)','i');if(n.test(m)){m=m.replace(n,'').replace(/^\s+/,'');if(m)this.setAttribute('class',m);else this.removeAttribute('class');}}},hasClass:function(l){var m=new RegExp('(?:^|\\s+)'+l+'(?=\\s|$)','');return m.test(this.getAttribute('class'));},append:function(l,m){var n=this;if(typeof l=='string')l=n.getDocument().createElement(l);if(m)n.$.insertBefore(l.$,n.$.firstChild);else n.$.appendChild(l.$);return l;},appendHtml:function(l){var n=this;if(!n.$.childNodes.length)n.setHtml(l);else{var m=new h('div',n.getDocument());m.setHtml(l);m.moveChildren(n);}},appendText:function(l){if(this.$.text!=undefined)this.$.text+=l;else this.append(new d.text(l));},appendBogus:function(){var n=this;var l=n.getLast();while(l&&l.type==3&&!e.rtrim(l.getText()))l=l.getPrevious();if(!l||!l.is||!l.is('br')){var m=b.opera?n.getDocument().createText(''):n.getDocument().createElement('br');b.gecko&&m.setAttribute('type','_moz');n.append(m);}},breakParent:function(l){var o=this;var m=new d.range(o.getDocument());m.setStartAfter(o);m.setEndAfter(l);var n=m.extractContents();m.insertNode(o.remove());n.insertAfterNode(o);},contains:c||b.webkit?function(l){var m=this.$;return l.type!=1?m.contains(l.getParent().$):m!=l.$&&m.contains(l.$);
+}:function(l){return!!(this.$.compareDocumentPosition(l.$)&16);},focus:(function(){function l(){try{this.$.focus();}catch(m){}};return function(m){if(m)e.setTimeout(l,100,this);else l.call(this);};})(),getHtml:function(){var l=this.$.innerHTML;return c?l.replace(/<\?[^>]*>/g,''):l;},getOuterHtml:function(){var m=this;if(m.$.outerHTML)return m.$.outerHTML.replace(/<\?[^>]*>/,'');var l=m.$.ownerDocument.createElement('div');l.appendChild(m.$.cloneNode(true));return l.innerHTML;},setHtml:function(l){return this.$.innerHTML=l;},setText:function(l){h.prototype.setText=this.$.innerText!=undefined?function(m){return this.$.innerText=m;}:function(m){return this.$.textContent=m;};return this.setText(l);},getAttribute:(function(){var l=function(m){return this.$.getAttribute(m,2);};if(c&&(b.ie7Compat||b.ie6Compat))return function(m){var q=this;switch(m){case 'class':m='className';break;case 'http-equiv':m='httpEquiv';break;case 'name':return q.$.name;case 'tabindex':var n=l.call(q,m);if(n!==0&&q.$.tabIndex===0)n=null;return n;break;case 'checked':var o=q.$.attributes.getNamedItem(m),p=o.specified?o.nodeValue:q.$.checked;return p?'checked':null;case 'hspace':case 'value':return q.$[m];case 'style':return q.$.style.cssText;case 'contenteditable':case 'contentEditable':return q.$.attributes.getNamedItem('contentEditable').specified?q.$.getAttribute('contentEditable'):null;}return l.call(q,m);};else return l;})(),getChildren:function(){return new d.nodeList(this.$.childNodes);},getComputedStyle:c?function(l){return this.$.currentStyle[e.cssStyleToDomStyle(l)];}:function(l){var m=this.getWindow().$.getComputedStyle(this.$,null);return m?m.getPropertyValue(l):'';},getDtd:function(){var l=f[this.getName()];this.getDtd=function(){return l;};return l;},getElementsByTag:g.prototype.getElementsByTag,getTabIndex:c?function(){var l=this.$.tabIndex;if(l===0&&!f.$tabIndex[this.getName()]&&parseInt(this.getAttribute('tabindex'),10)!==0)l=-1;return l;}:b.webkit?function(){var l=this.$.tabIndex;if(l==undefined){l=parseInt(this.getAttribute('tabindex'),10);if(isNaN(l))l=-1;}return l;}:function(){return this.$.tabIndex;},getText:function(){return this.$.textContent||this.$.innerText||'';},getWindow:function(){return this.getDocument().getWindow();},getId:function(){return this.$.id||null;},getNameAtt:function(){return this.$.name||null;},getName:function(){var l=this.$.nodeName.toLowerCase();if(c&&!(document.documentMode>8)){var m=this.$.scopeName;if(m!='HTML')l=m.toLowerCase()+':'+l;}return(this.getName=function(){return l;
+})();},getValue:function(){return this.$.value;},getFirst:function(l){var m=this.$.firstChild,n=m&&new d.node(m);if(n&&l&&!l(n))n=n.getNext(l);return n;},getLast:function(l){var m=this.$.lastChild,n=m&&new d.node(m);if(n&&l&&!l(n))n=n.getPrevious(l);return n;},getStyle:function(l){return this.$.style[e.cssStyleToDomStyle(l)];},is:function(){var l=this.getName();for(var m=0;m<arguments.length;m++){if(arguments[m]==l)return true;}return false;},isEditable:function(l){var o=this;var m=o.getName();if(o.isReadOnly()||o.getComputedStyle('display')=='none'||o.getComputedStyle('visibility')=='hidden'||o.is('a')&&o.data('cke-saved-name')&&!o.getChildCount()||f.$nonEditable[m]||f.$empty[m])return false;if(l!==false){var n=f[m]||f.span;return n&&n['#'];}return true;},isIdentical:function(l){if(this.getName()!=l.getName())return false;var m=this.$.attributes,n=l.$.attributes,o=m.length,p=n.length;for(var q=0;q<o;q++){var r=m[q];if(r.nodeName=='_moz_dirty')continue;if((!c||r.specified&&r.nodeName!='data-cke-expando')&&r.nodeValue!=l.getAttribute(r.nodeName))return false;}if(c)for(q=0;q<p;q++){r=n[q];if(r.specified&&r.nodeName!='data-cke-expando'&&r.nodeValue!=this.getAttribute(r.nodeName))return false;}return true;},isVisible:function(){var o=this;var l=(o.$.offsetHeight||o.$.offsetWidth)&&o.getComputedStyle('visibility')!='hidden',m,n;if(l&&(b.webkit||b.opera)){m=o.getWindow();if(!m.equals(a.document.getWindow())&&(n=m.$.frameElement))l=new h(n).isVisible();}return!!l;},isEmptyInlineRemoveable:function(){if(!f.$removeEmpty[this.getName()])return false;var l=this.getChildren();for(var m=0,n=l.count();m<n;m++){var o=l.getItem(m);if(o.type==1&&o.data('cke-bookmark'))continue;if(o.type==1&&!o.isEmptyInlineRemoveable()||o.type==3&&e.trim(o.getText()))return false;}return true;},hasAttributes:c&&(b.ie7Compat||b.ie6Compat)?function(){var l=this.$.attributes;for(var m=0;m<l.length;m++){var n=l[m];switch(n.nodeName){case 'class':if(this.getAttribute('class'))return true;case 'data-cke-expando':continue;default:if(n.specified)return true;}}return false;}:function(){var l=this.$.attributes,m=l.length,n={'data-cke-expando':1,_moz_dirty:1};return m>0&&(m>2||!n[l[0].nodeName]||m==2&&!n[l[1].nodeName]);},hasAttribute:(function(){function l(m){var n=this.$.attributes.getNamedItem(m);return!!(n&&n.specified);};return c&&b.version<8?function(m){if(m=='name')return!!this.$.name;return l.call(this,m);}:l;})(),hide:function(){this.setStyle('display','none');},moveChildren:function(l,m){var n=this.$;
+l=l.$;if(n==l)return;var o;if(m)while(o=n.lastChild)l.insertBefore(n.removeChild(o),l.firstChild);else while(o=n.firstChild)l.appendChild(n.removeChild(o));},mergeSiblings:(function(){function l(m,n,o){if(n&&n.type==1){var p=[];while(n.data('cke-bookmark')||n.isEmptyInlineRemoveable()){p.push(n);n=o?n.getNext():n.getPrevious();if(!n||n.type!=1)return;}if(m.isIdentical(n)){var q=o?m.getLast():m.getFirst();while(p.length)p.shift().move(m,!o);n.moveChildren(m,!o);n.remove();if(q&&q.type==1)q.mergeSiblings();}}};return function(m){var n=this;if(!(m===false||f.$removeEmpty[n.getName()]||n.is('a')))return;l(n,n.getNext(),true);l(n,n.getPrevious());};})(),show:function(){this.setStyles({display:'',visibility:''});},setAttribute:(function(){var l=function(m,n){this.$.setAttribute(m,n);return this;};if(c&&(b.ie7Compat||b.ie6Compat))return function(m,n){var o=this;if(m=='class')o.$.className=n;else if(m=='style')o.$.style.cssText=n;else if(m=='tabindex')o.$.tabIndex=n;else if(m=='checked')o.$.checked=n;else if(m=='contenteditable')l.call(o,'contentEditable',n);else l.apply(o,arguments);return o;};else if(b.ie8Compat&&b.secure)return function(m,n){if(m=='src'&&n.match(/^http:\/\//))try{l.apply(this,arguments);}catch(o){}else l.apply(this,arguments);return this;};else return l;})(),setAttributes:function(l){for(var m in l)this.setAttribute(m,l[m]);return this;},setValue:function(l){this.$.value=l;return this;},removeAttribute:(function(){var l=function(m){this.$.removeAttribute(m);};if(c&&(b.ie7Compat||b.ie6Compat))return function(m){if(m=='class')m='className';else if(m=='tabindex')m='tabIndex';else if(m=='contenteditable')m='contentEditable';l.call(this,m);};else return l;})(),removeAttributes:function(l){if(e.isArray(l))for(var m=0;m<l.length;m++)this.removeAttribute(l[m]);else for(var n in l)l.hasOwnProperty(n)&&this.removeAttribute(n);},removeStyle:function(l){var p=this;var m=p.$.style;if(!m.removeProperty&&(l=='border'||l=='margin'||l=='padding')){var n=j(l);for(var o=0;o<n.length;o++)p.removeStyle(n[o]);return;}m.removeProperty?m.removeProperty(l):m.removeAttribute(e.cssStyleToDomStyle(l));if(!p.$.style.cssText)p.removeAttribute('style');},setStyle:function(l,m){this.$.style[e.cssStyleToDomStyle(l)]=m;return this;},setStyles:function(l){for(var m in l)this.setStyle(m,l[m]);return this;},setOpacity:function(l){if(c&&b.version<9){l=Math.round(l*100);this.setStyle('filter',l>=100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+l+')');}else this.setStyle('opacity',l);
+},unselectable:b.gecko?function(){this.$.style.MozUserSelect='none';this.on('dragstart',function(l){l.data.preventDefault();});}:b.webkit?function(){this.$.style.KhtmlUserSelect='none';this.on('dragstart',function(l){l.data.preventDefault();});}:function(){if(c||b.opera){var l=this.$,m=l.getElementsByTagName('*'),n,o=0;l.unselectable='on';while(n=m[o++])switch(n.tagName.toLowerCase()){case 'iframe':case 'textarea':case 'input':case 'select':break;default:n.unselectable='on';}}},getPositionedAncestor:function(){var l=this;while(l.getName()!='html'){if(l.getComputedStyle('position')!='static')return l;l=l.getParent();}return null;},getDocumentPosition:function(l){var G=this;var m=0,n=0,o=G.getDocument(),p=o.getBody(),q=o.$.compatMode=='BackCompat';if(document.documentElement.getBoundingClientRect){var r=G.$.getBoundingClientRect(),s=o.$,t=s.documentElement,u=t.clientTop||p.$.clientTop||0,v=t.clientLeft||p.$.clientLeft||0,w=true;if(c){var x=o.getDocumentElement().contains(G),y=o.getBody().contains(G);w=q&&y||!q&&x;}if(w){m=r.left+(!q&&t.scrollLeft||p.$.scrollLeft);m-=v;n=r.top+(!q&&t.scrollTop||p.$.scrollTop);n-=u;}}else{var z=G,A=null,B;while(z&&!(z.getName()=='body'||z.getName()=='html')){m+=z.$.offsetLeft-z.$.scrollLeft;n+=z.$.offsetTop-z.$.scrollTop;if(!z.equals(G)){m+=z.$.clientLeft||0;n+=z.$.clientTop||0;}var C=A;while(C&&!C.equals(z)){m-=C.$.scrollLeft;n-=C.$.scrollTop;C=C.getParent();}A=z;z=(B=z.$.offsetParent)?new h(B):null;}}if(l){var D=G.getWindow(),E=l.getWindow();if(!D.equals(E)&&D.$.frameElement){var F=new h(D.$.frameElement).getDocumentPosition(l);m+=F.x;n+=F.y;}}if(!document.documentElement.getBoundingClientRect)if(b.gecko&&!q){m+=G.$.clientLeft?1:0;n+=G.$.clientTop?1:0;}return{x:m,y:n};},scrollIntoView:function(l){var m=this.getParent();if(!m)return;do{var n=m.$.clientWidth&&m.$.clientWidth<m.$.scrollWidth||m.$.clientHeight&&m.$.clientHeight<m.$.scrollHeight;if(n)this.scrollIntoParent(m,l,1);if(m.is('html')){var o=m.getWindow();try{var p=o.$.frameElement;p&&(m=new h(p));}catch(q){}}}while(m=m.getParent());},scrollIntoParent:function(l,m,n){!l&&(l=this.getWindow());var o=l.getDocument(),p=o.$.compatMode=='BackCompat';if(l instanceof d.window)l=p?o.getBody():o.getDocumentElement();function q(C,D){if(/body|html/.test(l.getName()))l.getWindow().$.scrollBy(C,D);else{l.$.scrollLeft+=C;l.$.scrollTop+=D;}};function r(C,D){var E={x:0,y:0};if(!C.is(p?'body':'html')){var F=C.$.getBoundingClientRect();E.x=F.left,E.y=F.top;}var G=C.getWindow();if(!G.equals(D)){var H=r(h.get(G.$.frameElement),D);
+E.x+=H.x,E.y+=H.y;}return E;};function s(C,D){return parseInt(C.getComputedStyle('margin-'+D)||0,10)||0;};var t=l.getWindow(),u=r(this,t),v=r(l,t),w=this.$.offsetHeight,x=this.$.offsetWidth,y=l.$.clientHeight,z=l.$.clientWidth,A,B;A={x:u.x-s(this,'left')-v.x||0,y:u.y-s(this,'top')-v.y||0};B={x:u.x+x+s(this,'right')-(v.x+z)||0,y:u.y+w+s(this,'bottom')-(v.y+y)||0};if(A.y<0||B.y>0)q(0,m===true?A.y:m===false?B.y:A.y<0?A.y:B.y);if(n&&(A.x<0||B.x>0))q(A.x<0?A.x:B.x,0);},setState:function(l){var m=this;switch(l){case 1:m.addClass('cke_on');m.removeClass('cke_off');m.removeClass('cke_disabled');break;case 0:m.addClass('cke_disabled');m.removeClass('cke_off');m.removeClass('cke_on');break;default:m.addClass('cke_off');m.removeClass('cke_on');m.removeClass('cke_disabled');break;}},getFrameDocument:function(){var l=this.$;try{l.contentWindow.document;}catch(m){l.src=l.src;if(c&&b.version<7)window.showModalDialog('javascript:document.write("<script>window.setTimeout(function(){window.close();},50);</script>")');}return l&&new g(l.contentWindow.document);},copyAttributes:function(l,m){var s=this;var n=s.$.attributes;m=m||{};for(var o=0;o<n.length;o++){var p=n[o],q=p.nodeName.toLowerCase(),r;if(q in m)continue;if(q=='checked'&&(r=s.getAttribute(q)))l.setAttribute(q,r);else if(p.specified||c&&p.nodeValue&&q=='value'){r=s.getAttribute(q);if(r===null)r=p.nodeValue;l.setAttribute(q,r);}}if(s.$.style.cssText!=='')l.$.style.cssText=s.$.style.cssText;},renameNode:function(l){var o=this;if(o.getName()==l)return;var m=o.getDocument(),n=new h(l,m);o.copyAttributes(n);o.moveChildren(n);o.getParent()&&o.$.parentNode.replaceChild(n.$,o.$);n.$['data-cke-expando']=o.$['data-cke-expando'];o.$=n.$;},getChild:function(l){var m=this.$;if(!l.slice)m=m.childNodes[l];else while(l.length>0&&m)m=m.childNodes[l.shift()];return m?new d.node(m):null;},getChildCount:function(){return this.$.childNodes.length;},disableContextMenu:function(){this.on('contextmenu',function(l){if(!l.data.getTarget().hasClass('cke_enable_context_menu'))l.data.preventDefault();});},getDirection:function(l){var m=this;return l?m.getComputedStyle('direction')||m.getDirection()||m.getDocument().$.dir||m.getDocument().getBody().getDirection(1):m.getStyle('direction')||m.getAttribute('dir');},data:function(l,m){l='data-'+l;if(m===undefined)return this.getAttribute(l);else if(m===false)this.removeAttribute(l);else this.setAttribute(l,m);return null;}});var i={width:['border-left-width','border-right-width','padding-left','padding-right'],height:['border-top-width','border-bottom-width','padding-top','padding-bottom']};
+function j(l){var m=['top','left','right','bottom'],n;if(l=='border')n=['color','style','width'];var o=[];for(var p=0;p<m.length;p++){if(n)for(var q=0;q<n.length;q++)o.push([l,m[p],n[q]].join('-'));else o.push([l,m[p]].join('-'));}return o;};function k(l){var m=0;for(var n=0,o=i[l].length;n<o;n++)m+=parseInt(this.getComputedStyle(i[l][n])||0,10)||0;return m;};h.prototype.setSize=function(l,m,n){if(typeof m=='number'){if(n&&!(c&&b.quirks))m-=k.call(this,l);this.setStyle(l,m+'px');}};h.prototype.getSize=function(l,m){var n=Math.max(this.$['offset'+e.capitalize(l)],this.$['client'+e.capitalize(l)])||0;if(m)n-=k.call(this,l);return n;};})();a.command=function(i,j){this.uiItems=[];this.exec=function(k){var l=this;if(l.state==0)return false;if(l.editorFocus)i.focus();if(l.fire('exec')===true)return true;return j.exec.call(l,i,k)!==false;};this.refresh=function(){if(this.fire('refresh')===true)return true;return j.refresh&&j.refresh.apply(this,arguments)!==false;};e.extend(this,j,{modes:{wysiwyg:1},editorFocus:1,state:2});a.event.call(this);};a.command.prototype={enable:function(){var i=this;if(i.state==0)i.setState(!i.preserveState||typeof i.previousState=='undefined'?2:i.previousState);},disable:function(){this.setState(0);},setState:function(i){var j=this;if(j.state==i)return false;j.previousState=j.state;j.state=i;j.fire('state');return true;},toggleState:function(){var i=this;if(i.state==2)i.setState(1);else if(i.state==1)i.setState(2);}};a.event.implementOn(a.command.prototype,true);a.ENTER_P=1;a.ENTER_BR=2;a.ENTER_DIV=3;a.config={customConfig:'config.js',autoUpdateElement:true,baseHref:'',contentsCss:a.basePath+'contents.css',contentsLangDirection:'ui',contentsLanguage:'',language:'',defaultLanguage:'en',enterMode:1,forceEnterMode:false,shiftEnterMode:2,corePlugins:'',docType:'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',bodyId:'',bodyClass:'',fullPage:false,height:200,plugins:'about,a11yhelp,basicstyles,bidi,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,dialogadvtab,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,iframe,image,indent,justify,keystrokes,link,list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,showblocks,showborders,smiley,sourcearea,specialchar,stylescombo,tab,table,tabletools,templates,toolbar,undo,wsc,wysiwygarea',extraPlugins:'',removePlugins:'',protectedSource:[],tabIndex:0,theme:'default',skin:'kama',width:'',baseFloatZIndex:10000};
+var i=a.config;a.focusManager=function(j){if(j.focusManager)return j.focusManager;this.hasFocus=false;this._={editor:j};return this;};a.focusManager.prototype={focus:function(){var k=this;if(k._.timer)clearTimeout(k._.timer);if(!k.hasFocus){if(a.currentInstance)a.currentInstance.focusManager.forceBlur();var j=k._.editor;j.container.getChild(1).addClass('cke_focus');k.hasFocus=true;j.fire('focus');}},blur:function(){var j=this;if(j._.timer)clearTimeout(j._.timer);j._.timer=setTimeout(function(){delete j._.timer;j.forceBlur();},100);},forceBlur:function(){if(this.hasFocus){var j=this._.editor;j.container.getChild(1).removeClass('cke_focus');this.hasFocus=false;j.fire('blur');}}};(function(){var j={};a.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,el:1,'en-au':1,'en-ca':1,'en-gb':1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,'fr-ca':1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,'pt-br':1,pt:1,ro:1,ru:1,sk:1,sl:1,'sr-latn':1,sr:1,sv:1,th:1,tr:1,ug:1,uk:1,vi:1,'zh-cn':1,zh:1},load:function(k,l,m){if(!k||!a.lang.languages[k])k=this.detect(l,k);if(!this[k])a.scriptLoader.load(a.getUrl('lang/'+k+'.js'),function(){m(k,this[k]);},this);else m(k,this[k]);},detect:function(k,l){var m=this.languages;l=l||navigator.userLanguage||navigator.language||k;var n=l.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),o=n[1],p=n[2];if(m[o+'-'+p])o=o+'-'+p;else if(!m[o])o=null;a.lang.detect=o?function(){return o;}:function(q){return q;};return o||k;}};})();a.scriptLoader=(function(){var j={},k={};return{load:function(l,m,n,o){var p=typeof l=='string';if(p)l=[l];if(!n)n=a;var q=l.length,r=[],s=[],t=function(y){if(m)if(p)m.call(n,y);else m.call(n,r,s);};if(q===0){t(true);return;}var u=function(y,z){(z?r:s).push(y);if(--q<=0){o&&a.document.getDocumentElement().removeStyle('cursor');t(z);}},v=function(y,z){j[y]=1;var A=k[y];delete k[y];for(var B=0;B<A.length;B++)A[B](y,z);},w=function(y){if(j[y]){u(y,true);return;}var z=k[y]||(k[y]=[]);z.push(u);if(z.length>1)return;var A=new h('script');A.setAttributes({type:'text/javascript',src:y});if(m)if(c)A.$.onreadystatechange=function(){if(A.$.readyState=='loaded'||A.$.readyState=='complete'){A.$.onreadystatechange=null;v(y,true);}};else{A.$.onload=function(){setTimeout(function(){v(y,true);},0);};A.$.onerror=function(){v(y,false);};}A.appendTo(a.document.getHead());};o&&a.document.getDocumentElement().setStyle('cursor','wait');for(var x=0;x<q;x++)w(l[x]);}};})();a.resourceManager=function(j,k){var l=this;
+l.basePath=j;l.fileName=k;l.registered={};l.loaded={};l.externals={};l._={waitingList:{}};};a.resourceManager.prototype={add:function(j,k){if(this.registered[j])throw '[CKEDITOR.resourceManager.add] The resource name "'+j+'" is already registered.';a.fire(j+e.capitalize(this.fileName)+'Ready',this.registered[j]=k||{});},get:function(j){return this.registered[j]||null;},getPath:function(j){var k=this.externals[j];return a.getUrl(k&&k.dir||this.basePath+j+'/');},getFilePath:function(j){var k=this.externals[j];return a.getUrl(this.getPath(j)+(k&&typeof k.file=='string'?k.file:this.fileName+'.js'));},addExternal:function(j,k,l){j=j.split(',');for(var m=0;m<j.length;m++){var n=j[m];this.externals[n]={dir:k,file:l};}},load:function(j,k,l){if(!e.isArray(j))j=j?[j]:[];var m=this.loaded,n=this.registered,o=[],p={},q={};for(var r=0;r<j.length;r++){var s=j[r];if(!s)continue;if(!m[s]&&!n[s]){var t=this.getFilePath(s);o.push(t);if(!(t in p))p[t]=[];p[t].push(s);}else q[s]=this.get(s);}a.scriptLoader.load(o,function(u,v){if(v.length)throw '[CKEDITOR.resourceManager.load] Resource name "'+p[v[0]].join(',')+'" was not found at "'+v[0]+'".';for(var w=0;w<u.length;w++){var x=p[u[w]];for(var y=0;y<x.length;y++){var z=x[y];q[z]=this.get(z);m[z]=1;}}k.call(l,q);},this);}};a.plugins=new a.resourceManager('plugins/','plugin');var j=a.plugins;j.load=e.override(j.load,function(k){return function(l,m,n){var o={},p=function(q){k.call(this,q,function(r){e.extend(o,r);var s=[];for(var t in r){var u=r[t],v=u&&u.requires;if(v)for(var w=0;w<v.length;w++){if(!o[v[w]])s.push(v[w]);}}if(s.length)p.call(this,s);else{for(t in o){u=o[t];if(u.onLoad&&!u.onLoad._called){u.onLoad();u.onLoad._called=1;}}if(m)m.call(n||window,o);}},this);};p.call(this,l);};});j.setLang=function(k,l,m){var n=this.get(k),o=n.langEntries||(n.langEntries={}),p=n.lang||(n.lang=[]);if(e.indexOf(p,l)==-1)p.push(l);o[l]=m;};a.skins=(function(){var k={},l={},m=function(n,o,p,q){var r=k[o];if(!n.skin){n.skin=r;if(r.init)r.init(n);}var s=function(B){for(var C=0;C<B.length;C++)B[C]=a.getUrl(l[o]+B[C]);};function t(B,C){return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(D,E,F,G){if(/^\/|^\w?:/.test(F))return D;else return 'url('+C+E+F+G+')';});};p=r[p];var u=!p||!!p._isLoaded;if(u)q&&q();else{var v=p._pending||(p._pending=[]);v.push(q);if(v.length>1)return;var w=!p.css||!p.css.length,x=!p.js||!p.js.length,y=function(){if(w&&x){p._isLoaded=1;for(var B=0;B<v.length;B++){if(v[B])v[B]();}}};if(!w){var z=p.css;if(e.isArray(z)){s(z);
+for(var A=0;A<z.length;A++)a.document.appendStyleSheet(z[A]);}else{z=t(z,a.getUrl(l[o]));a.document.appendStyleText(z);}p.css=z;w=1;}if(!x){s(p.js);a.scriptLoader.load(p.js,function(){x=1;y();});}y();}};return{add:function(n,o){k[n]=o;o.skinPath=l[n]||(l[n]=a.getUrl('skins/'+n+'/'));},load:function(n,o,p){var q=n.skinName,r=n.skinPath;if(k[q])m(n,q,o,p);else{l[q]=r;a.scriptLoader.load(a.getUrl(r+'skin.js'),function(){m(n,q,o,p);});}}};})();a.themes=new a.resourceManager('themes/','theme');a.ui=function(k){if(k.ui)return k.ui;this._={handlers:{},items:{},editor:k};return this;};var k=a.ui;k.prototype={add:function(l,m,n){this._.items[l]={type:m,command:n.command||null,args:Array.prototype.slice.call(arguments,2)};},create:function(l){var q=this;var m=q._.items[l],n=m&&q._.handlers[m.type],o=m&&m.command&&q._.editor.getCommand(m.command),p=n&&n.create.apply(q,m.args);m&&(p=e.extend(p,q._.editor.skin[m.type],true));if(o)o.uiItems.push(p);return p;},addHandler:function(l,m){this._.handlers[l]=m;}};a.event.implementOn(k);(function(){var l=0,m=function(){var x='editor'+ ++l;return a.instances&&a.instances[x]?m():x;},n={},o=function(x){var y=x.config.customConfig;if(!y)return false;y=a.getUrl(y);var z=n[y]||(n[y]={});if(z.fn){z.fn.call(x,x.config);if(a.getUrl(x.config.customConfig)==y||!o(x))x.fireOnce('customConfigLoaded');}else a.scriptLoader.load(y,function(){if(a.editorConfig)z.fn=a.editorConfig;else z.fn=function(){};o(x);});return true;},p=function(x,y){x.on('customConfigLoaded',function(){if(y){if(y.on)for(var z in y.on)x.on(z,y.on[z]);e.extend(x.config,y,true);delete x.config.on;}q(x);});if(y&&y.customConfig!=undefined)x.config.customConfig=y.customConfig;if(!o(x))x.fireOnce('customConfigLoaded');},q=function(x){var y=x.config.skin.split(','),z=y[0],A=a.getUrl(y[1]||'skins/'+z+'/');x.skinName=z;x.skinPath=A;x.skinClass='cke_skin_'+z;x.tabIndex=x.config.tabIndex||x.element.getAttribute('tabindex')||0;x.readOnly=!!(x.config.readOnly||x.element.getAttribute('disabled'));x.fireOnce('configLoaded');t(x);},r=function(x){a.lang.load(x.config.language,x.config.defaultLanguage,function(y,z){x.langCode=y;x.lang=e.prototypedCopy(z);if(b.gecko&&b.version<10900&&x.lang.dir=='rtl')x.lang.dir='ltr';x.fire('langLoaded');var A=x.config;A.contentsLangDirection=='ui'&&(A.contentsLangDirection=x.lang.dir);s(x);});},s=function(x){var y=x.config,z=y.plugins,A=y.extraPlugins,B=y.removePlugins;if(A){var C=new RegExp('(?:^|,)(?:'+A.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');
+z+=','+A;}if(B){C=new RegExp('(?:^|,)(?:'+B.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');}b.air&&(z+=',adobeair');j.load(z.split(','),function(D){var E=[],F=[],G=[];x.plugins=D;for(var H in D){var I=D[H],J=I.lang,K=j.getPath(H),L=null;I.path=K;if(J){L=e.indexOf(J,x.langCode)>=0?x.langCode:J[0];if(!I.langEntries||!I.langEntries[L])G.push(a.getUrl(K+'lang/'+L+'.js'));else{e.extend(x.lang,I.langEntries[L]);L=null;}}F.push(L);E.push(I);}a.scriptLoader.load(G,function(){var M=['beforeInit','init','afterInit'];for(var N=0;N<M.length;N++)for(var O=0;O<E.length;O++){var P=E[O];if(N===0&&F[O]&&P.lang)e.extend(x.lang,P.langEntries[F[O]]);if(P[M[N]])P[M[N]](x);}x.fire('pluginsLoaded');u(x);});});},t=function(x){a.skins.load(x,'editor',function(){r(x);});},u=function(x){var y=x.config.theme;a.themes.load(y,function(){var z=x.theme=a.themes.get(y);z.path=a.themes.getPath(y);z.build(x);if(x.config.autoUpdateElement)v(x);});},v=function(x){var y=x.element;if(x.elementMode==1&&y.is('textarea')){var z=y.$.form&&new h(y.$.form);if(z){function A(){x.updateElement();};z.on('submit',A);if(!z.$.submit.nodeName&&!z.$.submit.length)z.$.submit=e.override(z.$.submit,function(B){return function(){x.updateElement();if(B.apply)B.apply(this,arguments);else B();};});x.on('destroy',function(){z.removeListener('submit',A);});}}};function w(){var x,y=this._.commands,z=this.mode;if(!z)return;for(var A in y){x=y[A];x[x.startDisabled?'disable':this.readOnly&&!x.readOnly?'disable':x.modes[z]?'enable':'disable']();}};a.editor.prototype._init=function(){var z=this;var x=h.get(z._.element),y=z._.instanceConfig;delete z._.element;delete z._.instanceConfig;z._.commands={};z._.styles=[];z.element=x;z.name=x&&z.elementMode==1&&(x.getId()||x.getNameAtt())||m();if(z.name in a.instances)throw '[CKEDITOR.editor] The instance "'+z.name+'" already exists.';z.id=e.getNextId();z.config=e.prototypedCopy(i);z.ui=new k(z);z.focusManager=new a.focusManager(z);a.fire('instanceCreated',null,z);z.on('mode',w,null,null,1);z.on('readOnly',w,null,null,1);p(z,y);};})();e.extend(a.editor.prototype,{addCommand:function(l,m){return this._.commands[l]=new a.command(this,m);},addCss:function(l){this._.styles.push(l);},destroy:function(l){var m=this;if(!l)m.updateElement();m.fire('destroy');m.theme&&m.theme.destroy(m);a.remove(m);a.fire('instanceDestroyed',null,m);},execCommand:function(l,m){var n=this.getCommand(l),o={name:l,commandData:m,command:n};if(n&&n.state!=0)if(this.fire('beforeCommandExec',o)!==true){o.returnValue=n.exec(o.commandData);
+if(!n.async&&this.fire('afterCommandExec',o)!==true)return o.returnValue;}return false;},getCommand:function(l){return this._.commands[l];},getData:function(){var n=this;n.fire('beforeGetData');var l=n._.data;if(typeof l!='string'){var m=n.element;if(m&&n.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();else l='';}l={dataValue:l};n.fire('getData',l);return l.dataValue;},getSnapshot:function(){var l=this.fire('getSnapshot');if(typeof l!='string'){var m=this.element;if(m&&this.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();}return l;},loadSnapshot:function(l){this.fire('loadSnapshot',l);},setData:function(l,m,n){if(m)this.on('dataReady',function(p){p.removeListener();m.call(p.editor);});var o={dataValue:l};!n&&this.fire('setData',o);this._.data=o.dataValue;!n&&this.fire('afterSetData',o);},setReadOnly:function(l){l=l==undefined||l;if(this.readOnly!=l){this.readOnly=l;this.fire('readOnly');}},insertHtml:function(l){this.fire('insertHtml',l);},insertText:function(l){this.fire('insertText',l);},insertElement:function(l){this.fire('insertElement',l);},checkDirty:function(){return this.mayBeDirty&&this._.previousValue!==this.getSnapshot();},resetDirty:function(){if(this.mayBeDirty)this._.previousValue=this.getSnapshot();},updateElement:function(){var n=this;var l=n.element;if(l&&n.elementMode==1){var m=n.getData();if(n.config.htmlEncodeOutput)m=e.htmlEncode(m);if(l.is('textarea'))l.setValue(m);else l.setHtml(m);}}});a.on('loaded',function(){var l=a.editor._pending;if(l){delete a.editor._pending;for(var m=0;m<l.length;m++)l[m]._init();}});a.htmlParser=function(){this._={htmlPartsRegex:new RegExp("<(?:(?:\\/([^>]+)>)|(?:!--([\\S|\\s]*?)-->)|(?:([^\\s>]+)\\s*((?:(?:\"[^\"]*\")|(?:'[^']*')|[^\"'>])*)\\/?>))",'g')};};(function(){var l=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,m={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};a.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(n){var A=this;var o,p,q=0,r;while(o=A._.htmlPartsRegex.exec(n)){var s=o.index;if(s>q){var t=n.substring(q,s);if(r)r.push(t);else A.onText(t);}q=A._.htmlPartsRegex.lastIndex;if(p=o[1]){p=p.toLowerCase();if(r&&f.$cdata[p]){A.onCDATA(r.join(''));r=null;}if(!r){A.onTagClose(p);continue;}}if(r){r.push(o[0]);continue;}if(p=o[3]){p=p.toLowerCase();if(/="/.test(p))continue;
+var u={},v,w=o[4],x=!!(w&&w.charAt(w.length-1)=='/');if(w)while(v=l.exec(w)){var y=v[1].toLowerCase(),z=v[2]||v[3]||v[4]||'';if(!z&&m[y])u[y]=y;else u[y]=z;}A.onTagOpen(p,u,x);if(!r&&f.$cdata[p])r=[];continue;}if(p=o[2])A.onComment(p);}if(n.length>q)A.onText(n.substring(q,n.length));}};})();a.htmlParser.comment=function(l){this.value=l;this._={isBlockLike:false};};a.htmlParser.comment.prototype={type:8,writeHtml:function(l,m){var n=this.value;if(m){if(!(n=m.onComment(n,this)))return;if(typeof n!='string'){n.parent=this.parent;n.writeHtml(l,m);return;}}l.comment(n);}};(function(){a.htmlParser.text=function(l){this.value=l;this._={isBlockLike:false};};a.htmlParser.text.prototype={type:3,writeHtml:function(l,m){var n=this.value;if(m&&!(n=m.onText(n,this)))return;l.text(n);}};})();(function(){a.htmlParser.cdata=function(l){this.value=l;};a.htmlParser.cdata.prototype={type:3,writeHtml:function(l){l.write(this.value);}};})();a.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:true,hasInlineStarted:false};};(function(){var l=e.extend({table:1,ul:1,ol:1,dl:1},f.table,f.ul,f.ol,f.dl),m=c&&b.version<8?{dd:1,dt:1}:{},n={ol:1,ul:1},o=e.extend({},{html:1},f.html,f.body,f.head,{style:1,script:1});function p(q){return q.name=='a'&&q.attributes.href||f.$removeEmpty[q.name];};a.htmlParser.fragment.fromHtml=function(q,r,s){var t=new a.htmlParser(),u=s||new a.htmlParser.fragment(),v=[],w=[],x=u,y=false,z=false;function A(D){var E;if(v.length>0)for(var F=0;F<v.length;F++){var G=v[F],H=G.name,I=f[H],J=x.name&&f[x.name];if((!J||J[H])&&(!D||!I||I[D]||!f[D])){if(!E){B();E=1;}G=G.clone();G.parent=x;x=G;v.splice(F,1);F--;}else if(H==x.name)C(x,x.parent,1),F--;}};function B(){while(w.length)x.add(w.shift());};function C(D,E,F){if(D.previous!==undefined)return;E=E||x||u;var G=x;if(r&&(!E.type||E.name=='body')){var H,I;if(D.attributes&&(I=D.attributes['data-cke-real-element-type']))H=I;else H=D.name;if(H&&!(H in f.$body||H=='body'||D.isOrphan)){x=E;t.onTagOpen(r,{});D.returnPoint=E=x;}}if(D._.isBlockLike&&D.name!='pre'&&D.name!='textarea'){var J=D.children.length,K=D.children[J-1],L;if(K&&K.type==3)if(!(L=e.rtrim(K.value)))D.children.length=J-1;else K.value=L;}E.add(D);if(D.name=='pre')z=false;if(D.name=='textarea')y=false;if(D.returnPoint){x=D.returnPoint;delete D.returnPoint;}else x=F?E:G;};t.onTagOpen=function(D,E,F,G){var H=new a.htmlParser.element(D,E);if(H.isUnknown&&F)H.isEmpty=true;H.isOptionalClose=D in m||G;if(p(H)){v.push(H);return;}else if(D=='pre')z=true;
+else if(D=='br'&&z){x.add(new a.htmlParser.text('\n'));return;}else if(D=='textarea')y=true;if(D=='br'){w.push(H);return;}while(1){var I=x.name,J=I?f[I]||(x._.isBlockLike?f.div:f.span):o;if(!H.isUnknown&&!x.isUnknown&&!J[D]){if(x.isOptionalClose)t.onTagClose(I);else if(D in n&&I in n){var K=x.children,L=K[K.length-1];if(!(L&&L.name=='li'))C(L=new a.htmlParser.element('li'),x);!H.returnPoint&&(H.returnPoint=x);x=L;}else if(D in f.$listItem&&I!=D)t.onTagOpen(D=='li'?'ul':'dl',{},0,1);else if(I in l&&I!=D){!H.returnPoint&&(H.returnPoint=x);x=x.parent;}else{if(I in f.$inline)v.unshift(x);if(x.parent)C(x,x.parent,1);else{H.isOrphan=1;break;}}}else break;}A(D);B();H.parent=x;if(H.isEmpty)C(H);else x=H;};t.onTagClose=function(D){for(var E=v.length-1;E>=0;E--){if(D==v[E].name){v.splice(E,1);return;}}var F=[],G=[],H=x;while(H!=u&&H.name!=D){if(!H._.isBlockLike)G.unshift(H);F.push(H);H=H.returnPoint||H.parent;}if(H!=u){for(E=0;E<F.length;E++){var I=F[E];C(I,I.parent);}x=H;if(H._.isBlockLike)B();C(H,H.parent);if(H==x)x=x.parent;v=v.concat(G);}if(D=='body')r=false;};t.onText=function(D){if((!x._.hasInlineStarted||w.length)&&!z&&!y){D=e.ltrim(D);if(D.length===0)return;}var E=x.name,F=E?f[E]||(x._.isBlockLike?f.div:f.span):o;if(!y&&!F['#']&&E in l){t.onTagOpen(E in n?'li':E=='dl'?'dd':E=='table'?'tr':E=='tr'?'td':'');t.onText(D);return;}B();A();if(r&&(!x.type||x.name=='body')&&e.trim(D))this.onTagOpen(r,{},0,1);if(!z&&!y)D=D.replace(/[\t\r\n ]{2,}|[\t\r\n]/g,' ');x.add(new a.htmlParser.text(D));};t.onCDATA=function(D){x.add(new a.htmlParser.cdata(D));};t.onComment=function(D){B();A();x.add(new a.htmlParser.comment(D));};t.parse(q);B(!c&&1);while(x!=u)C(x,x.parent,1);return u;};a.htmlParser.fragment.prototype={add:function(q,r){var t=this;isNaN(r)&&(r=t.children.length);var s=r>0?t.children[r-1]:null;if(s){if(q._.isBlockLike&&s.type==3){s.value=e.rtrim(s.value);if(s.value.length===0){t.children.pop();t.add(q);return;}}s.next=q;}q.previous=s;q.parent=t;t.children.splice(r,0,q);t._.hasInlineStarted=q.type==3||q.type==1&&!q._.isBlockLike;},writeHtml:function(q,r){var s;this.filterChildren=function(){var t=new a.htmlParser.basicWriter();this.writeChildrenHtml.call(this,t,r,true);var u=t.getHtml();this.children=new a.htmlParser.fragment.fromHtml(u).children;s=1;};!this.name&&r&&r.onFragment(this);this.writeChildrenHtml(q,s?null:r);},writeChildrenHtml:function(q,r){for(var s=0;s<this.children.length;s++)this.children[s].writeHtml(q,r);}};})();a.htmlParser.element=function(l,m){var q=this;
+q.name=l;q.attributes=m||{};q.children=[];var n=l||'',o=n.match(/^cke:(.*)/);o&&(n=o[1]);var p=!!(f.$nonBodyContent[n]||f.$block[n]||f.$listItem[n]||f.$tableContent[n]||f.$nonEditable[n]||n=='br');q.isEmpty=!!f.$empty[l];q.isUnknown=!f[l];q._={isBlockLike:p,hasInlineStarted:q.isEmpty||!p};};a.htmlParser.cssStyle=function(){var l,m=arguments[0],n={};l=m instanceof a.htmlParser.element?m.attributes.style:m;(l||'').replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(o,p,q){p=='font-family'&&(q=q.replace(/["']/g,''));n[p.toLowerCase()]=q;});return{rules:n,populate:function(o){var p=this.toString();if(p)o instanceof h?o.setAttribute('style',p):o instanceof a.htmlParser.element?o.attributes.style=p:o.style=p;},'toString':function(){var o=[];for(var p in n)n[p]&&o.push(p,':',n[p],';');return o.join('');}};};(function(){var l=function(m,n){m=m[0];n=n[0];return m<n?-1:m>n?1:0;};a.htmlParser.element.prototype={type:1,add:a.htmlParser.fragment.prototype.add,clone:function(){return new a.htmlParser.element(this.name,this.attributes);},writeHtml:function(m,n){var o=this.attributes,p=this,q=p.name,r,s,t,u;p.filterChildren=function(){if(!u){var B=new a.htmlParser.basicWriter();a.htmlParser.fragment.prototype.writeChildrenHtml.call(p,B,n);p.children=new a.htmlParser.fragment.fromHtml(B.getHtml(),0,p.clone()).children;u=1;}};if(n){for(;;){if(!(q=n.onElementName(q)))return;p.name=q;if(!(p=n.onElement(p)))return;p.parent=this.parent;if(p.name==q)break;if(p.type!=1){p.writeHtml(m,n);return;}q=p.name;if(!q){for(var v=0,w=this.children.length;v<w;v++)this.children[v].parent=p.parent;this.writeChildrenHtml.call(p,m,u?null:n);return;}}o=p.attributes;}m.openTag(q,o);var x=[];for(var y=0;y<2;y++)for(r in o){s=r;t=o[r];if(y==1)x.push([r,t]);else if(n){for(;;){if(!(s=n.onAttributeName(r))){delete o[r];break;}else if(s!=r){delete o[r];r=s;continue;}else break;}if(s)if((t=n.onAttribute(p,s,t))===false)delete o[s];else o[s]=t;}}if(m.sortAttributes)x.sort(l);var z=x.length;for(y=0;y<z;y++){var A=x[y];m.attribute(A[0],A[1]);}m.openTagClose(q,p.isEmpty);if(!p.isEmpty){this.writeChildrenHtml.call(p,m,u?null:n);m.closeTag(q);}},writeChildrenHtml:function(m,n){a.htmlParser.fragment.prototype.writeChildrenHtml.apply(this,arguments);}};})();(function(){a.htmlParser.filter=e.createClass({$:function(q){this._={elementNames:[],attributeNames:[],elements:{$length:0},attributes:{$length:0}};if(q)this.addRules(q,10);},proto:{addRules:function(q,r){var s=this;if(typeof r!='number')r=10;
+m(s._.elementNames,q.elementNames,r);m(s._.attributeNames,q.attributeNames,r);n(s._.elements,q.elements,r);n(s._.attributes,q.attributes,r);s._.text=o(s._.text,q.text,r)||s._.text;s._.comment=o(s._.comment,q.comment,r)||s._.comment;s._.root=o(s._.root,q.root,r)||s._.root;},onElementName:function(q){return l(q,this._.elementNames);},onAttributeName:function(q){return l(q,this._.attributeNames);},onText:function(q){var r=this._.text;return r?r.filter(q):q;},onComment:function(q,r){var s=this._.comment;return s?s.filter(q,r):q;},onFragment:function(q){var r=this._.root;return r?r.filter(q):q;},onElement:function(q){var v=this;var r=[v._.elements['^'],v._.elements[q.name],v._.elements.$],s,t;for(var u=0;u<3;u++){s=r[u];if(s){t=s.filter(q,v);if(t===false)return null;if(t&&t!=q)return v.onNode(t);if(q.parent&&!q.name)break;}}return q;},onNode:function(q){var r=q.type;return r==1?this.onElement(q):r==3?new a.htmlParser.text(this.onText(q.value)):r==8?new a.htmlParser.comment(this.onComment(q.value)):null;},onAttribute:function(q,r,s){var t=this._.attributes[r];if(t){var u=t.filter(s,q,this);if(u===false)return false;if(typeof u!='undefined')return u;}return s;}}});function l(q,r){for(var s=0;q&&s<r.length;s++){var t=r[s];q=q.replace(t[0],t[1]);}return q;};function m(q,r,s){if(typeof r=='function')r=[r];var t,u,v=q.length,w=r&&r.length;if(w){for(t=0;t<v&&q[t].pri<s;t++){}for(u=w-1;u>=0;u--){var x=r[u];if(x){x.pri=s;q.splice(t,0,x);}}}};function n(q,r,s){if(r)for(var t in r){var u=q[t];q[t]=o(u,r[t],s);if(!u)q.$length++;}};function o(q,r,s){if(r){r.pri=s;if(q){if(!q.splice){if(q.pri>s)q=[r,q];else q=[q,r];q.filter=p;}else m(q,r,s);return q;}else{r.filter=r;return r;}}};function p(q){var r=q.type||q instanceof a.htmlParser.fragment;for(var s=0;s<this.length;s++){if(r)var t=q.type,u=q.name;var v=this[s],w=v.apply(window,arguments);if(w===false)return w;if(r){if(w&&(w.name!=u||w.type!=t))return w;}else if(typeof w!='string')return w;w!=undefined&&(q=w);}return q;};})();a.htmlParser.basicWriter=e.createClass({$:function(){this._={output:[]};},proto:{openTag:function(l,m){this._.output.push('<',l);},openTagClose:function(l,m){if(m)this._.output.push(' />');else this._.output.push('>');},attribute:function(l,m){if(typeof m=='string')m=e.htmlEncodeAttr(m);this._.output.push(' ',l,'="',m,'"');},closeTag:function(l){this._.output.push('</',l,'>');},text:function(l){this._.output.push(l);},comment:function(l){this._.output.push('<!--',l,'-->');},write:function(l){this._.output.push(l);
+},reset:function(){this._.output=[];this._.indent=false;},getHtml:function(l){var m=this._.output.join('');if(l)this.reset();return m;}}});delete a.loadFullCore;a.instances={};a.document=new g(document);a.add=function(l){a.instances[l.name]=l;l.on('focus',function(){if(a.currentInstance!=l){a.currentInstance=l;a.fire('currentInstance');}});l.on('blur',function(){if(a.currentInstance==l){a.currentInstance=null;a.fire('currentInstance');}});};a.remove=function(l){delete a.instances[l.name];};a.on('instanceDestroyed',function(){if(e.isEmpty(this.instances))a.fire('reset');});a.TRISTATE_ON=1;a.TRISTATE_OFF=2;a.TRISTATE_DISABLED=0;d.comment=function(l,m){if(typeof l=='string')l=(m?m.$:document).createComment(l);d.domObject.call(this,l);};d.comment.prototype=new d.node();e.extend(d.comment.prototype,{type:8,getOuterHtml:function(){return '<!--'+this.$.nodeValue+'-->';}});(function(){var l={address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1,legend:1,caption:1},m={body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,form:1,fieldset:1},n=function(o){var p=o.getChildren();for(var q=0,r=p.count();q<r;q++){var s=p.getItem(q);if(s.type==1&&f.$block[s.getName()])return true;}return false;};d.elementPath=function(o){var u=this;var p=null,q=null,r=[],s=o;while(s){if(s.type==1){if(!u.lastElement)u.lastElement=s;var t=s.getName();if(!q){if(!p&&l[t])p=s;if(m[t])if(!p&&t=='div'&&!n(s))p=s;else q=s;}r.push(s);if(t=='body')break;}s=s.getParent();}u.block=p;u.blockLimit=q;u.elements=r;};})();d.elementPath.prototype={compare:function(l){var m=this.elements,n=l&&l.elements;if(!n||m.length!=n.length)return false;for(var o=0;o<m.length;o++){if(!m[o].equals(n[o]))return false;}return true;},contains:function(l){var m=this.elements;for(var n=0;n<m.length;n++){if(m[n].getName() in l)return m[n];}return null;}};d.text=function(l,m){if(typeof l=='string')l=(m?m.$:document).createTextNode(l);this.$=l;};d.text.prototype=new d.node();e.extend(d.text.prototype,{type:3,getLength:function(){return this.$.nodeValue.length;},getText:function(){return this.$.nodeValue;},setText:function(l){this.$.nodeValue=l;},split:function(l){var q=this;if(c&&l==q.getLength()){var m=q.getDocument().createText('');m.insertAfter(q);return m;}var n=q.getDocument(),o=new d.text(q.$.splitText(l),n);if(b.ie8){var p=new d.text('',n);p.insertAfter(o);p.remove();}return o;},substring:function(l,m){if(typeof m!='number')return this.$.nodeValue.substr(l);else return this.$.nodeValue.substring(l,m);}});
+d.documentFragment=function(l){l=l||a.document;this.$=l.$.createDocumentFragment();};e.extend(d.documentFragment.prototype,h.prototype,{type:11,insertAfterNode:function(l){l=l.$;l.parentNode.insertBefore(this.$,l.nextSibling);}},true,{append:1,appendBogus:1,getFirst:1,getLast:1,appendTo:1,moveChildren:1,insertBefore:1,insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});(function(){function l(s,t){var u=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(u.collapsed){this.end();return null;}u.optimize();}var v,w=u.startContainer,x=u.endContainer,y=u.startOffset,z=u.endOffset,A,B=this.guard,C=this.type,D=s?'getPreviousSourceNode':'getNextSourceNode';if(!s&&!this._.guardLTR){var E=x.type==1?x:x.getParent(),F=x.type==1?x.getChild(z):x.getNext();this._.guardLTR=function(J,K){return(!K||!E.equals(J))&&(!F||!J.equals(F))&&(J.type!=1||!K||J.getName()!='body');};}if(s&&!this._.guardRTL){var G=w.type==1?w:w.getParent(),H=w.type==1?y?w.getChild(y-1):null:w.getPrevious();this._.guardRTL=function(J,K){return(!K||!G.equals(J))&&(!H||!J.equals(H))&&(J.type!=1||!K||J.getName()!='body');};}var I=s?this._.guardRTL:this._.guardLTR;if(B)A=function(J,K){if(I(J,K)===false)return false;return B(J,K);};else A=I;if(this.current)v=this.current[D](false,C,A);else{if(s){v=x;if(v.type==1)if(z>0)v=v.getChild(z-1);else v=A(v,true)===false?null:v.getPreviousSourceNode(true,C,A);}else{v=w;if(v.type==1)if(!(v=v.getChild(y)))v=A(w,true)===false?null:w.getNextSourceNode(true,C,A);}if(v&&A(v)===false)v=null;}while(v&&!this._.end){this.current=v;if(!this.evaluator||this.evaluator(v)!==false){if(!t)return v;}else if(t&&this.evaluator)return false;v=v[D](false,C,A);}this.end();return this.current=null;};function m(s){var t,u=null;while(t=l.call(this,s))u=t;return u;};d.walker=e.createClass({$:function(s){this.range=s;this._={};},proto:{end:function(){this._.end=1;},next:function(){return l.call(this);},previous:function(){return l.call(this,1);},checkForward:function(){return l.call(this,0,1)!==false;},checkBackward:function(){return l.call(this,1,1)!==false;},lastForward:function(){return m.call(this);},lastBackward:function(){return m.call(this,1);},reset:function(){delete this.current;this._={};}}});var n={block:1,'list-item':1,table:1,'table-row-group':1,'table-header-group':1,'table-footer-group':1,'table-row':1,'table-column-group':1,'table-column':1,'table-cell':1,'table-caption':1};h.prototype.isBlockBoundary=function(s){var t=s?e.extend({},f.$block,s||{}):f.$block;
+return this.getComputedStyle('float')=='none'&&n[this.getComputedStyle('display')]||t[this.getName()];};d.walker.blockBoundary=function(s){return function(t,u){return!(t.type==1&&t.isBlockBoundary(s));};};d.walker.listItemBoundary=function(){return this.blockBoundary({br:1});};d.walker.bookmark=function(s,t){function u(v){return v&&v.getName&&v.getName()=='span'&&v.data('cke-bookmark');};return function(v){var w,x;w=v&&!v.getName&&(x=v.getParent())&&u(x);w=s?w:w||u(v);return!!(t^w);};};d.walker.whitespaces=function(s){return function(t){var u;if(t&&t.type==3)u=!e.trim(t.getText())||b.webkit&&t.getText()=='​';return!!(s^u);};};d.walker.invisible=function(s){var t=d.walker.whitespaces();return function(u){var v;if(t(u))v=1;else{if(u.type==3)u=u.getParent();v=!u.$.offsetHeight;}return!!(s^v);};};d.walker.nodeType=function(s,t){return function(u){return!!(t^u.type==s);};};d.walker.bogus=function(s){function t(u){return!p(u)&&!q(u);};return function(u){var v=!c?u.is&&u.is('br'):u.getText&&o.test(u.getText());if(v){var w=u.getParent(),x=u.getNext(t);v=w.isBlockBoundary()&&(!x||x.type==1&&x.isBlockBoundary());}return!!(s^v);};};var o=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,p=d.walker.whitespaces(),q=d.walker.bookmark(),r=function(s){return q(s)||p(s)||s.type==1&&s.getName() in f.$inline&&!(s.getName() in f.$empty);};h.prototype.getBogus=function(){var s=this;do s=s.getPreviousSourceNode();while(r(s));if(s&&(!c?s.is&&s.is('br'):s.getText&&o.test(s.getText())))return s;return false;};})();d.range=function(l){var m=this;m.startContainer=null;m.startOffset=null;m.endContainer=null;m.endOffset=null;m.collapsed=true;m.document=l;};(function(){var l=function(v){v.collapsed=v.startContainer&&v.endContainer&&v.startContainer.equals(v.endContainer)&&v.startOffset==v.endOffset;},m=function(v,w,x,y){v.optimizeBookmark();var z=v.startContainer,A=v.endContainer,B=v.startOffset,C=v.endOffset,D,E;if(A.type==3)A=A.split(C);else if(A.getChildCount()>0)if(C>=A.getChildCount()){A=A.append(v.document.createText(''));E=true;}else A=A.getChild(C);if(z.type==3){z.split(B);if(z.equals(A))A=z.getNext();}else if(!B){z=z.getFirst().insertBeforeMe(v.document.createText(''));D=true;}else if(B>=z.getChildCount()){z=z.append(v.document.createText(''));D=true;}else z=z.getChild(B).getPrevious();var F=z.getParents(),G=A.getParents(),H,I,J;for(H=0;H<F.length;H++){I=F[H];J=G[H];if(!I.equals(J))break;}var K=x,L,M,N,O;for(var P=H;P<F.length;P++){L=F[P];if(K&&!L.equals(z))M=K.append(L.clone());N=L.getNext();while(N){if(N.equals(G[P])||N.equals(A))break;
+O=N.getNext();if(w==2)K.append(N.clone(true));else{N.remove();if(w==1)K.append(N);}N=O;}if(K)K=M;}K=x;for(var Q=H;Q<G.length;Q++){L=G[Q];if(w>0&&!L.equals(A))M=K.append(L.clone());if(!F[Q]||L.$.parentNode!=F[Q].$.parentNode){N=L.getPrevious();while(N){if(N.equals(F[Q])||N.equals(z))break;O=N.getPrevious();if(w==2)K.$.insertBefore(N.$.cloneNode(true),K.$.firstChild);else{N.remove();if(w==1)K.$.insertBefore(N.$,K.$.firstChild);}N=O;}}if(K)K=M;}if(w==2){var R=v.startContainer;if(R.type==3){R.$.data+=R.$.nextSibling.data;R.$.parentNode.removeChild(R.$.nextSibling);}var S=v.endContainer;if(S.type==3&&S.$.nextSibling){S.$.data+=S.$.nextSibling.data;S.$.parentNode.removeChild(S.$.nextSibling);}}else{if(I&&J&&(z.$.parentNode!=I.$.parentNode||A.$.parentNode!=J.$.parentNode)){var T=J.getIndex();if(D&&J.$.parentNode==z.$.parentNode)T--;if(y&&I.type==1){var U=h.createFromHtml('<span data-cke-bookmark="1" style="display:none">&nbsp;</span>',v.document);U.insertAfter(I);I.mergeSiblings(false);v.moveToBookmark({startNode:U});}else v.setStart(J.getParent(),T);}v.collapse(true);}if(D)z.remove();if(E&&A.$.parentNode)A.remove();},n={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1};function o(){var v=false,w=d.walker.whitespaces(),x=d.walker.bookmark(true),y=d.walker.bogus();return function(z){if(x(z)||w(z))return true;if(y(z)&&!v){v=true;return true;}if(z.type==3&&(z.hasAscendant('pre')||e.trim(z.getText()).length))return false;if(z.type==1&&!n[z.getName()])return false;return true;};};var p=d.walker.bogus();function q(v){var w=d.walker.whitespaces(),x=d.walker.bookmark(1);return function(y){if(x(y)||w(y))return true;return!v&&p(y)||y.type==1&&y.getName() in f.$removeEmpty;};};var r=new d.walker.whitespaces(),s=new d.walker.bookmark(),t=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/;function u(v){return!r(v)&&!s(v);};d.range.prototype={clone:function(){var w=this;var v=new d.range(w.document);v.startContainer=w.startContainer;v.startOffset=w.startOffset;v.endContainer=w.endContainer;v.endOffset=w.endOffset;v.collapsed=w.collapsed;return v;},collapse:function(v){var w=this;if(v){w.endContainer=w.startContainer;w.endOffset=w.startOffset;}else{w.startContainer=w.endContainer;w.startOffset=w.endOffset;}w.collapsed=true;},cloneContents:function(){var v=new d.documentFragment(this.document);if(!this.collapsed)m(this,2,v);return v;},deleteContents:function(v){if(this.collapsed)return;
+m(this,0,null,v);},extractContents:function(v){var w=new d.documentFragment(this.document);if(!this.collapsed)m(this,1,w,v);return w;},createBookmark:function(v){var B=this;var w,x,y,z,A=B.collapsed;w=B.document.createElement('span');w.data('cke-bookmark',1);w.setStyle('display','none');w.setHtml('&nbsp;');if(v){y='cke_bm_'+e.getNextNumber();w.setAttribute('id',y+(A?'C':'S'));}if(!A){x=w.clone();x.setHtml('&nbsp;');if(v)x.setAttribute('id',y+'E');z=B.clone();z.collapse();z.insertNode(x);}z=B.clone();z.collapse(true);z.insertNode(w);if(x){B.setStartAfter(w);B.setEndBefore(x);}else B.moveToPosition(w,4);return{startNode:v?y+(A?'C':'S'):w,endNode:v?y+'E':x,serializable:v,collapsed:A};},createBookmark2:function(v){var D=this;var w=D.startContainer,x=D.endContainer,y=D.startOffset,z=D.endOffset,A=D.collapsed,B,C;if(!w||!x)return{start:0,end:0};if(v){if(w.type==1){B=w.getChild(y);if(B&&B.type==3&&y>0&&B.getPrevious().type==3){w=B;y=0;}if(B&&B.type==1)y=B.getIndex(1);}while(w.type==3&&(C=w.getPrevious())&&C.type==3){w=C;y+=C.getLength();}if(!A){if(x.type==1){B=x.getChild(z);if(B&&B.type==3&&z>0&&B.getPrevious().type==3){x=B;z=0;}if(B&&B.type==1)z=B.getIndex(1);}while(x.type==3&&(C=x.getPrevious())&&C.type==3){x=C;z+=C.getLength();}}}return{start:w.getAddress(v),end:A?null:x.getAddress(v),startOffset:y,endOffset:z,normalized:v,collapsed:A,is2:true};},moveToBookmark:function(v){var D=this;if(v.is2){var w=D.document.getByAddress(v.start,v.normalized),x=v.startOffset,y=v.end&&D.document.getByAddress(v.end,v.normalized),z=v.endOffset;D.setStart(w,x);if(y)D.setEnd(y,z);else D.collapse(true);}else{var A=v.serializable,B=A?D.document.getById(v.startNode):v.startNode,C=A?D.document.getById(v.endNode):v.endNode;D.setStartBefore(B);B.remove();if(C){D.setEndBefore(C);C.remove();}else D.collapse(true);}},getBoundaryNodes:function(){var A=this;var v=A.startContainer,w=A.endContainer,x=A.startOffset,y=A.endOffset,z;if(v.type==1){z=v.getChildCount();if(z>x)v=v.getChild(x);else if(z<1)v=v.getPreviousSourceNode();else{v=v.$;while(v.lastChild)v=v.lastChild;v=new d.node(v);v=v.getNextSourceNode()||v;}}if(w.type==1){z=w.getChildCount();if(z>y)w=w.getChild(y).getPreviousSourceNode(true);else if(z<1)w=w.getPreviousSourceNode();else{w=w.$;while(w.lastChild)w=w.lastChild;w=new d.node(w);}}if(v.getPosition(w)&2)v=w;return{startNode:v,endNode:w};},getCommonAncestor:function(v,w){var A=this;var x=A.startContainer,y=A.endContainer,z;if(x.equals(y)){if(v&&x.type==1&&A.startOffset==A.endOffset-1)z=x.getChild(A.startOffset);
+else z=x;}else z=x.getCommonAncestor(y);return w&&!z.is?z.getParent():z;},optimize:function(){var x=this;var v=x.startContainer,w=x.startOffset;if(v.type!=1)if(!w)x.setStartBefore(v);else if(w>=v.getLength())x.setStartAfter(v);v=x.endContainer;w=x.endOffset;if(v.type!=1)if(!w)x.setEndBefore(v);else if(w>=v.getLength())x.setEndAfter(v);},optimizeBookmark:function(){var x=this;var v=x.startContainer,w=x.endContainer;if(v.is&&v.is('span')&&v.data('cke-bookmark'))x.setStartAt(v,3);if(w&&w.is&&w.is('span')&&w.data('cke-bookmark'))x.setEndAt(w,4);},trim:function(v,w){var D=this;var x=D.startContainer,y=D.startOffset,z=D.collapsed;if((!v||z)&&x&&x.type==3){if(!y){y=x.getIndex();x=x.getParent();}else if(y>=x.getLength()){y=x.getIndex()+1;x=x.getParent();}else{var A=x.split(y);y=x.getIndex()+1;x=x.getParent();if(D.startContainer.equals(D.endContainer))D.setEnd(A,D.endOffset-D.startOffset);else if(x.equals(D.endContainer))D.endOffset+=1;}D.setStart(x,y);if(z){D.collapse(true);return;}}var B=D.endContainer,C=D.endOffset;if(!(w||z)&&B&&B.type==3){if(!C){C=B.getIndex();B=B.getParent();}else if(C>=B.getLength()){C=B.getIndex()+1;B=B.getParent();}else{B.split(C);C=B.getIndex()+1;B=B.getParent();}D.setEnd(B,C);}},enlarge:function(v,w){switch(v){case 1:if(this.collapsed)return;var x=this.getCommonAncestor(),y=this.document.getBody(),z,A,B,C,D,E=false,F,G,H=this.startContainer,I=this.startOffset;if(H.type==3){if(I){H=!e.trim(H.substring(0,I)).length&&H;E=!!H;}if(H)if(!(C=H.getPrevious()))B=H.getParent();}else{if(I)C=H.getChild(I-1)||H.getLast();if(!C)B=H;}while(B||C){if(B&&!C){if(!D&&B.equals(x))D=true;if(!y.contains(B))break;if(!E||B.getComputedStyle('display')!='inline'){E=false;if(D)z=B;else this.setStartBefore(B);}C=B.getPrevious();}while(C){F=false;if(C.type==8){C=C.getPrevious();continue;}else if(C.type==3){G=C.getText();if(/[^\s\ufeff]/.test(G))C=null;F=/[\s\ufeff]$/.test(G);}else if((C.$.offsetWidth>0||w&&C.is('br'))&&!C.data('cke-bookmark'))if(E&&f.$removeEmpty[C.getName()]){G=C.getText();if(/[^\s\ufeff]/.test(G))C=null;else{var J=C.$.getElementsByTagName('*');for(var K=0,L;L=J[K++];){if(!f.$removeEmpty[L.nodeName.toLowerCase()]){C=null;break;}}}if(C)F=!!G.length;}else C=null;if(F)if(E){if(D)z=B;else if(B)this.setStartBefore(B);}else E=true;if(C){var M=C.getPrevious();if(!B&&!M){B=C;C=null;break;}C=M;}else B=null;}if(B)B=B.getParent();}H=this.endContainer;I=this.endOffset;B=C=null;D=E=false;if(H.type==3){H=!e.trim(H.substring(I)).length&&H;E=!(H&&H.getLength());if(H)if(!(C=H.getNext()))B=H.getParent();
+}else{C=H.getChild(I);if(!C)B=H;}while(B||C){if(B&&!C){if(!D&&B.equals(x))D=true;if(!y.contains(B))break;if(!E||B.getComputedStyle('display')!='inline'){E=false;if(D)A=B;else if(B)this.setEndAfter(B);}C=B.getNext();}while(C){F=false;if(C.type==3){G=C.getText();if(/[^\s\ufeff]/.test(G))C=null;F=/^[\s\ufeff]/.test(G);}else if(C.type==1){if((C.$.offsetWidth>0||w&&C.is('br'))&&!C.data('cke-bookmark'))if(E&&f.$removeEmpty[C.getName()]){G=C.getText();if(/[^\s\ufeff]/.test(G))C=null;else{J=C.$.getElementsByTagName('*');for(K=0;L=J[K++];){if(!f.$removeEmpty[L.nodeName.toLowerCase()]){C=null;break;}}}if(C)F=!!G.length;}else C=null;}else F=1;if(F)if(E)if(D)A=B;else this.setEndAfter(B);if(C){M=C.getNext();if(!B&&!M){B=C;C=null;break;}C=M;}else B=null;}if(B)B=B.getParent();}if(z&&A){x=z.contains(A)?A:z;this.setStartBefore(x);this.setEndAfter(x);}break;case 2:case 3:var N=new d.range(this.document);y=this.document.getBody();N.setStartAt(y,1);N.setEnd(this.startContainer,this.startOffset);var O=new d.walker(N),P,Q,R=d.walker.blockBoundary(v==3?{br:1}:null),S=function(Y){var Z=R(Y);if(!Z)P=Y;return Z;},T=function(Y){var Z=S(Y);if(!Z&&Y.is&&Y.is('br'))Q=Y;return Z;};O.guard=S;B=O.lastBackward();P=P||y;this.setStartAt(P,!P.is('br')&&(!B&&this.checkStartOfBlock()||B&&P.contains(B))?1:4);if(v==3){var U=this.clone();O=new d.walker(U);var V=d.walker.whitespaces(),W=d.walker.bookmark();O.evaluator=function(Y){return!V(Y)&&!W(Y);};var X=O.previous();if(X&&X.type==1&&X.is('br'))return;}N=this.clone();N.collapse();N.setEndAt(y,2);O=new d.walker(N);O.guard=v==3?T:S;P=null;B=O.lastForward();P=P||y;this.setEndAt(P,!B&&this.checkEndOfBlock()||B&&P.contains(B)?2:3);if(Q)this.setEndAfter(Q);}},shrink:function(v,w){if(!this.collapsed){v=v||2;var x=this.clone(),y=this.startContainer,z=this.endContainer,A=this.startOffset,B=this.endOffset,C=this.collapsed,D=1,E=1;if(y&&y.type==3)if(!A)x.setStartBefore(y);else if(A>=y.getLength())x.setStartAfter(y);else{x.setStartBefore(y);D=0;}if(z&&z.type==3)if(!B)x.setEndBefore(z);else if(B>=z.getLength())x.setEndAfter(z);else{x.setEndAfter(z);E=0;}var F=new d.walker(x),G=d.walker.bookmark();F.evaluator=function(K){return K.type==(v==1?1:3);};var H;F.guard=function(K,L){if(G(K))return true;if(v==1&&K.type==3)return false;if(L&&K.equals(H))return false;if(!L&&K.type==1)H=K;return true;};if(D){var I=F[v==1?'lastForward':'next']();I&&this.setStartAt(I,w?1:3);}if(E){F.reset();var J=F[v==1?'lastBackward':'previous']();J&&this.setEndAt(J,w?2:4);}return!!(D||E);
+}},insertNode:function(v){var z=this;z.optimizeBookmark();z.trim(false,true);var w=z.startContainer,x=z.startOffset,y=w.getChild(x);if(y)v.insertBefore(y);else w.append(v);if(v.getParent().equals(z.endContainer))z.endOffset++;z.setStartBefore(v);},moveToPosition:function(v,w){this.setStartAt(v,w);this.collapse(true);},selectNodeContents:function(v){this.setStart(v,0);this.setEnd(v,v.type==3?v.getLength():v.getChildCount());},setStart:function(v,w){var x=this;if(v.type==1&&f.$empty[v.getName()])w=v.getIndex(),v=v.getParent();x.startContainer=v;x.startOffset=w;if(!x.endContainer){x.endContainer=v;x.endOffset=w;}l(x);},setEnd:function(v,w){var x=this;if(v.type==1&&f.$empty[v.getName()])w=v.getIndex()+1,v=v.getParent();x.endContainer=v;x.endOffset=w;if(!x.startContainer){x.startContainer=v;x.startOffset=w;}l(x);},setStartAfter:function(v){this.setStart(v.getParent(),v.getIndex()+1);},setStartBefore:function(v){this.setStart(v.getParent(),v.getIndex());},setEndAfter:function(v){this.setEnd(v.getParent(),v.getIndex()+1);},setEndBefore:function(v){this.setEnd(v.getParent(),v.getIndex());},setStartAt:function(v,w){var x=this;switch(w){case 1:x.setStart(v,0);break;case 2:if(v.type==3)x.setStart(v,v.getLength());else x.setStart(v,v.getChildCount());break;case 3:x.setStartBefore(v);break;case 4:x.setStartAfter(v);}l(x);},setEndAt:function(v,w){var x=this;switch(w){case 1:x.setEnd(v,0);break;case 2:if(v.type==3)x.setEnd(v,v.getLength());else x.setEnd(v,v.getChildCount());break;case 3:x.setEndBefore(v);break;case 4:x.setEndAfter(v);}l(x);},fixBlock:function(v,w){var z=this;var x=z.createBookmark(),y=z.document.createElement(w);z.collapse(v);z.enlarge(2);z.extractContents().appendTo(y);y.trim();if(!c)y.appendBogus();z.insertNode(y);z.moveToBookmark(x);return y;},splitBlock:function(v){var F=this;var w=new d.elementPath(F.startContainer),x=new d.elementPath(F.endContainer),y=w.blockLimit,z=x.blockLimit,A=w.block,B=x.block,C=null;if(!y.equals(z))return null;if(v!='br'){if(!A){A=F.fixBlock(true,v);B=new d.elementPath(F.endContainer).block;}if(!B)B=F.fixBlock(false,v);}var D=A&&F.checkStartOfBlock(),E=B&&F.checkEndOfBlock();F.deleteContents();if(A&&A.equals(B))if(E){C=new d.elementPath(F.startContainer);F.moveToPosition(B,4);B=null;}else if(D){C=new d.elementPath(F.startContainer);F.moveToPosition(A,3);A=null;}else{B=F.splitElement(A);if(!c&&!A.is('ul','ol'))A.appendBogus();}return{previousBlock:A,nextBlock:B,wasStartOfBlock:D,wasEndOfBlock:E,elementPath:C};},splitElement:function(v){var y=this;
+if(!y.collapsed)return null;y.setEndAt(v,2);var w=y.extractContents(),x=v.clone(false);w.appendTo(x);x.insertAfter(v);y.moveToPosition(v,4);return x;},checkBoundaryOfElement:function(v,w){var x=w==1,y=this.clone();y.collapse(x);y[x?'setStartAt':'setEndAt'](v,x?1:2);var z=new d.walker(y);z.evaluator=q(x);return z[x?'checkBackward':'checkForward']();},checkStartOfBlock:function(){var B=this;var v=B.startContainer,w=B.startOffset;if(c&&w&&v.type==3){var x=e.ltrim(v.substring(0,w));if(t.test(x))B.trim(0,1);}var y=new d.elementPath(B.startContainer),z=B.clone();z.collapse(true);z.setStartAt(y.block||y.blockLimit,1);var A=new d.walker(z);A.evaluator=o();return A.checkBackward();},checkEndOfBlock:function(){var B=this;var v=B.endContainer,w=B.endOffset;if(c&&v.type==3){var x=e.rtrim(v.substring(w));if(t.test(x))B.trim(1,0);}var y=new d.elementPath(B.endContainer),z=B.clone();z.collapse(false);z.setEndAt(y.block||y.blockLimit,2);var A=new d.walker(z);A.evaluator=o();return A.checkForward();},getPreviousNode:function(v,w,x){var y=this.clone();y.collapse(1);y.setStartAt(x||this.document.getBody(),1);var z=new d.walker(y);z.evaluator=v;z.guard=w;return z.previous();},getNextNode:function(v,w,x){var y=this.clone();y.collapse();y.setEndAt(x||this.document.getBody(),2);var z=new d.walker(y);z.evaluator=v;z.guard=w;return z.next();},checkReadOnly:(function(){function v(w,x){while(w){if(w.type==1)if(w.getAttribute('contentEditable')=='false'&&!w.data('cke-editable'))return 0;else if(w.is('html')||w.getAttribute('contentEditable')=='true'&&(w.contains(x)||w.equals(x)))break;w=w.getParent();}return 1;};return function(){var w=this.startContainer,x=this.endContainer;return!(v(w,x)&&v(x,w));};})(),moveToElementEditablePosition:function(v,w){function x(z,A){var B;if(z.type==1&&z.isEditable(false))B=z[w?'getLast':'getFirst'](u);if(!A&&!B)B=z[w?'getPrevious':'getNext'](u);return B;};if(v.type==1&&!v.isEditable(false)){this.moveToPosition(v,w?4:3);return true;}var y=0;while(v){if(v.type==3){if(w&&this.checkEndOfBlock()&&t.test(v.getText()))this.moveToPosition(v,3);else this.moveToPosition(v,w?4:3);y=1;break;}if(v.type==1)if(v.isEditable()){this.moveToPosition(v,w?2:1);y=1;}else if(w&&v.is('br')&&this.checkEndOfBlock())this.moveToPosition(v,3);v=x(v,y);}return!!y;},moveToElementEditStart:function(v){return this.moveToElementEditablePosition(v);},moveToElementEditEnd:function(v){return this.moveToElementEditablePosition(v,true);},getEnclosedNode:function(){var v=this.clone();v.optimize();
+if(v.startContainer.type!=1||v.endContainer.type!=1)return null;var w=new d.walker(v),x=d.walker.bookmark(true),y=d.walker.whitespaces(true),z=function(B){return y(B)&&x(B);};v.evaluator=z;var A=w.next();w.reset();return A&&A.equals(w.previous())?A:null;},getTouchedStartNode:function(){var v=this.startContainer;if(this.collapsed||v.type!=1)return v;return v.getChild(this.startOffset)||v;},getTouchedEndNode:function(){var v=this.endContainer;if(this.collapsed||v.type!=1)return v;return v.getChild(this.endOffset-1)||v;}};})();a.POSITION_AFTER_START=1;a.POSITION_BEFORE_END=2;a.POSITION_BEFORE_START=3;a.POSITION_AFTER_END=4;a.ENLARGE_ELEMENT=1;a.ENLARGE_BLOCK_CONTENTS=2;a.ENLARGE_LIST_ITEM_CONTENTS=3;a.START=1;a.END=2;a.STARTEND=3;a.SHRINK_ELEMENT=1;a.SHRINK_TEXT=2;(function(){d.rangeList=function(n){if(n instanceof d.rangeList)return n;if(!n)n=[];else if(n instanceof d.range)n=[n];return e.extend(n,l);};var l={createIterator:function(){var n=this,o=d.walker.bookmark(),p=function(s){return!(s.is&&s.is('tr'));},q=[],r;return{getNextRange:function(s){r=r==undefined?0:r+1;var t=n[r];if(t&&n.length>1){if(!r)for(var u=n.length-1;u>=0;u--)q.unshift(n[u].createBookmark(true));if(s){var v=0;while(n[r+v+1]){var w=t.document,x=0,y=w.getById(q[v].endNode),z=w.getById(q[v+1].startNode),A;while(1){A=y.getNextSourceNode(false);if(!z.equals(A)){if(o(A)||A.type==1&&A.isBlockBoundary()){y=A;continue;}}else x=1;break;}if(!x)break;v++;}}t.moveToBookmark(q.shift());while(v--){A=n[++r];A.moveToBookmark(q.shift());t.setEnd(A.endContainer,A.endOffset);}}return t;}};},createBookmarks:function(n){var s=this;var o=[],p;for(var q=0;q<s.length;q++){o.push(p=s[q].createBookmark(n,true));for(var r=q+1;r<s.length;r++){s[r]=m(p,s[r]);s[r]=m(p,s[r],true);}}return o;},createBookmarks2:function(n){var o=[];for(var p=0;p<this.length;p++)o.push(this[p].createBookmark2(n));return o;},moveToBookmarks:function(n){for(var o=0;o<this.length;o++)this[o].moveToBookmark(n[o]);}};function m(n,o,p){var q=n.serializable,r=o[p?'endContainer':'startContainer'],s=p?'endOffset':'startOffset',t=q?o.document.getById(n.startNode):n.startNode,u=q?o.document.getById(n.endNode):n.endNode;if(r.equals(t.getPrevious())){o.startOffset=o.startOffset-r.getLength()-u.getPrevious().getLength();r=u.getNext();}else if(r.equals(u.getPrevious())){o.startOffset=o.startOffset-r.getLength();r=u.getNext();}r.equals(t.getParent())&&o[s]++;r.equals(u.getParent())&&o[s]++;o[p?'endContainer':'startContainer']=r;return o;};})();(function(){if(b.webkit){b.hc=false;
+return;}var l=h.createFromHtml('<div style="width:0px;height:0px;position:absolute;left:-10000px;border: 1px solid;border-color: red blue;"></div>',a.document);l.appendTo(a.document.getHead());try{b.hc=l.getComputedStyle('border-top-color')==l.getComputedStyle('border-right-color');}catch(m){b.hc=false;}if(b.hc)b.cssClass+=' cke_hc';l.remove();})();j.load(i.corePlugins.split(','),function(){a.status='loaded';a.fire('loaded');var l=a._.pending;if(l){delete a._.pending;for(var m=0;m<l.length;m++)a.add(l[m]);}});if(c)try{document.execCommand('BackgroundImageCache',false,true);}catch(l){}a.skins.add('kama',(function(){var m='cke_ui_color';return{editor:{css:['editor.css']},dialog:{css:['dialog.css']},richcombo:{canGroup:false},templates:{css:['templates.css']},margins:[0,0,0,0],init:function(n){if(n.config.width&&!isNaN(n.config.width))n.config.width-=12;var o=[],p=/\$color/g,q='/* UI Color Support */.cke_skin_kama .cke_menuitem .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_label,.cke_skin_kama .cke_menuitem a:focus .cke_label,.cke_skin_kama .cke_menuitem a:active .cke_label{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label{\tbackground-color: transparent !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuseparator{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{\tbackground-color: $color !important;}';if(b.webkit){q=q.split('}').slice(0,-1);for(var r=0;r<q.length;r++)q[r]=q[r].split('{');}function s(v){var w=v.getById(m);if(!w){w=v.getHead().append('style');w.setAttribute('id',m);
+w.setAttribute('type','text/css');}return w;};function t(v,w,x){var y,z,A;for(var B=0;B<v.length;B++){if(b.webkit)for(z=0;z<w.length;z++){A=w[z][1];for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);v[B].$.sheet.addRule(w[z][0],A);}else{A=w;for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);if(c)v[B].$.styleSheet.cssText+=A;else v[B].$.innerHTML+=A;}}};var u=/\$color/g;e.extend(n,{uiColor:null,getUiColor:function(){return this.uiColor;},setUiColor:function(v){var w,x=s(a.document),y='.'+n.id,z=[y+' .cke_wrapper',y+'_dialog .cke_dialog_contents',y+'_dialog a.cke_dialog_tab',y+'_dialog .cke_dialog_footer'].join(','),A='background-color: $color !important;';if(b.webkit)w=[[z,A]];else w=z+'{'+A+'}';return(this.setUiColor=function(B){var C=[[u,B]];n.uiColor=B;t([x],w,C);t(o,q,C);})(v);}});n.on('menuShow',function(v){var w=v.data[0],x=w.element.getElementsByTag('iframe').getItem(0).getFrameDocument();if(!x.getById('cke_ui_color')){var y=s(x);o.push(y);var z=n.getUiColor();if(z)t([y],q,[[u,z]]);}});if(n.config.uiColor)n.setUiColor(n.config.uiColor);}};})());(function(){a.dialog?m():a.on('dialogPluginReady',m);function m(){a.dialog.on('resize',function(n){var o=n.data,p=o.width,q=o.height,r=o.dialog,s=r.parts.contents;if(o.skin!='kama')return;s.setStyles({width:p+'px',height:q+'px'});});};})();j.add('about',{requires:['dialog'],init:function(m){var n=m.addCommand('about',new a.dialogCommand('about'));n.modes={wysiwyg:1,source:1};n.canUndo=false;n.readOnly=1;m.ui.addButton('About',{label:m.lang.about.title,command:'about'});a.dialog.add('about',this.path+'dialogs/about.js');}});(function(){var m='a11yhelp',n='a11yHelp';j.add(m,{requires:['dialog'],availableLangs:{cs:1,cy:1,da:1,de:1,el:1,en:1,eo:1,fa:1,fi:1,fr:1,gu:1,he:1,it:1,ku:1,mk:1,nb:1,nl:1,no:1,'pt-br':1,ro:1,tr:1,ug:1,vi:1,'zh-cn':1},init:function(o){var p=this;o.addCommand(n,{exec:function(){var q=o.langCode;q=p.availableLangs[q]?q:'en';a.scriptLoader.load(a.getUrl(p.path+'lang/'+q+'.js'),function(){e.extend(o.lang,p.langEntries[q]);o.openDialog(n);});},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:false});a.dialog.add(n,this.path+'dialogs/a11yhelp.js');}});})();j.add('basicstyles',{requires:['styles','button'],init:function(m){var n=function(q,r,s,t){var u=new a.style(t);m.attachStyleStateChange(u,function(v){!m.readOnly&&m.getCommand(s).setState(v);});m.addCommand(s,new a.styleCommand(u));m.ui.addButton(q,{label:r,command:s});},o=m.config,p=m.lang;n('Bold',p.bold,'bold',o.coreStyles_bold);n('Italic',p.italic,'italic',o.coreStyles_italic);
+n('Underline',p.underline,'underline',o.coreStyles_underline);n('Strike',p.strike,'strike',o.coreStyles_strike);n('Subscript',p.subscript,'subscript',o.coreStyles_subscript);n('Superscript',p.superscript,'superscript',o.coreStyles_superscript);}});i.coreStyles_bold={element:'strong',overrides:'b'};i.coreStyles_italic={element:'em',overrides:'i'};i.coreStyles_underline={element:'u'};i.coreStyles_strike={element:'strike'};i.coreStyles_subscript={element:'sub'};i.coreStyles_superscript={element:'sup'};(function(){var m={table:1,ul:1,ol:1,blockquote:1,div:1},n={},o={};e.extend(n,m,{tr:1,p:1,div:1,li:1});e.extend(o,n,{td:1});function p(B){q(B);r(B);};function q(B){var C=B.editor,D=B.data.path;if(C.readOnly)return;var E=C.config.useComputedState,F;E=E===undefined||E;if(!E)F=s(D.lastElement);F=F||D.block||D.blockLimit;if(F.is('body')){var G=C.getSelection().getRanges()[0].getEnclosedNode();G&&G.type==1&&(F=G);}if(!F)return;var H=E?F.getComputedStyle('direction'):F.getStyle('direction')||F.getAttribute('dir');C.getCommand('bidirtl').setState(H=='rtl'?1:2);C.getCommand('bidiltr').setState(H=='ltr'?1:2);};function r(B){var C=B.editor,D=B.data.path.block||B.data.path.blockLimit;C.fire('contentDirChanged',D?D.getComputedStyle('direction'):C.lang.dir);};function s(B){while(B&&!(B.getName() in o||B.is('body'))){var C=B.getParent();if(!C)break;B=C;}return B;};function t(B,C,D,E){if(B.isReadOnly())return;h.setMarker(E,B,'bidi_processed',1);var F=B;while((F=F.getParent())&&!F.is('body')){if(F.getCustomData('bidi_processed')){B.removeStyle('direction');B.removeAttribute('dir');return;}}var G='useComputedState' in D.config?D.config.useComputedState:1,H=G?B.getComputedStyle('direction'):B.getStyle('direction')||B.hasAttribute('dir');if(H==C)return;B.removeStyle('direction');if(G){B.removeAttribute('dir');if(C!=B.getComputedStyle('direction'))B.setAttribute('dir',C);}else B.setAttribute('dir',C);D.forceNextSelectionCheck();};function u(B,C,D){var E=B.getCommonAncestor(false,true);B=B.clone();B.enlarge(D==2?3:2);if(B.checkBoundaryOfElement(E,1)&&B.checkBoundaryOfElement(E,2)){var F;while(E&&E.type==1&&(F=E.getParent())&&F.getChildCount()==1&&!(E.getName() in C))E=F;return E.type==1&&E.getName() in C&&E;}};function v(B){return function(C){var D=C.getSelection(),E=C.config.enterMode,F=D.getRanges();if(F&&F.length){var G={},H=D.createBookmarks(),I=F.createIterator(),J,K=0;while(J=I.getNextRange(1)){var L=J.getEnclosedNode();if(!L||L&&!(L.type==1&&L.getName() in n))L=u(J,m,E);L&&t(L,B,C,G);
+var M,N,O=new d.walker(J),P=H[K].startNode,Q=H[K++].endNode;O.evaluator=function(R){return!!(R.type==1&&R.getName() in m&&!(R.getName()==(E==1?'p':'div')&&R.getParent().type==1&&R.getParent().getName()=='blockquote')&&R.getPosition(P)&2&&(R.getPosition(Q)&4+16)==4);};while(N=O.next())t(N,B,C,G);M=J.createIterator();M.enlargeBr=E!=2;while(N=M.getNextParagraph(E==1?'p':'div'))t(N,B,C,G);}h.clearAllMarkers(G);C.forceNextSelectionCheck();D.selectBookmarks(H);C.focus();}};};j.add('bidi',{requires:['styles','button'],init:function(B){var C=function(E,F,G,H){B.addCommand(G,new a.command(B,{exec:H}));B.ui.addButton(E,{label:F,command:G});},D=B.lang.bidi;C('BidiLtr',D.ltr,'bidiltr',v('ltr'));C('BidiRtl',D.rtl,'bidirtl',v('rtl'));B.on('selectionChange',p);B.on('contentDom',function(){B.document.on('dirChanged',function(E){B.fire('dirChanged',{node:E.data,dir:E.data.getDirection(1)});});});}});function w(B){var C=B.getDocument().getBody().getParent();while(B){if(B.equals(C))return false;B=B.getParent();}return true;};function x(B){var C=B==y.setAttribute,D=B==y.removeAttribute,E=/\bdirection\s*:\s*(.*?)\s*(:?$|;)/;return function(F,G){var J=this;if(!J.getDocument().equals(a.document)){var H;if((F==(C||D?'dir':'direction')||F=='style'&&(D||E.test(G)))&&!w(J)){H=J.getDirection(1);var I=B.apply(J,arguments);if(H!=J.getDirection(1)){J.getDocument().fire('dirChanged',J);return I;}}}return B.apply(J,arguments);};};var y=h.prototype,z=['setStyle','removeStyle','setAttribute','removeAttribute'];for(var A=0;A<z.length;A++)y[z[A]]=e.override(y[z[A]],x);})();(function(){function m(q,r){var s=r.block||r.blockLimit;if(!s||s.getName()=='body')return 2;if(s.getAscendant('blockquote',true))return 1;return 2;};function n(q){var r=q.editor;if(r.readOnly)return;var s=r.getCommand('blockquote');s.state=m(r,q.data.path);s.fire('state');};function o(q){for(var r=0,s=q.getChildCount(),t;r<s&&(t=q.getChild(r));r++){if(t.type==1&&t.isBlockBoundary())return false;}return true;};var p={exec:function(q){var r=q.getCommand('blockquote').state,s=q.getSelection(),t=s&&s.getRanges(true)[0];if(!t)return;var u=s.createBookmarks();if(c){var v=u[0].startNode,w=u[0].endNode,x;if(v&&v.getParent().getName()=='blockquote'){x=v;while(x=x.getNext()){if(x.type==1&&x.isBlockBoundary()){v.move(x,true);break;}}}if(w&&w.getParent().getName()=='blockquote'){x=w;while(x=x.getPrevious()){if(x.type==1&&x.isBlockBoundary()){w.move(x);break;}}}}var y=t.createIterator(),z;y.enlargeBr=q.config.enterMode!=2;if(r==2){var A=[];
+while(z=y.getNextParagraph())A.push(z);if(A.length<1){var B=q.document.createElement(q.config.enterMode==1?'p':'div'),C=u.shift();t.insertNode(B);B.append(new d.text('\ufeff',q.document));t.moveToBookmark(C);t.selectNodeContents(B);t.collapse(true);C=t.createBookmark();A.push(B);u.unshift(C);}var D=A[0].getParent(),E=[];for(var F=0;F<A.length;F++){z=A[F];D=D.getCommonAncestor(z.getParent());}var G={table:1,tbody:1,tr:1,ol:1,ul:1};while(G[D.getName()])D=D.getParent();var H=null;while(A.length>0){z=A.shift();while(!z.getParent().equals(D))z=z.getParent();if(!z.equals(H))E.push(z);H=z;}while(E.length>0){z=E.shift();if(z.getName()=='blockquote'){var I=new d.documentFragment(q.document);while(z.getFirst()){I.append(z.getFirst().remove());A.push(I.getLast());}I.replace(z);}else A.push(z);}var J=q.document.createElement('blockquote');J.insertBefore(A[0]);while(A.length>0){z=A.shift();J.append(z);}}else if(r==1){var K=[],L={};while(z=y.getNextParagraph()){var M=null,N=null;while(z.getParent()){if(z.getParent().getName()=='blockquote'){M=z.getParent();N=z;break;}z=z.getParent();}if(M&&N&&!N.getCustomData('blockquote_moveout')){K.push(N);h.setMarker(L,N,'blockquote_moveout',true);}}h.clearAllMarkers(L);var O=[],P=[];L={};while(K.length>0){var Q=K.shift();J=Q.getParent();if(!Q.getPrevious())Q.remove().insertBefore(J);else if(!Q.getNext())Q.remove().insertAfter(J);else{Q.breakParent(Q.getParent());P.push(Q.getNext());}if(!J.getCustomData('blockquote_processed')){P.push(J);h.setMarker(L,J,'blockquote_processed',true);}O.push(Q);}h.clearAllMarkers(L);for(F=P.length-1;F>=0;F--){J=P[F];if(o(J))J.remove();}if(q.config.enterMode==2){var R=true;while(O.length){Q=O.shift();if(Q.getName()=='div'){I=new d.documentFragment(q.document);var S=R&&Q.getPrevious()&&!(Q.getPrevious().type==1&&Q.getPrevious().isBlockBoundary());if(S)I.append(q.document.createElement('br'));var T=Q.getNext()&&!(Q.getNext().type==1&&Q.getNext().isBlockBoundary());while(Q.getFirst())Q.getFirst().remove().appendTo(I);if(T)I.append(q.document.createElement('br'));I.replace(Q);R=false;}}}}s.selectBookmarks(u);q.focus();}};j.add('blockquote',{init:function(q){q.addCommand('blockquote',p);q.ui.addButton('Blockquote',{label:q.lang.blockquote,command:'blockquote'});q.on('selectionChange',n);},requires:['domiterator']});})();j.add('button',{beforeInit:function(m){m.ui.addHandler('button',k.button.handler);}});a.UI_BUTTON='button';k.button=function(m){e.extend(this,m,{title:m.label,className:m.className||m.command&&'cke_button_'+m.command||'',click:m.click||(function(n){n.execCommand(m.command);
+})});this._={};};k.button.handler={create:function(m){return new k.button(m);}};(function(){k.button.prototype={render:function(m,n){var o=b,p=this._.id=e.getNextId(),q='',r=this.command,s;this._.editor=m;var t={id:p,button:this,editor:m,focus:function(){var z=a.document.getById(p);z.focus();},execute:function(){if(c&&b.version<7)e.setTimeout(function(){this.button.click(m);},0,this);else this.button.click(m);}},u=e.addFunction(function(z){if(t.onkey){z=new d.event(z);return t.onkey(t,z.getKeystroke())!==false;}}),v=e.addFunction(function(z){var A;if(t.onfocus)A=t.onfocus(t,new d.event(z))!==false;if(b.gecko&&b.version<10900)z.preventBubble();return A;});t.clickFn=s=e.addFunction(t.execute,t);if(this.modes){var w={};function x(){var z=m.mode;if(z){var A=this.modes[z]?w[z]!=undefined?w[z]:2:0;this.setState(m.readOnly&&!this.readOnly?0:A);}};m.on('beforeModeUnload',function(){if(m.mode&&this._.state!=0)w[m.mode]=this._.state;},this);m.on('mode',x,this);!this.readOnly&&m.on('readOnly',x,this);}else if(r){r=m.getCommand(r);if(r){r.on('state',function(){this.setState(r.state);},this);q+='cke_'+(r.state==1?'on':r.state==0?'disabled':'off');}}if(!r)q+='cke_off';if(this.className)q+=' '+this.className;n.push('<span class="cke_button'+(this.icon&&this.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">','<a id="',p,'" class="',q,'"',o.gecko&&o.version>=10900&&!o.hc?'':'" href="javascript:void(\''+(this.title||'').replace("'",'')+"')\"",' title="',this.title,'" tabindex="-1" hidefocus="true" role="button" aria-labelledby="'+p+'_label"'+(this.hasArrow?' aria-haspopup="true"':''));if(o.opera||o.gecko&&o.mac)n.push(' onkeypress="return false;"');if(o.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="return CKEDITOR.tools.callFunction(',u,', event);" onfocus="return CKEDITOR.tools.callFunction(',v,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',s,', this); return false;"><span class="cke_icon"');if(this.icon){var y=(this.iconOffset||0)*-16;n.push(' style="background-image:url(',a.getUrl(this.icon),');background-position:0 '+y+'px;"');}n.push('>&nbsp;</span><span id="',p,'_label" class="cke_label">',this.label,'</span>');if(this.hasArrow)n.push('<span class="cke_buttonarrow">'+(b.hc?'&#9660;':'&nbsp;')+'</span>');n.push('</a>','</span>');if(this.onRender)this.onRender();return t;},setState:function(m){if(this._.state==m)return false;this._.state=m;var n=a.document.getById(this._.id);if(n){n.setState(m);
+m==0?n.setAttribute('aria-disabled',true):n.removeAttribute('aria-disabled');m==1?n.setAttribute('aria-pressed',true):n.removeAttribute('aria-pressed');return true;}else return false;}};})();k.prototype.addButton=function(m,n){this.add(m,'button',n);};(function(){var m=function(y,z){var A=y.document,B=A.getBody(),C=false,D=function(){C=true;};B.on(z,D);(b.version>7?A.$:A.$.selection.createRange()).execCommand(z);B.removeListener(z,D);return C;},n=c?function(y,z){return m(y,z);}:function(y,z){try{return y.document.$.execCommand(z,false,null);}catch(A){return false;}},o=function(y){var z=this;z.type=y;z.canUndo=z.type=='cut';z.startDisabled=true;};o.prototype={exec:function(y,z){this.type=='cut'&&t(y);var A=n(y,this.type);if(!A)alert(y.lang.clipboard[this.type+'Error']);return A;}};var p={canUndo:false,exec:c?function(y){y.focus();if(!y.document.getBody().fire('beforepaste')&&!m(y,'paste')){y.fire('pasteDialog');return false;}}:function(y){try{if(!y.document.getBody().fire('beforepaste')&&!y.document.$.execCommand('Paste',false,null))throw 0;}catch(z){setTimeout(function(){y.fire('pasteDialog');},0);return false;}}},q=function(y){if(this.mode!='wysiwyg')return;switch(y.data.keyCode){case 1114112+86:case 2228224+45:var z=this.document.getBody();if(b.opera||b.gecko)z.fire('paste');return;case 1114112+88:case 2228224+46:var A=this;this.fire('saveSnapshot');setTimeout(function(){A.fire('saveSnapshot');},0);}};function r(y){y.cancel();};function s(y,z,A){var B=this.document;if(B.getById('cke_pastebin'))return;if(z=='text'&&y.data&&y.data.$.clipboardData){var C=y.data.$.clipboardData.getData('text/plain');if(C){y.data.preventDefault();A(C);return;}}var D=this.getSelection(),E=new d.range(B),F=new h(z=='text'?'textarea':b.webkit?'body':'div',B);F.setAttribute('id','cke_pastebin');b.webkit&&F.append(B.createText('\xa0'));B.getBody().append(F);F.setStyles({position:'absolute',top:D.getStartElement().getDocumentPosition().y+'px',width:'1px',height:'1px',overflow:'hidden'});F.setStyle(this.config.contentsLangDirection=='ltr'?'left':'right','-1000px');var G=D.createBookmarks();this.on('selectionChange',r,null,null,0);if(z=='text')F.$.focus();else{E.setStartAt(F,1);E.setEndAt(F,2);E.select(true);}var H=this;window.setTimeout(function(){H.document.getBody().focus();H.removeListener('selectionChange',r);if(b.ie7Compat){D.selectBookmarks(G);F.remove();}else{F.remove();D.selectBookmarks(G);}var I;F=b.webkit&&(I=F.getFirst())&&I.is&&I.hasClass('Apple-style-span')?I:F;A(F['get'+(z=='text'?'Value':'Html')]());
+},0);};function t(y){if(!c||b.quirks)return;var z=y.getSelection(),A;if(z.getType()==3&&(A=z.getSelectedElement())){var B=z.getRanges()[0],C=y.document.createText('');C.insertBefore(A);B.setStartBefore(C);B.setEndAfter(A);z.selectRanges([B]);setTimeout(function(){if(A.getParent()){C.remove();z.selectElement(A);}},0);}};var u,v;function w(y,z){var A;if(v&&y in {Paste:1,Cut:1})return 0;if(y=='Paste'){c&&(u=1);try{A=z.document.$.queryCommandEnabled(y)||b.webkit;}catch(D){}u=0;}else{var B=z.getSelection(),C=B&&B.getRanges();A=B&&!(C.length==1&&C[0].collapsed);}return A?2:0;};function x(){var z=this;if(z.mode!='wysiwyg')return;var y=w('Paste',z);z.getCommand('cut').setState(w('Cut',z));z.getCommand('copy').setState(w('Copy',z));z.getCommand('paste').setState(y);z.fire('pasteState',y);};j.add('clipboard',{requires:['dialog','htmldataprocessor'],init:function(y){y.on('paste',function(A){var B=A.data;if(B.html)y.insertHtml(B.html);else if(B.text)y.insertText(B.text);setTimeout(function(){y.fire('afterPaste');},0);},null,null,1000);y.on('pasteDialog',function(A){setTimeout(function(){y.openDialog('paste');},0);});y.on('pasteState',function(A){y.getCommand('paste').setState(A.data);});function z(A,B,C,D){var E=y.lang[B];y.addCommand(B,C);y.ui.addButton(A,{label:E,command:B});if(y.addMenuItems)y.addMenuItem(B,{label:E,command:B,group:'clipboard',order:D});};z('Cut','cut',new o('cut'),1);z('Copy','copy',new o('copy'),4);z('Paste','paste',p,8);a.dialog.add('paste',a.getUrl(this.path+'dialogs/paste.js'));y.on('key',q,y);y.on('contentDom',function(){var A=y.document.getBody();A.on(!c?'paste':'beforepaste',function(B){if(u)return;var C=B.data&&B.data.$;if(c&&C&&!C.ctrlKey)return;var D={mode:'html'};y.fire('beforePaste',D);s.call(y,B,D.mode,function(E){if(!(E=e.trim(E.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,''))))return;var F={};F[D.mode]=E;y.fire('paste',F);});});if(c){A.on('contextmenu',function(){u=1;setTimeout(function(){u=0;},0);});A.on('paste',function(B){if(!y.document.getById('cke_pastebin')){B.data.preventDefault();u=0;p.exec(y);}});}A.on('beforecut',function(){!u&&t(y);});A.on('mouseup',function(){setTimeout(function(){x.call(y);},0);},y);A.on('keyup',x,y);});y.on('selectionChange',function(A){v=A.data.selection.getRanges()[0].checkReadOnly();x.call(y);});if(y.contextMenu)y.contextMenu.addListener(function(A,B){var C=B.getRanges()[0].checkReadOnly();return{cut:w('Cut',y),copy:w('Copy',y),paste:w('Paste',y)};});}});})();j.add('colorbutton',{requires:['panelbutton','floatpanel','styles'],init:function(m){var n=m.config,o=m.lang.colorButton,p;
+if(!b.hc){q('TextColor','fore',o.textColorTitle);q('BGColor','back',o.bgColorTitle);}function q(t,u,v){var w=e.getNextId()+'_colorBox';m.ui.add(t,'panelbutton',{label:v,title:v,className:'cke_button_'+t.toLowerCase(),modes:{wysiwyg:1},panel:{css:m.skin.editor.css,attributes:{role:'listbox','aria-label':o.panelTitle}},onBlock:function(x,y){y.autoSize=true;y.element.addClass('cke_colorblock');y.element.setHtml(r(x,u,w));y.element.getDocument().getBody().setStyle('overflow','hidden');k.fire('ready',this);var z=y.keys,A=m.lang.dir=='rtl';z[A?37:39]='next';z[40]='next';z[9]='next';z[A?39:37]='prev';z[38]='prev';z[2228224+9]='prev';z[32]='click';},onOpen:function(){var x=m.getSelection(),y=x&&x.getStartElement(),z=new d.elementPath(y),A;y=z.block||z.blockLimit||m.document.getBody();do A=y&&y.getComputedStyle(u=='back'?'background-color':'color')||'transparent';while(u=='back'&&A=='transparent'&&y&&(y=y.getParent()));if(!A||A=='transparent')A='#ffffff';this._.panel._.iframe.getFrameDocument().getById(w).setStyle('background-color',A);}});};function r(t,u,v){var w=[],x=n.colorButton_colors.split(','),y=e.addFunction(function(E,F){if(E=='?'){var G=arguments.callee;function H(J){this.removeListener('ok',H);this.removeListener('cancel',H);J.name=='ok'&&G(this.getContentElement('picker','selectedColor').getValue(),F);};m.openDialog('colordialog',function(){this.on('ok',H);this.on('cancel',H);});return;}m.focus();t.hide(false);m.fire('saveSnapshot');new a.style(n['colorButton_'+F+'Style'],{color:'inherit'}).remove(m.document);if(E){var I=n['colorButton_'+F+'Style'];I.childRule=F=='back'?function(J){return s(J);}:function(J){return!(J.is('a')||J.getElementsByTag('a').count())||s(J);};new a.style(I,{color:E}).apply(m.document);}m.fire('saveSnapshot');});w.push('<a class="cke_colorauto" _cke_focus=1 hidefocus=true title="',o.auto,'" onclick="CKEDITOR.tools.callFunction(',y,",null,'",u,"');return false;\" href=\"javascript:void('",o.auto,'\')" role="option"><table role="presentation" cellspacing=0 cellpadding=0 width="100%"><tr><td><span class="cke_colorbox" id="',v,'"></span></td><td colspan=7 align=center>',o.auto,'</td></tr></table></a><table role="presentation" cellspacing=0 cellpadding=0 width="100%">');for(var z=0;z<x.length;z++){if(z%8===0)w.push('</tr><tr>');var A=x[z].split('/'),B=A[0],C=A[1]||B;if(!A[1])B='#'+B.replace(/^(.)(.)(.)$/,'$1$1$2$2$3$3');var D=m.lang.colors[C]||C;w.push('<td><a class="cke_colorbox" _cke_focus=1 hidefocus=true title="',D,'" onclick="CKEDITOR.tools.callFunction(',y,",'",B,"','",u,"'); return false;\" href=\"javascript:void('",D,'\')" role="option"><span class="cke_colorbox" style="background-color:#',C,'"></span></a></td>');
+}if(n.colorButton_enableMore===undefined||n.colorButton_enableMore)w.push('</tr><tr><td colspan=8 align=center><a class="cke_colormore" _cke_focus=1 hidefocus=true title="',o.more,'" onclick="CKEDITOR.tools.callFunction(',y,",'?','",u,"');return false;\" href=\"javascript:void('",o.more,"')\"",' role="option">',o.more,'</a></td>');w.push('</tr></table>');return w.join('');};function s(t){return t.getAttribute('contentEditable')=='false'||t.getAttribute('data-nostyle');};}});i.colorButton_colors='000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';i.colorButton_foreStyle={element:'span',styles:{color:'#(color)'},overrides:[{element:'font',attributes:{color:null}}]};i.colorButton_backStyle={element:'span',styles:{'background-color':'#(color)'}};j.colordialog={requires:['dialog'],init:function(m){m.addCommand('colordialog',new a.dialogCommand('colordialog'));a.dialog.add('colordialog',this.path+'dialogs/colordialog.js');}};j.add('colordialog',j.colordialog);j.add('contextmenu',{requires:['menu'],onLoad:function(){j.contextMenu=e.createClass({base:a.menu,$:function(m){this.base.call(this,m,{panel:{className:m.skinClass+' cke_contextmenu',attributes:{'aria-label':m.lang.contextmenu.options}}});},proto:{addTarget:function(m,n){if(b.opera&&!('oncontextmenu' in document.body)){var o;m.on('mousedown',function(s){s=s.data;if(s.$.button!=2){if(s.getKeystroke()==1114112+1)m.fire('contextmenu',s);return;}if(n&&(b.mac?s.$.metaKey:s.$.ctrlKey))return;var t=s.getTarget();if(!o){var u=t.getDocument();o=u.createElement('input');o.$.type='button';u.getBody().append(o);}o.setAttribute('style','position:absolute;top:'+(s.$.clientY-2)+'px;left:'+(s.$.clientX-2)+'px;width:5px;height:5px;opacity:0.01');});m.on('mouseup',function(s){if(o){o.remove();o=undefined;m.fire('contextmenu',s.data);}});}m.on('contextmenu',function(s){var t=s.data;if(n&&(b.webkit?p:b.mac?t.$.metaKey:t.$.ctrlKey))return;t.preventDefault();var u=t.getTarget().getDocument().getDocumentElement(),v=t.$.clientX,w=t.$.clientY;e.setTimeout(function(){this.open(u,null,v,w);},c?200:0,this);},this);if(b.opera)m.on('keypress',function(s){var t=s.data;if(t.$.keyCode===0)t.preventDefault();});if(b.webkit){var p,q=function(s){p=b.mac?s.data.$.metaKey:s.data.$.ctrlKey;},r=function(){p=0;};m.on('keydown',q);m.on('keyup',r);
+m.on('contextmenu',r);}},open:function(m,n,o,p){this.editor.focus();m=m||a.document.getDocumentElement();this.show(m,n,o,p);}}});},beforeInit:function(m){m.contextMenu=new j.contextMenu(m);m.addCommand('contextMenu',{exec:function(){m.contextMenu.open(m.document.getBody());}});}});(function(){function m(o){var p=this.att,q=o&&o.hasAttribute(p)&&o.getAttribute(p)||'';if(q!==undefined)this.setValue(q);};function n(){var o;for(var p=0;p<arguments.length;p++){if(arguments[p] instanceof h){o=arguments[p];break;}}if(o){var q=this.att,r=this.getValue();if(r)o.setAttribute(q,r);else o.removeAttribute(q,r);}};j.add('dialogadvtab',{createAdvancedTab:function(o,p){if(!p)p={id:1,dir:1,classes:1,styles:1};var q=o.lang.common,r={id:'advanced',label:q.advancedTab,title:q.advancedTab,elements:[{type:'vbox',padding:1,children:[]}]},s=[];if(p.id||p.dir){if(p.id)s.push({id:'advId',att:'id',type:'text',label:q.id,setup:m,commit:n});if(p.dir)s.push({id:'advLangDir',att:'dir',type:'select',label:q.langDir,'default':'',style:'width:100%',items:[[q.notSet,''],[q.langDirLTR,'ltr'],[q.langDirRTL,'rtl']],setup:m,commit:n});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}if(p.styles||p.classes){s=[];if(p.styles)s.push({id:'advStyles',att:'style',type:'text',label:q.styles,'default':'',validate:a.dialog.validate.inlineStyle(q.invalidInlineStyle),onChange:function(){},getStyle:function(t,u){var v=this.getValue().match(new RegExp('(?:^|;)\\s*'+t+'\\s*:\\s*([^;]*)','i'));return v?v[1]:u;},updateStyle:function(t,u){var v=this.getValue(),w=o.document.createElement('span');w.setAttribute('style',v);w.setStyle(t,u);v=e.normalizeCssText(w.getAttribute('style'));this.setValue(v,1);},setup:m,commit:n});if(p.classes)s.push({type:'hbox',widths:['45%','55%'],children:[{id:'advCSSClasses',att:'class',type:'text',label:q.cssClasses,'default':'',setup:m,commit:n}]});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}return r;}});})();(function(){j.add('div',{requires:['editingblock','dialog','domiterator','styles'],init:function(m){var n=m.lang.div;m.addCommand('creatediv',new a.dialogCommand('creatediv'));m.addCommand('editdiv',new a.dialogCommand('editdiv'));m.addCommand('removediv',{exec:function(o){var p=o.getSelection(),q=p&&p.getRanges(),r,s=p.createBookmarks(),t,u=[];function v(x){var y=new d.elementPath(x),z=y.blockLimit,A=z.is('div')&&z;if(A&&!A.data('cke-div-added')){u.push(A);A.data('cke-div-added');}};for(var w=0;w<q.length;
+w++){r=q[w];if(r.collapsed)v(p.getStartElement());else{t=new d.walker(r);t.evaluator=v;t.lastForward();}}for(w=0;w<u.length;w++)u[w].remove(true);p.selectBookmarks(s);}});m.ui.addButton('CreateDiv',{label:n.toolbar,command:'creatediv'});if(m.addMenuItems){m.addMenuItems({editdiv:{label:n.edit,command:'editdiv',group:'div',order:1},removediv:{label:n.remove,command:'removediv',group:'div',order:5}});if(m.contextMenu)m.contextMenu.addListener(function(o,p){if(!o||o.isReadOnly())return null;var q=new d.elementPath(o),r=q.blockLimit;if(r&&r.getAscendant('div',true))return{editdiv:2,removediv:2};return null;});}a.dialog.add('creatediv',this.path+'dialogs/div.js');a.dialog.add('editdiv',this.path+'dialogs/div.js');}});})();(function(){var m={toolbarFocus:{editorFocus:false,readOnly:1,exec:function(o){var p=o._.elementsPath.idBase,q=a.document.getById(p+'0');q&&q.focus(c||b.air);}}},n='<span class="cke_empty">&nbsp;</span>';j.add('elementspath',{requires:['selection'],init:function(o){var p='cke_path_'+o.name,q,r=function(){if(!q)q=a.document.getById(p);return q;},s='cke_elementspath_'+e.getNextNumber()+'_';o._.elementsPath={idBase:s,filters:[]};o.on('themeSpace',function(x){if(x.data.space=='bottom')x.data.html+='<span id="'+p+'_label" class="cke_voice_label">'+o.lang.elementsPath.eleLabel+'</span>'+'<div id="'+p+'" class="cke_path" role="group" aria-labelledby="'+p+'_label">'+n+'</div>';});function t(x){o.focus();var y=o._.elementsPath.list[x];if(y.is('body')){var z=new d.range(o.document);z.selectNodeContents(y);z.select();}else o.getSelection().selectElement(y);};var u=e.addFunction(t),v=e.addFunction(function(x,y){var z=o._.elementsPath.idBase,A;y=new d.event(y);var B=o.lang.dir=='rtl';switch(y.getKeystroke()){case B?39:37:case 9:A=a.document.getById(z+(x+1));if(!A)A=a.document.getById(z+'0');A.focus();return false;case B?37:39:case 2228224+9:A=a.document.getById(z+(x-1));if(!A)A=a.document.getById(z+(o._.elementsPath.list.length-1));A.focus();return false;case 27:o.focus();return false;case 13:case 32:t(x);return false;}return true;});o.on('selectionChange',function(x){var y=b,z=x.data.selection,A=z.getStartElement(),B=[],C=x.editor,D=C._.elementsPath.list=[],E=C._.elementsPath.filters;while(A){var F=0,G;if(A.data('cke-display-name'))G=A.data('cke-display-name');else if(A.data('cke-real-element-type'))G=A.data('cke-real-element-type');else G=A.getName();for(var H=0;H<E.length;H++){var I=E[H](A,G);if(I===false){F=1;break;}G=I||G;}if(!F){var J=D.push(A)-1,K='';
+if(y.opera||y.gecko&&y.mac)K+=' onkeypress="return false;"';if(y.gecko)K+=' onblur="this.style.cssText = this.style.cssText;"';var L=C.lang.elementsPath.eleTitle.replace(/%1/,G);B.unshift('<a id="',s,J,'" href="javascript:void(\'',G,'\')" tabindex="-1" title="',L,'"'+(b.gecko&&b.version<10900?' onfocus="event.preventBubble();"':'')+' hidefocus="true" '+' onkeydown="return CKEDITOR.tools.callFunction(',v,',',J,', event );"'+K,' onclick="CKEDITOR.tools.callFunction('+u,',',J,'); return false;"',' role="button" aria-labelledby="'+s+J+'_label">',G,'<span id="',s,J,'_label" class="cke_label">'+L+'</span>','</a>');}if(G=='body')break;A=A.getParent();}var M=r();M.setHtml(B.join('')+n);C.fire('elementsPathUpdate',{space:M});});function w(){q&&q.setHtml(n);delete o._.elementsPath.list;};o.on('readOnly',w);o.on('contentDomUnload',w);o.addCommand('elementsPathFocus',m.toolbarFocus);}});})();(function(){j.add('enterkey',{requires:['keystrokes','indent'],init:function(t){t.addCommand('enter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){r(v);}});t.addCommand('shiftEnter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){q(v);}});var u=t.keystrokeHandler.keystrokes;u[13]='enter';u[2228224+13]='shiftEnter';}});j.enterkey={enterBlock:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=v.checkStartOfBlock(),z=v.checkEndOfBlock(),A=new d.elementPath(v.startContainer),B=A.block;if(y&&z){if(B&&(B.is('li')||B.getParent().is('li'))){t.execCommand('outdent');return;}if(B&&B.getParent().is('blockquote')){B.breakParent(B.getParent());if(!B.getPrevious().getFirst(d.walker.invisible(1)))B.getPrevious().remove();if(!B.getNext().getFirst(d.walker.invisible(1)))B.getNext().remove();v.moveToElementEditStart(B);v.select();return;}}else if(B&&B.is('pre')){if(!z){n(t,u,v,w);return;}}else if(B&&f.$captionBlock[B.getName()]){n(t,u,v,w);return;}var C=u==3?'div':'p',D=v.splitBlock(C);if(!D)return;var E=D.previousBlock,F=D.nextBlock,G=D.wasStartOfBlock,H=D.wasEndOfBlock,I;if(F){I=F.getParent();if(I.is('li')){F.breakParent(I);F.move(F.getNext(),1);}}else if(E&&(I=E.getParent())&&I.is('li')){E.breakParent(I);I=E.getNext();v.moveToElementEditStart(I);E.move(E.getPrevious());}if(!G&&!H){if(F.is('li')&&(I=F.getFirst(d.walker.invisible(true)))&&I.is&&I.is('ul','ol'))(c?x.createText('\xa0'):x.createElement('br')).insertBefore(I);if(F)v.moveToElementEditStart(F);}else{var J,K;if(E){if(E.is('li')||!(p.test(E.getName())||E.is('pre')))J=E.clone();}else if(F)J=F.clone();if(!J){if(I&&I.is('li'))J=I;
+else{J=x.createElement(C);if(E&&(K=E.getDirection()))J.setAttribute('dir',K);}}else if(w&&!J.is('li'))J.renameNode(C);var L=D.elementPath;if(L)for(var M=0,N=L.elements.length;M<N;M++){var O=L.elements[M];if(O.equals(L.block)||O.equals(L.blockLimit))break;if(f.$removeEmpty[O.getName()]){O=O.clone();J.moveChildren(O);J.append(O);}}if(!c)J.appendBogus();if(!J.getParent())v.insertNode(J);J.is('li')&&J.removeAttribute('value');if(c&&G&&(!H||!E.getChildCount())){v.moveToElementEditStart(H?E:J);v.select();}v.moveToElementEditStart(G&&!H?F:J);}if(!c)if(F){var P=x.createElement('span');P.setHtml('&nbsp;');v.insertNode(P);P.scrollIntoView();v.deleteContents();}else J.scrollIntoView();v.select();},enterBr:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=u==3?'div':'p',z=v.checkEndOfBlock(),A=new d.elementPath(t.getSelection().getStartElement()),B=A.block,C=B&&A.block.getName(),D=false;if(!w&&C=='li'){o(t,u,v,w);return;}if(!w&&z&&p.test(C)){var E,F;if(F=B.getDirection()){E=x.createElement('div');E.setAttribute('dir',F);E.insertAfter(B);v.setStart(E,0);}else{x.createElement('br').insertAfter(B);if(b.gecko)x.createText('').insertAfter(B);v.setStartAt(B.getNext(),c?3:1);}}else{var G;D=C=='pre';if(C=='pre'&&c&&b.version<8)G=x.createText('\r');else G=x.createElement('br');v.deleteContents();v.insertNode(G);if(c)v.setStartAt(G,4);else{x.createText('\ufeff').insertAfter(G);if(z)G.getParent().appendBogus();G.getNext().$.nodeValue='';v.setStartAt(G.getNext(),1);var H=null;if(!b.gecko){H=x.createElement('span');H.setHtml('&nbsp;');}else H=x.createElement('br');H.insertBefore(G.getNext());H.scrollIntoView();H.remove();}}v.collapse(true);v.select(D);}};var m=j.enterkey,n=m.enterBr,o=m.enterBlock,p=/^h[1-6]$/;function q(t){if(t.mode!='wysiwyg')return false;return r(t,t.config.shiftEnterMode,1);};function r(t,u,v){v=t.config.forceEnterMode||v;if(t.mode!='wysiwyg')return false;if(!u)u=t.config.enterMode;setTimeout(function(){t.fire('saveSnapshot');if(u==2)n(t,u,null,v);else o(t,u,null,v);t.fire('saveSnapshot');},0);return true;};function s(t){var u=t.getSelection().getRanges(true);for(var v=u.length-1;v>0;v--)u[v].deleteContents();return u[0];};})();(function(){var m='nbsp,gt,lt,amp',n='quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro',o='Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml',p='Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv';
+function q(r,s){var t={},u=[],v={nbsp:'\xa0',shy:'­',gt:'>',lt:'<',amp:'&',apos:"'",quot:'"'};r=r.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(A,B){var C=s?'&'+B+';':v[B],D=s?v[B]:'&'+B+';';t[C]=D;u.push(C);return '';});if(!s&&r){r=r.split(',');var w=document.createElement('div'),x;w.innerHTML='&'+r.join(';&')+';';x=w.innerHTML;w=null;for(var y=0;y<x.length;y++){var z=x.charAt(y);t[z]='&'+r[y]+';';u.push(z);}}t.regex=u.join(s?'|':'');return t;};j.add('entities',{afterInit:function(r){var s=r.config,t=r.dataProcessor,u=t&&t.htmlFilter;if(u){var v=[];if(s.basicEntities!==false)v.push(m);if(s.entities){if(v.length)v.push(n);if(s.entities_latin)v.push(o);if(s.entities_greek)v.push(p);if(s.entities_additional)v.push(s.entities_additional);}var w=q(v.join(',')),x=w.regex?'['+w.regex+']':'a^';delete w.regex;if(s.entities&&s.entities_processNumerical)x='[^ -~]|'+x;x=new RegExp(x,'g');function y(C){return s.entities_processNumerical=='force'||!w[C]?'&#'+C.charCodeAt(0)+';':w[C];};var z=q([m,'shy'].join(','),true),A=new RegExp(z.regex,'g');function B(C){return z[C];};u.addRules({text:function(C){return C.replace(A,B).replace(x,y);}});}}});})();i.basicEntities=true;i.entities=true;i.entities_latin=true;i.entities_greek=true;i.entities_additional='#39';(function(){function m(v,w){var x=[];if(!w)return v;else for(var y in w)x.push(y+'='+encodeURIComponent(w[y]));return v+(v.indexOf('?')!=-1?'&':'?')+x.join('&');};function n(v){v+='';var w=v.charAt(0).toUpperCase();return w+v.substr(1);};function o(v){var C=this;var w=C.getDialog(),x=w.getParentEditor();x._.filebrowserSe=C;var y=x.config['filebrowser'+n(w.getName())+'WindowWidth']||x.config.filebrowserWindowWidth||'80%',z=x.config['filebrowser'+n(w.getName())+'WindowHeight']||x.config.filebrowserWindowHeight||'70%',A=C.filebrowser.params||{};A.CKEditor=x.name;A.CKEditorFuncNum=x._.filebrowserFn;if(!A.langCode)A.langCode=x.langCode;var B=m(C.filebrowser.url,A);x.popup(B,y,z,x.config.filebrowserWindowFeatures||x.config.fileBrowserWindowFeatures);};function p(v){var y=this;var w=y.getDialog(),x=w.getParentEditor();x._.filebrowserSe=y;if(!w.getContentElement(y['for'][0],y['for'][1]).getInputElement().$.value)return false;if(!w.getContentElement(y['for'][0],y['for'][1]).getAction())return false;return true;};function q(v,w,x){var y=x.params||{};y.CKEditor=v.name;y.CKEditorFuncNum=v._.filebrowserFn;if(!y.langCode)y.langCode=v.langCode;w.action=m(x.url,y);w.filebrowser=x;};function r(v,w,x,y){var z,A;for(var B in y){z=y[B];
+if(z.type=='hbox'||z.type=='vbox'||z.type=='fieldset')r(v,w,x,z.children);if(!z.filebrowser)continue;if(typeof z.filebrowser=='string'){var C={action:z.type=='fileButton'?'QuickUpload':'Browse',target:z.filebrowser};z.filebrowser=C;}if(z.filebrowser.action=='Browse'){var D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'BrowseUrl'];if(D===undefined)D=v.config.filebrowserBrowseUrl;}if(D){z.onClick=o;z.filebrowser.url=D;z.hidden=false;}}else if(z.filebrowser.action=='QuickUpload'&&z['for']){D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'UploadUrl'];if(D===undefined)D=v.config.filebrowserUploadUrl;}if(D){var E=z.onClick;z.onClick=function(F){var G=F.sender;if(E&&E.call(G,F)===false)return false;return p.call(G,F);};z.filebrowser.url=D;z.hidden=false;q(v,x.getContents(z['for'][0]).get(z['for'][1]),z.filebrowser);}}}};function s(v,w){var x=w.getDialog(),y=w.filebrowser.target||null;if(y){var z=y.split(':'),A=x.getContentElement(z[0],z[1]);if(A){A.setValue(v);x.selectPage(z[0]);}}};function t(v,w,x){if(x.indexOf(';')!==-1){var y=x.split(';');for(var z=0;z<y.length;z++){if(t(v,w,y[z]))return true;}return false;}var A=v.getContents(w).get(x).filebrowser;return A&&A.url;};function u(v,w){var A=this;var x=A._.filebrowserSe.getDialog(),y=A._.filebrowserSe['for'],z=A._.filebrowserSe.filebrowser.onSelect;if(y)x.getContentElement(y[0],y[1]).reset();if(typeof w=='function'&&w.call(A._.filebrowserSe)===false)return;if(z&&z.call(A._.filebrowserSe,v,w)===false)return;if(typeof w=='string'&&w)alert(w);if(v)s(v,A._.filebrowserSe);};j.add('filebrowser',{init:function(v,w){v._.filebrowserFn=e.addFunction(u,v);v.on('destroy',function(){e.removeFunction(this._.filebrowserFn);});}});a.on('dialogDefinition',function(v){var w=v.data.definition,x;for(var y in w.contents){if(x=w.contents[y]){r(v.editor,v.data.name,w,x.elements);if(x.hidden&&x.filebrowser)x.hidden=!t(w,x.id,x.filebrowser);}}});})();j.add('find',{requires:['dialog'],init:function(m){var n=j.find;m.ui.addButton('Find',{label:m.lang.findAndReplace.find,command:'find'});var o=m.addCommand('find',new a.dialogCommand('find'));o.canUndo=false;o.readOnly=1;m.ui.addButton('Replace',{label:m.lang.findAndReplace.replace,command:'replace'});var p=m.addCommand('replace',new a.dialogCommand('replace'));p.canUndo=false;a.dialog.add('find',this.path+'dialogs/find.js');a.dialog.add('replace',this.path+'dialogs/find.js');},requires:['styles']});i.find_highlight={element:'span',styles:{'background-color':'#004',color:'#fff'}};
+(function(){var m=/\.swf(?:$|\?)/i;function n(p){var q=p.attributes;return q.type=='application/x-shockwave-flash'||m.test(q.src||'');};function o(p,q){return p.createFakeParserElement(q,'cke_flash','flash',true);};j.add('flash',{init:function(p){p.addCommand('flash',new a.dialogCommand('flash'));p.ui.addButton('Flash',{label:p.lang.common.flash,command:'flash'});a.dialog.add('flash',this.path+'dialogs/flash.js');p.addCss('img.cke_flash{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');if(p.addMenuItems)p.addMenuItems({flash:{label:p.lang.flash.properties,command:'flash',group:'flash'}});p.on('doubleclick',function(q){var r=q.data.element;if(r.is('img')&&r.data('cke-real-element-type')=='flash')q.data.dialog='flash';});if(p.contextMenu)p.contextMenu.addListener(function(q,r){if(q&&q.is('img')&&!q.isReadOnly()&&q.data('cke-real-element-type')=='flash')return{flash:2};});},afterInit:function(p){var q=p.dataProcessor,r=q&&q.dataFilter;if(r)r.addRules({elements:{'cke:object':function(s){var t=s.attributes,u=t.classid&&String(t.classid).toLowerCase();if(!u&&!n(s)){for(var v=0;v<s.children.length;v++){if(s.children[v].name=='cke:embed'){if(!n(s.children[v]))return null;return o(p,s);}}return null;}return o(p,s);},'cke:embed':function(s){if(!n(s))return null;return o(p,s);}}},5);},requires:['fakeobjects']});})();e.extend(i,{flashEmbedTagOnly:false,flashAddEmbedTag:true,flashConvertOnEdit:false});(function(){function m(n,o,p,q,r,s,t){var u=n.config,v=r.split(';'),w=[],x={};for(var y=0;y<v.length;y++){var z=v[y];if(z){z=z.split('/');var A={},B=v[y]=z[0];A[p]=w[y]=z[1]||B;x[B]=new a.style(t,A);x[B]._.definition.name=B;}else v.splice(y--,1);}n.ui.addRichCombo(o,{label:q.label,title:q.panelTitle,className:'cke_'+(p=='size'?'fontSize':'font'),panel:{css:n.skin.editor.css.concat(u.contentsCss),multiSelect:false,attributes:{'aria-label':q.panelTitle}},init:function(){this.startGroup(q.panelTitle);for(var C=0;C<v.length;C++){var D=v[C];this.add(D,x[D].buildPreview(),D);}},onClick:function(C){n.focus();n.fire('saveSnapshot');var D=x[C];if(this.getValue()==C)D.remove(n.document);else D.apply(n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(C){var D=this.getValue(),E=C.data.path,F=E.elements;for(var G=0,H;G<F.length;G++){H=F[G];for(var I in x){if(x[I].checkElementMatch(H,true)){if(I!=D)this.setValue(I);
+return;}}}this.setValue('',s);},this);}});};j.add('font',{requires:['richcombo','styles'],init:function(n){var o=n.config;m(n,'Font','family',n.lang.font,o.font_names,o.font_defaultLabel,o.font_style);m(n,'FontSize','size',n.lang.fontSize,o.fontSize_sizes,o.fontSize_defaultLabel,o.fontSize_style);}});})();i.font_names='Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif';i.font_defaultLabel='';i.font_style={element:'span',styles:{'font-family':'#(family)'},overrides:[{element:'font',attributes:{face:null}}]};i.fontSize_sizes='8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px';i.fontSize_defaultLabel='';i.fontSize_style={element:'span',styles:{'font-size':'#(size)'},overrides:[{element:'font',attributes:{size:null}}]};j.add('format',{requires:['richcombo','styles'],init:function(m){var n=m.config,o=m.lang.format,p=n.format_tags.split(';'),q={};for(var r=0;r<p.length;r++){var s=p[r];q[s]=new a.style(n['format_'+s]);q[s]._.enterMode=m.config.enterMode;}m.ui.addRichCombo('Format',{label:o.label,title:o.panelTitle,className:'cke_format',panel:{css:m.skin.editor.css.concat(n.contentsCss),multiSelect:false,attributes:{'aria-label':o.panelTitle}},init:function(){this.startGroup(o.panelTitle);for(var t in q){var u=o['tag_'+t];this.add(t,q[t].buildPreview(u),u);}},onClick:function(t){m.focus();m.fire('saveSnapshot');var u=q[t],v=new d.elementPath(m.getSelection().getStartElement());u[u.checkActive(v)?'remove':'apply'](m.document);setTimeout(function(){m.fire('saveSnapshot');},0);},onRender:function(){m.on('selectionChange',function(t){var u=this.getValue(),v=t.data.path;for(var w in q){if(q[w].checkActive(v)){if(w!=u)this.setValue(w,m.lang.format['tag_'+w]);return;}}this.setValue('');},this);}});}});i.format_tags='p;h1;h2;h3;h4;h5;h6;pre;address;div';i.format_p={element:'p'};i.format_div={element:'div'};i.format_pre={element:'pre'};i.format_address={element:'address'};i.format_h1={element:'h1'};i.format_h2={element:'h2'};i.format_h3={element:'h3'};i.format_h4={element:'h4'};i.format_h5={element:'h5'};i.format_h6={element:'h6'};j.add('forms',{requires:['dialog'],init:function(m){var n=m.lang;
+m.addCss('form{border: 1px dotted #FF0000;padding: 2px;}\n');m.addCss('img.cke_hidden{background-image: url('+a.getUrl(this.path+'images/hiddenfield.gif')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 16px !important;'+'height: 16px !important;'+'}');var o=function(q,r,s){m.addCommand(r,new a.dialogCommand(r));m.ui.addButton(q,{label:n.common[q.charAt(0).toLowerCase()+q.slice(1)],command:r});a.dialog.add(r,s);},p=this.path+'dialogs/';o('Form','form',p+'form.js');o('Checkbox','checkbox',p+'checkbox.js');o('Radio','radio',p+'radio.js');o('TextField','textfield',p+'textfield.js');o('Textarea','textarea',p+'textarea.js');o('Select','select',p+'select.js');o('Button','button',p+'button.js');o('ImageButton','imagebutton',j.getPath('image')+'dialogs/image.js');o('HiddenField','hiddenfield',p+'hiddenfield.js');if(m.addMenuItems)m.addMenuItems({form:{label:n.form.menu,command:'form',group:'form'},checkbox:{label:n.checkboxAndRadio.checkboxTitle,command:'checkbox',group:'checkbox'},radio:{label:n.checkboxAndRadio.radioTitle,command:'radio',group:'radio'},textfield:{label:n.textfield.title,command:'textfield',group:'textfield'},hiddenfield:{label:n.hidden.title,command:'hiddenfield',group:'hiddenfield'},imagebutton:{label:n.image.titleButton,command:'imagebutton',group:'imagebutton'},button:{label:n.button.title,command:'button',group:'button'},select:{label:n.select.title,command:'select',group:'select'},textarea:{label:n.textarea.title,command:'textarea',group:'textarea'}});if(m.contextMenu){m.contextMenu.addListener(function(q){if(q&&q.hasAscendant('form',true)&&!q.isReadOnly())return{form:2};});m.contextMenu.addListener(function(q){if(q&&!q.isReadOnly()){var r=q.getName();if(r=='select')return{select:2};if(r=='textarea')return{textarea:2};if(r=='input')switch(q.getAttribute('type')){case 'button':case 'submit':case 'reset':return{button:2};case 'checkbox':return{checkbox:2};case 'radio':return{radio:2};case 'image':return{imagebutton:2};default:return{textfield:2};}if(r=='img'&&q.data('cke-real-element-type')=='hiddenfield')return{hiddenfield:2};}});}m.on('doubleclick',function(q){var r=q.data.element;if(r.is('form'))q.data.dialog='form';else if(r.is('select'))q.data.dialog='select';else if(r.is('textarea'))q.data.dialog='textarea';else if(r.is('img')&&r.data('cke-real-element-type')=='hiddenfield')q.data.dialog='hiddenfield';else if(r.is('input'))switch(r.getAttribute('type')){case 'button':case 'submit':case 'reset':q.data.dialog='button';
+break;case 'checkbox':q.data.dialog='checkbox';break;case 'radio':q.data.dialog='radio';break;case 'image':q.data.dialog='imagebutton';break;default:q.data.dialog='textfield';break;}});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.htmlFilter,p=n&&n.dataFilter;if(c)o&&o.addRules({elements:{input:function(q){var r=q.attributes,s=r.type;if(!s)r.type='text';if(s=='checkbox'||s=='radio')r.value=='on'&&delete r.value;}}});if(p)p.addRules({elements:{input:function(q){if(q.attributes.type=='hidden')return m.createFakeParserElement(q,'cke_hidden','hiddenfield');}}});},requires:['image','fakeobjects']});if(c)h.prototype.hasAttribute=e.override(h.prototype.hasAttribute,function(m){return function(n){var q=this;var o=q.$.attributes.getNamedItem(n);if(q.getName()=='input')switch(n){case 'class':return q.$.className.length>0;case 'checked':return!!q.$.checked;case 'value':var p=q.getAttribute('type');return p=='checkbox'||p=='radio'?q.$.value!='on':q.$.value;}return m.apply(q,arguments);};});(function(){var m={canUndo:false,exec:function(o){var p=o.document.createElement('hr');o.insertElement(p);}},n='horizontalrule';j.add(n,{init:function(o){o.addCommand(n,m);o.ui.addButton('HorizontalRule',{label:o.lang.horizontalrule,command:n});}});})();(function(){var m=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,n='{cke_protected}';function o(U){var V=U.children.length,W=U.children[V-1];while(W&&W.type==3&&!e.trim(W.value))W=U.children[--V];return W;};function p(U){var V=U.parent;return V?e.indexOf(V.children,U):-1;};function q(U,V){var W=U.children,X=o(U);if(X){if((V||!c)&&X.type==1&&X.name=='br')W.pop();if(X.type==3&&m.test(X.value))W.pop();}};function r(U,V,W){if(!V&&(!W||typeof W=='function'&&W(U)===false))return false;if(V&&c&&(document.documentMode>7||U.name in f.tr||U.name in f.$listItem))return false;var X=o(U);return!X||X&&(X.type==1&&X.name=='br'||U.name=='form'&&X.name=='input');};function s(U,V){return function(W){q(W,!U);if(r(W,!U,V))if(U||c)W.add(new a.htmlParser.text('\xa0'));else W.add(new a.htmlParser.element('br',{}));};};var t=f,u=['caption','colgroup','col','thead','tfoot','tbody'],v=e.extend({},t.$block,t.$listItem,t.$tableContent);for(var w in v){if(!('br' in t[w]))delete v[w];}delete v.pre;var x={elements:{},attributeNames:[[/^on/,'data-cke-pa-on']]},y={elements:{}};for(w in v)y.elements[w]=s();var z={elementNames:[[/^cke:/,''],[/^\?xml:namespace$/,'']],attributeNames:[[/^data-cke-(saved|pa)-/,''],[/^data-cke-.*/,''],['hidefocus','']],elements:{$:function(U){var V=U.attributes;
+if(V){if(V['data-cke-temp'])return false;var W=['name','href','src'],X;for(var Y=0;Y<W.length;Y++){X='data-cke-saved-'+W[Y];X in V&&delete V[W[Y]];}}return U;},table:function(U){var V=U.children.slice(0);V.sort(function(W,X){var Y,Z;if(W.type==1&&X.type==W.type){Y=e.indexOf(u,W.name);Z=e.indexOf(u,X.name);}if(!(Y>-1&&Z>-1&&Y!=Z)){Y=p(W);Z=p(X);}return Y>Z?1:-1;});},embed:function(U){var V=U.parent;if(V&&V.name=='object'){var W=V.attributes.width,X=V.attributes.height;W&&(U.attributes.width=W);X&&(U.attributes.height=X);}},param:function(U){U.children=[];U.isEmpty=true;return U;},a:function(U){if(!(U.children.length||U.attributes.name||U.attributes['data-cke-saved-name']))return false;},span:function(U){if(U.attributes['class']=='Apple-style-span')delete U.name;},pre:function(U){c&&q(U);},html:function(U){delete U.attributes.contenteditable;delete U.attributes['class'];},body:function(U){delete U.attributes.spellcheck;delete U.attributes.contenteditable;},style:function(U){var V=U.children[0];V&&V.value&&(V.value=e.trim(V.value));if(!U.attributes.type)U.attributes.type='text/css';},title:function(U){var V=U.children[0];V&&(V.value=U.attributes['data-cke-title']||'');}},attributes:{'class':function(U,V){return e.ltrim(U.replace(/(?:^|\s+)cke_[^\s]*/g,''))||false;}}};if(c)z.attributes.style=function(U,V){return U.replace(/(^|;)([^\:]+)/g,function(W){return W.toLowerCase();});};function A(U){var V=U.attributes;if(V.contenteditable!='false')V['data-cke-editable']=V.contenteditable?'true':1;V.contenteditable='false';};function B(U){var V=U.attributes;switch(V['data-cke-editable']){case 'true':V.contenteditable='true';break;case '1':delete V.contenteditable;break;}};for(w in {input:1,textarea:1}){x.elements[w]=A;z.elements[w]=B;}var C=/<(a|area|img|input|source)\b([^>]*)>/gi,D=/\b(on\w+|href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,E=/(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,F=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,G=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,H=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,I=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi;function J(U){return U.replace(C,function(V,W,X){return '<'+W+X.replace(D,function(Y,Z){if(!/^on/.test(Z)&&X.indexOf('data-cke-saved-'+Z)==-1)return ' data-cke-saved-'+Y+' data-cke-'+a.rnd+'-'+Y;return Y;})+'>';});};function K(U){return U.replace(E,function(V){return '<cke:encoded>'+encodeURIComponent(V)+'</cke:encoded>';});};function L(U){return U.replace(F,function(V,W){return decodeURIComponent(W);
+});};function M(U){return U.replace(G,'$1cke:$2');};function N(U){return U.replace(H,'$1$2');};function O(U){return U.replace(I,'<cke:$1$2></cke:$1>');};function P(U){return U.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,'$1$2$2');};function Q(U){return U.replace(/<!--(?!{cke_protected})[\s\S]+?-->/g,function(V){return '<!--'+n+'{C}'+encodeURIComponent(V).replace(/--/g,'%2D%2D')+'-->';});};function R(U){return U.replace(/<!--\{cke_protected\}\{C\}([\s\S]+?)-->/g,function(V,W){return decodeURIComponent(W);});};function S(U,V){var W=V._.dataStore;return U.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(X,Y){return decodeURIComponent(Y);}).replace(/\{cke_protected_(\d+)\}/g,function(X,Y){return W&&W[Y]||'';});};function T(U,V){var W=[],X=V.config.protectedSource,Y=V._.dataStore||(V._.dataStore={id:1}),Z=/<\!--\{cke_temp(comment)?\}(\d*?)-->/g,aa=[/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi].concat(X);U=U.replace(/<!--[\s\S]*?-->/g,function(ac){return '<!--{cke_tempcomment}'+(W.push(ac)-1)+'-->';});for(var ab=0;ab<aa.length;ab++)U=U.replace(aa[ab],function(ac){ac=ac.replace(Z,function(ad,ae,af){return W[af];});return/cke_temp(comment)?/.test(ac)?ac:'<!--{cke_temp}'+(W.push(ac)-1)+'-->';});U=U.replace(Z,function(ac,ad,ae){return '<!--'+n+(ad?'{C}':'')+encodeURIComponent(W[ae]).replace(/--/g,'%2D%2D')+'-->';});return U.replace(/(['"]).*?\1/g,function(ac){return ac.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(ad,ae){Y[Y.id]=decodeURIComponent(ae);return '{cke_protected_'+Y.id++ +'}';});});};j.add('htmldataprocessor',{requires:['htmlwriter'],init:function(U){var V=U.dataProcessor=new a.htmlDataProcessor(U);V.writer.forceSimpleAmpersand=U.config.forceSimpleAmpersand;V.dataFilter.addRules(x);V.dataFilter.addRules(y);V.htmlFilter.addRules(z);var W={elements:{}};for(w in v)W.elements[w]=s(true,U.config.fillEmptyBlocks);V.htmlFilter.addRules(W);},onLoad:function(){!('fillEmptyBlocks' in i)&&(i.fillEmptyBlocks=1);}});a.htmlDataProcessor=function(U){var V=this;V.editor=U;V.writer=new a.htmlWriter();V.dataFilter=new a.htmlParser.filter();V.htmlFilter=new a.htmlParser.filter();};a.htmlDataProcessor.prototype={toHtml:function(U,V){U=T(U,this.editor);U=J(U);U=K(U);U=M(U);U=O(U);U=P(U);var W=new h('div');W.setHtml('a'+U);U=W.getHtml().substr(1);U=U.replace(new RegExp(' data-cke-'+a.rnd+'-','ig'),' ');U=N(U);U=L(U);U=R(U);var X=a.htmlParser.fragment.fromHtml(U,V),Y=new a.htmlParser.basicWriter();X.writeHtml(Y,this.dataFilter);U=Y.getHtml(true);U=Q(U);
+return U;},toDataFormat:function(U,V){var W=this.writer,X=a.htmlParser.fragment.fromHtml(U,V);W.reset();X.writeHtml(W,this.htmlFilter);var Y=W.getHtml(true);Y=R(Y);Y=S(Y,this.editor);return Y;}};})();(function(){j.add('iframe',{requires:['dialog','fakeobjects'],init:function(m){var n='iframe',o=m.lang.iframe;a.dialog.add(n,this.path+'dialogs/iframe.js');m.addCommand(n,new a.dialogCommand(n));m.addCss('img.cke_iframe{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');m.ui.addButton('Iframe',{label:o.toolbar,command:n});m.on('doubleclick',function(p){var q=p.data.element;if(q.is('img')&&q.data('cke-real-element-type')=='iframe')p.data.dialog='iframe';});if(m.addMenuItems)m.addMenuItems({iframe:{label:o.title,command:'iframe',group:'image'}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(p&&p.is('img')&&p.data('cke-real-element-type')=='iframe')return{iframe:2};});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter;if(o)o.addRules({elements:{iframe:function(p){return m.createFakeParserElement(p,'cke_iframe','iframe',true);}}});}});})();(function(){j.add('image',{requires:['dialog'],init:function(o){var p='image';a.dialog.add(p,this.path+'dialogs/image.js');o.addCommand(p,new a.dialogCommand(p));o.ui.addButton('Image',{label:o.lang.common.image,command:p});o.on('doubleclick',function(q){var r=q.data.element;if(r.is('img')&&!r.data('cke-realelement')&&!r.isReadOnly())q.data.dialog='image';});if(o.addMenuItems)o.addMenuItems({image:{label:o.lang.image.menu,command:'image',group:'image'}});if(o.contextMenu)o.contextMenu.addListener(function(q,r){if(m(o,q))return{image:2};});},afterInit:function(o){p('left');p('right');p('center');p('block');function p(q){var r=o.getCommand('justify'+q);if(r){if(q=='left'||q=='right')r.on('exec',function(s){var t=m(o),u;if(t){u=n(t);if(u==q){t.removeStyle('float');if(q==n(t))t.removeAttribute('align');}else t.setStyle('float',q);s.cancel();}});r.on('refresh',function(s){var t=m(o),u;if(t){u=n(t);this.setState(u==q?1:q=='right'||q=='left'?2:0);s.cancel();}});}};}});function m(o,p){if(!p){var q=o.getSelection();p=q.getType()==3&&q.getSelectedElement();}if(p&&p.is('img')&&!p.data('cke-realelement')&&!p.isReadOnly())return p;};function n(o){var p=o.getStyle('float');if(p=='inherit'||p=='none')p=0;if(!p)p=o.getAttribute('align');return p;};})();i.image_removeLinkByEmptyURL=true;
+(function(){var m={ol:1,ul:1},n=d.walker.whitespaces(true),o=d.walker.bookmark(false,true);function p(t){var B=this;if(t.editor.readOnly)return null;var u=t.editor,v=t.data.path,w=v&&v.contains(m),x=v.block||v.blockLimit;if(w)return B.setState(2);if(!B.useIndentClasses&&B.name=='indent')return B.setState(2);if(!x)return B.setState(0);if(B.useIndentClasses){var y=x.$.className.match(B.classNameRegex),z=0;if(y){y=y[1];z=B.indentClassMap[y];}if(B.name=='outdent'&&!z||B.name=='indent'&&z==u.config.indentClasses.length)return B.setState(0);return B.setState(2);}else{var A=parseInt(x.getStyle(r(x)),10);if(isNaN(A))A=0;if(A<=0)return B.setState(0);return B.setState(2);}};function q(t,u){var w=this;w.name=u;w.useIndentClasses=t.config.indentClasses&&t.config.indentClasses.length>0;if(w.useIndentClasses){w.classNameRegex=new RegExp('(?:^|\\s+)('+t.config.indentClasses.join('|')+')(?=$|\\s)');w.indentClassMap={};for(var v=0;v<t.config.indentClasses.length;v++)w.indentClassMap[t.config.indentClasses[v]]=v+1;}w.startDisabled=u=='outdent';};function r(t,u){return(u||t.getComputedStyle('direction'))=='ltr'?'margin-left':'margin-right';};function s(t){return t.type==1&&t.is('li');};q.prototype={exec:function(t){var u=this,v={};function w(M){var N=C.startContainer,O=C.endContainer;while(N&&!N.getParent().equals(M))N=N.getParent();while(O&&!O.getParent().equals(M))O=O.getParent();if(!N||!O)return;var P=N,Q=[],R=false;while(!R){if(P.equals(O))R=true;Q.push(P);P=P.getNext();}if(Q.length<1)return;var S=M.getParents(true);for(var T=0;T<S.length;T++){if(S[T].getName&&m[S[T].getName()]){M=S[T];break;}}var U=u.name=='indent'?1:-1,V=Q[0],W=Q[Q.length-1],X=j.list.listToArray(M,v),Y=X[W.getCustomData('listarray_index')].indent;for(T=V.getCustomData('listarray_index');T<=W.getCustomData('listarray_index');T++){X[T].indent+=U;if(U>0){var Z=X[T].parent;X[T].parent=new h(Z.getName(),Z.getDocument());}}for(T=W.getCustomData('listarray_index')+1;T<X.length&&X[T].indent>Y;T++)X[T].indent+=U;var aa=j.list.arrayToList(X,v,null,t.config.enterMode,M.getDirection());if(u.name=='outdent'){var ab;if((ab=M.getParent())&&ab.is('li')){var ac=aa.listNode.getChildren(),ad=[],ae=ac.count(),af;for(T=ae-1;T>=0;T--){if((af=ac.getItem(T))&&af.is&&af.is('li'))ad.push(af);}}}if(aa)aa.listNode.replace(M);if(ad&&ad.length)for(T=0;T<ad.length;T++){var ag=ad[T],ah=ag;while((ah=ah.getNext())&&ah.is&&ah.getName() in m){if(c&&!ag.getFirst(function(ai){return n(ai)&&o(ai);}))ag.append(C.document.createText('\xa0'));ag.append(ah);
+}ag.insertAfter(ab);}};function x(){var M=C.createIterator(),N=t.config.enterMode;M.enforceRealBlocks=true;M.enlargeBr=N!=2;var O;while(O=M.getNextParagraph(N==1?'p':'div'))y(O);};function y(M,N){if(M.getCustomData('indent_processed'))return false;if(u.useIndentClasses){var O=M.$.className.match(u.classNameRegex),P=0;if(O){O=O[1];P=u.indentClassMap[O];}if(u.name=='outdent')P--;else P++;if(P<0)return false;P=Math.min(P,t.config.indentClasses.length);P=Math.max(P,0);M.$.className=e.ltrim(M.$.className.replace(u.classNameRegex,''));if(P>0)M.addClass(t.config.indentClasses[P-1]);}else{var Q=r(M,N),R=parseInt(M.getStyle(Q),10);if(isNaN(R))R=0;var S=t.config.indentOffset||40;R+=(u.name=='indent'?1:-1)*S;if(R<0)return false;R=Math.max(R,0);R=Math.ceil(R/S)*S;M.setStyle(Q,R?R+(t.config.indentUnit||'px'):'');if(M.getAttribute('style')==='')M.removeAttribute('style');}h.setMarker(v,M,'indent_processed',1);return true;};var z=t.getSelection(),A=z.createBookmarks(1),B=z&&z.getRanges(1),C,D=B.createIterator();while(C=D.getNextRange()){var E=C.getCommonAncestor(),F=E;while(F&&!(F.type==1&&m[F.getName()]))F=F.getParent();if(!F){var G=C.getEnclosedNode();if(G&&G.type==1&&G.getName() in m){C.setStartAt(G,1);C.setEndAt(G,2);F=G;}}if(F&&C.startContainer.type==1&&C.startContainer.getName() in m){var H=new d.walker(C);H.evaluator=s;C.startContainer=H.next();}if(F&&C.endContainer.type==1&&C.endContainer.getName() in m){H=new d.walker(C);H.evaluator=s;C.endContainer=H.previous();}if(F){var I=F.getFirst(s),J=!!I.getNext(s),K=C.startContainer,L=I.equals(K)||I.contains(K);if(!(L&&(u.name=='indent'||u.useIndentClasses||parseInt(F.getStyle(r(F)),10))&&y(F,!J&&I.getDirection())))w(F);}else x();}h.clearAllMarkers(v);t.forceNextSelectionCheck();z.selectBookmarks(A);}};j.add('indent',{init:function(t){var u=t.addCommand('indent',new q(t,'indent')),v=t.addCommand('outdent',new q(t,'outdent'));t.ui.addButton('Indent',{label:t.lang.indent,command:'indent'});t.ui.addButton('Outdent',{label:t.lang.outdent,command:'outdent'});t.on('selectionChange',e.bind(p,u));t.on('selectionChange',e.bind(p,v));if(b.ie6Compat||b.ie7Compat)t.addCss('ul,ol{\tmargin-left: 0px;\tpadding-left: 40px;}');t.on('dirChanged',function(w){var x=new d.range(t.document);x.setStartBefore(w.data.node);x.setEndAfter(w.data.node);var y=new d.walker(x),z;while(z=y.next()){if(z.type==1){if(!z.equals(w.data.node)&&z.getDirection()){x.setStartAfter(z);y=new d.walker(x);continue;}var A=t.config.indentClasses;if(A){var B=w.data.dir=='ltr'?['_rtl','']:['','_rtl'];
+for(var C=0;C<A.length;C++){if(z.hasClass(A[C]+B[0])){z.removeClass(A[C]+B[0]);z.addClass(A[C]+B[1]);}}}var D=z.getStyle('margin-right'),E=z.getStyle('margin-left');D?z.setStyle('margin-left',D):z.removeStyle('margin-left');E?z.setStyle('margin-right',E):z.removeStyle('margin-right');}}});},requires:['domiterator','list']});})();(function(){function m(q,r){r=r===undefined||r;var s;if(r)s=q.getComputedStyle('text-align');else{while(!q.hasAttribute||!(q.hasAttribute('align')||q.getStyle('text-align'))){var t=q.getParent();if(!t)break;q=t;}s=q.getStyle('text-align')||q.getAttribute('align')||'';}s&&(s=s.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,''));!s&&r&&(s=q.getComputedStyle('direction')=='rtl'?'right':'left');return s;};function n(q){if(q.editor.readOnly)return;q.editor.getCommand(this.name).refresh(q.data.path);};function o(q,r,s){var u=this;u.editor=q;u.name=r;u.value=s;var t=q.config.justifyClasses;if(t){switch(s){case 'left':u.cssClassName=t[0];break;case 'center':u.cssClassName=t[1];break;case 'right':u.cssClassName=t[2];break;case 'justify':u.cssClassName=t[3];break;}u.cssClassRegex=new RegExp('(?:^|\\s+)(?:'+t.join('|')+')(?=$|\\s)');}};function p(q){var r=q.editor,s=new d.range(r.document);s.setStartBefore(q.data.node);s.setEndAfter(q.data.node);var t=new d.walker(s),u;while(u=t.next()){if(u.type==1){if(!u.equals(q.data.node)&&u.getDirection()){s.setStartAfter(u);t=new d.walker(s);continue;}var v=r.config.justifyClasses;if(v)if(u.hasClass(v[0])){u.removeClass(v[0]);u.addClass(v[2]);}else if(u.hasClass(v[2])){u.removeClass(v[2]);u.addClass(v[0]);}var w='text-align',x=u.getStyle(w);if(x=='left')u.setStyle(w,'right');else if(x=='right')u.setStyle(w,'left');}}};o.prototype={exec:function(q){var C=this;var r=q.getSelection(),s=q.config.enterMode;if(!r)return;var t=r.createBookmarks(),u=r.getRanges(true),v=C.cssClassName,w,x,y=q.config.useComputedState;y=y===undefined||y;for(var z=u.length-1;z>=0;z--){w=u[z].createIterator();w.enlargeBr=s!=2;while(x=w.getNextParagraph(s==1?'p':'div')){x.removeAttribute('align');x.removeStyle('text-align');var A=v&&(x.$.className=e.ltrim(x.$.className.replace(C.cssClassRegex,''))),B=C.state==2&&(!y||m(x,true)!=C.value);if(v){if(B)x.addClass(v);else if(!A)x.removeAttribute('class');}else if(B)x.setStyle('text-align',C.value);}}q.focus();q.forceNextSelectionCheck();r.selectBookmarks(t);},refresh:function(q){var r=q.block||q.blockLimit;this.setState(r.getName()!='body'&&m(r,this.editor.config.useComputedState)==this.value?1:2);
+}};j.add('justify',{init:function(q){var r=new o(q,'justifyleft','left'),s=new o(q,'justifycenter','center'),t=new o(q,'justifyright','right'),u=new o(q,'justifyblock','justify');q.addCommand('justifyleft',r);q.addCommand('justifycenter',s);q.addCommand('justifyright',t);q.addCommand('justifyblock',u);q.ui.addButton('JustifyLeft',{label:q.lang.justify.left,command:'justifyleft'});q.ui.addButton('JustifyCenter',{label:q.lang.justify.center,command:'justifycenter'});q.ui.addButton('JustifyRight',{label:q.lang.justify.right,command:'justifyright'});q.ui.addButton('JustifyBlock',{label:q.lang.justify.block,command:'justifyblock'});q.on('selectionChange',e.bind(n,r));q.on('selectionChange',e.bind(n,t));q.on('selectionChange',e.bind(n,s));q.on('selectionChange',e.bind(n,u));q.on('dirChanged',p);},requires:['domiterator']});})();j.add('keystrokes',{beforeInit:function(m){m.keystrokeHandler=new a.keystrokeHandler(m);m.specialKeys={};},init:function(m){var n=m.config.keystrokes,o=m.config.blockedKeystrokes,p=m.keystrokeHandler.keystrokes,q=m.keystrokeHandler.blockedKeystrokes;for(var r=0;r<n.length;r++)p[n[r][0]]=n[r][1];for(r=0;r<o.length;r++)q[o[r]]=1;}});a.keystrokeHandler=function(m){var n=this;if(m.keystrokeHandler)return m.keystrokeHandler;n.keystrokes={};n.blockedKeystrokes={};n._={editor:m};return n;};(function(){var m,n=function(p){p=p.data;var q=p.getKeystroke(),r=this.keystrokes[q],s=this._.editor;m=s.fire('key',{keyCode:q})===true;if(!m){if(r){var t={from:'keystrokeHandler'};m=s.execCommand(r,t)!==false;}if(!m){var u=s.specialKeys[q];m=u&&u(s)===true;if(!m)m=!!this.blockedKeystrokes[q];}}if(m)p.preventDefault(true);return!m;},o=function(p){if(m){m=false;p.data.preventDefault(true);}};a.keystrokeHandler.prototype={attach:function(p){p.on('keydown',n,this);if(b.opera||b.gecko&&b.mac)p.on('keypress',o,this);}};})();i.blockedKeystrokes=[1114112+66,1114112+73,1114112+85];i.keystrokes=[[4456448+121,'toolbarFocus'],[4456448+122,'elementsPathFocus'],[2228224+121,'contextMenu'],[1114112+2228224+121,'contextMenu'],[1114112+90,'undo'],[1114112+89,'redo'],[1114112+2228224+90,'redo'],[1114112+76,'link'],[1114112+66,'bold'],[1114112+73,'italic'],[1114112+85,'underline'],[4456448+(c||b.webkit?189:109),'toolbarCollapse'],[4456448+48,'a11yHelp']];j.add('link',{requires:['fakeobjects','dialog'],init:function(m){m.addCommand('link',new a.dialogCommand('link'));m.addCommand('anchor',new a.dialogCommand('anchor'));m.addCommand('unlink',new a.unlinkCommand());m.addCommand('removeAnchor',new a.removeAnchorCommand());
+m.ui.addButton('Link',{label:m.lang.link.toolbar,command:'link'});m.ui.addButton('Unlink',{label:m.lang.unlink,command:'unlink'});m.ui.addButton('Anchor',{label:m.lang.anchor.toolbar,command:'anchor'});a.dialog.add('link',this.path+'dialogs/link.js');a.dialog.add('anchor',this.path+'dialogs/anchor.js');var n=m.lang.dir=='rtl'?'right':'left',o='background:url('+a.getUrl(this.path+'images/anchor.gif')+') no-repeat '+n+' center;'+'border:1px dotted #00f;';m.addCss('a.cke_anchor,a.cke_anchor_empty'+(c&&b.version<7?'':',a[name],a[data-cke-saved-name]')+'{'+o+'padding-'+n+':18px;'+'cursor:auto;'+'}'+(c?'a.cke_anchor_empty{display:inline-block;}':'')+'img.cke_anchor'+'{'+o+'width:16px;'+'min-height:15px;'+'height:1.15em;'+'vertical-align:'+(b.opera?'middle':'text-bottom')+';'+'}');m.on('selectionChange',function(p){if(m.readOnly)return;var q=m.getCommand('unlink'),r=p.data.path.lastElement&&p.data.path.lastElement.getAscendant('a',true);if(r&&r.getName()=='a'&&r.getAttribute('href')&&r.getChildCount())q.setState(2);else q.setState(0);});m.on('doubleclick',function(p){var q=j.link.getSelectedLink(m)||p.data.element;if(!q.isReadOnly())if(q.is('a')){p.data.dialog=q.getAttribute('name')&&(!q.getAttribute('href')||!q.getChildCount())?'anchor':'link';m.getSelection().selectElement(q);}else if(j.link.tryRestoreFakeAnchor(m,q))p.data.dialog='anchor';});if(m.addMenuItems)m.addMenuItems({anchor:{label:m.lang.anchor.menu,command:'anchor',group:'anchor',order:1},removeAnchor:{label:m.lang.anchor.remove,command:'removeAnchor',group:'anchor',order:5},link:{label:m.lang.link.menu,command:'link',group:'link',order:1},unlink:{label:m.lang.unlink,command:'unlink',group:'link',order:5}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(!p||p.isReadOnly())return null;var r=j.link.tryRestoreFakeAnchor(m,p);if(!r&&!(r=j.link.getSelectedLink(m)))return null;var s={};if(r.getAttribute('href')&&r.getChildCount())s={link:2,unlink:2};if(r&&r.hasAttribute('name'))s.anchor=s.removeAnchor=2;return s;});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter,p=n&&n.htmlFilter,q=m._.elementsPath&&m._.elementsPath.filters;if(o)o.addRules({elements:{a:function(r){var s=r.attributes;if(!s.name)return null;var t=!r.children.length;if(j.link.synAnchorSelector){var u=t?'cke_anchor_empty':'cke_anchor',v=s['class'];if(s.name&&(!v||v.indexOf(u)<0))s['class']=(v||'')+' '+u;if(t&&j.link.emptyAnchorFix){s.contenteditable='false';s['data-cke-editable']=1;}}else if(j.link.fakeAnchor&&t)return m.createFakeParserElement(r,'cke_anchor','anchor');
+return null;}}});if(j.link.emptyAnchorFix&&p)p.addRules({elements:{a:function(r){delete r.attributes.contenteditable;}}});if(q)q.push(function(r,s){if(s=='a')if(j.link.tryRestoreFakeAnchor(m,r)||r.getAttribute('name')&&(!r.getAttribute('href')||!r.getChildCount()))return 'anchor';});}});j.link={getSelectedLink:function(m){try{var n=m.getSelection();if(n.getType()==3){var o=n.getSelectedElement();if(o.is('a'))return o;}var p=n.getRanges(true)[0];p.shrink(2);var q=p.getCommonAncestor();return q.getAscendant('a',true);}catch(r){return null;}},fakeAnchor:b.opera||b.webkit,synAnchorSelector:c,emptyAnchorFix:c&&b.version<8,tryRestoreFakeAnchor:function(m,n){if(n&&n.data('cke-real-element-type')&&n.data('cke-real-element-type')=='anchor'){var o=m.restoreRealElement(n);if(o.data('cke-saved-name'))return o;}}};a.unlinkCommand=function(){};a.unlinkCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p=n.getRanges(),q,r;for(var s=0;s<p.length;s++){q=p[s].getCommonAncestor(true);r=q.getAscendant('a',true);if(!r)continue;p[s].selectNodeContents(r);}n.selectRanges(p);m.document.$.execCommand('unlink',false,null);n.selectBookmarks(o);},startDisabled:true};a.removeAnchorCommand=function(){};a.removeAnchorCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p;if(n&&(p=n.getSelectedElement())&&(j.link.fakeAnchor&&!p.getChildCount()?j.link.tryRestoreFakeAnchor(m,p):p.is('a')))p.remove(1);else if(p=j.link.getSelectedLink(m))if(p.hasAttribute('href')){p.removeAttributes({name:1,'data-cke-saved-name':1});p.removeClass('cke_anchor');}else p.remove(1);n.selectBookmarks(o);}};e.extend(i,{linkShowAdvancedTab:true,linkShowTargetTab:true});(function(){var m={ol:1,ul:1},n=/^[\n\r\t ]*$/,o=d.walker.whitespaces(),p=d.walker.bookmark(),q=function(N){return!(o(N)||p(N));},r=d.walker.bogus();function s(N){var O,P,Q;if(O=N.getDirection()){P=N.getParent();while(P&&!(Q=P.getDirection()))P=P.getParent();if(O==Q)N.removeAttribute('dir');}};function t(N,O){var P=N.getAttribute('style');P&&O.setAttribute('style',P.replace(/([^;])$/,'$1;')+(O.getAttribute('style')||''));};j.list={listToArray:function(N,O,P,Q,R){if(!m[N.getName()])return[];if(!Q)Q=0;if(!P)P=[];for(var S=0,T=N.getChildCount();S<T;S++){var U=N.getChild(S);if(U.type==1&&U.getName() in f.$list)j.list.listToArray(U,O,P,Q+1);if(U.$.nodeName.toLowerCase()!='li')continue;var V={parent:N,indent:Q,element:U,contents:[]};if(!R){V.grandparent=N.getParent();if(V.grandparent&&V.grandparent.$.nodeName.toLowerCase()=='li')V.grandparent=V.grandparent.getParent();
+}else V.grandparent=R;if(O)h.setMarker(O,U,'listarray_index',P.length);P.push(V);for(var W=0,X=U.getChildCount(),Y;W<X;W++){Y=U.getChild(W);if(Y.type==1&&m[Y.getName()])j.list.listToArray(Y,O,P,Q+1,V.grandparent);else V.contents.push(Y);}}return P;},arrayToList:function(N,O,P,Q,R){if(!P)P=0;if(!N||N.length<P+1)return null;var S,T=N[P].parent.getDocument(),U=new d.documentFragment(T),V=null,W=P,X=Math.max(N[P].indent,0),Y=null,Z,aa,ab=Q==1?'p':'div';while(1){var ac=N[W],ad=ac.grandparent;Z=ac.element.getDirection(1);if(ac.indent==X){if(!V||N[W].parent.getName()!=V.getName()){V=N[W].parent.clone(false,1);R&&V.setAttribute('dir',R);U.append(V);}Y=V.append(ac.element.clone(0,1));if(Z!=V.getDirection(1))Y.setAttribute('dir',Z);for(S=0;S<ac.contents.length;S++)Y.append(ac.contents[S].clone(1,1));W++;}else if(ac.indent==Math.max(X,0)+1){var ae=N[W-1].element.getDirection(1),af=j.list.arrayToList(N,null,W,Q,ae!=Z?Z:null);if(!Y.getChildCount()&&c&&!(T.$.documentMode>7))Y.append(T.createText('\xa0'));Y.append(af.listNode);W=af.nextIndex;}else if(ac.indent==-1&&!P&&ad){if(m[ad.getName()]){Y=ac.element.clone(false,true);if(Z!=ad.getDirection(1))Y.setAttribute('dir',Z);}else Y=new d.documentFragment(T);var ag=ad.getDirection(1)!=Z,ah=ac.element,ai=ah.getAttribute('class'),aj=ah.getAttribute('style'),ak=Y.type==11&&(Q!=2||ag||aj||ai),al,am=ac.contents.length;for(S=0;S<am;S++){al=ac.contents[S];if(al.type==1&&al.isBlockBoundary()){if(ag&&!al.getDirection())al.setAttribute('dir',Z);t(ah,al);ai&&al.addClass(ai);}else if(ak){if(!aa){aa=T.createElement(ab);ag&&aa.setAttribute('dir',Z);}aj&&aa.setAttribute('style',aj);ai&&aa.setAttribute('class',ai);aa.append(al.clone(1,1));}Y.append(aa||al.clone(1,1));}if(Y.type==11&&W!=N.length-1){var an=Y.getLast();if(an&&an.type==1&&an.getAttribute('type')=='_moz')an.remove();if(!(an=Y.getLast(q)&&an.type==1&&an.getName() in f.$block))Y.append(T.createElement('br'));}var ao=Y.$.nodeName.toLowerCase();if(!c&&(ao=='div'||ao=='p'))Y.appendBogus();U.append(Y);V=null;W++;}else return null;aa=null;if(N.length<=W||Math.max(N[W].indent,0)<X)break;}if(O){var ap=U.getFirst(),aq=N[0].parent;while(ap){if(ap.type==1){h.clearMarkers(O,ap);if(ap.getName() in f.$listItem)s(ap);}ap=ap.getNextSourceNode();}}return{listNode:U,nextIndex:W};}};function u(N){if(N.editor.readOnly)return null;var O=N.data.path,P=O.blockLimit,Q=O.elements,R,S;for(S=0;S<Q.length&&(R=Q[S])&&!R.equals(P);S++){if(m[Q[S].getName()])return this.setState(this.type==Q[S].getName()?1:2);}return this.setState(2);
+};function v(N,O,P,Q){var R=j.list.listToArray(O.root,P),S=[];for(var T=0;T<O.contents.length;T++){var U=O.contents[T];U=U.getAscendant('li',true);if(!U||U.getCustomData('list_item_processed'))continue;S.push(U);h.setMarker(P,U,'list_item_processed',true);}var V=O.root,W=V.getDocument(),X,Y;for(T=0;T<S.length;T++){var Z=S[T].getCustomData('listarray_index');X=R[Z].parent;if(!X.is(this.type)){Y=W.createElement(this.type);X.copyAttributes(Y,{start:1,type:1});Y.removeStyle('list-style-type');R[Z].parent=Y;}}var aa=j.list.arrayToList(R,P,null,N.config.enterMode),ab,ac=aa.listNode.getChildCount();for(T=0;T<ac&&(ab=aa.listNode.getChild(T));T++){if(ab.getName()==this.type)Q.push(ab);}aa.listNode.replace(O.root);};var w=/^h[1-6]$/;function x(N,O,P){var Q=O.contents,R=O.root.getDocument(),S=[];if(Q.length==1&&Q[0].equals(O.root)){var T=R.createElement('div');Q[0].moveChildren&&Q[0].moveChildren(T);Q[0].append(T);Q[0]=T;}var U=O.contents[0].getParent();for(var V=0;V<Q.length;V++)U=U.getCommonAncestor(Q[V].getParent());var W=N.config.useComputedState,X,Y;W=W===undefined||W;for(V=0;V<Q.length;V++){var Z=Q[V],aa;while(aa=Z.getParent()){if(aa.equals(U)){S.push(Z);if(!Y&&Z.getDirection())Y=1;var ab=Z.getDirection(W);if(X!==null)if(X&&X!=ab)X=null;else X=ab;break;}Z=aa;}}if(S.length<1)return;var ac=S[S.length-1].getNext(),ad=R.createElement(this.type);P.push(ad);var ae,af;while(S.length){ae=S.shift();af=R.createElement('li');if(ae.is('pre')||w.test(ae.getName()))ae.appendTo(af);else{ae.copyAttributes(af);if(X&&ae.getDirection()){af.removeStyle('direction');af.removeAttribute('dir');}ae.moveChildren(af);ae.remove();}af.appendTo(ad);}if(X&&Y)ad.setAttribute('dir',X);if(ac)ad.insertBefore(ac);else ad.appendTo(U);};function y(N,O,P){var Q=j.list.listToArray(O.root,P),R=[];for(var S=0;S<O.contents.length;S++){var T=O.contents[S];T=T.getAscendant('li',true);if(!T||T.getCustomData('list_item_processed'))continue;R.push(T);h.setMarker(P,T,'list_item_processed',true);}var U=null;for(S=0;S<R.length;S++){var V=R[S].getCustomData('listarray_index');Q[V].indent=-1;U=V;}for(S=U+1;S<Q.length;S++){if(Q[S].indent>Q[S-1].indent+1){var W=Q[S-1].indent+1-Q[S].indent,X=Q[S].indent;while(Q[S]&&Q[S].indent>=X){Q[S].indent+=W;S++;}S--;}}var Y=j.list.arrayToList(Q,P,null,N.config.enterMode,O.root.getAttribute('dir')),Z=Y.listNode,aa,ab;function ac(ad){if((aa=Z[ad?'getFirst':'getLast']())&&!(aa.is&&aa.isBlockBoundary())&&(ab=O.root[ad?'getPrevious':'getNext'](d.walker.whitespaces(true)))&&!(ab.is&&ab.isBlockBoundary({br:1})))N.document.createElement('br')[ad?'insertBefore':'insertAfter'](aa);
+};ac(true);ac();Z.replace(O.root);};function z(N,O){this.name=N;this.type=O;};var A=d.walker.nodeType(1);function B(N,O,P,Q){var R,S;while(R=N[Q?'getLast':'getFirst'](A)){if((S=R.getDirection(1))!==O.getDirection(1))R.setAttribute('dir',S);R.remove();P?R[Q?'insertBefore':'insertAfter'](P):O.append(R,Q);}};z.prototype={exec:function(N){var aq=this;var O=N.document,P=N.config,Q=N.getSelection(),R=Q&&Q.getRanges(true);if(!R||R.length<1)return;if(aq.state==2){var S=O.getBody();if(!S.getFirst(q)){P.enterMode==2?S.appendBogus():R[0].fixBlock(1,P.enterMode==1?'p':'div');Q.selectRanges(R);}else{var T=R.length==1&&R[0],U=T&&T.getEnclosedNode();if(U&&U.is&&aq.type==U.getName())aq.setState(1);}}var V=Q.createBookmarks(true),W=[],X={},Y=R.createIterator(),Z=0;while((T=Y.getNextRange())&&++Z){var aa=T.getBoundaryNodes(),ab=aa.startNode,ac=aa.endNode;if(ab.type==1&&ab.getName()=='td')T.setStartAt(aa.startNode,1);if(ac.type==1&&ac.getName()=='td')T.setEndAt(aa.endNode,2);var ad=T.createIterator(),ae;ad.forceBrBreak=aq.state==2;while(ae=ad.getNextParagraph()){if(ae.getCustomData('list_block'))continue;else h.setMarker(X,ae,'list_block',1);var af=new d.elementPath(ae),ag=af.elements,ah=ag.length,ai=null,aj=0,ak=af.blockLimit,al;for(var am=ah-1;am>=0&&(al=ag[am]);am--){if(m[al.getName()]&&ak.contains(al)){ak.removeCustomData('list_group_object_'+Z);var an=al.getCustomData('list_group_object');if(an)an.contents.push(ae);else{an={root:al,contents:[ae]};W.push(an);h.setMarker(X,al,'list_group_object',an);}aj=1;break;}}if(aj)continue;var ao=ak;if(ao.getCustomData('list_group_object_'+Z))ao.getCustomData('list_group_object_'+Z).contents.push(ae);else{an={root:ao,contents:[ae]};h.setMarker(X,ao,'list_group_object_'+Z,an);W.push(an);}}}var ap=[];while(W.length>0){an=W.shift();if(aq.state==2){if(m[an.root.getName()])v.call(aq,N,an,X,ap);else x.call(aq,N,an,ap);}else if(aq.state==1&&m[an.root.getName()])y.call(aq,N,an,X);}for(am=0;am<ap.length;am++)C(ap[am]);h.clearAllMarkers(X);Q.selectBookmarks(V);N.focus();}};function C(N){var O;(O=function(P){var Q=N[P?'getPrevious':'getNext'](q);if(Q&&Q.type==1&&Q.is(N.getName())){B(N,Q,null,!P);N.remove();N=Q;}})();O(1);};var D=f,E=/[\t\r\n ]*(?:&nbsp;|\xa0)$/;function F(N,O){var P,Q=N.children,R=Q.length;for(var S=0;S<R;S++){P=Q[S];if(P.name&&P.name in O)return S;}return R;};function G(N){return function(O){var P=O.children,Q=F(O,D.$list),R=P[Q],S=R&&R.previous,T;if(S&&(S.name&&S.name=='br'||S.value&&(T=S.value.match(E)))){var U=S;if(!(T&&T.index)&&U==P[0])P[0]=N||c?new a.htmlParser.text('\xa0'):new a.htmlParser.element('br',{});
+else if(U.name=='br')P.splice(Q-1,1);else U.value=U.value.replace(E,'');}};};var H={elements:{}};for(var I in D.$listItem)H.elements[I]=G();var J={elements:{}};for(I in D.$listItem)J.elements[I]=G(true);function K(N){return N.type==1&&(N.getName() in f.$block||N.getName() in f.$listItem)&&f[N.getName()]['#'];};function L(N,O,P){N.fire('saveSnapshot');P.enlarge(3);var Q=P.extractContents();O.trim(false,true);var R=O.createBookmark(),S=new d.elementPath(O.startContainer),T=S.block,U=S.lastElement.getAscendant('li',1)||T,V=new d.elementPath(P.startContainer),W=V.contains(f.$listItem),X=V.contains(f.$list),Y;if(T){var Z=T.getBogus();Z&&Z.remove();}else if(X){Y=X.getPrevious(q);if(Y&&r(Y))Y.remove();}Y=Q.getLast();if(Y&&Y.type==1&&Y.is('br'))Y.remove();var aa=O.startContainer.getChild(O.startOffset);if(aa)Q.insertBefore(aa);else O.startContainer.append(Q);if(W){var ab=M(W);if(ab)if(U.contains(W)){B(ab,W.getParent(),W);ab.remove();}else U.append(ab);}while(P.checkStartOfBlock()&&P.checkEndOfBlock()){V=new d.elementPath(P.startContainer);var ac=V.block,ad;if(ac.is('li')){ad=ac.getParent();if(ac.equals(ad.getLast(q))&&ac.equals(ad.getFirst(q)))ac=ad;}P.moveToPosition(ac,3);ac.remove();}var ae=P.clone(),af=N.document.getBody();ae.setEndAt(af,2);var ag=new d.walker(ae);ag.evaluator=function(ai){return q(ai)&&!r(ai);};var ah=ag.next();if(ah&&ah.type==1&&ah.getName() in f.$list)C(ah);O.moveToBookmark(R);O.select();N.selectionChange(1);N.fire('saveSnapshot');};function M(N){var O=N.getLast(q);return O&&O.type==1&&O.getName() in m?O:null;};j.add('list',{init:function(N){var O=N.addCommand('numberedlist',new z('numberedlist','ol')),P=N.addCommand('bulletedlist',new z('bulletedlist','ul'));N.ui.addButton('NumberedList',{label:N.lang.numberedlist,command:'numberedlist'});N.ui.addButton('BulletedList',{label:N.lang.bulletedlist,command:'bulletedlist'});N.on('selectionChange',e.bind(u,O));N.on('selectionChange',e.bind(u,P));N.on('key',function(Q){var R=Q.data.keyCode;if(N.mode=='wysiwyg'&&R in {8:1,46:1}){var S=N.getSelection(),T=S.getRanges()[0];if(!T.collapsed)return;var U=new d.elementPath(T.startContainer),V=R==8,W=N.document.getBody(),X=new d.walker(T.clone());X.evaluator=function(ai){return q(ai)&&!r(ai);};X.guard=function(ai,aj){return!(aj&&ai.type==1&&ai.is('table'));};var Y=T.clone();if(V){var Z,aa;if((Z=U.contains(m))&&T.checkBoundaryOfElement(Z,1)&&(Z=Z.getParent())&&Z.is('li')&&(Z=M(Z))){aa=Z;Z=Z.getPrevious(q);Y.moveToPosition(Z&&r(Z)?Z:aa,3);}else{X.range.setStartAt(W,1);
+X.range.setEnd(T.startContainer,T.startOffset);Z=X.previous();if(Z&&Z.type==1&&(Z.getName() in m||Z.is('li'))){if(!Z.is('li')){X.range.selectNodeContents(Z);X.reset();X.evaluator=K;Z=X.previous();}aa=Z;Y.moveToElementEditEnd(aa);}}if(aa){L(N,Y,T);Q.cancel();}else{var ab=U.contains(m),ac;if(ab&&T.checkBoundaryOfElement(ab,1)){ac=ab.getFirst(q);if(T.checkBoundaryOfElement(ac,1)){Z=ab.getPrevious(q);if(M(ac)){if(Z){T.moveToElementEditEnd(Z);T.select();}Q.cancel();}else{N.execCommand('outdent');Q.cancel();}}}}}else{var ad,ae;ac=T.startContainer.getAscendant('li',1);if(ac){X.range.setEndAt(W,2);var af=ac.getLast(q),ag=af&&K(af)?af:ac,ah=0;ad=X.next();if(ad&&ad.type==1&&ad.getName() in m&&ad.equals(af)){ah=1;ad=X.next();}else if(T.checkBoundaryOfElement(ag,2))ah=1;if(ah&&ad){ae=T.clone();ae.moveToElementEditStart(ad);L(N,Y,ae);Q.cancel();}}else{X.range.setEndAt(W,2);ad=X.next();if(ad&&ad.type==1&&ad.getName() in m){ad=ad.getFirst(q);if(U.block&&T.checkStartOfBlock()&&T.checkEndOfBlock()){U.block.remove();T.moveToElementEditStart(ad);T.select();Q.cancel();}else if(M(ad)){T.moveToElementEditStart(ad);T.select();Q.cancel();}else{ae=T.clone();ae.moveToElementEditStart(ad);L(N,Y,ae);Q.cancel();}}}}setTimeout(function(){N.selectionChange(1);});}});},afterInit:function(N){var O=N.dataProcessor;if(O){O.dataFilter.addRules(H);O.htmlFilter.addRules(J);}},requires:['domiterator']});})();(function(){j.liststyle={requires:['dialog'],init:function(m){m.addCommand('numberedListStyle',new a.dialogCommand('numberedListStyle'));a.dialog.add('numberedListStyle',this.path+'dialogs/liststyle.js');m.addCommand('bulletedListStyle',new a.dialogCommand('bulletedListStyle'));a.dialog.add('bulletedListStyle',this.path+'dialogs/liststyle.js');if(m.addMenuItems){m.addMenuGroup('list',108);m.addMenuItems({numberedlist:{label:m.lang.list.numberedTitle,group:'list',command:'numberedListStyle'},bulletedlist:{label:m.lang.list.bulletedTitle,group:'list',command:'bulletedListStyle'}});}if(m.contextMenu)m.contextMenu.addListener(function(n,o){if(!n||n.isReadOnly())return null;while(n){var p=n.getName();if(p=='ol')return{numberedlist:2};else if(p=='ul')return{bulletedlist:2};n=n.getParent();}return null;});}};j.add('liststyle',j.liststyle);})();(function(){function m(s){if(!s||s.type!=1||s.getName()!='form')return[];var t=[],u=['style','className'];for(var v=0;v<u.length;v++){var w=u[v],x=s.$.elements.namedItem(w);if(x){var y=new h(x);t.push([y,y.nextSibling]);y.remove();}}return t;};function n(s,t){if(!s||s.type!=1||s.getName()!='form')return;
+if(t.length>0)for(var u=t.length-1;u>=0;u--){var v=t[u][0],w=t[u][1];if(w)v.insertBefore(w);else v.appendTo(s);}};function o(s,t){var u=m(s),v={},w=s.$;if(!t){v['class']=w.className||'';w.className='';}v.inline=w.style.cssText||'';if(!t)w.style.cssText='position: static; overflow: visible';n(u);return v;};function p(s,t){var u=m(s),v=s.$;if('class' in t)v.className=t['class'];if('inline' in t)v.style.cssText=t.inline;n(u);};function q(s){var t=a.instances;for(var u in t){var v=t[u];if(v.mode=='wysiwyg'&&!v.readOnly){var w=v.document.getBody();w.setAttribute('contentEditable',false);w.setAttribute('contentEditable',true);}}if(s.focusManager.hasFocus){s.toolbox.focus();s.focus();}};function r(s){if(!c||b.version>6)return null;var t=h.createFromHtml('<iframe frameborder="0" tabindex="-1" src="javascript:void((function(){document.open();'+(b.isCustomDomain()?"document.domain='"+this.getDocument().$.domain+"';":'')+'document.close();'+'})())"'+' style="display:block;position:absolute;z-index:-1;'+'progid:DXImageTransform.Microsoft.Alpha(opacity=0);'+'"></iframe>');return s.append(t,true);};j.add('maximize',{init:function(s){var t=s.lang,u=a.document,v=u.getWindow(),w,x,y,z;function A(){var C=v.getViewPaneSize();z&&z.setStyles({width:C.width+'px',height:C.height+'px'});s.resize(C.width,C.height,null,true);};var B=2;s.addCommand('maximize',{modes:{wysiwyg:!b.iOS,source:!b.iOS},readOnly:1,editorFocus:false,exec:function(){var C=s.container.getChild(1),D=s.getThemeSpace('contents');if(s.mode=='wysiwyg'){var E=s.getSelection();w=E&&E.getRanges();x=v.getScrollPosition();}else{var F=s.textarea.$;w=!c&&[F.selectionStart,F.selectionEnd];x=[F.scrollLeft,F.scrollTop];}if(this.state==2){v.on('resize',A);y=v.getScrollPosition();var G=s.container;while(G=G.getParent()){G.setCustomData('maximize_saved_styles',o(G));G.setStyle('z-index',s.config.baseFloatZIndex-1);}D.setCustomData('maximize_saved_styles',o(D,true));C.setCustomData('maximize_saved_styles',o(C,true));var H={overflow:b.webkit?'':'hidden',width:0,height:0};u.getDocumentElement().setStyles(H);!b.gecko&&u.getDocumentElement().setStyle('position','fixed');!(b.gecko&&b.quirks)&&u.getBody().setStyles(H);c?setTimeout(function(){v.$.scrollTo(0,0);},0):v.$.scrollTo(0,0);C.setStyle('position',b.gecko&&b.quirks?'fixed':'absolute');C.$.offsetLeft;C.setStyles({'z-index':s.config.baseFloatZIndex-1,left:'0px',top:'0px'});z=r(C);C.addClass('cke_maximized');A();var I=C.getDocumentPosition();C.setStyles({left:-1*I.x+'px',top:-1*I.y+'px'});
+b.gecko&&q(s);}else if(this.state==1){v.removeListener('resize',A);var J=[D,C];for(var K=0;K<J.length;K++){p(J[K],J[K].getCustomData('maximize_saved_styles'));J[K].removeCustomData('maximize_saved_styles');}G=s.container;while(G=G.getParent()){p(G,G.getCustomData('maximize_saved_styles'));G.removeCustomData('maximize_saved_styles');}c?setTimeout(function(){v.$.scrollTo(y.x,y.y);},0):v.$.scrollTo(y.x,y.y);C.removeClass('cke_maximized');if(b.webkit){C.setStyle('display','inline');setTimeout(function(){C.setStyle('display','block');},0);}if(z){z.remove();z=null;}s.fire('resize');}this.toggleState();var L=this.uiItems[0];if(L){var M=this.state==2?t.maximize:t.minimize,N=s.element.getDocument().getById(L._.id);N.getChild(1).setHtml(M);N.setAttribute('title',M);N.setAttribute('href','javascript:void("'+M+'");');}if(s.mode=='wysiwyg'){if(w){b.gecko&&q(s);s.getSelection().selectRanges(w);var O=s.getSelection().getStartElement();O&&O.scrollIntoView(true);}else v.$.scrollTo(x.x,x.y);}else{if(w){F.selectionStart=w[0];F.selectionEnd=w[1];}F.scrollLeft=x[0];F.scrollTop=x[1];}w=x=null;B=this.state;},canUndo:false});s.ui.addButton('Maximize',{label:t.maximize,command:'maximize'});s.on('mode',function(){var C=s.getCommand('maximize');C.setState(C.state==0?0:B);},null,null,100);}});})();j.add('newpage',{init:function(m){m.addCommand('newpage',{modes:{wysiwyg:1,source:1},exec:function(n){var o=this;n.setData(n.config.newpage_html||'',function(){setTimeout(function(){n.fire('afterCommandExec',{name:'newpage',command:o});n.selectionChange();},200);});n.focus();},async:true});m.ui.addButton('NewPage',{label:m.lang.newPage,command:'newpage'});}});j.add('pagebreak',{init:function(m){m.addCommand('pagebreak',j.pagebreakCmd);m.ui.addButton('PageBreak',{label:m.lang.pagebreak,command:'pagebreak'});var n=['{','background: url('+a.getUrl(this.path+'images/pagebreak.gif')+') no-repeat center center;','clear: both;','width:100%; _width:99.9%;','border-top: #999999 1px dotted;','border-bottom: #999999 1px dotted;','padding:0;','height: 5px;','cursor: default;','}'].join('').replace(/;/g,' !important;');m.addCss('div.cke_pagebreak'+n);b.opera&&m.on('contentDom',function(){m.document.on('click',function(o){var p=o.data.getTarget();if(p.is('div')&&p.hasClass('cke_pagebreak'))m.getSelection().selectElement(p);});});},afterInit:function(m){var n=m.lang.pagebreakAlt,o=m.dataProcessor,p=o&&o.dataFilter,q=o&&o.htmlFilter;if(q)q.addRules({attributes:{'class':function(r,s){var t=r.replace('cke_pagebreak','');
+if(t!=r){var u=a.htmlParser.fragment.fromHtml('<span style="display: none;">&nbsp;</span>');s.children.length=0;s.add(u);var v=s.attributes;delete v['aria-label'];delete v.contenteditable;delete v.title;}return t;}}},5);if(p)p.addRules({elements:{div:function(r){var s=r.attributes,t=s&&s.style,u=t&&r.children.length==1&&r.children[0],v=u&&u.name=='span'&&u.attributes.style;if(v&&/page-break-after\s*:\s*always/i.test(t)&&/display\s*:\s*none/i.test(v)){s.contenteditable='false';s['class']='cke_pagebreak';s['data-cke-display-name']='pagebreak';s['aria-label']=n;s.title=n;r.children.length=0;}}}});},requires:['fakeobjects']});j.pagebreakCmd={exec:function(m){var n=m.lang.pagebreakAlt,o=h.createFromHtml('<div style="page-break-after: always;"contenteditable="false" title="'+n+'" '+'aria-label="'+n+'" '+'data-cke-display-name="pagebreak" '+'class="cke_pagebreak">'+'</div>',m.document),p=m.getSelection().getRanges(true);m.fire('saveSnapshot');for(var q,r=p.length-1;r>=0;r--){q=p[r];if(r<p.length-1)o=o.clone(true);q.splitBlock('p');q.insertNode(o);if(r==p.length-1){var s=o.getNext();q.moveToPosition(o,4);if(!s||s.type==1&&!s.isEditable())q.fixBlock(true,m.config.enterMode==3?'div':'p');q.select();}}m.fire('saveSnapshot');}};(function(){function m(n){n.data.mode='html';};j.add('pastefromword',{init:function(n){var o=0,p=function(q){q&&q.removeListener();n.removeListener('beforePaste',m);o&&setTimeout(function(){o=0;},0);};n.addCommand('pastefromword',{canUndo:false,exec:function(){o=1;n.on('beforePaste',m);if(n.execCommand('paste','html')===false){n.on('dialogShow',function(q){q.removeListener();q.data.on('cancel',p);});n.on('dialogHide',function(q){q.data.removeListener('cancel',p);});}n.on('afterPaste',p);}});n.ui.addButton('PasteFromWord',{label:n.lang.pastefromword.toolbar,command:'pastefromword'});n.on('pasteState',function(q){n.getCommand('pastefromword').setState(q.data);});n.on('paste',function(q){var r=q.data,s;if((s=r.html)&&(o||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(s))){var t=this.loadFilterRules(function(){if(t)n.fire('paste',r);else if(!n.config.pasteFromWordPromptCleanup||o||confirm(n.lang.pastefromword.confirmCleanup))r.html=a.cleanWord(s,n);});t&&q.cancel();}},this);},loadFilterRules:function(n){var o=a.cleanWord;if(o)n();else{var p=a.getUrl(i.pasteFromWordCleanupFile||this.path+'filter/default.js');a.scriptLoader.load(p,n,null,true);}return!o;},requires:['clipboard']});})();(function(){var m={exec:function(n){var o=e.tryThese(function(){var p=window.clipboardData.getData('Text');
+if(!p)throw 0;return p;});if(!o){n.openDialog('pastetext');return false;}else n.fire('paste',{text:o});return true;}};j.add('pastetext',{init:function(n){var o='pastetext',p=n.addCommand(o,m);n.ui.addButton('PasteText',{label:n.lang.pasteText.button,command:o});a.dialog.add(o,a.getUrl(this.path+'dialogs/pastetext.js'));if(n.config.forcePasteAsPlainText){n.on('beforeCommandExec',function(q){var r=q.data.commandData;if(q.data.name=='paste'&&r!='html'){n.execCommand('pastetext');q.cancel();}},null,null,0);n.on('beforePaste',function(q){q.data.mode='text';});}n.on('pasteState',function(q){n.getCommand('pastetext').setState(q.data);});},requires:['clipboard']});})();j.add('popup');e.extend(a.editor.prototype,{popup:function(m,n,o,p){n=n||'80%';o=o||'70%';if(typeof n=='string'&&n.length>1&&n.substr(n.length-1,1)=='%')n=parseInt(window.screen.width*parseInt(n,10)/100,10);if(typeof o=='string'&&o.length>1&&o.substr(o.length-1,1)=='%')o=parseInt(window.screen.height*parseInt(o,10)/100,10);if(n<640)n=640;if(o<420)o=420;var q=parseInt((window.screen.height-o)/2,10),r=parseInt((window.screen.width-n)/2,10);p=(p||'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes')+',width='+n+',height='+o+',top='+q+',left='+r;var s=window.open('',null,p,true);if(!s)return false;try{var t=navigator.userAgent.toLowerCase();if(t.indexOf(' chrome/')==-1){s.moveTo(r,q);s.resizeTo(n,o);}s.focus();s.location.href=m;}catch(u){s=window.open(m,null,p,true);}return true;}});(function(){var m,n={modes:{wysiwyg:1,source:1},canUndo:false,readOnly:1,exec:function(p){var q,r=p.config,s=r.baseHref?'<base href="'+r.baseHref+'"/>':'',t=b.isCustomDomain();if(r.fullPage)q=p.getData().replace(/<head>/,'$&'+s).replace(/[^>]*(?=<\/title>)/,'$& &mdash; '+p.lang.preview);else{var u='<body ',v=p.document&&p.document.getBody();if(v){if(v.getAttribute('id'))u+='id="'+v.getAttribute('id')+'" ';if(v.getAttribute('class'))u+='class="'+v.getAttribute('class')+'" ';}u+='>';q=p.config.docType+'<html dir="'+p.config.contentsLangDirection+'">'+'<head>'+s+'<title>'+p.lang.preview+'</title>'+e.buildStyleHtml(p.config.contentsCss)+'</head>'+u+p.getData()+'</body></html>';}var w=640,x=420,y=80;try{var z=window.screen;w=Math.round(z.width*0.8);x=Math.round(z.height*0.7);y=Math.round(z.width*0.1);}catch(D){}var A='';if(t){window._cke_htmlToLoad=q;A='javascript:void( (function(){document.open();document.domain="'+document.domain+'";'+'document.write( window.opener._cke_htmlToLoad );'+'document.close();'+'window.opener._cke_htmlToLoad = null;'+'})() )';
+}if(b.gecko){window._cke_htmlToLoad=q;A=m+'preview.html';}var B=window.open(A,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+w+',height='+x+',left='+y);if(!t&&!b.gecko){var C=B.document;C.open();C.write(q);C.close();b.webkit&&setTimeout(function(){C.body.innerHTML+='';},0);}}},o='preview';j.add(o,{init:function(p){m=this.path;p.addCommand(o,n);p.ui.addButton('Preview',{label:p.lang.preview,command:o});}});})();j.add('print',{init:function(m){var n='print',o=m.addCommand(n,j.print);m.ui.addButton('Print',{label:m.lang.print,command:n});}});j.print={exec:function(m){if(b.opera)return;else if(b.gecko)m.window.$.print();else m.document.$.execCommand('Print');},canUndo:false,readOnly:1,modes:{wysiwyg:!b.opera}};j.add('removeformat',{requires:['selection'],init:function(m){m.addCommand('removeFormat',j.removeformat.commands.removeformat);m.ui.addButton('RemoveFormat',{label:m.lang.removeFormat,command:'removeFormat'});m._.removeFormat={filters:[]};}});j.removeformat={commands:{removeformat:{exec:function(m){var n=m._.removeFormatRegex||(m._.removeFormatRegex=new RegExp('^(?:'+m.config.removeFormatTags.replace(/,/g,'|')+')$','i')),o=m._.removeAttributes||(m._.removeAttributes=m.config.removeFormatAttributes.split(',')),p=j.removeformat.filter,q=m.getSelection().getRanges(1),r=q.createIterator(),s;while(s=r.getNextRange()){if(!s.collapsed)s.enlarge(1);var t=s.createBookmark(),u=t.startNode,v=t.endNode,w,x=function(z){var A=new d.elementPath(z),B=A.elements;for(var C=1,D;D=B[C];C++){if(D.equals(A.block)||D.equals(A.blockLimit))break;if(n.test(D.getName())&&p(m,D))z.breakParent(D);}};x(u);if(v){x(v);w=u.getNextSourceNode(true,1);while(w){if(w.equals(v))break;var y=w.getNextSourceNode(false,1);if(!(w.getName()=='img'&&w.data('cke-realelement'))&&p(m,w))if(n.test(w.getName()))w.remove(1);else{w.removeAttributes(o);m.fire('removeFormatCleanup',w);}w=y;}}s.moveToBookmark(t);}m.getSelection().selectRanges(q);}}},filter:function(m,n){var o=m._.removeFormat.filters;for(var p=0;p<o.length;p++){if(o[p](n)===false)return false;}return true;}};a.editor.prototype.addRemoveFormatFilter=function(m){this._.removeFormat.filters.push(m);};i.removeFormatTags='b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var';i.removeFormatAttributes='class,style,lang,width,height,align,hspace,valign';j.add('resize',{init:function(m){var n=m.config,o=m.element.getDirection(1);!n.resize_dir&&(n.resize_dir='both');n.resize_maxWidth==undefined&&(n.resize_maxWidth=3000);
+n.resize_maxHeight==undefined&&(n.resize_maxHeight=3000);n.resize_minWidth==undefined&&(n.resize_minWidth=750);n.resize_minHeight==undefined&&(n.resize_minHeight=250);if(n.resize_enabled!==false){var p=null,q,r,s=(n.resize_dir=='both'||n.resize_dir=='horizontal')&&n.resize_minWidth!=n.resize_maxWidth,t=(n.resize_dir=='both'||n.resize_dir=='vertical')&&n.resize_minHeight!=n.resize_maxHeight;function u(x){var y=x.data.$.screenX-q.x,z=x.data.$.screenY-q.y,A=r.width,B=r.height,C=A+y*(o=='rtl'?-1:1),D=B+z;if(s)A=Math.max(n.resize_minWidth,Math.min(C,n.resize_maxWidth));if(t)B=Math.max(n.resize_minHeight,Math.min(D,n.resize_maxHeight));m.resize(s?A:null,B);};function v(x){a.document.removeListener('mousemove',u);a.document.removeListener('mouseup',v);if(m.document){m.document.removeListener('mousemove',u);m.document.removeListener('mouseup',v);}};var w=e.addFunction(function(x){if(!p)p=m.getResizable();r={width:p.$.offsetWidth||0,height:p.$.offsetHeight||0};q={x:x.screenX,y:x.screenY};n.resize_minWidth>r.width&&(n.resize_minWidth=r.width);n.resize_minHeight>r.height&&(n.resize_minHeight=r.height);a.document.on('mousemove',u);a.document.on('mouseup',v);if(m.document){m.document.on('mousemove',u);m.document.on('mouseup',v);}});m.on('destroy',function(){e.removeFunction(w);});m.on('themeSpace',function(x){if(x.data.space=='bottom'){var y='';if(s&&!t)y=' cke_resizer_horizontal';if(!s&&t)y=' cke_resizer_vertical';var z='<div class="cke_resizer'+y+' cke_resizer_'+o+'"'+' title="'+e.htmlEncode(m.lang.resize)+'"'+' onmousedown="CKEDITOR.tools.callFunction('+w+', event)"'+'></div>';o=='ltr'&&y=='ltr'?x.data.html+=z:x.data.html=z+x.data.html;}},m,null,100);}}});(function(){var m={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(o){var p=o.element.$.form;if(p)try{p.submit();}catch(q){if(p.submit.click)p.submit.click();}}},n='save';j.add(n,{init:function(o){var p=o.addCommand(n,m);p.modes={wysiwyg:!!o.element.$.form};o.ui.addButton('Save',{label:o.lang.save,command:n});}});})();(function(){var m='scaytcheck',n='';function o(t,u){var v=0,w;for(w in u){if(u[w]==t){v=1;break;}}return v;};var p=function(){var t=this,u=function(){if(q.instances[t.name])q.instances[t.name].destroy();var y=t.config,z={};z.srcNodeRef=t.document.getWindow().$.frameElement;z.assocApp='CKEDITOR.'+a.version+'@'+a.revision;z.customerid=y.scayt_customerid||'1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2';z.customDictionaryIds=y.scayt_customDictionaryIds||'';z.userDictionaryName=y.scayt_userDictionaryName||'';
+z.sLang=y.scayt_sLang||'en_US';z.onLoad=function(){if(!(c&&b.version<8))this.addStyle(this.selectorCss(),'padding-bottom: 2px !important;');if(t.focusManager.hasFocus&&!q.isControlRestored(t))this.focus();};z.onBeforeChange=function(){if(q.getScayt(t)&&!t.checkDirty())setTimeout(function(){t.resetDirty();},0);};var A=window.scayt_custom_params;if(typeof A=='object')for(var B in A)z[B]=A[B];if(q.getControlId(t))z.id=q.getControlId(t);var C=new window.scayt(z);C.afterMarkupRemove.push(function(E){new h(E,C.document).mergeSiblings();});var D=q.instances[t.name];if(D){C.sLang=D.sLang;C.option(D.option());C.paused=D.paused;}q.instances[t.name]=C;try{C.setDisabled(q.isPaused(t)===false);}catch(E){}t.fire('showScaytState');};t.on('contentDom',function(y){u();});t.on('contentDomUnload',function(){var y=a.document.getElementsByTag('script'),z=/^dojoIoScript(\d+)$/i,A=/^https?:\/\/svc\.webspellchecker\.net\/spellcheck\/script\/ssrv\.cgi/i;for(var B=0;B<y.count();B++){var C=y.getItem(B),D=C.getId(),E=C.getAttribute('src');if(D&&E&&D.match(z)&&E.match(A))C.remove();}});t.on('beforeCommandExec',function(y){if(y.data.name=='source'&&t.mode=='source')q.markControlRestore(t);});t.on('afterCommandExec',function(y){if(!q.isScaytEnabled(t))return;if(t.mode=='wysiwyg'&&(y.data.name=='undo'||y.data.name=='redo'))window.setTimeout(function(){q.getScayt(t).refresh();},10);});t.on('destroy',function(y){var z=y.editor,A=q.getScayt(z);if(!A)return;delete q.instances[z.name];q.setControlId(z,A.id);A.destroy(true);});t.on('setData',function(y){var z=q.getScayt(t);if(z){q.setPaused(t,!z.disabled);q.setControlId(t,z.id);z.destroy(true);delete q.instances[t.name];}});t.on('insertElement',function(){var y=q.getScayt(t);if(q.isScaytEnabled(t)){if(c)t.getSelection().unlock(true);window.setTimeout(function(){y.focus();y.refresh();},10);}},this,null,50);t.on('insertHtml',function(){var y=q.getScayt(t);if(q.isScaytEnabled(t)){if(c)t.getSelection().unlock(true);window.setTimeout(function(){y.focus();y.refresh();},10);}},this,null,50);t.on('scaytDialog',function(y){y.data.djConfig=window.djConfig;y.data.scayt_control=q.getScayt(t);y.data.tab=n;y.data.scayt=window.scayt;});var v=t.dataProcessor,w=v&&v.htmlFilter;if(w)w.addRules({elements:{span:function(y){if(y.attributes['data-scayt_word']&&y.attributes['data-scaytid']){delete y.name;return y;}}}});var x=j.undo.Image.prototype;x.equals=e.override(x.equals,function(y){return function(z){var E=this;var A=E.contents,B=z.contents,C=q.getScayt(E.editor);
+if(C&&q.isScaytReady(E.editor)){E.contents=C.reset(A)||'';z.contents=C.reset(B)||'';}var D=y.apply(E,arguments);E.contents=A;z.contents=B;return D;};});if(t.document)u();};j.scayt={engineLoaded:false,instances:{},controlInfo:{},setControlInfo:function(t,u){if(t&&t.name&&typeof this.controlInfo[t.name]!='object')this.controlInfo[t.name]={};for(var v in u)this.controlInfo[t.name][v]=u[v];},isControlRestored:function(t){if(t&&t.name&&this.controlInfo[t.name])return this.controlInfo[t.name].restored;return false;},markControlRestore:function(t){this.setControlInfo(t,{restored:true});},setControlId:function(t,u){this.setControlInfo(t,{id:u});},getControlId:function(t){if(t&&t.name&&this.controlInfo[t.name]&&this.controlInfo[t.name].id)return this.controlInfo[t.name].id;return null;},setPaused:function(t,u){this.setControlInfo(t,{paused:u});},isPaused:function(t){if(t&&t.name&&this.controlInfo[t.name])return this.controlInfo[t.name].paused;return undefined;},getScayt:function(t){return this.instances[t.name];},isScaytReady:function(t){return this.engineLoaded===true&&'undefined'!==typeof window.scayt&&this.getScayt(t);},isScaytEnabled:function(t){var u=this.getScayt(t);return u?u.disabled===false:false;},getUiTabs:function(t){var u=[],v=t.config.scayt_uiTabs||'1,1,1';v=v.split(',');v[3]='1';for(var w=0;w<4;w++)u[w]=typeof window.scayt!='undefined'&&typeof window.scayt.uiTags!='undefined'?parseInt(v[w],10)&&window.scayt.uiTags[w]:parseInt(v[w],10);return u;},loadEngine:function(t){if(b.gecko&&b.version<10900||b.opera||b.air)return t.fire('showScaytState');if(this.engineLoaded===true)return p.apply(t);else if(this.engineLoaded==-1)return a.on('scaytReady',function(){p.apply(t);});a.on('scaytReady',p,t);a.on('scaytReady',function(){this.engineLoaded=true;},this,null,0);this.engineLoaded=-1;var u=document.location.protocol;u=u.search(/https?:/)!=-1?u:'http:';var v='svc.webspellchecker.net/scayt26/loader__base.js',w=t.config.scayt_srcUrl||u+'//'+v,x=q.parseUrl(w).path+'/';if(window.scayt==undefined){a._djScaytConfig={baseUrl:x,addOnLoad:[function(){a.fireOnce('scaytReady');}],isDebug:false};a.document.getHead().append(a.document.createElement('script',{attributes:{type:'text/javascript',async:'true',src:w}}));}else a.fireOnce('scaytReady');return null;},parseUrl:function(t){var u;if(t.match&&(u=t.match(/(.*)[\/\\](.*?\.\w+)$/)))return{path:u[1],file:u[2]};else return t;}};var q=j.scayt,r=function(t,u,v,w,x,y,z){t.addCommand(w,x);t.addMenuItem(w,{label:v,command:w,group:y,order:z});
+},s={preserveState:true,editorFocus:false,canUndo:false,exec:function(t){if(q.isScaytReady(t)){var u=q.isScaytEnabled(t);this.setState(u?2:1);var v=q.getScayt(t);v.focus();v.setDisabled(u);}else if(!t.config.scayt_autoStartup&&q.engineLoaded>=0){this.setState(0);q.loadEngine(t);}}};j.add('scayt',{requires:['menubutton'],beforeInit:function(t){var u=t.config.scayt_contextMenuItemsOrder||'suggest|moresuggest|control',v='';u=u.split('|');if(u&&u.length)for(var w=0;w<u.length;w++)v+='scayt_'+u[w]+(u.length!=parseInt(w,10)+1?',':'');t.config.menu_groups=v+','+t.config.menu_groups;},init:function(t){var u=t.dataProcessor&&t.dataProcessor.dataFilter,v={elements:{span:function(E){var F=E.attributes;if(F&&F['data-scaytid'])delete E.name;}}};u&&u.addRules(v);var w={},x={},y=t.addCommand(m,s);a.dialog.add(m,a.getUrl(this.path+'dialogs/options.js'));var z=q.getUiTabs(t),A='scaytButton';t.addMenuGroup(A);var B={},C=t.lang.scayt;B.scaytToggle={label:C.enable,command:m,group:A};if(z[0]==1)B.scaytOptions={label:C.options,group:A,onClick:function(){n='options';t.openDialog(m);}};if(z[1]==1)B.scaytLangs={label:C.langs,group:A,onClick:function(){n='langs';t.openDialog(m);}};if(z[2]==1)B.scaytDict={label:C.dictionariesTab,group:A,onClick:function(){n='dictionaries';t.openDialog(m);}};B.scaytAbout={label:t.lang.scayt.about,group:A,onClick:function(){n='about';t.openDialog(m);}};t.addMenuItems(B);t.ui.add('Scayt','menubutton',{label:C.title,title:b.opera?C.opera_title:C.title,className:'cke_button_scayt',modes:{wysiwyg:1},onRender:function(){y.on('state',function(){this.setState(y.state);},this);},onMenu:function(){var E=q.isScaytEnabled(t);t.getMenuItem('scaytToggle').label=C[E?'disable':'enable'];var F=q.getUiTabs(t);return{scaytToggle:2,scaytOptions:E&&F[0]?2:0,scaytLangs:E&&F[1]?2:0,scaytDict:E&&F[2]?2:0,scaytAbout:E&&F[3]?2:0};}});if(t.contextMenu&&t.addMenuItems)t.contextMenu.addListener(function(E,F){if(!q.isScaytEnabled(t)||F.getRanges()[0].checkReadOnly())return null;var G=q.getScayt(t),H=G.getScaytNode();if(!H)return null;var I=G.getWord(H);if(!I)return null;var J=G.getLang(),K=window.scayt.getSuggestion(I,J);for(var L in w){delete t._.menuItems[L];delete t._.commands[L];}for(L in x){delete t._.menuItems[L];delete t._.commands[L];}w={};x={};var M=t.config.scayt_moreSuggestions||'on',N=false,O=t.config.scayt_maxSuggestions;typeof O!='number'&&(O=5);!O&&(O=K.length);var P=t.config.scayt_contextCommands||'all';P=P.split('|');if(K&&K.length){for(var Q=0,R=K.length;Q<R;Q+=1){var S='scayt_suggestion_'+K[Q].replace(' ','_'),T=(function(X,Y){return{exec:function(){G.replace(X,Y);
+}};})(H,K[Q]);if(Q<O){r(t,'button_'+S,K[Q],S,T,'scayt_suggest',Q+1);x[S]=2;}else if(M=='on'){r(t,'button_'+S,K[Q],S,T,'scayt_moresuggest',Q+1);w[S]=2;N=true;}}if(N){t.addMenuItem('scayt_moresuggest',{label:t.lang.scayt.moreSuggestions,group:'scayt_moresuggest',order:10,getItems:function(){return w;}});x.scayt_moresuggest=2;}}else{t.addMenuItem('scayt_nosuggest',{label:t.lang.scayt.noSuggestions?t.lang.scayt.noSuggestions:t.lang.spellCheck.noSuggestions?t.lang.spellCheck.noSuggestions:'No suggestions',group:'scayt_suggest',order:1});x.scayt_nosuggest=2;}if(o('all',P)||o('ignore',P)){var U={exec:function(){G.ignore(H);}};r(t,'ignore',C.ignore,'scayt_ignore',U,'scayt_control',1);x.scayt_ignore=2;}if(o('all',P)||o('ignoreall',P)){var V={exec:function(){G.ignoreAll(H);}};r(t,'ignore_all',C.ignoreAll,'scayt_ignore_all',V,'scayt_control',2);x.scayt_ignore_all=2;}if(o('all',P)||o('add',P)){var W={exec:function(){window.scayt.addWordToUserDictionary(H);}};r(t,'add_word',C.addWord,'scayt_add_word',W,'scayt_control',3);x.scayt_add_word=2;}if(G.fireOnContextMenu)G.fireOnContextMenu(t);return x;});var D=function(){t.removeListener('showScaytState',D);if(!b.opera&&!b.air)y.setState(q.isScaytEnabled(t)?1:2);else y.setState(0);};t.on('showScaytState',D);if(b.opera||b.air)t.on('instanceReady',function(){D();});if(t.config.scayt_autoStartup)t.on('instanceReady',function(){q.loadEngine(t);});},afterInit:function(t){var u,v=function(w){if(w.hasAttribute('data-scaytid'))return false;};if(t._.elementsPath&&(u=t._.elementsPath.filters))u.push(v);t.addRemoveFormatFilter&&t.addRemoveFormatFilter(v);}});})();j.add('smiley',{requires:['dialog'],init:function(m){m.config.smiley_path=m.config.smiley_path||this.path+'images/';m.addCommand('smiley',new a.dialogCommand('smiley'));m.ui.addButton('Smiley',{label:m.lang.smiley.toolbar,command:'smiley'});a.dialog.add('smiley',this.path+'dialogs/smiley.js');}});i.smiley_images=['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'];i.smiley_descriptions=['smiley','sad','wink','laugh','frown','cheeky','blush','surprise','indecision','angry','angel','cool','devil','crying','enlightened','no','yes','heart','broken heart','kiss','mail'];
+(function(){var m='.%2 p,.%2 div,.%2 pre,.%2 address,.%2 blockquote,.%2 h1,.%2 h2,.%2 h3,.%2 h4,.%2 h5,.%2 h6{background-repeat: no-repeat;background-position: top %3;border: 1px dotted gray;padding-top: 8px;padding-%3: 8px;}.%2 p{%1p.png);}.%2 div{%1div.png);}.%2 pre{%1pre.png);}.%2 address{%1address.png);}.%2 blockquote{%1blockquote.png);}.%2 h1{%1h1.png);}.%2 h2{%1h2.png);}.%2 h3{%1h3.png);}.%2 h4{%1h4.png);}.%2 h5{%1h5.png);}.%2 h6{%1h6.png);}',n=/%1/g,o=/%2/g,p=/%3/g,q={readOnly:1,preserveState:true,editorFocus:false,exec:function(r){this.toggleState();this.refresh(r);},refresh:function(r){if(r.document){var s=this.state==1?'addClass':'removeClass';r.document.getBody()[s]('cke_show_blocks');}}};j.add('showblocks',{requires:['wysiwygarea'],init:function(r){var s=r.addCommand('showblocks',q);s.canUndo=false;if(r.config.startupOutlineBlocks)s.setState(1);r.addCss(m.replace(n,'background-image: url('+a.getUrl(this.path)+'images/block_').replace(o,'cke_show_blocks ').replace(p,r.lang.dir=='rtl'?'right':'left'));r.ui.addButton('ShowBlocks',{label:r.lang.showBlocks,command:'showblocks'});r.on('mode',function(){if(s.state!=0)s.refresh(r);});r.on('contentDom',function(){if(s.state!=0)s.refresh(r);});}});})();(function(){var m='cke_show_border',n,o=(b.ie6Compat?['.%1 table.%2,','.%1 table.%2 td, .%1 table.%2 th','{','border : #d3d3d3 1px dotted','}']:['.%1 table.%2,','.%1 table.%2 > tr > td, .%1 table.%2 > tr > th,','.%1 table.%2 > tbody > tr > td, .%1 table.%2 > tbody > tr > th,','.%1 table.%2 > thead > tr > td, .%1 table.%2 > thead > tr > th,','.%1 table.%2 > tfoot > tr > td, .%1 table.%2 > tfoot > tr > th','{','border : #d3d3d3 1px dotted','}']).join('');n=o.replace(/%2/g,m).replace(/%1/g,'cke_show_borders ');var p={preserveState:true,editorFocus:false,readOnly:1,exec:function(q){this.toggleState();this.refresh(q);},refresh:function(q){if(q.document){var r=this.state==1?'addClass':'removeClass';q.document.getBody()[r]('cke_show_borders');}}};j.add('showborders',{requires:['wysiwygarea'],modes:{wysiwyg:1},init:function(q){var r=q.addCommand('showborders',p);r.canUndo=false;if(q.config.startupShowBorders!==false)r.setState(1);q.addCss(n);q.on('mode',function(){if(r.state!=0)r.refresh(q);},null,null,100);q.on('contentDom',function(){if(r.state!=0)r.refresh(q);});q.on('removeFormatCleanup',function(s){var t=s.data;if(q.getCommand('showborders').state==1&&t.is('table')&&(!t.hasAttribute('border')||parseInt(t.getAttribute('border'),10)<=0))t.addClass(m);});},afterInit:function(q){var r=q.dataProcessor,s=r&&r.dataFilter,t=r&&r.htmlFilter;
+if(s)s.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'],x=parseInt(v.border,10);if((!x||x<=0)&&(!w||w.indexOf(m)==-1))v['class']=(w||'')+' '+m;}}});if(t)t.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'];w&&(v['class']=w.replace(m,'').replace(/\s{2}/,' ').replace(/^\s+|\s+$/,''));}}});}});a.on('dialogDefinition',function(q){var r=q.data.name;if(r=='table'||r=='tableProperties'){var s=q.data.definition,t=s.getContents('info'),u=t.get('txtBorder'),v=u.commit;u.commit=e.override(v,function(y){return function(z,A){y.apply(this,arguments);var B=parseInt(this.getValue(),10);A[!B||B<=0?'addClass':'removeClass'](m);};});var w=s.getContents('advanced'),x=w&&w.get('advCSSClasses');if(x){x.setup=e.override(x.setup,function(y){return function(){y.apply(this,arguments);this.setValue(this.getValue().replace(/cke_show_border/,''));};});x.commit=e.override(x.commit,function(y){return function(z,A){y.apply(this,arguments);if(!parseInt(A.getAttribute('border'),10))A.addClass('cke_show_border');};});}}});})();j.add('sourcearea',{requires:['editingblock'],init:function(m){var n=j.sourcearea,o=a.document.getWindow();m.on('editingBlockReady',function(){var p,q;m.addMode('source',{load:function(r,s){if(c&&b.version<8)r.setStyle('position','relative');m.textarea=p=new h('textarea');p.setAttributes({dir:'ltr',tabIndex:b.webkit?-1:m.tabIndex,role:'textbox','aria-label':m.lang.editorTitle.replace('%1',m.name)});p.addClass('cke_source');p.addClass('cke_enable_context_menu');m.readOnly&&p.setAttribute('readOnly','readonly');var t={width:b.ie7Compat?'99%':'100%',height:'100%',resize:'none',outline:'none','text-align':'left'};if(c){q=function(){p.hide();p.setStyle('height',r.$.clientHeight+'px');p.setStyle('width',r.$.clientWidth+'px');p.show();};m.on('resize',q);o.on('resize',q);setTimeout(q,0);}r.setHtml('');r.append(p);p.setStyles(t);m.fire('ariaWidget',p);p.on('blur',function(){m.focusManager.blur();});p.on('focus',function(){m.focusManager.focus();});m.mayBeDirty=true;this.loadData(s);var u=m.keystrokeHandler;if(u)u.attach(p);setTimeout(function(){m.mode='source';m.fire('mode',{previousMode:m._.previousMode});},b.gecko||b.webkit?100:0);},loadData:function(r){p.setValue(r);m.fire('dataReady');},getData:function(){return p.getValue();},getSnapshotData:function(){return p.getValue();},unload:function(r){p.clearCustomData();m.textarea=p=null;if(q){m.removeListener('resize',q);o.removeListener('resize',q);}if(c&&b.version<8)r.removeStyle('position');
+},focus:function(){p.focus();}});});m.on('readOnly',function(){if(m.mode=='source')if(m.readOnly)m.textarea.setAttribute('readOnly','readonly');else m.textarea.removeAttribute('readOnly');});m.addCommand('source',n.commands.source);if(m.ui.addButton)m.ui.addButton('Source',{label:m.lang.source,command:'source'});m.on('mode',function(){m.getCommand('source').setState(m.mode=='source'?1:2);});}});j.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:false,readOnly:1,exec:function(m){if(m.mode=='wysiwyg')m.fire('saveSnapshot');m.getCommand('source').setState(0);m.setMode(m.mode=='source'?'wysiwyg':'source');},canUndo:false}}};(function(){j.add('stylescombo',{requires:['richcombo','styles'],init:function(n){var o=n.config,p=n.lang.stylesCombo,q={},r=[],s;function t(u){n.getStylesSet(function(v){if(!r.length){var w,x;for(var y=0,z=v.length;y<z;y++){var A=v[y];x=A.name;w=q[x]=new a.style(A);w._name=x;w._.enterMode=o.enterMode;r.push(w);}r.sort(m);}u&&u();});};n.ui.addRichCombo('Styles',{label:p.label,title:p.panelTitle,className:'cke_styles',panel:{css:n.skin.editor.css.concat(o.contentsCss),multiSelect:true,attributes:{'aria-label':p.panelTitle}},init:function(){s=this;t(function(){var u,v,w,x,y,z;for(y=0,z=r.length;y<z;y++){u=r[y];v=u._name;x=u.type;if(x!=w){s.startGroup(p['panelTitle'+String(x)]);w=x;}s.add(v,u.type==3?v:u.buildPreview(),v);}s.commit();});},onClick:function(u){n.focus();n.fire('saveSnapshot');var v=q[u],w=n.getSelection(),x=new d.elementPath(w.getStartElement());v[v.checkActive(x)?'remove':'apply'](n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(u){var v=this.getValue(),w=u.data.path,x=w.elements;for(var y=0,z=x.length,A;y<z;y++){A=x[y];for(var B in q){if(q[B].checkElementRemovable(A,true)){if(B!=v)this.setValue(B);return;}}}this.setValue('');},this);},onOpen:function(){var B=this;if(c||b.webkit)n.focus();var u=n.getSelection(),v=u.getSelectedElement(),w=new d.elementPath(v||u.getStartElement()),x=[0,0,0,0];B.showAll();B.unmarkAll();for(var y in q){var z=q[y],A=z.type;if(z.checkActive(w))B.mark(y);else if(A==3&&!z.checkApplicable(w)){B.hideItem(y);x[A]--;}x[A]++;}if(!x[1])B.hideGroup(p['panelTitle'+String(1)]);if(!x[2])B.hideGroup(p['panelTitle'+String(2)]);if(!x[3])B.hideGroup(p['panelTitle'+String(3)]);},reset:function(){if(s){delete s._.panel;delete s._.list;s._.committed=0;s._.items={};s._.state=2;}q={};r=[];t();}});n.on('instanceReady',function(){t();});}});function m(n,o){var p=n.type,q=o.type;
+return p==q?0:p==3?-1:q==3?1:q==1?1:-1;};})();j.add('table',{requires:['dialog'],init:function(m){var n=j.table,o=m.lang.table;m.addCommand('table',new a.dialogCommand('table'));m.addCommand('tableProperties',new a.dialogCommand('tableProperties'));m.ui.addButton('Table',{label:o.toolbar,command:'table'});a.dialog.add('table',this.path+'dialogs/table.js');a.dialog.add('tableProperties',this.path+'dialogs/table.js');if(m.addMenuItems)m.addMenuItems({table:{label:o.menu,command:'tableProperties',group:'table',order:5},tabledelete:{label:o.deleteTable,command:'tableDelete',group:'table',order:1}});m.on('doubleclick',function(p){var q=p.data.element;if(q.is('table'))p.data.dialog='tableProperties';});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(!p||p.isReadOnly())return null;var r=p.hasAscendant('table',1);if(r)return{tabledelete:2,table:2};return null;});}});(function(){var m=/^(?:td|th)$/;function n(G){var H=G.getRanges(),I=[],J={};function K(S){if(I.length>0)return;if(S.type==1&&m.test(S.getName())&&!S.getCustomData('selected_cell')){h.setMarker(J,S,'selected_cell',true);I.push(S);}};for(var L=0;L<H.length;L++){var M=H[L];if(M.collapsed){var N=M.getCommonAncestor(),O=N.getAscendant('td',true)||N.getAscendant('th',true);if(O)I.push(O);}else{var P=new d.walker(M),Q;P.guard=K;while(Q=P.next()){var R=Q.getAscendant('td')||Q.getAscendant('th');if(R&&!R.getCustomData('selected_cell')){h.setMarker(J,R,'selected_cell',true);I.push(R);}}}}h.clearAllMarkers(J);return I;};function o(G){var H=0,I=G.length-1,J={},K,L,M;while(K=G[H++])h.setMarker(J,K,'delete_cell',true);H=0;while(K=G[H++]){if((L=K.getPrevious())&&!L.getCustomData('delete_cell')||(L=K.getNext())&&!L.getCustomData('delete_cell')){h.clearAllMarkers(J);return L;}}h.clearAllMarkers(J);M=G[0].getParent();if(M=M.getPrevious())return M.getLast();M=G[I].getParent();if(M=M.getNext())return M.getChild(0);return null;};function p(G,H){var I=n(G),J=I[0],K=J.getAscendant('table'),L=J.getDocument(),M=I[0].getParent(),N=M.$.rowIndex,O=I[I.length-1],P=O.getParent().$.rowIndex+O.$.rowSpan-1,Q=new h(K.$.rows[P]),R=H?N:P,S=H?M:Q,T=e.buildTableMap(K),U=T[R],V=H?T[R-1]:T[R+1],W=T[0].length,X=L.createElement('tr');for(var Y=0;U[Y]&&Y<W;Y++){var Z;if(U[Y].rowSpan>1&&V&&U[Y]==V[Y]){Z=U[Y];Z.rowSpan+=1;}else{Z=new h(U[Y]).clone();Z.removeAttribute('rowSpan');!c&&Z.appendBogus();X.append(Z);Z=Z.$;}Y+=Z.colSpan-1;}H?X.insertBefore(S):X.insertAfter(S);};function q(G){if(G instanceof d.selection){var H=n(G),I=H[0],J=I.getAscendant('table'),K=e.buildTableMap(J),L=H[0].getParent(),M=L.$.rowIndex,N=H[H.length-1],O=N.getParent().$.rowIndex+N.$.rowSpan-1,P=[];
+for(var Q=M;Q<=O;Q++){var R=K[Q],S=new h(J.$.rows[Q]);for(var T=0;T<R.length;T++){var U=new h(R[T]),V=U.getParent().$.rowIndex;if(U.$.rowSpan==1)U.remove();else{U.$.rowSpan-=1;if(V==Q){var W=K[Q+1];W[T-1]?U.insertAfter(new h(W[T-1])):new h(J.$.rows[Q+1]).append(U,1);}}T+=U.$.colSpan-1;}P.push(S);}var X=J.$.rows,Y=new h(X[O+1]||(M>0?X[M-1]:null)||J.$.parentNode);for(Q=P.length;Q>=0;Q--)q(P[Q]);return Y;}else if(G instanceof h){J=G.getAscendant('table');if(J.$.rows.length==1)J.remove();else G.remove();}return null;};function r(G,H){var I=G.getParent(),J=I.$.cells,K=0;for(var L=0;L<J.length;L++){var M=J[L];K+=H?1:M.colSpan;if(M==G.$)break;}return K-1;};function s(G,H){var I=H?Infinity:0;for(var J=0;J<G.length;J++){var K=r(G[J],H);if(H?K<I:K>I)I=K;}return I;};function t(G,H){var I=n(G),J=I[0],K=J.getAscendant('table'),L=s(I,1),M=s(I),N=H?L:M,O=e.buildTableMap(K),P=[],Q=[],R=O.length;for(var S=0;S<R;S++){P.push(O[S][N]);var T=H?O[S][N-1]:O[S][N+1];Q.push(T);}for(S=0;S<R;S++){var U;if(!P[S])continue;if(P[S].colSpan>1&&Q[S]==P[S]){U=P[S];U.colSpan+=1;}else{U=new h(P[S]).clone();U.removeAttribute('colSpan');!c&&U.appendBogus();U[H?'insertBefore':'insertAfter'].call(U,new h(P[S]));U=U.$;}S+=U.rowSpan-1;}};function u(G){var H=n(G),I=H[0],J=H[H.length-1],K=I.getAscendant('table'),L=e.buildTableMap(K),M,N,O=[];for(var P=0,Q=L.length;P<Q;P++)for(var R=0,S=L[P].length;R<S;R++){if(L[P][R]==I.$)M=R;if(L[P][R]==J.$)N=R;}for(P=M;P<=N;P++)for(R=0;R<L.length;R++){var T=L[R],U=new h(K.$.rows[R]),V=new h(T[P]);if(V.$){if(V.$.colSpan==1)V.remove();else V.$.colSpan-=1;R+=V.$.rowSpan-1;if(!U.$.cells.length)O.push(U);}}var W=K.$.rows[0]&&K.$.rows[0].cells,X=new h(W[M]||(M?W[M-1]:K.$.parentNode));if(O.length==Q)K.remove();return X;};function v(G){var H=[],I=G[0]&&G[0].getAscendant('table'),J,K,L,M;for(J=0,K=G.length;J<K;J++)H.push(G[J].$.cellIndex);H.sort();for(J=1,K=H.length;J<K;J++){if(H[J]-H[J-1]>1){L=H[J-1]+1;break;}}if(!L)L=H[0]>0?H[0]-1:H[H.length-1]+1;var N=I.$.rows;for(J=0,K=N.length;J<K;J++){M=N[J].cells[L];if(M)break;}return M?new h(M):I.getPrevious();};function w(G,H){var I=G.getStartElement(),J=I.getAscendant('td',1)||I.getAscendant('th',1);if(!J)return;var K=J.clone();if(!c)K.appendBogus();if(H)K.insertBefore(J);else K.insertAfter(J);};function x(G){if(G instanceof d.selection){var H=n(G),I=H[0]&&H[0].getAscendant('table'),J=o(H);for(var K=H.length-1;K>=0;K--)x(H[K]);if(J)z(J,true);else if(I)I.remove();}else if(G instanceof h){var L=G.getParent();if(L.getChildCount()==1)L.remove();
+else G.remove();}};function y(G){var H=G.getBogus();H&&H.remove();G.trim();};function z(G,H){var I=new d.range(G.getDocument());if(!I['moveToElementEdit'+(H?'End':'Start')](G)){I.selectNodeContents(G);I.collapse(H?false:true);}I.select(true);};function A(G,H,I){var J=G[H];if(typeof I=='undefined')return J;for(var K=0;J&&K<J.length;K++){if(I.is&&J[K]==I.$)return K;else if(K==I)return new h(J[K]);}return I.is?-1:null;};function B(G,H){var I=[];for(var J=0;J<G.length;J++){var K=G[J];I.push(K[H]);if(K[H].rowSpan>1)J+=K[H].rowSpan-1;}return I;};function C(G,H,I){var J=n(G),K;if((H?J.length!=1:J.length<2)||(K=G.getCommonAncestor())&&K.type==1&&K.is('table'))return false;var L,M=J[0],N=M.getAscendant('table'),O=e.buildTableMap(N),P=O.length,Q=O[0].length,R=M.getParent().$.rowIndex,S=A(O,R,M);if(H){var T;try{var U=parseInt(M.getAttribute('rowspan'),10)||1,V=parseInt(M.getAttribute('colspan'),10)||1;T=O[H=='up'?R-U:H=='down'?R+U:R][H=='left'?S-V:H=='right'?S+V:S];}catch(an){return false;}if(!T||M.$==T)return false;J[H=='up'||H=='left'?'unshift':'push'](new h(T));}var W=M.getDocument(),X=R,Y=0,Z=0,aa=!I&&new d.documentFragment(W),ab=0;for(var ac=0;ac<J.length;ac++){L=J[ac];var ad=L.getParent(),ae=L.getFirst(),af=L.$.colSpan,ag=L.$.rowSpan,ah=ad.$.rowIndex,ai=A(O,ah,L);ab+=af*ag;Z=Math.max(Z,ai-S+af);Y=Math.max(Y,ah-R+ag);if(!I){if(y(L),L.getChildren().count()){if(ah!=X&&ae&&!(ae.isBlockBoundary&&ae.isBlockBoundary({br:1}))){var aj=aa.getLast(d.walker.whitespaces(true));if(aj&&!(aj.is&&aj.is('br')))aa.append('br');}L.moveChildren(aa);}ac?L.remove():L.setHtml('');}X=ah;}if(!I){aa.moveChildren(M);if(!c)M.appendBogus();if(Z>=Q)M.removeAttribute('rowSpan');else M.$.rowSpan=Y;if(Y>=P)M.removeAttribute('colSpan');else M.$.colSpan=Z;var ak=new d.nodeList(N.$.rows),al=ak.count();for(ac=al-1;ac>=0;ac--){var am=ak.getItem(ac);if(!am.$.cells.length){am.remove();al++;continue;}}return M;}else return Y*Z==ab;};function D(G,H){var I=n(G);if(I.length>1)return false;else if(H)return true;var J=I[0],K=J.getParent(),L=K.getAscendant('table'),M=e.buildTableMap(L),N=K.$.rowIndex,O=A(M,N,J),P=J.$.rowSpan,Q,R,S,T;if(P>1){R=Math.ceil(P/2);S=Math.floor(P/2);T=N+R;var U=new h(L.$.rows[T]),V=A(M,T),W;Q=J.clone();for(var X=0;X<V.length;X++){W=V[X];if(W.parentNode==U.$&&X>O){Q.insertBefore(new h(W));break;}else W=null;}if(!W)U.append(Q,true);}else{S=R=1;U=K.clone();U.insertAfter(K);U.append(Q=J.clone());var Y=A(M,N);for(var Z=0;Z<Y.length;Z++)Y[Z].rowSpan++;}if(!c)Q.appendBogus();J.$.rowSpan=R;Q.$.rowSpan=S;
+if(R==1)J.removeAttribute('rowSpan');if(S==1)Q.removeAttribute('rowSpan');return Q;};function E(G,H){var I=n(G);if(I.length>1)return false;else if(H)return true;var J=I[0],K=J.getParent(),L=K.getAscendant('table'),M=e.buildTableMap(L),N=K.$.rowIndex,O=A(M,N,J),P=J.$.colSpan,Q,R,S;if(P>1){R=Math.ceil(P/2);S=Math.floor(P/2);}else{S=R=1;var T=B(M,O);for(var U=0;U<T.length;U++)T[U].colSpan++;}Q=J.clone();Q.insertAfter(J);if(!c)Q.appendBogus();J.$.colSpan=R;Q.$.colSpan=S;if(R==1)J.removeAttribute('colSpan');if(S==1)Q.removeAttribute('colSpan');return Q;};var F={thead:1,tbody:1,tfoot:1,td:1,tr:1,th:1};j.tabletools={requires:['table','dialog'],init:function(G){var H=G.lang.table;G.addCommand('cellProperties',new a.dialogCommand('cellProperties'));a.dialog.add('cellProperties',this.path+'dialogs/tableCell.js');G.addCommand('tableDelete',{exec:function(I){var J=I.getSelection(),K=J&&J.getStartElement(),L=K&&K.getAscendant('table',1);if(!L)return;var M=L.getParent();if(M.getChildCount()==1&&!M.is('body','td','th'))L=M;var N=new d.range(I.document);N.moveToPosition(L,3);L.remove();N.select();}});G.addCommand('rowDelete',{exec:function(I){var J=I.getSelection();z(q(J));}});G.addCommand('rowInsertBefore',{exec:function(I){var J=I.getSelection();p(J,true);}});G.addCommand('rowInsertAfter',{exec:function(I){var J=I.getSelection();p(J);}});G.addCommand('columnDelete',{exec:function(I){var J=I.getSelection(),K=u(J);K&&z(K,true);}});G.addCommand('columnInsertBefore',{exec:function(I){var J=I.getSelection();t(J,true);}});G.addCommand('columnInsertAfter',{exec:function(I){var J=I.getSelection();t(J);}});G.addCommand('cellDelete',{exec:function(I){var J=I.getSelection();x(J);}});G.addCommand('cellMerge',{exec:function(I){z(C(I.getSelection()),true);}});G.addCommand('cellMergeRight',{exec:function(I){z(C(I.getSelection(),'right'),true);}});G.addCommand('cellMergeDown',{exec:function(I){z(C(I.getSelection(),'down'),true);}});G.addCommand('cellVerticalSplit',{exec:function(I){z(D(I.getSelection()));}});G.addCommand('cellHorizontalSplit',{exec:function(I){z(E(I.getSelection()));}});G.addCommand('cellInsertBefore',{exec:function(I){var J=I.getSelection();w(J,true);}});G.addCommand('cellInsertAfter',{exec:function(I){var J=I.getSelection();w(J);}});if(G.addMenuItems)G.addMenuItems({tablecell:{label:H.cell.menu,group:'tablecell',order:1,getItems:function(){var I=G.getSelection(),J=n(I);return{tablecell_insertBefore:2,tablecell_insertAfter:2,tablecell_delete:2,tablecell_merge:C(I,null,true)?2:0,tablecell_merge_right:C(I,'right',true)?2:0,tablecell_merge_down:C(I,'down',true)?2:0,tablecell_split_vertical:D(I,true)?2:0,tablecell_split_horizontal:E(I,true)?2:0,tablecell_properties:J.length>0?2:0};
+}},tablecell_insertBefore:{label:H.cell.insertBefore,group:'tablecell',command:'cellInsertBefore',order:5},tablecell_insertAfter:{label:H.cell.insertAfter,group:'tablecell',command:'cellInsertAfter',order:10},tablecell_delete:{label:H.cell.deleteCell,group:'tablecell',command:'cellDelete',order:15},tablecell_merge:{label:H.cell.merge,group:'tablecell',command:'cellMerge',order:16},tablecell_merge_right:{label:H.cell.mergeRight,group:'tablecell',command:'cellMergeRight',order:17},tablecell_merge_down:{label:H.cell.mergeDown,group:'tablecell',command:'cellMergeDown',order:18},tablecell_split_horizontal:{label:H.cell.splitHorizontal,group:'tablecell',command:'cellHorizontalSplit',order:19},tablecell_split_vertical:{label:H.cell.splitVertical,group:'tablecell',command:'cellVerticalSplit',order:20},tablecell_properties:{label:H.cell.title,group:'tablecellproperties',command:'cellProperties',order:21},tablerow:{label:H.row.menu,group:'tablerow',order:1,getItems:function(){return{tablerow_insertBefore:2,tablerow_insertAfter:2,tablerow_delete:2};}},tablerow_insertBefore:{label:H.row.insertBefore,group:'tablerow',command:'rowInsertBefore',order:5},tablerow_insertAfter:{label:H.row.insertAfter,group:'tablerow',command:'rowInsertAfter',order:10},tablerow_delete:{label:H.row.deleteRow,group:'tablerow',command:'rowDelete',order:15},tablecolumn:{label:H.column.menu,group:'tablecolumn',order:1,getItems:function(){return{tablecolumn_insertBefore:2,tablecolumn_insertAfter:2,tablecolumn_delete:2};}},tablecolumn_insertBefore:{label:H.column.insertBefore,group:'tablecolumn',command:'columnInsertBefore',order:5},tablecolumn_insertAfter:{label:H.column.insertAfter,group:'tablecolumn',command:'columnInsertAfter',order:10},tablecolumn_delete:{label:H.column.deleteColumn,group:'tablecolumn',command:'columnDelete',order:15}});if(G.contextMenu)G.contextMenu.addListener(function(I,J){if(!I||I.isReadOnly())return null;while(I){if(I.getName() in F)return{tablecell:2,tablerow:2,tablecolumn:2};I=I.getParent();}return null;});},getSelectedCells:n};j.add('tabletools',j.tabletools);})();e.buildTableMap=function(m){var n=m.$.rows,o=-1,p=[];for(var q=0;q<n.length;q++){o++;!p[o]&&(p[o]=[]);var r=-1;for(var s=0;s<n[q].cells.length;s++){var t=n[q].cells[s];r++;while(p[o][r])r++;var u=isNaN(t.colSpan)?1:t.colSpan,v=isNaN(t.rowSpan)?1:t.rowSpan;for(var w=0;w<v;w++){if(!p[o+w])p[o+w]=[];for(var x=0;x<u;x++)p[o+w][r+x]=n[q].cells[s];}r+=u-1;}}return p;};j.add('specialchar',{requires:['dialog'],availableLangs:{cs:1,cy:1,de:1,el:1,en:1,eo:1,et:1,fa:1,fi:1,fr:1,he:1,hr:1,it:1,nb:1,nl:1,no:1,'pt-br':1,tr:1,ug:1,'zh-cn':1},init:function(m){var n='specialchar',o=this;
+a.dialog.add(n,this.path+'dialogs/specialchar.js');m.addCommand(n,{exec:function(){var p=m.langCode;p=o.availableLangs[p]?p:'en';a.scriptLoader.load(a.getUrl(o.path+'lang/'+p+'.js'),function(){e.extend(m.lang.specialChar,o.langEntries[p]);m.openDialog(n);});},modes:{wysiwyg:1},canUndo:false});m.ui.addButton('SpecialChar',{label:m.lang.specialChar.toolbar,command:n});}});i.specialChars=['!','&quot;','#','$','%','&amp;',"'",'(',')','*','+','-','.','/','0','1','2','3','4','5','6','7','8','9',':',';','&lt;','=','&gt;','?','@','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','[',']','^','_','`','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','{','|','}','~','&euro;','&lsquo;','&rsquo;','&ldquo;','&rdquo;','&ndash;','&mdash;','&iexcl;','&cent;','&pound;','&curren;','&yen;','&brvbar;','&sect;','&uml;','&copy;','&ordf;','&laquo;','&not;','&reg;','&macr;','&deg;','&sup2;','&sup3;','&acute;','&micro;','&para;','&middot;','&cedil;','&sup1;','&ordm;','&raquo;','&frac14;','&frac12;','&frac34;','&iquest;','&Agrave;','&Aacute;','&Acirc;','&Atilde;','&Auml;','&Aring;','&AElig;','&Ccedil;','&Egrave;','&Eacute;','&Ecirc;','&Euml;','&Igrave;','&Iacute;','&Icirc;','&Iuml;','&ETH;','&Ntilde;','&Ograve;','&Oacute;','&Ocirc;','&Otilde;','&Ouml;','&times;','&Oslash;','&Ugrave;','&Uacute;','&Ucirc;','&Uuml;','&Yacute;','&THORN;','&szlig;','&agrave;','&aacute;','&acirc;','&atilde;','&auml;','&aring;','&aelig;','&ccedil;','&egrave;','&eacute;','&ecirc;','&euml;','&igrave;','&iacute;','&icirc;','&iuml;','&eth;','&ntilde;','&ograve;','&oacute;','&ocirc;','&otilde;','&ouml;','&divide;','&oslash;','&ugrave;','&uacute;','&ucirc;','&uuml;','&yacute;','&thorn;','&yuml;','&OElig;','&oelig;','&#372;','&#374','&#373','&#375;','&sbquo;','&#8219;','&bdquo;','&hellip;','&trade;','&#9658;','&bull;','&rarr;','&rArr;','&hArr;','&diams;','&asymp;'];(function(){var m={editorFocus:false,modes:{wysiwyg:1,source:1}},n={readOnly:1,exec:function(q){q.container.focusNext(true,q.tabIndex);}},o={readOnly:1,exec:function(q){q.container.focusPrevious(true,q.tabIndex);}};function p(q){return{editorFocus:false,canUndo:false,modes:{wysiwyg:1},exec:function(r){if(r.focusManager.hasFocus){var s=r.getSelection(),t=s.getCommonAncestor(),u;if(u=t.getAscendant('td',true)||t.getAscendant('th',true)){var v=new d.range(r.document),w=e.tryThese(function(){var D=u.getParent(),E=D.$.cells[u.$.cellIndex+(q?-1:1)];E.parentNode.parentNode;
+return E;},function(){var D=u.getParent(),E=D.getAscendant('table'),F=E.$.rows[D.$.rowIndex+(q?-1:1)];return F.cells[q?F.cells.length-1:0];});if(!(w||q)){var x=u.getAscendant('table').$,y=u.getParent().$.cells,z=new h(x.insertRow(-1),r.document);for(var A=0,B=y.length;A<B;A++){var C=z.append(new h(y[A],r.document).clone(false,false));!c&&C.appendBogus();}v.moveToElementEditStart(z);}else if(w){w=new h(w);v.moveToElementEditStart(w);if(!(v.checkStartOfBlock()&&v.checkEndOfBlock()))v.selectNodeContents(w);}else return true;v.select(true);return true;}}return false;}};};j.add('tab',{requires:['keystrokes'],init:function(q){var r=q.config.enableTabKeyTools!==false,s=q.config.tabSpaces||0,t='';while(s--)t+='\xa0';if(t)q.on('key',function(u){if(u.data.keyCode==9){q.insertHtml(t);u.cancel();}});if(r)q.on('key',function(u){if(u.data.keyCode==9&&q.execCommand('selectNextCell')||u.data.keyCode==2228224+9&&q.execCommand('selectPreviousCell'))u.cancel();});if(b.webkit||b.gecko)q.on('key',function(u){var v=u.data.keyCode;if(v==9&&!t){u.cancel();q.execCommand('blur');}if(v==2228224+9){q.execCommand('blurBack');u.cancel();}});q.addCommand('blur',e.extend(n,m));q.addCommand('blurBack',e.extend(o,m));q.addCommand('selectNextCell',p());q.addCommand('selectPreviousCell',p(true));}});})();h.prototype.focusNext=function(m,n){var w=this;var o=w.$,p=n===undefined?w.getTabIndex():n,q,r,s,t,u,v;if(p<=0){u=w.getNextSourceNode(m,1);while(u){if(u.isVisible()&&u.getTabIndex()===0){s=u;break;}u=u.getNextSourceNode(false,1);}}else{u=w.getDocument().getBody().getFirst();while(u=u.getNextSourceNode(false,1)){if(!q)if(!r&&u.equals(w)){r=true;if(m){if(!(u=u.getNextSourceNode(true,1)))break;q=1;}}else if(r&&!w.contains(u))q=1;if(!u.isVisible()||(v=u.getTabIndex())<0)continue;if(q&&v==p){s=u;break;}if(v>p&&(!s||!t||v<t)){s=u;t=v;}else if(!s&&v===0){s=u;t=v;}}}if(s)s.focus();};h.prototype.focusPrevious=function(m,n){var w=this;var o=w.$,p=n===undefined?w.getTabIndex():n,q,r,s,t=0,u,v=w.getDocument().getBody().getLast();while(v=v.getPreviousSourceNode(false,1)){if(!q)if(!r&&v.equals(w)){r=true;if(m){if(!(v=v.getPreviousSourceNode(true,1)))break;q=1;}}else if(r&&!w.contains(v))q=1;if(!v.isVisible()||(u=v.getTabIndex())<0)continue;if(p<=0){if(q&&u===0){s=v;break;}if(u>t){s=v;t=u;}}else{if(q&&u==p){s=v;break;}if(u<p&&(!s||u>t)){s=v;t=u;}}}if(s)s.focus();};(function(){j.add('templates',{requires:['dialog'],init:function(o){a.dialog.add('templates',a.getUrl(this.path+'dialogs/templates.js'));o.addCommand('templates',new a.dialogCommand('templates'));
+o.ui.addButton('Templates',{label:o.lang.templates.button,command:'templates'});}});var m={},n={};a.addTemplates=function(o,p){m[o]=p;};a.getTemplates=function(o){return m[o];};a.loadTemplates=function(o,p){var q=[];for(var r=0,s=o.length;r<s;r++){if(!n[o[r]]){q.push(o[r]);n[o[r]]=1;}}if(q.length)a.scriptLoader.load(q,p);else setTimeout(p,0);};})();i.templates_files=[a.getUrl('plugins/templates/templates/default.js')];i.templates_replaceContent=true;(function(){var m=function(){this.toolbars=[];this.focusCommandExecuted=false;};m.prototype.focus=function(){for(var o=0,p;p=this.toolbars[o++];)for(var q=0,r;r=p.items[q++];){if(r.focus){r.focus();return;}}};var n={toolbarFocus:{modes:{wysiwyg:1,source:1},readOnly:1,exec:function(o){if(o.toolbox){o.toolbox.focusCommandExecuted=true;if(c||b.air)setTimeout(function(){o.toolbox.focus();},100);else o.toolbox.focus();}}}};j.add('toolbar',{requires:['button'],init:function(o){var p,q=function(r,s){var t,u,v=o.lang.dir=='rtl',w=o.config.toolbarGroupCycling;w=w===undefined||w;switch(s){case 9:case 2228224+9:while(!u||!u.items.length){u=s==9?(u?u.next:r.toolbar.next)||o.toolbox.toolbars[0]:(u?u.previous:r.toolbar.previous)||o.toolbox.toolbars[o.toolbox.toolbars.length-1];if(u.items.length){r=u.items[p?u.items.length-1:0];while(r&&!r.focus){r=p?r.previous:r.next;if(!r)u=0;}}}if(r)r.focus();return false;case v?37:39:case 40:t=r;do{t=t.next;if(!t&&w)t=r.toolbar.items[0];}while(t&&!t.focus);if(t)t.focus();else q(r,9);return false;case v?39:37:case 38:t=r;do{t=t.previous;if(!t&&w)t=r.toolbar.items[r.toolbar.items.length-1];}while(t&&!t.focus);if(t)t.focus();else{p=1;q(r,2228224+9);p=0;}return false;case 27:o.focus();return false;case 13:case 32:r.execute();return false;}return true;};o.on('themeSpace',function(r){if(r.data.space==o.config.toolbarLocation){o.toolbox=new m();var s=e.getNextId(),t=['<div class="cke_toolbox" role="group" aria-labelledby="',s,'" onmousedown="return false;"'],u=o.config.toolbarStartupExpanded!==false,v;t.push(u?'>':' style="display:none">');t.push('<span id="',s,'" class="cke_voice_label">',o.lang.toolbars,'</span>');var w=o.toolbox.toolbars,x=o.config.toolbar instanceof Array?o.config.toolbar:o.config['toolbar_'+o.config.toolbar];for(var y=0;y<x.length;y++){var z,A=0,B,C=x[y],D;if(!C)continue;if(v){t.push('</div>');v=0;}if(C==='/'){t.push('<div class="cke_break"></div>');continue;}D=C.items||C;for(var E=0;E<D.length;E++){var F,G=D[E],H;F=o.ui.create(G);if(F){H=F.canGroup!==false;if(!A){z=e.getNextId();
+A={id:z,items:[]};B=C.name&&(o.lang.toolbarGroups[C.name]||C.name);t.push('<span id="',z,'" class="cke_toolbar"',B?' aria-labelledby="'+z+'_label"':'',' role="toolbar">');B&&t.push('<span id="',z,'_label" class="cke_voice_label">',B,'</span>');t.push('<span class="cke_toolbar_start"></span>');var I=w.push(A)-1;if(I>0){A.previous=w[I-1];A.previous.next=A;}}if(H){if(!v){t.push('<span class="cke_toolgroup" role="presentation">');v=1;}}else if(v){t.push('</span>');v=0;}var J=F.render(o,t);I=A.items.push(J)-1;if(I>0){J.previous=A.items[I-1];J.previous.next=J;}J.toolbar=A;J.onkey=q;J.onfocus=function(){if(!o.toolbox.focusCommandExecuted)o.focus();};}}if(v){t.push('</span>');v=0;}if(A)t.push('<span class="cke_toolbar_end"></span></span>');}t.push('</div>');if(o.config.toolbarCanCollapse){var K=e.addFunction(function(){o.execCommand('toolbarCollapse');});o.on('destroy',function(){e.removeFunction(K);});var L=e.getNextId();o.addCommand('toolbarCollapse',{readOnly:1,exec:function(M){var N=a.document.getById(L),O=N.getPrevious(),P=M.getThemeSpace('contents'),Q=O.getParent(),R=parseInt(P.$.style.height,10),S=Q.$.offsetHeight,T=!O.isVisible();if(!T){O.hide();N.addClass('cke_toolbox_collapser_min');N.setAttribute('title',M.lang.toolbarExpand);}else{O.show();N.removeClass('cke_toolbox_collapser_min');N.setAttribute('title',M.lang.toolbarCollapse);}N.getFirst().setText(T?'â–²':'â—€');var U=Q.$.offsetHeight-S;P.setStyle('height',R-U+'px');M.fire('resize');},modes:{wysiwyg:1,source:1}});t.push('<a title="'+(u?o.lang.toolbarCollapse:o.lang.toolbarExpand)+'" id="'+L+'" tabIndex="-1" class="cke_toolbox_collapser');if(!u)t.push(' cke_toolbox_collapser_min');t.push('" onclick="CKEDITOR.tools.callFunction('+K+')">','<span>&#9650;</span>','</a>');}r.data.html+=t.join('');}});o.on('destroy',function(){var r,s=0,t,u,v;r=this.toolbox.toolbars;for(;s<r.length;s++){u=r[s].items;for(t=0;t<u.length;t++){v=u[t];if(v.clickFn)e.removeFunction(v.clickFn);if(v.keyDownFn)e.removeFunction(v.keyDownFn);}}});o.addCommand('toolbarFocus',n.toolbarFocus);o.ui.add('-',a.UI_SEPARATOR,{});o.ui.addHandler(a.UI_SEPARATOR,{create:function(){return{render:function(r,s){s.push('<span class="cke_separator" role="separator"></span>');return{};}};}});}});})();a.UI_SEPARATOR='separator';i.toolbarLocation='top';i.toolbar_Basic=[['Bold','Italic','-','NumberedList','BulletedList','-','Link','Unlink','-','About']];i.toolbar_Full=[{name:'document',items:['Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates']},{name:'clipboard',items:['Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo']},{name:'editing',items:['Find','Replace','-','SelectAll','-','SpellChecker','Scayt']},{name:'forms',items:['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField']},'/',{name:'basicstyles',items:['Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat']},{name:'paragraph',items:['NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl']},{name:'links',items:['Link','Unlink','Anchor']},{name:'insert',items:['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe']},'/',{name:'styles',items:['Styles','Format','Font','FontSize']},{name:'colors',items:['TextColor','BGColor']},{name:'tools',items:['Maximize','ShowBlocks','-','About']}];
+i.toolbar='Full';i.toolbarCanCollapse=true;(function(){j.add('undo',{requires:['selection','wysiwygarea'],init:function(s){var t=new o(s),u=s.addCommand('undo',{exec:function(){if(t.undo()){s.selectionChange();this.fire('afterUndo');}},state:0,canUndo:false}),v=s.addCommand('redo',{exec:function(){if(t.redo()){s.selectionChange();this.fire('afterRedo');}},state:0,canUndo:false});t.onChange=function(){u.setState(t.undoable()?2:0);v.setState(t.redoable()?2:0);};function w(x){if(t.enabled&&x.data.command.canUndo!==false)t.save();};s.on('beforeCommandExec',w);s.on('afterCommandExec',w);s.on('saveSnapshot',function(x){t.save(x.data&&x.data.contentOnly);});s.on('contentDom',function(){s.document.on('keydown',function(x){if(!x.data.$.ctrlKey&&!x.data.$.metaKey)t.type(x);});});s.on('beforeModeUnload',function(){s.mode=='wysiwyg'&&t.save(true);});s.on('mode',function(){t.enabled=s.readOnly?false:s.mode=='wysiwyg';t.onChange();});s.ui.addButton('Undo',{label:s.lang.undo,command:'undo'});s.ui.addButton('Redo',{label:s.lang.redo,command:'redo'});s.resetUndo=function(){t.reset();s.fire('saveSnapshot');};s.on('updateSnapshot',function(){if(t.currentImage)t.update();});}});j.undo={};var m=j.undo.Image=function(s){this.editor=s;s.fire('beforeUndoImage');var t=s.getSnapshot(),u=t&&s.getSelection();c&&t&&(t=t.replace(/\s+data-cke-expando=".*?"/g,''));this.contents=t;this.bookmarks=u&&u.createBookmarks2(true);s.fire('afterUndoImage');},n=/\b(?:href|src|name)="[^"]*?"/gi;m.prototype={equals:function(s,t){var u=this.contents,v=s.contents;if(c&&(b.ie7Compat||b.ie6Compat)){u=u.replace(n,'');v=v.replace(n,'');}if(u!=v)return false;if(t)return true;var w=this.bookmarks,x=s.bookmarks;if(w||x){if(!w||!x||w.length!=x.length)return false;for(var y=0;y<w.length;y++){var z=w[y],A=x[y];if(z.startOffset!=A.startOffset||z.endOffset!=A.endOffset||!e.arrayCompare(z.start,A.start)||!e.arrayCompare(z.end,A.end))return false;}}return true;}};function o(s){this.editor=s;this.reset();};var p={8:1,46:1},q={16:1,17:1,18:1},r={37:1,38:1,39:1,40:1};o.prototype={type:function(s){var t=s&&s.data.getKey(),u=t in q,v=t in p,w=this.lastKeystroke in p,x=v&&t==this.lastKeystroke,y=t in r,z=this.lastKeystroke in r,A=!v&&!y,B=v&&!x,C=!(u||this.typing)||A&&(w||z);if(C||B){var D=new m(this.editor),E=this.snapshots.length;e.setTimeout(function(){var G=this;var F=G.editor.getSnapshot();if(c)F=F.replace(/\s+data-cke-expando=".*?"/g,'');if(D.contents!=F&&E==G.snapshots.length){G.typing=true;if(!G.save(false,D,false))G.snapshots.splice(G.index+1,G.snapshots.length-G.index-1);
+G.hasUndo=true;G.hasRedo=false;G.typesCount=1;G.modifiersCount=1;G.onChange();}},0,this);}this.lastKeystroke=t;if(v){this.typesCount=0;this.modifiersCount++;if(this.modifiersCount>25){this.save(false,null,false);this.modifiersCount=1;}}else if(!y){this.modifiersCount=0;this.typesCount++;if(this.typesCount>25){this.save(false,null,false);this.typesCount=1;}}},reset:function(){var s=this;s.lastKeystroke=0;s.snapshots=[];s.index=-1;s.limit=s.editor.config.undoStackSize||20;s.currentImage=null;s.hasUndo=false;s.hasRedo=false;s.resetType();},resetType:function(){var s=this;s.typing=false;delete s.lastKeystroke;s.typesCount=0;s.modifiersCount=0;},fireChange:function(){var s=this;s.hasUndo=!!s.getNextImage(true);s.hasRedo=!!s.getNextImage(false);s.resetType();s.onChange();},save:function(s,t,u){var w=this;var v=w.snapshots;if(!t)t=new m(w.editor);if(t.contents===false)return false;if(w.currentImage&&t.equals(w.currentImage,s))return false;v.splice(w.index+1,v.length-w.index-1);if(v.length==w.limit)v.shift();w.index=v.push(t)-1;w.currentImage=t;if(u!==false)w.fireChange();return true;},restoreImage:function(s){var w=this;var t=w.editor,u;if(s.bookmarks){t.focus();u=t.getSelection();}w.editor.loadSnapshot(s.contents);if(s.bookmarks)u.selectBookmarks(s.bookmarks);else if(c){var v=w.editor.document.getBody().$.createTextRange();v.collapse(true);v.select();}w.index=s.index;w.update();w.fireChange();},getNextImage:function(s){var x=this;var t=x.snapshots,u=x.currentImage,v,w;if(u)if(s)for(w=x.index-1;w>=0;w--){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}else for(w=x.index+1;w<t.length;w++){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}return null;},redoable:function(){return this.enabled&&this.hasRedo;},undoable:function(){return this.enabled&&this.hasUndo;},undo:function(){var t=this;if(t.undoable()){t.save(true);var s=t.getNextImage(true);if(s)return t.restoreImage(s),true;}return false;},redo:function(){var t=this;if(t.redoable()){t.save(true);if(t.redoable()){var s=t.getNextImage(false);if(s)return t.restoreImage(s),true;}}return false;},update:function(){var s=this;s.snapshots.splice(s.index,1,s.currentImage=new m(s.editor));}};})();(function(){var m=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi,n=d.walker.whitespaces(true),o=d.walker.bogus(true),p=function(E){return n(E)&&o(E);};function q(E){return E.isBlockBoundary()&&f.$empty[E.getName()];};function r(E){return function(F){if(this.mode=='wysiwyg'){this.focus();
+var G=this.getSelection(),H=G.isLocked;H&&G.unlock();this.fire('saveSnapshot');E.call(this,F.data);H&&this.getSelection().lock();var I=this;setTimeout(function(){try{I.fire('saveSnapshot');}catch(J){setTimeout(function(){I.fire('saveSnapshot');},200);}},0);}};};function s(E){var N=this;if(N.dataProcessor)E=N.dataProcessor.toHtml(E);if(!E)return;var F=N.getSelection(),G=F.getRanges()[0];if(G.checkReadOnly())return;if(b.opera){var H=new d.elementPath(G.startContainer);if(H.block){var I=a.htmlParser.fragment.fromHtml(E,false).children;for(var J=0,K=I.length;J<K;J++){if(I[J]._.isBlockLike){G.splitBlock(N.enterMode==3?'div':'p');G.insertNode(G.document.createText(''));G.select();break;}}}}if(c){var L=F.getNative();if(L.type=='Control')L.clear();else if(F.getType()==2){G=F.getRanges()[0];var M=G&&G.endContainer;if(M&&M.type==1&&M.getAttribute('contenteditable')=='false'&&G.checkBoundaryOfElement(M,2)){G.setEndAfter(G.endContainer);G.deleteContents();}}L.createRange().pasteHTML(E);}else N.document.$.execCommand('inserthtml',false,E);if(b.webkit){F=N.getSelection();F.scrollIntoView();}};function t(E){var F=this.getSelection(),G=F.getStartElement().hasAscendant('pre',true)?2:this.config.enterMode,H=G==2,I=e.htmlEncode(E.replace(/\r\n|\r/g,'\n'));I=I.replace(/^[ \t]+|[ \t]+$/g,function(O,P,Q){if(O.length==1)return '&nbsp;';else if(!P)return e.repeat('&nbsp;',O.length-1)+' ';else return ' '+e.repeat('&nbsp;',O.length-1);});I=I.replace(/[ \t]{2,}/g,function(O){return e.repeat('&nbsp;',O.length-1)+' ';});var J=G==1?'p':'div';if(!H)I=I.replace(/(\n{2})([\s\S]*?)(?:$|\1)/g,function(O,P,Q){return '<'+J+'>'+Q+'</'+J+'>';});I=I.replace(/\n/g,'<br>');if(!(H||c))I=I.replace(new RegExp('<br>(?=</'+J+'>)'),function(O){return e.repeat(O,2);});if(b.gecko||b.webkit){var K=new d.elementPath(F.getStartElement()),L=[];for(var M=0;M<K.elements.length;M++){var N=K.elements[M].getName();if(N in f.$inline)L.unshift(K.elements[M].getOuterHtml().match(/^<.*?>/));else if(N in f.$block)break;}I=L.join('')+I;}s.call(this,I);};function u(E){var F=this.getSelection(),G=F.getRanges(),H=E.getName(),I=f.$block[H],J=F.isLocked;if(J)F.unlock();var K,L,M,N;for(var O=G.length-1;O>=0;O--){K=G[O];if(!K.checkReadOnly()){K.deleteContents(1);L=!O&&E||E.clone(1);var P,Q;if(I)while((P=K.getCommonAncestor(0,1))&&(Q=f[P.getName()])&&!(Q&&Q[H])){if(P.getName() in f.span)K.splitElement(P);else if(K.checkStartOfBlock()&&K.checkEndOfBlock()){K.setStartBefore(P);K.collapse(true);P.remove();}else K.splitBlock();}K.insertNode(L);
+if(!M)M=L;}}if(M){K.moveToPosition(M,4);if(I){var R=M.getNext(p),S=R&&R.type==1&&R.getName();if(S&&f.$block[S]){if(f[S]['#'])K.moveToElementEditStart(R);else K.moveToElementEditEnd(M);}else if(!R){R=K.fixBlock(true,this.config.enterMode==3?'div':'p');K.moveToElementEditStart(R);}}}F.selectRanges([K]);if(J)this.getSelection().lock();};function v(E){if(!E.checkDirty())setTimeout(function(){E.resetDirty();},0);};var w=d.walker.whitespaces(true),x=d.walker.bookmark(false,true);function y(E){return w(E)&&x(E);};function z(E){return E.type==3&&e.trim(E.getText()).match(/^(?:&nbsp;|\xa0)$/);};function A(E){if(E.isLocked){E.unlock();setTimeout(function(){E.lock();},0);}};function B(E){return E.getOuterHtml().match(m);};w=d.walker.whitespaces(true);function C(E){var F=E.window,G=E.document,H=E.document.getBody(),I=H.getFirst(),J=H.getChildren().count();if(!J||J==1&&I.type==1&&I.hasAttribute('_moz_editor_bogus_node')){v(E);var K=E.element.getDocument(),L=K.getDocumentElement(),M=L.$.scrollTop,N=L.$.scrollLeft,O=G.$.createEvent('KeyEvents');O.initKeyEvent('keypress',true,true,F.$,false,false,false,false,0,32);G.$.dispatchEvent(O);if(M!=L.$.scrollTop||N!=L.$.scrollLeft)K.getWindow().$.scrollTo(N,M);J&&H.getFirst().remove();G.getBody().appendBogus();var P=new d.range(G);P.setStartAt(H,1);P.select();}};function D(E){var F=E.editor,G=E.data.path,H=G.blockLimit,I=E.data.selection,J=I.getRanges()[0],K=F.document.getBody(),L=F.config.enterMode;if(b.gecko){var M=G.block||G.blockLimit,N=M&&M.getLast(y);if(M&&M.isBlockBoundary()&&!(N&&N.type==1&&N.isBlockBoundary())&&!M.is('pre')&&!M.getBogus())M.appendBogus();}if(F.config.autoParagraph!==false&&L!=2&&J.collapsed&&H.getName()=='body'&&!G.block){var O=J.fixBlock(true,F.config.enterMode==3?'div':'p');if(c){var P=O.getFirst(y);P&&z(P)&&P.remove();}if(B(O)){var Q=O.getNext(w);if(Q&&Q.type==1&&!q(Q)){J.moveToElementEditStart(Q);O.remove();}else{Q=O.getPrevious(w);if(Q&&Q.type==1&&!q(Q)){J.moveToElementEditEnd(Q);O.remove();}}}J.select();E.cancel();}var R=new d.range(F.document);R.moveToElementEditEnd(F.document.getBody());var S=new d.elementPath(R.startContainer);if(!S.blockLimit.is('body')){var T;if(L!=2)T=K.append(F.document.createElement(L==1?'p':'div'));else T=K;if(!c)T.appendBogus();}};j.add('wysiwygarea',{requires:['editingblock'],init:function(E){var F=E.config.enterMode!=2&&E.config.autoParagraph!==false?E.config.enterMode==3?'div':'p':false,G=E.lang.editorTitle.replace('%1',E.name),H=E.lang.editorHelp;if(c)G+=', '+H;var I=a.document.getWindow(),J;
+E.on('editingBlockReady',function(){var M,N,O,P,Q,R,S,T=b.isCustomDomain(),U=function(X){if(N)N.remove();var Y='document.open();'+(T?'document.domain="'+document.domain+'";':'')+'document.close();';Y=b.air?'javascript:void(0)':c?'javascript:void(function(){'+encodeURIComponent(Y)+'}())':'';var Z=e.getNextId();N=h.createFromHtml('<iframe style="width:100%;height:100%" frameBorder="0" aria-describedby="'+Z+'"'+' title="'+G+'"'+' src="'+Y+'"'+' tabIndex="'+(b.webkit?-1:E.tabIndex)+'"'+' allowTransparency="true"'+'></iframe>');if(document.location.protocol=='chrome:')a.event.useCapture=true;N.on('load',function(aa){Q=1;aa.removeListener();var ab=N.getFrameDocument();ab.write(X);b.air&&W(ab.getWindow().$);});if(document.location.protocol=='chrome:')a.event.useCapture=false;M.append(h.createFromHtml('<span id="'+Z+'" class="cke_voice_label">'+H+'</span>'));M.append(N);if(b.webkit){S=function(){M.setStyle('width','100%');N.hide();N.setSize('width',M.getSize('width'));M.removeStyle('width');N.show();};I.on('resize',S);}};J=e.addFunction(W);var V='<script id="cke_actscrpt" type="text/javascript" data-cke-temp="1">'+(T?'document.domain="'+document.domain+'";':'')+'window.parent.CKEDITOR.tools.callFunction( '+J+', window );'+'</script>';function W(X){if(!Q)return;Q=0;E.fire('ariaWidget',N);var Y=X.document,Z=Y.body,aa=Y.getElementById('cke_actscrpt');aa&&aa.parentNode.removeChild(aa);Z.spellcheck=!E.config.disableNativeSpellChecker;var ab=!E.readOnly;if(c){Z.hideFocus=true;Z.disabled=true;Z.contentEditable=ab;Z.removeAttribute('disabled');}else setTimeout(function(){if(b.gecko&&b.version>=10900||b.opera)Y.$.body.contentEditable=ab;else if(b.webkit)Y.$.body.parentNode.contentEditable=ab;else Y.$.designMode=ab?'off':'on';},0);ab&&b.gecko&&e.setTimeout(C,0,null,E);X=E.window=new d.window(X);Y=E.document=new g(Y);ab&&Y.on('dblclick',function(ag){var ah=ag.data.getTarget(),ai={element:ah,dialog:''};E.fire('doubleclick',ai);ai.dialog&&E.openDialog(ai.dialog);});c&&Y.on('click',function(ag){var ah=ag.data.getTarget();if(ah.is('input')){var ai=ah.getAttribute('type');if(ai=='submit'||ai=='reset')ag.data.preventDefault();}});if(!(c||b.opera))Y.on('mousedown',function(ag){var ah=ag.data.getTarget();if(ah.is('img','hr','input','textarea','select'))E.getSelection().selectElement(ah);});if(b.gecko)Y.on('mouseup',function(ag){if(ag.data.$.button==2){var ah=ag.data.getTarget();if(!ah.getOuterHtml().replace(m,'')){var ai=new d.range(Y);ai.moveToElementEditStart(ah);ai.select(true);}}});
+Y.on('click',function(ag){ag=ag.data;if(ag.getTarget().is('a')&&ag.$.button!=2)ag.preventDefault();});if(b.webkit){Y.on('mousedown',function(){ad=1;});Y.on('click',function(ag){if(ag.data.getTarget().is('input','select'))ag.data.preventDefault();});Y.on('mouseup',function(ag){if(ag.data.getTarget().is('input','textarea'))ag.data.preventDefault();});}var ac=c?N:X;ac.on('blur',function(){E.focusManager.blur();});var ad;ac.on('focus',function(){var ag=E.document;if(b.gecko||b.opera)ag.getBody().focus();else if(b.webkit)if(!ad){E.document.getDocumentElement().focus();ad=1;}E.focusManager.focus();});var ae=E.keystrokeHandler;ae.blockedKeystrokes[8]=!ab;ae.attach(Y);Y.getDocumentElement().addClass(Y.$.compatMode);E.on('key',function(ag){if(E.mode!='wysiwyg')return;var ah=ag.data.keyCode;if(ah in {8:1,46:1}){var ai=E.getSelection(),aj=ai.getSelectedElement(),ak=ai.getRanges()[0],al=new d.elementPath(ak.startContainer),am,an,ao,ap=ah==8;if(aj){E.fire('saveSnapshot');ak.moveToPosition(aj,3);aj.remove();ak.select();E.fire('saveSnapshot');ag.cancel();}else if(ak.collapsed)if((am=al.block)&&ak[ap?'checkStartOfBlock':'checkEndOfBlock']()&&(ao=am[ap?'getPrevious':'getNext'](n))&&ao.is('table')){E.fire('saveSnapshot');if(ak[ap?'checkEndOfBlock':'checkStartOfBlock']())am.remove();ak['moveToElementEdit'+(ap?'End':'Start')](ao);ak.select();E.fire('saveSnapshot');ag.cancel();}else if(al.blockLimit.is('td')&&(an=al.blockLimit.getAscendant('table'))&&ak.checkBoundaryOfElement(an,ap?1:2)&&(ao=an[ap?'getPrevious':'getNext'](n))){E.fire('saveSnapshot');ak['moveToElementEdit'+(ap?'End':'Start')](ao);if(ak.checkStartOfBlock()&&ak.checkEndOfBlock())ao.remove();else ak.select();E.fire('saveSnapshot');ag.cancel();}}if(ah==33||ah==34)if(b.gecko){var aq=Y.getBody();if(X.$.innerHeight>aq.$.offsetHeight){ak=new d.range(Y);ak[ah==33?'moveToElementEditStart':'moveToElementEditEnd'](aq);ak.select();ag.cancel();}}});if(c&&Y.$.compatMode=='CSS1Compat'){var af={33:1,34:1};Y.on('keydown',function(ag){if(ag.data.getKeystroke() in af)setTimeout(function(){E.getSelection().scrollIntoView();},0);});}if(c&&E.config.enterMode!=1)Y.on('selectionchange',function(){var ag=Y.getBody(),ah=E.getSelection(),ai=ah&&ah.getRanges()[0];if(ai&&ag.getHtml().match(/^<p>&nbsp;<\/p>$/i)&&ai.startContainer.equals(ag))setTimeout(function(){ai=E.getSelection().getRanges()[0];if(!ai.startContainer.equals('body')){ag.getFirst().remove(1);ai.moveToElementEditEnd(ag);ai.select(1);}},0);});if(E.contextMenu)E.contextMenu.addTarget(Y,E.config.browserContextMenuOnCtrl!==false);
+setTimeout(function(){E.fire('contentDom');if(R){E.mode='wysiwyg';E.fire('mode',{previousMode:E._.previousMode});R=false;}O=false;if(P){E.focus();P=false;}setTimeout(function(){E.fire('dataReady');},0);try{E.document.$.execCommand('2D-position',false,true);}catch(ag){}try{E.document.$.execCommand('enableInlineTableEditing',false,!E.config.disableNativeTableHandles);}catch(ah){}if(E.config.disableObjectResizing)try{E.document.$.execCommand('enableObjectResizing',false,false);}catch(ai){E.document.getBody().on(c?'resizestart':'resize',function(aj){aj.data.preventDefault();});}if(c)setTimeout(function(){if(E.document){var aj=E.document.$.body;aj.runtimeStyle.marginBottom='0px';aj.runtimeStyle.marginBottom='';}},1000);},0);};E.addMode('wysiwyg',{load:function(X,Y,Z){M=X;if(c&&b.quirks)X.setStyle('position','relative');E.mayBeDirty=true;R=true;if(Z)this.loadSnapshotData(Y);else this.loadData(Y);},loadData:function(X){O=true;E._.dataStore={id:1};var Y=E.config,Z=Y.fullPage,aa=Y.docType,ab='<style type="text/css" data-cke-temp="1">'+E._.styles.join('\n')+'</style>';!Z&&(ab=e.buildStyleHtml(E.config.contentsCss)+ab);var ac=Y.baseHref?'<base href="'+Y.baseHref+'" data-cke-temp="1" />':'';if(Z)X=X.replace(/<!DOCTYPE[^>]*>/i,function(ad){E.docType=aa=ad;return '';}).replace(/<\?xml\s[^\?]*\?>/i,function(ad){E.xmlDeclaration=ad;return '';});if(E.dataProcessor)X=E.dataProcessor.toHtml(X,F);if(Z){if(!/<body[\s|>]/.test(X))X='<body>'+X;if(!/<html[\s|>]/.test(X))X='<html>'+X+'</html>';if(!/<head[\s|>]/.test(X))X=X.replace(/<html[^>]*>/,'$&<head><title></title></head>');else if(!/<title[\s|>]/.test(X))X=X.replace(/<head[^>]*>/,'$&<title></title>');ac&&(X=X.replace(/<head>/,'$&'+ac));X=X.replace(/<\/head\s*>/,ab+'$&');X=aa+X;}else X=Y.docType+'<html dir="'+Y.contentsLangDirection+'"'+' lang="'+(Y.contentsLanguage||E.langCode)+'">'+'<head>'+'<title>'+G+'</title>'+ac+ab+'</head>'+'<body'+(Y.bodyId?' id="'+Y.bodyId+'"':'')+(Y.bodyClass?' class="'+Y.bodyClass+'"':'')+'>'+X+'</html>';if(b.gecko)X=X.replace(/<br \/>(?=\s*<\/(:?html|body)>)/,'$&<br type="_moz" />');X+=V;this.onDispose();U(X);},getData:function(){var X=E.config,Y=X.fullPage,Z=Y&&E.docType,aa=Y&&E.xmlDeclaration,ab=N.getFrameDocument(),ac=Y?ab.getDocumentElement().getOuterHtml():ab.getBody().getHtml();if(b.gecko)ac=ac.replace(/<br>(?=\s*(:?$|<\/body>))/,'');if(E.dataProcessor)ac=E.dataProcessor.toDataFormat(ac,F);if(X.ignoreEmptyParagraph)ac=ac.replace(m,function(ad,ae){return ae;});if(aa)ac=aa+'\n'+ac;if(Z)ac=Z+'\n'+ac;
+return ac;},getSnapshotData:function(){return N.getFrameDocument().getBody().getHtml();},loadSnapshotData:function(X){N.getFrameDocument().getBody().setHtml(X);},onDispose:function(){if(!E.document)return;E.document.getDocumentElement().clearCustomData();E.document.getBody().clearCustomData();E.window.clearCustomData();E.document.clearCustomData();N.clearCustomData();N.remove();},unload:function(X){this.onDispose();if(S)I.removeListener('resize',S);E.window=E.document=N=M=P=null;E.fire('contentDomUnload');},focus:function(){var X=E.window;if(O)P=true;else if(X){var Y=E.getSelection(),Z=Y&&Y.getNative();if(Z&&Z.type=='Control')return;b.air?setTimeout(function(){X.focus();},0):X.focus();E.selectionChange();}}});E.on('insertHtml',r(s),null,null,20);E.on('insertElement',r(u),null,null,20);E.on('insertText',r(t),null,null,20);E.on('selectionChange',function(X){if(E.readOnly)return;var Y=E.getSelection();if(Y&&!Y.isLocked){var Z=E.checkDirty();E.fire('saveSnapshot',{contentOnly:1});D.call(this,X);E.fire('updateSnapshot');!Z&&E.resetDirty();}},null,null,1);});E.on('contentDom',function(){var M=E.document.getElementsByTag('title').getItem(0);M.data('cke-title',E.document.$.title);c&&(E.document.$.title=G);});E.on('readOnly',function(){if(E.mode=='wysiwyg'){var M=E.getMode();M.loadData(M.getData());}});if(a.document.$.documentMode>=8){E.addCss('html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}');var K=[];for(var L in f.$removeEmpty)K.push('html.CSS1Compat '+L+'[contenteditable=false]');E.addCss(K.join(',')+'{ display:inline-block;}');}else if(b.gecko){E.addCss('html { height: 100% !important; }');E.addCss('img:-moz-broken { -moz-force-broken-image-icon : 1;\tmin-width : 24px; min-height : 24px; }');}E.addCss('html {\t_overflow-y: scroll; cursor: text;\t*cursor:auto;}');E.addCss('img, input, textarea { cursor: default;}');E.on('insertElement',function(M){var N=M.data;if(N.type==1&&(N.is('input')||N.is('textarea'))){var O=N.getAttribute('contenteditable')=='false';if(!O){N.data('cke-editable',N.hasAttribute('contenteditable')?'true':'1');N.setAttribute('contenteditable',false);}}});}});if(b.gecko)(function(){var E=document.body;if(!E)window.addEventListener('load',arguments.callee,false);else{var F=E.getAttribute('onpageshow');E.setAttribute('onpageshow',(F?F+';':'')+'event.persisted && (function(){'+'var allInstances = CKEDITOR.instances, editor, doc;'+'for ( var i in allInstances )'+'{'+'\teditor = allInstances[ i ];'+'\tdoc = editor.document;'+'\tif ( doc )'+'\t{'+'\t\tdoc.$.designMode = "off";'+'\t\tdoc.$.designMode = "on";'+'\t}'+'}'+'})();');
+}})();})();i.disableObjectResizing=false;i.disableNativeTableHandles=true;i.disableNativeSpellChecker=true;i.ignoreEmptyParagraph=true;j.add('wsc',{requires:['dialog'],init:function(m){var n='checkspell',o=m.addCommand(n,new a.dialogCommand(n));o.modes={wysiwyg:!b.opera&&!b.air&&document.domain==window.location.hostname};m.ui.addButton('SpellChecker',{label:m.lang.spellCheck.toolbar,command:n});a.dialog.add(n,this.path+'dialogs/wsc.js');}});i.wsc_customerId=i.wsc_customerId||'1:ua3xw1-2XyGJ3-GWruD3-6OFNT1-oXcuB1-nR6Bp4-hgQHc-EcYng3-sdRXG3-NOfFk';i.wsc_customLoaderScript=i.wsc_customLoaderScript||null;a.DIALOG_RESIZE_NONE=0;a.DIALOG_RESIZE_WIDTH=1;a.DIALOG_RESIZE_HEIGHT=2;a.DIALOG_RESIZE_BOTH=3;(function(){var m=e.cssLength;function n(R){return!!this._.tabs[R][0].$.offsetHeight;};function o(){var V=this;var R=V._.currentTabId,S=V._.tabIdList.length,T=e.indexOf(V._.tabIdList,R)+S;for(var U=T-1;U>T-S;U--){if(n.call(V,V._.tabIdList[U%S]))return V._.tabIdList[U%S];}return null;};function p(){var V=this;var R=V._.currentTabId,S=V._.tabIdList.length,T=e.indexOf(V._.tabIdList,R);for(var U=T+1;U<T+S;U++){if(n.call(V,V._.tabIdList[U%S]))return V._.tabIdList[U%S];}return null;};function q(R,S){var T=R.$.getElementsByTagName('input');for(var U=0,V=T.length;U<V;U++){var W=new h(T[U]);if(W.getAttribute('type').toLowerCase()=='text')if(S){W.setAttribute('value',W.getCustomData('fake_value')||'');W.removeCustomData('fake_value');}else{W.setCustomData('fake_value',W.getAttribute('value'));W.setAttribute('value','');}}};function r(R,S){var U=this;var T=U.getInputElement();if(T)R?T.removeAttribute('aria-invalid'):T.setAttribute('aria-invalid',true);if(!R)if(U.select)U.select();else U.focus();S&&alert(S);U.fire('validated',{valid:R,msg:S});};function s(){var R=this.getInputElement();R&&R.removeAttribute('aria-invalid');};a.dialog=function(R,S){var T=a.dialog._.dialogDefinitions[S],U=e.clone(v),V=R.config.dialog_buttonsOrder||'OS',W=R.lang.dir,X={},Y,Z,aa;if(V=='OS'&&b.mac||V=='rtl'&&W=='ltr'||V=='ltr'&&W=='rtl')U.buttons.reverse();T=e.extend(T(R),U);T=e.clone(T);T=new z(this,T);var ab=a.document,ac=R.theme.buildDialog(R);this._={editor:R,element:ac.element,name:S,contentSize:{width:0,height:0},size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:false,focusList:[],currentFocusIndex:0,hasFocus:false};this.parts=ac.parts;e.setTimeout(function(){R.fire('ariaWidget',this.parts.contents);
+},0,this);var ad={position:b.ie6Compat?'absolute':'fixed',top:0,visibility:'hidden'};ad[W=='rtl'?'right':'left']=0;this.parts.dialog.setStyles(ad);a.event.call(this);this.definition=T=a.fire('dialogDefinition',{name:S,definition:T},R).definition;if(!('removeDialogTabs' in R._)&&R.config.removeDialogTabs){var ae=R.config.removeDialogTabs.split(';');for(Y=0;Y<ae.length;Y++){var af=ae[Y].split(':');if(af.length==2){var ag=af[0];if(!X[ag])X[ag]=[];X[ag].push(af[1]);}}R._.removeDialogTabs=X;}if(R._.removeDialogTabs&&(X=R._.removeDialogTabs[S]))for(Y=0;Y<X.length;Y++)T.removeContents(X[Y]);if(T.onLoad)this.on('load',T.onLoad);if(T.onShow)this.on('show',T.onShow);if(T.onHide)this.on('hide',T.onHide);if(T.onOk)this.on('ok',function(ar){R.fire('saveSnapshot');setTimeout(function(){R.fire('saveSnapshot');},0);if(T.onOk.call(this,ar)===false)ar.data.hide=false;});if(T.onCancel)this.on('cancel',function(ar){if(T.onCancel.call(this,ar)===false)ar.data.hide=false;});var ah=this,ai=function(ar){var as=ah._.contents,at=false;for(var au in as)for(var av in as[au]){at=ar.call(this,as[au][av]);if(at)return;}};this.on('ok',function(ar){ai(function(as){if(as.validate){var at=as.validate(this),au=typeof at=='string'||at===false;if(au){ar.data.hide=false;ar.stop();}r.call(as,!au,typeof at=='string'?at:undefined);return au;}});},this,null,0);this.on('cancel',function(ar){ai(function(as){if(as.isChanged()){if(!confirm(R.lang.common.confirmCancel))ar.data.hide=false;return true;}});},this,null,0);this.parts.close.on('click',function(ar){if(this.fire('cancel',{hide:true}).hide!==false)this.hide();ar.data.preventDefault();},this);function aj(){var ar=ah._.focusList;ar.sort(function(au,av){if(au.tabIndex!=av.tabIndex)return av.tabIndex-au.tabIndex;else return au.focusIndex-av.focusIndex;});var as=ar.length;for(var at=0;at<as;at++)ar[at].focusIndex=at;};function ak(ar){var as=ah._.focusList;ar=ar||0;if(as.length<1)return;var at=ah._.currentFocusIndex;try{as[at].getInputElement().$.blur();}catch(aw){}var au=(at+ar+as.length)%as.length,av=au;while(ar&&!as[av].isFocusable()){av=(av+ar+as.length)%as.length;if(av==au)break;}as[av].focus();if(as[av].type=='text')as[av].select();};this.changeFocus=ak;function al(ar){var ay=this;if(ah!=a.dialog._.currentTop)return;var as=ar.data.getKeystroke(),at=R.lang.dir=='rtl',au;Z=aa=0;if(as==9||as==2228224+9){var av=as==2228224+9;if(ah._.tabBarMode){var aw=av?o.call(ah):p.call(ah);ah.selectPage(aw);ah._.tabs[aw][0].focus();}else ak(av?-1:1);Z=1;}else if(as==4456448+121&&!ah._.tabBarMode&&ah.getPageCount()>1){ah._.tabBarMode=true;
+ah._.tabs[ah._.currentTabId][0].focus();Z=1;}else if((as==37||as==39)&&ah._.tabBarMode){aw=as==(at?39:37)?o.call(ah):p.call(ah);ah.selectPage(aw);ah._.tabs[aw][0].focus();Z=1;}else if((as==13||as==32)&&ah._.tabBarMode){ay.selectPage(ay._.currentTabId);ay._.tabBarMode=false;ay._.currentFocusIndex=-1;ak(1);Z=1;}else if(as==13){var ax=ar.data.getTarget();if(!ax.is('a','button','select','textarea')&&(!ax.is('input')||ax.$.type!='button')){au=ay.getButton('ok');au&&e.setTimeout(au.click,0,au);Z=1;}aa=1;}else if(as==27){au=ay.getButton('cancel');if(au)e.setTimeout(au.click,0,au);else if(ay.fire('cancel',{hide:true}).hide!==false)ay.hide();aa=1;}else return;am(ar);};function am(ar){if(Z)ar.data.preventDefault(1);else if(aa)ar.data.stopPropagation();};var an=this._.element;this.on('show',function(){an.on('keydown',al,this);if(b.opera||b.gecko)an.on('keypress',am,this);});this.on('hide',function(){an.removeListener('keydown',al);if(b.opera||b.gecko)an.removeListener('keypress',am);ai(function(ar){s.apply(ar);});});this.on('iframeAdded',function(ar){var as=new g(ar.data.iframe.$.contentWindow.document);as.on('keydown',al,this,null,0);});this.on('show',function(){var av=this;aj();if(R.config.dialog_startupFocusTab&&ah._.pageCount>1){ah._.tabBarMode=true;ah._.tabs[ah._.currentTabId][0].focus();}else if(!av._.hasFocus){av._.currentFocusIndex=-1;if(T.onFocus){var ar=T.onFocus.call(av);ar&&ar.focus();}else ak(1);if(av._.editor.mode=='wysiwyg'&&c){var as=R.document.$.selection,at=as.createRange();if(at)if(at.parentElement&&at.parentElement().ownerDocument==R.document.$||at.item&&at.item(0).ownerDocument==R.document.$){var au=document.body.createTextRange();au.moveToElementText(av.getElement().getFirst().$);au.collapse(true);au.select();}}}},this,null,4294967295);if(b.ie6Compat)this.on('load',function(ar){var as=this.getElement(),at=as.getFirst();at.remove();at.appendTo(as);},this);B(this);C(this);new d.text(T.title,a.document).appendTo(this.parts.title);for(Y=0;Y<T.contents.length;Y++){var ao=T.contents[Y];ao&&this.addPage(ao);}this.parts.tabs.on('click',function(ar){var au=this;var as=ar.data.getTarget();if(as.hasClass('cke_dialog_tab')){var at=as.$.id;au.selectPage(at.substring(4,at.lastIndexOf('_')));if(au._.tabBarMode){au._.tabBarMode=false;au._.currentFocusIndex=-1;ak(1);}ar.data.preventDefault();}},this);var ap=[],aq=a.dialog._.uiElementBuilders.hbox.build(this,{type:'hbox',className:'cke_dialog_footer_buttons',widths:[],children:T.buttons},ap).getChild();this.parts.footer.setHtml(ap.join(''));
+for(Y=0;Y<aq.length;Y++)this._.buttons[aq[Y].id]=aq[Y];};function t(R,S,T){this.element=S;this.focusIndex=T;this.tabIndex=0;this.isFocusable=function(){return!S.getAttribute('disabled')&&S.isVisible();};this.focus=function(){R._.currentFocusIndex=this.focusIndex;this.element.focus();};S.on('keydown',function(U){if(U.data.getKeystroke() in {32:1,13:1})this.fire('click');});S.on('focus',function(){this.fire('mouseover');});S.on('blur',function(){this.fire('mouseout');});};function u(R){var S=a.document.getWindow();function T(){R.layout();};S.on('resize',T);R.on('hide',function(){S.removeListener('resize',T);});};a.dialog.prototype={destroy:function(){this.hide();this._.element.remove();},resize:(function(){return function(R,S){var T=this;if(T._.contentSize&&T._.contentSize.width==R&&T._.contentSize.height==S)return;a.dialog.fire('resize',{dialog:T,skin:T._.editor.skinName,width:R,height:S},T._.editor);T.fire('resize',{skin:T._.editor.skinName,width:R,height:S},T._.editor);if(T._.editor.lang.dir=='rtl'&&T._.position)T._.position.x=a.document.getWindow().getViewPaneSize().width-T._.contentSize.width-parseInt(T._.element.getFirst().getStyle('right'),10);T._.contentSize={width:R,height:S};};})(),getSize:function(){var R=this._.element.getFirst();return{width:R.$.offsetWidth||0,height:R.$.offsetHeight||0};},move:function(R,S,T){var ab=this;var U=ab._.element.getFirst(),V=ab._.editor.lang.dir=='rtl',W=U.getComputedStyle('position')=='fixed';U.setStyle('zoom','100%');if(W&&ab._.position&&ab._.position.x==R&&ab._.position.y==S)return;ab._.position={x:R,y:S};if(!W){var X=a.document.getWindow().getScrollPosition();R+=X.x;S+=X.y;}if(V){var Y=ab.getSize(),Z=a.document.getWindow().getViewPaneSize();R=Z.width-Y.width-R;}var aa={top:(S>0?S:0)+'px'};aa[V?'right':'left']=(R>0?R:0)+'px';U.setStyles(aa);T&&(ab._.moved=1);},getPosition:function(){return e.extend({},this._.position);},show:function(){var R=this._.element,S=this.definition;if(!(R.getParent()&&R.getParent().equals(a.document.getBody())))R.appendTo(a.document.getBody());else R.setStyle('display','block');if(b.gecko&&b.version<10900){var T=this.parts.dialog;T.setStyle('position','absolute');setTimeout(function(){T.setStyle('position','fixed');},0);}this.resize(this._.contentSize&&this._.contentSize.width||S.width||S.minWidth,this._.contentSize&&this._.contentSize.height||S.height||S.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);if(a.dialog._.currentZIndex===null)a.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex;
+this._.element.getFirst().setStyle('z-index',a.dialog._.currentZIndex+=10);if(a.dialog._.currentTop===null){a.dialog._.currentTop=this;this._.parentDialog=null;H(this._.editor);}else{this._.parentDialog=a.dialog._.currentTop;var U=this._.parentDialog.getElement().getFirst();U.$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2);a.dialog._.currentTop=this;}R.on('keydown',L);R.on(b.opera?'keypress':'keyup',M);this._.hasFocus=false;e.setTimeout(function(){this.layout();u(this);this.parts.dialog.setStyle('visibility','');this.fireOnce('load',{});k.fire('ready',this);this.fire('show',{});this._.editor.fire('dialogShow',this);this.foreach(function(V){V.setInitValue&&V.setInitValue();});},100,this);},layout:function(){var X=this;var R=X.parts.dialog,S=X.getSize(),T=a.document.getWindow(),U=T.getViewPaneSize(),V=(U.width-S.width)/2,W=(U.height-S.height)/2;if(!b.ie6Compat)if(S.height+(W>0?W:0)>U.height||S.width+(V>0?V:0)>U.width)R.setStyle('position','absolute');else R.setStyle('position','fixed');X.move(X._.moved?X._.position.x:V,X._.moved?X._.position.y:W);},foreach:function(R){var U=this;for(var S in U._.contents)for(var T in U._.contents[S])R.call(U,U._.contents[S][T]);return U;},reset:(function(){var R=function(S){if(S.reset)S.reset(1);};return function(){this.foreach(R);return this;};})(),setupContent:function(){var R=arguments;this.foreach(function(S){if(S.setup)S.setup.apply(S,R);});},commitContent:function(){var R=arguments;this.foreach(function(S){if(c&&this._.currentFocusIndex==S.focusIndex)S.getInputElement().$.blur();if(S.commit)S.commit.apply(S,R);});},hide:function(){if(!this.parts.dialog.isVisible())return;this.fire('hide',{});this._.editor.fire('dialogHide',this);this.selectPage(this._.tabIdList[0]);var R=this._.element;R.setStyle('display','none');this.parts.dialog.setStyle('visibility','hidden');O(this);while(a.dialog._.currentTop!=this)a.dialog._.currentTop.hide();if(!this._.parentDialog)I();else{var S=this._.parentDialog.getElement().getFirst();S.setStyle('z-index',parseInt(S.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2));}a.dialog._.currentTop=this._.parentDialog;if(!this._.parentDialog){a.dialog._.currentZIndex=null;R.removeListener('keydown',L);R.removeListener(b.opera?'keypress':'keyup',M);var T=this._.editor;T.focus();if(T.mode=='wysiwyg'&&c){var U=T.getSelection();U&&U.unlock(true);}}else a.dialog._.currentZIndex-=10;delete this._.parentDialog;this.foreach(function(V){V.resetInitValue&&V.resetInitValue();
+});},addPage:function(R){var ad=this;var S=[],T=R.label?' title="'+e.htmlEncode(R.label)+'"':'',U=R.elements,V=a.dialog._.uiElementBuilders.vbox.build(ad,{type:'vbox',className:'cke_dialog_page_contents',children:R.elements,expand:!!R.expand,padding:R.padding,style:R.style||'width: 100%;height:100%'},S),W=h.createFromHtml(S.join(''));W.setAttribute('role','tabpanel');var X=b,Y='cke_'+R.id+'_'+e.getNextNumber(),Z=h.createFromHtml(['<a class="cke_dialog_tab"',ad._.pageCount>0?' cke_last':'cke_first',T,!!R.hidden?' style="display:none"':'',' id="',Y,'"',X.gecko&&X.version>=10900&&!X.hc?'':' href="javascript:void(0)"',' tabIndex="-1"',' hidefocus="true"',' role="tab">',R.label,'</a>'].join(''));W.setAttribute('aria-labelledby',Y);ad._.tabs[R.id]=[Z,W];ad._.tabIdList.push(R.id);!R.hidden&&ad._.pageCount++;ad._.lastTab=Z;ad.updateStyle();var aa=ad._.contents[R.id]={},ab,ac=V.getChild();while(ab=ac.shift()){aa[ab.id]=ab;if(typeof ab.getChild=='function')ac.push.apply(ac,ab.getChild());}W.setAttribute('name',R.id);W.appendTo(ad.parts.contents);Z.unselectable();ad.parts.tabs.append(Z);if(R.accessKey){N(ad,ad,'CTRL+'+R.accessKey,Q,P);ad._.accessKeyMap['CTRL+'+R.accessKey]=R.id;}},selectPage:function(R){if(this._.currentTabId==R)return;if(this.fire('selectPage',{page:R,currentPage:this._.currentTabId})===true)return;for(var S in this._.tabs){var T=this._.tabs[S][0],U=this._.tabs[S][1];if(S!=R){T.removeClass('cke_dialog_tab_selected');U.hide();}U.setAttribute('aria-hidden',S!=R);}var V=this._.tabs[R];V[0].addClass('cke_dialog_tab_selected');if(b.ie6Compat||b.ie7Compat){q(V[1]);V[1].show();setTimeout(function(){q(V[1],1);},0);}else V[1].show();this._.currentTabId=R;this._.currentTabIndex=e.indexOf(this._.tabIdList,R);},updateStyle:function(){this.parts.dialog[(this._.pageCount===1?'add':'remove')+'Class']('cke_single_page');},hidePage:function(R){var T=this;var S=T._.tabs[R]&&T._.tabs[R][0];if(!S||T._.pageCount==1||!S.isVisible())return;else if(R==T._.currentTabId)T.selectPage(o.call(T));S.hide();T._.pageCount--;T.updateStyle();},showPage:function(R){var T=this;var S=T._.tabs[R]&&T._.tabs[R][0];if(!S)return;S.show();T._.pageCount++;T.updateStyle();},getElement:function(){return this._.element;},getName:function(){return this._.name;},getContentElement:function(R,S){var T=this._.contents[R];return T&&T[S];},getValueOf:function(R,S){return this.getContentElement(R,S).getValue();},setValueOf:function(R,S,T){return this.getContentElement(R,S).setValue(T);},getButton:function(R){return this._.buttons[R];
+},click:function(R){return this._.buttons[R].click();},disableButton:function(R){return this._.buttons[R].disable();},enableButton:function(R){return this._.buttons[R].enable();},getPageCount:function(){return this._.pageCount;},getParentEditor:function(){return this._.editor;},getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement();},addFocusable:function(R,S){var U=this;if(typeof S=='undefined'){S=U._.focusList.length;U._.focusList.push(new t(U,R,S));}else{U._.focusList.splice(S,0,new t(U,R,S));for(var T=S+1;T<U._.focusList.length;T++)U._.focusList[T].focusIndex++;}}};e.extend(a.dialog,{add:function(R,S){if(!this._.dialogDefinitions[R]||typeof S=='function')this._.dialogDefinitions[R]=S;},exists:function(R){return!!this._.dialogDefinitions[R];},getCurrent:function(){return a.dialog._.currentTop;},okButton:(function(){var R=function(S,T){T=T||{};return e.extend({id:'ok',type:'button',label:S.lang.common.ok,'class':'cke_dialog_ui_button_ok',onClick:function(U){var V=U.data.dialog;if(V.fire('ok',{hide:true}).hide!==false)V.hide();}},T,true);};R.type='button';R.override=function(S){return e.extend(function(T){return R(T,S);},{type:'button'},true);};return R;})(),cancelButton:(function(){var R=function(S,T){T=T||{};return e.extend({id:'cancel',type:'button',label:S.lang.common.cancel,'class':'cke_dialog_ui_button_cancel',onClick:function(U){var V=U.data.dialog;if(V.fire('cancel',{hide:true}).hide!==false)V.hide();}},T,true);};R.type='button';R.override=function(S){return e.extend(function(T){return R(T,S);},{type:'button'},true);};return R;})(),addUIElement:function(R,S){this._.uiElementBuilders[R]=S;}});a.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};a.event.implementOn(a.dialog);a.event.implementOn(a.dialog.prototype,true);var v={resizable:3,minWidth:600,minHeight:400,buttons:[a.dialog.okButton,a.dialog.cancelButton]},w=function(R,S,T){for(var U=0,V;V=R[U];U++){if(V.id==S)return V;if(T&&V[T]){var W=w(V[T],S,T);if(W)return W;}}return null;},x=function(R,S,T,U,V){if(T){for(var W=0,X;X=R[W];W++){if(X.id==T){R.splice(W,0,S);return S;}if(U&&X[U]){var Y=x(X[U],S,T,U,true);if(Y)return Y;}}if(V)return null;}R.push(S);return S;},y=function(R,S,T){for(var U=0,V;V=R[U];U++){if(V.id==S)return R.splice(U,1);if(T&&V[T]){var W=y(V[T],S,T);if(W)return W;}}return null;},z=function(R,S){this.dialog=R;var T=S.contents;for(var U=0,V;V=T[U];U++)T[U]=V&&new A(R,V);e.extend(this,S);};z.prototype={getContents:function(R){return w(this.contents,R);
+},getButton:function(R){return w(this.buttons,R);},addContents:function(R,S){return x(this.contents,R,S);},addButton:function(R,S){return x(this.buttons,R,S);},removeContents:function(R){y(this.contents,R);},removeButton:function(R){y(this.buttons,R);}};function A(R,S){this._={dialog:R};e.extend(this,S);};A.prototype={get:function(R){return w(this.elements,R,'children');},add:function(R,S){return x(this.elements,R,S,'children');},remove:function(R){y(this.elements,R,'children');}};function B(R){var S=null,T=null,U=R.getElement().getFirst(),V=R.getParentEditor(),W=V.config.dialog_magnetDistance,X=V.skin.margins||[0,0,0,0];if(typeof W=='undefined')W=20;function Y(aa){var ab=R.getSize(),ac=a.document.getWindow().getViewPaneSize(),ad=aa.data.$.screenX,ae=aa.data.$.screenY,af=ad-S.x,ag=ae-S.y,ah,ai;S={x:ad,y:ae};T.x+=af;T.y+=ag;if(T.x+X[3]<W)ah=-X[3];else if(T.x-X[1]>ac.width-ab.width-W)ah=ac.width-ab.width+(V.lang.dir=='rtl'?0:X[1]);else ah=T.x;if(T.y+X[0]<W)ai=-X[0];else if(T.y-X[2]>ac.height-ab.height-W)ai=ac.height-ab.height+X[2];else ai=T.y;R.move(ah,ai,1);aa.data.preventDefault();};function Z(aa){a.document.removeListener('mousemove',Y);a.document.removeListener('mouseup',Z);if(b.ie6Compat){var ab=F.getChild(0).getFrameDocument();ab.removeListener('mousemove',Y);ab.removeListener('mouseup',Z);}};R.parts.title.on('mousedown',function(aa){S={x:aa.data.$.screenX,y:aa.data.$.screenY};a.document.on('mousemove',Y);a.document.on('mouseup',Z);T=R.getPosition();if(b.ie6Compat){var ab=F.getChild(0).getFrameDocument();ab.on('mousemove',Y);ab.on('mouseup',Z);}aa.data.preventDefault();},R);};function C(R){var S=R.definition,T=S.resizable;if(T==0)return;var U=R.getParentEditor(),V,W,X,Y,Z,aa,ab=e.addFunction(function(ae){Z=R.getSize();var af=R.parts.contents,ag=af.$.getElementsByTagName('iframe').length;if(ag){aa=h.createFromHtml('<div class="cke_dialog_resize_cover" style="height: 100%; position: absolute; width: 100%;"></div>');af.append(aa);}W=Z.height-R.parts.contents.getSize('height',!(b.gecko||b.opera||c&&b.quirks));V=Z.width-R.parts.contents.getSize('width',1);Y={x:ae.screenX,y:ae.screenY};X=a.document.getWindow().getViewPaneSize();a.document.on('mousemove',ac);a.document.on('mouseup',ad);if(b.ie6Compat){var ah=F.getChild(0).getFrameDocument();ah.on('mousemove',ac);ah.on('mouseup',ad);}ae.preventDefault&&ae.preventDefault();});R.on('load',function(){var ae='';if(T==1)ae=' cke_resizer_horizontal';else if(T==2)ae=' cke_resizer_vertical';var af=h.createFromHtml('<div class="cke_resizer'+ae+' cke_resizer_'+U.lang.dir+'"'+' title="'+e.htmlEncode(U.lang.resize)+'"'+' onmousedown="CKEDITOR.tools.callFunction('+ab+', event )"></div>');
+R.parts.footer.append(af,1);});U.on('destroy',function(){e.removeFunction(ab);});function ac(ae){var af=U.lang.dir=='rtl',ag=(ae.data.$.screenX-Y.x)*(af?-1:1),ah=ae.data.$.screenY-Y.y,ai=Z.width,aj=Z.height,ak=ai+ag*(R._.moved?1:2),al=aj+ah*(R._.moved?1:2),am=R._.element.getFirst(),an=af&&am.getComputedStyle('right'),ao=R.getPosition();if(ao.y+al>X.height)al=X.height-ao.y;if((af?an:ao.x)+ak>X.width)ak=X.width-(af?an:ao.x);if(T==1||T==3)ai=Math.max(S.minWidth||0,ak-V);if(T==2||T==3)aj=Math.max(S.minHeight||0,al-W);R.resize(ai,aj);if(!R._.moved)R.layout();ae.data.preventDefault();};function ad(){a.document.removeListener('mouseup',ad);a.document.removeListener('mousemove',ac);if(aa){aa.remove();aa=null;}if(b.ie6Compat){var ae=F.getChild(0).getFrameDocument();ae.removeListener('mouseup',ad);ae.removeListener('mousemove',ac);}};};var D,E={},F;function G(R){R.data.preventDefault(1);};function H(R){var S=a.document.getWindow(),T=R.config,U=T.dialog_backgroundCoverColor||'white',V=T.dialog_backgroundCoverOpacity,W=T.baseFloatZIndex,X=e.genKey(U,V,W),Y=E[X];if(!Y){var Z=['<div tabIndex="-1" style="position: ',b.ie6Compat?'absolute':'fixed','; z-index: ',W,'; top: 0px; left: 0px; ',!b.ie6Compat?'background-color: '+U:'','" class="cke_dialog_background_cover">'];if(b.ie6Compat){var aa=b.isCustomDomain(),ab="<html><body style=\\'background-color:"+U+";\\'></body></html>";Z.push('<iframe hidefocus="true" frameborder="0" id="cke_dialog_background_iframe" src="javascript:');Z.push('void((function(){document.open();'+(aa?"document.domain='"+document.domain+"';":'')+"document.write( '"+ab+"' );"+'document.close();'+'})())');Z.push('" style="position:absolute;left:0;top:0;width:100%;height: 100%;progid:DXImageTransform.Microsoft.Alpha(opacity=0)"></iframe>');}Z.push('</div>');Y=h.createFromHtml(Z.join(''));Y.setOpacity(V!=undefined?V:0.5);Y.on('keydown',G);Y.on('keypress',G);Y.on('keyup',G);Y.appendTo(a.document.getBody());E[X]=Y;}else Y.show();F=Y;var ac=function(){var af=S.getViewPaneSize();Y.setStyles({width:af.width+'px',height:af.height+'px'});},ad=function(){var af=S.getScrollPosition(),ag=a.dialog._.currentTop;Y.setStyles({left:af.x+'px',top:af.y+'px'});if(ag)do{var ah=ag.getPosition();ag.move(ah.x,ah.y);}while(ag=ag._.parentDialog)};D=ac;S.on('resize',ac);ac();if(!(b.mac&&b.webkit))Y.focus();if(b.ie6Compat){var ae=function(){ad();arguments.callee.prevScrollHandler.apply(this,arguments);};S.$.setTimeout(function(){ae.prevScrollHandler=window.onscroll||(function(){});
+window.onscroll=ae;},0);ad();}};function I(){if(!F)return;var R=a.document.getWindow();F.hide();R.removeListener('resize',D);if(b.ie6Compat)R.$.setTimeout(function(){var S=window.onscroll&&window.onscroll.prevScrollHandler;window.onscroll=S||null;},0);D=null;};function J(){for(var R in E)E[R].remove();E={};};var K={},L=function(R){var S=R.data.$.ctrlKey||R.data.$.metaKey,T=R.data.$.altKey,U=R.data.$.shiftKey,V=String.fromCharCode(R.data.$.keyCode),W=K[(S?'CTRL+':'')+(T?'ALT+':'')+(U?'SHIFT+':'')+V];if(!W||!W.length)return;W=W[W.length-1];W.keydown&&W.keydown.call(W.uiElement,W.dialog,W.key);R.data.preventDefault();},M=function(R){var S=R.data.$.ctrlKey||R.data.$.metaKey,T=R.data.$.altKey,U=R.data.$.shiftKey,V=String.fromCharCode(R.data.$.keyCode),W=K[(S?'CTRL+':'')+(T?'ALT+':'')+(U?'SHIFT+':'')+V];if(!W||!W.length)return;W=W[W.length-1];if(W.keyup){W.keyup.call(W.uiElement,W.dialog,W.key);R.data.preventDefault();}},N=function(R,S,T,U,V){var W=K[T]||(K[T]=[]);W.push({uiElement:R,dialog:S,key:T,keyup:V||R.accessKeyUp,keydown:U||R.accessKeyDown});},O=function(R){for(var S in K){var T=K[S];for(var U=T.length-1;U>=0;U--){if(T[U].dialog==R||T[U].uiElement==R)T.splice(U,1);}if(T.length===0)delete K[S];}},P=function(R,S){if(R._.accessKeyMap[S])R.selectPage(R._.accessKeyMap[S]);},Q=function(R,S){};(function(){k.dialog={uiElement:function(R,S,T,U,V,W,X){if(arguments.length<4)return;var Y=(U.call?U(S):U)||'div',Z=['<',Y,' '],aa=(V&&V.call?V(S):V)||{},ab=(W&&W.call?W(S):W)||{},ac=(X&&X.call?X.call(this,R,S):X)||'',ad=this.domId=ab.id||e.getNextId()+'_uiElement',ae=this.id=S.id,af;ab.id=ad;var ag={};if(S.type)ag['cke_dialog_ui_'+S.type]=1;if(S.className)ag[S.className]=1;if(S.disabled)ag.cke_disabled=1;var ah=ab['class']&&ab['class'].split?ab['class'].split(' '):[];for(af=0;af<ah.length;af++){if(ah[af])ag[ah[af]]=1;}var ai=[];for(af in ag)ai.push(af);ab['class']=ai.join(' ');if(S.title)ab.title=S.title;var aj=(S.style||'').split(';');if(S.align){var ak=S.align;aa['margin-left']=ak=='left'?0:'auto';aa['margin-right']=ak=='right'?0:'auto';}for(af in aa)aj.push(af+':'+aa[af]);if(S.hidden)aj.push('display:none');for(af=aj.length-1;af>=0;af--){if(aj[af]==='')aj.splice(af,1);}if(aj.length>0)ab.style=(ab.style?ab.style+'; ':'')+aj.join('; ');for(af in ab)Z.push(af+'="'+e.htmlEncode(ab[af])+'" ');Z.push('>',ac,'</',Y,'>');T.push(Z.join(''));(this._||(this._={})).dialog=R;if(typeof S.isChanged=='boolean')this.isChanged=function(){return S.isChanged;};if(typeof S.isChanged=='function')this.isChanged=S.isChanged;
+if(typeof S.setValue=='function')this.setValue=e.override(this.setValue,function(am){return function(an){am.call(this,S.setValue.call(this,an));};});if(typeof S.getValue=='function')this.getValue=e.override(this.getValue,function(am){return function(){return S.getValue.call(this,am.call(this));};});a.event.implementOn(this);this.registerEvents(S);if(this.accessKeyUp&&this.accessKeyDown&&S.accessKey)N(this,R,'CTRL+'+S.accessKey);var al=this;R.on('load',function(){var am=al.getInputElement();if(am){var an=al.type in {checkbox:1,ratio:1}&&c&&b.version<8?'cke_dialog_ui_focused':'';am.on('focus',function(){R._.tabBarMode=false;R._.hasFocus=true;al.fire('focus');an&&this.addClass(an);});am.on('blur',function(){al.fire('blur');an&&this.removeClass(an);});}});if(this.keyboardFocusable){this.tabIndex=S.tabIndex||0;this.focusIndex=R._.focusList.push(this)-1;this.on('focus',function(){R._.currentFocusIndex=al.focusIndex;});}e.extend(this,S);},hbox:function(R,S,T,U,V){if(arguments.length<4)return;this._||(this._={});var W=this._.children=S,X=V&&V.widths||null,Y=V&&V.height||null,Z={},aa,ab=function(){var ad=['<tbody><tr class="cke_dialog_ui_hbox">'];for(aa=0;aa<T.length;aa++){var ae='cke_dialog_ui_hbox_child',af=[];if(aa===0)ae='cke_dialog_ui_hbox_first';if(aa==T.length-1)ae='cke_dialog_ui_hbox_last';ad.push('<td class="',ae,'" role="presentation" ');if(X){if(X[aa])af.push('width:'+m(X[aa]));}else af.push('width:'+Math.floor(100/T.length)+'%');if(Y)af.push('height:'+m(Y));if(V&&V.padding!=undefined)af.push('padding:'+m(V.padding));if(c&&b.quirks&&W[aa].align)af.push('text-align:'+W[aa].align);if(af.length>0)ad.push('style="'+af.join('; ')+'" ');ad.push('>',T[aa],'</td>');}ad.push('</tr></tbody>');return ad.join('');},ac={role:'presentation'};V&&V.align&&(ac.align=V.align);k.dialog.uiElement.call(this,R,V||{type:'hbox'},U,'table',Z,ac,ab);},vbox:function(R,S,T,U,V){if(arguments.length<3)return;this._||(this._={});var W=this._.children=S,X=V&&V.width||null,Y=V&&V.heights||null,Z=function(){var aa=['<table role="presentation" cellspacing="0" border="0" '];aa.push('style="');if(V&&V.expand)aa.push('height:100%;');aa.push('width:'+m(X||'100%'),';');aa.push('"');aa.push('align="',e.htmlEncode(V&&V.align||(R.getParentEditor().lang.dir=='ltr'?'left':'right')),'" ');aa.push('><tbody>');for(var ab=0;ab<T.length;ab++){var ac=[];aa.push('<tr><td role="presentation" ');if(X)ac.push('width:'+m(X||'100%'));if(Y)ac.push('height:'+m(Y[ab]));else if(V&&V.expand)ac.push('height:'+Math.floor(100/T.length)+'%');
+if(V&&V.padding!=undefined)ac.push('padding:'+m(V.padding));if(c&&b.quirks&&W[ab].align)ac.push('text-align:'+W[ab].align);if(ac.length>0)aa.push('style="',ac.join('; '),'" ');aa.push(' class="cke_dialog_ui_vbox_child">',T[ab],'</td></tr>');}aa.push('</tbody></table>');return aa.join('');};k.dialog.uiElement.call(this,R,V||{type:'vbox'},U,'div',null,{role:'presentation'},Z);}};})();k.dialog.uiElement.prototype={getElement:function(){return a.document.getById(this.domId);},getInputElement:function(){return this.getElement();},getDialog:function(){return this._.dialog;},setValue:function(R,S){this.getInputElement().setValue(R);!S&&this.fire('change',{value:R});return this;},getValue:function(){return this.getInputElement().getValue();},isChanged:function(){return false;},selectParentTab:function(){var U=this;var R=U.getInputElement(),S=R,T;while((S=S.getParent())&&S.$.className.search('cke_dialog_page_contents')==-1){}if(!S)return U;T=S.getAttribute('name');if(U._.dialog._.currentTabId!=T)U._.dialog.selectPage(T);return U;},focus:function(){this.selectParentTab().getInputElement().focus();return this;},registerEvents:function(R){var S=/^on([A-Z]\w+)/,T,U=function(W,X,Y,Z){X.on('load',function(){W.getInputElement().on(Y,Z,W);});};for(var V in R){if(!(T=V.match(S)))continue;if(this.eventProcessors[V])this.eventProcessors[V].call(this,this._.dialog,R[V]);else U(this,this._.dialog,T[1].toLowerCase(),R[V]);}return this;},eventProcessors:{onLoad:function(R,S){R.on('load',S,this);},onShow:function(R,S){R.on('show',S,this);},onHide:function(R,S){R.on('hide',S,this);}},accessKeyDown:function(R,S){this.focus();},accessKeyUp:function(R,S){},disable:function(){var R=this.getElement(),S=this.getInputElement();S.setAttribute('disabled','true');R.addClass('cke_disabled');},enable:function(){var R=this.getElement(),S=this.getInputElement();S.removeAttribute('disabled');R.removeClass('cke_disabled');},isEnabled:function(){return!this.getElement().hasClass('cke_disabled');},isVisible:function(){return this.getInputElement().isVisible();},isFocusable:function(){if(!this.isEnabled()||!this.isVisible())return false;return true;}};k.dialog.hbox.prototype=e.extend(new k.dialog.uiElement(),{getChild:function(R){var S=this;if(arguments.length<1)return S._.children.concat();if(!R.splice)R=[R];if(R.length<2)return S._.children[R[0]];else return S._.children[R[0]]&&S._.children[R[0]].getChild?S._.children[R[0]].getChild(R.slice(1,R.length)):null;}},true);k.dialog.vbox.prototype=new k.dialog.hbox();
+(function(){var R={build:function(S,T,U){var V=T.children,W,X=[],Y=[];for(var Z=0;Z<V.length&&(W=V[Z]);Z++){var aa=[];X.push(aa);Y.push(a.dialog._.uiElementBuilders[W.type].build(S,W,aa));}return new k.dialog[T.type](S,Y,X,U,T);}};a.dialog.addUIElement('hbox',R);a.dialog.addUIElement('vbox',R);})();a.dialogCommand=function(R){this.dialogName=R;};a.dialogCommand.prototype={exec:function(R){b.opera?e.setTimeout(function(){R.openDialog(this.dialogName);},0,this):R.openDialog(this.dialogName);},canUndo:false,editorFocus:c||b.webkit};(function(){var R=/^([a]|[^a])+$/,S=/^\d*$/,T=/^\d*(?:\.\d+)?$/,U=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,V=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,W=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;a.VALIDATE_OR=1;a.VALIDATE_AND=2;a.dialog.validate={functions:function(){var X=arguments;return function(){var Y=this&&this.getValue?this.getValue():X[0],Z=undefined,aa=2,ab=[],ac;for(ac=0;ac<X.length;ac++){if(typeof X[ac]=='function')ab.push(X[ac]);else break;}if(ac<X.length&&typeof X[ac]=='string'){Z=X[ac];ac++;}if(ac<X.length&&typeof X[ac]=='number')aa=X[ac];var ad=aa==2?true:false;for(ac=0;ac<ab.length;ac++){if(aa==2)ad=ad&&ab[ac](Y);else ad=ad||ab[ac](Y);}return!ad?Z:true;};},regex:function(X,Y){return function(){var Z=this&&this.getValue?this.getValue():arguments[0];return!X.test(Z)?Y:true;};},notEmpty:function(X){return this.regex(R,X);},integer:function(X){return this.regex(S,X);},number:function(X){return this.regex(T,X);},cssLength:function(X){return this.functions(function(Y){return V.test(e.trim(Y));},X);},htmlLength:function(X){return this.functions(function(Y){return U.test(e.trim(Y));},X);},inlineStyle:function(X){return this.functions(function(Y){return W.test(e.trim(Y));},X);},equals:function(X,Y){return this.functions(function(Z){return Z==X;},Y);},notEqual:function(X,Y){return this.functions(function(Z){return Z!=X;},Y);}};a.on('instanceDestroyed',function(X){if(e.isEmpty(a.instances)){var Y;while(Y=a.dialog._.currentTop)Y.hide();J();}var Z=X.editor._.storedDialogs;for(var aa in Z)Z[aa].destroy();});})();e.extend(a.editor.prototype,{openDialog:function(R,S){if(this.mode=='wysiwyg'&&c){var T=this.getSelection();T&&T.lock();}var U=a.dialog._.dialogDefinitions[R],V=this.skin.dialog;if(a.dialog._.currentTop===null)H(this);if(typeof U=='function'&&V._isLoaded){var W=this._.storedDialogs||(this._.storedDialogs={}),X=W[R]||(W[R]=new a.dialog(this,R));S&&S.call(X,X);X.show();return X;}else if(U=='failed'){I();throw new Error('[CKEDITOR.dialog.openDialog] Dialog "'+R+'" failed when loading definition.');
+}var Y=this;function Z(ab){var ac=a.dialog._.dialogDefinitions[R],ad=Y.skin.dialog;if(!ad._isLoaded||aa&&typeof ab=='undefined')return;if(typeof ac!='function')a.dialog._.dialogDefinitions[R]='failed';Y.openDialog(R,S);};if(typeof U=='string'){var aa=1;a.scriptLoader.load(a.getUrl(U),Z,null,0,1);}a.skins.load(this,'dialog',Z);return null;}});})();j.add('dialog',{requires:['dialogui']});j.add('styles',{requires:['selection'],init:function(m){m.on('contentDom',function(){m.document.setCustomData('cke_includeReadonly',!m.config.disableReadonlyStyling);});}});a.editor.prototype.attachStyleStateChange=function(m,n){var o=this._.styleStateChangeCallbacks;if(!o){o=this._.styleStateChangeCallbacks=[];this.on('selectionChange',function(p){for(var q=0;q<o.length;q++){var r=o[q],s=r.style.checkActive(p.data.path)?1:2;r.fn.call(this,s);}});}o.push({style:m,fn:n});};a.STYLE_BLOCK=1;a.STYLE_INLINE=2;a.STYLE_OBJECT=3;(function(){var m={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},n={a:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},o=/\s*(?:;\s*|$)/,p=/#\((.+?)\)/g,q=d.walker.bookmark(0,1),r=d.walker.whitespaces(1);a.style=function(T,U){var X=this;var V=T.attributes;if(V&&V.style){T.styles=e.extend({},T.styles,Q(V.style));delete V.style;}if(U){T=e.clone(T);L(T.attributes,U);L(T.styles,U);}var W=X.element=T.element?typeof T.element=='string'?T.element.toLowerCase():T.element:'*';X.type=m[W]?1:n[W]?3:2;if(typeof X.element=='object')X.type=3;X._={definition:T};};a.style.prototype={apply:function(T){S.call(this,T,false);},remove:function(T){S.call(this,T,true);},applyToRange:function(T){var U=this;return(U.applyToRange=U.type==2?t:U.type==1?x:U.type==3?v:null).call(U,T);},removeFromRange:function(T){var U=this;return(U.removeFromRange=U.type==2?u:U.type==1?y:U.type==3?w:null).call(U,T);},applyToObject:function(T){K(T,this);},checkActive:function(T){var Y=this;switch(Y.type){case 1:return Y.checkElementRemovable(T.block||T.blockLimit,true);case 3:case 2:var U=T.elements;for(var V=0,W;V<U.length;V++){W=U[V];if(Y.type==2&&(W==T.block||W==T.blockLimit))continue;if(Y.type==3){var X=W.getName();if(!(typeof Y.element=='string'?X==Y.element:X in Y.element))continue;}if(Y.checkElementRemovable(W,true))return true;}}return false;},checkApplicable:function(T){switch(this.type){case 2:case 1:break;
+case 3:return T.lastElement.getAscendant(this.element,true);}return true;},checkElementMatch:function(T,U){var aa=this;var V=aa._.definition;if(!T||!V.ignoreReadonly&&T.isReadOnly())return false;var W,X=T.getName();if(typeof aa.element=='string'?X==aa.element:X in aa.element){if(!U&&!T.hasAttributes())return true;W=M(V);if(W._length){for(var Y in W){if(Y=='_length')continue;var Z=T.getAttribute(Y)||'';if(Y=='style'?R(W[Y],P(Z,false)):W[Y]==Z){if(!U)return true;}else if(U)return false;}if(U)return true;}else return true;}return false;},checkElementRemovable:function(T,U){if(this.checkElementMatch(T,U))return true;var V=N(this)[T.getName()];if(V){var W,X;if(!(W=V.attributes))return true;for(var Y=0;Y<W.length;Y++){X=W[Y][0];var Z=T.getAttribute(X);if(Z){var aa=W[Y][1];if(aa===null||typeof aa=='string'&&Z==aa||aa.test(Z))return true;}}}return false;},buildPreview:function(T){var U=this._.definition,V=[],W=U.element;if(W=='bdo')W='span';V=['<',W];var X=U.attributes;if(X)for(var Y in X)V.push(' ',Y,'="',X[Y],'"');var Z=a.style.getStyleText(U);if(Z)V.push(' style="',Z,'"');V.push('>',T||U.name,'</',W,'>');return V.join('');}};a.style.getStyleText=function(T){var U=T._ST;if(U)return U;U=T.styles;var V=T.attributes&&T.attributes.style||'',W='';if(V.length)V=V.replace(o,';');for(var X in U){var Y=U[X],Z=(X+':'+Y).replace(o,';');if(Y=='inherit')W+=Z;else V+=Z;}if(V.length)V=P(V);V+=W;return T._ST=V;};function s(T){var U,V;while(T=T.getParent()){if(T.getName()=='body')break;if(T.getAttribute('data-nostyle'))U=T;else if(!V){var W=T.getAttribute('contentEditable');if(W=='false')U=T;else if(W=='true')V=1;}}return U;};function t(T){var ay=this;var U=T.document;if(T.collapsed){var V=J(ay,U);T.insertNode(V);T.moveToPosition(V,2);return;}var W=ay.element,X=ay._.definition,Y,Z=X.ignoreReadonly,aa=Z||X.includeReadonly;if(aa==undefined)aa=U.getCustomData('cke_includeReadonly');var ab=f[W]||(Y=true,f.span);T.enlarge(1,1);T.trim();var ac=T.createBookmark(),ad=ac.startNode,ae=ac.endNode,af=ad,ag;if(!Z){var ah=s(ad),ai=s(ae);if(ah)af=ah.getNextSourceNode(true);if(ai)ae=ai;}if(af.getPosition(ae)==2)af=0;while(af){var aj=false;if(af.equals(ae)){af=null;aj=true;}else{var ak=af.type,al=ak==1?af.getName():null,am=al&&af.getAttribute('contentEditable')=='false',an=al&&af.getAttribute('data-nostyle');if(al&&af.data('cke-bookmark')){af=af.getNextSourceNode(true);continue;}if(!al||ab[al]&&!an&&(!am||aa)&&(af.getPosition(ae)|4|0|8)==4+0+8&&(!X.childRule||X.childRule(af))){var ao=af.getParent();
+if(ao&&((ao.getDtd()||f.span)[W]||Y)&&(!X.parentRule||X.parentRule(ao))){if(!ag&&(!al||!f.$removeEmpty[al]||(af.getPosition(ae)|4|0|8)==4+0+8)){ag=new d.range(U);ag.setStartBefore(af);}if(ak==3||am||ak==1&&!af.getChildCount()){var ap=af,aq;while((aj=!ap.getNext(q))&&(aq=ap.getParent(),ab[aq.getName()])&&(aq.getPosition(ad)|2|0|8)==2+0+8&&(!X.childRule||X.childRule(aq)))ap=aq;ag.setEndAfter(ap);}}else aj=true;}else aj=true;af=af.getNextSourceNode(an||am);}if(aj&&ag&&!ag.collapsed){var ar=J(ay,U),as=ar.hasAttributes(),at=ag.getCommonAncestor(),au={styles:{},attrs:{},blockedStyles:{},blockedAttrs:{}},av,aw,ax;while(ar&&at){if(at.getName()==W){for(av in X.attributes){if(au.blockedAttrs[av]||!(ax=at.getAttribute(aw)))continue;if(ar.getAttribute(av)==ax)au.attrs[av]=1;else au.blockedAttrs[av]=1;}for(aw in X.styles){if(au.blockedStyles[aw]||!(ax=at.getStyle(aw)))continue;if(ar.getStyle(aw)==ax)au.styles[aw]=1;else au.blockedStyles[aw]=1;}}at=at.getParent();}for(av in au.attrs)ar.removeAttribute(av);for(aw in au.styles)ar.removeStyle(aw);if(as&&!ar.hasAttributes())ar=null;if(ar){ag.extractContents().appendTo(ar);G(ay,ar);ag.insertNode(ar);ar.mergeSiblings();if(!c)ar.$.normalize();}else{ar=new h('span');ag.extractContents().appendTo(ar);ag.insertNode(ar);G(ay,ar);ar.remove(true);}ag=null;}}T.moveToBookmark(ac);T.shrink(2);};function u(T){T.enlarge(1,1);var U=T.createBookmark(),V=U.startNode;if(T.collapsed){var W=new d.elementPath(V.getParent()),X;for(var Y=0,Z;Y<W.elements.length&&(Z=W.elements[Y]);Y++){if(Z==W.block||Z==W.blockLimit)break;if(this.checkElementRemovable(Z)){var aa;if(T.collapsed&&(T.checkBoundaryOfElement(Z,2)||(aa=T.checkBoundaryOfElement(Z,1)))){X=Z;X.match=aa?'start':'end';}else{Z.mergeSiblings();if(Z.getName()==this.element)F(this,Z);else H(Z,N(this)[Z.getName()]);}}}if(X){var ab=V;for(Y=0;true;Y++){var ac=W.elements[Y];if(ac.equals(X))break;else if(ac.match)continue;else ac=ac.clone();ac.append(ab);ab=ac;}ab[X.match=='start'?'insertBefore':'insertAfter'](X);}}else{var ad=U.endNode,ae=this;function af(){var ai=new d.elementPath(V.getParent()),aj=new d.elementPath(ad.getParent()),ak=null,al=null;for(var am=0;am<ai.elements.length;am++){var an=ai.elements[am];if(an==ai.block||an==ai.blockLimit)break;if(ae.checkElementRemovable(an))ak=an;}for(am=0;am<aj.elements.length;am++){an=aj.elements[am];if(an==aj.block||an==aj.blockLimit)break;if(ae.checkElementRemovable(an))al=an;}if(al)ad.breakParent(al);if(ak)V.breakParent(ak);};af();var ag=V;while(!ag.equals(ad)){var ah=ag.getNextSourceNode();
+if(ag.type==1&&this.checkElementRemovable(ag)){if(ag.getName()==this.element)F(this,ag);else H(ag,N(this)[ag.getName()]);if(ah.type==1&&ah.contains(V)){af();ah=V.getNext();}}ag=ah;}}T.moveToBookmark(U);};function v(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);V&&!V.isReadOnly()&&K(V,this);};function w(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);if(!V)return;var W=this,X=W._.definition,Y=X.attributes;if(Y)for(var Z in Y)V.removeAttribute(Z,Y[Z]);if(X.styles)for(var aa in X.styles){if(!X.styles.hasOwnProperty(aa))continue;V.removeStyle(aa);}};function x(T){var U=T.createBookmark(true),V=T.createIterator();V.enforceRealBlocks=true;if(this._.enterMode)V.enlargeBr=this._.enterMode!=2;var W,X=T.document,Y;while(W=V.getNextParagraph()){if(!W.isReadOnly()){var Z=J(this,X,W);z(W,Z);}}T.moveToBookmark(U);};function y(T){var Y=this;var U=T.createBookmark(1),V=T.createIterator();V.enforceRealBlocks=true;V.enlargeBr=Y._.enterMode!=2;var W;while(W=V.getNextParagraph()){if(Y.checkElementRemovable(W))if(W.is('pre')){var X=Y._.enterMode==2?null:T.document.createElement(Y._.enterMode==1?'p':'div');X&&W.copyAttributes(X);z(W,X);}else F(Y,W,1);}T.moveToBookmark(U);};function z(T,U){var V=!U;if(V){U=T.getDocument().createElement('div');T.copyAttributes(U);}var W=U&&U.is('pre'),X=T.is('pre'),Y=W&&!X,Z=!W&&X;if(Y)U=E(T,U);else if(Z)U=D(V?[T.getHtml()]:B(T),U);else T.moveChildren(U);U.replace(T);if(W)A(U);else if(V)I(U);};function A(T){var U;if(!((U=T.getPrevious(r))&&U.is&&U.is('pre')))return;var V=C(U.getHtml(),/\n$/,'')+'\n\n'+C(T.getHtml(),/^\n/,'');if(c)T.$.outerHTML='<pre>'+V+'</pre>';else T.setHtml(V);U.remove();};function B(T){var U=/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,V=T.getName(),W=C(T.getOuterHtml(),U,function(Y,Z,aa){return Z+'</pre>'+aa+'<pre>';}),X=[];W.replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(Y,Z){X.push(Z);});return X;};function C(T,U,V){var W='',X='';T=T.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(Y,Z,aa){Z&&(W=Z);aa&&(X=aa);return '';});return W+T.replace(U,V)+X;};function D(T,U){var V;if(T.length>1)V=new d.documentFragment(U.getDocument());for(var W=0;W<T.length;W++){var X=T[W];X=X.replace(/(\r\n|\r)/g,'\n');X=C(X,/^[ \t]*\n/,'');X=C(X,/\n$/,'');X=C(X,/^[ \t]+|[ \t]+$/g,function(Z,aa,ab){if(Z.length==1)return '&nbsp;';else if(!aa)return e.repeat('&nbsp;',Z.length-1)+' ';else return ' '+e.repeat('&nbsp;',Z.length-1);
+});X=X.replace(/\n/g,'<br>');X=X.replace(/[ \t]{2,}/g,function(Z){return e.repeat('&nbsp;',Z.length-1)+' ';});if(V){var Y=U.clone();Y.setHtml(X);V.append(Y);}else U.setHtml(X);}return V||U;};function E(T,U){var V=T.getBogus();V&&V.remove();var W=T.getHtml();W=C(W,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,'');W=W.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,'$1');W=W.replace(/([ \t\n\r]+|&nbsp;)/g,' ');W=W.replace(/<br\b[^>]*>/gi,'\n');if(c){var X=T.getDocument().createElement('div');X.append(U);U.$.outerHTML='<pre>'+W+'</pre>';U.copyAttributes(X.getFirst());U=X.getFirst().remove();}else U.setHtml(W);return U;};function F(T,U){var V=T._.definition,W=V.attributes,X=V.styles,Y=N(T)[U.getName()],Z=e.isEmpty(W)&&e.isEmpty(X);for(var aa in W){if((aa=='class'||T._.definition.fullMatch)&&U.getAttribute(aa)!=O(aa,W[aa]))continue;Z=U.hasAttribute(aa);U.removeAttribute(aa);}for(var ab in X){if(T._.definition.fullMatch&&U.getStyle(ab)!=O(ab,X[ab],true))continue;Z=Z||!!U.getStyle(ab);U.removeStyle(ab);}H(U,Y,m[U.getName()]);if(Z)!f.$block[U.getName()]||T._.enterMode==2&&!U.hasAttributes()?I(U):U.renameNode(T._.enterMode==1?'p':'div');};function G(T,U){var V=T._.definition,W=V.attributes,X=V.styles,Y=N(T),Z=U.getElementsByTag(T.element);for(var aa=Z.count();--aa>=0;)F(T,Z.getItem(aa));for(var ab in Y){if(ab!=T.element){Z=U.getElementsByTag(ab);for(aa=Z.count()-1;aa>=0;aa--){var ac=Z.getItem(aa);H(ac,Y[ab]);}}}};function H(T,U,V){var W=U&&U.attributes;if(W)for(var X=0;X<W.length;X++){var Y=W[X][0],Z;if(Z=T.getAttribute(Y)){var aa=W[X][1];if(aa===null||aa.test&&aa.test(Z)||typeof aa=='string'&&Z==aa)T.removeAttribute(Y);}}if(!V)I(T);};function I(T){if(!T.hasAttributes())if(f.$block[T.getName()]){var U=T.getPrevious(r),V=T.getNext(r);if(U&&(U.type==3||!U.isBlockBoundary({br:1})))T.append('br',1);if(V&&(V.type==3||!V.isBlockBoundary({br:1})))T.append('br');T.remove(true);}else{var W=T.getFirst(),X=T.getLast();T.remove(true);if(W){W.type==1&&W.mergeSiblings();if(X&&!W.equals(X)&&X.type==1)X.mergeSiblings();}}};function J(T,U,V){var W,X=T._.definition,Y=T.element;if(Y=='*')Y='span';W=new h(Y,U);if(V)V.copyAttributes(W);W=K(W,T);if(U.getCustomData('doc_processing_style')&&W.hasAttribute('id'))W.removeAttribute('id');else U.setCustomData('doc_processing_style',1);return W;};function K(T,U){var V=U._.definition,W=V.attributes,X=a.style.getStyleText(V);if(W)for(var Y in W)T.setAttribute(Y,W[Y]);if(X)T.setAttribute('style',X);return T;};function L(T,U){for(var V in T)T[V]=T[V].replace(p,function(W,X){return U[X];
+});};function M(T){var U=T._AC;if(U)return U;U={};var V=0,W=T.attributes;if(W)for(var X in W){V++;U[X]=W[X];}var Y=a.style.getStyleText(T);if(Y){if(!U.style)V++;U.style=Y;}U._length=V;return T._AC=U;};function N(T){if(T._.overrides)return T._.overrides;var U=T._.overrides={},V=T._.definition.overrides;if(V){if(!e.isArray(V))V=[V];for(var W=0;W<V.length;W++){var X=V[W],Y,Z,aa;if(typeof X=='string')Y=X.toLowerCase();else{Y=X.element?X.element.toLowerCase():T.element;aa=X.attributes;}Z=U[Y]||(U[Y]={});if(aa){var ab=Z.attributes=Z.attributes||[];for(var ac in aa)ab.push([ac.toLowerCase(),aa[ac]]);}}}return U;};function O(T,U,V){var W=new h('span');W[V?'setStyle':'setAttribute'](T,U);return W[V?'getStyle':'getAttribute'](T);};function P(T,U){var V;if(U!==false){var W=new h('span');W.setAttribute('style',T);V=W.getAttribute('style')||'';}else V=T;V=V.replace(/(font-family:)(.*?)(?=;|$)/,function(X,Y,Z){var aa=Z.split(',');for(var ab=0;ab<aa.length;ab++)aa[ab]=e.trim(aa[ab].replace(/["']/g,''));return Y+aa.join(',');});return V.replace(/\s*([;:])\s*/,'$1').replace(/([^\s;])$/,'$1;').replace(/,\s+/g,',').replace(/\"/g,'').toLowerCase();};function Q(T){var U={};T.replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(V,W,X){U[W]=X;});return U;};function R(T,U){typeof T=='string'&&(T=Q(T));typeof U=='string'&&(U=Q(U));for(var V in T){if(!(V in U&&(U[V]==T[V]||T[V]=='inherit'||U[V]=='inherit')))return false;}return true;};function S(T,U){var V=T.getSelection(),W=V.createBookmarks(1),X=V.getRanges(),Y=U?this.removeFromRange:this.applyToRange,Z,aa=X.createIterator();while(Z=aa.getNextRange())Y.call(this,Z);if(W.length==1&&W[0].collapsed){V.selectRanges(X);T.getById(W[0].startNode).remove();}else V.selectBookmarks(W);T.removeCustomData('doc_processing_style');};})();a.styleCommand=function(m){this.style=m;};a.styleCommand.prototype.exec=function(m){var o=this;m.focus();var n=m.document;if(n)if(o.state==2)o.style.apply(n);else if(o.state==1)o.style.remove(n);return!!n;};a.stylesSet=new a.resourceManager('','stylesSet');a.addStylesSet=e.bind(a.stylesSet.add,a.stylesSet);a.loadStylesSet=function(m,n,o){a.stylesSet.addExternal(m,n,'');a.stylesSet.load(m,o);};a.editor.prototype.getStylesSet=function(m){if(!this._.stylesDefinitions){var n=this,o=n.config.stylesCombo_stylesSet||n.config.stylesSet||'default';if(o instanceof Array){n._.stylesDefinitions=o;m(o);return;}var p=o.split(':'),q=p[0],r=p[1],s=j.registered.styles.path;a.stylesSet.addExternal(q,r?p.slice(1).join(':'):s+'styles/'+q+'.js','');
+a.stylesSet.load(q,function(t){n._.stylesDefinitions=t[q];m(n._.stylesDefinitions);});}else m(this._.stylesDefinitions);};j.add('domiterator');(function(){function m(s){var t=this;if(arguments.length<1)return;t.range=s;t.forceBrBreak=0;t.enlargeBr=1;t.enforceRealBlocks=0;t._||(t._={});};var n=/^[\r\n\t ]+$/,o=d.walker.bookmark(false,true),p=d.walker.whitespaces(true),q=function(s){return o(s)&&p(s);};function r(s,t,u){var v=s.getNextSourceNode(t,null,u);while(!o(v))v=v.getNextSourceNode(t,null,u);return v;};m.prototype={getNextParagraph:function(s){var S=this;var t,u,v,w,x,y;if(!S._.started){u=S.range.clone();u.shrink(1,true);w=u.endContainer.hasAscendant('pre',true)||u.startContainer.hasAscendant('pre',true);u.enlarge(S.forceBrBreak&&!w||!S.enlargeBr?3:2);if(!u.collapsed){var z=new d.walker(u.clone()),A=d.walker.bookmark(true,true);z.evaluator=A;S._.nextNode=z.next();z=new d.walker(u.clone());z.evaluator=A;var B=z.previous();S._.lastNode=B.getNextSourceNode(true);if(S._.lastNode&&S._.lastNode.type==3&&!e.trim(S._.lastNode.getText())&&S._.lastNode.getParent().isBlockBoundary()){var C=new d.range(u.document);C.moveToPosition(S._.lastNode,4);if(C.checkEndOfBlock()){var D=new d.elementPath(C.endContainer),E=D.block||D.blockLimit;S._.lastNode=E.getNextSourceNode(true);}}if(!S._.lastNode){S._.lastNode=S._.docEndMarker=u.document.createText('');S._.lastNode.insertAfter(B);}u=null;}S._.started=1;}var F=S._.nextNode;B=S._.lastNode;S._.nextNode=null;while(F){var G=0,H=F.hasAscendant('pre'),I=F.type!=1,J=0;if(!I){var K=F.getName();if(F.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){if(K=='br')I=1;else if(!u&&!F.getChildCount()&&K!='hr'){t=F;v=F.equals(B);break;}if(u){u.setEndAt(F,3);if(K!='br')S._.nextNode=F;}G=1;}else{if(F.getFirst()){if(!u){u=new d.range(S.range.document);u.setStartAt(F,3);}F=F.getFirst();continue;}I=1;}}else if(F.type==3)if(n.test(F.getText()))I=0;if(I&&!u){u=new d.range(S.range.document);u.setStartAt(F,3);}v=(!G||I)&&F.equals(B);if(u&&!G)while(!F.getNext(q)&&!v){var L=F.getParent();if(L.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){G=1;I=0;v=v||L.equals(B);u.setEndAt(L,2);break;}F=L;I=1;v=F.equals(B);J=1;}if(I)u.setEndAt(F,4);F=r(F,J,B);v=!F;if(v||G&&u)break;}if(!t){if(!u){S._.docEndMarker&&S._.docEndMarker.remove();S._.nextNode=null;return null;}var M=new d.elementPath(u.startContainer),N=M.blockLimit,O={div:1,th:1,td:1};t=M.block;if(!t&&!S.enforceRealBlocks&&O[N.getName()]&&u.checkStartOfBlock()&&u.checkEndOfBlock())t=N;else if(!t||S.enforceRealBlocks&&t.getName()=='li'){t=S.range.document.createElement(s||'p');
+u.extractContents().appendTo(t);t.trim();u.insertNode(t);x=y=true;}else if(t.getName()!='li'){if(!u.checkStartOfBlock()||!u.checkEndOfBlock()){t=t.clone(false);u.extractContents().appendTo(t);t.trim();var P=u.splitBlock();x=!P.wasStartOfBlock;y=!P.wasEndOfBlock;u.insertNode(t);}}else if(!v)S._.nextNode=t.equals(B)?null:r(u.getBoundaryNodes().endNode,1,B);}if(x){var Q=t.getPrevious();if(Q&&Q.type==1)if(Q.getName()=='br')Q.remove();else if(Q.getLast()&&Q.getLast().$.nodeName.toLowerCase()=='br')Q.getLast().remove();}if(y){var R=t.getLast();if(R&&R.type==1&&R.getName()=='br')if(c||R.getPrevious(o)||R.getNext(o))R.remove();}if(!S._.nextNode)S._.nextNode=v||t.equals(B)||!B?null:r(t,1,B);return t;}};d.range.prototype.createIterator=function(){return new m(this);};})();j.add('panelbutton',{requires:['button'],onLoad:function(){function m(n){var p=this;var o=p._;if(o.state==0)return;p.createPanel(n);if(o.on){o.panel.hide();return;}o.panel.showBlock(p._.id,p.document.getById(p._.id),4);};k.panelButton=e.createClass({base:k.button,$:function(n){var p=this;var o=n.panel;delete n.panel;p.base(n);p.document=o&&o.parent&&o.parent.getDocument()||a.document;o.block={attributes:o.attributes};p.hasArrow=true;p.click=m;p._={panelDefinition:o};},statics:{handler:{create:function(n){return new k.panelButton(n);}}},proto:{createPanel:function(n){var o=this._;if(o.panel)return;var p=this._.panelDefinition||{},q=this._.panelDefinition.block,r=p.parent||a.document.getBody(),s=this._.panel=new k.floatPanel(n,r,p),t=s.addBlock(o.id,q),u=this;s.onShow=function(){if(u.className)this.element.getFirst().addClass(u.className+'_panel');u.setState(1);o.on=1;if(u.onOpen)u.onOpen();};s.onHide=function(v){if(u.className)this.element.getFirst().removeClass(u.className+'_panel');u.setState(u.modes&&u.modes[n.mode]?2:0);o.on=0;if(!v&&u.onClose)u.onClose();};s.onEscape=function(){s.hide();u.document.getById(o.id).focus();};if(this.onBlock)this.onBlock(s,t);t.onHide=function(){o.on=0;u.setState(2);};}}});},beforeInit:function(m){m.ui.addHandler('panelbutton',k.panelButton.handler);}});a.UI_PANELBUTTON='panelbutton';j.add('floatpanel',{requires:['panel']});(function(){var m={},n=false;function o(p,q,r,s,t){var u=e.genKey(q.getUniqueId(),r.getUniqueId(),p.skinName,p.lang.dir,p.uiColor||'',s.css||'',t||''),v=m[u];if(!v){v=m[u]=new k.panel(q,s);v.element=r.append(h.createFromHtml(v.renderHtml(p),q));v.element.setStyles({display:'none',position:'absolute'});}return v;};k.floatPanel=e.createClass({$:function(p,q,r,s){r.forceIFrame=1;
+var t=q.getDocument(),u=o(p,t,q,r,s||0),v=u.element,w=v.getFirst().getFirst();v.disableContextMenu();this.element=v;this._={editor:p,panel:u,parentElement:q,definition:r,document:t,iframe:w,children:[],dir:p.lang.dir};p.on('mode',function(){this.hide();},this);},proto:{addBlock:function(p,q){return this._.panel.addBlock(p,q);},addListBlock:function(p,q){return this._.panel.addListBlock(p,q);},getBlock:function(p){return this._.panel.getBlock(p);},showBlock:function(p,q,r,s,t){var u=this._.panel,v=u.showBlock(p);this.allowBlur(false);n=1;this._.returnFocus=this._.editor.focusManager.hasFocus?this._.editor:new h(a.document.$.activeElement);var w=this.element,x=this._.iframe,y=this._.definition,z=q.getDocumentPosition(w.getDocument()),A=this._.dir=='rtl',B=z.x+(s||0),C=z.y+(t||0);if(A&&(r==1||r==4))B+=q.$.offsetWidth;else if(!A&&(r==2||r==3))B+=q.$.offsetWidth-1;if(r==3||r==4)C+=q.$.offsetHeight-1;this._.panel._.offsetParentId=q.getId();w.setStyles({top:C+'px',left:0,display:''});w.setOpacity(0);w.getFirst().removeStyle('width');if(!this._.blurSet){var D=c?x:new d.window(x.$.contentWindow);a.event.useCapture=true;D.on('blur',function(E){var G=this;if(!G.allowBlur())return;var F=E.data.getTarget();if(F.getName&&F.getName()!='iframe')return;if(G.visible&&!G._.activeChild&&!n){delete G._.returnFocus;G.hide();}},this);D.on('focus',function(){this._.focused=true;this.hideChild();this.allowBlur(true);},this);a.event.useCapture=false;this._.blurSet=1;}u.onEscape=e.bind(function(E){if(this.onEscape&&this.onEscape(E)===false)return false;},this);e.setTimeout(function(){var E=e.bind(function(){var F=w.getFirst();if(v.autoSize){var G=v.element.getDocument(),H=(b.webkit?v.element:G.getBody()).$.scrollWidth;if(c&&b.quirks&&H>0)H+=(F.$.offsetWidth||0)-(F.$.clientWidth||0)+3;H+=4;F.setStyle('width',H+'px');v.element.addClass('cke_frameLoaded');var I=v.element.$.scrollHeight;if(c&&b.quirks&&I>0)I+=(F.$.offsetHeight||0)-(F.$.clientHeight||0)+3;F.setStyle('height',I+'px');u._.currentBlock.element.setStyle('display','none').removeStyle('display');}else F.removeStyle('height');if(A)B-=w.$.offsetWidth;w.setStyle('left',B+'px');var J=u.element,K=J.getWindow(),L=w.$.getBoundingClientRect(),M=K.getViewPaneSize(),N=L.width||L.right-L.left,O=L.height||L.bottom-L.top,P=A?L.right:M.width-L.left,Q=A?M.width-L.right:L.left;if(A){if(P<N)if(Q>N)B+=N;else if(M.width>N)B-=L.left;else B=B-L.right+M.width;}else if(P<N)if(Q>N)B-=N;else if(M.width>N)B=B-L.right+M.width;else B-=L.left;var R=M.height-L.top,S=L.top;
+if(R<O)if(S>O)C-=O;else if(M.height>O)C=C-L.bottom+M.height;else C-=L.top;if(c){var T=new h(w.$.offsetParent),U=T;if(U.getName()=='html')U=U.getDocument().getBody();if(U.getComputedStyle('direction')=='rtl')if(b.ie8Compat)B-=w.getDocument().getDocumentElement().$.scrollLeft*2;else B-=T.$.scrollWidth-T.$.clientWidth;}var V=w.getFirst(),W;if(W=V.getCustomData('activePanel'))W.onHide&&W.onHide.call(this,1);V.setCustomData('activePanel',this);w.setStyles({top:C+'px',left:B+'px'});w.setOpacity(1);},this);u.isLoaded?E():u.onLoad=E;e.setTimeout(function(){x.$.contentWindow.focus();this.allowBlur(true);},0,this);},b.air?200:0,this);this.visible=1;if(this.onShow)this.onShow.call(this);n=0;},hide:function(p){var r=this;if(r.visible&&(!r.onHide||r.onHide.call(r)!==true)){r.hideChild();b.gecko&&r._.iframe.getFrameDocument().$.activeElement.blur();r.element.setStyle('display','none');r.visible=0;r.element.getFirst().removeCustomData('activePanel');var q=p!==false&&r._.returnFocus;if(q){if(b.webkit&&q.type)q.getWindow().$.focus();q.focus();}}},allowBlur:function(p){var q=this._.panel;if(p!=undefined)q.allowBlur=p;return q.allowBlur;},showAsChild:function(p,q,r,s,t,u){if(this._.activeChild==p&&p._.panel._.offsetParentId==r.getId())return;this.hideChild();p.onHide=e.bind(function(){e.setTimeout(function(){if(!this._.focused)this.hide();},0,this);},this);this._.activeChild=p;this._.focused=false;p.showBlock(q,r,s,t,u);if(b.ie7Compat||b.ie8&&b.ie6Compat)setTimeout(function(){p.element.getChild(0).$.style.cssText+='';},100);},hideChild:function(){var p=this._.activeChild;if(p){delete p.onHide;delete p._.returnFocus;delete this._.activeChild;p.hide();}}}});a.on('instanceDestroyed',function(){var p=e.isEmpty(a.instances);for(var q in m){var r=m[q];if(p)r.destroy();else r.element.hide();}p&&(m={});});})();j.add('menu',{beforeInit:function(m){var n=m.config.menu_groups.split(','),o=m._.menuGroups={},p=m._.menuItems={};for(var q=0;q<n.length;q++)o[n[q]]=q+1;m.addMenuGroup=function(r,s){o[r]=s||100;};m.addMenuItem=function(r,s){if(o[s.group])p[r]=new a.menuItem(this,r,s);};m.addMenuItems=function(r){for(var s in r)this.addMenuItem(s,r[s]);};m.getMenuItem=function(r){return p[r];};m.removeMenuItem=function(r){delete p[r];};},requires:['floatpanel']});(function(){a.menu=e.createClass({$:function(n,o){var r=this;o=r._.definition=o||{};r.id=e.getNextId();r.editor=n;r.items=[];r._.listeners=[];r._.level=o.level||1;var p=e.extend({},o.panel,{css:n.skin.editor.css,level:r._.level-1,block:{}}),q=p.block.attributes=p.attributes||{};
+!q.role&&(q.role='menu');r._.panelDefinition=p;},_:{onShow:function(){var v=this;var n=v.editor.getSelection();if(c)n&&n.lock();var o=n&&n.getStartElement(),p=v._.listeners,q=[];v.removeAll();for(var r=0;r<p.length;r++){var s=p[r](o,n);if(s)for(var t in s){var u=v.editor.getMenuItem(t);if(u&&(!u.command||v.editor.getCommand(u.command).state)){u.state=s[t];v.add(u);}}}},onClick:function(n){this.hide(false);if(n.onClick)n.onClick();else if(n.command)this.editor.execCommand(n.command);},onEscape:function(n){var o=this.parent;if(o){o._.panel.hideChild();var p=o._.panel._.panel._.currentBlock,q=p._.focusIndex;p._.markItem(q);}else if(n==27)this.hide();return false;},onHide:function(){this._.unlockSelection();this.onHide&&this.onHide();},unlockSelection:function(){if(c&&!this.parent){var n=this.editor.getSelection();n&&n.unlock(true);}},showSubMenu:function(n){var v=this;var o=v._.subMenu,p=v.items[n],q=p.getItems&&p.getItems();if(!q){v._.panel.hideChild();return;}var r=v._.panel.getBlock(v.id);r._.focusIndex=n;if(o)o.removeAll();else{o=v._.subMenu=new a.menu(v.editor,e.extend({},v._.definition,{level:v._.level+1},true));o.parent=v;o._.onClick=e.bind(v._.onClick,v);}for(var s in q){var t=v.editor.getMenuItem(s);if(t){t.state=q[s];o.add(t);}}var u=v._.panel.getBlock(v.id).element.getDocument().getById(v.id+String(n));o.show(u,2);}},proto:{add:function(n){if(!n.order)n.order=this.items.length;this.items.push(n);},removeAll:function(){this.items=[];},show:function(n,o,p,q){if(!this.parent){this._.onShow();if(!this.items.length){this._.unlockSelection();return;}}o=o||(this.editor.lang.dir=='rtl'?2:1);var r=this.items,s=this.editor,t=this._.panel,u=this._.element;if(!t){t=this._.panel=new k.floatPanel(this.editor,a.document.getBody(),this._.panelDefinition,this._.level);t.onEscape=e.bind(function(F){if(this._.onEscape(F)===false)return false;},this);t.onHide=e.bind(function(){this._.onHide&&this._.onHide();},this);var v=t.addBlock(this.id,this._.panelDefinition.block);v.autoSize=true;var w=v.keys;w[40]='next';w[9]='next';w[38]='prev';w[2228224+9]='prev';w[s.lang.dir=='rtl'?37:39]=c?'mouseup':'click';w[32]=c?'mouseup':'click';c&&(w[13]='mouseup');u=this._.element=v.element;u.addClass(s.skinClass);var x=u.getDocument();x.getBody().setStyle('overflow','hidden');x.getElementsByTag('html').getItem(0).setStyle('overflow','hidden');this._.itemOverFn=e.addFunction(function(F){var G=this;clearTimeout(G._.showSubTimeout);G._.showSubTimeout=e.setTimeout(G._.showSubMenu,s.config.menu_subMenuDelay||400,G,[F]);
+},this);this._.itemOutFn=e.addFunction(function(F){clearTimeout(this._.showSubTimeout);},this);this._.itemClickFn=e.addFunction(function(F){var H=this;var G=H.items[F];if(G.state==0){H.hide();return;}if(G.getItems)H._.showSubMenu(F);else H._.onClick(G);},this);}m(r);var y=s.container.getChild(1),z=y.hasClass('cke_mixed_dir_content')?' cke_mixed_dir_content':'',A=['<div class="cke_menu'+z+'" role="presentation">'],B=r.length,C=B&&r[0].group;for(var D=0;D<B;D++){var E=r[D];if(C!=E.group){A.push('<div class="cke_menuseparator" role="separator"></div>');C=E.group;}E.render(this,D,A);}A.push('</div>');u.setHtml(A.join(''));k.fire('ready',this);if(this.parent)this.parent._.panel.showAsChild(t,this.id,n,o,p,q);else t.showBlock(this.id,n,o,p,q);s.fire('menuShow',[t]);},addListener:function(n){this._.listeners.push(n);},hide:function(n){var o=this;o._.onHide&&o._.onHide();o._.panel&&o._.panel.hide(n);}}});function m(n){n.sort(function(o,p){if(o.group<p.group)return-1;else if(o.group>p.group)return 1;return o.order<p.order?-1:o.order>p.order?1:0;});};a.menuItem=e.createClass({$:function(n,o,p){var q=this;e.extend(q,p,{order:0,className:'cke_button_'+o});q.group=n._.menuGroups[q.group];q.editor=n;q.name=o;},proto:{render:function(n,o,p){var w=this;var q=n.id+String(o),r=typeof w.state=='undefined'?2:w.state,s=' cke_'+(r==1?'on':r==0?'disabled':'off'),t=w.label;if(w.className)s+=' '+w.className;var u=w.getItems;p.push('<span class="cke_menuitem'+(w.icon&&w.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">'+'<a id="',q,'" class="',s,'" href="javascript:void(\'',(w.label||'').replace("'",''),'\')" title="',w.label,'" tabindex="-1"_cke_focus=1 hidefocus="true" role="menuitem"'+(u?'aria-haspopup="true"':'')+(r==0?'aria-disabled="true"':'')+(r==1?'aria-pressed="true"':''));if(b.opera||b.gecko&&b.mac)p.push(' onkeypress="return false;"');if(b.gecko)p.push(' onblur="this.style.cssText = this.style.cssText;"');var v=(w.iconOffset||0)*-16;p.push(' onmouseover="CKEDITOR.tools.callFunction(',n._.itemOverFn,',',o,');" onmouseout="CKEDITOR.tools.callFunction(',n._.itemOutFn,',',o,');" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',n._.itemClickFn,',',o,'); return false;"><span class="cke_icon_wrapper"><span class="cke_icon"'+(w.icon?' style="background-image:url('+a.getUrl(w.icon)+');background-position:0 '+v+'px;"':'')+'></span></span>'+'<span class="cke_label">');if(u)p.push('<span class="cke_menuarrow">','<span>&#',w.editor.lang.dir=='rtl'?'9668':'9658',';</span>','</span>');
+p.push(t,'</span></a></span>');}}});})();i.menu_groups='clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div';(function(){var m;j.add('editingblock',{init:function(n){if(!n.config.editingBlock)return;n.on('themeSpace',function(o){if(o.data.space=='contents')o.data.html+='<br>';});n.on('themeLoaded',function(){n.fireOnce('editingBlockReady');});n.on('uiReady',function(){n.setMode(n.config.startupMode);});n.on('afterSetData',function(){if(!m){function o(){m=true;n.getMode().loadData(n.getData());m=false;};if(n.mode)o();else n.on('mode',function(){if(n.mode){o();n.removeListener('mode',arguments.callee);}});}});n.on('beforeGetData',function(){if(!m&&n.mode){m=true;n.setData(n.getMode().getData(),null,1);m=false;}});n.on('getSnapshot',function(o){if(n.mode)o.data=n.getMode().getSnapshotData();});n.on('loadSnapshot',function(o){if(n.mode)n.getMode().loadSnapshotData(o.data);});n.on('mode',function(o){o.removeListener();b.webkit&&n.container.on('focus',function(){n.focus();});if(n.config.startupFocus)n.focus();setTimeout(function(){n.fireOnce('instanceReady');a.fire('instanceReady',null,n);},0);});n.on('destroy',function(){var o=this;if(o.mode)o._.modes[o.mode].unload(o.getThemeSpace('contents'));});}});a.editor.prototype.mode='';a.editor.prototype.addMode=function(n,o){o.name=n;(this._.modes||(this._.modes={}))[n]=o;};a.editor.prototype.setMode=function(n){this.fire('beforeSetMode',{newMode:n});var o,p=this.getThemeSpace('contents'),q=this.checkDirty();if(this.mode){if(n==this.mode)return;this._.previousMode=this.mode;this.fire('beforeModeUnload');var r=this.getMode();o=r.getData();r.unload(p);this.mode='';}p.setHtml('');var s=this.getMode(n);if(!s)throw '[CKEDITOR.editor.setMode] Unknown mode "'+n+'".';if(!q)this.on('mode',function(){this.resetDirty();this.removeListener('mode',arguments.callee);});s.load(p,typeof o!='string'?this.getData():o);};a.editor.prototype.getMode=function(n){return this._.modes&&this._.modes[n||this.mode];};a.editor.prototype.focus=function(){this.forceNextSelectionCheck();var n=this.getMode();if(n)n.focus();};})();i.startupMode='wysiwyg';i.editingBlock=true;(function(){function m(){var G=this;try{var D=G.getSelection();if(!D||!D.document.getWindow().$)return;var E=D.getStartElement(),F=new d.elementPath(E);if(!F.compare(G._.selectionPreviousPath)){G._.selectionPreviousPath=F;G.fire('selectionChange',{selection:D,path:F,element:E});
+}}catch(H){}};var n,o;function p(){o=true;if(n)return;q.call(this);n=e.setTimeout(q,200,this);};function q(){n=null;if(o){e.setTimeout(m,0,this);o=false;}};function r(D){function E(I,J){if(!I||I.type==3)return false;var K=D.clone();return K['moveToElementEdit'+(J?'End':'Start')](I);};var F=D.startContainer,G=D.getPreviousNode(A,null,F),H=D.getNextNode(A,null,F);if(E(G)||E(H,1))return true;if(!(G||H)&&!(F.type==1&&F.isBlockBoundary()&&F.getBogus()))return true;return false;};var s={modes:{wysiwyg:1,source:1},readOnly:c||b.webkit,exec:function(D){switch(D.mode){case 'wysiwyg':D.document.$.execCommand('SelectAll',false,null);D.forceNextSelectionCheck();D.selectionChange();break;case 'source':var E=D.textarea.$;if(c)E.createTextRange().execCommand('SelectAll');else{E.selectionStart=0;E.selectionEnd=E.value.length;}E.focus();}},canUndo:false};function t(D){w(D);var E=D.createText('​');D.setCustomData('cke-fillingChar',E);return E;};function u(D){return D&&D.getCustomData('cke-fillingChar');};function v(D){var E=D&&u(D);if(E)if(E.getCustomData('ready'))w(D);else E.setCustomData('ready',1);};function w(D){var E=D&&D.removeCustomData('cke-fillingChar');if(E){var F,G=D.getSelection().getNative(),H=G&&G.type!='None'&&G.getRangeAt(0);if(E.getLength()>1&&H&&H.intersectsNode(E.$)){F=[G.anchorOffset,G.focusOffset];var I=G.anchorNode==E.$&&G.anchorOffset>0,J=G.focusNode==E.$&&G.focusOffset>0;I&&F[0]--;J&&F[1]--;x(G)&&F.unshift(F.pop());}E.setText(E.getText().replace(/\u200B/g,''));if(F){var K=G.getRangeAt(0);K.setStart(K.startContainer,F[0]);K.setEnd(K.startContainer,F[1]);G.removeAllRanges();G.addRange(K);}}};function x(D){if(!D.isCollapsed){var E=D.getRangeAt(0);E.setStart(D.anchorNode,D.anchorOffset);E.setEnd(D.focusNode,D.focusOffset);return E.collapsed;}};j.add('selection',{init:function(D){if(b.webkit){D.on('selectionChange',function(){v(D.document);});D.on('beforeSetMode',function(){w(D.document);});var E,F;function G(){var I=D.document,J=u(I);if(J){var K=I.$.defaultView.getSelection();if(K.type=='Caret'&&K.anchorNode==J.$)F=1;E=J.getText();J.setText(E.replace(/\u200B/g,''));}};function H(){var I=D.document,J=u(I);if(J){J.setText(E);if(F){I.$.defaultView.getSelection().setPosition(J.$,J.getLength());F=0;}}};D.on('beforeUndoImage',G);D.on('afterUndoImage',H);D.on('beforeGetData',G,null,null,0);D.on('getData',H);}D.on('contentDom',function(){var I=D.document,J=a.document,K=I.getBody(),L=I.getDocumentElement();if(c){var M,N,O=1;K.on('focusin',function(V){if(V.data.$.srcElement.nodeName!='BODY')return;
+var W=I.getCustomData('cke_locked_selection');if(W){W.unlock(1);W.lock();}else if(M&&O){try{M.select();}catch(X){}M=null;}});K.on('focus',function(){N=1;U();});K.on('beforedeactivate',function(V){if(V.data.$.toElement)return;N=0;O=1;});c&&D.on('blur',function(){try{I.$.selection.empty();}catch(V){}});L.on('mousedown',function(){O=0;});L.on('mouseup',function(){O=1;});var P;K.on('mousedown',function(V){if(V.data.$.button==2){var W=D.document.$.selection;if(W.type=='None')P=D.window.getScrollPosition();}T();});K.on('mouseup',function(V){if(V.data.$.button==2&&P){D.document.$.documentElement.scrollLeft=P.x;D.document.$.documentElement.scrollTop=P.y;}P=null;N=1;setTimeout(function(){U(true);},0);});K.on('keydown',T);K.on('keyup',function(){N=1;U();});if(I.$.compatMode!='BackCompat'){if(b.ie7Compat||b.ie6Compat){function Q(V,W,X){try{V.moveToPoint(W,X);}catch(Y){}};L.on('mousedown',function(V){function W(ab){ab=ab.data.$;if(Z){var ac=K.$.createTextRange();Q(ac,ab.x,ab.y);Z.setEndPoint(aa.compareEndPoints('StartToStart',ac)<0?'EndToEnd':'StartToStart',ac);Z.select();}};function X(){J.removeListener('mouseup',Y);L.removeListener('mouseup',Y);};function Y(){L.removeListener('mousemove',W);X();Z.select();};V=V.data;if(V.getTarget().is('html')&&V.$.x<L.$.clientWidth&&V.$.y<L.$.clientHeight){var Z=K.$.createTextRange();Q(Z,V.$.x,V.$.y);var aa=Z.duplicate();L.on('mousemove',W);J.on('mouseup',Y);L.on('mouseup',Y);}});}if(b.ie8){L.on('mousedown',function(V){if(V.data.getTarget().is('html')){J.on('mouseup',S);L.on('mouseup',S);}});function R(){J.removeListener('mouseup',S);L.removeListener('mouseup',S);};function S(){R();var V=a.document.$.selection,W=V.createRange();if(V.type!='None'&&W.parentElement().ownerDocument==I.$)W.select();};}}I.on('selectionchange',U);function T(){N=0;};function U(V){if(N){var W=D.document,X=D.getSelection(),Y=X&&X.getNative();if(V&&Y&&Y.type=='None')if(!W.$.queryCommandEnabled('InsertImage')){e.setTimeout(U,50,this,true);return;}var Z;if(Y&&Y.type&&Y.type!='Control'&&(Z=Y.createRange())&&(Z=Z.parentElement())&&(Z=Z.nodeName)&&Z.toLowerCase() in {input:1,textarea:1})return;try{M=Y&&X.getRanges()[0];}catch(aa){}p.call(D);}};}else{I.on('mouseup',p,D);I.on('keyup',p,D);I.on('selectionchange',p,D);}if(b.webkit)I.on('keydown',function(V){var W=V.data.getKey();switch(W){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:w(D.document);}},null,null,-1);});D.on('contentDomUnload',D.forceNextSelectionCheck,D);D.addCommand('selectAll',s);
+D.ui.addButton('SelectAll',{label:D.lang.selectAll,command:'selectAll'});D.selectionChange=function(I){(I?m:p).call(this);};b.ie9Compat&&D.on('destroy',function(){var I=D.getSelection();I&&I.getNative().clear();},null,null,9);}});a.editor.prototype.getSelection=function(){return this.document&&this.document.getSelection();};a.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath;};g.prototype.getSelection=function(){var D=new d.selection(this);return!D||D.isInvalid?null:D;};a.SELECTION_NONE=1;a.SELECTION_TEXT=2;a.SELECTION_ELEMENT=3;d.selection=function(D){var G=this;var E=D.getCustomData('cke_locked_selection');if(E)return E;G.document=D;G.isLocked=0;G._={cache:{}};if(c)try{var F=G.getNative().createRange();if(!F||F.item&&F.item(0).ownerDocument!=G.document.$||F.parentElement&&F.parentElement().ownerDocument!=G.document.$)throw 0;}catch(H){G.isInvalid=true;}return G;};var y={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};d.selection.prototype={getNative:c?function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.$.selection);}:function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.getWindow().$.getSelection());},getType:c?function(){var D=this._.cache;if(D.type)return D.type;var E=1;try{var F=this.getNative(),G=F.type;if(G=='Text')E=2;if(G=='Control')E=3;if(F.createRange().parentElement)E=2;}catch(H){}return D.type=E;}:function(){var D=this._.cache;if(D.type)return D.type;var E=2,F=this.getNative();if(!F)E=1;else if(F.rangeCount==1){var G=F.getRangeAt(0),H=G.startContainer;if(H==G.endContainer&&H.nodeType==1&&G.endOffset-G.startOffset==1&&y[H.childNodes[G.startOffset].nodeName.toLowerCase()])E=3;}return D.type=E;},getRanges:(function(){var D=c?(function(){function E(G){return new d.node(G).getIndex();};var F=function(G,H){G=G.duplicate();G.collapse(H);var I=G.parentElement(),J=I.ownerDocument;if(!I.hasChildNodes())return{container:I,offset:0};var K=I.children,L,M,N=G.duplicate(),O=0,P=K.length-1,Q=-1,R,S,T;while(O<=P){Q=Math.floor((O+P)/2);L=K[Q];N.moveToElementText(L);R=N.compareEndPoints('StartToStart',G);if(R>0)P=Q-1;else if(R<0)O=Q+1;else if(b.ie9Compat&&L.tagName=='BR'){var U=J.defaultView.getSelection();return{container:U[H?'anchorNode':'focusNode'],offset:U[H?'anchorOffset':'focusOffset']};}else return{container:I,offset:E(L)};}if(Q==-1||Q==K.length-1&&R<0){N.moveToElementText(I);
+N.setEndPoint('StartToStart',G);S=N.text.replace(/(\r\n|\r)/g,'\n').length;K=I.childNodes;if(!S){L=K[K.length-1];if(L.nodeType!=3)return{container:I,offset:K.length};else return{container:L,offset:L.nodeValue.length};}var V=K.length;while(S>0&&V>0){M=K[--V];if(M.nodeType==3){T=M;S-=M.nodeValue.length;}}return{container:T,offset:-S};}else{N.collapse(R>0?true:false);N.setEndPoint(R>0?'StartToStart':'EndToStart',G);S=N.text.replace(/(\r\n|\r)/g,'\n').length;if(!S)return{container:I,offset:E(L)+(R>0?0:1)};while(S>0)try{M=L[R>0?'previousSibling':'nextSibling'];if(M.nodeType==3){S-=M.nodeValue.length;T=M;}L=M;}catch(W){return{container:I,offset:E(L)};}return{container:T,offset:R>0?-S:T.nodeValue.length+S};}};return function(){var Q=this;var G=Q.getNative(),H=G&&G.createRange(),I=Q.getType(),J;if(!G)return[];if(I==2){J=new d.range(Q.document);var K=F(H,true);J.setStart(new d.node(K.container),K.offset);K=F(H);J.setEnd(new d.node(K.container),K.offset);if(J.endContainer.getPosition(J.startContainer)&4&&J.endOffset<=J.startContainer.getIndex())J.collapse();return[J];}else if(I==3){var L=[];for(var M=0;M<H.length;M++){var N=H.item(M),O=N.parentNode,P=0;J=new d.range(Q.document);for(;P<O.childNodes.length&&O.childNodes[P]!=N;P++){}J.setStart(new d.node(O),P);J.setEnd(new d.node(O),P+1);L.push(J);}return L;}return[];};})():function(){var E=[],F,G=this.document,H=this.getNative();if(!H)return E;if(!H.rangeCount){F=new d.range(G);F.moveToElementEditStart(G.getBody());E.push(F);}for(var I=0;I<H.rangeCount;I++){var J=H.getRangeAt(I);F=new d.range(G);F.setStart(new d.node(J.startContainer),J.startOffset);F.setEnd(new d.node(J.endContainer),J.endOffset);E.push(F);}return E;};return function(E){var F=this._.cache;if(F.ranges&&!E)return F.ranges;else if(!F.ranges)F.ranges=new d.rangeList(D.call(this));if(E){var G=F.ranges;for(var H=0;H<G.length;H++){var I=G[H],J=I.getCommonAncestor();if(J.isReadOnly())G.splice(H,1);if(I.collapsed)continue;if(I.startContainer.isReadOnly()){var K=I.startContainer;while(K){if(K.is('body')||!K.isReadOnly())break;if(K.type==1&&K.getAttribute('contentEditable')=='false')I.setStartAfter(K);K=K.getParent();}}var L=I.startContainer,M=I.endContainer,N=I.startOffset,O=I.endOffset,P=I.clone();if(L&&L.type==3)if(N>=L.getLength())P.setStartAfter(L);else P.setStartBefore(L);if(M&&M.type==3)if(!O)P.setEndBefore(M);else P.setEndAfter(M);var Q=new d.walker(P);Q.evaluator=function(R){if(R.type==1&&R.isReadOnly()){var S=I.clone();I.setEndBefore(R);if(I.collapsed)G.splice(H--,1);
+if(!(R.getPosition(P.endContainer)&16)){S.setStartAfter(R);if(!S.collapsed)G.splice(H+1,0,S);}return true;}return false;};Q.next();}}return F.ranges;};})(),getStartElement:function(){var K=this;var D=K._.cache;if(D.startElement!==undefined)return D.startElement;var E,F=K.getNative();switch(K.getType()){case 3:return K.getSelectedElement();case 2:var G=K.getRanges()[0];if(G){if(!G.collapsed){G.optimize();while(1){var H=G.startContainer,I=G.startOffset;if(I==(H.getChildCount?H.getChildCount():H.getLength())&&!H.isBlockBoundary())G.setStartAfter(H);else break;}E=G.startContainer;if(E.type!=1)return E.getParent();E=E.getChild(G.startOffset);if(!E||E.type!=1)E=G.startContainer;else{var J=E.getFirst();while(J&&J.type==1){E=J;J=J.getFirst();}}}else{E=G.startContainer;if(E.type!=1)E=E.getParent();}E=E.$;}}return D.startElement=E?new h(E):null;},getSelectedElement:function(){var D=this._.cache;if(D.selectedElement!==undefined)return D.selectedElement;var E=this,F=e.tryThese(function(){return E.getNative().createRange().item(0);},function(){var G,H,I=E.getRanges()[0],J=I.getCommonAncestor(1,1),K={table:1,ul:1,ol:1,dl:1};for(var L in K){if(G=J.getAscendant(L,1))break;}if(G){var M=new d.range(this.document);M.setStartAt(G,1);M.setEnd(I.startContainer,I.startOffset);var N=e.extend(K,f.$listItem,f.$tableContent),O=new d.walker(M),P=function(Q,R){return function(S,T){if(S.type==3&&(!e.trim(S.getText())||S.getParent().data('cke-bookmark')))return true;var U;if(S.type==1){U=S.getName();if(U=='br'&&R&&S.equals(S.getParent().getBogus()))return true;if(T&&U in N||U in f.$removeEmpty)return true;}Q.halted=1;return false;};};O.guard=P(O);if(O.checkBackward()&&!O.halted){O=new d.walker(M);M.setStart(I.endContainer,I.endOffset);M.setEndAt(G,2);O.guard=P(O,1);if(O.checkForward()&&!O.halted)H=G.$;}}if(!H)throw 0;return H;},function(){var G=E.getRanges()[0],H,I;for(var J=2;J&&!((H=G.getEnclosedNode())&&H.type==1&&y[H.getName()]&&(I=H));J--)G.shrink(1);return I.$;});return D.selectedElement=F?new h(F):null;},getSelectedText:function(){var D=this._.cache;if(D.selectedText!==undefined)return D.selectedText;var E='',F=this.getNative();if(this.getType()==2)E=c?F.createRange().text:F.toString();return D.selectedText=E;},lock:function(){var D=this;D.getRanges();D.getStartElement();D.getSelectedElement();D.getSelectedText();D._.cache.nativeSel={};D.isLocked=1;D.document.setCustomData('cke_locked_selection',D);},unlock:function(D){var I=this;var E=I.document,F=E.getCustomData('cke_locked_selection');
+if(F){E.setCustomData('cke_locked_selection',null);if(D){var G=F.getSelectedElement(),H=!G&&F.getRanges();I.isLocked=0;I.reset();if(G)I.selectElement(G);else I.selectRanges(H);}}if(!F||!D){I.isLocked=0;I.reset();}},reset:function(){this._.cache={};},selectElement:function(D){var F=this;if(F.isLocked){var E=new d.range(F.document);E.setStartBefore(D);E.setEndAfter(D);F._.cache.selectedElement=D;F._.cache.startElement=D;F._.cache.ranges=new d.rangeList(E);F._.cache.type=3;return;}E=new d.range(D.getDocument());E.setStartBefore(D);E.setEndAfter(D);E.select();F.document.fire('selectionchange');F.reset();},selectRanges:function(D){var R=this;if(R.isLocked){R._.cache.selectedElement=null;R._.cache.startElement=D[0]&&D[0].getTouchedStartNode();R._.cache.ranges=new d.rangeList(D);R._.cache.type=2;return;}if(c){if(D.length>1){var E=D[D.length-1];D[0].setEnd(E.endContainer,E.endOffset);D.length=1;}if(D[0])D[0].select();R.reset();}else{var F=R.getNative();if(!F)return;if(D.length){F.removeAllRanges();b.webkit&&w(R.document);}for(var G=0;G<D.length;G++){if(G<D.length-1){var H=D[G],I=D[G+1],J=H.clone();J.setStart(H.endContainer,H.endOffset);J.setEnd(I.startContainer,I.startOffset);if(!J.collapsed){J.shrink(1,true);var K=J.getCommonAncestor(),L=J.getEnclosedNode();if(K.isReadOnly()||L&&L.isReadOnly()){I.setStart(H.startContainer,H.startOffset);D.splice(G--,1);continue;}}}var M=D[G],N=R.document.$.createRange(),O=M.startContainer;if(M.collapsed&&(b.opera||b.gecko&&b.version<10900)&&O.type==1&&!O.getChildCount())O.appendText('');if(M.collapsed&&b.webkit&&r(M)){var P=t(R.document);M.insertNode(P);var Q=P.getNext();if(Q&&!P.getPrevious()&&Q.type==1&&Q.getName()=='br'){w(R.document);M.moveToPosition(Q,3);}else M.moveToPosition(P,4);}N.setStart(M.startContainer.$,M.startOffset);try{N.setEnd(M.endContainer.$,M.endOffset);}catch(S){if(S.toString().indexOf('NS_ERROR_ILLEGAL_VALUE')>=0){M.collapse(1);N.setEnd(M.endContainer.$,M.endOffset);}else throw S;}F.addRange(N);}R.document.fire('selectionchange');R.reset();}},createBookmarks:function(D){return this.getRanges().createBookmarks(D);},createBookmarks2:function(D){return this.getRanges().createBookmarks2(D);},selectBookmarks:function(D){var E=[];for(var F=0;F<D.length;F++){var G=new d.range(this.document);G.moveToBookmark(D[F]);E.push(G);}this.selectRanges(E);return this;},getCommonAncestor:function(){var D=this.getRanges(),E=D[0].startContainer,F=D[D.length-1].endContainer;return E.getCommonAncestor(F);},scrollIntoView:function(){var D=this.getStartElement();
+D.scrollIntoView();}};var z=d.walker.whitespaces(true),A=d.walker.invisible(1),B=/\ufeff|\u00a0/,C={table:1,tbody:1,tr:1};d.range.prototype.select=c?function(D){var O=this;var E=O.collapsed,F,G,H,I=O.getEnclosedNode();if(I)try{H=O.document.$.body.createControlRange();H.addElement(I.$);H.select();return;}catch(P){}if(O.startContainer.type==1&&O.startContainer.getName() in C||O.endContainer.type==1&&O.endContainer.getName() in C)O.shrink(1,true);var J=O.createBookmark(),K=J.startNode,L;if(!E)L=J.endNode;H=O.document.$.body.createTextRange();H.moveToElementText(K.$);H.moveStart('character',1);if(L){var M=O.document.$.body.createTextRange();M.moveToElementText(L.$);H.setEndPoint('EndToEnd',M);H.moveEnd('character',-1);}else{var N=K.getNext(z);F=!(N&&N.getText&&N.getText().match(B))&&(D||!K.hasPrevious()||K.getPrevious().is&&K.getPrevious().is('br'));G=O.document.createElement('span');G.setHtml('&#65279;');G.insertBefore(K);if(F)O.document.createText('\ufeff').insertBefore(K);}O.setStartBefore(K);K.remove();if(E){if(F){H.moveStart('character',-1);H.select();O.document.$.selection.clear();}else H.select();O.moveToPosition(G,3);G.remove();}else{O.setEndBefore(L);L.remove();H.select();}O.document.fire('selectionchange');}:function(){this.document.getSelection().selectRanges([this]);};})();(function(){var m=a.htmlParser.cssStyle,n=e.cssLength,o=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i;function p(r,s){var t=o.exec(r),u=o.exec(s);if(t){if(!t[2]&&u[2]=='px')return u[1];if(t[2]=='px'&&!u[2])return u[1]+'px';}return s;};var q={elements:{$:function(r){var s=r.attributes,t=s&&s['data-cke-realelement'],u=t&&new a.htmlParser.fragment.fromHtml(decodeURIComponent(t)),v=u&&u.children[0];if(v&&r.attributes['data-cke-resizable']){var w=new m(r).rules,x=v.attributes,y=w.width,z=w.height;y&&(x.width=p(x.width,y));z&&(x.height=p(x.height,z));}return v;}}};j.add('fakeobjects',{requires:['htmlwriter'],afterInit:function(r){var s=r.dataProcessor,t=s&&s.htmlFilter;if(t)t.addRules(q);}});a.editor.prototype.createFakeElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x={'class':s,'data-cke-realelement':encodeURIComponent(r.getOuterHtml()),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.getAttribute('align')||''};if(!b.hc)x.src=a.getUrl('images/spacer.gif');if(t)x['data-cke-real-element-type']=t;if(u){x['data-cke-resizable']=u;var y=new m(),z=r.getAttribute('width'),A=r.getAttribute('height');z&&(y.rules.width=n(z));A&&(y.rules.height=n(A));y.populate(x);}return this.document.createElement('img',{attributes:x});
+};a.editor.prototype.createFakeParserElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x,y=new a.htmlParser.basicWriter();r.writeHtml(y);x=y.getHtml();var z={'class':s,'data-cke-realelement':encodeURIComponent(x),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.attributes.align||''};if(!b.hc)z.src=a.getUrl('images/spacer.gif');if(t)z['data-cke-real-element-type']=t;if(u){z['data-cke-resizable']=u;var A=r.attributes,B=new m(),C=A.width,D=A.height;C!=undefined&&(B.rules.width=n(C));D!=undefined&&(B.rules.height=n(D));B.populate(z);}return new a.htmlParser.element('img',z);};a.editor.prototype.restoreRealElement=function(r){if(r.data('cke-real-node-type')!=1)return null;var s=h.createFromHtml(decodeURIComponent(r.data('cke-realelement')),this.document);if(r.data('cke-resizable')){var t=r.getStyle('width'),u=r.getStyle('height');t&&s.setAttribute('width',p(s.getAttribute('width'),t));u&&s.setAttribute('height',p(s.getAttribute('height'),u));}return s;};})();j.add('richcombo',{requires:['floatpanel','listblock','button'],beforeInit:function(m){m.ui.addHandler('richcombo',k.richCombo.handler);}});a.UI_RICHCOMBO='richcombo';k.richCombo=e.createClass({$:function(m){var o=this;e.extend(o,m,{title:m.label,modes:{wysiwyg:1}});var n=o.panel||{};delete o.panel;o.id=e.getNextNumber();o.document=n&&n.parent&&n.parent.getDocument()||a.document;n.className=(n.className||'')+' cke_rcombopanel';n.block={multiSelect:n.multiSelect,attributes:n.attributes};o._={panelDefinition:n,items:{},state:2};},statics:{handler:{create:function(m){return new k.richCombo(m);}}},proto:{renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var o=b,p='cke_'+this.id,q=e.addFunction(function(v){var y=this;var w=y._;if(w.state==0)return;y.createPanel(m);if(w.on){w.panel.hide();return;}y.commit();var x=y.getValue();if(x)w.list.mark(x);else w.list.unmarkAll();w.panel.showBlock(y.id,new h(v),4);},this),r={id:p,combo:this,focus:function(){var v=a.document.getById(p).getChild(1);v.focus();},clickFn:q};function s(){var w=this;var v=w.modes[m.mode]?2:0;w.setState(m.readOnly&&!w.readOnly?0:v);w.setValue('');};m.on('mode',s,this);!this.readOnly&&m.on('readOnly',s,this);var t=e.addFunction(function(v,w){v=new d.event(v);var x=v.getKeystroke();switch(x){case 13:case 32:case 40:e.callFunction(q,w);break;default:r.onkey(r,x);}v.preventDefault();}),u=e.addFunction(function(){r.onfocus&&r.onfocus();});r.keyDownFn=t;n.push('<span class="cke_rcombo" role="presentation">','<span id=',p);
+if(this.className)n.push(' class="',this.className,' cke_off"');n.push(' role="presentation">','<span id="'+p+'_label" class=cke_label>',this.label,'</span>','<a hidefocus=true title="',this.title,'" tabindex="-1"',o.gecko&&o.version>=10900&&!o.hc?'':" href=\"javascript:void('"+this.label+"')\"",' role="button" aria-labelledby="',p,'_label" aria-describedby="',p,'_text" aria-haspopup="true"');if(b.opera||b.gecko&&b.mac)n.push(' onkeypress="return false;"');if(b.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="CKEDITOR.tools.callFunction( ',t,', event, this );" onfocus="return CKEDITOR.tools.callFunction(',u,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',q,', this); return false;"><span><span id="'+p+'_text" class="cke_text cke_inline_label">'+this.label+'</span>'+'</span>'+'<span class=cke_openbutton><span class=cke_icon>'+(b.hc?'&#9660;':b.air?'&nbsp;':'')+'</span></span>'+'</a>'+'</span>'+'</span>');if(this.onRender)this.onRender();return r;},createPanel:function(m){if(this._.panel)return;var n=this._.panelDefinition,o=this._.panelDefinition.block,p=n.parent||a.document.getBody(),q=new k.floatPanel(m,p,n),r=q.addListBlock(this.id,o),s=this;q.onShow=function(){if(s.className)this.element.getFirst().addClass(s.className+'_panel');s.setState(1);r.focus(!s.multiSelect&&s.getValue());s._.on=1;if(s.onOpen)s.onOpen();};q.onHide=function(t){if(s.className)this.element.getFirst().removeClass(s.className+'_panel');s.setState(s.modes&&s.modes[m.mode]?2:0);s._.on=0;if(!t&&s.onClose)s.onClose();};q.onEscape=function(){q.hide();};r.onClick=function(t,u){s.document.getWindow().focus();if(s.onClick)s.onClick.call(s,t,u);if(u)s.setValue(t,s._.items[t]);else s.setValue('');q.hide(false);};this._.panel=q;this._.list=r;q.getBlock(this.id).onHide=function(){s._.on=0;s.setState(2);};if(this.init)this.init();},setValue:function(m,n){var p=this;p._.value=m;var o=p.document.getById('cke_'+p.id+'_text');if(o){if(!(m||n)){n=p.label;o.addClass('cke_inline_label');}else o.removeClass('cke_inline_label');o.setHtml(typeof n!='undefined'?n:m);}},getValue:function(){return this._.value||'';},unmarkAll:function(){this._.list.unmarkAll();},mark:function(m){this._.list.mark(m);},hideItem:function(m){this._.list.hideItem(m);},hideGroup:function(m){this._.list.hideGroup(m);},showAll:function(){this._.list.showAll();},add:function(m,n,o){this._.items[m]=o||m;this._.list.add(m,n,o);},startGroup:function(m){this._.list.startGroup(m);
+},commit:function(){var m=this;if(!m._.committed){m._.list.commit();m._.committed=1;k.fire('ready',m);}m._.committed=1;},setState:function(m){var n=this;if(n._.state==m)return;n.document.getById('cke_'+n.id).setState(m);n._.state=m;}}});k.prototype.addRichCombo=function(m,n){this.add(m,'richcombo',n);};j.add('htmlwriter');a.htmlWriter=e.createClass({base:a.htmlParser.basicWriter,$:function(){var o=this;o.base();o.indentationChars='\t';o.selfClosingEnd=' />';o.lineBreakChars='\n';o.forceSimpleAmpersand=0;o.sortAttributes=1;o._.indent=0;o._.indentation='';o._.inPre=0;o._.rules={};var m=f;for(var n in e.extend({},m.$nonBodyContent,m.$block,m.$listItem,m.$tableContent))o.setRules(n,{indent:1,breakBeforeOpen:1,breakAfterOpen:1,breakBeforeClose:!m[n]['#'],breakAfterClose:1});o.setRules('br',{breakAfterOpen:1});o.setRules('title',{indent:0,breakAfterOpen:0});o.setRules('style',{indent:0,breakBeforeClose:1});o.setRules('pre',{indent:0});},proto:{openTag:function(m,n){var p=this;var o=p._.rules[m];if(p._.indent)p.indentation();else if(o&&o.breakBeforeOpen){p.lineBreak();p.indentation();}p._.output.push('<',m);},openTagClose:function(m,n){var p=this;var o=p._.rules[m];if(n)p._.output.push(p.selfClosingEnd);else{p._.output.push('>');if(o&&o.indent)p._.indentation+=p.indentationChars;}if(o&&o.breakAfterOpen)p.lineBreak();m=='pre'&&(p._.inPre=1);},attribute:function(m,n){if(typeof n=='string'){this.forceSimpleAmpersand&&(n=n.replace(/&amp;/g,'&'));n=e.htmlEncodeAttr(n);}this._.output.push(' ',m,'="',n,'"');},closeTag:function(m){var o=this;var n=o._.rules[m];if(n&&n.indent)o._.indentation=o._.indentation.substr(o.indentationChars.length);if(o._.indent)o.indentation();else if(n&&n.breakBeforeClose){o.lineBreak();o.indentation();}o._.output.push('</',m,'>');m=='pre'&&(o._.inPre=0);if(n&&n.breakAfterClose)o.lineBreak();},text:function(m){var n=this;if(n._.indent){n.indentation();!n._.inPre&&(m=e.ltrim(m));}n._.output.push(m);},comment:function(m){if(this._.indent)this.indentation();this._.output.push('<!--',m,'-->');},lineBreak:function(){var m=this;if(!m._.inPre&&m._.output.length>0)m._.output.push(m.lineBreakChars);m._.indent=1;},indentation:function(){var m=this;if(!m._.inPre)m._.output.push(m._.indentation);m._.indent=0;},setRules:function(m,n){var o=this._.rules[m];if(o)e.extend(o,n,true);else this._.rules[m]=n;}}});j.add('menubutton',{requires:['button','menu'],beforeInit:function(m){m.ui.addHandler('menubutton',k.menuButton.handler);}});a.UI_MENUBUTTON='menubutton';
+(function(){var m=function(n){var o=this._;if(o.state===0)return;o.previousState=o.state;var p=o.menu;if(!p){p=o.menu=new a.menu(n,{panel:{className:n.skinClass+' cke_contextmenu',attributes:{'aria-label':n.lang.common.options}}});p.onHide=e.bind(function(){this.setState(this.modes&&this.modes[n.mode]?o.previousState:0);},this);if(this.onMenu)p.addListener(this.onMenu);}if(o.on){p.hide();return;}this.setState(1);p.show(a.document.getById(this._.id),4);};k.menuButton=e.createClass({base:k.button,$:function(n){var o=n.panel;delete n.panel;this.base(n);this.hasArrow=true;this.click=m;},statics:{handler:{create:function(n){return new k.menuButton(n);}}}});})();j.add('dialogui');(function(){var m=function(u){var x=this;x._||(x._={});x._['default']=x._.initValue=u['default']||'';x._.required=u.required||false;var v=[x._];for(var w=1;w<arguments.length;w++)v.push(arguments[w]);v.push(true);e.extend.apply(e,v);return x._;},n={build:function(u,v,w){return new k.dialog.textInput(u,v,w);}},o={build:function(u,v,w){return new k.dialog[v.type](u,v,w);}},p={build:function(u,v,w){var x=v.children,y,z=[],A=[];for(var B=0;B<x.length&&(y=x[B]);B++){var C=[];z.push(C);A.push(a.dialog._.uiElementBuilders[y.type].build(u,y,C));}return new k.dialog[v.type](u,A,z,w,v);}},q={isChanged:function(){return this.getValue()!=this.getInitValue();},reset:function(u){this.setValue(this.getInitValue(),u);},setInitValue:function(){this._.initValue=this.getValue();},resetInitValue:function(){this._.initValue=this._['default'];},getInitValue:function(){return this._.initValue;}},r=e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onChange:function(u,v){if(!this._.domOnChangeRegistered){u.on('load',function(){this.getInputElement().on('change',function(){if(!u.parts.dialog.isVisible())return;this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},true),s=/^on([A-Z]\w+)/,t=function(u){for(var v in u){if(s.test(v)||v=='title'||v=='type')delete u[v];}return u;};e.extend(k.dialog,{labeledElement:function(u,v,w,x){if(arguments.length<4)return;var y=m.call(this,v);y.labelId=e.getNextId()+'_label';var z=this._.children=[],A=function(){var B=[],C=v.required?' cke_required':'';if(v.labelLayout!='horizontal')B.push('<label class="cke_dialog_ui_labeled_label'+C+'" ',' id="'+y.labelId+'"',y.inputId?' for="'+y.inputId+'"':'',(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',v.label,'</label>','<div class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+' role="presentation">',x.call(this,u,v),'</div>');
+else{var D={type:'hbox',widths:v.widths,padding:0,children:[{type:'html',html:'<label class="cke_dialog_ui_labeled_label'+C+'"'+' id="'+y.labelId+'"'+' for="'+y.inputId+'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>'+e.htmlEncode(v.label)+'</span>'},{type:'html',html:'<span class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+'>'+x.call(this,u,v)+'</span>'}]};a.dialog._.uiElementBuilders.hbox.build(u,D,B);}return B.join('');};k.dialog.uiElement.call(this,u,v,w,'div',null,{role:'presentation'},A);},textInput:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this._.inputId=e.getNextId()+'_textInput',y={'class':'cke_dialog_ui_input_'+v.type,id:x,type:v.type},z;if(v.validate)this.validate=v.validate;if(v.maxLength)y.maxlength=v.maxLength;if(v.size)y.size=v.size;if(v.inputStyle)y.style=v.inputStyle;var A=function(){var B=['<div class="cke_dialog_ui_input_',v.type,'" role="presentation"'];if(v.width)B.push('style="width:'+v.width+'" ');B.push('><input ');y['aria-labelledby']=this._.labelId;this._.required&&(y['aria-required']=this._.required);for(var C in y)B.push(C+'="'+y[C]+'" ');B.push(' /></div>');return B.join('');};k.dialog.labeledElement.call(this,u,v,w,A);},textarea:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this,y=this._.inputId=e.getNextId()+'_textarea',z={};if(v.validate)this.validate=v.validate;z.rows=v.rows||5;z.cols=v.cols||20;if(typeof v.inputStyle!='undefined')z.style=v.inputStyle;var A=function(){z['aria-labelledby']=this._.labelId;this._.required&&(z['aria-required']=this._.required);var B=['<div class="cke_dialog_ui_input_textarea" role="presentation"><textarea class="cke_dialog_ui_input_textarea" id="',y,'" '];for(var C in z)B.push(C+'="'+e.htmlEncode(z[C])+'" ');B.push('>',e.htmlEncode(x._['default']),'</textarea></div>');return B.join('');};k.dialog.labeledElement.call(this,u,v,w,A);},checkbox:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v,{'default':!!v['default']});if(v.validate)this.validate=v.validate;var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_checkbox':e.getNextId()+'_checkbox'},true),A=[],B=e.getNextId()+'_label',C={'class':'cke_dialog_ui_checkbox_input',type:'checkbox','aria-labelledby':B};t(z);if(v['default'])C.checked='checked';if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;x.checkbox=new k.dialog.uiElement(u,z,A,'input',null,C);A.push(' <label id="',B,'" for="',C.id,'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',e.htmlEncode(v.label),'</label>');
+return A.join('');};k.dialog.uiElement.call(this,u,v,w,'span',null,null,y);},radio:function(u,v,w){if(arguments.length<3)return;m.call(this,v);if(!this._['default'])this._['default']=this._.initValue=v.items[0][1];if(v.validate)this.validate=v.valdiate;var x=[],y=this,z=function(){var A=[],B=[],C={'class':'cke_dialog_ui_radio_item','aria-labelledby':this._.labelId},D=v.id?v.id+'_radio':e.getNextId()+'_radio';for(var E=0;E<v.items.length;E++){var F=v.items[E],G=F[2]!==undefined?F[2]:F[0],H=F[1]!==undefined?F[1]:F[0],I=e.getNextId()+'_radio_input',J=I+'_label',K=e.extend({},v,{id:I,title:null,type:null},true),L=e.extend({},K,{title:G},true),M={type:'radio','class':'cke_dialog_ui_radio_input',name:D,value:H,'aria-labelledby':J},N=[];if(y._['default']==H)M.checked='checked';t(K);t(L);if(typeof K.inputStyle!='undefined')K.style=K.inputStyle;x.push(new k.dialog.uiElement(u,K,N,'input',null,M));N.push(' ');new k.dialog.uiElement(u,L,N,'label',null,{id:J,'for':M.id},F[0]);A.push(N.join(''));}new k.dialog.hbox(u,x,A,B);return B.join('');};k.dialog.labeledElement.call(this,u,v,w,z);this._.children=x;},button:function(u,v,w){if(!arguments.length)return;if(typeof v=='function')v=v(u.getParentEditor());m.call(this,v,{disabled:v.disabled||false});a.event.implementOn(this);var x=this;u.on('load',function(A){var B=this.getElement();(function(){B.on('click',function(C){x.fire('click',{dialog:x.getDialog()});C.data.preventDefault();});B.on('keydown',function(C){if(C.data.getKeystroke() in {32:1}){x.click();C.data.preventDefault();}});})();B.unselectable();},this);var y=e.extend({},v);delete y.style;var z=e.getNextId()+'_label';k.dialog.uiElement.call(this,u,y,w,'a',null,{style:v.style,href:'javascript:void(0)',title:v.label,hidefocus:'true','class':v['class'],role:'button','aria-labelledby':z},'<span id="'+z+'" class="cke_dialog_ui_button">'+e.htmlEncode(v.label)+'</span>');},select:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v);if(v.validate)this.validate=v.validate;x.inputId=e.getNextId()+'_select';var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_select':e.getNextId()+'_select'},true),A=[],B=[],C={id:x.inputId,'class':'cke_dialog_ui_input_select','aria-labelledby':this._.labelId};if(v.size!=undefined)C.size=v.size;if(v.multiple!=undefined)C.multiple=v.multiple;t(z);for(var D=0,E;D<v.items.length&&(E=v.items[D]);D++)B.push('<option value="',e.htmlEncode(E[1]!==undefined?E[1]:E[0]).replace(/"/g,'&quot;'),'" /> ',e.htmlEncode(E[0]));if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;
+x.select=new k.dialog.uiElement(u,z,A,'select',null,C,B.join(''));return A.join('');};k.dialog.labeledElement.call(this,u,v,w,y);},file:function(u,v,w){if(arguments.length<3)return;if(v['default']===undefined)v['default']='';var x=e.extend(m.call(this,v),{definition:v,buttons:[]});if(v.validate)this.validate=v.validate;var y=function(){x.frameId=e.getNextId()+'_fileInput';var z=b.isCustomDomain(),A=['<iframe frameborder="0" allowtransparency="0" class="cke_dialog_ui_input_file" role="presentation" id="',x.frameId,'" title="',v.label,'" src="javascript:void('];A.push(z?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');A.push(')"></iframe>');return A.join('');};u.on('load',function(){var z=a.document.getById(x.frameId),A=z.getParent();A.addClass('cke_dialog_ui_input_file');});k.dialog.labeledElement.call(this,u,v,w,y);},fileButton:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v),y=this;if(v.validate)this.validate=v.validate;var z=e.extend({},v),A=z.onClick;z.className=(z.className?z.className+' ':'')+'cke_dialog_ui_button';z.onClick=function(B){var C=v['for'];if(!A||A.call(this,B)!==false){u.getContentElement(C[0],C[1]).submit();this.disable();}};u.on('load',function(){u.getContentElement(v['for'][0],v['for'][1])._.buttons.push(y);});k.dialog.button.call(this,u,z,w);},html:(function(){var u=/^\s*<[\w:]+\s+([^>]*)?>/,v=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,w=/\/$/;return function(x,y,z){if(arguments.length<3)return;var A=[],B,C=y.html,D,E;if(C.charAt(0)!='<')C='<span>'+C+'</span>';var F=y.focus;if(F){var G=this.focus;this.focus=function(){G.call(this);typeof F=='function'&&F.call(this);this.fire('focus');};if(y.isFocusable){var H=this.isFocusable;this.isFocusable=H;}this.keyboardFocusable=true;}k.dialog.uiElement.call(this,x,y,A,'span',null,null,'');B=A.join('');D=B.match(u);E=C.match(v)||['','',''];if(w.test(E[1])){E[1]=E[1].slice(0,-1);E[2]='/'+E[2];}z.push([E[1],' ',D[1]||'',E[2]].join(''));};})(),fieldset:function(u,v,w,x,y){var z=y.label,A=function(){var B=[];z&&B.push('<legend'+(y.labelStyle?' style="'+y.labelStyle+'"':'')+'>'+z+'</legend>');for(var C=0;C<w.length;C++)B.push(w[C]);return B.join('');};this._={children:v};k.dialog.uiElement.call(this,u,y,x,'fieldset',null,null,A);}},true);k.dialog.html.prototype=new k.dialog.uiElement();k.dialog.labeledElement.prototype=e.extend(new k.dialog.uiElement(),{setLabel:function(u){var v=a.document.getById(this._.labelId);if(v.getChildCount()<1)new d.text(u,a.document).appendTo(v);
+else v.getChild(0).$.nodeValue=u;return this;},getLabel:function(){var u=a.document.getById(this._.labelId);if(!u||u.getChildCount()<1)return '';else return u.getChild(0).getText();},eventProcessors:r},true);k.dialog.button.prototype=e.extend(new k.dialog.uiElement(),{click:function(){var u=this;if(!u._.disabled)return u.fire('click',{dialog:u._.dialog});u.getElement().$.blur();return false;},enable:function(){this._.disabled=false;var u=this.getElement();u&&u.removeClass('cke_disabled');},disable:function(){this._.disabled=true;this.getElement().addClass('cke_disabled');},isVisible:function(){return this.getElement().getFirst().isVisible();},isEnabled:function(){return!this._.disabled;},eventProcessors:e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onClick:function(u,v){this.on('click',function(){this.getElement().focus();v.apply(this,arguments);});}},true),accessKeyUp:function(){this.click();},accessKeyDown:function(){this.focus();},keyboardFocusable:true},true);k.dialog.textInput.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return a.document.getById(this._.inputId);},focus:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();v&&v.$.focus();},0);},select:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();if(v){v.$.focus();v.$.select();}},0);},accessKeyUp:function(){this.select();},setValue:function(u){!u&&(u='');return k.dialog.uiElement.prototype.setValue.apply(this,arguments);},keyboardFocusable:true},q,true);k.dialog.textarea.prototype=new k.dialog.textInput();k.dialog.select.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return this._.select.getElement();},add:function(u,v,w){var x=new h('option',this.getDialog().getParentEditor().document),y=this.getInputElement().$;x.$.text=u;x.$.value=v===undefined||v===null?u:v;if(w===undefined||w===null){if(c)y.add(x.$);else y.add(x.$,null);}else y.add(x.$,w);return this;},remove:function(u){var v=this.getInputElement().$;v.remove(u);return this;},clear:function(){var u=this.getInputElement().$;while(u.length>0)u.remove(0);return this;},keyboardFocusable:true},q,true);k.dialog.checkbox.prototype=e.extend(new k.dialog.uiElement(),{getInputElement:function(){return this._.checkbox.getElement();},setValue:function(u,v){this.getInputElement().$.checked=u;!v&&this.fire('change',{value:u});},getValue:function(){return this.getInputElement().$.checked;},accessKeyUp:function(){this.setValue(!this.getValue());
+},eventProcessors:{onChange:function(u,v){if(!c||b.version>8)return r.onChange.apply(this,arguments);else{u.on('load',function(){var w=this._.checkbox.getElement();w.on('propertychange',function(x){x=x.data.$;if(x.propertyName=='checked')this.fire('change',{value:w.$.checked});},this);},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.radio.prototype=e.extend(new k.dialog.uiElement(),{setValue:function(u,v){var w=this._.children,x;for(var y=0;y<w.length&&(x=w[y]);y++)x.getElement().$.checked=x.getValue()==u;!v&&this.fire('change',{value:u});},getValue:function(){var u=this._.children;for(var v=0;v<u.length;v++){if(u[v].getElement().$.checked)return u[v].getValue();}return null;},accessKeyUp:function(){var u=this._.children,v;for(v=0;v<u.length;v++){if(u[v].getElement().$.checked){u[v].getElement().focus();return;}}u[0].getElement().focus();},eventProcessors:{onChange:function(u,v){if(!c)return r.onChange.apply(this,arguments);else{u.on('load',function(){var w=this._.children,x=this;for(var y=0;y<w.length;y++){var z=w[y].getElement();z.on('propertychange',function(A){A=A.data.$;if(A.propertyName=='checked'&&this.$.checked)x.fire('change',{value:this.getAttribute('value')});});}},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.file.prototype=e.extend(new k.dialog.labeledElement(),q,{getInputElement:function(){var u=a.document.getById(this._.frameId).getFrameDocument();return u.$.forms.length>0?new h(u.$.forms[0].elements[0]):this.getElement();},submit:function(){this.getInputElement().getParent().$.submit();return this;},getAction:function(){return this.getInputElement().getParent().$.action;},registerEvents:function(u){var v=/^on([A-Z]\w+)/,w,x=function(z,A,B,C){z.on('formLoaded',function(){z.getInputElement().on(B,C,z);});};for(var y in u){if(!(w=y.match(v)))continue;if(this.eventProcessors[y])this.eventProcessors[y].call(this,this._.dialog,u[y]);else x(this,this._.dialog,w[1].toLowerCase(),u[y]);}return this;},reset:function(){var u=this._,v=a.document.getById(u.frameId),w=v.getFrameDocument(),x=u.definition,y=u.buttons,z=this.formLoadedNumber,A=this.formUnloadNumber,B=u.dialog._.editor.lang.dir,C=u.dialog._.editor.langCode;if(!z){z=this.formLoadedNumber=e.addFunction(function(){this.fire('formLoaded');},this);A=this.formUnloadNumber=e.addFunction(function(){this.getInputElement().clearCustomData();},this);this.getDialog()._.editor.on('destroy',function(){e.removeFunction(z);e.removeFunction(A);
+});}function D(){w.$.open();if(b.isCustomDomain())w.$.domain=document.domain;var E='';if(x.size)E=x.size-(c?7:0);var F=u.frameId+'_input';w.$.write(['<html dir="'+B+'" lang="'+C+'"><head><title></title></head><body style="margin: 0; overflow: hidden; background: transparent;">','<form enctype="multipart/form-data" method="POST" dir="'+B+'" lang="'+C+'" action="',e.htmlEncode(x.action),'">','<label id="',u.labelId,'" for="',F,'" style="display:none">',e.htmlEncode(x.label),'</label>','<input id="',F,'" aria-labelledby="',u.labelId,'" type="file" name="',e.htmlEncode(x.id||'cke_upload'),'" size="',e.htmlEncode(E>0?E:''),'" />','</form>','</body></html>','<script>window.parent.CKEDITOR.tools.callFunction('+z+');','window.onbeforeunload = function() {window.parent.CKEDITOR.tools.callFunction('+A+')}</script>'].join(''));w.$.close();for(var G=0;G<y.length;G++)y[G].enable();};if(b.gecko)setTimeout(D,500);else D();},getValue:function(){return this.getInputElement().$.value||'';},setInitValue:function(){this._.initValue='';},eventProcessors:{onChange:function(u,v){if(!this._.domOnChangeRegistered){this.on('formLoaded',function(){this.getInputElement().on('change',function(){this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},keyboardFocusable:true},true);k.dialog.fileButton.prototype=new k.dialog.button();k.dialog.fieldset.prototype=e.clone(k.dialog.hbox.prototype);a.dialog.addUIElement('text',n);a.dialog.addUIElement('password',n);a.dialog.addUIElement('textarea',o);a.dialog.addUIElement('checkbox',o);a.dialog.addUIElement('radio',o);a.dialog.addUIElement('button',o);a.dialog.addUIElement('select',o);a.dialog.addUIElement('file',o);a.dialog.addUIElement('fileButton',o);a.dialog.addUIElement('html',o);a.dialog.addUIElement('fieldset',p);})();j.add('panel',{beforeInit:function(m){m.ui.addHandler('panel',k.panel.handler);}});a.UI_PANEL='panel';k.panel=function(m,n){var o=this;if(n)e.extend(o,n);e.extend(o,{className:'',css:[]});o.id=e.getNextId();o.document=m;o._={blocks:{}};};k.panel.handler={create:function(m){return new k.panel(m);}};k.panel.prototype={renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var p=this;var o=p.id;n.push('<div class="',m.skinClass,'" lang="',m.langCode,'" role="presentation" style="display:none;z-index:'+(m.config.baseFloatZIndex+1)+'">'+'<div'+' id=',o,' dir=',m.lang.dir,' role="presentation" class="cke_panel cke_',m.lang.dir);if(p.className)n.push(' ',p.className);
+n.push('">');if(p.forceIFrame||p.css.length){n.push('<iframe id="',o,'_frame" frameborder="0" role="application" src="javascript:void(');n.push(b.isCustomDomain()?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');n.push(')"></iframe>');}n.push('</div></div>');return o;},getHolderElement:function(){var m=this._.holder;if(!m){if(this.forceIFrame||this.css.length){var n=this.document.getById(this.id+'_frame'),o=n.getParent(),p=o.getAttribute('dir'),q=o.getParent().getAttribute('class'),r=o.getParent().getAttribute('lang'),s=n.getFrameDocument();b.iOS&&o.setStyles({overflow:'scroll','-webkit-overflow-scrolling':'touch'});var t=e.addFunction(e.bind(function(w){this.isLoaded=true;if(this.onLoad)this.onLoad();},this)),u='<!DOCTYPE html><html dir="'+p+'" class="'+q+'_container" lang="'+r+'">'+'<head>'+'<style>.'+q+'_container{visibility:hidden}</style>'+e.buildStyleHtml(this.css)+'</head>'+'<body class="cke_'+p+' cke_panel_frame '+b.cssClass+'" style="margin:0;padding:0"'+' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction('+t+');"></body>'+'</html>';s.write(u);var v=s.getWindow();v.$.CKEDITOR=a;s.on('key'+(b.opera?'press':'down'),function(w){var z=this;var x=w.data.getKeystroke(),y=z.document.getById(z.id).getAttribute('dir');if(z._.onKeyDown&&z._.onKeyDown(x)===false){w.data.preventDefault();return;}if(x==27||x==(y=='rtl'?39:37))if(z.onEscape&&z.onEscape(x)===false)w.data.preventDefault();},this);m=s.getBody();m.unselectable();b.air&&e.callFunction(t);}else m=this.document.getById(this.id);this._.holder=m;}return m;},addBlock:function(m,n){var o=this;n=o._.blocks[m]=n instanceof k.panel.block?n:new k.panel.block(o.getHolderElement(),n);if(!o._.currentBlock)o.showBlock(m);return n;},getBlock:function(m){return this._.blocks[m];},showBlock:function(m){var r=this;var n=r._.blocks,o=n[m],p=r._.currentBlock,q=!r.forceIFrame||c?r._.holder:r.document.getById(r.id+'_frame');if(p){q.removeAttributes(p.attributes);p.hide();}r._.currentBlock=o;q.setAttributes(o.attributes);a.fire('ariaWidget',q);o._.focusIndex=-1;r._.onKeyDown=o.onKeyDown&&e.bind(o.onKeyDown,o);o.show();return o;},destroy:function(){this.element&&this.element.remove();}};k.panel.block=e.createClass({$:function(m,n){var o=this;o.element=m.append(m.getDocument().createElement('div',{attributes:{tabIndex:-1,'class':'cke_panel_block',role:'presentation'},styles:{display:'none'}}));if(n)e.extend(o,n);if(!o.attributes.title)o.attributes.title=o.attributes['aria-label'];
+o.keys={};o._.focusIndex=-1;o.element.disableContextMenu();},_:{markItem:function(m){var p=this;if(m==-1)return;var n=p.element.getElementsByTag('a'),o=n.getItem(p._.focusIndex=m);if(b.webkit||b.opera)o.getDocument().getWindow().focus();o.focus();p.onMark&&p.onMark(o);}},proto:{show:function(){this.element.setStyle('display','');},hide:function(){var m=this;if(!m.onHide||m.onHide.call(m)!==true)m.element.setStyle('display','none');},onKeyDown:function(m){var r=this;var n=r.keys[m];switch(n){case 'next':var o=r._.focusIndex,p=r.element.getElementsByTag('a'),q;while(q=p.getItem(++o)){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'prev':o=r._.focusIndex;p=r.element.getElementsByTag('a');while(o>0&&(q=p.getItem(--o))){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'click':case 'mouseup':o=r._.focusIndex;q=o>=0&&r.element.getElementsByTag('a').getItem(o);if(q)q.$[n]?q.$[n]():q.$['on'+n]();return false;}return true;}}});j.add('listblock',{requires:['panel'],onLoad:function(){k.panel.prototype.addListBlock=function(m,n){return this.addBlock(m,new k.listBlock(this.getHolderElement(),n));};k.listBlock=e.createClass({base:k.panel.block,$:function(m,n){var q=this;n=n||{};var o=n.attributes||(n.attributes={});(q.multiSelect=!!n.multiSelect)&&(o['aria-multiselectable']=true);!o.role&&(o.role='listbox');q.base.apply(q,arguments);var p=q.keys;p[40]='next';p[9]='next';p[38]='prev';p[2228224+9]='prev';p[32]=c?'mouseup':'click';c&&(p[13]='mouseup');q._.pendingHtml=[];q._.items={};q._.groups={};},_:{close:function(){if(this._.started){this._.pendingHtml.push('</ul>');delete this._.started;}},getClick:function(){if(!this._.click)this._.click=e.addFunction(function(m){var o=this;var n=true;if(o.multiSelect)n=o.toggle(m);else o.mark(m);if(o.onClick)o.onClick(m,n);},this);return this._.click;}},proto:{add:function(m,n,o){var r=this;var p=r._.pendingHtml,q=e.getNextId();if(!r._.started){p.push('<ul role="presentation" class=cke_panel_list>');r._.started=1;r._.size=r._.size||0;}r._.items[m]=q;p.push('<li id=',q,' class=cke_panel_listItem role=presentation><a id="',q,'_option" _cke_focus=1 hidefocus=true title="',o||m,'" href="javascript:void(\'',m,"')\" "+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',r._.getClick(),",'",m,"'); return false;\"",' role="option">',n||m,'</a></li>');},startGroup:function(m){this._.close();var n=e.getNextId();
+this._.groups[m]=n;this._.pendingHtml.push('<h1 role="presentation" id=',n,' class=cke_panel_grouptitle>',m,'</h1>');},commit:function(){var m=this;m._.close();m.element.appendHtml(m._.pendingHtml.join(''));delete m._.size;m._.pendingHtml=[];},toggle:function(m){var n=this.isMarked(m);if(n)this.unmark(m);else this.mark(m);return!n;},hideGroup:function(m){var n=this.element.getDocument().getById(this._.groups[m]),o=n&&n.getNext();if(n){n.setStyle('display','none');if(o&&o.getName()=='ul')o.setStyle('display','none');}},hideItem:function(m){this.element.getDocument().getById(this._.items[m]).setStyle('display','none');},showAll:function(){var m=this._.items,n=this._.groups,o=this.element.getDocument();for(var p in m)o.getById(m[p]).setStyle('display','');for(var q in n){var r=o.getById(n[q]),s=r.getNext();r.setStyle('display','');if(s&&s.getName()=='ul')s.setStyle('display','');}},mark:function(m){var p=this;if(!p.multiSelect)p.unmarkAll();var n=p._.items[m],o=p.element.getDocument().getById(n);o.addClass('cke_selected');p.element.getDocument().getById(n+'_option').setAttribute('aria-selected',true);p.onMark&&p.onMark(o);},unmark:function(m){var q=this;var n=q.element.getDocument(),o=q._.items[m],p=n.getById(o);p.removeClass('cke_selected');n.getById(o+'_option').removeAttribute('aria-selected');q.onUnmark&&q.onUnmark(p);},unmarkAll:function(){var q=this;var m=q._.items,n=q.element.getDocument();for(var o in m){var p=m[o];n.getById(p).removeClass('cke_selected');n.getById(p+'_option').removeAttribute('aria-selected');}q.onUnmark&&q.onUnmark();},isMarked:function(m){return this.element.getDocument().getById(this._.items[m]).hasClass('cke_selected');},focus:function(m){this._.focusIndex=-1;if(m){var n=this.element.getDocument().getById(this._.items[m]).getFirst(),o=this.element.getElementsByTag('a'),p,q=-1;while(p=o.getItem(++q)){if(p.equals(n)){this._.focusIndex=q;break;}}setTimeout(function(){n.focus();},0);}}}});}});a.themes.add('default',(function(){var m={};function n(o,p){var q,r;r=o.config.sharedSpaces;r=r&&r[p];r=r&&a.document.getById(r);if(r){var s='<span class="cke_shared " dir="'+o.lang.dir+'"'+'>'+'<span class="'+o.skinClass+' '+o.id+' cke_editor_'+o.name+'">'+'<span class="'+b.cssClass+'">'+'<span class="cke_wrapper cke_'+o.lang.dir+'">'+'<span class="cke_editor">'+'<div class="cke_'+p+'">'+'</div></span></span></span></span></span>',t=r.append(h.createFromHtml(s,r.getDocument()));if(r.getCustomData('cke_hasshared'))t.hide();else r.setCustomData('cke_hasshared',1);
+q=t.getChild([0,0,0,0]);!o.sharedSpaces&&(o.sharedSpaces={});o.sharedSpaces[p]=q;o.on('focus',function(){for(var u=0,v,w=r.getChildren();v=w.getItem(u);u++){if(v.type==1&&!v.equals(t)&&v.hasClass('cke_shared'))v.hide();}t.show();});o.on('destroy',function(){t.remove();});}return q;};return{build:function(o,p){var q=o.name,r=o.element,s=o.elementMode;if(!r||s==0)return;if(s==1)r.hide();var t=o.fire('themeSpace',{space:'top',html:''}).html,u=o.fire('themeSpace',{space:'contents',html:''}).html,v=o.fireOnce('themeSpace',{space:'bottom',html:''}).html,w=u&&o.config.height,x=o.config.tabIndex||o.element.getAttribute('tabindex')||0;if(!u)w='auto';else if(!isNaN(w))w+='px';var y='',z=o.config.width;if(z){if(!isNaN(z))z+='px';y+='width: '+z+';';}var A=t&&n(o,'top'),B=n(o,'bottom');A&&(A.setHtml(t),t='');B&&(B.setHtml(v),v='');var C='<style>.'+o.skinClass+'{visibility:hidden;}</style>';if(m[o.skinClass])C='';else m[o.skinClass]=1;var D=h.createFromHtml(['<span id="cke_',q,'" class="',o.skinClass,' ',o.id,' cke_editor_',q,'" dir="',o.lang.dir,'" title="',b.gecko?' ':'','" lang="',o.langCode,'"'+(b.webkit?' tabindex="'+x+'"':'')+' role="application"'+' aria-labelledby="cke_',q,'_arialbl"'+(y?' style="'+y+'"':'')+'>'+'<span id="cke_',q,'_arialbl" class="cke_voice_label">'+o.lang.editor+'</span>'+'<span class="',b.cssClass,'" role="presentation"><span class="cke_wrapper cke_',o.lang.dir,'" role="presentation"><table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody><tr',t?'':' style="display:none"',' role="presentation"><td id="cke_top_',q,'" class="cke_top" role="presentation">',t,'</td></tr><tr',u?'':' style="display:none"',' role="presentation"><td id="cke_contents_',q,'" class="cke_contents" style="height:',w,'" role="presentation">',u,'</td></tr><tr',v?'':' style="display:none"',' role="presentation"><td id="cke_bottom_',q,'" class="cke_bottom" role="presentation">',v,'</td></tr></tbody></table>'+C+'</span>'+'</span>'+'</span>'].join(''));D.getChild([1,0,0,0,0]).unselectable();D.getChild([1,0,0,0,2]).unselectable();if(s==1)D.insertAfter(r);else r.append(D);o.container=D;D.disableContextMenu();o.on('contentDirChanged',function(E){var F=(o.lang.dir!=E.data?'add':'remove')+'Class';D.getChild(1)[F]('cke_mixed_dir_content');var G=this.sharedSpaces&&this.sharedSpaces[this.config.toolbarLocation];G&&G.getParent().getParent()[F]('cke_mixed_dir_content');});o.fireOnce('themeLoaded');o.fireOnce('uiReady');},buildDialog:function(o){var p=e.getNextNumber(),q=h.createFromHtml(['<div class="',o.id,'_dialog cke_editor_',o.name.replace('.','\\.'),'_dialog cke_skin_',o.skinName,'" dir="',o.lang.dir,'" lang="',o.langCode,'" role="dialog" aria-labelledby="%title#"><table class="cke_dialog',' '+b.cssClass,' cke_',o.lang.dir,'" style="position:absolute" role="presentation"><tr><td role="presentation"><div class="%body" role="presentation"><div id="%title#" class="%title" role="presentation"></div><a id="%close_button#" class="%close_button" href="javascript:void(0)" title="'+o.lang.common.close+'" role="button"><span class="cke_label">X</span></a>'+'<div id="%tabs#" class="%tabs" role="tablist"></div>'+'<table class="%contents" role="presentation">'+'<tr>'+'<td id="%contents#" class="%contents" role="presentation"></td>'+'</tr>'+'<tr>'+'<td id="%footer#" class="%footer" role="presentation"></td>'+'</tr>'+'</table>'+'</div>'+'<div id="%tl#" class="%tl"></div>'+'<div id="%tc#" class="%tc"></div>'+'<div id="%tr#" class="%tr"></div>'+'<div id="%ml#" class="%ml"></div>'+'<div id="%mr#" class="%mr"></div>'+'<div id="%bl#" class="%bl"></div>'+'<div id="%bc#" class="%bc"></div>'+'<div id="%br#" class="%br"></div>'+'</td></tr>'+'</table>',c?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+p).replace(/%/g,'cke_dialog_')),r=q.getChild([0,0,0,0,0]),s=r.getChild(0),t=r.getChild(1);
+if(c&&!b.ie6Compat){var u=b.isCustomDomain(),v='javascript:void(function(){'+encodeURIComponent('document.open();'+(u?'document.domain="'+document.domain+'";':'')+'document.close();')+'}())',w=h.createFromHtml('<iframe frameBorder="0" class="cke_iframe_shim" src="'+v+'"'+' tabIndex="-1"'+'></iframe>');w.appendTo(r.getParent());}s.unselectable();t.unselectable();return{element:q,parts:{dialog:q.getChild(0),title:s,close:t,tabs:r.getChild(2),contents:r.getChild([3,0,0,0]),footer:r.getChild([3,0,1,0])}};},destroy:function(o){var p=o.container,q=o.element;if(p){p.clearCustomData();p.remove();}if(q){q.clearCustomData();o.elementMode==1&&q.show();delete o.element;}}};})());a.editor.prototype.getThemeSpace=function(m){var n='cke_'+m,o=this._[n]||(this._[n]=a.document.getById(n+'_'+this.name));return o;};a.editor.prototype.resize=function(m,n,o,p){var v=this;var q=v.container,r=a.document.getById('cke_contents_'+v.name),s=b.webkit&&v.document&&v.document.getWindow().$.frameElement,t=p?q.getChild(1):q;t.setSize('width',m,true);s&&(s.style.width='1%');var u=o?0:(t.$.offsetHeight||0)-(r.$.clientHeight||0);r.setStyle('height',Math.max(n-u,0)+'px');s&&(s.style.width='100%');v.fire('resize');};a.editor.prototype.getResizable=function(m){return m?a.document.getById('cke_contents_'+this.name):this.container;};})();
diff --git a/web/imcms/ckeditor/ckeditor.pack b/web/imcms/ckeditor/ckeditor.pack
new file mode 100644
index 0000000000..6c36089ee7
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor.pack
@@ -0,0 +1,211 @@
+/*
+ * CKPackager - Sample Package file
+ */
+
+header :
+	'/*'																			+ '\n' +
+	'Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.'	+ '\n' +
+	'For licensing, see LICENSE.html or http://ckeditor.com/license'				+ '\n' +
+	'*/'																			+ '\n' +
+	'\n',
+
+noCheck : false,
+
+constants :
+	{
+		'CKEDITOR.ELEMENT_MODE_NONE' : 0,
+		'CKEDITOR.ELEMENT_MODE_REPLACE' : 1,
+		'CKEDITOR.ELEMENT_MODE_APPENDTO' : 2,
+		'CKEDITOR.CTRL' : 0x110000,
+		'CKEDITOR.SHIFT' : 0x220000,
+		'CKEDITOR.ALT' : 0x440000,
+		'CKEDITOR.NODE_ELEMENT' : 1,
+		'CKEDITOR.NODE_DOCUMENT' : 9,
+		'CKEDITOR.NODE_TEXT' : 3,
+		'CKEDITOR.NODE_COMMENT' : 8,
+		'CKEDITOR.NODE_DOCUMENT_FRAGMENT' : 11,
+		'CKEDITOR.POSITION_IDENTICAL' : 0,
+		'CKEDITOR.POSITION_DISCONNECTED' : 1,
+		'CKEDITOR.POSITION_FOLLOWING' : 2,
+		'CKEDITOR.POSITION_PRECEDING' : 4,
+		'CKEDITOR.POSITION_IS_CONTAINED' : 8,
+		'CKEDITOR.POSITION_CONTAINS' : 16,
+		'CKEDITOR.ENTER_P' : 1,
+		'CKEDITOR.ENTER_BR' : 2,
+		'CKEDITOR.ENTER_DIV' : 3,
+		'CKEDITOR.TRISTATE_ON' : 1,
+		'CKEDITOR.TRISTATE_OFF' : 2,
+		'CKEDITOR.TRISTATE_DISABLED' : 0,
+		'CKEDITOR.POSITION_AFTER_START' : 1,
+		'CKEDITOR.POSITION_BEFORE_END' : 2,
+		'CKEDITOR.POSITION_BEFORE_START' : 3,
+		'CKEDITOR.POSITION_AFTER_END' : 4,
+		'CKEDITOR.ENLARGE_ELEMENT' : 1,
+		'CKEDITOR.ENLARGE_BLOCK_CONTENTS' : 2,
+		'CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS' : 3,
+		'CKEDITOR.START' : 1,
+		'CKEDITOR.END' : 2,
+		'CKEDITOR.STARTEND' : 3,
+		'CKEDITOR.SHRINK_ELEMENT' : 1,
+		'CKEDITOR.SHRINK_TEXT' : 2,
+		'CKEDITOR.UI_BUTTON' : '\'button\'',
+		'CKEDITOR.DIALOG_RESIZE_NONE' : 0,
+		'CKEDITOR.DIALOG_RESIZE_WIDTH' : 1,
+		'CKEDITOR.DIALOG_RESIZE_HEIGHT' : 2,
+		'CKEDITOR.DIALOG_RESIZE_BOTH' : 3,
+		'CKEDITOR.VALIDATE_OR' : 1,
+		'CKEDITOR.VALIDATE_AND' : 2,
+		'CKEDITOR.STYLE_BLOCK' : 1,
+		'CKEDITOR.STYLE_INLINE' : 2,
+		'CKEDITOR.STYLE_OBJECT' : 3,
+		'CKEDITOR.UI_PANELBUTTON' : '\'panelbutton\'',
+		'CKEDITOR.SELECTION_NONE' : 1,
+		'CKEDITOR.SELECTION_TEXT' : 2,
+		'CKEDITOR.SELECTION_ELEMENT' : 3,
+		'CKEDITOR.UI_RICHCOMBO' : '\'richcombo\'',
+		'CKEDITOR.UI_MENUBUTTON' : '\'menubutton\'',
+		'CKEDITOR.UI_PANEL' : '\'panel\''
+	},
+
+packages :
+	[
+		{
+			output : 'ckeditor_basic.js',
+			wrap : true,
+			files :
+				[
+					'_source/core/ckeditor_base.js',
+					'_source/core/event.js',
+					'_source/core/editor_basic.js',
+					'_source/core/env.js',
+					'_source/core/ckeditor_basic.js'
+				]
+		},
+
+		{
+			output : 'ckeditor.js',
+			wrap : true,
+			files :
+				[
+					'_source/core/ckeditor_base.js',
+					'_source/core/event.js',
+					'_source/core/editor_basic.js',
+					'_source/core/env.js',
+					'_source/core/ckeditor_basic.js',
+					'_source/core/dom.js',
+					'_source/core/tools.js',
+					'_source/core/dtd.js',
+					'_source/core/dom/event.js',
+					'_source/core/dom/domobject.js',
+					'_source/core/dom/window.js',
+					'_source/core/dom/document.js',
+					'_source/core/dom/node.js',
+					'_source/core/dom/nodelist.js',
+					'_source/core/dom/element.js',
+					'_source/core/command.js',
+					'_source/core/config.js',
+					'_source/core/focusmanager.js',
+					'_source/core/lang.js',
+					'_source/core/scriptloader.js',
+					'_source/core/resourcemanager.js',
+					'_source/core/plugins.js',
+					'_source/core/skins.js',
+					'_source/core/themes.js',
+					'_source/core/ui.js',
+					'_source/core/editor.js',
+					'_source/core/htmlparser.js',
+					'_source/core/htmlparser/comment.js',
+					'_source/core/htmlparser/text.js',
+					'_source/core/htmlparser/cdata.js',
+					'_source/core/htmlparser/fragment.js',
+					'_source/core/htmlparser/element.js',
+					'_source/core/htmlparser/filter.js',
+					'_source/core/htmlparser/basicwriter.js',
+					'_source/core/ckeditor.js',
+					'_source/core/dom/comment.js',
+					'_source/core/dom/elementpath.js',
+					'_source/core/dom/text.js',
+					'_source/core/dom/documentfragment.js',
+					'_source/core/dom/walker.js',
+					'_source/core/dom/range.js',
+					'_source/core/dom/rangelist.js',
+					'_source/core/_bootstrap.js',
+					'_source/skins/kama/skin.js',
+//					'_source/lang/en.js',
+					'_source/plugins/about/plugin.js',
+					'_source/plugins/a11yhelp/plugin.js',
+					'_source/plugins/basicstyles/plugin.js',
+					'_source/plugins/bidi/plugin.js',
+					'_source/plugins/blockquote/plugin.js',
+					'_source/plugins/button/plugin.js',
+					'_source/plugins/clipboard/plugin.js',
+					'_source/plugins/colorbutton/plugin.js',
+					'_source/plugins/colordialog/plugin.js',
+					'_source/plugins/contextmenu/plugin.js',
+					'_source/plugins/dialogadvtab/plugin.js',
+					'_source/plugins/div/plugin.js',
+					'_source/plugins/elementspath/plugin.js',
+					'_source/plugins/enterkey/plugin.js',
+					'_source/plugins/entities/plugin.js',
+					'_source/plugins/filebrowser/plugin.js',
+					'_source/plugins/find/plugin.js',
+					'_source/plugins/flash/plugin.js',
+					'_source/plugins/font/plugin.js',
+					'_source/plugins/format/plugin.js',
+					'_source/plugins/forms/plugin.js',
+					'_source/plugins/horizontalrule/plugin.js',
+					'_source/plugins/htmldataprocessor/plugin.js',
+					'_source/plugins/iframe/plugin.js',
+					'_source/plugins/image/plugin.js',
+					'_source/plugins/indent/plugin.js',
+					'_source/plugins/justify/plugin.js',
+					'_source/plugins/keystrokes/plugin.js',
+					'_source/plugins/link/plugin.js',
+					'_source/plugins/list/plugin.js',
+					'_source/plugins/liststyle/plugin.js',
+					'_source/plugins/maximize/plugin.js',
+					'_source/plugins/newpage/plugin.js',
+					'_source/plugins/pagebreak/plugin.js',
+					'_source/plugins/pastefromword/plugin.js',
+					'_source/plugins/pastetext/plugin.js',
+					'_source/plugins/popup/plugin.js',
+					'_source/plugins/preview/plugin.js',
+					'_source/plugins/print/plugin.js',
+					'_source/plugins/removeformat/plugin.js',
+					'_source/plugins/resize/plugin.js',
+					'_source/plugins/save/plugin.js',
+					'_source/plugins/scayt/plugin.js',
+					'_source/plugins/smiley/plugin.js',
+					'_source/plugins/showblocks/plugin.js',
+					'_source/plugins/showborders/plugin.js',
+					'_source/plugins/sourcearea/plugin.js',
+					'_source/plugins/stylescombo/plugin.js',
+					'_source/plugins/table/plugin.js',
+					'_source/plugins/tabletools/plugin.js',
+					'_source/plugins/specialchar/plugin.js',
+					'_source/plugins/tab/plugin.js',
+					'_source/plugins/templates/plugin.js',
+					'_source/plugins/toolbar/plugin.js',
+					'_source/plugins/undo/plugin.js',
+					'_source/plugins/wysiwygarea/plugin.js',
+					'_source/plugins/wsc/plugin.js',
+					'_source/plugins/dialog/plugin.js',
+					'_source/plugins/styles/plugin.js',
+					'_source/plugins/domiterator/plugin.js',
+					'_source/plugins/panelbutton/plugin.js',
+					'_source/plugins/floatpanel/plugin.js',
+					'_source/plugins/menu/plugin.js',
+					'_source/plugins/editingblock/plugin.js',
+					'_source/plugins/selection/plugin.js',
+					'_source/plugins/fakeobjects/plugin.js',
+					'_source/plugins/richcombo/plugin.js',
+					'_source/plugins/htmlwriter/plugin.js',
+					'_source/plugins/menubutton/plugin.js',
+					'_source/plugins/dialogui/plugin.js',
+					'_source/plugins/panel/plugin.js',
+					'_source/plugins/listblock/plugin.js',
+					'_source/themes/default/theme.js'
+				]
+		}
+
+	]
diff --git a/web/imcms/ckeditor/ckeditor.php b/web/imcms/ckeditor/ckeditor.php
new file mode 100644
index 0000000000..b54be36e0f
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+/*! \mainpage CKEditor - PHP server side intergation
+ * \section intro_sec CKEditor
+ * Visit <a href="http://ckeditor.com">CKEditor web site</a> to find more information about the editor.
+ * \section install_sec Installation
+ * \subsection step1 Include ckeditor.php in your PHP web site.
+ * @code
+ * <?php
+ * include("ckeditor/ckeditor.php");
+ * ?>
+ * @endcode
+ * \subsection step2 Create CKEditor class instance and use one of available methods to insert CKEditor.
+ * @code
+ * <?php
+ * $CKEditor = new CKEditor();
+ * $CKEditor->editor("editor1", "<p>Initial value.</p>");
+ * ?>
+ * @endcode
+ */
+
+if ( !function_exists('version_compare') || version_compare( phpversion(), '5', '<' ) )
+	include_once( 'ckeditor_php4.php' ) ;
+else
+	include_once( 'ckeditor_php5.php' ) ;
diff --git a/web/imcms/ckeditor/ckeditor_basic.js b/web/imcms/ckeditor/ckeditor_basic.js
new file mode 100644
index 0000000000..81e11b48c8
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor_basic.js
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'D03G5XL',version:'3.6.6',revision:'7689',rnd:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();var a=CKEDITOR;if(!a.event){a.event=function(){};a.event.implementOn=function(b){var c=a.event.prototype;for(var d in c){if(b[d]==undefined)b[d]=c[d];}};a.event.prototype=(function(){var b=function(d){var e=d.getPrivate&&d.getPrivate()||d._||(d._={});return e.events||(e.events={});},c=function(d){this.name=d;this.listeners=[];};c.prototype={getListenerIndex:function(d){for(var e=0,f=this.listeners;e<f.length;e++){if(f[e].fn==d)return e;}return-1;}};return{on:function(d,e,f,g,h){var i=b(this),j=i[d]||(i[d]=new c(d));if(j.getListenerIndex(e)<0){var k=j.listeners;if(!f)f=this;if(isNaN(h))h=10;var l=this,m=function(o,p,q,r){var s={name:d,sender:this,editor:o,data:p,listenerData:g,stop:q,cancel:r,removeListener:function(){l.removeListener(d,e);}};e.call(f,s);return s.data;};m.fn=e;m.priority=h;for(var n=k.length-1;n>=0;n--){if(k[n].priority<=h){k.splice(n+1,0,m);return;}}k.unshift(m);}},fire:(function(){var d=false,e=function(){d=true;},f=false,g=function(){f=true;};return function(h,i,j){var k=b(this)[h],l=d,m=f;d=f=false;if(k){var n=k.listeners;if(n.length){n=n.slice(0);for(var o=0;o<n.length;o++){var p=n[o].call(this,j,i,e,g);if(typeof p!='undefined')i=p;if(d||f)break;}}}var q=f||(typeof i=='undefined'?false:i);d=l;f=m;return q;};})(),fireOnce:function(d,e,f){var g=this.fire(d,e,f);delete b(this)[d];return g;},removeListener:function(d,e){var f=b(this)[d];if(f){var g=f.getListenerIndex(e);
+if(g>=0)f.listeners.splice(g,1);}},hasListeners:function(d){var e=b(this)[d];return e&&e.listeners.length>0;}};})();}if(!a.editor){a.ELEMENT_MODE_NONE=0;a.ELEMENT_MODE_REPLACE=1;a.ELEMENT_MODE_APPENDTO=2;a.editor=function(b,c,d,e){var f=this;f._={instanceConfig:b,element:c,data:e};f.elementMode=d||0;a.event.call(f);f._init();};a.editor.replace=function(b,c){var d=b;if(typeof d!='object'){d=document.getElementById(b);if(d&&d.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1})d=null;if(!d){var e=0,f=document.getElementsByName(b);while((d=f[e++])&&d.tagName.toLowerCase()!='textarea'){}}if(!d)throw '[CKEDITOR.editor.replace] The element with id or name "'+b+'" was not found.';}d.style.visibility='hidden';return new a.editor(c,d,1);};a.editor.appendTo=function(b,c,d){var e=b;if(typeof e!='object'){e=document.getElementById(b);if(!e)throw '[CKEDITOR.editor.appendTo] The element with id "'+b+'" was not found.';}return new a.editor(c,e,2,d);};a.editor.prototype={_init:function(){var b=a.editor._pending||(a.editor._pending=[]);b.push(this);},fire:function(b,c){return a.event.prototype.fire.call(this,b,c,this);},fireOnce:function(b,c){return a.event.prototype.fireOnce.call(this,b,c,this);}};a.event.implementOn(a.editor.prototype,true);}if(!a.env)a.env=(function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,d={ie:/*@cc_on!@*/false,opera:!!c&&c.version,webkit:b.indexOf(' applewebkit/')>-1,air:b.indexOf(' adobeair/')>-1,mac:b.indexOf('macintosh')>-1,quirks:document.compatMode=='BackCompat',mobile:b.indexOf('mobile')>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var g=document.domain,h=window.location.hostname;return g!=h&&g!='['+h+']';},secure:location.protocol=='https:'};d.gecko=navigator.product=='Gecko'&&!d.webkit&&!d.opera;var e=0;if(d.ie){e=parseFloat(b.match(/msie (\d+)/)[1]);d.ie8=!!document.documentMode;d.ie8Compat=document.documentMode==8;d.ie9Compat=document.documentMode==9;d.ie7Compat=e==7&&!document.documentMode||document.documentMode==7;d.ie6Compat=e<7||d.quirks;}if(d.gecko){var f=b.match(/rv:([\d\.]+)/);if(f){f=f[1].split('.');e=f[0]*10000+(f[1]||0)*100+ +(f[2]||0);}}if(d.opera)e=parseFloat(c.version());if(d.air)e=parseFloat(b.match(/ adobeair\/(\d+)/)[1]);if(d.webkit)e=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]);d.version=e;d.isCompatible=d.iOS&&e>=534||!d.mobile&&(d.ie&&e>=6||d.gecko&&e>=10801||d.opera&&e>=9.5||d.air&&e>=1||d.webkit&&e>=522||false);d.cssClass='cke_browser_'+(d.ie?'ie':d.gecko?'gecko':d.opera?'opera':d.webkit?'webkit':'unknown');
+if(d.quirks)d.cssClass+=' cke_browser_quirks';if(d.ie){d.cssClass+=' cke_browser_ie'+(d.version<7?'6':d.version>=8?document.documentMode:'7');if(d.quirks)d.cssClass+=' cke_browser_iequirks';if(document.documentMode&&document.documentMode>=9)d.cssClass+=' cke_browser_ie9plus';}if(d.gecko&&e<10900)d.cssClass+=' cke_browser_gecko18';if(d.air)d.cssClass+=' cke_browser_air';return d;})();var b=a.env;var c=b.ie;if(a.status=='unloaded')(function(){a.event.implementOn(a);a.loadFullCore=function(){if(a.status!='basic_ready'){a.loadFullCore._load=1;return;}delete a.loadFullCore;var e=document.createElement('script');e.type='text/javascript';e.src=a.basePath+'ckeditor.js';document.getElementsByTagName('head')[0].appendChild(e);};a.loadFullCoreTimeout=0;a.replaceClass='ckeditor';a.replaceByClassEnabled=1;var d=function(e,f,g,h){if(b.isCompatible){if(a.loadFullCore)a.loadFullCore();var i=g(e,f,h);a.add(i);return i;}return null;};a.replace=function(e,f){return d(e,f,a.editor.replace);};a.appendTo=function(e,f,g){return d(e,f,a.editor.appendTo,g);};a.add=function(e){var f=this._.pending||(this._.pending=[]);f.push(e);};a.replaceAll=function(){var e=document.getElementsByTagName('textarea');for(var f=0;f<e.length;f++){var g=null,h=e[f];if(!h.name&&!h.id)continue;if(typeof arguments[0]=='string'){var i=new RegExp('(?:^|\\s)'+arguments[0]+'(?:$|\\s)');if(!i.test(h.className))continue;}else if(typeof arguments[0]=='function'){g={};if(arguments[0](h,g)===false)continue;}this.replace(h,g);}};(function(){var e=function(){var f=a.loadFullCore,g=a.loadFullCoreTimeout;if(a.replaceByClassEnabled)a.replaceAll(a.replaceClass);a.status='basic_ready';if(f&&f._load)f();else if(g)setTimeout(function(){if(a.loadFullCore)a.loadFullCore();},g*1000);};if(window.addEventListener)window.addEventListener('load',e,false);else if(window.attachEvent)window.attachEvent('onload',e);})();a.status='basic_loaded';})();})();
diff --git a/web/imcms/ckeditor/ckeditor_basic_source.js b/web/imcms/ckeditor/ckeditor_basic_source.js
new file mode 100644
index 0000000000..9e94a34e48
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor_basic_source.js
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+// Compressed version of core/ckeditor_base.js. See original for instructions.
+/*jsl:ignore*/
+if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'3.6.6',revision:'7689',rnd:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
+/*jsl:end*/
+
+// Uncomment the following line to have a new timestamp generated for each
+// request, having clear cache load of the editor code.
+// CKEDITOR.timestamp = ( new Date() ).valueOf();
+
+// Set the script name to be loaded by the loader.
+CKEDITOR._autoLoad = 'core/ckeditor_basic';
+
+// Include the loader script.
+document.write(
+	'<script type="text/javascript" src="' + CKEDITOR.getUrl( '_source/core/loader.js' ) + '"></script>' );
diff --git a/web/imcms/ckeditor/ckeditor_php4.php b/web/imcms/ckeditor/ckeditor_php4.php
new file mode 100644
index 0000000000..7fc9babe02
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor_php4.php
@@ -0,0 +1,566 @@
+<?php
+/*
+* Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * \brief CKEditor class that can be used to create editor
+ * instances in PHP pages on server side.
+ * @see http://ckeditor.com
+ *
+ * Sample usage:
+ * @code
+ * $CKEditor = new CKEditor();
+ * $CKEditor->editor("editor1", "<p>Initial value.</p>");
+ * @endcode
+ */
+class CKEditor
+{
+	/**
+	 * The version of %CKEditor.
+	 * \private
+	 */
+	var $version = '3.6.6';
+	/**
+	 * A constant string unique for each release of %CKEditor.
+	 * \private
+	 */
+	var $_timestamp = 'D03G5XL';
+
+	/**
+	 * URL to the %CKEditor installation directory (absolute or relative to document root).
+	 * If not set, CKEditor will try to guess it's path.
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->basePath = '/ckeditor/';
+	 * @endcode
+	 */
+	var $basePath;
+	/**
+	 * An array that holds the global %CKEditor configuration.
+	 * For the list of available options, see http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->config['height'] = 400;
+	 * // Use @@ at the beggining of a string to ouput it without surrounding quotes.
+	 * $CKEditor->config['width'] = '@@screen.width * 0.8';
+	 * @endcode
+	 */
+	var $config = array();
+	/**
+	 * A boolean variable indicating whether CKEditor has been initialized.
+	 * Set it to true only if you have already included
+	 * &lt;script&gt; tag loading ckeditor.js in your website.
+	 */
+	var $initialized = false;
+	/**
+	 * Boolean variable indicating whether created code should be printed out or returned by a function.
+	 *
+	 * Example 1: get the code creating %CKEditor instance and print it on a page with the "echo" function.
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->returnOutput = true;
+	 * $code = $CKEditor->editor("editor1", "<p>Initial value.</p>");
+	 * echo "<p>Editor 1:</p>";
+	 * echo $code;
+	 * @endcode
+	 */
+	var $returnOutput = false;
+	/**
+	 * An array with textarea attributes.
+	 *
+	 * When %CKEditor is created with the editor() method, a HTML &lt;textarea&gt; element is created,
+	 * it will be displayed to anyone with JavaScript disabled or with incompatible browser.
+	 */
+	var $textareaAttributes = array( "rows" => 8, "cols" => 60 );
+	/**
+	 * A string indicating the creation date of %CKEditor.
+	 * Do not change it unless you want to force browsers to not use previously cached version of %CKEditor.
+	 */
+	var $timestamp = "D03G5XL";
+	/**
+	 * An array that holds event listeners.
+	 * \private
+	 */
+	var $_events = array();
+	/**
+	 * An array that holds global event listeners.
+	 * \private
+	 */
+	var $_globalEvents = array();
+
+	/**
+	 * Main Constructor.
+	 *
+	 *  @param $basePath (string) URL to the %CKEditor installation directory (optional).
+	 */
+	function CKEditor($basePath = null) {
+		if (!empty($basePath)) {
+			$this->basePath = $basePath;
+		}
+	}
+
+	/**
+	 * Creates a %CKEditor instance.
+	 * In incompatible browsers %CKEditor will downgrade to plain HTML &lt;textarea&gt; element.
+	 *
+	 * @param $name (string) Name of the %CKEditor instance (this will be also the "name" attribute of textarea element).
+	 * @param $value (string) Initial value (optional).
+	 * @param $config (array) The specific configurations to apply to this editor instance (optional).
+	 * @param $events (array) Event listeners for this editor instance (optional).
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->editor("field1", "<p>Initial value.</p>");
+	 * @endcode
+	 *
+	 * Advanced example:
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $config = array();
+	 * $config['toolbar'] = array(
+	 *     array( 'Source', '-', 'Bold', 'Italic', 'Underline', 'Strike' ),
+	 *     array( 'Image', 'Link', 'Unlink', 'Anchor' )
+	 * );
+	 * $events['instanceReady'] = 'function (ev) {
+	 *     alert("Loaded: " + ev.editor.name);
+	 * }';
+	 * $CKEditor->editor("field1", "<p>Initial value.</p>", $config, $events);
+	 * @endcode
+	 */
+	function editor($name, $value = "", $config = array(), $events = array())
+	{
+		$attr = "";
+		foreach ($this->textareaAttributes as $key => $val) {
+			$attr.= " " . $key . '="' . str_replace('"', '&quot;', $val) . '"';
+		}
+		$out = "<textarea name=\"" . $name . "\"" . $attr . ">" . htmlspecialchars($value) . "</textarea>\n";
+		if (!$this->initialized) {
+			$out .= $this->init();
+		}
+
+		$_config = $this->configSettings($config, $events);
+
+		$js = $this->returnGlobalEvents();
+		if (!empty($_config))
+			$js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";
+		else
+			$js .= "CKEDITOR.replace('".$name."');";
+
+		$out .= $this->script($js);
+
+		if (!$this->returnOutput) {
+			print $out;
+			$out = "";
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Replaces a &lt;textarea&gt; with a %CKEditor instance.
+	 *
+	 * @param $id (string) The id or name of textarea element.
+	 * @param $config (array) The specific configurations to apply to this editor instance (optional).
+	 * @param $events (array) Event listeners for this editor instance (optional).
+	 *
+	 * Example 1: adding %CKEditor to &lt;textarea name="article"&gt;&lt;/textarea&gt; element:
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->replace("article");
+	 * @endcode
+	 */
+	function replace($id, $config = array(), $events = array())
+	{
+		$out = "";
+		if (!$this->initialized) {
+			$out .= $this->init();
+		}
+
+		$_config = $this->configSettings($config, $events);
+
+		$js = $this->returnGlobalEvents();
+		if (!empty($_config)) {
+			$js .= "CKEDITOR.replace('".$id."', ".$this->jsEncode($_config).");";
+		}
+		else {
+			$js .= "CKEDITOR.replace('".$id."');";
+		}
+		$out .= $this->script($js);
+
+		if (!$this->returnOutput) {
+			print $out;
+			$out = "";
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Replace all &lt;textarea&gt; elements available in the document with editor instances.
+	 *
+	 * @param $className (string) If set, replace all textareas with class className in the page.
+	 *
+	 * Example 1: replace all &lt;textarea&gt; elements in the page.
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->replaceAll();
+	 * @endcode
+	 *
+	 * Example 2: replace all &lt;textarea class="myClassName"&gt; elements in the page.
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->replaceAll( 'myClassName' );
+	 * @endcode
+	 */
+	function replaceAll($className = null)
+	{
+		$out = "";
+		if (!$this->initialized) {
+			$out .= $this->init();
+		}
+
+		$_config = $this->configSettings();
+
+		$js = $this->returnGlobalEvents();
+		if (empty($_config)) {
+			if (empty($className)) {
+				$js .= "CKEDITOR.replaceAll();";
+			}
+			else {
+				$js .= "CKEDITOR.replaceAll('".$className."');";
+			}
+		}
+		else {
+			$classDetection = "";
+			$js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
+			if (!empty($className)) {
+				$js .= "	var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
+				$js .= "	if (!classRegex.test(textarea.className))\n";
+				$js .= "		return false;\n";
+			}
+			$js .= "	CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
+			$js .= "} );";
+
+		}
+
+		$out .= $this->script($js);
+
+		if (!$this->returnOutput) {
+			print $out;
+			$out = "";
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Adds event listener.
+	 * Events are fired by %CKEditor in various situations.
+	 *
+	 * @param $event (string) Event name.
+	 * @param $javascriptCode (string) Javascript anonymous function or function name.
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->addEventHandler('instanceReady', 'function (ev) {
+	 *     alert("Loaded: " + ev.editor.name);
+	 * }');
+	 * @endcode
+	 */
+	function addEventHandler($event, $javascriptCode)
+	{
+		if (!isset($this->_events[$event])) {
+			$this->_events[$event] = array();
+		}
+		// Avoid duplicates.
+		if (!in_array($javascriptCode, $this->_events[$event])) {
+			$this->_events[$event][] = $javascriptCode;
+		}
+	}
+
+	/**
+	 * Clear registered event handlers.
+	 * Note: this function will have no effect on already created editor instances.
+	 *
+	 * @param $event (string) Event name, if not set all event handlers will be removed (optional).
+	 */
+	function clearEventHandlers($event = null)
+	{
+		if (!empty($event)) {
+			$this->_events[$event] = array();
+		}
+		else {
+			$this->_events = array();
+		}
+	}
+
+	/**
+	 * Adds global event listener.
+	 *
+	 * @param $event (string) Event name.
+	 * @param $javascriptCode (string) Javascript anonymous function or function name.
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->addGlobalEventHandler('dialogDefinition', 'function (ev) {
+	 *     alert("Loading dialog: " + ev.data.name);
+	 * }');
+	 * @endcode
+	 */
+	function addGlobalEventHandler($event, $javascriptCode)
+	{
+		if (!isset($this->_globalEvents[$event])) {
+			$this->_globalEvents[$event] = array();
+		}
+		// Avoid duplicates.
+		if (!in_array($javascriptCode, $this->_globalEvents[$event])) {
+			$this->_globalEvents[$event][] = $javascriptCode;
+		}
+	}
+
+	/**
+	 * Clear registered global event handlers.
+	 * Note: this function will have no effect if the event handler has been already printed/returned.
+	 *
+	 * @param $event (string) Event name, if not set all event handlers will be removed (optional).
+	 */
+	function clearGlobalEventHandlers($event = null)
+	{
+		if (!empty($event)) {
+			$this->_globalEvents[$event] = array();
+		}
+		else {
+			$this->_globalEvents = array();
+		}
+	}
+
+	/**
+	 * Prints javascript code.
+	 * \private
+	 *
+	 * @param string $js
+	 */
+	function script($js)
+	{
+		$out = "<script type=\"text/javascript\">";
+		$out .= "//<![CDATA[\n";
+		$out .= $js;
+		$out .= "\n//]]>";
+		$out .= "</script>\n";
+
+		return $out;
+	}
+
+	/**
+	 * Returns the configuration array (global and instance specific settings are merged into one array).
+	 * \private
+	 *
+	 * @param $config (array) The specific configurations to apply to editor instance.
+	 * @param $events (array) Event listeners for editor instance.
+	 */
+	function configSettings($config = array(), $events = array())
+	{
+		$_config = $this->config;
+		$_events = $this->_events;
+
+		if (is_array($config) && !empty($config)) {
+			$_config = array_merge($_config, $config);
+		}
+
+		if (is_array($events) && !empty($events)) {
+			foreach ($events as $eventName => $code) {
+				if (!isset($_events[$eventName])) {
+					$_events[$eventName] = array();
+				}
+				if (!in_array($code, $_events[$eventName])) {
+					$_events[$eventName][] = $code;
+				}
+			}
+		}
+
+		if (!empty($_events)) {
+			foreach($_events as $eventName => $handlers) {
+				if (empty($handlers)) {
+					continue;
+				}
+				else if (count($handlers) == 1) {
+					$_config['on'][$eventName] = '@@'.$handlers[0];
+				}
+				else {
+					$_config['on'][$eventName] = '@@function (ev){';
+					foreach ($handlers as $handler => $code) {
+						$_config['on'][$eventName] .= '('.$code.')(ev);';
+					}
+					$_config['on'][$eventName] .= '}';
+				}
+			}
+		}
+
+		return $_config;
+	}
+
+	/**
+	 * Return global event handlers.
+	 * \private
+	 */
+	function returnGlobalEvents()
+	{
+		static $returnedEvents;
+		$out = "";
+
+		if (!isset($returnedEvents)) {
+			$returnedEvents = array();
+		}
+
+		if (!empty($this->_globalEvents)) {
+			foreach ($this->_globalEvents as $eventName => $handlers) {
+				foreach ($handlers as $handler => $code) {
+					if (!isset($returnedEvents[$eventName])) {
+						$returnedEvents[$eventName] = array();
+					}
+					// Return only new events
+					if (!in_array($code, $returnedEvents[$eventName])) {
+						$out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);";
+						$returnedEvents[$eventName][] = $code;
+					}
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Initializes CKEditor (executed only once).
+	 * \private
+	 */
+	function init()
+	{
+		static $initComplete;
+		$out = "";
+
+		if (!empty($initComplete)) {
+			return "";
+		}
+
+		if ($this->initialized) {
+			$initComplete = true;
+			return "";
+		}
+
+		$args = "";
+		$ckeditorPath = $this->ckeditorPath();
+
+		if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
+			$args = '?t=' . $this->timestamp;
+		}
+
+		// Skip relative paths...
+		if (strpos($ckeditorPath, '..') !== 0) {
+			$out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';");
+		}
+
+		$out .= "<script type=\"text/javascript\" src=\"" . $ckeditorPath . 'ckeditor.js' . $args . "\"></script>\n";
+
+		$extraCode = "";
+		if ($this->timestamp != $this->_timestamp) {
+			$extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
+		}
+		if ($extraCode) {
+			$out .= $this->script($extraCode);
+		}
+
+		$initComplete = $this->initialized = true;
+
+		return $out;
+	}
+
+	/**
+	 * Return path to ckeditor.js.
+	 * \private
+	 */
+	function ckeditorPath()
+	{
+		if (!empty($this->basePath)) {
+			return $this->basePath;
+		}
+
+		/**
+		 * The absolute pathname of the currently executing script.
+		 * Note: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php,
+		 * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user.
+		 */
+		if (isset($_SERVER['SCRIPT_FILENAME'])) {
+			$realPath = dirname($_SERVER['SCRIPT_FILENAME']);
+		}
+		else {
+			/**
+			 * realpath - Returns canonicalized absolute pathname
+			 */
+			$realPath = realpath( './' ) ;
+		}
+
+		/**
+		 * The filename of the currently executing script, relative to the document root.
+		 * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar
+		 * would be /test.php/foo.bar.
+		 */
+		$selfPath = dirname($_SERVER['PHP_SELF']);
+		$file = str_replace("\\", "/", __FILE__);
+
+		if (!$selfPath || !$realPath || !$file) {
+			return "/ckeditor/";
+		}
+
+		$documentRoot = substr($realPath, 0, strlen($realPath) - strlen($selfPath));
+		$fileUrl = substr($file, strlen($documentRoot));
+		$ckeditorUrl = str_replace("ckeditor_php4.php", "", $fileUrl);
+
+		return $ckeditorUrl;
+	}
+
+	/**
+	 * This little function provides a basic JSON support.
+	 * \private
+	 *
+	 * @param mixed $val
+	 * @return string
+	 */
+	function jsEncode($val)
+	{
+		if (is_null($val)) {
+			return 'null';
+		}
+		if (is_bool($val)) {
+			return $val ? 'true' : 'false';
+		}
+		if (is_int($val)) {
+			return $val;
+		}
+		if (is_float($val)) {
+			return str_replace(',', '.', $val);
+		}
+		if (is_array($val) || is_object($val)) {
+			if (is_array($val) && (array_keys($val) === range(0,count($val)-1))) {
+				return '[' . implode(',', array_map(array($this, 'jsEncode'), $val)) . ']';
+			}
+			$temp = array();
+			foreach ($val as $k => $v){
+				$temp[] = $this->jsEncode("{$k}") . ':' . $this->jsEncode($v);
+			}
+			return '{' . implode(',', $temp) . '}';
+		}
+		// String otherwise
+		if (strpos($val, '@@') === 0)
+			return substr($val, 2);
+		if (strtoupper(substr($val, 0, 9)) == 'CKEDITOR.')
+			return $val;
+
+		return '"' . str_replace(array("\\", "/", "\n", "\t", "\r", "\x08", "\x0c", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'), $val) . '"';
+	}
+}
diff --git a/web/imcms/ckeditor/ckeditor_php5.php b/web/imcms/ckeditor/ckeditor_php5.php
new file mode 100644
index 0000000000..b50c39bf4f
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor_php5.php
@@ -0,0 +1,556 @@
+<?php
+/*
+* Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * \brief CKEditor class that can be used to create editor
+ * instances in PHP pages on server side.
+ * @see http://ckeditor.com
+ *
+ * Sample usage:
+ * @code
+ * $CKEditor = new CKEditor();
+ * $CKEditor->editor("editor1", "<p>Initial value.</p>");
+ * @endcode
+ */
+class CKEditor
+{
+	/**
+	 * The version of %CKEditor.
+	 */
+	const version = '3.6.6';
+	/**
+	 * A constant string unique for each release of %CKEditor.
+	 */
+	const timestamp = 'D03G5XL';
+
+	/**
+	 * URL to the %CKEditor installation directory (absolute or relative to document root).
+	 * If not set, CKEditor will try to guess it's path.
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->basePath = '/ckeditor/';
+	 * @endcode
+	 */
+	public $basePath;
+	/**
+	 * An array that holds the global %CKEditor configuration.
+	 * For the list of available options, see http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->config['height'] = 400;
+	 * // Use @@ at the beggining of a string to ouput it without surrounding quotes.
+	 * $CKEditor->config['width'] = '@@screen.width * 0.8';
+	 * @endcode
+	 */
+	public $config = array();
+	/**
+	 * A boolean variable indicating whether CKEditor has been initialized.
+	 * Set it to true only if you have already included
+	 * &lt;script&gt; tag loading ckeditor.js in your website.
+	 */
+	public $initialized = false;
+	/**
+	 * Boolean variable indicating whether created code should be printed out or returned by a function.
+	 *
+	 * Example 1: get the code creating %CKEditor instance and print it on a page with the "echo" function.
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->returnOutput = true;
+	 * $code = $CKEditor->editor("editor1", "<p>Initial value.</p>");
+	 * echo "<p>Editor 1:</p>";
+	 * echo $code;
+	 * @endcode
+	 */
+	public $returnOutput = false;
+	/**
+	 * An array with textarea attributes.
+	 *
+	 * When %CKEditor is created with the editor() method, a HTML &lt;textarea&gt; element is created,
+	 * it will be displayed to anyone with JavaScript disabled or with incompatible browser.
+	 */
+	public $textareaAttributes = array( "rows" => 8, "cols" => 60 );
+	/**
+	 * A string indicating the creation date of %CKEditor.
+	 * Do not change it unless you want to force browsers to not use previously cached version of %CKEditor.
+	 */
+	public $timestamp = "D03G5XL";
+	/**
+	 * An array that holds event listeners.
+	 */
+	private $events = array();
+	/**
+	 * An array that holds global event listeners.
+	 */
+	private $globalEvents = array();
+
+	/**
+	 * Main Constructor.
+	 *
+	 *  @param $basePath (string) URL to the %CKEditor installation directory (optional).
+	 */
+	function __construct($basePath = null) {
+		if (!empty($basePath)) {
+			$this->basePath = $basePath;
+		}
+	}
+
+	/**
+	 * Creates a %CKEditor instance.
+	 * In incompatible browsers %CKEditor will downgrade to plain HTML &lt;textarea&gt; element.
+	 *
+	 * @param $name (string) Name of the %CKEditor instance (this will be also the "name" attribute of textarea element).
+	 * @param $value (string) Initial value (optional).
+	 * @param $config (array) The specific configurations to apply to this editor instance (optional).
+	 * @param $events (array) Event listeners for this editor instance (optional).
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->editor("field1", "<p>Initial value.</p>");
+	 * @endcode
+	 *
+	 * Advanced example:
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $config = array();
+	 * $config['toolbar'] = array(
+	 *     array( 'Source', '-', 'Bold', 'Italic', 'Underline', 'Strike' ),
+	 *     array( 'Image', 'Link', 'Unlink', 'Anchor' )
+	 * );
+	 * $events['instanceReady'] = 'function (ev) {
+	 *     alert("Loaded: " + ev.editor.name);
+	 * }';
+	 * $CKEditor->editor("field1", "<p>Initial value.</p>", $config, $events);
+	 * @endcode
+	 */
+	public function editor($name, $value = "", $config = array(), $events = array())
+	{
+		$attr = "";
+		foreach ($this->textareaAttributes as $key => $val) {
+			$attr.= " " . $key . '="' . str_replace('"', '&quot;', $val) . '"';
+		}
+		$out = "<textarea name=\"" . $name . "\"" . $attr . ">" . htmlspecialchars($value) . "</textarea>\n";
+		if (!$this->initialized) {
+			$out .= $this->init();
+		}
+
+		$_config = $this->configSettings($config, $events);
+
+		$js = $this->returnGlobalEvents();
+		if (!empty($_config))
+			$js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";
+		else
+			$js .= "CKEDITOR.replace('".$name."');";
+
+		$out .= $this->script($js);
+
+		if (!$this->returnOutput) {
+			print $out;
+			$out = "";
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Replaces a &lt;textarea&gt; with a %CKEditor instance.
+	 *
+	 * @param $id (string) The id or name of textarea element.
+	 * @param $config (array) The specific configurations to apply to this editor instance (optional).
+	 * @param $events (array) Event listeners for this editor instance (optional).
+	 *
+	 * Example 1: adding %CKEditor to &lt;textarea name="article"&gt;&lt;/textarea&gt; element:
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->replace("article");
+	 * @endcode
+	 */
+	public function replace($id, $config = array(), $events = array())
+	{
+		$out = "";
+		if (!$this->initialized) {
+			$out .= $this->init();
+		}
+
+		$_config = $this->configSettings($config, $events);
+
+		$js = $this->returnGlobalEvents();
+		if (!empty($_config)) {
+			$js .= "CKEDITOR.replace('".$id."', ".$this->jsEncode($_config).");";
+		}
+		else {
+			$js .= "CKEDITOR.replace('".$id."');";
+		}
+		$out .= $this->script($js);
+
+		if (!$this->returnOutput) {
+			print $out;
+			$out = "";
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Replace all &lt;textarea&gt; elements available in the document with editor instances.
+	 *
+	 * @param $className (string) If set, replace all textareas with class className in the page.
+	 *
+	 * Example 1: replace all &lt;textarea&gt; elements in the page.
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->replaceAll();
+	 * @endcode
+	 *
+	 * Example 2: replace all &lt;textarea class="myClassName"&gt; elements in the page.
+	 * @code
+	 * $CKEditor = new CKEditor();
+	 * $CKEditor->replaceAll( 'myClassName' );
+	 * @endcode
+	 */
+	public function replaceAll($className = null)
+	{
+		$out = "";
+		if (!$this->initialized) {
+			$out .= $this->init();
+		}
+
+		$_config = $this->configSettings();
+
+		$js = $this->returnGlobalEvents();
+		if (empty($_config)) {
+			if (empty($className)) {
+				$js .= "CKEDITOR.replaceAll();";
+			}
+			else {
+				$js .= "CKEDITOR.replaceAll('".$className."');";
+			}
+		}
+		else {
+			$classDetection = "";
+			$js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
+			if (!empty($className)) {
+				$js .= "	var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
+				$js .= "	if (!classRegex.test(textarea.className))\n";
+				$js .= "		return false;\n";
+			}
+			$js .= "	CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
+			$js .= "} );";
+
+		}
+
+		$out .= $this->script($js);
+
+		if (!$this->returnOutput) {
+			print $out;
+			$out = "";
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Adds event listener.
+	 * Events are fired by %CKEditor in various situations.
+	 *
+	 * @param $event (string) Event name.
+	 * @param $javascriptCode (string) Javascript anonymous function or function name.
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->addEventHandler('instanceReady', 'function (ev) {
+	 *     alert("Loaded: " + ev.editor.name);
+	 * }');
+	 * @endcode
+	 */
+	public function addEventHandler($event, $javascriptCode)
+	{
+		if (!isset($this->events[$event])) {
+			$this->events[$event] = array();
+		}
+		// Avoid duplicates.
+		if (!in_array($javascriptCode, $this->events[$event])) {
+			$this->events[$event][] = $javascriptCode;
+		}
+	}
+
+	/**
+	 * Clear registered event handlers.
+	 * Note: this function will have no effect on already created editor instances.
+	 *
+	 * @param $event (string) Event name, if not set all event handlers will be removed (optional).
+	 */
+	public function clearEventHandlers($event = null)
+	{
+		if (!empty($event)) {
+			$this->events[$event] = array();
+		}
+		else {
+			$this->events = array();
+		}
+	}
+
+	/**
+	 * Adds global event listener.
+	 *
+	 * @param $event (string) Event name.
+	 * @param $javascriptCode (string) Javascript anonymous function or function name.
+	 *
+	 * Example usage:
+	 * @code
+	 * $CKEditor->addGlobalEventHandler('dialogDefinition', 'function (ev) {
+	 *     alert("Loading dialog: " + ev.data.name);
+	 * }');
+	 * @endcode
+	 */
+	public function addGlobalEventHandler($event, $javascriptCode)
+	{
+		if (!isset($this->globalEvents[$event])) {
+			$this->globalEvents[$event] = array();
+		}
+		// Avoid duplicates.
+		if (!in_array($javascriptCode, $this->globalEvents[$event])) {
+			$this->globalEvents[$event][] = $javascriptCode;
+		}
+	}
+
+	/**
+	 * Clear registered global event handlers.
+	 * Note: this function will have no effect if the event handler has been already printed/returned.
+	 *
+	 * @param $event (string) Event name, if not set all event handlers will be removed (optional).
+	 */
+	public function clearGlobalEventHandlers($event = null)
+	{
+		if (!empty($event)) {
+			$this->globalEvents[$event] = array();
+		}
+		else {
+			$this->globalEvents = array();
+		}
+	}
+
+	/**
+	 * Prints javascript code.
+	 *
+	 * @param string $js
+	 */
+	private function script($js)
+	{
+		$out = "<script type=\"text/javascript\">";
+		$out .= "//<![CDATA[\n";
+		$out .= $js;
+		$out .= "\n//]]>";
+		$out .= "</script>\n";
+
+		return $out;
+	}
+
+	/**
+	 * Returns the configuration array (global and instance specific settings are merged into one array).
+	 *
+	 * @param $config (array) The specific configurations to apply to editor instance.
+	 * @param $events (array) Event listeners for editor instance.
+	 */
+	private function configSettings($config = array(), $events = array())
+	{
+		$_config = $this->config;
+		$_events = $this->events;
+
+		if (is_array($config) && !empty($config)) {
+			$_config = array_merge($_config, $config);
+		}
+
+		if (is_array($events) && !empty($events)) {
+			foreach ($events as $eventName => $code) {
+				if (!isset($_events[$eventName])) {
+					$_events[$eventName] = array();
+				}
+				if (!in_array($code, $_events[$eventName])) {
+					$_events[$eventName][] = $code;
+				}
+			}
+		}
+
+		if (!empty($_events)) {
+			foreach($_events as $eventName => $handlers) {
+				if (empty($handlers)) {
+					continue;
+				}
+				else if (count($handlers) == 1) {
+					$_config['on'][$eventName] = '@@'.$handlers[0];
+				}
+				else {
+					$_config['on'][$eventName] = '@@function (ev){';
+					foreach ($handlers as $handler => $code) {
+						$_config['on'][$eventName] .= '('.$code.')(ev);';
+					}
+					$_config['on'][$eventName] .= '}';
+				}
+			}
+		}
+
+		return $_config;
+	}
+
+	/**
+	 * Return global event handlers.
+	 */
+	private function returnGlobalEvents()
+	{
+		static $returnedEvents;
+		$out = "";
+
+		if (!isset($returnedEvents)) {
+			$returnedEvents = array();
+		}
+
+		if (!empty($this->globalEvents)) {
+			foreach ($this->globalEvents as $eventName => $handlers) {
+				foreach ($handlers as $handler => $code) {
+					if (!isset($returnedEvents[$eventName])) {
+						$returnedEvents[$eventName] = array();
+					}
+					// Return only new events
+					if (!in_array($code, $returnedEvents[$eventName])) {
+						$out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);";
+						$returnedEvents[$eventName][] = $code;
+					}
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Initializes CKEditor (executed only once).
+	 */
+	private function init()
+	{
+		static $initComplete;
+		$out = "";
+
+		if (!empty($initComplete)) {
+			return "";
+		}
+
+		if ($this->initialized) {
+			$initComplete = true;
+			return "";
+		}
+
+		$args = "";
+		$ckeditorPath = $this->ckeditorPath();
+
+		if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
+			$args = '?t=' . $this->timestamp;
+		}
+
+		// Skip relative paths...
+		if (strpos($ckeditorPath, '..') !== 0) {
+			$out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';");
+		}
+
+		$out .= "<script type=\"text/javascript\" src=\"" . $ckeditorPath . 'ckeditor.js' . $args . "\"></script>\n";
+
+		$extraCode = "";
+		if ($this->timestamp != self::timestamp) {
+			$extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
+		}
+		if ($extraCode) {
+			$out .= $this->script($extraCode);
+		}
+
+		$initComplete = $this->initialized = true;
+
+		return $out;
+	}
+
+	/**
+	 * Return path to ckeditor.js.
+	 */
+	private function ckeditorPath()
+	{
+		if (!empty($this->basePath)) {
+			return $this->basePath;
+		}
+
+		/**
+		 * The absolute pathname of the currently executing script.
+		 * Note: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php,
+		 * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user.
+		 */
+		if (isset($_SERVER['SCRIPT_FILENAME'])) {
+			$realPath = dirname($_SERVER['SCRIPT_FILENAME']);
+		}
+		else {
+			/**
+			 * realpath - Returns canonicalized absolute pathname
+			 */
+			$realPath = realpath( './' ) ;
+		}
+
+		/**
+		 * The filename of the currently executing script, relative to the document root.
+		 * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar
+		 * would be /test.php/foo.bar.
+		 */
+		$selfPath = dirname($_SERVER['PHP_SELF']);
+		$file = str_replace("\\", "/", __FILE__);
+
+		if (!$selfPath || !$realPath || !$file) {
+			return "/ckeditor/";
+		}
+
+		$documentRoot = substr($realPath, 0, strlen($realPath) - strlen($selfPath));
+		$fileUrl = substr($file, strlen($documentRoot));
+		$ckeditorUrl = str_replace("ckeditor_php5.php", "", $fileUrl);
+
+		return $ckeditorUrl;
+	}
+
+	/**
+	 * This little function provides a basic JSON support.
+	 *
+	 * @param mixed $val
+	 * @return string
+	 */
+	private function jsEncode($val)
+	{
+		if (is_null($val)) {
+			return 'null';
+		}
+		if (is_bool($val)) {
+			return $val ? 'true' : 'false';
+		}
+		if (is_int($val)) {
+			return $val;
+		}
+		if (is_float($val)) {
+			return str_replace(',', '.', $val);
+		}
+		if (is_array($val) || is_object($val)) {
+			if (is_array($val) && (array_keys($val) === range(0,count($val)-1))) {
+				return '[' . implode(',', array_map(array($this, 'jsEncode'), $val)) . ']';
+			}
+			$temp = array();
+			foreach ($val as $k => $v){
+				$temp[] = $this->jsEncode("{$k}") . ':' . $this->jsEncode($v);
+			}
+			return '{' . implode(',', $temp) . '}';
+		}
+		// String otherwise
+		if (strpos($val, '@@') === 0)
+			return substr($val, 2);
+		if (strtoupper(substr($val, 0, 9)) == 'CKEDITOR.')
+			return $val;
+
+		return '"' . str_replace(array("\\", "/", "\n", "\t", "\r", "\x08", "\x0c", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'), $val) . '"';
+	}
+}
diff --git a/web/imcms/ckeditor/ckeditor_source.js b/web/imcms/ckeditor/ckeditor_source.js
new file mode 100644
index 0000000000..362c23bc1a
--- /dev/null
+++ b/web/imcms/ckeditor/ckeditor_source.js
@@ -0,0 +1,35 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+// Compressed version of core/ckeditor_base.js. See original for instructions.
+/*jsl:ignore*/
+if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'3.6.6',revision:'7689',rnd:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
+/*jsl:end*/
+
+// Uncomment the following line to have a new timestamp generated for each
+// request, having clear cache load of the editor code.
+// CKEDITOR.timestamp = ( new Date() ).valueOf();
+
+if ( CKEDITOR.loader )
+	CKEDITOR.loader.load( 'core/ckeditor' );
+else
+{
+	// Set the script name to be loaded by the loader.
+	CKEDITOR._autoLoad = 'core/ckeditor';
+
+	// Include the loader script.
+	if ( document.body && (!document.readyState || document.readyState == 'complete') )
+	{
+		var script = document.createElement( 'script' );
+		script.type = 'text/javascript';
+		script.src = CKEDITOR.getUrl( '_source/core/loader.js' );
+		document.body.appendChild( script );
+	}
+	else
+	{
+		document.write(
+			'<script type="text/javascript" src="' + CKEDITOR.getUrl( '_source/core/loader.js' ) + '"></script>' );
+	}
+}
diff --git a/web/imcms/ckeditor/config.js b/web/imcms/ckeditor/config.js
new file mode 100644
index 0000000000..7d08da95ac
--- /dev/null
+++ b/web/imcms/ckeditor/config.js
@@ -0,0 +1,11 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+	// Define changes to default configuration here. For example:
+	// config.language = 'fr';
+	// config.uiColor = '#AADC6E';
+};
diff --git a/web/imcms/ckeditor/contents.css b/web/imcms/ckeditor/contents.css
new file mode 100644
index 0000000000..3b64467ae7
--- /dev/null
+++ b/web/imcms/ckeditor/contents.css
@@ -0,0 +1,25 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+body
+{
+	/* Font */
+	font-family: Arial, Verdana, sans-serif;
+	font-size: 12px;
+
+	/* Text color */
+	color: #222;
+
+	/* Remove the background color to make it transparent */
+	background-color: #fff;
+}
+
+ol,ul,dl
+{
+	/* IE7: reset rtl list margin. (#7334) */
+	*margin-right:0px;
+	/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
+    padding:0 40px;
+}
diff --git a/web/imcms/ckeditor/images/spacer.gif b/web/imcms/ckeditor/images/spacer.gif
new file mode 100644
index 0000000000..5bfd67a2d6
Binary files /dev/null and b/web/imcms/ckeditor/images/spacer.gif differ
diff --git a/web/imcms/ckeditor/lang/_languages.js b/web/imcms/ckeditor/lang/_languages.js
new file mode 100644
index 0000000000..f08029c804
--- /dev/null
+++ b/web/imcms/ckeditor/lang/_languages.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+var CKEDITOR_LANGS=(function(){var b={af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',cy:'Welsh',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-gb':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',is:'Icelandic',it:'Italian',ja:'Japanese',ka:'Georgian',km:'Khmer',ko:'Korean',ku:'Kurdish',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',ug:'Uighur',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},c=[];for(var d in b)c.push({code:d,name:b[d]});c.sort(function(e,f){return e.name<f.name?-1:1;});return c;})();
diff --git a/web/imcms/ckeditor/lang/_translationstatus.txt b/web/imcms/ckeditor/lang/_translationstatus.txt
new file mode 100644
index 0000000000..df863e541e
--- /dev/null
+++ b/web/imcms/ckeditor/lang/_translationstatus.txt
@@ -0,0 +1,65 @@
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+af.js      Found: 551 Missing: 28
+ar.js      Found: 471 Missing: 108
+bg.js      Found: 397 Missing: 182
+bn.js      Found: 293 Missing: 286
+bs.js      Found: 176 Missing: 403
+ca.js      Found: 550 Missing: 29
+cs.js      Found: 579 Missing: 0
+cy.js      Found: 579 Missing: 0
+da.js      Found: 577 Missing: 2
+de.js      Found: 578 Missing: 1
+el.js      Found: 449 Missing: 130
+en-au.js   Found: 348 Missing: 231
+en-ca.js   Found: 346 Missing: 233
+en-gb.js   Found: 518 Missing: 61
+eo.js      Found: 578 Missing: 1
+es.js      Found: 578 Missing: 1
+et.js      Found: 577 Missing: 2
+eu.js      Found: 418 Missing: 161
+fa.js      Found: 577 Missing: 2
+fi.js      Found: 579 Missing: 0
+fo.js      Found: 577 Missing: 2
+fr-ca.js   Found: 322 Missing: 257
+fr.js      Found: 578 Missing: 1
+gl.js      Found: 293 Missing: 286
+gu.js      Found: 577 Missing: 2
+he.js      Found: 578 Missing: 1
+hi.js      Found: 330 Missing: 249
+hr.js      Found: 578 Missing: 1
+hu.js      Found: 574 Missing: 5
+id.js      Found: 1 Missing: 578
+is.js      Found: 327 Missing: 252
+it.js      Found: 579 Missing: 0
+ja.js      Found: 496 Missing: 83
+ka.js      Found: 570 Missing: 9
+km.js      Found: 287 Missing: 292
+ko.js      Found: 305 Missing: 274
+ku.js      Found: 578 Missing: 1
+lt.js      Found: 577 Missing: 2
+lv.js      Found: 578 Missing: 1
+mk.js      Found: 0 Missing: 579
+mn.js      Found: 389 Missing: 190
+ms.js      Found: 277 Missing: 302
+nb.js      Found: 579 Missing: 0
+nl.js      Found: 576 Missing: 3
+no.js      Found: 579 Missing: 0
+pl.js      Found: 578 Missing: 1
+pt-br.js   Found: 579 Missing: 0
+pt.js      Found: 327 Missing: 252
+ro.js      Found: 434 Missing: 145
+ru.js      Found: 577 Missing: 2
+sk.js      Found: 578 Missing: 1
+sl.js      Found: 427 Missing: 152
+sr-latn.js Found: 288 Missing: 291
+sr.js      Found: 287 Missing: 292
+sv.js      Found: 552 Missing: 27
+th.js      Found: 299 Missing: 280
+tr.js      Found: 578 Missing: 1
+ug.js      Found: 574 Missing: 5
+uk.js      Found: 578 Missing: 1
+vi.js      Found: 578 Missing: 1
+zh-cn.js   Found: 579 Missing: 0
+zh.js      Found: 436 Missing: 143
diff --git a/web/imcms/ckeditor/lang/af.js b/web/imcms/ckeditor/lang/af.js
new file mode 100644
index 0000000000..1aa8655e62
--- /dev/null
+++ b/web/imcms/ckeditor/lang/af.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.af={dir:'ltr',editorTitle:'Teksverwerker, %1',editorHelp:'Druk op ALT 0 vir hulp',toolbars:'Editor toolbars',editor:'Teksverwerker',source:'Bron',newPage:'Nuwe bladsy',save:'Bewaar',preview:'Voorbeeld',cut:'Knip',copy:'Kopiëer',paste:'Plak',print:'Druk',underline:'Onderstreep',bold:'Vet',italic:'Skuins',selectAll:'Selekteer alles',removeFormat:'Verwyder opmaak',strike:'Deurstreep',subscript:'Onderskrif',superscript:'Bo-skrif',horizontalrule:'Horisontale lyn invoeg',pagebreak:'Bladsy-einde invoeg',pagebreakAlt:'Bladsy-einde',unlink:'Verwyder skakel',undo:'Ontdoen',redo:'Oordoen',common:{browseServer:'Blaai op bediener',url:'URL',protocol:'Protokol',upload:'Oplaai',uploadSubmit:'Stuur na bediener',image:'Afbeelding',flash:'Flash',form:'Vorm',checkbox:'Merkhokkie',radio:'Radioknoppie',textField:'Teksveld',textarea:'Teks-area',hiddenField:'Blinde veld',button:'Knop',select:'Keuseveld',imageButton:'Afbeeldingsknop',notSet:'<geen instelling>',id:'Id',name:'Naam',langDir:'Skryfrigting',langDirLtr:'Links na regs (LTR)',langDirRtl:'Regs na links (RTL)',langCode:'Taalkode',longDescr:'Lang beskrywing URL',cssClass:'CSS klasse',advisoryTitle:'Aanbevole titel',cssStyle:'Styl',ok:'OK',cancel:'Kanselleer',close:'Sluit',preview:'Voorbeeld',generalTab:'Algemeen',advancedTab:'Gevorderd',validateNumberFailed:"Hierdie waarde is nie 'n getal nie.",confirmNewPage:"Alle wysiginge sal verlore gaan. Is u seker dat u 'n nuwe bladsy wil laai?",confirmCancel:'Sommige opsies is gewysig. Is u seker dat u hierdie dialoogvenster wil sluit?',options:'Opsies',target:'Doel',targetNew:'Nuwe venster (_blank)',targetTop:'Boonste venster (_top)',targetSelf:'Selfde venster (_self)',targetParent:'Oorspronklike venster (_parent)',langDirLTR:'Links na Regs (LTR)',langDirRTL:'Regs na Links (RTL)',styles:'Styl',cssClasses:'CSS klasse',width:'Breedte',height:'Hoogte',align:'Oplyn',alignLeft:'Links',alignRight:'Regs',alignCenter:'Sentreer',alignTop:'Bo',alignMiddle:'Middel',alignBottom:'Onder',invalidValue:'Invalid value.',invalidHeight:"Hoogte moet 'n getal wees",invalidWidth:"Breedte moet 'n getal wees.",invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nie beskikbaar nie</span>'},contextmenu:{options:'Konteks Spyskaart-opsies'},specialChar:{toolbar:'Voeg spesiaale karakter in',title:'Kies spesiale karakter',options:'Spesiale karakter-opsies'},link:{toolbar:'Skakel invoeg/wysig',other:'<ander>',menu:'Wysig skakel',title:'Skakel',info:'Skakel informasie',target:'Doel',upload:'Oplaai',advanced:'Gevorderd',type:'Skakelsoort',toUrl:'URL',toAnchor:'Anker in bladsy',toEmail:'E-pos',targetFrame:'<raam>',targetPopup:'<opspringvenster>',targetFrameName:'Naam van doelraam',targetPopupName:'Naam van opspringvenster',popupFeatures:'Eienskappe van opspringvenster',popupResizable:'Herskaalbaar',popupStatusBar:'Statusbalk',popupLocationBar:'Adresbalk',popupToolbar:'Werkbalk',popupMenuBar:'Spyskaartbalk',popupFullScreen:'Volskerm (IE)',popupScrollBars:'Skuifbalke',popupDependent:'Afhanklik (Netscape)',popupLeft:'Posisie links',popupTop:'Posisie bo',id:'Id',langDir:'Skryfrigting',langDirLTR:'Links na regs (LTR)',langDirRTL:'Regs na links (RTL)',acccessKey:'Toegangsleutel',name:'Naam',langCode:'Taalkode',tabIndex:'Tab indeks',advisoryTitle:'Aanbevole titel',advisoryContentType:'Aanbevole inhoudstipe',cssClasses:'CSS klasse',charset:'Karakterstel van geskakelde bron',styles:'Styl',rel:'Relationship',selectAnchor:"Kies 'n anker",anchorName:'Op ankernaam',anchorId:'Op element Id',emailAddress:'E-posadres',emailSubject:'Berig-onderwerp',emailBody:'Berig-inhoud',noAnchors:'(Geen ankers beskikbaar in dokument)',noUrl:'Gee die skakel se URL',noEmail:'Gee die e-posadres'},anchor:{toolbar:'Anker byvoeg/verander',menu:'Anker-eienskappe',title:'Anker-eienskappe',name:'Ankernaam',errorName:'Voltooi die ankernaam asseblief',remove:'Remove Anchor'},list:{numberedTitle:'Eienskappe van genommerde lys',bulletedTitle:'Eienskappe van ongenommerde lys',type:'Tipe',start:'Begin',validateStartNumber:"Beginnommer van lys moet 'n heelgetal wees.",circle:'Sirkel',disc:'Skyf',square:'Vierkant',none:'Geen',notset:'<nie ingestel nie>',armenian:'Armeense nommering',georgian:'Georgiese nommering (an, ban, gan, ens.)',lowerRoman:'Romeinse kleinletters (i, ii, iii, iv, v, ens.)',upperRoman:'Romeinse hoofletters (I, II, III, IV, V, ens.)',lowerAlpha:'Kleinletters (a, b, c, d, e, ens.)',upperAlpha:'Hoofletters (A, B, C, D, E, ens.)',lowerGreek:'Griekse kleinletters (alpha, beta, gamma, ens.)',decimal:'Desimale syfers (1, 2, 3, ens.)',decimalLeadingZero:'Desimale syfers met voorloopnul (01, 02, 03, ens.)'},findAndReplace:{title:'Soek en vervang',find:'Soek',replace:'Vervang',findWhat:'Soek na:',replaceWith:'Vervang met:',notFoundMsg:'Teks nie gevind nie.',findOptions:'Find Options',matchCase:'Hoof/kleinletter sensitief',matchWord:'Hele woord moet voorkom',matchCyclic:'Soek deurlopend',replaceAll:'Vervang alles',replaceSuccessMsg:'%1 voorkoms(te) vervang.'},table:{toolbar:'Tabel',title:'Tabel eienskappe',menu:'Tabel eienskappe',deleteTable:'Verwyder tabel',rows:'Rye',columns:'Kolomme',border:'Randbreedte',widthPx:'piksels',widthPc:'persent',widthUnit:'breedte-eenheid',cellSpace:'Sel-afstand',cellPad:'Sel-spasie',caption:'Naam',summary:'Opsomming',headers:'Opskrifte',headersNone:'Geen',headersColumn:'Eerste kolom',headersRow:'Eerste ry',headersBoth:'Beide    ',invalidRows:"Aantal rye moet 'n getal groter as 0 wees.",invalidCols:"Aantal kolomme moet 'n getal groter as 0 wees.",invalidBorder:"Randbreedte moet 'n getal wees.",invalidWidth:"Tabelbreedte moet 'n getal wees.",invalidHeight:"Tabelhoogte moet 'n getal wees.",invalidCellSpacing:"Sel-afstand moet 'n getal wees.",invalidCellPadding:"Sel-spasie moet 'n getal wees.",cell:{menu:'Sel',insertBefore:'Voeg sel in voor',insertAfter:'Voeg sel in na',deleteCell:'Verwyder sel',merge:'Voeg selle saam',mergeRight:'Voeg saam na regs',mergeDown:'Voeg saam ondertoe',splitHorizontal:'Splits sel horisontaal',splitVertical:'Splits sel vertikaal',title:'Sel eienskappe',cellType:'Sel tipe',rowSpan:'Omspan rye',colSpan:'Omspan kolomme',wordWrap:'Woord terugloop',hAlign:'Horisontale oplyning',vAlign:'Vertikale oplyning',alignBaseline:'Basislyn',bgColor:'Agtergrondkleur',borderColor:'Randkleur',data:'Inhoud',header:'Opskrif',yes:'Ja',no:'Nee',invalidWidth:"Selbreedte moet 'n getal wees.",invalidHeight:"Selhoogte moet 'n getal wees.",invalidRowSpan:"Omspan rye moet 'n heelgetal wees.",invalidColSpan:"Omspan kolomme moet 'n heelgetal wees.",chooseColor:'Kies'},row:{menu:'Ry',insertBefore:'Voeg ry in voor',insertAfter:'Voeg ry in na',deleteRow:'Verwyder ry'},column:{menu:'Kolom',insertBefore:'Voeg kolom in voor',insertAfter:'Voeg kolom in na',deleteColumn:'Verwyder kolom'}},button:{title:'Knop eienskappe',text:'Teks (Waarde)',type:'Soort',typeBtn:'Knop',typeSbm:'Stuur',typeRst:'Maak leeg'},checkboxAndRadio:{checkboxTitle:'Merkhokkie eienskappe',radioTitle:'Radioknoppie eienskappe',value:'Waarde',selected:'Geselekteer'},form:{title:'Vorm eienskappe',menu:'Vorm eienskappe',action:'Aksie',method:'Metode',encoding:'Kodering'},select:{title:'Keuseveld eienskappe',selectInfo:'Info',opAvail:'Beskikbare opsies',value:'Waarde',size:'Grootte',lines:'Lyne',chkMulti:'Laat meer as een keuse toe',opText:'Teks',opValue:'Waarde',btnAdd:'Byvoeg',btnModify:'Wysig',btnUp:'Op',btnDown:'Af',btnSetValue:'Stel as geselekteerde waarde',btnDelete:'Verwyder'},textarea:{title:'Teks-area eienskappe',cols:'Kolomme',rows:'Rye'},textfield:{title:'Teksveld eienskappe',name:'Naam',value:'Waarde',charWidth:'Breedte (karakters)',maxChars:'Maksimum karakters',type:'Soort',typeText:'Teks',typePass:'Wagwoord'},hidden:{title:'Verborge veld eienskappe',name:'Naam',value:'Waarde'},image:{title:'Afbeelding eienskappe',titleButton:'Afbeeldingsknop eienskappe',menu:'Afbeelding eienskappe',infoTab:'Afbeelding informasie',btnUpload:'Stuur na bediener',upload:'Oplaai',alt:'Alternatiewe teks',lockRatio:'Vaste proporsie',resetSize:'Herstel grootte',border:'Rand',hSpace:'HSpasie',vSpace:'VSpasie',alertUrl:'Gee URL van afbeelding.',linkTab:'Skakel',button2Img:"Wil u die geselekteerde afbeeldingsknop vervang met 'n eenvoudige afbeelding?",img2Button:"Wil u die geselekteerde afbeelding vervang met 'n afbeeldingsknop?",urlMissing:'Die URL na die afbeelding ontbreek.',validateBorder:"Rand moet 'n heelgetal wees.",validateHSpace:"HSpasie moet 'n heelgetal wees.",validateVSpace:"VSpasie moet 'n heelgetal wees."},flash:{properties:'Flash eienskappe',propertiesTab:'Eienskappe',title:'Flash eienskappe',chkPlay:'Speel outomaties',chkLoop:'Herhaal',chkMenu:'Flash spyskaart aan',chkFull:'Laat volledige skerm toe',scale:'Skaal',scaleAll:'Wys alles',scaleNoBorder:'Geen rand',scaleFit:'Presiese pas',access:'Skrip toegang',accessAlways:'Altyd',accessSameDomain:'Selfde domeinnaam',accessNever:'Nooit',alignAbsBottom:'Absoluut-onder',alignAbsMiddle:'Absoluut-middel',alignBaseline:'Basislyn',alignTextTop:'Teks bo',quality:'Kwaliteit',qualityBest:'Beste',qualityHigh:'Hoog',qualityAutoHigh:'Outomaties hoog',qualityMedium:'Gemiddeld',qualityAutoLow:'Outomaties laag',qualityLow:'Laag',windowModeWindow:'Venster',windowModeOpaque:'Ondeursigtig',windowModeTransparent:'Deursigtig',windowMode:'Venster modus',flashvars:'Veranderlikes vir Flash',bgcolor:'Agtergrondkleur',hSpace:'HSpasie',vSpace:'VSpasie',validateSrc:'Voeg die URL in',validateHSpace:"HSpasie moet 'n heelgetal wees.",validateVSpace:"VSpasie moet 'n heelgetal wees."},spellCheck:{toolbar:'Speltoets',title:'Speltoetser',notAvailable:'Jammer, hierdie diens is nie nou beskikbaar nie.',errorLoading:'Fout by inlaai van diens: %s.',notInDic:'Nie in woordeboek nie',changeTo:'Verander na',btnIgnore:'Ignoreer',btnIgnoreAll:'Ignoreer alles',btnReplace:'Vervang',btnReplaceAll:'vervang alles',btnUndo:'Ontdoen',noSuggestions:'- Geen voorstel -',progress:'Spelling word getoets...',noMispell:'Klaar met speltoets: Geen foute nie',noChanges:'Klaar met speltoets: Geen woorde verander nie',oneChange:'Klaar met speltoets: Een woord verander',manyChanges:'Klaar met speltoets: %1 woorde verander',ieSpellDownload:'Speltoetser is nie geïnstalleer nie. Wil u dit nou aflaai?'},smiley:{toolbar:'Lagbekkie',title:'Voeg lagbekkie by',options:'Lagbekkie opsies'},elementsPath:{eleLabel:'Elemente-pad',eleTitle:'%1 element'},numberedlist:'Genommerde lys',bulletedlist:'Ongenommerde lys',indent:'Vergroot inspring',outdent:'Verklein inspring',justify:{left:'Links oplyn',center:'Sentreer',right:'Regs oplyn',block:'Uitvul'},blockquote:'Sitaatblok',clipboard:{title:'Byvoeg',cutError:'U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).',copyError:'U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).',pasteMsg:'Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.',securityMsg:'Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.',pasteArea:'Plak-area'},pastefromword:{confirmCleanup:'Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?',toolbar:'Plak vanuit Word',title:'Plak vanuit Word',error:"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout"},pasteText:{button:'Plak as eenvoudige teks',title:'Plak as eenvoudige teks'},templates:{button:'Sjablone',title:'Inhoud Sjablone',options:'Sjabloon opsies',insertOption:'Vervang huidige inhoud',selectPromptMsg:'Kies die sjabloon om te gebruik in die redigeerder (huidige inhoud gaan verlore):',emptyListMsg:'(Geen sjablone gedefineer nie)'},showBlocks:'Toon blokke',stylesCombo:{label:'Styl',panelTitle:'Opmaak style',panelTitle1:'Blok style',panelTitle2:'Inlyn style',panelTitle3:'Objek style'},format:{label:'Opmaak',panelTitle:'Opmaak',tag_p:'Normaal',tag_pre:'Opgemaak',tag_address:'Adres',tag_h1:'Opskrif 1',tag_h2:'Opskrif 2',tag_h3:'Opskrif 3',tag_h4:'Opskrif 4',tag_h5:'Opskrif 5',tag_h6:'Opskrif 6',tag_div:'Normaal (DIV)'},div:{title:'Skep Div houer',toolbar:'Skep Div houer',cssClassInputLabel:'CSS klasse',styleSelectLabel:'Styl',IdInputLabel:'Id',languageCodeInputLabel:' Taalkode',inlineStyleInputLabel:'Inlyn Styl',advisoryTitleInputLabel:'Aanbevole Titel',langDirLabel:'Skryfrigting',langDirLTRLabel:'Links na regs (LTR)',langDirRTLLabel:'Regs na links (RTL)',edit:'Wysig Div',remove:'Verwyder Div'},iframe:{title:'IFrame Eienskappe',toolbar:'IFrame',noUrl:'Gee die iframe URL',scrolling:'Skuifbalke aan',border:'Wys rand van raam'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Fontnaam'},fontSize:{label:'Grootte',voiceLabel:'Fontgrootte',panelTitle:'Fontgrootte'},colorButton:{textColorTitle:'Tekskleur',bgColorTitle:'Agtergrondkleur',panelTitle:'Kleure',auto:'Outomaties',more:'Meer Kleure...'},colors:{'000':'Swart',800000:'Meroen','8B4513':'Sjokoladebruin','2F4F4F':'Donkerleisteengrys','008080':'Blougroen','000080':'Vlootblou','4B0082':'Indigo',696969:'Donkergrys',B22222:'Rooibaksteen',A52A2A:'Bruin',DAA520:'Donkergeel','006400':'Donkergroen','40E0D0':'Turkoois','0000CD':'Middelblou',800080:'Pers',808080:'Grys',F00:'Rooi',FF8C00:'Donkeroranje',FFD700:'Goud','008000':'Groen','0FF':'Siaan','00F':'Blou',EE82EE:'Viooltjieblou',A9A9A9:'Donkergrys',FFA07A:'Ligsalm',FFA500:'Oranje',FFFF00:'Geel','00FF00':'Lemmetjie',AFEEEE:'Ligturkoois',ADD8E6:'Ligblou',DDA0DD:'Pruim',D3D3D3:'Liggrys',FFF0F5:'Linne',FAEBD7:'Ivoor',FFFFE0:'Liggeel',F0FFF0:'Heuningdou',F0FFFF:'Asuur',F0F8FF:'Ligte hemelsblou',E6E6FA:'Laventel',FFF:'Wit'},scayt:{title:'Speltoets terwyl u tik',opera_title:'Nie ondersteun deur Opera nie',enable:'SCAYT aan',disable:'SCAYT af',about:'SCAYT info',toggle:'SCAYT wissel aan/af',options:'Opsies',langs:'Tale',moreSuggestions:'Meer voorstelle',ignore:'Ignoreer',ignoreAll:'Ignoreer alles',addWord:'Voeg woord by',emptyDic:'Woordeboeknaam mag nie leeg wees nie.',noSuggestions:'Geen voorstel',optionsTab:'Opsies',allCaps:'Ignoreer woorde in hoofletters',ignoreDomainNames:'Ignoreer domeinname',mixedCase:'Ignoreer woorde met hoof- en kleinletters',mixedWithDigits:'Ignoreer woorde met syfers',languagesTab:'Tale',dictionariesTab:'Woordeboeke',dic_field_name:'Naam van woordeboek',dic_create:'Skep',dic_restore:'Herstel',dic_delete:'Verwijder',dic_rename:'Hernoem',dic_info:"Aanvanklik word die gebruikerswoordeboek in 'n koekie gestoor. Koekies is egter beperk in grootte. Wanneer die gebruikerswoordeboek te groot vir 'n koekie geword het, kan dit op ons bediener gestoor word. Om u persoonlike woordeboek op ons bediener te stoor, gee asb. 'n naam vir u woordeboek. Indien u alreeds 'n gestoorde woordeboek het, tik die naam en kliek op die Herstel knop.",aboutTab:'Info'},about:{title:'Info oor CKEditor',dlgTitle:'Info oor CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Vir lisensie-informasie, besoek asb. ons webwerf:',copy:'Kopiereg &copy; $1. Alle regte voorbehou.'},maximize:'Maksimaliseer',minimize:'Minimaliseer',fakeobjects:{anchor:'Anker',flash:'Flash animasie',iframe:'IFrame',hiddenfield:'Verborge veld',unknown:'Onbekende objek'},resize:'Sleep om te herskaal',colordialog:{title:'Kies kleur',options:'Kleuropsies',highlight:'Aktief',selected:'Geselekteer',clear:'Herstel'},toolbarCollapse:'Verklein werkbalk',toolbarExpand:'Vergroot werkbalk',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Skryfrigting van links na regs',rtl:'Skryfrigting van regs na links'},docprops:{label:'Dokument Eienskappe',title:'Dokument Eienskappe',design:'Design',meta:'Meta Data',chooseColor:'Kies',other:'<ander>',docTitle:'Bladsy Opskrif',charset:'Karakterstel Kodeering',charsetOther:'Ander Karakterstel Kodeering',charsetASCII:'ASCII',charsetCE:'Sentraal Europa',charsetCT:'Chinees Traditioneel (Big5)',charsetCR:'Cyrillic',charsetGR:'Grieks',charsetJP:'Japanees',charsetKR:'Koreans',charsetTR:'Turks',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Dokument Opskrif Soort',docTypeOther:'Ander Dokument Opskrif Soort',xhtmlDec:'Voeg XHTML verklaring by',bgColor:'Agtergrond kleur',bgImage:'Agtergrond Beeld URL',bgFixed:'Vasgeklemde Agtergrond',txtColor:'Tekskleur',margin:'Bladsy Rante',marginTop:'Bo',marginLeft:'Links',marginRight:'Regs',marginBottom:'Onder',metaKeywords:'Dokument Index Sleutelwoorde(comma verdeelt)',metaDescription:'Dokument Beskrywing',metaAuthor:'Skrywer',metaCopyright:'Kopiereg',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ar.js b/web/imcms/ckeditor/lang/ar.js
new file mode 100644
index 0000000000..8789709474
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ar.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ar={dir:'rtl',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'المصدر',newPage:'ص�حة جديدة',save:'ح�ظ',preview:'معاينة الص�حة',cut:'قص',copy:'نسخ',paste:'لصق',print:'طباعة',underline:'تسطير',bold:'غامق',italic:'مائل',selectAll:'تحديد الكل',removeFormat:'إزالة التنسيقات',strike:'يتوسطه خط',subscript:'منخ�ض',superscript:'مرت�ع',horizontalrule:'خط �اصل',pagebreak:'إدخال ص�حة جديدة',pagebreakAlt:'Page Break',unlink:'إزالة رابط',undo:'تراجع',redo:'إعادة',common:{browseServer:'تص�ح',url:'الرابط',protocol:'البروتوكول',upload:'ر�ع',uploadSubmit:'أرسل',image:'صورة',flash:'�لاش',form:'نموذج',checkbox:'خانة إختيار',radio:'زر اختيار',textField:'مربع نص',textarea:'مساحة نصية',hiddenField:'إدراج حقل خ�ي',button:'زر ضغط',select:'اختار',imageButton:'زر صورة',notSet:'<بدون تحديد>',id:'الرقم',name:'الاسم',langDir:'إتجاه النص',langDirLtr:'اليسار لليمين (LTR)',langDirRtl:'اليمين لليسار (RTL)',langCode:'رمز اللغة',longDescr:'الوص� الت�صيلى',cssClass:'�ئات التنسيق',advisoryTitle:'عنوان التقرير',cssStyle:'نمط',ok:'موا�ق',cancel:'إلغاء الأمر',close:'أغلق',preview:'استعراض',generalTab:'عام',advancedTab:'متقدم',validateNumberFailed:'لايوجد نتيجة',confirmNewPage:'ست�قد أي متغييرات اذا لم تقم بح�ظها اولا. هل أنت متأكد أنك تريد ص�حة جديدة؟',confirmCancel:'بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟',options:'خيارات',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'العرض',height:'الإرت�اع',align:'محاذاة',alignLeft:'يسار',alignRight:'يمين',alignCenter:'وسط',alignTop:'أعلى',alignMiddle:'وسط',alignBottom:'أس�ل',invalidValue:'Invalid value.',invalidHeight:'الارت�اع يجب أن يكون عدداً.',invalidWidth:'العرض يجب أن يكون عدداً.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, غير متاح</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'إدراج  خاص.�',title:'اختر الخواص',options:'Special Character Options'},link:{toolbar:'رابط',other:'<أخرى>',menu:'تحرير رابط',title:'إرتباط تشعبي',info:'معلومات الرابط',target:'هد� الرابط',upload:'ر�ع',advanced:'متقدم',type:'نوع الربط',toUrl:'URL',toAnchor:'مكان �ي هذا المستند',toEmail:'بريد إلكتروني',targetFrame:'<إطار>',targetPopup:'<نا�ذة منبثقة>',targetFrameName:'اسم الإطار المستهد�',targetPopupName:'اسم النا�ذة المنبثقة',popupFeatures:'خصائص النا�ذة المنبثقة',popupResizable:'قابلة التشكيل',popupStatusBar:'شريط الحالة',popupLocationBar:'شريط العنوان',popupToolbar:'شريط الأدوات',popupMenuBar:'القوائم الرئيسية',popupFullScreen:'ملئ الشاشة (IE)',popupScrollBars:'أشرطة التمرير',popupDependent:'تابع (Netscape)',popupLeft:'التمركز لليسار',popupTop:'التمركز للأعلى',id:'هوية',langDir:'إتجاه النص',langDirLTR:'اليسار لليمين (LTR)',langDirRTL:'اليمين لليسار (RTL)',acccessKey:'م�اتيح الإختصار',name:'الاسم',langCode:'كود النص',tabIndex:'الترتيب',advisoryTitle:'عنوان التقرير',advisoryContentType:'نوع التقرير',cssClasses:'�ئات التنسيق',charset:'ترميز المادة المطلوبة',styles:'نمط',rel:'Relationship',selectAnchor:'اختر علامة مرجعية',anchorName:'حسب الاسم',anchorId:'حسب رقم العنصر',emailAddress:'عنوان البريد إلكتروني',emailSubject:'موضوع الرسالة',emailBody:'محتوى الرسالة',noAnchors:'(لا توجد علامات مرجعية �ي هذا المستند)',noUrl:'من �ضلك أدخل عنوان الموقع الذي يشير إليه الرابط',noEmail:'من �ضلك أدخل عنوان البريد الإلكتروني'},anchor:{toolbar:'إشارة مرجعية',menu:'تحرير الإشارة المرجعية',title:'خصائص الإشارة المرجعية',name:'اسم الإشارة المرجعية',errorName:'الرجاء كتابة اسم الإشارة المرجعية',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'بحث واستبدال',find:'بحث',replace:'إستبدال',findWhat:'البحث بـ:',replaceWith:'إستبدال بـ:',notFoundMsg:'لم يتم العثور على النص المحدد.',findOptions:'Find Options',matchCase:'مطابقة حالة الأحر�',matchWord:'مطابقة بالكامل',matchCyclic:'مطابقة دورية',replaceAll:'إستبدال الكل',replaceSuccessMsg:'تم استبدال 1% من الحالات '},table:{toolbar:'جدول',title:'خصائص الجدول',menu:'خصائص الجدول',deleteTable:'حذ� الجدول',rows:'ص�و�',columns:'أعمدة',border:'الحدود',widthPx:'بكسل',widthPc:'بالمئة',widthUnit:'width unit',cellSpace:'تباعد الخلايا',cellPad:'المسا�ة البادئة',caption:'الوص�',summary:'الخلاصة',headers:'العناوين',headersNone:'بدون',headersColumn:'العمود الأول',headersRow:'الص� الأول',headersBoth:'كلاهما',invalidRows:'عدد الص�و� يجب أن يكون عدداً أكبر من ص�ر.',invalidCols:'عدد الأعمدة يجب أن يكون عدداً أكبر من ص�ر.',invalidBorder:'حجم الحد يجب أن يكون عدداً.',invalidWidth:'عرض الجدول يجب أن يكون عدداً.',invalidHeight:'ارت�اع الجدول يجب أن يكون عدداً.',invalidCellSpacing:'المسا�ة بين الخلايا يجب أن تكون عدداً.',invalidCellPadding:'المسا�ة البادئة يجب أن تكون عدداً',cell:{menu:'خلية',insertBefore:'إدراج خلية قبل',insertAfter:'إدراج خلية بعد',deleteCell:'حذ� خلية',merge:'دمج خلايا',mergeRight:'دمج لليمين',mergeDown:'دمج للأس�ل',splitHorizontal:'تقسيم الخلية أ�قياً',splitVertical:'تقسيم الخلية عمودياً',title:'خصائص الخلية',cellType:'نوع الخلية',rowSpan:'امتداد الص�و�',colSpan:'امتداد الأعمدة',wordWrap:'الت�ا� النص',hAlign:'محاذاة أ�قية',vAlign:'محاذاة رأسية',alignBaseline:'خط القاعدة',bgColor:'لون الخل�ية',borderColor:'لون الحدود',data:'بيانات',header:'عنوان',yes:'نعم',no:'لا',invalidWidth:'عرض الخلية يجب أن يكون عدداً.',invalidHeight:'ارت�اع الخلية يجب أن يكون عدداً.',invalidRowSpan:'امتداد الص�و� يجب أن يكون عدداً صحيحاً.',invalidColSpan:'امتداد الأعمدة يجب أن يكون عدداً صحيحاً.',chooseColor:'اختر'},row:{menu:'ص�',insertBefore:'إدراج ص� قبل',insertAfter:'إدراج ص� بعد',deleteRow:'حذ� ص�و�'},column:{menu:'عمود',insertBefore:'إدراج عمود قبل',insertAfter:'إدراج عمود بعد',deleteColumn:'حذ� أعمدة'}},button:{title:'خصائص زر الضغط',text:'القيمة/التسمية',type:'نوع الزر',typeBtn:'زر',typeSbm:'إرسال',typeRst:'إعادة تعيين'},checkboxAndRadio:{checkboxTitle:'خصائص خانة الإختيار',radioTitle:'خصائص زر الخيار',value:'القيمة',selected:'محدد'},form:{title:'خصائص النموذج',menu:'خصائص النموذج',action:'اسم المل�',method:'الأسلوب',encoding:'تش�ير'},select:{title:'خصائص اختيار الحقل',selectInfo:'اختار معلومات',opAvail:'الخيارات المتاحة',value:'القيمة',size:'الحجم',lines:'الأسطر',chkMulti:'السماح بتحديدات متعددة',opText:'النص',opValue:'القيمة',btnAdd:'إضا�ة',btnModify:'تعديل',btnUp:'أعلى',btnDown:'أس�ل',btnSetValue:'إجعلها محددة',btnDelete:'إزالة'},textarea:{title:'خصائص مساحة النص',cols:'الأعمدة',rows:'الص�و�'},textfield:{title:'خصائص مربع النص',name:'الاسم',value:'القيمة',charWidth:'عرض السمات',maxChars:'اقصى عدد للسمات',type:'نوع المحتوى',typeText:'نص',typePass:'كلمة مرور'},hidden:{title:'خصائص الحقل المخ�ي',name:'الاسم',value:'القيمة'},image:{title:'خصائص الصورة',titleButton:'خصائص زر الصورة',menu:'خصائص الصورة',infoTab:'معلومات الصورة',btnUpload:'أرسلها للخادم',upload:'ر�ع',alt:'عنوان الصورة',lockRatio:'تناسق الحجم',resetSize:'إستعادة الحجم الأصلي',border:'سمك الحدود',hSpace:'تباعد أ�قي',vSpace:'تباعد عمودي',alertUrl:'�ضلاً أكتب الموقع الذي توجد عليه هذه الصورة.',linkTab:'الرابط',button2Img:'هل تريد تحويل زر الصورة المختار إلى صورة بسيطة؟',img2Button:'هل تريد تحويل الصورة المختارة إلى زر صورة؟',urlMissing:'عنوان مصدر الصورة م�قود',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'خصائص ال�لاش',propertiesTab:'الخصائص',title:'خصائص �يلم ال�لاش',chkPlay:'تشغيل تلقائي',chkLoop:'تكرار',chkMenu:'تمكين قائمة �يلم ال�لاش',chkFull:'ملء الشاشة',scale:'الحجم',scaleAll:'إظهار الكل',scaleNoBorder:'بلا حدود',scaleFit:'ضبط تام',access:'دخول النص البرمجي',accessAlways:'دائماً',accessSameDomain:'ن�س النطاق',accessNever:'مطلقاً',alignAbsBottom:'أس�ل النص',alignAbsMiddle:'وسط السطر',alignBaseline:'على السطر',alignTextTop:'أعلى النص',quality:'جودة',qualityBest:'أ�ضل',qualityHigh:'عالية',qualityAutoHigh:'عالية تلقائياً',qualityMedium:'متوسطة',qualityAutoLow:'منخ�ضة تلقائياً',qualityLow:'منخ�ضة',windowModeWindow:'نا�ذة',windowModeOpaque:'غير ش�ا�',windowModeTransparent:'ش�ا�',windowMode:'وضع النا�ذة',flashvars:'متغيرات ال�لاش',bgcolor:'لون الخل�ية',hSpace:'تباعد أ�قي',vSpace:'تباعد عمودي',validateSrc:'�ضلاً أدخل عنوان الموقع الذي يشير إليه الرابط',validateHSpace:'HSpace يجب أن يكون عدداً.',validateVSpace:'VSpace يجب أن يكون عدداً.'},spellCheck:{toolbar:'تدقيق إملائي',title:'التدقيق الإملائي',notAvailable:'ع�واً، ولكن هذه الخدمة غير متاحة الان',errorLoading:'خطأ �ي تحميل تطبيق خدمة الاستضا�ة: %s.',notInDic:'ليست �ي القاموس',changeTo:'التغيير إلى',btnIgnore:'تجاهل',btnIgnoreAll:'تجاهل الكل',btnReplace:'تغيير',btnReplaceAll:'تغيير الكل',btnUndo:'تراجع',noSuggestions:'- لا توجد إقتراحات -',progress:'جاري التدقيق الاملائى',noMispell:'تم التدقيق الإملائي: لم يتم العثور على أي أخطاء إملائية',noChanges:'تم التدقيق الإملائي: لم يتم تغيير أي كلمة',oneChange:'تم التدقيق الإملائي: تم تغيير كلمة واحدة �قط',manyChanges:'تم إكمال التدقيق الإملائي: تم تغيير %1 من كلمات',ieSpellDownload:'المدقق الإملائي (الإنجليزي) غير مثبّت. هل تود تحميله الآن؟'},smiley:{toolbar:'ابتسامات',title:'إدراج ابتسامات',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'عنصر 1%'},numberedlist:'ادخال/حذ� تعداد رقمي',bulletedlist:'ادخال/حذ� تعداد نقطي',indent:'زيادة المسا�ة البادئة',outdent:'إنقاص المسا�ة البادئة',justify:{left:'محاذاة إلى اليسار',center:'توسيط',right:'محاذاة إلى اليمين',block:'ضبط'},blockquote:'اقتباس',clipboard:{title:'لصق',cutError:'الإعدادات الأمنية للمتص�ح الذي تستخدمه تمنع القص التلقائي. �ضلاً إستخدم لوحة الم�اتيح ل�عل ذلك (Ctrl/Cmd+X).',copyError:'الإعدادات الأمنية للمتص�ح الذي تستخدمه تمنع النسخ التلقائي. �ضلاً إستخدم لوحة الم�اتيح ل�عل ذلك (Ctrl/Cmd+C).',pasteMsg:'الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) �ي لوحة الم�اتيح، ثم اضغط زر  <STRONG>موا�ق</STRONG>.',securityMsg:'نظراً لإعدادات الأمان الخاصة بمتص�حك، لن يتمكن هذا المحرر من الوصول لمحتوى حا�ظتك، لذلك يجب عليك لصق المحتوى مرة أخرى �ي هذه النا�ذة.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظي�ه قبل الشروع �ي عملية اللصق؟',toolbar:'لصق من وورد',title:'لصق من وورد',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'لصق كنص بسيط',title:'لصق كنص بسيط'},templates:{button:'القوالب',title:'قوالب المحتوى',options:'Template Options',insertOption:'استبدال المحتوى',selectPromptMsg:'اختر القالب الذي تود وضعه �ي المحرر',emptyListMsg:'(لم يتم تعري� أي قالب)'},showBlocks:'مخطط ت�صيلي',stylesCombo:{label:'أنماط',panelTitle:'Formatting Styles',panelTitle1:'أنماط ال�قرة',panelTitle2:'أنماط مضمنة',panelTitle3:'أنماط الكائن'},format:{label:'تنسيق',panelTitle:'تنسيق ال�قرة',tag_p:'عادي',tag_pre:'منسّق',tag_address:'عنوان',tag_h1:'العنوان 1',tag_h2:'العنوان  2',tag_h3:'العنوان  3',tag_h4:'العنوان  4',tag_h5:'العنوان  5',tag_h6:'العنوان  6',tag_div:'عادي (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'خط',voiceLabel:'حجم الخط',panelTitle:'حجم الخط'},fontSize:{label:'حجم الخط',voiceLabel:'حجم الخط',panelTitle:'حجم الخط'},colorButton:{textColorTitle:'لون النص',bgColorTitle:'لون الخل�ية',panelTitle:'Colors',auto:'تلقائي',more:'ألوان إضا�ية...'},colors:{'000':'أسود',800000:'كستنائي','8B4513':'بني �اتح','2F4F4F':'رمادي أردوازي غامق','008080':'أزرق مخضر','000080':'أزرق داكن','4B0082':'كحلي',696969:'رمادي داكن',B22222:'طوبي',A52A2A:'بني',DAA520:'ذهبي داكن','006400':'أخضر داكن','40E0D0':'�يروزي','0000CD':'أزرق متوسط',800080:'بن�سجي غامق',808080:'رمادي',F00:'أحمر',FF8C00:'برتقالي داكن',FFD700:'ذهبي','008000':'أخضر','0FF':'تركواز','00F':'أزرق',EE82EE:'بن�سجي',A9A9A9:'رمادي شاحب',FFA07A:'برتقالي وردي',FFA500:'برتقالي',FFFF00:'أص�ر','00FF00':'ليموني',AFEEEE:'�يروزي شاحب',ADD8E6:'أزرق �اتح',DDA0DD:'بن�سجي �اتح',D3D3D3:'رمادي �اتح',FFF0F5:'وردي �اتح',FAEBD7:'أبيض عتيق',FFFFE0:'أص�ر �اتح',F0FFF0:'أبيض مائل للأخضر',F0FFFF:'سماوي',F0F8FF:'لبني',E6E6FA:'أرجواني',FFF:'أبيض'},scayt:{title:'تدقيق إملائي أثناء الكتابة',opera_title:'Not supported by Opera',enable:'ت�عيل SCAYT',disable:'تعطيل SCAYT',about:'عن SCAYT',toggle:'تثبيت SCAYT',options:'خيارات',langs:'لغات',moreSuggestions:'المزيد من المقترحات',ignore:'تجاهل',ignoreAll:'تجاهل الكل',addWord:'إضا�ة كلمة',emptyDic:'اسم القاموس يجب ألا يكون �ارغاً.',noSuggestions:'لا توجد إقتراحات',optionsTab:'خيارات',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'لغات',dictionariesTab:'قواميس',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'عن'},about:{title:'عن CKEditor',dlgTitle:'عن CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'للحصول على معلومات الترخيص ، يرجى زيارة موقعنا على شبكة الانترنت:',copy:'حقوق النشر &copy; $1. جميع الحقوق مح�وظة.'},maximize:'تكبير',minimize:'تصغير',fakeobjects:{anchor:'إرساء',flash:'رسم متحرك بال�لاش',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'كائن غير معرو�'},resize:'اسحب لتغيير الحجم',colordialog:{title:'اختر لون',options:'Color Options',highlight:'إلقاء الضوء',selected:'م�ختار',clear:'مسح'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'خصائص الص�حة',title:'خصائص الص�حة',design:'Design',meta:'المعرّ�ات الرأسية',chooseColor:'اختر',other:'<أخرى>',docTitle:'عنوان الص�حة',charset:'ترميز الحرو�',charsetOther:'ترميز آخر',charsetASCII:'ASCII',charsetCE:'أوروبا الوسطى',charsetCT:'الصينية التقليدية (Big5)',charsetCR:'السيريلية',charsetGR:'اليونانية',charsetJP:'اليابانية',charsetKR:'الكورية',charsetTR:'التركية',charsetUN:'Unicode (UTF-8)',charsetWE:'أوروبا الغربية',docType:'ترويسة نوع  الص�حة',docTypeOther:'ترويسة نوع  ص�حة أخرى',xhtmlDec:'تضمين   إعلانات لغة XHTMLَ',bgColor:'لون الخل�ية',bgImage:'رابط الصورة الخل�ية',bgFixed:'جعلها علامة مائية',txtColor:'لون النص',margin:'هوامش الص�حة',marginTop:'علوي',marginLeft:'أيسر',marginRight:'أيمن',marginBottom:'س�لي',metaKeywords:'الكلمات الأساسية (م�صولة ب�واصل)َ',metaDescription:'وص� الص�حة',metaAuthor:'الكاتب',metaCopyright:'المالك',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/bg.js b/web/imcms/ckeditor/lang/bg.js
new file mode 100644
index 0000000000..3816f43515
--- /dev/null
+++ b/web/imcms/ckeditor/lang/bg.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.bg={dir:'ltr',editorTitle:'Тек�тов редактор за форматиран тек�т, %1',editorHelp:'нати�нете ALT 0 за помощ',toolbars:'Ленти � ин�трументи',editor:'Тек�тов редактор за форматиран тек�т',source:'Източник',newPage:'�ова �траница',save:'Запи�',preview:'Преглед',cut:'Отрежи',copy:'Копирай',paste:'Вмъкни',print:'Печат',underline:'Подчертан',bold:'Удебелен',italic:'�аклонен',selectAll:'Избери в�ичко',removeFormat:'Премахване на форматирането',strike:'Зачертан тек�т',subscript:'Индек�иран тек�т',superscript:'Супер�крипт',horizontalrule:'Вмъкване на хоризонтална лини�',pagebreak:'Вмъкване на нова �траница при печат',pagebreakAlt:'Раздел�не на �траници',unlink:'Премахни връзката',undo:'Възтанови',redo:'Връщане на предишен �тату�',common:{browseServer:'Избор от �ървъра',url:'URL',protocol:'Протокол',upload:'Качване',uploadSubmit:'Изпращане към �ървъра',image:'Снимка',flash:'Флаш',form:'Форма',checkbox:'Поле за избор',radio:'Радио бутон',textField:'Тек�тово поле',textarea:'Тек�това зона',hiddenField:'Скрито поле',button:'Бутон',select:'Поле за избор',imageButton:'Бутон за �нимка',notSet:'<не е избрано>',id:'ID',name:'Име',langDir:'По�ока на езика',langDirLtr:'Л�во на д��но (ЛнД)',langDirRtl:'Д��но на л�во (ДнЛ)',langCode:'Код на езика',longDescr:'Уеб адре� за дълго опи�ание',cssClass:'Кла�ове за CSS',advisoryTitle:'Advisory Title',cssStyle:'Стил',ok:'ОК',cancel:'Отказ',close:'Затвори',preview:'Преглед',generalTab:'Общо',advancedTab:'Разширено',validateNumberFailed:'Тази �тойно�т не е чи�ло',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Опции',target:'Цел',targetNew:'�ов прозорец (_blank)',targetTop:'Горна позици� (_top)',targetSelf:'Текущи� прозорец (_self)',targetParent:'О�новен прозорец (_parent)',langDirLTR:'Л�во на д��но (ЛнД)',langDirRTL:'Д��но на л�во (ДнЛ)',styles:'Стил',cssClasses:'Кла�ове за CSS',width:'Ширина',height:'Ви�очина',align:'Подравн�ване',alignLeft:'Л�во',alignRight:'Д��но',alignCenter:'Център',alignTop:'Горе',alignMiddle:'По �редата',alignBottom:'Долу',invalidValue:'Invalid value.',invalidHeight:'Ви�очината тр�бва да е чи�ло.',invalidWidth:'Ширина требе да е чи�ло.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Опции на контек�тното меню'},specialChar:{toolbar:'Вмъкване на �пециален знак',title:'Избор на �пециален знак',options:'Опции за �пециален знак'},link:{toolbar:'Връзка',other:'<друго>',menu:'Пром�на на връзка',title:'Връзка',info:'Инфо за връзката',target:'Цел',upload:'Качване',advanced:'Разширено',type:'Тип на връзката',toUrl:'Уеб адре�',toAnchor:'Връзка към котва в тек�та',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<изкачащ прозорец>',targetFrameName:'Име на целеви�т прозорец',targetPopupName:'Име на изкачащ прозорец',popupFeatures:'Функции на изкачащ прозорец',popupResizable:'Оразмер�ем',popupStatusBar:'Стату�на лента',popupLocationBar:'Лента � локаци�та',popupToolbar:'Лента � ин�трументи',popupMenuBar:'Лента за меню',popupFullScreen:'Ц�л екран (IE)',popupScrollBars:'Скролери',popupDependent:'Зави�имо�т (Netscape)',popupLeft:'Л�ва позици�',popupTop:'Горна позици�',id:'ID',langDir:'По�ока на езика',langDirLTR:'Л�во на Д��но (ЛнД)',langDirRTL:'Д��но на Л�во (ДнЛ)',acccessKey:'Ключ за до�тъп',name:'Име',langCode:'Код за езика',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Кла�ове за CSS',charset:'Linked Resource Charset',styles:'Стил',rel:'Връзка',selectAnchor:'Изберете котва',anchorName:'По име на котва',anchorId:'По ID на елемент',emailAddress:'E-mail aдре�',emailSubject:'Тема',emailBody:'Съдържание',noAnchors:'(No anchors available in the document)',noUrl:'Мол� въведете URL адре�а',noEmail:'Мол� въведете e-mail aдре�'},anchor:{toolbar:'Котва',menu:'Пром�на на котва',title:'�а�тройки на котва',name:'Име на котва',errorName:'Мол� въведете име на котвата',remove:'Премахване на котва'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Тип',start:'Старт',validateStartNumber:'List start number must be a whole number.',circle:'Кръг',disc:'Ди�к',square:'Квадрат',none:'��ма',notset:'<не е указано>',armenian:'�рмен�ко номериране',georgian:'Грузин�ко номериране (an, ban, gan, и т.н.)',lowerRoman:'Малки рим�ки чи�ла (i, ii, iii, iv, v и т.н.)',upperRoman:'Големи рим�ки чи�ла (I, II, III, IV, V и т.н.)',lowerAlpha:'Малки букви (а, б, в, г, д и т.н.)',upperAlpha:'Големи букви (�, Б, В, Г, Д и т.н.)',lowerGreek:'Малки гръцки букви (алфа, бета, гама и т.н.)',decimal:'Чи�ла (1, 2, 3 и др.)',decimalLeadingZero:'Чи�ла � водеща нула (01, 02, 03 и т.н.)'},findAndReplace:{title:'Тър�ене и препокриване',find:'Тър�ене',replace:'Препокриване',findWhat:'Тър�и за:',replaceWith:'Препокрива �:',notFoundMsg:'Указани�т тек�т не е намерен.',findOptions:'Find Options',matchCase:'Съвпадение',matchWord:'Съвпадение � дума',matchCyclic:'Циклично �ъвпадение',replaceAll:'Препокрий в�ички',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Таблица',title:'�а�тройки на таблицата',menu:'�а�тройки на таблицата',deleteTable:'Изтриване на таблица',rows:'Редове',columns:'Колони',border:'Размер на рамката',widthPx:'пик�ела',widthPc:'процент',widthUnit:'единица за ширина',cellSpace:'Разто�ние между клетките',cellPad:'Отдел�не на клетките',caption:'Заглавие',summary:'Обща информаци�',headers:'Хедъри',headersNone:'��ма',headersColumn:'Първа колона',headersRow:'Първи ред',headersBoth:'Заедно',invalidRows:'Бро�т редове тр�бва да е по-гол�м от 0.',invalidCols:'Бро�т колони тр�бва да е по-гол�м от 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Клетка',insertBefore:'Вмъкване на клетка преди',insertAfter:'Вмъкване на клетка �лед',deleteCell:'Изтриване на клетки',merge:'Сливане на клетки',mergeRight:'Сливане в д��но',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'�а�тройки на клетката',cellType:'Тип на клетката',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'�вто. прено�',hAlign:'Хоризонтално подравн�ване',vAlign:'Вертикално подравн�ване',alignBaseline:'Базова лини�',bgColor:'Фон',borderColor:'Цв�т на рамката',data:'Данни',header:'Хедър',yes:'Да',no:'�е',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Изберете'},row:{menu:'Ред',insertBefore:'Insert Row Before',insertAfter:'Вмъкване на ред �лед',deleteRow:'Изтриване на редове'},column:{menu:'Колона',insertBefore:'Вмъкване на колона преди',insertAfter:'Вмъкване на колона �лед',deleteColumn:'Изтриване на колони'}},button:{title:'�а�тройки на бутона',text:'Тек�т (�тойно�т)',type:'Тип',typeBtn:'Бутон',typeSbm:'Добави',typeRst:'�улиране'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'�а�тройки на радиобутон',value:'Стойно�т',selected:'Избрано'},form:{title:'�а�тройки на формата',menu:'�а�тройки на формата',action:'Дей�твие',method:'Метод',encoding:'Кодиране'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'�алични опции',value:'Стойно�т',size:'Размер',lines:'линии',chkMulti:'Allow multiple selections',opText:'Тек�т',opValue:'Стойно�т',btnAdd:'Добави',btnModify:'Промени',btnUp:'�а горе',btnDown:'�а долу',btnSetValue:'Set as selected value',btnDelete:'Изтриване'},textarea:{title:'Опции за тек�товата зона',cols:'Колони',rows:'Редове'},textfield:{title:'�а�тройки за тек�тово поле',name:'Име',value:'Стойно�т',charWidth:'Ширина на знаците',maxChars:'Мак�. знаци',type:'Тип',typeText:'Тек�т',typePass:'Парола'},hidden:{title:'�а�тройки за �крито поле',name:'Име',value:'Стойно�т'},image:{title:'�а�тройки за �нимка',titleButton:'�а�тойки за бутон за �нимка',menu:'�а�тройки за �нимка',infoTab:'Инфо за �нимка',btnUpload:'Изпрати � на �ървъра',upload:'Качване',alt:'�лтернативен тек�т',lockRatio:'Заключване на �ъотношението',resetSize:'�улиране на размер',border:'Рамка',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Връзка',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'�а�тройки за флаш',propertiesTab:'�а�тройки',title:'�а�тройки за флаш',chkPlay:'�вто. пу�кане',chkLoop:'Цикъл',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Показва в�ичко',scaleNoBorder:'Без рамка',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Винаги',accessSameDomain:'Същи�т домейн',accessNever:'�икога',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Каче�тво',qualityBest:'Отлично',qualityHigh:'Ви�око',qualityAutoHigh:'�вто. ви�око',qualityMedium:'Средно',qualityAutoLow:'�вто. ни�ко',qualityLow:'�и�ко',windowModeWindow:'Прозорец',windowModeOpaque:'Плътно�т',windowModeTransparent:'Прозрачно�т',windowMode:'Режим на прозореца',flashvars:'Променливи за Флаш',bgcolor:'Background color',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Уеб адре�а не тр�бва да е празен.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Проверка на правопи�',title:'Проверка на правопи�',notAvailable:'Съжал�ваме, но у�лугата не е до�тъпна за момента',errorLoading:'Error loading application service host: %s.',notInDic:'�е е в речника',changeTo:'Промени на',btnIgnore:'Игнорирай',btnIgnoreAll:'Игнорирай в�ичко',btnReplace:'Препокриване',btnReplaceAll:'Препокрий в�ичко',btnUndo:'Възтанови',noSuggestions:'- ��ма препоръчани -',progress:'Провер�ва �е правопи�а...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'У�мивка',title:'Вмъкване на у�мивка',options:'Опции за у�мивката'},elementsPath:{eleLabel:'Път за елементите',eleTitle:'%1 елемент'},numberedlist:'Вмъкване/Премахване на номериран �пи�ък',bulletedlist:'Вмъкване/Премахване на точков �пи�ък',indent:'Увеличаване на от�тъпа',outdent:'�амал�ване на от�тъпа',justify:{left:'Подравни в л�во',center:'Център',right:'Подравни в д��но',block:'Justify'},blockquote:'Блок за цитат',clipboard:{title:'Paste',cutError:'�а�тройките за �игурно�т на Ваши� браузър не позвол�ват на редактора автоматично да изъплни дей�тви�та за отр�зване. Мол� ползвайте клавиатурните команди за целта (ctrl+x).',copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Показва блокове',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Стил',IdInputLabel:'ID',languageCodeInputLabel:' Код на езика',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Пром�на на Div',remove:'Премахване на Div'},iframe:{title:'IFrame на�тройки',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Шрифт',voiceLabel:'Шрифт',panelTitle:'Име на шрифт'},fontSize:{label:'Размер',voiceLabel:'Размер на шрифт',panelTitle:'Размер на шрифт'},colorButton:{textColorTitle:'Цв�т на шрифт',bgColorTitle:'Фонов цв�т',panelTitle:'Цветове',auto:'�втоматично',more:'Още цветове'},colors:{'000':'Черно',800000:'Ке�тен�во','8B4513':'Светлокаф�во','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Индиго',696969:'Тъмно �иво',B22222:'Огнено червено',A52A2A:'Каф�во',DAA520:'Злати�то','006400':'Тъмно зелено','40E0D0':'Тюркуазено','0000CD':'Средно �иньо',800080:'Пурпурно',808080:'Сиво',F00:'Червено',FF8C00:'Тъмно оранжево',FFD700:'Златно','008000':'Зелено','0FF':'Светло �иньо','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'��ма предложени�',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Игнорирани думи и цифри',languagesTab:'Езици',dictionariesTab:'Речници',dic_field_name:'Име на речнк',dic_create:'�ов',dic_restore:'Възтанов�ване',dic_delete:'Изтриване',dic_rename:'Преименуване',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'Отно�но'},about:{title:'Отно�но CKEditor',dlgTitle:'Отно�но CKEditor',help:'Проверете $1 за помощ.',userGuide:"CKEditor User's Guide",moreInfo:'За лицензионна информаци� мол� по�етете �айта ни:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Мак�имизиране',minimize:'Минимизиране',fakeobjects:{anchor:'Кука',flash:'Флаш анимаци�',iframe:'IFrame',hiddenfield:'Скрито поле',unknown:'�еизве�тен обект'},resize:'Влачете за да оразмерите',colordialog:{title:'Изберете цв�т',options:'Цветови опции',highlight:'О�вет�ване',selected:'Изберете цв�т',clear:'Изчи�тване'},toolbarCollapse:'Свиване на лентата � ин�трументи',toolbarExpand:'Разшир�ване на лентата � ин�трументи',toolbarGroups:{document:'Документ',clipboard:'Clipboard/Undo',editing:'Пром�на',forms:'Форми',basicstyles:'Базови �тилове',paragraph:'Параграф',links:'Връзки',insert:'Вмъкване',styles:'Стилове',colors:'Цветове',tools:'Ин�трументи'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'�а�тройки на документа',title:'�а�тройки на документа',design:'Дизайн',meta:'Мета етикети',chooseColor:'Изберете',other:'Други...',docTitle:'Заглавие на �траницата',charset:'Кодова таблица',charsetOther:'Друга кодова таблица',charsetASCII:'ASCII',charsetCE:'Централна европей�ка',charsetCT:'Китай�ки традиционен',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/bn.js b/web/imcms/ckeditor/lang/bn.js
new file mode 100644
index 0000000000..76301ee1d6
--- /dev/null
+++ b/web/imcms/ckeditor/lang/bn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.bn={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'সোর�স',newPage:'নত�ন পেজ',save:'সংরক�ষন কর',preview:'প�রিভিউ',cut:'কাট',copy:'কপি',paste:'পেস�ট',print:'প�রিন�ট',underline:'আন�ডারলাইন',bold:'বোল�ড',italic:'ইটালিক',selectAll:'সব সিলেক�ট কর',removeFormat:'ফরমেট সরাও',strike:'স�ট�রাইক থ�র�',subscript:'অধোলেখ',superscript:'অভিলেখ',horizontalrule:'রেখা য�ক�ত কর',pagebreak:'পেজ ব�রেক',pagebreakAlt:'Page Break',unlink:'লিংক সরাও',undo:'আনড�',redo:'রি-ড�',common:{browseServer:'ব�রাউজ সার�ভার',url:'URL',protocol:'প�রোটোকল',upload:'আপলোড',uploadSubmit:'ইহাকে সার�ভারে প�রেরন কর',image:'ছবির লেবেল য�ক�ত কর',flash:'ফ�লাশ লেবেল য�ক�ত কর',form:'ফর�ম',checkbox:'চেক বাক�স',radio:'রেডিও বাটন',textField:'টেক�সট ফীল�ড',textarea:'টেক�সট �রিয়া',hiddenField:'গ�প�ত ফীল�ড',button:'বাটন',select:'বাছাই ফীল�ড',imageButton:'ছবির বাটন',notSet:'<সেট নেই>',id:'আইডি',name:'নাম',langDir:'ভাষা লেখার দিক',langDirLtr:'বাম থেকে ডান (LTR)',langDirRtl:'ডান থেকে বাম (RTL)',langCode:'ভাষা কোড',longDescr:'URL �র লম�বা বর�ণনা',cssClass:'স�টাইল-শীট ক�লাস',advisoryTitle:'পরামর�শ শীর�ষক',cssStyle:'স�টাইল',ok:'ওকে',cancel:'বাতিল',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'�ডভান�সড',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'প�রস�থ',height:'দৈর�ঘ�য',align:'�লাইন',alignLeft:'বামে',alignRight:'ডানে',alignCenter:'মা�খানে',alignTop:'উপর',alignMiddle:'মধ�য',alignBottom:'নীচে',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'বিশেষ অক�ষর য�ক�ত কর',title:'বিশেষ ক�যারেক�টার বাছাই কর',options:'Special Character Options'},link:{toolbar:'লিংক য�ক�ত কর',other:'<other>',menu:'লিংক সম�পাদন',title:'লিংক',info:'লিংক তথ�য',target:'টার�গেট',upload:'আপলোড',advanced:'�ডভান�সড',type:'লিংক প�রকার',toUrl:'URL',toAnchor:'�ই পেজে নোঙর কর',toEmail:'ইমেইল',targetFrame:'<ফ�রেম>',targetPopup:'<পপআপ উইন�ডো>',targetFrameName:'টার�গেট ফ�রেমের নাম',targetPopupName:'পপআপ উইন�ডোর নাম',popupFeatures:'পপআপ উইন�ডো ফীচার সমূহ',popupResizable:'Resizable',popupStatusBar:'স�ট�যাটাস বার',popupLocationBar:'লোকেশন বার',popupToolbar:'ট�ল বার',popupMenuBar:'মেন�য� বার',popupFullScreen:'পূর�ণ পর�দা জ�ড়ে (IE)',popupScrollBars:'স�ক�রল বার',popupDependent:'ডিপেন�ডেন�ট (Netscape)',popupLeft:'বামের পজিশন',popupTop:'ডানের পজিশন',id:'Id',langDir:'ভাষা লেখার দিক',langDirLTR:'বাম থেকে ডান (LTR)',langDirRTL:'ডান থেকে বাম (RTL)',acccessKey:'�ক�সেস কী',name:'নাম',langCode:'ভাষা লেখার দিক',tabIndex:'ট�যাব ইন�ডেক�স',advisoryTitle:'পরামর�শ শীর�ষক',advisoryContentType:'পরামর�শ কন�টেন�টের প�রকার',cssClasses:'স�টাইল-শীট ক�লাস',charset:'লিংক রিসোর�স ক�যারেক�টর সেট',styles:'স�টাইল',rel:'Relationship',selectAnchor:'নোঙর বাছাই',anchorName:'নোঙরের নাম দিয়ে',anchorId:'নোঙরের আইডি দিয়ে',emailAddress:'ইমেইল ঠিকানা',emailSubject:'মেসেজের বিষয়',emailBody:'মেসেজের দেহ',noAnchors:'(No anchors available in the document)',noUrl:'অন�গ�রহ করে URL লিংক টাইপ কর�ন',noEmail:'অন�গ�রহ করে ইমেইল �ড�রেস টাইপ কর�ন'},anchor:{toolbar:'নোঙ�গর',menu:'নোঙর প�রোপার�টি',title:'নোঙর প�রোপার�টি',name:'নোঙরের নাম',errorName:'নোঙরের নাম টাইপ কর�ন',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'খোজো',replace:'রিপ�লেস',findWhat:'যা খ��জতে হবে:',replaceWith:'যার সাথে বদলাতে হবে:',notFoundMsg:'আপনার উল�লেখিত টেকস�ট পাওয়া যায়নি',findOptions:'Find Options',matchCase:'কেস মিলাও',matchWord:'প�রা শব�দ মেলাও',matchCyclic:'Match cyclic',replaceAll:'সব বদলে দাও',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'টেবিলের লেবেল য�ক�ত কর',title:'টেবিল প�রোপার�টি',menu:'টেবিল প�রোপার�টি',deleteTable:'টেবিল ডিলীট কর',rows:'রো',columns:'কলাম',border:'বর�ডার সাইজ',widthPx:'পিক�সেল',widthPc:'শতকরা',widthUnit:'width unit',cellSpace:'সেল স�পেস',cellPad:'সেল প�যাডিং',caption:'শীর�ষক',summary:'সারাংশ',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'সেল',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'সেল ম�ছে দাও',merge:'সেল জোড়া দাও',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'রো',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'রো ম�ছে দাও'},column:{menu:'কলাম',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'কলাম ম�ছে দাও'}},button:{title:'বাটন প�রোপার�টি',text:'টেক�সট (ভ�যাল�)',type:'প�রকার',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'চেক বক�স প�রোপার�টি',radioTitle:'রেডিও বাটন প�রোপার�টি',value:'ভ�যাল�',selected:'সিলেক�টেড'},form:{title:'ফর�ম প�রোপার�টি',menu:'ফর�ম প�রোপার�টি',action:'�কশ�যন',method:'পদ�ধতি',encoding:'Encoding'},select:{title:'বাছাই ফীল�ড প�রোপার�টি',selectInfo:'তথ�য',opAvail:'অন�যান�য বিকল�প',value:'ভ�যাল�',size:'সাইজ',lines:'লাইন সমূহ',chkMulti:'�কাধিক সিলেকশন �লাউ কর',opText:'টেক�সট',opValue:'ভ�যাল�',btnAdd:'য�ক�ত',btnModify:'বদলে দাও',btnUp:'উপর',btnDown:'নীচে',btnSetValue:'বাছাই করা ভ�যাল� হিসেবে সেট কর',btnDelete:'ডিলীট'},textarea:{title:'টেক�সট �রিয়া প�রোপার�টি',cols:'কলাম',rows:'রো'},textfield:{title:'টেক�সট ফীল�ড প�রোপার�টি',name:'নাম',value:'ভ�যাল�',charWidth:'ক�যারেক�টার প�রশস�ততা',maxChars:'সর�বাধিক ক�যারেক�টার',type:'টাইপ',typeText:'টেক�সট',typePass:'পাসওয়ার�ড'},hidden:{title:'গ�প�ত ফীল�ড প�রোপার�টি',name:'নাম',value:'ভ�যাল�'},image:{title:'ছবির প�রোপার�টি',titleButton:'ছবি বাটন প�রোপার�টি',menu:'ছবির প�রোপার�টি',infoTab:'ছবির তথ�য',btnUpload:'ইহাকে সার�ভারে প�রেরন কর',upload:'আপলোড',alt:'বিকল�প টেক�সট',lockRatio:'অন�পাত লক কর',resetSize:'সাইজ পূর�বাবস�থায় ফিরিয়ে দাও',border:'বর�ডার',hSpace:'হরাইজন�টাল স�পেস',vSpace:'ভার�টিকেল স�পেস',alertUrl:'অন�গ�রহক করে ছবির URL টাইপ কর�ন',linkTab:'লিংক',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'ফ�লাশ প�রোপার�টি',propertiesTab:'Properties',title:'ফ�ল�যাশ প�রোপার�টি',chkPlay:'অটো প�লে',chkLoop:'লূপ',chkMenu:'ফ�ল�যাশ মেন� �নাবল কর',chkFull:'Allow Fullscreen',scale:'স�কেল',scaleAll:'সব দেখাও',scaleNoBorder:'কোনো বর�ডার নেই',scaleFit:'নিখ��ত ফিট',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs নীচে',alignAbsMiddle:'Abs উপর',alignBaseline:'মূল রেখা',alignTextTop:'টেক�সট উপর',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'বেকগ�রাউন�ড রং',hSpace:'হরাইজন�টাল স�পেস',vSpace:'ভার�টিকেল স�পেস',validateSrc:'অন�গ�রহ করে URL লিংক টাইপ কর�ন',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'বানান চেক',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'শব�দকোষে নেই',changeTo:'�তে বদলাও',btnIgnore:'ইগনোর কর',btnIgnoreAll:'সব ইগনোর কর',btnReplace:'বদলে দাও',btnReplaceAll:'সব বদলে দাও',btnUndo:'আন�ড�',noSuggestions:'- কোন সাজেশন নেই -',progress:'বানান পরীক�ষা চলছে...',noMispell:'বানান পরীক�ষা শেষ: কোন ভ�ল বানান পাওয়া যায়নি',noChanges:'বানান পরীক�ষা শেষ: কোন শব�দ পরিবর�তন করা হয়নি',oneChange:'বানান পরীক�ষা শেষ: �কটি মাত�র শব�দ পরিবর�তন করা হয়েছে',manyChanges:'বানান পরীক�ষা শেষ: %1 গ�লো শব�দ বদলে গ�যাছে',ieSpellDownload:'বানান পরীক�ষক ইনস�টল করা নেই। আপনি কি �খনই �টা ডাউনলোড করতে চান?'},smiley:{toolbar:'স�মাইলী',title:'স�মাইলী য�ক�ত কর',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'সাংখ�যিক লিস�টের লেবেল',bulletedlist:'ব�লেট লিস�ট লেবেল',indent:'ইনডেন�ট বাড়াও',outdent:'ইনডেন�ট কমাও',justify:{left:'বা দিকে ঘে�ষা',center:'মা� বরাবর ঘেষা',right:'ডান দিকে ঘে�ষা',block:'ব�লক জাস�টিফাই'},blockquote:'Block Quote',clipboard:{title:'পেস�ট',cutError:'আপনার ব�রাউজারের স�রক�ষা সেটিংস �ডিটরকে অটোমেটিক কাট করার অন�মতি দেয়নি। দয়া করে �ই কাজের জন�য কিবোর�ড ব�যবহার কর�ন (Ctrl/Cmd+X)।',copyError:'আপনার ব�রাউজারের স�রক�ষা সেটিংস �ডিটরকে অটোমেটিক কপি করার অন�মতি দেয়নি। দয়া করে �ই কাজের জন�য কিবোর�ড ব�যবহার কর�ন (Ctrl/Cmd+C)।',pasteMsg:'অন�গ�রহ করে নীচের বাক�সে কিবোর�ড ব�যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস�ট কর�ন �বং <STRONG>OK</STRONG> চাপ দিন',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'পেস�ট (শব�দ)',title:'পেস�ট (শব�দ)',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'সাদা টেক�সট হিসেবে পেস�ট কর',title:'সাদা টেক�সট হিসেবে পেস�ট কর'},templates:{button:'টেমপ�লেট',title:'কনটেন�ট টেমপ�লেট',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'অন�গ�রহ করে �ডিটরে ওপেন করার জন�য টেমপ�লেট বাছাই কর�ন<br>(আসল কনটেন�ট হারিয়ে যাবে):',emptyListMsg:'(কোন টেমপ�লেট ডিফাইন করা নেই)'},showBlocks:'Show Blocks',stylesCombo:{label:'স�টাইল',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'ফন�ট ফরমেট',panelTitle:'ফন�ট ফরমেট',tag_p:'সাধারণ',tag_pre:'ফর�মেটেড',tag_address:'ঠিকানা',tag_h1:'শীর�ষক ১',tag_h2:'শীর�ষক ২',tag_h3:'শীর�ষক ৩',tag_h4:'শীর�ষক ৪',tag_h5:'শীর�ষক ৫',tag_h6:'শীর�ষক ৬',tag_div:'শীর�ষক (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'ফন�ট',voiceLabel:'Font',panelTitle:'ফন�ট'},fontSize:{label:'সাইজ',voiceLabel:'Font Size',panelTitle:'সাইজ'},colorButton:{textColorTitle:'টেক�স�ট রং',bgColorTitle:'বেকগ�রাউন�ড রং',panelTitle:'Colors',auto:'অটোমেটিক',more:'আরও রং...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'কোন সাজেশন নেই',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'ডক�য�মেন�ট প�রোপার�টি',title:'ডক�য�মেন�ট প�রোপার�টি',design:'Design',meta:'মেটাডেটা',chooseColor:'Choose',other:'<other>',docTitle:'পেজ শীর�ষক',charset:'ক�যারেক�টার সেট �নকোডিং',charsetOther:'অন�য ক�যারেক�টার সেট �নকোডিং',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'ডক�য�মেন�ট টাইপ হেডিং',docTypeOther:'অন�য ডক�য�মেন�ট টাইপ হেডিং',xhtmlDec:'XHTML ডেক�লারেশন য�ক�ত কর',bgColor:'ব�যাকগ�রাউন�ড রং',bgImage:'ব�যাকগ�রাউন�ড ছবির URL',bgFixed:'স�ক�রলহীন ব�যাকগ�রাউন�ড',txtColor:'টেক�স�ট রং',margin:'পেজ মার�জিন',marginTop:'উপর',marginLeft:'বামে',marginRight:'ডানে',marginBottom:'নীচে',metaKeywords:'ডক�য�মেন�ট ইন�ডেক�স কিওয়ার�ড (কমা দ�বারা বিচ�ছিন�ন)',metaDescription:'ডক�যূমেন�ট বর�ণনা',metaAuthor:'লেখক',metaCopyright:'কপীরাইট',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/bs.js b/web/imcms/ckeditor/lang/bs.js
new file mode 100644
index 0000000000..25f62707a0
--- /dev/null
+++ b/web/imcms/ckeditor/lang/bs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.bs={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'HTML kôd',newPage:'Novi dokument',save:'Snimi',preview:'Prikaži',cut:'Izreži',copy:'Kopiraj',paste:'Zalijepi',print:'Štampaj',underline:'Podvuci',bold:'Boldiraj',italic:'Ukosi',selectAll:'Selektuj sve',removeFormat:'Poništi format',strike:'Precrtaj',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Ubaci horizontalnu liniju',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Izbriši link',undo:'Vrati',redo:'Ponovi',common:{browseServer:'Browse Server',url:'URL',protocol:'Protokol',upload:'Šalji',uploadSubmit:'Šalji na server',image:'Slika',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<nije podešeno>',id:'Id',name:'Naziv',langDir:'Smjer pisanja',langDirLtr:'S lijeva na desno (LTR)',langDirRtl:'S desna na lijevo (RTL)',langCode:'Jezièni kôd',longDescr:'Dugaèki opis URL-a',cssClass:'Klase CSS stilova',advisoryTitle:'Advisory title',cssStyle:'Stil',ok:'OK',cancel:'Odustani',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Naprednije',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Širina',height:'Visina',align:'Poravnanje',alignLeft:'Lijevo',alignRight:'Desno',alignCenter:'Centar',alignTop:'Vrh',alignMiddle:'Sredina',alignBottom:'Dno',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Ubaci specijalni karater',title:'Izaberi specijalni karakter',options:'Special Character Options'},link:{toolbar:'Ubaci/Izmjeni link',other:'<other>',menu:'Izmjeni link',title:'Link',info:'Link info',target:'Prozor',upload:'Šalji',advanced:'Naprednije',type:'Tip linka',toUrl:'URL',toAnchor:'Sidro na ovoj stranici',toEmail:'E-Mail',targetFrame:'<frejm>',targetPopup:'<popup prozor>',targetFrameName:'Target Frame Name',targetPopupName:'Naziv popup prozora',popupFeatures:'Moguænosti popup prozora',popupResizable:'Resizable',popupStatusBar:'Statusna traka',popupLocationBar:'Traka za lokaciju',popupToolbar:'Traka sa alatima',popupMenuBar:'Izborna traka',popupFullScreen:'Cijeli ekran (IE)',popupScrollBars:'Scroll traka',popupDependent:'Ovisno (Netscape)',popupLeft:'Lijeva pozicija',popupTop:'Gornja pozicija',id:'Id',langDir:'Smjer pisanja',langDirLTR:'S lijeva na desno (LTR)',langDirRTL:'S desna na lijevo (RTL)',acccessKey:'Pristupna tipka',name:'Naziv',langCode:'Smjer pisanja',tabIndex:'Tab indeks',advisoryTitle:'Advisory title',advisoryContentType:'Advisory vrsta sadržaja',cssClasses:'Klase CSS stilova',charset:'Linked Resource Charset',styles:'Stil',rel:'Relationship',selectAnchor:'Izaberi sidro',anchorName:'Po nazivu sidra',anchorId:'Po Id-u elementa',emailAddress:'E-Mail Adresa',emailSubject:'Subjekt poruke',emailBody:'Poruka',noAnchors:'(Nema dostupnih sidra na stranici)',noUrl:'Molimo ukucajte URL link',noEmail:'Molimo ukucajte e-mail adresu'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Naði',replace:'Zamjeni',findWhat:'Naði šta:',replaceWith:'Zamjeni sa:',notFoundMsg:'Traženi tekst nije pronaðen.',findOptions:'Find Options',matchCase:'Uporeðuj velika/mala slova',matchWord:'Uporeðuj samo cijelu rijeè',matchCyclic:'Match cyclic',replaceAll:'Zamjeni sve',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabela',title:'Svojstva tabele',menu:'Svojstva tabele',deleteTable:'Delete Table',rows:'Redova',columns:'Kolona',border:'Okvir',widthPx:'piksela',widthPc:'posto',widthUnit:'width unit',cellSpace:'Razmak æelija',cellPad:'Uvod æelija',caption:'Naslov',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Briši æelije',merge:'Spoji æelije',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Briši redove'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Briši kolone'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Svojstva slike',titleButton:'Image Button Properties',menu:'Svojstva slike',infoTab:'Info slike',btnUpload:'Šalji na server',upload:'Šalji',alt:'Tekst na slici',lockRatio:'Zakljuèaj odnos',resetSize:'Resetuj dimenzije',border:'Okvir',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Molimo ukucajte URL od slike.',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs dole',alignAbsMiddle:'Abs sredina',alignBaseline:'Bazno',alignTextTop:'Vrh teksta',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Boja pozadine',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Molimo ukucajte URL link',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smješko',title:'Ubaci smješka',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Numerisana lista',bulletedlist:'Lista',indent:'Poveæaj uvod',outdent:'Smanji uvod',justify:{left:'Lijevo poravnanje',center:'Centralno poravnanje',right:'Desno poravnanje',block:'Puno poravnanje'},blockquote:'Block Quote',clipboard:{title:'Zalijepi',cutError:'Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).',copyError:'Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).',pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Zalijepi iz Word-a',title:'Zalijepi iz Word-a',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Zalijepi kao obièan tekst',title:'Zalijepi kao obièan tekst'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stil',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Velièina',voiceLabel:'Font Size',panelTitle:'Velièina'},colorButton:{textColorTitle:'Boja teksta',bgColorTitle:'Boja pozadine',panelTitle:'Colors',auto:'Automatska',more:'Više boja...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ca.js b/web/imcms/ckeditor/lang/ca.js
new file mode 100644
index 0000000000..6ef32e3705
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ca.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ca={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Editor de text enriquit',source:'Codi font',newPage:'Nova pàgina',save:'Desa',preview:'Visualització prèvia',cut:'Retalla',copy:'Copia',paste:'Enganxa',print:'Imprimeix',underline:'Subratllat',bold:'Negreta',italic:'Cursiva',selectAll:'Selecciona-ho tot',removeFormat:'Elimina Format',strike:'Barrat',subscript:'Subíndex',superscript:'Superíndex',horizontalrule:'Insereix línia horitzontal',pagebreak:'Insereix salt de pàgina',pagebreakAlt:'Salt de pàgina',unlink:"Elimina l'enllaç",undo:'Desfés',redo:'Refés',common:{browseServer:'Veure servidor',url:'URL',protocol:'Protocol',upload:'Puja',uploadSubmit:'Envia-la al servidor',image:'Imatge',flash:'Flash',form:'Formulari',checkbox:'Casella de verificació',radio:"Botó d'opció",textField:'Camp de text',textarea:'Àrea de text',hiddenField:'Camp ocult',button:'Botó',select:'Camp de selecció',imageButton:"Botó d'imatge",notSet:'<no definit>',id:'Id',name:'Nom',langDir:"Direcció de l'idioma",langDirLtr:"D'esquerra a dreta (LTR)",langDirRtl:'De dreta a esquerra (RTL)',langCode:"Codi d'idioma",longDescr:'Descripció llarga de la URL',cssClass:"Classes del full d'estil",advisoryTitle:'Títol consultiu',cssStyle:'Estil',ok:"D'acord",cancel:'Cancel·la',close:'Tanca',preview:'Previsualitza',generalTab:'General',advancedTab:'Avançat',validateNumberFailed:'Aquest valor no és un número.',confirmNewPage:'Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?',confirmCancel:"Algunes opcions s'han canviat. Esteu segur que voleu tancar la finestra de diàleg?",options:'Opcions',target:'Destí',targetNew:'Nova finestra (_blank)',targetTop:'Finestra major (_top)',targetSelf:'Mateixa finestra (_self)',targetParent:'Finestra pare (_parent)',langDirLTR:"D'esquerra a dreta (LTR)",langDirRTL:'De dreta a esquerra (RTL)',styles:'Estil',cssClasses:"Classes del full d'estil",width:'Amplada',height:'Alçada',align:'Alineació',alignLeft:"Ajusta a l'esquerra",alignRight:'Ajusta a la dreta',alignCenter:'Centre',alignTop:'Superior',alignMiddle:'Centre',alignBottom:'Inferior',invalidValue:'Invalid value.',invalidHeight:"L'alçada ha de ser un nombre.",invalidWidth:"L'amplada ha de ser un nombre.",invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, no disponible</span>'},contextmenu:{options:'Opcions del menú contextual'},specialChar:{toolbar:'Insereix caràcter especial',title:'Selecciona el caràcter especial',options:'Opcions de caràcters especials'},link:{toolbar:'Insereix/Edita enllaç',other:'<altre>',menu:"Edita l'enllaç",title:'Enllaç',info:"Informació de l'enllaç",target:'Destí',upload:'Puja',advanced:'Avançat',type:"Tipus d'enllaç",toUrl:'URL',toAnchor:'Àncora en aquesta pàgina',toEmail:'Correu electrònic',targetFrame:'<marc>',targetPopup:'<finestra emergent>',targetFrameName:'Nom del marc de destí',targetPopupName:'Nom finestra popup',popupFeatures:'Característiques finestra popup',popupResizable:'Redimensionable',popupStatusBar:"Barra d'estat",popupLocationBar:"Barra d'adreça",popupToolbar:"Barra d'eines",popupMenuBar:'Barra de menú',popupFullScreen:'Pantalla completa (IE)',popupScrollBars:"Barres d'scroll",popupDependent:'Depenent (Netscape)',popupLeft:'Posició esquerra',popupTop:'Posició dalt',id:'Id',langDir:"Direcció de l'idioma",langDirLTR:"D'esquerra a dreta (LTR)",langDirRTL:'De dreta a esquerra (RTL)',acccessKey:"Clau d'accés",name:'Nom',langCode:"Direcció de l'idioma",tabIndex:'Index de Tab',advisoryTitle:'Títol consultiu',advisoryContentType:'Tipus de contingut consultiu',cssClasses:"Classes del full d'estil",charset:'Conjunt de caràcters font enllaçat',styles:'Estil',rel:'Relationship',selectAnchor:'Selecciona una àncora',anchorName:"Per nom d'àncora",anchorId:"Per Id d'element",emailAddress:'Adreça de correu electrònic',emailSubject:'Assumpte del missatge',emailBody:'Cos del missatge',noAnchors:'(No hi ha àncores disponibles en aquest document)',noUrl:"Si us plau, escrigui l'enllaç URL",noEmail:"Si us plau, escrigui l'adreça correu electrònic"},anchor:{toolbar:'Insereix/Edita àncora',menu:"Propietats de l'àncora",title:"Propietats de l'àncora",name:"Nom de l'àncora",errorName:"Si us plau, escriviu el nom de l'ancora",remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Cerca i reemplaça',find:'Cerca',replace:'Reemplaça',findWhat:'Cerca:',replaceWith:'Remplaça amb:',notFoundMsg:"El text especificat no s'ha trobat.",findOptions:'Find Options',matchCase:'Distingeix majúscules/minúscules',matchWord:'Només paraules completes',matchCyclic:'Match cyclic',replaceAll:'Reemplaça-ho tot',replaceSuccessMsg:'%1 ocurrència/es reemplaçada/es.'},table:{toolbar:'Taula',title:'Propietats de la taula',menu:'Propietats de la taula',deleteTable:'Suprimeix la taula',rows:'Files',columns:'Columnes',border:'Mida vora',widthPx:'píxels',widthPc:'percentatge',widthUnit:"unitat d'amplada",cellSpace:'Espaiat de cel·les',cellPad:'Encoixinament de cel·les',caption:'Títol',summary:'Resum',headers:'Capçaleres',headersNone:'Cap',headersColumn:'Primera columna',headersRow:'Primera fila',headersBoth:'Ambdues',invalidRows:'El nombre de files ha de ser un nombre major que 0.',invalidCols:'El nombre de columnes ha de ser un nombre major que 0.',invalidBorder:'El gruix de la vora ha de ser un nombre.',invalidWidth:"L'amplada de la taula  ha de ser un nombre.",invalidHeight:"L'alçada de la taula  ha de ser un nombre.",invalidCellSpacing:"L'espaiat de cel·la  ha de ser un nombre.",invalidCellPadding:"L'encoixinament de cel·la  ha de ser un nombre.",cell:{menu:'Cel·la',insertBefore:'Insereix abans',insertAfter:'Insereix després',deleteCell:'Suprimeix',merge:'Fusiona',mergeRight:'Fusiona a la dreta',mergeDown:'Fusiona avall',splitHorizontal:'Divideix horitzontalment',splitVertical:'Divideix verticalment',title:'Propietats de la cel·la',cellType:'Tipus de cel·la',rowSpan:'Expansió de files',colSpan:'Expansió de columnes',wordWrap:'Ajustar al contingut',hAlign:'Alineació Horizontal',vAlign:'Alineació Vertical',alignBaseline:'A la línia base',bgColor:'Color de fons',borderColor:'Color de la vora',data:'Dades',header:'Capçalera',yes:'Sí',no:'No',invalidWidth:"L'amplada de cel·la ha de ser un nombre.",invalidHeight:"L'alçada de cel·la ha de ser un nombre.",invalidRowSpan:"L'expansió de files ha de ser un nombre enter.",invalidColSpan:"L'expansió de columnes ha de ser un nombre enter.",chooseColor:'Trieu'},row:{menu:'Fila',insertBefore:'Insereix fila abans de',insertAfter:'Insereix fila darrera',deleteRow:'Suprimeix una fila'},column:{menu:'Columna',insertBefore:'Insereix columna abans de',insertAfter:'Insereix columna darrera',deleteColumn:'Suprimeix una columna'}},button:{title:'Propietats del botó',text:'Text (Valor)',type:'Tipus',typeBtn:'Botó',typeSbm:'Transmet formulari',typeRst:'Reinicia formulari'},checkboxAndRadio:{checkboxTitle:'Propietats de la casella de verificació',radioTitle:"Propietats del botó d'opció",value:'Valor',selected:'Seleccionat'},form:{title:'Propietats del formulari',menu:'Propietats del formulari',action:'Acció',method:'Mètode',encoding:'Codificació'},select:{title:'Propietats del camp de selecció',selectInfo:'Info',opAvail:'Opcions disponibles',value:'Valor',size:'Mida',lines:'Línies',chkMulti:'Permet múltiples seleccions',opText:'Text',opValue:'Valor',btnAdd:'Afegeix',btnModify:'Modifica',btnUp:'Amunt',btnDown:'Avall',btnSetValue:'Selecciona per defecte',btnDelete:'Elimina'},textarea:{title:"Propietats de l'àrea de text",cols:'Columnes',rows:'Files'},textfield:{title:'Propietats del camp de text',name:'Nom',value:'Valor',charWidth:'Amplada',maxChars:'Nombre màxim de caràcters',type:'Tipus',typeText:'Text',typePass:'Contrasenya'},hidden:{title:'Propietats del camp ocult',name:'Nom',value:'Valor'},image:{title:'Propietats de la imatge',titleButton:"Propietats del botó d'imatge",menu:'Propietats de la imatge',infoTab:'Informació de la imatge',btnUpload:'Envia-la al servidor',upload:'Puja',alt:'Text alternatiu',lockRatio:'Bloqueja les proporcions',resetSize:'Restaura la mida',border:'Vora',hSpace:'Espaiat horit.',vSpace:'Espaiat vert.',alertUrl:'Si us plau, escriviu la URL de la imatge',linkTab:'Enllaç',button2Img:"Voleu transformar el botó d'imatge seleccionat en una simple imatge?",img2Button:"Voleu transformar la imatge seleccionada en un botó d'imatge?",urlMissing:'Falta la URL de la imatge.',validateBorder:'La vora ha de ser un nombre enter.',validateHSpace:'HSpace ha de ser un nombre enter.',validateVSpace:'VSpace ha de ser un nombre enter.'},flash:{properties:'Propietats del Flash',propertiesTab:'Propietats',title:'Propietats del Flash',chkPlay:'Reprodució automàtica',chkLoop:'Bucle',chkMenu:'Habilita menú Flash',chkFull:'Permetre la pantalla completa',scale:'Escala',scaleAll:'Mostra-ho tot',scaleNoBorder:'Sense vores',scaleFit:'Mida exacta',access:'Accés a scripts',accessAlways:'Sempre',accessSameDomain:'El mateix domini',accessNever:'Mai',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Qualitat',qualityBest:'La millor',qualityHigh:'Alta',qualityAutoHigh:'Alta automàtica',qualityMedium:'Mitjana',qualityAutoLow:'Baixa automàtica',qualityLow:'Baixa',windowModeWindow:'Finestra',windowModeOpaque:'Opaca',windowModeTransparent:'Transparent',windowMode:'Mode de la finestra',flashvars:'Variables de Flash',bgcolor:'Color de Fons',hSpace:'Espaiat horit.',vSpace:'Espaiat vert.',validateSrc:"Si us plau, escrigui l'enllaç URL",validateHSpace:"L'espaiat horitzonatal ha de ser un nombre.",validateVSpace:"L'espaiat vertical ha de ser un nombre."},spellCheck:{toolbar:"Revisa l'ortografia",title:"Comprova l'ortografia",notAvailable:'El servei no es troba disponible ara.',errorLoading:'Error carregant el servidor: %s.',notInDic:'No és al diccionari',changeTo:'Reemplaça amb',btnIgnore:'Ignora',btnIgnoreAll:'Ignora-les totes',btnReplace:'Canvia',btnReplaceAll:'Canvia-les totes',btnUndo:'Desfés',noSuggestions:'Cap suggeriment',progress:'Verificació ortogràfica en curs...',noMispell:'Verificació ortogràfica acabada: no hi ha cap paraula mal escrita',noChanges:"Verificació ortogràfica: no s'ha canviat cap paraula",oneChange:"Verificació ortogràfica: s'ha canviat una paraula",manyChanges:"Verificació ortogràfica: s'han canviat %1 paraules",ieSpellDownload:'Verificació ortogràfica no instal·lada. Voleu descarregar-ho ara?'},smiley:{toolbar:'Icona',title:'Insereix una icona',options:"Opcions d'emoticones"},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Llista numerada',bulletedlist:'Llista de pics',indent:'Augmenta el sagnat',outdent:'Redueix el sagnat',justify:{left:"Alinea a l'esquerra",center:'Centrat',right:'Alinea a la dreta',block:'Justificat'},blockquote:'Bloc de cita',clipboard:{title:'Enganxa',cutError:'La seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl+X).',copyError:'La seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl+C).',pasteMsg:'Si us plau, enganxeu dins del següent camp utilitzant el teclat (<STRONG>Ctrl+V</STRONG>) i premeu <STRONG>OK</STRONG>.',securityMsg:"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir al porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.",pasteArea:"Àrea d'enganxat"},pastefromword:{confirmCleanup:'El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?',toolbar:'Enganxa des del Word',title:'Enganxa des del Word',error:'No ha estat possible netejar les dades enganxades degut a un error intern'},pasteText:{button:'Enganxa com a text no formatat',title:'Enganxa com a text no formatat'},templates:{button:'Plantilles',title:'Plantilles de contingut',options:'Opcions de plantilla',insertOption:'Reemplaça el contingut actual',selectPromptMsg:"Seleccioneu una plantilla per usar a l'editor<br>(per defecte s'elimina el contingut actual):",emptyListMsg:'(No hi ha plantilles definides)'},showBlocks:'Mostra els blocs',stylesCombo:{label:'Estil',panelTitle:'Estils de format',panelTitle1:'Estils de bloc',panelTitle2:'Estils incrustats',panelTitle3:"Estils d'objecte"},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatejat',tag_address:'Adreça',tag_h1:'Encapçalament 1',tag_h2:'Encapçalament 2',tag_h3:'Encapçalament 3',tag_h4:'Encapçalament 4',tag_h5:'Encapçalament 5',tag_h6:'Encapçalament 6',tag_div:'Normal (DIV)'},div:{title:'Crea un contenidor Div',toolbar:'Crea un contenidor Div',cssClassInputLabel:"Classes de la fulla d'estils",styleSelectLabel:'Estil',IdInputLabel:'Id',languageCodeInputLabel:" Codi d'idioma",inlineStyleInputLabel:'Estil en línia',advisoryTitleInputLabel:'Títol de guia',langDirLabel:"Direcció de l'idioma",langDirLTRLabel:"D'esquerra a dreta (LTR)",langDirRTLLabel:'De dreta a esquerra (RTL)',edit:'Edita Div',remove:'Elimina Div'},iframe:{title:'Propietats IFrame',toolbar:'IFrame',noUrl:"Si us plau, introduïu la URL de l'iframe URL",scrolling:'Activa les barrres de desplaçament',border:'Mostra la vora del marc'},font:{label:'Tipus de lletra',voiceLabel:'Tipus de lletra',panelTitle:'Tipus de lletra'},fontSize:{label:'Mida',voiceLabel:'Mida de la lletra',panelTitle:'Mida'},colorButton:{textColorTitle:'Color de Text',bgColorTitle:'Color de Fons',panelTitle:'Colors',auto:'Automàtic',more:'Més colors...'},colors:{'000':'Negre',800000:'Granat','8B4513':'Marró sella','2F4F4F':'Gris pissarra fosca','008080':'Blau xarxet','000080':'Blau marí','4B0082':'Indi',696969:'Gris intens',B22222:'Maó',A52A2A:'Marró (web)',DAA520:'Solidago','006400':'Verd fosc','40E0D0':'Turquesa','0000CD':'Atzur',800080:'Lila',808080:'Gris',F00:'Vermell',FF8C00:'Taronja fosc',FFD700:'Or','008000':'Verd','0FF':'Cian','00F':'Blau',EE82EE:'Lavanda rosat',A9A9A9:'Gris clar',FFA07A:'Salmó clar',FFA500:'Taronja',FFFF00:'Groc','00FF00':'Verd llima',AFEEEE:'Blau pàlid',ADD8E6:'Blau clar',DDA0DD:'Pruna',D3D3D3:'Gris clar',FFF0F5:'Lavanda rosat',FAEBD7:'Blanc antic',FFFFE0:'Groc clar',F0FFF0:'Verd pàlid',F0FFFF:'Blau cel pàlid',F0F8FF:'Cian pàlid',E6E6FA:'Lavanda',FFF:'Blanc'},scayt:{title:'Spell Check As You Type',opera_title:"No és compatible amb l'Opera",enable:"Habilitat l'SCAYT",disable:'Deshabilita SCAYT',about:"Quant a l'SCAYT",toggle:"Commuta l'SCAYT",options:'Opcions',langs:'Idiomes',moreSuggestions:'Més suggerències',ignore:'Ignora',ignoreAll:"Ignora'ls tots",addWord:'Afegeix una paraula',emptyDic:"El nom del diccionari no hauria d'estar buit.",noSuggestions:'Cap suggeriment',optionsTab:'Opcions',allCaps:'Ignora paraules en majúscules',ignoreDomainNames:'Ignora els noms de domini',mixedCase:'Ignora paraules amb majúscules i minúscules',mixedWithDigits:'Ignora paraules amb números ',languagesTab:'Idiomes',dictionariesTab:'Diccionaris',dic_field_name:'Nom del diccionari',dic_create:'Crea',dic_restore:'Restaura',dic_delete:'Elimina',dic_rename:'Canvia el nom',dic_info:"Inicialment el diccionari d'usuari s'emmagatzema en una galeta. De totes maneres, les galetes tenen la mida limitada. Quan el diccionari creix massa, llavors el diccionari es pot emmagatzemar al nostre servidor. Per desar el vostre diccionari personal al nostre servidor heu d.'especificar un nom pel diccionari. Si ja heu desat un diccionari, teclegeu si us plau el seu nom i cliqueu el botó de restauració.",aboutTab:'Quant a'},about:{title:'Quant al CKEditor',dlgTitle:'Quant al CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Per informació sobre llicències visiteu el web:',copy:'Copyright &copy; $1. Tots els drets reservats.'},maximize:'Maximitza',minimize:'Minimitza',fakeobjects:{anchor:'Àncora',flash:'Animació Flash',iframe:'IFrame',hiddenfield:'Camp ocult',unknown:'Objecte desconegut'},resize:'Arrossegueu per redimensionar',colordialog:{title:'Selecciona el color',options:'Opcions del color',highlight:'Destacat',selected:'Seleccionat',clear:'Neteja'},toolbarCollapse:"Redueix la barra d'eines",toolbarExpand:"Amplia la barra d'eines",toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:"Direcció del text d'esquerra a dreta",rtl:'Direcció del text de dreta a esquerra'},docprops:{label:'Propietats del document',title:'Propietats del document',design:'Design',meta:'Metadades',chooseColor:'Trieu',other:'<altre>',docTitle:'Títol de la pàgina',charset:'Codificació de conjunt de caràcters',charsetOther:'Una altra codificació de caràcters',charsetASCII:'ASCII',charsetCE:'Centreeuropeu',charsetCT:'Xinès tradicional (Big5)',charsetCR:'Ciríl·lic',charsetGR:'Grec',charsetJP:'Japonès',charsetKR:'Coreà',charsetTR:'Turc',charsetUN:'Unicode (UTF-8)',charsetWE:'Europeu occidental',docType:'Capçalera de tipus de document',docTypeOther:'Un altra capçalera de tipus de document',xhtmlDec:'Incloure declaracions XHTML',bgColor:'Color de fons',bgImage:'URL de la imatge de fons',bgFixed:'Fons fixe',txtColor:'Color de Text',margin:'Marges de pàgina',marginTop:'Cap',marginLeft:'Esquerra',marginRight:'Dreta',marginBottom:'Peu',metaKeywords:'Mots clau per a indexació (separats per coma)',metaDescription:'Descripció del document',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/cs.js b/web/imcms/ckeditor/lang/cs.js
new file mode 100644
index 0000000000..ba4f377669
--- /dev/null
+++ b/web/imcms/ckeditor/lang/cs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.cs={dir:'ltr',editorTitle:'Textový editor, %1',editorHelp:'Stiskněte ALT 0 pro nápovědu',toolbars:'Panely nástrojů editoru',editor:'Textový editor',source:'Zdroj',newPage:'Nová stránka',save:'Uložit',preview:'Náhled',cut:'Vyjmout',copy:'Kopírovat',paste:'Vložit',print:'Tisk',underline:'Podtržené',bold:'Tu�né',italic:'Kurzíva',selectAll:'Vybrat vše',removeFormat:'Odstranit formátování',strike:'Přeškrtnuté',subscript:'Dolní index',superscript:'Horní index',horizontalrule:'Vložit vodorovnou linku',pagebreak:'Vložit konec stránky',pagebreakAlt:'Konec stránky',unlink:'Odstranit odkaz',undo:'Zpět',redo:'Znovu',common:{browseServer:'Vybrat na serveru',url:'URL',protocol:'Protokol',upload:'Odeslat',uploadSubmit:'Odeslat na server',image:'Obrázek',flash:'Flash',form:'Formulář',checkbox:'Zaškrtávací polí�ko',radio:'Přepína�',textField:'Textové pole',textarea:'Textová oblast',hiddenField:'Skryté pole',button:'Tla�ítko',select:'Seznam',imageButton:'Obrázkové tla�ítko',notSet:'<nenastaveno>',id:'Id',name:'Jméno',langDir:'Směr jazyka',langDirLtr:'Zleva doprava (LTR)',langDirRtl:'Zprava doleva (RTL)',langCode:'Kód jazyka',longDescr:'Dlouhý popis URL',cssClass:'Třída stylu',advisoryTitle:'Pomocný titulek',cssStyle:'Styl',ok:'OK',cancel:'Zrušit',close:'Zavřít',preview:'Náhled',generalTab:'Obecné',advancedTab:'Rozšířené',validateNumberFailed:'Zadaná hodnota není �íselná.',confirmNewPage:'Jakékoliv neuložené změny obsahu budou ztraceny. Skute�ně chcete otevřít novou stránku?',confirmCancel:'Některá z nastavení byla změněna. Skute�ně chcete zavřít dialogové okno?',options:'Nastavení',target:'Cíl',targetNew:'Nové okno (_blank)',targetTop:'Okno nejvyšší úrovně (_top)',targetSelf:'Stejné okno (_self)',targetParent:'Rodi�ovské okno (_parent)',langDirLTR:'Zleva doprava (LTR)',langDirRTL:'Zprava doleva (RTL)',styles:'Styly',cssClasses:'Třídy stylů',width:'Šířka',height:'Výška',align:'Zarovnání',alignLeft:'Vlevo',alignRight:'Vpravo',alignCenter:'Na střed',alignTop:'Nahoru',alignMiddle:'Na střed',alignBottom:'Dolů',invalidValue:'Neplatná hodnota.',invalidHeight:'Zadaná výška musí být �íslo.',invalidWidth:'Šířka musí být �íslo.',invalidCssLength:'Hodnota ur�ená pro pole "%1" musí být kladné �íslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).',invalidHtmlLength:'Hodnota ur�ená pro pole "%1" musí být kladné �íslo bez nebo s platnou jednotkou míry HTML (px nebo %).',invalidInlineStyle:'Hodnota ur�ená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu "název : hodnota", oddělené středníky',cssLengthTooltip:'Zadejte �íslo jako hodnotu v pixelech nebo �íslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).',unavailable:'%1<span class="cke_accessibility">, nedostupné</span>'},contextmenu:{options:'Nastavení kontextové nabídky'},specialChar:{toolbar:'Vložit speciální znaky',title:'Výběr speciálního znaku',options:'Nastavení speciálních znaků'},link:{toolbar:'Odkaz',other:'<jiný>',menu:'Změnit odkaz',title:'Odkaz',info:'Informace o odkazu',target:'Cíl',upload:'Odeslat',advanced:'Rozšířené',type:'Typ odkazu',toUrl:'URL',toAnchor:'Kotva v této stránce',toEmail:'E-mail',targetFrame:'<rámec>',targetPopup:'<vyskakovací okno>',targetFrameName:'Název cílového rámu',targetPopupName:'Název vyskakovacího okna',popupFeatures:'Vlastnosti vyskakovacího okna',popupResizable:'Umožňující měnit velikost',popupStatusBar:'Stavový řádek',popupLocationBar:'Panel umístění',popupToolbar:'Panel nástrojů',popupMenuBar:'Panel nabídky',popupFullScreen:'Celá obrazovka (IE)',popupScrollBars:'Posuvníky',popupDependent:'Závislost (Netscape)',popupLeft:'Levý okraj',popupTop:'Horní okraj',id:'Id',langDir:'Směr jazyka',langDirLTR:'Zleva doprava (LTR)',langDirRTL:'Zprava doleva (RTL)',acccessKey:'Přístupový klí�',name:'Jméno',langCode:'Kód jazyka',tabIndex:'Pořadí prvku',advisoryTitle:'Pomocný titulek',advisoryContentType:'Pomocný typ obsahu',cssClasses:'Třída stylu',charset:'Přiřazená znaková sada',styles:'Styl',rel:'Vztah',selectAnchor:'Vybrat kotvu',anchorName:'Podle jména kotvy',anchorId:'Podle Id objektu',emailAddress:'E-mailová adresa',emailSubject:'Předmět zprávy',emailBody:'Tělo zprávy',noAnchors:'(Ve stránce není definována žádná kotva!)',noUrl:'Zadejte prosím URL odkazu',noEmail:'Zadejte prosím e-mailovou adresu'},anchor:{toolbar:'Záložka',menu:'Vlastnosti záložky',title:'Vlastnosti záložky',name:'Název záložky',errorName:'Zadejte prosím název záložky',remove:'Odstranit záložku'},list:{numberedTitle:'Vlastnosti �íslování',bulletedTitle:'Vlastnosti odrážek',type:'Typ',start:'Po�átek',validateStartNumber:'Číslování musí za�ínat celým �íslem.',circle:'Kroužky',disc:'Kole�ka',square:'Čtverce',none:'Nic',notset:'<nenastaveno>',armenian:'Arménské',georgian:'Gruzínské (an, ban, gan, atd.)',lowerRoman:'Malé římské (i, ii, iii, iv, v, atd.)',upperRoman:'Velké římské (I, II, III, IV, V, atd.)',lowerAlpha:'Malá latinka (a, b, c, d, e, atd.)',upperAlpha:'Velká latinka (A, B, C, D, E, atd.)',lowerGreek:'Malé řecké (alpha, beta, gamma, atd.)',decimal:'Arabská �ísla (1, 2, 3, atd.)',decimalLeadingZero:'Arabská �ísla uvozená nulou (01, 02, 03, atd.)'},findAndReplace:{title:'Najít a nahradit',find:'Hledat',replace:'Nahradit',findWhat:'Co hledat:',replaceWith:'Čím nahradit:',notFoundMsg:'Hledaný text nebyl nalezen.',findOptions:'Možnosti hledání',matchCase:'Rozlišovat velikost písma',matchWord:'Pouze celá slova',matchCyclic:'Procházet opakovaně',replaceAll:'Nahradit vše',replaceSuccessMsg:'%1 nahrazení.'},table:{toolbar:'Tabulka',title:'Vlastnosti tabulky',menu:'Vlastnosti tabulky',deleteTable:'Smazat tabulku',rows:'Řádky',columns:'Sloupce',border:'Ohrani�ení',widthPx:'bodů',widthPc:'procent',widthUnit:'jednotka šířky',cellSpace:'Vzdálenost buněk',cellPad:'Odsazení obsahu v buňce',caption:'Popis',summary:'Souhrn',headers:'Záhlaví',headersNone:'Žádné',headersColumn:'První sloupec',headersRow:'První řádek',headersBoth:'Obojí',invalidRows:'Po�et řádků musí být �íslo větší než 0.',invalidCols:'Po�et sloupců musí být �íslo větší než 0.',invalidBorder:'Zdaná velikost okraje musí být �íselná.',invalidWidth:'Šířka tabulky musí být �íslo.',invalidHeight:'Zadaná výška tabulky musí být �íselná.',invalidCellSpacing:'Zadaná vzdálenost buněk musí být �íselná.',invalidCellPadding:'Zadané odsazení obsahu v buňce musí být �íselné.',cell:{menu:'Buňka',insertBefore:'Vložit buňku před',insertAfter:'Vložit buňku za',deleteCell:'Smazat buňky',merge:'Slou�it buňky',mergeRight:'Slou�it doprava',mergeDown:'Slou�it dolů',splitHorizontal:'Rozdělit buňky vodorovně',splitVertical:'Rozdělit buňky svisle',title:'Vlastnosti buňky',cellType:'Typ buňky',rowSpan:'Spojit řádky',colSpan:'Spojit sloupce',wordWrap:'Zalamování',hAlign:'Vodorovné zarovnání',vAlign:'Svislé zarovnání',alignBaseline:'Na ú�aří',bgColor:'Barva pozadí',borderColor:'Barva okraje',data:'Data',header:'Hlavi�ka',yes:'Ano',no:'Ne',invalidWidth:'Šířka buňky musí být �íslo.',invalidHeight:'Zadaná výška buňky musí být �íslená.',invalidRowSpan:'Zadaný po�et slou�ených řádků musí být celé �íslo.',invalidColSpan:'Zadaný po�et slou�ených sloupců musí být celé �íslo.',chooseColor:'Výběr'},row:{menu:'Řádek',insertBefore:'Vložit řádek před',insertAfter:'Vložit řádek za',deleteRow:'Smazat řádky'},column:{menu:'Sloupec',insertBefore:'Vložit sloupec před',insertAfter:'Vložit sloupec za',deleteColumn:'Smazat sloupec'}},button:{title:'Vlastnosti tla�ítka',text:'Popisek',type:'Typ',typeBtn:'Tla�ítko',typeSbm:'Odeslat',typeRst:'Obnovit'},checkboxAndRadio:{checkboxTitle:'Vlastnosti zaškrtávacího polí�ka',radioTitle:'Vlastnosti přepína�e',value:'Hodnota',selected:'Zaškrtnuto'},form:{title:'Vlastnosti formuláře',menu:'Vlastnosti formuláře',action:'Akce',method:'Metoda',encoding:'Kódování'},select:{title:'Vlastnosti seznamu',selectInfo:'Info',opAvail:'Dostupná nastavení',value:'Hodnota',size:'Velikost',lines:'Řádků',chkMulti:'Povolit mnohonásobné výběry',opText:'Text',opValue:'Hodnota',btnAdd:'Přidat',btnModify:'Změnit',btnUp:'Nahoru',btnDown:'Dolů',btnSetValue:'Nastavit jako vybranou hodnotu',btnDelete:'Smazat'},textarea:{title:'Vlastnosti textové oblasti',cols:'Sloupců',rows:'Řádků'},textfield:{title:'Vlastnosti textového pole',name:'Název',value:'Hodnota',charWidth:'Šířka ve znacích',maxChars:'Maximální po�et znaků',type:'Typ',typeText:'Text',typePass:'Heslo'},hidden:{title:'Vlastnosti skrytého pole',name:'Název',value:'Hodnota'},image:{title:'Vlastnosti obrázku',titleButton:'Vlastností obrázkového tla�ítka',menu:'Vlastnosti obrázku',infoTab:'Informace o obrázku',btnUpload:'Odeslat na server',upload:'Odeslat',alt:'Alternativní text',lockRatio:'Zámek',resetSize:'Původní velikost',border:'Okraje',hSpace:'Horizontální mezera',vSpace:'Vertikální mezera',alertUrl:'Zadejte prosím URL obrázku',linkTab:'Odkaz',button2Img:'Skute�ně chcete převést zvolené obrázkové tla�ítko na oby�ejný obrázek?',img2Button:'Skute�ně chcete převést zvolený obrázek na obrázkové tla�ítko?',urlMissing:'Zadané URL zdroje obrázku nebylo nalezeno.',validateBorder:'Okraj musí být nastaven v celých �íslech.',validateHSpace:'Horizontální mezera musí být nastavena v celých �íslech.',validateVSpace:'Vertikální mezera musí být nastavena v celých �íslech.'},flash:{properties:'Vlastnosti Flashe',propertiesTab:'Vlastnosti',title:'Vlastnosti Flashe',chkPlay:'Automatické spuštění',chkLoop:'Opakování',chkMenu:'Nabídka Flash',chkFull:'Povolit celoobrazovkový režim',scale:'Zobrazit',scaleAll:'Zobrazit vše',scaleNoBorder:'Bez okraje',scaleFit:'Přizpůsobit',access:'Přístup ke skriptu',accessAlways:'Vždy',accessSameDomain:'Ve stejné doméně',accessNever:'Nikdy',alignAbsBottom:'Zcela dolů',alignAbsMiddle:'Doprostřed',alignBaseline:'Na ú�aří',alignTextTop:'Na horní okraj textu',quality:'Kvalita',qualityBest:'Nejlepší',qualityHigh:'Vysoká',qualityAutoHigh:'Vysoká - auto',qualityMedium:'Střední',qualityAutoLow:'Nízká - auto',qualityLow:'Nejnižší',windowModeWindow:'Okno',windowModeOpaque:'Neprůhledné',windowModeTransparent:'Průhledné',windowMode:'Režim okna',flashvars:'Proměnné pro Flash',bgcolor:'Barva pozadí',hSpace:'Horizontální mezera',vSpace:'Vertikální mezera',validateSrc:'Zadejte prosím URL odkazu',validateHSpace:'Zadaná horizontální mezera musí být �íslo.',validateVSpace:'Zadaná vertikální mezera musí být �íslo.'},spellCheck:{toolbar:'Zkontrolovat pravopis',title:'Kontrola pravopisu',notAvailable:'Omlouváme se, ale služba nyní není dostupná.',errorLoading:'Chyba nahrávání služby aplikace z: %s.',notInDic:'Není ve slovníku',changeTo:'Změnit na',btnIgnore:'Přesko�it',btnIgnoreAll:'Přeskakovat vše',btnReplace:'Zaměnit',btnReplaceAll:'Zaměňovat vše',btnUndo:'Zpět',noSuggestions:'- žádné návrhy -',progress:'Probíhá kontrola pravopisu...',noMispell:'Kontrola pravopisu dokon�ena: Žádné pravopisné chyby nenalezeny',noChanges:'Kontrola pravopisu dokon�ena: Beze změn',oneChange:'Kontrola pravopisu dokon�ena: Jedno slovo změněno',manyChanges:'Kontrola pravopisu dokon�ena: %1 slov změněno',ieSpellDownload:'Kontrola pravopisu není nainstalována. Chcete ji nyní stáhnout?'},smiley:{toolbar:'Smajlíci',title:'Vkládání smajlíků',options:'Nastavení smajlíků'},elementsPath:{eleLabel:'Cesta objektu',eleTitle:'%1 objekt'},numberedlist:'Číslování',bulletedlist:'Odrážky',indent:'Zvětšit odsazení',outdent:'Zmenšit odsazení',justify:{left:'Zarovnat vlevo',center:'Zarovnat na střed',right:'Zarovnat vpravo',block:'Zarovnat do bloku'},blockquote:'Citace',clipboard:{title:'Vložit',cutError:'Bezpe�nostní nastavení vašeho prohlíže�e nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).',copyError:'Bezpe�nostní nastavení vašeho prohlíže�e nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).',pasteMsg:'Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.',securityMsg:'Z důvodů nastavení bezpe�nosti vašeho prohlíže�e nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.',pasteArea:'Oblast vkládání'},pastefromword:{confirmCleanup:'Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vy�istit?',toolbar:'Vložit z Wordu',title:'Vložit z Wordu',error:'Z důvodu vnitřní chyby nebylo možné provést vy�ištění vkládaného textu.'},pasteText:{button:'Vložit jako �istý text',title:'Vložit jako �istý text'},templates:{button:'Šablony',title:'Šablony obsahu',options:'Nastavení šablon',insertOption:'Nahradit aktuální obsah',selectPromptMsg:'Prosím zvolte šablonu pro otevření v editoru<br>(aktuální obsah editoru bude ztracen):',emptyListMsg:'(Není definována žádná šablona)'},showBlocks:'Ukázat bloky',stylesCombo:{label:'Styl',panelTitle:'Formátovací styly',panelTitle1:'Blokové styly',panelTitle2:'Řádkové styly',panelTitle3:'Objektové styly'},format:{label:'Formát',panelTitle:'Formát',tag_p:'Normální',tag_pre:'Naformátováno',tag_address:'Adresa',tag_h1:'Nadpis 1',tag_h2:'Nadpis 2',tag_h3:'Nadpis 3',tag_h4:'Nadpis 4',tag_h5:'Nadpis 5',tag_h6:'Nadpis 6',tag_div:'Normální (DIV)'},div:{title:'Vytvořit Div kontejner',toolbar:'Vytvořit Div kontejner',cssClassInputLabel:'Třídy stylů',styleSelectLabel:'Styly',IdInputLabel:'Id',languageCodeInputLabel:' Kód jazyka',inlineStyleInputLabel:'Vnitřní styly',advisoryTitleInputLabel:'Nápovědní titulek',langDirLabel:'Směr jazyka',langDirLTRLabel:'Zleva doprava (LTR)',langDirRTLLabel:'Zprava doleva (RTL)',edit:'Změnit Div',remove:'Odstranit Div'},iframe:{title:'Vlastnosti IFrame',toolbar:'IFrame',noUrl:'Zadejte prosím URL obsahu pro IFrame',scrolling:'Zapnout posuvníky',border:'Zobrazit okraj'},font:{label:'Písmo',voiceLabel:'Písmo',panelTitle:'Písmo'},fontSize:{label:'Velikost',voiceLabel:'Velikost písma',panelTitle:'Velikost'},colorButton:{textColorTitle:'Barva textu',bgColorTitle:'Barva pozadí',panelTitle:'Barvy',auto:'Automaticky',more:'Více barev...'},colors:{'000':'Černá',800000:'Kaštanová','8B4513':'Sedlová hně�','2F4F4F':'Tmavě bledě šedá','008080':'Čírka','000080':'Námořnická modř','4B0082':'Inkoustová',696969:'Tmavě šedá',B22222:'Pálená cihla',A52A2A:'Hnědá',DAA520:'Zlatý prut','006400':'Tmavě zelená','40E0D0':'Tyrkisová','0000CD':'Středně modrá',800080:'Purpurová',808080:'Šedá',F00:'Červená',FF8C00:'Tmavě oranžová',FFD700:'Zlatá','008000':'Zelená','0FF':'Azurová','00F':'Modrá',EE82EE:'Fialová',A9A9A9:'Kalně šedá',FFA07A:'Světle lososová',FFA500:'Oranžová',FFFF00:'Žlutá','00FF00':'Limetková',AFEEEE:'Bledě tyrkisová',ADD8E6:'Světle modrá',DDA0DD:'Švestková',D3D3D3:'Světle šedá',FFF0F5:'Levandulově ruměnná',FAEBD7:'Antická bílá',FFFFE0:'Světle žlutá',F0FFF0:'Medová rosa',F0FFFF:'Azurová',F0F8FF:'Alen�ina modrá',E6E6FA:'Levandulová',FFF:'Bílá'},scayt:{title:'Kontrola pravopisu během psaní (SCAYT)',opera_title:'Toto Opera nepodporuje',enable:'Zapnout SCAYT',disable:'Vypnout SCAYT',about:'O aplikaci SCAYT',toggle:'Vypína� SCAYT',options:'Nastavení',langs:'Jazyky',moreSuggestions:'Více návrhů',ignore:'Přesko�it',ignoreAll:'Přesko�it vše',addWord:'Přidat slovo',emptyDic:'Název slovníku nesmí být prázdný.',noSuggestions:'Zádné návrhy',optionsTab:'Nastavení',allCaps:'Ignorovat slova tvořená velkými písmeny',ignoreDomainNames:'Ignorovat doménová jména',mixedCase:'Ignorovat slova obsahující různou velikost písma',mixedWithDigits:'Ignorovat slova obsahující �ísla',languagesTab:'Jazyky',dictionariesTab:'Slovníky',dic_field_name:'Název slovníku',dic_create:'Vytvořit',dic_restore:'Obnovit',dic_delete:'Smazat',dic_rename:'Přejmenovat',dic_info:'Zpo�átku se uživatelský slovník ukládá do cookies ve vašem prohlíže�i. Ovšem cookies mají omezenou velikost, takže když slovník dosáhne velikosti, kdy se již do cookies nevejde, může být uložen na našem serveru. Chcete-li uložit váš osobní slovník na našem serveru, je třeba slovník nejdříve pojmenovat. Máte-li již slovník pojmenován a uložen, zadejte jeho název a klepněte na tla�ítko Obnovit.',aboutTab:'O aplikaci'},about:{title:'O aplikaci CKEditor',dlgTitle:'O aplikaci CKEditor',help:'Prohlédněte si $1 pro nápovědu.',userGuide:'Uživatelská příru�ka CKEditor',moreInfo:'Pro informace o lincenci navštivte naši webovou stránku:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximalizovat',minimize:'Minimalizovat',fakeobjects:{anchor:'Záložka',flash:'Flash animace',iframe:'IFrame',hiddenfield:'Skryté pole',unknown:'Neznámý objekt'},resize:'Uchopit pro změnu velikosti',colordialog:{title:'Výběr barvy',options:'Nastavení barvy',highlight:'Zvýraznit',selected:'Vybráno',clear:'Vy�istit'},toolbarCollapse:'Skrýt panel nástrojů',toolbarExpand:'Zobrazit panel nástrojů',toolbarGroups:{document:'Dokument',clipboard:'Schránka/Zpět',editing:'Úpravy',forms:'Formuláře',basicstyles:'Základní styly',paragraph:'Odstavec',links:'Odkazy',insert:'Vložit',styles:'Styly',colors:'Barvy',tools:'Nástroje'},bidi:{ltr:'Směr textu zleva doprava',rtl:'Směr textu zprava doleva'},docprops:{label:'Vlastnosti dokumentu',title:'Vlastnosti dokumentu',design:'Vzhled',meta:'Metadata',chooseColor:'Výběr',other:'<jiný>',docTitle:'Titulek stránky',charset:'Znaková sada',charsetOther:'Další znaková sada',charsetASCII:'ASCII',charsetCE:'Středoevropské jazyky',charsetCT:'Tradi�ní �ínština (Big5)',charsetCR:'Cyrilice',charsetGR:'Ře�tina',charsetJP:'Japonština',charsetKR:'Korejština',charsetTR:'Ture�tina',charsetUN:'Unicode (UTF-8)',charsetWE:'Západoevropské jazyky',docType:'Typ dokumentu',docTypeOther:'Jiný typ dokumetu',xhtmlDec:'Zahrnout deklarace XHTML',bgColor:'Barva pozadí',bgImage:'URL obrázku na pozadí',bgFixed:'Nerolovatelné (Pevné) pozadí',txtColor:'Barva textu',margin:'Okraje stránky',marginTop:'Horní',marginLeft:'Levý',marginRight:'Pravý',marginBottom:'Dolní',metaKeywords:'Klí�ová slova (oddělená �árkou)',metaDescription:'Popis dokumentu',metaAuthor:'Autor',metaCopyright:'Autorská práva',previewHtml:'<p>Toto je <strong>ukázkový text</strong>. Používáte <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/cy.js b/web/imcms/ckeditor/lang/cy.js
new file mode 100644
index 0000000000..a5d6544a2e
--- /dev/null
+++ b/web/imcms/ckeditor/lang/cy.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.cy={dir:'ltr',editorTitle:'Golygydd testun cyfoethog, %1',editorHelp:'Gwasgwch ALT 0 am gymorth',toolbars:'Bariau offer golygydd',editor:'Golygydd Testun Cyfoethog',source:'HTML',newPage:'Tudalen newydd',save:'Cadw',preview:'Rhagolwg',cut:'Torri',copy:'Copïo',paste:'Gludo',print:'Argraffu',underline:'Tanlinellu',bold:'Bras',italic:'Italig',selectAll:'Dewis Popeth',removeFormat:'Tynnu Fformat',strike:'Llinell Trwyddo',subscript:'Is-sgript',superscript:'Uwchsgript',horizontalrule:'Mewnosod Llinell Lorweddol',pagebreak:'Mewnosod Toriad Tudalen i Argraffu',pagebreakAlt:'Toriad Tudalen',unlink:'Datgysylltu',undo:'Dadwneud',redo:'Ailadrodd',common:{browseServer:"Pori'r Gweinydd",url:'URL',protocol:'Protocol',upload:'Lanlwytho',uploadSubmit:"Anfon i'r Gweinydd",image:'Delwedd',flash:'Flash',form:'Ffurflen',checkbox:'Blwch ticio',radio:'Botwm Radio',textField:'Maes Testun',textarea:'Ardal Testun',hiddenField:'Maes Cudd',button:'Botwm',select:'Maes Dewis',imageButton:'Botwm Delwedd',notSet:'<heb osod>',id:'Id',name:'Name',langDir:'Cyfeiriad Iaith',langDirLtr:"Chwith i'r Dde (LTR)",langDirRtl:"Dde i'r Chwith (RTL)",langCode:'Cod Iaith',longDescr:'URL Disgrifiad Hir',cssClass:'Dosbarth Dalen Arddull',advisoryTitle:'Teitl Cynghorol',cssStyle:'Arddull',ok:'Iawn',cancel:'Diddymu',close:'Cau',preview:'Rhagolwg',generalTab:'Cyffredinol',advancedTab:'Uwch',validateNumberFailed:"Nid yw'r gwerth hwn yn rhif.",confirmNewPage:"Byddwch yn colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. A ydych am barhau i lwytho tudalen newydd?",confirmCancel:"Mae rhai o'r opsiynau wedi'u newid. A ydych wir am gau'r deialog?",options:'Opsiynau',target:'Targed',targetNew:'Ffenest Newydd (_blank)',targetTop:'Ffenest ar y Brig (_top)',targetSelf:'Yr un Ffenest (_self)',targetParent:'Ffenest y Rhiant (_parent)',langDirLTR:"Chwith i'r Dde (LTR)",langDirRTL:"Dde i'r Chwith (RTL)",styles:'Arddull',cssClasses:'Dosbarthiadau Ffeil Ddiwyg',width:'Lled',height:'Uchder',align:'Alinio',alignLeft:'Chwith',alignRight:'Dde',alignCenter:'Canol',alignTop:'Brig',alignMiddle:'Canol',alignBottom:'Gwaelod',invalidValue:'Gwerth annilys.',invalidHeight:"Rhaid i'r Uchder fod yn rhif.",invalidWidth:"Rhaid i'r Lled fod yn rhif.",invalidCssLength:"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).",invalidHtmlLength:"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).",invalidInlineStyle:"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw:gwerth\", wedi'u gwahanu gyda hanner colon.",cssLengthTooltip:'Rhowch rif ar gyfer gwerth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).',unavailable:'%1<span class="cke_accessibility">, ddim ar gael</span>'},contextmenu:{options:'Opsiynau Dewislen Cyd-destun'},specialChar:{toolbar:'Mewnosod Nodau Arbennig',title:'Dewis Nod Arbennig',options:'Opsiynau Nodau Arbennig'},link:{toolbar:'Dolen',other:'<eraill>',menu:'Golygu Dolen',title:'Dolen',info:'Gwyb ar y Ddolen',target:'Targed',upload:'Lanlwytho',advanced:'Uwch',type:'Math y Ddolen',toUrl:'URL',toAnchor:'Dolen at angor yn y testun',toEmail:'E-bost',targetFrame:'<ffrâm>',targetPopup:'<ffenestr bop>',targetFrameName:'Enw Ffrâm y Targed',targetPopupName:'Enw Ffenestr Bop',popupFeatures:'Nodweddion Ffenestr Bop',popupResizable:'Ailfeintiol',popupStatusBar:'Bar Statws',popupLocationBar:'Bar Safle',popupToolbar:'Bar Offer',popupMenuBar:'Dewislen',popupFullScreen:'Sgrin Llawn (IE)',popupScrollBars:'Barrau Sgrolio',popupDependent:'Dibynnol (Netscape)',popupLeft:'Safle Chwith',popupTop:'Safle Top',id:'Id',langDir:'Cyfeiriad Iaith',langDirLTR:"Chwith i'r Dde (LTR)",langDirRTL:"Dde i'r Chwith (RTL)",acccessKey:'Allwedd Mynediad',name:'Enw',langCode:'Cod Iaith',tabIndex:'Indecs Tab',advisoryTitle:'Teitl Cynghorol',advisoryContentType:'Math y Cynnwys Cynghorol',cssClasses:'Dosbarthiadau Dalen Arddull',charset:"Set nodau'r Adnodd Cysylltiedig",styles:'Arddull',rel:'Perthynas',selectAnchor:'Dewiswch Angor',anchorName:"Gan Enw'r Angor",anchorId:'Gan Id yr Elfen',emailAddress:'Cyfeiriad E-Bost',emailSubject:'Testun y Message Subject',emailBody:'Pwnc y Neges',noAnchors:'(Dim angorau ar gael yn y ddogfen)',noUrl:'Teipiwch URL y ddolen',noEmail:'Teipiwch gyfeiriad yr e-bost'},anchor:{toolbar:'Angor',menu:'Golygwch yr Angor',title:"Priodweddau'r Angor",name:"Enw'r Angor",errorName:"Teipiwch enw'r angor",remove:'Tynnwch yr Angor'},list:{numberedTitle:'Priodweddau Rhestr Rifol',bulletedTitle:'Priodweddau Rhestr Fwled',type:'Math',start:'Dechrau',validateStartNumber:'Rhaid bod y rhif cychwynnol yn gyfanrif.',circle:'Cylch',disc:'Disg',square:'Sgwâr',none:'Dim',notset:'<heb osod>',armenian:'Rhifau Armeneg',georgian:'Rhifau Sioraidd (an, ban, gan, ayyb.)',lowerRoman:'Rhufeinig Is (i, ii, iii, iv, v, ayyb.)',upperRoman:'Rhufeinig Uwch (I, II, III, IV, V, ayyb.)',lowerAlpha:'Alffa Is (a, b, c, d, e, ayyb.)',upperAlpha:'Alffa Uwch (A, B, C, D, E, ayyb.)',lowerGreek:'Groeg Is (alpha, beta, gamma, ayyb.)',decimal:'Degol (1, 2, 3, ayyb.)',decimalLeadingZero:'Degol â sero arweiniol (01, 02, 03, ayyb.)'},findAndReplace:{title:'Chwilio ac Amnewid',find:'Chwilio',replace:'Amnewid',findWhat:"Chwilio'r term:",replaceWith:'Amnewid gyda:',notFoundMsg:"Nid oedd y testun wedi'i ddarganfod.",findOptions:'Chwilio Opsiynau',matchCase:"Cyfateb i'r cas",matchWord:'Cyfateb gair cyfan',matchCyclic:'Cyfateb cylchol',replaceAll:'Amnewid pob un',replaceSuccessMsg:'Amnewidiwyd %1 achlysur.'},table:{toolbar:'Tabl',title:'Nodweddion Tabl',menu:'Nodweddion Tabl',deleteTable:'Dileu Tabl',rows:'Rhesi',columns:'Colofnau',border:'Maint yr Ymyl',widthPx:'picsel',widthPc:'y cant',widthUnit:'uned lled',cellSpace:"Bylchu'r gell",cellPad:"Padio'r gell",caption:'Pennawd',summary:'Crynodeb',headers:'Penynnau',headersNone:'Dim',headersColumn:'Colofn gyntaf',headersRow:'Rhes gyntaf',headersBoth:'Y Ddau',invalidRows:"Mae'n rhaid cael o leiaf un rhes.",invalidCols:"Mae'n rhaid cael o leiaf un golofn.",invalidBorder:"Mae'n rhaid i faint yr ymyl fod yn rhif.",invalidWidth:"Mae'n rhaid i led y tabl fod yn rhif.",invalidHeight:"Mae'n rhaid i uchder y tabl fod yn rhif.",invalidCellSpacing:"Mae'n rhaid i fylchiad y gell fod yn rhif positif.",invalidCellPadding:"Mae'n rhaid i badiad y gell fod yn rhif positif.",cell:{menu:'Cell',insertBefore:'Mewnosod Cell Cyn',insertAfter:'Mewnosod Cell Ar Ôl',deleteCell:'Dileu Celloedd',merge:'Cyfuno Celloedd',mergeRight:"Cyfuno i'r Dde",mergeDown:'Cyfuno i Lawr',splitHorizontal:"Hollti'r Gell yn Lorweddol",splitVertical:"Hollti'r Gell yn Fertigol",title:"Priodweddau'r Gell",cellType:'Math y Gell',rowSpan:'Rhychwant Rhesi',colSpan:'Rhychwant Colofnau',wordWrap:'Lapio Geiriau',hAlign:'Aliniad Llorweddol',vAlign:'Aliniad Fertigol',alignBaseline:'Baslinell',bgColor:'Lliw Cefndir',borderColor:'Lliw Ymyl',data:'Data',header:'Pennyn',yes:'Ie',no:'Na',invalidWidth:"Mae'n rhaid i led y gell fod yn rhif.",invalidHeight:"Mae'n rhaid i uchder y gell fod yn rhif.",invalidRowSpan:"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.",invalidColSpan:"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.",chooseColor:'Choose'},row:{menu:'Rhes',insertBefore:'Mewnosod Rhes Cyn',insertAfter:'Mewnosod Rhes Ar Ôl',deleteRow:'Dileu Rhesi'},column:{menu:'Colofn',insertBefore:'Mewnosod Colofn Cyn',insertAfter:'Mewnosod Colofn Ar Ôl',deleteColumn:'Dileu Colofnau'}},button:{title:'Priodweddau Botymau',text:'Testun (Gwerth)',type:'Math',typeBtn:'Botwm',typeSbm:'Gyrru',typeRst:'Ailosod'},checkboxAndRadio:{checkboxTitle:'Priodweddau Blwch Ticio',radioTitle:'Priodweddau Botwm Radio',value:'Gwerth',selected:'Dewiswyd'},form:{title:'Priodweddau Ffurflen',menu:'Priodweddau Ffurflen',action:'Gweithred',method:'Dull',encoding:'Amgodio'},select:{title:'Priodweddau Maes Dewis',selectInfo:'Gwyb Dewis',opAvail:'Opsiynau ar Gael',value:'Gwerth',size:'Maint',lines:'llinellau',chkMulti:'Caniatàu aml-ddewisiadau',opText:'Testun',opValue:'Gwerth',btnAdd:'Ychwanegu',btnModify:'Newid',btnUp:'Lan',btnDown:'Lawr',btnSetValue:'Gosod fel gwerth a ddewiswyd',btnDelete:'Dileu'},textarea:{title:'Priodweddau Ardal Testun',cols:'Colofnau',rows:'Rhesi'},textfield:{title:'Priodweddau Maes Testun',name:'Enw',value:'Gwerth',charWidth:'Lled Nod',maxChars:'Uchafswm y Nodau',type:'Math',typeText:'Testun',typePass:'Cyfrinair'},hidden:{title:'Priodweddau Maes Cudd',name:'Enw',value:'Gwerth'},image:{title:'Priodweddau Delwedd',titleButton:'Priodweddau Botwm Delwedd',menu:'Priodweddau Delwedd',infoTab:'Gwyb Delwedd',btnUpload:"Anfon i'r Gweinydd",upload:'lanlwytho',alt:'Testun Amgen',lockRatio:'Cloi Cymhareb',resetSize:'Ailosod Maint',border:'Ymyl',hSpace:'BwlchLl',vSpace:'BwlchF',alertUrl:'Rhowch URL y ddelwedd',linkTab:'Dolen',button2Img:"Ydych am drawsffurfio'r botwm ddelwedd hwn ar ddelwedd syml?",img2Button:"Ydych am drawsffurfio'r ddelwedd hon ar fotwm delwedd?",urlMissing:'URL gwreiddiol y ddelwedd ar goll.',validateBorder:"Rhaid i'r ymyl fod yn gyfanrif.",validateHSpace:"Rhaid i'r HSpace fod yn gyfanrif.",validateVSpace:"Rhaid i'r VSpace fod yn gyfanrif."},flash:{properties:'Priodweddau Flash',propertiesTab:'Priodweddau',title:'Priodweddau Flash',chkPlay:'AwtoChwarae',chkLoop:'Lwpio',chkMenu:'Galluogi Dewislen Flash',chkFull:'Caniatàu Sgrin Llawn',scale:'Graddfa',scaleAll:'Dangos pob',scaleNoBorder:'Dim Ymyl',scaleFit:'Ffit Union',access:'Mynediad Sgript',accessAlways:'Pob amser',accessSameDomain:"R'un parth",accessNever:'Byth',alignAbsBottom:'Gwaelod Abs',alignAbsMiddle:'Canol Abs',alignBaseline:'Baslinell',alignTextTop:'Testun Top',quality:'Ansawdd',qualityBest:'Gorau',qualityHigh:'Uchel',qualityAutoHigh:'Uchel Awto',qualityMedium:'Canolig',qualityAutoLow:'Isel Awto',qualityLow:'Isel',windowModeWindow:'Ffenestr',windowModeOpaque:'Afloyw',windowModeTransparent:'Tryloyw',windowMode:'Modd ffenestr',flashvars:'Newidynnau ar gyfer Flash',bgcolor:'Lliw cefndir',hSpace:'BwlchLl',vSpace:'BwlchF',validateSrc:'Ni all yr URL fod yn wag.',validateHSpace:"Rhaid i'r BwlchLl fod yn rhif.",validateVSpace:"Rhaid i'r BwlchF fod yn rhif."},spellCheck:{toolbar:'Gwirio Sillafu',title:'Gwirio Sillafu',notAvailable:"Nid yw'r gwasanaeth hwn ar gael yn bresennol.",errorLoading:'Error loading application service host: %s.',notInDic:"Nid i'w gael yn y geiriadur",changeTo:'Newid i',btnIgnore:'Anwybyddu Un',btnIgnoreAll:'Anwybyddu Pob',btnReplace:'Amnewid Un',btnReplaceAll:'Amnewid Pob',btnUndo:'Dadwneud',noSuggestions:'- Dim awgrymiadau -',progress:'Gwirio sillafu yn ar y gweill...',noMispell:'Gwirio sillafu wedi gorffen: Dim camsillaf.',noChanges:'Gwirio sillafu wedi gorffen: Dim newidiadau',oneChange:'Gwirio sillafu wedi gorffen: Newidiwyd 1 gair',manyChanges:'Gwirio sillafu wedi gorffen: Newidiwyd %1 gair',ieSpellDownload:'Gwirydd sillafu heb ei arsefydlu. A ydych am ei lawrlwytho nawr?'},smiley:{toolbar:'Gwenoglun',title:'Mewnosod Gwenoglun',options:'Opsiynau Gwenogluniau'},elementsPath:{eleLabel:'Llwybr elfennau',eleTitle:'Elfen %1'},numberedlist:'Mewnosod/Tynnu Rhestr Rhifol',bulletedlist:'Mewnosod/Tynnu Rhestr Bwled',indent:"Cynyddu'r Mewnoliad",outdent:"Lleihau'r Mewnoliad",justify:{left:"Alinio i'r Chwith",center:"Alinio i'r Canol",right:"Alinio i'r Dde",block:'Aliniad Bloc'},blockquote:'Dyfyniad bloc',clipboard:{title:'Gludo',cutError:"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).",copyError:"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).",pasteMsg:"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.",securityMsg:"Oherwydd gosodiadau diogelwch eich porwr, nid yw'r porwr yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.",pasteArea:'Ardal Gludo'},pastefromword:{confirmCleanup:"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?",toolbar:'Gludo o Word',title:'Gludo o Word',error:'Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol'},pasteText:{button:'Gludo fel testun plaen',title:'Gludo fel Testun Plaen'},templates:{button:'Templedi',title:'Templedi Cynnwys',options:'Opsiynau Templedi',insertOption:'Amnewid y cynnwys go iawn',selectPromptMsg:"Dewiswch dempled i'w agor yn y golygydd",emptyListMsg:"(Dim templedi wedi'u diffinio)"},showBlocks:'Dangos Blociau',stylesCombo:{label:'Arddulliau',panelTitle:'Arddulliau Fformatio',panelTitle1:'Arddulliau Bloc',panelTitle2:'Arddulliau Mewnol',panelTitle3:'Arddulliau Gwrthrych'},format:{label:'Fformat',panelTitle:'Fformat Paragraff',tag_p:'Normal',tag_pre:"Wedi'i Fformatio",tag_address:'Cyfeiriad',tag_h1:'Pennawd 1',tag_h2:'Pennawd 2',tag_h3:'Pennawd 3',tag_h4:'Pennawd 4',tag_h5:'Pennawd 5',tag_h6:'Pennawd 6',tag_div:'Normal (DIV)'},div:{title:'Creu Cynhwysydd Div',toolbar:'Creu Cynhwysydd Div',cssClassInputLabel:'Dosbarthiadau Ffeil Ddiwyg',styleSelectLabel:'Arddull',IdInputLabel:'Id',languageCodeInputLabel:' Cod Iaith',inlineStyleInputLabel:'Arddull Mewn Llinell',advisoryTitleInputLabel:'Teitl Cynghorol',langDirLabel:'Cyfeiriad yr Iaith',langDirLTRLabel:"Chwith i'r Dde (LTR)",langDirRTLLabel:"Dde i'r Chwith (RTL)",edit:'Golygu Div',remove:'Tynnu Div'},iframe:{title:'Priodweddau IFrame',toolbar:'IFrame',noUrl:'Rhowch fath URL yr iframe',scrolling:'Galluogi bariau sgrolio',border:'Dangos ymyl y ffrâm'},font:{label:'Ffont',voiceLabel:'Ffont',panelTitle:"Enw'r Ffont"},fontSize:{label:'Maint',voiceLabel:'Maint y Ffont',panelTitle:'Maint y Ffont'},colorButton:{textColorTitle:'Lliw Testun',bgColorTitle:'Lliw Cefndir',panelTitle:'Lliwiau',auto:'Awtomatig',more:'Mwy o Liwiau...'},colors:{'000':'Du',800000:'Marwn','8B4513':'Brown Cyfrwy','2F4F4F':'Llechen Tywyll','008080':'Corhwyad','000080':'Nefi','4B0082':'Indigo',696969:'Llwyd Pwl',B22222:'Bric Tân',A52A2A:'Brown',DAA520:'Rhoden Aur','006400':'Gwyrdd Tywyll','40E0D0':'Gwyrddlas','0000CD':'Glas Canolig',800080:'Porffor',808080:'Llwyd',F00:'Coch',FF8C00:'Oren Tywyll',FFD700:'Aur','008000':'Gwyrdd','0FF':'Cyan','00F':'Glas',EE82EE:'Fioled',A9A9A9:'Llwyd Tywyll',FFA07A:'Samwn Golau',FFA500:'Oren',FFFF00:'Melyn','00FF00':'Leim',AFEEEE:'Gwyrddlas Golau',ADD8E6:'Glas Golau',DDA0DD:'Eirinen',D3D3D3:'Llwyd Golau',FFF0F5:'Gwrid Lafant',FAEBD7:'Gwyn Hynafol',FFFFE0:'Melyn Golau',F0FFF0:'Melwn Gwyrdd Golau',F0FFFF:'Aswr',F0F8FF:'Glas Alys',E6E6FA:'Lafant',FFF:'Gwyn'},scayt:{title:"Gwirio'r Sillafu Wrth Deipio",opera_title:'Heb ei gynnal gan Opera',enable:'Galluogi SCAYT',disable:'Analluogi SCAYT',about:'Ynghylch SCAYT',toggle:'Togl SCAYT',options:'Opsiynau',langs:'Ieithoedd',moreSuggestions:'Awgrymiadau pellach',ignore:'Anwybyddu',ignoreAll:'Anwybyddu pob',addWord:'Ychwanegu Gair',emptyDic:"Ni ddylai enw'r geiriadur fod yn wag.",noSuggestions:'Dim awgrymiadau',optionsTab:'Opsiynau',allCaps:'Anwybyddu Geiriau Nodau Uwch i Gyd',ignoreDomainNames:'Anwybyddu Enwau Parth',mixedCase:'Anwybyddu Geiriau â Chymysgedd Nodau Uwch ac Is',mixedWithDigits:'Anwybyddu Geiriau â Rhifau',languagesTab:'Ieithoedd',dictionariesTab:'Geiriaduron',dic_field_name:"Enw'r geiriadur",dic_create:'Creu',dic_restore:'Adfer',dic_delete:'Dileu',dic_rename:'Ailenwi',dic_info:"Ar y cychwyn, caiff y Geiriadur ei storio mewn Cwci. Er, mae terfyn ar faint cwcis. Pan fydd Gweiriadur Defnyddiwr yn tyfu tu hwnt i gyfyngiadau maint Cwci, caiff y geiriadur ei storio ar ein gweinydd ni. er mwyn storio eich geiriadur poersonol chi ar ein gweinydd, bydd angen i chi osod enw ar gyfer y geiriadur. Os oes geiriadur 'da chi ar ein gweinydd yn barod, teipiwch ei enw a chliciwch y botwm Adfer.",aboutTab:'Ynghylch'},about:{title:'Ynghylch CKEditor',dlgTitle:'Ynghylch CKEditor',help:'Gwirio $1 am gymorth.',userGuide:'Canllawiau Defnyddiwr CKEditor',moreInfo:"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:",copy:'Hawlfraint &copy; $1. Cedwir pob hawl.'},maximize:'Mwyhau',minimize:'Lleihau',fakeobjects:{anchor:'Angor',flash:'Animeiddiant Flash',iframe:'IFrame',hiddenfield:'Maes Cudd',unknown:'Gwrthrych Anhysbys'},resize:'Llusgo i ailfeintio',colordialog:{title:'Dewis lliw',options:'Opsiynau Lliw',highlight:'Uwcholeuo',selected:'Dewiswyd',clear:'Clirio'},toolbarCollapse:"Cyfangu'r Bar Offer",toolbarExpand:"Ehangu'r Bar Offer",toolbarGroups:{document:'Dogfen',clipboard:'Clipfwrdd/Dadwneud',editing:'Golygu',forms:'Ffurflenni',basicstyles:'Arddulliau Sylfaenol',paragraph:'Paragraff',links:'Dolenni',insert:'Mewnosod',styles:'Arddulliau',colors:'Lliwiau',tools:'Offer'},bidi:{ltr:"Cyfeiriad testun o'r chwith i'r dde",rtl:"Cyfeiriad testun o'r dde i'r chwith"},docprops:{label:'Priodweddau Dogfen',title:'Priodweddau Dogfen',design:'Cynllunio',meta:'Tagiau Meta',chooseColor:'Dewis',other:'Arall...',docTitle:'Teitl y Dudalen',charset:'Amgodio Set Nodau',charsetOther:'Amgodio Set Nodau Arall',charsetASCII:'ASCII',charsetCE:'Ewropeaidd Canol',charsetCT:'Tsieinëeg Traddodiadol (Big5)',charsetCR:'Syrilig',charsetGR:'Groeg',charsetJP:'Siapanëeg',charsetKR:'Corëeg',charsetTR:'Tyrceg',charsetUN:'Unicode (UTF-8)',charsetWE:'Ewropeaidd Gorllewinol',docType:'Pennawd Math y Ddogfen',docTypeOther:'Pennawd Math y Ddogfen Arall',xhtmlDec:'Cynnwys Datganiadau XHTML',bgColor:'Lliw Cefndir',bgImage:'URL Delwedd Cefndir',bgFixed:'Cefndir Sefydlog (Ddim yn Sgrolio)',txtColor:'Lliw y Testun',margin:'Ffin y Dudalen',marginTop:'Brig',marginLeft:'Chwith',marginRight:'Dde',marginBottom:'Gwaelod',metaKeywords:'Allweddeiriau Indecsio Dogfen (gwahanu gyda choma)',metaDescription:'Disgrifiad y Ddogfen',metaAuthor:'Awdur',metaCopyright:'Hawlfraint',previewHtml:'<p>Dyma ychydig o <strong>destun sampl</strong>. Rydych chi\'n defnyddio <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/da.js b/web/imcms/ckeditor/lang/da.js
new file mode 100644
index 0000000000..7b1f731641
--- /dev/null
+++ b/web/imcms/ckeditor/lang/da.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.da={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Tryk ALT 0 for hjælp',toolbars:'Editors værktøjslinjer',editor:'Rich Text Editor',source:'Kilde',newPage:'Ny side',save:'Gem',preview:'Vis eksempel',cut:'Klip',copy:'Kopiér',paste:'Indsæt',print:'Udskriv',underline:'Understreget',bold:'Fed',italic:'Kursiv',selectAll:'Vælg alt',removeFormat:'Fjern formatering',strike:'Gennemstreget',subscript:'Sænket skrift',superscript:'Hævet skrift',horizontalrule:'Indsæt vandret streg',pagebreak:'Indsæt sideskift',pagebreakAlt:'Sideskift',unlink:'Fjern hyperlink',undo:'Fortryd',redo:'Annullér fortryd',common:{browseServer:'Gennemse...',url:'URL',protocol:'Protokol',upload:'Upload',uploadSubmit:'Upload',image:'Indsæt billede',flash:'Indsæt Flash',form:'Indsæt formular',checkbox:'Indsæt afkrydsningsfelt',radio:'Indsæt alternativknap',textField:'Indsæt tekstfelt',textarea:'Indsæt tekstboks',hiddenField:'Indsæt skjult felt',button:'Indsæt knap',select:'Indsæt liste',imageButton:'Indsæt billedknap',notSet:'<intet valgt>',id:'Id',name:'Navn',langDir:'Tekstretning',langDirLtr:'Fra venstre mod højre (LTR)',langDirRtl:'Fra højre mod venstre (RTL)',langCode:'Sprogkode',longDescr:'Udvidet beskrivelse',cssClass:'Typografiark (CSS)',advisoryTitle:'Titel',cssStyle:'Typografi (CSS)',ok:'OK',cancel:'Annullér',close:'Luk',preview:'Forhåndsvisning',generalTab:'Generelt',advancedTab:'Avanceret',validateNumberFailed:'Værdien er ikke et tal.',confirmNewPage:'Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?',confirmCancel:'Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?',options:'Vis muligheder',target:'Mål',targetNew:'Nyt vindue (_blank)',targetTop:'Øverste vindue (_top)',targetSelf:'Samme vindue (_self)',targetParent:'Samme vindue (_parent)',langDirLTR:'Venstre til højre (LTR)',langDirRTL:'Højre til venstre (RTL)',styles:'Style',cssClasses:'Stylesheetklasser',width:'Bredde',height:'Højde',align:'Justering',alignLeft:'Venstre',alignRight:'Højre',alignCenter:'Centreret',alignTop:'Øverst',alignMiddle:'Centreret',alignBottom:'Nederst',invalidValue:'Invalid value.',invalidHeight:'Højde skal være et tal.',invalidWidth:'Bredde skal være et tal.',invalidCssLength:'Værdien specificeret for "%1" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).',invalidHtmlLength:'Værdien specificeret for "%1" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).',invalidInlineStyle:'Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som "name:value", separeret af semikoloner',cssLengthTooltip:'Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, ikke tilgængelig</span>'},contextmenu:{options:'Muligheder for hjælpemenu'},specialChar:{toolbar:'Indsæt symbol',title:'Vælg symbol',options:'Muligheder for specialkarakterer'},link:{toolbar:'Indsæt/redigér hyperlink',other:'<anden>',menu:'Redigér hyperlink',title:'Egenskaber for hyperlink',info:'Generelt',target:'Mål',upload:'Upload',advanced:'Avanceret',type:'Type',toUrl:'URL',toAnchor:'Bogmærke på denne side',toEmail:'E-mail',targetFrame:'<ramme>',targetPopup:'<popup vindue>',targetFrameName:'Destinationsvinduets navn',targetPopupName:'Popupvinduets navn',popupFeatures:'Egenskaber for popup',popupResizable:'Justérbar',popupStatusBar:'Statuslinje',popupLocationBar:'Adresselinje',popupToolbar:'Værktøjslinje',popupMenuBar:'Menulinje',popupFullScreen:'Fuld skærm (IE)',popupScrollBars:'Scrollbar',popupDependent:'Koblet/dependent (Netscape)',popupLeft:'Position fra venstre',popupTop:'Position fra toppen',id:'Id',langDir:'Tekstretning',langDirLTR:'Fra venstre mod højre (LTR)',langDirRTL:'Fra højre mod venstre (RTL)',acccessKey:'Genvejstast',name:'Navn',langCode:'Tekstretning',tabIndex:'Tabulatorindeks',advisoryTitle:'Titel',advisoryContentType:'Indholdstype',cssClasses:'Typografiark',charset:'Tegnsæt',styles:'Typografi',rel:'Relation',selectAnchor:'Vælg et anker',anchorName:'Efter ankernavn',anchorId:'Efter element-Id',emailAddress:'E-mailadresse',emailSubject:'Emne',emailBody:'Besked',noAnchors:'(Ingen bogmærker i dokumentet)',noUrl:'Indtast hyperlink-URL!',noEmail:'Indtast e-mailadresse!'},anchor:{toolbar:'Indsæt/redigér bogmærke',menu:'Egenskaber for bogmærke',title:'Egenskaber for bogmærke',name:'Bogmærkenavn',errorName:'Indtast bogmærkenavn',remove:'Fjern bogmærke'},list:{numberedTitle:'Egenskaber for nummereret liste',bulletedTitle:'Værdier for cirkelpunktopstilling',type:'Type',start:'Start',validateStartNumber:'Den nummererede liste skal starte med et rundt nummer',circle:'Cirkel',disc:'Værdier for diskpunktopstilling',square:'Firkant',none:'Ingen',notset:'<ikke defineret>',armenian:'Armensk nummering',georgian:'Georgiansk nummering (an, ban, gan, etc.)',lowerRoman:'Små romerske (i, ii, iii, iv, v, etc.)',upperRoman:'Store romerske (I, II, III, IV, V, etc.)',lowerAlpha:'Små alfabet (a, b, c, d, e, etc.)',upperAlpha:'Store alfabet (A, B, C, D, E, etc.)',lowerGreek:'Små græsk (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, osv.)',decimalLeadingZero:'Decimaler med 0 først (01, 02, 03, etc.)'},findAndReplace:{title:'Søg og erstat',find:'Søg',replace:'Erstat',findWhat:'Søg efter:',replaceWith:'Erstat med:',notFoundMsg:'Søgeteksten blev ikke fundet',findOptions:'Find muligheder',matchCase:'Forskel på store og små bogstaver',matchWord:'Kun hele ord',matchCyclic:'Match cyklisk',replaceAll:'Erstat alle',replaceSuccessMsg:'%1 forekomst(er) erstattet.'},table:{toolbar:'Tabel',title:'Egenskaber for tabel',menu:'Egenskaber for tabel',deleteTable:'Slet tabel',rows:'Rækker',columns:'Kolonner',border:'Rammebredde',widthPx:'pixels',widthPc:'procent',widthUnit:'Bredde på enhed',cellSpace:'Celleafstand',cellPad:'Cellemargen',caption:'Titel',summary:'Resumé',headers:'Hoved',headersNone:'Ingen',headersColumn:'Første kolonne',headersRow:'Første række',headersBoth:'Begge',invalidRows:'Antallet af rækker skal være større end 0.',invalidCols:'Antallet af kolonner skal være større end 0.',invalidBorder:'Rammetykkelse skal være et tal.',invalidWidth:'Tabelbredde skal være et tal.',invalidHeight:'Tabelhøjde skal være et tal.',invalidCellSpacing:'Celleafstand skal være et tal.',invalidCellPadding:'Cellemargen skal være et tal.',cell:{menu:'Celle',insertBefore:'Indsæt celle før',insertAfter:'Indsæt celle efter',deleteCell:'Slet celle',merge:'Flet celler',mergeRight:'Flet til højre',mergeDown:'Flet nedad',splitHorizontal:'Del celle vandret',splitVertical:'Del celle lodret',title:'Celleegenskaber',cellType:'Celletype',rowSpan:'Række span (rows span)',colSpan:'Kolonne span (columns span)',wordWrap:'Tekstombrydning',hAlign:'Vandret justering',vAlign:'Lodret justering',alignBaseline:'Grundlinje',bgColor:'Baggrundsfarve',borderColor:'Rammefarve',data:'Data',header:'Hoved',yes:'Ja',no:'Nej',invalidWidth:'Cellebredde skal være et tal.',invalidHeight:'Cellehøjde skal være et tal.',invalidRowSpan:'Række span skal være et heltal.',invalidColSpan:'Kolonne span skal være et heltal.',chooseColor:'Vælg'},row:{menu:'Række',insertBefore:'Indsæt række før',insertAfter:'Indsæt række efter',deleteRow:'Slet række'},column:{menu:'Kolonne',insertBefore:'Indsæt kolonne før',insertAfter:'Indsæt kolonne efter',deleteColumn:'Slet kolonne'}},button:{title:'Egenskaber for knap',text:'Tekst',type:'Type',typeBtn:'Knap',typeSbm:'Send',typeRst:'Nulstil'},checkboxAndRadio:{checkboxTitle:'Egenskaber for afkrydsningsfelt',radioTitle:'Egenskaber for alternativknap',value:'Værdi',selected:'Valgt'},form:{title:'Egenskaber for formular',menu:'Egenskaber for formular',action:'Handling',method:'Metode',encoding:'Kodning (encoding)'},select:{title:'Egenskaber for liste',selectInfo:'Generelt',opAvail:'Valgmuligheder',value:'Værdi',size:'Størrelse',lines:'Linjer',chkMulti:'Tillad flere valg',opText:'Tekst',opValue:'Værdi',btnAdd:'Tilføj',btnModify:'Redigér',btnUp:'Op',btnDown:'Ned',btnSetValue:'Sæt som valgt',btnDelete:'Slet'},textarea:{title:'Egenskaber for tekstboks',cols:'Kolonner',rows:'Rækker'},textfield:{title:'Egenskaber for tekstfelt',name:'Navn',value:'Værdi',charWidth:'Bredde (tegn)',maxChars:'Max. antal tegn',type:'Type',typeText:'Tekst',typePass:'Adgangskode'},hidden:{title:'Egenskaber for skjult felt',name:'Navn',value:'Værdi'},image:{title:'Egenskaber for billede',titleButton:'Egenskaber for billedknap',menu:'Egenskaber for billede',infoTab:'Generelt',btnUpload:'Upload fil til serveren',upload:'Upload',alt:'Alternativ tekst',lockRatio:'Lås størrelsesforhold',resetSize:'Nulstil størrelse',border:'Ramme',hSpace:'Vandret margen',vSpace:'Lodret margen',alertUrl:'Indtast stien til billedet',linkTab:'Hyperlink',button2Img:'Vil du lave billedknappen om til et almindeligt billede?',img2Button:'Vil du lave billedet om til en billedknap?',urlMissing:'Kilde på billed-URL mangler',validateBorder:'Kant skal være et helt nummer.',validateHSpace:'HSpace skal være et helt nummer.',validateVSpace:'VSpace skal være et helt nummer.'},flash:{properties:'Egenskaber for Flash',propertiesTab:'Egenskaber',title:'Egenskaber for Flash',chkPlay:'Automatisk afspilning',chkLoop:'Gentagelse',chkMenu:'Vis Flash-menu',chkFull:'Tillad fuldskærm',scale:'Skalér',scaleAll:'Vis alt',scaleNoBorder:'Ingen ramme',scaleFit:'Tilpas størrelse',access:'Scriptadgang',accessAlways:'Altid',accessSameDomain:'Samme domæne',accessNever:'Aldrig',alignAbsBottom:'Absolut nederst',alignAbsMiddle:'Absolut centreret',alignBaseline:'Grundlinje',alignTextTop:'Toppen af teksten',quality:'Kvalitet',qualityBest:'Bedste',qualityHigh:'Høj',qualityAutoHigh:'Auto høj',qualityMedium:'Medium',qualityAutoLow:'Auto lav',qualityLow:'Lav',windowModeWindow:'Vindue',windowModeOpaque:'Gennemsigtig (opaque)',windowModeTransparent:'Transparent',windowMode:'Vinduestilstand',flashvars:'Variabler for Flash',bgcolor:'Baggrundsfarve',hSpace:'Vandret margen',vSpace:'Lodret margen',validateSrc:'Indtast hyperlink URL!',validateHSpace:'Vandret margen skal være et tal.',validateVSpace:'Lodret margen skal være et tal.'},spellCheck:{toolbar:'Stavekontrol',title:'Stavekontrol',notAvailable:'Stavekontrol er desværre ikke tilgængelig.',errorLoading:'Fejl ved indlæsning af host: %s.',notInDic:'Ikke i ordbogen',changeTo:'Forslag',btnIgnore:'Ignorér',btnIgnoreAll:'Ignorér alle',btnReplace:'Erstat',btnReplaceAll:'Erstat alle',btnUndo:'Tilbage',noSuggestions:'(ingen forslag)',progress:'Stavekontrollen arbejder...',noMispell:'Stavekontrol færdig: Ingen fejl fundet',noChanges:'Stavekontrol færdig: Ingen ord ændret',oneChange:'Stavekontrol færdig: Et ord ændret',manyChanges:'Stavekontrol færdig: %1 ord ændret',ieSpellDownload:'Stavekontrol ikke installeret. Vil du installere den nu?'},smiley:{toolbar:'Smiley',title:'Vælg smiley',options:'Smileymuligheder'},elementsPath:{eleLabel:'Sti på element',eleTitle:'%1 element'},numberedlist:'Talopstilling',bulletedlist:'Punktopstilling',indent:'Forøg indrykning',outdent:'Formindsk indrykning',justify:{left:'Venstrestillet',center:'Centreret',right:'Højrestillet',block:'Lige margener'},blockquote:'Blokcitat',clipboard:{title:'Indsæt',cutError:'Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).',copyError:'Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).',pasteMsg:'Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.',securityMsg:'Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.',pasteArea:'Indsæt område'},pastefromword:{confirmCleanup:'Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?',toolbar:'Indsæt fra Word',title:'Indsæt fra Word',error:'Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl'},pasteText:{button:'Indsæt som ikke-formateret tekst',title:'Indsæt som ikke-formateret tekst'},templates:{button:'Skabeloner',title:'Indholdsskabeloner',options:'Skabelon muligheder',insertOption:'Erstat det faktiske indhold',selectPromptMsg:'Vælg den skabelon, som skal åbnes i editoren (nuværende indhold vil blive overskrevet):',emptyListMsg:'(Der er ikke defineret nogen skabelon)'},showBlocks:'Vis afsnitsmærker',stylesCombo:{label:'Typografi',panelTitle:'Formattering på stylesheet',panelTitle1:'Block typografi',panelTitle2:'Inline typografi',panelTitle3:'Object typografi'},format:{label:'Formatering',panelTitle:'Formatering',tag_p:'Normal',tag_pre:'Formateret',tag_address:'Adresse',tag_h1:'Overskrift 1',tag_h2:'Overskrift 2',tag_h3:'Overskrift 3',tag_h4:'Overskrift 4',tag_h5:'Overskrift 5',tag_h6:'Overskrift 6',tag_div:'Normal (DIV)'},div:{title:'Opret Div Container',toolbar:'Opret Div Container',cssClassInputLabel:'Typografiark',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Sprogkode',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Vejledende titel',langDirLabel:'Sprogretning',langDirLTRLabel:'Venstre til højre (LTR)',langDirRTLLabel:'Højre til venstre (RTL)',edit:'Rediger Div',remove:'Slet Div'},iframe:{title:'Iframe egenskaber',toolbar:'Iframe',noUrl:'Venligst indsæt URL på iframen',scrolling:'Aktiver scrollbars',border:'Vis kant på rammen'},font:{label:'Skrifttype',voiceLabel:'Skrifttype',panelTitle:'Skrifttype'},fontSize:{label:'Skriftstørrelse',voiceLabel:'Skriftstørrelse',panelTitle:'Skriftstørrelse'},colorButton:{textColorTitle:'Tekstfarve',bgColorTitle:'Baggrundsfarve',panelTitle:'Farver',auto:'Automatisk',more:'Flere farver...'},colors:{'000':'Sort',800000:'Mørkerød','8B4513':'Mørk orange','2F4F4F':'Dark Slate Grå','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Mørkegrå',B22222:'Scarlet / Rød',A52A2A:'Brun',DAA520:'Guld','006400':'Mørkegrøn','40E0D0':'Tyrkis','0000CD':'Mellemblå',800080:'Lilla',808080:'Grå',F00:'Rød',FF8C00:'Mørk orange',FFD700:'Guld','008000':'Grøn','0FF':'Cyan','00F':'Blå',EE82EE:'Violet',A9A9A9:'Matgrå',FFA07A:'Laksefarve',FFA500:'Orange',FFFF00:'Gul','00FF00':'Lime',AFEEEE:'Mat tyrkis',ADD8E6:'Lyseblå',DDA0DD:'Plum',D3D3D3:'Lysegrå',FFF0F5:'Lavender Blush',FAEBD7:'Antikhvid',FFFFE0:'Lysegul',F0FFF0:'Gul / Beige',F0FFFF:'Himmeblå',F0F8FF:'Alice blue',E6E6FA:'Lavendel',FFF:'Hvid'},scayt:{title:'Stavekontrol mens du skriver',opera_title:'Ikke supporteret af Opera',enable:'Aktivér SCAYT',disable:'Deaktivér SCAYT',about:'Om SCAYT',toggle:'Skift/toggle SCAYT',options:'Indstillinger',langs:'Sprog',moreSuggestions:'Flere forslag',ignore:'Ignorér',ignoreAll:'Ignorér alle',addWord:'Tilføj ord',emptyDic:'Ordbogsnavn må ikke være tom.',noSuggestions:'Ingen forslag',optionsTab:'Indstillinger',allCaps:'Ignorer alle store bogstaver',ignoreDomainNames:'Ignorér domænenavne',mixedCase:'Ignorer ord med store og små bogstaver',mixedWithDigits:'Ignorér ord med numre',languagesTab:'Sprog',dictionariesTab:'Ordbøger',dic_field_name:'Navn på ordbog',dic_create:'Opret',dic_restore:'Gendan',dic_delete:'Slet',dic_rename:'Omdøb',dic_info:'Til start er brugerordbogen gemt i en Cookie. Dog har Cookies en begrænsning på størrelse. Når ordbogen når en bestemt størrelse kan den blive gemt på vores server. For at gemme din personlige ordbog på vores server skal du angive et navn for denne. Såfremt du allerede har gemt en ordbog, skriv navnet på denne og klik på Gendan knappen.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Se $1 for at få hjælp.',userGuide:'CKEditor-brugermanual',moreInfo:'For informationer omkring licens, se venligst vores hjemmeside (på engelsk):',copy:'Copyright &copy; $1. Alle rettigheder forbeholdes.'},maximize:'Maksimér',minimize:'Minimér',fakeobjects:{anchor:'Anker',flash:'Flashanimation',iframe:'Iframe',hiddenfield:'Skjult felt',unknown:'Ukendt objekt'},resize:'Træk for at skalere',colordialog:{title:'Vælg farve',options:'Farvemuligheder',highlight:'Markér',selected:'Valgt farve',clear:'Nulstil'},toolbarCollapse:'Sammenklap værktøjslinje',toolbarExpand:'Udvid værktøjslinje',toolbarGroups:{document:'Dokument',clipboard:'Udklipsholder/Fortryd',editing:'Redigering',forms:'Formularer',basicstyles:'Basis styles',paragraph:'Paragraf',links:'Links',insert:'Indsæt',styles:'Typografier',colors:'Farver',tools:'Værktøjer'},bidi:{ltr:'Tekstretning fra venstre til højre',rtl:'Tekstretning fra højre til venstre'},docprops:{label:'Egenskaber for dokument',title:'Egenskaber for dokument',design:'Design',meta:'Metatags',chooseColor:'Vælg',other:'<anden>',docTitle:'Sidetitel',charset:'Tegnsætskode',charsetOther:'Anden tegnsætskode',charsetASCII:'ASCII',charsetCE:'Centraleuropæisk',charsetCT:'Traditionel kinesisk (Big5)',charsetCR:'Kyrillisk',charsetGR:'Græsk',charsetJP:'Japansk',charsetKR:'Koreansk',charsetTR:'Tyrkisk',charsetUN:'Unicode (UTF-8)',charsetWE:'Vesteuropæisk',docType:'Dokumenttype kategori',docTypeOther:'Anden dokumenttype kategori',xhtmlDec:'Inkludere XHTML deklartion',bgColor:'Baggrundsfarve',bgImage:'Baggrundsbillede URL',bgFixed:'Fastlåst baggrund',txtColor:'Tekstfarve',margin:'Sidemargen',marginTop:'Øverst',marginLeft:'Venstre',marginRight:'Højre',marginBottom:'Nederst',metaKeywords:'Dokument index nøgleord (kommasepareret)',metaDescription:'Dokumentbeskrivelse',metaAuthor:'Forfatter',metaCopyright:'Copyright',previewHtml:'<p>Dette er et <strong>eksempel på noget tekst</strong>. Du benytter <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/de.js b/web/imcms/ckeditor/lang/de.js
new file mode 100644
index 0000000000..d00425bbc3
--- /dev/null
+++ b/web/imcms/ckeditor/lang/de.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.de={dir:'ltr',editorTitle:'WYSIWYG-Editor, %1',editorHelp:'Drücken Sie ALT 0 für Hilfe',toolbars:'Editor Symbolleisten',editor:'WYSIWYG-Editor',source:'Quellcode',newPage:'Neue Seite',save:'Speichern',preview:'Vorschau',cut:'Ausschneiden',copy:'Kopieren',paste:'Einfügen',print:'Drucken',underline:'Unterstrichen',bold:'Fett',italic:'Kursiv',selectAll:'Alles auswählen',removeFormat:'Formatierungen entfernen',strike:'Durchgestrichen',subscript:'Tiefgestellt',superscript:'Hochgestellt',horizontalrule:'Horizontale Linie einfügen',pagebreak:'Seitenumbruch einfügen',pagebreakAlt:'Seitenumbruch einfügen',unlink:'Link entfernen',undo:'Rückgängig',redo:'Wiederherstellen',common:{browseServer:'Server durchsuchen',url:'URL',protocol:'Protokoll',upload:'Hochladen',uploadSubmit:'Zum Server senden',image:'Bild',flash:'Flash',form:'Formular',checkbox:'Checkbox',radio:'Radiobutton',textField:'Textfeld einzeilig',textarea:'Textfeld mehrzeilig',hiddenField:'Verstecktes Feld',button:'Klickbutton',select:'Auswahlfeld',imageButton:'Bildbutton',notSet:'<nichts>',id:'ID',name:'Name',langDir:'Schreibrichtung',langDirLtr:'Links nach Rechts (LTR)',langDirRtl:'Rechts nach Links (RTL)',langCode:'Sprachenkürzel',longDescr:'Langform URL',cssClass:'Stylesheet Klasse',advisoryTitle:'Titel Beschreibung',cssStyle:'Style',ok:'OK',cancel:'Abbrechen',close:'Schließen',preview:'Vorschau',generalTab:'Allgemein',advancedTab:'Erweitert',validateNumberFailed:'Dieser Wert ist keine Nummer.',confirmNewPage:'Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?',confirmCancel:'Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?',options:'Optionen',target:'Zielseite',targetNew:'Neues Fenster (_blank)',targetTop:'Oberstes Fenster (_top)',targetSelf:'Gleiches Fenster (_self)',targetParent:'Oberes Fenster (_parent)',langDirLTR:'Links nach Rechts (LNR)',langDirRTL:'Rechts nach Links (RNL)',styles:'Style',cssClasses:'Stylesheet Klasse',width:'Breite',height:'Höhe',align:'Ausrichtung',alignLeft:'Links',alignRight:'Rechts',alignCenter:'Zentriert',alignTop:'Oben',alignMiddle:'Mitte',alignBottom:'Unten',invalidValue:'Invalid value.',invalidHeight:'Höhe muss eine Zahl sein.',invalidWidth:'Breite muss eine Zahl sein.',invalidCssLength:'Wert spezifiziert für "%1" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).',invalidHtmlLength:'Wert spezifiziert für "%1" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).',invalidInlineStyle:'Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format "Name : Wert" getrennt mit Semikolons.',cssLengthTooltip:'Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).',unavailable:'%1<span class="cke_accessibility">, nicht verfügbar</span>'},contextmenu:{options:'Kontextmenü Optionen'},specialChar:{toolbar:'Sonderzeichen einfügen/editieren',title:'Sonderzeichen auswählen',options:'Sonderzeichen Optionen'},link:{toolbar:'Link einfügen/editieren',other:'<andere>',menu:'Link editieren',title:'Link',info:'Link-Info',target:'Zielseite',upload:'Hochladen',advanced:'Erweitert',type:'Link-Typ',toUrl:'URL',toAnchor:'Anker in dieser Seite',toEmail:'E-Mail',targetFrame:'<Frame>',targetPopup:'<Pop-up Fenster>',targetFrameName:'Ziel-Fenster-Name',targetPopupName:'Pop-up Fenster-Name',popupFeatures:'Pop-up Fenster-Eigenschaften',popupResizable:'Größe änderbar',popupStatusBar:'Statusleiste',popupLocationBar:'Adress-Leiste',popupToolbar:'Symbolleiste',popupMenuBar:'Menü-Leiste',popupFullScreen:'Vollbild (IE)',popupScrollBars:'Rollbalken',popupDependent:'Abhängig (Netscape)',popupLeft:'Linke Position',popupTop:'Obere Position',id:'Id',langDir:'Schreibrichtung',langDirLTR:'Links nach Rechts (LTR)',langDirRTL:'Rechts nach Links (RTL)',acccessKey:'Zugriffstaste',name:'Name',langCode:'Sprachenkürzel',tabIndex:'Tab-Index',advisoryTitle:'Titel Beschreibung',advisoryContentType:'Inhaltstyp',cssClasses:'Stylesheet Klasse',charset:'Ziel-Zeichensatz',styles:'Style',rel:'Beziehung',selectAnchor:'Anker auswählen',anchorName:'nach Anker Name',anchorId:'nach Element Id',emailAddress:'E-Mail Adresse',emailSubject:'Betreffzeile',emailBody:'Nachrichtentext',noAnchors:'(keine Anker im Dokument vorhanden)',noUrl:'Bitte geben Sie die Link-URL an',noEmail:'Bitte geben Sie e-Mail Adresse an'},anchor:{toolbar:'Anker einfügen/editieren',menu:'Anker-Eigenschaften',title:'Anker-Eigenschaften',name:'Anker Name',errorName:'Bitte geben Sie den Namen des Ankers ein',remove:'Anker entfernen'},list:{numberedTitle:'Nummerierte Listen-Eigenschaften',bulletedTitle:'Listen-Eigenschaften',type:'Typ',start:'Start',validateStartNumber:'List Startnummer muss eine ganze Zahl sein.',circle:'Ring',disc:'Kreis',square:'Quadrat',none:'Keine',notset:'<nicht gesetzt>',armenian:'Armenisch Nummerierung',georgian:'Georgisch Nummerierung (an, ban, gan, etc.)',lowerRoman:'Klein römisch (i, ii, iii, iv, v, etc.)',upperRoman:'Groß römisch (I, II, III, IV, V, etc.)',lowerAlpha:'Klein alpha (a, b, c, d, e, etc.)',upperAlpha:'Groß alpha (A, B, C, D, E, etc.)',lowerGreek:'Klein griechisch (alpha, beta, gamma, etc.)',decimal:'Dezimal (1, 2, 3, etc.)',decimalLeadingZero:'Dezimal mit führende  Null (01, 02, 03, etc.)'},findAndReplace:{title:'Suchen und Ersetzen',find:'Suchen',replace:'Ersetzen',findWhat:'Suche nach:',replaceWith:'Ersetze mit:',notFoundMsg:'Der gesuchte Text wurde nicht gefunden.',findOptions:'Suchoptionen',matchCase:'Groß-Kleinschreibung beachten',matchWord:'Nur ganze Worte suchen',matchCyclic:'Zyklische Suche',replaceAll:'Alle ersetzen',replaceSuccessMsg:'%1 vorkommen ersetzt.'},table:{toolbar:'Tabelle',title:'Tabellen-Eigenschaften',menu:'Tabellen-Eigenschaften',deleteTable:'Tabelle löschen',rows:'Zeile',columns:'Spalte',border:'Rahmen',widthPx:'Pixel',widthPc:'%',widthUnit:'Breite Einheit',cellSpace:'Zellenabstand außen',cellPad:'Zellenabstand innen',caption:'Überschrift',summary:'Inhaltsübersicht',headers:'Kopfzeile',headersNone:'Keine',headersColumn:'Erste Spalte',headersRow:'Erste Zeile',headersBoth:'Beide',invalidRows:'Die Anzahl der Zeilen muß größer als 0 sein.',invalidCols:'Die Anzahl der Spalten muß größer als 0 sein..',invalidBorder:'Die Rahmenbreite muß eine Zahl sein.',invalidWidth:'Die Tabellenbreite muss eine Zahl sein.',invalidHeight:'Die Tabellenbreite muß eine Zahl sein.',invalidCellSpacing:'Der Zellenabstand außen muß eine positive Zahl sein.',invalidCellPadding:'Der Zellenabstand innen muß eine positive Zahl sein.',cell:{menu:'Zelle',insertBefore:'Zelle davor einfügen',insertAfter:'Zelle danach einfügen',deleteCell:'Zelle löschen',merge:'Zellen verbinden',mergeRight:'Nach rechts verbinden',mergeDown:'Nach unten verbinden',splitHorizontal:'Zelle horizontal teilen',splitVertical:'Zelle vertikal teilen',title:'Zellen-Eigenschaften',cellType:'Zellart',rowSpan:'Anzahl Zeilen verbinden',colSpan:'Anzahl Spalten verbinden',wordWrap:'Zeilenumbruch',hAlign:'Horizontale Ausrichtung',vAlign:'Vertikale Ausrichtung',alignBaseline:'Grundlinie',bgColor:'Hintergrundfarbe',borderColor:'Rahmenfarbe',data:'Daten',header:'Überschrift',yes:'Ja',no:'Nein',invalidWidth:'Zellenbreite muß eine Zahl sein.',invalidHeight:'Zellenhöhe muß eine Zahl sein.',invalidRowSpan:'"Anzahl Zeilen verbinden" muss eine Ganzzahl sein.',invalidColSpan:'"Anzahl Spalten verbinden" muss eine Ganzzahl sein.',chooseColor:'Wählen'},row:{menu:'Zeile',insertBefore:'Zeile oberhalb einfügen',insertAfter:'Zeile unterhalb einfügen',deleteRow:'Zeile entfernen'},column:{menu:'Spalte',insertBefore:'Spalte links davor einfügen',insertAfter:'Spalte rechts danach einfügen',deleteColumn:'Spalte löschen'}},button:{title:'Button-Eigenschaften',text:'Text (Wert)',type:'Typ',typeBtn:'Button',typeSbm:'Absenden',typeRst:'Zurücksetzen'},checkboxAndRadio:{checkboxTitle:'Checkbox-Eigenschaften',radioTitle:'Optionsfeld-Eigenschaften',value:'Wert',selected:'ausgewählt'},form:{title:'Formular-Eigenschaften',menu:'Formular-Eigenschaften',action:'Action',method:'Method',encoding:'Zeichenkodierung'},select:{title:'Auswahlfeld-Eigenschaften',selectInfo:'Info',opAvail:'Mögliche Optionen',value:'Wert',size:'Größe',lines:'Linien',chkMulti:'Erlaube Mehrfachauswahl',opText:'Text',opValue:'Wert',btnAdd:'Hinzufügen',btnModify:'Ändern',btnUp:'Hoch',btnDown:'Runter',btnSetValue:'Setze als Standardwert',btnDelete:'Entfernen'},textarea:{title:'Textfeld (mehrzeilig) Eigenschaften',cols:'Spalten',rows:'Reihen'},textfield:{title:'Textfeld (einzeilig) Eigenschaften',name:'Name',value:'Wert',charWidth:'Zeichenbreite',maxChars:'Max. Zeichen',type:'Typ',typeText:'Text',typePass:'Passwort'},hidden:{title:'Verstecktes Feld-Eigenschaften',name:'Name',value:'Wert'},image:{title:'Bild-Eigenschaften',titleButton:'Bildbutton-Eigenschaften',menu:'Bild-Eigenschaften',infoTab:'Bild-Info',btnUpload:'Zum Server senden',upload:'Hochladen',alt:'Alternativer Text',lockRatio:'Größenverhältnis beibehalten',resetSize:'Größe zurücksetzen',border:'Rahmen',hSpace:'Horizontal-Abstand',vSpace:'Vertikal-Abstand',alertUrl:'Bitte geben Sie die Bild-URL an',linkTab:'Link',button2Img:'Möchten Sie den gewählten Bild-Button in ein einfaches Bild umwandeln?',img2Button:'Möchten Sie das gewählten Bild in einen Bild-Button umwandeln?',urlMissing:'Imagequelle URL fehlt.',validateBorder:'Rahmen muß eine ganze Zahl sein.',validateHSpace:'Horizontal-Abstand muß eine ganze Zahl sein.',validateVSpace:'Vertikal-Abstand muß eine ganze Zahl sein.'},flash:{properties:'Flash-Eigenschaften',propertiesTab:'Eigenschaften',title:'Flash-Eigenschaften',chkPlay:'Automatisch Abspielen',chkLoop:'Endlosschleife',chkMenu:'Flash-Menü aktivieren',chkFull:'Vollbildmodus erlauben',scale:'Skalierung',scaleAll:'Alles anzeigen',scaleNoBorder:'Ohne Rand',scaleFit:'Passgenau',access:'Skript Zugang',accessAlways:'Immer',accessSameDomain:'Gleiche Domain',accessNever:'Nie',alignAbsBottom:'Abs Unten',alignAbsMiddle:'Abs Mitte',alignBaseline:'Baseline',alignTextTop:'Text Oben',quality:'Qualität',qualityBest:'Beste',qualityHigh:'Hoch',qualityAutoHigh:'Auto Hoch',qualityMedium:'Medium',qualityAutoLow:'Auto Niedrig',qualityLow:'Niedrig',windowModeWindow:'Fenster',windowModeOpaque:'Deckend',windowModeTransparent:'Transparent',windowMode:'Fenster Modus',flashvars:'Variablen für Flash',bgcolor:'Hintergrundfarbe',hSpace:'Horizontal-Abstand',vSpace:'Vertikal-Abstand',validateSrc:'Bitte geben Sie die Link-URL an',validateHSpace:'HSpace muss eine Zahl sein.',validateVSpace:'VSpace muss eine Zahl sein.'},spellCheck:{toolbar:'Rechtschreibprüfung',title:'Rechtschreibprüfung',notAvailable:'Entschuldigung, aber dieser Dienst steht im Moment nicht zur Verfügung.',errorLoading:'Fehler beim laden des Dienstanbieters: %s.',notInDic:'Nicht im Wörterbuch',changeTo:'Ändern in',btnIgnore:'Ignorieren',btnIgnoreAll:'Alle Ignorieren',btnReplace:'Ersetzen',btnReplaceAll:'Alle Ersetzen',btnUndo:'Rückgängig',noSuggestions:' - keine Vorschläge - ',progress:'Rechtschreibprüfung läuft...',noMispell:'Rechtschreibprüfung abgeschlossen - keine Fehler gefunden',noChanges:'Rechtschreibprüfung abgeschlossen - keine Worte geändert',oneChange:'Rechtschreibprüfung abgeschlossen - ein Wort geändert',manyChanges:'Rechtschreibprüfung abgeschlossen - %1 Wörter geändert',ieSpellDownload:'Rechtschreibprüfung nicht installiert. Möchten Sie sie jetzt herunterladen?'},smiley:{toolbar:'Smiley',title:'Smiley auswählen',options:'Smiley Optionen'},elementsPath:{eleLabel:'Elements Pfad',eleTitle:'%1 Element'},numberedlist:'Nummerierte Liste',bulletedlist:'Liste',indent:'Einzug erhöhen',outdent:'Einzug verringern',justify:{left:'Linksbündig',center:'Zentriert',right:'Rechtsbündig',block:'Blocksatz'},blockquote:'Zitatblock',clipboard:{title:'Einfügen',cutError:'Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).',copyError:'Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).',pasteMsg:'Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.',securityMsg:'Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.',pasteArea:'Einfügebereich'},pastefromword:{confirmCleanup:'Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?',toolbar:'Aus MS-Word einfügen',title:'Aus MS-Word einfügen',error:'Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen'},pasteText:{button:'Als Text einfügen',title:'Als Text einfügen'},templates:{button:'Vorlagen',title:'Vorlagen',options:'Vorlagen Optionen',insertOption:'Aktuellen Inhalt ersetzen',selectPromptMsg:'Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen (der aktuelle Inhalt wird dabei gelöscht!):',emptyListMsg:'(keine Vorlagen definiert)'},showBlocks:'Blöcke anzeigen',stylesCombo:{label:'Stil',panelTitle:'Formatierungenstil',panelTitle1:'Block Stilart',panelTitle2:'Inline Stilart',panelTitle3:'Objekt Stilart'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatiert',tag_address:'Addresse',tag_h1:'Überschrift 1',tag_h2:'Überschrift 2',tag_h3:'Überschrift 3',tag_h4:'Überschrift 4',tag_h5:'Überschrift 5',tag_h6:'Überschrift 6',tag_div:'Normal (DIV)'},div:{title:'Div Container erzeugen',toolbar:'Div Container erzeugen',cssClassInputLabel:'Stylesheet Klasse',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:'Sprachenkürzel',inlineStyleInputLabel:'Inline Stil',advisoryTitleInputLabel:'Tooltip',langDirLabel:'Sprache Richtung',langDirLTRLabel:'Links nach Rechs (LTR)',langDirRTLLabel:'Rechs nach Links (RTL)',edit:'Div bearbeiten',remove:'Div entfernen'},iframe:{title:'IFrame-Eigenschaften',toolbar:'IFrame',noUrl:'Bitte geben Sie die IFrame-URL an',scrolling:'Rollbalken anzeigen',border:'Rahmen anzeigen'},font:{label:'Schriftart',voiceLabel:'Schriftart',panelTitle:'Schriftart'},fontSize:{label:'Größe',voiceLabel:'Schrifgröße',panelTitle:'Größe'},colorButton:{textColorTitle:'Textfarbe',bgColorTitle:'Hintergrundfarbe',panelTitle:'Farben',auto:'Automatisch',more:'Weitere Farben...'},colors:{'000':'Schwarz',800000:'Kastanienbraun','8B4513':'Braun','2F4F4F':'Dunkles Schiefergrau','008080':'Blaugrün','000080':'Navy','4B0082':'Indigo',696969:'Dunkelgrau',B22222:'Ziegelrot',A52A2A:'Braun',DAA520:'Goldgelb','006400':'Dunkelgrün','40E0D0':'Türkis','0000CD':'Medium Blau',800080:'Lila',808080:'Grau',F00:'Rot',FF8C00:'Dunkelorange',FFD700:'Gold','008000':'Grün','0FF':'Cyan','00F':'Blau',EE82EE:'Hellviolett',A9A9A9:'Dunkelgrau',FFA07A:'Helles Lachsrosa',FFA500:'Orange',FFFF00:'Gelb','00FF00':'Lime',AFEEEE:'Blaß-Türkis',ADD8E6:'Hellblau',DDA0DD:'Pflaumenblau',D3D3D3:'Hellgrau',FFF0F5:'Lavendel',FAEBD7:'Antik Weiß',FFFFE0:'Hellgelb',F0FFF0:'Honigtau',F0FFFF:'Azurblau',F0F8FF:'Alice Blau',E6E6FA:'Lavendel',FFF:'Weiß'},scayt:{title:'Rechtschreibprüfung während der Texteingabe (SCAYT)',opera_title:'Nicht von Opera unterstützt',enable:'SCAYT einschalten',disable:'SCAYT ausschalten',about:'Über SCAYT',toggle:'SCAYT umschalten',options:'Optionen',langs:'Sprachen',moreSuggestions:'Mehr Vorschläge',ignore:'Ignorieren',ignoreAll:'Alle ignorieren',addWord:'Wort hinzufügen',emptyDic:'Wörterbuchname sollte leer sein.',noSuggestions:'keine Vorschläge',optionsTab:'Optionen',allCaps:'Groß geschriebenen Wörter ignorieren',ignoreDomainNames:'Domain-Namen ignorieren',mixedCase:'Wörter mit gemischte Setzkasten ignorieren',mixedWithDigits:'Wörter mit Zahlen ignorieren',languagesTab:'Sprachen',dictionariesTab:'Wörterbücher',dic_field_name:'Wörterbuchname',dic_create:'Erzeugen',dic_restore:'Wiederherstellen',dic_delete:'Löschen',dic_rename:'Umbenennen',dic_info:'Anfangs wird das Benutzerwörterbuch in einem Cookie gespeichert. Allerdings sind Cookies in der Größe begrenzt. Wenn das Benutzerwörterbuch bis zu einem Punkt wächst, wo es nicht mehr in einem Cookie gespeichert werden kann, wird das Benutzerwörterbuch auf dem Server gespeichert. Um Ihr persönliches Wörterbuch auf dem Server zu speichern, müssen Sie einen Namen für das Wörterbuch angeben. Falls  Sie schon ein gespeicherte Wörterbuch haben, geben Sie bitte dessen Namen ein und klicken Sie auf die Schaltfläche Wiederherstellen.',aboutTab:'Über'},about:{title:'Über CKEditor',dlgTitle:'Über CKEditor',help:'Prüfe $1 für Hilfe.',userGuide:'CKEditor Benutzerhandbuch',moreInfo:'Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:',copy:'Copyright &copy; $1. Alle Rechte vorbehalten.'},maximize:'Maximieren',minimize:'Minimieren',fakeobjects:{anchor:'Anker',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Verstecktes Feld',unknown:'Unbekanntes Objekt'},resize:'Zum Vergrößern ziehen',colordialog:{title:'Farbe wählen',options:'Farbeoptionen',highlight:'Hervorheben',selected:'Ausgewählte Farbe',clear:'Entfernen'},toolbarCollapse:'Symbolleiste einklappen',toolbarExpand:'Symbolleiste ausklappen',toolbarGroups:{document:'Dokument',clipboard:'Zwischenablage/Rückgängig',editing:'Editieren',forms:'Formularen',basicstyles:'Grundstile',paragraph:'Absatz',links:'Links',insert:'Einfügen',styles:'Stile',colors:'Farben',tools:'Werkzeuge'},bidi:{ltr:'Leserichtung von Links nach Rechts',rtl:'Leserichtung von Rechts nach Links'},docprops:{label:'Dokument-Eigenschaften',title:'Dokument-Eigenschaften',design:'Design',meta:'Metadaten',chooseColor:'Wählen',other:'<andere>',docTitle:'Seitentitel',charset:'Zeichenkodierung',charsetOther:'Andere Zeichenkodierung',charsetASCII:'ASCII',charsetCE:'Zentraleuropäisch',charsetCT:'traditionell Chinesisch (Big5)',charsetCR:'Kyrillisch',charsetGR:'Griechisch',charsetJP:'Japanisch',charsetKR:'Koreanisch',charsetTR:'Türkisch',charsetUN:'Unicode (UTF-8)',charsetWE:'Westeuropäisch',docType:'Dokumententyp',docTypeOther:'Anderer Dokumententyp',xhtmlDec:'Beziehe XHTML Deklarationen ein',bgColor:'Hintergrundfarbe',bgImage:'Hintergrundbild URL',bgFixed:'feststehender Hintergrund',txtColor:'Textfarbe',margin:'Seitenränder',marginTop:'Oben',marginLeft:'Links',marginRight:'Rechts',marginBottom:'Unten',metaKeywords:'Schlüsselwörter (durch Komma getrennt)',metaDescription:'Dokument-Beschreibung',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>Das ist ein <strong>Beispieltext</strong>. Du schreibst in <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/el.js b/web/imcms/ckeditor/lang/el.js
new file mode 100644
index 0000000000..e91ef9e613
--- /dev/null
+++ b/web/imcms/ckeditor/lang/el.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.el={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Ε�γαλειοθήκες Επεξε�γαστή',editor:'Επεξε�γαστής Πλο�σιου Κειμένου',source:'HTML κώδικας',newPage:'�έα Σελίδα',save:'Αποθήκευση',preview:'Π�οεπισκόπιση',cut:'Αποκοπή',copy:'Αντιγ�αφή',paste:'Επικόλληση',print:'Εκτ�πωση',underline:'Υπογ�άμμιση',bold:'Έντονα',italic:'Πλάγια',selectAll:'Επιλογή όλων',removeFormat:'Αφαί�εση Μο�φοποίησης',strike:'Διαγ�άμμιση',subscript:'Δείκτης',superscript:'Εκθέτης',horizontalrule:'Εισαγωγή Ο�ιζόντιας Γ�αμμής',pagebreak:'Εισαγωγή τέλους σελίδας',pagebreakAlt:'Αλλαγή Σελίδας',unlink:'Αφαί�εση Συνδέσμου (Link)',undo:'Αναί�εση',redo:'Επαναφο�ά',common:{browseServer:'Εξε�ε�νηση διακομιστή',url:'URL',protocol:'Π�ωτόκολλο',upload:'Ανέβασμα',uploadSubmit:'Αποστολή στον Διακομιστή',image:'Εικόνα',flash:'Εισαγωγή Flash',form:'Φό�μα',checkbox:'Κουτί επιλογής',radio:'Κουμπί επιλογής',textField:'Πεδίο κειμένου',textarea:'Πε�ιοχή κειμένου',hiddenField:'Κ�υφό πεδίο',button:'Κουμπί',select:'Πεδίο επιλογής',imageButton:'Κουμπί εικόνας',notSet:'<δεν έχει �υθμιστεί>',id:'Id',name:'Όνομα',langDir:'Κατε�θυνση κειμένου',langDirLtr:'Α�ιστε�ά π�ος Δεξιά (LTR)',langDirRtl:'Δεξιά π�ος Α�ιστε�ά (RTL)',langCode:'Κωδικός Γλώσσας',longDescr:'Αναλυτική πε�ιγ�αφή URL',cssClass:'Stylesheet Classes',advisoryTitle:'Ενδεικτικός τίτλος',cssStyle:'Μο�φή κειμένου',ok:'OK',cancel:'Ακ��ωση',close:'Κλείσιμο',preview:'Π�οεπισκόπηση',generalTab:'Γενικά',advancedTab:'Για π�οχω�ημένους',validateNumberFailed:'Αυτή η τιμή δεν είναι α�ιθμός.',confirmNewPage:'Οι όποιες αλλαγές στο πε�ιεχόμενο θα χαθο�ν. Είσαστε σίγου�οι ότι θέλετε να φο�τώσετε μια νέα σελίδα;',confirmCancel:'Με�ικές επιλογές έχουν αλλάξει. Είσαστε σίγου�οι ότι θέλετε να κλείσετε το πα�άθυ�ο διαλόγου;',options:'Επιλογές',target:'Π�οο�ισμός',targetNew:'�έο Πα�άθυ�ο (_blank)',targetTop:'Α�χική Πε�ιοχή (_top)',targetSelf:'Ίδια Πε�ιοχή (_self)',targetParent:'Γονεϊκό Πα�άθυ�ο (_parent)',langDirLTR:'Α�ιστε�ά π�ος Δεξιά (LTR)',langDirRTL:'Δεξιά π�ος Α�ιστε�ά (RTL)',styles:'Μο�φή',cssClasses:'Stylesheet Classes',width:'Πλάτος',height:'Ύψος',align:'Στοίχιση',alignLeft:'Α�ιστε�ά',alignRight:'Δεξιά',alignCenter:'Κέντ�ο',alignTop:'Πάνω',alignMiddle:'Μέση',alignBottom:'Κάτω',invalidValue:'Invalid value.',invalidHeight:'Το �ψος π�έπει να είναι ένας α�ιθμός.',invalidWidth:'Το πλάτος π�έπει να είναι ένας α�ιθμός.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Επιλογές Αναδυόμενου Μενο�'},specialChar:{toolbar:'Εισαγωγή Ειδικο� Χα�ακτή�α',title:'Επιλέξτε έναν Ειδικό Χα�ακτή�α',options:'Επιλογές Ειδικών Χα�ακτή�ων'},link:{toolbar:'Σ�νδεσμος',other:'<άλλο>',menu:'Επεξε�γασία Συνδέσμου',title:'Σ�νδεσμος',info:'Πλη�οφο�ίες Συνδέσμου',target:'Πα�άθυ�ο Π�οο�ισμο�',upload:'Ανέβασμα',advanced:'Για π�οχω�ημένους',type:'Τ�πος Συνδέσμου',toUrl:'URL',toAnchor:'Άγκυ�α σε αυτή τη σελίδα',toEmail:'E-Mail',targetFrame:'<πλαίσιο>',targetPopup:'<αναδυόμενο πα�άθυ�ο>',targetFrameName:'Όνομα Πα�αθ��ου Π�οο�ισμο�',targetPopupName:'Όνομα Αναδυόμενου Πα�αθ��ου',popupFeatures:'Επιλογές Αναδυόμενου Πα�αθ��ου',popupResizable:'Π�οσα�μοζόμενο Μέγεθος',popupStatusBar:'Γ�αμμή Κατάστασης',popupLocationBar:'Γ�αμμή Τοποθεσίας',popupToolbar:'Ε�γαλειοθήκη',popupMenuBar:'Γ�αμμή Επιλογών',popupFullScreen:'Πλή�ης Οθόνη (IE)',popupScrollBars:'Μπά�ες Κ�λισης',popupDependent:'Εξα�τημένο (Netscape)',popupLeft:'Θέση Α�ιστε�ά',popupTop:'Θέση Πάνω',id:'Id',langDir:'Κατε�θυνση Κειμένου',langDirLTR:'Α�ιστε�ά π�ος Δεξιά (LTR)',langDirRTL:'Δεξιά π�ος Α�ιστε�ά (RTL)',acccessKey:'Συντόμευση',name:'Όνομα',langCode:'Κατε�θυνση Κειμένου',tabIndex:'Σει�ά Μεταπήδησης',advisoryTitle:'Ενδεικτικός Τίτλος',advisoryContentType:'Ενδεικτικός Τ�πος Πε�ιεχομένου',cssClasses:'Stylesheet Classes',charset:'Κωδικοποίηση Χα�ακτή�ων Π�οσα�τημένης Πηγής',styles:'Μο�φή',rel:'Σχέση',selectAnchor:'Επιλέξτε μια άγκυ�α',anchorName:'Βάσει του Ονόματος της άγκυ�ας',anchorId:'Βάσει του Element Id',emailAddress:'Διε�θυνση e-mail',emailSubject:'Θέμα Μην�ματος',emailBody:'Κείμενο Μην�ματος',noAnchors:'(Δεν υπά�χουν άγκυ�ες στο κείμενο)',noUrl:'Εισάγετε την τοποθεσία (URL) του υπε�συνδέσμου (Link)',noEmail:'Εισάγετε την διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου'},anchor:{toolbar:'Εισαγωγή/επεξε�γασία Άγκυ�ας',menu:'Ιδιότητες άγκυ�ας',title:'Ιδιότητες άγκυ�ας',name:'Όνομα άγκυ�ας',errorName:'Πα�ακαλο�με εισάγετε όνομα άγκυ�ας',remove:'Αφαί�εση Άγκυ�ας'},list:{numberedTitle:'Ιδιότητες Α�ιθμημένης Λίστας ',bulletedTitle:'Ιδιότητες Λίστας Σημείων',type:'Τ�πος',start:'Εκκίνηση',validateStartNumber:'Ο α�ιθμός εκκίνησης της α�ίθμησης π�έπει να είναι ακέ�αιος α�ιθμός.',circle:'Κ�κλος',disc:'Δίσκος',square:'Τετ�άγωνο',none:'Τίποτα',notset:'<δεν έχει ο�ιστεί>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Δεκαδικός (1, 2, 3, κτλ)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Αναζήτηση και Αντικατάσταση',find:'Αναζήτηση',replace:'Αντικατάσταση',findWhat:'Αναζήτηση για:',replaceWith:'Αντικατάσταση με:',notFoundMsg:'Το κείμενο δεν β�έθηκε.',findOptions:'Find Options',matchCase:'Έλεγχος πεζών/κεφαλαίων',matchWord:'Ε��εση πλή�ους λέξης',matchCyclic:'Match cyclic',replaceAll:'Αντικατάσταση Όλων',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Πίνακας',title:'Ιδιότητες Πίνακα',menu:'Ιδιότητες Πίνακα',deleteTable:'Διαγ�αφή πίνακα',rows:'Γ�αμμές',columns:'Κολώνες',border:'Πάχος Πε�ιγ�άμματος',widthPx:'pixels',widthPc:'τοις εκατό',widthUnit:'μονάδα πλάτους',cellSpace:'Διάστημα κελιών',cellPad:'Γέμισμα κελιών',caption:'Λεζάντα',summary:'Πε�ίληψη',headers:'Κεφαλίδες',headersNone:'Κανένα',headersColumn:'Π�ώτη Στήλη',headersRow:'Π�ώτη Σει�ά',headersBoth:'Και τα δ�ο',invalidRows:'Ο α�ιθμός των σει�ών π�έπει να είναι μεγαλ�τε�ος από 0.',invalidCols:'Ο α�ιθμός των στηλών π�έπει να είναι μεγαλ�τε�ος από 0.',invalidBorder:'Το πάχος του πε�ιγ�άμματος π�έπει να είναι ένας α�ιθμός.',invalidWidth:'Το πλάτος του πίνακα π�έπει να είναι ένας α�ιθμός.',invalidHeight:'Το �ψος του πίνακα π�έπει να είναι ένας α�ιθμός.',invalidCellSpacing:'Η απόσταση μεταξ� των κελιών π�έπει να είναι ένας θετικός α�ιθμός.',invalidCellPadding:'Το γέμισμα μέσα στα κελιά π�έπει να είναι ένας θετικός α�ιθμός.',cell:{menu:'Κελί',insertBefore:'Εισαγωγή Κελιο� Π�ιν',insertAfter:'Εισαγωγή Κελιο� Μετά',deleteCell:'Διαγ�αφή Κελιών',merge:'Ενοποίηση Κελιών',mergeRight:'Συγχώνευση Με Δεξιά',mergeDown:'Συγχώνευση Με Κάτω',splitHorizontal:'Ο�ιζόντιο Μοί�ασμα Κελιο�',splitVertical:'Κατακό�υφο Μοί�ασμα Κελιο�',title:'Ιδιότητες Κελιο�',cellType:'Τ�πος Κελιο�',rowSpan:'Ε��ος Σει�ών',colSpan:'Ε��ος Στηλών',wordWrap:'Word Wrap',hAlign:'Ο�ιζόντια Στοίχιση',vAlign:'Κάθετη Στοίχιση',alignBaseline:'Baseline',bgColor:'Χ�ώμα Φόντου',borderColor:'Χ�ώμα Πε�ιγ�άμματος',data:'Δεδομένα',header:'Κεφαλίδα',yes:'�αι',no:'Όχι',invalidWidth:'Το πλάτος του κελιο� π�έπει να είναι ένας α�ιθμός.',invalidHeight:'Το �ψος του κελιο� π�έπει να είναι ένας α�ιθμός.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Επιλέξτε'},row:{menu:'Σει�ά',insertBefore:'Εισαγωγή Σει�άς Από Πάνω',insertAfter:'Εισαγωγή Σει�άς Από Κάτω',deleteRow:'Διαγ�αφή Γ�αμμών'},column:{menu:'Στήλη',insertBefore:'Εισαγωγή Στήλης Π�ιν',insertAfter:'Εισαγωγή Σει�άς Μετά',deleteColumn:'Διαγ�αφή Κολωνών'}},button:{title:'Ιδιότητες Κουμπιο�',text:'Κείμενο (Τιμή)',type:'Τ�πος',typeBtn:'Κουμπί',typeSbm:'Υποβολή',typeRst:'Επαναφο�ά'},checkboxAndRadio:{checkboxTitle:'Ιδιότητες Κουτιο� Επιλογής',radioTitle:'Ιδιότητες Κουμπιο� Επιλογής',value:'Τιμή',selected:'Επιλεγμένο'},form:{title:'Ιδιότητες Φό�μας',menu:'Ιδιότητες Φό�μας',action:'Δ�άση',method:'Μέθοδος',encoding:'Κωδικοποίηση'},select:{title:'Ιδιότητες Πεδίου Επιλογής',selectInfo:'Πλη�οφο�ίες Πεδίου Επιλογής',opAvail:'Διαθέσιμες Επιλογές',value:'Τιμή',size:'Μέγεθος',lines:'γ�αμμές',chkMulti:'�α επιτ�έπονται οι πολλαπλές επιλογές',opText:'Κείμενο',opValue:'Τιμή',btnAdd:'Π�οσθήκη',btnModify:'Τ�οποποίηση',btnUp:'Πάνω',btnDown:'Κάτω',btnSetValue:'Π�οεπιλογή',btnDelete:'Διαγ�αφή'},textarea:{title:'Ιδιότητες Πε�ιοχής Κειμένου',cols:'Στήλες',rows:'Σει�ές'},textfield:{title:'Ιδιότητες Πεδίου Κειμένου',name:'Όνομα',value:'Τιμή',charWidth:'Πλάτος Χα�ακτή�ων',maxChars:'Μέγιστοι χα�ακτή�ες',type:'Τ�πος',typeText:'Κείμενο',typePass:'Κωδικός'},hidden:{title:'Ιδιότητες Κ�υφο� Πεδίου',name:'Όνομα',value:'Τιμή'},image:{title:'Ιδιότητες Εικόνας',titleButton:'Ιδιότητες Κουμπιο� Εικόνας',menu:'Ιδιότητες Εικόνας',infoTab:'Πλη�οφο�ίες Εικόνας',btnUpload:'Αποστολή στον Διακομιστή',upload:'Ανέβασμα',alt:'Εναλλακτικό Κείμενο',lockRatio:'Κλείδωμα Αναλογίας',resetSize:'Επαναφο�ά Α�χικο� Μεγέθους',border:'Πε�ίγ�αμμα',hSpace:'Ο�ιζόντιο Διάστημα',vSpace:'Κάθετο Διάστημα',alertUrl:'Εισάγετε την τοποθεσία (URL) της εικόνας',linkTab:'Σ�νδεσμος',button2Img:'Θέλετε να μετατ�έψετε το επιλεγμένο κουμπί εικόνας σε απλή εικόνα;',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Ιδιότητες Flash',propertiesTab:'Ιδιότητες',title:'Ιδιότητες Flash',chkPlay:'Αυτόματη Εκτέλεση',chkLoop:'Επανάληψη',chkMenu:'Ενε�γοποίηση Flash Menu',chkFull:'Allow Fullscreen',scale:'Μεγέθυνση',scaleAll:'Εμφάνιση όλων',scaleNoBorder:'Χω�ίς Πε�ίγ�αμμα',scaleFit:'Ακ�ιβές Μέγεθος',access:'Script Access',accessAlways:'Πάντα',accessSameDomain:'Same domain',accessNever:'Ποτέ',alignAbsBottom:'Απόλυτα Κάτω',alignAbsMiddle:'Απόλυτα στη Μέση',alignBaseline:'Γ�αμμή Βάσης',alignTextTop:'Κο�υφή Κειμένου',quality:'Ποιότητα',qualityBest:'Καλ�τε�η',qualityHigh:'Υψηλή',qualityAutoHigh:'Αυτόματη Υψηλή',qualityMedium:'Μεσαία',qualityAutoLow:'Αυτόματη Χαμηλή',qualityLow:'Χαμηλή',windowModeWindow:'Πα�άθυ�ο',windowModeOpaque:'Συμπαγές',windowModeTransparent:'Διάφανο',windowMode:'Window mode',flashvars:'Μεταβλητές για Flash',bgcolor:'Χ�ώμα Υποβάθ�ου',hSpace:'Ο�ιζόντιο Διάστημα',vSpace:'Κάθετο Διάστημα',validateSrc:'Εισάγετε την τοποθεσία (URL) του υπε�συνδέσμου (Link)',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Ο�θογ�αφικός Έλεγχος',title:'Ο�θογ�αφικός Έλεγχος',notAvailable:'Η υπη�εσία δεν είναι διαθέσιμη αυτήν την στιγμή.',errorLoading:'Error loading application service host: %s.',notInDic:'Δεν υπά�χει στο λεξικό',changeTo:'Αλλαγή σε',btnIgnore:'Αγνόηση',btnIgnoreAll:'Αγνόηση όλων',btnReplace:'Αντικατάσταση',btnReplaceAll:'Αντικατάσταση όλων',btnUndo:'Αναί�εση',noSuggestions:'- Δεν υπά�χουν π�οτάσεις -',progress:'Γίνεται ο�θογ�αφικός έλεγχος...',noMispell:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: Δεν β�έθηκαν λάθη',noChanges:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: Δεν άλλαξαν λέξεις',oneChange:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: Άλλαξε μια λέξη',manyChanges:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: Άλλαξαν %1 λέξεις',ieSpellDownload:'Δεν υπά�χει εγκατεστημένος ο�θογ�άφος. Θέλετε να τον κατεβάσετε τώ�α;'},smiley:{toolbar:'Smiley',title:'Επιλέξτε ένα Smiley',options:'Επιλογές Smiley'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 στοιχείο'},numberedlist:'Εισαγωγή/Απομάκ�υνση Α�ιθμημένης Λίστας',bulletedlist:'Εισαγωγή/Απομάκ�υνση Λίστας Κουκκίδων',indent:'Α�ξηση Εσοχής',outdent:'Μείωση Εσοχής',justify:{left:'Στοίχιση Α�ιστε�ά',center:'Στοίχιση στο Κέντ�ο',right:'Στοίχιση Δεξιά',block:'Πλή�ης Στοίχιση'},blockquote:'Πε�ιοχή Πα�άθεσης',clipboard:{title:'Επικόλληση',cutError:'Οι �υθμίσεις ασφαλείας του φυλλομετ�ητή σας δεν επιτ�έπουν την επιλεγμένη ε�γασία αποκοπής. Χ�ησιμοποιείστε το πληκτ�ολόγιο (Ctrl/Cmd+X).',copyError:'Οι �υθμίσεις ασφαλείας του φυλλομετ�ητή σας δεν επιτ�έπουν την επιλεγμένη ε�γασία αντιγ�αφής. Χ�ησιμοποιείστε το πληκτ�ολόγιο (Ctrl/Cmd+C).',pasteMsg:'Πα�ακαλώ επικολήστε στο ακόλουθο κουτί χ�ησιμοποιόντας το πληκτ�ολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Επικόλληση από το Word',title:'Επικόλληση από το Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Επικόλληση ως Απλό Κείμενο',title:'Επικόλληση ως Απλό Κείμενο'},templates:{button:'Π�ότυπα',title:'Π�ότυπα Πε�ιεχομένου',options:'Template Options',insertOption:'Αντικατάσταση υπά�χοντων πε�ιεχομένων',selectPromptMsg:'Πα�ακαλώ επιλέξτε π�ότυπο για εισαγωγή στο π�όγ�αμμα',emptyListMsg:'(Δεν έχουν καθο�ιστεί π�ότυπα)'},showBlocks:'Π�οβολή Πε�ιοχών',stylesCombo:{label:'Μο�φές',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Μο�φοποίηση',panelTitle:'Μο�φοποίηση Πα�αγ�άφου',tag_p:'Κανονικό',tag_pre:'Μο�φοποιημένο',tag_address:'Διε�θυνση',tag_h1:'Επικεφαλίδα 1',tag_h2:'Επικεφαλίδα 2',tag_h3:'Επικεφαλίδα 3',tag_h4:'Επικεφαλίδα 4',tag_h5:'Επικεφαλίδα 5',tag_h6:'Επικεφαλίδα 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Ενε�γοποίηση μπα�ών κ�λισης',border:'Show frame border'},font:{label:'Γ�αμματοσει�ά',voiceLabel:'Γ�αμματοσει�ά',panelTitle:'Όνομα Γ�αμματοσει�άς'},fontSize:{label:'Μέγεθος',voiceLabel:'Μέγεθος γ�αμματοσει�άς',panelTitle:'Μέγεθος Γ�αμματοσει�άς'},colorButton:{textColorTitle:'Χ�ώμα Κειμένου',bgColorTitle:'Χ�ώμα Φόντου',panelTitle:'Χ�ώματα',auto:'Αυτόματα',more:'Πε�ισσότε�α χ�ώματα...'},colors:{'000':'Μα��ο',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Μώβ',808080:'Γκ�ί',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Επιλογές',langs:'Γλώσσες',moreSuggestions:'Πε�ισσότε�ες π�οτάσεις',ignore:'Αγνόησε το',ignoreAll:'�α αγνοηθο�ν όλα',addWord:'Π�οσθήκη στο λεξικό',emptyDic:'Το όνομα του λεξικο� δεν π�έπει να είναι κενό.',noSuggestions:'No suggestions',optionsTab:'Επιλογές',allCaps:'�α αγνοο�νται όλες οι λέξεις σε κεφαλαία',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Γλώσσες',dictionariesTab:'Λεξικά',dic_field_name:'Όνομα λεξικο�',dic_create:'Δημιου�γία',dic_restore:'Ανάκτηση',dic_delete:'Διαγ�αφή',dic_rename:'Μετονομασία',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'Πε�ί'},about:{title:'Πε�ί του CKEditor',dlgTitle:'Πε�ί του CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Μεγιστοποίηση',minimize:'Ελαχιστοποίηση',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Άγνωστο Αντικείμενο'},resize:'Σ��σιμο για αλλαγή μεγέθους',colordialog:{title:'Επιλογή Χ�ώματος',options:'Επιλογές Χ�ωμάτων',highlight:'Highlight',selected:'Επιλεγμένο Χ�ώμα',clear:'Καθα�ισμός'},toolbarCollapse:'Σ�μπτηξη Ε�γαλειοθήκης',toolbarExpand:'Ανάπτυξη Ε�γαλειοθήκης',toolbarGroups:{document:'Έγγ�αφο',clipboard:'Clipboard/Undo',editing:'Σε επεξε�γασία',forms:'Φό�μες',basicstyles:'Βασικά στυλ',paragraph:'Πα�άγ�αφος',links:'Συνδέσμοι',insert:'Εισαγωγή',styles:'Στυλ',colors:'Χ�ώματα',tools:'Ε�γαλεία'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Ιδιότητες Εγγ�άφου',title:'Ιδιότητες Εγγ�άφου',design:'Design',meta:'Δεδομένα Meta',chooseColor:'Choose',other:'Άλλο...',docTitle:'Τίτλος Σελίδας',charset:'Κωδικοποίηση Χα�ακτή�ων',charsetOther:'Άλλη Κωδικοποίηση Χα�ακτή�ων',charsetASCII:'ASCII',charsetCE:'Κεντ�ικής Ευ�ώπης',charsetCT:'Πα�αδοσιακά κινέζικα (Big5)',charsetCR:'Κυ�ιλλική',charsetGR:'Ελληνική',charsetJP:'Ιαπωνική',charsetKR:'Κο�εάτικη',charsetTR:'Του�κική',charsetUN:'Διεθνής (UTF-8)',charsetWE:'Δυτικής Ευ�ώπης',docType:'Επικεφαλίδα τ�που εγγ�άφου',docTypeOther:'Άλλη επικεφαλίδα τ�που εγγ�άφου',xhtmlDec:'�α συμπε�ιληφθο�ν οι δηλώσεις XHTML',bgColor:'Χ�ώμα φόντου',bgImage:'Διε�θυνση εικόνας φόντου',bgFixed:'Φόντο χω�ίς κ�λιση',txtColor:'Χ�ώμα Γ�αμμάτων',margin:'Πε�ιθώ�ια σελίδας',marginTop:'Κο�υφή',marginLeft:'Α�ιστε�ά',marginRight:'Δεξιά',marginBottom:'Κάτω',metaKeywords:'Λέξεις κλειδιά δείκτες εγγ�άφου (διαχω�ισμός με κόμμα)',metaDescription:'Πε�ιγ�αφή εγγ�άφου',metaAuthor:'Συγγ�αφέας',metaCopyright:'Πνευματικά Δικαιώματα',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/en-au.js b/web/imcms/ckeditor/lang/en-au.js
new file mode 100644
index 0000000000..0115d3c98b
--- /dev/null
+++ b/web/imcms/ckeditor/lang/en-au.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['en-au']={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Align',alignLeft:'Left',alignRight:'Right',alignCenter:'Centre',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a number.',invalidCellPadding:'Cell padding must be a number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background colour',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Centre',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Colour',bgColorTitle:'Background Colour',panelTitle:'Colors',auto:'Automatic',more:'More Colours...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/en-ca.js b/web/imcms/ckeditor/lang/en-ca.js
new file mode 100644
index 0000000000..39bbab21f8
--- /dev/null
+++ b/web/imcms/ckeditor/lang/en-ca.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['en-ca']={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Align',alignLeft:'Left',alignRight:'Right',alignCenter:'Centre',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a number.',invalidCellPadding:'Cell padding must be a number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background colour',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Centre',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Colour',bgColorTitle:'Background Colour',panelTitle:'Colors',auto:'Automatic',more:'More Colours...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/en-gb.js b/web/imcms/ckeditor/lang/en-gb.js
new file mode 100644
index 0000000000..cc3d3d12dd
--- /dev/null
+++ b/web/imcms/ckeditor/lang/en-gb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['en-gb']={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Align',alignLeft:'Left',alignRight:'Right',alignCenter:'Centre',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a number.',invalidCellPadding:'Cell padding must be a number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background colour',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Centre',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Colour',bgColorTitle:'Background Colour',panelTitle:'Colours',auto:'Automatic',more:'More Colours...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Grey','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Grey',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Grey',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Grey',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximise',minimize:'Minimise',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select colour',options:'Colour Options',highlight:'Highlight',selected:'Selected Colour',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/en.js b/web/imcms/ckeditor/lang/en.js
new file mode 100644
index 0000000000..ff4cd811f8
--- /dev/null
+++ b/web/imcms/ckeditor/lang/en.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.en={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Alignment',alignLeft:'Left',alignRight:'Right',alignCenter:'Center',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background color',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Center',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Color',bgColorTitle:'Background Color',panelTitle:'Colors',auto:'Automatic',more:'More Colors...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/eo.js b/web/imcms/ckeditor/lang/eo.js
new file mode 100644
index 0000000000..fa3b4e89f1
--- /dev/null
+++ b/web/imcms/ckeditor/lang/eo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.eo={dir:'ltr',editorTitle:'riĉteksta redaktilo, %1',editorHelp:'Premu ALT 0 por helpilo',toolbars:'Ilobretoj de la redaktilo',editor:'Redaktilo por Riĉiga Teksto',source:'Fonto',newPage:'Nova Pa�o',save:'Konservi',preview:'Vidigi Aspekton',cut:'Eltondi',copy:'Kopii',paste:'Interglui',print:'Presi',underline:'Substreko',bold:'Grasa',italic:'Kursiva',selectAll:'Elekti ĉion',removeFormat:'Forigi Formaton',strike:'Trastreko',subscript:'Suba indico',superscript:'Supra indico',horizontalrule:'Enmeti Horizontalan Linion',pagebreak:'Enmeti Pa�avancon por Presado',pagebreakAlt:'Pa�avanco',unlink:'Forigi Ligilon',undo:'Malfari',redo:'Refari',common:{browseServer:'Foliumi en la Servilo',url:'URL',protocol:'Protokolo',upload:'Al�uti',uploadSubmit:'Sendu al Servilo',image:'Bildo',flash:'Fla�o',form:'Formularo',checkbox:'Markobutono',radio:'Radiobutono',textField:'Teksta kampo',textarea:'Teksta Areo',hiddenField:'Ka�ita Kampo',button:'Butono',select:'Elekta Kampo',imageButton:'Bildbutono',notSet:'<Defaŭlta>',id:'Id',name:'Nomo',langDir:'Skribdirekto',langDirLtr:'De maldekstro dekstren (LTR)',langDirRtl:'De dekstro maldekstren (RTL)',langCode:'Lingva Kodo',longDescr:'URL de Longa Priskribo',cssClass:'Klasoj de Stilfolioj',advisoryTitle:'Priskriba Titolo',cssStyle:'Stilo',ok:'Akcepti',cancel:'Rezigni',close:'Fermi',preview:'Vidigi Aspekton',generalTab:'Ĝenerala',advancedTab:'Speciala',validateNumberFailed:'Tiu valoro ne estas nombro.',confirmNewPage:'La neregistritaj �an�oj estas perdotaj. Ĉu vi certas, ke vi volas �argi novan pa�on?',confirmCancel:'Iuj opcioj esta �an�itaj. Ĉu vi certas, ke vi volas fermi la dialogon?',options:'Opcioj',target:'Celo',targetNew:'Nova Fenestro (_blank)',targetTop:'Supra Fenestro (_top)',targetSelf:'Sama Fenestro (_self)',targetParent:'Patra Fenestro (_parent)',langDirLTR:'De maldekstro dekstren (LTR)',langDirRTL:'De dekstro maldekstren (RTL)',styles:'Stilo',cssClasses:'Stilfoliaj Klasoj',width:'Lar�o',height:'Alto',align:'Ĝisrandigo',alignLeft:'Maldekstre',alignRight:'Dekstre',alignCenter:'Centre',alignTop:'Supre',alignMiddle:'Centre',alignBottom:'Malsupre',invalidValue:'Nevalida Valoro',invalidHeight:'Alto devas esti nombro.',invalidWidth:'Lar�o devas esti nombro.',invalidCssLength:'La valoro indikita por la "%1" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'La valoro indikita por la "%1" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).',invalidInlineStyle:'La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de "nomo : valoro", apartigitaj per punktokomoj.',cssLengthTooltip:'Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nehavebla</span>'},contextmenu:{options:'Opcioj de Kunteksta Menuo'},specialChar:{toolbar:'Enmeti Specialan Signon',title:'Selekti Specialan Signon',options:'Opcioj pri Specialaj Signoj'},link:{toolbar:'Enmeti/Ŝan�i Ligilon',other:'<alia>',menu:'Ŝan�i Ligilon',title:'Ligilo',info:'Informoj pri la Ligilo',target:'Celo',upload:'Al�uti',advanced:'Speciala',type:'Tipo de Ligilo',toUrl:'URL',toAnchor:'Ankri en tiu ĉi pa�o',toEmail:'Retpo�to',targetFrame:'<kadro>',targetPopup:'<�prucfenestro>',targetFrameName:'Nomo de CelKadro',targetPopupName:'Nomo de Ŝprucfenestro',popupFeatures:'Atributoj de la Ŝprucfenestro',popupResizable:'Dimensi�an�ebla',popupStatusBar:'Statobreto',popupLocationBar:'Adresobreto',popupToolbar:'Ilobreto',popupMenuBar:'Menubreto',popupFullScreen:'Tutekrane (IE)',popupScrollBars:'Rulumskaloj',popupDependent:'Dependa (Netscape)',popupLeft:'Maldekstra Pozicio',popupTop:'Supra Pozicio',id:'Id',langDir:'Skribdirekto',langDirLTR:'De maldekstro dekstren (LTR)',langDirRTL:'De dekstro maldekstren (RTL)',acccessKey:'Fulmoklavo',name:'Nomo',langCode:'Lingva Kodo',tabIndex:'Taba Indekso',advisoryTitle:'Priskriba Titolo',advisoryContentType:'Enhavotipo',cssClasses:'Klasoj de Stilfolioj',charset:'Signaro de la Ligita Rimedo',styles:'Stilo',rel:'Rilato',selectAnchor:'Elekti Ankron',anchorName:'Per Ankronomo',anchorId:'Per Elementidentigilo',emailAddress:'Retpo�to',emailSubject:'Mesa�a Temo',emailBody:'Mesa�a korpo',noAnchors:'<Ne disponeblas ankroj en la dokumento>',noUrl:'Bonvolu entajpi la URL-on',noEmail:'Bonvolu entajpi la retpo�tadreson'},anchor:{toolbar:'Ankro',menu:'Enmeti/Ŝan�i Ankron',title:'Ankraj Atributoj',name:'Ankra Nomo',errorName:'Bv entajpi la ankran nomon',remove:'Forigi Ankron'},list:{numberedTitle:'Atributoj de Numera Listo',bulletedTitle:'Atributoj de Bula Listo',type:'Tipo',start:'Komenco',validateStartNumber:'La unua listero devas esti entjera nombro.',circle:'Cirklo',disc:'Disko',square:'kvadrato',none:'Neniu',notset:'<Defaŭlta>',armenian:'Armena nombrado',georgian:'Gruza nombrado (an, ban, gan, ktp.)',lowerRoman:'Minusklaj Romanaj Nombroj (i, ii, iii, iv, v, ktp.)',upperRoman:'Majusklaj Romanaj Nombroj (I, II, III, IV, V, ktp.)',lowerAlpha:'Minusklaj Literoj (a, b, c, d, e, ktp.)',upperAlpha:'Majusklaj Literoj (A, B, C, D, E, ktp.)',lowerGreek:'Grekaj Minusklaj Literoj (alpha, beta, gamma, ktp.)',decimal:'Dekumaj Nombroj (1, 2, 3, ktp.)',decimalLeadingZero:'Dekumaj Nombroj malantaŭ nulo (01, 02, 03, ktp.)'},findAndReplace:{title:'Serĉi kaj Anstataŭigi',find:'Serĉi',replace:'Anstataŭigi',findWhat:'Serĉi:',replaceWith:'Anstataŭigi per:',notFoundMsg:'La celteksto ne estas trovita.',findOptions:'Opcioj pri Serĉado',matchCase:'Kongruigi Usklecon',matchWord:'Tuta Vorto',matchCyclic:'Cikla Serĉado',replaceAll:'Anstataŭigi Ĉion',replaceSuccessMsg:'%1 anstataŭigita(j) apero(j).'},table:{toolbar:'Tabelo',title:'Atributoj de Tabelo',menu:'Atributoj de Tabelo',deleteTable:'Forigi Tabelon',rows:'Linioj',columns:'Kolumnoj',border:'Bordero',widthPx:'Rastrumeroj',widthPc:'elcentoj',widthUnit:'unuo de lar�o',cellSpace:'Spaco inter la Ĉeloj',cellPad:'Interna Mar�eno de la ĉeloj',caption:'Tabeltitolo',summary:'Resumo',headers:'Supraj Pa�otitoloj',headersNone:'Neniu',headersColumn:'Unua kolumno',headersRow:'Unua linio',headersBoth:'Ambaŭ',invalidRows:'La nombro de la linioj devas superi 0.',invalidCols:'La nombro de la kolumnoj devas superi 0.',invalidBorder:'La bordergrando devas esti nombro.',invalidWidth:'La tabellar�o devas esti nombro.',invalidHeight:'La tabelalto devas esti nombro.',invalidCellSpacing:'La spaco inter la ĉeloj devas esti pozitiva nombro.',invalidCellPadding:'La interna mar�eno en la ĉeloj devas esti pozitiva nombro.',cell:{menu:'Ĉelo',insertBefore:'Enmeti Ĉelon Antaŭ',insertAfter:'Enmeti Ĉelon Post',deleteCell:'Forigi la Ĉelojn',merge:'Kunfandi la Ĉelojn',mergeRight:'Kunfandi dekstren',mergeDown:'Kunfandi malsupren ',splitHorizontal:'Horizontale dividi',splitVertical:'Vertikale dividi',title:'Ĉelatributoj',cellType:'Ĉeltipo',rowSpan:'Kunfando de linioj',colSpan:'Kunfando de kolumnoj',wordWrap:'Cezuro',hAlign:'Horizontala �israndigo',vAlign:'Vertikala �israndigo',alignBaseline:'Malsupro de la teksto',bgColor:'Fonkoloro',borderColor:'Borderkoloro',data:'Datenoj',header:'Supra pa�otitolo',yes:'Jes',no:'No',invalidWidth:'Ĉellar�o devas esti nombro.',invalidHeight:'Ĉelalto devas esti nombro.',invalidRowSpan:'Kunfando de linioj devas esti entjera nombro.',invalidColSpan:'Kunfando de kolumnoj devas esti entjera nombro.',chooseColor:'Elektu'},row:{menu:'Linio',insertBefore:'Enmeti linion antaŭ',insertAfter:'Enmeti linion post',deleteRow:'Forigi Liniojn'},column:{menu:'Kolumno',insertBefore:'Enmeti kolumnon antaŭ',insertAfter:'Enmeti kolumnon post',deleteColumn:'Forigi Kolumnojn'}},button:{title:'Butonaj atributoj',text:'Teksto (Valoro)',type:'Tipo',typeBtn:'Butono',typeSbm:'Validigi (submit)',typeRst:'Remeti en la originstaton (Reset)'},checkboxAndRadio:{checkboxTitle:'Markobutonaj Atributoj',radioTitle:'Radiobutonaj Atributoj',value:'Valoro',selected:'Selektita'},form:{title:'Formularaj Atributoj',menu:'Formularaj Atributoj',action:'Ago',method:'Metodo',encoding:'Kodoprezento'},select:{title:'Atributoj de Elekta Kampo',selectInfo:'Informoj pri la rulummenuo',opAvail:'Elektoj Disponeblaj',value:'Valoro',size:'Grando',lines:'Linioj',chkMulti:'Permesi Plurajn Elektojn',opText:'Teksto',opValue:'Valoro',btnAdd:'Aldoni',btnModify:'Modifi',btnUp:'Supren',btnDown:'Malsupren',btnSetValue:'Agordi kiel Elektitan Valoron',btnDelete:'Forigi'},textarea:{title:'Atributoj de Teksta Areo',cols:'Kolumnoj',rows:'Linioj'},textfield:{title:'Atributoj de Teksta Kampo',name:'Nomo',value:'Valoro',charWidth:'Signolar�o',maxChars:'Maksimuma Nombro da Signoj',type:'Tipo',typeText:'Teksto',typePass:'Pasvorto'},hidden:{title:'Atributoj de Ka�ita Kampo',name:'Nomo',value:'Valoro'},image:{title:'Atributoj de Bildo',titleButton:'Bildbutonaj Atributoj',menu:'Atributoj de Bildo',infoTab:'Informoj pri Bildo',btnUpload:'Sendu al Servilo',upload:'Al�uti',alt:'Anstataŭiga Teksto',lockRatio:'Konservi Proporcion',resetSize:'Origina Grando',border:'Bordero',hSpace:'Horizontala Spaco',vSpace:'Vertikala Spaco',alertUrl:'Bonvolu tajpi la retadreson de la bildo',linkTab:'Ligilo',button2Img:'Ĉu vi volas transformi la selektitan bildbutonon en simplan bildon?',img2Button:'Ĉu vi volas transformi la selektitan bildon en bildbutonon?',urlMissing:'La fontretadreso de la bildo mankas.',validateBorder:'La bordero devas esti entjera nombro.',validateHSpace:'La horizontala spaco devas esti entjera nombro.',validateVSpace:'La vertikala spaco devas esti entjera nombro.'},flash:{properties:'Fla�atributoj',propertiesTab:'Atributoj',title:'Fla�atributoj',chkPlay:'Aŭtomata legado',chkLoop:'Iteracio',chkMenu:'Ebligi fla�menuon',chkFull:'Permesi tutekranon',scale:'Skalo',scaleAll:'Montri ĉion',scaleNoBorder:'Neniu bordero',scaleFit:'Origina grando',access:'Atingi skriptojn',accessAlways:'Ĉiam',accessSameDomain:'Sama domajno',accessNever:'Neniam',alignAbsBottom:'Absoluta Malsupro',alignAbsMiddle:'Absoluta Centro',alignBaseline:'TekstoMalsupro',alignTextTop:'TekstoSupro',quality:'Kvalito',qualityBest:'Plej bona',qualityHigh:'Alta',qualityAutoHigh:'Aŭtomate alta',qualityMedium:'Meza',qualityAutoLow:'Aŭtomate malalta',qualityLow:'Malalta',windowModeWindow:'Fenestro',windowModeOpaque:'Opaka',windowModeTransparent:'Travidebla',windowMode:'Fenestra re�imo',flashvars:'Variabloj por Fla�o',bgcolor:'Fona Koloro',hSpace:'Horizontala Spaco',vSpace:'Vertikala Spaco',validateSrc:'Bonvolu entajpi la retadreson (URL)',validateHSpace:'Horizontala Spaco devas esti nombro.',validateVSpace:'Vertikala Spaco devas esti nombro.'},spellCheck:{toolbar:'Kontroli la ortografion',title:'Kontroli la ortografion',notAvailable:'Bedaŭrinde la servo ne funkcias nuntempe.',errorLoading:'Eraro en la servoel�uto el la gastiga komputiko: %s.',notInDic:'Ne trovita en la vortaro',changeTo:'Ŝan�i al',btnIgnore:'Ignori',btnIgnoreAll:'Ignori Ĉion',btnReplace:'Anstataŭigi',btnReplaceAll:'Anstataŭigi Ĉion',btnUndo:'Malfari',noSuggestions:'- Neniu propono -',progress:'La ortografio estas kontrolata...',noMispell:'Ortografikontrolado finita: neniu eraro trovita',noChanges:'Ortografikontrolado finita: neniu vorto korektita',oneChange:'Ortografikontrolado finita: unu vorto korektita',manyChanges:'Ortografikontrolado finita: %1 vortoj korektitaj',ieSpellDownload:'Ortografikontrolilo ne instalita. Ĉu vi volas el�uti �in nun?'},smiley:{toolbar:'Mienvinjeto',title:'Enmeti Mienvinjeton',options:'Opcioj pri mienvinjetoj'},elementsPath:{eleLabel:'Vojo al Elementoj',eleTitle:'%1 elementoj'},numberedlist:'Numera Listo',bulletedlist:'Bula Listo',indent:'Pligrandigi Krommar�enon',outdent:'Malpligrandigi Krommar�enon',justify:{left:'Ĝisrandigi maldekstren',center:'Centrigi',right:'Ĝisrandigi dekstren',block:'Ĝisrandigi Ambaŭflanke'},blockquote:'Citaĵo',clipboard:{title:'Interglui',cutError:'La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).',copyError:'La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).',pasteMsg:'Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK',securityMsg:'Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la po�o. Bonvolu denove interglui la datenojn en tiun fenestron.',pasteArea:'Intergluoareo'},pastefromword:{confirmCleanup:'La teksto, kiun vi volas interglui, �ajnas esti kopiita el Word. Ĉu vi deziras purigi �in antaŭ intergluo?',toolbar:'Interglui el Word',title:'Interglui el Word',error:'Ne eblis purigi la intergluitajn datenojn pro interna eraro'},pasteText:{button:'Interglui kiel platan tekston',title:'Interglui kiel platan tekston'},templates:{button:'Ŝablonoj',title:'Enhavo de �ablonoj',options:'Opcioj pri �ablonoj',insertOption:'Anstataŭigi la nunan enhavon',selectPromptMsg:'Bonvolu selekti la �ablonon por malfermi �in en la redaktilo',emptyListMsg:'(Neniu �ablono difinita)'},showBlocks:'Montri la blokojn',stylesCombo:{label:'Stiloj',panelTitle:'Stiloj pri enpa�igo',panelTitle1:'Stiloj de blokoj',panelTitle2:'Enliniaj Stiloj',panelTitle3:'Stiloj de objektoj'},format:{label:'Formato',panelTitle:'ParagrafFormato',tag_p:'Normala',tag_pre:'Formatita',tag_address:'Adreso',tag_h1:'Titolo 1',tag_h2:'Titolo 2',tag_h3:'Titolo 3',tag_h4:'Titolo 4',tag_h5:'Titolo 5',tag_h6:'Titolo 6',tag_div:'Normala (DIV)'},div:{title:'Krei DIV ujon',toolbar:'Krei DIV ujon',cssClassInputLabel:'Stilfolioklasoj',styleSelectLabel:'Stilo',IdInputLabel:'Id',languageCodeInputLabel:' Lingvokodo',inlineStyleInputLabel:'Enlinia stilo',advisoryTitleInputLabel:'Priskriba Titolo',langDirLabel:'Skribdirekto',langDirLTRLabel:'Maldekstre dekstren (angle LTR)',langDirRTLLabel:'Dekstre maldekstren (angle RTL)',edit:'Redakti Div',remove:'Forigi Div'},iframe:{title:'Atributoj de la enlinia kadro (IFrame)',toolbar:'Enlinia kadro (IFrame)',noUrl:'Bonvolu entajpi la retadreson de la ligilo al la enlinia kadro (IFrame)',scrolling:'Ebligi rulumskalon',border:'Montri borderon de kadro (frame)'},font:{label:'Tiparo',voiceLabel:'Tiparo',panelTitle:'Tipara nomo'},fontSize:{label:'Grado',voiceLabel:'Tipara grado',panelTitle:'Tipara grado'},colorButton:{textColorTitle:'Teksta Koloro',bgColorTitle:'Fona Koloro',panelTitle:'Koloroj',auto:'Aŭtomata',more:'Pli da Koloroj...'},colors:{'000':'Nigra',800000:'Ka�tankolora','8B4513':'Mezbruna','2F4F4F':'Ardezgriza','008080':'Marĉanaskolora','000080':'Maristblua','4B0082':'Indigokolora',696969:'Malhelgriza',B22222:'Brikru�a',A52A2A:'Bruna',DAA520:'Senbrilorkolora','006400':'Malhelverda','40E0D0':'Turkisblua','0000CD':'Re�blua',800080:'Purpura',808080:'Griza',F00:'Ru�a',FF8C00:'Malheloran�kolora',FFD700:'Orkolora','008000':'Verda','0FF':'Verdblua','00F':'Blua',EE82EE:'Viola',A9A9A9:'Mezgriza',FFA07A:'Salmokolora',FFA500:'Oran�kolora',FFFF00:'Flava','00FF00':'Limetkolora',AFEEEE:'Helturkiskolora',ADD8E6:'Helblua',DDA0DD:'Prunkolora',D3D3D3:'Helgriza',FFF0F5:'Lavendkolora vango�minko',FAEBD7:'Antikvablanka',FFFFE0:'Helflava',F0FFF0:'Vintromelonkolora',F0FFFF:'Lazura',F0F8FF:'Aliceblua',E6E6FA:'Lavendkolora',FFF:'Blanka'},scayt:{title:'OrtografiKontrolado Dum Vi Tajpas (OKDVT)',opera_title:'Ne subportata de Opera',enable:'Ebligi OKDVT',disable:'Malebligi OKDVT',about:'Pri OKDVT',toggle:'Baskuligi OKDVT',options:'Opcioj',langs:'Lingvoj',moreSuggestions:'Pli da sugestoj',ignore:'Ignori',ignoreAll:'Ignori ĉion',addWord:'Almeti la vorton',emptyDic:'La vortaronomo ne devus esti malplena.',noSuggestions:'No suggestions',optionsTab:'Opcioj',allCaps:'Ignori la vortojn skribitajn nur per ĉefliteroj',ignoreDomainNames:'Ignori domajnajn nomojn',mixedCase:'Ignori vortojn kun miksa uskleco',mixedWithDigits:'Ignori vortojn kun nombroj',languagesTab:'Lingvoj',dictionariesTab:'Vortaroj',dic_field_name:'Vortaronomo',dic_create:'Krei',dic_restore:'Restaŭri',dic_delete:'Forigi',dic_rename:'Renomi',dic_info:'Komence la vortaro de la uzanto estas konservita en kuketo. Tamen la kuketgrando estas limigita. Kiam la vortaro de la uzanto atingas grandon, kiu ne plu ebligas konservi �in en kuketo, tiam la vortaro povas esti konservata en niaj serviloj. Por konservi vian personan vortaron en nian servilon, vi devas indiki nomon por tiu vortaro. Se vi jam havas konservitan vortaron, bonvolu entajpi ties nomon kaj alklaki la restaŭrbutonon.',aboutTab:'Pri'},about:{title:'Pri CKEditor',dlgTitle:'Pri CKEditor',help:'Kontroli $1 por helpo.',userGuide:'CKEditor Uzindikoj',moreInfo:'Por informoj pri licenco, bonvolu viziti nian retpa�aron:',copy:'Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.'},maximize:'Pligrandigi',minimize:'Malgrandigi',fakeobjects:{anchor:'Ankro',flash:'Fla�Animacio',iframe:'Enlinia Kadro (IFrame)',hiddenfield:'Ka�ita kampo',unknown:'Nekonata objekto'},resize:'Movigi por �an�i la grandon',colordialog:{title:'Selekti koloron',options:'Opcioj pri koloroj',highlight:'Detaloj',selected:'Selektita koloro',clear:'Forigi'},toolbarCollapse:'Faldi la ilbreton',toolbarExpand:'Malfaldi la ilbreton',toolbarGroups:{document:'Dokumento',clipboard:'Po�o/Malfari',editing:'Redaktado',forms:'Formularoj',basicstyles:'Bazaj stiloj',paragraph:'Paragrafo',links:'Ligiloj',insert:'Enmeti',styles:'Stiloj',colors:'Koloroj',tools:'Iloj'},bidi:{ltr:'Tekstdirekto de maldekstre dekstren',rtl:'Tekstdirekto de dekstre maldekstren'},docprops:{label:'Dokumentaj Atributoj',title:'Dokumentaj Atributoj',design:'Dizajno',meta:'Metadatenoj',chooseColor:'Elektu',other:'<alia>',docTitle:'Pa�otitolo',charset:'Signara Kodo',charsetOther:'Alia Signara Kodo',charsetASCII:'ASCII',charsetCE:'Centra Eŭropa',charsetCT:'Tradicia Ĉina (Big5)',charsetCR:'Cirila',charsetGR:'Greka',charsetJP:'Japana',charsetKR:'Korea',charsetTR:'Turka',charsetUN:'Unikodo (UTF-8)',charsetWE:'Okcidenta Eŭropa',docType:'Dokumenta Tipo',docTypeOther:'Alia Dokumenta Tipo',xhtmlDec:'Inkluzivi XHTML Deklarojn',bgColor:'Fona Koloro',bgImage:'URL de Fona Bildo',bgFixed:'Neruluma Fono',txtColor:'Teksta Koloro',margin:'Pa�aj Mar�enoj',marginTop:'Supra',marginLeft:'Maldekstra',marginRight:'Dekstra',marginBottom:'Malsupra',metaKeywords:'Ŝlosilvortoj de la Dokumento (apartigitaj de komoj)',metaDescription:'Dokumenta Priskribo',metaAuthor:'Verkinto',metaCopyright:'Kopirajto',previewHtml:'<p>Tio estas <strong>sampla teksto</strong>. Vi estas uzanta <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/es.js b/web/imcms/ckeditor/lang/es.js
new file mode 100644
index 0000000000..c7a9e62024
--- /dev/null
+++ b/web/imcms/ckeditor/lang/es.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.es={dir:'ltr',editorTitle:'Editor de texto, %1',editorHelp:'Pulse ALT 0 para ayuda',toolbars:'Barras de herramientas del editor',editor:'Editor de texto enriquecido',source:'Fuente HTML',newPage:'Nueva Página',save:'Guardar',preview:'Vista Previa',cut:'Cortar',copy:'Copiar',paste:'Pegar',print:'Imprimir',underline:'Subrayado',bold:'Negrita',italic:'Cursiva',selectAll:'Seleccionar Todo',removeFormat:'Eliminar Formato',strike:'Tachado',subscript:'Subíndice',superscript:'Superíndice',horizontalrule:'Insertar Línea Horizontal',pagebreak:'Insertar Salto de Página',pagebreakAlt:'Salto de página',unlink:'Eliminar Vínculo',undo:'Deshacer',redo:'Rehacer',common:{browseServer:'Ver Servidor',url:'URL',protocol:'Protocolo',upload:'Cargar',uploadSubmit:'Enviar al Servidor',image:'Imagen',flash:'Flash',form:'Formulario',checkbox:'Casilla de Verificación',radio:'Botones de Radio',textField:'Campo de Texto',textarea:'Area de Texto',hiddenField:'Campo Oculto',button:'Botón',select:'Campo de Selección',imageButton:'Botón Imagen',notSet:'<No definido>',id:'Id',name:'Nombre',langDir:'Orientación',langDirLtr:'Izquierda a Derecha (LTR)',langDirRtl:'Derecha a Izquierda (RTL)',langCode:'Cód. de idioma',longDescr:'Descripción larga URL',cssClass:'Clases de hojas de estilo',advisoryTitle:'Título',cssStyle:'Estilo',ok:'Aceptar',cancel:'Cancelar',close:'Cerrar',preview:'Previsualización',generalTab:'General',advancedTab:'Avanzado',validateNumberFailed:'El valor no es un número.',confirmNewPage:'Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?',confirmCancel:'Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?',options:'Opciones',target:'Destino',targetNew:'Nueva ventana (_blank)',targetTop:'Ventana principal (_top)',targetSelf:'Misma ventana (_self)',targetParent:'Ventana padre (_parent)',langDirLTR:'Izquierda a derecha (LTR)',langDirRTL:'Derecha a izquierda (RTL)',styles:'Estilos',cssClasses:'Clase de la hoja de estilos',width:'Anchura',height:'Altura',align:'Alineación',alignLeft:'Izquierda',alignRight:'Derecha',alignCenter:'Centrado',alignTop:'Tope',alignMiddle:'Centro',alignBottom:'Pie',invalidValue:'Invalid value.',invalidHeight:'Altura debe ser un número.',invalidWidth:'Anchura debe ser un número.',invalidCssLength:'El valor especificado para el campo "%1" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).',invalidHtmlLength:'El valor especificado para el campo "%1" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).',invalidInlineStyle:'El valor especificado para el estilo debe consistir en uno o más pares con el formato "nombre: valor", separados por punto y coma.',cssLengthTooltip:'Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).',unavailable:'%1<span class="cke_accessibility">, no disponible</span>'},contextmenu:{options:'Opciones del menú contextual'},specialChar:{toolbar:'Insertar Caracter Especial',title:'Seleccione un caracter especial',options:'Opciones de caracteres especiales'},link:{toolbar:'Insertar/Editar Vínculo',other:'<otro>',menu:'Editar Vínculo',title:'Vínculo',info:'Información de Vínculo',target:'Destino',upload:'Cargar',advanced:'Avanzado',type:'Tipo de vínculo',toUrl:'URL',toAnchor:'Referencia en esta página',toEmail:'E-Mail',targetFrame:'<marco>',targetPopup:'<ventana emergente>',targetFrameName:'Nombre del Marco Destino',targetPopupName:'Nombre de Ventana Emergente',popupFeatures:'Características de Ventana Emergente',popupResizable:'Redimensionable',popupStatusBar:'Barra de Estado',popupLocationBar:'Barra de ubicación',popupToolbar:'Barra de Herramientas',popupMenuBar:'Barra de Menú',popupFullScreen:'Pantalla Completa (IE)',popupScrollBars:'Barras de desplazamiento',popupDependent:'Dependiente (Netscape)',popupLeft:'Posición Izquierda',popupTop:'Posición Derecha',id:'Id',langDir:'Orientación',langDirLTR:'Izquierda a Derecha (LTR)',langDirRTL:'Derecha a Izquierda (RTL)',acccessKey:'Tecla de Acceso',name:'Nombre',langCode:'Código idioma',tabIndex:'Indice de tabulación',advisoryTitle:'Título',advisoryContentType:'Tipo de Contenido',cssClasses:'Clases de hojas de estilo',charset:'Fuente de caracteres vinculado',styles:'Estilo',rel:'Relación',selectAnchor:'Seleccionar una referencia',anchorName:'Por Nombre de Referencia',anchorId:'Por ID de elemento',emailAddress:'Dirección de E-Mail',emailSubject:'Título del Mensaje',emailBody:'Cuerpo del Mensaje',noAnchors:'(No hay referencias disponibles en el documento)',noUrl:'Por favor escriba el vínculo URL',noEmail:'Por favor escriba la dirección de e-mail'},anchor:{toolbar:'Referencia',menu:'Propiedades de Referencia',title:'Propiedades de Referencia',name:'Nombre de la Referencia',errorName:'Por favor, complete el nombre de la Referencia',remove:'Quitar Referencia'},list:{numberedTitle:'Propiedades de lista numerada',bulletedTitle:'Propiedades de viñetas',type:'Tipo',start:'Inicio',validateStartNumber:'El Inicio debe ser un número entero.',circle:'Círculo',disc:'Disco',square:'Cuadrado',none:'Ninguno',notset:'<sin establecer>',armenian:'Numeración armenia',georgian:'Numeración georgiana (an, ban, gan, etc.)',lowerRoman:'Números romanos en minúsculas (i, ii, iii, iv, v, etc.)',upperRoman:'Números romanos en mayúsculas (I, II, III, IV, V, etc.)',lowerAlpha:'Alfabeto en minúsculas (a, b, c, d, e, etc.)',upperAlpha:'Alfabeto en mayúsculas  (A, B, C, D, E, etc.)',lowerGreek:'Letras griegas (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal con cero inicial (01, 02, 03, etc.)'},findAndReplace:{title:'Buscar y Reemplazar',find:'Buscar',replace:'Reemplazar',findWhat:'Texto a buscar:',replaceWith:'Reemplazar con:',notFoundMsg:'El texto especificado no ha sido encontrado.',findOptions:'Opciones de búsqueda',matchCase:'Coincidir may/min',matchWord:'Coincidir toda la palabra',matchCyclic:'Buscar en todo el contenido',replaceAll:'Reemplazar Todo',replaceSuccessMsg:'La expresión buscada ha sido reemplazada %1 veces.'},table:{toolbar:'Tabla',title:'Propiedades de Tabla',menu:'Propiedades de Tabla',deleteTable:'Eliminar Tabla',rows:'Filas',columns:'Columnas',border:'Tamaño de Borde',widthPx:'pixeles',widthPc:'porcentaje',widthUnit:'unidad de la anchura',cellSpace:'Esp. e/celdas',cellPad:'Esp. interior',caption:'Título',summary:'Síntesis',headers:'Encabezados',headersNone:'Ninguno',headersColumn:'Primera columna',headersRow:'Primera fila',headersBoth:'Ambas',invalidRows:'El número de filas debe ser un número mayor que 0.',invalidCols:'El número de columnas debe ser un número mayor que 0.',invalidBorder:'El tamaño del borde debe ser un número.',invalidWidth:'La anchura de tabla debe ser un número.',invalidHeight:'La altura de tabla debe ser un número.',invalidCellSpacing:'El espaciado entre celdas debe ser un número.',invalidCellPadding:'El espaciado interior debe ser un número.',cell:{menu:'Celda',insertBefore:'Insertar celda a la izquierda',insertAfter:'Insertar celda a la derecha',deleteCell:'Eliminar Celdas',merge:'Combinar Celdas',mergeRight:'Combinar a la derecha',mergeDown:'Combinar hacia abajo',splitHorizontal:'Dividir la celda horizontalmente',splitVertical:'Dividir la celda verticalmente',title:'Propiedades de celda',cellType:'Tipo de Celda',rowSpan:'Expandir filas',colSpan:'Expandir columnas',wordWrap:'Ajustar al contenido',hAlign:'Alineación Horizontal',vAlign:'Alineación Vertical',alignBaseline:'Linea de base',bgColor:'Color de fondo',borderColor:'Color de borde',data:'Datos',header:'Encabezado',yes:'Sí',no:'No',invalidWidth:'La anchura de celda debe ser un número.',invalidHeight:'La altura de celda debe ser un número.',invalidRowSpan:'La expansión de filas debe ser un número entero.',invalidColSpan:'La expansión de columnas debe ser un número entero.',chooseColor:'Elegir'},row:{menu:'Fila',insertBefore:'Insertar fila en la parte superior',insertAfter:'Insertar fila en la parte inferior',deleteRow:'Eliminar Filas'},column:{menu:'Columna',insertBefore:'Insertar columna a la izquierda',insertAfter:'Insertar columna a la derecha',deleteColumn:'Eliminar Columnas'}},button:{title:'Propiedades de Botón',text:'Texto (Valor)',type:'Tipo',typeBtn:'Boton',typeSbm:'Enviar',typeRst:'Reestablecer'},checkboxAndRadio:{checkboxTitle:'Propiedades de Casilla',radioTitle:'Propiedades de Botón de Radio',value:'Valor',selected:'Seleccionado'},form:{title:'Propiedades de Formulario',menu:'Propiedades de Formulario',action:'Acción',method:'Método',encoding:'Codificación'},select:{title:'Propiedades de Campo de Selección',selectInfo:'Información',opAvail:'Opciones disponibles',value:'Valor',size:'Tamaño',lines:'Lineas',chkMulti:'Permitir múltiple selección',opText:'Texto',opValue:'Valor',btnAdd:'Agregar',btnModify:'Modificar',btnUp:'Subir',btnDown:'Bajar',btnSetValue:'Establecer como predeterminado',btnDelete:'Eliminar'},textarea:{title:'Propiedades de Area de Texto',cols:'Columnas',rows:'Filas'},textfield:{title:'Propiedades de Campo de Texto',name:'Nombre',value:'Valor',charWidth:'Caracteres de ancho',maxChars:'Máximo caracteres',type:'Tipo',typeText:'Texto',typePass:'Contraseña'},hidden:{title:'Propiedades de Campo Oculto',name:'Nombre',value:'Valor'},image:{title:'Propiedades de Imagen',titleButton:'Propiedades de Botón de Imagen',menu:'Propiedades de Imagen',infoTab:'Información de Imagen',btnUpload:'Enviar al Servidor',upload:'Cargar',alt:'Texto Alternativo',lockRatio:'Proporcional',resetSize:'Tamaño Original',border:'Borde',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',alertUrl:'Por favor escriba la URL de la imagen',linkTab:'Vínculo',button2Img:'¿Desea convertir el botón de imagen en una simple imagen?',img2Button:'¿Desea convertir la imagen en un botón de imagen?',urlMissing:'Debe indicar la URL de la imagen.',validateBorder:'El borde debe ser un número.',validateHSpace:'El espaciado horizontal debe ser un número.',validateVSpace:'El espaciado vertical debe ser un número.'},flash:{properties:'Propiedades de Flash',propertiesTab:'Propiedades',title:'Propiedades de Flash',chkPlay:'Autoejecución',chkLoop:'Repetir',chkMenu:'Activar Menú Flash',chkFull:'Permitir pantalla completa',scale:'Escala',scaleAll:'Mostrar todo',scaleNoBorder:'Sin Borde',scaleFit:'Ajustado',access:'Acceso de scripts',accessAlways:'Siempre',accessSameDomain:'Mismo dominio',accessNever:'Nunca',alignAbsBottom:'Abs inferior',alignAbsMiddle:'Abs centro',alignBaseline:'Línea de base',alignTextTop:'Tope del texto',quality:'Calidad',qualityBest:'La mejor',qualityHigh:'Alta',qualityAutoHigh:'Auto Alta',qualityMedium:'Media',qualityAutoLow:'Auto Baja',qualityLow:'Baja',windowModeWindow:'Ventana',windowModeOpaque:'Opaco',windowModeTransparent:'Transparente',windowMode:'WindowMode',flashvars:'Opciones',bgcolor:'Color de Fondo',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',validateSrc:'Por favor escriba el vínculo URL',validateHSpace:'Esp.Horiz debe ser un número.',validateVSpace:'Esp.Vert debe ser un número.'},spellCheck:{toolbar:'Ortografía',title:'Comprobar ortografía',notAvailable:'Lo sentimos pero el servicio no está disponible.',errorLoading:'Error cargando la aplicación del servidor: %s.',notInDic:'No se encuentra en el Diccionario',changeTo:'Cambiar a',btnIgnore:'Ignorar',btnIgnoreAll:'Ignorar Todo',btnReplace:'Reemplazar',btnReplaceAll:'Reemplazar Todo',btnUndo:'Deshacer',noSuggestions:'- No hay sugerencias -',progress:'Control de Ortografía en progreso...',noMispell:'Control finalizado: no se encontraron errores',noChanges:'Control finalizado: no se ha cambiado ninguna palabra',oneChange:'Control finalizado: se ha cambiado una palabra',manyChanges:'Control finalizado: se ha cambiado %1 palabras',ieSpellDownload:'Módulo de Control de Ortografía no instalado.\r\n¿Desea descargarlo ahora?'},smiley:{toolbar:'Emoticonos',title:'Insertar un Emoticon',options:'Opciones de emoticonos'},elementsPath:{eleLabel:'Ruta de los elementos',eleTitle:'%1 elemento'},numberedlist:'Numeración',bulletedlist:'Viñetas',indent:'Aumentar Sangría',outdent:'Disminuir Sangría',justify:{left:'Alinear a Izquierda',center:'Centrar',right:'Alinear a Derecha',block:'Justificado'},blockquote:'Cita',clipboard:{title:'Pegar',cutError:'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).',copyError:'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).',pasteMsg:'Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.',securityMsg:'Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.',pasteArea:'Zona de pegado'},pastefromword:{confirmCleanup:'El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?',toolbar:'Pegar desde Word',title:'Pegar desde Word',error:'No ha sido posible limpiar los datos debido a un error interno'},pasteText:{button:'Pegar como Texto Plano',title:'Pegar como Texto Plano'},templates:{button:'Plantillas',title:'Contenido de Plantillas',options:'Opciones de plantillas',insertOption:'Reemplazar el contenido actual',selectPromptMsg:'Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):',emptyListMsg:'(No hay plantillas definidas)'},showBlocks:'Mostrar bloques',stylesCombo:{label:'Estilo',panelTitle:'Estilos para formatear',panelTitle1:'Estilos de párrafo',panelTitle2:'Estilos de carácter',panelTitle3:'Estilos de objeto'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normal',tag_pre:'Con formato',tag_address:'Dirección',tag_h1:'Encabezado 1',tag_h2:'Encabezado 2',tag_h3:'Encabezado 3',tag_h4:'Encabezado 4',tag_h5:'Encabezado 5',tag_h6:'Encabezado 6',tag_div:'Normal (DIV)'},div:{title:'Crear contenedor DIV',toolbar:'Crear contenedor DIV',cssClassInputLabel:'Clase de hoja de estilos',styleSelectLabel:'Estilo',IdInputLabel:'Id',languageCodeInputLabel:' Codigo de idioma',inlineStyleInputLabel:'Estilo',advisoryTitleInputLabel:'Título',langDirLabel:'Orientación',langDirLTRLabel:'Izquierda a Derecha (LTR)',langDirRTLLabel:'Derecha a Izquierda (RTL)',edit:'Editar Div',remove:'Quitar Div'},iframe:{title:'Propiedades de iframe',toolbar:'IFrame',noUrl:'Por favor, escriba la dirección del iframe',scrolling:'Activar barras de desplazamiento',border:'Mostrar borde del marco'},font:{label:'Fuente',voiceLabel:'Fuente',panelTitle:'Fuente'},fontSize:{label:'Tamaño',voiceLabel:'Tamaño de fuente',panelTitle:'Tamaño'},colorButton:{textColorTitle:'Color de Texto',bgColorTitle:'Color de Fondo',panelTitle:'Colores',auto:'Automático',more:'Más Colores...'},colors:{'000':'Negro',800000:'Marrón oscuro','8B4513':'Marrón tierra','2F4F4F':'Pizarra Oscuro','008080':'Azul verdoso','000080':'Azul marino','4B0082':'Añil',696969:'Gris oscuro',B22222:'Ladrillo',A52A2A:'Marrón',DAA520:'Oro oscuro','006400':'Verde oscuro','40E0D0':'Turquesa','0000CD':'Azul medio-oscuro',800080:'Púrpura',808080:'Gris',F00:'Rojo',FF8C00:'Naranja oscuro',FFD700:'Oro','008000':'Verde','0FF':'Cian','00F':'Azul',EE82EE:'Violeta',A9A9A9:'Gris medio',FFA07A:'Salmón claro',FFA500:'Naranja',FFFF00:'Amarillo','00FF00':'Lima',AFEEEE:'Turquesa claro',ADD8E6:'Azul claro',DDA0DD:'Violeta claro',D3D3D3:'Gris claro',FFF0F5:'Lavanda rojizo',FAEBD7:'Blanco antiguo',FFFFE0:'Amarillo claro',F0FFF0:'Miel',F0FFFF:'Azul celeste',F0F8FF:'Azul pálido',E6E6FA:'Lavanda',FFF:'Blanco'},scayt:{title:'Comprobar Ortografía Mientras Escribe',opera_title:'No soportado en Opera',enable:'Activar Corrector',disable:'Desactivar Corrector',about:'Acerca de Corrector',toggle:'Cambiar Corrector',options:'Opciones',langs:'Idiomas',moreSuggestions:'Más sugerencias',ignore:'Ignorar',ignoreAll:'Ignorar Todas',addWord:'Añadir palabra',emptyDic:'El nombre del diccionario no puede estar en blanco.',noSuggestions:'No hay sugerencias',optionsTab:'Opciones',allCaps:'Omitir palabras en MAYÚSCULAS',ignoreDomainNames:'Omitir nombres de dominio',mixedCase:'Ignorar palabras con combinación de mayúsculas y minúsculas',mixedWithDigits:'Omitir palabras con números',languagesTab:'Idiomas',dictionariesTab:'Diccionarios',dic_field_name:'Nombre del diccionario',dic_create:'Crear',dic_restore:'Recuperar',dic_delete:'Borrar',dic_rename:'Renombrar',dic_info:'Inicialmente el Diccionario de usuario se guarda en una Cookie. Sin embargo, las cookies están limitadas en tamaño. Cuando el diccionario crece a un punto en el que no se puede guardar en una Cookie, el diccionario puede ser almacenado en nuestro servidor. Para almacenar su diccionario personalizado en nuestro servidor debe especificar un nombre para su diccionario. Si ya ha guardado un diccionaro, por favor, escriba su nombre y pulse el botón Recuperar',aboutTab:'Acerca de'},about:{title:'Acerca de CKEditor',dlgTitle:'Acerca de CKEditor',help:'Lea la  $1 para resolver sus dudas.',userGuide:'Guía de usuario de CKEditor',moreInfo:'Para información de licencia, por favor visite nuestro sitio web:',copy:'Copyright &copy; $1. Todos los derechos reservados.'},maximize:'Maximizar',minimize:'Minimizar',fakeobjects:{anchor:'Ancla',flash:'Animación flash',iframe:'IFrame',hiddenfield:'Campo oculto',unknown:'Objeto desconocido'},resize:'Arrastre para redimensionar',colordialog:{title:'Elegir color',options:'Opciones de colores',highlight:'Muestra',selected:'Elegido',clear:'Borrar'},toolbarCollapse:'Contraer barra de herramientas',toolbarExpand:'Expandir barra de herramientas',toolbarGroups:{document:'Documento',clipboard:'Portapapeles/Deshacer',editing:'Edición',forms:'Formularios',basicstyles:'Estilos básicos',paragraph:'Párrafo',links:'Enlaces',insert:'Insertar',styles:'Estilos',colors:'Colores',tools:'Herramientas'},bidi:{ltr:'Dirección del texto de izquierda a derecha',rtl:'Dirección del texto de derecha a izquierda'},docprops:{label:'Propiedades del documento',title:'Propiedades del documento',design:'Diseño',meta:'Meta Tags',chooseColor:'Elegir',other:'Otro...',docTitle:'Título de página',charset:'Codificación de caracteres',charsetOther:'Otra codificación de caracteres',charsetASCII:'ASCII',charsetCE:'Centro Europeo',charsetCT:'Chino Tradicional (Big5)',charsetCR:'Ruso',charsetGR:'Griego',charsetJP:'Japonés',charsetKR:'Koreano',charsetTR:'Turco',charsetUN:'Unicode (UTF-8)',charsetWE:'Europeo occidental',docType:'Tipo de documento',docTypeOther:'Otro tipo de documento',xhtmlDec:'Incluir declaración XHTML',bgColor:'Color de fondo',bgImage:'Imagen de fondo',bgFixed:'Fondo fijo (no se desplaza)',txtColor:'Color del texto',margin:'Márgenes',marginTop:'Superior',marginLeft:'Izquierdo',marginRight:'Derecho',marginBottom:'Inferior',metaKeywords:'Palabras claves del documento separadas por coma (meta keywords)',metaDescription:'Descripción del documento',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>Este es un <strong>texto de ejemplo</strong>. Usted está usando <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/et.js b/web/imcms/ckeditor/lang/et.js
new file mode 100644
index 0000000000..887f009a38
--- /dev/null
+++ b/web/imcms/ckeditor/lang/et.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.et={dir:'ltr',editorTitle:'Vormindatud teksti redaktor %1',editorHelp:'Abi saamiseks vajuta ALT 0',toolbars:'Redaktori tööriistaribad',editor:'Rikkalik tekstiredaktor',source:'Lähtekood',newPage:'Uus leht',save:'Salvestamine',preview:'Eelvaade',cut:'Lõika',copy:'Kopeeri',paste:'Aseta',print:'Printimine',underline:'Allajoonitud',bold:'Paks',italic:'Kursiiv',selectAll:'Kõige valimine',removeFormat:'Vormingu eemaldamine',strike:'Läbijoonitud',subscript:'Allindeks',superscript:'Ülaindeks',horizontalrule:'Horisontaaljoone sisestamine',pagebreak:'Lehevahetuskoha sisestamine',pagebreakAlt:'Lehevahetuskoht',unlink:'Lingi eemaldamine',undo:'Tagasivõtmine',redo:'Toimingu kordamine',common:{browseServer:'Serveri sirvimine',url:'URL',protocol:'Protokoll',upload:'Laadi üles',uploadSubmit:'Saada serverisse',image:'Pilt',flash:'Flash',form:'Vorm',checkbox:'Märkeruut',radio:'Raadionupp',textField:'Tekstilahter',textarea:'Tekstiala',hiddenField:'Varjatud lahter',button:'Nupp',select:'Valiklahter',imageButton:'Piltnupp',notSet:'<määramata>',id:'ID',name:'Nimi',langDir:'Keele suund',langDirLtr:'Vasakult paremale (LTR)',langDirRtl:'Paremalt vasakule (RTL)',langCode:'Keele kood',longDescr:'Pikk kirjeldus URL',cssClass:'Stiilistiku klassid',advisoryTitle:'Soovituslik pealkiri',cssStyle:'Laad',ok:'OK',cancel:'Loobu',close:'Sulge',preview:'Eelvaade',generalTab:'Üldine',advancedTab:'Täpsemalt',validateNumberFailed:'See väärtus pole number.',confirmNewPage:'Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?',confirmCancel:'Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?',options:'Valikud',target:'Sihtkoht',targetNew:'Uus aken (_blank)',targetTop:'Kõige ülemine aken (_top)',targetSelf:'Sama aken (_self)',targetParent:'Vanemaken (_parent)',langDirLTR:'Vasakult paremale (LTR)',langDirRTL:'Paremalt vasakule (RTL)',styles:'Stiili',cssClasses:'Stiililehe klassid',width:'Laius',height:'Kõrgus',align:'Joondus',alignLeft:'Vasak',alignRight:'Paremale',alignCenter:'Kesk',alignTop:'Üles',alignMiddle:'Keskele',alignBottom:'Alla',invalidValue:'Invalid value.',invalidHeight:'Kõrgus peab olema number.',invalidWidth:'Laius peab olema number.',invalidCssLength:'"%1" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.',invalidHtmlLength:'"%1" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.',invalidInlineStyle:'Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: "nimi : väärtus".',cssLengthTooltip:'Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).',unavailable:'%1<span class="cke_accessibility">, pole saadaval</span>'},contextmenu:{options:'Kontekstimenüü valikud'},specialChar:{toolbar:'Erimärgi sisestamine',title:'Erimärgi valimine',options:'Erimärkide valikud'},link:{toolbar:'Lingi lisamine/muutmine',other:'<muu>',menu:'Muuda linki',title:'Link',info:'Lingi info',target:'Sihtkoht',upload:'Lae üles',advanced:'Täpsemalt',type:'Lingi liik',toUrl:'URL',toAnchor:'Ankur sellel lehel',toEmail:'E-post',targetFrame:'<raam>',targetPopup:'<hüpikaken>',targetFrameName:'Sihtmärk raami nimi',targetPopupName:'Hüpikakna nimi',popupFeatures:'Hüpikakna omadused',popupResizable:'Suurust saab muuta',popupStatusBar:'Olekuriba',popupLocationBar:'Aadressiriba',popupToolbar:'Tööriistariba',popupMenuBar:'Menüüriba',popupFullScreen:'Täisekraan (IE)',popupScrollBars:'Kerimisribad',popupDependent:'Sõltuv (Netscape)',popupLeft:'Vasak asukoht',popupTop:'Ülemine asukoht',id:'ID',langDir:'Keele suund',langDirLTR:'Vasakult paremale (LTR)',langDirRTL:'Paremalt vasakule (RTL)',acccessKey:'Juurdepääsu võti',name:'Nimi',langCode:'Keele suund',tabIndex:'Tab indeks',advisoryTitle:'Juhendav tiitel',advisoryContentType:'Juhendava sisu tüüp',cssClasses:'Stiilistiku klassid',charset:'Lingitud ressursi märgistik',styles:'Laad',rel:'Suhe',selectAnchor:'Vali ankur',anchorName:'Ankru nime järgi',anchorId:'Elemendi id järgi',emailAddress:'E-posti aadress',emailSubject:'Sõnumi teema',emailBody:'Sõnumi tekst',noAnchors:'(Selles dokumendis pole ankruid)',noUrl:'Palun kirjuta lingi URL',noEmail:'Palun kirjuta e-posti aadress'},anchor:{toolbar:'Ankru sisestamine/muutmine',menu:'Ankru omadused',title:'Ankru omadused',name:'Ankru nimi',errorName:'Palun sisesta ankru nimi',remove:'Eemalda ankur'},list:{numberedTitle:'Numberloendi omadused',bulletedTitle:'Punktloendi omadused',type:'Liik',start:'Algus',validateStartNumber:'Loendi algusnumber peab olema täisarv.',circle:'Ring',disc:'Täpp',square:'Ruut',none:'Puudub',notset:'<pole määratud>',armenian:'Armeenia numbrid',georgian:'Gruusia numbrid (an, ban, gan, jne)',lowerRoman:'Väiksed rooma numbrid (i, ii, iii, iv, v, jne)',upperRoman:'Suured rooma numbrid (I, II, III, IV, V, jne)',lowerAlpha:'Väiketähed (a, b, c, d, e, jne)',upperAlpha:'Suurtähed (A, B, C, D, E, jne)',lowerGreek:'Kreeka väiketähed (alpha, beta, gamma, jne)',decimal:'Numbrid (1, 2, 3, jne)',decimalLeadingZero:'Numbrid algusnulliga (01, 02, 03, jne)'},findAndReplace:{title:'Otsimine ja asendamine',find:'Otsi',replace:'Asenda',findWhat:'Otsitav:',replaceWith:'Asendus:',notFoundMsg:'Otsitud teksti ei leitud.',findOptions:'Otsingu valikud',matchCase:'Suur- ja väiketähtede eristamine',matchWord:'Ainult terved sõnad',matchCyclic:'Jätkatakse algusest',replaceAll:'Asenda kõik',replaceSuccessMsg:'%1 vastet asendati.'},table:{toolbar:'Tabel',title:'Tabeli omadused',menu:'Tabeli omadused',deleteTable:'Kustuta tabel',rows:'Read',columns:'Veerud',border:'Joone suurus',widthPx:'pikslit',widthPc:'protsenti',widthUnit:'laiuse ühik',cellSpace:'Lahtri vahe',cellPad:'Lahtri täidis',caption:'Tabeli tiitel',summary:'Kokkuvõte',headers:'Päised',headersNone:'Puudub',headersColumn:'Esimene tulp',headersRow:'Esimene rida',headersBoth:'Mõlemad',invalidRows:'Ridade arv peab olema nullist suurem.',invalidCols:'Tulpade arv peab olema nullist suurem.',invalidBorder:'Äärise suurus peab olema number.',invalidWidth:'Tabeli laius peab olema number.',invalidHeight:'Tabeli kõrgus peab olema number.',invalidCellSpacing:'Lahtrite vahe peab olema positiivne arv.',invalidCellPadding:'Lahtrite polsterdus (padding) peab olema positiivne arv.',cell:{menu:'Lahter',insertBefore:'Sisesta lahter enne',insertAfter:'Sisesta lahter peale',deleteCell:'Eemalda lahtrid',merge:'Ühenda lahtrid',mergeRight:'Ühenda paremale',mergeDown:'Ühenda alla',splitHorizontal:'Poolita lahter horisontaalselt',splitVertical:'Poolita lahter vertikaalselt',title:'Lahtri omadused',cellType:'Lahtri liik',rowSpan:'Ridade vahe',colSpan:'Tulpade vahe',wordWrap:'Sõnade murdmine',hAlign:'Horisontaalne joondus',vAlign:'Vertikaalne joondus',alignBaseline:'Baasjoon',bgColor:'Tausta värv',borderColor:'Äärise värv',data:'Andmed',header:'Päis',yes:'Jah',no:'Ei',invalidWidth:'Lahtri laius peab olema number.',invalidHeight:'Lahtri kõrgus peab olema number.',invalidRowSpan:'Ridade vahe peab olema täisarv.',invalidColSpan:'Tulpade vahe peab olema täisarv.',chooseColor:'Vali'},row:{menu:'Rida',insertBefore:'Sisesta rida enne',insertAfter:'Sisesta rida peale',deleteRow:'Eemalda read'},column:{menu:'Veerg',insertBefore:'Sisesta veerg enne',insertAfter:'Sisesta veerg peale',deleteColumn:'Eemalda veerud'}},button:{title:'Nupu omadused',text:'Tekst (väärtus)',type:'Liik',typeBtn:'Nupp',typeSbm:'Saada',typeRst:'Lähtesta'},checkboxAndRadio:{checkboxTitle:'Märkeruudu omadused',radioTitle:'Raadionupu omadused',value:'Väärtus',selected:'Märgitud'},form:{title:'Vormi omadused',menu:'Vormi omadused',action:'Toiming',method:'Meetod',encoding:'Kodeering'},select:{title:'Valiklahtri omadused',selectInfo:'Info',opAvail:'Võimalikud valikud:',value:'Väärtus',size:'Suurus',lines:'ridu',chkMulti:'Võimalik mitu valikut',opText:'Tekst',opValue:'Väärtus',btnAdd:'Lisa',btnModify:'Muuda',btnUp:'Üles',btnDown:'Alla',btnSetValue:'Määra vaikimisi',btnDelete:'Kustuta'},textarea:{title:'Tekstiala omadused',cols:'Veerge',rows:'Ridu'},textfield:{title:'Tekstilahtri omadused',name:'Nimi',value:'Väärtus',charWidth:'Laius (tähemärkides)',maxChars:'Maksimaalselt tähemärke',type:'Liik',typeText:'Tekst',typePass:'Parool'},hidden:{title:'Varjatud lahtri omadused',name:'Nimi',value:'Väärtus'},image:{title:'Pildi omadused',titleButton:'Piltnupu omadused',menu:'Pildi omadused',infoTab:'Pildi info',btnUpload:'Saada serverisse',upload:'Lae üles',alt:'Alternatiivne tekst',lockRatio:'Lukusta kuvasuhe',resetSize:'Lähtesta suurus',border:'Joon',hSpace:'H. vaheruum',vSpace:'V. vaheruum',alertUrl:'Palun kirjuta pildi URL',linkTab:'Link',button2Img:'Kas tahad teisendada valitud pildiga nupu tavaliseks pildiks?',img2Button:'Kas tahad teisendada valitud tavalise pildi pildiga nupuks?',urlMissing:'Pildi lähte-URL on puudu.',validateBorder:'Äärise laius peab olema täisarv.',validateHSpace:'Horisontaalne vaheruum peab olema täisarv.',validateVSpace:'Vertikaalne vaheruum peab olema täisarv.'},flash:{properties:'Flashi omadused',propertiesTab:'Omadused',title:'Flashi omadused',chkPlay:'Automaatne start ',chkLoop:'Korduv',chkMenu:'Flashi menüü lubatud',chkFull:'Täisekraan lubatud',scale:'Mastaap',scaleAll:'Näidatakse kõike',scaleNoBorder:'Äärist ei ole',scaleFit:'Täpne sobivus',access:'Skriptide ligipääs',accessAlways:'Kõigile',accessSameDomain:'Samalt domeenilt',accessNever:'Mitte ühelegi',alignAbsBottom:'Abs alla',alignAbsMiddle:'Abs keskele',alignBaseline:'Baasjoonele',alignTextTop:'Tekstist üles',quality:'Kvaliteet',qualityBest:'Parim',qualityHigh:'Kõrge',qualityAutoHigh:'Automaatne kõrge',qualityMedium:'Keskmine',qualityAutoLow:'Automaatne madal',qualityLow:'Madal',windowModeWindow:'Aken',windowModeOpaque:'Läbipaistmatu',windowModeTransparent:'Läbipaistev',windowMode:'Akna režiim',flashvars:'Flashi muutujad',bgcolor:'Tausta värv',hSpace:'H. vaheruum',vSpace:'V. vaheruum',validateSrc:'Palun kirjuta lingi URL',validateHSpace:'H. vaheruum peab olema number.',validateVSpace:'V. vaheruum peab olema number.'},spellCheck:{toolbar:'Õigekirjakontroll',title:'Õigekirjakontroll',notAvailable:'Kahjuks ei ole teenus praegu saadaval.',errorLoading:'Viga rakenduse teenushosti laadimisel: %s.',notInDic:'Puudub sõnastikust',changeTo:'Muuda',btnIgnore:'Ignoreeri',btnIgnoreAll:'Ignoreeri kõiki',btnReplace:'Asenda',btnReplaceAll:'Asenda kõik',btnUndo:'Võta tagasi',noSuggestions:'- Soovitused puuduvad -',progress:'Toimub õigekirja kontroll...',noMispell:'Õigekirja kontroll sooritatud: õigekirjuvigu ei leitud',noChanges:'Õigekirja kontroll sooritatud: ühtegi sõna ei muudetud',oneChange:'Õigekirja kontroll sooritatud: üks sõna muudeti',manyChanges:'Õigekirja kontroll sooritatud: %1 sõna muudetud',ieSpellDownload:'Õigekirja kontrollija ei ole paigaldatud. Soovid sa selle alla laadida?'},smiley:{toolbar:'Emotikon',title:'Sisesta emotikon',options:'Emotikonide valikud'},elementsPath:{eleLabel:'Elementide asukoht',eleTitle:'%1 element'},numberedlist:'Numberloend',bulletedlist:'Punktloend',indent:'Taande suurendamine',outdent:'Taande vähendamine',justify:{left:'Vasakjoondus',center:'Keskjoondus',right:'Paremjoondus',block:'Rööpjoondus'},blockquote:'Blokktsitaat',clipboard:{title:'Asetamine',cutError:'Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).',copyError:'Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).',pasteMsg:'Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.',securityMsg:'Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.',pasteArea:'Asetamise ala'},pastefromword:{confirmCleanup:'Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?',toolbar:'Asetamine Wordist',title:'Asetamine Wordist',error:'Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik'},pasteText:{button:'Asetamine tavalise tekstina',title:'Asetamine tavalise tekstina'},templates:{button:'Mall',title:'Sisumallid',options:'Malli valikud',insertOption:'Praegune sisu asendatakse',selectPromptMsg:'Palun vali mall, mis avada redaktoris<br />(praegune sisu läheb kaotsi):',emptyListMsg:'(Ühtegi malli ei ole defineeritud)'},showBlocks:'Blokkide näitamine',stylesCombo:{label:'Stiil',panelTitle:'Vormindusstiilid',panelTitle1:'Blokkstiilid',panelTitle2:'Reasisesed stiilid',panelTitle3:'Objektistiilid'},format:{label:'Vorming',panelTitle:'Vorming',tag_p:'Tavaline',tag_pre:'Vormindatud',tag_address:'Aadress',tag_h1:'Pealkiri 1',tag_h2:'Pealkiri 2',tag_h3:'Pealkiri 3',tag_h4:'Pealkiri 4',tag_h5:'Pealkiri 5',tag_h6:'Pealkiri 6',tag_div:'Tavaline (DIV)'},div:{title:'Div-konteineri loomine',toolbar:'Div-konteineri loomine',cssClassInputLabel:'Stiililehe klassid',styleSelectLabel:'Stiil',IdInputLabel:'ID',languageCodeInputLabel:' Keelekood',inlineStyleInputLabel:'Reasisene stiil',advisoryTitleInputLabel:'Soovitatav pealkiri',langDirLabel:'Keele suund',langDirLTRLabel:'Vasakult paremale (LTR)',langDirRTLLabel:'Paremalt vasakule (RTL)',edit:'Muuda Div',remove:'Eemalda Div'},iframe:{title:'IFrame omadused',toolbar:'IFrame',noUrl:'Vali iframe URLi liik',scrolling:'Kerimisribade lubamine',border:'Raami äärise näitamine'},font:{label:'Kiri',voiceLabel:'Kiri',panelTitle:'Kiri'},fontSize:{label:'Suurus',voiceLabel:'Kirja suurus',panelTitle:'Suurus'},colorButton:{textColorTitle:'Teksti värv',bgColorTitle:'Tausta värv',panelTitle:'Värvid',auto:'Automaatne',more:'Rohkem värve...'},colors:{'000':'Must',800000:'Kastanpruun','8B4513':'Sadulapruun','2F4F4F':'Tume paehall','008080':'Sinakasroheline','000080':'Meresinine','4B0082':'Indigosinine',696969:'Tumehall',B22222:'Šamottkivi',A52A2A:'Pruun',DAA520:'Kuldkollane','006400':'Tumeroheline','40E0D0':'Türkiissinine','0000CD':'Keskmine sinine',800080:'Lilla',808080:'Hall',F00:'Punanae',FF8C00:'Tumeoranž',FFD700:'Kuldne','008000':'Roheline','0FF':'Tsüaniidsinine','00F':'Sinine',EE82EE:'Violetne',A9A9A9:'Tuhm hall',FFA07A:'Hele lõhe',FFA500:'Oranž',FFFF00:'Kollane','00FF00':'Lubja hall',AFEEEE:'Kahvatu türkiis',ADD8E6:'Helesinine',DDA0DD:'Ploomililla',D3D3D3:'Helehall',FFF0F5:'Lavendlipunane',FAEBD7:'Antiikvalge',FFFFE0:'Helekollane',F0FFF0:'Meloniroheline',F0FFFF:'Taevasinine',F0F8FF:'Beebisinine',E6E6FA:'Lavendel',FFF:'Valge'},scayt:{title:'Õigekirjakontroll kirjutamise ajal',opera_title:'Operas pole toetatud',enable:'SCAYT lubatud',disable:'SCAYT keelatud',about:'SCAYT-ist lähemalt',toggle:'SCAYT sisse/välja lülitamine',options:'Valikud',langs:'Keeled',moreSuggestions:'Veel soovitusi',ignore:'Eira',ignoreAll:'Eira kõiki',addWord:'Lisa sõna',emptyDic:'Sõnaraamatu nimi ei tohi olla tühi.',noSuggestions:'No suggestions',optionsTab:'Valikud',allCaps:'Läbivate suurtähtedega sõnade eiramine',ignoreDomainNames:'Domeeninimede eiramine',mixedCase:'Tavapäratu tõstuga sõnade eiramine',mixedWithDigits:'Numbreid sisaldavate sõnade eiramine',languagesTab:'Keeled',dictionariesTab:'Sõnaraamatud',dic_field_name:'Sõnaraamatu nimi',dic_create:'Loo',dic_restore:'Taasta',dic_delete:'Kustuta',dic_rename:'Nimeta ümber',dic_info:'Alguses säilitatakse kasutaja sõnaraamatut küpsises. Küpsise suurus on piiratud. Pärast sõnaraamatu kasvamist nii suureks, et see küpsisesse ei mahu, võib sõnaraamatut hoida meie serveris. Oma isikliku sõnaraamatu hoidmiseks meie serveris pead andma sellele nime. Kui sa juba oled sõnaraamatu salvestanud, sisesta selle nimi ja klõpsa taastamise nupule.',aboutTab:'Lähemalt'},about:{title:'CKEditorist',dlgTitle:'CKEditorist',help:'Abi jaoks vaata $1.',userGuide:'CKEditori kasutusjuhendit',moreInfo:'Litsentsi andmed leiab meie veebilehelt:',copy:'Copyright &copy; $1. Kõik õigused kaitstud.'},maximize:'Maksimeerimine',minimize:'Minimeerimine',fakeobjects:{anchor:'Ankur',flash:'Flashi animatsioon',iframe:'IFrame',hiddenfield:'Varjatud väli',unknown:'Tundmatu objekt'},resize:'Suuruse muutmiseks lohista',colordialog:{title:'Värvi valimine',options:'Värvi valikud',highlight:'Näidis',selected:'Valitud värv',clear:'Eemalda'},toolbarCollapse:'Tööriistariba peitmine',toolbarExpand:'Tööriistariba näitamine',toolbarGroups:{document:'Dokument',clipboard:'Lõikelaud/tagasivõtmine',editing:'Muutmine',forms:'Vormid',basicstyles:'Põhistiilid',paragraph:'Lõik',links:'Lingid',insert:'Sisesta',styles:'Stiilid',colors:'Värvid',tools:'Tööriistad'},bidi:{ltr:'Teksti suund vasakult paremale',rtl:'Teksti suund paremalt vasakule'},docprops:{label:'Dokumendi omadused',title:'Dokumendi omadused',design:'Disain',meta:'Meta andmed',chooseColor:'Vali',other:'<muu>',docTitle:'Lehekülje tiitel',charset:'Märgistiku kodeering',charsetOther:'Ülejäänud märgistike kodeeringud',charsetASCII:'ASCII',charsetCE:'Kesk-Euroopa',charsetCT:'Hiina traditsiooniline (Big5)',charsetCR:'Kirillisa',charsetGR:'Kreeka',charsetJP:'Jaapani',charsetKR:'Korea',charsetTR:'Türgi',charsetUN:'Unicode (UTF-8)',charsetWE:'Lääne-Euroopa',docType:'Dokumendi tüüppäis',docTypeOther:'Teised dokumendi tüüppäised',xhtmlDec:'Arva kaasa XHTML deklaratsioonid',bgColor:'Taustavärv',bgImage:'Taustapildi URL',bgFixed:'Mittekeritav tagataust',txtColor:'Teksti värv',margin:'Lehekülje äärised',marginTop:'Ülaserv',marginLeft:'Vasakserv',marginRight:'Paremserv',marginBottom:'Alaserv',metaKeywords:'Dokumendi võtmesõnad (eraldatud komadega)',metaDescription:'Dokumendi kirjeldus',metaAuthor:'Autor',metaCopyright:'Autoriõigus',previewHtml:'<p>See on <strong>näidistekst</strong>. Sa kasutad <a href="javascript:void(0)">CKEditori</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/eu.js b/web/imcms/ckeditor/lang/eu.js
new file mode 100644
index 0000000000..a8135da2f7
--- /dev/null
+++ b/web/imcms/ckeditor/lang/eu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.eu={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'HTML Iturburua',newPage:'Orrialde Berria',save:'Gorde',preview:'Aurrebista',cut:'Ebaki',copy:'Kopiatu',paste:'Itsatsi',print:'Inprimatu',underline:'Azpimarratu',bold:'Lodia',italic:'Etzana',selectAll:'Hautatu dena',removeFormat:'Kendu Formatua',strike:'Marratua',subscript:'Azpi-indize',superscript:'Goi-indize',horizontalrule:'Txertatu Marra Horizontala',pagebreak:'Txertatu Orrialde-jauzia',pagebreakAlt:'Page Break',unlink:'Kendu Esteka',undo:'Desegin',redo:'Berregin',common:{browseServer:'Zerbitzaria arakatu',url:'URL',protocol:'Protokoloa',upload:'Gora kargatu',uploadSubmit:'Zerbitzarira bidalia',image:'Irudia',flash:'Flasha',form:'Formularioa',checkbox:'Kontrol-laukia',radio:'Aukera-botoia',textField:'Testu Eremua',textarea:'Testu-area',hiddenField:'Ezkutuko Eremua',button:'Botoia',select:'Hautespen Eremua',imageButton:'Irudi Botoia',notSet:'<Ezarri gabe>',id:'Id',name:'Izena',langDir:'Hizkuntzaren Norabidea',langDirLtr:'Ezkerretik Eskumara(LTR)',langDirRtl:'Eskumatik Ezkerrera (RTL)',langCode:'Hizkuntza Kodea',longDescr:'URL Deskribapen Luzea',cssClass:'Estilo-orriko Klaseak',advisoryTitle:'Izenburua',cssStyle:'Estiloa',ok:'Ados',cancel:'Utzi',close:'Close',preview:'Preview',generalTab:'Orokorra',advancedTab:'Aurreratua',validateNumberFailed:'Balio hau ez da zenbaki bat.',confirmNewPage:'Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?',confirmCancel:'Aukera batzuk aldatu egin dira. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Zabalera',height:'Altuera',align:'Lerrokatu',alignLeft:'Ezkerrera',alignRight:'Eskuman',alignCenter:'Erdian',alignTop:'Goian',alignMiddle:'Erdian',alignBottom:'Behean',invalidValue:'Invalid value.',invalidHeight:'Altuera zenbaki bat izan behar da.',invalidWidth:'Zabalera zenbaki bat izan behar da.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, erabilezina</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Txertatu Karaktere Berezia',title:'Karaktere Berezia Aukeratu',options:'Special Character Options'},link:{toolbar:'Txertatu/Editatu Esteka',other:'<other>',menu:'Aldatu Esteka',title:'Esteka',info:'Estekaren Informazioa',target:'Target (Helburua)',upload:'Gora kargatu',advanced:'Aurreratua',type:'Esteka Mota',toUrl:'URL',toAnchor:'Aingura orrialde honetan',toEmail:'ePosta',targetFrame:'<marko>',targetPopup:'<popup leihoa>',targetFrameName:'Marko Helburuaren Izena',targetPopupName:'Popup Leihoaren Izena',popupFeatures:'Popup Leihoaren Ezaugarriak',popupResizable:'Tamaina Aldakorra',popupStatusBar:'Egoera Barra',popupLocationBar:'Kokaleku Barra',popupToolbar:'Tresna Barra',popupMenuBar:'Menu Barra',popupFullScreen:'Pantaila Osoa (IE)',popupScrollBars:'Korritze Barrak',popupDependent:'Menpekoa (Netscape)',popupLeft:'Ezkerreko  Posizioa',popupTop:'Goiko Posizioa',id:'Id',langDir:'Hizkuntzaren Norabidea',langDirLTR:'Ezkerretik Eskumara(LTR)',langDirRTL:'Eskumatik Ezkerrera (RTL)',acccessKey:'Sarbide-gakoa',name:'Izena',langCode:'Hizkuntzaren Norabidea',tabIndex:'Tabulazio Indizea',advisoryTitle:'Izenburua',advisoryContentType:'Eduki Mota (Content Type)',cssClasses:'Estilo-orriko Klaseak',charset:'Estekatutako Karaktere Multzoa',styles:'Estiloa',rel:'Relationship',selectAnchor:'Aingura bat hautatu',anchorName:'Aingura izenagatik',anchorId:'Elementuaren ID-gatik',emailAddress:'ePosta Helbidea',emailSubject:'Mezuaren Gaia',emailBody:'Mezuaren Gorputza',noAnchors:'(Ez daude aingurak eskuragarri dokumentuan)',noUrl:'Mesedez URL esteka idatzi',noEmail:'Mesedez ePosta helbidea idatzi'},anchor:{toolbar:'Aingura',menu:'Ainguraren Ezaugarriak',title:'Ainguraren Ezaugarriak',name:'Ainguraren Izena',errorName:'Idatzi ainguraren izena',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Bilatu eta Ordeztu',find:'Bilatu',replace:'Ordezkatu',findWhat:'Zer bilatu:',replaceWith:'Zerekin ordeztu:',notFoundMsg:'Idatzitako testua ez da topatu.',findOptions:'Find Options',matchCase:'Maiuskula/minuskula',matchWord:'Esaldi osoa bilatu',matchCyclic:'Bilaketa ziklikoa',replaceAll:'Ordeztu Guztiak',replaceSuccessMsg:'Zenbat aldiz ordeztua: %1'},table:{toolbar:'Taula',title:'Taularen Ezaugarriak',menu:'Taularen Ezaugarriak',deleteTable:'Ezabatu Taula',rows:'Lerroak',columns:'Zutabeak',border:'Ertzaren Zabalera',widthPx:'pixel',widthPc:'ehuneko',widthUnit:'width unit',cellSpace:'Gelaxka arteko tartea',cellPad:'Gelaxken betegarria',caption:'Epigrafea',summary:'Laburpena',headers:'Goiburuak',headersNone:'Bat ere ez',headersColumn:'Lehen zutabea',headersRow:'Lehen lerroa',headersBoth:'Biak',invalidRows:'Lerro kopurua 0 baino handiagoa den zenbakia izan behar da.',invalidCols:'Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.',invalidBorder:'Ertzaren tamaina zenbaki bat izan behar da.',invalidWidth:'Taularen zabalera zenbaki bat izan behar da.',invalidHeight:'Taularen altuera zenbaki bat izan behar da.',invalidCellSpacing:'Gelaxka arteko tartea zenbaki bat izan behar da.',invalidCellPadding:'Gelaxken betegarria zenbaki bat izan behar da.',cell:{menu:'Gelaxka',insertBefore:'Txertatu Gelaxka Aurretik',insertAfter:'Txertatu Gelaxka Ostean',deleteCell:'Kendu Gelaxkak',merge:'Batu Gelaxkak',mergeRight:'Elkartu Eskumara',mergeDown:'Elkartu Behera',splitHorizontal:'Banatu Gelaxkak Horizontalki',splitVertical:'Banatu Gelaxkak Bertikalki',title:'Gelaxken Ezaugarriak',cellType:'Gelaxka Mota',rowSpan:'Hedatutako Lerroak',colSpan:'Hedatutako Zutabeak',wordWrap:'Itzulbira',hAlign:'Lerrokatze Horizontala',vAlign:'Lerrokatze Bertikala',alignBaseline:'Oinarri-lerroan',bgColor:'Fondoaren Kolorea',borderColor:'Ertzaren Kolorea',data:'Data',header:'Goiburua',yes:'Bai',no:'Ez',invalidWidth:'Gelaxkaren zabalera zenbaki bat izan behar da.',invalidHeight:'Gelaxkaren altuera zenbaki bat izan behar da.',invalidRowSpan:'Lerroen hedapena zenbaki osoa izan behar da.',invalidColSpan:'Zutabeen hedapena zenbaki osoa izan behar da.',chooseColor:'Choose'},row:{menu:'Lerroa',insertBefore:'Txertatu Lerroa Aurretik',insertAfter:'Txertatu Lerroa Ostean',deleteRow:'Ezabatu Lerroak'},column:{menu:'Zutabea',insertBefore:'Txertatu Zutabea Aurretik',insertAfter:'Txertatu Zutabea Ostean',deleteColumn:'Ezabatu Zutabeak'}},button:{title:'Botoiaren Ezaugarriak',text:'Testua (Balorea)',type:'Mota',typeBtn:'Botoia',typeSbm:'Bidali',typeRst:'Garbitu'},checkboxAndRadio:{checkboxTitle:'Kontrol-laukiko Ezaugarriak',radioTitle:'Aukera-botoiaren Ezaugarriak',value:'Balorea',selected:'Hautatuta'},form:{title:'Formularioaren Ezaugarriak',menu:'Formularioaren Ezaugarriak',action:'Ekintza',method:'Metodoa',encoding:'Kodeketa'},select:{title:'Hautespen Eremuaren Ezaugarriak',selectInfo:'Informazioa',opAvail:'Aukera Eskuragarriak',value:'Balorea',size:'Tamaina',lines:'lerro kopurura',chkMulti:'Hautaketa anitzak baimendu',opText:'Testua',opValue:'Balorea',btnAdd:'Gehitu',btnModify:'Aldatu',btnUp:'Gora',btnDown:'Behera',btnSetValue:'Aukeratutako balorea ezarri',btnDelete:'Ezabatu'},textarea:{title:'Testu-arearen Ezaugarriak',cols:'Zutabeak',rows:'Lerroak'},textfield:{title:'Testu Eremuaren Ezaugarriak',name:'Izena',value:'Balorea',charWidth:'Zabalera',maxChars:'Zenbat karaktere gehienez',type:'Mota',typeText:'Testua',typePass:'Pasahitza'},hidden:{title:'Ezkutuko Eremuaren Ezaugarriak',name:'Izena',value:'Balorea'},image:{title:'Irudi Ezaugarriak',titleButton:'Irudi Botoiaren Ezaugarriak',menu:'Irudi Ezaugarriak',infoTab:'Irudi informazioa',btnUpload:'Zerbitzarira bidalia',upload:'Gora Kargatu',alt:'Ordezko Testua',lockRatio:'Erlazioa Blokeatu',resetSize:'Tamaina Berrezarri',border:'Ertza',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Mesedez Irudiaren URLa idatzi',linkTab:'Esteka',button2Img:'Aukeratutako irudi botoia, irudi normal batean eraldatu nahi duzu?',img2Button:'Aukeratutako irudia, irudi botoi batean eraldatu nahi duzu?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flasharen Ezaugarriak',propertiesTab:'Ezaugarriak',title:'Flasharen Ezaugarriak',chkPlay:'Automatikoki Erreproduzitu',chkLoop:'Begizta',chkMenu:'Flasharen Menua Gaitu',chkFull:'Onartu Pantaila osoa',scale:'Eskalatu',scaleAll:'Dena erakutsi',scaleNoBorder:'Ertzik gabe',scaleFit:'Doitu',access:'Scriptak baimendu',accessAlways:'Beti',accessSameDomain:'Domeinu berdinekoak',accessNever:'Inoiz ere ez',alignAbsBottom:'Abs Behean',alignAbsMiddle:'Abs Erdian',alignBaseline:'Oinan',alignTextTop:'Testua Goian',quality:'Kalitatea',qualityBest:'Hoberena',qualityHigh:'Altua',qualityAutoHigh:'Auto Altua',qualityMedium:'Ertaina',qualityAutoLow:'Auto Baxua',qualityLow:'Baxua',windowModeWindow:'Leihoa',windowModeOpaque:'Opakoa',windowModeTransparent:'Gardena',windowMode:'Leihoaren modua',flashvars:'Flash Aldagaiak',bgcolor:'Atzeko kolorea',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Mesedez URL esteka idatzi',validateHSpace:'HSpace zenbaki bat izan behar da.',validateVSpace:'VSpace zenbaki bat izan behar da.'},spellCheck:{toolbar:'Ortografia',title:'Ortografia zuzenketa',notAvailable:'Barkatu baina momentu honetan zerbitzua ez dago erabilgarri.',errorLoading:'Errorea gertatu da aplikazioa zerbitzaritik kargatzean: %s.',notInDic:'Ez dago hiztegian',changeTo:'Honekin ordezkatu',btnIgnore:'Ezikusi',btnIgnoreAll:'Denak Ezikusi',btnReplace:'Ordezkatu',btnReplaceAll:'Denak Ordezkatu',btnUndo:'Desegin',noSuggestions:'- Iradokizunik ez -',progress:'Zuzenketa ortografikoa martxan...',noMispell:'Zuzenketa ortografikoa bukatuta: Akatsik ez',noChanges:'Zuzenketa ortografikoa bukatuta: Ez da ezer aldatu',oneChange:'Zuzenketa ortografikoa bukatuta: Hitz bat aldatu da',manyChanges:'Zuzenketa ortografikoa bukatuta: %1 hitz aldatu dira',ieSpellDownload:'Zuzentzaile ortografikoa ez dago instalatuta. Deskargatu nahi duzu?'},smiley:{toolbar:'Aurpegierak',title:'Aurpegiera Sartu',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 elementua'},numberedlist:'Zenbakidun Zerrenda',bulletedlist:'Buletdun Zerrenda',indent:'Handitu Koska',outdent:'Txikitu Koska',justify:{left:'Lerrokatu Ezkerrean',center:'Lerrokatu Erdian',right:'Lerrokatu Eskuman',block:'Justifikatu'},blockquote:'Aipamen blokea',clipboard:{title:'Itsatsi',cutError:'Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki moztea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl/Cmd+X).',copyError:'Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki kopiatzea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl/Cmd+C).',pasteMsg:'Mesedez teklatua erabilita (<STRONG>Ctrl/Cmd+V</STRONG>) ondorego eremuan testua itsatsi eta <STRONG>OK</STRONG> sakatu.',securityMsg:'Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'Itsatsi nahi duzun testua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?',toolbar:'Itsatsi Word-etik',title:'Itsatsi Word-etik',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Testu Arrunta bezala Itsatsi',title:'Testu Arrunta bezala Itsatsi'},templates:{button:'Txantiloiak',title:'Eduki Txantiloiak',options:'Template Options',insertOption:'Ordeztu oraingo edukiak',selectPromptMsg:'Mesedez txantiloia aukeratu editorean kargatzeko<br>(orain dauden edukiak galduko dira):',emptyListMsg:'(Ez dago definitutako txantiloirik)'},showBlocks:'Blokeak erakutsi',stylesCombo:{label:'Estiloa',panelTitle:'Formatting Styles',panelTitle1:'Bloke Estiloak',panelTitle2:'Inline Estiloak',panelTitle3:'Objektu Estiloak'},format:{label:'Formatua',panelTitle:'Formatua',tag_p:'Arrunta',tag_pre:'Formateatua',tag_address:'Helbidea',tag_h1:'Izenburua 1',tag_h2:'Izenburua 2',tag_h3:'Izenburua 3',tag_h4:'Izenburua 4',tag_h5:'Izenburua 5',tag_h6:'Izenburua 6',tag_div:'Paragrafoa (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Letra-tipoa',voiceLabel:'Letra-tipoa',panelTitle:'Letra-tipoa'},fontSize:{label:'Tamaina',voiceLabel:'Tamaina',panelTitle:'Tamaina'},colorButton:{textColorTitle:'Testu Kolorea',bgColorTitle:'Atzeko kolorea',panelTitle:'Colors',auto:'Automatikoa',more:'Kolore gehiago...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Ortografia Zuzenketa Idatzi Ahala (SCAYT)',opera_title:'Not supported by Opera',enable:'Gaitu SCAYT',disable:'Desgaitu SCAYT',about:'SCAYTi buruz',toggle:'SCAYT aldatu',options:'Aukerak',langs:'Hizkuntzak',moreSuggestions:'Iradokizun gehiago',ignore:'Baztertu',ignoreAll:'Denak baztertu',addWord:'Hitza Gehitu',emptyDic:'Hiztegiaren izena ezin da hutsik egon.',noSuggestions:'Iradokizunik ez',optionsTab:'Aukerak',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Hizkuntzak',dictionariesTab:'Hiztegiak',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'Honi buruz'},about:{title:'CKEditor(r)i buruz',dlgTitle:'CKEditor(r)i buruz',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Lizentziari buruzko informazioa gure webgunean:',copy:'Copyright &copy; $1. Eskubide guztiak erreserbaturik.'},maximize:'Maximizatu',minimize:'Minimize',fakeobjects:{anchor:'Aingura',flash:'Flash Animazioa',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Objektu ezezaguna'},resize:'Arrastatu tamaina aldatzeko',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Dokumentuaren Ezarpenak',title:'Dokumentuaren Ezarpenak',design:'Design',meta:'Meta Informazioa',chooseColor:'Choose',other:'<other>',docTitle:'Orriaren Izenburua',charset:'Karaktere Multzoaren Kodeketa',charsetOther:'Beste Karaktere Multzoko Kodeketa',charsetASCII:'ASCII',charsetCE:'Erdialdeko Europakoa',charsetCT:'Txinatar Tradizionala (Big5)',charsetCR:'Zirilikoa',charsetGR:'Grekoa',charsetJP:'Japoniarra',charsetKR:'Korearra',charsetTR:'Turkiarra',charsetUN:'Unicode (UTF-8)',charsetWE:'Mendebaldeko Europakoa',docType:'Document Type Goiburua',docTypeOther:'Beste Document Type Goiburua',xhtmlDec:'XHTML Ezarpenak',bgColor:'Atzeko Kolorea',bgImage:'Atzeko Irudiaren URL-a',bgFixed:'Korritze gabeko Atzealdea',txtColor:'Testu Kolorea',margin:'Orrialdearen marjinak',marginTop:'Goian',marginLeft:'Ezkerrean',marginRight:'Eskuman',marginBottom:'Behean',metaKeywords:'Dokumentuaren Gako-hitzak (komarekin bananduta)',metaDescription:'Dokumentuaren Deskribapena',metaAuthor:'Egilea',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/fa.js b/web/imcms/ckeditor/lang/fa.js
new file mode 100644
index 0000000000..2dab558ab7
--- /dev/null
+++ b/web/imcms/ckeditor/lang/fa.js
@@ -0,0 +1,822 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Defines the {@link CKEDITOR.lang} object for the
+ * Persian language.
+ */
+
+/**#@+
+   @type String
+   @example
+*/
+
+/**
+ * Contains the dictionary of language entries.
+ * @namespace
+ */
+CKEDITOR.lang['fa'] =
+{
+	/**
+	 * The language reading direction. Possible values are "rtl" for
+	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
+	 * languages (like English).
+	 * @default 'ltr'
+	 */
+	dir : 'rtl',
+
+	/*
+	 * Screenreader titles. Please note that screenreaders are not always capable
+	 * of reading non-English words. So be careful while translating it.
+	 */
+	editorTitle : 'ویرایشگر متن غنی, %1',
+	editorHelp : 'کلید Alt+0 را برای راهنمایی ب�شارید',
+
+	// ARIA descriptions.
+	toolbars	: 'نوار ابزار',
+	editor		: 'ویرایشگر متن غنی',
+
+	// Toolbar buttons without dialogs.
+	source			: 'منبع',
+	newPage			: 'برگهٴ تازه',
+	save			: 'ذخیره',
+	preview			: 'پیشنمایش',
+	cut				: 'برش',
+	copy			: 'کپی',
+	paste			: 'چسباندن',
+	print			: 'چاپ',
+	underline		: 'زیرخطدار',
+	bold			: 'درشت',
+	italic			: 'خمیده',
+	selectAll		: 'گزینش همه',
+	removeFormat	: 'برداشتن �رمت',
+	strike			: 'میانخط',
+	subscript		: 'زیرنویس',
+	superscript		: 'بالانویس',
+	horizontalrule	: 'گنجاندن خط ا�قی',
+	pagebreak		: 'گنجاندن شکستگی پایان برگه',
+	pagebreakAlt		: 'شکستن ص�حه',
+	unlink			: 'برداشتن پیوند',
+	undo			: 'واچیدن',
+	redo			: 'بازچیدن',
+
+	// Common messages and labels.
+	common :
+	{
+		browseServer	: '�هرستنمایی سرور',
+		url				: 'URL',
+		protocol		: 'پروتکل',
+		upload			: 'انتقال به سرور',
+		uploadSubmit	: 'به سرور ب�رست',
+		image			: 'تصویر',
+		flash			: '�لش',
+		form			: '�رم',
+		checkbox		: 'خانهٴ گزینهای',
+		radio			: 'دکمهٴ رادیویی',
+		textField		: '�یلد متنی',
+		textarea		: 'ناحیهٴ متنی',
+		hiddenField		: '�یلد پنهان',
+		button			: 'دکمه',
+		select			: '�یلد چندگزینهای',
+		imageButton		: 'دکمهٴ تصویری',
+		notSet			: '<تعین نشده>',
+		id				: 'شناسه',
+		name			: 'نام',
+		langDir			: 'جهتنمای زبان',
+		langDirLtr		: 'چپ به راست (LTR)',
+		langDirRtl		: 'راست به چپ (RTL)',
+		langCode		: 'کد زبان',
+		longDescr		: 'URL توصی� طولانی',
+		cssClass		: 'کلاسهای شیوهنامه(Stylesheet)',
+		advisoryTitle	: 'عنوان کمکی',
+		cssStyle		: 'شیوه(style)',
+		ok				: 'پذیرش',
+		cancel			: 'انصرا�',
+		close			: 'بستن',
+		preview			: 'پیشنمایش',
+		generalTab		: 'عمومی',
+		advancedTab		: 'پیشر�ته',
+		validateNumberFailed : 'این مقدار یک عدد نیست.',
+		confirmNewPage	: 'هر تغییر ایجاد شدهی ذخیره نشده از بین خواهد ر�ت. آیا اطمینان دارید که قصد بارگیری ص�حه جدیدی را دارید؟',
+		confirmCancel	: 'برخی از گزینهها تغییر کردهاند. آیا واقعا قصد بستن این پنجره را دارید؟',
+		options			: 'گزینهها',
+		target			: 'مسیر',
+		targetNew		: 'پنجره جدید (_blank)',
+		targetTop		: 'بالاترین پنجره (_top)',
+		targetSelf		: 'همان پنجره (_self)',
+		targetParent	: 'پنجره والد (_parent)',
+		langDirLTR		: 'چپ به راست (LTR)',
+		langDirRTL		: 'راست به چپ (RTL)',
+		styles			: 'سبک',
+		cssClasses		: 'کلاسهای شیوهنامه',
+		width			: 'پهنا',
+		height			: 'درازا',
+		align			: 'چینش',
+		alignLeft		: 'Ú†Ù¾',
+		alignRight		: 'راست',
+		alignCenter		: 'وسط',
+		alignTop		: 'بالا',
+		alignMiddle		: 'وسط',
+		alignBottom		: 'پائین',
+		invalidValue	: 'Invalid value.', // MISSING
+		invalidHeight	: 'ارت�اع باید یک عدد باشد.',
+		invalidWidth	: 'پهنا باید یک عدد باشد.',
+		invalidCssLength	: 'عدد تعیین شده برای �یلد "%1" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).',
+		invalidHtmlLength	: 'عدد تعیین شده برای �یلد "%1" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).',
+		invalidInlineStyle	: 'عدد تعیین شده برای سبک درونخطی(Inline Style) باید دارای یک یا چند چندتایی با شکلی شبیه "name : value" که باید با یک ","(semi-colons) از هم جدا شوند.',
+		cssLengthTooltip	: 'یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).',
+
+		// Put the voice-only part of the label in the span.
+		unavailable		: '%1<span class="cke_accessibility">، غیر قابل دسترس</span>'
+	},
+
+	contextmenu :
+	{
+		options : 'گزینههای منوی زمینه'
+	},
+
+	// Special char dialog.
+	specialChar		:
+	{
+		toolbar		: 'گنجاندن نویسهٴ ویژه',
+		title		: 'گزینش نویسهٴ ویژه',
+		options : 'گزینههای نویسههای ویژه'
+	},
+
+	// Link dialog.
+	link :
+	{
+		toolbar		: 'گنجاندن/ویرایش پیوند',
+		other 		: '<سایر>',
+		menu		: 'ویرایش پیوند',
+		title		: 'پیوند',
+		info		: 'اطلاعات پیوند',
+		target		: 'مقصد',
+		upload		: 'انتقال به سرور',
+		advanced	: 'پیشر�ته',
+		type		: 'نوع پیوند',
+		toUrl		: 'URL',
+		toAnchor	: 'لنگر در همین ص�حه',
+		toEmail		: 'پست الکترونیکی',
+		targetFrame		: '<�ریم>',
+		targetPopup		: '<پنجرهٴ پاپاپ>',
+		targetFrameName	: 'نام �ریم مقصد',
+		targetPopupName	: 'نام پنجرهٴ پاپاپ',
+		popupFeatures	: 'ویژگیهای پنجرهٴ پاپاپ',
+		popupResizable	: 'قابل تغییر اندازه',
+		popupStatusBar	: 'نوار وضعیت',
+		popupLocationBar: 'نوار موقعیت',
+		popupToolbar	: 'نوارابزار',
+		popupMenuBar	: 'نوار منو',
+		popupFullScreen	: 'تمامص�حه (IE)',
+		popupScrollBars	: 'میلههای پیمایش',
+		popupDependent	: 'وابسته (Netscape)',
+		popupLeft		: 'موقعیت چپ',
+		popupTop		: 'موقعیت بالا',
+		id				: 'شناسه',
+		langDir			: 'جهتنمای زبان',
+		langDirLTR		: 'چپ به راست (LTR)',
+		langDirRTL		: 'راست به چپ (RTL)',
+		acccessKey		: 'کلید دستیابی',
+		name			: 'نام',
+		langCode			: 'جهتنمای زبان',
+		tabIndex			: 'نمایهٴ دسترسی با برگه',
+		advisoryTitle		: 'عنوان کمکی',
+		advisoryContentType	: 'نوع محتوای کمکی',
+		cssClasses		: 'کلاسهای شیوهنامه(Stylesheet)',
+		charset			: 'نویسهگان منبع پیوند شده',
+		styles			: 'شیوه(style)',
+		rel			: 'وابستگی',
+		selectAnchor		: 'یک لنگر برگزینید',
+		anchorName		: 'با نام لنگر',
+		anchorId			: 'با شناسهٴ المان',
+		emailAddress		: 'نشانی پست الکترونیکی',
+		emailSubject		: 'موضوع پیام',
+		emailBody		: 'متن پیام',
+		noAnchors		: '(در این سند لنگری دردسترس نیست)',
+		noUrl			: 'لط�ا URL پیوند را بنویسید',
+		noEmail			: 'لط�ا نشانی پست الکترونیکی را بنویسید'
+	},
+
+	// Anchor dialog
+	anchor :
+	{
+		toolbar		: 'گنجاندن/ویرایش لنگر',
+		menu		: 'ویژگیهای لنگر',
+		title		: 'ویژگیهای لنگر',
+		name		: 'نام لنگر',
+		errorName	: 'لط�ا نام لنگر را بنویسید',
+		remove		: 'حذ� لنگر'
+	},
+
+	// List style dialog
+	list:
+	{
+		numberedTitle		: 'ویژگیهای �هرست شمارهدار',
+		bulletedTitle		: 'ویژگیهای �هرست گلولهدار',
+		type				: 'نوع',
+		start				: 'شروع',
+		validateStartNumber				:'�هرست شماره شروع باید یک عدد صحیح باشد.',
+		circle				: 'دایره',
+		disc				: 'ص�حه گرد',
+		square				: 'چهارگوش',
+		none				: 'هیچ',
+		notset				: '<تنظیم نشده>',
+		armenian			: 'شمارهگذاری ارمنی',
+		georgian			: 'شمارهگذاری گریگورین (an, ban, gan, etc.)',
+		lowerRoman			: 'پانویس رومی (i, ii, iii, iv, v, etc.)',
+		upperRoman			: 'بالانویس رومی (I, II, III, IV, V, etc.)',
+		lowerAlpha			: 'پانویس ال�بایی (a, b, c, d, e, etc.)',
+		upperAlpha			: 'بالانویس ال�بایی (A, B, C, D, E, etc.)',
+		lowerGreek			: 'پانویس یونانی (alpha, beta, gamma, etc.)',
+		decimal				: 'دهدهی (1, 2, 3, etc.)',
+		decimalLeadingZero	: 'دهدهی همراه با ص�ر (01, 02, 03, etc.)'
+	},
+
+	// Find And Replace Dialog
+	findAndReplace :
+	{
+		title				: 'جستجو و جایگزینی',
+		find				: 'جستجو',
+		replace				: 'جایگزینی',
+		findWhat			: 'چه چیز را مییابید:',
+		replaceWith			: 'جایگزینی با:',
+		notFoundMsg			: 'متن موردنظر یا�ت نشد.',
+		findOptions			: 'گزینههای جستجو',
+		matchCase			: 'همسانی در بزرگی و کوچکی نویسهها',
+		matchWord			: 'همسانی با واژهٴ کامل',
+		matchCyclic			: 'همسانی با چرخه',
+		replaceAll			: 'جایگزینی همهٴ یا�تهها',
+		replaceSuccessMsg	: '%1 رخداد جایگزین شد.'
+	},
+
+	// Table Dialog
+	table :
+	{
+		toolbar		: 'جدول',
+		title		: 'ویژگیهای جدول',
+		menu		: 'ویژگیهای جدول',
+		deleteTable	: 'پاک کردن جدول',
+		rows		: 'سطرها',
+		columns		: 'ستونها',
+		border		: 'اندازهٴ لبه',
+		widthPx		: 'پیکسل',
+		widthPc		: 'درصد',
+		widthUnit	: 'واحد پهنا',
+		cellSpace	: '�اصلهٴ میان سلولها',
+		cellPad		: '�اصلهٴ پرشده در سلول',
+		caption		: 'عنوان',
+		summary		: 'خلاصه',
+		headers		: 'سرنویسها',
+		headersNone		: 'هیچ',
+		headersColumn	: 'اولین ستون',
+		headersRow		: 'اولین ردی�',
+		headersBoth		: 'هردو',
+		invalidRows		: 'تعداد ردی�ها باید یک عدد بزرگتر از 0 باشد.',
+		invalidCols		: 'تعداد ستونها باید یک عدد بزرگتر از 0 باشد.',
+		invalidBorder	: 'مقدار اندازه خطوط باید یک عدد باشد.',
+		invalidWidth	: 'مقدار پهنای جدول باید یک عدد باشد.',
+		invalidHeight	: 'مقدار ارت�اع  جدول باید یک عدد باشد.',
+		invalidCellSpacing	: 'مقدار �اصلهگذاری سلول باید یک عدد باشد.',
+		invalidCellPadding	: 'بالشتک سلول باید یک عدد باشد.',
+
+		cell :
+		{
+			menu			: 'سلول',
+			insertBefore	: 'ا�زودن سلول قبل از',
+			insertAfter		: 'ا�زودن سلول بعد از',
+			deleteCell		: 'حذ� سلولها',
+			merge			: 'ادغام سلولها',
+			mergeRight		: 'ادغام به راست',
+			mergeDown		: 'ادغام به پایین',
+			splitHorizontal	: 'جدا کردن ا�قی سلول',
+			splitVertical	: 'جدا کردن عمودی سلول',
+			title			: 'ویژگیهای سلول',
+			cellType		: 'نوع سلول',
+			rowSpan			: 'محدوده ردی�ها',
+			colSpan			: 'محدوده ستونها',
+			wordWrap		: 'شکستن کلمه',
+			hAlign			: 'چینش ا�قی',
+			vAlign			: 'چینش عمودی',
+			alignBaseline	: 'خط مبنا',
+			bgColor			: 'رنگ زمینه',
+			borderColor		: 'رنگ خطوط',
+			data			: 'اطلاعات',
+			header			: 'سرنویس',
+			yes				: 'بله',
+			no				: 'خیر',
+			invalidWidth	: 'عرض سلول باید یک عدد باشد.',
+			invalidHeight	: 'ارت�اع سلول باید عدد باشد.',
+			invalidRowSpan	: 'مقدار محدوده ردی�ها باید یک عدد باشد.',
+			invalidColSpan	: 'مقدار محدوده ستونها باید یک عدد باشد.',
+			chooseColor		: 'انتخاب'
+		},
+
+		row :
+		{
+			menu			: 'سطر',
+			insertBefore	: 'ا�زودن سطر قبل از',
+			insertAfter		: 'ا�زودن سطر بعد از',
+			deleteRow		: 'حذ� سطرها'
+		},
+
+		column :
+		{
+			menu			: 'ستون',
+			insertBefore	: 'ا�زودن ستون قبل از',
+			insertAfter		: 'ا�زودن ستون بعد از',
+			deleteColumn	: 'حذ� ستونها'
+		}
+	},
+
+	// Button Dialog.
+	button :
+	{
+		title		: 'ویژگیهای دکمه',
+		text		: 'متن (مقدار)',
+		type		: 'نوع',
+		typeBtn		: 'دکمه',
+		typeSbm		: 'ثبت',
+		typeRst		: 'بازنشانی (Reset)'
+	},
+
+	// Checkbox and Radio Button Dialogs.
+	checkboxAndRadio :
+	{
+		checkboxTitle : 'ویژگیهای خانهٴ گزینهای',
+		radioTitle	: 'ویژگیهای دکمهٴ رادیویی',
+		value		: 'مقدار',
+		selected	: 'برگزیده'
+	},
+
+	// Form Dialog.
+	form :
+	{
+		title		: 'ویژگیهای �رم',
+		menu		: 'ویژگیهای �رم',
+		action		: 'رویداد',
+		method		: 'متد',
+		encoding	: 'رمزنگاری'
+	},
+
+	// Select Field Dialog.
+	select :
+	{
+		title		: 'ویژگیهای �یلد چندگزینهای',
+		selectInfo	: 'اطلاعات',
+		opAvail		: 'گزینههای دردسترس',
+		value		: 'مقدار',
+		size		: 'اندازه',
+		lines		: 'خطوط',
+		chkMulti	: 'گزینش چندگانه �راهم باشد',
+		opText		: 'متن',
+		opValue		: 'مقدار',
+		btnAdd		: 'ا�زودن',
+		btnModify	: 'ویرایش',
+		btnUp		: 'بالا',
+		btnDown		: 'پائین',
+		btnSetValue : 'تنظیم به عنوان مقدار برگزیده',
+		btnDelete	: 'پاککردن'
+	},
+
+	// Textarea Dialog.
+	textarea :
+	{
+		title		: 'ویژگیهای ناحیهٴ متنی',
+		cols		: 'ستونها',
+		rows		: 'سطرها'
+	},
+
+	// Text Field Dialog.
+	textfield :
+	{
+		title		: 'ویژگیهای �یلد متنی',
+		name		: 'نام',
+		value		: 'مقدار',
+		charWidth	: 'پهنای نویسه',
+		maxChars	: 'بیشینهٴ نویسهها',
+		type		: 'نوع',
+		typeText	: 'متن',
+		typePass	: 'گذرواژه'
+	},
+
+	// Hidden Field Dialog.
+	hidden :
+	{
+		title	: 'ویژگیهای �یلد پنهان',
+		name	: 'نام',
+		value	: 'مقدار'
+	},
+
+	// Image Dialog.
+	image :
+	{
+		title		: 'ویژگیهای تصویر',
+		titleButton	: 'ویژگیهای دکمهٴ تصویری',
+		menu		: 'ویژگیهای تصویر',
+		infoTab		: 'اطلاعات تصویر',
+		btnUpload	: 'به سرور ب�رست',
+		upload		: 'انتقال به سرور',
+		alt			: 'متن جایگزین',
+		lockRatio	: 'ق�ل کردن نسبت',
+		resetSize	: 'بازنشانی اندازه',
+		border		: 'لبه',
+		hSpace		: '�اصلهٴ ا�قی',
+		vSpace		: '�اصلهٴ عمودی',
+		alertUrl	: 'لط�ا URL تصویر را بنویسید',
+		linkTab		: 'پیوند',
+		button2Img	: 'آیا مایلید از یک تصویر ساده روی دکمه تصویری انتخاب شده است�اده کنید؟',
+		img2Button	: 'آیا مایلید از یک دکمه تصویری روی تصویر انتخاب شده است�اده کنید؟',
+		urlMissing	: 'آدرس URL اصلی تصویر یا�ت نشد.',
+		validateBorder	: 'مقدار خطوط باید یک عدد باشد.',
+		validateHSpace	: 'مقدار �اصلهگذاری ا�قی باید یک عدد باشد.',
+		validateVSpace	: 'مقدار �اصلهگذاری عمودی باید یک عدد باشد.'
+	},
+
+	// Flash Dialog
+	flash :
+	{
+		properties		: 'ویژگیهای �لش',
+		propertiesTab	: 'ویژگیها',
+		title			: 'ویژگیهای �لش',
+		chkPlay			: 'آغاز خودکار',
+		chkLoop			: 'اجرای پیاپی',
+		chkMenu			: 'در دسترس بودن منوی �لش',
+		chkFull			: 'اجازه تمام ص�حه',
+ 		scale			: 'مقیاس',
+		scaleAll		: 'نمایش همه',
+		scaleNoBorder	: 'بدون کران',
+		scaleFit		: 'جایگیری کامل',
+		access			: 'دسترسی به اسکریپت',
+		accessAlways	: 'همیشه',
+		accessSameDomain: 'همان دامنه',
+		accessNever		: 'هرگز',
+		alignAbsBottom	: 'پائین مطلق',
+		alignAbsMiddle	: 'وسط مطلق',
+		alignBaseline	: 'خط پایه',
+		alignTextTop	: 'متن بالا',
+		quality			: 'کی�یت',
+		qualityBest		: 'بهترین',
+		qualityHigh		: 'بالا',
+		qualityAutoHigh	: 'بالا - خودکار',
+		qualityMedium	: 'متوسط',
+		qualityAutoLow	: 'پایین - خودکار',
+		qualityLow		: 'پایین',
+		windowModeWindow: 'پنجره',
+		windowModeOpaque: 'مات',
+		windowModeTransparent : 'ش�ا�',
+		windowMode		: 'حالت پنجره',
+		flashvars		: 'مقادیر برای �لش',
+		bgcolor			: 'رنگ پسزمینه',
+		hSpace			: '�اصلهٴ ا�قی',
+		vSpace			: '�اصلهٴ عمودی',
+		validateSrc		: 'لط�ا URL پیوند را بنویسید',
+		validateHSpace	: 'مقدار �اصلهگذاری ا�قی باید یک عدد باشد.',
+		validateVSpace	: 'مقدار �اصلهگذاری عمودی باید یک عدد باشد.'
+	},
+
+	// Speller Pages Dialog
+	spellCheck :
+	{
+		toolbar			: 'بررسی املا',
+		title			: 'بررسی املا',
+		notAvailable	: 'با عرض پوزش خدمات الان در دسترس نیستند.',
+		errorLoading	: 'خطا در بارگیری برنامه خدمات میزبان: %s.',
+		notInDic		: 'در واژه~نامه یا�ت نشد',
+		changeTo		: 'تغییر به',
+		btnIgnore		: 'چشمپوشی',
+		btnIgnoreAll	: 'چشمپوشی همه',
+		btnReplace		: 'جایگزینی',
+		btnReplaceAll	: 'جایگزینی همه',
+		btnUndo			: 'واچینش',
+		noSuggestions	: '- پیشنهادی نیست -',
+		progress		: 'بررسی املا در حال انجام...',
+		noMispell		: 'بررسی املا انجام شد. هیچ غلط املائی یا�ت نشد',
+		noChanges		: 'بررسی املا انجام شد. هیچ واژهای تغییر نیا�ت',
+		oneChange		: 'بررسی املا انجام شد. یک واژه تغییر یا�ت',
+		manyChanges		: 'بررسی املا انجام شد. %1 واژه تغییر یا�ت',
+		ieSpellDownload	: 'بررسی کنندهٴ املا نصب نشده است. آیا میخواهید آن را هماکنون دریا�ت کنید؟'
+	},
+
+	smiley :
+	{
+		toolbar	: 'خندانک',
+		title	: 'گنجاندن خندانک',
+		options : 'گزینههای خندانک'
+	},
+
+	elementsPath :
+	{
+		eleLabel : 'مسیر عناصر',
+		eleTitle : '%1 عنصر'
+	},
+
+	numberedlist	: '�هرست شمارهدار',
+	bulletedlist	: '�هرست نقطهای',
+	indent			: 'ا�زایش تور�تگی',
+	outdent			: 'کاهش تور�تگی',
+
+	justify :
+	{
+		left	: 'چپچین',
+		center	: 'میانچین',
+		right	: 'راستچین',
+		block	: 'بلوکچین'
+	},
+
+	blockquote : 'بلوک نقل قول',
+
+	clipboard :
+	{
+		title		: 'چسباندن',
+		cutError	: 'تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لط�ا با دکمههای ص�حه کلید این کار را انجام دهید (Ctrl/Cmd+X).',
+		copyError	: 'تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لط�ا با دکمههای ص�حه کلید این کار را انجام دهید (Ctrl/Cmd+C).',
+		pasteMsg	: 'لط�ا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.',
+		securityMsg	: 'به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.',
+		pasteArea	: 'محل چسباندن'
+	},
+
+	pastefromword :
+	{
+		confirmCleanup	: 'متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟',
+		toolbar			: 'چسباندن از Word',
+		title			: 'چسباندن از Word',
+		error			: 'به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.'
+	},
+
+	pasteText :
+	{
+		button	: 'چسباندن به عنوان متن �ساده',
+		title	: 'چسباندن به عنوان متن �ساده'
+	},
+
+	templates :
+	{
+		button			: 'الگوها',
+		title			: 'الگوهای محتویات',
+		options : 'گزینههای الگو',
+		insertOption	: 'محتویات کنونی جایگزین شوند',
+		selectPromptMsg	: 'لط�ا الگوی موردنظر را برای بازکردن در ویرایشگر برگزینید<br>(محتویات کنونی از دست خواهند ر�ت):',
+		emptyListMsg	: '(الگوئی تعری� نشده است)'
+	},
+
+	showBlocks : 'نمایش بلوکها',
+
+	stylesCombo :
+	{
+		label		: 'سبک',
+		panelTitle	: 'سبکهای قالببندی',
+		panelTitle1	: 'سبکهای بلوک',
+		panelTitle2	: 'سبکهای درونخطی',
+		panelTitle3	: 'سبکهای شیء'
+	},
+
+	format :
+	{
+		label		: '�رمت',
+		panelTitle	: '�رمت',
+
+		tag_p		: 'نرمال',
+		tag_pre		: '�رمت شده',
+		tag_address	: 'آدرس',
+		tag_h1		: 'سرنویس 1',
+		tag_h2		: 'سرنویس 2',
+		tag_h3		: 'سرنویس 3',
+		tag_h4		: 'سرنویس 4',
+		tag_h5		: 'سرنویس 5',
+		tag_h6		: 'سرنویس 6',
+		tag_div		: 'بند'
+	},
+
+	div :
+	{
+		title				: 'ایجاد یک محل DIV',
+		toolbar				: 'ایجاد یک محل DIV',
+		cssClassInputLabel	: 'کلاسهای شیوهنامه',
+		styleSelectLabel	: 'سبک',
+		IdInputLabel		: 'شناسه',
+		languageCodeInputLabel	: ' کد زبان',
+		inlineStyleInputLabel	: 'سبک درونخطی(Inline Style)',
+		advisoryTitleInputLabel	: 'عنوان مشاوره',
+		langDirLabel		: 'جهت نوشتاری زبان',
+		langDirLTRLabel		: 'چپ به راست (LTR)',
+		langDirRTLLabel		: 'راست به چپ (RTL)',
+		edit				: 'ویرایش Div',
+		remove				: 'حذ� Div'
+  	},
+
+	iframe :
+	{
+		title		: 'ویژگیهای IFrame',
+		toolbar		: 'IFrame',
+		noUrl		: 'لط�ا مسیر URL iframe را درج کنید',
+		scrolling	: 'نمایش خطکشها',
+		border		: 'نمایش خطوط frame'
+	},
+
+	font :
+	{
+		label		: 'قلم',
+		voiceLabel	: 'قلم',
+		panelTitle	: 'قلم'
+	},
+
+	fontSize :
+	{
+		label		: 'اندازه',
+		voiceLabel	: 'اندازه قلم',
+		panelTitle	: 'اندازه'
+	},
+
+	colorButton :
+	{
+		textColorTitle	: 'رنگ متن',
+		bgColorTitle	: 'رنگ پسزمینه',
+		panelTitle		: 'رنگها',
+		auto			: 'خودکار',
+		more			: 'رنگهای بیشتر...'
+	},
+
+	colors :
+	{
+		'000' : 'سیاه',
+		'800000' : 'خرمایی',
+		'8B4513' : 'قهوهای شکلاتی',
+		'2F4F4F' : 'ارغوانی مایل به خاکستری',
+		'008080' : 'آبی مایل به خاکستری',
+		'000080' : 'آبی سیر',
+		'4B0082' : 'نیلی',
+		'696969' : 'خاکستری تیره',
+		'B22222' : 'آتش آجری',
+		'A52A2A' : 'قهوهای',
+		'DAA520' : 'میلهی طلایی',
+		'006400' : 'سبز تیره',
+		'40E0D0' : '�یروزهای',
+		'0000CD' : 'آبی روشن',
+		'800080' : 'ارغوانی',
+		'808080' : 'خاکستری',
+		'F00' : 'قرمز',
+		'FF8C00' : 'نارنجی پررنگ',
+		'FFD700' : 'طلایی',
+		'008000' : 'سبز',
+		'0FF' : 'آبی مایل به سبز',
+		'00F' : 'آبی',
+		'EE82EE' : 'بن�ش',
+		'A9A9A9' : 'خاکستری مات',
+		'FFA07A' : 'صورتی کدر روشن',
+		'FFA500' : 'نارنجی',
+		'FFFF00' : 'زرد',
+		'00FF00' : '�س�ری',
+		'AFEEEE' : '�یروزهای رنگ پریده',
+		'ADD8E6' : 'آبی کمرنگ',
+		'DDA0DD' : 'آلویی',
+		'D3D3D3' : 'خاکستری روشن',
+		'FFF0F5' : 'بن�ش کمرنگ',
+		'FAEBD7' : 'عتیقه س�ید',
+		'FFFFE0' : 'زرد روشن',
+		'F0FFF0' : 'عسلی',
+		'F0FFFF' : 'لاجوردی',
+		'F0F8FF' : 'آبی براق',
+		'E6E6FA' : 'بن�ش کمرنگ',
+		'FFF' : 'س�ید'
+	},
+
+	scayt :
+	{
+		title			: 'بررسی املای تایپ شما',
+		opera_title		: 'توسط اپرا پشتیبانی نمیشود',
+		enable			: '�عالسازی SCAYT',
+		disable			: 'غیر�عالسازی SCAYT',
+		about			: 'درباره SCAYT',
+		toggle			: 'ضامن SCAYT',
+		options			: 'گزینهها',
+		langs			: 'زبانها',
+		moreSuggestions	: 'پیشنهادهای بیشتر',
+		ignore			: 'عبور کردن',
+		ignoreAll		: 'عبور کردن از همه',
+		addWord			: 'ا�زودن Word',
+		emptyDic		: 'نام دیکشنری نباید خالی باشد.',
+		noSuggestions	: 'No suggestions', // MISSING
+		optionsTab		: 'گزینهها',
+		allCaps			: 'نادیده گر�تن همه کلاه-واژهها',
+		ignoreDomainNames : 'عبور از نامهای دامنه',
+		mixedCase		: 'عبور از کلماتی مرکب از حرو� بزرگ و کوچک',
+		mixedWithDigits	: 'عبور از کلمات به همراه عدد',
+
+		languagesTab	: 'زبانها',
+
+		dictionariesTab	: 'دیکشنریها',
+		dic_field_name	: 'نام دیکشنری',
+		dic_create		: 'ایجاد',
+		dic_restore		: 'بازیا�ت',
+		dic_delete		: 'حذ�',
+		dic_rename		: 'تغییر نام',
+		dic_info		: 'در ابتدا دیکشنری کاربر در کوکی ذخیره میشود. با این حال، کوکیها در اندازه محدود شدهاند. وقتی که دیکشنری کاربری بزرگ میشود و به نقطهای که نمیتواند در کوکی ذخیره شود، پس از آن دیکشنری ممکن است بر روی سرور ما ذخیره شود. برای ذخیره دیکشنری شخصی شما بر روی سرور ما، باید یک نام برای دیکشنری خود مشخص نمایید. اگر شما قبلا یک دیکشنری روی سرور ما ذخیره کردهاید، لط�ا نام آنرا درج و روی دکمه بازیا�ت کلیک نمایید.',
+
+		aboutTab		: 'درباره'
+	},
+
+	about :
+	{
+		title		: 'درباره CKEditor',
+		dlgTitle	: 'درباره CKEditor',
+		help	: 'بررسی $1 برای راهنمایی.',
+		userGuide : 'راهنمای کاربران CKEditor',
+		moreInfo	: 'برای کسب اطلاعات مجوز لط�ا به وب سایت ما مراجعه کنید:',
+		copy		: 'حق نشر &copy; $1. کلیه حقوق مح�وظ است.'
+	},
+
+	maximize : 'حداکثر کردن',
+	minimize : 'حداقل کردن',
+
+	fakeobjects :
+	{
+		anchor		: 'لنگر',
+		flash		: 'انیمشن �لش',
+		iframe		: 'IFrame',
+		hiddenfield	: '�یلد پنهان',
+		unknown		: 'شیء ناشناخته'
+	},
+
+	resize : 'کشیدن برای تغییر اندازه',
+
+	colordialog :
+	{
+		title		: 'انتخاب رنگ',
+		options	:	'گزینههای رنگ',
+		highlight	: 'متمایز',
+		selected	: 'رنگ انتخاب شده',
+		clear		: 'پاک کردن'
+	},
+
+	toolbarCollapse	: 'بستن نوار ابزار',
+	toolbarExpand	: 'بازکردن نوار ابزار',
+
+	toolbarGroups :
+	{
+		document : 'سند',
+		clipboard : 'حا�ظه موقت/برگشت',
+		editing : 'در حال ویرایش',
+		forms : '�رمها',
+		basicstyles : 'شیوههای پایه',
+		paragraph : 'بند',
+		links : 'پیوندها',
+		insert : 'ورود',
+		styles : 'شیوهها',
+		colors : 'رنگها',
+		tools : 'ابزارها'
+	},
+
+	bidi :
+	{
+		ltr : 'نوشتار متن از چپ به راست',
+		rtl : 'نوشتار متن از راست به چپ'
+	},
+
+	docprops :
+	{
+		label : 'ویژگیهای سند',
+		title : 'ویژگیهای سند',
+		design : 'طراحی',
+		meta : '�راداده',
+		chooseColor : 'انتخاب',
+		other : '<سایر>',
+		docTitle :	'عنوان ص�حه',
+		charset : 	'رمزگذاری نویسهگان',
+		charsetOther : 'رمزگذاری نویسهگان دیگر',
+		charsetASCII : 'ASCII',
+		charsetCE : 'اروپای مرکزی',
+		charsetCT : 'چینی رسمی (Big5)',
+		charsetCR : 'سیریلیک',
+		charsetGR : 'یونانی',
+		charsetJP : 'ژاپنی',
+		charsetKR : 'کرهای',
+		charsetTR : 'ترکی',
+		charsetUN : 'یونیک�د (UTF-8)',
+		charsetWE : 'اروپای غربی',
+		docType : 'عنوان نوع سند',
+		docTypeOther : 'عنوان نوع سند دیگر',
+		xhtmlDec : 'شامل تعاری� XHTML',
+		bgColor : 'رنگ پسزمینه',
+		bgImage : 'URL تصویر پسزمینه',
+		bgFixed : 'پسزمینهٴ پیمایش ناپذیر',
+		txtColor : 'رنگ متن',
+		margin : 'حاشیههای ص�حه',
+		marginTop : 'بالا',
+		marginLeft : 'Ú†Ù¾',
+		marginRight : 'راست',
+		marginBottom : 'پایین',
+		metaKeywords : 'کلیدواژگان نمایهگذاری سند (با کاما جدا شوند)',
+		metaDescription : 'توصی� سند',
+		metaAuthor : 'نویسنده',
+		metaCopyright : 'حق انتشار',
+		previewHtml : '<p>این یک <strong>متن نمونه</strong> است. شما در حال است�اده از <a href="javascript:void(0)">CKEditor</a> هستید.</p>'
+	}
+};
diff --git a/web/imcms/ckeditor/lang/fi.js b/web/imcms/ckeditor/lang/fi.js
new file mode 100644
index 0000000000..c6991f2263
--- /dev/null
+++ b/web/imcms/ckeditor/lang/fi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.fi={dir:'ltr',editorTitle:'Rikastekstieditori, %1',editorHelp:'Paina ALT 0 nähdäksesi ohjeen',toolbars:'Editorin työkalupalkit',editor:'Rikastekstieditori',source:'Koodi',newPage:'Tyhjennä',save:'Tallenna',preview:'Esikatsele',cut:'Leikkaa',copy:'Kopioi',paste:'Liitä',print:'Tulosta',underline:'Alleviivattu',bold:'Lihavoitu',italic:'Kursivoitu',selectAll:'Valitse kaikki',removeFormat:'Poista muotoilu',strike:'Yliviivattu',subscript:'Alaindeksi',superscript:'Yläindeksi',horizontalrule:'Lisää murtoviiva',pagebreak:'Lisää sivunvaihto',pagebreakAlt:'Sivunvaihto',unlink:'Poista linkki',undo:'Kumoa',redo:'Toista',common:{browseServer:'Selaa palvelinta',url:'Osoite',protocol:'Protokolla',upload:'Lisää tiedosto',uploadSubmit:'Lähetä palvelimelle',image:'Kuva',flash:'Flash-animaatio',form:'Lomake',checkbox:'Valintaruutu',radio:'Radiopainike',textField:'Tekstikenttä',textarea:'Tekstilaatikko',hiddenField:'Piilokenttä',button:'Painike',select:'Valintakenttä',imageButton:'Kuvapainike',notSet:'<ei asetettu>',id:'Tunniste',name:'Nimi',langDir:'Kielen suunta',langDirLtr:'Vasemmalta oikealle (LTR)',langDirRtl:'Oikealta vasemmalle (RTL)',langCode:'Kielikoodi',longDescr:'Pitkän kuvauksen URL',cssClass:'Tyyliluokat',advisoryTitle:'Avustava otsikko',cssStyle:'Tyyli',ok:'OK',cancel:'Peruuta',close:'Sulje',preview:'Esikatselu',generalTab:'Yleinen',advancedTab:'Lisäominaisuudet',validateNumberFailed:'Arvon pitää olla numero.',confirmNewPage:'Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?',confirmCancel:'Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?',options:'Asetukset',target:'Kohde',targetNew:'Uusi ikkuna (_blank)',targetTop:'Päällimmäinen ikkuna (_top)',targetSelf:'Sama ikkuna (_self)',targetParent:'Ylemmän tason ikkuna (_parent)',langDirLTR:'Vasemmalta oikealle (LTR)',langDirRTL:'Oikealta vasemmalle (RTL)',styles:'Tyyli',cssClasses:'Tyylitiedoston luokat',width:'Leveys',height:'Korkeus',align:'Kohdistus',alignLeft:'Vasemmalle',alignRight:'Oikealle',alignCenter:'Keskelle',alignTop:'Ylös',alignMiddle:'Keskelle',alignBottom:'Alas',invalidValue:'Virheellinen arvo.',invalidHeight:'Korkeuden täytyy olla numero.',invalidWidth:'Leveyden täytyy olla numero.',invalidCssLength:'Kentän "%1" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.',invalidHtmlLength:'Kentän "%1" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.',invalidInlineStyle:'Tyylille annetun arvon täytyy koostua yhdestä tai useammasta "nimi : arvo" parista, jotka ovat eroteltuna toisistaan puolipisteillä.',cssLengthTooltip:'Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).',unavailable:'%1<span class="cke_accessibility">, ei saatavissa</span>'},contextmenu:{options:'Pikavalikon ominaisuudet'},specialChar:{toolbar:'Lisää erikoismerkki',title:'Valitse erikoismerkki',options:'Erikoismerkin ominaisuudet'},link:{toolbar:'Lisää linkki/muokkaa linkkiä',other:'<muu>',menu:'Muokkaa linkkiä',title:'Linkki',info:'Linkin tiedot',target:'Kohde',upload:'Lisää tiedosto',advanced:'Lisäominaisuudet',type:'Linkkityyppi',toUrl:'Osoite',toAnchor:'Ankkuri tässä sivussa',toEmail:'Sähköposti',targetFrame:'<kehys>',targetPopup:'<popup ikkuna>',targetFrameName:'Kohdekehyksen nimi',targetPopupName:'Popup ikkunan nimi',popupFeatures:'Popup ikkunan ominaisuudet',popupResizable:'Venytettävä',popupStatusBar:'Tilarivi',popupLocationBar:'Osoiterivi',popupToolbar:'Vakiopainikkeet',popupMenuBar:'Valikkorivi',popupFullScreen:'Täysi ikkuna (IE)',popupScrollBars:'Vierityspalkit',popupDependent:'Riippuva (Netscape)',popupLeft:'Vasemmalta (px)',popupTop:'Ylhäältä (px)',id:'Tunniste',langDir:'Kielen suunta',langDirLTR:'Vasemmalta oikealle (LTR)',langDirRTL:'Oikealta vasemmalle (RTL)',acccessKey:'Pikanäppäin',name:'Nimi',langCode:'Kielen suunta',tabIndex:'Tabulaattori indeksi',advisoryTitle:'Avustava otsikko',advisoryContentType:'Avustava sisällön tyyppi',cssClasses:'Tyyliluokat',charset:'Linkitetty kirjaimisto',styles:'Tyyli',rel:'Suhde',selectAnchor:'Valitse ankkuri',anchorName:'Ankkurin nimen mukaan',anchorId:'Ankkurin ID:n mukaan',emailAddress:'Sähköpostiosoite',emailSubject:'Aihe',emailBody:'Viesti',noAnchors:'(Ei ankkureita tässä dokumentissa)',noUrl:'Linkille on kirjoitettava URL',noEmail:'Kirjoita sähköpostiosoite'},anchor:{toolbar:'Lisää ankkuri/muokkaa ankkuria',menu:'Ankkurin ominaisuudet',title:'Ankkurin ominaisuudet',name:'Nimi',errorName:'Ankkurille on kirjoitettava nimi',remove:'Poista ankkuri'},list:{numberedTitle:'Numeroidun listan ominaisuudet',bulletedTitle:'Numeroimattoman listan ominaisuudet',type:'Tyyppi',start:'Alku',validateStartNumber:'Listan ensimmäisen numeron tulee olla kokonaisluku.',circle:'Ympyrä',disc:'Levy',square:'Neliö',none:'Ei mikään',notset:'<ei asetettu>',armenian:'Armeenialainen numerointi',georgian:'Georgialainen numerointi (an, ban, gan, etc.)',lowerRoman:'Pienet roomalaiset (i, ii, iii, iv, v, jne.)',upperRoman:'Isot roomalaiset (I, II, III, IV, V, jne.)',lowerAlpha:'Pienet aakkoset (a, b, c, d, e, jne.)',upperAlpha:'Isot aakkoset (A, B, C, D, E, jne.)',lowerGreek:'Pienet kreikkalaiset (alpha, beta, gamma, jne.)',decimal:'Desimaalit (1, 2, 3, jne.)',decimalLeadingZero:'Desimaalit, alussa nolla (01, 02, 03, jne.)'},findAndReplace:{title:'Etsi ja korvaa',find:'Etsi',replace:'Korvaa',findWhat:'Etsi mitä:',replaceWith:'Korvaa tällä:',notFoundMsg:'Etsittyä tekstiä ei löytynyt.',findOptions:'Hakuasetukset',matchCase:'Sama kirjainkoko',matchWord:'Koko sana',matchCyclic:'Kierrä ympäri',replaceAll:'Korvaa kaikki',replaceSuccessMsg:'%1 esiintymä(ä) korvattu.'},table:{toolbar:'Taulu',title:'Taulun ominaisuudet',menu:'Taulun ominaisuudet',deleteTable:'Poista taulu',rows:'Rivit',columns:'Sarakkeet',border:'Rajan paksuus',widthPx:'pikseliä',widthPc:'prosenttia',widthUnit:'leveysyksikkö',cellSpace:'Solujen väli',cellPad:'Solujen sisennys',caption:'Otsikko',summary:'Yhteenveto',headers:'Ylätunnisteet',headersNone:'Ei',headersColumn:'Ensimmäinen sarake',headersRow:'Ensimmäinen rivi',headersBoth:'Molemmat',invalidRows:'Rivien määrän täytyy olla suurempi kuin 0.',invalidCols:'Sarakkeiden määrän täytyy olla suurempi kuin 0.',invalidBorder:'Reunan koon täytyy olla numero.',invalidWidth:'Taulun leveyden täytyy olla numero.',invalidHeight:'Taulun korkeuden täytyy olla numero.',invalidCellSpacing:'Solujen välin täytyy olla numero.',invalidCellPadding:'Solujen sisennyksen täytyy olla numero.',cell:{menu:'Solu',insertBefore:'Lisää solu eteen',insertAfter:'Lisää solu perään',deleteCell:'Poista solut',merge:'Yhdistä solut',mergeRight:'Yhdistä oikealla olevan kanssa',mergeDown:'Yhdistä alla olevan kanssa',splitHorizontal:'Jaa solu vaakasuunnassa',splitVertical:'Jaa solu pystysuunnassa',title:'Solun ominaisuudet',cellType:'Solun tyyppi',rowSpan:'Rivin jatkuvuus',colSpan:'Solun jatkuvuus',wordWrap:'Rivitys',hAlign:'Horisontaali kohdistus',vAlign:'Vertikaali kohdistus',alignBaseline:'Alas (teksti)',bgColor:'Taustan väri',borderColor:'Reunan väri',data:'Data',header:'Ylätunniste',yes:'Kyllä',no:'Ei',invalidWidth:'Solun leveyden täytyy olla numero.',invalidHeight:'Solun korkeuden täytyy olla numero.',invalidRowSpan:'Rivin jatkuvuuden täytyy olla kokonaisluku.',invalidColSpan:'Solun jatkuvuuden täytyy olla kokonaisluku.',chooseColor:'Valitse'},row:{menu:'Rivi',insertBefore:'Lisää rivi yläpuolelle',insertAfter:'Lisää rivi alapuolelle',deleteRow:'Poista rivit'},column:{menu:'Sarake',insertBefore:'Lisää sarake vasemmalle',insertAfter:'Lisää sarake oikealle',deleteColumn:'Poista sarakkeet'}},button:{title:'Painikkeen ominaisuudet',text:'Teksti (arvo)',type:'Tyyppi',typeBtn:'Painike',typeSbm:'Lähetä',typeRst:'Tyhjennä'},checkboxAndRadio:{checkboxTitle:'Valintaruudun ominaisuudet',radioTitle:'Radiopainikkeen ominaisuudet',value:'Arvo',selected:'Valittu'},form:{title:'Lomakkeen ominaisuudet',menu:'Lomakkeen ominaisuudet',action:'Toiminto',method:'Tapa',encoding:'Enkoodaus'},select:{title:'Valintakentän ominaisuudet',selectInfo:'Info',opAvail:'Ominaisuudet',value:'Arvo',size:'Koko',lines:'Rivit',chkMulti:'Salli usea valinta',opText:'Teksti',opValue:'Arvo',btnAdd:'Lisää',btnModify:'Muuta',btnUp:'Ylös',btnDown:'Alas',btnSetValue:'Aseta valituksi',btnDelete:'Poista'},textarea:{title:'Tekstilaatikon ominaisuudet',cols:'Sarakkeita',rows:'Rivejä'},textfield:{title:'Tekstikentän ominaisuudet',name:'Nimi',value:'Arvo',charWidth:'Leveys',maxChars:'Maksimi merkkimäärä',type:'Tyyppi',typeText:'Teksti',typePass:'Salasana'},hidden:{title:'Piilokentän ominaisuudet',name:'Nimi',value:'Arvo'},image:{title:'Kuvan ominaisuudet',titleButton:'Kuvapainikkeen ominaisuudet',menu:'Kuvan ominaisuudet',infoTab:'Kuvan tiedot',btnUpload:'Lähetä palvelimelle',upload:'Lisää kuva',alt:'Vaihtoehtoinen teksti',lockRatio:'Lukitse suhteet',resetSize:'Alkuperäinen koko',border:'Kehys',hSpace:'Vaakatila',vSpace:'Pystytila',alertUrl:'Kirjoita kuvan osoite (URL)',linkTab:'Linkki',button2Img:'Haluatko muuntaa valitun kuvanäppäimen kuvaksi?',img2Button:'Haluatko muuntaa valitun kuvan kuvanäppäimeksi?',urlMissing:'Kuvan lähdeosoite puuttuu.',validateBorder:'Kehyksen täytyy olla kokonaisluku.',validateHSpace:'HSpace-määrityksen täytyy olla kokonaisluku.',validateVSpace:'VSpace-määrityksen täytyy olla kokonaisluku.'},flash:{properties:'Flash-ominaisuudet',propertiesTab:'Ominaisuudet',title:'Flash ominaisuudet',chkPlay:'Automaattinen käynnistys',chkLoop:'Toisto',chkMenu:'Näytä Flash-valikko',chkFull:'Salli kokoruututila',scale:'Levitä',scaleAll:'Näytä kaikki',scaleNoBorder:'Ei rajaa',scaleFit:'Tarkka koko',access:'Skriptien pääsy',accessAlways:'Aina',accessSameDomain:'Sama verkkotunnus',accessNever:'Ei koskaan',alignAbsBottom:'Aivan alas',alignAbsMiddle:'Aivan keskelle',alignBaseline:'Alas (teksti)',alignTextTop:'Ylös (teksti)',quality:'Laatu',qualityBest:'Paras',qualityHigh:'Korkea',qualityAutoHigh:'Automaattinen korkea',qualityMedium:'Keskitaso',qualityAutoLow:'Automaattinen matala',qualityLow:'Matala',windowModeWindow:'Ikkuna',windowModeOpaque:'Läpinäkyvyys',windowModeTransparent:'Läpinäkyvä',windowMode:'Ikkuna tila',flashvars:'Muuttujat Flash:lle',bgcolor:'Taustaväri',hSpace:'Vaakatila',vSpace:'Pystytila',validateSrc:'Linkille on kirjoitettava URL',validateHSpace:'Vaakatilan täytyy olla numero.',validateVSpace:'Pystytilan täytyy olla numero.'},spellCheck:{toolbar:'Tarkista oikeinkirjoitus',title:'Oikoluku',notAvailable:'Valitettavasti oikoluku ei ole käytössä tällä hetkellä.',errorLoading:'Virhe ladattaessa oikolukupalvelua isännältä: %s.',notInDic:'Ei sanakirjassa',changeTo:'Vaihda',btnIgnore:'Jätä huomioimatta',btnIgnoreAll:'Jätä kaikki huomioimatta',btnReplace:'Korvaa',btnReplaceAll:'Korvaa kaikki',btnUndo:'Kumoa',noSuggestions:'Ei ehdotuksia',progress:'Tarkistus käynnissä...',noMispell:'Tarkistus valmis: Ei virheitä',noChanges:'Tarkistus valmis: Yhtään sanaa ei muutettu',oneChange:'Tarkistus valmis: Yksi sana muutettiin',manyChanges:'Tarkistus valmis: %1 sanaa muutettiin',ieSpellDownload:'Oikeinkirjoituksen tarkistusta ei ole asennettu. Haluatko ladata sen nyt?'},smiley:{toolbar:'Hymiö',title:'Lisää hymiö',options:'Hymiön ominaisuudet'},elementsPath:{eleLabel:'Elementin polku',eleTitle:'%1 elementti'},numberedlist:'Numerointi',bulletedlist:'Luottelomerkit',indent:'Suurenna sisennystä',outdent:'Pienennä sisennystä',justify:{left:'Tasaa vasemmat reunat',center:'Keskitä',right:'Tasaa oikeat reunat',block:'Tasaa molemmat reunat'},blockquote:'Lainaus',clipboard:{title:'Liitä',cutError:'Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).',copyError:'Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).',pasteMsg:'Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.',securityMsg:'Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.',pasteArea:'Leikealue'},pastefromword:{confirmCleanup:'Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)',toolbar:'Liitä Word-dokumentista',title:'Liitä Word-dokumentista',error:'Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia'},pasteText:{button:'Liitä tekstinä',title:'Liitä tekstinä'},templates:{button:'Pohjat',title:'Sisältöpohjat',options:'Sisältöpohjan ominaisuudet',insertOption:'Korvaa editorin koko sisältö',selectPromptMsg:'Valitse pohja editoriin<br>(aiempi sisältö menetetään):',emptyListMsg:'(Ei määriteltyjä pohjia)'},showBlocks:'Näytä elementit',stylesCombo:{label:'Tyyli',panelTitle:'Muotoilujen tyylit',panelTitle1:'Lohkojen tyylit',panelTitle2:'Rivinsisäiset tyylit',panelTitle3:'Objektien tyylit'},format:{label:'Muotoilu',panelTitle:'Muotoilu',tag_p:'Normaali',tag_pre:'Muotoiltu',tag_address:'Osoite',tag_h1:'Otsikko 1',tag_h2:'Otsikko 2',tag_h3:'Otsikko 3',tag_h4:'Otsikko 4',tag_h5:'Otsikko 5',tag_h6:'Otsikko 6',tag_div:'Normaali (DIV)'},div:{title:'Luo div-kehikko',toolbar:'Luo div-kehikko',cssClassInputLabel:'Tyylitiedoston luokat',styleSelectLabel:'Tyyli',IdInputLabel:'Id',languageCodeInputLabel:' Kielen koodi',inlineStyleInputLabel:'Sisätyyli',advisoryTitleInputLabel:'Ohjeistava otsikko',langDirLabel:'Kielen suunta',langDirLTRLabel:'Vasemmalta oikealle (LTR)',langDirRTLLabel:'Oikealta vasemmalle (RTL)',edit:'Muokkaa Diviä',remove:'Poista Div'},iframe:{title:'IFrame-kehyksen ominaisuudet',toolbar:'IFrame-kehys',noUrl:'Anna IFrame-kehykselle lähdeosoite (src)',scrolling:'Näytä vierityspalkit',border:'Näytä kehyksen reunat'},font:{label:'Kirjaisinlaji',voiceLabel:'Kirjaisinlaji',panelTitle:'Kirjaisinlaji'},fontSize:{label:'Koko',voiceLabel:'Kirjaisimen koko',panelTitle:'Koko'},colorButton:{textColorTitle:'Tekstiväri',bgColorTitle:'Taustaväri',panelTitle:'Värit',auto:'Automaattinen',more:'Lisää värejä...'},colors:{'000':'Musta',800000:'Kastanjanruskea','8B4513':'Satulanruskea','2F4F4F':'Tumma liuskekivenharmaa','008080':'Sinivihreä','000080':'Laivastonsininen','4B0082':'Indigonsininen',696969:'Tummanharmaa',B22222:'Tiili',A52A2A:'Ruskea',DAA520:'Kultapiisku','006400':'Tummanvihreä','40E0D0':'Turkoosi','0000CD':'Keskisininen',800080:'Purppura',808080:'Harmaa',F00:'Punainen',FF8C00:'Tumma oranssi',FFD700:'Kulta','008000':'Vihreä','0FF':'Syaani','00F':'Sininen',EE82EE:'Violetti',A9A9A9:'Tummanharmaa',FFA07A:'Vaaleanlohenpunainen',FFA500:'Oranssi',FFFF00:'Keltainen','00FF00':'Limetin vihreä',AFEEEE:'Haalea turkoosi',ADD8E6:'Vaaleansininen',DDA0DD:'Luumu',D3D3D3:'Vaaleanharmaa',FFF0F5:'Laventelinpunainen',FAEBD7:'Antiikinvalkoinen',FFFFE0:'Vaaleankeltainen',F0FFF0:'Hunajameloni',F0FFFF:'Asurinsininen',F0F8FF:'Alice Blue -sininen',E6E6FA:'Lavanteli',FFF:'Valkoinen'},scayt:{title:'Oikolue kirjoitettaessa',opera_title:'Opera ei tue tätä ominaisuutta',enable:'Ota käyttöön oikoluku kirjoitettaessa',disable:'Poista käytöstä oikoluku kirjoitetaessa',about:'Tietoja oikoluvusta kirjoitetaessa',toggle:'Vaihda oikoluku kirjoittaessa tilaa',options:'Asetukset',langs:'Kielet',moreSuggestions:'Lisää ehdotuksia',ignore:'Ohita',ignoreAll:'Ohita kaikki',addWord:'Lisää sana',emptyDic:'Sanakirjan nimi on annettava.',noSuggestions:'Ei ehdotuksia',optionsTab:'Asetukset',allCaps:'Ohita sanat, jotka on kirjoitettu kokonaan isoilla kirjaimilla',ignoreDomainNames:'Ohita verkkotunnukset',mixedCase:'Ohita sanat, joissa on sekoitettu isoja ja pieniä kirjaimia',mixedWithDigits:'Ohita sanat, joissa on numeroita',languagesTab:'Kielet',dictionariesTab:'Sanakirjat',dic_field_name:'Sanakirjan nimi',dic_create:'Luo',dic_restore:'Palauta',dic_delete:'Poista',dic_rename:'Nimeä uudelleen',dic_info:'Oletuksena sanakirjat tallennetaan evästeeseen, mutta evästeiden koko on kuitenkin rajallinen. Sanakirjan kasvaessa niin suureksi, ettei se enää mahdu evästeeseen, sanakirja täytyy tallentaa palvelimellemme. Tallentaaksesi sanakirjasi palvelimellemme tulee sinun antaa sille nimi. Jos olet jo tallentanut sanakirjan, anna sen nimi ja klikkaa Palauta-painiketta',aboutTab:'Tietoa'},about:{title:'Tietoa CKEditorista',dlgTitle:'Tietoa CKEditorista',help:'Katso ohjeet: $1.',userGuide:'CKEditorin käyttäjäopas',moreInfo:'Lisenssitiedot löytyvät kotisivuiltamme:',copy:'Copyright &copy; $1. Kaikki oikeuden pidätetään.'},maximize:'Suurenna',minimize:'Pienennä',fakeobjects:{anchor:'Ankkuri',flash:'Flash animaatio',iframe:'IFrame-kehys',hiddenfield:'Piilokenttä',unknown:'Tuntematon objekti'},resize:'Raahaa muuttaaksesi kokoa',colordialog:{title:'Valitse väri',options:'Värin ominaisuudet',highlight:'Korostus',selected:'Valittu',clear:'Poista'},toolbarCollapse:'Kutista työkalupalkki',toolbarExpand:'Laajenna työkalupalkki',toolbarGroups:{document:'Dokumentti',clipboard:'Leikepöytä/Kumoa',editing:'Muokkaus',forms:'Lomakkeet',basicstyles:'Perustyylit',paragraph:'Kappale',links:'Linkit',insert:'Lisää',styles:'Tyylit',colors:'Värit',tools:'Työkalut'},bidi:{ltr:'Tekstin suunta vasemmalta oikealle',rtl:'Tekstin suunta oikealta vasemmalle'},docprops:{label:'Dokumentin ominaisuudet',title:'Dokumentin ominaisuudet',design:'Sommittelu',meta:'Metatieto',chooseColor:'Valitse',other:'<muu>',docTitle:'Sivun nimi',charset:'Merkistökoodaus',charsetOther:'Muu merkistökoodaus',charsetASCII:'ASCII',charsetCE:'Keskieurooppalainen',charsetCT:'Kiina, perinteinen (Big5)',charsetCR:'Kyrillinen',charsetGR:'Kreikka',charsetJP:'Japani',charsetKR:'Korealainen',charsetTR:'Turkkilainen',charsetUN:'Unicode (UTF-8)',charsetWE:'Länsieurooppalainen',docType:'Dokumentin tyyppi',docTypeOther:'Muu dokumentin tyyppi',xhtmlDec:'Lisää XHTML julistukset',bgColor:'Taustaväri',bgImage:'Taustakuva',bgFixed:'Paikallaanpysyvä tausta',txtColor:'Tekstiväri',margin:'Sivun marginaalit',marginTop:'Ylä',marginLeft:'Vasen',marginRight:'Oikea',marginBottom:'Ala',metaKeywords:'Hakusanat (pilkulla erotettuna)',metaDescription:'Kuvaus',metaAuthor:'Tekijä',metaCopyright:'Tekijänoikeudet',previewHtml:'<p>Tämä on <strong>esimerkkitekstiä</strong>. Käytät juuri <a href="javascript:void(0)">CKEditoria</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/fo.js b/web/imcms/ckeditor/lang/fo.js
new file mode 100644
index 0000000000..c2ec0a3272
--- /dev/null
+++ b/web/imcms/ckeditor/lang/fo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.fo={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Trýst ALT og 0 fyri vegleiðing',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kelda',newPage:'Nýggj síða',save:'Goym',preview:'Frumsýning',cut:'Kvett',copy:'Avrita',paste:'Innrita',print:'Prenta',underline:'Undirstrikað',bold:'Feit skrift',italic:'Skráskrift',selectAll:'Markera alt',removeFormat:'Strika sniðgeving',strike:'Yvirstrikað',subscript:'Lækkað skrift',superscript:'Hækkað skrift',horizontalrule:'Ger vatnrætta linju',pagebreak:'Ger síðuskift',pagebreakAlt:'Síðuskift',unlink:'Strika tilknýti',undo:'Angra',redo:'Vend aftur',common:{browseServer:'Ambætarakagi',url:'URL',protocol:'Protokoll',upload:'Send til ambætaran',uploadSubmit:'Send til ambætaran',image:'Myndir',flash:'Flash',form:'Formur',checkbox:'Flugubein',radio:'Radioknøttur',textField:'Tekstteigur',textarea:'Tekstumráði',hiddenField:'Fjaldur teigur',button:'Knøttur',select:'Valskrá',imageButton:'Myndaknøttur',notSet:'<ikki sett>',id:'Id',name:'Navn',langDir:'Tekstkós',langDirLtr:'Frá vinstru til høgru (LTR)',langDirRtl:'Frá høgru til vinstru (RTL)',langCode:'Málkoda',longDescr:'Víðkað URL frágreiðing',cssClass:'Typografi klassar',advisoryTitle:'Vegleiðandi heiti',cssStyle:'Typografi',ok:'Góðkent',cancel:'Avlýst',close:'Lat aftur',preview:'Frumsýn',generalTab:'Generelt',advancedTab:'Fjølbroytt',validateNumberFailed:'Hetta er ikki eitt tal.',confirmNewPage:'Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?',confirmCancel:'Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?',options:'Options',target:'Target',targetNew:'Nýtt vindeyga (_blank)',targetTop:'Vindeyga ovast (_top)',targetSelf:'Sama vindeyga (_self)',targetParent:'Upphavligt vindeyga (_parent)',langDirLTR:'Frá vinstru til høgru (LTR)',langDirRTL:'Frá høgru til vinstru (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Breidd',height:'Hædd',align:'Justering',alignLeft:'Vinstra',alignRight:'Høgra',alignCenter:'Miðsett',alignTop:'Ovast',alignMiddle:'Miðja',alignBottom:'Botnur',invalidValue:'Invalid value.',invalidHeight:'Hædd má vera eitt tal.',invalidWidth:'Breidd má vera eitt tal.',invalidCssLength:'Virðið sett í "%1" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).',invalidHtmlLength:'Virðið sett í "%1" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).',invalidInlineStyle:'Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum "name : value", hvørt parið sundurskilt við semi-colon.',cssLengthTooltip:'Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).',unavailable:'%1<span class="cke_accessibility">, ikki tøkt</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Set inn sertekn',title:'Vel sertekn',options:'Møguleikar við serteknum'},link:{toolbar:'Ger/broyt tilknýti',other:'<annað>',menu:'Broyt tilknýti',title:'Tilknýti',info:'Tilknýtis upplýsingar',target:'Target',upload:'Send til ambætaran',advanced:'Fjølbroytt',type:'Tilknýtisslag',toUrl:'URL',toAnchor:'Tilknýti til marknastein í tekstinum',toEmail:'Teldupostur',targetFrame:'<ramma>',targetPopup:'<popup vindeyga>',targetFrameName:'Vís navn vindeygans',targetPopupName:'Popup vindeygans navn',popupFeatures:'Popup vindeygans víðkaðu eginleikar',popupResizable:'Stødd kann broytast',popupStatusBar:'Støðufrágreiðingarbjálki',popupLocationBar:'Adressulinja',popupToolbar:'Amboðsbjálki',popupMenuBar:'Skrábjálki',popupFullScreen:'Fullur skermur (IE)',popupScrollBars:'Rullibjálki',popupDependent:'Bundið (Netscape)',popupLeft:'Frástøða frá vinstru',popupTop:'Frástøða frá íerva',id:'Id',langDir:'Tekstkós',langDirLTR:'Frá vinstru til høgru (LTR)',langDirRTL:'Frá høgru til vinstru (RTL)',acccessKey:'Snarvegisknöttur',name:'Navn',langCode:'Tekstkós',tabIndex:'Tabulator indeks',advisoryTitle:'Vegleiðandi heiti',advisoryContentType:'Vegleiðandi innihaldsslag',cssClasses:'Typografi klassar',charset:'Atknýtt teknsett',styles:'Typografi',rel:'Relatión',selectAnchor:'Vel ein marknastein',anchorName:'Eftir navni á marknasteini',anchorId:'Eftir element Id',emailAddress:'Teldupost-adressa',emailSubject:'Evni',emailBody:'Breyðtekstur',noAnchors:'(Eingir marknasteinar eru í hesum dokumentið)',noUrl:'Vinarliga skriva tilknýti (URL)',noEmail:'Vinarliga skriva teldupost-adressu'},anchor:{toolbar:'Ger/broyt marknastein',menu:'Eginleikar fyri marknastein',title:'Eginleikar fyri marknastein',name:'Heiti marknasteinsins',errorName:'Vinarliga rita marknasteinsins heiti',remove:'Strika marknastein'},list:{numberedTitle:'Eginleikar fyri lista við tølum',bulletedTitle:'Eginleikar fyri lista við prikkum',type:'Slag',start:'Byrjan',validateStartNumber:'Byrjunartalið fyri lista má vera eitt heiltal.',circle:'Sirkul',disc:'Disc',square:'Fýrkantur',none:'Einki',notset:'<ikki sett>',armenian:'Armensk talskipan',georgian:'Georgisk talskipan (an, ban, gan, osv.)',lowerRoman:'Lítil rómaratøl (i, ii, iii, iv, v, etc.)',upperRoman:'Stór rómaratøl (I, II, III, IV, V, etc.)',lowerAlpha:'Lítlir bókstavir (a, b, c, d, e, etc.)',upperAlpha:'Stórir bókstavir (A, B, C, D, E, etc.)',lowerGreek:'Grikskt við lítlum (alpha, beta, gamma, etc.)',decimal:'Vanlig tøl (1, 2, 3, etc.)',decimalLeadingZero:'Tøl við null frammanfyri (01, 02, 03, etc.)'},findAndReplace:{title:'Finn og broyt',find:'Leita',replace:'Yvirskriva',findWhat:'Finn:',replaceWith:'Yvirskriva við:',notFoundMsg:'Leititeksturin varð ikki funnin',findOptions:'Finn møguleikar',matchCase:'Munur á stórum og smáum bókstavum',matchWord:'Bert heil orð',matchCyclic:'Match cyclic',replaceAll:'Yvirskriva alt',replaceSuccessMsg:'%1 úrslit broytt.'},table:{toolbar:'Tabell',title:'Eginleikar fyri tabell',menu:'Eginleikar fyri tabell',deleteTable:'Strika tabell',rows:'Røðir',columns:'Kolonnur',border:'Bordabreidd',widthPx:'pixels',widthPc:'prosent',widthUnit:'breiddar unit',cellSpace:'Fjarstøða millum meskar',cellPad:'Meskubreddi',caption:'Tabellfrágreiðing',summary:'Samandráttur',headers:'Yvirskriftir',headersNone:'Eingin',headersColumn:'Fyrsta kolonna',headersRow:'Fyrsta rað',headersBoth:'Báðir',invalidRows:'Talið av røðum má vera eitt tal størri enn 0.',invalidCols:'Talið av kolonnum má vera eitt tal størri enn 0.',invalidBorder:'Borda-stødd má vera eitt tal.',invalidWidth:'Tabell-breidd má vera eitt tal.',invalidHeight:'Tabell-hædd má vera eitt tal.',invalidCellSpacing:'Cell spacing má vera eitt tal.',invalidCellPadding:'Cell padding má vera eitt tal.',cell:{menu:'Meski',insertBefore:'Set meska inn áðrenn',insertAfter:'Set meska inn aftaná',deleteCell:'Strika meskar',merge:'Flætta meskar',mergeRight:'Flætta meskar til høgru',mergeDown:'Flætta saman',splitHorizontal:'Kloyv meska vatnrætt',splitVertical:'Kloyv meska loddrætt',title:'Mesku eginleikar',cellType:'Mesku slag',rowSpan:'Ræð spenni',colSpan:'Kolonnu spenni',wordWrap:'Orðkloyving',hAlign:'Horisontal plasering',vAlign:'Loddrøtt plasering',alignBaseline:'Basislinja',bgColor:'Bakgrundslitur',borderColor:'Bordalitur',data:'Data',header:'Header',yes:'Ja',no:'Nei',invalidWidth:'Meskubreidd má vera eitt tal.',invalidHeight:'Meskuhædd má vera eitt tal.',invalidRowSpan:'Raðspennið má vera eitt heiltal.',invalidColSpan:'Kolonnuspennið má vera eitt heiltal.',chooseColor:'Vel'},row:{menu:'Rað',insertBefore:'Set rað inn áðrenn',insertAfter:'Set rað inn aftaná',deleteRow:'Strika røðir'},column:{menu:'Kolonna',insertBefore:'Set kolonnu inn áðrenn',insertAfter:'Set kolonnu inn aftaná',deleteColumn:'Strika kolonnur'}},button:{title:'Eginleikar fyri knøtt',text:'Tekstur',type:'Slag',typeBtn:'Knøttur',typeSbm:'Send',typeRst:'Nullstilla'},checkboxAndRadio:{checkboxTitle:'Eginleikar fyri flugubein',radioTitle:'Eginleikar fyri radioknøtt',value:'Virði',selected:'Valt'},form:{title:'Eginleikar fyri Form',menu:'Eginleikar fyri Form',action:'Hending',method:'Háttur',encoding:'Encoding'},select:{title:'Eginleikar fyri valskrá',selectInfo:'Upplýsingar',opAvail:'Tøkir møguleikar',value:'Virði',size:'Stødd',lines:'Linjur',chkMulti:'Loyv fleiri valmøguleikum samstundis',opText:'Tekstur',opValue:'Virði',btnAdd:'Legg afturat',btnModify:'Broyt',btnUp:'Upp',btnDown:'Niður',btnSetValue:'Set sum valt virði',btnDelete:'Strika'},textarea:{title:'Eginleikar fyri tekstumráði',cols:'kolonnur',rows:'røðir'},textfield:{title:'Eginleikar fyri tekstteig',name:'Navn',value:'Virði',charWidth:'Breidd (sjónlig tekn)',maxChars:'Mest loyvdu tekn',type:'Slag',typeText:'Tekstur',typePass:'Loyniorð'},hidden:{title:'Eginleikar fyri fjaldan teig',name:'Navn',value:'Virði'},image:{title:'Myndaeginleikar',titleButton:'Eginleikar fyri myndaknøtt',menu:'Myndaeginleikar',infoTab:'Myndaupplýsingar',btnUpload:'Send til ambætaran',upload:'Send',alt:'Alternativur tekstur',lockRatio:'Læs lutfallið',resetSize:'Upprunastødd',border:'Bordi',hSpace:'Høgri breddi',vSpace:'Vinstri breddi',alertUrl:'Rita slóðina til myndina',linkTab:'Tilknýti',button2Img:'Skal valdi myndaknøttur gerast til vanliga mynd?',img2Button:'Skal valda mynd gerast til myndaknøtt?',urlMissing:'URL til mynd manglar.',validateBorder:'Bordi má vera eitt heiltal.',validateHSpace:'HSpace má vera eitt heiltal.',validateVSpace:'VSpace má vera eitt heiltal.'},flash:{properties:'Flash eginleikar',propertiesTab:'Eginleikar',title:'Flash eginleikar',chkPlay:'Avspælingin byrjar sjálv',chkLoop:'Endurspæl',chkMenu:'Ger Flash skrá virkna',chkFull:'Loyv fullan skerm',scale:'Skalering',scaleAll:'Vís alt',scaleNoBorder:'Eingin bordi',scaleFit:'Neyv skalering',access:'Script atgongd',accessAlways:'Altíð',accessSameDomain:'Sama navnaøki',accessNever:'Ongantíð',alignAbsBottom:'Abs botnur',alignAbsMiddle:'Abs miðja',alignBaseline:'Basislinja',alignTextTop:'Tekst toppur',quality:'Góðska',qualityBest:'Besta',qualityHigh:'Høg',qualityAutoHigh:'Auto høg',qualityMedium:'Meðal',qualityAutoLow:'Auto Lág',qualityLow:'Lág',windowModeWindow:'Rútur',windowModeOpaque:'Ikki transparent',windowModeTransparent:'Transparent',windowMode:'Slag av rúti',flashvars:'Variablar fyri Flash',bgcolor:'Bakgrundslitur',hSpace:'Høgri breddi',vSpace:'Vinstri breddi',validateSrc:'Vinarliga skriva tilknýti (URL)',validateHSpace:'HSpace má vera eitt tal.',validateVSpace:'VSpace má vera eitt tal.'},spellCheck:{toolbar:'Kanna stavseting',title:'Kanna stavseting',notAvailable:'Tíverri, ikki tøkt í løtuni.',errorLoading:'Feilur við innlesing av application service host: %s.',notInDic:'Finst ikki í orðabókini',changeTo:'Broyt til',btnIgnore:'Forfjóna',btnIgnoreAll:'Forfjóna alt',btnReplace:'Yvirskriva',btnReplaceAll:'Yvirskriva alt',btnUndo:'Angra',noSuggestions:'- Einki uppskot -',progress:'Rættstavarin arbeiðir...',noMispell:'Rættstavarin liðugur: Eingin feilur funnin',noChanges:'Rættstavarin liðugur: Einki orð varð broytt',oneChange:'Rættstavarin liðugur: Eitt orð er broytt',manyChanges:'Rættstavarin liðugur: %1 orð broytt',ieSpellDownload:'Rættstavarin er ikki tøkur í tekstviðgeranum. Vilt tú heinta hann nú?'},smiley:{toolbar:'Smiley',title:'Vel Smiley',options:'Møguleikar fyri Smiley'},elementsPath:{eleLabel:'Slóð til elementir',eleTitle:'%1 element'},numberedlist:'Talmerktur listi',bulletedlist:'Punktmerktur listi',indent:'Økja reglubrotarinntriv',outdent:'Minka reglubrotarinntriv',justify:{left:'Vinstrasett',center:'Miðsett',right:'Høgrasett',block:'Javnir tekstkantar'},blockquote:'Blockquote',clipboard:{title:'Innrita',cutError:'Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).',copyError:'Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).',pasteMsg:'Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.',securityMsg:'Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.',pasteArea:'Avritingarumráði'},pastefromword:{confirmCleanup:'Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?',toolbar:'Innrita frá Word',title:'Innrita frá Word',error:'Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil'},pasteText:{button:'Innrita som reinan tekst',title:'Innrita som reinan tekst'},templates:{button:'Skabelónir',title:'Innihaldsskabelónir',options:'Møguleikar fyri Template',insertOption:'Yvirskriva núverandi innihald',selectPromptMsg:'Vinarliga vel ta skabelón, ið skal opnast í tekstviðgeranum<br>(Hetta yvirskrivar núverandi innihald):',emptyListMsg:'(Ongar skabelónir tøkar)'},showBlocks:'Vís blokkar',stylesCombo:{label:'Typografi',panelTitle:'Formatterings stílir',panelTitle1:'Blokk stílir',panelTitle2:'Inline stílir',panelTitle3:'Object stílir'},format:{label:'Skriftsnið',panelTitle:'Skriftsnið',tag_p:'Vanligt',tag_pre:'Sniðgivið',tag_address:'Adressa',tag_h1:'Yvirskrift 1',tag_h2:'Yvirskrift 2',tag_h3:'Yvirskrift 3',tag_h4:'Yvirskrift 4',tag_h5:'Yvirskrift 5',tag_h6:'Yvirskrift 6',tag_div:'Vanligt (DIV)'},div:{title:'Ger Div Container',toolbar:'Ger Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Vinstru til høgru (LTR)',langDirRTLLabel:'Høgru til vinstru (RTL)',edit:'Redigera Div',remove:'Strika Div'},iframe:{title:'Møguleikar fyri IFrame',toolbar:'IFrame',noUrl:'Vinarliga skriva URL til iframe',scrolling:'Loyv scrollbars',border:'Vís frame kant'},font:{label:'Skrift',voiceLabel:'Skrift',panelTitle:'Skrift'},fontSize:{label:'Skriftstødd',voiceLabel:'Skriftstødd',panelTitle:'Skriftstødd'},colorButton:{textColorTitle:'Tekstlitur',bgColorTitle:'Bakgrundslitur',panelTitle:'Litir',auto:'Automatiskt',more:'Fleiri litir...'},colors:{'000':'Svart',800000:'Maroon','8B4513':'Saðilsbrúnt','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Myrkagrátt',B22222:'Fire Brick',A52A2A:'Brúnt',DAA520:'Gullstavur','006400':'Myrkagrønt','40E0D0':'Turquoise','0000CD':'Meðal blátt',800080:'Purple',808080:'Grátt',F00:'Reytt',FF8C00:'Myrkt appelsingult',FFD700:'Gull','008000':'Grønt','0FF':'Cyan','00F':'Blátt',EE82EE:'Violet',A9A9A9:'Døkt grátt',FFA07A:'Ljósur laksur',FFA500:'Appelsingult',FFFF00:'Gult','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Ljósablátt',DDA0DD:'Plum',D3D3D3:'Ljósagrátt',FFF0F5:'Lavender Blush',FAEBD7:'Klassiskt hvítt',FFFFE0:'Ljósagult',F0FFF0:'Hunangsdøggur',F0FFFF:'Azure',F0F8FF:'Alice Blátt',E6E6FA:'Lavender',FFF:'Hvítt'},scayt:{title:'Kanna stavseting, meðan tú skrivar',opera_title:'Ikki stuðlað í Opera',enable:'Loyv SCAYT',disable:'Nokta SCAYT',about:'Um SCAYT',toggle:'Toggle SCAYT',options:'Uppseting',langs:'Tungumál',moreSuggestions:'Fleiri tilráðingar',ignore:'Ignorera',ignoreAll:'Ignorera alt',addWord:'Legg orð afturat',emptyDic:'Heiti á orðabók eigur ikki at vera tómt.',noSuggestions:'Einki uppskot',optionsTab:'Uppseting',allCaps:'Loyp orð við bert stórum stavum um',ignoreDomainNames:'loyp økisnøvn um',mixedCase:'Loyp orð við blandaðum smáum og stórum stavum um',mixedWithDigits:'Loyp orð við tølum um',languagesTab:'Tungumál',dictionariesTab:'Orðabøkur',dic_field_name:'Orðabókanavn',dic_create:'Upprætta nýggja',dic_restore:'Endurskapa',dic_delete:'Strika',dic_rename:'Broyt',dic_info:'Upprunaliga er brúkara-orðabókin goymd í eini cookie í tínum egna kaga. Men hesar cookies eru avmarkaðar í stødd. Tá brúkara-orðabókin veksur seg ov stóra til eina cookie, so er møguligt at goyma hana á ambætara okkara. Fyri at goyma persónligu orðabókina á ambætaranum eigur tú at velja eitt navn til tína skuffu. Hevur tú longu goymt eina orðabók, so vinarliga skriva navnið og klikk á knøttin Endurskapa.',aboutTab:'Um'},about:{title:'Um CKEditor',dlgTitle:'Um CKEditor',help:'Kekka $1 fyri hjálp.',userGuide:'CKEditor Brúkaravegleiðing',moreInfo:'Licens upplýsingar finnast á heimasíðu okkara:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maksimera',minimize:'Minimera',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Fjaldur teigur',unknown:'Ókent Object'},resize:'Drag fyri at broyta stødd',colordialog:{title:'Vel lit',options:'Litmøguleikar',highlight:'Framheva',selected:'Valdur litur',clear:'Strika'},toolbarCollapse:'Lat Toolbar aftur',toolbarExpand:'Vís Toolbar',toolbarGroups:{document:'Dokument',clipboard:'Clipboard/Undo',editing:'Editering',forms:'Formar',basicstyles:'Grundleggjandi Styles',paragraph:'Reglubrot',links:'Leinkjur',insert:'Set inn',styles:'Styles',colors:'Litir',tools:'Tól'},bidi:{ltr:'Tekstkós frá vinstru til høgru',rtl:'Tekstkós frá høgru til vinstru'},docprops:{label:'Eginleikar fyri dokument',title:'Eginleikar fyri dokument',design:'Design',meta:'META-upplýsingar',chooseColor:'Vel',other:'<annað>',docTitle:'Síðuheiti',charset:'Teknsett koda',charsetOther:'Onnur teknsett koda',charsetASCII:'ASCII',charsetCE:'Miðeuropa',charsetCT:'Kinesiskt traditionelt (Big5)',charsetCR:'Cyrilliskt',charsetGR:'Grikst',charsetJP:'Japanskt',charsetKR:'Koreanskt',charsetTR:'Turkiskt',charsetUN:'Unicode (UTF-8)',charsetWE:'Vestureuropa',docType:'Dokumentslag yvirskrift',docTypeOther:'Annað dokumentslag yvirskrift',xhtmlDec:'Viðfest XHTML deklaratiónir',bgColor:'Bakgrundslitur',bgImage:'Leið til bakgrundsmynd (URL)',bgFixed:'Læst bakgrund (rullar ikki)',txtColor:'Tekstlitur',margin:'Síðubreddar',marginTop:'Ovast',marginLeft:'Vinstra',marginRight:'Høgra',marginBottom:'Niðast',metaKeywords:'Dokument index lyklaorð (sundurbýtt við komma)',metaDescription:'Dokumentlýsing',metaAuthor:'Høvundur',metaCopyright:'Upphavsrættindi',previewHtml:'<p>Hetta er ein <strong>royndartekstur</strong>. Tygum brúka <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/fr-ca.js b/web/imcms/ckeditor/lang/fr-ca.js
new file mode 100644
index 0000000000..ef498521b0
--- /dev/null
+++ b/web/imcms/ckeditor/lang/fr-ca.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['fr-ca']={dir:'ltr',editorTitle:'Editor de text enriquit, %1',editorHelp:'Prem ALT 0 per obtenir ajuda',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'Nouvelle page',save:'Sauvegarder',preview:'Previsualiser',cut:'Couper',copy:'Copier',paste:'Coller',print:'Imprimer',underline:'Souligné',bold:'Gras',italic:'Italique',selectAll:'Tout sélectionner',removeFormat:'Supprimer le formatage',strike:'Barrer',subscript:'Indice',superscript:'Exposant',horizontalrule:'Insérer un séparateur',pagebreak:'Insérer un saut de page',pagebreakAlt:'Page Break',unlink:'Supprimer le lien',undo:'Annuler',redo:'Refaire',common:{browseServer:'Parcourir le serveur',url:'URL',protocol:'Protocole',upload:'Télécharger',uploadSubmit:'Envoyer sur le serveur',image:'Image',flash:'Animation Flash',form:'Formulaire',checkbox:'Case à cocher',radio:'Bouton radio',textField:'Champ texte',textarea:'Zone de texte',hiddenField:'Champ caché',button:'Bouton',select:'Champ de sélection',imageButton:'Bouton image',notSet:'<Par défaut>',id:'Id',name:'Nom',langDir:"Sens d'écriture",langDirLtr:'De gauche à droite (LTR)',langDirRtl:'De droite à gauche (RTL)',langCode:'Code langue',longDescr:'URL de description longue',cssClass:'Classes de feuilles de style',advisoryTitle:'Titre',cssStyle:'Style',ok:'OK',cancel:'Annuler',close:'Close',preview:'Preview',generalTab:'Général',advancedTab:'Avancée',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Largeur',height:'Hauteur',align:'Alignement',alignLeft:'Gauche',alignRight:'Droite',alignCenter:'Centré',alignTop:'Haut',alignMiddle:'Milieu',alignBottom:'Bas',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insérer un caractère spécial',title:'Insérer un caractère spécial',options:'Special Character Options'},link:{toolbar:'Insérer/modifier le lien',other:'<other>',menu:'Modifier le lien',title:'Propriétés du lien',info:'Informations sur le lien',target:'Destination',upload:'Télécharger',advanced:'Avancée',type:'Type de lien',toUrl:'URL',toAnchor:'Ancre dans cette page',toEmail:'E-Mail',targetFrame:'<Cadre>',targetPopup:'<fenêtre popup>',targetFrameName:'Nom du cadre de destination',targetPopupName:'Nom de la fenêtre popup',popupFeatures:'Caractéristiques de la fenêtre popup',popupResizable:'Resizable',popupStatusBar:"Barre d'état",popupLocationBar:"Barre d'adresses",popupToolbar:"Barre d'outils",popupMenuBar:'Barre de menu',popupFullScreen:'Plein écran (IE)',popupScrollBars:'Barres de défilement',popupDependent:'Dépendante (Netscape)',popupLeft:'Position à partir de la gauche',popupTop:'Position à partir du haut',id:'Id',langDir:"Sens d'écriture",langDirLTR:'De gauche à droite (LTR)',langDirRTL:'De droite à gauche (RTL)',acccessKey:'Équivalent clavier',name:'Nom',langCode:"Sens d'écriture",tabIndex:'Ordre de tabulation',advisoryTitle:'Titre',advisoryContentType:'Type de contenu',cssClasses:'Classes de feuilles de style',charset:'Encodage de caractère',styles:'Style',rel:'Relationship',selectAnchor:'Sélectionner une ancre',anchorName:'Par nom',anchorId:'Par id',emailAddress:'Adresse E-Mail',emailSubject:'Sujet du message',emailBody:'Corps du message',noAnchors:"(Pas d'ancre disponible dans le document)",noUrl:"Veuillez saisir l'URL",noEmail:"Veuillez saisir l'adresse e-mail"},anchor:{toolbar:"Insérer/modifier l'ancre",menu:"Propriétés de l'ancre",title:"Propriétés de l'ancre",name:"Nom de l'ancre",errorName:"Veuillez saisir le nom de l'ancre",remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Chercher et Remplacer',find:'Chercher',replace:'Remplacer',findWhat:'Rechercher:',replaceWith:'Remplacer par:',notFoundMsg:'Le texte indiqué est introuvable.',findOptions:'Find Options',matchCase:'Respecter la casse',matchWord:'Mot entier',matchCyclic:'Match cyclic',replaceAll:'Tout remplacer',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tableau',title:'Propriétés du tableau',menu:'Propriétés du tableau',deleteTable:'Supprimer le tableau',rows:'Lignes',columns:'Colonnes',border:'Taille de la bordure',widthPx:'pixels',widthPc:'pourcentage',widthUnit:'width unit',cellSpace:'Espacement',cellPad:'Contour',caption:'Titre',summary:'Résumé',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cellule',insertBefore:'Insérer une cellule avant',insertAfter:'Insérer une cellule après',deleteCell:'Supprimer des cellules',merge:'Fusionner les cellules',mergeRight:'Fusionner à droite',mergeDown:'Fusionner en bas',splitHorizontal:'Scinder la cellule horizontalement',splitVertical:'Scinder la cellule verticalement',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Ligne',insertBefore:'Insérer une ligne avant',insertAfter:'Insérer une ligne après',deleteRow:'Supprimer des lignes'},column:{menu:'Colonne',insertBefore:'Insérer une colonne avant',insertAfter:'Insérer une colonne après',deleteColumn:'Supprimer des colonnes'}},button:{title:'Propriétés du bouton',text:'Texte (Valeur)',type:'Type',typeBtn:'Bouton',typeSbm:'Soumettre',typeRst:'Réinitialiser'},checkboxAndRadio:{checkboxTitle:'Propriétés de la case à cocher',radioTitle:'Propriétés du bouton radio',value:'Valeur',selected:'Sélectionné'},form:{title:'Propriétés du formulaire',menu:'Propriétés du formulaire',action:'Action',method:'Méthode',encoding:'Encoding'},select:{title:'Propriétés de la liste/du menu',selectInfo:'Info',opAvail:'Options disponibles',value:'Valeur',size:'Taille',lines:'lignes',chkMulti:'Sélection multiple',opText:'Texte',opValue:'Valeur',btnAdd:'Ajouter',btnModify:'Modifier',btnUp:'Monter',btnDown:'Descendre',btnSetValue:'Valeur sélectionnée',btnDelete:'Supprimer'},textarea:{title:'Propriétés de la zone de texte',cols:'Colonnes',rows:'Lignes'},textfield:{title:'Propriétés du champ texte',name:'Nom',value:'Valeur',charWidth:'Largeur en caractères',maxChars:'Nombre maximum de caractères',type:'Type',typeText:'Texte',typePass:'Mot de passe'},hidden:{title:'Propriétés du champ caché',name:'Nom',value:'Valeur'},image:{title:"Propriétés de l'image",titleButton:'Propriétés du bouton image',menu:"Propriétés de l'image",infoTab:"Informations sur l'image",btnUpload:'Envoyer sur le serveur',upload:'Télécharger',alt:'Texte de remplacement',lockRatio:'Garder les proportions',resetSize:'Taille originale',border:'Bordure',hSpace:'Espacement horizontal',vSpace:'Espacement vertical',alertUrl:"Veuillez saisir l'URL de l'image",linkTab:'Lien',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:"Propriétés de l'animation Flash",propertiesTab:'Properties',title:"Propriétés de l'animation Flash",chkPlay:'Lecture automatique',chkLoop:'Boucle',chkMenu:'Activer le menu Flash',chkFull:'Allow Fullscreen',scale:'Affichage',scaleAll:'Par défaut (tout montrer)',scaleNoBorder:'Sans bordure',scaleFit:'Ajuster aux dimensions',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bas',alignAbsMiddle:'Abs Milieu',alignBaseline:'Bas du texte',alignTextTop:'Haut du texte',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Couleur de fond',hSpace:'Espacement horizontal',vSpace:'Espacement vertical',validateSrc:"Veuillez saisir l'URL",validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Orthographe',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Pas dans le dictionnaire',changeTo:'Changer en',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer tout',btnReplace:'Remplacer',btnReplaceAll:'Remplacer tout',btnUndo:'Annuler',noSuggestions:'- Pas de suggestion -',progress:"Vérification d'orthographe en cours...",noMispell:"Vérification d'orthographe terminée: pas d'erreur trouvée",noChanges:"Vérification d'orthographe terminée: Pas de modifications",oneChange:"Vérification d'orthographe terminée: Un mot modifié",manyChanges:"Vérification d'orthographe terminée: %1 mots modifiés",ieSpellDownload:"Le Correcteur d'orthographe n'est pas installé. Souhaitez-vous le télécharger maintenant?"},smiley:{toolbar:'Emoticon',title:'Insérer un Emoticon',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Liste numérotée',bulletedlist:'Liste à puces',indent:'Augmenter le retrait',outdent:'Diminuer le retrait',justify:{left:'Aligner à gauche',center:'Centrer',right:'Aligner à Droite',block:'Texte justifié'},blockquote:'Citation',clipboard:{title:'Coller',cutError:"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).",copyError:"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).",pasteMsg:'Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.',securityMsg:"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.",pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Coller en tant que Word (formaté)',title:'Coller en tant que Word (formaté)',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Coller comme texte',title:'Coller comme texte'},templates:{button:'Modèles',title:'Modèles de contenu',options:'Template Options',insertOption:'Remplacer tout le contenu actuel',selectPromptMsg:"Sélectionner le modèle à ouvrir dans l'éditeur<br>(le contenu actuel sera remplacé):",emptyListMsg:'(Aucun modèle disponible)'},showBlocks:'Afficher les blocs',stylesCombo:{label:'Style',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formaté',tag_address:'Adresse',tag_h1:'En-tête 1',tag_h2:'En-tête 2',tag_h3:'En-tête 3',tag_h4:'En-tête 4',tag_h5:'En-tête 5',tag_h6:'En-tête 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Police',voiceLabel:'Font',panelTitle:'Police'},fontSize:{label:'Taille',voiceLabel:'Font Size',panelTitle:'Taille'},colorButton:{textColorTitle:'Couleur de caractère',bgColorTitle:'Couleur de fond',panelTitle:'Colors',auto:'Automatique',more:'Plus de couleurs...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'Pas de suggestion',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Propriétés du document',title:'Propriétés du document',design:'Design',meta:'Méta-Données',chooseColor:'Choose',other:'<other>',docTitle:'Titre de la page',charset:'Encodage de caractère',charsetOther:'Autre encodage de caractère',charsetASCII:'ASCII',charsetCE:'Europe Centrale',charsetCT:'Chinois Traditionnel (Big5)',charsetCR:'Cyrillique',charsetGR:'Grecque',charsetJP:'Japonais',charsetKR:'Coréen',charsetTR:'Turcque',charsetUN:'Unicode (UTF-8)',charsetWE:'Occidental',docType:'Type de document',docTypeOther:'Autre type de document',xhtmlDec:'Inclure les déclarations XHTML',bgColor:'Couleur de fond',bgImage:'Image de fond',bgFixed:'Image fixe sans défilement',txtColor:'Couleur de caractère',margin:'Marges',marginTop:'Haut',marginLeft:'Gauche',marginRight:'Droite',marginBottom:'Bas',metaKeywords:'Mots-clés (séparés par des virgules)',metaDescription:'Description',metaAuthor:'Auteur',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/fr.js b/web/imcms/ckeditor/lang/fr.js
new file mode 100644
index 0000000000..e75c130597
--- /dev/null
+++ b/web/imcms/ckeditor/lang/fr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.fr={dir:'ltr',editorTitle:'Éditeur de Texte Enrichi, %1',editorHelp:"Appuyez sur ALT-0 pour l'aide",toolbars:"Barre d'outils de l'éditeur",editor:'Éditeur de Texte Enrichi',source:'Source',newPage:'Nouvelle page',save:'Enregistrer',preview:'Aperçu',cut:'Couper',copy:'Copier',paste:'Coller',print:'Imprimer',underline:'Souligné',bold:'Gras',italic:'Italique',selectAll:'Tout sélectionner',removeFormat:'Supprimer la mise en forme',strike:'Barré',subscript:'Indice',superscript:'Exposant',horizontalrule:'Ligne horizontale',pagebreak:'Saut de page',pagebreakAlt:'Saut de page',unlink:'Supprimer le lien',undo:'Annuler',redo:'Rétablir',common:{browseServer:'Explorer le serveur',url:'URL',protocol:'Protocole',upload:'Envoyer',uploadSubmit:'Envoyer sur le serveur',image:'Image',flash:'Flash',form:'Formulaire',checkbox:'Case à cocher',radio:'Bouton Radio',textField:'Champ texte',textarea:'Zone de texte',hiddenField:'Champ caché',button:'Bouton',select:'Liste déroulante',imageButton:'Bouton image',notSet:'<non défini>',id:'Id',name:'Nom',langDir:"Sens d'écriture",langDirLtr:'Gauche à droite (LTR)',langDirRtl:'Droite à gauche (RTL)',langCode:'Code de langue',longDescr:'URL de description longue (longdesc => malvoyant)',cssClass:'Classe CSS',advisoryTitle:'Description (title)',cssStyle:'Style',ok:'OK',cancel:'Annuler',close:'Fermer',preview:'Aperçu',generalTab:'Général',advancedTab:'Avancé',validateNumberFailed:"Cette valeur n'est pas un nombre.",confirmNewPage:'Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page?',confirmCancel:'Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer?',options:'Options',target:'Cible (Target)',targetNew:'Nouvelle fenêtre (_blank)',targetTop:'Fenêtre supérieure (_top)',targetSelf:'Même fenêtre (_self)',targetParent:'Fenêtre parent (_parent)',langDirLTR:'Gauche à Droite (LTR)',langDirRTL:'Droite à Gauche (RTL)',styles:'Style',cssClasses:'Classes de style',width:'Largeur',height:'Hauteur',align:'Alignement',alignLeft:'Gauche',alignRight:'Droite',alignCenter:'Centré',alignTop:'Haut',alignMiddle:'Milieu',alignBottom:'Bas',invalidValue:'Invalid value.',invalidHeight:'La hauteur doit être un nombre.',invalidWidth:'La largeur doit être un nombre.',invalidCssLength:'La valeur spécifiée pour le champ "%1" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'La valeur spécifiée pour le champ "%1" doit être un nombre positif avec ou sans unité de mesure HTML valide (px or %).',invalidInlineStyle:'La valeur spécifiée pour le style inline doit être composée d\'un ou plusieurs couples de valeur au format "nom : valeur", separés par des points-virgules.',cssLengthTooltip:'Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, Indisponible</span>'},contextmenu:{options:'Options du menu contextuel'},specialChar:{toolbar:'Insérer un caractère spécial',title:'Sélectionnez un caractère',options:'Options des caractères spéciaux'},link:{toolbar:'Lien',other:'<autre>',menu:'Editer le lien',title:'Lien',info:'Infos sur le lien',target:'Cible',upload:'Envoyer',advanced:'Avancé',type:'Type de lien',toUrl:'URL',toAnchor:'Transformer le lien en ancre dans le texte',toEmail:'E-mail',targetFrame:'<cadre>',targetPopup:'<fenêtre popup>',targetFrameName:'Nom du Cadre destination',targetPopupName:'Nom de la fenêtre popup',popupFeatures:'Options de la fenêtre popup',popupResizable:'Redimensionnable',popupStatusBar:'Barre de status',popupLocationBar:"Barre d'adresse",popupToolbar:"Barre d'outils",popupMenuBar:'Barre de menu',popupFullScreen:'Plein écran (IE)',popupScrollBars:'Barres de défilement',popupDependent:'Dépendante (Netscape)',popupLeft:'Position gauche',popupTop:'Position haute',id:'Id',langDir:"Sens d'écriture",langDirLTR:'Gauche à droite',langDirRTL:'Droite à gauche',acccessKey:"Touche d'accessibilité",name:'Nom',langCode:'Code de langue',tabIndex:'Index de tabulation',advisoryTitle:'Description (title)',advisoryContentType:'Type de contenu (ex: text/html)',cssClasses:'Classe CSS',charset:'Charset de la cible',styles:'Style',rel:'Relation',selectAnchor:"Sélectionner l'ancre",anchorName:"Par nom d'ancre",anchorId:"Par ID d'élément",emailAddress:'Adresse E-Mail',emailSubject:'Sujet du message',emailBody:'Corps du message',noAnchors:'(Aucune ancre disponible dans ce document)',noUrl:"Veuillez entrer l'adresse du lien",noEmail:"Veuillez entrer l'adresse e-mail"},anchor:{toolbar:'Ancre',menu:"Editer l'ancre",title:"Propriétés de l'ancre",name:"Nom de l'ancre",errorName:"Veuillez entrer le nom de l'ancre.",remove:"Supprimer l'ancre"},list:{numberedTitle:'Propriétés de la liste numérotée',bulletedTitle:'Propriétés de la liste à puces',type:'Type',start:'Début',validateStartNumber:'Le premier élément de la liste doit être un nombre entier.',circle:'Cercle',disc:'Disque',square:'Carré',none:'Aucun',notset:'<Non défini>',armenian:'Numération arménienne',georgian:'Numération géorgienne (an, ban, gan, etc.)',lowerRoman:'Nombres romains minuscules (i, ii, iii, iv, v, etc.)',upperRoman:'Nombres romains majuscules (I, II, III, IV, V, etc.)',lowerAlpha:'Alphabétique minuscules (a, b, c, d, e, etc.)',upperAlpha:'Alphabétique majuscules (A, B, C, D, E, etc.)',lowerGreek:'Grec minuscule (alpha, beta, gamma, etc.)',decimal:'Décimal (1, 2, 3, etc.)',decimalLeadingZero:'Décimal précédé par un 0 (01, 02, 03, etc.)'},findAndReplace:{title:'Trouver et remplacer',find:'Trouver',replace:'Remplacer',findWhat:'Expression à trouver: ',replaceWith:'Remplacer par: ',notFoundMsg:'Le texte spécifié ne peut être trouvé.',findOptions:'Options de recherche',matchCase:'Respecter la casse',matchWord:'Mot entier uniquement',matchCyclic:'Boucler',replaceAll:'Remplacer tout',replaceSuccessMsg:'%1 occurrence(s) replacée(s).'},table:{toolbar:'Tableau',title:'Propriétés du tableau',menu:'Propriétés du tableau',deleteTable:'Supprimer le tableau',rows:'Lignes',columns:'Colonnes',border:'Taille de la bordure',widthPx:'pixels',widthPc:'% pourcents',widthUnit:'unité de largeur',cellSpace:'Espacement des cellules',cellPad:'Marge interne des cellules',caption:'Titre du tableau',summary:'Résumé (description)',headers:'En-Têtes',headersNone:'Aucunes',headersColumn:'Première colonne',headersRow:'Première ligne',headersBoth:'Les deux',invalidRows:'Le nombre de lignes doit être supérieur à 0.',invalidCols:'Le nombre de colonnes doit être supérieur à 0.',invalidBorder:'La taille de la bordure doit être un nombre.',invalidWidth:'La largeur du tableau doit être un nombre.',invalidHeight:'La hauteur du tableau doit être un nombre.',invalidCellSpacing:"L'espacement des cellules doit être un nombre positif.",invalidCellPadding:'La marge intérieure des cellules doit être un nombre positif.',cell:{menu:'Cellule',insertBefore:'Insérer une cellule avant',insertAfter:'Insérer une cellule après',deleteCell:'Supprimer les cellules',merge:'Fusionner les cellules',mergeRight:'Fusionner à droite',mergeDown:'Fusionner en bas',splitHorizontal:'Fractionner horizontalement',splitVertical:'Fractionner verticalement',title:'Propriétés de la cellule',cellType:'Type de cellule',rowSpan:'Fusion de lignes',colSpan:'Fusion de colonnes',wordWrap:'Césure',hAlign:'Alignement Horizontal',vAlign:'Alignement Vertical',alignBaseline:'Bas du texte',bgColor:"Couleur d'arrière-plan",borderColor:'Couleur de Bordure',data:'Données',header:'Entête',yes:'Oui',no:'Non',invalidWidth:'La Largeur de Cellule doit être un nombre.',invalidHeight:'La Hauteur de Cellule doit être un nombre.',invalidRowSpan:'La fusion de lignes doit être un nombre entier.',invalidColSpan:'La fusion de colonnes doit être un nombre entier.',chooseColor:'Choisissez'},row:{menu:'Ligne',insertBefore:'Insérer une ligne avant',insertAfter:'Insérer une ligne après',deleteRow:'Supprimer les lignes'},column:{menu:'Colonnes',insertBefore:'Insérer une colonne avant',insertAfter:'Insérer une colonne après',deleteColumn:'Supprimer les colonnes'}},button:{title:'Propriétés du bouton',text:'Texte (Value)',type:'Type',typeBtn:'Bouton',typeSbm:'Validation (submit)',typeRst:'Remise à zéro'},checkboxAndRadio:{checkboxTitle:'Propriétés de la case à cocher',radioTitle:'Propriétés du bouton Radio',value:'Valeur',selected:'Sélectionné'},form:{title:'Propriétés du formulaire',menu:'Propriétés du formulaire',action:'Action',method:'Méthode',encoding:'Encodage'},select:{title:'Propriétés du menu déroulant',selectInfo:'Informations sur le menu déroulant',opAvail:'Options disponibles',value:'Valeur',size:'Taille',lines:'Lignes',chkMulti:'Permettre les sélections multiples',opText:'Texte',opValue:'Valeur',btnAdd:'Ajouter',btnModify:'Modifier',btnUp:'Haut',btnDown:'Bas',btnSetValue:'Définir comme valeur sélectionnée',btnDelete:'Supprimer'},textarea:{title:'Propriétés de la zone de texte',cols:'Colonnes',rows:'Lignes'},textfield:{title:'Propriétés du champ texte',name:'Nom',value:'Valeur',charWidth:'Taille des caractères',maxChars:'Nombre maximum de caractères',type:'Type',typeText:'Texte',typePass:'Mot de passe'},hidden:{title:'Propriétés du champ caché',name:'Nom',value:'Valeur'},image:{title:"Propriétés de l'image",titleButton:'Propriétés du bouton image',menu:"Propriétés de l'image",infoTab:"Informations sur l'image",btnUpload:'Envoyer sur le serveur',upload:'Envoyer',alt:'Texte de remplacement',lockRatio:'Conserver les proportions',resetSize:"Taille d'origine",border:'Bordure',hSpace:'Espacement horizontal',vSpace:'Espacement vertical',alertUrl:"Veuillez entrer l'adresse de l'image",linkTab:'Lien',button2Img:'Voulez-vous transformer le bouton image sélectionné en simple image?',img2Button:"Voulez-vous transformer l'image en bouton image?",urlMissing:"L'adresse source de l'image est manquante.",validateBorder:'Bordure doit être un entier.',validateHSpace:'HSpace doit être un entier.',validateVSpace:'VSpace doit être un entier.'},flash:{properties:'Propriétés du Flash',propertiesTab:'Propriétés',title:'Propriétés du Flash',chkPlay:'Jouer automatiquement',chkLoop:'Boucle',chkMenu:'Activer le menu Flash',chkFull:'Permettre le plein écran',scale:'Echelle',scaleAll:'Afficher tout',scaleNoBorder:'Pas de bordure',scaleFit:"Taille d'origine",access:'Accès aux scripts',accessAlways:'Toujours',accessSameDomain:'Même domaine',accessNever:'Jamais',alignAbsBottom:'Bas absolu',alignAbsMiddle:'Milieu absolu',alignBaseline:'Bas du texte',alignTextTop:'Haut du texte',quality:'Qualité',qualityBest:'Meilleure',qualityHigh:'Haute',qualityAutoHigh:'Haute Auto',qualityMedium:'Moyenne',qualityAutoLow:'Basse Auto',qualityLow:'Basse',windowModeWindow:'Fenêtre',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Mode fenêtre',flashvars:'Variables du Flash',bgcolor:"Couleur d'arrière-plan",hSpace:'Espacement horizontal',vSpace:'Espacement vertical',validateSrc:"L'adresse ne doit pas être vide.",validateHSpace:"L'espacement horizontal doit être un nombre.",validateVSpace:"L'espacement vertical doit être un nombre."},spellCheck:{toolbar:"Vérifier l'orthographe",title:"Vérifier l'orthographe",notAvailable:'Désolé, le service est indisponible actuellement.',errorLoading:"Erreur du chargement du service depuis l'hôte : %s.",notInDic:"N'existe pas dans le dictionnaire.",changeTo:'Modifier pour',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer tout',btnReplace:'Remplacer',btnReplaceAll:'Remplacer tout',btnUndo:'Annuler',noSuggestions:'- Aucune suggestion -',progress:"Vérification de l'orthographe en cours...",noMispell:"Vérification de l'orthographe terminée : aucune erreur trouvée.",noChanges:"Vérification de l'orthographe terminée : Aucun mot corrigé.",oneChange:"Vérification de l'orthographe terminée : Un seul mot corrigé.",manyChanges:"Vérification de l'orthographe terminée : %1 mots corrigés.",ieSpellDownload:"La vérification d'orthographe n'est pas installée. Voulez-vous la télécharger maintenant?"},smiley:{toolbar:'Émoticones',title:'Insérer un émoticone',options:'Options des émoticones'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 éléments'},numberedlist:'Insérer/Supprimer la liste numérotée',bulletedlist:'Insérer/Supprimer la liste à puces',indent:'Augmenter le retrait (tabulation)',outdent:'Diminuer le retrait (tabulation)',justify:{left:'Aligner à gauche',center:'Centrer',right:'Aligner à droite',block:'Justifier'},blockquote:'Citation',clipboard:{title:'Coller',cutError:"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement l'opération \"couper\". Veuillez utiliser le raccourci clavier (Ctrl/Cmd+X).",copyError:"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement des opérations de copie. Veuillez utiliser le raccourci clavier (Ctrl/Cmd+C).",pasteMsg:'Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.',securityMsg:"A cause des paramètres de sécurité de votre navigateur, l'éditeur n'est pas en mesure d'accéder directement à vos données contenues dans le presse-papier. Vous devriez réessayer de coller les données dans la fenêtre.",pasteArea:'Coller la zone'},pastefromword:{confirmCleanup:'Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?',toolbar:'Coller depuis Word',title:'Coller depuis Word',error:"Il n'a pas été possible de nettoyer les données collées à la suite d'une erreur interne."},pasteText:{button:'Coller comme texte sans mise en forme',title:'Coller comme texte sans mise en forme'},templates:{button:'Modèles',title:'Contenu des modèles',options:'Options des modèles',insertOption:'Remplacer le contenu actuel',selectPromptMsg:"Veuillez sélectionner le modèle pour l'ouvrir dans l'éditeur",emptyListMsg:'(Aucun modèle disponible)'},showBlocks:'Afficher les blocs',stylesCombo:{label:'Styles',panelTitle:'Styles de mise en page',panelTitle1:'Styles de blocs',panelTitle2:'Styles en ligne',panelTitle3:"Styles d'objet"},format:{label:'Format',panelTitle:'Format de paragraphe',tag_p:'Normal',tag_pre:'Formaté',tag_address:'Adresse',tag_h1:'Titre 1',tag_h2:'Titre 2',tag_h3:'Titre 3',tag_h4:'Titre 4',tag_h5:'Titre 5',tag_h6:'Titre 6',tag_div:'Normal (DIV)'},div:{title:'Créer un container DIV',toolbar:'Créer un container DIV',cssClassInputLabel:'Classe CSS',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:'Code de langue',inlineStyleInputLabel:'Style en ligne',advisoryTitleInputLabel:'Advisory Title',langDirLabel:"Sens d'écriture",langDirLTRLabel:'Gauche à droite (LTR)',langDirRTLLabel:'Droite à gauche (RTL)',edit:'Éditer la DIV',remove:'Enlever la DIV'},iframe:{title:'Propriétés de la IFrame',toolbar:'IFrame',noUrl:"Veuillez entrer l'adresse du lien de la IFrame",scrolling:'Permettre à la barre de défilement',border:'Afficher une bordure de la IFrame'},font:{label:'Police',voiceLabel:'Police',panelTitle:'Style de police'},fontSize:{label:'Taille',voiceLabel:'Taille de police',panelTitle:'Taille de police'},colorButton:{textColorTitle:'Couleur de texte',bgColorTitle:"Couleur d'arrière plan",panelTitle:'Couleurs',auto:'Automatique',more:'Plus de couleurs...'},colors:{'000':'Noir',800000:'Marron','8B4513':'Brun moyen','2F4F4F':'Vert sombre','008080':'Canard','000080':'Bleu marine','4B0082':'Indigo',696969:'Gris foncé',B22222:'Rouge brique',A52A2A:'Brun',DAA520:'Or terni','006400':'Vert foncé','40E0D0':'Turquoise','0000CD':'Bleu royal',800080:'Pourpre',808080:'Gris',F00:'Rouge',FF8C00:'Orange foncé',FFD700:'Or','008000':'Vert','0FF':'Cyan','00F':'Bleu',EE82EE:'Violet',A9A9A9:'Gris moyen',FFA07A:'Saumon',FFA500:'Orange',FFFF00:'Jaune','00FF00':'Lime',AFEEEE:'Turquoise clair',ADD8E6:'Bleu clair',DDA0DD:'Prune',D3D3D3:'Gris clair',FFF0F5:'Fard Lavande',FAEBD7:'Blanc antique',FFFFE0:'Jaune clair',F0FFF0:'Honeydew',F0FFFF:'Azur',F0F8FF:'Bleu Alice',E6E6FA:'Lavande',FFF:'Blanc'},scayt:{title:"Vérification de l'Orthographe en Cours de Frappe (SCAYT)",opera_title:'Non supporté par Opera',enable:'Activer SCAYT',disable:'Désactiver SCAYT',about:'A propos de SCAYT',toggle:'Activer/Désactiver SCAYT',options:'Options',langs:'Langues',moreSuggestions:'Plus de suggestions',ignore:'Ignorer',ignoreAll:'Ignorer Tout',addWord:'Ajouter le mot',emptyDic:'Le nom du dictionnaire ne devrait pas être vide.',noSuggestions:'Aucune suggestion',optionsTab:'Options',allCaps:'Ignorer les mots entièrement en majuscules',ignoreDomainNames:'Ignorer les noms de domaines',mixedCase:'Ignorer les mots à casse multiple',mixedWithDigits:'Ignorer les mots contenant des chiffres',languagesTab:'Langues',dictionariesTab:'Dictionnaires',dic_field_name:'Nom du dictionnaire',dic_create:'Créer',dic_restore:'Restaurer',dic_delete:'Effacer',dic_rename:'Renommer',dic_info:"Initialement, le dictionnaire de l'utilisateur est stocké dans un cookie. Cependant, les cookies sont limités en taille. Quand le dictionnaire atteint une taille qu'il n'est plus possible de stocker dans un cookie, il peut alors être stocké sur nos serveurs. Afin de stocker votre dictionnaire personnel sur nos serveurs, vous devez spécifier un nom pour ce dictionnaire. Si vous avez déjà un dictionnaire stocké, merci de taper son nom puis cliquer sur Restaurer pour le récupérer.",aboutTab:'À propos de'},about:{title:'À propos de CKEditor',dlgTitle:'À propos de CKEditor',help:"Consulter $1 pour l'aide.",userGuide:"Guide de l'utilisateur CKEditor en anglais",moreInfo:'Pour les informations de licence, veuillez visiter notre site web:',copy:'Copyright &copy; $1. Tous droits réservés.'},maximize:'Agrandir',minimize:'Minimiser',fakeobjects:{anchor:'Ancre',flash:'Animation Flash',iframe:'IFrame',hiddenfield:'Champ caché',unknown:'Objet inconnu'},resize:'Déplacer pour modifier la taille',colordialog:{title:'Choisir une couleur',options:'Option des couleurs',highlight:'Détails',selected:'Couleur choisie',clear:'Effacer'},toolbarCollapse:"Enrouler la barre d'outils",toolbarExpand:"Dérouler la barre d'outils",toolbarGroups:{document:'Document',clipboard:'Presse-papier/Défaire',editing:'Editer',forms:'Formulaires',basicstyles:'Styles de base',paragraph:'Paragraphe',links:'Liens',insert:'Insérer',styles:'Styles',colors:'Couleurs',tools:'Outils'},bidi:{ltr:'Direction du texte de la gauche vers la droite',rtl:'Direction du texte de la droite vers la gauche'},docprops:{label:'Propriétés du document',title:'Propriétés du document',design:'Design',meta:'Métadonnées',chooseColor:'Choisissez',other:'<autre>',docTitle:'Titre de la page',charset:'Encodage de caractère',charsetOther:'Autre encodage de caractère',charsetASCII:'ASCII',charsetCE:'Europe Centrale',charsetCT:'Chinois Traditionnel (Big5)',charsetCR:'Cyrillique',charsetGR:'Grec',charsetJP:'Japonais',charsetKR:'Coréen',charsetTR:'Turc',charsetUN:'Unicode (UTF-8)',charsetWE:'Occidental',docType:'Type de document',docTypeOther:'Autre type de document',xhtmlDec:'Inclure les déclarations XHTML',bgColor:'Couleur de fond',bgImage:'Image de fond',bgFixed:'Image fixe sans défilement',txtColor:'Couleur de texte',margin:'Marges',marginTop:'Haut',marginLeft:'Gauche',marginRight:'Droite',marginBottom:'Bas',metaKeywords:'Mots-clés (séparés par des virgules)',metaDescription:'Description',metaAuthor:'Auteur',metaCopyright:'Copyright',previewHtml:'<p>Ceci est un <strong>texte d\'exemple</strong>. Vous utilisez <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/gl.js b/web/imcms/ckeditor/lang/gl.js
new file mode 100644
index 0000000000..1405e54c3c
--- /dev/null
+++ b/web/imcms/ckeditor/lang/gl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.gl={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Código Fonte',newPage:'Nova Páxina',save:'Gardar',preview:'Vista Previa',cut:'Cortar',copy:'Copiar',paste:'Pegar',print:'Imprimir',underline:'Sub-raiado',bold:'Negrita',italic:'Cursiva',selectAll:'Seleccionar todo',removeFormat:'Eliminar Formato',strike:'Tachado',subscript:'Subíndice',superscript:'Superíndice',horizontalrule:'Inserir Liña Horizontal',pagebreak:'Inserir Salto de Páxina',pagebreakAlt:'Page Break',unlink:'Eliminar Ligazón',undo:'Desfacer',redo:'Refacer',common:{browseServer:'Navegar no Servidor',url:'URL',protocol:'Protocolo',upload:'Carregar',uploadSubmit:'Enviar ó Servidor',image:'Imaxe',flash:'Flash',form:'Formulario',checkbox:'Cadro de Verificación',radio:'Botón de Radio',textField:'Campo de Texto',textarea:'�rea de Texto',hiddenField:'Campo Oculto',button:'Botón',select:'Campo de Selección',imageButton:'Botón de Imaxe',notSet:'<non definido>',id:'Id',name:'Nome',langDir:'Orientación do Idioma',langDirLtr:'Esquerda a Dereita (LTR)',langDirRtl:'Dereita a Esquerda (RTL)',langCode:'Código do Idioma',longDescr:'Descrición Completa da URL',cssClass:'Clases da Folla de Estilos',advisoryTitle:'Título',cssStyle:'Estilo',ok:'OK',cancel:'Cancelar',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanzado',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Largura',height:'Altura',align:'Aliñamento',alignLeft:'Esquerda',alignRight:'Dereita',alignCenter:'Centro',alignTop:'Tope',alignMiddle:'Centro',alignBottom:'Pé',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Inserir Carácter Especial',title:'Seleccione Caracter Especial',options:'Special Character Options'},link:{toolbar:'Inserir/Editar Ligazón',other:'<outro>',menu:'Editar Ligazón',title:'Ligazón',info:'Información da Ligazón',target:'Destino',upload:'Carregar',advanced:'Advanzado',type:'Tipo de Ligazón',toUrl:'URL',toAnchor:'Referencia nesta páxina',toEmail:'E-Mail',targetFrame:'<frame>',targetPopup:'<Xanela Emerxente>',targetFrameName:'Nome do Marco Destino',targetPopupName:'Nome da Xanela Emerxente',popupFeatures:'Características da Xanela Emerxente',popupResizable:'Resizable',popupStatusBar:'Barra de Estado',popupLocationBar:'Barra de Localización',popupToolbar:'Barra de Ferramentas',popupMenuBar:'Barra de Menú',popupFullScreen:'A Toda Pantalla (IE)',popupScrollBars:'Barras de Desplazamento',popupDependent:'Dependente (Netscape)',popupLeft:'Posición Esquerda',popupTop:'Posición dende Arriba',id:'Id',langDir:'Orientación do Idioma',langDirLTR:'Esquerda a Dereita (LTR)',langDirRTL:'Dereita a Esquerda (RTL)',acccessKey:'Chave de Acceso',name:'Nome',langCode:'Orientación do Idioma',tabIndex:'�ndice de Tabulación',advisoryTitle:'Título',advisoryContentType:'Tipo de Contido',cssClasses:'Clases da Folla de Estilos',charset:'Fonte de Caracteres Vinculado',styles:'Estilo',rel:'Relationship',selectAnchor:'Seleccionar unha Referencia',anchorName:'Por Nome de Referencia',anchorId:'Por Element Id',emailAddress:'Enderezo de E-Mail',emailSubject:'Asunto do Mensaxe',emailBody:'Corpo do Mensaxe',noAnchors:'(Non hai referencias disponibles no documento)',noUrl:'Por favor, escriba a ligazón URL',noEmail:'Por favor, escriba o enderezo de e-mail'},anchor:{toolbar:'Inserir/Editar Referencia',menu:'Propriedades da Referencia',title:'Propriedades da Referencia',name:'Nome da Referencia',errorName:'Por favor, escriba o nome da referencia',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Procurar',replace:'Substituir',findWhat:'Texto a procurar:',replaceWith:'Substituir con:',notFoundMsg:'Non te atopou o texto indicado.',findOptions:'Find Options',matchCase:'Coincidir Mai./min.',matchWord:'Coincidir con toda a palabra',matchCyclic:'Match cyclic',replaceAll:'Substitiur Todo',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabla',title:'Propiedades da Táboa',menu:'Propiedades da Táboa',deleteTable:'Borrar Táboa',rows:'Filas',columns:'Columnas',border:'Tamaño do Borde',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Marxe entre Celas',cellPad:'Marxe interior',caption:'Título',summary:'Sumario',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cela',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Borrar Cela',merge:'Unir Celas',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Fila',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Borrar Filas'},column:{menu:'Columna',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Borrar Columnas'}},button:{title:'Propriedades do Botón',text:'Texto (Valor)',type:'Tipo',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Propriedades do Cadro de Verificación',radioTitle:'Propriedades do Botón de Radio',value:'Valor',selected:'Seleccionado'},form:{title:'Propriedades do Formulario',menu:'Propriedades do Formulario',action:'Acción',method:'Método',encoding:'Encoding'},select:{title:'Propriedades do Campo de Selección',selectInfo:'Info',opAvail:'Opcións Disponibles',value:'Valor',size:'Tamaño',lines:'liñas',chkMulti:'Permitir múltiples seleccións',opText:'Texto',opValue:'Valor',btnAdd:'Engadir',btnModify:'Modificar',btnUp:'Subir',btnDown:'Baixar',btnSetValue:'Definir como valor por defecto',btnDelete:'Borrar'},textarea:{title:'Propriedades da �rea de Texto',cols:'Columnas',rows:'Filas'},textfield:{title:'Propriedades do Campo de Texto',name:'Nome',value:'Valor',charWidth:'Tamaño do Caracter',maxChars:'Máximo de Caracteres',type:'Tipo',typeText:'Texto',typePass:'Chave'},hidden:{title:'Propriedades do Campo Oculto',name:'Nome',value:'Valor'},image:{title:'Propriedades da Imaxe',titleButton:'Propriedades do Botón de Imaxe',menu:'Propriedades da Imaxe',infoTab:'Información da Imaxe',btnUpload:'Enviar ó Servidor',upload:'Carregar',alt:'Texto Alternativo',lockRatio:'Proporcional',resetSize:'Tamaño Orixinal',border:'Límite',hSpace:'Esp. Horiz.',vSpace:'Esp. Vert.',alertUrl:'Por favor, escriba a URL da imaxe',linkTab:'Ligazón',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Propriedades Flash',propertiesTab:'Properties',title:'Propriedades Flash',chkPlay:'Auto Execución',chkLoop:'Bucle',chkMenu:'Activar Menú Flash',chkFull:'Allow Fullscreen',scale:'Escalar',scaleAll:'Amosar Todo',scaleNoBorder:'Sen Borde',scaleFit:'Encaixar axustando',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Inferior',alignAbsMiddle:'Abs Centro',alignBaseline:'Liña Base',alignTextTop:'Tope do Texto',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Cor do Fondo',hSpace:'Esp. Horiz.',vSpace:'Esp. Vert.',validateSrc:'Por favor, escriba a ligazón URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Corrección Ortográfica',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Non está no diccionario',changeTo:'Cambiar a',btnIgnore:'Ignorar',btnIgnoreAll:'Ignorar Todas',btnReplace:'Substituir',btnReplaceAll:'Substituir Todas',btnUndo:'Desfacer',noSuggestions:'- Sen candidatos -',progress:'Corrección ortográfica en progreso...',noMispell:'Corrección ortográfica rematada: Non se atoparon erros',noChanges:'Corrección ortográfica rematada: Non se substituiu nengunha verba',oneChange:'Corrección ortográfica rematada: Unha verba substituida',manyChanges:'Corrección ortográfica rematada: %1 verbas substituidas',ieSpellDownload:'O corrector ortográfico non está instalado. ¿Quere descargalo agora?'},smiley:{toolbar:'Smiley',title:'Inserte un Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Lista Numerada',bulletedlist:'Marcas',indent:'Aumentar Sangría',outdent:'Disminuir Sangría',justify:{left:'Aliñar á Esquerda',center:'Centrado',right:'Aliñar á Dereita',block:'Xustificado'},blockquote:'Block Quote',clipboard:{title:'Pegar',cutError:'Os axustes de seguridade do seu navegador non permiten que o editor realice automáticamente as tarefas de corte. Por favor, use o teclado para iso (Ctrl/Cmd+X).',copyError:'Os axustes de seguridade do seu navegador non permiten que o editor realice automáticamente as tarefas de copia. Por favor, use o teclado para iso (Ctrl/Cmd+C).',pasteMsg:'Por favor, pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e pulse <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Pegar dende Word',title:'Pegar dende Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Pegar como texto plano',title:'Pegar como texto plano'},templates:{button:'Plantillas',title:'Plantillas de Contido',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Por favor, seleccione a plantilla a abrir no editor<br>(o contido actual perderase):',emptyListMsg:'(Non hai plantillas definidas)'},showBlocks:'Show Blocks',stylesCombo:{label:'Estilo',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normal',tag_pre:'Formateado',tag_address:'Enderezo',tag_h1:'Enacabezado 1',tag_h2:'Encabezado 2',tag_h3:'Encabezado 3',tag_h4:'Encabezado 4',tag_h5:'Encabezado 5',tag_h6:'Encabezado 6',tag_div:'Paragraph (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Tipo',voiceLabel:'Font',panelTitle:'Tipo'},fontSize:{label:'Tamaño',voiceLabel:'Font Size',panelTitle:'Tamaño'},colorButton:{textColorTitle:'Cor do Texto',bgColorTitle:'Cor do Fondo',panelTitle:'Colors',auto:'Automático',more:'Máis Cores...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'Sen candidatos',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Propriedades do Documento',title:'Propriedades do Documento',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'<outro>',docTitle:'Título da Páxina',charset:'Codificación do Xogo de Caracteres',charsetOther:'Outra Codificación do Xogo de Caracteres',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Encabezado do Tipo de Documento',docTypeOther:'Outro Encabezado do Tipo de Documento',xhtmlDec:'Incluir Declaracións XHTML',bgColor:'Cor de Fondo',bgImage:'URL da Imaxe de Fondo',bgFixed:'Fondo Fixo',txtColor:'Cor do Texto',margin:'Marxes da Páxina',marginTop:'Arriba',marginLeft:'Esquerda',marginRight:'Dereita',marginBottom:'Abaixo',metaKeywords:'Palabras Chave de Indexación do Documento (separadas por comas)',metaDescription:'Descripción do Documento',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/gu.js b/web/imcms/ckeditor/lang/gu.js
new file mode 100644
index 0000000000..e11db54bd3
--- /dev/null
+++ b/web/imcms/ckeditor/lang/gu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.gu={dir:'ltr',editorTitle:'રીચ ટેક�ષ�ત� �ડિટર, %1',editorHelp:'પ�રેસ ALT 0 મદદ માટ',toolbars:'�ડીટર ટૂલ બાર',editor:'રીચ ટેક�ષ�ત� �ડીટર',source:'મૂળ કે પ�રાથમિક દસ�તાવેજ',newPage:'નવ� પાન�ં',save:'સેવ',preview:'પૂર�વદર�શન',cut:'કાપવ�ં',copy:'નકલ',paste:'પેસ�ટ',print:'પ�રિન�ટ',underline:'અન�ડર�લાઇન, નીચે લીટી',bold:'બોલ�ડ/સ�પષ�ટ',italic:'ઇટેલિક, ત�રાંસા',selectAll:'બઘ�ં પસંદ કરવ�ં',removeFormat:'ફૉર�મટ કાઢવ�ં',strike:'છેકી નાખવ�ં',subscript:'�ક ચિહ�નની નીચે કરેલ�ં બીજ�ં ચિહ�ન',superscript:'�ક ચિહ�ન ઉપર કરેલ�ં બીજ�ં ચિહ�ન.',horizontalrule:'સમસ�તરીય રેખા ઇન�સર�ટ/દાખલ કરવી',pagebreak:'ઇન�સર�ટ પેજબ�રેક/પાનાને અલગ કરવ�ં/દાખલ કરવ�ં',pagebreakAlt:'નવ�ં પાન�ં',unlink:'લિંક કાઢવી',undo:'રદ કરવ�ં; પહેલાં હતી �વી સ�થિતિ પાછી લાવવી',redo:'રિડૂ; પછી હતી �વી સ�થિતિ પાછી લાવવી',common:{browseServer:'સર�વર બ�રાઉ� કરો',url:'URL',protocol:'પ�રોટોકૉલ',upload:'અપલોડ',uploadSubmit:'આ સર�વરને મોકલવ�ં',image:'ચિત�ર',flash:'ફ�લૅશ',form:'ફૉર�મ/પત�રક',checkbox:'ચેક બોક�સ',radio:'રેડિઓ બટન',textField:'ટેક�સ�ટ ફીલ�ડ, શબ�દ ક�ષેત�ર',textarea:'ટેક�સ�ટ �રિઆ, શબ�દ વિસ�તાર',hiddenField:'ગ�પ�ત ક�ષેત�ર',button:'બટન',select:'પસંદગી ક�ષેત�ર',imageButton:'ચિત�ર બટન',notSet:'<સેટ નથી>',id:'Id',name:'નામ',langDir:'ભાષા લેખવાની પદ�ધતિ',langDirLtr:'ડાબે થી જમણે (LTR)',langDirRtl:'જમણે થી ડાબે (RTL)',langCode:'ભાષા કોડ',longDescr:'વધારે માહિતી માટે URL',cssClass:'સ�ટાઇલ-શીટ ક�લાસ',advisoryTitle:'મ�ખ�ય મથાળ�ં',cssStyle:'સ�ટાઇલ',ok:'ઠીક છે',cancel:'રદ કરવ�ં',close:'બંધ કરવ�ં',preview:'જોવ�ં',generalTab:'જનરલ',advancedTab:'અડ�વાન�સડ',validateNumberFailed:'આ રકમ આકડો નથી.',confirmNewPage:'સવે કાર�ય વગરન�ં ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવ�ં પાન�ં ખોલવ�ં છે?',confirmCancel:'ઘણા વિકલ�પો બદલાયા છે. તમારે આ બોક�ષ� બંધ કરવ�ં છે?',options:'વિકલ�પો',target:'લક�ષ�ય',targetNew:'નવી વિન�ડો (_blank)',targetTop:'ઉપરની વિન�ડો (_top)',targetSelf:'�જ વિન�ડો (_self)',targetParent:'પેરનટ વિન�ડો (_parent)',langDirLTR:'ડાબે થી જમણે (LTR)',langDirRTL:'જમણે થી ડાબે (RTL)',styles:'શૈલી',cssClasses:'શૈલી કલાસીસ',width:'પહોળાઈ',height:'ઊંચાઈ',align:'લાઇનદોરીમાં ગોઠવવ�ં',alignLeft:'ડાબી બાજ� ગોઠવવ�ં',alignRight:'જમણી',alignCenter:'મધ�ય સેન�ટર',alignTop:'ઉપર',alignMiddle:'વચ�ચે',alignBottom:'નીચે',invalidValue:'Invalid value.',invalidHeight:'ઉંચાઈ �ક આંકડો હોવો જોઈ�.',invalidWidth:'પોહળ ઈ �ક આંકડો હોવો જોઈ�.',invalidCssLength:'"%1" ની વેલ�ય� �ક પોસીટીવ આંકડો હોવો જોઈ� અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.',invalidHtmlLength:'"%1" ની વેલ�ય� �ક પોસીટીવ આંકડો હોવો જોઈ� અથવા HTML measurement unit (px or %) વગર.',invalidInlineStyle:'ઈનલાઈન  સ�ટાઈલ ની વેલ�ય�  "name : value" ના ફોર�મેટ માં હોવી જોઈ�, વચ�ચે સેમી-કોલોન જોઈ�.',cssLengthTooltip:'પિક�ષ�લ� નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.',unavailable:'%1<span class="cke_accessibility">, નથી મળત�ં</span>'},contextmenu:{options:'કોન�તેક�ષ�ત� મેન�ના વિકલ�પો'},specialChar:{toolbar:'વિશિષ�ટ અક�ષર ઇન�સર�ટ/દાખલ કરવ�ં',title:'સ�પેશિઅલ વિશિષ�ટ અક�ષર પસંદ કરો',options:'સ�પેશિઅલ કરેક�ટરના વિકલ�પો'},link:{toolbar:'લિંક ઇન�સર�ટ/દાખલ કરવી',other:'<other> <અન�ય>',menu:' લિંક �ડિટ/માં ફેરફાર કરવો',title:'લિંક',info:'લિંક ઇન�ફૉ ટૅબ',target:'ટાર�ગેટ/લક�ષ�ય',upload:'અપલોડ',advanced:'અડ�વાન�સડ',type:'લિંક પ�રકાર',toUrl:'URL',toAnchor:'આ પેજનો �ંકર',toEmail:'ઈ-મેલ',targetFrame:'<ફ�રેમ>',targetPopup:'<પૉપ-અપ વિન�ડો>',targetFrameName:'ટાર�ગેટ ફ�રેમ ન�ં નામ',targetPopupName:'પૉપ-અપ વિન�ડો ન�ં નામ',popupFeatures:'પૉપ-અપ વિન�ડો ફીચરસૅ',popupResizable:'રીસાઈ��બલ',popupStatusBar:'સ�ટૅટસ બાર',popupLocationBar:'લોકેશન બાર',popupToolbar:'ટૂલ બાર',popupMenuBar:'મેન�યૂ બાર',popupFullScreen:'ફ�લ સ�ક�રીન (IE)',popupScrollBars:'સ�ક�રોલ બાર',popupDependent:'ડિપેન�ડન�ટ (Netscape)',popupLeft:'ડાબી બાજ�',popupTop:'જમણી બાજ�',id:'Id',langDir:'ભાષા લેખવાની પદ�ધતિ',langDirLTR:'ડાબે થી જમણે (LTR)',langDirRTL:'જમણે થી ડાબે (RTL)',acccessKey:'�ક�સેસ કી',name:'નામ',langCode:'ભાષા લેખવાની પદ�ધતિ',tabIndex:'ટૅબ ઇન�ડેક�સ',advisoryTitle:'મ�ખ�ય મથાળ�ં',advisoryContentType:'મ�ખ�ય કન�ટેન�ટ પ�રકાર',cssClasses:'સ�ટાઇલ-શીટ ક�લાસ',charset:'લિંક રિસૉર�સ કૅરિક�ટર સેટ',styles:'સ�ટાઇલ',rel:'સંબંધની સ�થિતિ',selectAnchor:'�ંકર પસંદ કરો',anchorName:'�ંકર નામથી પસંદ કરો',anchorId:'�ંકર �લિમન�ટ Id થી પસંદ કરો',emailAddress:'ઈ-મેલ સરનામ�ં',emailSubject:'ઈ-મેલ વિષય',emailBody:'સંદેશ',noAnchors:'(ડૉક�ય�મન�ટમાં �ંકરની સંખ�યા)',noUrl:'લિંક  URL ટાઇપ કરો',noEmail:'ઈ-મેલ સરનામ�ં ટાઇપ કરો'},anchor:{toolbar:'�ંકર ઇન�સર�ટ/દાખલ કરવી',menu:'�ંકરના ગ�ણ',title:'�ંકરના ગ�ણ',name:'�ંકરન�ં નામ',errorName:'�ંકરન�ં નામ ટાઈપ કરો',remove:'સ�થિર નકરવ�ં'},list:{numberedTitle:'આંકડાના લીસ�ટના ગ�ણ',bulletedTitle:'બ�લેટેડ લીસ�ટના ગ�ણ',type:'પ�રકાર',start:'શર� કરવ�ં',validateStartNumber:'લીસ�ટના સર�આતનો આંકડો પ�રો હોવો જોઈ�.',circle:'વર�ત�ળ',disc:'ડિસ�ક',square:'ચોરસ',none:'કસ� ',notset:'<સેટ નથી>',armenian:'અરમેનિયન આંકડા પદ�ધતિ',georgian:'ગેઓર�ગિયન આંકડા પદ�ધતિ (an, ban, gan, etc.)',lowerRoman:'રોમન નાના (i, ii, iii, iv, v, etc.)',upperRoman:'રોમન મોટા (I, II, III, IV, V, etc.)',lowerAlpha:'આલ�ફા નાના (a, b, c, d, e, etc.)',upperAlpha:'આલ�ફા મોટા (A, B, C, D, E, etc.)',lowerGreek:'ગ�રીક નાના (alpha, beta, gamma, etc.)',decimal:'આંકડા (1, 2, 3, etc.)',decimalLeadingZero:'સ�ન�ય આગળ આંકડા (01, 02, 03, etc.)'},findAndReplace:{title:'શોધવ�ં અને બદલવ�ં',find:'શોધવ�ં',replace:'રિપ�લેસ/બદલવ�ં',findWhat:'આ શોધો',replaceWith:'આનાથી બદલો',notFoundMsg:'તમે શોધેલી ટેક�સ�ટ નથી મળી',findOptions:'વીકલ�પ શોધો',matchCase:'કેસ સરખા રાખો',matchWord:'બઘા શબ�દ સરખા રાખો',matchCyclic:'સરખાવવા બધા',replaceAll:'બઘા બદલી ',replaceSuccessMsg:'%1 ફેરફારો બાદલાયા છે.'},table:{toolbar:'ટેબલ, કોઠો',title:'ટેબલ, કોઠાન�ં મથાળ�ં',menu:'ટેબલ, કોઠાન�ં મથાળ�ં',deleteTable:'કોઠો ડિલીટ/કાઢી નાખવ�ં',rows:'પંક�તિના ખાના',columns:'કૉલમ/ઊભી કટાર',border:'કોઠાની બાજ�(બોર�ડર) સાઇ�',widthPx:'પિકસલ',widthPc:'પ�રતિશત',widthUnit:'પોહાલાઈ �કમ',cellSpace:'સેલ અંતર',cellPad:'સેલ પૅડિંગ',caption:'મથાળ�ં/કૅપ�શન ',summary:'ટૂંકો �હેવાલ',headers:'મથાળા',headersNone:'નથી ',headersColumn:'પહેલી ઊભી કટાર',headersRow:'પહેલી  કટાર',headersBoth:'બેવ�ં',invalidRows:'આડી કટાર, 0 કરતા વધારે હોવી જોઈ�.',invalidCols:'ઉભી કટાર, 0 કરતા વધારે હોવી જોઈ�.',invalidBorder:'બોર�ડર �ક આંકડો હોવો જોઈ�',invalidWidth:'ટેબલની પોહલાઈ આંકડો હોવો જોઈ�.',invalidHeight:'ટેબલની ઊંચાઈ આંકડો હોવો જોઈ�.',invalidCellSpacing:'સેલ વચ�ચેની જગ�યા સ�ન�ય કરતા વધારે હોવી જોઈ�.',invalidCellPadding:'સેલની અંદરની જગ�યા સ�ન�ય કરતા વધારે હોવી જોઈ�.',cell:{menu:'કોષના ખાના',insertBefore:'પહેલાં કોષ ઉમેરવો',insertAfter:'પછી કોષ ઉમેરવો',deleteCell:'કોષ ડિલીટ/કાઢી નાખવો',merge:'કોષ ભેગા કરવા',mergeRight:'જમણી બાજ� ભેગા કરવા',mergeDown:'નીચે ભેગા કરવા',splitHorizontal:'કોષને સમસ�તરીય વિભાજન કરવ�ં',splitVertical:'કોષને સીધ�ં ને ઊભ�ં વિભાજન કરવ�ં',title:'સેલના ગ�ણ',cellType:'સેલનો પ�રકાર',rowSpan:'આડી કટારની જગ�યા',colSpan:'ઊભી કતારની જગ�યા',wordWrap:'વર�ડ રેપ',hAlign:'સપાટ લાઈનદોરી',vAlign:'ઊભી લાઈનદોરી',alignBaseline:'બસે લાઈન',bgColor:'પાછાળનો રંગ',borderColor:'બોર�ડેર રંગ',data:'સ�વીકૃત માહિતી',header:'મથાળ�ં',yes:'હા',no:'ના',invalidWidth:'સેલની પોહલાઈ આંકડો હોવો જોઈ�.',invalidHeight:'સેલની ઊંચાઈ આંકડો હોવો જોઈ�.',invalidRowSpan:'રો સ�પાન આંકડો હોવો જોઈ�.',invalidColSpan:'કોલમ સ�પાન આંકડો હોવો જોઈ�.',chooseColor:'પસંદ કરવ�ં'},row:{menu:'પંક�તિના ખાના',insertBefore:'પહેલાં પંક�તિ ઉમેરવી',insertAfter:'પછી પંક�તિ ઉમેરવી',deleteRow:'પંક�તિઓ ડિલીટ/કાઢી નાખવી'},column:{menu:'કૉલમ/ઊભી કટાર',insertBefore:'પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી',insertAfter:'પછી કૉલમ/ઊભી કટાર ઉમેરવી',deleteColumn:'કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી'}},button:{title:'બટનના ગ�ણ',text:'ટેક�સ�ટ (વૅલ�યૂ)',type:'પ�રકાર',typeBtn:'બટન',typeSbm:'સબ�મિટ',typeRst:'રિસેટ'},checkboxAndRadio:{checkboxTitle:'ચેક બોક�સ ગ�ણ',radioTitle:'રેડિઓ બટનના ગ�ણ',value:'વૅલ�યૂ',selected:'સિલેક�ટેડ'},form:{title:'ફૉર�મ/પત�રકના ગ�ણ',menu:'ફૉર�મ/પત�રકના ગ�ણ',action:'ક�રિયા',method:'પદ�ધતિ',encoding:'અન�કોડીન�ગ'},select:{title:'પસંદગી ક�ષેત�રના ગ�ણ',selectInfo:'સૂચના',opAvail:'ઉપલબ�ધ વિકલ�પ',value:'વૅલ�યૂ',size:'સાઇ�',lines:'લીટીઓ',chkMulti:'�કથી વધારે પસંદ કરી શકો',opText:'ટેક�સ�ટ',opValue:'વૅલ�યૂ',btnAdd:'ઉમેરવ�ં',btnModify:'બદલવ�ં',btnUp:'ઉપર',btnDown:'નીચે',btnSetValue:'પસંદ કરલી વૅલ�યૂ સેટ કરો',btnDelete:'રદ કરવ�ં'},textarea:{title:'ટેક�સ�ટ �અરિઆ, શબ�દ વિસ�તારના ગ�ણ',cols:'કૉલમ/ઊભી કટાર',rows:'પંક�તિઓ'},textfield:{title:'ટેક�સ�ટ ફીલ�ડ, શબ�દ ક�ષેત�રના ગ�ણ',name:'નામ',value:'વૅલ�યૂ',charWidth:'કેરેક�ટરની પહોળાઈ',maxChars:'અધિકતમ કેરેક�ટર',type:'ટાઇપ',typeText:'ટેક�સ�ટ',typePass:'પાસવર�ડ'},hidden:{title:'ગ�પ�ત ક�ષેત�રના ગ�ણ',name:'નામ',value:'વૅલ�યૂ'},image:{title:'ચિત�રના ગ�ણ',titleButton:'ચિત�ર બટનના ગ�ણ',menu:'ચિત�રના ગ�ણ',infoTab:'ચિત�ર ની જાણકારી',btnUpload:'આ સર�વરને મોકલવ�ં',upload:'અપલોડ',alt:'ઑલ�ટર�નટ ટેક�સ�ટ',lockRatio:'લૉક ગ�ણોત�તર',resetSize:'રીસેટ સાઇ�',border:'બોર�ડર',hSpace:'સમસ�તરીય જગ�યા',vSpace:'લંબરૂપ જગ�યા',alertUrl:'ચિત�રની URL ટાઇપ કરો',linkTab:'લિંક',button2Img:'તમારે ઈમેજ બટનને સાદી ઈમેજમાં બદલવ�ં છે.',img2Button:'તમારે સાદી ઈમેજને ઈમેજ બટનમાં બદલવ�ં છે.',urlMissing:'ઈમેજની મૂળ URL છે નહી.',validateBorder:'બોર�ડેર આંકડો હોવો જોઈ�.',validateHSpace:'HSpaceઆંકડો હોવો જોઈ�.',validateVSpace:'VSpace આંકડો હોવો જોઈ�. '},flash:{properties:'ફ�લૅશના ગ�ણ',propertiesTab:'ગ�ણ',title:'ફ�લૅશ ગ�ણ',chkPlay:'ઑટો/સ�વયં પ�લે',chkLoop:'લૂપ',chkMenu:'ફ�લૅશ મેન�યૂ નો પ�રયોગ કરો',chkFull:'ફૂલ સ�ક�રીન કરવ�ં',scale:'સ�કેલ',scaleAll:'સ�કેલ ઓલ/બધ� બતાવો',scaleNoBorder:'સ�કેલ બોર�ડર વગર',scaleFit:'સ�કેલ �કદમ ફીટ',access:'સ�ક�રીપ�ટ �ક�સેસ',accessAlways:'હમેશાં',accessSameDomain:'�જ ડોમેન',accessNever:'નહી',alignAbsBottom:'Abs નીચે',alignAbsMiddle:'Abs ઉપર',alignBaseline:'આધાર લીટી',alignTextTop:'ટેક�સ�ટ ઉપર',quality:'ગ�ણધર�મ',qualityBest:'શ�રેષ�ઠ',qualityHigh:'ઊંચ�ં',qualityAutoHigh:'ઓટો ઊંચ�ં',qualityMedium:'મધ�યમ',qualityAutoLow:'ઓટો નીચ�ં',qualityLow:'નીચ�ં',windowModeWindow:'વિન�ડો',windowModeOpaque:'અપારદર�શક',windowModeTransparent:'પારદર�શક',windowMode:'વિન�ડો મોડ',flashvars:'ફલેશ ના વિકલ�પો',bgcolor:'બૅકગ�રાઉન�ડ રંગ,',hSpace:'સમસ�તરીય જગ�યા',vSpace:'લંબરૂપ જગ�યા',validateSrc:'લિંક  URL ટાઇપ કરો',validateHSpace:'HSpace આંકડો હોવો જોઈ�.',validateVSpace:'VSpace આંકડો હોવો જોઈ�.'},spellCheck:{toolbar:'જોડણી (સ�પેલિંગ) તપાસવી',title:'સ�પેલ ',notAvailable:'માફ કરશો, આ સ�વિધા ઉપલબ�ધ નથી',errorLoading:'સર�વિસ �પ�લીકેશન લોડ નથી થ: %s.',notInDic:'શબ�દકોશમાં નથી',changeTo:'આનાથી બદલવ�ં',btnIgnore:'ઇગ�નોર/અવગણના કરવી',btnIgnoreAll:'બધાની ઇગ�નોર/અવગણના કરવી',btnReplace:'બદલવ�ં',btnReplaceAll:'બધા બદલી કરો',btnUndo:'અન�ડૂ',noSuggestions:'- કઇ સજેશન નથી -',progress:'શબ�દની જોડણી/સ�પેલ ચેક ચાલ� છે...',noMispell:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: ખોટી જોડણી મળી નથી',noChanges:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: �કપણ શબ�દ બદલયો નથી',oneChange:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: �ક શબ�દ બદલયો છે',manyChanges:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: %1 શબ�દ બદલયા છે',ieSpellDownload:'સ�પેલ-ચેકર ઇન�સ�ટોલ નથી. શ�ં તમે ડાઉનલોડ કરવા માંગો છો?'},smiley:{toolbar:'સ�માઇલી',title:'સ�માઇલી  પસંદ કરો',options:'સમ�ય�લી વિકલ�પો'},elementsPath:{eleLabel:'�લીમેન�ટ�સ નો ',eleTitle:'�લીમેન�ટ %1'},numberedlist:'સંખ�યાંકન સૂચિ',bulletedlist:'બ�લેટ સૂચિ',indent:'ઇન�ડેન�ટ, લીટીના આરંભમાં જગ�યા વધારવી',outdent:'ઇન�ડેન�ટ લીટીના આરંભમાં જગ�યા ઘટાડવી',justify:{left:'ડાબી બાજ��/બાજ� તરફ',center:'સંકેંદ�રણ/સેંટરિંગ',right:'જમણી બાજ��/બાજ� તરફ',block:'બ�લૉક, અંતરાય જસ�ટિફાઇ'},blockquote:'બ�લૉક-કોટ, અવતરણચિહ�નો',clipboard:{title:'પેસ�ટ',cutError:'તમારા બ�રાઉ�ર ની સ�રક�ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.',copyError:'તમારા બ�રાઉ�ર ની સ�રક�ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प�रयोग करें।',pasteMsg:'Ctrl/Cmd+V નો પ�રયોગ કરી પેસ�ટ કરો',securityMsg:'તમારા બ�રાઉ�ર ની સ�રક�ષિત સેટિંગસના કારણે,�ડિટર તમારા કિલ�પબોર�ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન�ડોમાં ફરીથી પેસ�ટ કરવ�ં પડશે.',pasteArea:'પેસ�ટ કરવાની જગ�યા'},pastefromword:{confirmCleanup:'તમે જે ટેક�ષ�ત� કોપી કરી રહ�યા છો ટે વર�ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?',toolbar:'પેસ�ટ (વડૅ ટેક�સ�ટ)',title:'પેસ�ટ (વડૅ ટેક�સ�ટ)',error:'પેસ�ટ કરેલો ડેટા ઇન�ટરનલ �રર ના લીથે સાફ કરી શકાયો નથી.'},pasteText:{button:'પેસ�ટ (ટેક�સ�ટ)',title:'પેસ�ટ (ટેક�સ�ટ)'},templates:{button:'ટેમ�પ�લેટ',title:'કન�ટેન�ટ ટેમ�પ�લેટ',options:'ટેમ�પ�લેટના વિકલ�પો',insertOption:'મૂળ શબ�દને બદલો',selectPromptMsg:'�ડિટરમાં ઓપન કરવા ટેમ�પ�લેટ પસંદ કરો (વર�તમાન કન�ટેન�ટ સેવ નહીં થાય):',emptyListMsg:'(કોઈ ટેમ�પ�લેટ ડિફાઇન નથી)'},showBlocks:'બ�લૉક બતાવવ�ં',stylesCombo:{label:'શૈલી/રીત',panelTitle:'ફોર�મેટ ',panelTitle1:'બ�લોક ',panelTitle2:'ઈનલાઈન ',panelTitle3:'ઓબ�જેક�ટ પદ�ધતિ'},format:{label:'ફૉન�ટ ફૉર�મટ, રચનાની શૈલી',panelTitle:'ફૉન�ટ ફૉર�મટ, રચનાની શૈલી',tag_p:'સામાન�ય',tag_pre:'ફૉર�મટેડ',tag_address:'સરનામ�ં',tag_h1:'શીર�ષક 1',tag_h2:'શીર�ષક 2',tag_h3:'શીર�ષક 3',tag_h4:'શીર�ષક 4',tag_h5:'શીર�ષક 5',tag_h6:'શીર�ષક 6',tag_div:'શીર�ષક (DIV)'},div:{title:'Div કન�ટેનર બનાવ�ંવ�ં',toolbar:'Div કન�ટેનર બનાવ�ંવ�ં',cssClassInputLabel:'સ�ટાઈલશીટ કલાસીસ',styleSelectLabel:'સ�ટાઈલ',IdInputLabel:'Id',languageCodeInputLabel:'ભાષાનો કોડ',inlineStyleInputLabel:'ઈનલાઈન પદ�ધતિ',advisoryTitleInputLabel:'�ડવાઈ�ર શીર�ષક',langDirLabel:'ભાષાની દિશા',langDirLTRLabel:'ડાબે થી જમણે (LTR)',langDirRTLLabel:'જમણે થી ડાબે (RTL)',edit:'ડીવીમાં ફેરફાર કરવો',remove:'ડીવી કાઢી કાઢવ�ં'},iframe:{title:'IFrame વિકલ�પો',toolbar:'IFrame',noUrl:'iframe URL ટાઈપ� કરો',scrolling:'સ�ક�રોલબાર ચાલ� કરવા',border:'ફ�રેમ બોર�ડેર બતાવવી'},font:{label:'ફૉન�ટ',voiceLabel:'ફોન�ટ',panelTitle:'ફૉન�ટ'},fontSize:{label:'ફૉન�ટ સાઇ�/કદ',voiceLabel:'ફોન�ટ સાઈ�',panelTitle:'ફૉન�ટ સાઇ�/કદ'},colorButton:{textColorTitle:'શબ�દનો રંગ',bgColorTitle:'બૅકગ�રાઉન�ડ રંગ,',panelTitle:'રંગ',auto:'સ�વચાલિત',more:'ઔર રંગ...'},colors:{'000':'કાળો',800000:'મર�ન','8B4513':'છીક','2F4F4F':'ડાર�ક સ�લેટ ગ�રે ','008080':'ટીલ','000080':'નેવી','4B0082':'જામલી',696969:'ડાર�ક ગ�રે',B22222:'ઈટ',A52A2A:'બ�રાઉન',DAA520:'ગોલ�ડન રોડ','006400':'ડાર�ક લીલો','40E0D0':'ટ�રકોઈસ','0000CD':'મધ�યમ વાદળી',800080:'પર�પલ',808080:'ગ�રે',F00:'લાલ',FF8C00:'ડાર�ક ઓરંજ',FFD700:'ગોલ�ડ','008000':'ગ�રીન','0FF':'સાયન','00F':'વાદળી',EE82EE:'વાયોલેટ',A9A9A9:'ડીમ ',FFA07A:'લાઈટ સાલમન',FFA500:'ઓરંજ',FFFF00:'પીળો','00FF00':'લાઈમ',AFEEEE:'પેલ કોઈસ',ADD8E6:'લાઈટ બ�લ�',DDA0DD:'પલ�મ',D3D3D3:'લાઈટ ગ�રે',FFF0F5:'લવંડર ',FAEBD7:'�ન�ટીક સફેદ',FFFFE0:'લાઈટ પીળો',F0FFF0:'હનીડઉય',F0FFFF:'અ��રે',F0F8FF:'�લીસ બ�લ�',E6E6FA:'લવંડર',FFF:'સફેદ'},scayt:{title:'ટાઈપ કરતા સ�પેલ તપાસો',opera_title:'ઓપેરામાં સપોર�ટ નથી',enable:'SCAYT �નેબલ કરવ�ં',disable:'SCAYT ડિસેબલ કરવ�ં',about:'SCAYT વિષે',toggle:'SCAYT ટોગલ',options:'વિકલ�પો',langs:'ભાષાઓ',moreSuggestions:'વધારે વિકલ�પો',ignore:'ઇગ�નોર',ignoreAll:'બધા ઇગ�નોર ',addWord:'શબ�દ ઉમેરવો',emptyDic:'ડિક�સનરીન�ં નામ ખાલી ના હોય.',noSuggestions:'No suggestions',optionsTab:'વિકલ�પો',allCaps:'ઓલ-કેપ�સ વર�ડ છોડી દો.',ignoreDomainNames:'ડોમેન નામ છોડી દો.',mixedCase:'મિક�સ કેસ વર�ડ છોડી દો.',mixedWithDigits:'આંકડા વાળા શબ�દ છોડી દો.',languagesTab:'ભાષા',dictionariesTab:'શબ�દકોશ',dic_field_name:'શબ�દકોશ નામ',dic_create:'બનાવવ�ં',dic_restore:'પાછ�ં ',dic_delete:'કાઢી નાખવ�ં',dic_rename:'નવ�ં નામ આપવ�ં',dic_info:'પેહલા User Dictionary, Cookie તરીકે સ�ટોર થાય છે. પણ Cookie ની સમતા ઓછી છે. જયારે User Dictionary, Cookie તરીકે સ�ટોર ના કરી શકાય, ત�યારે તે અમારા સર�વર પર સ�ટોર થાય છે. તમારી વ�યતિગત ડીકસ�નરી ને સર�વર પર સ�ટોર કરવા માટે તમારે તેન�ં નામ આપવ�ં પડશે. જો તમે તમારી ડીકસ�નરી ન�ં નામ આપેલ�ં હોય તો તમે રિસ�ટોર બટન ક�લીક કરી શકો.',aboutTab:'વિષે'},about:{title:'CKEditor વિષે',dlgTitle:'CKEditor વિષે',help:'મદદ માટે $1 તપાસો',userGuide:'CKEditor ય��ર�સ ગાઈડ',moreInfo:'લાયસનસની માહિતી માટે અમારી વેબ સાઈટ',copy:'કોપીરાઈટ &copy; $1. ઓલ રાઈટ�સ '},maximize:'મોટ�ં કરવ�ં',minimize:'નાન�ં કરવ�ં',fakeobjects:{anchor:'અનકર',flash:'ફ�લેશ ',iframe:'IFrame',hiddenfield:'હિડન ',unknown:'અનનોન ઓબ�જેક�ટ'},resize:'ખેંચી ને યોગ�ય કરવ�ં',colordialog:{title:'રંગ પસંદ કરો',options:'રંગના વિકલ�પ',highlight:'હાઈઈટ',selected:'પસંદ કરેલો રંગ',clear:'સાફ કરવ�ં'},toolbarCollapse:'ટૂલબાર નાન�ં કરવ�ં',toolbarExpand:'ટૂલબાર મોટ�ં કરવ�ં',toolbarGroups:{document:'દસ�તાવેજ',clipboard:'ક�લિપબોર�ડ/અન',editing:'�ડીટ કરવ�ં',forms:'ફોર�મ',basicstyles:'બેસિક� સ�ટાઇલ',paragraph:'ફકરો',links:'લીંક',insert:'ઉમેરવ�ં',styles:'સ�ટાઇલ',colors:'રંગ',tools:'ટૂલ�સ'},bidi:{ltr:'ટેક�ષ�ત� ની દિશા ડાબે થી જમણે',rtl:'ટેક�ષ�ત� ની દિશા જમણે થી ડાબે'},docprops:{label:'ડૉક�ય�મન�ટ ગ�ણ/પ�રૉપર�ટિ�',title:'ડૉક�ય�મન�ટ ગ�ણ/પ�રૉપર�ટિ�',design:'ડીસા',meta:'મેટાડૅટા',chooseColor:'વિકલ�પ',other:'<other>',docTitle:'પેજ મથાળ�ં/ટાઇટલ',charset:'કેરેક�ટર સેટ �ન�કોડિંગ',charsetOther:'અન�ય કેરેક�ટર સેટ �ન�કોડિંગ',charsetASCII:'ASCII',charsetCE:'મધ�ય ય�રોપિઅન (Central European)',charsetCT:'ચાઇની� (Chinese Traditional Big5)',charsetCR:'સિરીલિક (Cyrillic)',charsetGR:'ગ�રીક (Greek)',charsetJP:'જાપાનિ� (Japanese)',charsetKR:'કોરીયન (Korean)',charsetTR:'ટર�કિ (Turkish)',charsetUN:'યૂનિકોડ (UTF-8)',charsetWE:'પશ�ચિમ ય�રોપિઅન (Western European)',docType:'ડૉક�ય�મન�ટ પ�રકાર શીર�ષક',docTypeOther:'અન�ય ડૉક�ય�મન�ટ પ�રકાર શીર�ષક',xhtmlDec:'XHTML સૂચના સમાવિષ�ટ કરવી',bgColor:'બૅકગ�રાઉન�ડ રંગ',bgImage:'બૅકગ�રાઉન�ડ ચિત�ર URL',bgFixed:'સ�ક�રોલ ન થાય તેવ�ં બૅકગ�રાઉન�ડ',txtColor:'શબ�દનો રંગ',margin:'પેજ માર�જિન',marginTop:'ઉપર',marginLeft:'ડાબી',marginRight:'જમણી',marginBottom:'નીચે',metaKeywords:'ડૉક�ય�મન�ટ ઇન�ડેક�સ સંકેતશબ�દ (અલ�પવિરામ (,) થી અલગ કરો)',metaDescription:'ડૉક�ય�મન�ટ વર�ણન',metaAuthor:'લેખક',metaCopyright:'કૉપિરાઇટ',previewHtml:'<p>આ �ક <strong>સેમ�પલ ટેક�ષ�ત�</strong> છે. તમે <a href="javascript:void(0)">CKEditor</a> વાપરો છો.</p>'}};
diff --git a/web/imcms/ckeditor/lang/he.js b/web/imcms/ckeditor/lang/he.js
new file mode 100644
index 0000000000..8175de2e5f
--- /dev/null
+++ b/web/imcms/ckeditor/lang/he.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.he={dir:'rtl',editorTitle:'עורך טקסט עשיר, %1',editorHelp:'לחץ �לט ALT + 0 לעזרה',toolbars:'סרגלי כלי� של העורך',editor:'עורך טקסט עשיר',source:'מקור',newPage:'דף חדש',save:'שמירה',preview:'תצוגה מקדימה',cut:'גזירה',copy:'העתקה',paste:'הדבקה',print:'הדפסה',underline:'קו תחתון',bold:'מודגש',italic:'נטוי',selectAll:'בחירת הכל',removeFormat:'הסרת העיצוב',strike:'כתיב מחוק',subscript:'כתיב תחתון',superscript:'כתיב עליון',horizontalrule:'הוספת קו �ופקי',pagebreak:'הוספת שבירת דף',pagebreakAlt:'שבירת דף',unlink:'הסרת הקישור',undo:'ביטול צעד �חרון',redo:'חזרה על צעד �חרון',common:{browseServer:'סייר השרת',url:'כתובת (URL)',protocol:'פרוטוקול',upload:'העל�ה',uploadSubmit:'שליחה לשרת',image:'תמונה',flash:'פל�ש',form:'טופס',checkbox:'תיבת סימון',radio:'לחצן �פשרויות',textField:'שדה טקסט',textarea:'�יזור טקסט',hiddenField:'שדה חבוי',button:'כפתור',select:'שדה בחירה',imageButton:'כפתור תמונה',notSet:'<ל� נקבע>',id:'זיהוי (ID)',name:'ש�',langDir:'כיוון שפה',langDirLtr:'שמ�ל לימין (LTR)',langDirRtl:'ימין לשמ�ל (RTL)',langCode:'קוד שפה',longDescr:'קישור לתי�ור מפורט',cssClass:'מחלקת עיצוב (CSS Class)',advisoryTitle:'כותרת מוצעת',cssStyle:'סגנון',ok:'�ישור',cancel:'ביטול',close:'סגירה',preview:'תצוגה מקדימה',generalTab:'כללי',advancedTab:'�פשרויות מתקדמות',validateNumberFailed:'הערך חייב להיות מספרי.',confirmNewPage:'כל השינויי� של� נשמרו י�בדו. ה�� להעלות דף חדש?',confirmCancel:'חלק מה�פשרויות שונו, ה�� לסגור �ת הדי�לוג?',options:'�פשרויות',target:'מטרה',targetNew:'חלון חדש (_blank)',targetTop:'החלון העליון ביותר (_top)',targetSelf:'�ותו חלון (_self)',targetParent:'חלון ה�ב (_parent)',langDirLTR:'שמ�ל לימין (LTR)',langDirRTL:'ימין לשמ�ל (RTL)',styles:'סגנון',cssClasses:'מחלקות גליונות סגנון',width:'רוחב',height:'גובה',align:'יישור',alignLeft:'לשמ�ל',alignRight:'לימין',alignCenter:'מרכז',alignTop:'למעלה',alignMiddle:'ל�מצע',alignBottom:'לתחתית',invalidValue:'Invalid value.',invalidHeight:'הגובה חייב להיות מספר.',invalidWidth:'הרוחב חייב להיות מספר.',invalidCssLength:'הערך שצוין לשדה "%1" חייב להיות מספר חיובי ע� �ו לל� יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, �ו pc).',invalidHtmlLength:'הערך שצוין לשדה "%1" חייב להיות מספר חיובי ע� �ו לל� יחידת מידה חוקית של HTML (px �ו %).',invalidInlineStyle:'הערך שצויין לשדה הסגנון חייב להכיל זוג ערכי� �חד �ו יותר בפורמט "ש� : ערך", מופרדי� על ידי נקודה-פסיק.',cssLengthTooltip:'יש להכניס מספר המייצג פיקסלי� �ו מספר ע� יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, ל� זמין</span>'},contextmenu:{options:'�פשרויות תפריט ההקשר'},specialChar:{toolbar:'הוספת תו מיוחד',title:'בחירת תו מיוחד',options:'�פשרויות תווי� מיוחדי�'},link:{toolbar:'הוספת/עריכת קישור',other:'<�חר>',menu:'מ�פייני קישור',title:'קישור',info:'מידע על הקישור',target:'מטרה',upload:'העל�ה',advanced:'�פשרויות מתקדמות',type:'סוג קישור',toUrl:'כתובת (URL)',toAnchor:'עוגן בעמוד זה',toEmail:'דו�"ל',targetFrame:'<מסגרת>',targetPopup:'<חלון קופץ>',targetFrameName:'ש� מסגרת היעד',targetPopupName:'ש� החלון הקופץ',popupFeatures:'תכונות החלון הקופץ',popupResizable:'שינוי גודל',popupStatusBar:'סרגל חיווי',popupLocationBar:'סרגל כתובת',popupToolbar:'סרגל הכלי�',popupMenuBar:'סרגל תפריט',popupFullScreen:'מסך מל� (IE)',popupScrollBars:'ניתן לגלילה',popupDependent:'תלוי (Netscape)',popupLeft:'מיקו� צד שמ�ל',popupTop:'מיקו� צד עליון',id:'זיהוי (ID)',langDir:'כיוון שפה',langDirLTR:'שמ�ל לימין (LTR)',langDirRTL:'ימין לשמ�ל (RTL)',acccessKey:'מקש גישה',name:'ש�',langCode:'קוד שפה',tabIndex:'מספר ט�ב',advisoryTitle:'כותרת מוצעת',advisoryContentType:'Content Type מוצע',cssClasses:'גיליונות עיצוב קבוצות',charset:'קידוד המש�ב המקושר',styles:'סגנון',rel:'קשר גומלין',selectAnchor:'בחירת עוגן',anchorName:'עפ"י ש� העוגן',anchorId:'עפ"י זיהוי (ID) ה�למנט',emailAddress:'כתובת הדו�"ל',emailSubject:'נוש� ההודעה',emailBody:'גוף ההודעה',noAnchors:'(�ין עוגני� זמיני� בדף)',noUrl:'יש להקליד �ת כתובת הקישור (URL)',noEmail:'יש להקליד �ת כתובת הדו�"ל'},anchor:{toolbar:'הוספת/עריכת נקודת עיגון',menu:'מ�פייני נקודת עיגון',title:'מ�פייני נקודת עיגון',name:'ש� לנקודת עיגון',errorName:'יש להקליד ש� לנקודת עיגון',remove:'מחיקת נקודת עיגון'},list:{numberedTitle:'תכונות רשימה ממוספרת',bulletedTitle:'תכונות רשימת תבליטי�',type:'סוג',start:'תחילת מספור',validateStartNumber:'שדה תחילת המספור חייב להכיל מספר של�.',circle:'עיגול ריק',disc:'עיגול מל�',square:'ריבוע',none:'לל�',notset:'<ל� נקבע>',armenian:'ספרות �רמניות',georgian:"ספרות גי�ורגיות (an, ban, gan וכו')",lowerRoman:"ספירה רומית ב�ותיות קטנות (i, ii, iii, iv, v וכו')",upperRoman:"ספירה רומיות ב�ותיות גדולות (I, II, III, IV, V וכו')",lowerAlpha:"�ותיות �נגליות קטנות (a, b, c, d, e וכו')",upperAlpha:"�ותיות �נגליות גדולות (A, B, C, D, E וכו')",lowerGreek:"�ותיות יווניות קטנות (alpha, beta, gamma וכו')",decimal:"ספרות (1, 2, 3 וכו')",decimalLeadingZero:"ספרות ע� 0 בהתחלה (01, 02, 03 וכו')"},findAndReplace:{title:'חיפוש והחלפה',find:'חיפוש',replace:'החלפה',findWhat:'חיפוש מחרוזת:',replaceWith:'החלפה במחרוזת:',notFoundMsg:'הטקסט המבוקש ל� נמצ�.',findOptions:'�פשרויות חיפוש',matchCase:'הבחנה בין �ותיות רשיות לקטנות (Case)',matchWord:'הת�מה למילה המל�ה',matchCyclic:'הת�מה מחזורית',replaceAll:'החלפה בכל העמוד',replaceSuccessMsg:'%1 טקסטי� הוחלפו.'},table:{toolbar:'טבלה',title:'מ�פייני טבלה',menu:'מ�פייני טבלה',deleteTable:'מחק טבלה',rows:'שורות',columns:'עמודות',border:'גודל מסגרת',widthPx:'פיקסלי�',widthPc:'�חוז',widthUnit:'יחידת רוחב',cellSpace:'מרווח ת�',cellPad:'ריפוד ת�',caption:'כיתוב',summary:'תקציר',headers:'כותרות',headersNone:'�ין',headersColumn:'עמודה ר�שונה',headersRow:'שורה ר�שונה',headersBoth:'שניה�',invalidRows:'שדה מספר השורות חייב להיות מספר גדול מ 0.',invalidCols:'שדה מספר העמודות חייב להיות מספר גדול מ 0.',invalidBorder:'שדה גודל המסגרת חייב להיות מספר.',invalidWidth:'שדה רוחב הטבלה חייב להיות מספר.',invalidHeight:'שדה גובה הטבלה חייב להיות מספר.',invalidCellSpacing:'שדה ריווח הת�י� חייב להיות מספר חיובי.',invalidCellPadding:'שדה ריפוד הת�י� חייב להיות מספר חיובי.',cell:{menu:'מ�פייני ת�',insertBefore:'הוספת ת� לפני',insertAfter:'הוספת ת� �חרי',deleteCell:'מחיקת ת�י�',merge:'מיזוג ת�י�',mergeRight:'מזג ימינה',mergeDown:'מזג למטה',splitHorizontal:'פיצול ת� �ופקית',splitVertical:'פיצול ת� �נכית',title:'תכונות הת�',cellType:'סוג הת�',rowSpan:'מתיחת השורות',colSpan:'מתיחת הת�י�',wordWrap:'מניעת גלישת שורות',hAlign:'יישור �ופקי',vAlign:'יישור �נכי',alignBaseline:'שורת בסיס',bgColor:'צבע רקע',borderColor:'צבע מסגרת',data:'מידע',header:'כותרת',yes:'כן',no:'ל�',invalidWidth:'שדה רוחב הת� חייב להיות מספר.',invalidHeight:'שדה גובה הת� חייב להיות מספר.',invalidRowSpan:'שדה מתיחת השורות חייב להיות מספר של�.',invalidColSpan:'שדה מתיחת העמודות חייב להיות מספר של�.',chooseColor:'בחר'},row:{menu:'שורה',insertBefore:'הוספת שורה לפני',insertAfter:'הוספת שורה �חרי',deleteRow:'מחיקת שורות'},column:{menu:'עמודה',insertBefore:'הוספת עמודה לפני',insertAfter:'הוספת עמודה �חרי',deleteColumn:'מחיקת עמודות'}},button:{title:'מ�פייני כפתור',text:'טקסט (ערך)',type:'סוג',typeBtn:'כפתור',typeSbm:'שליחה',typeRst:'�יפוס'},checkboxAndRadio:{checkboxTitle:'מ�פייני תיבת סימון',radioTitle:'מ�פייני לחצן �פשרויות',value:'ערך',selected:'מסומן'},form:{title:'מ�פיני טופס',menu:'מ�פיני טופס',action:'שלח �ל',method:'סוג שליחה',encoding:'קידוד'},select:{title:'מ�פייני שדה בחירה',selectInfo:'מידע',opAvail:'�פשרויות זמינות',value:'ערך',size:'גודל',lines:'שורות',chkMulti:'�יפשור בחירות מרובות',opText:'טקסט',opValue:'ערך',btnAdd:'הוספה',btnModify:'שינוי',btnUp:'למעלה',btnDown:'למטה',btnSetValue:'קביעה כברירת מחדל',btnDelete:'מחיקה'},textarea:{title:'מ�פייני �יזור טקסט',cols:'עמודות',rows:'שורות'},textfield:{title:'מ�פייני שדה טקסט',name:'ש�',value:'ערך',charWidth:'רוחב לפי תווי�',maxChars:'מקסימו� תווי�',type:'סוג',typeText:'טקסט',typePass:'סיסמה'},hidden:{title:'מ�פיני שדה חבוי',name:'ש�',value:'ערך'},image:{title:'מ�פייני התמונה',titleButton:'מ�פיני כפתור תמונה',menu:'תכונות התמונה',infoTab:'מידע על התמונה',btnUpload:'שליחה לשרת',upload:'העל�ה',alt:'טקסט חלופי',lockRatio:'נעילת היחס',resetSize:'�יפוס הגודל',border:'מסגרת',hSpace:'מרווח �ופקי',vSpace:'מרווח �נכי',alertUrl:'יש להקליד �ת כתובת התמונה',linkTab:'קישור',button2Img:'ה�� להפוך �ת תמונת הכפתור לתמונה פשוטה?',img2Button:'ה�� להפוך �ת התמונה לכפתור תמונה?',urlMissing:'כתובת התמונה חסרה.',validateBorder:'שדה המסגרת חייב להיות מספר של�.',validateHSpace:'שדה המרווח ה�ופקי חייב להיות מספר של�.',validateVSpace:'שדה המרווח ה�נכי חייב להיות מספר של�.'},flash:{properties:'מ�פייני פל�ש',propertiesTab:'מ�פייני�',title:'מ�פיני פל�ש',chkPlay:'ניגון �וטומטי',chkLoop:'לול�ה',chkMenu:'�פשר תפריט פל�ש',chkFull:'�פשר חלון מל�',scale:'גודל',scaleAll:'הצג הכל',scaleNoBorder:'לל� גבולות',scaleFit:'הת�מה מושלמת',access:'גישת סקריפט',accessAlways:'תמיד',accessSameDomain:'דומיין זהה',accessNever:'�ף פע�',alignAbsBottom:'לתחתית ה�בסולוטית',alignAbsMiddle:'מרכוז �בסולוטי',alignBaseline:'לקו התחתית',alignTextTop:'לר�ש הטקסט',quality:'�יכות',qualityBest:'מעולה',qualityHigh:'גבוהה',qualityAutoHigh:'גבוהה �וטומטית',qualityMedium:'ממוצעת',qualityAutoLow:'נמוכה �וטומטית',qualityLow:'נמוכה',windowModeWindow:'חלון',windowModeOpaque:'�טו�',windowModeTransparent:'שקוף',windowMode:'מצב חלון',flashvars:'משתני� לפל�ש',bgcolor:'צבע רקע',hSpace:'מרווח �ופקי',vSpace:'מרווח �נכי',validateSrc:'יש להקליד �ת כתובת סרטון הפל�ש (URL)',validateHSpace:'המרווח ה�ופקי חייב להיות מספר.',validateVSpace:'המרווח ה�נכי חייב להיות מספר.'},spellCheck:{toolbar:'בדיקת �יות',title:'בדיקת �יות',notAvailable:'ל� נמצ� שירות זמין.',errorLoading:'שגי�ה בהעל�ת השירות: %s.',notInDic:'ל� נמצ� במילון',changeTo:'שינוי ל',btnIgnore:'התעלמות',btnIgnoreAll:'התעלמות מהכל',btnReplace:'החלפה',btnReplaceAll:'החלפת הכל',btnUndo:'החזרה',noSuggestions:'- �ין הצעות -',progress:'בודק ה�יות בתהליך בדיקה....',noMispell:'בדיקות �יות הסתיימה: ל� נמצ�ו שגי�ות כתיב',noChanges:'בדיקות �יות הסתיימה: ל� שונתה �ף מילה',oneChange:'בדיקות �יות הסתיימה: שונתה מילה �חת',manyChanges:'בדיקות �יות הסתיימה: %1 מילי� שונו',ieSpellDownload:'בודק ה�יות ל� מותקן, ה�� להורידו?'},smiley:{toolbar:'סמיילי',title:'הוספת סמיילי',options:'�פשרויות סמיילי�'},elementsPath:{eleLabel:'עץ ה�למנטי�',eleTitle:'%1 �למנט'},numberedlist:'רשימה ממוספרת',bulletedlist:'רשימת נקודות',indent:'הגדלת הזחה',outdent:'הקטנת הזחה',justify:{left:'יישור לשמ�ל',center:'מרכוז',right:'יישור לימין',block:'יישור לשוליי�'},blockquote:'בלוק ציטוט',clipboard:{title:'הדבקה',cutError:'הגדרות ה�בטחה בדפדפן שלך ל� מ�פשרות לעורך לבצע פעולות גזירה �וטומטיות. יש להשתמש במקלדת לש� כך (Ctrl/Cmd+X).',copyError:'הגדרות ה�בטחה בדפדפן שלך ל� מ�פשרות לעורך לבצע פעולות העתקה �וטומטיות. יש להשתמש במקלדת לש� כך (Ctrl/Cmd+C).',pasteMsg:'נ� להדביק בתוך הקופסה ב�מצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>�ישור</b>.',securityMsg:'עקב הגדרות �בטחה בדפדפן, ל� ניתן לגשת �ל לוח הגזירי� (Clipboard) בצורה ישירה. נ� להדביק שוב בחלון זה.',pasteArea:'�יזור הדבקה'},pastefromword:{confirmCleanup:'נר�ה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. ה�� ברצונך לנקות �ותו טר� ההדבקה?',toolbar:'הדבקה מ-Word',title:'הדבקה מ-Word',error:'ל� ניתן היה לנקות �ת המידע בשל תקלה פנימית.'},pasteText:{button:'הדבקה כטקסט פשוט',title:'הדבקה כטקסט פשוט'},templates:{button:'תבניות',title:'תביות תוכן',options:'�פשרויות התבניות',insertOption:'החלפת תוכן ממשי',selectPromptMsg:'יש לבחור תבנית לפתיחה בעורך.<br />התוכן המקורי ימחק:',emptyListMsg:'(ל� הוגדרו תבניות)'},showBlocks:'הצגת בלוקי�',stylesCombo:{label:'סגנון',panelTitle:'סגנונות פורמט',panelTitle1:'סגנונות בלוק',panelTitle2:'סגנונות רצף',panelTitle3:'סגנונות �ובייקט'},format:{label:'עיצוב',panelTitle:'עיצוב',tag_p:'נורמלי',tag_pre:'קוד',tag_address:'כתובת',tag_h1:'כותרת',tag_h2:'כותרת 2',tag_h3:'כותרת 3',tag_h4:'כותרת 4',tag_h5:'כותרת 5',tag_h6:'כותרת 6',tag_div:'נורמלי (DIV)'},div:{title:'יצירת מיכל (Div)',toolbar:'יצירת מיכל (Div)',cssClassInputLabel:'מחלקת עיצוב',styleSelectLabel:'סגנון',IdInputLabel:'מזהה (ID)',languageCodeInputLabel:'קוד שפה',inlineStyleInputLabel:'סגנון פנימי',advisoryTitleInputLabel:'כותרת מוצעת',langDirLabel:'כיוון שפה',langDirLTRLabel:'שמ�ל לימין (LTR)',langDirRTLLabel:'ימין לשמ�ל (RTL)',edit:'עריכת מיכל (Div)',remove:'הסרת מיכל (Div)'},iframe:{title:'מ�פייני חלון פנימי (iframe)',toolbar:'חלון פנימי (iframe)',noUrl:'יש להכניס כתובת לחלון.',scrolling:'�פשר פסי גלילה',border:'הר�ה מסגרת לחלון'},font:{label:'גופן',voiceLabel:'גופן',panelTitle:'גופן'},fontSize:{label:'גודל',voiceLabel:'גודל',panelTitle:'גודל'},colorButton:{textColorTitle:'צבע טקסט',bgColorTitle:'צבע רקע',panelTitle:'צבעי�',auto:'�וטומטי',more:'צבעי� נוספי�...'},colors:{'000':'שחור',800000:'סגול כהה','8B4513':'חו� בהיר','2F4F4F':'�פור צפחה','008080':'כחול-ירוק','000080':'כחול-סגול','4B0082':'�ינדיגו',696969:'�פור מעומע�',B22222:'�דו�-חו�',A52A2A:'חו�',DAA520:'כתו� זהב','006400':'ירוק כהה','40E0D0':'טורקיז','0000CD':'כחול בינוני',800080:'סגול',808080:'�פור',F00:'�דו�',FF8C00:'כתו� כהה',FFD700:'זהב','008000':'ירוק','0FF':'צי�ן','00F':'כחול',EE82EE:'סגלגל',A9A9A9:'�פור כהה',FFA07A:'כתו�-וורוד',FFA500:'כתו�',FFFF00:'צהוב','00FF00':'ליי�',AFEEEE:'טורקיז בהיר',ADD8E6:'כחול בהיר',DDA0DD:'שזיף',D3D3D3:'�פור בהיר',FFF0F5:'לבנדר מסמיק',FAEBD7:'לבן עתיק',FFFFE0:'צהוב בהיר',F0FFF0:'טל דבש',F0FFFF:'תכלת',F0F8FF:'כחול טיפת מי�',E6E6FA:'לבנדר',FFF:'לבן'},scayt:{title:'בדיקת �יות בזמן כתיבה (SCAYT)',opera_title:'ל� זמין בדפדפן �ופרה',enable:'�פשר SCAYT',disable:'בטל SCAYT',about:'�ודות SCAYT',toggle:'שינוי SCAYT',options:'�פשרויות',langs:'שפות',moreSuggestions:'הצעות נוספות',ignore:'התעלמות',ignoreAll:'התעלמות מהכל',addWord:'הוספת מילה',emptyDic:'יש לבחור מילון.',noSuggestions:'�ין הצעות',optionsTab:'�פשרויות',allCaps:'התעל� ממילי� שכל �ותיותיהן גדולות',ignoreDomainNames:'התעל� משמות מתח�',mixedCase:'התעל� ממילי� ע� �ותיות גדולות וקטנות ביחד',mixedWithDigits:'התעל� ממילי� ע� מספרי�',languagesTab:'שפות',dictionariesTab:'מילון',dic_field_name:'ש� המילון',dic_create:'יצירה',dic_restore:'שחזור',dic_delete:'מחיקה',dic_rename:'שינוי ש�',dic_info:'בהתחלה מילון המשתמש מ�וחסן בעוגיה, �ך עוגיות מוגבלות במקו�. כ�שר המילון מגיע לגודל בו הו� �ינו יכול להת�כסן בעוגיה, המילון צריך להת�כסן בשרתנו. לש� כך עליך לתת ש� למילון. �� כבר יש לך מילון מ�וחסן, יש להכניס �ת שמו וללחוץ על כפתור השחזור.',aboutTab:'�ודות'},about:{title:'�ודות CKEditor',dlgTitle:'�ודות CKEditor',help:'היכנסו ל$1 לעזרה.',userGuide:'מדריך המשתמש של CKEditor',moreInfo:'למידע נוסף בקרו ב�תרנו:',copy:'Copyright &copy; $1. כל הזכויות שמורות.'},maximize:'הגדלה למקסימו�',minimize:'הקטנה למינימו�',fakeobjects:{anchor:'עוגן',flash:'סרטון פל�ש',iframe:'חלון פנימי (iframe)',hiddenfield:'שדה חבוי',unknown:'�ובייקט ל� ידוע'},resize:'יש לגרור בכדי לשנות �ת הגודל',colordialog:{title:'בחירת צבע',options:'�פשרויות צבע',highlight:'סימון',selected:'בחירה',clear:'ניקוי'},toolbarCollapse:'מזעור סרגל כלי�',toolbarExpand:'הרחבת סרגל כלי�',toolbarGroups:{document:'מסמך',clipboard:'לוח הגזירי� (Clipboard)/צעד �חרון',editing:'עריכה',forms:'טפסי�',basicstyles:'עיצוב בסיסי',paragraph:'פסקה',links:'קישורי�',insert:'הכנסה',styles:'עיצוב',colors:'צבעי�',tools:'כלי�'},bidi:{ltr:'כיוון טקסט משמ�ל לימין (LTR)',rtl:'כיוון טקסט מימין לשמ�ל (RTL)'},docprops:{label:'מ�פייני מסמך',title:'מ�פייני מסמך',design:'עיצוב',meta:'תגי Meta',chooseColor:'בחירה',other:'�חר...',docTitle:'כותרת עמוד',charset:'קידוד תווי�',charsetOther:'קידוד תווי� �חר',charsetASCII:'ASCII',charsetCE:'מרכז �ירופ�י',charsetCT:'סיני מסורתי (Big5)',charsetCR:'קירילי',charsetGR:'יווני',charsetJP:'יפני',charsetKR:'קורי�ני',charsetTR:'טורקי',charsetUN:'יוניקוד (UTF-8)',charsetWE:'מערב �ירופ�י',docType:'כותר סוג מסמך',docTypeOther:'כותר סוג מסמך �חר',xhtmlDec:'כלול הכרזות XHTML',bgColor:'צבע רקע',bgImage:'כתובת של תמונת רקע',bgFixed:'רקע ל� נגלל (צמוד)',txtColor:'צבע טקסט',margin:'מרווחי עמוד',marginTop:'עליון',marginLeft:'שמ�לי',marginRight:'ימני',marginBottom:'תחתון',metaKeywords:'מילות מפתח של המסמך (מופרדות בפסיק)',metaDescription:'תי�ור המסמך',metaAuthor:'מחבר/ת',metaCopyright:'זכויות יוצרי�',previewHtml:'<p>זהו <strong>טקסט הדגמה</strong>. �ת/ה משתמש/ת ב<a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/hi.js b/web/imcms/ckeditor/lang/hi.js
new file mode 100644
index 0000000000..6223009e79
--- /dev/null
+++ b/web/imcms/ckeditor/lang/hi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.hi={dir:'ltr',editorTitle:'रिच टेक�स�ट �डिटर, %1',editorHelp:'मदद के लिये ALT 0 दबा�',toolbars:'�डिटर टूलबार',editor:'रिच टेक�स�ट �डिटर',source:'सोर�स',newPage:'नया पेज',save:'सेव',preview:'प�रीव�यू',cut:'कट',copy:'कॉपी',paste:'पेस�ट',print:'प�रिन�ट',underline:'रेखांकण',bold:'बोल�ड',italic:'इटैलिक',selectAll:'सब सॅलॅक�ट करें',removeFormat:'फ़ॉर�मैट हटायें',strike:'स�ट�राइक थ�रू',subscript:'अधोलेख',superscript:'अभिलेख',horizontalrule:'हॉरिज़ॉन�टल रेखा इन�सर�ट करें',pagebreak:'पेज ब�रेक इन�सर�ट� करें',pagebreakAlt:'पेज ब�रेक',unlink:'लिंक हटायें',undo:'अन�डू',redo:'रीडू',common:{browseServer:'सर�वर ब�राउज़ करें',url:'URL',protocol:'प�रोटोकॉल',upload:'अपलोड',uploadSubmit:'इसे सर�वर को भेजें',image:'तस�वीर',flash:'फ़�लैश',form:'फ़ॉर�म',checkbox:'चॅक बॉक�स',radio:'रेडिओ बटन',textField:'टेक�स�ट फ़ील�ड',textarea:'टेक�स�ट �रिया',hiddenField:'ग�प�त फ़ील�ड',button:'बटन',select:'च�नाव फ़ील�ड',imageButton:'तस�वीर बटन',notSet:'<सॅट नहीं>',id:'Id',name:'नाम',langDir:'भाषा लिखने की दिशा',langDirLtr:'बायें से दायें (LTR)',langDirRtl:'दायें से बायें (RTL)',langCode:'भाषा कोड',longDescr:'अधिक विवरण के लि� URL',cssClass:'स�टाइल-शीट क�लास',advisoryTitle:'परामर�श शीर�शक',cssStyle:'स�टाइल',ok:'ठीक है',cancel:'रद�द करें',close:'Close',preview:'Preview',generalTab:'सामान�य',advancedTab:'�ड�वान�स�ड',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'चौड़ाई',height:'ऊ�चाई',align:'�लाइन',alignLeft:'दायें',alignRight:'दायें',alignCenter:'बीच में',alignTop:'ऊपर',alignMiddle:'मध�य',alignBottom:'नीचे',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'विशेष करॅक�टर इन�सर�ट करें',title:'विशेष करॅक�टर च�नें',options:'Special Character Options'},link:{toolbar:'लिंक इन�सर�ट/संपादन',other:'<अन�य>',menu:'लिंक संपादन',title:'लिंक',info:'लिंक  ',target:'टार�गेट',upload:'अपलोड',advanced:'�ड�वान�स�ड',type:'लिंक प�रकार',toUrl:'URL',toAnchor:'इस पेज का �ंकर',toEmail:'ई-मेल',targetFrame:'<फ़�रेम>',targetPopup:'<पॉप-अप विन�डो>',targetFrameName:'टार�गेट फ़�रेम का नाम',targetPopupName:'पॉप-अप विन�डो का नाम',popupFeatures:'पॉप-अप विन�डो फ़ीचर�स',popupResizable:'Resizable',popupStatusBar:'स�टेटस बार',popupLocationBar:'लोकेशन बार',popupToolbar:'टूल बार',popupMenuBar:'मॅन�यू बार',popupFullScreen:'फ़�ल स�क�रीन (IE)',popupScrollBars:'स�क�रॉल बार',popupDependent:'डिपेन�डॅन�ट (Netscape)',popupLeft:'बायीं तरफ',popupTop:'दायीं तरफ',id:'Id',langDir:'भाषा लिखने की दिशा',langDirLTR:'बायें से दायें (LTR)',langDirRTL:'दायें से बायें (RTL)',acccessKey:'�क�सॅस की',name:'नाम',langCode:'भाषा लिखने की दिशा',tabIndex:'टैब इन�डॅक�स',advisoryTitle:'परामर�श शीर�शक',advisoryContentType:'परामर�श कन�टॅन�ट प�रकार',cssClasses:'स�टाइल-शीट क�लास',charset:'लिंक रिसोर�स करॅक�टर सॅट',styles:'स�टाइल',rel:'Relationship',selectAnchor:'�ंकर च�नें',anchorName:'�ंकर नाम से',anchorId:'�लीमॅन�ट Id से',emailAddress:'ई-मेल पता',emailSubject:'संदेश विषय',emailBody:'संदेश',noAnchors:'(डॉक�यूमॅन�ट में �ंकर�स की संख�या)',noUrl:'लिंक URL टाइप करें',noEmail:'ई-मेल पता टाइप करें'},anchor:{toolbar:'�ंकर इन�सर�ट/संपादन',menu:'�ंकर प�रॉपर�टीज़',title:'�ंकर प�रॉपर�टीज़',name:'�ंकर का नाम',errorName:'�ंकर का नाम टाइप करें',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'खोजें और बदलें',find:'खोजें',replace:'रीप�लेस',findWhat:'यह खोजें:',replaceWith:'इससे रिप�लेस करें:',notFoundMsg:'आपके द�वारा दिया गया टेक�स�ट नहीं मिला',findOptions:'Find Options',matchCase:'केस मिलायें',matchWord:'पूरा शब�द मिलायें',matchCyclic:'Match cyclic',replaceAll:'सभी रिप�लेस करें',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'टेबल',title:'टेबल प�रॉपर�टीज़',menu:'टेबल प�रॉपर�टीज़',deleteTable:'टेबल डिलीट करें',rows:'पंक�तिया�',columns:'कालम',border:'बॉर�डर साइज़',widthPx:'पिक�सैल',widthPc:'प�रतिशत',widthUnit:'width unit',cellSpace:'सैल अंतर',cellPad:'सैल पैडिंग',caption:'शीर�षक',summary:'सारांश',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'खाना',insertBefore:'पहले सैल डालें',insertAfter:'बाद में सैल डालें',deleteCell:'सैल डिलीट करें',merge:'सैल मिलायें',mergeRight:'बा�या विलय',mergeDown:'नीचे विलय करें',splitHorizontal:'सैल को क�षैतिज स�थिति में विभाजित करें',splitVertical:'सैल को लम�बाकार में विभाजित करें',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'पंक�ति',insertBefore:'पहले पंक�ति डालें',insertAfter:'बाद में पंक�ति डालें',deleteRow:'पंक�तिया� डिलीट करें'},column:{menu:'कालम',insertBefore:'पहले कालम डालें',insertAfter:'बाद में कालम डालें',deleteColumn:'कालम डिलीट करें'}},button:{title:'बटन प�रॉपर�टीज़',text:'टेक�स�ट (वैल�यू)',type:'प�रकार',typeBtn:'बटन',typeSbm:'सब�मिट',typeRst:'रिसेट'},checkboxAndRadio:{checkboxTitle:'चॅक बॉक�स प�रॉपर�टीज़',radioTitle:'रेडिओ बटन प�रॉपर�टीज़',value:'वैल�यू',selected:'सॅलॅक�टॅड'},form:{title:'फ़ॉर�म प�रॉपर�टीज़',menu:'फ़ॉर�म प�रॉपर�टीज़',action:'क�रिया',method:'तरीका',encoding:'Encoding'},select:{title:'च�नाव फ़ील�ड प�रॉपर�टीज़',selectInfo:'सूचना',opAvail:'उपलब�ध विकल�प',value:'वैल�यू',size:'साइज़',lines:'पंक�तिया�',chkMulti:'�क से ज�यादा विकल�प च�नने दें',opText:'टेक�स�ट',opValue:'वैल�यू',btnAdd:'जोड़ें',btnModify:'बदलें',btnUp:'ऊपर',btnDown:'नीचे',btnSetValue:'च�नी गई वैल�यू सॅट करें',btnDelete:'डिलीट'},textarea:{title:'टेक�स�त �रिया प�रॉपर�टीज़',cols:'कालम',rows:'पंक�तियां'},textfield:{title:'टेक�स�ट फ़ील�ड प�रॉपर�टीज़',name:'नाम',value:'वैल�यू',charWidth:'करॅक�टर की चौ�ाई',maxChars:'अधिकतम करॅक�टर',type:'टाइप',typeText:'टेक�स�ट',typePass:'पास�वर�ड'},hidden:{title:'ग�प�त फ़ील�ड प�रॉपर�टीज़',name:'नाम',value:'वैल�यू'},image:{title:'तस�वीर प�रॉपर�टीज़',titleButton:'तस�वीर बटन प�रॉपर�टीज़',menu:'तस�वीर प�रॉपर�टीज़',infoTab:'तस�वीर की जानकारी',btnUpload:'इसे सर�वर को भेजें',upload:'अपलोड',alt:'वैकल�पिक टेक�स�ट',lockRatio:'लॉक अन�पात',resetSize:'रीसॅट साइज़',border:'बॉर�डर',hSpace:'हॉरिज़ॉन�टल स�पेस',vSpace:'वर�टिकल स�पेस',alertUrl:'तस�वीर का URL टाइप करें ',linkTab:'लिंक',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'फ़�लैश प�रॉपर�टीज़',propertiesTab:'Properties',title:'फ़�लैश प�रॉपर�टीज़',chkPlay:'ऑटो प�ले',chkLoop:'लूप',chkMenu:'फ़�लैश मॅन�यू का प�रयोग करें',chkFull:'Allow Fullscreen',scale:'स�केल',scaleAll:'सभी दिखायें',scaleNoBorder:'कोई बॉर�डर नहीं',scaleFit:'बिल�क�ल फ़िट',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs नीचे',alignAbsMiddle:'Abs ऊपर',alignBaseline:'मूल रेखा',alignTextTop:'टेक�स�ट ऊपर',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'बैक�ग�राउन�ड रंग',hSpace:'हॉरिज़ॉन�टल स�पेस',vSpace:'वर�टिकल स�पेस',validateSrc:'लिंक URL टाइप करें',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'वर�तनी (स�पेलिंग) जा�च',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'शब�दकोश में नहीं',changeTo:'इसमें बदलें',btnIgnore:'इग�नोर',btnIgnoreAll:'सभी इग�नोर करें',btnReplace:'रिप�लेस',btnReplaceAll:'सभी रिप�लेस करें',btnUndo:'अन�डू',noSuggestions:'- कोई स��ाव नहीं -',progress:'वर�तनी की जा�च (स�पॅल-चॅक) जारी है...',noMispell:'वर�तनी की जा�च : कोई गलत वर�तनी (स�पॅलिंग) नहीं पाई गई',noChanges:'वर�तनी की जा�च :कोई शब�द नहीं बदला गया',oneChange:'वर�तनी की जा�च : �क शब�द बदला गया',manyChanges:'वर�तनी की जा�च : %1 शब�द बदले गये',ieSpellDownload:'स�पॅल-चॅकर इन�स�टाल नहीं किया गया है। क�या आप इसे डाउनलोड करना चाहेंगे?'},smiley:{toolbar:'स�माइली',title:'स�माइली इन�सर�ट करें',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'अंकीय सूची',bulletedlist:'ब�लॅट सूची',indent:'इन�डॅन�ट ब�ायें',outdent:'इन�डॅन�ट कम करें',justify:{left:'बायीं तरफ',center:'बीच में',right:'दायीं तरफ',block:'ब�लॉक जस�टीफ़ाई'},blockquote:'ब�लॉक-कोट',clipboard:{title:'पेस�ट',cutError:'आपके ब�राउज़र की स�रक�षा सॅटिन�ग�स ने कट करने की अन�मति नहीं प�रदान की है। (Ctrl/Cmd+X) का प�रयोग करें।',copyError:'आपके ब�राआउज़र की स�रक�षा सॅटिन�ग�स ने कॉपी करने की अन�मति नहीं प�रदान की है। (Ctrl/Cmd+C) का प�रयोग करें।',pasteMsg:'Ctrl/Cmd+V का प�रयोग करके पेस�ट करें और ठीक है करें.',securityMsg:'आपके ब�राउज़र की स�रक�षा आपके ब�राउज़र की स�रKश सैटिंग के कारण, �डिटर आपके क�लिपबोर�ड डेटा को नहीं पा सकता है. आपको उसे इस विन�डो में दोबारा पेस�ट करना होगा.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'पेस�ट (वर�ड से)',title:'पेस�ट (वर�ड से)',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'पेस�ट (सादा टॅक�स�ट)',title:'पेस�ट (सादा टॅक�स�ट)'},templates:{button:'टॅम�प�लेट',title:'कन�टेन�ट टॅम�प�लेट',options:'Template Options',insertOption:'मूल शब�दों को बदलें',selectPromptMsg:'�डिटर में ओपन करने हेत� टॅम�प�लेट च�नें(वर�तमान कन�टॅन�ट सेव नहीं होंगे):',emptyListMsg:'(कोई टॅम�प�लेट डिफ़ाइन नहीं किया गया है)'},showBlocks:'ब�लॉक दिखायें',stylesCombo:{label:'स�टाइल',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'फ़ॉर�मैट',panelTitle:'फ़ॉर�मैट',tag_p:'साधारण',tag_pre:'फ़ॉर�मैटॅड',tag_address:'पता',tag_h1:'शीर�षक 1',tag_h2:'शीर�षक 2',tag_h3:'शीर�षक 3',tag_h4:'शीर�षक 4',tag_h5:'शीर�षक 5',tag_h6:'शीर�षक 6',tag_div:'शीर�षक (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'फ़ॉन�ट',voiceLabel:'Font',panelTitle:'फ़ॉन�ट'},fontSize:{label:'साइज़',voiceLabel:'Font Size',panelTitle:'साइज़'},colorButton:{textColorTitle:'टेक�स�ट रंग',bgColorTitle:'बैक�ग�राउन�ड रंग',panelTitle:'Colors',auto:'स�वचालित',more:'और रंग...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'कोई स��ाव नहीं',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'मेक�सिमाईज़',minimize:'मिनिमाईज़',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'डॉक�यूमॅन�ट प�रॉपर�टीज़',title:'डॉक�यूमॅन�ट प�रॉपर�टीज़',design:'Design',meta:'मॅटाडेटा',chooseColor:'Choose',other:'<अन�य>',docTitle:'पेज शीर�षक',charset:'करेक�टर सॅट �न�कोडिंग',charsetOther:'अन�य करेक�टर सॅट �न�कोडिंग',charsetASCII:'ASCII',charsetCE:'मध�य यूरोपीय (Central European)',charsetCT:'चीनी (Chinese Traditional Big5)',charsetCR:'सिरीलिक (Cyrillic)',charsetGR:'यवन (Greek)',charsetJP:'जापानी (Japanese)',charsetKR:'कोरीयन (Korean)',charsetTR:'त�र�की (Turkish)',charsetUN:'यूनीकोड (UTF-8)',charsetWE:'पश�चिम यूरोपीय (Western European)',docType:'डॉक�यूमॅन�ट प�रकार शीर�षक',docTypeOther:'अन�य डॉक�यूमॅन�ट प�रकार शीर�षक',xhtmlDec:'XHTML सूचना सम�मिलित करें',bgColor:'बैक�ग�राउन�ड रंग',bgImage:'बैक�ग�राउन�ड तस�वीर URL',bgFixed:'स�क�रॉल न करने वाला बैक�ग�राउन�ड',txtColor:'टेक�स�ट रंग',margin:'पेज मार�जिन',marginTop:'ऊपर',marginLeft:'बायें',marginRight:'दायें',marginBottom:'नीचे',metaKeywords:'डॉक�य�मॅन�ट इन�डेक�स संकेतशब�द (अल�पविराम से अलग करें)',metaDescription:'डॉक�यूमॅन�ट करॅक�टरन',metaAuthor:'लेखक',metaCopyright:'कॉपीराइट',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/hr.js b/web/imcms/ckeditor/lang/hr.js
new file mode 100644
index 0000000000..d7cf58b9cb
--- /dev/null
+++ b/web/imcms/ckeditor/lang/hr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.hr={dir:'ltr',editorTitle:'Bogati uređiva� teksta, %1',editorHelp:'Pritisni ALT 0 za pomoć',toolbars:'Alatne trake uređiva�a teksta',editor:'Bogati uređiva� teksta',source:'Kôd',newPage:'Nova stranica',save:'Snimi',preview:'Pregledaj',cut:'Izreži',copy:'Kopiraj',paste:'Zalijepi',print:'Ispiši',underline:'Potcrtano',bold:'Podebljaj',italic:'Ukosi',selectAll:'Odaberi sve',removeFormat:'Ukloni formatiranje',strike:'Precrtano',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Ubaci vodoravnu liniju',pagebreak:'Ubaci prijelom stranice',pagebreakAlt:'Prijelom stranice',unlink:'Ukloni link',undo:'Poništi',redo:'Ponovi',common:{browseServer:'Pretraži server',url:'URL',protocol:'Protokol',upload:'Pošalji',uploadSubmit:'Pošalji na server',image:'Slika',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<nije postavljeno>',id:'Id',name:'Naziv',langDir:'Smjer jezika',langDirLtr:'S lijeva na desno (LTR)',langDirRtl:'S desna na lijevo (RTL)',langCode:'Kôd jezika',longDescr:'Duga�ki opis URL',cssClass:'Stylesheet klase',advisoryTitle:'Advisory naslov',cssStyle:'Stil',ok:'OK',cancel:'Poništi',close:'Zatvori',preview:'Pregledaj',generalTab:'Općenito',advancedTab:'Napredno',validateNumberFailed:'Ova vrijednost nije broj.',confirmNewPage:'Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite u�itati novu stranicu?',confirmCancel:'Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?',options:'Opcije',target:'Odredište',targetNew:'Novi prozor (_blank)',targetTop:'Vršni prozor (_top)',targetSelf:'Isti prozor (_self)',targetParent:'Roditeljski prozor (_parent)',langDirLTR:'S lijeva na desno (LTR)',langDirRTL:'S desna na lijevo (RTL)',styles:'Stil',cssClasses:'Klase stilova',width:'Širina',height:'Visina',align:'Poravnaj',alignLeft:'Lijevo',alignRight:'Desno',alignCenter:'Središnje',alignTop:'Vrh',alignMiddle:'Sredina',alignBottom:'Dolje',invalidValue:'Invalid value.',invalidHeight:'Visina mora biti broj.',invalidWidth:'Širina mora biti broj.',invalidCssLength:'Vrijednost određena za "%1" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).',invalidHtmlLength:'Vrijednost određena za "%1" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).',invalidInlineStyle:'Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom "naziv:vrijednost", odvojenih to�ka-zarezom.',cssLengthTooltip:'Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).',unavailable:'%1<span class="cke_accessibility">, nedostupno</span>'},contextmenu:{options:'Opcije izbornika'},specialChar:{toolbar:'Ubaci posebne znakove',title:'Odaberite posebni karakter',options:'Opcije specijalnih znakova'},link:{toolbar:'Ubaci/promijeni link',other:'<drugi>',menu:'Promijeni link',title:'Link',info:'Link Info',target:'Meta',upload:'Pošalji',advanced:'Napredno',type:'Link vrsta',toUrl:'URL',toAnchor:'Sidro na ovoj stranici',toEmail:'E-Mail',targetFrame:'<okvir>',targetPopup:'<popup prozor>',targetFrameName:'Ime ciljnog okvira',targetPopupName:'Naziv popup prozora',popupFeatures:'Mogućnosti popup prozora',popupResizable:'Promjenjiva veli�ina',popupStatusBar:'Statusna traka',popupLocationBar:'Traka za lokaciju',popupToolbar:'Traka s alatima',popupMenuBar:'Izborna traka',popupFullScreen:'Cijeli ekran (IE)',popupScrollBars:'Scroll traka',popupDependent:'Ovisno (Netscape)',popupLeft:'Lijeva pozicija',popupTop:'Gornja pozicija',id:'Id',langDir:'Smjer jezika',langDirLTR:'S lijeva na desno (LTR)',langDirRTL:'S desna na lijevo (RTL)',acccessKey:'Pristupna tipka',name:'Naziv',langCode:'Smjer jezika',tabIndex:'Tab Indeks',advisoryTitle:'Advisory naslov',advisoryContentType:'Advisory vrsta sadržaja',cssClasses:'Stylesheet klase',charset:'Kodna stranica povezanih resursa',styles:'Stil',rel:'Veza',selectAnchor:'Odaberi sidro',anchorName:'Po nazivu sidra',anchorId:'Po Id elementa',emailAddress:'E-Mail adresa',emailSubject:'Naslov',emailBody:'Sadržaj poruke',noAnchors:'(Nema dostupnih sidra)',noUrl:'Molimo upišite URL link',noEmail:'Molimo upišite e-mail adresu'},anchor:{toolbar:'Ubaci/promijeni sidro',menu:'Svojstva sidra',title:'Svojstva sidra',name:'Ime sidra',errorName:'Molimo unesite ime sidra',remove:'Ukloni sidro'},list:{numberedTitle:'Svojstva broj�ane liste',bulletedTitle:'Svojstva liste',type:'Vrsta',start:'Po�etak',validateStartNumber:'Po�etak broj�ane liste mora biti cijeli broj.',circle:'Krug',disc:'Disk',square:'Kvadrat',none:'Bez',notset:'<nije određen>',armenian:'Armenijska numeracija',georgian:'Gruzijska numeracija(an, ban, gan, etc.)',lowerRoman:'Romanska numeracija mala slova (i, ii, iii, iv, v, itd.)',upperRoman:'Romanska numeracija velika slova (I, II, III, IV, V, itd.)',lowerAlpha:'Znakovi mala slova (a, b, c, d, e, itd.)',upperAlpha:'Znakovi velika slova (A, B, C, D, E, itd.)',lowerGreek:'Gr�ka numeracija mala slova (alfa, beta, gama, itd).',decimal:'Decimalna numeracija (1, 2, 3, itd.)',decimalLeadingZero:'Decimalna s vodećom nulom (01, 02, 03, itd)'},findAndReplace:{title:'Pronađi i zamijeni',find:'Pronađi',replace:'Zamijeni',findWhat:'Pronađi:',replaceWith:'Zamijeni s:',notFoundMsg:'Traženi tekst nije pronađen.',findOptions:'Opcije traženja',matchCase:'Usporedi mala/velika slova',matchWord:'Usporedi cijele rije�i',matchCyclic:'Usporedi kružno',replaceAll:'Zamijeni sve',replaceSuccessMsg:'Zamijenjeno %1 pojmova.'},table:{toolbar:'Tablica',title:'Svojstva tablice',menu:'Svojstva tablice',deleteTable:'Izbriši tablicu',rows:'Redova',columns:'Kolona',border:'Veli�ina okvira',widthPx:'piksela',widthPc:'postotaka',widthUnit:'jedinica širine',cellSpace:'Prostornost ćelija',cellPad:'Razmak ćelija',caption:'Naslov',summary:'Sažetak',headers:'Zaglavlje',headersNone:'Ništa',headersColumn:'Prva kolona',headersRow:'Prvi red',headersBoth:'Oba',invalidRows:'Broj redova mora biti broj veći od 0.',invalidCols:'Broj kolona mora biti broj veći od 0.',invalidBorder:'Debljina ruba mora biti broj.',invalidWidth:'Širina tablice mora biti broj.',invalidHeight:'Visina tablice mora biti broj.',invalidCellSpacing:'Prostornost ćelija mora biti broj.',invalidCellPadding:'Razmak ćelija mora biti broj.',cell:{menu:'Ćelija',insertBefore:'Ubaci ćeliju prije',insertAfter:'Ubaci ćeliju poslije',deleteCell:'Izbriši ćelije',merge:'Spoji ćelije',mergeRight:'Spoji desno',mergeDown:'Spoji dolje',splitHorizontal:'Podijeli ćeliju vodoravno',splitVertical:'Podijeli ćeliju okomito',title:'Svojstva ćelije',cellType:'Vrsta ćelije',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Prelazak u novi red',hAlign:'Vodoravno poravnanje',vAlign:'Okomito poravnanje',alignBaseline:'Osnovna linija',bgColor:'Boja pozadine',borderColor:'Boja ruba',data:'Podatak',header:'Zaglavlje',yes:'Da',no:'ne',invalidWidth:'Širina ćelije mora biti broj.',invalidHeight:'Visina ćelije mora biti broj.',invalidRowSpan:'Rows span mora biti cijeli broj.',invalidColSpan:'Columns span mora biti cijeli broj.',chooseColor:'Odaberi'},row:{menu:'Red',insertBefore:'Ubaci red prije',insertAfter:'Ubaci red poslije',deleteRow:'Izbriši redove'},column:{menu:'Kolona',insertBefore:'Ubaci kolonu prije',insertAfter:'Ubaci kolonu poslije',deleteColumn:'Izbriši kolone'}},button:{title:'Image Button svojstva',text:'Tekst (vrijednost)',type:'Vrsta',typeBtn:'Gumb',typeSbm:'Pošalji',typeRst:'Poništi'},checkboxAndRadio:{checkboxTitle:'Checkbox svojstva',radioTitle:'Radio Button svojstva',value:'Vrijednost',selected:'Odabrano'},form:{title:'Form svojstva',menu:'Form svojstva',action:'Akcija',method:'Metoda',encoding:'Encoding'},select:{title:'Selection svojstva',selectInfo:'Info',opAvail:'Dostupne opcije',value:'Vrijednost',size:'Veli�ina',lines:'linija',chkMulti:'Dozvoli višestruki odabir',opText:'Tekst',opValue:'Vrijednost',btnAdd:'Dodaj',btnModify:'Promijeni',btnUp:'Gore',btnDown:'Dolje',btnSetValue:'Postavi kao odabranu vrijednost',btnDelete:'Obriši'},textarea:{title:'Textarea svojstva',cols:'Kolona',rows:'Redova'},textfield:{title:'Text Field svojstva',name:'Ime',value:'Vrijednost',charWidth:'Širina',maxChars:'Najviše karaktera',type:'Vrsta',typeText:'Tekst',typePass:'Šifra'},hidden:{title:'Hidden Field svojstva',name:'Ime',value:'Vrijednost'},image:{title:'Svojstva slika',titleButton:'Image Button svojstva',menu:'Svojstva slika',infoTab:'Info slike',btnUpload:'Pošalji na server',upload:'Pošalji',alt:'Alternativni tekst',lockRatio:'Zaklju�aj odnos',resetSize:'Obriši veli�inu',border:'Okvir',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Unesite URL slike',linkTab:'Link',button2Img:'Želite li promijeniti odabrani gumb u jednostavnu sliku?',img2Button:'Želite li promijeniti odabranu sliku u gumb?',urlMissing:'Nedostaje URL slike.',validateBorder:'Okvir mora biti cijeli broj.',validateHSpace:'HSpace mora biti cijeli broj',validateVSpace:'VSpace mora biti cijeli broj.'},flash:{properties:'Flash svojstva',propertiesTab:'Svojstva',title:'Flash svojstva',chkPlay:'Auto Play',chkLoop:'Ponavljaj',chkMenu:'Omogući Flash izbornik',chkFull:'Omogući Fullscreen',scale:'Omjer',scaleAll:'Prikaži sve',scaleNoBorder:'Bez okvira',scaleFit:'To�na veli�ina',access:'Script Access',accessAlways:'Uvijek',accessSameDomain:'Ista domena',accessNever:'Nikad',alignAbsBottom:'Abs dolje',alignAbsMiddle:'Abs sredina',alignBaseline:'Bazno',alignTextTop:'Vrh teksta',quality:'Kvaliteta',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Vrsta prozora',flashvars:'Varijable za Flash',bgcolor:'Boja pozadine',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Molimo upišite URL link',validateHSpace:'HSpace mora biti broj.',validateVSpace:'VSpace mora biti broj.'},spellCheck:{toolbar:'Provjeri pravopis',title:'Provjera pravopisa',notAvailable:'Žao nam je, ali usluga trenutno nije dostupna.',errorLoading:'Greška u�itavanja aplikacije: %s.',notInDic:'Nije u rje�niku',changeTo:'Promijeni u',btnIgnore:'Zanemari',btnIgnoreAll:'Zanemari sve',btnReplace:'Zamijeni',btnReplaceAll:'Zamijeni sve',btnUndo:'Vrati',noSuggestions:'-Nema preporuke-',progress:'Provjera u tijeku...',noMispell:'Provjera završena: Nema grešaka',noChanges:'Provjera završena: Nije napravljena promjena',oneChange:'Provjera završena: Jedna rije� promjenjena',manyChanges:'Provjera završena: Promijenjeno %1 rije�i',ieSpellDownload:'Provjera pravopisa nije instalirana. Želite li skinuti provjeru pravopisa?'},smiley:{toolbar:'Smješko',title:'Ubaci smješka',options:'Opcije smješka'},elementsPath:{eleLabel:'Putanja elemenata',eleTitle:'%1 element'},numberedlist:'Broj�ana lista',bulletedlist:'Obi�na lista',indent:'Pomakni udesno',outdent:'Pomakni ulijevo',justify:{left:'Lijevo poravnanje',center:'Središnje poravnanje',right:'Desno poravnanje',block:'Blok poravnanje'},blockquote:'Blockquote',clipboard:{title:'Zalijepi',cutError:'Sigurnosne postavke Vašeg pretraživa�a ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).',copyError:'Sigurnosne postavke Vašeg pretraživa�a ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).',pasteMsg:'Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.',securityMsg:'Zbog sigurnosnih postavki Vašeg pretraživa�a, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.',pasteArea:'Prostor za ljepljenje'},pastefromword:{confirmCleanup:'Tekst koji želite zalijepiti �ini se da je kopiran iz Worda. Želite li prije o�istiti tekst?',toolbar:'Zalijepi iz Worda',title:'Zalijepi iz Worda',error:'Nije moguće o�istiti podatke za ljepljenje zbog interne greške'},pasteText:{button:'Zalijepi kao �isti tekst',title:'Zalijepi kao �isti tekst'},templates:{button:'Predlošci',title:'Predlošci sadržaja',options:'Opcije predložaka',insertOption:'Zamijeni trenutne sadržaje',selectPromptMsg:'Molimo odaberite predložak koji želite otvoriti<br>(stvarni sadržaj će biti izgubljen):',emptyListMsg:'(Nema definiranih predložaka)'},showBlocks:'Prikaži blokove',stylesCombo:{label:'Stil',panelTitle:'Stilovi formatiranja',panelTitle1:'Block stilovi',panelTitle2:'Inline stilovi',panelTitle3:'Object stilovi'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatirano',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Napravi DIV kontejner',toolbar:'Napravi DIV kontejner',cssClassInputLabel:'Klase stilova',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:'Jezi�ni kod',inlineStyleInputLabel:'Stil u liniji',advisoryTitleInputLabel:'Savjetodavni naslov',langDirLabel:'Smjer jezika',langDirLTRLabel:'S lijeva na desno (LTR)',langDirRTLLabel:'S desna na lijevo (RTL)',edit:'Uredi DIV',remove:'Ukloni DIV'},iframe:{title:'IFrame svojstva',toolbar:'IFrame',noUrl:'Unesite URL iframe-a',scrolling:'Omogući trake za skrolanje',border:'Prikaži okvir IFrame-a'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Veli�ina',voiceLabel:'Veli�ina slova',panelTitle:'Veli�ina'},colorButton:{textColorTitle:'Boja teksta',bgColorTitle:'Boja pozadine',panelTitle:'Boje',auto:'Automatski',more:'Više boja...'},colors:{'000':'Crna',800000:'Kesten','8B4513':'Smeđa','2F4F4F':'Tamno siva','008080':'Teal','000080':'Mornarska','4B0082':'Indigo',696969:'Tamno siva',B22222:'Vatrena cigla',A52A2A:'Smeđa',DAA520:'Zlatna','006400':'Tamno zelena','40E0D0':'Tirkizna','0000CD':'Srednje plava',800080:'Ljubi�asta',808080:'Siva',F00:'Crvena',FF8C00:'Tamno naranđasta',FFD700:'Zlatna','008000':'Zelena','0FF':'Cijan','00F':'Plava',EE82EE:'Ljubi�asta',A9A9A9:'Mutno siva',FFA07A:'Svijetli losos',FFA500:'Naranđasto',FFFF00:'Žuto','00FF00':'Limun',AFEEEE:'Blijedo tirkizna',ADD8E6:'Svijetlo plava',DDA0DD:'Šljiva',D3D3D3:'Svijetlo siva',FFF0F5:'Lavanda rumeno',FAEBD7:'Antikno bijela',FFFFE0:'Svijetlo žuta',F0FFF0:'Med',F0FFFF:'Azurna',F0F8FF:'Alice plava',E6E6FA:'Lavanda',FFF:'Bijela'},scayt:{title:'Provjeri pravopis tijekom tipkanja (SCAYT)',opera_title:'Nije podržano u Operi',enable:'Omogući SCAYT',disable:'Onemogući SCAYT',about:'O SCAYT',toggle:'Omoguću/Onemogući SCAYT',options:'Opcije',langs:'Jezici',moreSuggestions:'Više prijedloga',ignore:'Zanemari',ignoreAll:'Zanemari sve',addWord:'Dodaj rije�',emptyDic:'Naziv rje�nika ne smije biti prazno.',noSuggestions:'Nema preporuke',optionsTab:'Opcije',allCaps:'Ignoriraj rije�i s velikim slovima',ignoreDomainNames:'Ignoriraj nazive domena',mixedCase:'Ignoriraj rije�i s miješanim slovima',mixedWithDigits:'Ignoriraj rije�i s brojevima',languagesTab:'Jezici',dictionariesTab:'Rje�nici',dic_field_name:'Naziv rije�nika',dic_create:'Napravi',dic_restore:'Povrati',dic_delete:'Obriši',dic_rename:'Promijeni naziv',dic_info:'Na po�etku se korisni�ki Rije�nik sprema u Cookie. Nažalost, veli�ina im je ograni�ena. Kada korisni�ki Rije�nik naraste preko te veli�ine, Rije�nik će biti smješten na naš server. Kako bi se korisni�ki Rije�nik spremio na naš server morate odabrati naziv Vašeg Rije�nika. Ukoliko ste već prije spremali Rije�nik na naše servere, unesite naziv Rije�nika i pritisnite na Povrati.',aboutTab:'O SCAYT'},about:{title:'O CKEditoru',dlgTitle:'O CKEditoru',help:'Provjeri $1 za pomoć.',userGuide:'Vodi� za CKEditor korisnike',moreInfo:'Za informacije o licencama posjetite našu web stranicu:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Povećaj',minimize:'Smanji',fakeobjects:{anchor:'Sidro',flash:'Flash animacija',iframe:'IFrame',hiddenfield:'Sakriveno polje',unknown:'Nepoznati objekt'},resize:'Povuci za promjenu veli�ine',colordialog:{title:'Odaberi boju',options:'Opcije boje',highlight:'Istaknuto',selected:'Odabrana boja',clear:'O�isti'},toolbarCollapse:'Smanji alatnu traku',toolbarExpand:'Proširi alatnu traku',toolbarGroups:{document:'Dokument',clipboard:'Međuspremnik/Poništi',editing:'Uređivanje',forms:'Forme',basicstyles:'Osnovni stilovi',paragraph:'Paragraf',links:'Veze',insert:'Umetni',styles:'Stilovi',colors:'Boje',tools:'Alatke'},bidi:{ltr:'Smjer teksta s lijeva na desno',rtl:'Smjer teksta s desna na lijevo'},docprops:{label:'Svojstva dokumenta',title:'Svojstva dokumenta',design:'Dizajn',meta:'Meta Data',chooseColor:'Odaberi',other:'<drugi>',docTitle:'Naslov stranice',charset:'Enkodiranje znakova',charsetOther:'Ostalo enkodiranje znakova',charsetASCII:'ASCII',charsetCE:'Središnja Europa',charsetCT:'Tradicionalna kineska (Big5)',charsetCR:'Ćirilica',charsetGR:'Gr�ka',charsetJP:'Japanska',charsetKR:'Koreanska',charsetTR:'Turska',charsetUN:'Unicode (UTF-8)',charsetWE:'Zapadna Europa',docType:'Zaglavlje vrste dokumenta',docTypeOther:'Ostalo zaglavlje vrste dokumenta',xhtmlDec:'Ubaci XHTML deklaracije',bgColor:'Boja pozadine',bgImage:'URL slike pozadine',bgFixed:'Pozadine se ne pomi�e',txtColor:'Boja teksta',margin:'Margine stranice',marginTop:'Vrh',marginLeft:'Lijevo',marginRight:'Desno',marginBottom:'Dolje',metaKeywords:'Klju�ne rije�i dokumenta (odvojene zarezom)',metaDescription:'Opis dokumenta',metaAuthor:'Autor',metaCopyright:'Autorska prava',previewHtml:'<p>Ovo je neki <strong>primjer teksta</strong>. Vi koristite <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/hu.js b/web/imcms/ckeditor/lang/hu.js
new file mode 100644
index 0000000000..ae337576e5
--- /dev/null
+++ b/web/imcms/ckeditor/lang/hu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.hu={dir:'ltr',editorTitle:'HTML szerkesztő, %1',editorHelp:'Press ALT 0 for help',toolbars:'Szerkesztő Eszköztár',editor:'HTML szerkesztő',source:'Forráskód',newPage:'Új oldal',save:'Mentés',preview:'Előnézet',cut:'Kivágás',copy:'Másolás',paste:'Beillesztés',print:'Nyomtatás',underline:'Aláhúzott',bold:'Félkövér',italic:'Dőlt',selectAll:'Mindent kijelöl',removeFormat:'Formázás eltávolítása',strike:'�thúzott',subscript:'Alsó index',superscript:'Felső index',horizontalrule:'Elválasztóvonal beillesztése',pagebreak:'Oldaltörés beillesztése',pagebreakAlt:'Oldaltörés',unlink:'Hivatkozás törlése',undo:'Visszavonás',redo:'Ismétlés',common:{browseServer:'Böngészés a szerveren',url:'Hivatkozás',protocol:'Protokoll',upload:'Feltöltés',uploadSubmit:'Küldés a szerverre',image:'Kép',flash:'Flash',form:'Űrlap',checkbox:'Jelölőnégyzet',radio:'Választógomb',textField:'Szövegmező',textarea:'Szövegterület',hiddenField:'Rejtettmező',button:'Gomb',select:'Legördülő lista',imageButton:'Képgomb',notSet:'<nincs beállítva>',id:'Azonosító',name:'Név',langDir:'�rás iránya',langDirLtr:'Balról jobbra',langDirRtl:'Jobbról balra',langCode:'Nyelv kódja',longDescr:'Részletes leírás webcíme',cssClass:'Stíluskészlet',advisoryTitle:'Súgócimke',cssStyle:'Stílus',ok:'Rendben',cancel:'Mégsem',close:'Bezárás',preview:'Előnézet',generalTab:'�ltalános',advancedTab:'További opciók',validateNumberFailed:'A mezőbe csak számokat írhat.',confirmNewPage:'Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?',confirmCancel:'Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?',options:'Beállítások',target:'Cél',targetNew:'Új ablak (_blank)',targetTop:'Legfelső ablak (_top)',targetSelf:'Aktuális ablakban (_self)',targetParent:'Szülő ablak (_parent)',langDirLTR:'Balról jobbra (LTR)',langDirRTL:'Jobbról balra (RTL)',styles:'Stílus',cssClasses:'Stíluslap osztály',width:'Szélesség',height:'Magasság',align:'Igazítás',alignLeft:'Bal',alignRight:'Jobbra',alignCenter:'Középre',alignTop:'Tetejére',alignMiddle:'Középre',alignBottom:'Aljára',invalidValue:'Invalid value.',invalidHeight:'A magasság mezőbe csak számokat írhat.',invalidWidth:'A szélesség mezőbe csak számokat írhat.',invalidCssLength:'"%1"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).',invalidHtmlLength:'"%1"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nem elérhető</span>'},contextmenu:{options:'Helyi menü opciók'},specialChar:{toolbar:'Speciális karakter beillesztése',title:'Speciális karakter választása',options:'Speciális karakter opciók'},link:{toolbar:'Hivatkozás beillesztése/módosítása',other:'<más>',menu:'Hivatkozás módosítása',title:'Hivatkozás tulajdonságai',info:'Alaptulajdonságok',target:'Tartalom megjelenítése',upload:'Feltöltés',advanced:'További opciók',type:'Hivatkozás típusa',toUrl:'URL',toAnchor:'Horgony az oldalon',toEmail:'E-Mail',targetFrame:'<keretben>',targetPopup:'<felugró ablakban>',targetFrameName:'Keret neve',targetPopupName:'Felugró ablak neve',popupFeatures:'Felugró ablak jellemzői',popupResizable:'�tméretezés',popupStatusBar:'�llapotsor',popupLocationBar:'Címsor',popupToolbar:'Eszköztár',popupMenuBar:'Menü sor',popupFullScreen:'Teljes képernyő (csak IE)',popupScrollBars:'Gördítősáv',popupDependent:'Szülőhöz kapcsolt (csak Netscape)',popupLeft:'Bal pozíció',popupTop:'Felső pozíció',id:'Id',langDir:'�rás iránya',langDirLTR:'Balról jobbra',langDirRTL:'Jobbról balra',acccessKey:'Billentyűkombináció',name:'Név',langCode:'�rás iránya',tabIndex:'Tabulátor index',advisoryTitle:'Súgócimke',advisoryContentType:'Súgó tartalomtípusa',cssClasses:'Stíluskészlet',charset:'Hivatkozott tartalom kódlapja',styles:'Stílus',rel:'Kapcsolat típusa',selectAnchor:'Horgony választása',anchorName:'Horgony név szerint',anchorId:'Azonosító szerint',emailAddress:'E-Mail cím',emailSubject:'Üzenet tárgya',emailBody:'Üzenet',noAnchors:'(Nincs horgony a dokumentumban)',noUrl:'Adja meg a hivatkozás webcímét',noEmail:'Adja meg az E-Mail címet'},anchor:{toolbar:'Horgony beillesztése/szerkesztése',menu:'Horgony tulajdonságai',title:'Horgony tulajdonságai',name:'Horgony neve',errorName:'Kérem adja meg a horgony nevét',remove:'Horgony eltávolítása'},list:{numberedTitle:'Sorszámozott lista tulajdonságai',bulletedTitle:'Pontozott lista tulajdonságai',type:'Típus',start:'Kezdőszám',validateStartNumber:'A kezdőszám nem lehet tört érték.',circle:'Kör',disc:'Korong',square:'Négyzet',none:'Nincs',notset:'<Nincs beállítva>',armenian:'Örmény számozás',georgian:'Grúz számozás (an, ban, gan, stb.)',lowerRoman:'Római kisbetűs (i, ii, iii, iv, v, stb.)',upperRoman:'Római nagybetűs (I, II, III, IV, V, stb.)',lowerAlpha:'Kisbetűs (a, b, c, d, e, stb.)',upperAlpha:'Nagybetűs (A, B, C, D, E, stb.)',lowerGreek:'Görög (alpha, beta, gamma, stb.)',decimal:'Arab számozás (1, 2, 3, stb.)',decimalLeadingZero:'Számozás bevezető nullákkal (01, 02, 03, stb.)'},findAndReplace:{title:'Keresés és csere',find:'Keresés',replace:'Csere',findWhat:'Keresett szöveg:',replaceWith:'Csere erre:',notFoundMsg:'A keresett szöveg nem található.',findOptions:'Find Options',matchCase:'kis- és nagybetű megkülönböztetése',matchWord:'csak ha ez a teljes szó',matchCyclic:'Ciklikus keresés',replaceAll:'Az összes cseréje',replaceSuccessMsg:'%1 egyezőség cserélve.'},table:{toolbar:'Táblázat',title:'Táblázat tulajdonságai',menu:'Táblázat tulajdonságai',deleteTable:'Táblázat törlése',rows:'Sorok',columns:'Oszlopok',border:'Szegélyméret',widthPx:'képpont',widthPc:'százalék',widthUnit:'Szélesség egység',cellSpace:'Cella térköz',cellPad:'Cella belső margó',caption:'Felirat',summary:'Leírás',headers:'Fejlécek',headersNone:'Nincsenek',headersColumn:'Első oszlop',headersRow:'Első sor',headersBoth:'Mindkettő',invalidRows:'A sorok számának nagyobbnak kell lenni mint 0.',invalidCols:'Az oszlopok számának nagyobbnak kell lenni mint 0.',invalidBorder:'A szegélyméret mezőbe csak számokat írhat.',invalidWidth:'A szélesség mezőbe csak számokat írhat.',invalidHeight:'A magasság mezőbe csak számokat írhat.',invalidCellSpacing:'A cella térköz mezőbe csak számokat írhat.',invalidCellPadding:'A cella belső margó mezőbe csak számokat írhat.',cell:{menu:'Cella',insertBefore:'Beszúrás balra',insertAfter:'Beszúrás jobbra',deleteCell:'Cellák törlése',merge:'Cellák egyesítése',mergeRight:'Cellák egyesítése jobbra',mergeDown:'Cellák egyesítése lefelé',splitHorizontal:'Cellák szétválasztása vízszintesen',splitVertical:'Cellák szétválasztása függőlegesen',title:'Cella tulajdonságai',cellType:'Cella típusa',rowSpan:'Függőleges egyesítés',colSpan:'Vízszintes egyesítés',wordWrap:'Hosszú sorok törése',hAlign:'Vízszintes igazítás',vAlign:'Függőleges igazítás',alignBaseline:'Alapvonalra',bgColor:'Háttér színe',borderColor:'Keret színe',data:'Adat',header:'Fejléc',yes:'Igen',no:'Nem',invalidWidth:'A szélesség mezőbe csak számokat írhat.',invalidHeight:'A magasság mezőbe csak számokat írhat.',invalidRowSpan:'A függőleges egyesítés mezőbe csak számokat írhat.',invalidColSpan:'A vízszintes egyesítés mezőbe csak számokat írhat.',chooseColor:'Válasszon'},row:{menu:'Sor',insertBefore:'Beszúrás fölé',insertAfter:'Beszúrás alá',deleteRow:'Sorok törlése'},column:{menu:'Oszlop',insertBefore:'Beszúrás balra',insertAfter:'Beszúrás jobbra',deleteColumn:'Oszlopok törlése'}},button:{title:'Gomb tulajdonságai',text:'Szöveg (Érték)',type:'Típus',typeBtn:'Gomb',typeSbm:'Küldés',typeRst:'Alaphelyzet'},checkboxAndRadio:{checkboxTitle:'Jelölőnégyzet tulajdonságai',radioTitle:'Választógomb tulajdonságai',value:'Érték',selected:'Kiválasztott'},form:{title:'Űrlap tulajdonságai',menu:'Űrlap tulajdonságai',action:'Adatfeldolgozást végző hivatkozás',method:'Adatküldés módja',encoding:'Kódolás'},select:{title:'Legördülő lista tulajdonságai',selectInfo:'Alaptulajdonságok',opAvail:'Elérhető opciók',value:'Érték',size:'Méret',lines:'sor',chkMulti:'több sor is kiválasztható',opText:'Szöveg',opValue:'Érték',btnAdd:'Hozzáad',btnModify:'Módosít',btnUp:'Fel',btnDown:'Le',btnSetValue:'Legyen az alapértelmezett érték',btnDelete:'Töröl'},textarea:{title:'Szövegterület tulajdonságai',cols:'Karakterek száma egy sorban',rows:'Sorok száma'},textfield:{title:'Szövegmező tulajdonságai',name:'Név',value:'Érték',charWidth:'Megjelenített karakterek száma',maxChars:'Maximális karakterszám',type:'Típus',typeText:'Szöveg',typePass:'Jelszó'},hidden:{title:'Rejtett mező tulajdonságai',name:'Név',value:'Érték'},image:{title:'Kép tulajdonságai',titleButton:'Képgomb tulajdonságai',menu:'Kép tulajdonságai',infoTab:'Alaptulajdonságok',btnUpload:'Küldés a szerverre',upload:'Feltöltés',alt:'Buborék szöveg',lockRatio:'Arány megtartása',resetSize:'Eredeti méret',border:'Keret',hSpace:'Vízsz. táv',vSpace:'Függ. táv',alertUrl:'Töltse ki a kép webcímét',linkTab:'Hivatkozás',button2Img:'A kiválasztott képgombból sima képet szeretne csinálni?',img2Button:'A kiválasztott képből képgombot szeretne csinálni?',urlMissing:'Hiányzik a kép URL-je',validateBorder:'A keret méretének egész számot kell beírni!',validateHSpace:'Vízszintes távolságnak egész számot kell beírni!',validateVSpace:'Függőleges távolságnak egész számot kell beírni!'},flash:{properties:'Flash tulajdonságai',propertiesTab:'Tulajdonságok',title:'Flash tulajdonságai',chkPlay:'Automata lejátszás',chkLoop:'Folyamatosan',chkMenu:'Flash menü engedélyezése',chkFull:'Teljes képernyő engedélyezése',scale:'Méretezés',scaleAll:'Mindent mutat',scaleNoBorder:'Keret nélkül',scaleFit:'Teljes kitöltés',access:'Szkript hozzáférés',accessAlways:'Mindig',accessSameDomain:'Azonos domainről',accessNever:'Soha',alignAbsBottom:'Legaljára',alignAbsMiddle:'Közepére',alignBaseline:'Alapvonalhoz',alignTextTop:'Szöveg tetejére',quality:'Minőség',qualityBest:'Legjobb',qualityHigh:'Jó',qualityAutoHigh:'Automata jó',qualityMedium:'Közepes',qualityAutoLow:'Automata gyenge',qualityLow:'Gyenge',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Ablak mód',flashvars:'Flash változók',bgcolor:'Háttérszín',hSpace:'Vízsz. táv',vSpace:'Függ. táv',validateSrc:'Adja meg a hivatkozás webcímét',validateHSpace:'A vízszintes távolsűág mezőbe csak számokat írhat.',validateVSpace:'A függőleges távolsűág mezőbe csak számokat írhat.'},spellCheck:{toolbar:'Helyesírás-ellenőrzés',title:'Helyesírás ellenörző',notAvailable:'Sajnálom, de a szolgáltatás jelenleg nem elérhető.',errorLoading:'Hiba a szolgáltatás host betöltése közben: %s.',notInDic:'Nincs a szótárban',changeTo:'Módosítás',btnIgnore:'Kihagyja',btnIgnoreAll:'Mindet kihagyja',btnReplace:'Csere',btnReplaceAll:'Összes cseréje',btnUndo:'Visszavonás',noSuggestions:'Nincs javaslat',progress:'Helyesírás-ellenőrzés folyamatban...',noMispell:'Helyesírás-ellenőrzés kész: Nem találtam hibát',noChanges:'Helyesírás-ellenőrzés kész: Nincs változtatott szó',oneChange:'Helyesírás-ellenőrzés kész: Egy szó cserélve',manyChanges:'Helyesírás-ellenőrzés kész: %1 szó cserélve',ieSpellDownload:'A helyesírás-ellenőrző nincs telepítve. Szeretné letölteni most?'},smiley:{toolbar:'Hangulatjelek',title:'Hangulatjel beszúrása',options:'Hangulatjel opciók'},elementsPath:{eleLabel:'Elem utak',eleTitle:'%1 elem'},numberedlist:'Számozás',bulletedlist:'Felsorolás',indent:'Behúzás növelése',outdent:'Behúzás csökkentése',justify:{left:'Balra',center:'Középre',right:'Jobbra',block:'Sorkizárt'},blockquote:'Idézet blokk',clipboard:{title:'Beillesztés',cutError:'A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).',copyError:'A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).',pasteMsg:'Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.',securityMsg:'A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.',pasteArea:'Beszúrás mező'},pastefromword:{confirmCleanup:'Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)',toolbar:'Beillesztés Word-ből',title:'Beillesztés Word-ből',error:'Egy belső hiba miatt nem sikerült megtisztítani a szöveget'},pasteText:{button:'Beillesztés formázatlan szövegként',title:'Beillesztés formázatlan szövegként'},templates:{button:'Sablonok',title:'Elérhető sablonok',options:'Sablon opciók',insertOption:'Kicseréli a jelenlegi tartalmat',selectPromptMsg:'Válassza ki melyik sablon nyíljon meg a szerkesztőben<br>(a jelenlegi tartalom elveszik):',emptyListMsg:'(Nincs sablon megadva)'},showBlocks:'Blokkok megjelenítése',stylesCombo:{label:'Stílus',panelTitle:'Formázási stílusok',panelTitle1:'Blokk stílusok',panelTitle2:'Inline stílusok',panelTitle3:'Objektum stílusok'},format:{label:'Formátum',panelTitle:'Formátum',tag_p:'Normál',tag_pre:'Formázott',tag_address:'Címsor',tag_h1:'Fejléc 1',tag_h2:'Fejléc 2',tag_h3:'Fejléc 3',tag_h4:'Fejléc 4',tag_h5:'Fejléc 5',tag_h6:'Fejléc 6',tag_div:'Bekezdés (DIV)'},div:{title:'DIV tároló létrehozása',toolbar:'DIV tároló létrehozása',cssClassInputLabel:'Stíluslap osztály',styleSelectLabel:'Stílus',IdInputLabel:'Azonosító',languageCodeInputLabel:' Nyelv kódja',inlineStyleInputLabel:'Inline stílus',advisoryTitleInputLabel:'Tipp szöveg',langDirLabel:'Nyelvi irány',langDirLTRLabel:'Balról jobbra (LTR)',langDirRTLLabel:'Jobbról balra (RTL)',edit:'DIV szerkesztése',remove:'DIV eltávolítása'},iframe:{title:'IFrame Tulajdonságok',toolbar:'IFrame',noUrl:'Kérem írja be a iframe URL-t',scrolling:'Gördítősáv bekapcsolása',border:'Legyen keret'},font:{label:'Betűtípus',voiceLabel:'Betűtípus',panelTitle:'Betűtípus'},fontSize:{label:'Méret',voiceLabel:'Betűméret',panelTitle:'Méret'},colorButton:{textColorTitle:'Betűszín',bgColorTitle:'Háttérszín',panelTitle:'Színek',auto:'Automatikus',more:'További színek...'},colors:{'000':'Fekete',800000:'Bordó','8B4513':'Barna','2F4F4F':'Sötét türkiz','008080':'Türkiz','000080':'Király kék','4B0082':'Indigó kék',696969:'Szürke',B22222:'Tégla vörös',A52A2A:'Vörös',DAA520:'Arany sárga','006400':'Sötét zöld','40E0D0':'Türkiz','0000CD':'Kék',800080:'Lila',808080:'Szürke',F00:'Piros',FF8C00:'Sötét narancs',FFD700:'Arany','008000':'Zöld','0FF':'Türkiz','00F':'Kék',EE82EE:'Rózsaszín',A9A9A9:'Sötét szürke',FFA07A:'Lazac',FFA500:'Narancs',FFFF00:'Citromsárga','00FF00':'Neon zöld',AFEEEE:'Világos türkiz',ADD8E6:'Világos kék',DDA0DD:'Világos lila',D3D3D3:'Világos szürke',FFF0F5:'Lavender Blush',FAEBD7:'Törtfehér',FFFFE0:'Világos sárga',F0FFF0:'Menta',F0FFFF:'Azúr kék',F0F8FF:'Halvány kék',E6E6FA:'Lavender',FFF:'Fehér'},scayt:{title:'Helyesírás ellenőrzés gépelés közben',opera_title:'Az Opera nem támogatja',enable:'SCAYT engedélyezése',disable:'SCAYT letiltása',about:'SCAYT névjegy',toggle:'SCAYT kapcsolása',options:'Beállítások',langs:'Nyelvek',moreSuggestions:'További javaslatok',ignore:'Kihagy',ignoreAll:'Összes kihagyása',addWord:'Szó hozzáadása',emptyDic:'A szótár nevét meg kell adni.',noSuggestions:'Nincs javaslat',optionsTab:'Beállítások',allCaps:'Nagybetűs szavak kihagyása',ignoreDomainNames:'Domain nevek kihagyása',mixedCase:'Kis és nagybetűt is tartalmazó szavak kihagyása',mixedWithDigits:'Számokat tartalmazó szavak kihagyása',languagesTab:'Nyelvek',dictionariesTab:'Szótár',dic_field_name:'Szótár neve',dic_create:'Létrehozás',dic_restore:'Visszaállítás',dic_delete:'Törlés',dic_rename:'�tnevezés',dic_info:'Kezdetben a felhasználói szótár böngésző sütiben tárolódik. Azonban a sütik maximális mérete korlátozott. Amikora a szótár akkora lesz, hogy már sütiben nem lehet tárolni, akkor a szótárat tárolhatja a szerveren is. Ehhez egy nevet kell megadni a szótárhoz. Amennyiben már van szerveren tárolt szótára, adja meg a nevét és kattintson a visszaállítás gombra.',aboutTab:'Névjegy'},about:{title:'CKEditor névjegy',dlgTitle:'CKEditor névjegy',help:'Itt találsz segítséget: $1',userGuide:'CKEditor Felhasználói útmutató',moreInfo:'Licenszelési információkért kérjük látogassa meg weboldalunkat:',copy:'Copyright &copy; $1. Minden jog fenntartva.'},maximize:'Teljes méret',minimize:'Kis méret',fakeobjects:{anchor:'Horgony',flash:'Flash animáció',iframe:'IFrame',hiddenfield:'Rejtett mezõ',unknown:'Ismeretlen objektum'},resize:'Húzza az átméretezéshez',colordialog:{title:'Válasszon színt',options:'Szín opciók',highlight:'Nagyítás',selected:'Kiválasztott',clear:'Ürítés'},toolbarCollapse:'Eszköztár összecsukása',toolbarExpand:'Eszköztár szétnyitása',toolbarGroups:{document:'Dokumentum',clipboard:'Vágólap/Visszavonás',editing:'Szerkesztés',forms:'Űrlapok',basicstyles:'Alapstílusok',paragraph:'Bekezdés',links:'Hivatkozások',insert:'Beszúrás',styles:'Stílusok',colors:'Színek',tools:'Eszközök'},bidi:{ltr:'Szöveg iránya balról jobbra',rtl:'Szöveg iránya jobbról balra'},docprops:{label:'Dokumentum tulajdonságai',title:'Dokumentum tulajdonságai',design:'Design',meta:'Meta adatok',chooseColor:'Válasszon',other:'<más>',docTitle:'Oldalcím',charset:'Karakterkódolás',charsetOther:'Más karakterkódolás',charsetASCII:'ASCII',charsetCE:'Közép-Európai',charsetCT:'Kínai Tradicionális (Big5)',charsetCR:'Cyrill',charsetGR:'Görög',charsetJP:'Japán',charsetKR:'Koreai',charsetTR:'Török',charsetUN:'Unicode (UTF-8)',charsetWE:'Nyugat-Európai',docType:'Dokumentum típus fejléc',docTypeOther:'Más dokumentum típus fejléc',xhtmlDec:'XHTML deklarációk beillesztése',bgColor:'Háttérszín',bgImage:'Háttérkép cím',bgFixed:'Nem gördíthető háttér',txtColor:'Betűszín',margin:'Oldal margók',marginTop:'Felső',marginLeft:'Bal',marginRight:'Jobb',marginBottom:'Alsó',metaKeywords:'Dokumentum keresőszavak (vesszővel elválasztva)',metaDescription:'Dokumentum leírás',metaAuthor:'Szerző',metaCopyright:'Szerzői jog',previewHtml:'<p>Ez itt egy <strong>példa</strong>. A <a href="javascript:void(0)">CKEditor</a>-t használod.</p>'}};
diff --git a/web/imcms/ckeditor/lang/id.js b/web/imcms/ckeditor/lang/id.js
new file mode 100644
index 0000000000..df564e6051
--- /dev/null
+++ b/web/imcms/ckeditor/lang/id.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.id={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Alignment',alignLeft:'Left',alignRight:'Right',alignCenter:'Center',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background color',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Center',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Color',bgColorTitle:'Background Color',panelTitle:'Colors',auto:'Automatic',more:'More Colors...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/is.js b/web/imcms/ckeditor/lang/is.js
new file mode 100644
index 0000000000..8ecb360df2
--- /dev/null
+++ b/web/imcms/ckeditor/lang/is.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.is={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kóði',newPage:'Ný síða',save:'Vista',preview:'Forskoða',cut:'Klippa',copy:'Afrita',paste:'Líma',print:'Prenta',underline:'Undirstrikað',bold:'Feitletrað',italic:'Skáletrað',selectAll:'Velja allt',removeFormat:'Fjarlægja snið',strike:'Yfirstrikað',subscript:'Niðurskrifað',superscript:'Uppskrifað',horizontalrule:'Lóðrétt lína',pagebreak:'Setja inn síðuskil',pagebreakAlt:'Page Break',unlink:'Fjarlægja stiklu',undo:'Afturkalla',redo:'Hætta við afturköllun',common:{browseServer:'Fletta í skjalasafni',url:'Vefslóð',protocol:'Samskiptastaðall',upload:'Senda upp',uploadSubmit:'Hlaða upp',image:'Setja inn mynd',flash:'Flash',form:'Setja inn innsláttarform',checkbox:'Setja inn hökunarreit',radio:'Setja inn valhnapp',textField:'Setja inn textareit',textarea:'Setja inn textasvæði',hiddenField:'Setja inn falið svæði',button:'Setja inn hnapp',select:'Setja inn lista',imageButton:'Setja inn myndahnapp',notSet:'<ekkert valið>',id:'Auðkenni',name:'Nafn',langDir:'Lesstefna',langDirLtr:'Frá vinstri til hægri (LTR)',langDirRtl:'Frá hægri til vinstri (RTL)',langCode:'Tungumálakóði',longDescr:'Nánari lýsing',cssClass:'Stílsniðsflokkur',advisoryTitle:'Titill',cssStyle:'Stíll',ok:'� lagi',cancel:'Hætta við',close:'Close',preview:'Preview',generalTab:'Almennt',advancedTab:'Tæknilegt',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Breidd',height:'Hæð',align:'Jöfnun',alignLeft:'Vinstri',alignRight:'Hægri',alignCenter:'Miðjað',alignTop:'Efst',alignMiddle:'Miðjuð',alignBottom:'Neðst',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Setja inn merki',title:'Velja tákn',options:'Special Character Options'},link:{toolbar:'Stofna/breyta stiklu',other:'<annar>',menu:'Breyta stiklu',title:'Stikla',info:'Almennt',target:'Mark',upload:'Senda upp',advanced:'Tæknilegt',type:'Stikluflokkur',toUrl:'URL',toAnchor:'Bókamerki á þessari síðu',toEmail:'Netfang',targetFrame:'<rammi>',targetPopup:'<sprettigluggi>',targetFrameName:'Nafn markglugga',targetPopupName:'Nafn sprettiglugga',popupFeatures:'Eigindi sprettiglugga',popupResizable:'Resizable',popupStatusBar:'Stöðustika',popupLocationBar:'Fanglína',popupToolbar:'Verkfærastika',popupMenuBar:'Vallína',popupFullScreen:'Heilskjár (IE)',popupScrollBars:'Skrunstikur',popupDependent:'Háð venslum (Netscape)',popupLeft:'Fjarlægð frá vinstri',popupTop:'Fjarlægð frá efri brún',id:'Id',langDir:'Lesstefna',langDirLTR:'Frá vinstri til hægri (LTR)',langDirRTL:'Frá hægri til vinstri (RTL)',acccessKey:'Skammvalshnappur',name:'Nafn',langCode:'Lesstefna',tabIndex:'Raðnúmer innsláttarreits',advisoryTitle:'Titill',advisoryContentType:'Tegund innihalds',cssClasses:'Stílsniðsflokkur',charset:'Táknróf',styles:'Stíll',rel:'Relationship',selectAnchor:'Veldu akkeri',anchorName:'Eftir akkerisnafni',anchorId:'Eftir auðkenni einingar',emailAddress:'Netfang',emailSubject:'Efni',emailBody:'Meginmál',noAnchors:'<Engin bókamerki á skrá>',noUrl:'Sláðu inn veffang stiklunnar!',noEmail:'Sláðu inn netfang!'},anchor:{toolbar:'Stofna/breyta kaflamerki',menu:'Eigindi kaflamerkis',title:'Eigindi kaflamerkis',name:'Nafn bókamerkis',errorName:'Sláðu inn nafn bókamerkis!',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Finna og skipta',find:'Leita',replace:'Skipta út',findWhat:'Leita að:',replaceWith:'Skipta út fyrir:',notFoundMsg:'Leitartexti fannst ekki!',findOptions:'Find Options',matchCase:'Gera greinarmun á¡ há¡- og lágstöfum',matchWord:'Aðeins heil orð',matchCyclic:'Match cyclic',replaceAll:'Skipta út allsstaðar',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tafla',title:'Eigindi töflu',menu:'Eigindi töflu',deleteTable:'Fella töflu',rows:'Raðir',columns:'Dálkar',border:'Breidd ramma',widthPx:'myndeindir',widthPc:'prósent',widthUnit:'width unit',cellSpace:'Bil milli reita',cellPad:'Reitaspássía',caption:'Titill',summary:'�fram',headers:'Fyrirsagnir',headersNone:'Engar',headersColumn:'Fyrsti dálkur',headersRow:'Fyrsta röð',headersBoth:'Hvort tveggja',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Reitur',insertBefore:'Skjóta inn reiti fyrir aftan',insertAfter:'Skjóta inn reiti fyrir framan',deleteCell:'Fella reit',merge:'Sameina reiti',mergeRight:'Sameina til hægri',mergeDown:'Sameina niður á við',splitHorizontal:'Kljúfa reit lárétt',splitVertical:'Kljúfa reit lóðrétt',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Röð',insertBefore:'Skjóta inn röð fyrir ofan',insertAfter:'Skjóta inn röð fyrir neðan',deleteRow:'Eyða röð'},column:{menu:'Dálkur',insertBefore:'Skjóta inn dálki vinstra megin',insertAfter:'Skjóta inn dálki hægra megin',deleteColumn:'Fella dálk'}},button:{title:'Eigindi hnapps',text:'Texti',type:'Gerð',typeBtn:'Hnappur',typeSbm:'Staðfesta',typeRst:'Hreinsa'},checkboxAndRadio:{checkboxTitle:'Eigindi markreits',radioTitle:'Eigindi valhnapps',value:'Gildi',selected:'Valið'},form:{title:'Eigindi innsláttarforms',menu:'Eigindi innsláttarforms',action:'Aðgerð',method:'Aðferð',encoding:'Encoding'},select:{title:'Eigindi lista',selectInfo:'Upplýsingar',opAvail:'Kostir',value:'Gildi',size:'Stærð',lines:'línur',chkMulti:'Leyfa fleiri kosti',opText:'Texti',opValue:'Gildi',btnAdd:'Bæta við',btnModify:'Breyta',btnUp:'Upp',btnDown:'Niður',btnSetValue:'Merkja sem valið',btnDelete:'Eyða'},textarea:{title:'Eigindi textasvæðis',cols:'Dálkar',rows:'Línur'},textfield:{title:'Eigindi textareits',name:'Nafn',value:'Gildi',charWidth:'Breidd (leturtákn)',maxChars:'Hámarksfjöldi leturtákna',type:'Gerð',typeText:'Texti',typePass:'Lykilorð'},hidden:{title:'Eigindi falins svæðis',name:'Nafn',value:'Gildi'},image:{title:'Eigindi myndar',titleButton:'Eigindi myndahnapps',menu:'Eigindi myndar',infoTab:'Almennt',btnUpload:'Hlaða upp',upload:'Hlaða upp',alt:'Baklægur texti',lockRatio:'Festa stærðarhlutfall',resetSize:'Reikna stærð',border:'Rammi',hSpace:'Vinstri bil',vSpace:'Hægri bil',alertUrl:'Sláðu inn slóðina að myndinni',linkTab:'Stikla',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Eigindi Flash',propertiesTab:'Properties',title:'Eigindi Flash',chkPlay:'Sjálfvirk spilun',chkLoop:'Endurtekning',chkMenu:'Sýna Flash-valmynd',chkFull:'Allow Fullscreen',scale:'Skali',scaleAll:'Sýna allt',scaleNoBorder:'�n ramma',scaleFit:'Fella skala að stærð',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs neðst',alignAbsMiddle:'Abs miðjuð',alignBaseline:'Grunnlína',alignTextTop:'Efri brún texta',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Bakgrunnslitur',hSpace:'Vinstri bil',vSpace:'Hægri bil',validateSrc:'Sláðu inn veffang stiklunnar!',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Villuleit',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Ekki í orðabókinni',changeTo:'Tillaga',btnIgnore:'Hunsa',btnIgnoreAll:'Hunsa allt',btnReplace:'Skipta',btnReplaceAll:'Skipta öllu',btnUndo:'Til baka',noSuggestions:'- engar tillögur -',progress:'Villuleit í gangi...',noMispell:'Villuleit lokið: Engin villa fannst',noChanges:'Villuleit lokið: Engu orði breytt',oneChange:'Villuleit lokið: Einu orði breytt',manyChanges:'Villuleit lokið: %1 orðum breytt',ieSpellDownload:'Villuleit ekki sett upp.<br>Viltu setja hana upp?'},smiley:{toolbar:'Svipur',title:'Velja svip',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Númeraður listi',bulletedlist:'Punktalisti',indent:'Minnka inndrátt',outdent:'Auka inndrátt',justify:{left:'Vinstrijöfnun',center:'Miðja texta',right:'Hægrijöfnun',block:'Jafna báðum megin'},blockquote:'Inndráttur',clipboard:{title:'Líma',cutError:'Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).',copyError:'Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).',pasteMsg:'Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.',securityMsg:'Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Líma úr Word',title:'Líma úr Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Líma sem ósniðinn texta',title:'Líma sem ósniðinn texta'},templates:{button:'Sniðmát',title:'Innihaldssniðmát',options:'Template Options',insertOption:'Skipta út raunverulegu innihaldi',selectPromptMsg:'Veldu sniðmát til að opna í ritlinum.<br>(Núverandi innihald víkur fyrir því!):',emptyListMsg:'(Ekkert sniðmát er skilgreint!)'},showBlocks:'Sýna blokkir',stylesCombo:{label:'Stílflokkur',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Stílsnið',panelTitle:'Stílsnið',tag_p:'Venjulegt letur',tag_pre:'Forsniðið',tag_address:'Vistfang',tag_h1:'Fyrirsögn 1',tag_h2:'Fyrirsögn 2',tag_h3:'Fyrirsögn 3',tag_h4:'Fyrirsögn 4',tag_h5:'Fyrirsögn 5',tag_h6:'Fyrirsögn 6',tag_div:'Venjulegt (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Leturgerð ',voiceLabel:'Font',panelTitle:'Leturgerð '},fontSize:{label:'Leturstærð ',voiceLabel:'Font Size',panelTitle:'Leturstærð '},colorButton:{textColorTitle:'Litur texta',bgColorTitle:'Bakgrunnslitur',panelTitle:'Colors',auto:'Sjálfval',more:'Fleiri liti...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'engar tillögur',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Eigindi skjals',title:'Eigindi skjals',design:'Design',meta:'Lýsigögn',chooseColor:'Choose',other:'<annar>',docTitle:'Titill síðu',charset:'Letursett',charsetOther:'Annað letursett',charsetASCII:'ASCII',charsetCE:'Mið-evrópskt',charsetCT:'Kínverskt, hefðbundið (Big5)',charsetCR:'Kýrilskt',charsetGR:'Grískt',charsetJP:'Japanskt',charsetKR:'Kóreskt',charsetTR:'Tyrkneskt',charsetUN:'Unicode (UTF-8)',charsetWE:'Vestur-evrópst',docType:'Flokkur skjalategunda',docTypeOther:'Annar flokkur skjalategunda',xhtmlDec:'Fella inn XHTML lýsingu',bgColor:'Bakgrunnslitur',bgImage:'Slóð bakgrunnsmyndar',bgFixed:'Læstur bakgrunnur',txtColor:'Litur texta',margin:'Hliðarspássía',marginTop:'Efst',marginLeft:'Vinstri',marginRight:'Hægri',marginBottom:'Neðst',metaKeywords:'Lykilorð efnisorðaskrár (aðgreind með kommum)',metaDescription:'Lýsing skjals',metaAuthor:'Höfundur',metaCopyright:'Höfundarréttur',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/it.js b/web/imcms/ckeditor/lang/it.js
new file mode 100644
index 0000000000..c46d53a42c
--- /dev/null
+++ b/web/imcms/ckeditor/lang/it.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.it={dir:'ltr',editorTitle:'Editor di testo Rich Text, %1',editorHelp:'Premi ALT 0 per aiuto',toolbars:'Editor toolbar',editor:'Rich Text Editor',source:'Codice Sorgente',newPage:'Nuova pagina vuota',save:'Salva',preview:'Anteprima',cut:'Taglia',copy:'Copia',paste:'Incolla',print:'Stampa',underline:'Sottolineato',bold:'Grassetto',italic:'Corsivo',selectAll:'Seleziona tutto',removeFormat:'Elimina formattazione',strike:'Barrato',subscript:'Pedice',superscript:'Apice',horizontalrule:'Inserisci riga orizzontale',pagebreak:'Inserisci interruzione di pagina',pagebreakAlt:'Interruzione di pagina',unlink:'Elimina collegamento',undo:'Annulla',redo:'Ripristina',common:{browseServer:'Cerca sul server',url:'URL',protocol:'Protocollo',upload:'Carica',uploadSubmit:'Invia al server',image:'Immagine',flash:'Oggetto Flash',form:'Modulo',checkbox:'Checkbox',radio:'Radio Button',textField:'Campo di testo',textarea:'Area di testo',hiddenField:'Campo nascosto',button:'Bottone',select:'Menu di selezione',imageButton:'Bottone immagine',notSet:'<non impostato>',id:'Id',name:'Nome',langDir:'Direzione scrittura',langDirLtr:'Da Sinistra a Destra (LTR)',langDirRtl:'Da Destra a Sinistra (RTL)',langCode:'Codice Lingua',longDescr:'URL descrizione estesa',cssClass:'Nome classe CSS',advisoryTitle:'Titolo',cssStyle:'Stile',ok:'OK',cancel:'Annulla',close:'Chiudi',preview:'Anteprima',generalTab:'Generale',advancedTab:'Avanzate',validateNumberFailed:'Il valore inserito non è un numero.',confirmNewPage:'Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?',confirmCancel:'Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?',options:'Opzioni',target:'Destinazione',targetNew:'Nuova finestra (_blank)',targetTop:'Finestra in primo piano (_top)',targetSelf:'Stessa finestra (_self)',targetParent:'Finestra Padre (_parent)',langDirLTR:'Da sinistra a destra (LTR)',langDirRTL:'Da destra a sinistra (RTL)',styles:'Stile',cssClasses:'Classi di stile',width:'Larghezza',height:'Altezza',align:'Allineamento',alignLeft:'Sinistra',alignRight:'Destra',alignCenter:'Centrato',alignTop:'In Alto',alignMiddle:'Centrato',alignBottom:'In Basso',invalidValue:'Valore non valido.',invalidHeight:"L'altezza dev'essere un numero",invalidWidth:"La Larghezza dev'essere un numero",invalidCssLength:'Il valore indicato per il campo "%1" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).',invalidHtmlLength:'Il valore indicato per il campo "%1" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).',invalidInlineStyle:'Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di "name : value", separati da semicolonne.',cssLengthTooltip:'Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).',unavailable:'%1<span class="cke_accessibility">, non disponibile</span>'},contextmenu:{options:'Opzioni del menù contestuale'},specialChar:{toolbar:'Inserisci carattere speciale',title:'Seleziona carattere speciale',options:'Opzioni carattere speciale'},link:{toolbar:'Inserisci/Modifica collegamento',other:'<altro>',menu:'Modifica collegamento',title:'Collegamento',info:'Informazioni collegamento',target:'Destinazione',upload:'Carica',advanced:'Avanzate',type:'Tipo di Collegamento',toUrl:'URL',toAnchor:'Ancora nella pagina',toEmail:'E-Mail',targetFrame:'<riquadro>',targetPopup:'<finestra popup>',targetFrameName:'Nome del riquadro di destinazione',targetPopupName:'Nome finestra popup',popupFeatures:'Caratteristiche finestra popup',popupResizable:'Ridimensionabile',popupStatusBar:'Barra di stato',popupLocationBar:'Barra degli indirizzi',popupToolbar:'Barra degli strumenti',popupMenuBar:'Barra del menu',popupFullScreen:'A tutto schermo (IE)',popupScrollBars:'Barre di scorrimento',popupDependent:'Dipendente (Netscape)',popupLeft:'Posizione da sinistra',popupTop:"Posizione dall'alto",id:'Id',langDir:'Direzione scrittura',langDirLTR:'Da Sinistra a Destra (LTR)',langDirRTL:'Da Destra a Sinistra (RTL)',acccessKey:'Scorciatoia<br />da tastiera',name:'Nome',langCode:'Direzione scrittura',tabIndex:'Ordine di tabulazione',advisoryTitle:'Titolo',advisoryContentType:'Tipo della risorsa collegata',cssClasses:'Nome classe CSS',charset:'Set di caretteri della risorsa collegata',styles:'Stile',rel:'Relazioni',selectAnchor:'Scegli Ancora',anchorName:'Per Nome',anchorId:'Per id elemento',emailAddress:'Indirizzo E-Mail',emailSubject:'Oggetto del messaggio',emailBody:'Corpo del messaggio',noAnchors:'(Nessuna ancora disponibile nel documento)',noUrl:"Devi inserire l'URL del collegamento",noEmail:"Devi inserire un'indirizzo e-mail"},anchor:{toolbar:'Inserisci/Modifica Ancora',menu:'Proprietà ancora',title:'Proprietà ancora',name:'Nome ancora',errorName:"Inserici il nome dell'ancora",remove:"Rimuovi l'ancora"},list:{numberedTitle:'Proprietà liste numerate',bulletedTitle:'Proprietà liste puntate',type:'Tipo',start:'Inizio',validateStartNumber:'Il numero di inizio di una lista numerata deve essere un numero intero.',circle:'Cerchio',disc:'Disco',square:'Quadrato',none:'Nessuno',notset:'<non impostato>',armenian:'Numerazione Armena',georgian:'Numerazione Georgiana (an, ban, gan, ecc.)',lowerRoman:'Numerazione Romana minuscola (i, ii, iii, iv, v, ecc.)',upperRoman:'Numerazione Romana maiuscola (I, II, III, IV, V, ecc.)',lowerAlpha:'Alfabetico minuscolo (a, b, c, d, e, ecc.)',upperAlpha:'Alfabetico maiuscolo (A, B, C, D, E, ecc.)',lowerGreek:'Greco minuscolo (alpha, beta, gamma, ecc.)',decimal:'Decimale (1, 2, 3, ecc.)',decimalLeadingZero:'Decimale preceduto da 0 (01, 02, 03, ecc.)'},findAndReplace:{title:'Cerca e Sostituisci',find:'Trova',replace:'Sostituisci',findWhat:'Trova:',replaceWith:'Sostituisci con:',notFoundMsg:"L'elemento cercato non è stato trovato.",findOptions:'Opzioni di ricerca',matchCase:'Maiuscole/minuscole',matchWord:'Solo parole intere',matchCyclic:'Ricerca ciclica',replaceAll:'Sostituisci tutto',replaceSuccessMsg:'%1 occorrenza(e) sostituite.'},table:{toolbar:'Tabella',title:'Proprietà tabella',menu:'Proprietà tabella',deleteTable:'Cancella Tabella',rows:'Righe',columns:'Colonne',border:'Dimensione bordo',widthPx:'pixel',widthPc:'percento',widthUnit:'unità larghezza',cellSpace:'Spaziatura celle',cellPad:'Padding celle',caption:'Intestazione',summary:'Indice',headers:'Intestazione',headersNone:'Nessuna',headersColumn:'Prima Colonna',headersRow:'Prima Riga',headersBoth:'Entrambe',invalidRows:"Il numero di righe dev'essere un numero maggiore di 0.",invalidCols:"Il numero di colonne dev'essere un numero maggiore di 0.",invalidBorder:"La dimensione del bordo dev'essere un numero.",invalidWidth:"La larghezza della tabella dev'essere un numero.",invalidHeight:"L'altezza della tabella dev'essere un numero.",invalidCellSpacing:"La spaziatura tra le celle dev'essere un numero.",invalidCellPadding:"Il paging delle celle dev'essere un numero",cell:{menu:'Cella',insertBefore:'Inserisci Cella Prima',insertAfter:'Inserisci Cella Dopo',deleteCell:'Elimina celle',merge:'Unisce celle',mergeRight:'Unisci a Destra',mergeDown:'Unisci in Basso',splitHorizontal:'Dividi Cella Orizzontalmente',splitVertical:'Dividi Cella Verticalmente',title:'Proprietà della cella',cellType:'Tipo di cella',rowSpan:'Su più righe',colSpan:'Su più colonne',wordWrap:'Ritorno a capo',hAlign:'Allineamento orizzontale',vAlign:'Allineamento verticale',alignBaseline:'Linea Base',bgColor:'Colore di Sfondo',borderColor:'Colore del Bordo',data:'Dati',header:'Intestazione',yes:'Si',no:'No',invalidWidth:"La larghezza della cella dev'essere un numero.",invalidHeight:"L'altezza della cella dev'essere un numero.",invalidRowSpan:"Il numero di righe dev'essere un numero intero.",invalidColSpan:"Il numero di colonne dev'essere un numero intero.",chooseColor:'Scegli'},row:{menu:'Riga',insertBefore:'Inserisci Riga Prima',insertAfter:'Inserisci Riga Dopo',deleteRow:'Elimina righe'},column:{menu:'Colonna',insertBefore:'Inserisci Colonna Prima',insertAfter:'Inserisci Colonna Dopo',deleteColumn:'Elimina colonne'}},button:{title:'Proprietà bottone',text:'Testo (Valore)',type:'Tipo',typeBtn:'Bottone',typeSbm:'Invio',typeRst:'Annulla'},checkboxAndRadio:{checkboxTitle:'Proprietà checkbox',radioTitle:'Proprietà radio button',value:'Valore',selected:'Selezionato'},form:{title:'Proprietà modulo',menu:'Proprietà modulo',action:'Azione',method:'Metodo',encoding:'Codifica'},select:{title:'Proprietà menu di selezione',selectInfo:'Info',opAvail:'Opzioni disponibili',value:'Valore',size:'Dimensione',lines:'righe',chkMulti:'Permetti selezione multipla',opText:'Testo',opValue:'Valore',btnAdd:'Aggiungi',btnModify:'Modifica',btnUp:'Su',btnDown:'Gi',btnSetValue:'Imposta come predefinito',btnDelete:'Rimuovi'},textarea:{title:'Proprietà area di testo',cols:'Colonne',rows:'Righe'},textfield:{title:'Proprietà campo di testo',name:'Nome',value:'Valore',charWidth:'Larghezza',maxChars:'Numero massimo di caratteri',type:'Tipo',typeText:'Testo',typePass:'Password'},hidden:{title:'Proprietà campo nascosto',name:'Nome',value:'Valore'},image:{title:'Proprietà immagine',titleButton:'Proprietà bottone immagine',menu:'Proprietà immagine',infoTab:'Informazioni immagine',btnUpload:'Invia al server',upload:'Carica',alt:'Testo alternativo',lockRatio:'Blocca rapporto',resetSize:'Reimposta dimensione',border:'Bordo',hSpace:'HSpace',vSpace:'VSpace',alertUrl:"Devi inserire l'URL per l'immagine",linkTab:'Collegamento',button2Img:"Vuoi trasformare il bottone immagine selezionato in un'immagine semplice?",img2Button:"Vuoi trasferomare l'immagine selezionata in un bottone immagine?",urlMissing:"Manca l'URL dell'immagine.",validateBorder:'Il campo Bordo deve essere un numero intero.',validateHSpace:'Il campo HSpace deve essere un numero intero.',validateVSpace:'Il campo VSpace deve essere un numero intero.'},flash:{properties:'Proprietà Oggetto Flash',propertiesTab:'Proprietà',title:'Proprietà Oggetto Flash',chkPlay:'Avvio Automatico',chkLoop:'Riavvio automatico',chkMenu:'Abilita Menu di Flash',chkFull:'Permetti la modalità tutto schermo',scale:'Ridimensiona',scaleAll:'Mostra Tutto',scaleNoBorder:'Senza Bordo',scaleFit:'Dimensione Esatta',access:'Accesso Script',accessAlways:'Sempre',accessSameDomain:'Solo stesso dominio',accessNever:'Mai',alignAbsBottom:'In basso assoluto',alignAbsMiddle:'Centrato assoluto',alignBaseline:'Linea base',alignTextTop:'In alto al testo',quality:'Qualità',qualityBest:'Massima',qualityHigh:'Alta',qualityAutoHigh:'Alta Automatica',qualityMedium:'Intermedia',qualityAutoLow:'Bassa Automatica',qualityLow:'Bassa',windowModeWindow:'Finestra',windowModeOpaque:'Opaca',windowModeTransparent:'Trasparente',windowMode:'Modalità finestra',flashvars:'Variabili per Flash',bgcolor:'Colore sfondo',hSpace:'HSpace',vSpace:'VSpace',validateSrc:"Devi inserire l'URL del collegamento",validateHSpace:"L'HSpace dev'essere un numero.",validateVSpace:"Il VSpace dev'essere un numero."},spellCheck:{toolbar:'Correttore ortografico',title:'Controllo ortografico',notAvailable:'Il servizio non è momentaneamente disponibile.',errorLoading:"Errore nel caricamento dell'host col servizio applicativo: %s.",notInDic:'Non nel dizionario',changeTo:'Cambia in',btnIgnore:'Ignora',btnIgnoreAll:'Ignora tutto',btnReplace:'Cambia',btnReplaceAll:'Cambia tutto',btnUndo:'Annulla',noSuggestions:'- Nessun suggerimento -',progress:'Controllo ortografico in corso',noMispell:'Controllo ortografico completato: nessun errore trovato',noChanges:'Controllo ortografico completato: nessuna parola cambiata',oneChange:'Controllo ortografico completato: 1 parola cambiata',manyChanges:'Controllo ortografico completato: %1 parole cambiate',ieSpellDownload:'Contollo ortografico non installato. Lo vuoi scaricare ora?'},smiley:{toolbar:'Emoticon',title:'Inserisci emoticon',options:'Opzioni Smiley'},elementsPath:{eleLabel:'Percorso degli elementi',eleTitle:'%1 elemento'},numberedlist:'Elenco numerato',bulletedlist:'Elenco puntato',indent:'Aumenta rientro',outdent:'Riduci rientro',justify:{left:'Allinea a sinistra',center:'Centra',right:'Allinea a destra',block:'Giustifica'},blockquote:'Citazione',clipboard:{title:'Incolla',cutError:'Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).',copyError:'Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).',pasteMsg:"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.",securityMsg:"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.",pasteArea:'Incolla'},pastefromword:{confirmCleanup:'Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?',toolbar:'Incolla da Word',title:'Incolla da Word',error:'Non è stato possibile eliminarre il testo incollato a causa di un errore interno.'},pasteText:{button:'Incolla come testo semplice',title:'Incolla come testo semplice'},templates:{button:'Modelli',title:'Contenuto dei modelli',options:'Opzioni del Modello',insertOption:'Cancella il contenuto corrente',selectPromptMsg:"Seleziona il modello da aprire nell'editor<br />(il contenuto attuale verrà eliminato):",emptyListMsg:'(Nessun modello definito)'},showBlocks:'Visualizza Blocchi',stylesCombo:{label:'Stile',panelTitle:'Stili di formattazione',panelTitle1:'Stili per blocchi',panelTitle2:'Stili in linea',panelTitle3:'Stili per oggetti'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normale',tag_pre:'Formattato',tag_address:'Indirizzo',tag_h1:'Titolo 1',tag_h2:'Titolo 2',tag_h3:'Titolo 3',tag_h4:'Titolo 4',tag_h5:'Titolo 5',tag_h6:'Titolo 6',tag_div:'Paragrafo (DIV)'},div:{title:'Crea DIV contenitore',toolbar:'Crea DIV contenitore',cssClassInputLabel:'Classi di stile',styleSelectLabel:'Stile',IdInputLabel:'Id',languageCodeInputLabel:'Codice lingua',inlineStyleInputLabel:'Stile Inline',advisoryTitleInputLabel:'Titolo Avviso',langDirLabel:'Direzione di scrittura',langDirLTRLabel:'Da sinistra a destra (LTR)',langDirRTLLabel:'Da destra a sinistra (RTL)',edit:'Modifica DIV',remove:'Rimuovi DIV'},iframe:{title:'Proprietà IFrame',toolbar:'IFrame',noUrl:"Inserire l'URL del campo IFrame",scrolling:'Abilita scrollbar',border:'Mostra il bordo'},font:{label:'Carattere',voiceLabel:'Carattere',panelTitle:'Carattere'},fontSize:{label:'Dimensione',voiceLabel:'Dimensione Carattere',panelTitle:'Dimensione'},colorButton:{textColorTitle:'Colore testo',bgColorTitle:'Colore sfondo',panelTitle:'Colori',auto:'Automatico',more:'Altri colori...'},colors:{'000':'Nero',800000:'Marrone Castagna','8B4513':'Marrone Cuoio','2F4F4F':'Grigio Fumo di Londra','008080':'Acquamarina','000080':'Blu Oceano','4B0082':'Indigo',696969:'Grigio Scuro',B22222:'Giallo Fiamma',A52A2A:'Marrone',DAA520:'Giallo Mimosa','006400':'Verde Scuro','40E0D0':'Turchese','0000CD':'Blue Scuro',800080:'Viola',808080:'Grigio',F00:'Rosso',FF8C00:'Arancio Scuro',FFD700:'Oro','008000':'Verde','0FF':'Ciano','00F':'Blu',EE82EE:'Violetto',A9A9A9:'Grigio Scuro',FFA07A:'Salmone',FFA500:'Arancio',FFFF00:'Giallo','00FF00':'Lime',AFEEEE:'Turchese Chiaro',ADD8E6:'Blu Chiaro',DDA0DD:'Rosso Ciliegia',D3D3D3:'Grigio Chiaro',FFF0F5:'Lavanda Chiara',FAEBD7:'Bianco Antico',FFFFE0:'Giallo Chiaro',F0FFF0:'Verde Mela',F0FFFF:'Azzurro',F0F8FF:'Celeste',E6E6FA:'Lavanda',FFF:'Bianco'},scayt:{title:'Controllo Ortografico Mentre Scrivi',opera_title:'Non supportato da Opera',enable:'Abilita COMS',disable:'Disabilita COMS',about:'About COMS',toggle:'Inverti abilitazione SCOMS',options:'Opzioni',langs:'Lingue',moreSuggestions:'Altri suggerimenti',ignore:'Ignora',ignoreAll:'Ignora tutti',addWord:'Aggiungi Parola',emptyDic:'Il nome del dizionario non può essere vuoto.',noSuggestions:'Nessun suggerimento',optionsTab:'Opzioni',allCaps:'Ignora Parole in maiuscolo',ignoreDomainNames:'Ignora nomi di dominio',mixedCase:'Ignora parole con maiuscole e minuscole',mixedWithDigits:'Ignora parole con numeri',languagesTab:'Lingue',dictionariesTab:'Dizionari',dic_field_name:'Nome del dizionario',dic_create:'Crea',dic_restore:'Ripristina',dic_delete:'Cancella',dic_rename:'Rinomina',dic_info:'Inizialmente il dizionario utente è memorizzato in un Cookie. I Cookie però hanno una dimensioni massima limitata. Quando il dizionario utente creasce a tal punto da non poter più essere memorizzato in un Cookie, allora il dizionario può essere memorizzato sul nostro server. Per memorizzare il proprio dizionario personale sul nostro server, è necessario specificare un nome per il proprio dizionario. Se avete già memorizzato un dizionario, inserite il nome che gli avete dato e premete il pulsante Ripristina.',aboutTab:'Info'},about:{title:'Riguardo CKEditor',dlgTitle:'Riguardo CKEditor',help:"Vedi $1 per l'aiuto.",userGuide:'Guida Utente CKEditor',moreInfo:'Per le informazioni sulla licenza si prega di visitare il nostro sito:',copy:'Copyright &copy; $1. Tutti i diritti riservati.'},maximize:'Massimizza',minimize:'Minimizza',fakeobjects:{anchor:'Ancora',flash:'Animazione Flash',iframe:'IFrame',hiddenfield:'Campo Nascosto',unknown:'Oggetto sconosciuto'},resize:'Trascina per ridimensionare',colordialog:{title:'Selezionare il colore',options:'Opzioni colore',highlight:'Evidenzia',selected:'Seleziona il colore',clear:'cancella'},toolbarCollapse:'Minimizza Toolbar',toolbarExpand:'Espandi Toolbar',toolbarGroups:{document:'Documento',clipboard:'Copia negli appunti/Indietro',editing:'Modifica',forms:'Form',basicstyles:'Stili di base',paragraph:'Paragrafo',links:'Link',insert:'Inserisci',styles:'Stili',colors:'Colori',tools:'Strumenti'},bidi:{ltr:'Direzione del testo da sinistra verso destra',rtl:'Direzione del testo da destra verso sinistra'},docprops:{label:'Proprietà del Documento',title:'Proprietà del Documento',design:'Disegna',meta:'Meta Data',chooseColor:'Scegli',other:'<altro>',docTitle:'Titolo pagina',charset:'Set di caretteri',charsetOther:'Altro set di caretteri',charsetASCII:'ASCII',charsetCE:'Europa Centrale',charsetCT:'Cinese Tradizionale (Big5)',charsetCR:'Cirillico',charsetGR:'Greco',charsetJP:'Giapponese',charsetKR:'Coreano',charsetTR:'Turco',charsetUN:'Unicode (UTF-8)',charsetWE:'Europa Occidentale',docType:'Intestazione DocType',docTypeOther:'Altra intestazione DocType',xhtmlDec:'Includi dichiarazione XHTML',bgColor:'Colore di sfondo',bgImage:'Immagine di sfondo',bgFixed:'Sfondo fissato',txtColor:'Colore testo',margin:'Margini',marginTop:'In Alto',marginLeft:'A Sinistra',marginRight:'A Destra',marginBottom:'In Basso',metaKeywords:'Chiavi di indicizzazione documento (separate da virgola)',metaDescription:'Descrizione documento',metaAuthor:'Autore',metaCopyright:'Copyright',previewHtml:'<p>Questo è un <strong>testo di esempio</strong>. State usando <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ja.js b/web/imcms/ckeditor/lang/ja.js
new file mode 100644
index 0000000000..0e80747be2
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ja.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ja={dir:'ltr',editorTitle:'リッ�テキストエディタ, %1',editorHelp:'ヘルプ� ALT 0 を押������',toolbars:'Editor toolbars',editor:'リッ�テキストエディタ',source:'ソース',newPage:'新��ページ',save:'�存',preview:'プレビュー',cut:'切り�り',copy:'コピー',paste:'貼り付�',print:'�刷',underline:'下線',bold:'太字',italic:'斜体',selectAll:'����択',removeFormat:'フォーマット削除',strike:'打�消�線',subscript:'添�字',superscript:'上付�文字',horizontalrule:'横罫線',pagebreak:'改ページ挿入',pagebreakAlt:'Page Break',unlink:'リンク削除',undo:'元�戻�',redo:'やり直�',common:{browseServer:'サー�ーブラウザー',url:'URL',protocol:'プロトコル',upload:'アップロード',uploadSubmit:'サー�ー��信',image:'イメージ',flash:'Flash',form:'フォーム',checkbox:'�ェックボックス',radio:'ラジオボタン',textField:'１行テキスト',textarea:'テキストエリア',hiddenField:'��視フィールド',button:'ボタン',select:'�択フィールド',imageButton:'画�ボタン',notSet:'<��>',id:'Id',name:'Name属性',langDir:'文字表記�方�',langDirLtr:'左�ら� (LTR)',langDirRtl:'��ら左 (RTL)',langCode:'言語コード',longDescr:'longdesc属性(長文説明)',cssClass:'スタイルシートクラス',advisoryTitle:'Title属性',cssStyle:'スタイルシート',ok:'OK',cancel:'キャンセル',close:'閉�る',preview:'プレビュー',generalTab:'全般',advancedTab:'高度�設定',validateNumberFailed:'値�数���り��ん',confirmNewPage:'変更内容を�存��� 新��ページを開��もよ�����ょ��？',confirmCancel:'オプション設定を変更����。ダイアログを閉��もよ�����ょ��？',options:'オプション',target:'ターゲット',targetNew:'新��ウィンドウ (_空白)',targetTop:'最上部ウィンドウ (_トップ)',targetSelf:'��ウィンドウ (_�一)',targetParent:'親ウィンドウ (_親)',langDirLTR:'左�ら� (LTR)',langDirRTL:'��ら左 (RTL)',styles:'スタイル',cssClasses:'スタイルシートクラス',width:'幅',height:'高�',align:'行��',alignLeft:'左',alignRight:'�',alignCenter:'中央',alignTop:'上',alignMiddle:'中央',alignBottom:'下',invalidValue:'Invalid value.',invalidHeight:'高��数値�入力������。',invalidWidth:'幅�数値�入力������。',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, 利用��能</span>'},contextmenu:{options:'コンテキストメニューオプション'},specialChar:{toolbar:'特殊文字挿入',title:'特殊文字�択',options:'特殊文字オプション'},link:{toolbar:'リンク挿入/編集',other:'<��他�>',menu:'リンク編集',title:'�イパーリンク',info:'�イパーリンク 情報',target:'ターゲット',upload:'アップロード',advanced:'高度�設定',type:'リンクタイプ',toUrl:'URL',toAnchor:'��ページ�アンカー',toEmail:'E-Mail',targetFrame:'<フレーム>',targetPopup:'<�ップアップウィンドウ>',targetFrameName:'目的�フレーム�',targetPopupName:'�ップアップウィンドウ�',popupFeatures:'�ップアップウィンドウ特徴',popupResizable:'サイズ�変',popupStatusBar:'ステータス�ー',popupLocationBar:'ロケーション�ー',popupToolbar:'ツール�ー',popupMenuBar:'メニュー�ー',popupFullScreen:'全画�モード(IE)',popupScrollBars:'スクロール�ー',popupDependent:'開��ウィンドウ�連動��閉�る (Netscape)',popupLeft:'左端�ら�座標�指定',popupTop:'上端�ら�座標�指定',id:'Id',langDir:'文字表記�方�',langDirLTR:'左�ら� (LTR)',langDirRTL:'��ら左 (RTL)',acccessKey:'アクセスキー',name:'Name属性',langCode:'言語コード',tabIndex:'タブインデックス',advisoryTitle:'Title属性',advisoryContentType:'Content Type属性',cssClasses:'スタイルシートクラス',charset:'リンクcharset属性',styles:'スタイルシート',rel:'Relationship',selectAnchor:'アンカーを�択',anchorName:'アンカー�',anchorId:'エレメントID',emailAddress:'E-Mail アドレス',emailSubject:'件�',emailBody:'本文',noAnchors:'(ドキュメント����利用�能�アンカー��り��ん。)',noUrl:'リンクURLを入力������。',noEmail:'メールアドレスを入力������。'},anchor:{toolbar:'アンカー挿入/編集',menu:'アンカー プロパティ',title:'アンカー プロパティ',name:'アンカー�',errorName:'アンカー�を必�入力������。',remove:'Remove Anchor'},list:{numberedTitle:'段�番� プロパティ',bulletedTitle:'箇�書� プロパティ',type:'タイプ',start:'開始',validateStartNumber:'リスト開始番��数値�入力������。',circle:'白丸',disc:'黒丸',square:'四角',none:'��',notset:'<��>',armenian:'アルメニア数字',georgian:'グルジア数字 (an, ban, gan, etc.)',lowerRoman:'�文字ローマ数字 (i, ii, iii, iv, v, etc.)',upperRoman:'大文字ローマ数字 (I, II, III, IV, V, etc.)',lowerAlpha:'�文字アルファベット (a, b, c, d, e, etc.)',upperAlpha:'大文字アルファベット (A, B, C, D, E, etc.)',lowerGreek:'�文字ギリシャ文字 (alpha, beta, gamma, etc.)',decimal:'数字 (1, 2, 3, etc.)',decimalLeadingZero:'上���0を���数字 (01, 02, 03, etc.)'},findAndReplace:{title:'検索��置�',find:'検索',replace:'置���',findWhat:'検索�る文字列:',replaceWith:'置���る文字列:',notFoundMsg:'指定�れ�文字列�見��り��ん���。',findOptions:'Find Options',matchCase:'大文字��文字を区別�る',matchWord:'�語���探�',matchCyclic:'一周�る',replaceAll:'���置��',replaceSuccessMsg:'%1 個置�����。'},table:{toolbar:'テーブル',title:'テーブル プロパティ',menu:'テーブル プロパティ',deleteTable:'テーブル削除',rows:'行',columns:'列',border:'ボーダーサイズ',widthPx:'ピクセル',widthPc:'パーセント',widthUnit:'ユニット',cellSpace:'セル内余白',cellPad:'セル内間隔',caption:'キャプション',summary:'テーブル�概�',headers:'テーブルヘッダ(th)',headersNone:'��',headersColumn:'���列��',headersRow:'���行��',headersBoth:'両方',invalidRows:'行�0より大��数値�入力������。',invalidCols:'列�0より大��数値�入力������。',invalidBorder:'ボーダーサイズ�数値�入力������。',invalidWidth:'幅�数値�入力������。',invalidHeight:'高��数値�入力������。',invalidCellSpacing:'セル内余白�数値�入力������。',invalidCellPadding:'セル内間隔�数値�入力������。',cell:{menu:'セル',insertBefore:'セル���挿入',insertAfter:'セル�後�挿入',deleteCell:'セル削除',merge:'セル��',mergeRight:'����',mergeDown:'下���',splitHorizontal:'セルを水平方�分割',splitVertical:'セルを垂直方��分割',title:'セルプロパティ',cellType:'セルタイプ',rowSpan:'縦幅(行数)',colSpan:'横幅(列数)',wordWrap:'折り返�',hAlign:'セル横�整列',vAlign:'セル縦�整列',alignBaseline:'ベースライン',bgColor:'背景色',borderColor:'ボーダーカラー',data:'テーブルデータ(td)',header:'テーブルヘッダ(th)',yes:'Yes',no:'No',invalidWidth:'セル幅�数値�入力������。',invalidHeight:'セル高��数値�入力������。',invalidRowSpan:'縦幅(行数)�数値�入力������。',invalidColSpan:'横幅(列数)�数値�入力������。',chooseColor:'色��択'},row:{menu:'行',insertBefore:'行���挿入',insertAfter:'行�後�挿入',deleteRow:'行削除'},column:{menu:'カラム',insertBefore:'カラム���挿入',insertAfter:'カラム�後�挿入',deleteColumn:'列削除'}},button:{title:'ボタン プロパティ',text:'テキスト (値)',type:'タイプ',typeBtn:'ボタン',typeSbm:'�信',typeRst:'リセット'},checkboxAndRadio:{checkboxTitle:'�ェックボックス プロパティ',radioTitle:'ラジオボタン プロパティ',value:'値',selected:'�択済�'},form:{title:'フォーム プロパティ',menu:'フォーム プロパティ',action:'アクション',method:'メソッド',encoding:'エンコーディング'},select:{title:'�択フィールド プロパティ',selectInfo:'情報',opAvail:'利用�能�オプション',value:'�択項目値',size:'サイズ',lines:'行',chkMulti:'複数項目�択を許�',opText:'�択項目�',opValue:'値',btnAdd:'追加',btnModify:'編集',btnUp:'上�',btnDown:'下�',btnSetValue:'�択��値を設定',btnDelete:'削除'},textarea:{title:'テキストエリア プロパティ',cols:'列',rows:'行'},textfield:{title:'１行テキスト プロパティ',name:'��',value:'値',charWidth:'サイズ',maxChars:'最大長',type:'タイプ',typeText:'テキスト',typePass:'パスワード入力'},hidden:{title:'��視フィールド プロパティ',name:'��',value:'値'},image:{title:'イメージ プロパティ',titleButton:'画�ボタン プロパティ',menu:'イメージ プロパティ',infoTab:'イメージ 情報',btnUpload:'サー�ー��信',upload:'アップロード',alt:'代替テキスト',lockRatio:'ロック比率',resetSize:'サイズリセット',border:'ボーダー',hSpace:'横間隔',vSpace:'縦間隔',alertUrl:'イメージ�URLを入力������。',linkTab:'リンク',button2Img:'�択��ボタンを画��置������？',img2Button:'�択��画�をボタン�置������？',urlMissing:'イメージ�URLを入力������。',validateBorder:'ボーダー�数値�入力������。',validateHSpace:'横間隔�数値�入力������。',validateVSpace:'縦間隔�数値�入力������。'},flash:{properties:'Flash プロパティ',propertiesTab:'プロパティ',title:'Flash プロパティ',chkPlay:'�生',chkLoop:'ループ�生',chkMenu:'Flashメニュー�能',chkFull:'フルスクリーン許�',scale:'拡大縮�設定',scaleAll:'���表示',scaleNoBorder:'外�見���様�拡大',scaleFit:'上下左��フィット',access:'スプリクトアクセス(AllowScriptAccess)',accessAlways:'����場��通信�能(Always)',accessSameDomain:'�一ドメイン���通信�能(Same domain)',accessNever:'����場��通信��能(Never)',alignAbsBottom:'下部(絶対的)',alignAbsMiddle:'中央(絶対的)',alignBaseline:'ベースライン',alignTextTop:'テキスト上部',quality:'画質',qualityBest:'�質優先',qualityHigh:'高',qualityAutoHigh:'自動/高',qualityMedium:'中',qualityAutoLow:'自動/低',qualityLow:'低',windowModeWindow:'標準',windowModeOpaque:'背景を��明設定',windowModeTransparent:'背景を��設定',windowMode:'ウィンドウモード',flashvars:'フラッシュ�渡�変数(FlashVars)',bgcolor:'背景色',hSpace:'横間隔',vSpace:'縦間隔',validateSrc:'リンクURLを入力������。',validateHSpace:'横間隔�数値�入力������。',validateVSpace:'縦間隔�数値�入力������。'},spellCheck:{toolbar:'スペル�ェック',title:'スペル�ェック',notAvailable:'申�訳�り��ん��在サービスを利用�る�������ん',errorLoading:'アプリケーションサービスホスト読込�エラー: %s.',notInDic:'辞書��り��ん',changeTo:'変更',btnIgnore:'無視',btnIgnoreAll:'���無視',btnReplace:'置�',btnReplaceAll:'���置�',btnUndo:'やり直�',noSuggestions:'- 該当�� -',progress:'スペル�ェック処�中...',noMispell:'スペル�ェック完了: スペル�誤り��り��ん���',noChanges:'スペル�ェック完了: 語��変更�れ��ん���',oneChange:'スペル�ェック完了: １語�変更�れ���',manyChanges:'スペル�ェック完了: %1 語�変更�れ���',ieSpellDownload:'スペル�ェッカー�インストール�れ����ん。今��ダウンロード����?'},smiley:{toolbar:'絵文字',title:'顔文字挿入',options:'絵文字オプション'},elementsPath:{eleLabel:'エレメントパス',eleTitle:'%1 エレメント'},numberedlist:'段�番�',bulletedlist:'箇�書�',indent:'インデント',outdent:'インデント解除',justify:{left:'左��',center:'中央��',right:'���',block:'両端��'},blockquote:'ブロック引用',clipboard:{title:'貼り付�',cutError:'ブラウザー�セキュリティ設定�よりエディタ�切り�り�作�自動�実行�る�������ん。実行�る��手動�キーボード�(Ctrl/Cmd+X)を使用������。',copyError:'ブラウザー�セキュリティ設定�よりエディタ�コピー�作�自動�実行�る�������ん。実行�る��手動�キーボード�(Ctrl/Cmd+C)を使用������。',pasteMsg:'キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用���次�入力エリア内�貼���<STRONG>OK</STRONG>を押������。',securityMsg:'ブラウザ�セキュリティ設定�より�エディタ�クリップボード・データ�直接アクセス�る�������ん。��ウィンドウ�貼り付��作を行�度�表示�れ��。',pasteArea:'貼り付�場所'},pastefromword:{confirmCleanup:'貼り付�を行�テキスト��ワード文章�らコピー�れよ�������。貼り付�る��クリーニングを行����？',toolbar:'ワード文章�ら貼り付�',title:'ワード文章�ら貼り付�',error:'内部エラー�より貼り付��データ�クリア����ん���'},pasteText:{button:'プレーンテキスト貼り付�',title:'プレーンテキスト貼り付�'},templates:{button:'テンプレート(雛形)',title:'テンプレート内容',options:'テンプレートオプション',insertOption:'�在�エディタ�内容�置��を���',selectPromptMsg:'エディター�使用�るテンプレートを�択������。<br>(�在�エディタ�内容�失�れ��):',emptyListMsg:'(テンプレート�定義�れ����ん)'},showBlocks:'ブロック表示',stylesCombo:{label:'スタイル',panelTitle:'スタイル',panelTitle1:'ブロックスタイル',panelTitle2:'インラインスタイル',panelTitle3:'オブジェクトスタイル'},format:{label:'フォーマット',panelTitle:'フォーマット',tag_p:'標準',tag_pre:'書�付�',tag_address:'アドレス',tag_h1:'見出� 1',tag_h2:'見出� 2',tag_h3:'見出� 3',tag_h4:'見出� 4',tag_h5:'見出� 5',tag_h6:'見出� 6',tag_div:'標準 (DIV)'},div:{title:'Divコンテナ',toolbar:'Divコンテナ',cssClassInputLabel:'スタイルシートクラス',styleSelectLabel:'スタイル',IdInputLabel:'Id',languageCodeInputLabel:' 言語コード',inlineStyleInputLabel:'インラインスタイル',advisoryTitleInputLabel:'Title属性',langDirLabel:'文字表記�方�',langDirLTRLabel:'左�ら� (LTR)',langDirRTLLabel:'��ら左 (RTL)',edit:'Divコンテナ 編集',remove:'Divコンテナ 削除'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'フォント',voiceLabel:'フォント',panelTitle:'フォント'},fontSize:{label:'サイズ',voiceLabel:'フォントサイズ',panelTitle:'サイズ'},colorButton:{textColorTitle:'テキスト色',bgColorTitle:'背景色',panelTitle:'色',auto:'自動',more:'��他�色...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'スペル�ェック設定(SCAYT)',opera_title:'Opera��サ�ート�れ��ん',enable:'SCAYT有効',disable:'SCAYT無効',about:'SCAYTﾊﾞｰｼﾞｮ�',toggle:'SCAYT切替',options:'オプション',langs:'言語',moreSuggestions:'他�候補',ignore:'無視',ignoreAll:'���無視',addWord:'語�追加',emptyDic:'辞書��必�入力������',noSuggestions:'該当��',optionsTab:'オプション',allCaps:'全�大文字��語を無視',ignoreDomainNames:'ドメイン�を無視',mixedCase:'大文字�文字混在��語を無視',mixedWithDigits:'数字付��語を無視',languagesTab:'言語',dictionariesTab:'辞書',dic_field_name:'辞書�',dic_create:'登録',dic_restore:'元�戻�',dic_delete:'削除',dic_rename:'��変更',dic_info:'始�ユーザーディレクトリ��Cookie��存�れ��。但� Cookie �サイズ�制���り��。ユーザーディレクトリ�Cookie��存����サイズ�到��る�ディレクトリ�サー�ー上��存�れ��。個人�ディレクトリをサー�ー上��存�る���ディレクトリ�を明示�る必���り��。も�既��存�れ�ディレクトリ��る場������を入力��元�戻�ボタンを押������。',aboutTab:'�ージョン情報'},about:{title:'CKEditor�ージョン情報',dlgTitle:'CKEditor�ージョン情報',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'ライセンス情報�詳細�ウェブサイト��確�������:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'最大化',minimize:'最�化',fakeobjects:{anchor:'アンカー',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'ドラッグ��リサイズ',colordialog:{title:'色�択',options:'カラーオプション',highlight:'�イライト',selected:'�択�れ�色',clear:'クリア'},toolbarCollapse:'ツール�ーを閉�る',toolbarExpand:'ツール�ーを開�',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'テキスト��� : 左�ら��',rtl:'テキスト��� : ��ら左�'},docprops:{label:'文書 プロパティ',title:'文書 プロパティ',design:'Design',meta:'メタデータ',chooseColor:'色��択',other:'<��他�>',docTitle:'ページタイトル',charset:'文字セット符�化',charsetOther:'他�文字セット符�化',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'文書タイプヘッダー',docTypeOther:'��他文書タイプヘッダー',xhtmlDec:'XHTML宣言をインクルード',bgColor:'背景色',bgImage:'背景画� URL',bgFixed:'スクロール���背景',txtColor:'テキスト色',margin:'ページ・マージン',marginTop:'上部',marginLeft:'左',marginRight:'�',marginBottom:'下部',metaKeywords:'文書�キーワード(カンマ区切り)',metaDescription:'文書�概�',metaAuthor:'文書�作者',metaCopyright:'文書�著作権',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ka.js b/web/imcms/ckeditor/lang/ka.js
new file mode 100644
index 0000000000..ff820c4a42
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ka.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ka={dir:'ltr',editorTitle:'ტექსტის რედ�ქტ�რი, %1',editorHelp:'დ��ჭირეთ ALT 0-ს დ�ხმ�რების მის�ღებ�დ',toolbars:'Editor toolbars',editor:'ტექსტის რედ�ქტ�რი',source:'კ�დები',newPage:'�ხ�ლი გვერდი',save:'ჩ�წერ�',preview:'გ�დ�ხედვ�',cut:'�მ�ჭრ�',copy:'�სლი',paste:'ჩ�სმ�',print:'ბეჭდვ�',underline:'გ�ხ�ზული',bold:'მსხვილი',italic:'დ�ხრილი',selectAll:'ყველ�ფრის მ�ნიშნვ�',removeFormat:'ფ�რმ�ტირების მ�ხსნ�',strike:'გ�დ�ხ�ზული',subscript:'ინდექსი',superscript:'ხ�რისხი',horizontalrule:'ჰ�რიზ�ნტ�ლური ხ�ზის ჩ�სმ�',pagebreak:'გვერდის წყვეტ� ბეჭდვისთვის',pagebreakAlt:'გვერდის წყვეტ�',unlink:'ბმულის მ�ხსნ�',undo:'გ�უქმებ�',redo:'გ�მე�რებ�',common:{browseServer:'სერვერზე დ�თვ�ლიერებ�',url:'URL',protocol:'პრ�ტ�კ�ლი',upload:'�ტვირთვ�',uploadSubmit:'სერვერზე გ�გზ�ვნ�',image:'სურ�თი',flash:'Flash',form:'ფ�რმ�',checkbox:'მ�ნიშვნის ღილ�კი',radio:'�მ�რჩევის ღილ�კი',textField:'ტექსტური ველი',textarea:'ტექსტური �რე',hiddenField:'მ�ლული ველი',button:'ღილ�კი',select:'�რჩევის ველი',imageButton:'სურ�თი�ნი ღილ�კი',notSet:'<�რ�ფერი>',id:'Id',name:'ს�ხელი',langDir:'ენის მიმ�რთულებ�',langDirLtr:'მ�რცხნიდ�ნ მ�რჯვნივ (LTR)',langDirRtl:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',langCode:'ენის კ�დი',longDescr:'დიდი �ღწერის URL',cssClass:'CSS კლ�სი',advisoryTitle:'ს�თ�ური',cssStyle:'CSS სტილი',ok:'დი�ხ',cancel:'გ�უქმებ�',close:'დ�ხურვ�',preview:'გ�დ�ხედვ�',generalTab:'ინფ�რმ�ცი�',advancedTab:'გ�ფ�რთ�ებული',validateNumberFailed:'ეს მნიშვნელ�ბ� �რ�� რიცხვი.',confirmNewPage:'�მ დ�კუმენტში ყველ� ჩ�უწერელი ცვლილებ� დ�იკ�რგებ�. დ�რწმუნებული ხ�რთ რ�მ �ხ�ლი გვერდის ჩ�ტვირთვ� გინდ�თ?',confirmCancel:'ზ�გიერთი პ�რ�მეტრი შეცვლილი�, დ�რწმუნებულილ ხ�რთ რ�მ ფ�ნჯრის დ�ხურვ� გსურთ?',options:'პ�რ�მეტრები',target:'გ�ხსნის �დგილი',targetNew:'�ხ�ლი ფ�ნჯ�რ� (_blank)',targetTop:'ზედ� ფ�ნჯ�რ� (_top)',targetSelf:'იგივე ფ�ნჯ�რ� (_self)',targetParent:'მშ�ბელი ფ�ნჯ�რ� (_parent)',langDirLTR:'მ�რცხნიდ�ნ მ�რჯვნივ (LTR)',langDirRTL:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',styles:'სტილი',cssClasses:'CSS კლ�სი',width:'სიგ�ნე',height:'სიმ�ღლე',align:'სწ�რებ�',alignLeft:'მ�რცხენ�',alignRight:'მ�რჯვენ�',alignCenter:'შუ�',alignTop:'ზემ�თ�',alignMiddle:'შუ�',alignBottom:'ქვემ�თ�',invalidValue:'Invalid value.',invalidHeight:'სიმ�ღლე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidWidth:'სიგ�ნე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, მიუწვდ�მელი�</span>'},contextmenu:{options:'კ�ნტექსტური მენიუს პ�რ�მეტრები'},specialChar:{toolbar:'სპეცი�ლური სიმბ�ლ�ს ჩ�სმ�',title:'სპეცი�ლური სიმბ�ლ�ს �რჩევ�',options:'სპეცი�ლური სიმბ�ლ�ს პ�რ�მეტრები'},link:{toolbar:'ბმული',other:'<სხვ�>',menu:'ბმულის რედ�ქტირებ�',title:'ბმული',info:'ბმულის ინფ�რმ�ცი�',target:'გ�ხსნის �დგილი',upload:'�ქ�ჩვ�',advanced:'დ�წვრილებით',type:'ბმულის ტიპი',toUrl:'URL',toAnchor:'ბმული ტექსტში ღუზ�ზე',toEmail:'ელფ�სტ�',targetFrame:'<frame>',targetPopup:'<popup ფ�ნჯ�რ�>',targetFrameName:'Frame-ის ს�ხელი',targetPopupName:'Popup ფ�ნჯრის ს�ხელი',popupFeatures:'Popup ფ�ნჯრის პ�რ�მეტრები',popupResizable:'ცვ�ლებ�დი ზ�მით',popupStatusBar:'სტ�ტუსის ზ�ლი',popupLocationBar:'ნ�ვიგ�ციის ზ�ლი',popupToolbar:'ხელს�წყ�თ� ზ�ლი',popupMenuBar:'მენიუს ზ�ლი',popupFullScreen:'მთელი ეკრ�ნი (IE)',popupScrollBars:'გ�დ�ხვევის ზ�ლები',popupDependent:'დ�მ�კიდებული (Netscape)',popupLeft:'მ�რცხენ� პ�ზიცი�',popupTop:'ზედ� პ�ზიცი�',id:'Id',langDir:'ენის მიმ�რთულებ�',langDirLTR:'მ�რცხნიდ�ნ მ�რჯვნივ (LTR)',langDirRTL:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',acccessKey:'წვდ�მის ღილ�კი',name:'ს�ხელი',langCode:'ენის კ�დი',tabIndex:'Tab-ის ინდექსი',advisoryTitle:'ს�თ�ური',advisoryContentType:'შიგთ�ვსის ტიპი',cssClasses:'CSS კლ�სი',charset:'კ�დირებ�',styles:'CSS სტილი',rel:'კ�ვშირი',selectAnchor:'�ირჩიეთ ღუზ�',anchorName:'ღუზის ს�ხელით',anchorId:'ელემენტის Id-თ',emailAddress:'ელფ�სტის მის�მ�რთები',emailSubject:'წერილის ს�თ�ური',emailBody:'წერილის ტექსტი',noAnchors:'(�მ დ�კუმენტში ღუზ� �რ��)',noUrl:'�კრიფეთ ბმულის URL',noEmail:'�კრიფეთ ელფ�სტის მის�მ�რთი'},anchor:{toolbar:'ღუზ�',menu:'ღუზის რედ�ქტირებ�',title:'ღუზის პ�რ�მეტრები',name:'ღუზუს ს�ხელი',errorName:'�კრიფეთ ღუზის ს�ხელი',remove:'Remove Anchor'},list:{numberedTitle:'გ�დ�ნ�მრილი სიის პ�რ�მეტრები',bulletedTitle:'ღილები�ნი სიის პ�რ�მეტრები',type:'ტიპი',start:'ს�წყისი',validateStartNumber:'სიის ს�წყისი მთელი რიცხვი უნდ� იყ�ს.',circle:'წრეწირი',disc:'წრე',square:'კვ�დრ�ტი',none:'�რ�ფერი',notset:'<�რ�ფერი>',armenian:'ს�მხური გ�დ�ნ�მრვ�',georgian:'ქ�რთული გ�დ�ნ�მრვ� (�ნ, ბ�ნ, გ�ნ, ..)',lowerRoman:'რ�მ�ული გ�დ�ნ�მრვც� პ�ტ�რ� ციფრებით (i, ii, iii, iv, v, ..)',upperRoman:'რ�მ�ული გ�დ�ნ�მრვ� დიდი ციფრებით (I, II, III, IV, V, etc.)',lowerAlpha:'პ�ტ�რ� ლ�თინური �ს�ებით (a, b, c, d, e, ..)',upperAlpha:'დიდი ლ�თინური �ს�ებით (A, B, C, D, E, ..)',lowerGreek:'პ�ტ�რ� ბერძნული �ს�ებით (�ლფ�, ბეტ�, გ�მ�, ..)',decimal:'რიცხვებით (1, 2, 3, ..)',decimalLeadingZero:'ნულით დ�წყებული რიცხვებით (01, 02, 03, ..)'},findAndReplace:{title:'ძებნ� დ� შეცვლ�',find:'ძებნ�',replace:'შეცვლ�',findWhat:'ს�ძიებელი ტექსტი:',replaceWith:'შეცვლის ტექსტი:',notFoundMsg:'მითითებული ტექსტი �რ მ�იძებნ�.',findOptions:'Find Options',matchCase:'დიდი დ� პ�ტ�რ� �ს�ების დ�მთხვევ�',matchWord:'მთელი სიტყვის დ�მთხვევ�',matchCyclic:'დ�კუმენტის ბ�ლ�ში გ�სვლის მერე თ�ვიდ�ნ დ�წყებ�',replaceAll:'ყველ�ს შეცვლ�',replaceSuccessMsg:'%1 მ�ძებნილი შეიცვ�ლ�.'},table:{toolbar:'ცხრილი',title:'ცხრილის პ�რ�მეტრები',menu:'ცხრილის პ�რ�მეტრები',deleteTable:'ცხრილის წ�შლ�',rows:'სტრიქ�ნი',columns:'სვეტი',border:'ჩ�რჩ�ს ზ�მ�',widthPx:'წერტილი',widthPc:'პრ�ცენტი',widthUnit:'ს�ზ�მი ერთეული',cellSpace:'უჯრის სივრცე (spacing)',cellPad:'უჯრის კიდე (padding)',caption:'ს�თ�ური',summary:'შეჯ�მებ�',headers:'ს�თ�ურები',headersNone:'�რ�ფერი',headersColumn:'პირველი სვეტი',headersRow:'პირველი სტრიქ�ნი',headersBoth:'�რივე',invalidRows:'სტრიქ�ნების რ��დენ�ბ� დ�დებითი რიცხვი უნდ� იყ�ს.',invalidCols:'სვეტების რ��დენ�ბ� დ�დებითი რიცხვი უნდ� იყ�ს.',invalidBorder:'ჩ�რჩ�ს ზ�მ� რიცხვით უდნ� იყ�ს წ�რმ�დგენილი.',invalidWidth:'ცხრილის სიგ�ნე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidHeight:'ცხრილის სიმ�ღლე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidCellSpacing:'უჯრის სივრცე (spacing) რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidCellPadding:'უჯრის კიდე (padding) რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',cell:{menu:'უჯრ�',insertBefore:'უჯრის ჩ�სმ� მ�ნ�მდე',insertAfter:'უჯრის ჩ�სმ� მერე',deleteCell:'უჯრების წ�შლ�',merge:'უჯრების შეერთებ�',mergeRight:'შეერთებ� მ�რჯვენ�სთ�ნ',mergeDown:'შეერთებ� ქვემ�თ�სთ�ნ',splitHorizontal:'გ�ყ�ფ� ჰ�რიზ�ნტ�ლურ�დ',splitVertical:'გ�ყ�ფ� ვერტიკ�ლურ�დ',title:'უჯრის პ�რ�მეტრები',cellType:'უჯრის ტიპი',rowSpan:'სტრიქ�ნების �დენ�ბ�',colSpan:'სვეტების �დენ�ბ�',wordWrap:'სტრიქ�ნის გ�დ�ტ�ნ� (Word Wrap)',hAlign:'ჰ�რიზ�ნტ�ლური სწ�რებ�',vAlign:'ვერტიკ�ლური სწ�რებ�',alignBaseline:'ძირით�დი ხ�ზის გ�სწვრივ',bgColor:'ფ�ნის ფერი',borderColor:'ჩ�რჩ�ს ფერი',data:'მ�ნ�ცემები',header:'ს�თ�ური',yes:'დი�ხ',no:'�რ�',invalidWidth:'უჯრის სიგ�ნე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidHeight:'უჯრის სიმ�ღლე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidRowSpan:'სტრიქ�ნების რ��დენ�ბ� მთელი რიცხვი უნდ� იყ�ს.',invalidColSpan:'სვეტების რ��დენ�ბ� მთელი რიცხვი უნდ� იყ�ს.',chooseColor:'�რჩევ�'},row:{menu:'სტრიქ�ნი',insertBefore:'სტრიქ�ნის ჩ�მ�ტებ� წინ',insertAfter:'სტრიქ�ნის ჩ�მ�ტებ� მერე',deleteRow:'სტრიქ�ნების წ�შლ�'},column:{menu:'სვეტი',insertBefore:'სვეტის ჩ�მ�ტებ� წინ',insertAfter:'სვეტის ჩ�მ�ტებ� მერე',deleteColumn:'სვეტების წ�შლ�'}},button:{title:'ღილ�კის პ�რ�მეტრები',text:'ტექსტი',type:'ტიპი',typeBtn:'ღილ�კი',typeSbm:'გ�გზ�ვნ�',typeRst:'გ�სუფთ�ვებ�'},checkboxAndRadio:{checkboxTitle:'მ�ნიშვნის ღილ�კის (Checkbox) პ�რ�მეტრები',radioTitle:'�ს�რჩევი ღილ�კის (Radio) პ�რ�მეტრები',value:'ტექსტი',selected:'�რჩეული'},form:{title:'ფ�რმის პ�რ�მეტრები',menu:'ფ�რმის პ�რ�მეტრები',action:'ქმედებ�',method:'მეთ�დი',encoding:'კ�დირებ�'},select:{title:'�რჩევის ველის პ�რ�მეტრები',selectInfo:'ინფ�რმ�ცი�',opAvail:'შეს�ძლებელი ვ�რი�ნტები',value:'მნიშვნელ�ბ�',size:'ზ�მ�',lines:'ხ�ზები',chkMulti:'მრ�ვლ�ბითი �რჩევ�ნის ს�შუ�ლებ�',opText:'ტექსტი',opValue:'მნიშვნელ�ბ�',btnAdd:'დ�მ�ტებ�',btnModify:'შეცვლ�',btnUp:'ზემ�თ',btnDown:'ქვემ�თ',btnSetValue:'�მ�რჩეულ მნიშვნელ�ვნ�დ დ�ყენებ�',btnDelete:'წ�შლ�'},textarea:{title:'ტექსტური �რის პ�რ�მეტრები',cols:'სვეტები',rows:'სტრიქ�ნები'},textfield:{title:'ტექსტური ველის პ�რ�მეტრები',name:'ს�ხელი',value:'მნიშვნელ�ბ�',charWidth:'სიმბ�ლ�ს ზ�მ�',maxChars:'�ს�ების მ�ქსიმ�ლური �დენ�ბ�',type:'ტიპი',typeText:'ტექსტი',typePass:'პ�რ�ლი'},hidden:{title:'მ�ლული ველის პ�რ�მეტრები',name:'ს�ხელი',value:'მნიშვნელ�ბ�'},image:{title:'სურ�თის პ�რ�მეტრები',titleButton:'სურ�თი�ნი ღილ�კის პ�რ�მეტრები',menu:'სურ�თის პ�რ�მეტრები',infoTab:'სურ�თის ინფ�რმცი�',btnUpload:'სერვერისთვის გ�გზ�ვნ�',upload:'�ტვირთვ�',alt:'ს�ნ�ცვლ� ტექსტი',lockRatio:'პრ�პ�რციის შენ�რჩუნებ�',resetSize:'ზ�მის დ�ბრუნებ�',border:'ჩ�რჩ�',hSpace:'ჰ�რიზ�ნტ�ლური სივრცე',vSpace:'ვერტიკ�ლური სივრცე',alertUrl:'�კრიფეთ სურ�თის URL',linkTab:'ბმული',button2Img:'გსურთ �რჩეული სურ�თი�ნი ღილ�კის გ�დ�ქცევ� ჩვეულებრივ ღილ�კ�დ?',img2Button:'გსურთ �რჩეული ჩვეულებრივი ღილ�კის გ�დ�ქცევ� სურ�თი�ნ ღილ�კ�დ?',urlMissing:'სურ�თის URL �რ�� შევსებული.',validateBorder:'ჩ�რჩ� მთელი რიცხვი უნდ� იყ�ს.',validateHSpace:'ჰ�რიზ�ნტ�ლური სივრცე მთელი რიცხვი უნდ� იყ�ს.',validateVSpace:'ვერტიკ�ლური სივრცე მთელი რიცხვი უნდ� იყ�ს.'},flash:{properties:'Flash-ის პ�რ�მეტრები',propertiesTab:'პ�რ�მეტრები',title:'Flash-ის პ�რ�მეტრები',chkPlay:'�ვტ� გ�შვებ�',chkLoop:'ჩ�ციკლვ�',chkMenu:'Flash-ის მენიუს დ�შვებ�',chkFull:'მთელი ეკრ�ნის დ�შვებ�',scale:'მ�სშტ�ბირებ�',scaleAll:'ყველ�ფრის ჩვენებ�',scaleNoBorder:'ჩ�რჩ�ს გ�რეშე',scaleFit:'ზუსტი ჩ�სმ�',access:'სკრიპტის წვდ�მ�',accessAlways:'ყ�ველთვის',accessSameDomain:'იგივე დ�მენი',accessNever:'�რ�სდრ�ს',alignAbsBottom:'ჩ�რჩ�ს ქვემ�თ� ნ�წილის სწ�რებ� ტექსტისთვის',alignAbsMiddle:'ჩ�რჩ�ს შუ� ნ�წილის სწ�რებ� ტექსტისთვის',alignBaseline:'ს�ბ�ზის� ხ�ზის სწ�რებ�',alignTextTop:'ტექსტი ზემ�დ�ნ',quality:'ხ�რისხი',qualityBest:'ს�უკეთეს�',qualityHigh:'მ�ღ�ლი',qualityAutoHigh:'მ�ღ�ლი (�ვტ�მ�ტური)',qualityMedium:'ს�შუ�ლ�',qualityAutoLow:'ძ�ლი�ნ დ�ბ�ლი',qualityLow:'დ�ბ�ლი',windowModeWindow:'ფ�ნჯ�რ�',windowModeOpaque:'გ�უმჭვირვ�ლე',windowModeTransparent:'გ�მჭვირვ�ლე',windowMode:'ფ�ნჯრის რეჟიმი',flashvars:'ცვლ�დები Flash-ისთვის',bgcolor:'ფ�ნის ფერი',hSpace:'ჰ�რიზ. სივრცე',vSpace:'ვერტ. სივრცე',validateSrc:'URL �რ უნდ� იყ�ს ც�რიელი.',validateHSpace:'ჰ�რიზ�ნტ�ლური სივრცე �რ უნდ� იყ�ს ც�რიელი.',validateVSpace:'ვერტიკ�ლური სივრცე �რ უნდ� იყ�ს ც�რიელი.'},spellCheck:{toolbar:'მ�რთლწერ�',title:'მ�რთლწერ�',notAvailable:'უკ�ცრ�ვ�დ, ეს სერვისი �მჟ�მ�დ მიუწვდ�მელი�.',errorLoading:'სერვისის გ�მ�ძ�ხების შეცდ�მ�: %s.',notInDic:'�რ�� ლექსიკ�ნში',changeTo:'შეცვლელი',btnIgnore:'უგულებელყ�ფ�',btnIgnoreAll:'ყველ�ს უგულებელყ�ფ�',btnReplace:'შეცვლ�',btnReplaceAll:'ყველ�ს შეცვლ�',btnUndo:'გ�უქმებ�',noSuggestions:'- �რ�� შემ�თ�ვ�ზებ� -',progress:'მიმდინ�რე�ბს მ�რთლწერის შემ�წმებ�...',noMispell:'მ�რთლწერის შემ�წმებ�: შეცდ�მ� �რ მ�იძებნ�',noChanges:'მ�რთლწერის შემ�წმებ�: �რ�ფერი შეცვლილ�',oneChange:'მ�რთლწერის შემ�წმებ�: ერთი სიტყვ� შეიცვ�ლ�',manyChanges:'მ�რთლწერის შემ�წმებ�: %1 სიტყვ� შეიცვ�ლ�',ieSpellDownload:'მ�რთლწერის შემ�წმებ� �რ�� დ�ინსტ�ლირებული. ჩ�მ�ვქ�ჩ�თ ინტერნეტიდ�ნ?'},smiley:{toolbar:'სიცილ�კები',title:'სიცილ�კის ჩ�სმ�',options:'სიცილ�კის პ�რ�მეტრები'},elementsPath:{eleLabel:'ელემეტის გზ�',eleTitle:'%1 ელემენტი'},numberedlist:'გ�დ�ნ�მრილი სი�',bulletedlist:'ღილი�ნი სი�',indent:'მეტ�დ შეწევ�',outdent:'ნ�კლებ�დ შეწევ�',justify:{left:'მ�რცხნივ სწ�რებ�',center:'შუ�ში სწ�რებ�',right:'მ�რჯვნივ სწ�რებ�',block:'გ�დ�სწ�რებ�'},blockquote:'ციტ�ტ�',clipboard:{title:'ჩ�სმ�',cutError:'თქვენი ბრ�უზერის უს�ფრთხ�ების პ�რ�მეტრები �რ იძლევ� �მ�ჭრის �პერ�ციის �ვტ�მ�ტურ�დ გ�ნხ�რციელების ს�შუ�ლებ�ს. გ�მ�იყენეთ კლ�ვი�ტურ� �მისთვის (Ctrl/Cmd+X).',copyError:'თქვენი ბრ�უზერის უს�ფრთხ�ების პ�რ�მეტრები �რ იძლევ� �სლის �პერ�ციის �ვტ�მ�ტურ�დ გ�ნხ�რციელების ს�შუ�ლებ�ს. გ�მ�იყენეთ კლ�ვი�ტურ� �მისთვის (Ctrl/Cmd+C).',pasteMsg:'ჩ�სვით �მ �რის შიგნით კლ�ვი�ტურის გ�მ�ყენებით (<strong>Ctrl/Cmd+V</strong>) დ� დ��ჭირეთ OK-ს',securityMsg:'თქვენი ბრ�უზერის უს�ფრთხ�ების პ�რ�მეტრები �რ იძლევ� clipboard-ის მ�ნ�ცემების წვდ�მის უფლებ�ს. კიდევ უნდ� ჩ�სვ�თ ტექსტი �მ ფ�ნჯ�რ�ში.',pasteArea:'ჩ�სმის �რე'},pastefromword:{confirmCleanup:'ჩ�ს�სმელი ტექსტი ვ�რდიდ�ნ გ�დმ�ტ�ნილს გ�ვს - გინდ�თ მისი წინ�სწ�რ გ�წმენდ�?',toolbar:'ვ�რდიდ�ნ ჩ�სმ�',title:'ვ�რდიდ�ნ ჩ�სმ�',error:'შიდ� შეცდ�მის გ�მ� ვერ მ�ხერხდ� ტექსტის გ�წმენდ�'},pasteText:{button:'მხ�ლ�დ ტექსტის ჩ�სმ�',title:'მხ�ლ�დ ტექსტის ჩ�სმ�'},templates:{button:'თ�რგები',title:'თ�რგები',options:'თ�რგების პ�რ�მეტრები',insertOption:'მიმდინ�რე შეგთ�ვსის შეცვლ�',selectPromptMsg:'�ირჩიეთ თ�რგი რედ�ქტ�რისთვის',emptyListMsg:'(თ�რგი �რ�� გ�ნს�ზღვრული)'},showBlocks:'�რეების ჩვენებ�',stylesCombo:{label:'სტილები',panelTitle:'ფ�რმ�ტირების სტილები',panelTitle1:'�რის სტილები',panelTitle2:'თ�ნდ�რთული სტილები',panelTitle3:'�ბიექტის სტილები'},format:{label:'ფი�რმ�ტირებ�',panelTitle:'ფ�რმ�ტირებ�',tag_p:'ჩვეულებრივი',tag_pre:'ფ�რმ�ტირებული',tag_address:'მის�მ�რთი',tag_h1:'ს�თ�ური 1',tag_h2:'ს�თ�ური 2',tag_h3:'ს�თ�ური 3',tag_h4:'ს�თ�ური 4',tag_h5:'ს�თ�ური 5',tag_h6:'ს�თ�ური 6',tag_div:'ჩვეულებრივი (DIV)'},div:{title:'Div კ�ნტეინერის შექმნ�',toolbar:'Div კ�ნტეინერის შექმნ�',cssClassInputLabel:'CSS კლ�სები',styleSelectLabel:'სტილი',IdInputLabel:'Id',languageCodeInputLabel:'ენის კ�დი',inlineStyleInputLabel:'თ�ნდ�რთული სტილი',advisoryTitleInputLabel:'ს�თ�ური',langDirLabel:'ენის მინ�რთულებ�',langDirLTRLabel:'მ�რცხნიდ�ნ მ�რჯვნიც (LTR)',langDirRTLLabel:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',edit:'Div-ის რედ�ქტირებ�',remove:'Div-ის წ�შლ�'},iframe:{title:'IFrame-ის პ�რ�მეტრები',toolbar:'IFrame',noUrl:'�კრიფეთ iframe-ის URL',scrolling:'გ�დ�ხვევის ზ�ლების დ�შვებ�',border:'ჩ�რჩ�ს გ�მ�ჩენ�'},font:{label:'ფ�ნტი',voiceLabel:'ფ�ნტი',panelTitle:'ფ�ნტის ს�ხელი'},fontSize:{label:'ზ�მ�',voiceLabel:'ტექსტის ზ�მ�',panelTitle:'ტექსტის ზ�მ�'},colorButton:{textColorTitle:'ტექსტის ფერი',bgColorTitle:'ფ�ნის ფერი',panelTitle:'ფერები',auto:'�ვტ�მ�ტური',more:'მეტი ფერი...'},colors:{'000':'შ�ვი',800000:'მუქი შინდისფერი','8B4513':'ყ�ვისფერი','2F4F4F':'მ�ლურჯ� ნ�ცრისფერი','008080':'ჩ�მქრ�ლი ლურჯი','000080':'მუქი ლურჯი','4B0082':'ი�ს�მნისფერი',696969:'მუქი ნ�ცრისფერი',B22222:'�გურისფერი',A52A2A:'მუქი ყ�ვისფერი',DAA520:'მ�ყვით�ლ�','006400':'მუქი მწვ�ნე','40E0D0':'ცისფერი','0000CD':'ზ�მიერ�დ ლურჯი',800080:'იისფერი',808080:'ნ�ცრისფერი',F00:'წითელი',FF8C00:'მუქი სტ�ფილ�სფერი',FFD700:'�ქრ�სფერი','008000':'მწვ�ნე','0FF':'ღი� ცისფერი','00F':'ლურჯი',EE82EE:'იისფერი',A9A9A9:'ბ�ცი ნ�ცრისფერი',FFA07A:'ჩ�მქრ�ლი ვ�რდისფერი',FFA500:'სტ�ფილ�სფერი',FFFF00:'ყვითელი','00FF00':'ლურჯი',AFEEEE:'ცისფერი',ADD8E6:'ღი� ლურჯი',DDA0DD:'ღი� იისფერი',D3D3D3:'ღი� ნ�ცრისფერი',FFF0F5:'ღი� ვ�რდისფერი',FAEBD7:'ღი� ყ�ვისფერი',FFFFE0:'ნ�თელი ყვითელი',F0FFF0:'ღი� მწვ�ნე',F0FFFF:'ღი� ცისფერი 2',F0F8FF:'ღი� ცისფერი 3',E6E6FA:'ღი� იისფერი 2',FFF:'თეთრი'},scayt:{title:'მ�რთლწერის შემ�წმებ� კრეფის�ს',opera_title:'�რ�� მხ�რდ�ჭერილი Opera-ს მიერ',enable:'SCAYT-ის ჩ�რთვ�',disable:'SCAYT-ის გ�მ�რთვ�',about:'SCAYT-ის შეს�ხებ',toggle:'SCAYT-ის გ�დ�რთვ�',options:'პ�რ�მეტრები',langs:'ენები',moreSuggestions:'მეტი შემ�თ�ვ�ზებ�',ignore:'უგულებელყ�ფ�',ignoreAll:'ყველ�ს უგულებელყ�ფ�',addWord:'სიტყვის დ�მ�ტებ�',emptyDic:'ლექსიკ�ნის სიტყვ� �რ უნდ� იყ�ს ც�რიელი.',noSuggestions:'No suggestions',optionsTab:'პ�რ�მეტრები',allCaps:'დიდი �ს�ებით დ�წერილი სიტყვების უგულებელყ�ფ�',ignoreDomainNames:'დ�მენური ს�ხელების უგულებელყ�ფ�',mixedCase:'შერეული �ს�ებ�ნი სიტყვების უგულებელყ�ფ�',mixedWithDigits:'ციფრები�ნი სიტყვების უგულებელყ�ფ�',languagesTab:'ენები',dictionariesTab:'ლექსიკ�ნები',dic_field_name:'ლექსიკ�ნის ს�ხელი',dic_create:'შექმნ�',dic_restore:'დ�ბრუნებ�',dic_delete:'წ�შლ�',dic_rename:'გ�დ�რქმევ�',dic_info:'თ�ვდ�პირველ�დ მ�მხმ�რებლის ლექსიკ�ნი ინ�ხებ� Cookie-ში. თუმც� Cookie შეზღუდული� ზ�მ�ში. რ�ც� ლექსიკ�ნის ზ�მ� გ�იზრდებ� ს�კმ��დ ის შეიძლებ� შევინ�ხ�თ ჩვენს სერვერზე. ჩვენს სერვერზე ლექსიკ�ნს შეს�ნ�ხ�დ უნდ� მიუთით�თ მისი ს�ხელი. თუ უკე გ�ქვთ ლექსიკ�ნი, �კრიფეთ მისი ს�ხელი დ� დ��ჭირეთ "დ�ბრუნების" ღილ�კს.',aboutTab:'ინფ�რმ�ცი�'},about:{title:'CKEditor-ის შეს�ხებ',dlgTitle:'CKEditor-ის შეს�ხებ',help:'დ�ხმ�რებისთვის იხილეთ $1.',userGuide:'CKEditor-ის მ�მხმ�რებლის ს�ხელმძღვ�ნელ�',moreInfo:'ლიცენზიის ინფ�რმ�ციისთვის ეწვიეთ ჩვენს ს�იტს:',copy:'Copyright &copy; $1. ყველ� უფლებ� დ�ცული�.'},maximize:'გ�დიდებ�',minimize:'დ�პ�ტ�რ�ვებ�',fakeobjects:{anchor:'ღუზ�',flash:'Flash �ნიმ�ცი�',iframe:'IFrame',hiddenfield:'მ�ლული ველი',unknown:'უცნ�ბი �ბიექტი'},resize:'გ�წიე ზ�მის შეს�ცვლელ�დ',colordialog:{title:'ფერის შეცვლ�',options:'ფერის პ�რ�მეტრები',highlight:'ჩვენებ�',selected:'�რჩეული ფერი',clear:'გ�სუფთ�ვებ�'},toolbarCollapse:'ხელს�წყ�თ� ზ�ლის შეწევ�',toolbarExpand:'ხელს�წყ�თ� ზ�ლის გ�მ�წევ�',toolbarGroups:{document:'დ�კუმენტი',clipboard:'Clipboard/გ�უქმებ�',editing:'რედ�ქტირებ�',forms:'ფ�რმები',basicstyles:'ძირით�დი სტილები',paragraph:'�ბზ�ცი',links:'ბმულები',insert:'ჩ�სმ�',styles:'სტილები',colors:'ფერები',tools:'ხელს�წყ�ები'},bidi:{ltr:'ტექსტის მიმ�რთულებ� მ�რცხნიდ�ნ მ�რჯვნივ',rtl:'ტექსტის მიმ�რთულებ� მ�რჯვნიდ�ნ მ�რცხნივ'},docprops:{label:'დ�კუმენტის პ�რ�მეტრები',title:'დ�კუმენტის პ�რ�მეტრები',design:'დიზ�ინი',meta:'მეტ�Tag-ები',chooseColor:'�რჩევ�',other:'სხვ�...',docTitle:'გვერდის ს�თ�ური',charset:'კ�დირებ�',charsetOther:'სხვ� კ�დირებები',charsetASCII:'�მერიკული (ASCII)',charsetCE:'ცენტრ�ლურ ევრ�პული',charsetCT:'ტრ�დიციული ჩინური (Big5)',charsetCR:'კირილური',charsetGR:'ბერძნული',charsetJP:'ი�პ�ნური',charsetKR:'კ�რეული',charsetTR:'თურქული',charsetUN:'უნიკ�დი (UTF-8)',charsetWE:'დ�ს�ვლეთ ევრ�პული',docType:'დ�კუმენტის ტიპი',docTypeOther:'სხვ� ტიპის დ�კუმენტი',xhtmlDec:'XHTML დეკლ�რ�ციების ჩ�რთვ�',bgColor:'ფ�ნის ფერი',bgImage:'ფ�ნური სურ�თის URL',bgFixed:'უმ�ძრ�� (ფიქსირებული) ფ�ნი',txtColor:'ტექსტის ფერი',margin:'გვერდის კიდეები',marginTop:'ზედ�',marginLeft:'მ�რცხენ�',marginRight:'მ�რჯვენ�',marginBottom:'ქვედ�',metaKeywords:'დ�კუმენტის ს�კვ�ნძ� სიტყვები (მძიმით გ�მ�ყ�ფილი)',metaDescription:'დ�კუმენტის �ღწერ�',metaAuthor:'�ვტ�რი',metaCopyright:'Copyright',previewHtml:'<p>ეს �რის <strong>ს�ცდელი ტექსტი</strong>. თქვენ <a href="javascript:void(0)">CKEditor</a>-ით ს�რგებლ�ბთ.</p>'}};
diff --git a/web/imcms/ckeditor/lang/km.js b/web/imcms/ckeditor/lang/km.js
new file mode 100644
index 0000000000..94acc34391
--- /dev/null
+++ b/web/imcms/ckeditor/lang/km.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.km={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'កូ�',newPage:'ទំព�រ�្មី',save:'រក្សាទុក',preview:'មើលសាកល្បង',cut:'កា�់យក',copy:'ចំលងយក',paste:'ចំលងដាក់',print:'បោះពុម្ភ',underline:'ដិ�បន្ទា�់ពីក្រោមអក្សរ',bold:'អក្សរដិ�ធំ',italic:'អក្សរផ្��ក',selectAll:'ជ្រើសរើសទាំងអស់',removeFormat:'លប់ចោល ការរចនា',strike:'ដិ�បន្ទា�់ពាក់កណ្�ាលអក្សរ',subscript:'អក្សរ�ូចក្រោម',superscript:'អក្សរ�ូចលើ',horizontalrule:'បន្�ែមបន្ទា�់ផ្��ក',pagebreak:'បន្�ែម ការផ្�ាច់ទំព�រ',pagebreakAlt:'Page Break',unlink:'លប់ឈ្នាប់',undo:'សារឡើងវិញ',redo:'ធ្វើឡើងវិញ',common:{browseServer:'មើល',url:'URL',protocol:'ប្រូ�ូកូល',upload:'ទាញយក',uploadSubmit:'បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្�ល់ស�វា',image:'រូបភាព',flash:'Flash',form:'បែបបទ',checkbox:'ប្រអប់ជ្រើសរើស',radio:'ប៉ូ�ុនរង្វង់មូល',textField:'ជួរសរស�រអ�្�បទ',textarea:'�ំបន់សរស�រអ�្�បទ',hiddenField:'ជួរលាក់',button:'ប៉ូ�ុន',select:'ជួរជ្រើសរើស',imageButton:'ប៉ូ�ុនរូបភាព',notSet:'<មិនមែន>',id:'Id',name:'ឈ្មោះ',langDir:'ទិសដៅភាសា',langDirLtr:'ពីឆ្វ�ងទៅស្�ាំ(LTR)',langDirRtl:'ពីស្�ាំទៅឆ្វ�ង(RTL)',langCode:'ល��កូ�ភាសា',longDescr:'អធិប្បាយ URL វែង',cssClass:'Stylesheet Classes',advisoryTitle:'ចំណងជើង ប្រឹក្សា',cssStyle:'ម៉ូ�',ok:'យល់ព្រម',cancel:'មិនយល់ព្រម',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'កំរិ��្ពស់',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'ទទឹង',height:'កំពស់',align:'កំណ�់ទី�ាំង',alignLeft:'�ាងឆ្វង',alignRight:'�ាងស្�ាំ',alignCenter:'កណ្�ាល',alignTop:'�ាងលើ',alignMiddle:'កណ្�ាល',alignBottom:'�ាងក្រោម',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'បន្�ែមអក្សរពិស�ស',title:'�ូអក្សរពិស�ស',options:'Special Character Options'},link:{toolbar:'បន្�ែម/កែប្រែ ឈ្នាប់',other:'<other>',menu:'កែប្រែឈ្នាប់',title:'ឈ្នាប់',info:'ព�៌មានអំពីឈ្នាប់',target:'គោលដៅ',upload:'ទាញយក',advanced:'កំរិ��្ពស់',type:'ប្រភ�ទឈ្នាប់',toUrl:'URL',toAnchor:'យុ�្កានៅក្នុងទំព�រន�ះ',toEmail:'អ៊ីមែល',targetFrame:'<ហ្វ្រ�ម>',targetPopup:'<វីនដូវ លោ�>',targetFrameName:'ឈ្មោះហ្រ្វ�មដែលជាគោលដៅ',targetPopupName:'ឈ្មោះវីនដូវលោ�',popupFeatures:'លក្�ណះរបស់វីនដូលលោ�',popupResizable:'Resizable',popupStatusBar:'របា ព�៌មាន',popupLocationBar:'របា ទី�ាំង',popupToolbar:'របា ឩបករណ�',popupMenuBar:'របា មឺនុយ',popupFullScreen:'អ�ក្រុងព�ញ(IE)',popupScrollBars:'របា ទាញ',popupDependent:'អាស្រ�យលើ (Netscape)',popupLeft:'ទី�ាំង�ាងឆ្វ�ង',popupTop:'ទី�ាំង�ាងលើ',id:'Id',langDir:'ទិសដៅភាសា',langDirLTR:'ពីឆ្វ�ងទៅស្�ាំ(LTR)',langDirRTL:'ពីស្�ាំទៅឆ្វ�ង(RTL)',acccessKey:'ឃី សំរាប់ចូល',name:'ឈ្មោះ',langCode:'ទិសដៅភាសា',tabIndex:'ល�� Tab',advisoryTitle:'ចំណងជើង ប្រឹក្សា',advisoryContentType:'ប្រភ�ទអ�្�បទ ប្រឹក្សា',cssClasses:'Stylesheet Classes',charset:'ល��កូ�អក្សររបស់ឈ្នាប់',styles:'ម៉ូ�',rel:'Relationship',selectAnchor:'ជ្រើសរើសយុ�្កា',anchorName:'�ាមឈ្មោះរបស់យុ�្កា',anchorId:'�ាម Id',emailAddress:'អ៊ីមែល',emailSubject:'ចំណងជើងអ�្�បទ',emailBody:'អ�្�បទ',noAnchors:'(No anchors available in the document)',noUrl:'សូមសរស�រ អាស�យដ្ឋាន URL',noEmail:'សូមសរស�រ អាស�យដ្ឋាន អ៊ីមែល'},anchor:{toolbar:'បន្�ែម/កែប្រែ យុ�្កា',menu:'ការកំណ�់យុ�្កា',title:'ការកំណ�់យុ�្កា',name:'ឈ្មោះយុទ្ធ�្កា',errorName:'សូមសរស�រ ឈ្មោះយុទ្ធ�្កា',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'ស្វែងរក',replace:'ជំនួស',findWhat:'ស្វែងរកអ្វី:',replaceWith:'ជំនួសជាមួយ:',notFoundMsg:'ពាក្យន�ះ រកមិនឃើញទ� ។',findOptions:'Find Options',matchCase:'ករណ៉�្រូវរក',matchWord:'�្រូវពាក្យទាំងអស់',matchCyclic:'Match cyclic',replaceAll:'ជំនួសទាំងអស់',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'�ារាង',title:'ការកំណ�់ �ារាង',menu:'ការកំណ�់ �ារាង',deleteTable:'លប់�ារាង',rows:'ជួរផ្��ក',columns:'ជួរឈរ',border:'ទំហំស៊ុម',widthPx:'ភីកសែល',widthPc:'ភាគរយ',widthUnit:'width unit',cellSpace:'គំលា�សែល',cellPad:'គែមសែល',caption:'ចំណងជើង',summary:'ស�ចក្�ីសង្��ប',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'លប់សែល',merge:'បញ្ជូលសែល',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'លប់ជួរផ្��ក'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'លប់ជួរឈរ'}},button:{title:'ការកំណ�់ ប៉ូ�ុន',text:'អ�្�បទ(�ំលៃ)',type:'ប្រភ�ទ',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'ការកំណ�់ប្រអប់ជ្រើសរើស',radioTitle:'ការកំណ�់ប៉ូ�ុនរង្វង់',value:'�ំលៃ',selected:'បានជ្រើសរើស'},form:{title:'ការកំណ�់បែបបទ',menu:'ការកំណ�់បែបបទ',action:'សកម្មភាព',method:'វិធី',encoding:'Encoding'},select:{title:'ការកំណ�់ជួរជ្រើសរើស',selectInfo:'ព�៌មាន',opAvail:'ការកំណ�់ជ្រើសរើស ដែលអាចកំណ�់បាន',value:'�ំលៃ',size:'ទំហំ',lines:'បន្ទា�់',chkMulti:'អនុញ្ញា�អោយជ្រើសរើសច្រើន',opText:'ពាក្យ',opValue:'�ំលៃ',btnAdd:'បន្�ែម',btnModify:'ផ្លាស់ប្�ូរ',btnUp:'លើ',btnDown:'ក្រោម',btnSetValue:'Set as selected value',btnDelete:'លប់'},textarea:{title:'ការកំណ�់កន្លែងសរស�រអ�្�បទ',cols:'ជូរឈរ',rows:'ជូរផ្��ក'},textfield:{title:'ការកំណ�់ជួរអ�្�បទ',name:'ឈ្មោះ',value:'�ំលៃ',charWidth:'ទទឹង អក្សរ',maxChars:'អក្សរអ�ិបរិមា',type:'ប្រភ�ទ',typeText:'ពាក្យ',typePass:'ពាក្យសំងា�់'},hidden:{title:'ការកំណ�់ជួរលាក់',name:'ឈ្មោះ',value:'�ំលៃ'},image:{title:'ការកំណ�់រូបភាព',titleButton:'ការកំណ�់ប៉ូ�ុនរូបភាព',menu:'ការកំណ�់រូបភាព',infoTab:'ព�៌មានអំពីរូបភាព',btnUpload:'បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្�ល់ស�វា',upload:'ទាញយក',alt:'អ�្�បទជំនួស',lockRatio:'អ�្រាឡុក',resetSize:'កំណ�់ទំហំឡើងវិញ',border:'ស៊ុម',hSpace:'គំលា�ទទឹង',vSpace:'គំលា�បណ្�ោយ',alertUrl:'សូមសរស�រងាស�យដ្ឋានរបស់រូបភាព',linkTab:'ឈ្នាប់',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'ការកំណ�់ Flash',propertiesTab:'Properties',title:'ការកំណ�់ Flash',chkPlay:'ល�ងដោយស្វ�យប្រវ�្�',chkLoop:'ចំនួនដង',chkMenu:'បង្ហាញ មឺនុយរបស់ Flash',chkFull:'Allow Fullscreen',scale:'ទំហំ',scaleAll:'បង្ហាញទាំងអស់',scaleNoBorder:'មិនបង្ហាញស៊ុម',scaleFit:'�្រូវល្មម',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'បន្ទា�់ជាមូលដ្ឋាន',alignTextTop:'លើអ�្�បទ',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'ពណ៌ផ្ទៃ�ាងក្រោយ',hSpace:'គំលា�ទទឹង',vSpace:'គំលា�បណ្�ោយ',validateSrc:'សូមសរស�រ អាស�យដ្ឋាន URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'ពិនិ�្យអក្�រាវិរុទ្ធ',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'គ្មានក្នុងវចនានុក្រម',changeTo:'ផ្លាស់ប្�ូរទៅ',btnIgnore:'មិនផ្លាស់ប្�ូរ',btnIgnoreAll:'មិនផ្លាស់ប្�ូរ ទាំងអស់',btnReplace:'ជំនួស',btnReplaceAll:'ជំនួសទាំងអស់',btnUndo:'សារឡើងវិញ',noSuggestions:'- គ្មានសំណើរ -',progress:'កំពុងពិនិ�្យអក្�រាវិរុទ្ធ...',noMispell:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: គ្មានកំហុស',noChanges:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: ពុំមានផ្លាស់ប្�ូរ',oneChange:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: ពាក្យមួយ�្រូចបានផ្លាស់ប្�ូរ',manyChanges:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: %1 ពាក្យបានផ្លាស់ប្�ូរ',ieSpellDownload:'ពុំមានកម្មវិធីពិនិ�្យអក្�រាវិរុទ្ធ ។ �ើចង់ទាញយកពីណា?'},smiley:{toolbar:'រូបភាព',title:'បញ្ជូលរូបភាព',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'បញ្ជីជាអក្សរ',bulletedlist:'បញ្ជីជារង្វង់មូល',indent:'បន្�ែមការចូលបន្ទា�់',outdent:'បន្�យការចូលបន្ទា�់',justify:{left:'�ំរឹមឆ្វ�ង',center:'�ំរឹមកណ្�ាល',right:'�ំរឹមស្�ាំ',block:'�ំរឹមសង�ាង'},blockquote:'Block Quote',clipboard:{title:'ចំលងដាក់',cutError:'ការកំណ�់សុវ�្�ភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក ន�ះ​មិនអាចធ្វើកម្មវិធី�ាក់�ែងអ�្�បទ កា�់អ�្�បទយកដោយស្វ�យប្រវ�្�បានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចន�ះ  (Ctrl/Cmd+X) ។',copyError:'ការកំណ�់សុវ�្�ភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក ន�ះ​មិនអាចធ្វើកម្មវិធី�ាក់�ែងអ�្�បទ ចំលងអ�្�បទយកដោយស្វ�យប្រវ�្�បានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចន�ះ (Ctrl/Cmd+C)។',pasteMsg:'សូមចំលងអ�្�បទទៅដាក់ក្នុងប្រអប់ដូច�ាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'ចំលងដាក់ពី Word',title:'ចំលងដាក់ពី Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'ចំលងដាក់អ�្�បទធម្ម�ា',title:'ចំលងដាក់អ�្�បទធម្ម�ា'},templates:{button:'ឯកសារគំរូ',title:'ឯកសារគំរូ របស់អ�្�ន�យ',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'សូមជ្រើសរើសឯកសារគំរូ ដើម្បីបើកនៅក្នុងកម្មវិធី�ាក់�ែងអ�្�បទ<br>(អ�្�បទនឹងបា�់បង់):',emptyListMsg:'(ពុំមានឯកសារគំរូ�្រូវបានកំណ�់)'},showBlocks:'Show Blocks',stylesCombo:{label:'ម៉ូ�',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'រចនា',panelTitle:'រចនា',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'ហ្វុង',voiceLabel:'Font',panelTitle:'ហ្វុង'},fontSize:{label:'ទំហំ',voiceLabel:'Font Size',panelTitle:'ទំហំ'},colorButton:{textColorTitle:'ពណ៌អក្សរ',bgColorTitle:'ពណ៌ផ្ទៃ�ាងក្រោយ',panelTitle:'Colors',auto:'ស្វ�យប្រវ�្�',more:'ពណ៌ផ្ស�ងទៀ�..'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:' គ្មានសំណើរ ',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'ការកំណ�់ ឯកសារ',title:'ការកំណ�់ ឯកសារ',design:'Design',meta:'ទិន្នន�យម�',chooseColor:'Choose',other:'<other>',docTitle:'ចំណងជើងទំព�រ',charset:'កំណ�់ល��កូ�ភាសា',charsetOther:'កំណ�់ល��កូ�ភាសាផ្ស�ងទៀ�',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'ប្រភ�ទក្បាលទំព�រ',docTypeOther:'ប្រភ�ទក្បាលទំព�រផ្ស�ងទៀ�',xhtmlDec:'បញ្ជូល XHTML',bgColor:'ពណ៌�ាងក្រោម',bgImage:'URL របស់រូបភាព�ាងក្រោម',bgFixed:'ទំព�រក្រោមមិនប្�ូរ',txtColor:'ពណ៌អក្សរ',margin:'ស៊ុមទំព�រ',marginTop:'លើ',marginLeft:'ឆ្វ�ង',marginRight:'ស្ដាំ',marginBottom:'ក្រោម',metaKeywords:'ពាក្យនៅក្នុងឯកសារ (ផ្�ាច់ពីគ្នាដោយក្បៀស)',metaDescription:'ស�ចក្�ីអ�្�ាធិប្បាយអំពីឯកសារ',metaAuthor:'អ្នកនិពន្ធ',metaCopyright:'រក្សាសិទ្ធិ�',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ko.js b/web/imcms/ckeditor/lang/ko.js
new file mode 100644
index 0000000000..cbea154c9c
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ko.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ko={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'소스',newPage:'새 문서',save:'저장하기',preview:'미리보기',cut:'잘�내기',copy:'복사하기',paste:'붙여넣기',print:'�쇄하기',underline:'밑줄',bold:'진하게',italic:'�텔릭',selectAll:'전체선�',removeFormat:'�맷 지우기',strike:'취소선',subscript:'아래 첨�',superscript:'위 첨�',horizontalrule:'수�선 삽입',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'�� 삭제',undo:'취소',redo:'재실행',common:{browseServer:'서버 보기',url:'URL',protocol:'프로토콜',upload:'업로드',uploadSubmit:'서버로 전송',image:'�미지',flash:'플래쉬',form:'�',checkbox:'체�박스',radio:'�디오버튼',textField:'입력필드',textarea:'입력�역',hiddenField:'숨김필드',button:'버튼',select:'펼침목�',imageButton:'�미지버튼',notSet:'<설정�지 않�>',id:'ID',name:'Name',langDir:'쓰기 방향',langDirLtr:'왼쪽�서 오른쪽 (LTR)',langDirRtl:'오른쪽�서 왼쪽 (RTL)',langCode:'언어 코드',longDescr:'URL 설명',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'예',cancel:'아니오',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'�세히',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'너비',height:'높�',align:'정렬',alignLeft:'왼쪽',alignRight:'오른쪽',alignCenter:'가운�',alignTop:'위',alignMiddle:'중간',alignBottom:'아래',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'특수문� 삽입',title:'특수문� 선�',options:'Special Character Options'},link:{toolbar:'�� 삽입/변경',other:'<기타>',menu:'�� 수정',title:'��',info:'�� 정보',target:'타겟',upload:'업로드',advanced:'�세히',type:'�� 종류',toUrl:'URL',toAnchor:'책갈피',toEmail:'�메�',targetFrame:'<프레임>',targetPopup:'<�업창>',targetFrameName:'타겟 프레임 �름',targetPopupName:'�업창 �름',popupFeatures:'�업창 설정',popupResizable:'Resizable',popupStatusBar:'�태바',popupLocationBar:'주소표시줄',popupToolbar:'툴바',popupMenuBar:'메뉴바',popupFullScreen:'전체화면 (IE)',popupScrollBars:'스�롤바',popupDependent:'Dependent (Netscape)',popupLeft:'왼쪽 위치',popupTop:'윗쪽 위치',id:'Id',langDir:'쓰기 방향',langDirLTR:'왼쪽�서 오른쪽 (LTR)',langDirRTL:'오른쪽�서 왼쪽 (RTL)',acccessKey:'엑세스 키',name:'Name',langCode:'쓰기 방향',tabIndex:'탭 순서',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'책갈피 선�',anchorName:'책갈피 �름',anchorId:'책갈피 ID',emailAddress:'�메� 주소',emailSubject:'제목',emailBody:'내용',noAnchors:'(문서� 책갈피가 없습니다.)',noUrl:'�� URL� 입력하십시요.',noEmail:'�메�주소를 입력하십시요.'},anchor:{toolbar:'책갈피 삽입/변경',menu:'책갈피 �성',title:'책갈피 �성',name:'책갈피 �름',errorName:'책갈피 �름� 입력하십시요.',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'찾기 & 바꾸기',find:'찾기',replace:'바꾸기',findWhat:'찾� 문�열:',replaceWith:'바꿀 문�열:',notFoundMsg:'문�열� 찾� 수 없습니다.',findOptions:'Find Options',matchCase:'대소문� 구분',matchWord:'온전한 단어',matchCyclic:'Match cyclic',replaceAll:'모� 바꾸기',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'표',title:'표 설정',menu:'표 설정',deleteTable:'표 삭제',rows:'가로줄',columns:'세로줄',border:'테�리 �기',widthPx:'픽셀',widthPc:'�센트',widthUnit:'width unit',cellSpace:'셀 간격',cellPad:'셀 여백',caption:'캡션',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'셀/칸(Cell)',insertBefore:'앞� 셀/칸 삽입',insertAfter:'뒤� 셀/칸 삽입',deleteCell:'셀 삭제',merge:'셀 합치기',mergeRight:'오른쪽 뭉치기',mergeDown:'왼쪽 뭉치기',splitHorizontal:'수� 나누기',splitVertical:'수� 나누기',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'행(Row)',insertBefore:'앞� 행 삽입',insertAfter:'뒤� 행 삽입',deleteRow:'가로줄 삭제'},column:{menu:'열(Column)',insertBefore:'앞� 열 삽입',insertAfter:'뒤� 열 삽입',deleteColumn:'세로줄 삭제'}},button:{title:'버튼 �성',text:'버튼글�(값)',type:'버튼종류',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'체�박스 �성',radioTitle:'�디오버튼 �성',value:'값',selected:'선��'},form:{title:'� �성',menu:'� �성',action:'실행경로(Action)',method:'방법(Method)',encoding:'Encoding'},select:{title:'펼침목� �성',selectInfo:'정보',opAvail:'선�옵션',value:'값',size:'세로�기',lines:'줄',chkMulti:'여러항목 선� 허용',opText:'�름',opValue:'값',btnAdd:'추가',btnModify:'변경',btnUp:'위로',btnDown:'아래로',btnSetValue:'선��것으로 설정',btnDelete:'삭제'},textarea:{title:'입력�역 �성',cols:'칸수',rows:'줄수'},textfield:{title:'입력필드 �성',name:'�름',value:'값',charWidth:'글� 너비',maxChars:'최대 글�수',type:'종류',typeText:'문�열',typePass:'비밀번호'},hidden:{title:'숨김필드 �성',name:'�름',value:'값'},image:{title:'�미지 설정',titleButton:'�미지버튼 �성',menu:'�미지 설정',infoTab:'�미지 정보',btnUpload:'서버로 전송',upload:'업로드',alt:'�미지 설명',lockRatio:'비율 유지',resetSize:'�래 �기로',border:'테�리',hSpace:'수�여백',vSpace:'수�여백',alertUrl:'�미지 URL� 입력하십시요',linkTab:'��',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'플래쉬 �성',propertiesTab:'Properties',title:'플래쉬 등�정보',chkPlay:'��재�',chkLoop:'반복',chkMenu:'플래쉬메뉴 가능',chkFull:'Allow Fullscreen',scale:'�역',scaleAll:'모�보기',scaleNoBorder:'경계선없�',scaleFit:'�역��조절',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'줄아래(Abs Bottom)',alignAbsMiddle:'줄중간(Abs Middle)',alignBaseline:'기준선',alignTextTop:'글��단',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'배경 색�',hSpace:'수�여백',vSpace:'수�여백',validateSrc:'�� URL� 입력하십시요.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'철�검사',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'사전� 없는 단어',changeTo:'변경할 단어',btnIgnore:'건너뜀',btnIgnoreAll:'모� 건너뜀',btnReplace:'변경',btnReplaceAll:'모� 변경',btnUndo:'취소',noSuggestions:'- 추천단어 없� -',progress:'철�검사를 진행중입니다...',noMispell:'철�검사 완료: 잘못� 철�가 없습니다.',noChanges:'철�검사 완료: 변경� 단어가 없습니다.',oneChange:'철�검사 완료: 단어가 변경�었습니다.',manyChanges:'철�검사 완료: %1 단어가 변경�었습니다.',ieSpellDownload:'철� 검사기가 철치�지 않았습니다. 지금 다운로드하시겠습니까?'},smiley:{toolbar:'아�콘',title:'아�콘 삽입',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'순서있는 목�',bulletedlist:'순서없는 목�',indent:'들여쓰기',outdent:'내어쓰기',justify:{left:'왼쪽 정렬',center:'가운� 정렬',right:'오른쪽 정렬',block:'양쪽 맞춤'},blockquote:'Block Quote',clipboard:{title:'붙여넣기',cutError:'브�우저� 보안설정때문� 잘�내기 기능� 실행할 수 없습니다. 키보드 명령� 사용하십시요. (Ctrl/Cmd+X).',copyError:'브�우저� 보안설정때문� 복사하기 기능� 실행할 수 없습니다. 키보드 명령� 사용하십시요.  (Ctrl/Cmd+C).',pasteMsg:'키보드� (<STRONG>Ctrl/Cmd+V</STRONG>) 를 �용해서 ��안� 붙여넣고 <STRONG>OK</STRONG> 를 누르세요.',securityMsg:'브러우저 보안 설정으로 �해, �립보드� �료를 �접 접근할 수 없습니다. � 창� 다시 붙여넣기 하십시오.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'MS Word 형��서 붙여넣기',title:'MS Word 형��서 붙여넣기',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'�스트로 붙여넣기',title:'�스트로 붙여넣기'},templates:{button:'템플릿',title:'내용 템플릿',options:'Template Options',insertOption:'현재 내용 바꾸기',selectPromptMsg:'�디터�서 사용할 템플릿� 선�하십시요.<br>(지금까지 작성� 내용� 사�집니다.):',emptyListMsg:'(템플릿� 없습니다.)'},showBlocks:'Show Blocks',stylesCombo:{label:'스타�',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'�맷',panelTitle:'�맷',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'�트',voiceLabel:'Font',panelTitle:'�트'},fontSize:{label:'글� �기',voiceLabel:'Font Size',panelTitle:'글� �기'},colorButton:{textColorTitle:'글� 색�',bgColorTitle:'배경 색�',panelTitle:'Colors',auto:'기본색�',more:'색�선�...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'추천단어 없�',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'문서 �성',title:'문서 �성',design:'Design',meta:'메타��터',chooseColor:'Choose',other:'<기타>',docTitle:'페�지명',charset:'�릭터셋 �코딩',charsetOther:'다른 �릭터셋 �코딩',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'문서 헤드',docTypeOther:'다른 문서헤드',xhtmlDec:'XHTML 문서정� �함',bgColor:'배경색�',bgImage:'배경�미지 URL',bgFixed:'스�롤�지않는 배경',txtColor:'글� 색�',margin:'페�지 여백',marginTop:'위',marginLeft:'왼쪽',marginRight:'오른쪽',marginBottom:'아래',metaKeywords:'문서 키워드 (콤마로 구분)',metaDescription:'문서 설명',metaAuthor:'작성�',metaCopyright:'저작권',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ku.js b/web/imcms/ckeditor/lang/ku.js
new file mode 100644
index 0000000000..f9b4dd6dad
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ku.js
@@ -0,0 +1,821 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+* @fileOverview
+*/
+
+/**#@+
+   @type String
+   @example
+*/
+
+/**
+ * Contains the dictionary of language entries.
+ * @namespace
+ */
+CKEDITOR.lang['ku'] =
+{
+	/**
+	 * The language reading direction. Possible values are "rtl" for
+	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
+	 * languages (like English).
+	 * @default 'ltr'
+	 */
+	dir : 'rtl',
+
+	/*
+	 * Screenreader titles. Please note that screenreaders are not always capable
+	 * of reading non-English words. So be careful while translating it.
+	 */
+	editorTitle : 'ده‌سکاریکه‌ری ناونیشان',
+	editorHelp : 'کلیکی ALT له‌گه‌ڵ 0 بکه‌ بۆ یارمه‌تی',
+
+	// ARIA descriptions.
+	toolbars	: 'تووڵاەرازی دەسکاریکەر',
+	editor		: 'سەرنووسەی دەقی بەپیت',
+
+	// Toolbar buttons without dialogs.
+	source			: 'سەرچاوە',
+	newPage			: 'پەڕەیەکی نوێ',
+	save			: 'پاشکەوتکردن',
+	preview			: 'پێشبینین',
+	cut				: 'بڕین',
+	copy			: 'لەبەرگرنتەوه',
+	paste			: 'لکاندن',
+	print			: 'چاپکردن',
+	underline		: 'ژێرهێڵ',
+	bold			: 'Ù‚Û•ÚµÛ•Ùˆ',
+	italic			: 'لار',
+	selectAll		: 'نیشانکردنی هەمووی',
+	removeFormat	: 'لابردنی داڕشتەکە',
+	strike			: 'لێدان',
+	subscript		: 'ژێرنووس',
+	superscript		: 'سەرنووس',
+	horizontalrule	: 'دانانی هێلی ئاسۆیی',
+	pagebreak		: 'دانانی پشووی پەڕە بۆ چاپکردن',
+	pagebreakAlt		: 'پشووی پەڕە',
+	unlink			: 'لابردنی بەستەر',
+	undo			: 'پووچکردنەوه',
+	redo			: 'هەڵگەڕاندنەوه',
+
+	// Common messages and labels.
+	common :
+	{
+		browseServer	: 'هێنانی ڕاژە',
+		url				: 'ناونیشانی بەستەر',
+		protocol		: 'پڕۆتۆکۆڵ',
+		upload			: 'بارکردن',
+		uploadSubmit	: 'ناردنی بۆ ڕاژە',
+		image			: 'ÙˆÛŽÙ†Û•',
+		flash			: '�لاش',
+		form			: 'داڕشتە',
+		checkbox		: 'خانەی نیشانکردن',
+		radio			: 'جێگرەوەی دوگمە',
+		textField		: 'خانەی دەق',
+		textarea		: 'ڕووبەری دەق',
+		hiddenField		: 'شاردنەوی خانە',
+		button			: 'دوگمە',
+		select			: 'هەڵبژاردەی خانە',
+		imageButton		: 'دوگمەی وێنە',
+		notSet			: '<هیچ دانەدراوە>',
+		id				: 'ناسنامە',
+		name			: 'ناو',
+		langDir			: 'ئاراستەی زمان',
+		langDirLtr		: 'چەپ بۆ ڕاست (LTR)',
+		langDirRtl		: 'ڕاست بۆ چەپ (RTL)',
+		langCode		: 'هێمای زمان',
+		longDescr		: 'پێناسەی درێژی بەستەر',
+		cssClass		: 'شێوازی چینی په‌ڕە',
+		advisoryTitle	: 'ڕاوێژکاری سەردێڕ',
+		cssStyle		: 'شێواز',
+		ok				: 'باشە',
+		cancel			: 'هەڵوەشاندن',
+		close			: 'داخستن',
+		preview			: 'پێشبینین',
+		generalTab		: 'گشتی',
+		advancedTab		: 'په‌ره‌سه‌ندوو',
+		validateNumberFailed : 'ئەم نرخە ژمارە نیه، تکایە نرخێکی ژمارە بنووسە.',
+		confirmNewPage	: 'سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناوەووە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟',
+		confirmCancel	: 'هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی له‌داخستنی ئەم دیالۆگە؟',
+		options			: 'هەڵبژاردە',
+		target			: 'ئامانج',
+		targetNew		: 'پەنجەرەیه‌کی نوێ (_blank)',
+		targetTop		: 'لووتکەی پەنجەرە (_top)',
+		targetSelf		: 'لەهەمان پەنجەرە (_self)',
+		targetParent	: 'پەنجەرەی باوان (_parent)',
+		langDirLTR		: 'چەپ بۆ ڕاست (LTR)',
+		langDirRTL		: 'ڕاست بۆ چەپ (RTL)',
+		styles			: 'شێواز',
+		cssClasses		: 'شێوازی چینی پەڕە',
+		width			: 'پانی',
+		height			: 'درێژی',
+		align			: 'ڕێککەرەوە',
+		alignLeft		: 'Ú†Û•Ù¾',
+		alignRight		: 'ڕاست',
+		alignCenter		: 'ناوەڕاست',
+		alignTop		: 'سەرەوە',
+		alignMiddle		: 'ناوەند',
+		alignBottom		: 'ژێرەوە',
+		invalidValue	: 'نرخێکی نادرووست.',
+		invalidHeight	: 'درێژی دەبێت ژمارە بێت.',
+		invalidWidth	: 'پانی دەبێت ژمارە بێت.',
+		invalidCssLength	: 'ئەم نرخەی دراوە بۆ خانەی "%1" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).',
+		invalidHtmlLength	: 'ئەم نرخەی دراوە بۆ خانەی "%1" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).',
+		invalidInlineStyle	: 'دانه‌ی نرخی شێوازی ناوهێڵ ده‌بێت پێکهاتبێت له‌یه‌ك یان زیاتری داڕشته‌ "ناو : نرخ", جیاکردنه‌وه‌ی به‌�اریزه‌وخاڵ',
+		cssLengthTooltip	: 'ژماره‌یه‌ك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).',
+
+		// Put the voice-only part of the label in the span.
+		unavailable		: '%1<span class="cke_accessibility">, ئامادە نیە</span>'
+	},
+
+	contextmenu :
+	{
+		options : 'هەڵبژاردەی لیستەی کلیکی دەستی ڕاست'
+	},
+
+	// Special char dialog.
+	specialChar		:
+	{
+		toolbar		: 'دانانەی نووسەی تایبەتی',
+		title		: 'هەڵبژاردنی نووسەی تایبەتی',
+		options : 'هەڵبژاردەی نووسەی تایبەتی'
+	},
+
+	// Link dialog.
+	link :
+	{
+		toolbar		: 'دانان/ڕێکخستنی بەستەر',
+		other 		: '<هیتر>',
+		menu		: 'چاکسازی بەستەر',
+		title		: 'بەستەر',
+		info		: 'زانیاری بەستەر',
+		target		: 'ئامانج',
+		upload		: 'بارکردن',
+		advanced	: 'پێشکه‌وتوو',
+		type		: 'جۆری به‌سته‌ر',
+		toUrl		: 'ناونیشانی به‌سته‌ر',
+		toAnchor	: 'به‌سته‌ر بۆ له‌نگه‌ر له‌ ده‌ق',
+		toEmail		: 'ئیمه‌یل',
+		targetFrame		: '<چووارچێوه>',
+		targetPopup		: '<په‌نجه‌ره‌ی سه‌رهه‌ڵده‌ر>',
+		targetFrameName	: 'ناوی ئامانجی چووارچێوه',
+		targetPopupName	: 'ناوی په‌نجه‌ره‌ی سه‌رهه‌ڵده‌ر',
+		popupFeatures	: 'خاسیه‌تی په‌نجه‌ره‌ی سه‌رهه‌ڵده‌ر',
+		popupResizable	: 'توانای گۆڕینی قه‌باره‌',
+		popupStatusBar	: 'هێڵی دۆخ',
+		popupLocationBar: 'هێڵی ناونیشانی به‌سته‌ر',
+		popupToolbar	: 'هێڵی تووڵامراز',
+		popupMenuBar	: 'هێڵی لیسته',
+		popupFullScreen	: 'پڕ به‌پڕی شاشه‌ (IE)',
+		popupScrollBars	: 'هێڵی هاتووچۆپێکردن',
+		popupDependent	: 'پێوه‌به‌ستراو (Netscape)',
+		popupLeft		: 'جێگای چه‌پ',
+		popupTop		: 'جێگای سه‌ره‌وه‌',
+		id				: 'ناسنامه',
+		langDir			: 'ئاراسته‌ی زمان',
+		langDirLTR		: 'چه‌پ بۆ ڕاست (LTR)',
+		langDirRTL		: 'ڕاست بۆ چه‌پ (RTL)',
+		acccessKey		: 'کلیلی ده‌ستپێگه‌یشتن',
+		name			: 'ناو',
+		langCode			: 'هێمای زمان',
+		tabIndex			: 'بازده‌ری تابی  ئیندێکس',
+		advisoryTitle		: 'ڕاوێژکاری سه‌ردێڕ',
+		advisoryContentType	: 'جۆری ناوه‌ڕۆکی ڕاویژکار',
+		cssClasses		: 'شێوازی چینی په‌ڕه‌',
+		charset			: 'بەستەری سەرچاوەی نووسه',
+		styles			: 'شێواز',
+		rel			: 'په‌یوه‌ندی (rel)',
+		selectAnchor		: 'هه‌ڵبژاردنی له‌نگه‌رێك',
+		anchorName		: 'به‌پێی ناوی له‌نگه‌ر',
+		anchorId			: 'به‌پێی ناسنامه‌ی توخم',
+		emailAddress		: 'ناونیشانی ئیمه‌یل',
+		emailSubject		: 'بابه‌تی نامه',
+		emailBody		: 'ناوه‌ڕۆکی نامه',
+		noAnchors		: '(هیچ جۆرێکی له‌نگه‌ر ئاماده‌ نیه له‌م په‌ڕه‌یه)',
+		noUrl			: 'تکایه‌ ناونیشانی به‌سته‌ر بنووسه',
+		noEmail			: 'تکایه‌ ناونیشانی ئیمه‌یل بنووسه'
+	},
+
+	// Anchor dialog
+	anchor :
+	{
+		toolbar		: 'دانان/چاکسازی له‌نگه‌ر',
+		menu		: 'چاکسازی له‌نگه‌ر',
+		title		: 'خاسیه‌تی له‌نگه‌ر',
+		name		: 'ناوی له‌نگه‌ر',
+		errorName	: 'تکایه‌ ناوی له‌نگه‌ر بنووسه',
+		remove		: 'لابردنی له‌نگه‌ر'
+	},
+
+	// List style dialog
+	list:
+	{
+		numberedTitle		: 'خاسیه‌تی لیستی ژماره‌یی',
+		bulletedTitle		: 'خاسیه‌تی لیستی خاڵی',
+		type				: 'جۆر',
+		start				: 'ده‌ستپێکردن',
+		validateStartNumber				:'ده‌ستپێکه‌ری لیستی ژماره‌یی ده‌بێت ته‌نها ژماره‌ بێت.',
+		circle				: 'بازنه',
+		disc				: 'په‌پکه',
+		square				: 'چووراگۆشه',
+		none				: 'هیچ',
+		notset				: '<دانه‌ندراوه>',
+		armenian			: 'ئاراسته‌ی ژماره‌ی ئه‌رمه‌نی',
+		georgian			: 'ئاراسته‌ی ژماره‌ی جۆڕجی (an, ban, gan, وه‌هیتر.)',
+		lowerRoman			: 'ژماره‌ی ڕۆمی بچووك (i, ii, iii, iv, v, وه‌هیتر.)',
+		upperRoman			: 'ژماره‌ی ڕۆمی گه‌وره (I, II, III, IV, V, وه‌هیتر.)',
+		lowerAlpha			: 'ئه‌ل�ابێی بچووك (a, b, c, d, e, وه‌هیتر.)',
+		upperAlpha			: 'ئه‌ل�ابێی گه‌وره‌ (A, B, C, D, E, وه‌هیتر.)',
+		lowerGreek			: 'یۆنانی بچووك (alpha, beta, gamma, وه‌هیتر.)',
+		decimal				: 'ژماره (1, 2, 3, وه‌هیتر.)',
+		decimalLeadingZero	: 'ژماره‌ س�ڕی له‌پێشه‌وه (01, 02, 03, وه‌هیتر.)'
+	},
+
+	// Find And Replace Dialog
+	findAndReplace :
+	{
+		title				: 'گه‌ڕان وه‌ له‌بریدانان',
+		find				: 'گه‌ڕان',
+		replace				: 'له‌بریدانان',
+		findWhat			: 'گه‌ڕان به‌دووای:',
+		replaceWith			: 'له‌بریدانان به‌:',
+		notFoundMsg			: 'هیچ ده‌قه‌ گه‌ڕانێك نه‌دۆزراوه.',
+		findOptions			: 'هه‌ڵبژارده‌کانی گه‌ڕان',
+		matchCase			: 'جیاکردنه‌وه‌ له‌نێوان پیتی گه‌وره‌و بچووك',
+		matchWord			: 'ته‌نها هه‌موو وشه‌که‌',
+		matchCyclic			: 'گه‌ڕان له‌هه‌موو په‌ڕه‌که',
+		replaceAll			: 'له‌بریدانانی هه‌مووی',
+		replaceSuccessMsg	: ' پێشهاته(ی) له‌بری دانرا. %1'
+	},
+
+	// Table Dialog
+	table :
+	{
+		toolbar		: 'خشته',
+		title		: 'خاسیه‌تی خشته',
+		menu		: 'خاسیه‌تی خشته',
+		deleteTable	: 'سڕینه‌وه‌ی خشته',
+		rows		: 'ڕیز',
+		columns		: 'ستوونه‌کان',
+		border		: 'گه‌وره‌یی په‌راوێز',
+		widthPx		: 'وێنه‌خاڵ - پیکسل',
+		widthPc		: 'له‌سه‌دا',
+		widthUnit	: 'پانی یه‌که‌',
+		cellSpace	: 'بۆشایی خانه',
+		cellPad		: 'بۆشایی ناوپۆش',
+		caption		: 'سه‌ردێڕ',
+		summary		: 'کورته',
+		headers		: 'سه‌رپه‌ڕه‌',
+		headersNone		: 'هیچ',
+		headersColumn	: 'یه‌که‌م ئه‌ستوون',
+		headersRow		: 'یه‌که‌م ڕیز',
+		headersBoth		: 'هه‌ردووك',
+		invalidRows		: 'ژماره‌ی ڕیز ده‌بێت گه‌وره‌تر بێت له‌ژماره‌ی 0.',
+		invalidCols		: 'ژماره‌ی ئه‌ستوونی ده‌بێت گه‌وره‌تر بێت له‌ژماره‌ی 0.',
+		invalidBorder	: 'ژماره‌ی په‌راوێز ده‌بێت ته‌نها ژماره‌ بێت.',
+		invalidWidth	: 'پانی خشته‌ ده‌بێت ته‌نها ژماره‌ بێت.',
+		invalidHeight	: 'درێژی خشته ده‌بێت ته‌نها ژماره‌ بێت.',
+		invalidCellSpacing	: 'بۆشایی خانه‌ ده‌بێت ژماره‌کی درووست بێت.',
+		invalidCellPadding	: 'ناوپۆشی خانه‌ ده‌بێت ژماره‌کی درووست بێت.',
+
+		cell :
+		{
+			menu			: 'خانه',
+			insertBefore	: 'دانانی خانه‌ له‌پێش',
+			insertAfter		: 'دانانی خانه له‌پاش',
+			deleteCell		: 'سڕینه‌وه‌ی خانه',
+			merge			: 'تێکه‌ڵکردنی خانه',
+			mergeRight		: 'تێکه‌ڵکردنی له‌گه‌ڵ ڕاست',
+			mergeDown		: 'تێکه‌ڵکردنی له‌گه‌ڵ خواره‌وه',
+			splitHorizontal	: 'دابه‌شکردنی خانه‌ی ئاسۆیی',
+			splitVertical	: 'دابه‌شکردنی خانه‌ی ئه‌ستونی',
+			title			: 'خاسیه‌تی خانه',
+			cellType		: 'جۆری خانه',
+			rowSpan			: 'ماوه‌ی نێوان ڕیز',
+			colSpan			: 'بستی ئه‌ستونی',
+			wordWrap		: 'پێچانه‌وه‌ی وشه',
+			hAlign			: 'ڕیزکردنی ئاسۆیی',
+			vAlign			: 'ڕیزکردنی ئه‌ستونی',
+			alignBaseline	: 'هێڵه‌بنه‌ڕه‌ت',
+			bgColor			: 'ڕه‌نگی پاشبنه‌ما',
+			borderColor		: 'ڕه‌نگی په‌راوێز',
+			data			: 'داتا',
+			header			: 'سه‌رپه‌ڕه‌',
+			yes				: 'به‌ڵێ',
+			no				: 'نه‌خێر',
+			invalidWidth	: 'پانی خانه‌ ده‌بێت به‌ته‌واوی ژماره‌ بێت.',
+			invalidHeight	: 'درێژی خانه‌ به‌ته‌واوی ده‌بێت ژماره‌ بێت.',
+			invalidRowSpan	: 'ماوه‌ی نێوان ڕیز به‌ته‌واوی ده‌بێت ژماره‌ بێت.',
+			invalidColSpan	: 'ماوه‌ی نێوان ئه‌ستونی به‌ته‌واوی ده‌بێت ژماره‌ بێت.',
+			chooseColor		: 'هه‌ڵبژاردن'
+		},
+
+		row :
+		{
+			menu			: 'ڕیز',
+			insertBefore	: 'دانانی ڕیز له‌پێش',
+			insertAfter		: 'دانانی ڕیز له‌پاش',
+			deleteRow		: 'سڕینه‌وه‌ی ڕیز'
+		},
+
+		column :
+		{
+			menu			: 'ئه‌ستون',
+			insertBefore	: 'دانانی ئه‌ستون له‌پێش',
+			insertAfter		: 'دانانی ئه‌ستوون له‌پاش',
+			deleteColumn	: 'سڕینه‌وه‌ی ئه‌ستوون'
+		}
+	},
+
+	// Button Dialog.
+	button :
+	{
+		title		: 'خاسیه‌تی دوگمه',
+		text		: '(نرخی) ده‌ق',
+		type		: 'جۆر',
+		typeBtn		: 'دوگمه‌',
+		typeSbm		: 'ناردن',
+		typeRst		: 'ڕێکخستنه‌وه'
+	},
+
+	// Checkbox and Radio Button Dialogs.
+	checkboxAndRadio :
+	{
+		checkboxTitle : 'خاسیه‌تی چووارگۆشی پشکنین',
+		radioTitle	: 'خاسیه‌تی جێگره‌وه‌ی دوگمه',
+		value		: 'نرخ',
+		selected	: 'هه‌ڵبژاردرا'
+	},
+
+	// Form Dialog.
+	form :
+	{
+		title		: 'خاسیه‌تی داڕشته',
+		menu		: 'خاسیه‌تی داڕشته',
+		action		: 'کردار',
+		method		: 'Ú•ÛŽÚ¯Ù‡',
+		encoding	: 'به‌کۆدکه‌ر'
+	},
+
+	// Select Field Dialog.
+	select :
+	{
+		title		: 'هه‌ڵبژارده‌ی خاسیه‌تی خانه',
+		selectInfo	: 'زانیاری',
+		opAvail		: 'هه‌ڵبژارده‌ی هه‌بوو',
+		value		: 'نرخ',
+		size		: 'گه‌وره‌یی',
+		lines		: 'هێڵه‌کان',
+		chkMulti	: 'ڕێدان به‌�ره‌ هه‌ڵبژارده',
+		opText		: 'ده‌ق',
+		opValue		: 'نرخ',
+		btnAdd		: 'زیادکردن',
+		btnModify	: 'گۆڕانکاری',
+		btnUp		: 'سه‌ره‌وه',
+		btnDown		: 'خواره‌وه',
+		btnSetValue : 'دابنێ وه‌ك نرخێکی هه‌ڵبژێردراو',
+		btnDelete	: 'سڕینه‌وه'
+	},
+
+	// Textarea Dialog.
+	textarea :
+	{
+		title		: 'خاسیه‌تی ڕووبه‌ری ده‌ق',
+		cols		: 'ئه‌ستونیه‌کان',
+		rows		: 'ڕیزه‌کان'
+	},
+
+	// Text Field Dialog.
+	textfield :
+	{
+		title		: 'خاسیه‌تی خانه‌ی ده‌ق',
+		name		: 'ناو',
+		value		: 'نرخ',
+		charWidth	: 'پانی نووسه',
+		maxChars	: 'ئه‌وپه‌ڕی نووسه',
+		type		: 'جۆر',
+		typeText	: 'ده‌ق',
+		typePass	: 'پێپه‌ڕه‌وشه'
+	},
+
+	// Hidden Field Dialog.
+	hidden :
+	{
+		title	: 'خاسیه‌تی خانه‌ی شاردراوه',
+		name	: 'ناو',
+		value	: 'نرخ'
+	},
+
+	// Image Dialog.
+	image :
+	{
+		title		: 'خاسیه‌تی وێنه',
+		titleButton	: 'خاسیه‌تی دوگمه‌ی وێنه',
+		menu		: 'خاسیه‌تی وێنه',
+		infoTab		: 'زانیاری وێنه',
+		btnUpload	: 'ناردنی بۆ ڕاژه',
+		upload		: 'بارکردن',
+		alt			: 'جێگره‌وه‌ی ده‌ق',
+		lockRatio	: 'داخستنی ڕێژه',
+		resetSize	: 'ڕێکخستنه‌وه‌ی قه‌باره',
+		border		: 'په‌راوێز',
+		hSpace		: 'بۆشایی ئاسۆیی',
+		vSpace		: 'بۆشایی ئه‌ستونی',
+		alertUrl	: 'تکایه‌ ناونیشانی به‌سته‌ری وێنه‌ بنووسه',
+		linkTab		: 'به‌سته‌ر',
+		button2Img	: 'تۆ ده‌ته‌وێت دوگمه‌ی وێنه‌ی دیاریکراو بگۆڕیت بۆ وێنه‌کی ئاسایی؟',
+		img2Button	: 'تۆ ده‌ته‌وێت وێنه‌ی دیاریکراو بگۆڕیت بۆ دوگمه‌ی وێنه؟',
+		urlMissing	: 'سه‌رچاوه‌ی به‌سته‌ری وێنه‌ بزره',
+		validateBorder	: 'په‌راوێز ده‌بێت به‌ته‌واوی ته‌نها ژماره‌ بێت.',
+		validateHSpace	: 'بۆشایی ئاسۆیی ده‌بێت به‌ته‌واوی ته‌نها ژماره‌ بێت.',
+		validateVSpace	: 'بۆشایی ئه‌ستونی ده‌بێت به‌ته‌واوی ته‌نها ژماره‌ بێت.'
+	},
+
+	// Flash Dialog
+	flash :
+	{
+		properties		: 'خاسیه‌تی �لاش',
+		propertiesTab	: 'خاسیه‌ت',
+		title			: 'خاسیه‌تی �لاش',
+		chkPlay			: 'پێکردنی یان لێدانی خۆکار',
+		chkLoop			: 'گرێ',
+		chkMenu			: 'چالاککردنی لیسته‌ی �لاش',
+		chkFull			: 'ڕێپێدان به‌ پڕ به‌پڕی شاشه',
+ 		scale			: 'پێوانه',
+		scaleAll		: 'نیشاندانی هه‌موو',
+		scaleNoBorder	: 'بێ په‌راوێز',
+		scaleFit		: 'به‌وردی بگونجێت',
+		access			: 'ده‌ستپێگه‌یشتنی نووسراو',
+		accessAlways	: 'هه‌میشه',
+		accessSameDomain: 'هه‌مان دۆمه‌ین',
+		accessNever		: 'هه‌رگیز',
+		alignAbsBottom	: 'له‌ ژێره‌وه',
+		alignAbsMiddle	: 'له‌ناوه‌ند',
+		alignBaseline	: 'هێڵەبنەڕەت',
+		alignTextTop	: 'ده‌ق له‌سه‌ره‌وه',
+		quality			: 'جۆرایه‌تی',
+		qualityBest		: 'باشترین',
+		qualityHigh		: 'به‌رزی',
+		qualityAutoHigh	: 'به‌رزی خۆکار',
+		qualityMedium	: 'مامناوه‌ند',
+		qualityAutoLow	: 'نزمی خۆکار',
+		qualityLow		: 'نزم',
+		windowModeWindow: 'په‌نجه‌ره',
+		windowModeOpaque: 'ناڕوون',
+		windowModeTransparent : 'ڕۆشن',
+		windowMode		: 'شێوازی په‌نجه‌ره',
+		flashvars		: 'گۆڕاوه‌کان بۆ �لاش',
+		bgcolor			: 'ڕه‌نگی پاشبنه‌ما',
+		hSpace			: 'بۆشایی ئاسۆیی',
+		vSpace			: 'بۆشایی ئه‌ستونی',
+		validateSrc		: 'ناونیشانی به‌سته‌ر نابێت خاڵی بێت',
+		validateHSpace	: 'بۆشایی ئاسۆیی ده‌بێت ژماره‌ بێت.',
+		validateVSpace	: 'بۆشایی ئه‌ستونی ده‌بێت ژماره‌ بێت.'
+	},
+
+	// Speller Pages Dialog
+	spellCheck :
+	{
+		toolbar			: 'پشکنینی ڕێنووس',
+		title			: 'پشکنینی ڕێنووس',
+		notAvailable	: 'ببووره‌، له‌مکاته‌دا ڕاژه‌که له‌به‌رده‌ستا نیه.',
+		errorLoading	: 'هه‌ڵه‌ له‌هێنانی داخوازینامه‌ی خانه‌خۆێی ڕاژه: %s.',
+		notInDic		: 'له‌�ه‌رهه‌نگ دانیه',
+		changeTo		: 'گۆڕینی بۆ',
+		btnIgnore		: 'پشتگوێ کردن',
+		btnIgnoreAll	: 'پشتگوێکردنی هه‌مووی',
+		btnReplace		: 'له‌بریدانن',
+		btnReplaceAll	: 'له‌بریدانانی هه‌مووی',
+		btnUndo			: 'پووچکردنه‌وه',
+		noSuggestions	: '- هیچ پێشنیارێك -',
+		progress		: 'پشکنینی ڕێنووس له‌به‌رده‌وامبوون دایه...',
+		noMispell		: 'پشکنینی ڕێنووس کۆتای هات: هیچ هه‌ڵه‌یه‌کی ڕێنووس نه‌دۆزراوه',
+		noChanges		: 'پشکنینی ڕێنووس کۆتای هات: هیچ وشه‌یه‌ك نۆگۆڕدرا',
+		oneChange		: 'پشکنینی ڕێنووس کۆتای هات: یه‌ك وشه گۆڕدرا',
+		manyChanges		: 'پشکنینی ڕێنووس کۆتای هات: له‌سه‌دا %1 ی وشه‌کان گۆڕدرا',
+		ieSpellDownload	: 'پشکنینی ڕێنووس دانه‌مزراوه. ده‌ته‌وێت ئێستا دایبگریت?'
+	},
+
+	smiley :
+	{
+		toolbar	: 'زه‌رده‌خه‌نه',
+		title	: 'دانانی زه‌رده‌خه‌نه‌یه‌ك',
+		options : 'هه‌ڵبژارده‌ی زه‌رده‌خه‌نه'
+	},
+
+	elementsPath :
+	{
+		eleLabel : 'ڕێڕه‌وی توخمه‌کان',
+		eleTitle : '%1 توخم'
+	},
+
+	numberedlist	: 'دانان/لابردنی ژمارەی لیست',
+	bulletedlist	: 'دانان/لابردنی خاڵی لیست',
+	indent			: 'زیادکردنی بۆشایی',
+	outdent			: 'کەمکردنەوەی بۆشایی',
+
+	justify :
+	{
+		left	: 'به‌هێڵ کردنی چه‌پ',
+		center	: 'ناوه‌ڕاست',
+		right	: 'به‌هێڵ کردنی ڕاست',
+		block	: 'هاوستوونی'
+	},
+
+	blockquote : 'بەربەستکردنی وتەی وەرگیراو',
+
+	clipboard :
+	{
+		title		: 'لکاندن',
+		cutError	: 'پارێزی وێبگەڕەکەت ڕێگه‌نادات بە سەرنووسەکە له‌بڕینی خۆکار. تکایە لەبری ئەمە ئەم �ەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).',
+		copyError	: 'پارێزی وێبگەڕەکەت ڕێگه‌نادات بەسەرنووسەکە لە لکاندنی دەقی خۆکار. تکایە لەبری ئەمە ئەم �ەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).',
+		pasteMsg	: 'تکایه‌ بیلکێنه‌ له‌ناوه‌وه‌ی ئه‌م سنوقه له‌ڕێی ته‌خته‌کلیله‌که‌ت به‌باکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشه‌ بکه.',
+		securityMsg	: 'به‌هۆی شێوه‌پێدانی پارێزی وێبگه‌ڕه‌که‌ت، سه‌رنووسه‌که‌ ناتوانێت ده‌ستبگه‌یه‌نێت به‌هه‌ڵگیراوه‌که ڕاسته‌وخۆ. بۆیه‌ پێویسته دووباره‌ بیلکێنیت له‌م په‌نجه‌ره‌یه‌.',
+		pasteArea	: 'ناوچه‌ی لکاندن'
+	},
+
+	pastefromword :
+	{
+		confirmCleanup	: 'ئه‌م ده‌قه‌ی به‌ته‌مای بیلکێنی پێده‌چێت له‌ word هێنرابێت. ده‌ته‌وێت پاکی بکه‌یوه‌ پێش ئه‌وه‌ی بیلکێنی؟',
+		toolbar			: 'لکاندنی له‌ڕێی Word',
+		title			: 'لکاندنی له‌لایه‌ن Word',
+		error			: 'هیچ ڕێگه‌یه‌ك نه‌بوو له‌لکاندنی ده‌قه‌که‌ به‌هۆی هه‌ڵه‌کی ناوه‌خۆیی'
+	},
+
+	pasteText :
+	{
+		button	: 'لکاندنی وه‌ك ده‌قی ڕوون',
+		title	: 'لکاندنی وه‌ك ده‌قی ڕوون'
+	},
+
+	templates :
+	{
+		button			: 'ڕووکار',
+		title			: 'پێکهاته‌ی ڕووکار',
+		options : 'هه‌ڵبژارده‌کانی ڕووکار',
+		insertOption	: 'له‌شوێن دانانی ئه‌م پێکهاتانه‌ی ئێستا',
+		selectPromptMsg	: 'ڕووکارێك هه‌ڵبژێره‌ بۆ کردنه‌وه‌ی له‌ سه‌رنووسه‌ر:',
+		emptyListMsg	: '(هیچ ڕووکارێك دیارینه‌کراوه)'
+	},
+
+	showBlocks : 'نیشاندانی بەربەستەکان',
+
+	stylesCombo :
+	{
+		label		: 'شێواز',
+		panelTitle	: 'شێوازی ڕازاندنه‌وه',
+		panelTitle1	: 'شێوازی خشت',
+		panelTitle2	: 'شێوازی ناوهێڵ',
+		panelTitle3	: 'شێوازی به‌رکار'
+	},
+
+	format :
+	{
+		label		: 'ڕازاندنه‌وه',
+		panelTitle	: 'به‌شی ڕازاندنه‌وه‌',
+
+		tag_p		: 'ئاسایی',
+		tag_pre		: 'شێوازکراو',
+		tag_address	: 'ناونیشان',
+		tag_h1		: 'سه‌رنووسه‌ی ١',
+		tag_h2		: 'سه‌رنووسه‌ی ٢',
+		tag_h3		: 'سه‌رنووسه‌ی ٣',
+		tag_h4		: 'سه‌رنووسه‌ی ٤',
+		tag_h5		: 'سه‌رنووسه‌ی ٥',
+		tag_h6		: 'سه‌رنووسه‌ی ٦',
+		tag_div		: '(DIV)-ی ئاسایی'
+	},
+
+	div :
+	{
+		title				: 'دانانی له‌خۆگری Div',
+		toolbar				: 'دانانی له‌خۆگری Div',
+		cssClassInputLabel	: 'شێوازی چینی په‌ڕه',
+		styleSelectLabel	: 'شێواز',
+		IdInputLabel		: 'ناسنامه',
+		languageCodeInputLabel	: 'هێمای زمان',
+		inlineStyleInputLabel	: 'شێوازی ناوهێڵ',
+		advisoryTitleInputLabel	: 'سه‌ردێڕ',
+		langDirLabel		: 'ئاراسته‌ی زمان',
+		langDirLTRLabel		: 'چه‌پ بۆ ڕاست (LTR)',
+		langDirRTLLabel		: 'ڕاست بۆ چه‌پ (RTL)',
+		edit				: 'چاکسازی Div',
+		remove				: 'لابردنی Div'
+  	},
+
+	iframe :
+	{
+		title		: 'دیالۆگی چووارچێوه',
+		toolbar		: 'چووارچێوه',
+		noUrl		: 'تکایه‌ ناونیشانی به‌سته‌ر بنووسه‌ بۆ چووارچێوه‌',
+		scrolling	: 'چالاککردنی هاتووچۆپێکردن',
+		border		: 'نیشاندانی لاکێشه‌ به‌چووارده‌وری چووارچێوه'
+	},
+
+	font :
+	{
+		label		: '�ۆنت',
+		voiceLabel	: '�ۆنت',
+		panelTitle	: 'ناوی �ۆنت'
+	},
+
+	fontSize :
+	{
+		label		: 'گه‌وره‌یی',
+		voiceLabel	: 'گه‌وره‌یی �ۆنت',
+		panelTitle	: 'گه‌وره‌یی �ۆنت'
+	},
+
+	colorButton :
+	{
+		textColorTitle	: 'ڕه‌نگی ده‌ق',
+		bgColorTitle	: 'ڕه‌نگی پاشبنه‌ما',
+		panelTitle		: 'ڕه‌نگه‌کان',
+		auto			: 'خۆکار',
+		more			: 'ڕه‌نگی زیاتر...'
+	},
+
+	colors :
+	{
+		'000' : 'ڕه‌ش',
+		'800000' : 'سۆرو ماڕوونی',
+		'8B4513' : 'ماڕوونی',
+		'2F4F4F' : 'سه‌وزی تاریك',
+		'008080' : 'سه‌وزو شین',
+		'000080' : 'شینی تۆخ',
+		'4B0082' : 'مۆری تۆخ',
+		'696969' : 'ڕه‌ساسی تۆخ',
+		'B22222' : 'سۆری تۆخ',
+		'A52A2A' : 'قاوه‌یی',
+		'DAA520' : 'قاوه‌یی بریسکه‌دار',
+		'006400' : 'سه‌وزی تۆخ',
+		'40E0D0' : 'شینی ناتۆخی بریسکه‌دار',
+		'0000CD' : 'شینی مامناوه‌ند',
+		'800080' : 'په‌مبه‌یی',
+		'808080' : 'ڕه‌ساسی',
+		'F00' : 'سۆر',
+		'FF8C00' : 'ناره‌نجی تۆخ',
+		'FFD700' : 'زه‌رد',
+		'008000' : 'سه‌وز',
+		'0FF' : 'شینی ئاسمانی',
+		'00F' : 'شین',
+		'EE82EE' : 'په‌مه‌یی',
+		'A9A9A9' : 'ڕه‌ساسی ناتۆخ',
+		'FFA07A' : 'ناره‌نجی ناتۆخ',
+		'FFA500' : 'ناره‌نجی',
+		'FFFF00' : 'زه‌رد',
+		'00FF00' : 'سه‌وز',
+		'AFEEEE' : 'شینی ناتۆخ',
+		'ADD8E6' : 'شینی زۆر ناتۆخ',
+		'DDA0DD' : 'په‌مه‌یی ناتۆخ',
+		'D3D3D3' : 'ڕه‌ساسی بریسکه‌دار',
+		'FFF0F5' : 'جه‌رگی زۆر ناتۆخ',
+		'FAEBD7' : 'جه‌رگی ناتۆخ',
+		'FFFFE0' : 'سپی ناتۆخ',
+		'F0FFF0' : 'هه‌نگوینی ناتۆخ',
+		'F0FFFF' : 'شینێکی زۆر ناتۆخ',
+		'F0F8FF' : 'شینێکی ئاسمانی زۆر ناتۆخ',
+		'E6E6FA' : 'شیری',
+		'FFF' : 'سپی'
+	},
+
+	scayt :
+	{
+		title			: 'پشکنینی نووسه‌ له‌کاتی نووسین',
+		opera_title		: 'پشتیوانی نه‌کراوه له‌لایه‌ن Opera',
+		enable			: 'چالاککردنی SCAYT',
+		disable			: 'ناچالاککردنی SCAYT',
+		about			: 'ده‌رباره‌ی SCAYT',
+		toggle			: 'گۆڕینی SCAYT',
+		options			: 'هه‌ڵبژارده',
+		langs			: 'زمانه‌کان',
+		moreSuggestions	: 'پێشنیاری زیاتر',
+		ignore			: 'پشتگوێخستن',
+		ignoreAll		: 'پشتگوێخستنی هه‌مووی',
+		addWord			: 'زیادکردنی ووشه',
+		emptyDic		: 'ناوی �ه‌رهه‌نگ نابێت خاڵی بێت.',
+		noSuggestions	: 'No suggestions', // MISSING
+		optionsTab		: 'هه‌ڵبژارده',
+		allCaps			: 'پشتگوێخستنی وشانه‌ی پێکهاتووه له‌پیتی گه‌وره‌',
+		ignoreDomainNames : 'پشتگوێخستنی دۆمه‌ین',
+		mixedCase		: 'پشتگوێخستنی وشانه‌ی پێکهاتووه له‌پیتی گه‌وره‌و بچووك',
+		mixedWithDigits	: 'پشتگوێخستنی وشانه‌ی پێکهاتووه له‌ژماره',
+
+		languagesTab	: 'زمانه‌کان',
+
+		dictionariesTab	: '�ه‌رهه‌نگه‌کان',
+		dic_field_name	: 'ناوی �ه‌رهه‌نگ',
+		dic_create		: 'درووستکردن',
+		dic_restore		: 'گه‌ڕاندنه‌وه',
+		dic_delete		: 'سڕینه‌وه',
+		dic_rename		: 'گۆڕینی ناو',
+		dic_info		: 'له‌بنچینه‌دا �ه‌رهه‌نگی به‌کارهێنه‌ر کۆگاکردن کراوه‌ له‌ شه‌کرۆکه Cookie, هه‌رچۆنێك بێت شه‌کۆرکه سنووردار کراوه له‌ قه‌باره کۆگاکردن.کاتێك �ه‌رهه‌نگی به‌کارهێنه‌ر گه‌یشته‌ ئه‌م خاڵه‌ی که‌ناتوانرێت زیاتر کۆگاکردن بکرێت له‌ شه‌کرۆکه‌، ئه‌وسا �ه‌رهه‌نگه‌که‌ پێویسته‌ کۆگابکرێت له‌ ڕاژه‌که‌ی ئێمه‌.‌ بۆ کۆگاکردنی زانیاری تایبه‌تی �ه‌رهه‌نگه‌که‌ له‌ ڕاژه‌که‌ی ئێمه, پێویسته‌ ناوێك هه‌ڵبژێریت بۆ �ه‌رهه‌نگه‌که‌. گه‌ر تۆ �ه‌رهه‌نگێکی کۆگاکراوت هه‌یه‌, تکایه‌ ناوی �ه‌رهه‌نگه‌که‌ بنووسه‌ وه‌ کلیکی دوگمه‌ی گه‌ڕاندنه‌وه‌ بکه.',
+
+		aboutTab		: 'ده‌رباره‌ی'
+	},
+
+	about :
+	{
+		title		: 'ده‌رباره‌ی CKEditor',
+		dlgTitle	: 'ده‌رباره‌ی CKEditor',
+		help	: 'سه‌یری $1 بکه‌ بۆ یارمه‌تی.',
+		userGuide : 'ڕێپیشانده‌ری CKEditors',
+		moreInfo	: 'بۆ زانیاری زیاتری مۆڵه‌ت, تکایه‌ سه‌ردانی ماڵپه‌ڕه‌که‌مان بکه:',
+		copy		: 'ما�ی له‌به‌رگرتنه‌وه‌ی &copy; $1. گشتی پارێزراوه.'
+	},
+
+	maximize : 'ئەوپه‌ڕی گەورەیی',
+	minimize : 'ئەوپەڕی بچووکی',
+
+	fakeobjects :
+	{
+		anchor		: 'له‌نگه‌ر',
+		flash		: '�لاش',
+		iframe		: 'له‌چوارچێوه',
+		hiddenfield	: 'شاردنه‌وه‌ی خانه',
+		unknown		: 'به‌رکارێکی نه‌ناسراو'
+	},
+
+	resize : 'ڕابکێشە بۆ گۆڕینی قەبارەکەی',
+
+	colordialog :
+	{
+		title		: 'هه‌ڵبژاردنی ڕه‌نگ',
+		options	:	'هه‌ڵبژارده‌ی ڕه‌نگه‌کان',
+		highlight	: 'نیشانکردن',
+		selected	: 'هه‌ڵبژاردرا',
+		clear		: 'پاککردنه‌وه'
+	},
+
+	toolbarCollapse	: 'شاردنەوی هێڵی تووڵامراز',
+	toolbarExpand	: 'نیشاندانی هێڵی تووڵامراز',
+
+	toolbarGroups :
+	{
+		document : 'په‌ڕه',
+		clipboard : 'بڕین/پووچکردنه‌وه',
+		editing : 'چاکسازی',
+		forms : 'داڕشته',
+		basicstyles : 'شێوازی بنچینه‌یی',
+		paragraph : 'بڕگه',
+		links : 'به‌سته‌ر',
+		insert : 'خستنه‌ ناو',
+		styles : 'شێواز',
+		colors : 'ڕه‌نگه‌کان',
+		tools : 'ئامرازه‌کان'
+	},
+
+	bidi :
+	{
+		ltr : 'ئاراسته‌ی نووسه‌ له‌چه‌پ بۆ ڕاست',
+		rtl : 'ئاراسته‌ی نووسه‌ له‌ڕاست بۆ چه‌پ'
+	},
+
+	docprops :
+	{
+		label : 'خاسییه‌تی په‌ڕه',
+		title : 'خاسییه‌تی په‌ڕه',
+		design : 'شێوه‌کار',
+		meta : 'زانیاری مێتا',
+		chooseColor : '‌هه‌ڵبژێره',
+		other : 'هیتر...',
+		docTitle :	'سه‌ردێڕی په‌ڕه',
+		charset : 	'ده‌سته‌ی نووسه‌ی به‌کۆده‌که‌ر',
+		charsetOther : 'ده‌سته‌ی نووسه‌ی به‌کۆده‌که‌ری تر',
+		charsetASCII : 'ASCII',
+		charsetCE : 'ناوه‌ڕاست ئه‌وروپا',
+		charsetCT : 'چینی(Big5)',
+		charsetCR : 'سیریلیك',
+		charsetGR : 'یۆنانی',
+		charsetJP : 'ژاپۆن',
+		charsetKR : 'کۆریا',
+		charsetTR : 'تورکیا',
+		charsetUN : 'Unicode (UTF-8)',
+		charsetWE : 'ڕۆژئاوای ئه‌وروپا',
+		docType : 'سه‌رپه‌ڕه‌ی جۆری په‌ڕه',
+		docTypeOther : 'سه‌رپه‌ڕه‌ی جۆری په‌ڕه‌ی تر',
+		xhtmlDec : 'به‌یاننامه‌کانی XHTML له‌گه‌ڵدابێت',
+		bgColor : 'ڕه‌نگی پاشبنه‌ما',
+		bgImage : 'ناونیشانی به‌سته‌ری وێنه‌ی پاشبنه‌ما',
+		bgFixed : 'بێ هاتووچوپێکردنی (چه‌سپاو) پاشبنه‌مای وێنه',
+		txtColor : 'ڕه‌نگی ده‌ق',
+		margin : 'ته‌نیشت په‌ڕه‌',
+		marginTop : 'سه‌ره‌وه',
+		marginLeft : 'چه‌پ',
+		marginRight : 'ڕاست',
+		marginBottom : 'ژێره‌وه',
+		metaKeywords : 'به‌ڵگه‌نامه‌ی وشه‌ی کاریگه‌ر(به‌ کۆما لێکیان جیابکه‌وه)',
+		metaDescription : 'پێناسه‌ی لاپه‌ڕه',
+		metaAuthor : 'نووسه‌ر',
+		metaCopyright : 'ما�ی بڵاوکردنه‌وه‌ی',
+		previewHtml : '<p>ئه‌مه‌ وه‌ك نموونه‌ی <strong>ده‌قه</strong>. تۆ به‌کارده‌هێنیت <a href="javascript:void(0)">CKEditor</a>.</p>'
+	}
+};
diff --git a/web/imcms/ckeditor/lang/lt.js b/web/imcms/ckeditor/lang/lt.js
new file mode 100644
index 0000000000..a9c40245a2
--- /dev/null
+++ b/web/imcms/ckeditor/lang/lt.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.lt={dir:'ltr',editorTitle:'Pilnas redaktorius, %1',editorHelp:'Spauskite ALT 0 dėl pagalbos',toolbars:'Redaktoriaus įrankiai',editor:'Pilnas redaktorius',source:'Šaltinis',newPage:'Naujas puslapis',save:'Išsaugoti',preview:'Peržiūra',cut:'Iškirpti',copy:'Kopijuoti',paste:'Įdėti',print:'Spausdinti',underline:'Pabrauktas',bold:'Pusjuodis',italic:'Kursyvas',selectAll:'Pažymėti viską',removeFormat:'Panaikinti formatą',strike:'Perbrauktas',subscript:'Apatinis indeksas',superscript:'Viršutinis indeksas',horizontalrule:'Įterpti horizontalią liniją',pagebreak:'Įterpti puslapių skirtuką',pagebreakAlt:'Puslapio skirtukas',unlink:'Panaikinti nuorodą',undo:'Atšaukti',redo:'Atstatyti',common:{browseServer:'Naršyti po serverį',url:'URL',protocol:'Protokolas',upload:'Siųsti',uploadSubmit:'Siųsti į serverį',image:'Vaizdas',flash:'Flash',form:'Forma',checkbox:'Žymimasis langelis',radio:'Žymimoji akutė',textField:'Teksto laukas',textarea:'Teksto sritis',hiddenField:'Nerodomas laukas',button:'Mygtukas',select:'Atrankos laukas',imageButton:'Vaizdinis mygtukas',notSet:'<nėra nustatyta>',id:'Id',name:'Vardas',langDir:'Teksto kryptis',langDirLtr:'Iš kairės į dešinę (LTR)',langDirRtl:'Iš dešinės į kairę (RTL)',langCode:'Kalbos kodas',longDescr:'Ilgas aprašymas URL',cssClass:'Stilių lentelės klasės',advisoryTitle:'Konsultacinė antraštė',cssStyle:'Stilius',ok:'OK',cancel:'Nutraukti',close:'Uždaryti',preview:'Peržiūrėti',generalTab:'Bendros savybės',advancedTab:'Papildomas',validateNumberFailed:'Ši reikšmė nėra skai�ius.',confirmNewPage:'Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?',confirmCancel:'Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?',options:'Parametrai',target:'Tikslinė nuoroda',targetNew:'Naujas langas (_blank)',targetTop:'Viršutinis langas (_top)',targetSelf:'Esamas langas (_self)',targetParent:'Paskutinis langas (_parent)',langDirLTR:'Iš kairės į dešinę (LTR)',langDirRTL:'Iš dešinės į kairę (RTL)',styles:'Stilius',cssClasses:'Stilių klasės',width:'Plotis',height:'Aukštis',align:'Lygiuoti',alignLeft:'Kairę',alignRight:'Dešinę',alignCenter:'Centrą',alignTop:'Viršūnę',alignMiddle:'Vidurį',alignBottom:'Apa�ią',invalidValue:'Invalid value.',invalidHeight:'Aukštis turi būti nurodytas skai�iais.',invalidWidth:'Plotis turi būti nurodytas skai�iais.',invalidCssLength:'Reikšmė nurodyta "%1" laukui, turi būti teigiamas skai�ius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).',invalidHtmlLength:'Reikšmė nurodyta "%1" laukui, turi būti teigiamas skai�ius su arba be tinkamo HTML matavimo vieneto (px arba %).',invalidInlineStyle:'Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių "vardas : reikšmė", atskirta kabliataškiais.',cssLengthTooltip:'Įveskite reikšmę pikseliais arba skai�iais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).',unavailable:'%1<span class="cke_accessibility">, netinkamas</span>'},contextmenu:{options:'Kontekstinio meniu parametrai'},specialChar:{toolbar:'Įterpti specialų simbolį',title:'Pasirinkite specialų simbolį',options:'Specialaus simbolio nustatymai'},link:{toolbar:'Įterpti/taisyti nuorodą',other:'<kitas>',menu:'Taisyti nuorodą',title:'Nuoroda',info:'Nuorodos informacija',target:'Paskirties vieta',upload:'Siųsti',advanced:'Papildomas',type:'Nuorodos tipas',toUrl:'Nuoroda',toAnchor:'Žymė šiame puslapyje',toEmail:'El.paštas',targetFrame:'<kadras>',targetPopup:'<išskleidžiamas langas>',targetFrameName:'Paskirties kadro vardas',targetPopupName:'Paskirties lango vardas',popupFeatures:'Išskleidžiamo lango savybės',popupResizable:'Kintamas dydis',popupStatusBar:'Būsenos juosta',popupLocationBar:'Adreso juosta',popupToolbar:'Mygtukų juosta',popupMenuBar:'Meniu juosta',popupFullScreen:'Visas ekranas (IE)',popupScrollBars:'Slinkties juostos',popupDependent:'Priklausomas (Netscape)',popupLeft:'Kairė pozicija',popupTop:'Viršutinė pozicija',id:'Id',langDir:'Teksto kryptis',langDirLTR:'Iš kairės į dešinę (LTR)',langDirRTL:'Iš dešinės į kairę (RTL)',acccessKey:'Prieigos raktas',name:'Vardas',langCode:'Teksto kryptis',tabIndex:'Tabuliavimo indeksas',advisoryTitle:'Konsultacinė antraštė',advisoryContentType:'Konsultacinio turinio tipas',cssClasses:'Stilių lentelės klasės',charset:'Susietų išteklių simbolių lentelė',styles:'Stilius',rel:'Sąsajos',selectAnchor:'Pasirinkite žymę',anchorName:'Pagal žymės vardą',anchorId:'Pagal žymės Id',emailAddress:'El.pašto adresas',emailSubject:'Žinutės tema',emailBody:'Žinutės turinys',noAnchors:'(Šiame dokumente žymių nėra)',noUrl:'Prašome įvesti nuorodos URL',noEmail:'Prašome įvesti el.pašto adresą'},anchor:{toolbar:'Įterpti/modifikuoti žymę',menu:'Žymės savybės',title:'Žymės savybės',name:'Žymės vardas',errorName:'Prašome įvesti žymės vardą',remove:'Pašalinti žymę'},list:{numberedTitle:'Skaitmeninio sąrašo nustatymai',bulletedTitle:'Ženklelinio sąrašo nustatymai',type:'Rūšis',start:'Pradžia',validateStartNumber:'Sąrašo pradžios skaitmuo turi būti sveikas skai�ius.',circle:'Apskritimas',disc:'Diskas',square:'Kvadratas',none:'Niekas',notset:'<nenurodytas>',armenian:'Armėniški skaitmenys',georgian:'Gruziniški skaitmenys (an, ban, gan, t.t)',lowerRoman:'Mažosios Romėnų (i, ii, iii, iv, v, t.t)',upperRoman:'Didžiosios Romėnų (I, II, III, IV, V, t.t)',lowerAlpha:'Mažosios Alpha (a, b, c, d, e, t.t)',upperAlpha:'Didžiosios Alpha (A, B, C, D, E, t.t)',lowerGreek:'Mažosios Graikų (alpha, beta, gamma, t.t)',decimal:'Dešimtainis (1, 2, 3, t.t)',decimalLeadingZero:'Dešimtainis su nuliu priekyje (01, 02, 03, t.t)'},findAndReplace:{title:'Surasti ir pakeisti',find:'Rasti',replace:'Pakeisti',findWhat:'Surasti tekstą:',replaceWith:'Pakeisti tekstu:',notFoundMsg:'Nurodytas tekstas nerastas.',findOptions:'Paieškos nustatymai',matchCase:'Skirti didžiąsias ir mažąsias raides',matchWord:'Atitikti pilną žodį',matchCyclic:'Sutampantis cikliškumas',replaceAll:'Pakeisti viską',replaceSuccessMsg:'%1 sutapimas(ų) buvo pakeisti.'},table:{toolbar:'Lentelė',title:'Lentelės savybės',menu:'Lentelės savybės',deleteTable:'Šalinti lentelę',rows:'Eilutės',columns:'Stulpeliai',border:'Rėmelio dydis',widthPx:'taškais',widthPc:'procentais',widthUnit:'plo�io vienetas',cellSpace:'Tarpas tarp langelių',cellPad:'Trapas nuo langelio rėmo iki teksto',caption:'Antraštė',summary:'Santrauka',headers:'Antraštės',headersNone:'Nėra',headersColumn:'Pirmas stulpelis',headersRow:'Pirma eilutė',headersBoth:'Abu',invalidRows:'Skai�ius turi būti didesnis nei 0.',invalidCols:'Skai�ius turi būti didesnis nei 0.',invalidBorder:'Reikšmė turi būti nurodyta skai�iumi.',invalidWidth:'Reikšmė turi būti nurodyta skai�iumi.',invalidHeight:'Reikšmė turi būti nurodyta skai�iumi.',invalidCellSpacing:'Reikšmė turi būti nurodyta skai�iumi.',invalidCellPadding:'Reikšmė turi būti nurodyta skai�iumi.',cell:{menu:'Langelis',insertBefore:'Įterpti langelį prieš',insertAfter:'Įterpti langelį po',deleteCell:'Šalinti langelius',merge:'Sujungti langelius',mergeRight:'Sujungti su dešine',mergeDown:'Sujungti su apa�ia',splitHorizontal:'Skaidyti langelį horizontaliai',splitVertical:'Skaidyti langelį vertikaliai',title:'Cell nustatymai',cellType:'Cell rūšis',rowSpan:'Eilu�ių Span',colSpan:'Stulpelių Span',wordWrap:'Sutraukti raides',hAlign:'Horizontalus lygiavimas',vAlign:'Vertikalus lygiavimas',alignBaseline:'Apatinė linija',bgColor:'Fono spalva',borderColor:'Rėmelio spalva',data:'Data',header:'Antraštė',yes:'Taip',no:'Ne',invalidWidth:'Reikšmė turi būti skai�ius.',invalidHeight:'Reikšmė turi būti skai�ius.',invalidRowSpan:'Reikšmė turi būti skai�ius.',invalidColSpan:'Reikšmė turi būti skai�ius.',chooseColor:'Pasirinkite'},row:{menu:'Eilutė',insertBefore:'Įterpti eilutę prieš',insertAfter:'Įterpti eilutę po',deleteRow:'Šalinti eilutes'},column:{menu:'Stulpelis',insertBefore:'Įterpti stulpelį prieš',insertAfter:'Įterpti stulpelį po',deleteColumn:'Šalinti stulpelius'}},button:{title:'Mygtuko savybės',text:'Tekstas (Reikšmė)',type:'Tipas',typeBtn:'Mygtukas',typeSbm:'Siųsti',typeRst:'Išvalyti'},checkboxAndRadio:{checkboxTitle:'Žymimojo langelio savybės',radioTitle:'Žymimosios akutės savybės',value:'Reikšmė',selected:'Pažymėtas'},form:{title:'Formos savybės',menu:'Formos savybės',action:'Veiksmas',method:'Metodas',encoding:'Kodavimas'},select:{title:'Atrankos lauko savybės',selectInfo:'Informacija',opAvail:'Galimos parinktys',value:'Reikšmė',size:'Dydis',lines:'eilu�ių',chkMulti:'Leisti daugeriopą atranką',opText:'Tekstas',opValue:'Reikšmė',btnAdd:'Įtraukti',btnModify:'Modifikuoti',btnUp:'Aukštyn',btnDown:'Žemyn',btnSetValue:'Laikyti pažymėta reikšme',btnDelete:'Trinti'},textarea:{title:'Teksto srities savybės',cols:'Ilgis',rows:'Plotis'},textfield:{title:'Teksto lauko savybės',name:'Vardas',value:'Reikšmė',charWidth:'Ilgis simboliais',maxChars:'Maksimalus simbolių skai�ius',type:'Tipas',typeText:'Tekstas',typePass:'Slaptažodis'},hidden:{title:'Nerodomo lauko savybės',name:'Vardas',value:'Reikšmė'},image:{title:'Vaizdo savybės',titleButton:'Vaizdinio mygtuko savybės',menu:'Vaizdo savybės',infoTab:'Vaizdo informacija',btnUpload:'Siųsti į serverį',upload:'Nusiųsti',alt:'Alternatyvus Tekstas',lockRatio:'Išlaikyti proporciją',resetSize:'Atstatyti dydį',border:'Rėmelis',hSpace:'Hor.Erdvė',vSpace:'Vert.Erdvė',alertUrl:'Prašome įvesti vaizdo URL',linkTab:'Nuoroda',button2Img:'Ar norite mygtuką paversti paprastu paveiksliuku?',img2Button:'Ar norite paveiksliuką paversti mygtuku?',urlMissing:'Paveiksliuko nuorodos nėra.',validateBorder:'Reikšmė turi būti sveikas skai�ius.',validateHSpace:'Reikšmė turi būti sveikas skai�ius.',validateVSpace:'Reikšmė turi būti sveikas skai�ius.'},flash:{properties:'Flash savybės',propertiesTab:'Nustatymai',title:'Flash savybės',chkPlay:'Automatinis paleidimas',chkLoop:'Ciklas',chkMenu:'Leisti Flash meniu',chkFull:'Leisti per visą ekraną',scale:'Mastelis',scaleAll:'Rodyti visą',scaleNoBorder:'Be rėmelio',scaleFit:'Tikslus atitikimas',access:'Skripto priėjimas',accessAlways:'Visada',accessSameDomain:'Tas pats domenas',accessNever:'Niekada',alignAbsBottom:'Absoliu�ią apa�ią',alignAbsMiddle:'Absoliutų vidurį',alignBaseline:'Apatinę liniją',alignTextTop:'Teksto viršūnę',quality:'Kokybė',qualityBest:'Geriausia',qualityHigh:'Gera',qualityAutoHigh:'Automatiškai Gera',qualityMedium:'Vidutinė',qualityAutoLow:'Automatiškai Žema',qualityLow:'Žema',windowModeWindow:'Langas',windowModeOpaque:'Nepermatomas',windowModeTransparent:'Permatomas',windowMode:'Lango režimas',flashvars:'Flash kintamieji',bgcolor:'Fono spalva',hSpace:'Hor.Erdvė',vSpace:'Vert.Erdvė',validateSrc:'Prašome įvesti nuorodos URL',validateHSpace:'HSpace turi būti skai�ius.',validateVSpace:'VSpace turi būti skai�ius.'},spellCheck:{toolbar:'Rašybos tikrinimas',title:'Tikrinti klaidas',notAvailable:'Atleiskite, šiuo metu servisas neprieinamas.',errorLoading:'Klaida įkraunant servisą: %s.',notInDic:'Žodyne nerastas',changeTo:'Pakeisti į',btnIgnore:'Ignoruoti',btnIgnoreAll:'Ignoruoti visus',btnReplace:'Pakeisti',btnReplaceAll:'Pakeisti visus',btnUndo:'Atšaukti',noSuggestions:'- Nėra pasiūlymų -',progress:'Vyksta rašybos tikrinimas...',noMispell:'Rašybos tikrinimas baigtas: Nerasta rašybos klaidų',noChanges:'Rašybos tikrinimas baigtas: Nėra pakeistų žodžių',oneChange:'Rašybos tikrinimas baigtas: Vienas žodis pakeistas',manyChanges:'Rašybos tikrinimas baigtas: Pakeista %1 žodžių',ieSpellDownload:'Rašybos tikrinimas neinstaliuotas. Ar Jūs norite jį dabar atsisiųsti?'},smiley:{toolbar:'Veideliai',title:'Įterpti veidelį',options:'Šypsenėlių nustatymai'},elementsPath:{eleLabel:'Elemento kelias',eleTitle:'%1 elementas'},numberedlist:'Numeruotas sąrašas',bulletedlist:'Suženklintas sąrašas',indent:'Padidinti įtrauką',outdent:'Sumažinti įtrauką',justify:{left:'Lygiuoti kairę',center:'Centruoti',right:'Lygiuoti dešinę',block:'Lygiuoti abi puses'},blockquote:'Citata',clipboard:{title:'Įdėti',cutError:'Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).',copyError:'Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).',pasteMsg:'Žemiau esan�iame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.',securityMsg:'Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.',pasteArea:'Įkelti dalį'},pastefromword:{confirmCleanup:'Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?',toolbar:'Įdėti iš Word',title:'Įdėti iš Word',error:'Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto'},pasteText:{button:'Įdėti kaip gryną tekstą',title:'Įdėti kaip gryną tekstą'},templates:{button:'Šablonai',title:'Turinio šablonai',options:'Template Options',insertOption:'Pakeisti dabartinį turinį pasirinktu šablonu',selectPromptMsg:'Pasirinkite norimą šabloną<br>(<b>Dėmesio!</b> esamas turinys bus prarastas):',emptyListMsg:'(Šablonų sąrašas tuš�ias)'},showBlocks:'Rodyti blokus',stylesCombo:{label:'Stilius',panelTitle:'Stilių formatavimas',panelTitle1:'Blokų stiliai',panelTitle2:'Vidiniai stiliai',panelTitle3:'Objektų stiliai'},format:{label:'Šrifto formatas',panelTitle:'Šrifto formatas',tag_p:'Normalus',tag_pre:'Formuotas',tag_address:'Kreipinio',tag_h1:'Antraštinis 1',tag_h2:'Antraštinis 2',tag_h3:'Antraštinis 3',tag_h4:'Antraštinis 4',tag_h5:'Antraštinis 5',tag_h6:'Antraštinis 6',tag_div:'Normalus (DIV)'},div:{title:'Sukurti Div elementą',toolbar:'Sukurti Div elementą',cssClassInputLabel:'Stilių klasės',styleSelectLabel:'Stilius',IdInputLabel:'Id',languageCodeInputLabel:' Kalbos kodas',inlineStyleInputLabel:'Vidiniai stiliai',advisoryTitleInputLabel:'Patariamas pavadinimas',langDirLabel:'Kalbos nurodymai',langDirLTRLabel:'Iš kairės į dešinę (LTR)',langDirRTLLabel:'Iš dešinės į kairę (RTL)',edit:'Redaguoti Div',remove:'Pašalinti Div'},iframe:{title:'IFrame nustatymai',toolbar:'IFrame',noUrl:'Nurodykite iframe nuorodą',scrolling:'Įjungti slankiklius',border:'Rodyti rėmelį'},font:{label:'Šriftas',voiceLabel:'Šriftas',panelTitle:'Šriftas'},fontSize:{label:'Šrifto dydis',voiceLabel:'Šrifto dydis',panelTitle:'Šrifto dydis'},colorButton:{textColorTitle:'Teksto spalva',bgColorTitle:'Fono spalva',panelTitle:'Spalva',auto:'Automatinis',more:'Daugiau spalvų...'},colors:{'000':'Juoda',800000:'Kaštoninė','8B4513':'Tamsiai ruda','2F4F4F':'Pilka tamsaus šiferio','008080':'Teal','000080':'Karinis','4B0082':'Indigo',696969:'Tamsiai pilka',B22222:'Ugnies',A52A2A:'Ruda',DAA520:'Aukso','006400':'Tamsiai žalia','40E0D0':'Turquoise','0000CD':'Vidutinė mėlyna',800080:'Violetinė',808080:'Pilka',F00:'Raudona',FF8C00:'Tamsiai oranžinė',FFD700:'Auksinė','008000':'Žalia','0FF':'Žydra','00F':'Mėlyna',EE82EE:'Violetinė',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Oranžinė',FFFF00:'Geltona','00FF00':'Citrinų',AFEEEE:'Pale Turquoise',ADD8E6:'Šviesiai mėlyna',DDA0DD:'Plum',D3D3D3:'Šviesiai pilka',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Šviesiai geltona',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'Balta'},scayt:{title:'Tikrinti klaidas kai rašoma',opera_title:'Nepalaikoma naršyklėje Opera',enable:'Įjungti SCAYT',disable:'Išjungti SCAYT',about:'Apie SCAYT',toggle:'Perjungti SCAYT',options:'Parametrai',langs:'Kalbos',moreSuggestions:'Daugiau patarimų',ignore:'Ignoruoti',ignoreAll:'Ignoruoti viską',addWord:'Pridėti žodį',emptyDic:'Žodyno vardas neturėtų būti tuš�ias.',noSuggestions:'No suggestions',optionsTab:'Parametrai',allCaps:'Ignoruoti visas didžiąsias raides',ignoreDomainNames:'Ignoruoti domenų vardus',mixedCase:'Ignoruoti maišyto dydžio raides',mixedWithDigits:'Ignoruoti raides su skai�iais',languagesTab:'Kalbos',dictionariesTab:'Žodynai',dic_field_name:'Žodyno pavadinimas',dic_create:'Sukurti',dic_restore:'Atstatyti',dic_delete:'Ištrinti',dic_rename:'Pervadinti',dic_info:'Paprastai žodynas yra saugojamas sausainėliuose (cookies), kurių dydis, bet kokiu atveju, yra apribotas. Esant sausainėlių apimties pervišiui, viskas bus saugoma serveryje. Jei norite iš kart viską saugoti serveryje, turite sugalvoti žodynui pavadinimą. Jei jau turite žodyną, įrašykite pavadinimą ir nuspauskite Atstatyti mygtuką.',aboutTab:'Apie'},about:{title:'Apie CKEditor',dlgTitle:'Apie CKEditor',help:'Patikrinkite $1 dėl pagalbos.',userGuide:'CKEditor Vartotojo Gidas',moreInfo:'Dėl licencijavimo apsilankykite mūsų svetainėje:',copy:'Copyright &copy; $1. Visos teiss saugomos.'},maximize:'Išdidinti',minimize:'Sumažinti',fakeobjects:{anchor:'Žymė',flash:'Flash animacija',iframe:'IFrame',hiddenfield:'Paslėptas laukas',unknown:'Nežinomas objektas'},resize:'Pavilkite, kad pakeistumėte dydį',colordialog:{title:'Pasirinkite spalvą',options:'Spalvos nustatymai',highlight:'Paryškinti',selected:'Pasirinkta spalva',clear:'Išvalyti'},toolbarCollapse:'Apjungti įrankių juostą',toolbarExpand:'Išplėsti įrankių juostą',toolbarGroups:{document:'Dokumentas',clipboard:'Atmintinė/Atgal',editing:'Redagavimas',forms:'Formos',basicstyles:'Pagrindiniai stiliai',paragraph:'Paragrafas',links:'Nuorodos',insert:'Įterpti',styles:'Stiliai',colors:'Spalvos',tools:'Įrankiai'},bidi:{ltr:'Tekstas iš kairės į dešinę',rtl:'Tekstas iš dešinės į kairę'},docprops:{label:'Dokumento savybės',title:'Dokumento savybės',design:'Išdėstymas',meta:'Meta duomenys',chooseColor:'Pasirinkite',other:'<kitas>',docTitle:'Puslapio antraštė',charset:'Simbolių kodavimo lentelė',charsetOther:'Kita simbolių kodavimo lentelė',charsetASCII:'ASCII',charsetCE:'Centrinės Europos',charsetCT:'Tradicinės kinų (Big5)',charsetCR:'Kirilica',charsetGR:'Graikų',charsetJP:'Japonų',charsetKR:'Korėjie�ių',charsetTR:'Turkų',charsetUN:'Unikodas (UTF-8)',charsetWE:'Vakarų Europos',docType:'Dokumento tipo antraštė',docTypeOther:'Kita dokumento tipo antraštė',xhtmlDec:'Įtraukti XHTML deklaracijas',bgColor:'Fono spalva',bgImage:'Fono paveikslėlio nuoroda (URL)',bgFixed:'Neslenkantis fonas',txtColor:'Teksto spalva',margin:'Puslapio kraštinės',marginTop:'Viršuje',marginLeft:'Kairėje',marginRight:'Dešinėje',marginBottom:'Apa�ioje',metaKeywords:'Dokumento indeksavimo raktiniai žodžiai (atskirti kableliais)',metaDescription:'Dokumento apibūdinimas',metaAuthor:'Autorius',metaCopyright:'Autorinės teisės',previewHtml:'<p>Tai yra <strong>pavyzdinis tekstas</strong>. Jūs naudojate <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/lv.js b/web/imcms/ckeditor/lang/lv.js
new file mode 100644
index 0000000000..051d3a1499
--- /dev/null
+++ b/web/imcms/ckeditor/lang/lv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.lv={dir:'ltr',editorTitle:'Bag�tin�t� teksta redaktors, %1',editorHelp:'Palīdzībai, nospiediet ALT 0 ',toolbars:'Redaktora rīkjoslas',editor:'Bag�tin�t� teksta redaktors',source:'HTML kods',newPage:'Jauna lapa',save:'Saglab�t',preview:'Priekšskatīt',cut:'Izgriezt',copy:'Kopēt',paste:'Ielīmēt',print:'Druk�t',underline:'Pasvītrots',bold:'Treknin�ts',italic:'Kursīvs',selectAll:'Iezīmēt visu',removeFormat:'Noņemt stilus',strike:'P�rsvītrots',subscript:'Apakšrakst�',superscript:'Augšrakst�',horizontalrule:'Ievietot horizont�lu Atdalīt�jsvītru',pagebreak:'Ievietot lapas p�rtraukumu drukai',pagebreakAlt:'Lapas p�rnesums',unlink:'Noņemt hipersaiti',undo:'Atcelt',redo:'Atk�rtot',common:{browseServer:'Skatīt servera saturu',url:'URL',protocol:'Protokols',upload:'Augšupiel�dēt',uploadSubmit:'Nosūtīt serverim',image:'Attēls',flash:'Flash',form:'Forma',checkbox:'Izvēles rūtiņa',radio:'Radio poga',textField:'Teksta rinda',textarea:'Teksta laukums',hiddenField:'Paslēpts lauks',button:'Poga',select:'Iezīmēšanas lauks',imageButton:'Attēlpoga',notSet:'<nav iestatīts>',id:'Id',name:'Nosaukums',langDir:'Valodas lasīšanas virziens',langDirLtr:'No kreis�s uz labo (LTR)',langDirRtl:'No lab�s uz kreiso (RTL)',langCode:'Valodas kods',longDescr:'Gara apraksta Hipersaite',cssClass:'Stilu saraksta klases',advisoryTitle:'Konsultatīvs virsraksts',cssStyle:'Stils',ok:'Apstiprin�t',cancel:'Atcelt',close:'Aizvērt',preview:'Priekšskatījums',generalTab:'Visp�rīgi',advancedTab:'Izvērstais',validateNumberFailed:'Šī vērtība nav skaitlis',confirmNewPage:'Jebkuras nesaglab�t�s izmaiņas tiks zaudētas. Vai tieš�m vēlaties atvērt jaunu lapu?',confirmCancel:'Daži no uzst�dījumiem ir mainīti. Vai tieš�m vēlaties aizvērt šo dialogu?',options:'Uzst�dījumi',target:'Mērķis',targetNew:'Jauns logs (_blank)',targetTop:'Virsējais logs (_top)',targetSelf:'Tas pats logs (_self)',targetParent:'Avota logs (_parent)',langDirLTR:'Kreisais uz Labo (LTR)',langDirRTL:'Labais uz Kreiso (RTL)',styles:'Stils',cssClasses:'Stilu klases',width:'Platums',height:'Augstums',align:'Līdzin�jums',alignLeft:'Pa kreisi',alignRight:'Pa labi',alignCenter:'Centrēti',alignTop:'Augš�',alignMiddle:'Pa vidu',alignBottom:'Apakš�',invalidValue:'Nekorekta vērtība',invalidHeight:'Augstumam j�būt skaitlim.',invalidWidth:'Platumam j�būt skaitlim',invalidCssLength:'Laukam "%1" nor�dītajai vērtībai j�būt pozitīvam skaitlim ar vai bez korekt�m CSS mērvienīb�m (px, %, in, cm, mm, em, ex, pt, vai pc).',invalidHtmlLength:'Laukam "%1" nor�dītajai vērtībai j�būt pozitīvam skaitlim ar vai bez korekt�m HTML mērvienīb�m (px vai %).',invalidInlineStyle:'Iekļautaj� stil� nor�dītajai vērtībai j�sast�v no viena vai vair�kiem p�riem pēc forma\'ta "nosaukums: vērtība", atdalītiem ar semikolu.',cssLengthTooltip:'Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).',unavailable:'%1<span class="cke_accessibility">, nav pieejams</span>'},contextmenu:{options:'Uznirstoš�s izvēlnes uzst�dījumi'},specialChar:{toolbar:'Ievietot speci�lo simbolu',title:'Ievietot īpašu simbolu',options:'Speci�lo simbolu uzst�dījumi'},link:{toolbar:'Ievietot/Labot hipersaiti',other:'<cits>',menu:'Labot hipersaiti',title:'Hipersaite',info:'Hipersaites inform�cija',target:'Mērķis',upload:'Augšupiel�dēt',advanced:'Izvērstais',type:'Hipersaites tips',toUrl:'Adrese',toAnchor:'Iezīme šaj� lap�',toEmail:'E-pasts',targetFrame:'<ietvars>',targetPopup:'<uznirstoš� log�>',targetFrameName:'Mērķa ietvara nosaukums',targetPopupName:'Uznirstoš� loga nosaukums',popupFeatures:'Uznirstoš� loga nosaukums īpašības',popupResizable:'Mērogojams',popupStatusBar:'Statusa josla',popupLocationBar:'Atrašan�s vietas josla',popupToolbar:'Rīku josla',popupMenuBar:'Izvēlnes josla',popupFullScreen:'Piln� ekr�n� (IE)',popupScrollBars:'Ritjoslas',popupDependent:'Atkarīgs (Netscape)',popupLeft:'Kreis� koordin�te',popupTop:'Augšēj� koordin�te',id:'ID',langDir:'Valodas lasīšanas virziens',langDirLTR:'No kreis�s uz labo (LTR)',langDirRTL:'No lab�s uz kreiso (RTL)',acccessKey:'Pieejas taustiņš',name:'Nosaukums',langCode:'Valodas kods',tabIndex:'Ciļņu indekss',advisoryTitle:'Konsultatīvs virsraksts',advisoryContentType:'Konsultatīvs satura tips',cssClasses:'Stilu saraksta klases',charset:'Pievienot� resursa kodējums',styles:'Stils',rel:'Rel�cija',selectAnchor:'Izvēlēties iezīmi',anchorName:'Pēc iezīmes nosaukuma',anchorId:'Pēc elementa ID',emailAddress:'E-pasta adrese',emailSubject:'Ziņas tēma',emailBody:'Ziņas saturs',noAnchors:'(Šaj� dokument� nav iezīmju)',noUrl:'Lūdzu nor�di hipersaiti',noEmail:'Lūdzu nor�di e-pasta adresi'},anchor:{toolbar:'Ievietot/Labot iezīmi',menu:'Labot iezīmi',title:'Iezīmes uzst�dījumi',name:'Iezīmes nosaukums',errorName:'Lūdzu nor�diet iezīmes nosaukumu',remove:'Noņemt iezīmi'},list:{numberedTitle:'Numurēta saraksta uzst�dījumi',bulletedTitle:'Vienk�rša saraksta uzst�dījumi',type:'Tips',start:'S�kt',validateStartNumber:'Saraksta s�kuma numuram j�būt veselam skaitlim',circle:'Aplis',disc:'Disks',square:'Kvadr�ts',none:'Nekas',notset:'<nav nor�dīts>',armenian:'Armēņu skaitļi',georgian:'Gruzīņu skaitļi (an, ban, gan, utt)',lowerRoman:'Mazie rom�ņu (i, ii, iii, iv, v, utt)',upperRoman:'Lielie rom�ņu (I, II, III, IV, V, utt)',lowerAlpha:'Mazie alfabēta (a, b, c, d, e, utt)',upperAlpha:'Lielie alfabēta (A, B, C, D, E, utt)',lowerGreek:'Mazie grieķu (alfa, beta, gamma, utt)',decimal:'Decim�lie (1, 2, 3, utt)',decimalLeadingZero:'Decim�lie ar nulli (01, 02, 03, utt)'},findAndReplace:{title:'Meklēt un aizvietot',find:'Meklēt',replace:'Nomainīt',findWhat:'Meklēt:',replaceWith:'Nomainīt uz:',notFoundMsg:'Nor�dīt� fr�ze netika atrasta.',findOptions:'Meklēt uzst�dījumi',matchCase:'Reģistrjūtīgs',matchWord:'J�sakrīt pilnīb�',matchCyclic:'Sakrist cikliski',replaceAll:'Aizvietot visu',replaceSuccessMsg:'%1 gadījums(i) aizvietoti'},table:{toolbar:'Tabula',title:'Tabulas īpašības',menu:'Tabulas īpašības',deleteTable:'Dzēst tabulu',rows:'Rindas',columns:'Kolonnas',border:'R�mja izmērs',widthPx:'pikseļos',widthPc:'procentu�li',widthUnit:'platuma mērvienība',cellSpace:'Rūtiņu atstatums',cellPad:'Rūtiņu nobīde',caption:'Leģenda',summary:'Anot�cija',headers:'Virsraksti',headersNone:'Nekas',headersColumn:'Pirm� kolona',headersRow:'Pirm� rinda',headersBoth:'Abi',invalidRows:'Rindu skaitam j�būt liel�kam par 0',invalidCols:'Kolonu skaitam j�būt liel�kam par 0',invalidBorder:'R�mju izmēram j�būt skaitlim',invalidWidth:'Tabulas platumam j�būt skaitlim',invalidHeight:'Tabulas augstumam j�būt skaitlim',invalidCellSpacing:'Šūnu atstarpēm j�būt pozitīvam skaitlim',invalidCellPadding:'Šūnu atk�pēm j�būt pozitīvam skaitlim',cell:{menu:'Šūna',insertBefore:'Pievienot šūnu pirms',insertAfter:'Pievienot šūnu pēc',deleteCell:'Dzēst rūtiņas',merge:'Apvienot rūtiņas',mergeRight:'Apvieno pa labi',mergeDown:'Apvienot uz leju',splitHorizontal:'Sadalīt šūnu horizont�li',splitVertical:'Sadalīt šūnu vertik�li',title:'Šūnas uzst�dījumi',cellType:'Šūnas tips',rowSpan:'Apvienotas rindas',colSpan:'Apvienotas kolonas',wordWrap:'V�rdu p�rnese',hAlign:'Horizont�lais novietojums',vAlign:'Vertik�lais novietojums',alignBaseline:'Pamatrinda',bgColor:'Fona kr�sa',borderColor:'R�mja kr�sa',data:'Dati',header:'Virsraksts',yes:'J�',no:'Nē',invalidWidth:'Šūnas platumam j�būt skaitlim',invalidHeight:'Šūnas augstumam j�būt skaitlim',invalidRowSpan:'Apvienojamo rindu skaitam j�būt veselam skaitlim',invalidColSpan:'Apvienojamo kolonu skaitam j�būt veselam skaitlim',chooseColor:'Izvēlēties'},row:{menu:'Rinda',insertBefore:'Ievietot rindu pirms',insertAfter:'Ievietot rindu pēc',deleteRow:'Dzēst rindas'},column:{menu:'Kolonna',insertBefore:'Ievietot kolonu pirms',insertAfter:'Ievieto kolonu pēc',deleteColumn:'Dzēst kolonnas'}},button:{title:'Pogas īpašības',text:'Teksts (vērtība)',type:'Tips',typeBtn:'Poga',typeSbm:'Nosūtīt',typeRst:'Atcelt'},checkboxAndRadio:{checkboxTitle:'Atzīmēšanas kastītes īpašības',radioTitle:'Izvēles poga īpašības',value:'Vērtība',selected:'Iezīmēts'},form:{title:'Formas īpašības',menu:'Formas īpašības',action:'Darbība',method:'Metode',encoding:'Kodējums'},select:{title:'Iezīmēšanas lauka īpašības',selectInfo:'Inform�cija',opAvail:'Pieejam�s iespējas',value:'Vērtība',size:'Izmērs',lines:'rindas',chkMulti:'Atļaut vair�kus iezīmējumus',opText:'Teksts',opValue:'Vērtība',btnAdd:'Pievienot',btnModify:'Veikt izmaiņas',btnUp:'Augšup',btnDown:'Lejup',btnSetValue:'Noteikt k� iezīmēto vērtību',btnDelete:'Dzēst'},textarea:{title:'Teksta laukuma īpašības',cols:'Kolonnas',rows:'Rindas'},textfield:{title:'Teksta rindas  īpašības',name:'Nosaukums',value:'Vērtība',charWidth:'Simbolu platums',maxChars:'Simbolu maksim�lais daudzums',type:'Tips',typeText:'Teksts',typePass:'Parole'},hidden:{title:'Paslēpt�s teksta rindas īpašības',name:'Nosaukums',value:'Vērtība'},image:{title:'Attēla īpašības',titleButton:'Attēlpogas īpašības',menu:'Attēla īpašības',infoTab:'Inform�cija par attēlu',btnUpload:'Nosūtīt serverim',upload:'Augšupiel�dēt',alt:'Alternatīvais teksts',lockRatio:'Nemainīga Augstuma/Platuma attiecība',resetSize:'Atjaunot s�kotnējo izmēru',border:'R�mis',hSpace:'Horizont�l� telpa',vSpace:'Vertik�l� telpa',alertUrl:'Lūdzu nor�dīt attēla hipersaiti',linkTab:'Hipersaite',button2Img:'Vai vēlaties p�rveidot izvēlēto attēla pogu uz attēla?',img2Button:'Vai vēlaties p�rveidot izvēlēto attēlu uz attēla pogas?',urlMissing:'Trūkst attēla atrašan�s adrese.',validateBorder:'Apmalei j�būt veselam skaitlim',validateHSpace:'HSpace j�būt veselam skaitlim',validateVSpace:'VSpace j�būt veselam skaitlim'},flash:{properties:'Flash īpašības',propertiesTab:'Uzst�dījumi',title:'Flash īpašības',chkPlay:'Autom�tiska atskaņošana',chkLoop:'Nep�rtraukti',chkMenu:'Atļaut Flash izvēlni',chkFull:'Pilnekr�ns',scale:'Mainīt izmēru',scaleAll:'R�dīt visu',scaleNoBorder:'Bez r�mja',scaleFit:'Precīzs izmērs',access:'Skripta pieeja',accessAlways:'Vienmēr',accessSameDomain:'Tas pats domēns',accessNever:'Nekad',alignAbsBottom:'Absolūti apakš�',alignAbsMiddle:'Absolūti vertik�li centrēts',alignBaseline:'Pamatrind�',alignTextTop:'Teksta augš�',quality:'Kvalit�te',qualityBest:'Lab�k�',qualityHigh:'Augsta',qualityAutoHigh:'Autom�tiski Augsta',qualityMedium:'Vidēja',qualityAutoLow:'Autom�tiski Zema',qualityLow:'Zema',windowModeWindow:'Logs',windowModeOpaque:'Necaurspīdīgs',windowModeTransparent:'Caurspīdīgs',windowMode:'Loga režīms',flashvars:'Flash mainīgie',bgcolor:'Fona kr�sa',hSpace:'Horizont�l� telpa',vSpace:'Vertik�l� telpa',validateSrc:'Lūdzu nor�di hipersaiti',validateHSpace:'Hspace j�būt skaitlim',validateVSpace:'Vspace j�būt skaitlim'},spellCheck:{toolbar:'Pareizrakstības p�rbaude',title:'P�rbaudīt gramatiku',notAvailable:'Atvainojiet, bet serviss šobrīd nav pieejams.',errorLoading:'Kļūda iel�dējot aplik�cijas servisa adresi: %s.',notInDic:'Netika atrasts v�rdnīc�',changeTo:'Nomainīt uz',btnIgnore:'Ignorēt',btnIgnoreAll:'Ignorēt visu',btnReplace:'Aizvietot',btnReplaceAll:'Aizvietot visu',btnUndo:'Atcelt',noSuggestions:'- Nav ieteikumu -',progress:'Notiek pareizrakstības p�rbaude...',noMispell:'Pareizrakstības p�rbaude pabeigta: kļūdas netika atrastas',noChanges:'Pareizrakstības p�rbaude pabeigta: nekas netika labots',oneChange:'Pareizrakstības p�rbaude pabeigta: 1 v�rds izmainīts',manyChanges:'Pareizrakstības p�rbaude pabeigta: %1 v�rdi tika mainīti',ieSpellDownload:'Pareizrakstības p�rbaudīt�js nav pievienots. Vai vēlaties to lejupiel�dēt tagad?'},smiley:{toolbar:'Smaidiņi',title:'Ievietot smaidiņu',options:'Smaidiņu uzst�dījumi'},elementsPath:{eleLabel:'Elementa ceļš',eleTitle:'%1 elements'},numberedlist:'Numurēts saraksts',bulletedlist:'Pievienot/Noņemt vienk�ršu sarakstu',indent:'Palielin�t atk�pi',outdent:'Samazin�t atk�pi',justify:{left:'Izlīdzin�t pa kreisi',center:'Izlīdzin�t pret centru',right:'Izlīdzin�t pa labi',block:'Izlīdzin�t malas'},blockquote:'Bloka cit�ts',clipboard:{title:'Ievietot',cutError:'Jūsu p�rlūkprogrammas drošības iestatījumi nepieļauj redaktoram autom�tiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.',copyError:'Jūsu p�rlūkprogrammas drošības iestatījumi nepieļauj redaktoram autom�tiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.',pasteMsg:'Lūdzu, ievietojiet tekstu šaj� laukum�, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.',securityMsg:'Jūsu p�rlūka drošības uzst�dījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums j�ielīmē atk�rtoti šaj� log�.',pasteArea:'Ielīmēšanas zona'},pastefromword:{confirmCleanup:'Teksts, kuru vēlaties ielīmēt, izskat�s ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?',toolbar:'Ievietot no Worda',title:'Ievietot no Worda',error:'Iekšējas kļūdas dēļ, neizdev�s iztīrīt ielīmētos datus.'},pasteText:{button:'Ievietot k� vienk�ršu tekstu',title:'Ievietot k� vienk�ršu tekstu'},templates:{button:'Sagataves',title:'Satura sagataves',options:'Sagataves uzst�dījumi',insertOption:'Aizvietot pašreizējo saturu',selectPromptMsg:'Lūdzu, nor�diet sagatavi, ko atvērt editor�<br>(patreizējie dati tiks zaudēti):',emptyListMsg:'(Nav nor�dītas sagataves)'},showBlocks:'Par�dīt blokus',stylesCombo:{label:'Stils',panelTitle:'Formatēšanas stili',panelTitle1:'Bloka stili',panelTitle2:'iekļautie stili',panelTitle3:'Objekta stili'},format:{label:'Form�ts',panelTitle:'Form�ts',tag_p:'Norm�ls teksts',tag_pre:'Formatēts teksts',tag_address:'Adrese',tag_h1:'Virsraksts 1',tag_h2:'Virsraksts 2',tag_h3:'Virsraksts 3',tag_h4:'Virsraksts 4',tag_h5:'Virsraksts 5',tag_h6:'Virsraksts 6',tag_div:'Rindkopa (DIV)'},div:{title:'Izveidot div konteineri',toolbar:'Izveidot div konteineri',cssClassInputLabel:'Stilu klases',styleSelectLabel:'Stils',IdInputLabel:'Id',languageCodeInputLabel:'Valodas kods',inlineStyleInputLabel:'Iekļautais stils',advisoryTitleInputLabel:'Konsultatīvs virsraksts',langDirLabel:'Valodas virziens',langDirLTRLabel:'Kreisais uz Labo (LTR)',langDirRTLLabel:'Labais uz kreiso (RTL)',edit:'Labot Div',remove:'Noņemt Div'},iframe:{title:'IFrame uzst�dījumi',toolbar:'IFrame',noUrl:'Nor�diet iframe adresi',scrolling:'Atļaut ritjoslas',border:'R�dīt r�mi'},font:{label:'Šrifts',voiceLabel:'Fonts',panelTitle:'Šrifts'},fontSize:{label:'Izmērs',voiceLabel:'Fonta izmeŗs',panelTitle:'Izmērs'},colorButton:{textColorTitle:'Teksta kr�sa',bgColorTitle:'Fona kr�sa',panelTitle:'Kr�sa',auto:'Autom�tiska',more:'Plaš�ka palete...'},colors:{'000':'Melns',800000:'Sarkanbrūns','8B4513':'Sedlu brūns','2F4F4F':'Tumšas t�feles pelēks','008080':'Zili-zaļš','000080':'Jūras','4B0082':'Indigo',696969:'Tumši pelēks',B22222:'Ķieģeļsarkans',A52A2A:'Brūns',DAA520:'Zelta','006400':'Tumši zaļš','40E0D0':'Tirkīzs','0000CD':'Vidēji zils',800080:'Purpurs',808080:'Pelēks',F00:'Sarkans',FF8C00:'Tumši oranžs',FFD700:'Zelta','008000':'Zaļš','0FF':'Tumšzils','00F':'Zils',EE82EE:'Violets',A9A9A9:'Pelēks',FFA07A:'Gaiši laškr�sas',FFA500:'Oranžs',FFFF00:'Dzeltens','00FF00':'Laima',AFEEEE:'Gaiši tirkīza',ADD8E6:'Gaiši zils',DDA0DD:'Plūmju',D3D3D3:'Gaiši pelēks',FFF0F5:'Lavandas s�rts',FAEBD7:'Antīki balts',FFFFE0:'Gaiši dzeltens',F0FFF0:'Meduspile',F0FFFF:'Debesszils',F0F8FF:'Alises zils',E6E6FA:'Lavanda',FFF:'Balts'},scayt:{title:'P�rbaudīt gramatiku rakstot',opera_title:'Opera neatbalsta',enable:'Ieslēgt SCAYT',disable:'Atslēgt SCAYT',about:'Par SCAYT',toggle:'P�rslēgt SCAYT',options:'Uzst�dījumi',langs:'Valodas',moreSuggestions:'Vair�k ieteikumi',ignore:'Ignorēt',ignoreAll:'Ignorēt visu',addWord:'Pievienot v�rdu',emptyDic:'V�rdnīcas nosaukums nevar būt tukšs.',noSuggestions:'No suggestions',optionsTab:'Uzst�dījumi',allCaps:'Ignorēt v�rdus ar lielajiem burtiem',ignoreDomainNames:'Ignorēt domēnu nosaukumus',mixedCase:'Ignorēt v�rdus ar jauktu reģistru burtiem',mixedWithDigits:'Ignorēt v�rdus ar skaitļiem',languagesTab:'Valodas',dictionariesTab:'V�rdnīcas',dic_field_name:'V�rdnīcas nosaukums',dic_create:'Izveidot',dic_restore:'Atjaunot',dic_delete:'Dzēst',dic_rename:'P�rsaukt',dic_info:'S�kum� lietot�ja v�rdnīca tiek glab�ta Cookie. Diemžēl, Cookie ir ierobežots izmērs. Kad v�rdnīca sasniegs izmēru, ka to vairs nevar glab�t Cookie, t� tiks noglab�ta uz servera. Lai saglab�tu personīgo v�rdnīcu uz jūsu servera, jums j�nor�da t�s nosaukums. Ja jūs jau esiet noglab�juši v�rdnīcu, lūdzu ierakstiet t�s nosaukum un nospiediet Atjaunot pogu.',aboutTab:'Par'},about:{title:'Par CKEditor',dlgTitle:'Par CKEditor',help:'P�rbaudiet $1 palīdzībai.',userGuide:'CKEditor Lietot�ja pam�cība',moreInfo:'Inform�cijai par licenzēšanu apmeklējiet mūsu m�jas lapu:',copy:'Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.'},maximize:'Maksimizēt',minimize:'Minimizēt',fakeobjects:{anchor:'Iezīme',flash:'Flash anim�cija',iframe:'Iframe',hiddenfield:'Slēpts lauks',unknown:'Nezin�ms objekts'},resize:'Velciet lai mērogotu',colordialog:{title:'Izvēlies kr�su',options:'Kr�sas uzst�dījumi',highlight:'Paraugs',selected:'Izvēlēt� kr�sa',clear:'Notīrīt'},toolbarCollapse:'Aizvērt rīkjoslu',toolbarExpand:'Atvērt rīkjoslu',toolbarGroups:{document:'Dokuments',clipboard:'Starpliktuve/Atcelt',editing:'Labošana',forms:'Formas',basicstyles:'Pamata stili',paragraph:'Paragr�fs',links:'Saites',insert:'Ievietot',styles:'Stili',colors:'Kr�sas',tools:'Rīki'},bidi:{ltr:'Teksta virziens no kreis�s uz labo',rtl:'Teksta virziens no lab�s uz kreiso'},docprops:{label:'Dokumenta īpašības',title:'Dokumenta īpašības',design:'Dizains',meta:'META dati',chooseColor:'Izvēlēties',other:'<cits>',docTitle:'Dokumenta virsraksts <Title>',charset:'Simbolu kodējums',charsetOther:'Cits simbolu kodējums',charsetASCII:'ASCII',charsetCE:'Centr�leiropas',charsetCT:'Ķīniešu tradicion�l� (Big5)',charsetCR:'Kirilica',charsetGR:'Grieķu',charsetJP:'Jap�ņu',charsetKR:'Korejiešu',charsetTR:'Turku',charsetUN:'Unikods (UTF-8)',charsetWE:'Rietumeiropas',docType:'Dokumenta tips',docTypeOther:'Cits dokumenta tips',xhtmlDec:'Ietvert XHTML deklar�cijas',bgColor:'Fona kr�sa',bgImage:'Fona attēla hipersaite',bgFixed:'Fona attēls ir fiksēts',txtColor:'Teksta kr�sa',margin:'Lapas robežas',marginTop:'Augš�',marginLeft:'Pa kreisi',marginRight:'Pa labi',marginBottom:'Apakš�',metaKeywords:'Dokumentu aprakstoši atslēgv�rdi (atdalīti ar komatu)',metaDescription:'Dokumenta apraksts',metaAuthor:'Autors',metaCopyright:'Autortiesības',previewHtml:'<p>Šis ir <strong>parauga teksts</strong>. Jūs izmantojiet <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/mk.js b/web/imcms/ckeditor/lang/mk.js
new file mode 100644
index 0000000000..5d0518302b
--- /dev/null
+++ b/web/imcms/ckeditor/lang/mk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.mk={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Alignment',alignLeft:'Left',alignRight:'Right',alignCenter:'Center',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background color',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Center',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Color',bgColorTitle:'Background Color',panelTitle:'Colors',auto:'Automatic',more:'More Colors...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/mn.js b/web/imcms/ckeditor/lang/mn.js
new file mode 100644
index 0000000000..09958758e1
--- /dev/null
+++ b/web/imcms/ckeditor/lang/mn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.mn={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Боло�руулагчийн х�р�г�лийн �амбар',editor:'Х�лб�рт бичв�р болов�руулагч',source:'Код',newPage:'Шин� хууда�',save:'Хадгалах',preview:'Уридчлан харах',cut:'Хайчлах',copy:'Хуулах',paste:'Буулгах',print:'Х�вл�х',underline:'Доогуур нь зураа�тай болгох',bold:'Тод бүдүүн',italic:'�алуу',selectAll:'Бүгдийг нь �онгох',removeFormat:'Параргафын загварыг авч ха�х',strike:'Дундуур нь зураа�тай болгох',subscript:'Суурь болгох',superscript:'З�р�г болгох',horizontalrule:'Хөндлөн зураа� оруулах',pagebreak:'Хууда� ту�гаарлагч оруулах',pagebreakAlt:'Page Break',unlink:'Холбоо� авч ха�х',undo:'Хүчингүй болгох',redo:'Өмнөх үйлдл�� ��рг��х',common:{browseServer:'Сервер харуулах',url:'URL',protocol:'Протокол',upload:'Хуулах',uploadSubmit:'Үүнийг �ерв�ррүү илг��',image:'Зураг',flash:'Флаш',form:'Форм',checkbox:'Чекбок�',radio:'Радио товч',textField:'Техт талбар',textarea:'Техт орчин',hiddenField:'�ууц талбар',button:'Товч',select:'Сонгогч талбар',imageButton:'Зурагтай товч',notSet:'<Оноохгүй>',id:'Id',name:'��р',langDir:'Х�лний чигл�л',langDirLtr:'Зүүн��� баруун (LTR)',langDirRtl:'Баруунаа� зүүн (RTL)',langCode:'Х�лний код',longDescr:'URL-ын тайлбар',cssClass:'Stylesheet кла��ууд',advisoryTitle:'Зөвлөлдөх гарчиг',cssStyle:'Загвар',ok:'OK',cancel:'Болих',close:'Хаах',preview:'Preview',generalTab:'Ерөнхий',advancedTab:'��м�лт',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Сонголт',target:'Бай',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Зүүн талаа� баруун тийш�� (LTR)',langDirRTL:'Баруун талаа� зүүн тийш�� (RTL)',styles:'Загвар',cssClasses:'Stylesheet Classes',width:'Өргөн',height:'Өндөр',align:'Тулгах тал',alignLeft:'Зүүн',alignRight:'Баруун',alignCenter:'Төвд',alignTop:'Д��д талд',alignMiddle:'Дунд талд',alignBottom:'Доод талд',invalidValue:'Invalid value.',invalidHeight:'Өндөр нь тоо байх ё�той.',invalidWidth:'Өргөн нь тоо байх ё�той.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Онцгой т�мд�гт оруулах',title:'Онцгой т�мд�гт �онгох',options:'Special Character Options'},link:{toolbar:'Холбоо�',other:'<other>',menu:'Холбоо� за�варлах',title:'Холбоо�',info:'Холбоо�ын тухай м�д��л�л',target:'Байрлал',upload:'Хуулах',advanced:'��м�лт',type:'Линкийн төрөл',toUrl:'цахим хууда�ны ха�г (URL)',toAnchor:'Эн� бичв�р д�х зангуу руу очих холбоо�',toEmail:'Э-захиа',targetFrame:'<�гуулах хүр��>',targetPopup:'<popup цонх>',targetFrameName:'Очих фремын н�р',targetPopupName:'Popup цонхны н�р',popupFeatures:'Popup цонхны онцлог',popupResizable:'Resizable',popupStatusBar:'Стату� х���г',popupLocationBar:'Location х���г',popupToolbar:'Багажны �амбар',popupMenuBar:'Ц��ний �амбар',popupFullScreen:'Цонх дүүрг�х (Internet Explorer)',popupScrollBars:'Скрол х���гүүд',popupDependent:'Хамаатай (Netscape)',popupLeft:'Зүүн байрлал',popupTop:'Д��д байрлал',id:'Id',langDir:'Х�лний чигл�л',langDirLTR:'Зүүн��� баруун (LTR)',langDirRTL:'Баруунаа� зүүн (RTL)',acccessKey:'Холбох түлхүүр',name:'��р',langCode:'Х�лний код',tabIndex:'Tab индек�',advisoryTitle:'Зөвлөлдөх гарчиг',advisoryContentType:'Зөвлөлдөх төрлийн агуулга',cssClasses:'Stylesheet кла��ууд',charset:'Т�мд�гт оноох нөөцөд холбогд�он',styles:'Загвар',rel:'Relationship',selectAnchor:'��г зангууг �онгоно уу',anchorName:'Зангуугийн н�р��р',anchorId:'Элем�нтйн Id н�р��р',emailAddress:'Э-шуудангийн ха�г',emailSubject:'Зурва�ны гарчиг',emailBody:'Зурва�ны их бие',noAnchors:'(Баримт бичиг зангуугүй байна)',noUrl:'Холбоо�ны URL ха�гийг шивн� үү',noEmail:'Э-шуудангий ха�гаа шивн� үү'},anchor:{toolbar:'Зангуу',menu:'Зангууг боло�руулах',title:'Зангуугийн шинж чанар',name:'Зангуугийн н�р',errorName:'Зангуугийн н�рийг оруулна уу',remove:'Зангууг у�тгах'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Төрөл',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Хайж орлуулах',find:'Хайх',replace:'Орлуулах',findWhat:'Хайх үг/ү��г:',replaceWith:'Солих үг:',notFoundMsg:'Хай�ан бичв�рийг ол�онгүй.',findOptions:'Хайх �онголтууд',matchCase:'Т�нц�х төлөв',matchWord:'Т�нц�х бүт�н үг',matchCyclic:'Match cyclic',replaceAll:'Бүгдийг нь �олих',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Хү�н�гт',title:'Хү�н�гт',menu:'Хү�н�гт',deleteTable:'Хү�н�гт у�тгах',rows:'Мөр',columns:'Багана',border:'Хүр��ний х�мж��',widthPx:'ц�г',widthPc:'хувь',widthUnit:'өргөний н�гж',cellSpace:'�үх хоорондын зай (spacing)',cellPad:'�үх доторлох(padding)',caption:'Тайлбар',summary:'Тайлбар',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Хү�н�гтийн өргөн нь тоо байх ё�той.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'�үх/зай',insertBefore:'�үх/зай өмнө нь оруулах',insertAfter:'�үх/зай дараа нь оруулах',deleteCell:'�үх у�тгах',merge:'�үх н�гт�х',mergeRight:'Баруун тийш н�гтг�х',mergeDown:'Доош н�гтг�х',splitHorizontal:'�үх/зайг бо�оогоор нь ту�гаарлах',splitVertical:'�үх/зайг хөндлөнгөөр нь ту�гаарлах',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Х�вт��д т�гшл�х арга',vAlign:'Бо�оод т�гшл�х арга',alignBaseline:'Baseline',bgColor:'Д�в�г�р өнгө',borderColor:'Хүр��ний өнгө',data:'Data',header:'Header',yes:'Тийм',no:'Үгүй',invalidWidth:'�үдний өргөн нь тоо байх ё�той.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Сонгох'},row:{menu:'Мөр',insertBefore:'Мөр өмнө нь оруулах',insertAfter:'Мөр дараа нь оруулах',deleteRow:'Мөр у�тгах'},column:{menu:'Багана',insertBefore:'Багана өмнө нь оруулах',insertAfter:'Багана дараа нь оруулах',deleteColumn:'Багана у�тгах'}},button:{title:'Товчны шинж чанар',text:'Т�к�т (Утга)',type:'Төрөл',typeBtn:'Товч',typeSbm:'Submit',typeRst:'Болих'},checkboxAndRadio:{checkboxTitle:'Чекбок�ны шинж чанар',radioTitle:'Радио товчны шинж чанар',value:'Утга',selected:'Сонгогд�он'},form:{title:'Форм шинж чанар',menu:'Форм шинж чанар',action:'Үйлд�л',method:'�рга',encoding:'Encoding'},select:{title:'Согогч талбарын шинж чанар',selectInfo:'М�д��л�л',opAvail:'Идв�хт�й �онголт',value:'Утга',size:'Х�мж��',lines:'Мөр',chkMulti:'Олон зүйл з�р�г �онгохыг зөвшөөрөх',opText:'Т�к�т',opValue:'Утга',btnAdd:'��м�х',btnModify:'Өөрчлөх',btnUp:'Д��ш',btnDown:'Доош',btnSetValue:'Сонгогд�ан утга оноох',btnDelete:'У�тгах'},textarea:{title:'Тек�т орчны шинж чанар',cols:'Багана',rows:'Мөр'},textfield:{title:'Тек�т талбарын шинж чанар',name:'��р',value:'Утга',charWidth:'Т�мд�гтын өргөн',maxChars:'Хамгийн их т�мд�гт',type:'Төрөл',typeText:'Тек�т',typePass:'�ууц үг'},hidden:{title:'�ууц талбарын шинж чанар',name:'��р',value:'Утга'},image:{title:'Зураг',titleButton:'Зурган товчны шинж чанар',menu:'Зураг',infoTab:'Зурагны м�д��л�л',btnUpload:'Үүнийг �ерв�ррүү илг��',upload:'Хуулах',alt:'Зургийг орлох бичв�р',lockRatio:'Радио түгжих',resetSize:'х�мж�� дахин оноох',border:'Хүр��',hSpace:'Хөндлөн зай',vSpace:'Бо�оо зай',alertUrl:'Зурагны URL-ын төрлийн �онгоно уу',linkTab:'Холбоо�',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Зургийн �х �урвалжийн ха�г (URL) байхгүй байна.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Флаш шинж чанар',propertiesTab:'Properties',title:'Флаш  шинж чанар',chkPlay:'�втоматаар тоглох',chkLoop:'Давтах',chkMenu:'Флаш ц�� идв�хжүүл�х',chkFull:'Allow Fullscreen',scale:'Өргөгтгөх',scaleAll:'Бүгдийг харуулах',scaleNoBorder:'Хүр��гүй',scaleFit:'Яг тааруулах',access:'Script Access',accessAlways:'Онцлогууд',accessSameDomain:'Байнга',accessNever:'Х�з�� ч үгүй',alignAbsBottom:'Abs доод талд',alignAbsMiddle:'Abs Дунд талд',alignBaseline:'Baseline',alignTextTop:'Тек�т д��р',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Д�в�г�р өнгө',hSpace:'Хөндлөн зай',vSpace:'Бо�оо зай',validateSrc:'Линк URL-�� төрөлжүүлн� үү',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Үгийн дүр�х шалгах',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Толь бичиггүй',changeTo:'Өөрчлөх',btnIgnore:'Зөвшөөрөх',btnIgnoreAll:'Бүгдийг зөвшөөрөх',btnReplace:'Солих',btnReplaceAll:'Бүгдийг Дарж бичих',btnUndo:'Буцаах',noSuggestions:'- Тайлбаргүй -',progress:'Дүр�м шалгаж байгаа үйл �вц...',noMispell:'Дүр�м шалгаад дуу��ан: �лдаа олд�онгүй',noChanges:'Дүр�м шалгаад дуу��ан: үг өөрчлөгдөөгүй',oneChange:'Дүр�м шалгаад дуу��ан: 1 үг өөрчлөгд�өн',manyChanges:'Дүр�м шалгаад дуу��ан: %1 үг өөрчлөгд�өн',ieSpellDownload:'Дүр�м шалгагч �уугаагүй байна. Татаж авахыг хү�ч байна уу?'},smiley:{toolbar:'Тодорхойлолт',title:'Тодорхойлолт оруулах',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Дугаарлагд�ан жаг�аалт',bulletedlist:'Ц�гт�й жаг�аалт',indent:'Догол мөр ха�ах',outdent:'Догол мөр н�м�х',justify:{left:'Зүүн талд тулгах',center:'Голлуулах',right:'Баруун талд тулгах',block:'Т�гшл�х'},blockquote:'Ишл�л х���г',clipboard:{title:'Буулгах',cutError:'Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлд�лийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хо�лолыг ашиглана уу.',copyError:'Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлд�лийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хо�лолыг ашиглана уу.',pasteMsg:'(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийн� үү. Мөн <strong>OK</strong> дар.',securityMsg:'Таны үзүүл�гч/browser/-н хамгаалалтын тохиргооноо� болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Эн� цонход дахин paste хийхийг оролд.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Word-оо� буулгах',title:'Word-оо� буулгах',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Энгийн бичв�р��р буулгах',title:'Энгийн бичв�р��р буулгах'},templates:{button:'Загварууд',title:'Загварын агуулга',options:'Template Options',insertOption:'Одоогийн агууллагыг дарж бичих',selectPromptMsg:'Загварыг н��ж editor-рүү �онгож оруулна уу<br />(Одоогийн агууллагыг у�таж магадгүй):',emptyListMsg:'(Загвар тодорхойлогдоогүй байна)'},showBlocks:'Хавтангуудыг харуулах',stylesCombo:{label:'Загвар',panelTitle:'Загвар х�лб�ржүүл�х',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Параргафын загвар',panelTitle:'Параргафын загвар',tag_p:'Х�вийн',tag_pre:'Formatted',tag_address:'Ха�г',tag_h1:'Гарчиг 1',tag_h2:'Гарчиг 2',tag_h3:'Гарчиг 3',tag_h4:'Гарчиг 4',tag_h5:'Гарчиг 5',tag_h6:'Гарчиг 6',tag_div:'Paragraph (DIV)'},div:{title:'Div г�д�г х���г бий болгох',toolbar:'Div г�д�г х���г бий болгох',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Зүүн талаа� баруун тиш�� (LTR)',langDirRTLLabel:'Баруун талаа� зүүн тиш�� (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Ү�гийн х�лб�р',voiceLabel:'Үг�ийн х�лб�р',panelTitle:'Үг�ийн х�лб�рийн н�р'},fontSize:{label:'Х�мж��',voiceLabel:'Ү�гийн х�мж��',panelTitle:'Ү�гийн х�мж��'},colorButton:{textColorTitle:'Бичв�рийн өнгө',bgColorTitle:'Д�в�г�р өнгө',panelTitle:'Өнгөнүүд',auto:'�втоматаар',more:'��м�лт өнгөнүүд...'},colors:{'000':'Хар',800000:'Хүр�н','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Саарал',F00:'Улаан',FF8C00:'Dark Orange',FFD700:'�лт','008000':'�огоон','0FF':'Ц�нх�р','00F':'Хөх',EE82EE:'Ягаан',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Улбар шар',FFFF00:'Шар','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Цайвар �аарал',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'Цагаан'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Сонголт',langs:'Х�лүүд',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'No suggestions',optionsTab:'Сонголт',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Х�лүүд',dictionariesTab:'Толь бичгүүд',dic_field_name:'Dictionary name',dic_create:'Бий болгох',dic_restore:'Restore',dic_delete:'У�тгах',dic_rename:'��рийг �олих',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Д�лг�ц дүүрг�х',minimize:'Цонхыг баг�гаж харуулах',fakeobjects:{anchor:'Зангуу',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Холбоо�ууд',insert:'Оруулах',styles:'Загварууд',colors:'Онгөнүүд',tools:'Х�р�г�лүүд'},bidi:{ltr:'Зүүн��� баруун тийш бичл�г',rtl:'Баруунаа� зүүн тийш бичл�г'},docprops:{label:'Баримт бичиг шинж чанар',title:'Баримт бичиг шинж чанар',design:'Design',meta:'Meta өгөгдөл',chooseColor:'Сонгох',other:'<other>',docTitle:'Хууда�ны гарчиг',charset:'Encoding т�мд�гт',charsetOther:'Encoding-д өөр т�мд�гт оноох',charsetASCII:'ASCII',charsetCE:'Төв европ',charsetCT:'Х�тадын уламжлалт (Big5)',charsetCR:'Крил',charsetGR:'Гред',charsetJP:'Япон',charsetKR:'Солонго�',charsetTR:'Tурк',charsetUN:'Юникод (UTF-8)',charsetWE:'Баруун европ',docType:'Баримт бичгийн төрөл Heading',docTypeOther:'Бу�ад баримт бичгийн төрөл Heading',xhtmlDec:'XHTML-ийн м�д��ллийг агуулах',bgColor:'Фоно өнгө',bgImage:'Фоно зурагны URL',bgFixed:'Гүйд�ггүй фоно',txtColor:'Фонтны өнгө',margin:'Хууда�ны захын зай',marginTop:'Д��д тал',marginLeft:'Зүүн тал',marginRight:'Баруун тал',marginBottom:'Доод тал',metaKeywords:'Баримт бичгийн индек� түлхүүр үг (та�лалаар ту�гаарлагдана)',metaDescription:'Баримт бичгийн тайлбар',metaAuthor:'Зохиогч',metaCopyright:'Зохиогчийн �рх',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ms.js b/web/imcms/ckeditor/lang/ms.js
new file mode 100644
index 0000000000..d45e908254
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ms.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ms={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Sumber',newPage:'Helaian Baru',save:'Simpan',preview:'Prebiu',cut:'Potong',copy:'Salin',paste:'Tampal',print:'Cetak',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Pilih Semua',removeFormat:'Buang Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Masukkan Garisan Membujur',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Buang Sambungan',undo:'Batalkan',redo:'Ulangkan',common:{browseServer:'Browse Server',url:'URL',protocol:'Protokol',upload:'Muat Naik',uploadSubmit:'Hantar ke Server',image:'Gambar',flash:'Flash',form:'Borang',checkbox:'Checkbox',radio:'Butang Radio',textField:'Text Field',textarea:'Textarea',hiddenField:'Field Tersembunyi',button:'Butang',select:'Field Pilihan',imageButton:'Butang Bergambar',notSet:'<tidak di set>',id:'Id',name:'Nama',langDir:'Arah Tulisan',langDirLtr:'Kiri ke Kanan (LTR)',langDirRtl:'Kanan ke Kiri (RTL)',langCode:'Kod Bahasa',longDescr:'Butiran Panjang URL',cssClass:'Kelas-kelas Stylesheet',advisoryTitle:'Tajuk Makluman',cssStyle:'Stail',ok:'OK',cancel:'Batal',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Lebar',height:'Tinggi',align:'Jajaran',alignLeft:'Kiri',alignRight:'Kanan',alignCenter:'Tengah',alignTop:'Atas',alignMiddle:'Pertengahan',alignBottom:'Bawah',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Masukkan Huruf Istimewa',title:'Sila pilih huruf istimewa',options:'Special Character Options'},link:{toolbar:'Masukkan/Sunting Sambungan',other:'<lain>',menu:'Sunting Sambungan',title:'Sambungan',info:'Butiran Sambungan',target:'Sasaran',upload:'Muat Naik',advanced:'Advanced',type:'Jenis Sambungan',toUrl:'URL',toAnchor:'Pautan dalam muka surat ini',toEmail:'E-Mail',targetFrame:'<bingkai>',targetPopup:'<tetingkap popup>',targetFrameName:'Nama Bingkai Sasaran',targetPopupName:'Nama Tetingkap Popup',popupFeatures:'Ciri Tetingkap Popup',popupResizable:'Resizable',popupStatusBar:'Bar Status',popupLocationBar:'Bar Lokasi',popupToolbar:'Toolbar',popupMenuBar:'Bar Menu',popupFullScreen:'Skrin Penuh (IE)',popupScrollBars:'Bar-bar skrol',popupDependent:'Bergantungan (Netscape)',popupLeft:'Posisi Kiri',popupTop:'Posisi Atas',id:'Id',langDir:'Arah Tulisan',langDirLTR:'Kiri ke Kanan (LTR)',langDirRTL:'Kanan ke Kiri (RTL)',acccessKey:'Kunci Akses',name:'Nama',langCode:'Arah Tulisan',tabIndex:'Indeks Tab ',advisoryTitle:'Tajuk Makluman',advisoryContentType:'Jenis Kandungan Makluman',cssClasses:'Kelas-kelas Stylesheet',charset:'Linked Resource Charset',styles:'Stail',rel:'Relationship',selectAnchor:'Sila pilih pautan',anchorName:'dengan menggunakan nama pautan',anchorId:'dengan menggunakan ID elemen',emailAddress:'Alamat E-Mail',emailSubject:'Subjek Mesej',emailBody:'Isi Kandungan Mesej',noAnchors:'(Tiada pautan terdapat dalam dokumen ini)',noUrl:'Sila taip sambungan URL',noEmail:'Sila taip alamat e-mail'},anchor:{toolbar:'Masukkan/Sunting Pautan',menu:'Ciri-ciri Pautan',title:'Ciri-ciri Pautan',name:'Nama Pautan',errorName:'Sila taip nama pautan',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Cari',replace:'Ganti',findWhat:'Perkataan yang dicari:',replaceWith:'Diganti dengan:',notFoundMsg:'Text yang dicari tidak dijumpai.',findOptions:'Find Options',matchCase:'Padanan case huruf',matchWord:'Padana Keseluruhan perkataan',matchCyclic:'Match cyclic',replaceAll:'Ganti semua',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Jadual',title:'Ciri-ciri Jadual',menu:'Ciri-ciri Jadual',deleteTable:'Delete Table',rows:'Barisan',columns:'Jaluran',border:'Saiz Border',widthPx:'piksel-piksel',widthPc:'peratus',widthUnit:'width unit',cellSpace:'Ruangan Antara Sel',cellPad:'Tambahan Ruang Sel',caption:'Keterangan',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Buangkan Sel-sel',merge:'Cantumkan Sel-sel',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Buangkan Baris'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Buangkan Lajur'}},button:{title:'Ciri-ciri Butang',text:'Teks (Nilai)',type:'Jenis',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Ciri-ciri Checkbox',radioTitle:'Ciri-ciri Butang Radio',value:'Nilai',selected:'Dipilih'},form:{title:'Ciri-ciri Borang',menu:'Ciri-ciri Borang',action:'Tindakan borang',method:'Cara borang dihantar',encoding:'Encoding'},select:{title:'Ciri-ciri Selection Field',selectInfo:'Select Info',opAvail:'Pilihan sediada',value:'Nilai',size:'Saiz',lines:'garisan',chkMulti:'Benarkan pilihan pelbagai',opText:'Teks',opValue:'Nilai',btnAdd:'Tambah Pilihan',btnModify:'Ubah Pilihan',btnUp:'Naik ke atas',btnDown:'Turun ke bawah',btnSetValue:'Set sebagai nilai terpilih',btnDelete:'Padam'},textarea:{title:'Ciri-ciri Textarea',cols:'Lajur',rows:'Baris'},textfield:{title:'Ciri-ciri Text Field',name:'Nama',value:'Nilai',charWidth:'Lebar isian',maxChars:'Isian Maksimum',type:'Jenis',typeText:'Teks',typePass:'Kata Laluan'},hidden:{title:'Ciri-ciri Field Tersembunyi',name:'Nama',value:'Nilai'},image:{title:'Ciri-ciri Imej',titleButton:'Ciri-ciri Butang Bergambar',menu:'Ciri-ciri Imej',infoTab:'Info Imej',btnUpload:'Hantar ke Server',upload:'Muat Naik',alt:'Text Alternatif',lockRatio:'Tetapkan Nisbah',resetSize:'Saiz Set Semula',border:'Border',hSpace:'Ruang Melintang',vSpace:'Ruang Menegak',alertUrl:'Sila taip URL untuk fail gambar',linkTab:'Sambungan',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Bawah Mutlak',alignAbsMiddle:'Pertengahan Mutlak',alignBaseline:'Garis Dasar',alignTextTop:'Atas Text',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Warna Latarbelakang',hSpace:'Ruang Melintang',vSpace:'Ruang Menegak',validateSrc:'Sila taip sambungan URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Semak Ejaan',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Tidak terdapat didalam kamus',changeTo:'Tukarkan kepada',btnIgnore:'Biar',btnIgnoreAll:'Biarkan semua',btnReplace:'Ganti',btnReplaceAll:'Gantikan Semua',btnUndo:'Batalkan',noSuggestions:'- Tiada cadangan -',progress:'Pemeriksaan ejaan sedang diproses...',noMispell:'Pemeriksaan ejaan siap: Tiada salah ejaan',noChanges:'Pemeriksaan ejaan siap: Tiada perkataan diubah',oneChange:'Pemeriksaan ejaan siap: Satu perkataan telah diubah',manyChanges:'Pemeriksaan ejaan siap: %1 perkataan diubah',ieSpellDownload:'Pemeriksa ejaan tidak dipasang. Adakah anda mahu muat turun sekarang?'},smiley:{toolbar:'Smiley',title:'Masukkan Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Senarai bernombor',bulletedlist:'Senarai tidak bernombor',indent:'Tambahkan Inden',outdent:'Kurangkan Inden',justify:{left:'Jajaran Kiri',center:'Jajaran Tengah',right:'Jajaran Kanan',block:'Jajaran Blok'},blockquote:'Block Quote',clipboard:{title:'Tampal',cutError:'Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).',copyError:'Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).',pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Tampal dari Word',title:'Tampal dari Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Tampal sebagai text biasa',title:'Tampal sebagai text biasa'},templates:{button:'Templat',title:'Templat Kandungan',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Sila pilih templat untuk dibuka oleh editor<br>(kandungan sebenar akan hilang):',emptyListMsg:'(Tiada Templat Disimpan)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stail',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Telah Diformat',tag_address:'Alamat',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Perenggan (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Saiz',voiceLabel:'Font Size',panelTitle:'Saiz'},colorButton:{textColorTitle:'Warna Text',bgColorTitle:'Warna Latarbelakang',panelTitle:'Colors',auto:'Otomatik',more:'Warna lain-lain...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'Tiada cadangan',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Ciri-ciri dokumen',title:'Ciri-ciri dokumen',design:'Design',meta:'Data Meta',chooseColor:'Choose',other:'<lain>',docTitle:'Tajuk Muka Surat',charset:'Enkod Set Huruf',charsetOther:'Enkod Set Huruf yang Lain',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Jenis Kepala Dokumen',docTypeOther:'Jenis Kepala Dokumen yang Lain',xhtmlDec:'Masukkan pemula kod XHTML',bgColor:'Warna Latarbelakang',bgImage:'URL Gambar Latarbelakang',bgFixed:'Imej Latarbelakang tanpa Skrol',txtColor:'Warna Text',margin:'Margin Muka Surat',marginTop:'Atas',marginLeft:'Kiri',marginRight:'Kanan',marginBottom:'Bawah',metaKeywords:'Kata Kunci Indeks Dokumen (dipisahkan oleh koma)',metaDescription:'Keterangan Dokumen',metaAuthor:'Penulis',metaCopyright:'Hakcipta',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/nb.js b/web/imcms/ckeditor/lang/nb.js
new file mode 100644
index 0000000000..36de645637
--- /dev/null
+++ b/web/imcms/ckeditor/lang/nb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.nb={dir:'ltr',editorTitle:'Rikteksteditor, %1',editorHelp:'Trykk ALT 0 for hjelp',toolbars:'Verktøylinjer for editor',editor:'Rikteksteditor',source:'Kilde',newPage:'Ny side',save:'Lagre',preview:'Forhåndsvis',cut:'Klipp ut',copy:'Kopier',paste:'Lim inn',print:'Skriv ut',underline:'Understreking',bold:'Fet',italic:'Kursiv',selectAll:'Merk alt',removeFormat:'Fjern formatering',strike:'Gjennomstreking',subscript:'Senket skrift',superscript:'Hevet skrift',horizontalrule:'Sett inn horisontal linje',pagebreak:'Sett inn sideskift for utskrift',pagebreakAlt:'Sideskift',unlink:'Fjern lenke',undo:'Angre',redo:'Gjør om',common:{browseServer:'Bla igjennom server',url:'URL',protocol:'Protokoll',upload:'Last opp',uploadSubmit:'Send det til serveren',image:'Bilde',flash:'Flash',form:'Skjema',checkbox:'Avmerkingsboks',radio:'Alternativknapp',textField:'Tekstboks',textarea:'Tekstområde',hiddenField:'Skjult felt',button:'Knapp',select:'Rullegardinliste',imageButton:'Bildeknapp',notSet:'<ikke satt>',id:'Id',name:'Navn',langDir:'Språkretning',langDirLtr:'Venstre til høyre (VTH)',langDirRtl:'Høyre til venstre (HTV)',langCode:'Språkkode',longDescr:'Utvidet beskrivelse',cssClass:'Stilarkklasser',advisoryTitle:'Tittel',cssStyle:'Stil',ok:'OK',cancel:'Avbryt',close:'Lukk',preview:'Forhåndsvis',generalTab:'Generelt',advancedTab:'Avansert',validateNumberFailed:'Denne verdien er ikke et tall.',confirmNewPage:'Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?',confirmCancel:'Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?',options:'Valg',target:'Mål',targetNew:'Nytt vindu (_blank)',targetTop:'Hele vindu (_top)',targetSelf:'Samme vindu (_self)',targetParent:'Foreldrevindu (_parent)',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',styles:'Stil',cssClasses:'Stilarkklasser',width:'Bredde',height:'Høyde',align:'Juster',alignLeft:'Venstre',alignRight:'Høyre',alignCenter:'Midtjuster',alignTop:'Topp',alignMiddle:'Midten',alignBottom:'Bunn',invalidValue:'Ugyldig verdi.',invalidHeight:'Høyde må være et tall.',invalidWidth:'Bredde må være et tall.',invalidCssLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).',invalidHtmlLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).',invalidInlineStyle:'Verdi angitt for inline stil må bestå av en eller flere sett med formatet "navn : verdi", separert med semikolon',cssLengthTooltip:'Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).',unavailable:'%1<span class="cke_accessibility">, utilgjenglig</span>'},contextmenu:{options:'Alternativer for høyreklikkmeny'},specialChar:{toolbar:'Sett inn spesialtegn',title:'Velg spesialtegn',options:'Alternativer for spesialtegn'},link:{toolbar:'Sett inn/Rediger lenke',other:'<annen>',menu:'Rediger lenke',title:'Lenke',info:'Lenkeinfo',target:'Mål',upload:'Last opp',advanced:'Avansert',type:'Lenketype',toUrl:'URL',toAnchor:'Lenke til anker i teksten',toEmail:'E-post',targetFrame:'<ramme>',targetPopup:'<popup-vindu>',targetFrameName:'Målramme',targetPopupName:'Navn på popup-vindu',popupFeatures:'Egenskaper for popup-vindu',popupResizable:'Skalerbar',popupStatusBar:'Statuslinje',popupLocationBar:'Adresselinje',popupToolbar:'Verktøylinje',popupMenuBar:'Menylinje',popupFullScreen:'Fullskjerm (IE)',popupScrollBars:'Scrollbar',popupDependent:'Avhenging (Netscape)',popupLeft:'Venstre posisjon',popupTop:'Topp-posisjon',id:'Id',langDir:'Språkretning',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',acccessKey:'Aksessknapp',name:'Navn',langCode:'Språkkode',tabIndex:'Tabindeks',advisoryTitle:'Tittel',advisoryContentType:'Type',cssClasses:'Stilarkklasser',charset:'Lenket tegnsett',styles:'Stil',rel:'Relasjon (rel)',selectAnchor:'Velg et anker',anchorName:'Anker etter navn',anchorId:'Element etter ID',emailAddress:'E-postadresse',emailSubject:'Meldingsemne',emailBody:'Melding',noAnchors:'(Ingen anker i dokumentet)',noUrl:'Vennligst skriv inn lenkens URL',noEmail:'Vennligst skriv inn e-postadressen'},anchor:{toolbar:'Sett inn/Rediger anker',menu:'Egenskaper for anker',title:'Egenskaper for anker',name:'Ankernavn',errorName:'Vennligst skriv inn ankernavnet',remove:'Fjern anker'},list:{numberedTitle:'Egenskaper for nummerert liste',bulletedTitle:'Egenskaper for punktmerket liste',type:'Type',start:'Start',validateStartNumber:'Starten på listen må være et heltall.',circle:'Sirkel',disc:'Disk',square:'Firkant',none:'Ingen',notset:'<ikke satt>',armenian:'Armensk nummerering',georgian:'Georgisk nummerering (an, ban, gan, osv.)',lowerRoman:'Romertall, små (i, ii, iii, iv, v, osv.)',upperRoman:'Romertall, store (I, II, III, IV, V, osv.)',lowerAlpha:'Alfabetisk, små (a, b, c, d, e, osv.)',upperAlpha:'Alfabetisk, store (A, B, C, D, E, osv.)',lowerGreek:'Gresk, små (alpha, beta, gamma, osv.)',decimal:'Tall (1, 2, 3, osv.)',decimalLeadingZero:'Tall, med førstesiffer null (01, 02, 03, osv.)'},findAndReplace:{title:'Søk og erstatt',find:'Søk',replace:'Erstatt',findWhat:'Søk etter:',replaceWith:'Erstatt med:',notFoundMsg:'Fant ikke søketeksten.',findOptions:'Søkealternativer',matchCase:'Skill mellom store og små bokstaver',matchWord:'Bare hele ord',matchCyclic:'Søk i hele dokumentet',replaceAll:'Erstatt alle',replaceSuccessMsg:'%1 tilfelle(r) erstattet.'},table:{toolbar:'Tabell',title:'Egenskaper for tabell',menu:'Egenskaper for tabell',deleteTable:'Slett tabell',rows:'Rader',columns:'Kolonner',border:'Rammestørrelse',widthPx:'piksler',widthPc:'prosent',widthUnit:'Bredde-enhet',cellSpace:'Cellemarg',cellPad:'Cellepolstring',caption:'Tittel',summary:'Sammendrag',headers:'Overskrifter',headersNone:'Ingen',headersColumn:'Første kolonne',headersRow:'Første rad',headersBoth:'Begge',invalidRows:'Antall rader må være et tall større enn 0.',invalidCols:'Antall kolonner må være et tall større enn 0.',invalidBorder:'Rammestørrelse må være et tall.',invalidWidth:'Tabellbredde må være et tall.',invalidHeight:'Tabellhøyde må være et tall.',invalidCellSpacing:'Cellemarg må være et positivt tall.',invalidCellPadding:'Cellepolstring må være et positivt tall.',cell:{menu:'Celle',insertBefore:'Sett inn celle før',insertAfter:'Sett inn celle etter',deleteCell:'Slett celler',merge:'Slå sammen celler',mergeRight:'Slå sammen høyre',mergeDown:'Slå sammen ned',splitHorizontal:'Del celle horisontalt',splitVertical:'Del celle vertikalt',title:'Celleegenskaper',cellType:'Celletype',rowSpan:'Radspenn',colSpan:'Kolonnespenn',wordWrap:'Tekstbrytning',hAlign:'Horisontal justering',vAlign:'Vertikal justering',alignBaseline:'Grunnlinje',bgColor:'Bakgrunnsfarge',borderColor:'Rammefarge',data:'Data',header:'Overskrift',yes:'Ja',no:'Nei',invalidWidth:'Cellebredde må være et tall.',invalidHeight:'Cellehøyde må være et tall.',invalidRowSpan:'Radspenn må være et heltall.',invalidColSpan:'Kolonnespenn må være et heltall.',chooseColor:'Velg'},row:{menu:'Rader',insertBefore:'Sett inn rad før',insertAfter:'Sett inn rad etter',deleteRow:'Slett rader'},column:{menu:'Kolonne',insertBefore:'Sett inn kolonne før',insertAfter:'Sett inn kolonne etter',deleteColumn:'Slett kolonner'}},button:{title:'Egenskaper for knapp',text:'Tekst (verdi)',type:'Type',typeBtn:'Knapp',typeSbm:'Send',typeRst:'Nullstill'},checkboxAndRadio:{checkboxTitle:'Egenskaper for avmerkingsboks',radioTitle:'Egenskaper for alternativknapp',value:'Verdi',selected:'Valgt'},form:{title:'Egenskaper for skjema',menu:'Egenskaper for skjema',action:'Handling',method:'Metode',encoding:'Encoding'},select:{title:'Egenskaper for rullegardinliste',selectInfo:'Info',opAvail:'Tilgjenglige alternativer',value:'Verdi',size:'Størrelse',lines:'Linjer',chkMulti:'Tillat flervalg',opText:'Tekst',opValue:'Verdi',btnAdd:'Legg til',btnModify:'Endre',btnUp:'Opp',btnDown:'Ned',btnSetValue:'Sett som valgt',btnDelete:'Slett'},textarea:{title:'Egenskaper for tekstområde',cols:'Kolonner',rows:'Rader'},textfield:{title:'Egenskaper for tekstfelt',name:'Navn',value:'Verdi',charWidth:'Tegnbredde',maxChars:'Maks antall tegn',type:'Type',typeText:'Tekst',typePass:'Passord'},hidden:{title:'Egenskaper for skjult felt',name:'Navn',value:'Verdi'},image:{title:'Bildeegenskaper',titleButton:'Egenskaper for bildeknapp',menu:'Bildeegenskaper',infoTab:'Bildeinformasjon',btnUpload:'Send det til serveren',upload:'Last opp',alt:'Alternativ tekst',lockRatio:'Lås forhold',resetSize:'Tilbakestill størrelse',border:'Ramme',hSpace:'HMarg',vSpace:'VMarg',alertUrl:'Vennligst skriv bilde-urlen',linkTab:'Lenke',button2Img:'Vil du endre den valgte bildeknappen til et vanlig bilde?',img2Button:'Vil du endre det valgte bildet til en bildeknapp?',urlMissing:'Bildets adresse mangler.',validateBorder:'Ramme må være et heltall.',validateHSpace:'HMarg må være et heltall.',validateVSpace:'VMarg må være et heltall.'},flash:{properties:'Egenskaper for Flash-objekt',propertiesTab:'Egenskaper',title:'Flash-egenskaper',chkPlay:'Autospill',chkLoop:'Loop',chkMenu:'Slå på Flash-meny',chkFull:'Tillat fullskjerm',scale:'Skaler',scaleAll:'Vis alt',scaleNoBorder:'Ingen ramme',scaleFit:'Skaler til å passe',access:'Scripttilgang',accessAlways:'Alltid',accessSameDomain:'Samme domene',accessNever:'Aldri',alignAbsBottom:'Abs bunn',alignAbsMiddle:'Abs midten',alignBaseline:'Bunnlinje',alignTextTop:'Tekst topp',quality:'Kvalitet',qualityBest:'Best',qualityHigh:'Høy',qualityAutoHigh:'Auto høy',qualityMedium:'Medium',qualityAutoLow:'Auto lav',qualityLow:'Lav',windowModeWindow:'Vindu',windowModeOpaque:'Opaque',windowModeTransparent:'Gjennomsiktig',windowMode:'Vindumodus',flashvars:'Variabler for flash',bgcolor:'Bakgrunnsfarge',hSpace:'HMarg',vSpace:'VMarg',validateSrc:'Vennligst skriv inn lenkens url.',validateHSpace:'HMarg må være et tall.',validateVSpace:'VMarg må være et tall.'},spellCheck:{toolbar:'Stavekontroll',title:'Stavekontroll',notAvailable:'Beklager, tjenesten er utilgjenglig nå.',errorLoading:'Feil under lasting av applikasjonstjenestetjener: %s.',notInDic:'Ikke i ordboken',changeTo:'Endre til',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer alle',btnReplace:'Erstatt',btnReplaceAll:'Erstatt alle',btnUndo:'Angre',noSuggestions:'- Ingen forslag -',progress:'Stavekontroll pågår...',noMispell:'Stavekontroll fullført: ingen feilstavinger funnet',noChanges:'Stavekontroll fullført: ingen ord endret',oneChange:'Stavekontroll fullført: Ett ord endret',manyChanges:'Stavekontroll fullført: %1 ord endret',ieSpellDownload:'Stavekontroll er ikke installert. Vil du laste den ned nå?'},smiley:{toolbar:'Smil',title:'Sett inn smil',options:'Alternativer for smil'},elementsPath:{eleLabel:'Element-sti',eleTitle:'%1 element'},numberedlist:'Legg til/Fjern nummerert liste',bulletedlist:'Legg til/Fjern punktmerket liste',indent:'Øk innrykk',outdent:'Reduser innrykk',justify:{left:'Venstrejuster',center:'Midtstill',right:'Høyrejuster',block:'Blokkjuster'},blockquote:'Sitatblokk',clipboard:{title:'Lim inn',cutError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).',copyError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).',pasteMsg:'Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.',securityMsg:'Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.',pasteArea:'Innlimingsområde'},pastefromword:{confirmCleanup:'Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?',toolbar:'Lim inn fra Word',title:'Lim inn fra Word',error:'Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil'},pasteText:{button:'Lim inn som ren tekst',title:'Lim inn som ren tekst'},templates:{button:'Maler',title:'Innholdsmaler',options:'Alternativer for mal',insertOption:'Erstatt gjeldende innhold',selectPromptMsg:'Velg malen du vil åpne i redigeringsverktøyet:',emptyListMsg:'(Ingen maler definert)'},showBlocks:'Vis blokker',stylesCombo:{label:'Stil',panelTitle:'Stilformater',panelTitle1:'Blokkstiler',panelTitle2:'Inlinestiler',panelTitle3:'Objektstiler'},format:{label:'Format',panelTitle:'Avsnittsformat',tag_p:'Normal',tag_pre:'Formatert',tag_address:'Adresse',tag_h1:'Overskrift 1',tag_h2:'Overskrift 2',tag_h3:'Overskrift 3',tag_h4:'Overskrift 4',tag_h5:'Overskrift 5',tag_h6:'Overskrift 6',tag_div:'Normal (DIV)'},div:{title:'Sett inn Div Container',toolbar:'Sett inn Div Container',cssClassInputLabel:'Stilark-klasser',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Språkkode',inlineStyleInputLabel:'Inlinestiler',advisoryTitleInputLabel:'Tittel',langDirLabel:'Språkretning',langDirLTRLabel:'Venstre til høyre (VTH)',langDirRTLLabel:'Høyre til venstre (HTV)',edit:'Rediger Div',remove:'Fjern Div'},iframe:{title:'Egenskaper for IFrame',toolbar:'IFrame',noUrl:'Vennligst skriv inn URL for iframe',scrolling:'Aktiver scrollefelt',border:'Viss ramme rundt iframe'},font:{label:'Skrift',voiceLabel:'Font',panelTitle:'Skrift'},fontSize:{label:'Størrelse',voiceLabel:'Font Størrelse',panelTitle:'Størrelse'},colorButton:{textColorTitle:'Tekstfarge',bgColorTitle:'Bakgrunnsfarge',panelTitle:'Farger',auto:'Automatisk',more:'Flere farger...'},colors:{'000':'Svart',800000:'Rødbrun','8B4513':'Salbrun','2F4F4F':'Grønnsvart','008080':'Blågrønn','000080':'Marineblått','4B0082':'Indigo',696969:'Mørk grå',B22222:'Mørkerød',A52A2A:'Brun',DAA520:'Lys brun','006400':'Mørk grønn','40E0D0':'Turkis','0000CD':'Medium blå',800080:'Purpur',808080:'Grå',F00:'Rød',FF8C00:'Mørk oransje',FFD700:'Gull','008000':'Grønn','0FF':'Cyan','00F':'Blå',EE82EE:'Fiolett',A9A9A9:'Svak grå',FFA07A:'Rosa-oransje',FFA500:'Oransje',FFFF00:'Gul','00FF00':'Lime',AFEEEE:'Svak turkis',ADD8E6:'Lys Blå',DDA0DD:'Plomme',D3D3D3:'Lys grå',FFF0F5:'Svak lavendelrosa',FAEBD7:'Antikk-hvit',FFFFE0:'Lys gul',F0FFF0:'Honningmelon',F0FFFF:'Svakt asurblått',F0F8FF:'Svak cyan',E6E6FA:'Lavendel',FFF:'Hvit'},scayt:{title:'Stavekontroll mens du skriver',opera_title:'Ikke støttet av Opera',enable:'Slå på SCAYT',disable:'Slå av SCAYT',about:'Om SCAYT',toggle:'Veksle SCAYT',options:'Valg',langs:'Språk',moreSuggestions:'Flere forslag',ignore:'Ignorer',ignoreAll:'Ignorer Alle',addWord:'Legg til ord',emptyDic:'Ordboknavn bør ikke være tom.',noSuggestions:'Ingen forslag',optionsTab:'Valg',allCaps:'Ikke kontroller ord med kun store bokstaver',ignoreDomainNames:'Ikke kontroller domenenavn',mixedCase:'Ikke kontroller ord med blandet små og store bokstaver',mixedWithDigits:'Ikke kontroller ord som inneholder tall',languagesTab:'Språk',dictionariesTab:'Ordbøker',dic_field_name:'Ordboknavn',dic_create:'Opprett',dic_restore:'Gjenopprett',dic_delete:'Slett',dic_rename:'Gi nytt navn',dic_info:'Brukerordboken lagres først i en informasjonskapsel på din maskin, men det er en begrensning på hvor mye som kan lagres her. Når ordboken blir for stor til å lagres i en informasjonskapsel, vil vi i stedet lagre ordboken på vår server. For å lagre din personlige ordbok på vår server, burde du velge et navn for ordboken din. Hvis du allerede har lagret en ordbok, vennligst skriv inn ordbokens navn og klikk på Gjenopprett-knappen.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Se $1 for hjelp.',userGuide:'CKEditors brukerveiledning',moreInfo:'For lisensieringsinformasjon, vennligst besøk vårt nettsted:',copy:'Copyright &copy; $1. Alle rettigheter reservert.'},maximize:'Maksimer',minimize:'Minimer',fakeobjects:{anchor:'Anker',flash:'Flash-animasjon',iframe:'IFrame',hiddenfield:'Skjult felt',unknown:'Ukjent objekt'},resize:'Dra for å skalere',colordialog:{title:'Velg farge',options:'Alternativer for farge',highlight:'Merk',selected:'Valgt',clear:'Tøm'},toolbarCollapse:'Skjul verktøylinje',toolbarExpand:'Vis verktøylinje',toolbarGroups:{document:'Dokument',clipboard:'Utklippstavle/Angre',editing:'Redigering',forms:'Skjema',basicstyles:'Basisstiler',paragraph:'Avsnitt',links:'Lenker',insert:'Innsetting',styles:'Stiler',colors:'Farger',tools:'Verktøy'},bidi:{ltr:'Tekstretning fra venstre til høyre',rtl:'Tekstretning fra høyre til venstre'},docprops:{label:'Dokumentegenskaper',title:'Dokumentegenskaper',design:'Design',meta:'Meta-data',chooseColor:'Velg',other:'<annen>',docTitle:'Sidetittel',charset:'Tegnsett',charsetOther:'Annet tegnsett',charsetASCII:'ASCII',charsetCE:'Sentraleuropeisk',charsetCT:'Tradisonell kinesisk(Big5)',charsetCR:'Kyrillisk',charsetGR:'Gresk',charsetJP:'Japansk',charsetKR:'Koreansk',charsetTR:'Tyrkisk',charsetUN:'Unicode (UTF-8)',charsetWE:'Vesteuropeisk',docType:'Dokumenttype header',docTypeOther:'Annet dokumenttype header',xhtmlDec:'Inkluder XHTML-deklarasjon',bgColor:'Bakgrunnsfarge',bgImage:'URL for bakgrunnsbilde',bgFixed:'Lås bakgrunnsbilde',txtColor:'Tekstfarge',margin:'Sidemargin',marginTop:'Topp',marginLeft:'Venstre',marginRight:'Høyre',marginBottom:'Bunn',metaKeywords:'Dokument nøkkelord (kommaseparert)',metaDescription:'Dokumentbeskrivelse',metaAuthor:'Forfatter',metaCopyright:'Kopirett',previewHtml:'<p>Dette er en <strong>eksempeltekst</strong>. Du bruker <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/nl.js b/web/imcms/ckeditor/lang/nl.js
new file mode 100644
index 0000000000..5f36b9470a
--- /dev/null
+++ b/web/imcms/ckeditor/lang/nl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.nl={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Werkbalken',editor:'Tekstverwerker',source:'Code',newPage:'Nieuwe pagina',save:'Opslaan',preview:'Voorbeeld',cut:'Knippen',copy:'Kopiëren',paste:'Plakken',print:'Printen',underline:'Onderstreept',bold:'Vet',italic:'Cursief',selectAll:'Alles selecteren',removeFormat:'Opmaak verwijderen',strike:'Doorhalen',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Horizontale lijn invoegen',pagebreak:'Pagina-einde invoegen',pagebreakAlt:'Pagina-einde',unlink:'Link verwijderen',undo:'Ongedaan maken',redo:'Opnieuw uitvoeren',common:{browseServer:'Bladeren op server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Naar server verzenden',image:'Afbeelding',flash:'Flash',form:'Formulier',checkbox:'Aanvinkvakje',radio:'Selectievakje',textField:'Tekstveld',textarea:'Tekstvak',hiddenField:'Verborgen veld',button:'Knop',select:'Selectieveld',imageButton:'Afbeeldingsknop',notSet:'<niet ingevuld>',id:'Id',name:'Naam',langDir:'Schrijfrichting',langDirLtr:'Links naar rechts (LTR)',langDirRtl:'Rechts naar links (RTL)',langCode:'Taalcode',longDescr:'Lange URL-omschrijving',cssClass:'Stylesheet-klassen',advisoryTitle:'Adviserende titel',cssStyle:'Stijl',ok:'OK',cancel:'Annuleren',close:'Sluiten',preview:'Voorbeeld',generalTab:'Algemeen',advancedTab:'Geavanceerd',validateNumberFailed:'Deze waarde is geen geldig getal.',confirmNewPage:'Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?',confirmCancel:'Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?',options:'Opties',target:'Doelvenster',targetNew:'Nieuw venster (_blank)',targetTop:'Hele venster (_top)',targetSelf:'Zelfde venster (_self)',targetParent:'Origineel venster (_parent)',langDirLTR:'Links naar rechts (LTR)',langDirRTL:'Rechts naar links (RTL)',styles:'Stijl',cssClasses:'Stylesheet klassen',width:'Breedte',height:'Hoogte',align:'Uitlijning',alignLeft:'Links',alignRight:'Rechts',alignCenter:'Centreren',alignTop:'Boven',alignMiddle:'Midden',alignBottom:'Onder',invalidValue:'Invalid value.',invalidHeight:'De hoogte moet een getal zijn.',invalidWidth:'De breedte moet een getal zijn.',invalidCssLength:'Waarde in veld "%1" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).',invalidHtmlLength:'Waarde in veld "%1" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).',invalidInlineStyle:'Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat "naam : waarde", gescheiden door puntkomma\'s.',cssLengthTooltip:'Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).',unavailable:'%1<span class="cke_accessibility">, niet beschikbaar</span>'},contextmenu:{options:'Contextmenu opties'},specialChar:{toolbar:'Speciaal teken invoegen',title:'Selecteer speciaal teken',options:'Speciale tekens opties'},link:{toolbar:'Link invoegen/wijzigen',other:'<ander>',menu:'Link wijzigen',title:'Link',info:'Linkomschrijving',target:'Doelvenster',upload:'Upload',advanced:'Geavanceerd',type:'Linktype',toUrl:'URL',toAnchor:'Interne link in pagina',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popupvenster>',targetFrameName:'Naam doelframe',targetPopupName:'Naam popupvenster',popupFeatures:'Instellingen popupvenster',popupResizable:'Herschaalbaar',popupStatusBar:'Statusbalk',popupLocationBar:'Locatiemenu',popupToolbar:'Werkbalk',popupMenuBar:'Menubalk',popupFullScreen:'Volledig scherm (IE)',popupScrollBars:'Schuifbalken',popupDependent:'Afhankelijk (Netscape)',popupLeft:'Positie links',popupTop:'Positie boven',id:'Id',langDir:'Schrijfrichting',langDirLTR:'Links naar rechts (LTR)',langDirRTL:'Rechts naar links (RTL)',acccessKey:'Toegangstoets',name:'Naam',langCode:'Taalcode',tabIndex:'Tabvolgorde',advisoryTitle:'Adviserende titel',advisoryContentType:'Aanbevolen content-type',cssClasses:'Stylesheet-klassen',charset:'Karakterset van gelinkte bron',styles:'Stijl',rel:'Relatie',selectAnchor:'Kies een interne link',anchorName:'Op naam interne link',anchorId:'Op kenmerk interne link',emailAddress:'E-mailadres',emailSubject:'Onderwerp bericht',emailBody:'Inhoud bericht',noAnchors:'(Geen interne links in document gevonden)',noUrl:'Geef de link van de URL',noEmail:'Geef een e-mailadres'},anchor:{toolbar:'Interne link',menu:'Eigenschappen interne link',title:'Eigenschappen interne link',name:'Naam interne link',errorName:'Geef de naam van de interne link op',remove:'Interne link verwijderen'},list:{numberedTitle:'Eigenschappen genummerde lijst',bulletedTitle:'Eigenschappen lijst met opsommingstekens',type:'Type',start:'Start',validateStartNumber:'Startnummer van de lijst moet een heel nummer zijn.',circle:'Cirkel',disc:'Schijf',square:'Vierkant',none:'Geen',notset:'<niet gezet>',armenian:'Armeense nummering',georgian:'Georgische nummering (an, ban, gan, etc.)',lowerRoman:'Romeins kleine letters (i, ii, iii, iv, v, etc.)',upperRoman:'Romeinse hoofdletters (I, II, III, IV, V, etc.)',lowerAlpha:'Kleine letters (a, b, c, d, e, etc.)',upperAlpha:'Hoofdletters (A, B, C, D, E, etc.)',lowerGreek:'Grieks kleine letters (alpha, beta, gamma, etc.)',decimal:'Cijfers (1, 2, 3, etc.)',decimalLeadingZero:'Cijfers beginnen met nul (01, 02, 03, etc.)'},findAndReplace:{title:'Zoeken en vervangen',find:'Zoeken',replace:'Vervangen',findWhat:'Zoeken naar:',replaceWith:'Vervangen met:',notFoundMsg:'De opgegeven tekst is niet gevonden.',findOptions:'Zoekopties',matchCase:'Hoofdlettergevoelig',matchWord:'Hele woord moet voorkomen',matchCyclic:'Doorlopend zoeken',replaceAll:'Alles vervangen',replaceSuccessMsg:'%1 resultaten vervangen.'},table:{toolbar:'Tabel',title:'Eigenschappen tabel',menu:'Eigenschappen tabel',deleteTable:'Tabel verwijderen',rows:'Rijen',columns:'Kolommen',border:'Breedte rand',widthPx:'pixels',widthPc:'procent',widthUnit:'eenheid breedte',cellSpace:'Afstand tussen cellen',cellPad:'Ruimte in de cel',caption:'Naam',summary:'Samenvatting',headers:'Koppen',headersNone:'Geen',headersColumn:'Eerste kolom',headersRow:'Eerste rij',headersBoth:'Beide',invalidRows:'Het aantal rijen moet een getal zijn groter dan 0.',invalidCols:'Het aantal kolommen moet een getal zijn groter dan 0.',invalidBorder:'De rand breedte moet een getal zijn.',invalidWidth:'De tabelbreedte moet een getal zijn.',invalidHeight:'De tabelhoogte moet een getal zijn.',invalidCellSpacing:'Afstand tussen cellen moet een getal zijn.',invalidCellPadding:'Ruimte in de cel moet een getal zijn.',cell:{menu:'Cel',insertBefore:'Voeg cel in voor',insertAfter:'Voeg cel in achter',deleteCell:'Cellen verwijderen',merge:'Cellen samenvoegen',mergeRight:'Voeg samen naar rechts',mergeDown:'Voeg samen naar beneden',splitHorizontal:'Splits cellen horizontaal',splitVertical:'Splits cellen verticaal',title:'Cel eigenschappen',cellType:'Cel type',rowSpan:'Rijen samenvoegen',colSpan:'Kolommen samenvoegen',wordWrap:'Automatische terugloop',hAlign:'Horizontale uitlijning',vAlign:'Verticale uitlijning',alignBaseline:'Basislijn',bgColor:'Achtergrondkleur',borderColor:'Kleur rand',data:'Inhoud',header:'Kop',yes:'Ja',no:'Nee',invalidWidth:'De celbreedte moet een getal zijn.',invalidHeight:'De celhoogte moet een getal zijn.',invalidRowSpan:'Rijen samenvoegen moet een heel getal zijn.',invalidColSpan:'Kolommen samenvoegen moet een heel getal zijn.',chooseColor:'Kies'},row:{menu:'Rij',insertBefore:'Voeg rij in voor',insertAfter:'Voeg rij in achter',deleteRow:'Rijen verwijderen'},column:{menu:'Kolom',insertBefore:'Voeg kolom in voor',insertAfter:'Voeg kolom in achter',deleteColumn:'Kolommen verwijderen'}},button:{title:'Eigenschappen knop',text:'Tekst (waarde)',type:'Soort',typeBtn:'Knop',typeSbm:'Versturen',typeRst:'Leegmaken'},checkboxAndRadio:{checkboxTitle:'Eigenschappen aanvinkvakje',radioTitle:'Eigenschappen selectievakje',value:'Waarde',selected:'Geselecteerd'},form:{title:'Eigenschappen formulier',menu:'Eigenschappen formulier',action:'Actie',method:'Methode',encoding:'Codering'},select:{title:'Eigenschappen selectieveld',selectInfo:'Informatie',opAvail:'Beschikbare opties',value:'Waarde',size:'Grootte',lines:'Regels',chkMulti:'Gecombineerde selecties toestaan',opText:'Tekst',opValue:'Waarde',btnAdd:'Toevoegen',btnModify:'Wijzigen',btnUp:'Omhoog',btnDown:'Omlaag',btnSetValue:'Als geselecteerde waarde instellen',btnDelete:'Verwijderen'},textarea:{title:'Eigenschappen tekstvak',cols:'Kolommen',rows:'Rijen'},textfield:{title:'Eigenschappen tekstveld',name:'Naam',value:'Waarde',charWidth:'Breedte (tekens)',maxChars:'Maximum aantal tekens',type:'Soort',typeText:'Tekst',typePass:'Wachtwoord'},hidden:{title:'Eigenschappen verborgen veld',name:'Naam',value:'Waarde'},image:{title:'Eigenschappen afbeelding',titleButton:'Eigenschappen afbeeldingsknop',menu:'Eigenschappen afbeelding',infoTab:'Informatie afbeelding',btnUpload:'Naar server verzenden',upload:'Upload',alt:'Alternatieve tekst',lockRatio:'Afmetingen vergrendelen',resetSize:'Afmetingen resetten',border:'Rand',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Geef de URL van de afbeelding',linkTab:'Link',button2Img:'Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?',img2Button:'Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?',urlMissing:'De URL naar de afbeelding ontbreekt.',validateBorder:'Rand moet een heel nummer zijn.',validateHSpace:'HSpace moet een heel nummer zijn.',validateVSpace:'VSpace moet een heel nummer zijn.'},flash:{properties:'Eigenschappen Flash',propertiesTab:'Eigenschappen',title:'Eigenschappen Flash',chkPlay:'Automatisch afspelen',chkLoop:'Herhalen',chkMenu:"Flashmenu's inschakelen",chkFull:'Schermvullend toestaan',scale:'Schaal',scaleAll:'Alles tonen',scaleNoBorder:'Geen rand',scaleFit:'Precies passend',access:'Script toegang',accessAlways:'Altijd',accessSameDomain:'Zelfde domeinnaam',accessNever:'Nooit',alignAbsBottom:'Absoluut-onder',alignAbsMiddle:'Absoluut-midden',alignBaseline:'Basislijn',alignTextTop:'Boven tekst',quality:'Kwaliteit',qualityBest:'Beste',qualityHigh:'Hoog',qualityAutoHigh:'Automatisch hoog',qualityMedium:'Gemiddeld',qualityAutoLow:'Automatisch laag',qualityLow:'Laag',windowModeWindow:'Venster',windowModeOpaque:'Ondoorzichtig',windowModeTransparent:'Doorzichtig',windowMode:'Venster modus',flashvars:'Variabelen voor Flash',bgcolor:'Achtergrondkleur',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'De URL mag niet leeg zijn.',validateHSpace:'De HSpace moet een getal zijn.',validateVSpace:'De VSpace moet een getal zijn.'},spellCheck:{toolbar:'Spellingscontrole',title:'Spellingscontrole',notAvailable:'Excuses, deze dienst is momenteel niet beschikbaar.',errorLoading:'Er is een fout opgetreden bij het laden van de dienst: %s.',notInDic:'Niet in het woordenboek',changeTo:'Wijzig in',btnIgnore:'Negeren',btnIgnoreAll:'Alles negeren',btnReplace:'Vervangen',btnReplaceAll:'Alles vervangen',btnUndo:'Ongedaan maken',noSuggestions:'- Geen suggesties -',progress:'Bezig met spellingscontrole...',noMispell:'Klaar met spellingscontrole: geen fouten gevonden',noChanges:'Klaar met spellingscontrole: geen woorden aangepast',oneChange:'Klaar met spellingscontrole: één woord aangepast',manyChanges:'Klaar met spellingscontrole: %1 woorden aangepast',ieSpellDownload:'De spellingscontrole is niet geïnstalleerd. Wilt u deze nu downloaden?'},smiley:{toolbar:'Smiley',title:'Smiley invoegen',options:'Smiley opties'},elementsPath:{eleLabel:'Elementenpad',eleTitle:'%1 element'},numberedlist:'Genummerde lijst',bulletedlist:'Opsomming',indent:'Inspringing vergroten',outdent:'Inspringing verkleinen',justify:{left:'Links uitlijnen',center:'Centreren',right:'Rechts uitlijnen',block:'Uitvullen'},blockquote:'Citaatblok',clipboard:{title:'Plakken',cutError:'De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.',copyError:'De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.',pasteMsg:'Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.',securityMsg:'Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.',pasteArea:'Plakgebied'},pastefromword:{confirmCleanup:'De tekst die u plakte lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?',toolbar:'Plakken als Word-gegevens',title:'Plakken als Word-gegevens',error:'Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout'},pasteText:{button:'Plakken als platte tekst',title:'Plakken als platte tekst'},templates:{button:'Sjablonen',title:'Inhoud sjablonen',options:'Template opties',insertOption:'Vervang de huidige inhoud',selectPromptMsg:'Selecteer het sjabloon dat in de editor geopend moet worden (de actuele inhoud gaat verloren):',emptyListMsg:'(Geen sjablonen gedefinieerd)'},showBlocks:'Toon blokken',stylesCombo:{label:'Stijl',panelTitle:'Opmaakstijlen',panelTitle1:'Blok stijlen',panelTitle2:'Inline stijlen',panelTitle3:'Object stijlen'},format:{label:'Opmaak',panelTitle:'Opmaak',tag_p:'Normaal',tag_pre:'Met opmaak',tag_address:'Adres',tag_h1:'Kop 1',tag_h2:'Kop 2',tag_h3:'Kop 3',tag_h4:'Kop 4',tag_h5:'Kop 5',tag_h6:'Kop 6',tag_div:'Normaal (DIV)'},div:{title:'Div aanmaken',toolbar:'Div aanmaken',cssClassInputLabel:'Stylesheet klassen',styleSelectLabel:'Stijl',IdInputLabel:'Id',languageCodeInputLabel:' Taalcode',inlineStyleInputLabel:'Inline stijl',advisoryTitleInputLabel:'Adviserende titel',langDirLabel:'Schrijfrichting',langDirLTRLabel:'Links naar rechts (LTR)',langDirRTLLabel:'Rechts naar links (RTL)',edit:'Div wijzigen',remove:'Div verwijderen'},iframe:{title:'IFrame eigenschappen',toolbar:'IFrame',noUrl:'Geef de IFrame URL in',scrolling:'Scrollbalken inschakelen',border:'Framerand tonen'},font:{label:'Lettertype',voiceLabel:'Lettertype',panelTitle:'Lettertype'},fontSize:{label:'Lettergrootte',voiceLabel:'Lettergrootte',panelTitle:'Lettergrootte'},colorButton:{textColorTitle:'Tekstkleur',bgColorTitle:'Achtergrondkleur',panelTitle:'Kleuren',auto:'Automatisch',more:'Meer kleuren...'},colors:{'000':'Zwart',800000:'Kastanjebruin','8B4513':'Chocoladebruin','2F4F4F':'Donkerleigrijs','008080':'Blauwgroen','000080':'Marine','4B0082':'Indigo',696969:'Donkergrijs',B22222:'Baksteen',A52A2A:'Bruin',DAA520:'Donkergeel','006400':'Donkergroen','40E0D0':'Turquoise','0000CD':'Middenblauw',800080:'Paars',808080:'Grijs',F00:'Rood',FF8C00:'Donkeroranje',FFD700:'Goud','008000':'Groen','0FF':'Cyaan','00F':'Blauw',EE82EE:'Violet',A9A9A9:'Donkergrijs',FFA07A:'Lichtzalm',FFA500:'Oranje',FFFF00:'Geel','00FF00':'Felgroen',AFEEEE:'Lichtturquoise',ADD8E6:'Lichtblauw',DDA0DD:'Pruim',D3D3D3:'Lichtgrijs',FFF0F5:'Linnen',FAEBD7:'Ivoor',FFFFE0:'Lichtgeel',F0FFF0:'Honingdauw',F0FFFF:'Azuur',F0F8FF:'Licht hemelsblauw',E6E6FA:'Lavendel',FFF:'Wit'},scayt:{title:'Controleer de spelling tijdens het typen',opera_title:'Niet ondersteund door Opera',enable:'SCAYT inschakelen',disable:'SCAYT uitschakelen',about:'Over SCAYT',toggle:'SCAYT in/uitschakelen',options:'Opties',langs:'Talen',moreSuggestions:'Meer suggesties',ignore:'Negeren',ignoreAll:'Alles negeren',addWord:'Woord toevoegen',emptyDic:'De naam van het woordenboek mag niet leeg zijn.',noSuggestions:'Geen suggesties',optionsTab:'Opties',allCaps:'Negeer woorden helemaal in hoofdletters',ignoreDomainNames:'Negeer domeinnamen',mixedCase:'Negeer woorden met hoofd- en kleine letters',mixedWithDigits:'Negeer woorden met cijfers',languagesTab:'Talen',dictionariesTab:'Woordenboeken',dic_field_name:'Naam woordenboek',dic_create:'Aanmaken',dic_restore:'Terugzetten',dic_delete:'Verwijderen',dic_rename:'Hernoemen',dic_info:'Initieel wordt het gebruikerswoordenboek opgeslagen in een cookie. Cookies zijn echter beperkt in grootte. Zodra het gebruikerswoordenboek het punt bereikt waarop het niet meer in een cookie opgeslagen kan worden, dan wordt het woordenboek op de server opgeslagen. Om je persoonlijke woordenboek op je eigen server op te slaan, moet je een mapnaam opgeven. Indien je al een woordenboek hebt opgeslagen, typ dan de naam en klik op de Terugzetten knop.',aboutTab:'Over'},about:{title:'Over CKEditor',dlgTitle:'Over CKEditor',help:'Bekijk de $1 voor hulp.',userGuide:'CKEditor gebruiksaanwijzing',moreInfo:'Voor licentie informatie, bezoek onze website:',copy:'Copyright &copy; $1. Alle rechten voorbehouden.'},maximize:'Maximaliseren',minimize:'Minimaliseren',fakeobjects:{anchor:'Interne link',flash:'Flash animatie',iframe:'IFrame',hiddenfield:'Verborgen veld',unknown:'Onbekend object'},resize:'Sleep om te herschalen',colordialog:{title:'Selecteer kleur',options:'Kleuropties',highlight:'Actief',selected:'Geselecteerde kleur',clear:'Wissen'},toolbarCollapse:'Werkbalk inklappen',toolbarExpand:'Werkbalk uitklappen',toolbarGroups:{document:'Document',clipboard:'Klembord/Ongedaan maken',editing:'Bewerken',forms:'Formulieren',basicstyles:'Basisstijlen',paragraph:'Paragraaf',links:'Links',insert:'Invoegen',styles:'Stijlen',colors:'Kleuren',tools:'Toepassingen'},bidi:{ltr:'Schrijfrichting van links naar rechts',rtl:'Schrijfrichting van rechts naar links'},docprops:{label:'Documenteigenschappen',title:'Documenteigenschappen',design:'Ontwerp',meta:'Meta tags',chooseColor:'Kies',other:'Anders...',docTitle:'Paginatitel',charset:'Tekencodering',charsetOther:'Andere tekencodering',charsetASCII:'ASCII',charsetCE:'Centraal Europees',charsetCT:'Traditioneel Chinees (Big5)',charsetCR:'Cyrillisch',charsetGR:'Grieks',charsetJP:'Japans',charsetKR:'Koreaans',charsetTR:'Turks',charsetUN:'Unicode (UTF-8)',charsetWE:'West Europees',docType:'Documenttype-definitie',docTypeOther:'Andere documenttype-definitie',xhtmlDec:'XHTML declaratie invoegen',bgColor:'Achtergrondkleur',bgImage:'Achtergrondafbeelding URL',bgFixed:'Niet-scrollend (gefixeerde) achtergrond',txtColor:'Tekstkleur',margin:'Pagina marges',marginTop:'Boven',marginLeft:'Links',marginRight:'Rechts',marginBottom:'Onder',metaKeywords:'Trefwoorden voor indexering (komma-gescheiden)',metaDescription:'Documentbeschrijving',metaAuthor:'Auteur',metaCopyright:'Auteursrechten',previewHtml:'<p>Dit is <strong>voorbeeld tekst</strong>. Je gebruikt <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/no.js b/web/imcms/ckeditor/lang/no.js
new file mode 100644
index 0000000000..c826f6015a
--- /dev/null
+++ b/web/imcms/ckeditor/lang/no.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.no={dir:'ltr',editorTitle:'Rikteksteditor, %1',editorHelp:'Trykk ALT 0 for hjelp',toolbars:'Verktøylinjer for editor',editor:'Rikteksteditor',source:'Kilde',newPage:'Ny side',save:'Lagre',preview:'Forhåndsvis',cut:'Klipp ut',copy:'Kopier',paste:'Lim inn',print:'Skriv ut',underline:'Understreking',bold:'Fet',italic:'Kursiv',selectAll:'Merk alt',removeFormat:'Fjern formatering',strike:'Gjennomstreking',subscript:'Senket skrift',superscript:'Hevet skrift',horizontalrule:'Sett inn horisontal linje',pagebreak:'Sett inn sideskift for utskrift',pagebreakAlt:'Sideskift',unlink:'Fjern lenke',undo:'Angre',redo:'Gjør om',common:{browseServer:'Bla igjennom server',url:'URL',protocol:'Protokoll',upload:'Last opp',uploadSubmit:'Send det til serveren',image:'Bilde',flash:'Flash',form:'Skjema',checkbox:'Avmerkingsboks',radio:'Alternativknapp',textField:'Tekstboks',textarea:'Tekstområde',hiddenField:'Skjult felt',button:'Knapp',select:'Rullegardinliste',imageButton:'Bildeknapp',notSet:'<ikke satt>',id:'Id',name:'Navn',langDir:'Språkretning',langDirLtr:'Venstre til høyre (VTH)',langDirRtl:'Høyre til venstre (HTV)',langCode:'Språkkode',longDescr:'Utvidet beskrivelse',cssClass:'Stilarkklasser',advisoryTitle:'Tittel',cssStyle:'Stil',ok:'OK',cancel:'Avbryt',close:'Lukk',preview:'Forhåndsvis',generalTab:'Generelt',advancedTab:'Avansert',validateNumberFailed:'Denne verdien er ikke et tall.',confirmNewPage:'Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?',confirmCancel:'Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?',options:'Valg',target:'Mål',targetNew:'Nytt vindu (_blank)',targetTop:'Hele vindu (_top)',targetSelf:'Samme vindu (_self)',targetParent:'Foreldrevindu (_parent)',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',styles:'Stil',cssClasses:'Stilarkklasser',width:'Bredde',height:'Høyde',align:'Juster',alignLeft:'Venstre',alignRight:'Høyre',alignCenter:'Midtjuster',alignTop:'Topp',alignMiddle:'Midten',alignBottom:'Bunn',invalidValue:'Ugyldig verdi.',invalidHeight:'Høyde må være et tall.',invalidWidth:'Bredde må være et tall.',invalidCssLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).',invalidHtmlLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).',invalidInlineStyle:'Verdi angitt for inline stil må bestå av en eller flere sett med formatet "navn : verdi", separert med semikolon',cssLengthTooltip:'Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).',unavailable:'%1<span class="cke_accessibility">, utilgjenglig</span>'},contextmenu:{options:'Alternativer for høyreklikkmeny'},specialChar:{toolbar:'Sett inn spesialtegn',title:'Velg spesialtegn',options:'Alternativer for spesialtegn'},link:{toolbar:'Sett inn/Rediger lenke',other:'<annen>',menu:'Rediger lenke',title:'Lenke',info:'Lenkeinfo',target:'Mål',upload:'Last opp',advanced:'Avansert',type:'Lenketype',toUrl:'URL',toAnchor:'Lenke til anker i teksten',toEmail:'E-post',targetFrame:'<ramme>',targetPopup:'<popup-vindu>',targetFrameName:'Målramme',targetPopupName:'Navn på popup-vindu',popupFeatures:'Egenskaper for popup-vindu',popupResizable:'Skalerbar',popupStatusBar:'Statuslinje',popupLocationBar:'Adresselinje',popupToolbar:'Verktøylinje',popupMenuBar:'Menylinje',popupFullScreen:'Fullskjerm (IE)',popupScrollBars:'Scrollbar',popupDependent:'Avhenging (Netscape)',popupLeft:'Venstre posisjon',popupTop:'Topp-posisjon',id:'Id',langDir:'Språkretning',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',acccessKey:'Aksessknapp',name:'Navn',langCode:'Språkkode',tabIndex:'Tabindeks',advisoryTitle:'Tittel',advisoryContentType:'Type',cssClasses:'Stilarkklasser',charset:'Lenket tegnsett',styles:'Stil',rel:'Relasjon (rel)',selectAnchor:'Velg et anker',anchorName:'Anker etter navn',anchorId:'Element etter ID',emailAddress:'E-postadresse',emailSubject:'Meldingsemne',emailBody:'Melding',noAnchors:'(Ingen anker i dokumentet)',noUrl:'Vennligst skriv inn lenkens URL',noEmail:'Vennligst skriv inn e-postadressen'},anchor:{toolbar:'Sett inn/Rediger anker',menu:'Egenskaper for anker',title:'Egenskaper for anker',name:'Ankernavn',errorName:'Vennligst skriv inn ankernavnet',remove:'Fjern anker'},list:{numberedTitle:'Egenskaper for nummerert liste',bulletedTitle:'Egenskaper for punktmerket liste',type:'Type',start:'Start',validateStartNumber:'Starten på listen må være et heltall.',circle:'Sirkel',disc:'Disk',square:'Firkant',none:'Ingen',notset:'<ikke satt>',armenian:'Armensk nummerering',georgian:'Georgisk nummerering (an, ban, gan, osv.)',lowerRoman:'Romertall, små (i, ii, iii, iv, v, osv.)',upperRoman:'Romertall, store (I, II, III, IV, V, osv.)',lowerAlpha:'Alfabetisk, små (a, b, c, d, e, osv.)',upperAlpha:'Alfabetisk, store (A, B, C, D, E, osv.)',lowerGreek:'Gresk, små (alpha, beta, gamma, osv.)',decimal:'Tall (1, 2, 3, osv.)',decimalLeadingZero:'Tall, med førstesiffer null (01, 02, 03, osv.)'},findAndReplace:{title:'Søk og erstatt',find:'Søk',replace:'Erstatt',findWhat:'Søk etter:',replaceWith:'Erstatt med:',notFoundMsg:'Fant ikke søketeksten.',findOptions:'Søkealternativer',matchCase:'Skill mellom store og små bokstaver',matchWord:'Bare hele ord',matchCyclic:'Søk i hele dokumentet',replaceAll:'Erstatt alle',replaceSuccessMsg:'%1 tilfelle(r) erstattet.'},table:{toolbar:'Tabell',title:'Egenskaper for tabell',menu:'Egenskaper for tabell',deleteTable:'Slett tabell',rows:'Rader',columns:'Kolonner',border:'Rammestørrelse',widthPx:'piksler',widthPc:'prosent',widthUnit:'Bredde-enhet',cellSpace:'Cellemarg',cellPad:'Cellepolstring',caption:'Tittel',summary:'Sammendrag',headers:'Overskrifter',headersNone:'Ingen',headersColumn:'Første kolonne',headersRow:'Første rad',headersBoth:'Begge',invalidRows:'Antall rader må være et tall større enn 0.',invalidCols:'Antall kolonner må være et tall større enn 0.',invalidBorder:'Rammestørrelse må være et tall.',invalidWidth:'Tabellbredde må være et tall.',invalidHeight:'Tabellhøyde må være et tall.',invalidCellSpacing:'Cellemarg må være et positivt tall.',invalidCellPadding:'Cellepolstring må være et positivt tall.',cell:{menu:'Celle',insertBefore:'Sett inn celle før',insertAfter:'Sett inn celle etter',deleteCell:'Slett celler',merge:'Slå sammen celler',mergeRight:'Slå sammen høyre',mergeDown:'Slå sammen ned',splitHorizontal:'Del celle horisontalt',splitVertical:'Del celle vertikalt',title:'Celleegenskaper',cellType:'Celletype',rowSpan:'Radspenn',colSpan:'Kolonnespenn',wordWrap:'Tekstbrytning',hAlign:'Horisontal justering',vAlign:'Vertikal justering',alignBaseline:'Grunnlinje',bgColor:'Bakgrunnsfarge',borderColor:'Rammefarge',data:'Data',header:'Overskrift',yes:'Ja',no:'Nei',invalidWidth:'Cellebredde må være et tall.',invalidHeight:'Cellehøyde må være et tall.',invalidRowSpan:'Radspenn må være et heltall.',invalidColSpan:'Kolonnespenn må være et heltall.',chooseColor:'Velg'},row:{menu:'Rader',insertBefore:'Sett inn rad før',insertAfter:'Sett inn rad etter',deleteRow:'Slett rader'},column:{menu:'Kolonne',insertBefore:'Sett inn kolonne før',insertAfter:'Sett inn kolonne etter',deleteColumn:'Slett kolonner'}},button:{title:'Egenskaper for knapp',text:'Tekst (verdi)',type:'Type',typeBtn:'Knapp',typeSbm:'Send',typeRst:'Nullstill'},checkboxAndRadio:{checkboxTitle:'Egenskaper for avmerkingsboks',radioTitle:'Egenskaper for alternativknapp',value:'Verdi',selected:'Valgt'},form:{title:'Egenskaper for skjema',menu:'Egenskaper for skjema',action:'Handling',method:'Metode',encoding:'Encoding'},select:{title:'Egenskaper for rullegardinliste',selectInfo:'Info',opAvail:'Tilgjenglige alternativer',value:'Verdi',size:'Størrelse',lines:'Linjer',chkMulti:'Tillat flervalg',opText:'Tekst',opValue:'Verdi',btnAdd:'Legg til',btnModify:'Endre',btnUp:'Opp',btnDown:'Ned',btnSetValue:'Sett som valgt',btnDelete:'Slett'},textarea:{title:'Egenskaper for tekstområde',cols:'Kolonner',rows:'Rader'},textfield:{title:'Egenskaper for tekstfelt',name:'Navn',value:'Verdi',charWidth:'Tegnbredde',maxChars:'Maks antall tegn',type:'Type',typeText:'Tekst',typePass:'Passord'},hidden:{title:'Egenskaper for skjult felt',name:'Navn',value:'Verdi'},image:{title:'Bildeegenskaper',titleButton:'Egenskaper for bildeknapp',menu:'Bildeegenskaper',infoTab:'Bildeinformasjon',btnUpload:'Send det til serveren',upload:'Last opp',alt:'Alternativ tekst',lockRatio:'Lås forhold',resetSize:'Tilbakestill størrelse',border:'Ramme',hSpace:'HMarg',vSpace:'VMarg',alertUrl:'Vennligst skriv bilde-urlen',linkTab:'Lenke',button2Img:'Vil du endre den valgte bildeknappen til et vanlig bilde?',img2Button:'Vil du endre det valgte bildet til en bildeknapp?',urlMissing:'Bildets adresse mangler.',validateBorder:'Ramme må være et heltall.',validateHSpace:'HMarg må være et heltall.',validateVSpace:'VMarg må være et heltall.'},flash:{properties:'Egenskaper for Flash-objekt',propertiesTab:'Egenskaper',title:'Flash-egenskaper',chkPlay:'Autospill',chkLoop:'Loop',chkMenu:'Slå på Flash-meny',chkFull:'Tillat fullskjerm',scale:'Skaler',scaleAll:'Vis alt',scaleNoBorder:'Ingen ramme',scaleFit:'Skaler til å passe',access:'Scripttilgang',accessAlways:'Alltid',accessSameDomain:'Samme domene',accessNever:'Aldri',alignAbsBottom:'Abs bunn',alignAbsMiddle:'Abs midten',alignBaseline:'Bunnlinje',alignTextTop:'Tekst topp',quality:'Kvalitet',qualityBest:'Best',qualityHigh:'Høy',qualityAutoHigh:'Auto høy',qualityMedium:'Medium',qualityAutoLow:'Auto lav',qualityLow:'Lav',windowModeWindow:'Vindu',windowModeOpaque:'Opaque',windowModeTransparent:'Gjennomsiktig',windowMode:'Vindumodus',flashvars:'Variabler for flash',bgcolor:'Bakgrunnsfarge',hSpace:'HMarg',vSpace:'VMarg',validateSrc:'Vennligst skriv inn lenkens url.',validateHSpace:'HMarg må være et tall.',validateVSpace:'VMarg må være et tall.'},spellCheck:{toolbar:'Stavekontroll',title:'Stavekontroll',notAvailable:'Beklager, tjenesten er utilgjenglig nå.',errorLoading:'Feil under lasting av applikasjonstjenestetjener: %s.',notInDic:'Ikke i ordboken',changeTo:'Endre til',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer alle',btnReplace:'Erstatt',btnReplaceAll:'Erstatt alle',btnUndo:'Angre',noSuggestions:'- Ingen forslag -',progress:'Stavekontroll pågår...',noMispell:'Stavekontroll fullført: ingen feilstavinger funnet',noChanges:'Stavekontroll fullført: ingen ord endret',oneChange:'Stavekontroll fullført: Ett ord endret',manyChanges:'Stavekontroll fullført: %1 ord endret',ieSpellDownload:'Stavekontroll er ikke installert. Vil du laste den ned nå?'},smiley:{toolbar:'Smil',title:'Sett inn smil',options:'Alternativer for smil'},elementsPath:{eleLabel:'Element-sti',eleTitle:'%1 element'},numberedlist:'Legg til/Fjern nummerert liste',bulletedlist:'Legg til/Fjern punktmerket liste',indent:'Øk innrykk',outdent:'Reduser innrykk',justify:{left:'Venstrejuster',center:'Midtstill',right:'Høyrejuster',block:'Blokkjuster'},blockquote:'Sitatblokk',clipboard:{title:'Lim inn',cutError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).',copyError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).',pasteMsg:'Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.',securityMsg:'Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.',pasteArea:'Innlimingsområde'},pastefromword:{confirmCleanup:'Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?',toolbar:'Lim inn fra Word',title:'Lim inn fra Word',error:'Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil'},pasteText:{button:'Lim inn som ren tekst',title:'Lim inn som ren tekst'},templates:{button:'Maler',title:'Innholdsmaler',options:'Alternativer for mal',insertOption:'Erstatt gjeldende innhold',selectPromptMsg:'Velg malen du vil åpne i redigeringsverktøyet:',emptyListMsg:'(Ingen maler definert)'},showBlocks:'Vis blokker',stylesCombo:{label:'Stil',panelTitle:'Stilformater',panelTitle1:'Blokkstiler',panelTitle2:'Inlinestiler',panelTitle3:'Objektstiler'},format:{label:'Format',panelTitle:'Avsnittsformat',tag_p:'Normal',tag_pre:'Formatert',tag_address:'Adresse',tag_h1:'Overskrift 1',tag_h2:'Overskrift 2',tag_h3:'Overskrift 3',tag_h4:'Overskrift 4',tag_h5:'Overskrift 5',tag_h6:'Overskrift 6',tag_div:'Normal (DIV)'},div:{title:'Sett inn Div Container',toolbar:'Sett inn Div Container',cssClassInputLabel:'Stilark-klasser',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Språkkode',inlineStyleInputLabel:'Inlinestiler',advisoryTitleInputLabel:'Tittel',langDirLabel:'Språkretning',langDirLTRLabel:'Venstre til høyre (VTH)',langDirRTLLabel:'Høyre til venstre (HTV)',edit:'Rediger Div',remove:'Fjern Div'},iframe:{title:'Egenskaper for IFrame',toolbar:'IFrame',noUrl:'Vennligst skriv inn URL for iframe',scrolling:'Aktiver scrollefelt',border:'Viss ramme rundt iframe'},font:{label:'Skrift',voiceLabel:'Font',panelTitle:'Skrift'},fontSize:{label:'Størrelse',voiceLabel:'Font Størrelse',panelTitle:'Størrelse'},colorButton:{textColorTitle:'Tekstfarge',bgColorTitle:'Bakgrunnsfarge',panelTitle:'Farger',auto:'Automatisk',more:'Flere farger...'},colors:{'000':'Svart',800000:'Rødbrun','8B4513':'Salbrun','2F4F4F':'Grønnsvart','008080':'Blågrønn','000080':'Marineblått','4B0082':'Indigo',696969:'Mørk grå',B22222:'Mørkerød',A52A2A:'Brun',DAA520:'Lys brun','006400':'Mørk grønn','40E0D0':'Turkis','0000CD':'Medium blå',800080:'Purpur',808080:'Grå',F00:'Rød',FF8C00:'Mørk oransje',FFD700:'Gull','008000':'Grønn','0FF':'Cyan','00F':'Blå',EE82EE:'Fiolett',A9A9A9:'Svak grå',FFA07A:'Rosa-oransje',FFA500:'Oransje',FFFF00:'Gul','00FF00':'Lime',AFEEEE:'Svak turkis',ADD8E6:'Lys Blå',DDA0DD:'Plomme',D3D3D3:'Lys grå',FFF0F5:'Svak lavendelrosa',FAEBD7:'Antikk-hvit',FFFFE0:'Lys gul',F0FFF0:'Honningmelon',F0FFFF:'Svakt asurblått',F0F8FF:'Svak cyan',E6E6FA:'Lavendel',FFF:'Hvit'},scayt:{title:'Stavekontroll mens du skriver',opera_title:'Ikke støttet av Opera',enable:'Slå på SCAYT',disable:'Slå av SCAYT',about:'Om SCAYT',toggle:'Veksle SCAYT',options:'Valg',langs:'Språk',moreSuggestions:'Flere forslag',ignore:'Ignorer',ignoreAll:'Ignorer Alle',addWord:'Legg til ord',emptyDic:'Ordboknavn bør ikke være tom.',noSuggestions:'Ingen forslag',optionsTab:'Valg',allCaps:'Ikke kontroller ord med kun store bokstaver',ignoreDomainNames:'Ikke kontroller domenenavn',mixedCase:'Ikke kontroller ord med blandet små og store bokstaver',mixedWithDigits:'Ikke kontroller ord som inneholder tall',languagesTab:'Språk',dictionariesTab:'Ordbøker',dic_field_name:'Ordboknavn',dic_create:'Opprett',dic_restore:'Gjenopprett',dic_delete:'Slett',dic_rename:'Gi nytt navn',dic_info:'Brukerordboken lagres først i en informasjonskapsel på din maskin, men det er en begrensning på hvor mye som kan lagres her. Når ordboken blir for stor til å lagres i en informasjonskapsel, vil vi i stedet lagre ordboken på vår server. For å lagre din personlige ordbok på vår server, burde du velge et navn for ordboken din. Hvis du allerede har lagret en ordbok, vennligst skriv inn ordbokens navn og klikk på Gjenopprett-knappen.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Se $1 for hjelp.',userGuide:'CKEditors brukerveiledning',moreInfo:'For lisensieringsinformasjon, vennligst besøk vårt nettsted:',copy:'Copyright &copy; $1. Alle rettigheter reservert.'},maximize:'Maksimer',minimize:'Minimer',fakeobjects:{anchor:'Anker',flash:'Flash-animasjon',iframe:'IFrame',hiddenfield:'Skjult felt',unknown:'Ukjent objekt'},resize:'Dra for å skalere',colordialog:{title:'Velg farge',options:'Alternativer for farge',highlight:'Merk',selected:'Valgt',clear:'Tøm'},toolbarCollapse:'Skjul verktøylinje',toolbarExpand:'Vis verktøylinje',toolbarGroups:{document:'Dokument',clipboard:'Utklippstavle/Angre',editing:'Redigering',forms:'Skjema',basicstyles:'Basisstiler',paragraph:'Avsnitt',links:'Lenker',insert:'Innsetting',styles:'Stiler',colors:'Farger',tools:'Verktøy'},bidi:{ltr:'Tekstretning fra venstre til høyre',rtl:'Tekstretning fra høyre til venstre'},docprops:{label:'Dokumentegenskaper',title:'Dokumentegenskaper',design:'Design',meta:'Meta-data',chooseColor:'Velg',other:'<annen>',docTitle:'Sidetittel',charset:'Tegnsett',charsetOther:'Annet tegnsett',charsetASCII:'ASCII',charsetCE:'Sentraleuropeisk',charsetCT:'Tradisonell kinesisk(Big5)',charsetCR:'Kyrillisk',charsetGR:'Gresk',charsetJP:'Japansk',charsetKR:'Koreansk',charsetTR:'Tyrkisk',charsetUN:'Unicode (UTF-8)',charsetWE:'Vesteuropeisk',docType:'Dokumenttype header',docTypeOther:'Annet dokumenttype header',xhtmlDec:'Inkluder XHTML-deklarasjon',bgColor:'Bakgrunnsfarge',bgImage:'URL for bakgrunnsbilde',bgFixed:'Lås bakgrunnsbilde',txtColor:'Tekstfarge',margin:'Sidemargin',marginTop:'Topp',marginLeft:'Venstre',marginRight:'Høyre',marginBottom:'Bunn',metaKeywords:'Dokument nøkkelord (kommaseparert)',metaDescription:'Dokumentbeskrivelse',metaAuthor:'Forfatter',metaCopyright:'Kopirett',previewHtml:'<p>Dette er en <strong>eksempeltekst</strong>. Du bruker <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/pl.js b/web/imcms/ckeditor/lang/pl.js
new file mode 100644
index 0000000000..7bcfdd45e9
--- /dev/null
+++ b/web/imcms/ckeditor/lang/pl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.pl={dir:'ltr',editorTitle:'Edytor tekstu sformatowanego, %1',editorHelp:'W celu uzyskania pomocy naciśnij ALT 0',toolbars:'Paski narzędzi edytora',editor:'Edytor tekstu sformatowanego',source:'Źródło dokumentu',newPage:'Nowa strona',save:'Zapisz',preview:'Podgląd',cut:'Wytnij',copy:'Kopiuj',paste:'Wklej',print:'Drukuj',underline:'Podkreślenie',bold:'Pogrubienie',italic:'Kursywa',selectAll:'Zaznacz wszystko',removeFormat:'Usuń formatowanie',strike:'Przekreślenie',subscript:'Indeks dolny',superscript:'Indeks górny',horizontalrule:'Wstaw poziomą linię',pagebreak:'Wstaw podział strony',pagebreakAlt:'Wstaw podział strony',unlink:'Usuń odnośnik',undo:'Cofnij',redo:'Ponów',common:{browseServer:'Przeglądaj',url:'Adres URL',protocol:'Protokół',upload:'Wyślij',uploadSubmit:'Wyślij',image:'Obrazek',flash:'Flash',form:'Formularz',checkbox:'Pole wyboru (checkbox)',radio:'Przycisk opcji (radio)',textField:'Pole tekstowe',textarea:'Obszar tekstowy',hiddenField:'Pole ukryte',button:'Przycisk',select:'Lista wyboru',imageButton:'Przycisk graficzny',notSet:'<nie ustawiono>',id:'Id',name:'Nazwa',langDir:'Kierunek tekstu',langDirLtr:'Od lewej do prawej (LTR)',langDirRtl:'Od prawej do lewej (RTL)',langCode:'Kod języka',longDescr:'Adres URL długiego opisu',cssClass:'Nazwa klasy CSS',advisoryTitle:'Opis obiektu docelowego',cssStyle:'Styl',ok:'OK',cancel:'Anuluj',close:'Zamknij',preview:'Podgląd',generalTab:'Ogólne',advancedTab:'Zaawansowane',validateNumberFailed:'Ta wartość nie jest liczbą.',confirmNewPage:'Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?',confirmCancel:'Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?',options:'Opcje',target:'Obiekt docelowy',targetNew:'Nowe okno (_blank)',targetTop:'Okno najwyżej w hierarchii (_top)',targetSelf:'To samo okno (_self)',targetParent:'Okno nadrzędne (_parent)',langDirLTR:'Od lewej do prawej (LTR)',langDirRTL:'Od prawej do lewej (RTL)',styles:'Style',cssClasses:'Klasy arkusza stylów',width:'Szerokość',height:'Wysokość',align:'Wyrównaj',alignLeft:'Do lewej',alignRight:'Do prawej',alignCenter:'Do środka',alignTop:'Do góry',alignMiddle:'Do środka',alignBottom:'Do dołu',invalidValue:'Invalid value.',invalidHeight:'Wysokość musi być liczbą.',invalidWidth:'Szerokość musi być liczbą.',invalidCssLength:'Wartość podana dla pola "%1" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).',invalidHtmlLength:'Wartość podana dla pola "%1" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).',invalidInlineStyle:'Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie "nazwa : wartość", rozdzielonych średnikami.',cssLengthTooltip:'Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).',unavailable:'%1<span class="cke_accessibility">, niedostępne</span>'},contextmenu:{options:'Opcje menu kontekstowego'},specialChar:{toolbar:'Wstaw znak specjalny',title:'Wybierz znak specjalny',options:'Opcje znaków specjalnych'},link:{toolbar:'Wstaw/edytuj odnośnik',other:'<inny>',menu:'Edytuj odnośnik',title:'Odnośnik',info:'Informacje ',target:'Obiekt docelowy',upload:'Wyślij',advanced:'Zaawansowane',type:'Typ odnośnika',toUrl:'Adres URL',toAnchor:'Odnośnik wewnątrz strony (kotwica)',toEmail:'Adres e-mail',targetFrame:'<ramka>',targetPopup:'<wyskakujące okno>',targetFrameName:'Nazwa ramki docelowej',targetPopupName:'Nazwa wyskakującego okna',popupFeatures:'Właściwości wyskakującego okna',popupResizable:'Skalowalny',popupStatusBar:'Pasek statusu',popupLocationBar:'Pasek adresu',popupToolbar:'Pasek narzędzi',popupMenuBar:'Pasek menu',popupFullScreen:'Pełny ekran (IE)',popupScrollBars:'Paski przewijania',popupDependent:'Okno zależne (Netscape)',popupLeft:'Pozycja w poziomie',popupTop:'Pozycja w pionie',id:'Id',langDir:'Kierunek tekstu',langDirLTR:'Od lewej do prawej (LTR)',langDirRTL:'Od prawej do lewej (RTL)',acccessKey:'Klawisz dostępu',name:'Nazwa',langCode:'Kod języka',tabIndex:'Indeks kolejności',advisoryTitle:'Opis obiektu docelowego',advisoryContentType:'Typ MIME obiektu docelowego',cssClasses:'Nazwa klasy CSS',charset:'Kodowanie znaków obiektu docelowego',styles:'Styl',rel:'Relacja',selectAnchor:'Wybierz kotwicę',anchorName:'Wg nazwy',anchorId:'Wg identyfikatora',emailAddress:'Adres e-mail',emailSubject:'Temat',emailBody:'Treść',noAnchors:'(W dokumencie nie zdefiniowano żadnych kotwic)',noUrl:'Podaj adres URL',noEmail:'Podaj adres e-mail'},anchor:{toolbar:'Wstaw/edytuj kotwicę',menu:'Właściwości kotwicy',title:'Właściwości kotwicy',name:'Nazwa kotwicy',errorName:'Wpisz nazwę kotwicy',remove:'Usuń kotwicę'},list:{numberedTitle:'Właściwości list numerowanych',bulletedTitle:'Właściwości list wypunktowanych',type:'Typ punktora',start:'Początek',validateStartNumber:'Listę musi rozpoczynać liczba całkowita.',circle:'Koło',disc:'Okrąg',square:'Kwadrat',none:'Brak',notset:'<nie ustawiono>',armenian:'Numerowanie armeńskie',georgian:'Numerowanie gruzińskie (an, ban, gan itd.)',lowerRoman:'Małe cyfry rzymskie (i, ii, iii, iv, v itd.)',upperRoman:'Duże cyfry rzymskie (I, II, III, IV, V itd.)',lowerAlpha:'Małe litery (a, b, c, d, e itd.)',upperAlpha:'Duże litery (A, B, C, D, E itd.)',lowerGreek:'Małe litery greckie (alpha, beta, gamma itd.)',decimal:'Liczby (1, 2, 3 itd.)',decimalLeadingZero:'Liczby z początkowym zerem (01, 02, 03 itd.)'},findAndReplace:{title:'Znajdź i zamień',find:'Znajdź',replace:'Zamień',findWhat:'Znajdź:',replaceWith:'Zastąp przez:',notFoundMsg:'Nie znaleziono szukanego hasła.',findOptions:'Opcje wyszukiwania',matchCase:'Uwzględnij wielkość liter',matchWord:'Całe słowa',matchCyclic:'Cykliczne dopasowanie',replaceAll:'Zamień wszystko',replaceSuccessMsg:'%1 wystąpień zastąpionych.'},table:{toolbar:'Tabela',title:'Właściwości tabeli',menu:'Właściwości tabeli',deleteTable:'Usuń tabelę',rows:'Liczba wierszy',columns:'Liczba kolumn',border:'Grubość obramowania',widthPx:'piksele',widthPc:'%',widthUnit:'jednostka szerokości',cellSpace:'Odstęp pomiędzy komórkami',cellPad:'Dopełnienie komórek',caption:'Tytuł',summary:'Podsumowanie',headers:'Nagłówki',headersNone:'Brak',headersColumn:'Pierwsza kolumna',headersRow:'Pierwszy wiersz',headersBoth:'Oba',invalidRows:'Liczba wierszy musi być większa niż 0.',invalidCols:'Liczba kolumn musi być większa niż 0.',invalidBorder:'Wartość obramowania musi być liczbą.',invalidWidth:'Szerokość tabeli musi być liczbą.',invalidHeight:'Wysokość tabeli musi być liczbą.',invalidCellSpacing:'Odstęp pomiędzy komórkami musi być liczbą dodatnią.',invalidCellPadding:'Dopełnienie komórek musi być liczbą dodatnią.',cell:{menu:'Komórka',insertBefore:'Wstaw komórkę z lewej',insertAfter:'Wstaw komórkę z prawej',deleteCell:'Usuń komórki',merge:'Połącz komórki',mergeRight:'Połącz z komórką z prawej',mergeDown:'Połącz z komórką poniżej',splitHorizontal:'Podziel komórkę poziomo',splitVertical:'Podziel komórkę pionowo',title:'Właściwości komórki',cellType:'Typ komórki',rowSpan:'Scalenie wierszy',colSpan:'Scalenie komórek',wordWrap:'Zawijanie słów',hAlign:'Wyrównanie poziome',vAlign:'Wyrównanie pionowe',alignBaseline:'Linia bazowa',bgColor:'Kolor tła',borderColor:'Kolor obramowania',data:'Dane',header:'Nagłówek',yes:'Tak',no:'Nie',invalidWidth:'Szerokość komórki musi być liczbą.',invalidHeight:'Wysokość komórki musi być liczbą.',invalidRowSpan:'Scalenie wierszy musi być liczbą całkowitą.',invalidColSpan:'Scalenie komórek musi być liczbą całkowitą.',chooseColor:'Wybierz'},row:{menu:'Wiersz',insertBefore:'Wstaw wiersz powyżej',insertAfter:'Wstaw wiersz poniżej',deleteRow:'Usuń wiersze'},column:{menu:'Kolumna',insertBefore:'Wstaw kolumnę z lewej',insertAfter:'Wstaw kolumnę z prawej',deleteColumn:'Usuń kolumny'}},button:{title:'Właściwości przycisku',text:'Tekst (Wartość)',type:'Typ',typeBtn:'Przycisk',typeSbm:'Wyślij',typeRst:'Wyczyść'},checkboxAndRadio:{checkboxTitle:'Właściwości pola wyboru (checkbox)',radioTitle:'Właściwości przycisku opcji (radio)',value:'Wartość',selected:'Zaznaczone'},form:{title:'Właściwości formularza',menu:'Właściwości formularza',action:'Akcja',method:'Metoda',encoding:'Kodowanie'},select:{title:'Właściwości listy wyboru',selectInfo:'Informacje',opAvail:'Dostępne opcje',value:'Wartość',size:'Rozmiar',lines:'wierszy',chkMulti:'Wielokrotny wybór',opText:'Tekst',opValue:'Wartość',btnAdd:'Dodaj',btnModify:'Zmień',btnUp:'Do góry',btnDown:'Do dołu',btnSetValue:'Ustaw jako zaznaczoną',btnDelete:'Usuń'},textarea:{title:'Właściwości obszaru tekstowego',cols:'Liczba kolumn',rows:'Liczba wierszy'},textfield:{title:'Właściwości pola tekstowego',name:'Nazwa',value:'Wartość',charWidth:'Szerokość w znakach',maxChars:'Szerokość maksymalna',type:'Typ',typeText:'Tekst',typePass:'Hasło'},hidden:{title:'Właściwości pola ukrytego',name:'Nazwa',value:'Wartość'},image:{title:'Właściwości obrazka',titleButton:'Właściwości przycisku graficznego',menu:'Właściwości obrazka',infoTab:'Informacje o obrazku',btnUpload:'Wyślij',upload:'Wyślij',alt:'Tekst zastępczy',lockRatio:'Zablokuj proporcje',resetSize:'Przywróć rozmiar',border:'Obramowanie',hSpace:'Odstęp poziomy',vSpace:'Odstęp pionowy',alertUrl:'Podaj adres obrazka.',linkTab:'Hiperłącze',button2Img:'Czy chcesz przekonwertować zaznaczony przycisk graficzny do zwykłego obrazka?',img2Button:'Czy chcesz przekonwertować zaznaczony obrazek do przycisku graficznego?',urlMissing:'Podaj adres URL obrazka.',validateBorder:'Wartość obramowania musi być liczbą całkowitą.',validateHSpace:'Wartość odstępu poziomego musi być liczbą całkowitą.',validateVSpace:'Wartość odstępu pionowego musi być liczbą całkowitą.'},flash:{properties:'Właściwości obiektu Flash',propertiesTab:'Właściwości',title:'Właściwości obiektu Flash',chkPlay:'Autoodtwarzanie',chkLoop:'Pętla',chkMenu:'Włącz menu',chkFull:'Zezwól na pełny ekran',scale:'Skaluj',scaleAll:'Pokaż wszystko',scaleNoBorder:'Bez obramowania',scaleFit:'Dokładne dopasowanie',access:'Dostęp skryptów',accessAlways:'Zawsze',accessSameDomain:'Ta sama domena',accessNever:'Nigdy',alignAbsBottom:'Do dołu',alignAbsMiddle:'Do środka w pionie',alignBaseline:'Do linii bazowej',alignTextTop:'Do góry tekstu',quality:'Jakość',qualityBest:'Najlepsza',qualityHigh:'Wysoka',qualityAutoHigh:'Auto wysoka',qualityMedium:'Średnia',qualityAutoLow:'Auto niska',qualityLow:'Niska',windowModeWindow:'Okno',windowModeOpaque:'Nieprzezroczyste',windowModeTransparent:'Przezroczyste',windowMode:'Tryb okna',flashvars:'Zmienne obiektu Flash',bgcolor:'Kolor tła',hSpace:'Odstęp poziomy',vSpace:'Odstęp pionowy',validateSrc:'Podaj adres URL',validateHSpace:'Odstęp poziomy musi być liczbą.',validateVSpace:'Odstęp pionowy musi być liczbą.'},spellCheck:{toolbar:'Sprawdź pisownię',title:'Sprawdź pisownię',notAvailable:'Przepraszamy, ale usługa jest obecnie niedostępna.',errorLoading:'Błąd wczytywania hosta aplikacji usługi: %s.',notInDic:'Słowa nie ma w słowniku',changeTo:'Zmień na',btnIgnore:'Ignoruj',btnIgnoreAll:'Ignoruj wszystkie',btnReplace:'Zmień',btnReplaceAll:'Zmień wszystkie',btnUndo:'Cofnij',noSuggestions:'- Brak sugestii -',progress:'Trwa sprawdzanie...',noMispell:'Sprawdzanie zakończone: nie znaleziono błędów',noChanges:'Sprawdzanie zakończone: nie zmieniono żadnego słowa',oneChange:'Sprawdzanie zakończone: zmieniono jedno słowo',manyChanges:'Sprawdzanie zakończone: zmieniono %l słów',ieSpellDownload:'Słownik nie jest zainstalowany. Czy chcesz go pobrać?'},smiley:{toolbar:'Emotikony',title:'Wstaw emotikona',options:'Opcje emotikonów'},elementsPath:{eleLabel:'Ścieżka elementów',eleTitle:'element %1'},numberedlist:'Lista numerowana',bulletedlist:'Lista wypunktowana',indent:'Zwiększ wcięcie',outdent:'Zmniejsz wcięcie',justify:{left:'Wyrównaj do lewej',center:'Wyśrodkuj',right:'Wyrównaj do prawej',block:'Wyjustuj'},blockquote:'Cytat',clipboard:{title:'Wklej',cutError:'Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.',copyError:'Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.',pasteMsg:'Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.',securityMsg:'Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.',pasteArea:'Obszar wklejania'},pastefromword:{confirmCleanup:'Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?',toolbar:'Wklej z programu MS Word',title:'Wklej z programu MS Word',error:'Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.'},pasteText:{button:'Wklej jako czysty tekst',title:'Wklej jako czysty tekst'},templates:{button:'Szablony',title:'Szablony zawartości',options:'Opcje szablonów',insertOption:'Zastąp obecną zawartość',selectPromptMsg:'Wybierz szablon do otwarcia w edytorze<br>(obecna zawartość okna edytora zostanie utracona):',emptyListMsg:'(Brak zdefiniowanych szablonów)'},showBlocks:'Pokaż bloki',stylesCombo:{label:'Styl',panelTitle:'Style formatujące',panelTitle1:'Style blokowe',panelTitle2:'Style liniowe',panelTitle3:'Style obiektowe'},format:{label:'Format',panelTitle:'Format',tag_p:'Normalny',tag_pre:'Tekst sformatowany',tag_address:'Adres',tag_h1:'Nagłówek 1',tag_h2:'Nagłówek 2',tag_h3:'Nagłówek 3',tag_h4:'Nagłówek 4',tag_h5:'Nagłówek 5',tag_h6:'Nagłówek 6',tag_div:'Normalny (DIV)'},div:{title:'Utwórz pojemnik Div',toolbar:'Utwórz pojemnik Div',cssClassInputLabel:'Klasy arkusza stylów',styleSelectLabel:'Styl',IdInputLabel:'Id',languageCodeInputLabel:'Kod języka',inlineStyleInputLabel:'Style liniowe',advisoryTitleInputLabel:'Opis obiektu docelowego',langDirLabel:'Kierunek tekstu',langDirLTRLabel:'Od lewej do prawej (LTR)',langDirRTLLabel:'Od prawej do lewej (RTL)',edit:'Edytuj pojemnik Div',remove:'Usuń pojemnik Div'},iframe:{title:'Właściwości elementu IFrame',toolbar:'IFrame',noUrl:'Podaj adres URL elementu IFrame',scrolling:'Włącz paski przewijania',border:'Pokaż obramowanie obiektu IFrame'},font:{label:'Czcionka',voiceLabel:'Czcionka',panelTitle:'Czcionka'},fontSize:{label:'Rozmiar',voiceLabel:'Rozmiar czcionki',panelTitle:'Rozmiar'},colorButton:{textColorTitle:'Kolor tekstu',bgColorTitle:'Kolor tła',panelTitle:'Kolory',auto:'Automatycznie',more:'Więcej kolorów...'},colors:{'000':'Czarny',800000:'Kasztanowy','8B4513':'Czekoladowy','2F4F4F':'Ciemnografitowy','008080':'Morski','000080':'Granatowy','4B0082':'Indygo',696969:'Ciemnoszary',B22222:'Czerwień żelazowa',A52A2A:'Brązowy',DAA520:'Ciemnozłoty','006400':'Ciemnozielony','40E0D0':'Turkusowy','0000CD':'Ciemnoniebieski',800080:'Purpurowy',808080:'Szary',F00:'Czerwony',FF8C00:'Ciemnopomarańczowy',FFD700:'Złoty','008000':'Zielony','0FF':'Cyjan','00F':'Niebieski',EE82EE:'Fioletowy',A9A9A9:'Przygaszony szary',FFA07A:'�ososiowy',FFA500:'Pomarańczowy',FFFF00:'Żółty','00FF00':'Limonkowy',AFEEEE:'Bladoturkusowy',ADD8E6:'Jasnoniebieski',DDA0DD:'Śliwkowy',D3D3D3:'Jasnoszary',FFF0F5:'Jasnolawendowy',FAEBD7:'Kremowobiały',FFFFE0:'Jasnożółty',F0FFF0:'Bladozielony',F0FFFF:'Jasnolazurowy',F0F8FF:'Jasnobłękitny',E6E6FA:'Lawendowy',FFF:'Biały'},scayt:{title:'Sprawdź pisownię podczas pisania (SCAYT)',opera_title:'Funkcja nie jest obsługiwana przez przeglądarkę Opera',enable:'Włącz SCAYT',disable:'Wyłącz SCAYT',about:'Informacje o SCAYT',toggle:'Przełącz SCAYT',options:'Opcje',langs:'Języki',moreSuggestions:'Więcej sugestii',ignore:'Ignoruj',ignoreAll:'Ignoruj wszystkie',addWord:'Dodaj słowo',emptyDic:'Nazwa słownika nie może być pusta.',noSuggestions:'Brak sugestii',optionsTab:'Opcje',allCaps:'Ignoruj wyrazy pisane dużymi literami',ignoreDomainNames:'Ignoruj nazwy domen',mixedCase:'Ignoruj wyrazy pisane dużymi i małymi literami',mixedWithDigits:'Ignoruj wyrazy zawierające cyfry',languagesTab:'Języki',dictionariesTab:'Słowniki',dic_field_name:'Nazwa słownika',dic_create:'Utwórz',dic_restore:'Przywróć',dic_delete:'Usuń',dic_rename:'Zmień nazwę',dic_info:'Początkowo słownik użytkownika przechowywany jest w cookie. Pliki cookie mają jednak ograniczoną pojemność. Jeśli słownik użytkownika przekroczy wielkość dopuszczalną dla pliku cookie, możliwe jest przechowanie go na naszym serwerze. W celu zapisania słownika na serwerze niezbędne jest nadanie mu nazwy. Jeśli słownik został już zapisany na serwerze, wystarczy podać jego nazwę i nacisnąć przycisk Przywróć.',aboutTab:'Informacje o SCAYT'},about:{title:'Informacje o programie CKEditor',dlgTitle:'Informacje o programie CKEditor',help:'Pomoc znajdziesz w $1.',userGuide:'podręczniku użytkownika programu CKEditor',moreInfo:'Informacje na temat licencji można znaleźć na naszej stronie:',copy:'Copyright &copy; $1. Wszelkie prawa zastrzeżone.'},maximize:'Maksymalizuj',minimize:'Minimalizuj',fakeobjects:{anchor:'Kotwica',flash:'Animacja Flash',iframe:'IFrame',hiddenfield:'Pole ukryte',unknown:'Nieznany obiekt'},resize:'Przeciągnij, aby zmienić rozmiar',colordialog:{title:'Wybierz kolor',options:'Opcje koloru',highlight:'Zaznacz',selected:'Wybrany',clear:'Wyczyść'},toolbarCollapse:'Zwiń pasek narzędzi',toolbarExpand:'Rozwiń pasek narzędzi',toolbarGroups:{document:'Dokument',clipboard:'Schowek/Wstecz',editing:'Edycja',forms:'Formularze',basicstyles:'Style podstawowe',paragraph:'Akapit',links:'Hiperłącza',insert:'Wstawianie',styles:'Style',colors:'Kolory',tools:'Narzędzia'},bidi:{ltr:'Kierunek tekstu od lewej strony do prawej',rtl:'Kierunek tekstu od prawej strony do lewej'},docprops:{label:'Właściwości dokumentu',title:'Właściwości dokumentu',design:'Projekt strony',meta:'Znaczniki meta',chooseColor:'Wybierz',other:'Inne',docTitle:'Tytuł strony',charset:'Kodowanie znaków',charsetOther:'Inne kodowanie znaków',charsetASCII:'ASCII',charsetCE:'Środkowoeuropejskie',charsetCT:'Chińskie tradycyjne (Big5)',charsetCR:'Cyrylica',charsetGR:'Greckie',charsetJP:'Japońskie',charsetKR:'Koreańskie',charsetTR:'Tureckie',charsetUN:'Unicode (UTF-8)',charsetWE:'Zachodnioeuropejskie',docType:'Definicja typu dokumentu',docTypeOther:'Inna definicja typu dokumentu',xhtmlDec:'Uwzględnij deklaracje XHTML',bgColor:'Kolor tła',bgImage:'Adres URL obrazka tła',bgFixed:'Tło nieruchome (nieprzewijające się)',txtColor:'Kolor tekstu',margin:'Marginesy strony',marginTop:'Górny',marginLeft:'Lewy',marginRight:'Prawy',marginBottom:'Dolny',metaKeywords:'Słowa kluczowe dokumentu (oddzielone przecinkami)',metaDescription:'Opis dokumentu',metaAuthor:'Autor',metaCopyright:'Prawa autorskie',previewHtml:'<p>To jest <strong>przykładowy tekst</strong>. Korzystasz z programu <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/pt-br.js b/web/imcms/ckeditor/lang/pt-br.js
new file mode 100644
index 0000000000..52416c6ff7
--- /dev/null
+++ b/web/imcms/ckeditor/lang/pt-br.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['pt-br']={dir:'ltr',editorTitle:'Editor de texto rico, %1',editorHelp:'Pressione ALT+0 para ajuda',toolbars:'Barra de Ferramentas do Editor',editor:'Editor de Texto',source:'Código-Fonte',newPage:'Novo',save:'Salvar',preview:'Visualizar',cut:'Recortar',copy:'Copiar',paste:'Colar',print:'Imprimir',underline:'Sublinhado',bold:'Negrito',italic:'Itálico',selectAll:'Selecionar Tudo',removeFormat:'Remover Formatação',strike:'Tachado',subscript:'Subscrito',superscript:'Sobrescrito',horizontalrule:'Inserir Linha Horizontal',pagebreak:'Inserir Quebra de Página',pagebreakAlt:'Quebra de Página',unlink:'Remover Link',undo:'Desfazer',redo:'Refazer',common:{browseServer:'Localizar no Servidor',url:'URL',protocol:'Protocolo',upload:'Enviar ao Servidor',uploadSubmit:'Enviar para o Servidor',image:'Imagem',flash:'Flash',form:'Formulário',checkbox:'Caixa de Seleção',radio:'Botão de Opção',textField:'Caixa de Texto',textarea:'�rea de Texto',hiddenField:'Campo Oculto',button:'Botão',select:'Caixa de Listagem',imageButton:'Botão de Imagem',notSet:'<não ajustado>',id:'Id',name:'Nome',langDir:'Direção do idioma',langDirLtr:'Esquerda para Direita (LTR)',langDirRtl:'Direita para Esquerda (RTL)',langCode:'Idioma',longDescr:'Descrição da URL',cssClass:'Classe de CSS',advisoryTitle:'Título',cssStyle:'Estilos',ok:'OK',cancel:'Cancelar',close:'Fechar',preview:'Visualizar',generalTab:'Geral',advancedTab:'Avançado',validateNumberFailed:'Este valor não é um número.',confirmNewPage:'Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?',confirmCancel:'Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?',options:'Opções',target:'Destino',targetNew:'Nova Janela (_blank)',targetTop:'Janela de Cima (_top)',targetSelf:'Mesma Janela (_self)',targetParent:'Janela Pai (_parent)',langDirLTR:'Esquerda para Direita (LTR)',langDirRTL:'Direita para Esquerda (RTL)',styles:'Estilo',cssClasses:'Classes',width:'Largura',height:'Altura',align:'Alinhamento',alignLeft:'Esquerda',alignRight:'Direita',alignCenter:'Centralizado',alignTop:'Superior',alignMiddle:'Centralizado',alignBottom:'Inferior',invalidValue:'Valor inválido.',invalidHeight:'A altura tem que ser um número',invalidWidth:'A largura tem que ser um número.',invalidCssLength:'O valor do campo "%1" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'O valor do campo "%1" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px or %).',invalidInlineStyle:'O valor válido para estilo deve conter uma ou mais tuplas no formato "nome : valor", separados por ponto e vírgula.',cssLengthTooltip:'Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, indisponível</span>'},contextmenu:{options:'Opções Menu de Contexto'},specialChar:{toolbar:'Inserir Caractere Especial',title:'Selecione um Caractere Especial',options:'Opções de Caractere Especial'},link:{toolbar:'Inserir/Editar Link',other:'<outro>',menu:'Editar Link',title:'Editar Link',info:'Informações',target:'Destino',upload:'Enviar ao Servidor',advanced:'Avançado',type:'Tipo de hiperlink',toUrl:'URL',toAnchor:'Âncora nesta página',toEmail:'E-Mail',targetFrame:'<frame>',targetPopup:'<janela popup>',targetFrameName:'Nome do Frame de Destino',targetPopupName:'Nome da Janela Pop-up',popupFeatures:'Propriedades da Janela Pop-up',popupResizable:'Redimensionável',popupStatusBar:'Barra de Status',popupLocationBar:'Barra de Endereços',popupToolbar:'Barra de Ferramentas',popupMenuBar:'Barra de Menus',popupFullScreen:'Modo Tela Cheia (IE)',popupScrollBars:'Barras de Rolagem',popupDependent:'Dependente (Netscape)',popupLeft:'Esquerda',popupTop:'Topo',id:'Id',langDir:'Direção do idioma',langDirLTR:'Esquerda para Direita (LTR)',langDirRTL:'Direita para Esquerda (RTL)',acccessKey:'Chave de Acesso',name:'Nome',langCode:'Direção do idioma',tabIndex:'�ndice de Tabulação',advisoryTitle:'Título',advisoryContentType:'Tipo de Conteúdo',cssClasses:'Classe de CSS',charset:'Charset do Link',styles:'Estilos',rel:'Tipo de Relação',selectAnchor:'Selecione uma âncora',anchorName:'Nome da âncora',anchorId:'Id da âncora',emailAddress:'Endereço E-Mail',emailSubject:'Assunto da Mensagem',emailBody:'Corpo da Mensagem',noAnchors:'(Não há âncoras no documento)',noUrl:'Por favor, digite o endereço do Link',noEmail:'Por favor, digite o endereço de e-mail'},anchor:{toolbar:'Inserir/Editar Âncora',menu:'Formatar Âncora',title:'Formatar Âncora',name:'Nome da Âncora',errorName:'Por favor, digite o nome da âncora',remove:'Remover Âncora'},list:{numberedTitle:'Propriedades da Lista Numerada',bulletedTitle:'Propriedades da Lista sem Numeros',type:'Tipo',start:'Início',validateStartNumber:'O número inicial da lista deve ser um número inteiro.',circle:'Círculo',disc:'Disco',square:'Quadrado',none:'Nenhum',notset:'<não definido>',armenian:'Numeração Armêna',georgian:'Numeração da Geórgia (an, ban, gan, etc.)',lowerRoman:'Numeração Romana minúscula (i, ii, iii, iv, v, etc.)',upperRoman:'Numeração Romana maiúscula (I, II, III, IV, V, etc.)',lowerAlpha:'Numeração Alfabética minúscula (a, b, c, d, e, etc.)',upperAlpha:'Numeração Alfabética Maiúscula (A, B, C, D, E, etc.)',lowerGreek:'Numeração Grega minúscula (alpha, beta, gamma, etc.)',decimal:'Numeração Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Numeração Decimal com zeros (01, 02, 03, etc.)'},findAndReplace:{title:'Localizar e Substituir',find:'Localizar',replace:'Substituir',findWhat:'Procurar por:',replaceWith:'Substituir por:',notFoundMsg:'O texto especificado não foi encontrado.',findOptions:'Opções',matchCase:'Coincidir Maiúsculas/Minúsculas',matchWord:'Coincidir a palavra inteira',matchCyclic:'Coincidir cíclico',replaceAll:'Substituir Tudo',replaceSuccessMsg:'%1 ocorrência(s) substituída(s).'},table:{toolbar:'Tabela',title:'Formatar Tabela',menu:'Formatar Tabela',deleteTable:'Apagar Tabela',rows:'Linhas',columns:'Colunas',border:'Borda',widthPx:'pixels',widthPc:'%',widthUnit:'unidade largura',cellSpace:'Espaçamento',cellPad:'Margem interna',caption:'Legenda',summary:'Resumo',headers:'Cabeçalho',headersNone:'Nenhum',headersColumn:'Primeira coluna',headersRow:'Primeira linha',headersBoth:'Ambos',invalidRows:'O número de linhas tem que ser um número maior que 0.',invalidCols:'O número de colunas tem que ser um número maior que 0.',invalidBorder:'O tamanho da borda tem que ser um número.',invalidWidth:'A largura da tabela tem que ser um número.',invalidHeight:'A altura da tabela tem que ser um número.',invalidCellSpacing:'O espaçamento das células tem que ser um número.',invalidCellPadding:'A margem interna das células tem que ser um número.',cell:{menu:'Célula',insertBefore:'Inserir célula a esquerda',insertAfter:'Inserir célula a direita',deleteCell:'Remover Células',merge:'Mesclar Células',mergeRight:'Mesclar com célula a direita',mergeDown:'Mesclar com célula abaixo',splitHorizontal:'Dividir célula horizontalmente',splitVertical:'Dividir célula verticalmente',title:'Propriedades da célula',cellType:'Tipo de célula',rowSpan:'Linhas cobertas',colSpan:'Colunas cobertas',wordWrap:'Quebra de palavra',hAlign:'Alinhamento horizontal',vAlign:'Alinhamento vertical',alignBaseline:'Patamar de alinhamento',bgColor:'Cor de fundo',borderColor:'Cor das bordas',data:'Dados',header:'Cabeçalho',yes:'Sim',no:'Não',invalidWidth:'A largura da célula tem que ser um número.',invalidHeight:'A altura da célula tem que ser um número.',invalidRowSpan:'Linhas cobertas tem que ser um número inteiro.',invalidColSpan:'Colunas cobertas tem que ser um número inteiro.',chooseColor:'Escolher'},row:{menu:'Linha',insertBefore:'Inserir linha acima',insertAfter:'Inserir linha abaixo',deleteRow:'Remover Linhas'},column:{menu:'Coluna',insertBefore:'Inserir coluna a esquerda',insertAfter:'Inserir coluna a direita',deleteColumn:'Remover Colunas'}},button:{title:'Formatar Botão',text:'Texto (Valor)',type:'Tipo',typeBtn:'Botão',typeSbm:'Enviar',typeRst:'Limpar'},checkboxAndRadio:{checkboxTitle:'Formatar Caixa de Seleção',radioTitle:'Formatar Botão de Opção',value:'Valor',selected:'Selecionado'},form:{title:'Formatar Formulário',menu:'Formatar Formulário',action:'Ação',method:'Método',encoding:'Codificação'},select:{title:'Formatar Caixa de Listagem',selectInfo:'Informações',opAvail:'Opções disponíveis',value:'Valor',size:'Tamanho',lines:'linhas',chkMulti:'Permitir múltiplas seleções',opText:'Texto',opValue:'Valor',btnAdd:'Adicionar',btnModify:'Modificar',btnUp:'Para cima',btnDown:'Para baixo',btnSetValue:'Definir como selecionado',btnDelete:'Remover'},textarea:{title:'Formatar �rea de Texto',cols:'Colunas',rows:'Linhas'},textfield:{title:'Formatar Caixa de Texto',name:'Nome',value:'Valor',charWidth:'Comprimento (em caracteres)',maxChars:'Número Máximo de Caracteres',type:'Tipo',typeText:'Texto',typePass:'Senha'},hidden:{title:'Formatar Campo Oculto',name:'Nome',value:'Valor'},image:{title:'Formatar Imagem',titleButton:'Formatar Botão de Imagem',menu:'Formatar Imagem',infoTab:'Informações da Imagem',btnUpload:'Enviar para o Servidor',upload:'Enviar',alt:'Texto Alternativo',lockRatio:'Travar Proporções',resetSize:'Redefinir para o Tamanho Original',border:'Borda',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Por favor, digite a URL da imagem.',linkTab:'Link',button2Img:'Deseja transformar o botão de imagem em uma imagem comum?',img2Button:'Deseja transformar a imagem em um botão de imagem?',urlMissing:'URL da imagem está faltando.',validateBorder:'A borda deve ser um número inteiro.',validateHSpace:'O HSpace deve ser um número inteiro.',validateVSpace:'O VSpace deve ser um número inteiro.'},flash:{properties:'Propriedades do Flash',propertiesTab:'Propriedades',title:'Propriedades do Flash',chkPlay:'Tocar Automaticamente',chkLoop:'Tocar Infinitamente',chkMenu:'Habilita Menu Flash',chkFull:'Permitir tela cheia',scale:'Escala',scaleAll:'Mostrar tudo',scaleNoBorder:'Sem Borda',scaleFit:'Escala Exata',access:'Acesso ao script',accessAlways:'Sempre',accessSameDomain:'Acessar Mesmo Domínio',accessNever:'Nunca',alignAbsBottom:'Inferior Absoluto',alignAbsMiddle:'Centralizado Absoluto',alignBaseline:'Baseline',alignTextTop:'Superior Absoluto',quality:'Qualidade',qualityBest:'Qualidade Melhor',qualityHigh:'Qualidade Alta',qualityAutoHigh:'Qualidade Alta Automática',qualityMedium:'Qualidade Média',qualityAutoLow:'Qualidade Baixa Automática',qualityLow:'Qualidade Baixa',windowModeWindow:'Janela',windowModeOpaque:'Opaca',windowModeTransparent:'Transparente',windowMode:'Modo da janela',flashvars:'Variáveis do Flash',bgcolor:'Cor do Plano de Fundo',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Por favor, digite o endereço do link',validateHSpace:'O HSpace tem que ser um número',validateVSpace:'O VSpace tem que ser um número.'},spellCheck:{toolbar:'Verificar Ortografia',title:'Corretor Ortográfico',notAvailable:'Desculpe, o serviço não está disponível no momento.',errorLoading:'Erro carregando servidor de aplicação: %s.',notInDic:'Não encontrada',changeTo:'Alterar para',btnIgnore:'Ignorar uma vez',btnIgnoreAll:'Ignorar Todas',btnReplace:'Alterar',btnReplaceAll:'Alterar Todas',btnUndo:'Desfazer',noSuggestions:'-sem sugestões de ortografia-',progress:'Verificação ortográfica em andamento...',noMispell:'Verificação encerrada: Não foram encontrados erros de ortografia',noChanges:'Verificação ortográfica encerrada: Não houve alterações',oneChange:'Verificação ortográfica encerrada: Uma palavra foi alterada',manyChanges:'Verificação ortográfica encerrada: %1 palavras foram alteradas',ieSpellDownload:'A verificação ortográfica não foi instalada. Você gostaria de realizar o download agora?'},smiley:{toolbar:'Emoticon',title:'Inserir Emoticon',options:'Opções de Emoticons'},elementsPath:{eleLabel:'Caminho dos Elementos',eleTitle:'Elemento %1'},numberedlist:'Lista numerada',bulletedlist:'Lista sem números',indent:'Aumentar Recuo',outdent:'Diminuir Recuo',justify:{left:'Alinhar Esquerda',center:'Centralizar',right:'Alinhar Direita',block:'Justificado'},blockquote:'Citação',clipboard:{title:'Colar',cutError:'As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).',copyError:'As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).',pasteMsg:'Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.',securityMsg:'As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.',pasteArea:'�rea para Colar'},pastefromword:{confirmCleanup:'O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?',toolbar:'Colar do Word',title:'Colar do Word',error:'Não foi possível limpar os dados colados devido a um erro interno'},pasteText:{button:'Colar como Texto sem Formatação',title:'Colar como Texto sem Formatação'},templates:{button:'Modelos de layout',title:'Modelo de layout de conteúdo',options:'Opções de Template',insertOption:'Substituir o conteúdo atual',selectPromptMsg:'Selecione um modelo de layout para ser aberto no editor<br>(o conteúdo atual será perdido):',emptyListMsg:'(Não foram definidos modelos de layout)'},showBlocks:'Mostrar blocos de código',stylesCombo:{label:'Estilo',panelTitle:'Estilos de Formatação',panelTitle1:'Estilos de bloco',panelTitle2:'Estilos de texto corrido',panelTitle3:'Estilos de objeto'},format:{label:'Formatação',panelTitle:'Formatação',tag_p:'Normal',tag_pre:'Formatado',tag_address:'Endereço',tag_h1:'Título 1',tag_h2:'Título 2',tag_h3:'Título 3',tag_h4:'Título 4',tag_h5:'Título 5',tag_h6:'Título 6',tag_div:'Normal (DIV)'},div:{title:'Criar Container de DIV',toolbar:'Criar Container de DIV',cssClassInputLabel:'Classes de CSS',styleSelectLabel:'Estilo',IdInputLabel:'Id',languageCodeInputLabel:'Código de Idioma',inlineStyleInputLabel:'Estilo Inline',advisoryTitleInputLabel:'Título Consulta',langDirLabel:'Direção da Escrita',langDirLTRLabel:'Esquerda para Direita (LTR)',langDirRTLLabel:'Direita para Esquerda (RTL)',edit:'Editar Div',remove:'Remover Div'},iframe:{title:'Propriedade do IFrame',toolbar:'IFrame',noUrl:'Insira a URL do iframe',scrolling:'Abilita scrollbars',border:'Mostra borda do iframe'},font:{label:'Fonte',voiceLabel:'Fonte',panelTitle:'Fonte'},fontSize:{label:'Tamanho',voiceLabel:'Tamanho da fonte',panelTitle:'Tamanho'},colorButton:{textColorTitle:'Cor do Texto',bgColorTitle:'Cor do Plano de Fundo',panelTitle:'Cores',auto:'Automático',more:'Mais Cores...'},colors:{'000':'Preto',800000:'Foquete','8B4513':'Marrom 1','2F4F4F':'Cinza 1','008080':'Cerceta','000080':'Azul Marinho','4B0082':'�ndigo',696969:'Cinza 2',B22222:'Tijolo de Fogo',A52A2A:'Marrom 2',DAA520:'Vara Dourada','006400':'Verde Escuro','40E0D0':'Turquesa','0000CD':'Azul Médio',800080:'Roxo',808080:'Cinza 3',F00:'Vermelho',FF8C00:'Laranja Escuro',FFD700:'Dourado','008000':'Verde','0FF':'Ciano','00F':'Azul',EE82EE:'Violeta',A9A9A9:'Cinza Escuro',FFA07A:'Salmão Claro',FFA500:'Laranja',FFFF00:'Amarelo','00FF00':'Lima',AFEEEE:'Turquesa Pálido',ADD8E6:'Azul Claro',DDA0DD:'Ameixa',D3D3D3:'Cinza Claro',FFF0F5:'Lavanda 1',FAEBD7:'Branco Antiguidade',FFFFE0:'Amarelo Claro',F0FFF0:'Orvalho',F0FFFF:'Azure',F0F8FF:'Azul Alice',E6E6FA:'Lavanda 2',FFF:'Branco'},scayt:{title:'Correção ortográfica durante a digitação',opera_title:'Não suportado no Opera',enable:'Habilitar correção ortográfica durante a digitação',disable:'Desabilitar correção ortográfica durante a digitação',about:'Sobre a correção ortográfica durante a digitação',toggle:'Ativar/desativar correção ortográfica durante a digitação',options:'Opções',langs:'Idiomas',moreSuggestions:'Mais sugestões',ignore:'Ignorar',ignoreAll:'Ignorar todas',addWord:'Adicionar palavra',emptyDic:'O nome do dicionário não deveria estar vazio.',noSuggestions:'sem sugestões de ortografia',optionsTab:'Opções',allCaps:'Ignorar palavras maiúsculas',ignoreDomainNames:'Ignorar nomes de domínio',mixedCase:'Ignorar palavras com maiúsculas e minúsculas misturadas',mixedWithDigits:'Ignorar palavras com números',languagesTab:'Idiomas',dictionariesTab:'Dicionários',dic_field_name:'Nome do Dicionário',dic_create:'Criar',dic_restore:'Restaurar',dic_delete:'Excluir',dic_rename:'Renomear',dic_info:'Inicialmente, o dicionário do usuário fica armazenado em um Cookie. Porém, Cookies tem tamanho limitado, portanto quand o dicionário do usuário atingir o tamanho limite poderá ser armazenado no nosso servidor. Para armazenar seu dicionário pessoal no nosso servidor deverá especificar um nome para ele. Se já tiver um dicionário armazenado por favor especifique o seu nome e clique em Restaurar.',aboutTab:'Sobre'},about:{title:'Sobre o CKEditor',dlgTitle:'Sobre o CKEditor',help:'Verifique o $1 para obter ajuda.',userGuide:'Guia do Usuário do CKEditor',moreInfo:'Para informações sobre a licença por favor visite o nosso site:',copy:'Copyright &copy; $1. Todos os direitos reservados.'},maximize:'Maximizar',minimize:'Minimize',fakeobjects:{anchor:'Âncora',flash:'Animação em Flash',iframe:'IFrame',hiddenfield:'Campo Oculto',unknown:'Objeto desconhecido'},resize:'Arraste para redimensionar',colordialog:{title:'Selecione uma Cor',options:'Opções de Cor',highlight:'Grifar',selected:'Cor Selecionada',clear:'Limpar'},toolbarCollapse:'Diminuir Barra de Ferramentas',toolbarExpand:'Aumentar Barra de Ferramentas',toolbarGroups:{document:'Documento',clipboard:'Clipboard/Desfazer',editing:'Edição',forms:'Formulários',basicstyles:'Estilos Básicos',paragraph:'Paragrafo',links:'Links',insert:'Inserir',styles:'Estilos',colors:'Cores',tools:'Ferramentas'},bidi:{ltr:'Direção do texto da esquerda para a direita',rtl:'Direção do texto da direita para a esquerda'},docprops:{label:'Propriedades Documento',title:'Propriedades Documento',design:'Design',meta:'Meta Dados',chooseColor:'Escolher',other:'<outro>',docTitle:'Título da Página',charset:'Codificação de Caracteres',charsetOther:'Outra Codificação de Caracteres',charsetASCII:'ASCII',charsetCE:'Europa Central',charsetCT:'Chinês Tradicional (Big5)',charsetCR:'Cirílico',charsetGR:'Grego',charsetJP:'Japonês',charsetKR:'Coreano',charsetTR:'Turco',charsetUN:'Unicode (UTF-8)',charsetWE:'Europa Ocidental',docType:'Cabeçalho Tipo de Documento',docTypeOther:'Outro Tipo de Documento',xhtmlDec:'Incluir Declarações XHTML',bgColor:'Cor do Plano de Fundo',bgImage:'URL da Imagem de Plano de Fundo',bgFixed:'Plano de Fundo Fixo',txtColor:'Cor do Texto',margin:'Margens da Página',marginTop:'Superior',marginLeft:'Inferior',marginRight:'Direita',marginBottom:'Inferior',metaKeywords:'Palavras-chave de Indexação do Documento (separadas por vírgula)',metaDescription:'Descrição do Documento',metaAuthor:'Autor',metaCopyright:'Direitos Autorais',previewHtml:'<p>Este é um <strong>texto de exemplo</strong>. Você está usando <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/pt.js b/web/imcms/ckeditor/lang/pt.js
new file mode 100644
index 0000000000..ae88856723
--- /dev/null
+++ b/web/imcms/ckeditor/lang/pt.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.pt={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor de barras de ferramentas',editor:'Editor de texto enriquecido',source:'Fonte',newPage:'Nova Página',save:'Guardar',preview:'Pré-visualizar',cut:'Cortar',copy:'Copiar',paste:'Colar',print:'Imprimir',underline:'Sublinhado',bold:'Negrito',italic:'Itálico',selectAll:'Seleccionar Tudo',removeFormat:'Eliminar Formato',strike:'Rasurado',subscript:'Superior à Linha',superscript:'Inferior à Linha',horizontalrule:'Inserir Linha Horizontal',pagebreak:'Inserir Quebra de Página',pagebreakAlt:'Quebra de página',unlink:'Eliminar Hiperligação',undo:'Anular',redo:'Repetir',common:{browseServer:'Navegar no Servidor',url:'URL',protocol:'Protocolo',upload:'Carregar',uploadSubmit:'Enviar para o Servidor',image:'Imagem',flash:'Flash',form:'Formulário',checkbox:'Caixa de Verificação',radio:'Botão de Opção',textField:'Campo de Texto',textarea:'�rea de Texto',hiddenField:'Campo Escondido',button:'Botão',select:'Caixa de Combinação',imageButton:'Botão de Imagem',notSet:'<Não definido>',id:'Id',name:'Nome',langDir:'Orientação de idioma',langDirLtr:'Esquerda à Direita (LTR)',langDirRtl:'Direita a Esquerda (RTL)',langCode:'Código de Idioma',longDescr:'Descrição Completa do URL',cssClass:'Classes de Estilo de Folhas Classes',advisoryTitle:'Título',cssStyle:'Estilo',ok:'OK',cancel:'Cancelar',close:'Fechar',preview:'Pré-visualização',generalTab:'Geral',advancedTab:'Avançado',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Opções',target:'Alvo',targetNew:'Nova Janela (_blank)',targetTop:'Janela superior (_top)',targetSelf:'Mesma janela (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Direita para Esquerda (RTL)',styles:'Estilo',cssClasses:'Stylesheet Classes',width:'Largura',height:'Altura',align:'Alinhamento',alignLeft:'Esquerda',alignRight:'Direita',alignCenter:'Centrado',alignTop:'Topo',alignMiddle:'Centro',alignBottom:'Fundo',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Menu de opções de contexto'},specialChar:{toolbar:'Inserir Caracter Especial',title:'Seleccione um caracter especial',options:'Special Character Options'},link:{toolbar:'Inserir/Editar Hiperligação',other:'<outro>',menu:'Editar Hiperligação',title:'Hiperligação',info:'Informação de Hiperligação',target:'Destino',upload:'Carregar',advanced:'Avançado',type:'Tipo de Hiperligação',toUrl:'URL',toAnchor:'Referência a esta página',toEmail:'E-Mail',targetFrame:'<Frame>',targetPopup:'<Janela de popup>',targetFrameName:'Nome do Frame Destino',targetPopupName:'Nome da Janela de Popup',popupFeatures:'Características de Janela de Popup',popupResizable:'Redimensionável',popupStatusBar:'Barra de Estado',popupLocationBar:'Barra de localização',popupToolbar:'Barra de Ferramentas',popupMenuBar:'Barra de Menu',popupFullScreen:'Janela Completa (IE)',popupScrollBars:'Barras de deslocamento',popupDependent:'Dependente (Netscape)',popupLeft:'Posição Esquerda',popupTop:'Posição Direita',id:'ID',langDir:'Orientação de idioma',langDirLTR:'Esquerda à Direita (LTR)',langDirRTL:'Direita a Esquerda (RTL)',acccessKey:'Chave de Acesso',name:'Nome',langCode:'Orientação de idioma',tabIndex:'�ndice de Tubulação',advisoryTitle:'Título',advisoryContentType:'Tipo de Conteúdo',cssClasses:'Classes de Estilo de Folhas Classes',charset:'Fonte de caracteres vinculado',styles:'Estilo',rel:'Relação',selectAnchor:'Seleccionar una referência',anchorName:'Por Nome de Referência',anchorId:'Por ID de elemento',emailAddress:'Endereço de E-Mail',emailSubject:'Título de Mensagem',emailBody:'Corpo da Mensagem',noAnchors:'(Não há referências disponíveis no documento)',noUrl:'Por favor introduza a hiperligação URL',noEmail:'Por favor introduza o endereço de e-mail'},anchor:{toolbar:' Inserir/Editar Âncora',menu:'Propriedades da Âncora',title:'Propriedades da Âncora',name:'Nome da Âncora',errorName:'Por favor, introduza o nome da âncora',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Tipo',start:'Iniciar',validateStartNumber:'List start number must be a whole number.',circle:'Círculo',disc:'Disco',square:'Quadrado',none:'Nenhum',notset:'<not set>',armenian:'Numeração armênia',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Procurar',replace:'Substituir',findWhat:'Texto a Procurar:',replaceWith:'Substituir por:',notFoundMsg:'O texto especificado não foi encontrado.',findOptions:'Find Options',matchCase:'Maiúsculas/Minúsculas',matchWord:'Coincidir com toda a palavra',matchCyclic:'Match cyclic',replaceAll:'Substituir Tudo',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabela',title:'Propriedades da Tabela',menu:'Propriedades da Tabela',deleteTable:'Eliminar Tabela',rows:'Linhas',columns:'Colunas',border:'Tamanho do Limite',widthPx:'pixeis',widthPc:'percentagem',widthUnit:'width unit',cellSpace:'Esp. e/células',cellPad:'Esp. interior',caption:'Título',summary:'Sumário',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Célula',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Eliminar Célula',merge:'Unir Células',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Linha',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Eliminar Linhas'},column:{menu:'Coluna',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Eliminar Coluna'}},button:{title:'Propriedades do Botão',text:'Texto (Valor)',type:'Tipo',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Propriedades da Caixa de Verificação',radioTitle:'Propriedades do Botão de Opção',value:'Valor',selected:'Seleccionado'},form:{title:'Propriedades do Formulário',menu:'Propriedades do Formulário',action:'Acção',method:'Método',encoding:'Encoding'},select:{title:'Propriedades da Caixa de Combinação',selectInfo:'Informação',opAvail:'Opções Possíveis',value:'Valor',size:'Tamanho',lines:'linhas',chkMulti:'Permitir selecções múltiplas',opText:'Texto',opValue:'Valor',btnAdd:'Adicionar',btnModify:'Modificar',btnUp:'Para cima',btnDown:'Para baixo',btnSetValue:'Definir um valor por defeito',btnDelete:'Apagar'},textarea:{title:'Propriedades da �rea de Texto',cols:'Colunas',rows:'Linhas'},textfield:{title:'Propriedades do Campo de Texto',name:'Nome',value:'Valor',charWidth:'Tamanho do caracter',maxChars:'Nr. Máximo de Caracteres',type:'Tipo',typeText:'Texto',typePass:'Palavra-chave'},hidden:{title:'Propriedades do Campo Escondido',name:'Nome',value:'Valor'},image:{title:'Propriedades da Imagem',titleButton:'Propriedades do Botão de imagens',menu:'Propriedades da Imagem',infoTab:'Informação da Imagem',btnUpload:'Enviar para o Servidor',upload:'Carregar',alt:'Texto Alternativo',lockRatio:'Proporcional',resetSize:'Tamanho Original',border:'Limite',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',alertUrl:'Por favor introduza o URL da imagem',linkTab:'Hiperligação',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Propriedades do Flash',propertiesTab:'Properties',title:'Propriedades do Flash',chkPlay:'Reproduzir automaticamente',chkLoop:'Loop',chkMenu:'Permitir Menu do Flash',chkFull:'Allow Fullscreen',scale:'Escala',scaleAll:'Mostrar tudo',scaleNoBorder:'Sem Limites',scaleFit:'Tamanho Exacto',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs inferior',alignAbsMiddle:'Abs centro',alignBaseline:'Linha de base',alignTextTop:'Topo do texto',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Cor de Fundo',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',validateSrc:'Por favor introduza a hiperligação URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Verificação Ortográfica',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Não está num directório',changeTo:'Mudar para',btnIgnore:'Ignorar',btnIgnoreAll:'Ignorar Tudo',btnReplace:'Substituir',btnReplaceAll:'Substituir Tudo',btnUndo:'Anular',noSuggestions:'- Sem sugestões -',progress:'Verificação ortográfica em progresso…',noMispell:'Verificação ortográfica completa: não foram encontrados erros',noChanges:'Verificação ortográfica completa: não houve alteração de palavras',oneChange:'Verificação ortográfica completa: uma palavra alterada',manyChanges:'Verificação ortográfica completa: %1 palavras alteradas',ieSpellDownload:' Verificação ortográfica não instalada. Quer descarregar agora?'},smiley:{toolbar:'Emoticons',title:'Inserir um Emoticon',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Numeração',bulletedlist:'Marcas',indent:'Aumentar Avanço',outdent:'Diminuir Avanço',justify:{left:'Alinhar à Esquerda',center:'Alinhar ao Centro',right:'Alinhar à Direita',block:'Justificado'},blockquote:'Bloco de citação',clipboard:{title:'Colar',cutError:'A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).',copyError:'A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).',pasteMsg:'Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prima <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Colar do Word',title:'Colar do Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Colar como Texto Simples',title:'Colar como Texto Simples'},templates:{button:'Modelos',title:'Modelo de Conteúdo',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Por favor, seleccione o modelo a abrir no editor<br>(o conteúdo actual será perdido):',emptyListMsg:'(Sem modelos definidos)'},showBlocks:'Exibir blocos',stylesCombo:{label:'Estilo',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normal',tag_pre:'Formatado',tag_address:'Endereço',tag_h1:'Título 1',tag_h2:'Título 2',tag_h3:'Título 3',tag_h4:'Título 4',tag_h5:'Título 5',tag_h6:'Título 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Tipo de Letra',voiceLabel:'Font',panelTitle:'Tipo de Letra'},fontSize:{label:'Tamanho',voiceLabel:'Font Size',panelTitle:'Tamanho'},colorButton:{textColorTitle:'Cor do Texto',bgColorTitle:'Cor de Fundo',panelTitle:'Colors',auto:'Automático',more:'Mais Cores...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'Sem sugestões',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximizar',minimize:'Minimizar',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Arraste para redimensionar',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Colapsar Barra',toolbarExpand:'Expandir Barra',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Propriedades do Documento',title:'Propriedades do Documento',design:'Design',meta:'Meta Data',chooseColor:'Choose',other:'<outro>',docTitle:'Título da Página',charset:'Codificação de Caracteres',charsetOther:'Outra Codificação de Caracteres',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Tipo de Cabeçalho do Documento',docTypeOther:'Outro Tipo de Cabeçalho do Documento',xhtmlDec:'Incluir Declarações XHTML',bgColor:'Cor de Fundo',bgImage:'Caminho para a Imagem de Fundo',bgFixed:'Fundo Fixo',txtColor:'Cor do Texto',margin:'Margem das Páginas',marginTop:'Topo',marginLeft:'Esquerda',marginRight:'Direita',marginBottom:'Fundo',metaKeywords:'Palavras de Indexação do Documento (separadas por virgula)',metaDescription:'Descrição do Documento',metaAuthor:'Autor',metaCopyright:'Direitos de Autor',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ro.js b/web/imcms/ckeditor/lang/ro.js
new file mode 100644
index 0000000000..36d76e4e70
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ro.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ro={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Apasă ALT 0 pentru ajutor',toolbars:'Editează bara de unelte',editor:'Rich Text Editor',source:'Sursa',newPage:'Pagină nouă',save:'Salvează',preview:'Previzualizare',cut:'Taie',copy:'Copiază',paste:'Adaugă',print:'Printează',underline:'Subliniat (underline)',bold:'Îngroşat (bold)',italic:'Înclinat (italic)',selectAll:'Selectează tot',removeFormat:'Înlătură formatarea',strike:'Tăiat (strike through)',subscript:'Indice (subscript)',superscript:'Putere (superscript)',horizontalrule:'Inserează linie orizontală',pagebreak:'Inserează separator de pagină (Page Break)',pagebreakAlt:'Page Break',unlink:'Înlătură link (legătură web)',undo:'Starea anterioară (undo)',redo:'Starea ulterioară (redo)',common:{browseServer:'Răsfoieşte server',url:'URL',protocol:'Protocol',upload:'Încarcă',uploadSubmit:'Trimite la server',image:'Imagine',flash:'Flash',form:'Formular (Form)',checkbox:'Bifă (Checkbox)',radio:'Buton radio (RadioButton)',textField:'Câmp text (TextField)',textarea:'Suprafaţă text (Textarea)',hiddenField:'Câmp ascuns (HiddenField)',button:'Buton',select:'Câmp selecţie (SelectionField)',imageButton:'Buton imagine (ImageButton)',notSet:'<nesetat>',id:'Id',name:'Nume',langDir:'Direcţia cuvintelor',langDirLtr:'stânga-dreapta (LTR)',langDirRtl:'dreapta-stânga (RTL)',langCode:'Codul limbii',longDescr:'Descrierea lungă URL',cssClass:'Clasele cu stilul paginii (CSS)',advisoryTitle:'Titlul consultativ',cssStyle:'Stil',ok:'OK',cancel:'Anulare',close:'Închide',preview:'Previzualizare',generalTab:'General',advancedTab:'Avansat',validateNumberFailed:'Această valoare nu este un număr.',confirmNewPage:'Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?',confirmCancel:'Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?',options:'Opțiuni',target:'Țintă',targetNew:'Fereastră nouă (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'În aceeași fereastră (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Stânga spre Dreapta (LTR)',langDirRTL:'Dreapta spre Stânga (RTL)',styles:'Stil',cssClasses:'Stylesheet Classes',width:'Lăţime',height:'Înălţime',align:'Aliniere',alignLeft:'Mărește Bara',alignRight:'Dreapta',alignCenter:'Centru',alignTop:'Sus',alignMiddle:'Mijloc',alignBottom:'Jos',invalidValue:'Invalid value.',invalidHeight:'Înălțimea trebuie să fie un număr.',invalidWidth:'Lățimea trebuie să fie un număr.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Opțiuni Meniu Contextual'},specialChar:{toolbar:'Inserează caracter special',title:'Selectează caracter special',options:'Opțiuni caractere speciale'},link:{toolbar:'Inserează/Editează link (legătură web)',other:'<alt>',menu:'Editează Link',title:'Link (Legătură web)',info:'Informaţii despre link (Legătură web)',target:'Ţintă (Target)',upload:'Încarcă',advanced:'Avansat',type:'Tipul link-ului (al legăturii web)',toUrl:'URL',toAnchor:'Ancoră în această pagină',toEmail:'E-Mail',targetFrame:'<frame>',targetPopup:'<fereastra popup>',targetFrameName:'Numele frameului ţintă',targetPopupName:'Numele ferestrei popup',popupFeatures:'Proprietăţile ferestrei popup',popupResizable:'Redimensionabil',popupStatusBar:'Bara de status',popupLocationBar:'Bara de locaţie',popupToolbar:'Bara de opţiuni',popupMenuBar:'Bara de meniu',popupFullScreen:'Tot ecranul (Full Screen)(IE)',popupScrollBars:'Bare de derulare',popupDependent:'Dependent (Netscape)',popupLeft:'Poziţia la stânga',popupTop:'Poziţia la dreapta',id:'Id',langDir:'Direcţia cuvintelor',langDirLTR:'stânga-dreapta (LTR)',langDirRTL:'dreapta-stânga (RTL)',acccessKey:'Tasta de acces',name:'Nume',langCode:'Direcţia cuvintelor',tabIndex:'Indexul tabului',advisoryTitle:'Titlul consultativ',advisoryContentType:'Tipul consultativ al titlului',cssClasses:'Clasele cu stilul paginii (CSS)',charset:'Setul de caractere al resursei legate',styles:'Stil',rel:'Relație',selectAnchor:'Selectaţi o ancoră',anchorName:'după numele ancorei',anchorId:'după Id-ul elementului',emailAddress:'Adresă de e-mail',emailSubject:'Subiectul mesajului',emailBody:'Opțiuni Meniu Contextual',noAnchors:'(Nicio ancoră disponibilă în document)',noUrl:'Vă rugăm să scrieţi URL-ul',noEmail:'Vă rugăm să scrieţi adresa de e-mail'},anchor:{toolbar:'Inserează/Editează ancoră',menu:'Proprietăţi ancoră',title:'Proprietăţi ancoră',name:'Numele ancorei',errorName:'Vă rugăm scrieţi numele ancorei',remove:'Elimină ancora'},list:{numberedTitle:'Proprietățile listei numerotate',bulletedTitle:'Proprietățile listei cu simboluri',type:'Tip',start:'Start',validateStartNumber:'Începutul listei trebuie să fie un număr întreg.',circle:'Cerc',disc:'Disc',square:'Pătrat',none:'Nimic',notset:'<nesetat>',armenian:'Numerotare armeniană',georgian:'Numerotare georgiană (an, ban, gan, etc.)',lowerRoman:'Cifre romane mici (i, ii, iii, iv, v, etc.)',upperRoman:'Cifre romane mari (I, II, III, IV, V, etc.)',lowerAlpha:'Litere mici (a, b, c, d, e, etc.)',upperAlpha:'Litere mari (A, B, C, D, E, etc.)',lowerGreek:'Litere grecești mici (alpha, beta, gamma, etc.)',decimal:'Decimale (1, 2, 3, etc.)',decimalLeadingZero:'Decimale cu zero în față (01, 02, 03, etc.)'},findAndReplace:{title:'Găseşte şi înlocuieşte',find:'Găseşte',replace:'Înlocuieşte',findWhat:'Găseşte:',replaceWith:'Înlocuieşte cu:',notFoundMsg:'Textul specificat nu a fost găsit.',findOptions:'Find Options',matchCase:'Deosebeşte majuscule de minuscule (Match case)',matchWord:'Doar cuvintele întregi',matchCyclic:'Potrivește ciclic',replaceAll:'Înlocuieşte tot',replaceSuccessMsg:'%1 căutări înlocuite.'},table:{toolbar:'Tabel',title:'Proprietăţile tabelului',menu:'Proprietăţile tabelului',deleteTable:'Şterge tabel',rows:'Rânduri',columns:'Coloane',border:'Mărimea marginii',widthPx:'pixeli',widthPc:'procente',widthUnit:'unitate lățime',cellSpace:'Spaţiu între celule',cellPad:'Spaţiu în cadrul celulei',caption:'Titlu (Caption)',summary:'Rezumat',headers:'Antente',headersNone:'Nimic',headersColumn:'Prima coloană',headersRow:'Primul rând',headersBoth:'Ambele',invalidRows:'Numărul rândurilor trebuie să fie mai mare decât 0.',invalidCols:'Numărul coloanelor trebuie să fie mai mare decât 0.',invalidBorder:'Dimensiunea bordurii trebuie să aibe un număr.',invalidWidth:'Lățimea tabelului trebuie să fie un număr.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Spațierea celului trebuie să fie un număr pozitiv.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Celulă',insertBefore:'Inserează celulă înainte',insertAfter:'Inserează celulă după',deleteCell:'Şterge celule',merge:'Uneşte celule',mergeRight:'Uneşte la dreapta',mergeDown:'Uneşte jos',splitHorizontal:'Împarte celula pe orizontală',splitVertical:'Împarte celula pe verticală',title:'Proprietăți celulă',cellType:'Tipul celulei',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Aliniament orizontal',vAlign:'Aliniament vertical',alignBaseline:'Baseline',bgColor:'Culoare fundal',borderColor:'Culoare bordură',data:'Data',header:'Antet',yes:'Da',no:'Nu',invalidWidth:'Lățimea celulei trebuie să fie un număr.',invalidHeight:'Înălțimea celulei trebuie să fie un număr.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Alege'},row:{menu:'Rând',insertBefore:'Inserează rând înainte',insertAfter:'Inserează rând după',deleteRow:'Şterge rânduri'},column:{menu:'Coloană',insertBefore:'Inserează coloană înainte',insertAfter:'Inserează coloană după',deleteColumn:'Şterge celule'}},button:{title:'Proprietăţi buton',text:'Text (Valoare)',type:'Tip',typeBtn:'Buton',typeSbm:'Trimite',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Proprietăţi bifă (Checkbox)',radioTitle:'Proprietăţi buton radio (Radio Button)',value:'Valoare',selected:'Selectat'},form:{title:'Proprietăţi formular (Form)',menu:'Proprietăţi formular (Form)',action:'Acţiune',method:'Metodă',encoding:'Encodare'},select:{title:'Proprietăţi câmp selecţie (Selection Field)',selectInfo:'Informaţii',opAvail:'Opţiuni disponibile',value:'Valoare',size:'Mărime',lines:'linii',chkMulti:'Permite selecţii multiple',opText:'Text',opValue:'Valoare',btnAdd:'Adaugă',btnModify:'Modifică',btnUp:'Sus',btnDown:'Jos',btnSetValue:'Setează ca valoare selectată',btnDelete:'Şterge'},textarea:{title:'Proprietăţi suprafaţă text (Textarea)',cols:'Coloane',rows:'Linii'},textfield:{title:'Proprietăţi câmp text (Text Field)',name:'Nume',value:'Valoare',charWidth:'Lărgimea caracterului',maxChars:'Caractere maxime',type:'Tip',typeText:'Text',typePass:'Parolă'},hidden:{title:'Proprietăţi câmp ascuns (Hidden Field)',name:'Nume',value:'Valoare'},image:{title:'Proprietăţile imaginii',titleButton:'Proprietăţi buton imagine (Image Button)',menu:'Proprietăţile imaginii',infoTab:'Informaţii despre imagine',btnUpload:'Trimite la server',upload:'Încarcă',alt:'Text alternativ',lockRatio:'Păstrează proporţiile',resetSize:'Resetează mărimea',border:'Margine',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Vă rugăm să scrieţi URL-ul imaginii',linkTab:'Link (Legătură web)',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Sursa URL a imaginii lipsește.',validateBorder:'Bordura trebuie să fie un număr întreg.',validateHSpace:'Hspace trebuie să fie un număr întreg.',validateVSpace:'Vspace trebuie să fie un număr întreg.'},flash:{properties:'Proprietăţile flashului',propertiesTab:'Proprietăți',title:'Proprietăţile flashului',chkPlay:'Rulează automat',chkLoop:'Repetă (Loop)',chkMenu:'Activează meniul flash',chkFull:'Permite pe tot ecranul',scale:'Scală',scaleAll:'Arată tot',scaleNoBorder:'Fără bordură (No border)',scaleFit:'Potriveşte',access:'Acces script',accessAlways:'Întotdeauna',accessSameDomain:'Același domeniu',accessNever:'Niciodată',alignAbsBottom:'Jos absolut (Abs Bottom)',alignAbsMiddle:'Mijloc absolut (Abs Middle)',alignBaseline:'Linia de jos (Baseline)',alignTextTop:'Text sus',quality:'Calitate',qualityBest:'Cea mai bună',qualityHigh:'Înaltă',qualityAutoHigh:'Auto înaltă',qualityMedium:'Medie',qualityAutoLow:'Auto Joasă',qualityLow:'Joasă',windowModeWindow:'Fereastră',windowModeOpaque:'Opacă',windowModeTransparent:'Transparentă',windowMode:'Mod fereastră',flashvars:'Variabile pentru flash',bgcolor:'Coloarea fundalului',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Vă rugăm să scrieţi URL-ul',validateHSpace:'Hspace trebuie să fie un număr.',validateVSpace:'VSpace trebuie să fie un număr'},spellCheck:{toolbar:'Verifică scrierea textului',title:'Spell Check',notAvailable:'Scuzați, dar serviciul nu este disponibil momentan.',errorLoading:'Eroare în lansarea aplicației service host %s.',notInDic:'Nu e în dicţionar',changeTo:'Schimbă în',btnIgnore:'Ignoră',btnIgnoreAll:'Ignoră toate',btnReplace:'Înlocuieşte',btnReplaceAll:'Înlocuieşte tot',btnUndo:'Starea anterioară (undo)',noSuggestions:'- Fără sugestii -',progress:'Verificarea textului în desfăşurare...',noMispell:'Verificarea textului terminată: Nicio greşeală găsită',noChanges:'Verificarea textului terminată: Niciun cuvânt modificat',oneChange:'Verificarea textului terminată: Un cuvânt modificat',manyChanges:'Verificarea textului terminată: 1% cuvinte modificate',ieSpellDownload:'Unealta pentru verificat textul (Spell checker) neinstalată. Doriţi să o descărcaţi acum?'},smiley:{toolbar:'Figură expresivă (Emoticon)',title:'Inserează o figură expresivă (Emoticon)',options:'Opțiuni figuri expresive'},elementsPath:{eleLabel:'Calea elementelor',eleTitle:'%1 element'},numberedlist:'Inserează / Elimină Listă numerotată',bulletedlist:'Inserează / Elimină Listă cu puncte',indent:'Creşte indentarea',outdent:'Scade indentarea',justify:{left:'Aliniere la stânga',center:'Aliniere centrală',right:'Aliniere la dreapta',block:'Aliniere în bloc (Block Justify)'},blockquote:'Citat',clipboard:{title:'Adaugă',cutError:'Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).',copyError:'Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).',pasteMsg:'Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK',securityMsg:'Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.',pasteArea:'Suprafața de adăugare'},pastefromword:{confirmCleanup:'Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?',toolbar:'Adaugă din Word',title:'Adaugă din Word',error:'Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne'},pasteText:{button:'Adaugă ca text simplu (Plain Text)',title:'Adaugă ca text simplu (Plain Text)'},templates:{button:'Template-uri (şabloane)',title:'Template-uri (şabloane) de conţinut',options:'Opțiuni șabloane',insertOption:'Înlocuieşte cuprinsul actual',selectPromptMsg:'Vă rugăm selectaţi template-ul (şablonul) ce se va deschide în editor<br>(conţinutul actual va fi pierdut):',emptyListMsg:'(Niciun template (şablon) definit)'},showBlocks:'Arată blocurile',stylesCombo:{label:'Stil',panelTitle:'Formatarea stilurilor',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formatare',panelTitle:'Formatare',tag_p:'Normal',tag_pre:'Formatat',tag_address:'Adresă',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:'Codul limbii',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Mărime',voiceLabel:'Font Size',panelTitle:'Mărime'},colorButton:{textColorTitle:'Culoarea textului',bgColorTitle:'Coloarea fundalului',panelTitle:'Colors',auto:'Automatic',more:'Mai multe culori...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'Fără sugestii',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Mărește',minimize:'Micșorează',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Trage pentru a redimensiona',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Micșorează Bara',toolbarExpand:'Mărește Bara',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Proprietăţile documentului',title:'Proprietăţile documentului',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'<alt>',docTitle:'Titlul paginii',charset:'Encoding setului de caractere',charsetOther:'Alt encoding al setului de caractere',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinezesc tradiţional (Big5)',charsetCR:'Chirilic',charsetGR:'Grecesc',charsetJP:'Japonez',charsetKR:'Corean',charsetTR:'Turcesc',charsetUN:'Unicode (UTF-8)',charsetWE:'Vest european',docType:'Document Type Heading',docTypeOther:'Alt Document Type Heading',xhtmlDec:'Include declaraţii XHTML',bgColor:'Culoarea fundalului (Background Color)',bgImage:'URL-ul imaginii din fundal (Background Image URL)',bgFixed:'Fundal neflotant, fix (Non-scrolling Background)',txtColor:'Culoarea textului',margin:'Marginile paginii',marginTop:'Sus',marginLeft:'Stânga',marginRight:'Dreapta',marginBottom:'Jos',metaKeywords:'Cuvinte cheie după care se va indexa documentul (separate prin virgulă)',metaDescription:'Descrierea documentului',metaAuthor:'Autor',metaCopyright:'Drepturi de autor',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ru.js b/web/imcms/ckeditor/lang/ru.js
new file mode 100644
index 0000000000..a5692d371a
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ru.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ru={dir:'ltr',editorTitle:'Визуальный редактор тек�та, %1',editorHelp:'нажмите ALT-0 дл� открыти� �правки',toolbars:'Панели ин�трументов редактора',editor:'Визуальный редактор тек�та',source:'И�точник',newPage:'�ова� �траница',save:'Сохранить',preview:'Предварительный про�мотр',cut:'Вырезать',copy:'Копировать',paste:'В�тавить',print:'Печать',underline:'Подчеркнутый',bold:'Полужирный',italic:'Кур�ив',selectAll:'Выделить в�е',removeFormat:'Убрать форматирование',strike:'Зачеркнутый',subscript:'Под�трочный индек�',superscript:'�ад�трочный индек�',horizontalrule:'В�тавить горизонтальную линию',pagebreak:'В�тавить разрыв �траницы дл� печати',pagebreakAlt:'Разрыв �траницы',unlink:'Убрать ��ылку',undo:'Отменить',redo:'Повторить',common:{browseServer:'Выбор на �ервере',url:'С�ылка',protocol:'Протокол',upload:'Загрузка',uploadSubmit:'Загрузить на �ервер',image:'Изображение',flash:'Flash',form:'Форма',checkbox:'Флагова� кнопка',radio:'Кнопка выбора',textField:'Тек�товое поле',textarea:'Много�трочное тек�товое поле',hiddenField:'Скрытое поле',button:'Кнопка',select:'Спи�ок выбора',imageButton:'Изображение-кнопка',notSet:'<не указано>',id:'Идентификатор',name:'Им�',langDir:'�аправление тек�та',langDirLtr:'Слева направо (LTR)',langDirRtl:'Справа налево (RTL)',langCode:'Код �зыка',longDescr:'Длинное опи�ание ��ылки',cssClass:'Кла�� CSS',advisoryTitle:'Заголовок',cssStyle:'Стиль',ok:'ОК',cancel:'Отмена',close:'Закрыть',preview:'Предпро�мотр',generalTab:'О�новное',advancedTab:'Дополнительно',validateNumberFailed:'Это значение не �вл�ет�� чи�лом.',confirmNewPage:'�е�охранённые изменени� будут потер�ны! Вы дей�твительно желаете перейти на другую �траницу?',confirmCancel:'�екоторые параметры были изменены. Вы уверены, что желаете закрыть без �охранени�?',options:'Параметры',target:'Цель',targetNew:'�овое окно (_blank)',targetTop:'Главное окно (_top)',targetSelf:'Текущее окно (_self)',targetParent:'Родитель�кое окно (_parent)',langDirLTR:'Слева направо (LTR)',langDirRTL:'Справа налево (RTL)',styles:'Стиль',cssClasses:'Кла��ы CSS',width:'Ширина',height:'Вы�ота',align:'Выравнивание',alignLeft:'По левому краю',alignRight:'По правому краю',alignCenter:'По центру',alignTop:'По верху',alignMiddle:'По �ередине',alignBottom:'По низу',invalidValue:'Invalid value.',invalidHeight:'Вы�ота задает�� чи�лом.',invalidWidth:'Ширина задает�� чи�лом.',invalidCssLength:'Значение, указанное в поле "%1", должно быть положительным целым чи�лом. Допу�кает�� указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).',invalidHtmlLength:'Значение, указанное в поле "%1", должно быть положительным целым чи�лом. Допу�кает�� указание единиц меры HTML (px или %).',invalidInlineStyle:'Значение, указанное дл� �тил� �лемента, должно �о�то�ть из одной или не�кольких пар данных в формате "параметр : значение", разделённых точкой � зап�той.',cssLengthTooltip:'Введите значение в пик�ел�х, либо чи�ло � корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).',unavailable:'%1<span class="cke_accessibility">, недо�тупно</span>'},contextmenu:{options:'Параметры контек�тного меню'},specialChar:{toolbar:'В�тавить �пециальный �имвол',title:'Выберите �пециальный �имвол',options:'Выбор �пециального �имвола'},link:{toolbar:'В�тавить/Редактировать ��ылку',other:'<другой>',menu:'Редактировать ��ылку',title:'С�ылка',info:'Информаци� о ��ылке',target:'Цель',upload:'Загрузка',advanced:'Дополнительно',type:'Тип ��ылки',toUrl:'С�ылка',toAnchor:'С�ылка на �корь в тек�те',toEmail:'Email',targetFrame:'<фрейм>',targetPopup:'<в�плывающее окно>',targetFrameName:'Им� целевого фрейма',targetPopupName:'Им� в�плывающего окна',popupFeatures:'Параметры в�плывающего окна',popupResizable:'Измен�емый размер',popupStatusBar:'Строка �о�то�ни�',popupLocationBar:'Панель адре�а',popupToolbar:'Панель ин�трументов',popupMenuBar:'Панель меню',popupFullScreen:'Полно�кранное (IE)',popupScrollBars:'Поло�ы прокрутки',popupDependent:'Зави�имое (Netscape)',popupLeft:'От�туп �лева',popupTop:'От�туп �верху',id:'Идентификатор',langDir:'�аправление тек�та',langDirLTR:'Слева направо (LTR)',langDirRTL:'Справа налево (RTL)',acccessKey:'Клавиша до�тупа',name:'Им�',langCode:'Код �зыка',tabIndex:'По�ледовательно�ть перехода',advisoryTitle:'Заголовок',advisoryContentType:'Тип �одержимого',cssClasses:'Кла��ы CSS',charset:'Кодировка ре�ур�а',styles:'Стиль',rel:'Отношение',selectAnchor:'Выберите �корь',anchorName:'По имени',anchorId:'По идентификатору',emailAddress:'Email адре�',emailSubject:'Тема �ообщени�',emailBody:'Тек�т �ообщени�',noAnchors:'(В документе нет ни одного �кор�)',noUrl:'Пожалуй�та, введите ��ылку',noEmail:'Пожалуй�та, введите email адре�'},anchor:{toolbar:'В�тавить / редактировать �корь',menu:'Изменить �корь',title:'Свой�тва �кор�',name:'Им� �кор�',errorName:'Пожалуй�та, введите им� �кор�',remove:'Удалить �корь'},list:{numberedTitle:'Свой�тва нумерованного �пи�ка',bulletedTitle:'Свой�тва маркированного �пи�ка',type:'Тип',start:'�ачина� �',validateStartNumber:'Первый номер �пи�ка должен быть задан обычным целым чи�лом.',circle:'Круг',disc:'Окружно�ть',square:'Квадрат',none:'�ет',notset:'<не указано>',armenian:'�рм�н�ка� нумераци�',georgian:'Грузин�ка� нумераци� (ани, бани, гани, и т.д.)',lowerRoman:'Строчные рим�кие (i, ii, iii, iv, v, и т.д.)',upperRoman:'Заглавные рим�кие (I, II, III, IV, V, и т.д.)',lowerAlpha:'Строчные латин�кие (a, b, c, d, e, и т.д.)',upperAlpha:'Заглавные латин�кие (A, B, C, D, E, и т.д.)',lowerGreek:'Строчные грече�кие (альфа, бета, гамма, и т.д.)',decimal:'Де��тичные (1, 2, 3, и т.д.)',decimalLeadingZero:'Де��тичные � ведущим нулём (01, 02, 03, и т.д.)'},findAndReplace:{title:'Пои�к и замена',find:'�айти',replace:'Заменить',findWhat:'�айти:',replaceWith:'Заменить на:',notFoundMsg:'И�комый тек�т не найден.',findOptions:'Опции пои�ка',matchCase:'Учитывать реги�тр',matchWord:'Только �лово целиком',matchCyclic:'По в�ему тек�ту',replaceAll:'Заменить в�ё',replaceSuccessMsg:'У�пешно заменено %1 раз(а).'},table:{toolbar:'Таблица',title:'Свой�тва таблицы',menu:'Свой�тва таблицы',deleteTable:'Удалить таблицу',rows:'Строки',columns:'Колонки',border:'Размер границ',widthPx:'пик�елей',widthPc:'процентов',widthUnit:'единица измерени�',cellSpace:'Внешний от�туп �чеек',cellPad:'Внутренний от�туп �чеек',caption:'Заголовок',summary:'Итоги',headers:'Заголовки',headersNone:'Без заголовков',headersColumn:'Лева� колонка',headersRow:'Верхн�� �трока',headersBoth:'Сверху и �лева',invalidRows:'Количе�тво �трок должно быть больше 0.',invalidCols:'Количе�тво �толбцов должно быть больше 0.',invalidBorder:'Размер границ должен быть чи�лом.',invalidWidth:'Ширина таблицы должна быть чи�лом.',invalidHeight:'Вы�ота таблицы должна быть чи�лом.',invalidCellSpacing:'Внешний от�туп �чеек (cellspacing) должен быть чи�лом.',invalidCellPadding:'Внутренний от�туп �чеек (cellpadding) должен быть чи�лом.',cell:{menu:'Ячейка',insertBefore:'В�тавить �чейку �лева',insertAfter:'В�тавить �чейку �права',deleteCell:'Удалить �чейки',merge:'Объединить �чейки',mergeRight:'Объединить � правой',mergeDown:'Объединить � нижней',splitHorizontal:'Разделить �чейку по горизонтали',splitVertical:'Разделить �чейку по вертикали',title:'Свой�тва �чейки',cellType:'Тип �чейки',rowSpan:'Объедин�ет �трок',colSpan:'Объедин�ет колонок',wordWrap:'Перено� по �ловам',hAlign:'Горизонтальное выравнивание',vAlign:'Вертикальное выравнивание',alignBaseline:'По базовой линии',bgColor:'Цвет фона',borderColor:'Цвет границ',data:'Данные',header:'Заголовок',yes:'Да',no:'�ет',invalidWidth:'Ширина �чейки должна быть чи�лом.',invalidHeight:'Вы�ота �чейки должна быть чи�лом.',invalidRowSpan:'Количе�тво объедин�емых �трок должно быть задано чи�лом.',invalidColSpan:'Количе�тво объедин�емых колонок должно быть задано чи�лом.',chooseColor:'Выберите'},row:{menu:'Строка',insertBefore:'В�тавить �троку �верху',insertAfter:'В�тавить �троку �низу',deleteRow:'Удалить �троки'},column:{menu:'Колонка',insertBefore:'В�тавить колонку �лева',insertAfter:'В�тавить колонку �права',deleteColumn:'Удалить колонки'}},button:{title:'Свой�тва кнопки',text:'Тек�т (Значение)',type:'Тип',typeBtn:'Кнопка',typeSbm:'Отправка',typeRst:'Сбро�'},checkboxAndRadio:{checkboxTitle:'Свой�тва флаговой кнопки',radioTitle:'Свой�тва кнопки выбора',value:'Значение',selected:'Выбрано'},form:{title:'Свой�тва формы',menu:'Свой�тва формы',action:'Дей�твие',method:'Метод',encoding:'Кодировка'},select:{title:'Свой�тва �пи�ка выбора',selectInfo:'Информаци� о �пи�ке выбора',opAvail:'До�тупные варианты',value:'Значение',size:'Размер',lines:'�трок(и)',chkMulti:'Разрешить выбор не�кольких вариантов',opText:'Тек�т',opValue:'Значение',btnAdd:'Добавить',btnModify:'Изменить',btnUp:'Подн�ть',btnDown:'Опу�тить',btnSetValue:'Пометить как выбранное',btnDelete:'Удалить'},textarea:{title:'Свой�тва много�трочного тек�тового пол�',cols:'Колонок',rows:'Строк'},textfield:{title:'Свой�тва тек�тового пол�',name:'Им�',value:'Значение',charWidth:'Ширина пол� (в �имволах)',maxChars:'Мак�. количе�тво �имволов',type:'Тип �одержимого',typeText:'Тек�т',typePass:'Пароль'},hidden:{title:'Свой�тва �крытого пол�',name:'Им�',value:'Значение'},image:{title:'Свой�тва изображени�',titleButton:'Свой�тва изображени�-кнопки',menu:'Свой�тва изображени�',infoTab:'Данные об изображении',btnUpload:'Загрузить на �ервер',upload:'Загрузить',alt:'�льтернативный тек�т',lockRatio:'Сохран�ть пропорции',resetSize:'Вернуть обычные размеры',border:'Граница',hSpace:'Гориз. от�туп',vSpace:'Вертик. от�туп',alertUrl:'Пожалуй�та, введите ��ылку на изображение',linkTab:'С�ылка',button2Img:'Вы желаете преобразовать �то изображение-кнопку в обычное изображение?',img2Button:'Вы желаете преобразовать �то обычное изображение в изображение-кнопку?',urlMissing:'�е указана ��ылка на изображение.',validateBorder:'Размер границ должен быть задан чи�лом.',validateHSpace:'Горизонтальный от�туп должен быть задан чи�лом.',validateVSpace:'Вертикальный от�туп должен быть задан чи�лом.'},flash:{properties:'Свой�тва Flash',propertiesTab:'Свой�тва',title:'Свой�тва Flash',chkPlay:'�втоматиче�кое во�произведение',chkLoop:'Повтор�ть',chkMenu:'Включить меню Flash',chkFull:'Разрешить полно�кранный режим',scale:'Ма�штабировать',scaleAll:'Пропорционально',scaleNoBorder:'Заходить за границы',scaleFit:'Заполн�ть',access:'До�туп к �криптам',accessAlways:'В�егда',accessSameDomain:'В том же домене',accessNever:'�икогда',alignAbsBottom:'По низу тек�та',alignAbsMiddle:'По �ередине тек�та',alignBaseline:'По базовой линии',alignTextTop:'По верху тек�та',quality:'Каче�тво',qualityBest:'Лучшее',qualityHigh:'Вы�окое',qualityAutoHigh:'Запу�к на вы�оком',qualityMedium:'Среднее',qualityAutoLow:'Запу�к на низком',qualityLow:'�изкое',windowModeWindow:'Обычный',windowModeOpaque:'�епрозрачный',windowModeTransparent:'Прозрачный',windowMode:'Взаимодей�твие � окном',flashvars:'Переменные дл� Flash',bgcolor:'Цвет фона',hSpace:'Гориз. от�туп',vSpace:'Вертик. от�туп',validateSrc:'Вы должны вве�ти ��ылку',validateHSpace:'Горизонтальный от�туп задает�� чи�лом.',validateVSpace:'Вертикальный от�туп задает�� чи�лом.'},spellCheck:{toolbar:'Проверить орфографию',title:'Проверка орфографии',notAvailable:'Извините, но в данный момент �ерви� недо�тупен.',errorLoading:'Произошла ошибка при подключении к �ерверу проверки орфографии: %s.',notInDic:'От�ут�твует в �ловаре',changeTo:'Изменить на',btnIgnore:'Пропу�тить',btnIgnoreAll:'Пропу�тить в�ё',btnReplace:'Заменить',btnReplaceAll:'Заменить в�ё',btnUndo:'Отменить',noSuggestions:'- Варианты от�ут�твуют -',progress:'Орфографи� провер�ет��...',noMispell:'Проверка орфографии завершена. Ошибок не найдено',noChanges:'Проверка орфографии завершена. �е изменено ни одного �лова',oneChange:'Проверка орфографии завершена. Изменено одно �лово',manyChanges:'Проверка орфографии завершена. Изменено �лов: %1',ieSpellDownload:'Модуль проверки орфографии не у�тановлен. Хотите �качать его?'},smiley:{toolbar:'Смайлы',title:'В�тавить �майл',options:'Выбор �майла'},elementsPath:{eleLabel:'Путь �лементов',eleTitle:'Элемент %1'},numberedlist:'В�тавить / удалить нумерованный �пи�ок',bulletedlist:'В�тавить / удалить маркированный �пи�ок',indent:'Увеличить от�туп',outdent:'Уменьшить от�туп',justify:{left:'По левому краю',center:'По центру',right:'По правому краю',block:'По ширине'},blockquote:'Цитата',clipboard:{title:'В�тавить',cutError:'�а�тройки безопа�но�ти вашего браузера не разрешают редактору выполн�ть операции по вырезке тек�та. Пожалуй�та, и�пользуйте дл� �того клавиатуру (Ctrl/Cmd+X).',copyError:'�а�тройки безопа�но�ти вашего браузера не разрешают редактору выполн�ть операции по копированию тек�та. Пожалуй�та, и�пользуйте дл� �того клавиатуру (Ctrl/Cmd+C).',pasteMsg:'Пожалуй�та, в�тавьте тек�т в зону ниже, и�пользу� клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку "OK".',securityMsg:'�а�тройки безопа�но�ти вашего браузера не разрешают редактору напр�мую обращать�� к буферу обмена. Вы должны в�тавить тек�т �нова в �то окно.',pasteArea:'Зона дл� в�тавки'},pastefromword:{confirmCleanup:'Тек�т, который вы желаете в�тавить, по в�ей видимо�ти, был �копирован из Word. Следует ли очи�тить его перед в�тавкой?',toolbar:'В�тавить из Word',title:'В�тавить из Word',error:'�евозможно очи�тить в�тавленные данные из-за внутренней ошибки'},pasteText:{button:'В�тавить только тек�т',title:'В�тавить только тек�т'},templates:{button:'Шаблоны',title:'Шаблоны �одержимого',options:'Параметры шаблона',insertOption:'Заменить текущее �одержимое',selectPromptMsg:'Пожалуй�та, выберите, какой шаблон �ледует открыть в редакторе',emptyListMsg:'(не определено ни одного шаблона)'},showBlocks:'Отображать блоки',stylesCombo:{label:'Стили',panelTitle:'Стили форматировани�',panelTitle1:'Стили блока',panelTitle2:'Стили �лемента',panelTitle3:'Стили объекта'},format:{label:'Форматирование',panelTitle:'Форматирование',tag_p:'Обычное',tag_pre:'Моноширинное',tag_address:'�дре�',tag_h1:'Заголовок 1',tag_h2:'Заголовок 2',tag_h3:'Заголовок 3',tag_h4:'Заголовок 4',tag_h5:'Заголовок 5',tag_h6:'Заголовок 6',tag_div:'Обычное (div)'},div:{title:'Создать Div-контейнер',toolbar:'Создать Div-контейнер',cssClassInputLabel:'Кла��ы CSS',styleSelectLabel:'Стиль',IdInputLabel:'Идентификатор',languageCodeInputLabel:'Код �зыка',inlineStyleInputLabel:'Стиль �лемента',advisoryTitleInputLabel:'Заголовок',langDirLabel:'�аправление тек�та',langDirLTRLabel:'Слева направо (LTR)',langDirRTLLabel:'Справа налево (RTL)',edit:'Редактировать контейнер',remove:'Удалить контейнер'},iframe:{title:'Свой�тва iFrame',toolbar:'iFrame',noUrl:'Пожалуй�та, введите ��ылку фрейма',scrolling:'Отображать поло�ы прокрутки',border:'Показать границы фрейма'},font:{label:'Шрифт',voiceLabel:'Шрифт',panelTitle:'Шрифт'},fontSize:{label:'Размер',voiceLabel:'Размер шрифта',panelTitle:'Размер шрифта'},colorButton:{textColorTitle:'Цвет тек�та',bgColorTitle:'Цвет фона',panelTitle:'Цвета',auto:'�втоматиче�ки',more:'Ещё цвета...'},colors:{'000':'Чёрный',800000:'Бордовый','8B4513':'Кожано-коричневый','2F4F4F':'Темный �иневато-�ерый','008080':'Сине-зелёный','000080':'Тёмно-�иний','4B0082':'Индиго',696969:'Тёмно-�ерый',B22222:'Кирпичный',A52A2A:'Коричневый',DAA520:'Золоти�то-берёзовый','006400':'Темно-зелёный','40E0D0':'Бирюзовый','0000CD':'Умеренно �иний',800080:'Пурпурный',808080:'Серый',F00:'Кра�ный',FF8C00:'Темно-оранжевый',FFD700:'Золоти�тый','008000':'Зелёный','0FF':'Ва�ильковый','00F':'Синий',EE82EE:'Фиолетовый',A9A9A9:'Ту�кло-�ерый',FFA07A:'Светло-ло�о�евый',FFA500:'Оранжевый',FFFF00:'Жёлтый','00FF00':'Лайма',AFEEEE:'Бледно-�иний',ADD8E6:'Свелто-голубой',DDA0DD:'Сливовый',D3D3D3:'Светло-�ерый',FFF0F5:'Розово-лавандовый',FAEBD7:'�нтичный белый',FFFFE0:'Светло-жёлтый',F0FFF0:'Медв�ной ро�ы',F0FFFF:'Лазурный',F0F8FF:'Бледно-голубой',E6E6FA:'Лавандовый',FFF:'Белый'},scayt:{title:'Проверка орфографии по мере ввода (SCAYT)',opera_title:'�е поддерживает�� Opera',enable:'Включить SCAYT',disable:'Отключить SCAYT',about:'О SCAYT',toggle:'Переключить SCAYT',options:'�а�тройки',langs:'Языки',moreSuggestions:'Ещё варианты',ignore:'Пропу�тить',ignoreAll:'Пропу�тить в�ё',addWord:'Добавить �лово',emptyDic:'Вы должны указать название �ловар�.',noSuggestions:'No suggestions',optionsTab:'Параметры',allCaps:'Игнорировать �лова из заглавных букв',ignoreDomainNames:'Игнорировать доменные имена',mixedCase:'Игнорировать �лова из букв в разном реги�тре',mixedWithDigits:'Игнорировать �лова, �одержащие цифры',languagesTab:'Языки',dictionariesTab:'Словари',dic_field_name:'�азвание �ловар�',dic_create:'Создать',dic_restore:'Во��тановить',dic_delete:'Удалить',dic_rename:'Переименовать',dic_info:'Изначально, пользователь�кий �ловарь хранит�� в cookie, которые ограничены в размере. Когда �ловарь пользовател� выра�тает до размеров, что его невозможно хранить в cookie, он перено�ит�� на хранение на наш �ервер. Чтобы �охранить ваш �ловарь на нашем �ервере, вам �ледует указать название вашего �ловар�. Е�ли у ва� уже был �ловарь, который вы �охран�ли на нашем �ервере, то укажите зде�ь его название и нажмите кнопку Во��тановить.',aboutTab:'О SCAYT'},about:{title:'О CKEditor',dlgTitle:'О CKEditor',help:'$1 �одержит подробную �правку по и�пользованию.',userGuide:'Руковод�тво пользовател� CKEditor',moreInfo:'Дл� получени� информации о лицензии, пожалуй�та, перейдите на наш �айт:',copy:'Copyright &copy; $1. В�е права защищены.'},maximize:'Развернуть',minimize:'Свернуть',fakeobjects:{anchor:'Якорь',flash:'Flash анимаци�',iframe:'iFrame',hiddenfield:'Скрытое поле',unknown:'�еизве�тный объект'},resize:'Перетащите дл� изменени� размера',colordialog:{title:'Выберите цвет',options:'�а�тройки цвета',highlight:'Под кур�ором',selected:'Выбранный цвет',clear:'Очи�тить'},toolbarCollapse:'Свернуть панель ин�трументов',toolbarExpand:'Развернуть панель ин�трументов',toolbarGroups:{document:'Документ',clipboard:'Буфер обмена / Отмена дей�твий',editing:'Корректировка',forms:'Формы',basicstyles:'Про�тые �тили',paragraph:'�бзац',links:'С�ылки',insert:'В�тавка',styles:'Стили',colors:'Цвета',tools:'Ин�трументы'},bidi:{ltr:'�аправление тек�та �лева направо',rtl:'�аправление тек�та �права налево'},docprops:{label:'Свой�тва документа',title:'Свой�тва документа',design:'Дизайн',meta:'Метаданные',chooseColor:'Выберите',other:'Другой ...',docTitle:'Заголовок �траницы',charset:'Кодировка набора �имволов',charsetOther:'Друга� кодировка набора �имволов',charsetASCII:'ASCII',charsetCE:'Центрально-европей�ка�',charsetCT:'Китай�ка� традиционна� (Big5)',charsetCR:'Кириллица',charsetGR:'Грече�ка�',charsetJP:'Япон�ка�',charsetKR:'Корей�ка�',charsetTR:'Турецка�',charsetUN:'Юникод (UTF-8)',charsetWE:'Западно-европей�ка�',docType:'Заголовок типа документа',docTypeOther:'Другой заголовок типа документа',xhtmlDec:'Включить объ�влени� XHTML',bgColor:'Цвет фона',bgImage:'С�ылка на фоновое изображение',bgFixed:'Фон прикреплён (не проматывает��)',txtColor:'Цвет тек�та',margin:'От�тупы �траницы',marginTop:'Верхний',marginLeft:'Левый',marginRight:'Правый',marginBottom:'�ижний',metaKeywords:'Ключевые �лова документа (через зап�тую)',metaDescription:'Опи�ание документа',metaAuthor:'�втор',metaCopyright:'�втор�кие права',previewHtml:'<p>Это <strong>пример</strong> тек�та, напи�анного � помощью <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/sk.js b/web/imcms/ckeditor/lang/sk.js
new file mode 100644
index 0000000000..43c092db38
--- /dev/null
+++ b/web/imcms/ckeditor/lang/sk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sk={dir:'ltr',editorTitle:'Editor formátovaného textu, %1',editorHelp:'Stla�te ALT 0 pre nápovedu',toolbars:'Lišty nástrojov editora',editor:'Editor formátovaného textu',source:'Zdroj',newPage:'Nová stránka',save:'Uložiť',preview:'Náhľad',cut:'Vystrihnúť',copy:'Kopírovať',paste:'Vložiť',print:'Tla�',underline:'Pod�iarknuté',bold:'Tu�né',italic:'Kurzíva',selectAll:'Vybrať všetko',removeFormat:'Odstrániť formátovanie',strike:'Pre�iarknuté',subscript:'Dolný index',superscript:'Horný index',horizontalrule:'Vložiť vodorovnú �iaru',pagebreak:'Vložiť oddeľova� stránky pre tla�',pagebreakAlt:'Zalomenie strany',unlink:'Odstrániť odkaz',undo:'Späť',redo:'Znovu',common:{browseServer:'Prechádzať server',url:'URL',protocol:'Protokol',upload:'Nahrať',uploadSubmit:'Odoslať to na server',image:'Obrázok',flash:'Flash',form:'Formulár',checkbox:'Zaškrtávacie polí�ko',radio:'Prepína�',textField:'Textové pole',textarea:'Textová oblasť',hiddenField:'Skryté pole',button:'Tla�idlo',select:'Rozbaľovací zoznam',imageButton:'Obrázkové tla�idlo',notSet:'<nenastavené>',id:'Id',name:'Meno',langDir:'Orientácia jazyka',langDirLtr:'Zľava doprava (LTR)',langDirRtl:'Sprava doľava (RTL)',langCode:'Kód jazyka',longDescr:'Dlhý popis URL',cssClass:'Triedy štýlu',advisoryTitle:'Pomocný titulok',cssStyle:'Štýl',ok:'OK',cancel:'Zrušiť',close:'Zatvorit',preview:'Náhľad',generalTab:'Hlavné',advancedTab:'Rozšírené',validateNumberFailed:'Hodnota nieje �íslo.',confirmNewPage:'Všetky neuložené zmeny v tomto obsahu budú stratené. Ste si istý, že chcete na�ítať novú stránku?',confirmCancel:'Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?',options:'Možnosti',target:'Cieľ',targetNew:'Nové okno (_blank)',targetTop:'Najvrchnejšie okno (_top)',targetSelf:'To isté okno (_self)',targetParent:'Rodi�ovské okno (_parent)',langDirLTR:'Zľava doprava (LTR)',langDirRTL:'Sprava doľava (RTL)',styles:'Štýl',cssClasses:'Triedy štýlu',width:'Šírka',height:'Výška',align:'Zarovnanie',alignLeft:'Vľavo',alignRight:'Vpravo',alignCenter:'Na stred',alignTop:'Nahor',alignMiddle:'Na stred',alignBottom:'Dole',invalidValue:'Neplatná hodnota.',invalidHeight:'Výška musí byť �íslo.',invalidWidth:'Šírka musí byť �íslo.',invalidCssLength:'Špecifikovaná hodnota pre pole "%1" musí byť kladné �íslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).',invalidHtmlLength:'Špecifikovaná hodnota pre pole "%1" musí byť kladné �íslo s alebo bez platnej HTML mernej jednotky (px alebo %).',invalidInlineStyle:'Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu "názov: hodnota", oddelených bodko�iarkou.',cssLengthTooltip:'Vložte �íslo pre hodnotu v pixeloch alebo �íslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nedostupný</span>'},contextmenu:{options:'Možnosti kontextového menu'},specialChar:{toolbar:'Vložiť špeciálny znak',title:'Výber špeciálneho znaku',options:'Možnosti špeciálneho znaku'},link:{toolbar:'Odkaz',other:'<iný>',menu:'Upraviť odkaz',title:'Odkaz',info:'Informácie o odkaze',target:'Cieľ',upload:'Nahrať',advanced:'Rozšírené',type:'Typ odkazu',toUrl:'URL',toAnchor:'Odkaz na kotvu v texte',toEmail:'E-mail',targetFrame:'<rámec>',targetPopup:'<vyskakovacie okno>',targetFrameName:'Názov rámu cieľa',targetPopupName:'Názov vyskakovacieho okna',popupFeatures:'Vlastnosti vyskakovacieho okna',popupResizable:'Meniteľná veľkosť (resizable)',popupStatusBar:'Stavový riadok (status bar)',popupLocationBar:'Panel umiestnenia (location bar)',popupToolbar:'Panel nástrojov (toolbar)',popupMenuBar:'Panel ponuky (menu bar)',popupFullScreen:'Celá obrazovka (IE)',popupScrollBars:'Posuvníky (scroll bars)',popupDependent:'Závislosť (Netscape)',popupLeft:'Ľavý okraj',popupTop:'Horný okraj',id:'Id',langDir:'Orientácia jazyka',langDirLTR:'Zľava doprava (LTR)',langDirRTL:'Sprava doľava (RTL)',acccessKey:'Prístupový kľú�',name:'Názov',langCode:'Orientácia jazyka',tabIndex:'Poradie prvku (tab index)',advisoryTitle:'Pomocný titulok',advisoryContentType:'Pomocný typ obsahu',cssClasses:'Triedy štýlu',charset:'Priradená znaková sada',styles:'Štýl',rel:'Vzťah (rel)',selectAnchor:'Vybrať kotvu',anchorName:'Podľa mena kotvy',anchorId:'Podľa Id objektu',emailAddress:'E-Mailová adresa',emailSubject:'Predmet správy',emailBody:'Telo správy',noAnchors:'(V dokumente nie sú dostupné žiadne kotvy)',noUrl:'Zadajte prosím URL odkazu',noEmail:'Zadajte prosím e-mailovú adresu'},anchor:{toolbar:'Kotva',menu:'Upraviť kotvu',title:'Vlastnosti kotvy',name:'Názov kotvy',errorName:'Zadajte prosím názov kotvy',remove:'Odstrániť kotvu'},list:{numberedTitle:'Vlastnosti �íselného zoznamu',bulletedTitle:'Vlastnosti odrážkového zoznamu',type:'Typ',start:'Za�iatok',validateStartNumber:'Za�iato�né �íslo �íselného zoznamu musí byť celé �íslo.',circle:'Kruh',disc:'Disk',square:'Štvorec',none:'Ni�',notset:'<nenastavené>',armenian:'Arménske �íslovanie',georgian:'Gregoriánske �íslovanie (an, ban, gan, at�.)',lowerRoman:'Malé rímske (i, ii, iii, iv, v, at�.)',upperRoman:'Veľké rímske (I, II, III, IV, V, at�.)',lowerAlpha:'Malé latinské (a, b, c, d, e, at�.)',upperAlpha:'Veľké latinské (A, B, C, D, E, at�.)',lowerGreek:'Malé grécke (alfa, beta, gama, at�.)',decimal:'Číselné (1, 2, 3, at�.)',decimalLeadingZero:'Číselné s nulou (01, 02, 03, at�.)'},findAndReplace:{title:'Nájsť a nahradiť',find:'Hľadať',replace:'Nahradiť',findWhat:'Čo hľadať:',replaceWith:'Čím nahradiť:',notFoundMsg:'Hľadaný text nebol nájdený.',findOptions:'Nájsť možnosti',matchCase:'Rozlišovať malé a veľké písmená',matchWord:'Len celé slová',matchCyclic:'Cykliť zhodu',replaceAll:'Nahradiť všetko',replaceSuccessMsg:'%1 výskyt(ov) nahradených.'},table:{toolbar:'Tabuľka',title:'Vlastnosti tabuľky',menu:'Vlastnosti tabuľky',deleteTable:'Vymazať tabuľku',rows:'Riadky',columns:'Stĺpce',border:'Šírka rámu (border)',widthPx:'pixelov',widthPc:'percent',widthUnit:'jednotka šírky',cellSpace:'Vzdialenosť buniek (cell spacing)',cellPad:'Odsadenie obsahu (cell padding)',caption:'Popis',summary:'Prehľad',headers:'Hlavi�ka',headersNone:'Žiadne',headersColumn:'Prvý stĺpec',headersRow:'Prvý riadok',headersBoth:'Obe',invalidRows:'Po�et riadkov musí byť �íslo vä�šie ako 0.',invalidCols:'Po�et stĺpcov musí byť �íslo vä�šie ako 0.',invalidBorder:'Širka rámu musí byť �íslo.',invalidWidth:'Širka tabuľky musí byť �íslo.',invalidHeight:'Výška tabuľky musí byť �íslo.',invalidCellSpacing:'Medzera mädzi bunkami (cell spacing) musí byť kladné �íslo.',invalidCellPadding:'Odsadenie v bunkách (cell padding) musí byť kladné �íslo.',cell:{menu:'Bunka',insertBefore:'Vložiť bunku pred',insertAfter:'Vložiť bunku za',deleteCell:'Vymazať bunky',merge:'Zlú�iť bunky',mergeRight:'Zlú�iť doprava',mergeDown:'Zlú�iť dole',splitHorizontal:'Rozdeliť bunky horizontálne',splitVertical:'Rozdeliť bunky vertikálne',title:'Vlastnosti bunky',cellType:'Typ bunky',rowSpan:'Rozsah riadkov',colSpan:'Rozsah stĺpcov',wordWrap:'Zalomovanie riadkov',hAlign:'Horizontálne zarovnanie',vAlign:'Vertikálne zarovnanie',alignBaseline:'Základná �iara (baseline)',bgColor:'Farba pozadia',borderColor:'Farba rámu',data:'Dáta',header:'Hlavi�ka',yes:'�no',no:'Nie',invalidWidth:'Šírka bunky musí byť �íslo.',invalidHeight:'Výška bunky musí byť �íslo.',invalidRowSpan:'Rozsah riadkov musí byť celé �íslo.',invalidColSpan:'Rozsah stĺpcov musí byť celé �íslo.',chooseColor:'Vybrať'},row:{menu:'Riadok',insertBefore:'Vložiť riadok pred',insertAfter:'Vložiť riadok po',deleteRow:'Vymazať riadky'},column:{menu:'Stĺpec',insertBefore:'Vložiť stĺpec pred',insertAfter:'Vložiť stĺpec po',deleteColumn:'Zmazať stĺpce'}},button:{title:'Vlastnosti tla�idla',text:'Text (Hodnota)',type:'Typ',typeBtn:'Tla�idlo',typeSbm:'Odoslať',typeRst:'Resetovať'},checkboxAndRadio:{checkboxTitle:'Vlastnosti zaškrtávacieho polí�ka',radioTitle:'Vlastnosti prepína�a (radio button)',value:'Hodnota',selected:'Vybrané (selected)'},form:{title:'Vlastnosti formulára',menu:'Vlastnosti formulára',action:'Akcia (action)',method:'Metóda (method)',encoding:'Kódovanie (encoding)'},select:{title:'Vlastnosti rozbaľovacieho zoznamu',selectInfo:'Informácie o výbere',opAvail:'Dostupné možnosti',value:'Hodnota',size:'Veľkosť',lines:'riadkov',chkMulti:'Povoliť viacnásobný výber',opText:'Text',opValue:'Hodnota',btnAdd:'Pridať',btnModify:'Upraviť',btnUp:'Hore',btnDown:'Dole',btnSetValue:'Nastaviť ako vybranú hodnotu',btnDelete:'Vymazať'},textarea:{title:'Vlastnosti textovej oblasti (textarea)',cols:'Stĺpcov',rows:'Riadkov'},textfield:{title:'Vlastnosti textového poľa',name:'Názov (name)',value:'Hodnota',charWidth:'Šírka poľa (podľa znakov)',maxChars:'Maximálny po�et znakov',type:'Typ',typeText:'Text',typePass:'Heslo'},hidden:{title:'Vlastnosti skrytého poľa',name:'Názov (name)',value:'Hodnota'},image:{title:'Vlastnosti obrázka',titleButton:'Vlastnosti obrázkového tla�idla',menu:'Vlastnosti obrázka',infoTab:'Informácie o obrázku',btnUpload:'Odoslať to na server',upload:'Nahrať',alt:'Alternatívny text',lockRatio:'Pomer zámky',resetSize:'Pôvodná veľkosť',border:'Rám (border)',hSpace:'H-medzera',vSpace:'V-medzera',alertUrl:'Zadajte prosím URL obrázka',linkTab:'Odkaz',button2Img:'Chcete zmeniť vybrané obrázkové tla�idlo na jednoduchý obrázok?',img2Button:'Chcete zmeniť vybraný obrázok na obrázkové tla�idlo?',urlMissing:'Chýba URL zdroja obrázka.',validateBorder:'Rám (border) musí byť celé �íslo.',validateHSpace:'H-medzera musí byť celé �íslo.',validateVSpace:'V-medzera musí byť celé �íslo.'},flash:{properties:'Vlastnosti Flashu',propertiesTab:'Vlastnosti',title:'Vlastnosti Flashu',chkPlay:'Automatické prehrávanie',chkLoop:'Opakovanie',chkMenu:'Povoliť Flash Menu',chkFull:'Povoliť zobrazenie na celú obrazovku (fullscreen)',scale:'Mierka',scaleAll:'Zobraziť všetko',scaleNoBorder:'Bez okrajov',scaleFit:'Roztiahnuť, aby sedelo presne',access:'Prístup skriptu',accessAlways:'Vždy',accessSameDomain:'Rovnaká doména',accessNever:'Nikdy',alignAbsBottom:'Úplne dole',alignAbsMiddle:'Do stredu',alignBaseline:'Na základnú �iaru',alignTextTop:'Na horný okraj textu',quality:'Kvalita',qualityBest:'Najlepšia',qualityHigh:'Vysoká',qualityAutoHigh:'Automaticky vysoká',qualityMedium:'Stredná',qualityAutoLow:'Automaticky nízka',qualityLow:'Nízka',windowModeWindow:'Okno',windowModeOpaque:'Nepriehľadný',windowModeTransparent:'Priehľadný',windowMode:'Mód okna',flashvars:'Premenné pre Flash',bgcolor:'Farba pozadia',hSpace:'H-medzera',vSpace:'V-medzera',validateSrc:'URL nesmie byť prázdne.',validateHSpace:'H-medzera musí byť �íslo.',validateVSpace:'V-medzera musí byť �íslo'},spellCheck:{toolbar:'Kontrola pravopisu',title:'Skontrolovať pravopis',notAvailable:'Prepá�te, ale služba je momentálne nedostupná.',errorLoading:'Chyba pri na�ítaní slovníka z adresy: %s.',notInDic:'Nie je v slovníku',changeTo:'Zmeniť na',btnIgnore:'Ignorovať',btnIgnoreAll:'Ignorovať všetko',btnReplace:'Prepísat',btnReplaceAll:'Prepísat všetko',btnUndo:'Späť',noSuggestions:'- Žiadny návrh -',progress:'Prebieha kontrola pravopisu...',noMispell:'Kontrola pravopisu dokon�ená: Neboli nájdené žiadne chyby pravopisu',noChanges:'Kontrola pravopisu dokon�ená: Neboli zmenené žiadne slová',oneChange:'Kontrola pravopisu dokon�ená: Bolo zmenené jedno slovo',manyChanges:'Kontrola pravopisu dokon�ená: Bolo zmenených %1 slov',ieSpellDownload:'Kontrola pravopisu nie je naištalovaná. Chcete ju teraz stiahnuť?'},smiley:{toolbar:'Smajlíky',title:'Vložiť smajlíka',options:'Možnosti smajlíkov'},elementsPath:{eleLabel:'Cesta prvkov',eleTitle:'%1 prvok'},numberedlist:'Vložiť/Odstrániť �íslovaný zoznam',bulletedlist:'Vložiť/Odstrániť zoznam s odrážkami',indent:'Zvä�šiť odsadenie',outdent:'Zmenšiť odsadenie',justify:{left:'Zarovnať vľavo',center:'Zarovnať na stred',right:'Zarovnať vpravo',block:'Zarovnať do bloku'},blockquote:'Citácia',clipboard:{title:'Vložiť',cutError:'Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Prosím, použite na to klávesnicu (Ctrl/Cmd+X).',copyError:'Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru automaticky spustiť operáciu kopírovania. Prosím, použite na to klávesnicu (Ctrl/Cmd+C).',pasteMsg:'Prosím, vložte nasledovný rám�ek použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stla�te OK.',securityMsg:'Kvôli vašim bezpe�nostným nastaveniam prehliada�a editor nie je schopný pristupovať k vašej schránke na kopírovanie priamo. Vložte to preto do tohto okna.',pasteArea:'Miesto pre vloženie'},pastefromword:{confirmCleanup:'Vkladaný text vyzerá byť skopírovaný z Wordu. Chcete ho automaticky vy�istiť pred vkladaním?',toolbar:'Vložiť z Wordu',title:'Vložiť z Wordu',error:'Nebolo možné vy�istiť vložené dáta kvôli internej chybe'},pasteText:{button:'Vložiť ako �istý text',title:'Vložiť ako �istý text'},templates:{button:'Šablóny',title:'Šablóny obsahu',options:'Možnosti šablóny',insertOption:'Nahradiť aktuálny obsah',selectPromptMsg:'Prosím vyberte šablónu na otvorenie v editore',emptyListMsg:'(Žiadne šablóny nedefinované)'},showBlocks:'Ukázať bloky',stylesCombo:{label:'Štýly',panelTitle:'Formátovanie štýlov',panelTitle1:'Štýly bloku',panelTitle2:'Vnútroriadkové (inline) štýly',panelTitle3:'Štýly objeku'},format:{label:'Formát',panelTitle:'Formát',tag_p:'Normálny',tag_pre:'Formátovaný',tag_address:'Adresa',tag_h1:'Nadpis 1',tag_h2:'Nadpis 2',tag_h3:'Nadpis 3',tag_h4:'Nadpis 4',tag_h5:'Nadpis 5',tag_h6:'Nadpis 6',tag_div:'Normálny (DIV)'},div:{title:'Vytvoriť Div kontajner',toolbar:'Vytvoriť Div kontajner',cssClassInputLabel:'Triedy štýlu',styleSelectLabel:'Štýl',IdInputLabel:'Id',languageCodeInputLabel:'Kód jazyka',inlineStyleInputLabel:'Inline štýl',advisoryTitleInputLabel:'Pomocný titulok',langDirLabel:'Smer jazyka',langDirLTRLabel:'Zľava doprava (LTR)',langDirRTLLabel:'Zprava doľava (RTL)',edit:'Upraviť Div',remove:'Odstrániť Div'},iframe:{title:'Vlastnosti IFrame',toolbar:'IFrame',noUrl:'Prosím, vložte URL iframe',scrolling:'Povoliť skrolovanie',border:'Zobraziť rám frame-u'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Názov fontu'},fontSize:{label:'Veľkosť',voiceLabel:'Veľkosť písma',panelTitle:'Veľkosť písma'},colorButton:{textColorTitle:'Farba textu',bgColorTitle:'Farba pozadia',panelTitle:'Farby',auto:'Automaticky',more:'Viac farieb...'},colors:{'000':'Čierna',800000:'Maroon','8B4513':'Sedlová hnedá','2F4F4F':'Tmavo bridlicovo sivá','008080':'Modrozelená','000080':'Tmavomodrá','4B0082':'Indigo',696969:'Tmavá sivá',B22222:'Ohňová tehlová',A52A2A:'Hnedá',DAA520:'Zlatobyľ','006400':'Tmavá zelená','40E0D0':'Tyrkysová','0000CD':'Stredná modrá',800080:'Purpurová',808080:'Sivá',F00:'Červená',FF8C00:'Tmavá oranžová',FFD700:'Zlatá','008000':'Zelená','0FF':'Azúrová','00F':'Modrá',EE82EE:'Fialová',A9A9A9:'Tmavá sivá',FFA07A:'Svetlo lososová',FFA500:'Oranžová',FFFF00:'Žltá','00FF00':'Vápenná',AFEEEE:'Svetlo tyrkysová',ADD8E6:'Svetlo modrá',DDA0DD:'Slivková',D3D3D3:'Svetlo sivá',FFF0F5:'Levanduľovo �ervená',FAEBD7:'Antická biela',FFFFE0:'Svetlo žltá',F0FFF0:'Medová',F0FFFF:'Azúrová',F0F8FF:'Alicovo modrá',E6E6FA:'Levanduľová',FFF:'Biela'},scayt:{title:'Kontrola pravopisu po�as písania',opera_title:'Nepodporované Operou',enable:'Povoliť KPPP (Kontrola pravopisu po�as písania)',disable:'Zakázať  KPPP (Kontrola pravopisu po�as písania)',about:'O KPPP (Kontrola pravopisu po�as písania)',toggle:'Prepnúť KPPP (Kontrola pravopisu po�as písania)',options:'Možnosti',langs:'Jazyky',moreSuggestions:'Viac návrhov',ignore:'Ignorovať',ignoreAll:'Ignorovať všetko',addWord:'Pridať slovo',emptyDic:'Názov slovníka by nemal byť prázdny.',noSuggestions:'No suggestions',optionsTab:'Možnosti',allCaps:'Ignorovať slová písané veľkými písmenami',ignoreDomainNames:'Iznorovať názvy domén',mixedCase:'Ignorovať slová so smiešanými veľkými a malými písmenami',mixedWithDigits:'Ignorovať slová s �íslami',languagesTab:'Jazyky',dictionariesTab:'Slovníky',dic_field_name:'Názov slovníka',dic_create:'Vytvoriť',dic_restore:'Obnoviť',dic_delete:'Vymazať',dic_rename:'Premenovať',dic_info:'Spo�iatku je užívateľský slovník uložený v cookie. Cookie však majú obmedzenú veľkosť. Ke� užívateľský slovník narastie do bodu, kedy nemôže byť uložený v cookie, potom musí byť slovník uložený na našom serveri. Pre uloženie vášho osobného slovníka na náš server by ste mali zadať názov pre váš slovník. Ak už máte uložený slovník, prosíme, napíšte jeho názov a kliknite tla�idlo Obnoviť.',aboutTab:'O'},about:{title:'O CKEditor-e',dlgTitle:'O CKEditor-e',help:'Zaškrtnite $1 pre pomoc.',userGuide:'Používateľská príru�ka KCEditor-a',moreInfo:'Pre informácie o licenciách, prosíme, navštívte našu web stránku:',copy:'Copyright &copy; $1. Všetky práva vyhradené.'},maximize:'Maximalizovať',minimize:'Minimalizovať',fakeobjects:{anchor:'Kotva',flash:'Flash animácia',iframe:'IFrame',hiddenfield:'Skryté pole',unknown:'Neznámy objekt'},resize:'Potiahnite pre zmenu veľkosti',colordialog:{title:'Vyberte farbu',options:'Možnosti farby',highlight:'Zvýrazniť',selected:'Vybraná farba',clear:'Vy�istiť'},toolbarCollapse:'Zbaliť lištu nástrojov',toolbarExpand:'Rozbaliť lištu nástrojov',toolbarGroups:{document:'Dokument',clipboard:'Schránka pre kopírovanie/Späť',editing:'Upravovanie',forms:'Formuláre',basicstyles:'Základné štýly',paragraph:'Odstavec',links:'Odkazy',insert:'Vložiť',styles:'Štýly',colors:'Farby',tools:'Nástroje'},bidi:{ltr:'Smer textu zľava doprava',rtl:'Smer textu sprava doľava'},docprops:{label:'Vlastnosti dokumentu',title:'Vlastnosti dokumentu',design:'Design',meta:'Meta zna�ky',chooseColor:'Vybrať',other:'Iný...',docTitle:'Titulok stránky',charset:'Znaková sada',charsetOther:'Iná znaková sada',charsetASCII:'ASCII',charsetCE:'Stredoeurópska',charsetCT:'Čínština tradi�ná (Big5)',charsetCR:'Cyrillika',charsetGR:'Gré�tina',charsetJP:'Japon�ina',charsetKR:'Korej�ina',charsetTR:'Ture�tina',charsetUN:'Unicode (UTF-8)',charsetWE:'Západná európa',docType:'Typ záhlavia dokumentu',docTypeOther:'Iný typ záhlavia dokumentu',xhtmlDec:'Vložiť deklarácie XHTML',bgColor:'Farba pozadia',bgImage:'URL obrázka na pozadí',bgFixed:'Fixné pozadie',txtColor:'Farba textu',margin:'Okraje stránky (margins)',marginTop:'Horný',marginLeft:'Ľavý',marginRight:'Pravý',marginBottom:'Dolný',metaKeywords:'Indexované kľú�ové slová dokumentu (oddelené �iarkou)',metaDescription:'Popis dokumentu',metaAuthor:'Autor',metaCopyright:'Autorské práva (copyright)',previewHtml:'<p>Toto je nejaký <strong>ukážkový text</strong>. Používate <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/sl.js b/web/imcms/ckeditor/lang/sl.js
new file mode 100644
index 0000000000..a47ca7790f
--- /dev/null
+++ b/web/imcms/ckeditor/lang/sl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sl={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Izvorna koda',newPage:'Nova stran',save:'Shrani',preview:'Predogled',cut:'Izreži',copy:'Kopiraj',paste:'Prilepi',print:'Natisni',underline:'Pod�rtano',bold:'Krepko',italic:'Leže�e',selectAll:'Izberi vse',removeFormat:'Odstrani oblikovanje',strike:'Pre�rtano',subscript:'Podpisano',superscript:'Nadpisano',horizontalrule:'Vstavi vodoravno �rto',pagebreak:'Vstavi prelom strani',pagebreakAlt:'Page Break',unlink:'Odstrani povezavo',undo:'Razveljavi',redo:'Ponovi',common:{browseServer:'Prebrskaj na strežniku',url:'URL',protocol:'Protokol',upload:'Prenesi',uploadSubmit:'Pošlji na strežnik',image:'Slika',flash:'Flash',form:'Obrazec',checkbox:'Potrditveno polje',radio:'Izbirno polje',textField:'Vnosno polje',textarea:'Vnosno obmo�je',hiddenField:'Skrito polje',button:'Gumb',select:'Spustni seznam',imageButton:'Gumb s sliko',notSet:'<ni postavljen>',id:'Id',name:'Ime',langDir:'Smer jezika',langDirLtr:'Od leve proti desni (LTR)',langDirRtl:'Od desne proti levi (RTL)',langCode:'Oznaka jezika',longDescr:'Dolg opis URL-ja',cssClass:'Razred stilne predloge',advisoryTitle:'Predlagani naslov',cssStyle:'Slog',ok:'V redu',cancel:'Prekli�i',close:'Close',preview:'Preview',generalTab:'Splošno',advancedTab:'Napredno',validateNumberFailed:'Ta vrednost ni število.',confirmNewPage:'Vse neshranjene spremembe te vsebine bodo izgubljene. Ali gotovo želiš naložiti novo stran?',confirmCancel:'Nekaj možnosti je bilo spremenjenih. Ali gotovo želiš zapreti okno?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Širina',height:'Višina',align:'Poravnava',alignLeft:'Levo',alignRight:'Desno',alignCenter:'Sredinsko',alignTop:'Na vrh',alignMiddle:'V sredino',alignBottom:'Na dno',invalidValue:'Invalid value.',invalidHeight:'Višina mora biti število.',invalidWidth:'Širina mora biti število.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nedosegljiv</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Vstavi posebni znak',title:'Izberi posebni znak',options:'Special Character Options'},link:{toolbar:'Vstavi/uredi povezavo',other:'<drug>',menu:'Uredi povezavo',title:'Povezava',info:'Podatki o povezavi',target:'Cilj',upload:'Prenesi',advanced:'Napredno',type:'Vrsta povezave',toUrl:'URL',toAnchor:'Zaznamek na tej strani',toEmail:'Elektronski naslov',targetFrame:'<okvir>',targetPopup:'<pojavno okno>',targetFrameName:'Ime ciljnega okvirja',targetPopupName:'Ime pojavnega okna',popupFeatures:'Zna�ilnosti pojavnega okna',popupResizable:'Spremenljive velikosti',popupStatusBar:'Vrstica stanja',popupLocationBar:'Naslovna vrstica',popupToolbar:'Orodna vrstica',popupMenuBar:'Menijska vrstica',popupFullScreen:'Celozaslonska slika (IE)',popupScrollBars:'Drsniki',popupDependent:'Podokno (Netscape)',popupLeft:'Lega levo',popupTop:'Lega na vrhu',id:'Id',langDir:'Smer jezika',langDirLTR:'Od leve proti desni (LTR)',langDirRTL:'Od desne proti levi (RTL)',acccessKey:'Vstopno geslo',name:'Ime',langCode:'Smer jezika',tabIndex:'Številka tabulatorja',advisoryTitle:'Predlagani naslov',advisoryContentType:'Predlagani tip vsebine (content-type)',cssClasses:'Razred stilne predloge',charset:'Kodna tabela povezanega vira',styles:'Slog',rel:'Relationship',selectAnchor:'Izberi zaznamek',anchorName:'Po imenu zaznamka',anchorId:'Po ID-ju elementa',emailAddress:'Elektronski naslov',emailSubject:'Predmet sporo�ila',emailBody:'Vsebina sporo�ila',noAnchors:'(V tem dokumentu ni zaznamkov)',noUrl:'Vnesite URL povezave',noEmail:'Vnesite elektronski naslov'},anchor:{toolbar:'Vstavi/uredi zaznamek',menu:'Lastnosti zaznamka',title:'Lastnosti zaznamka',name:'Ime zaznamka',errorName:'Prosim vnesite ime zaznamka',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Najdi in zamenjaj',find:'Najdi',replace:'Zamenjaj',findWhat:'Najdi:',replaceWith:'Zamenjaj z:',notFoundMsg:'Navedeno besedilo ni bilo najdeno.',findOptions:'Find Options',matchCase:'Razlikuj velike in male �rke',matchWord:'Samo cele besede',matchCyclic:'Primerjaj znake v cirilici',replaceAll:'Zamenjaj vse',replaceSuccessMsg:'%1 pojavitev je bilo zamenjano.'},table:{toolbar:'Tabela',title:'Lastnosti tabele',menu:'Lastnosti tabele',deleteTable:'Izbriši tabelo',rows:'Vrstice',columns:'Stolpci',border:'Velikost obrobe',widthPx:'pik',widthPc:'procentov',widthUnit:'width unit',cellSpace:'Razmik med celicami',cellPad:'Polnilo med celicami',caption:'Naslov',summary:'Povzetek',headers:'Glave',headersNone:'Brez',headersColumn:'Prvi stolpec',headersRow:'Prva vrstica',headersBoth:'Oboje',invalidRows:'Število vrstic mora biti ve�je od 0.',invalidCols:'Število stolpcev mora biti ve�je od 0.',invalidBorder:'Širina obrobe mora biti število.',invalidWidth:'Širina tabele mora biti število.',invalidHeight:'Višina tabele mora biti število.',invalidCellSpacing:'Razmik med celicami mora biti število.',invalidCellPadding:'Zamik celic mora biti število',cell:{menu:'Celica',insertBefore:'Vstavi celico pred',insertAfter:'Vstavi celico za',deleteCell:'Izbriši celice',merge:'Združi celice',mergeRight:'Združi desno',mergeDown:'Druži navzdol',splitHorizontal:'Razdeli celico vodoravno',splitVertical:'Razdeli celico navpi�no',title:'Lastnosti celice',cellType:'Vrsta celice',rowSpan:'Razpon vrstic',colSpan:'Razpon stolpcev',wordWrap:'Prelom besedila',hAlign:'Vodoravna poravnava',vAlign:'Navpi�na poravnava',alignBaseline:'Osnovnica',bgColor:'Barva ozadja',borderColor:'Barva obrobe',data:'Podatki',header:'Glava',yes:'Da',no:'Ne',invalidWidth:'Širina celice mora biti število.',invalidHeight:'Višina celice mora biti število.',invalidRowSpan:'Razpon vrstic mora biti celo število.',invalidColSpan:'Razpon stolpcev mora biti celo število.',chooseColor:'Izberi'},row:{menu:'Vrstica',insertBefore:'Vstavi vrstico pred',insertAfter:'Vstavi vrstico za',deleteRow:'Izbriši vrstice'},column:{menu:'Stolpec',insertBefore:'Vstavi stolpec pred',insertAfter:'Vstavi stolpec za',deleteColumn:'Izbriši stolpce'}},button:{title:'Lastnosti gumba',text:'Besedilo (Vrednost)',type:'Tip',typeBtn:'Gumb',typeSbm:'Potrdi',typeRst:'Ponastavi'},checkboxAndRadio:{checkboxTitle:'Lastnosti potrditvenega polja',radioTitle:'Lastnosti izbirnega polja',value:'Vrednost',selected:'Izbrano'},form:{title:'Lastnosti obrazca',menu:'Lastnosti obrazca',action:'Akcija',method:'Metoda',encoding:'Kodiranje znakov'},select:{title:'Lastnosti spustnega seznama',selectInfo:'Podatki',opAvail:'Razpoložljive izbire',value:'Vrednost',size:'Velikost',lines:'vrstic',chkMulti:'Dovoli izbor ve�ih vrstic',opText:'Besedilo',opValue:'Vrednost',btnAdd:'Dodaj',btnModify:'Spremeni',btnUp:'Gor',btnDown:'Dol',btnSetValue:'Postavi kot privzeto izbiro',btnDelete:'Izbriši'},textarea:{title:'Lastnosti vnosnega obmo�ja',cols:'Stolpcev',rows:'Vrstic'},textfield:{title:'Lastnosti vnosnega polja',name:'Ime',value:'Vrednost',charWidth:'Dolžina',maxChars:'Najve�je število znakov',type:'Tip',typeText:'Besedilo',typePass:'Geslo'},hidden:{title:'Lastnosti skritega polja',name:'Ime',value:'Vrednost'},image:{title:'Lastnosti slike',titleButton:'Lastnosti gumba s sliko',menu:'Lastnosti slike',infoTab:'Podatki o sliki',btnUpload:'Pošlji na strežnik',upload:'Pošlji',alt:'Nadomestno besedilo',lockRatio:'Zakleni razmerje',resetSize:'Ponastavi velikost',border:'Obroba',hSpace:'Vodoravni razmik',vSpace:'Navpi�ni razmik',alertUrl:'Vnesite URL slike',linkTab:'Povezava',button2Img:'Želiš pretvoriti izbrani gumb s sliko v preprosto sliko?',img2Button:'Želiš pretvoriti izbrano sliko v gumb s sliko?',urlMissing:'Manjka vir (URL) slike.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Lastnosti Flash',propertiesTab:'Lastnosti',title:'Lastnosti Flash',chkPlay:'Samodejno predvajaj',chkLoop:'Ponavljanje',chkMenu:'Omogo�i Flash Meni',chkFull:'Dovoli celozaslonski na�in',scale:'Pove�ava',scaleAll:'Pokaži vse',scaleNoBorder:'Brez obrobe',scaleFit:'Natan�no prileganje',access:'Dostop skript',accessAlways:'Vedno',accessSameDomain:'Samo ista domena',accessNever:'Nikoli',alignAbsBottom:'Popolnoma na dno',alignAbsMiddle:'Popolnoma v sredino',alignBaseline:'Na osnovno �rto',alignTextTop:'Besedilo na vrh',quality:'Kakovost',qualityBest:'Najvišja',qualityHigh:'Visoka',qualityAutoHigh:'Samodejno visoka',qualityMedium:'Srednja',qualityAutoLow:'Samodejno nizka',qualityLow:'Nizka',windowModeWindow:'Okno',windowModeOpaque:'Motno',windowModeTransparent:'Prosojno',windowMode:'Vrsta okna',flashvars:'Spremenljivke za Flash',bgcolor:'Barva ozadja',hSpace:'Vodoravni razmik',vSpace:'Navpi�ni razmik',validateSrc:'Vnesite URL povezave',validateHSpace:'Vodoravni razmik mora biti število.',validateVSpace:'Navpi�ni razmik mora biti število.'},spellCheck:{toolbar:'Preveri �rkovanje',title:'Črkovalnik',notAvailable:'Oprostite, storitev trenutno ni dosegljiva.',errorLoading:'Napaka pri nalaganju storitve programa na naslovu %s.',notInDic:'Ni v slovarju',changeTo:'Spremeni v',btnIgnore:'Prezri',btnIgnoreAll:'Prezri vse',btnReplace:'Zamenjaj',btnReplaceAll:'Zamenjaj vse',btnUndo:'Razveljavi',noSuggestions:'- Ni predlogov -',progress:'Preverjanje �rkovanja se izvaja...',noMispell:'Črkovanje je kon�ano: Brez napak',noChanges:'Črkovanje je kon�ano: Nobena beseda ni bila spremenjena',oneChange:'Črkovanje je kon�ano: Spremenjena je bila ena beseda',manyChanges:'Črkovanje je kon�ano: Spremenjenih je bilo %1 besed',ieSpellDownload:'Črkovalnik ni nameš�en. Ali ga želite prenesti sedaj?'},smiley:{toolbar:'Smeško',title:'Vstavi smeška',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Oštevil�en seznam',bulletedlist:'Ozna�en seznam',indent:'Pove�aj zamik',outdent:'Zmanjšaj zamik',justify:{left:'Leva poravnava',center:'Sredinska poravnava',right:'Desna poravnava',block:'Obojestranska poravnava'},blockquote:'Citat',clipboard:{title:'Prilepi',cutError:'Varnostne nastavitve brskalnika ne dopuš�ajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).',copyError:'Varnostne nastavitve brskalnika ne dopuš�ajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).',pasteMsg:'Prosim prilepite v sle�i okvir s pomo�jo tipkovnice (<STRONG>Ctrl/Cmd+V</STRONG>) in pritisnite <STRONG>V redu</STRONG>.',securityMsg:'Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložiš�a. Vsebino odložiš�a ponovno prilepite v to okno.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Prilepi iz Worda',title:'Prilepi iz Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Prilepi kot golo besedilo',title:'Prilepi kot golo besedilo'},templates:{button:'Predloge',title:'Vsebinske predloge',options:'Template Options',insertOption:'Zamenjaj trenutno vsebino',selectPromptMsg:'Izberite predlogo, ki jo želite odpreti v urejevalniku<br>(trenutna vsebina bo izgubljena):',emptyListMsg:'(Ni pripravljenih predlog)'},showBlocks:'Prikaži ograde',stylesCombo:{label:'Slog',panelTitle:'Formatting Styles',panelTitle1:'Slogi odstavkov',panelTitle2:'Slogi besedila',panelTitle3:'Slogi objektov'},format:{label:'Oblika',panelTitle:'Oblika',tag_p:'Navaden',tag_pre:'Oblikovan',tag_address:'Napis',tag_h1:'Naslov 1',tag_h2:'Naslov 2',tag_h3:'Naslov 3',tag_h4:'Naslov 4',tag_h5:'Naslov 5',tag_h6:'Naslov 6',tag_div:'Navaden (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Pisava',voiceLabel:'Pisava',panelTitle:'Pisava'},fontSize:{label:'Velikost',voiceLabel:'Velikost',panelTitle:'Velikost'},colorButton:{textColorTitle:'Barva besedila',bgColorTitle:'Barva ozadja',panelTitle:'Colors',auto:'Samodejno',more:'Ve� barv...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Črkovanje med tipkanjem',opera_title:'Not supported by Opera',enable:'Omogo�i SCAYT',disable:'Onemogo�i SCAYT',about:'O storitvi SCAYT',toggle:'Preklopi SCAYT',options:'Možnosti',langs:'Jeziki',moreSuggestions:'Ve� predlogov',ignore:'Prezri',ignoreAll:'Prezri vse',addWord:'Dodaj besedo',emptyDic:'Ime slovarja ne more biti prazno.',noSuggestions:'Ni predlogov',optionsTab:'Možnosti',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Jeziki',dictionariesTab:'Slovarji',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'O storitvi'},about:{title:'O programu CKEditor',dlgTitle:'O programu CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Za informacijo o licenci prostim obiš�ite našo spletno stran:',copy:'Copyright &copy; $1. Vse pravice pridržane.'},maximize:'Maksimiraj',minimize:'Minimiraj',fakeobjects:{anchor:'Sidro',flash:'Flash animacija',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Neznan objekt'},resize:'Potegni za spremembo velikosti',colordialog:{title:'Izberi barvo',options:'Color Options',highlight:'Poudarjeno',selected:'Izbrano',clear:'Po�isti'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Lastnosti dokumenta',title:'Lastnosti dokumenta',design:'Design',meta:'Meta podatki',chooseColor:'Izberi',other:'<drug>',docTitle:'Naslov strani',charset:'Kodna tabela',charsetOther:'Druga kodna tabela',charsetASCII:'ASCII',charsetCE:'Srednjeevropsko',charsetCT:'Tradicionalno Kitajsko (Big5)',charsetCR:'Cirilica',charsetGR:'Grško',charsetJP:'Japonsko',charsetKR:'Korejsko',charsetTR:'Turško',charsetUN:'Unicode (UTF-8)',charsetWE:'Zahodnoevropsko',docType:'Glava tipa dokumenta',docTypeOther:'Druga glava tipa dokumenta',xhtmlDec:'Vstavi XHTML deklaracije',bgColor:'Barva ozadja',bgImage:'URL slike za ozadje',bgFixed:'Nepremi�no ozadje',txtColor:'Barva besedila',margin:'Zamiki strani',marginTop:'Na vrhu',marginLeft:'Levo',marginRight:'Desno',marginBottom:'Spodaj',metaKeywords:'Klju�ne besede (lo�ene z vejicami)',metaDescription:'Opis strani',metaAuthor:'Avtor',metaCopyright:'Avtorske pravice',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/sr-latn.js b/web/imcms/ckeditor/lang/sr-latn.js
new file mode 100644
index 0000000000..10310251b3
--- /dev/null
+++ b/web/imcms/ckeditor/lang/sr-latn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['sr-latn']={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kôd',newPage:'Nova stranica',save:'Sa�uvaj',preview:'Izgled stranice',cut:'Iseci',copy:'Kopiraj',paste:'Zalepi',print:'Štampa',underline:'Podvu�eno',bold:'Podebljano',italic:'Kurziv',selectAll:'Ozna�i sve',removeFormat:'Ukloni formatiranje',strike:'Precrtano',subscript:'Indeks',superscript:'Stepen',horizontalrule:'Unesi horizontalnu liniju',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Ukloni link',undo:'Poni�ti akciju',redo:'Ponovi akciju',common:{browseServer:'Pretraži server',url:'URL',protocol:'Protokol',upload:'Pošalji',uploadSubmit:'Pošalji na server',image:'Slika',flash:'Fleš',form:'Forma',checkbox:'Polje za potvrdu',radio:'Radio-dugme',textField:'Tekstualno polje',textarea:'Zona teksta',hiddenField:'Skriveno polje',button:'Dugme',select:'Izborno polje',imageButton:'Dugme sa slikom',notSet:'<nije postavljeno>',id:'Id',name:'Naziv',langDir:'Smer jezika',langDirLtr:'S leva na desno (LTR)',langDirRtl:'S desna na levo (RTL)',langCode:'Kôd jezika',longDescr:'Pun opis URL',cssClass:'Stylesheet klase',advisoryTitle:'Advisory naslov',cssStyle:'Stil',ok:'OK',cancel:'Otkaži',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Napredni tagovi',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Širina',height:'Visina',align:'Ravnanje',alignLeft:'Levo',alignRight:'Desno',alignCenter:'Sredina',alignTop:'Vrh',alignMiddle:'Sredina',alignBottom:'Dole',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Unesi specijalni karakter',title:'Odaberite specijalni karakter',options:'Special Character Options'},link:{toolbar:'Unesi/izmeni link',other:'<о�тало>',menu:'Izmeni link',title:'Link',info:'Link Info',target:'Meta',upload:'Pošalji',advanced:'Napredni tagovi',type:'Vrsta linka',toUrl:'URL',toAnchor:'Sidro na ovoj stranici',toEmail:'E-Mail',targetFrame:'<okvir>',targetPopup:'<popup prozor>',targetFrameName:'Naziv odredišnog frejma',targetPopupName:'Naziv popup prozora',popupFeatures:'Mogućnosti popup prozora',popupResizable:'Resizable',popupStatusBar:'Statusna linija',popupLocationBar:'Lokacija',popupToolbar:'Toolbar',popupMenuBar:'Kontekstni meni',popupFullScreen:'Prikaz preko celog ekrana (IE)',popupScrollBars:'Scroll bar',popupDependent:'Zavisno (Netscape)',popupLeft:'Od leve ivice ekrana (px)',popupTop:'Od vrha ekrana (px)',id:'Id',langDir:'Smer jezika',langDirLTR:'S leva na desno (LTR)',langDirRTL:'S desna na levo (RTL)',acccessKey:'Pristupni taster',name:'Naziv',langCode:'Smer jezika',tabIndex:'Tab indeks',advisoryTitle:'Advisory naslov',advisoryContentType:'Advisory vrsta sadržaja',cssClasses:'Stylesheet klase',charset:'Linked Resource Charset',styles:'Stil',rel:'Relationship',selectAnchor:'Odaberi sidro',anchorName:'Po nazivu sidra',anchorId:'Po Id-ju elementa',emailAddress:'E-Mail adresa',emailSubject:'Naslov',emailBody:'Sadržaj poruke',noAnchors:'(Nema dostupnih sidra)',noUrl:'Unesite URL linka',noEmail:'Otkucajte adresu elektronske pote'},anchor:{toolbar:'Unesi/izmeni sidro',menu:'Osobine sidra',title:'Osobine sidra',name:'Ime sidra',errorName:'Unesite ime sidra',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Pretraga',replace:'Zamena',findWhat:'Pronadi:',replaceWith:'Zameni sa:',notFoundMsg:'Traženi tekst nije pronađen.',findOptions:'Find Options',matchCase:'Razlikuj mala i velika slova',matchWord:'Uporedi cele reci',matchCyclic:'Match cyclic',replaceAll:'Zameni sve',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabela',title:'Osobine tabele',menu:'Osobine tabele',deleteTable:'Delete Table',rows:'Redova',columns:'Kolona',border:'Veli�ina okvira',widthPx:'piksela',widthPc:'procenata',widthUnit:'width unit',cellSpace:'Ćelijski prostor',cellPad:'Razmak ćelija',caption:'Naslov tabele',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Obriši ćelije',merge:'Spoj celije',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Obriši redove'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Obriši kolone'}},button:{title:'Osobine dugmeta',text:'Tekst (vrednost)',type:'Tip',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Osobine polja za potvrdu',radioTitle:'Osobine radio-dugmeta',value:'Vrednost',selected:'Ozna�eno'},form:{title:'Osobine forme',menu:'Osobine forme',action:'Akcija',method:'Metoda',encoding:'Encoding'},select:{title:'Osobine izbornog polja',selectInfo:'Info',opAvail:'Dostupne opcije',value:'Vrednost',size:'Veli�ina',lines:'linija',chkMulti:'Dozvoli višestruku selekciju',opText:'Tekst',opValue:'Vrednost',btnAdd:'Dodaj',btnModify:'Izmeni',btnUp:'Gore',btnDown:'Dole',btnSetValue:'Podesi kao ozna�enu vrednost',btnDelete:'Obriši'},textarea:{title:'Osobine zone teksta',cols:'Broj kolona',rows:'Broj redova'},textfield:{title:'Osobine tekstualnog polja',name:'Naziv',value:'Vrednost',charWidth:'Širina (karaktera)',maxChars:'Maksimalno karaktera',type:'Tip',typeText:'Tekst',typePass:'Lozinka'},hidden:{title:'Osobine skrivenog polja',name:'Naziv',value:'Vrednost'},image:{title:'Osobine slika',titleButton:'Osobine dugmeta sa slikom',menu:'Osobine slika',infoTab:'Info slike',btnUpload:'Pošalji na server',upload:'Pošalji',alt:'Alternativni tekst',lockRatio:'Zaklju�aj odnos',resetSize:'Resetuj veli�inu',border:'Okvir',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Unesite URL slike',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Osobine fleša',propertiesTab:'Properties',title:'Osobine fleša',chkPlay:'Automatski start',chkLoop:'Ponavljaj',chkMenu:'Uklju�i fleš meni',chkFull:'Allow Fullscreen',scale:'Skaliraj',scaleAll:'Prikaži sve',scaleNoBorder:'Bez ivice',scaleFit:'Popuni površinu',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs dole',alignAbsMiddle:'Abs sredina',alignBaseline:'Bazno',alignTextTop:'Vrh teksta',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Boja pozadine',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Unesite URL linka',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Proveri spelovanje',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Nije u re�niku',changeTo:'Izmeni',btnIgnore:'Ignoriši',btnIgnoreAll:'Ignoriši sve',btnReplace:'Zameni',btnReplaceAll:'Zameni sve',btnUndo:'Vrati akciju',noSuggestions:'- Bez sugestija -',progress:'Provera spelovanja u toku...',noMispell:'Provera spelovanja završena: greške nisu pronadene',noChanges:'Provera spelovanja završena: Nije izmenjena nijedna rec',oneChange:'Provera spelovanja završena: Izmenjena je jedna re�',manyChanges:'Provera spelovanja završena: %1 re�(i) je izmenjeno',ieSpellDownload:'Provera spelovanja nije instalirana. Da li želite da je skinete sa Interneta?'},smiley:{toolbar:'Smajli',title:'Unesi smajlija',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Nabrojiva lista',bulletedlist:'Nenabrojiva lista',indent:'Uvećaj levu marginu',outdent:'Smanji levu marginu',justify:{left:'Levo ravnanje',center:'Centriran tekst',right:'Desno ravnanje',block:'Obostrano ravnanje'},blockquote:'Block Quote',clipboard:{title:'Zalepi',cutError:'Sigurnosna podešavanja Vašeg pretraživa�a ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite pre�icu sa tastature (Ctrl/Cmd+X).',copyError:'Sigurnosna podešavanja Vašeg pretraživa�a ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite pre�icu sa tastature (Ctrl/Cmd+C).',pasteMsg:'Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu pre�icu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Zalepi iz Worda',title:'Zalepi iz Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Zalepi kao �ist tekst',title:'Zalepi kao �ist tekst'},templates:{button:'Obrasci',title:'Obrasci za sadržaj',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Molimo Vas da odaberete obrazac koji ce biti primenjen na stranicu (trenutni sadržaj ce biti obrisan):',emptyListMsg:'(Nema definisanih obrazaca)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stil',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatirano',tag_address:'Adresa',tag_h1:'Naslov 1',tag_h2:'Naslov 2',tag_h3:'Naslov 3',tag_h4:'Naslov 4',tag_h5:'Naslov 5',tag_h6:'Naslov 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Veli�ina fonta',voiceLabel:'Font Size',panelTitle:'Veli�ina fonta'},colorButton:{textColorTitle:'Boja teksta',bgColorTitle:'Boja pozadine',panelTitle:'Colors',auto:'Automatski',more:'Više boja...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'Bez sugestija',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Osobine dokumenta',title:'Osobine dokumenta',design:'Design',meta:'Metapodaci',chooseColor:'Choose',other:'<о�тало>',docTitle:'Naslov stranice',charset:'Kodiranje skupa karaktera',charsetOther:'Ostala kodiranja skupa karaktera',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Zaglavlje tipa dokumenta',docTypeOther:'Ostala zaglavlja tipa dokumenta',xhtmlDec:'Ukljuci XHTML deklaracije',bgColor:'Boja pozadine',bgImage:'URL pozadinske slike',bgFixed:'Fiksirana pozadina',txtColor:'Boja teksta',margin:'Margine stranice',marginTop:'Gornja',marginLeft:'Leva',marginRight:'Desna',marginBottom:'Donja',metaKeywords:'Klju�ne reci za indeksiranje dokumenta (razdvojene zarezima)',metaDescription:'Opis dokumenta',metaAuthor:'Autor',metaCopyright:'Autorska prava',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/sr.js b/web/imcms/ckeditor/lang/sr.js
new file mode 100644
index 0000000000..1a82046352
--- /dev/null
+++ b/web/imcms/ckeditor/lang/sr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sr={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kôд',newPage:'�ова �траница',save:'Сачувај',preview:'Изглед �транице',cut:'И�еци',copy:'Копирај',paste:'Залепи',print:'Штампа',underline:'Подвучено',bold:'Подебљано',italic:'Курзив',selectAll:'Означи �ве',removeFormat:'Уклони форматирање',strike:'Прецртано',subscript:'Индек�',superscript:'Степен',horizontalrule:'Уне�и хоризонталну линију',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Уклони линк',undo:'Поништи акцију',redo:'Понови акцију',common:{browseServer:'Претражи �ервер',url:'УРЛ',protocol:'Протокол',upload:'Пошаљи',uploadSubmit:'Пошаљи на �ервер',image:'Слика',flash:'Флеш елемент',form:'Форма',checkbox:'Поље за потврду',radio:'Радио-дугме',textField:'Тек�туално поље',textarea:'Зона тек�та',hiddenField:'Скривено поље',button:'Дугме',select:'Изборно поље',imageButton:'Дугме �а �ликом',notSet:'<није по�тављено>',id:'Ид',name:'�азив',langDir:'Смер језика',langDirLtr:'С лева на де�но (LTR)',langDirRtl:'С де�на на лево (RTL)',langCode:'Kôд језика',longDescr:'Пун опи� УРЛ',cssClass:'Stylesheet кла�е',advisoryTitle:'Advisory на�лов',cssStyle:'Стил',ok:'OK',cancel:'Oткажи',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'�апредни тагови',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Ширина',height:'Ви�ина',align:'Равнање',alignLeft:'Лево',alignRight:'Де�но',alignCenter:'Средина',alignTop:'Врх',alignMiddle:'Средина',alignBottom:'Доле',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Уне�и �пецијални карактер',title:'Одаберите �пецијални карактер',options:'Special Character Options'},link:{toolbar:'Уне�и/измени линк',other:'<other>',menu:'Промени линк',title:'Линк',info:'Линк инфо',target:'Meтa',upload:'Пошаљи',advanced:'�апредни тагови',type:'Вр�та линка',toUrl:'URL',toAnchor:'Сидро на овој �траници',toEmail:'Eлектрон�ка пошта',targetFrame:'<оквир>',targetPopup:'<и�качући прозор>',targetFrameName:'�азив одредишног фрејма',targetPopupName:'�азив и�качућег прозора',popupFeatures:'Могућно�ти и�качућег прозора',popupResizable:'Resizable',popupStatusBar:'Стату�на линија',popupLocationBar:'Локација',popupToolbar:'Toolbar',popupMenuBar:'Контек�тни мени',popupFullScreen:'Приказ преко целог екрана (ИE)',popupScrollBars:'Скрол бар',popupDependent:'Зави�но (Netscape)',popupLeft:'Од леве ивице екрана (пик�ела)',popupTop:'Од врха екрана (пик�ела)',id:'Id',langDir:'Смер језика',langDirLTR:'С лева на де�но (LTR)',langDirRTL:'С де�на на лево (RTL)',acccessKey:'При�тупни та�тер',name:'�азив',langCode:'Смер језика',tabIndex:'Таб индек�',advisoryTitle:'Advisory на�лов',advisoryContentType:'Advisory вр�та �адржаја',cssClasses:'Stylesheet кла�е',charset:'Linked Resource Charset',styles:'Стил',rel:'Relationship',selectAnchor:'Одабери �идро',anchorName:'По називу �идра',anchorId:'Пo Ид-jу елемента',emailAddress:'�дре�а електрон�ке поште',emailSubject:'�а�лов',emailBody:'Садржај поруке',noAnchors:'(�ема до�тупних �идра)',noUrl:'Уне�ите УРЛ линка',noEmail:'Откуцајте адре�у електрон�ке поште'},anchor:{toolbar:'Уне�и/измени �идро',menu:'О�обине �идра',title:'О�обине �идра',name:'Име �идра',errorName:'Молимо Ва� да уне�ете име �идра',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Претрага',replace:'Замена',findWhat:'Пронађи:',replaceWith:'Замени �а:',notFoundMsg:'Тражени тек�т није пронађен.',findOptions:'Find Options',matchCase:'Разликуј велика и мала �лова',matchWord:'Упореди целе речи',matchCyclic:'Match cyclic',replaceAll:'Замени �ве',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Табела',title:'О�обине табеле',menu:'О�обине табеле',deleteTable:'Delete Table',rows:'Редова',columns:'Kолона',border:'Величина оквира',widthPx:'пик�ела',widthPc:'процената',widthUnit:'width unit',cellSpace:'Ћелиј�ки про�тор',cellPad:'Размак ћелија',caption:'�а�лов табеле',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Обриши ћелије',merge:'Спој ћелије',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Обриши редове'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Обриши колоне'}},button:{title:'О�обине дугмета',text:'Тек�т (вредно�т)',type:'Tип',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'О�обине поља за потврду',radioTitle:'О�обине радио-дугмета',value:'Вредно�т',selected:'Означено'},form:{title:'О�обине форме',menu:'О�обине форме',action:'Aкција',method:'Mетода',encoding:'Encoding'},select:{title:'О�обине изборног поља',selectInfo:'Инфо',opAvail:'До�тупне опције',value:'Вредно�т',size:'Величина',lines:'линија',chkMulti:'Дозволи више�труку �елекцију',opText:'Тек�т',opValue:'Вредно�т',btnAdd:'Додај',btnModify:'Измени',btnUp:'Горе',btnDown:'Доле',btnSetValue:'Поде�и као означену вредно�т',btnDelete:'Обриши'},textarea:{title:'О�обине зоне тек�та',cols:'Број колона',rows:'Број редова'},textfield:{title:'О�обине тек�туалног поља',name:'�азив',value:'Вредно�т',charWidth:'Ширина (карактера)',maxChars:'Мак�имално карактера',type:'Тип',typeText:'Тек�т',typePass:'Лозинка'},hidden:{title:'О�обине �кривеног поља',name:'�азив',value:'Вредно�т'},image:{title:'О�обине �лика',titleButton:'О�обине дугмета �а �ликом',menu:'О�обине �лика',infoTab:'Инфо �лике',btnUpload:'Пошаљи на �ервер',upload:'Пошаљи',alt:'�лтернативни тек�т',lockRatio:'Закључај одно�',resetSize:'Ре�етуј величину',border:'Оквир',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Уне�ите УРЛ �лике',linkTab:'Линк',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'О�обине Флеша',propertiesTab:'Properties',title:'О�обине флеша',chkPlay:'�утомат�ки �тарт',chkLoop:'Понављај',chkMenu:'Укључи флеш мени',chkFull:'Allow Fullscreen',scale:'Скалирај',scaleAll:'Прикажи �ве',scaleNoBorder:'Без ивице',scaleFit:'Попуни површину',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs доле',alignAbsMiddle:'Abs �редина',alignBaseline:'Базно',alignTextTop:'Врх тек�та',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Боја позадине',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Уне�ите УРЛ линка',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Провери �пеловање',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'�ије у речнику',changeTo:'Измени',btnIgnore:'Игнориши',btnIgnoreAll:'Игнориши �ве',btnReplace:'Замени',btnReplaceAll:'Замени �ве',btnUndo:'Врати акцију',noSuggestions:'- Без �уге�тија -',progress:'Провера �пеловања у току...',noMispell:'Провера �пеловања завршена: грешке ни�у пронађене',noChanges:'Провера �пеловања завршена: �ије измењена ниједна реч',oneChange:'Провера �пеловања завршена: Измењена је једна реч',manyChanges:'Провера �пеловања завршена:  %1 реч(и) је измењено',ieSpellDownload:'Провера �пеловања није ин�талирана. Да ли желите да је �кинете �а Интернета?'},smiley:{toolbar:'Смајли',title:'Уне�и �мајлија',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'�абројиву ли�ту',bulletedlist:'�енабројива ли�та',indent:'Увећај леву маргину',outdent:'Смањи леву маргину',justify:{left:'Лево равнање',center:'Центриран тек�т',right:'Де�но равнање',block:'Обо�трано равнање'},blockquote:'Block Quote',clipboard:{title:'Залепи',cutError:'Сигурно�на подешавања Вашег претраживача не дозвољавају операције аутомат�ког и�ецања тек�та. Молимо Ва� да кори�тите пречицу �а та�татуре (Ctrl/Cmd+X).',copyError:'Сигурно�на подешавања Вашег претраживача не дозвољавају операције аутомат�ког копирања тек�та. Молимо Ва� да кори�тите пречицу �а та�татуре (Ctrl/Cmd+C).',pasteMsg:'Молимо Ва� да залепите унутар доње површине кори�тећи та�татурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да прити�нете <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Залепи из Worda',title:'Залепи из Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Залепи као чи�т тек�т',title:'Залепи као чи�т тек�т'},templates:{button:'Обра�ци',title:'Обра�ци за �адржај',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Молимо Ва� да одаберете образац који ће бити примењен на �траницу (тренутни �адржај ће бити обри�ан):',emptyListMsg:'(�ема дефини�аних образаца)'},showBlocks:'Show Blocks',stylesCombo:{label:'Стил',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Формат',panelTitle:'Формат',tag_p:'Normal',tag_pre:'Formatirano',tag_address:'Adresa',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Фонт',voiceLabel:'Font',panelTitle:'Фонт'},fontSize:{label:'Величина фонта',voiceLabel:'Font Size',panelTitle:'Величина фонта'},colorButton:{textColorTitle:'Боја тек�та',bgColorTitle:'Боја позадине',panelTitle:'Colors',auto:'�утомат�ки',more:'Више боја...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:'Без �уге�тија',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'О�обине документа',title:'О�обине документа',design:'Design',meta:'Метаподаци',chooseColor:'Choose',other:'<other>',docTitle:'�а�лов �транице',charset:'Кодирање �купа карактера',charsetOther:'О�тала кодирања �купа карактера',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Заглавље типа документа',docTypeOther:'О�тала заглавља типа документа',xhtmlDec:'Улључи XHTML декларације',bgColor:'Боја позадине',bgImage:'УРЛ позадин�ке �лике',bgFixed:'Фик�ирана позадина',txtColor:'Боја тек�та',margin:'Маргине �транице',marginTop:'Горња',marginLeft:'Лева',marginRight:'Де�на',marginBottom:'Доња',metaKeywords:'Кључне речи за индек�ирање документа (раздвојене зарезом)',metaDescription:'Опи� документа',metaAuthor:'�утор',metaCopyright:'�утор�ка права',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/sv.js b/web/imcms/ckeditor/lang/sv.js
new file mode 100644
index 0000000000..81d681151a
--- /dev/null
+++ b/web/imcms/ckeditor/lang/sv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sv={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Tryck ALT 0 för hjälp',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Källa',newPage:'Ny sida',save:'Spara',preview:'Förhandsgranska',cut:'Klipp ut',copy:'Kopiera',paste:'Klistra in',print:'Skriv ut',underline:'Understruken',bold:'Fet',italic:'Kursiv',selectAll:'Markera allt',removeFormat:'Radera formatering',strike:'Genomstruken',subscript:'Nedsänkta tecken',superscript:'Upphöjda tecken',horizontalrule:'Infoga horisontal linje',pagebreak:'Infoga sidbrytning',pagebreakAlt:'Sidbrytning',unlink:'Radera länk',undo:'Ångra',redo:'Gör om',common:{browseServer:'Bläddra på server',url:'URL',protocol:'Protokoll',upload:'Ladda upp',uploadSubmit:'Skicka till server',image:'Bild',flash:'Flash',form:'Formulär',checkbox:'Kryssruta',radio:'Alternativknapp',textField:'Textfält',textarea:'Textruta',hiddenField:'Dolt fält',button:'Knapp',select:'Flervalslista',imageButton:'Bildknapp',notSet:'<ej angivet>',id:'Id',name:'Namn',langDir:'Språkriktning',langDirLtr:'Vänster till Höger (VTH)',langDirRtl:'Höger till Vänster (HTV)',langCode:'Språkkod',longDescr:'URL-beskrivning',cssClass:'Stilmall',advisoryTitle:'Titel',cssStyle:'Stilmall',ok:'OK',cancel:'Avbryt',close:'Stäng',preview:'Förhandsgranska',generalTab:'Allmänt',advancedTab:'Avancerad',validateNumberFailed:'Värdet är inte ett nummer.',confirmNewPage:'Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?',confirmCancel:'Några av de alternativ har ändrats. Är du säker på att stänga dialogrutan?',options:'Alternativ',target:'Mål',targetNew:'Nytt fönster (_blank)',targetTop:'Översta fönstret (_top)',targetSelf:'Samma fönster (_self)',targetParent:'Föregående fönster (_parent)',langDirLTR:'Vänster till höger (LTR)',langDirRTL:'Höger till vänster (RTL)',styles:'Stil',cssClasses:'Stilmallar',width:'Bredd',height:'Höjd',align:'Justering',alignLeft:'Vänster',alignRight:'Höger',alignCenter:'Centrerad',alignTop:'Överkant',alignMiddle:'Mitten',alignBottom:'Nederkant',invalidValue:'Invalid value.',invalidHeight:'Höjd måste vara ett nummer.',invalidWidth:'Bredd måste vara ett nummer.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, Ej tillgänglig</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Klistra in utökat tecken',title:'Välj utökat tecken',options:'Special Character Options'},link:{toolbar:'Infoga/Redigera länk',other:'<annan>',menu:'Redigera länk',title:'Länk',info:'Länkinformation',target:'Mål',upload:'Ladda upp',advanced:'Avancerad',type:'Länktyp',toUrl:'URL',toAnchor:'Ankare i sidan',toEmail:'E-post',targetFrame:'<ram>',targetPopup:'<popup-fönster>',targetFrameName:'Målets ramnamn',targetPopupName:'Popup-fönstrets namn',popupFeatures:'Popup-fönstrets egenskaper',popupResizable:'Resizable',popupStatusBar:'Statusfält',popupLocationBar:'Adressfält',popupToolbar:'Verktygsfält',popupMenuBar:'Menyfält',popupFullScreen:'Helskärm (endast IE)',popupScrollBars:'Scrolllista',popupDependent:'Beroende (endast Netscape)',popupLeft:'Position från vänster',popupTop:'Position från sidans topp',id:'Id',langDir:'Språkriktning',langDirLTR:'Vänster till höger (VTH)',langDirRTL:'Höger till vänster (HTV)',acccessKey:'Behörighetsnyckel',name:'Namn',langCode:'Språkriktning',tabIndex:'Tabindex',advisoryTitle:'Titel',advisoryContentType:'Innehållstyp',cssClasses:'Stylesheet class',charset:'Teckenuppställning',styles:'Stilmall',rel:'Relationship',selectAnchor:'Välj ett ankare',anchorName:'efter ankarnamn',anchorId:'efter objektid',emailAddress:'E-postadress',emailSubject:'Ämne',emailBody:'Innehåll',noAnchors:'(Inga ankare kunde hittas)',noUrl:'Var god ange länkens URL',noEmail:'Var god ange E-postadress'},anchor:{toolbar:'Infoga/Redigera ankarlänk',menu:'Egenskaper för ankarlänk',title:'Egenskaper för ankarlänk',name:'Ankarnamn',errorName:'Var god ange ett ankarnamn',remove:'Remove Anchor'},list:{numberedTitle:'Egenskaper för punktlista',bulletedTitle:'Egenskaper för punktlista',type:'Typ',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Cirkel',disc:'Disk',square:'Fyrkant',none:'Ingen',notset:'<ej angiven>',armenian:'Armenisk numrering',georgian:'Georgisk numrering (an, ban, gan, etc.)',lowerRoman:'Romerska gemener (i, ii, iii, iv, v, etc.)',upperRoman:'Romerska versaler (I, II, III, IV, V, etc.)',lowerAlpha:'Alpha gemener (a, b, c, d, e, etc.)',upperAlpha:'Alpha versaler (A, B, C, D, E, etc.)',lowerGreek:'Grekiska gemener (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal nolla (01, 02, 03, etc.)'},findAndReplace:{title:'Sök och ersätt',find:'Sök',replace:'Ersätt',findWhat:'Sök efter:',replaceWith:'Ersätt med:',notFoundMsg:'Angiven text kunde ej hittas.',findOptions:'Find Options',matchCase:'Skiftläge',matchWord:'Inkludera hela ord',matchCyclic:'Matcha cykliska',replaceAll:'Ersätt alla',replaceSuccessMsg:'%1 förekomst(er) ersatta.'},table:{toolbar:'Tabell',title:'Tabellegenskaper',menu:'Tabellegenskaper',deleteTable:'Radera tabell',rows:'Rader',columns:'Kolumner',border:'Kantstorlek',widthPx:'pixlar',widthPc:'procent',widthUnit:'enhet bredd',cellSpace:'Cellavstånd',cellPad:'Cellutfyllnad',caption:'Rubrik',summary:'Sammanfattning',headers:'Ruberiker',headersNone:'Ingen',headersColumn:'Första kolumnen',headersRow:'Första raden',headersBoth:'Båda',invalidRows:'Antal rader måste vara större än 0.',invalidCols:'Antal kolumner måste vara ett nummer större än 0.',invalidBorder:'Ram måste vara ett nummer.',invalidWidth:'Tabell måste vara ett nummer.',invalidHeight:'Tabellens höjd måste vara ett nummer.',invalidCellSpacing:'Luft i cell måste vara ett nummer.',invalidCellPadding:'Luft i cell måste vara ett nummer.',cell:{menu:'Cell',insertBefore:'Lägg till cell före',insertAfter:'Lägg till cell efter',deleteCell:'Radera celler',merge:'Sammanfoga celler',mergeRight:'Sammanfoga höger',mergeDown:'Sammanfoga ner',splitHorizontal:'Dela cell horisontellt',splitVertical:'Dela cell vertikalt',title:'Egenskaper för cell',cellType:'Celltyp',rowSpan:'Rad spann',colSpan:'Kolumnen spann',wordWrap:'Radbrytning',hAlign:'Horisontell justering',vAlign:'Vertikal justering',alignBaseline:'Baslinje',bgColor:'Bakgrundsfärg',borderColor:'Ramfärg',data:'Data',header:'Rubrik',yes:'Ja',no:'Nej',invalidWidth:'Cellens bredd måste vara ett nummer.',invalidHeight:'Cellens höjd måste vara ett nummer.',invalidRowSpan:'Radutvidgning måste vara ett heltal.',invalidColSpan:'Kolumn måste vara ett heltal.',chooseColor:'Välj'},row:{menu:'Rad',insertBefore:'Lägg till Rad Före',insertAfter:'Lägg till rad efter',deleteRow:'Radera rad'},column:{menu:'Kolumn',insertBefore:'Lägg till kolumn före',insertAfter:'Lägg till kolumn efter',deleteColumn:'Radera kolumn'}},button:{title:'Egenskaper för knapp',text:'Text (värde)',type:'Typ',typeBtn:'Knapp',typeSbm:'Skicka',typeRst:'Återställ'},checkboxAndRadio:{checkboxTitle:'Egenskaper för kryssruta',radioTitle:'Egenskaper för alternativknapp',value:'Värde',selected:'Vald'},form:{title:'Egenskaper för formulär',menu:'Egenskaper för formulär',action:'Funktion',method:'Metod',encoding:'Kodning'},select:{title:'Egenskaper för flervalslista',selectInfo:'Information',opAvail:'Befintliga val',value:'Värde',size:'Storlek',lines:'Linjer',chkMulti:'Tillåt flerval',opText:'Text',opValue:'Värde',btnAdd:'Lägg till',btnModify:'Redigera',btnUp:'Upp',btnDown:'Ner',btnSetValue:'Markera som valt värde',btnDelete:'Radera'},textarea:{title:'Egenskaper för textruta',cols:'Kolumner',rows:'Rader'},textfield:{title:'Egenskaper för textfält',name:'Namn',value:'Värde',charWidth:'Teckenbredd',maxChars:'Max antal tecken',type:'Typ',typeText:'Text',typePass:'Lösenord'},hidden:{title:'Egenskaper för dolt fält',name:'Namn',value:'Värde'},image:{title:'Bildegenskaper',titleButton:'Egenskaper för bildknapp',menu:'Bildegenskaper',infoTab:'Bildinformation',btnUpload:'Skicka till server',upload:'Ladda upp',alt:'Alternativ text',lockRatio:'Lås höjd/bredd förhållanden',resetSize:'Återställ storlek',border:'Kant',hSpace:'Horis. marginal',vSpace:'Vert. marginal',alertUrl:'Var god och ange bildens URL',linkTab:'Länk',button2Img:'Vill du omvandla den valda bildknappen på en enkel bild?',img2Button:'Vill du omvandla den valda bildknappen på en enkel bild?',urlMissing:'Bildkällans URL saknas.',validateBorder:'Kantlinje måste vara ett heltal.',validateHSpace:'HSpace måste vara ett heltal.',validateVSpace:'VSpace måste vara ett heltal.'},flash:{properties:'Flashegenskaper',propertiesTab:'Egenskaper',title:'Flashegenskaper',chkPlay:'Automatisk uppspelning',chkLoop:'Upprepa/Loopa',chkMenu:'Aktivera Flashmeny',chkFull:'Tillåt helskärm',scale:'Skala',scaleAll:'Visa allt',scaleNoBorder:'Ingen ram',scaleFit:'Exakt passning',access:'Script-tillgång',accessAlways:'Alltid',accessSameDomain:'Samma domän',accessNever:'Aldrig',alignAbsBottom:'Absolut nederkant',alignAbsMiddle:'Absolut centrering',alignBaseline:'Baslinje',alignTextTop:'Text överkant',quality:'Kvalitet',qualityBest:'Bäst',qualityHigh:'Hög',qualityAutoHigh:'Auto Hög',qualityMedium:'Medium',qualityAutoLow:'Auto Låg',qualityLow:'Låg',windowModeWindow:'Fönster',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Fönsterläge',flashvars:'Variabler för Flash',bgcolor:'Bakgrundsfärg',hSpace:'Horis. marginal',vSpace:'Vert. marginal',validateSrc:'Var god ange länkens URL',validateHSpace:'HSpace måste vara ett nummer.',validateVSpace:'VSpace måste vara ett nummer.'},spellCheck:{toolbar:'Stavningskontroll',title:'Kontrollera stavning',notAvailable:'Tyvärr är tjänsten ej tillgänglig nu',errorLoading:'Tjänsten är ej tillgänglig: %s.',notInDic:'Saknas i ordlistan',changeTo:'Ändra till',btnIgnore:'Ignorera',btnIgnoreAll:'Ignorera alla',btnReplace:'Ersätt',btnReplaceAll:'Ersätt alla',btnUndo:'Ångra',noSuggestions:'- Förslag saknas -',progress:'Stavningskontroll pågår...',noMispell:'Stavningskontroll slutförd: Inga stavfel påträffades.',noChanges:'Stavningskontroll slutförd: Inga ord rättades.',oneChange:'Stavningskontroll slutförd: Ett ord rättades.',manyChanges:'Stavningskontroll slutförd: %1 ord rättades.',ieSpellDownload:'Stavningskontrollen är ej installerad. Vill du göra det nu?'},smiley:{toolbar:'Smiley',title:'Infoga smiley',options:'Smileyinställningar'},elementsPath:{eleLabel:'Elementets sökväg',eleTitle:'%1 element'},numberedlist:'Numrerad lista',bulletedlist:'Punktlista',indent:'Öka indrag',outdent:'Minska indrag',justify:{left:'Vänsterjustera',center:'Centrera',right:'Högerjustera',block:'Justera till marginaler'},blockquote:'Blockcitat',clipboard:{title:'Klistra in',cutError:'Säkerhetsinställningar i Er webläsare tillåter inte åtgården Klipp ut. Använd (Ctrl/Cmd+X) istället.',copyError:'Säkerhetsinställningar i Er webläsare tillåter inte åtgården Kopiera. Använd (Ctrl/Cmd+C) istället',pasteMsg:'Var god och klistra in Er text i rutan nedan genom att använda (<STRONG>Ctrl/Cmd+V</STRONG>) klicka sen på <STRONG>OK</STRONG>.',securityMsg:'På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa innan du klistrar?',toolbar:'Klistra in från Word',title:'Klistra in från Word',error:'Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel'},pasteText:{button:'Klistra in som vanlig text',title:'Klistra in som vanlig text'},templates:{button:'Sidmallar',title:'Sidmallar',options:'Inställningar för mall',insertOption:'Ersätt aktuellt innehåll',selectPromptMsg:'Var god välj en mall att använda med editorn<br>(allt nuvarande innehåll raderas):',emptyListMsg:'(Ingen mall är vald)'},showBlocks:'Visa block',stylesCombo:{label:'Anpassad stil',panelTitle:'Formatmallar',panelTitle1:'Blockstil',panelTitle2:'Inbäddad stil',panelTitle3:'Objektets stil'},format:{label:'Teckenformat',panelTitle:'Teckenformat',tag_p:'Normal',tag_pre:'Formaterad',tag_address:'Adress',tag_h1:'Rubrik 1',tag_h2:'Rubrik 2',tag_h3:'Rubrik 3',tag_h4:'Rubrik 4',tag_h5:'Rubrik 5',tag_h6:'Rubrik 6',tag_div:'Normal (DIV)'},div:{title:'Skapa Div container',toolbar:'Skapa Div container',cssClassInputLabel:'Stilmallar',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Språkkod',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Rådgivande titel',langDirLabel:'Språkriktning',langDirLTRLabel:'Vänster till Höger (LTR)',langDirRTLLabel:'Höger till vänster (RTL)',edit:'Redigera Div',remove:'Ta bort Div'},iframe:{title:'iFrame Egenskaper',toolbar:'iFrame',noUrl:'Skriv in URL för iFrame',scrolling:'Aktivera rullningslister',border:'Visa ramkant'},font:{label:'Typsnitt',voiceLabel:'Typsnitt',panelTitle:'Typsnitt'},fontSize:{label:'Storlek',voiceLabel:'Teckenstorlek',panelTitle:'Storlek'},colorButton:{textColorTitle:'Textfärg',bgColorTitle:'Bakgrundsfärg',panelTitle:'Färger',auto:'Automatisk',more:'Fler färger...'},colors:{'000':'Svart',800000:'Rödbrun','8B4513':'Mörkbrun','2F4F4F':'Skiffergrå','008080':'Kricka','000080':'Marinblå','4B0082':'Indigo',696969:'Mörkgrå',B22222:'Tegelsten',A52A2A:'Brun',DAA520:'Mörk guld','006400':'Mörkgrön','40E0D0':'Turkos','0000CD':'Medium blå',800080:'Lila',808080:'Grå',F00:'Röd',FF8C00:'Mörkorange',FFD700:'Guld','008000':'Grön','0FF':'Turkos','00F':'Blå',EE82EE:'Violett',A9A9A9:'Matt grå',FFA07A:'Laxrosa',FFA500:'Orange',FFFF00:'Gul','00FF00':'Lime',AFEEEE:'Ljusturkos',ADD8E6:'Ljusblå',DDA0DD:'Plommon',D3D3D3:'Ljusgrå',FFF0F5:'Ljus lavender',FAEBD7:'Antikvit',FFFFE0:'Ljusgul',F0FFF0:'Honung',F0FFFF:'Azurblå',F0F8FF:'Aliceblå',E6E6FA:'Lavender',FFF:'Vit'},scayt:{title:'Stavningskontroll medan du skriver',opera_title:'Stöds ej av Opera',enable:'Aktivera SCAYT',disable:'Inaktivera SCAYT',about:'Om SCAYT',toggle:'Växla SCAYT',options:'Inställningar',langs:'Språk',moreSuggestions:'Fler förslag',ignore:'Ignorera',ignoreAll:'Ignorera alla',addWord:'Lägg till ord',emptyDic:'Ordlistans namn får ej vara tomt.',noSuggestions:'Förslag saknas',optionsTab:'Inställningar',allCaps:'Ignorera alla ord med enbart versaler',ignoreDomainNames:'Ignorera domännamn',mixedCase:'Ignorera ord med blandat shiftläge',mixedWithDigits:'Ignorera ord med nummer',languagesTab:'Språk',dictionariesTab:'Ordlistor',dic_field_name:'Ordlistans namn',dic_create:'Skapa',dic_restore:'Återställ',dic_delete:'Ta bort',dic_rename:'Byt namn',dic_info:'Inledningsvis lagras ordlistan i en cookie. När ordlista växer till en punkt där det inte kan lagras i en cookie, lagras den på vår server. För att lagra din personliga ordlista på vår server du ska ange ett namn för din ordbok. Om du redan har en lagrad ordbok, skriv namnet och klicka på knappen Återställ.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'För information av licenciering besök vår hemsida:',copy:'Copyright &copy; $1. Alla rättigheter reserverade.'},maximize:'Maximera',minimize:'Minimera',fakeobjects:{anchor:'Ankare',flash:'Flashanimation',iframe:'iFrame',hiddenfield:'Gömt fält',unknown:'Okänt objekt'},resize:'Dra för att ändra storlek',colordialog:{title:'Välj färg',options:'Färgalternativ',highlight:'Markera',selected:'Vald färg',clear:'Rensa'},toolbarCollapse:'Dölj verktygsfält',toolbarExpand:'Visa verktygsfält',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text riktning från vänster till höger',rtl:'Text riktning från höger till vänster'},docprops:{label:'Dokumentegenskaper',title:'Dokumentegenskaper',design:'Design',meta:'Metadata',chooseColor:'Välj',other:'<annan>',docTitle:'Sidtitel',charset:'Teckenuppsättningar',charsetOther:'Övriga teckenuppsättningar',charsetASCII:'ASCII',charsetCE:'Central Europa',charsetCT:'Traditionell Kinesisk (Big5)',charsetCR:'Kyrillisk',charsetGR:'Grekiska',charsetJP:'Japanska',charsetKR:'Koreanska',charsetTR:'Turkiska',charsetUN:'Unicode (UTF-8)',charsetWE:'Väst Europa',docType:'Sidhuvud',docTypeOther:'Övriga sidhuvuden',xhtmlDec:'Inkludera XHTML deklaration',bgColor:'Bakgrundsfärg',bgImage:'Bakgrundsbildens URL',bgFixed:'Fast bakgrund',txtColor:'Textfärg',margin:'Sidmarginal',marginTop:'Topp',marginLeft:'Vänster',marginRight:'Höger',marginBottom:'Botten',metaKeywords:'Sidans nyckelord',metaDescription:'Sidans beskrivning',metaAuthor:'Författare',metaCopyright:'Upphovsrätt',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/th.js b/web/imcms/ckeditor/lang/th.js
new file mode 100644
index 0000000000..c4e43c1385
--- /dev/null
+++ b/web/imcms/ckeditor/lang/th.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.th={dir:'ltr',editorTitle:'Rich text editor, %1',editorHelp:'Press ALT 0 for help',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'ดูรหัส HTML',newPage:'สร้างหน้าเอ�สารใหม่',save:'บันทึ�',preview:'ดูหน้าเอ�สารตัวอย่าง',cut:'ตัด',copy:'สำเนา',paste:'วาง',print:'สั่งพิมพ์',underline:'ตัวขีดเส้นใต้',bold:'ตัวหนา',italic:'ตัวเอียง',selectAll:'เลือ�ทั้งหมด',removeFormat:'ล้างรูป�บบ',strike:'ตัวขีดเส้นทับ',subscript:'ตัวห้อย',superscript:'ตัวย�',horizontalrule:'�ทร�เส้นคั่นบรรทัด',pagebreak:'�ทร�ตัว�บ่งหน้า Page Break',pagebreakAlt:'Page Break',unlink:'ลบ ลิงค์',undo:'ย�เลิ�คำสั่ง',redo:'ทำซ้ำคำสั่ง',common:{browseServer:'เปิดหน้าต่างจัด�ารไฟล์อัพโหลด',url:'ที่อยู่อ้างอิง URL',protocol:'โปรโตคอล',upload:'อัพโหลดไฟล์',uploadSubmit:'อัพโหลดไฟล์ไปเ�็บไว้ที่เครื่อง�ม่ข่าย (เซิร์ฟเวอร์)',image:'รูปภาพ',flash:'ไฟล์ Flash',form:'�บบฟอร์ม',checkbox:'เช็คบ๊อ�',radio:'เรดิโอบัตตอน',textField:'เท็�ซ์ฟิลด์',textarea:'เท็�ซ์�อเรีย',hiddenField:'ฮิดเดนฟิลด์',button:'ปุ่ม',select:'�ถบตัวเลือ�',imageButton:'ปุ่ม�บบรูปภาพ',notSet:'<ไม่ระบุ>',id:'ไอดี',name:'ชื่อ',langDir:'�ารเขียน-อ่านภาษา',langDirLtr:'จา�ซ้ายไปขวา (LTR)',langDirRtl:'จา�ขวามาซ้าย (RTL)',langCode:'รหัสภาษา',longDescr:'คำอธิบายประ�อบ URL',cssClass:'คลาสของไฟล์�ำหนดลั�ษณะ�าร�สดงผล',advisoryTitle:'คำเ�ริ่นนำ',cssStyle:'ลั�ษณะ�าร�สดงผล',ok:'ต�ลง',cancel:'ย�เลิ�',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'ขั้นสูง',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'ความ�ว้าง',height:'ความสูง',align:'�ารจัดวาง',alignLeft:'ชิดซ้าย',alignRight:'ชิดขวา',alignCenter:'�ึ่ง�ลาง',alignTop:'บนสุด',alignMiddle:'�ึ่ง�ลาง�นวตั้ง',alignBottom:'ชิดด้านล่าง',invalidValue:'Invalid value.',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'�ทร�ตัวอั�ษรพิเศษ',title:'�ทร�ตัวอั�ษรพิเศษ',options:'Special Character Options'},link:{toolbar:'�ทร�/��้ไข ลิงค์',other:'<อื่น ๆ>',menu:'��้ไข ลิงค์',title:'ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ',info:'รายละเอียด',target:'�ารเปิดหน้าลิงค์',upload:'อัพโหลดไฟล์',advanced:'ขั้นสูง',type:'ประเภทของลิงค์',toUrl:'URL',toAnchor:'จุดเชื่อมโยง (Anchor)',toEmail:'ส่งอีเมล์ (E-Mail)',targetFrame:'<เปิดในเฟรม>',targetPopup:'<เปิดหน้าจอเล็� (Pop-up)>',targetFrameName:'ชื่อทาร์เ�็ตเฟรม',targetPopupName:'ระบุชื่อหน้าจอเล็� (Pop-up)',popupFeatures:'คุณสมบัติของหน้าจอเล็� (Pop-up)',popupResizable:'Resizable',popupStatusBar:'�สดง�ถบสถานะ',popupLocationBar:'�สดงที่อยู่ของไฟล์',popupToolbar:'�สดง�ถบเครื่องมือ',popupMenuBar:'�สดง�ถบเมนู',popupFullScreen:'�สดงเต็มหน้าจอ (IE5.5++ เท่านั้น)',popupScrollBars:'�สดง�ถบเลื่อน',popupDependent:'�สดงเต็มหน้าจอ (Netscape)',popupLeft:'พิ�ัดซ้าย (Left Position)',popupTop:'พิ�ัดบน (Top Position)',id:'Id',langDir:'�ารเขียน-อ่านภาษา',langDirLTR:'จา�ซ้ายไปขวา (LTR)',langDirRTL:'จา�ขวามาซ้าย (RTL)',acccessKey:'�อคเซส คีย์',name:'ชื่อ',langCode:'�ารเขียน-อ่านภาษา',tabIndex:'ลำดับของ �ท็บ',advisoryTitle:'คำเ�ริ่นนำ',advisoryContentType:'ชนิดของคำเ�ริ่นนำ',cssClasses:'คลาสของไฟล์�ำหนดลั�ษณะ�าร�สดงผล',charset:'ลิงค์เชื่อมโยงไปยังชุดตัวอั�ษร',styles:'ลั�ษณะ�าร�สดงผล',rel:'Relationship',selectAnchor:'ระบุข้อมูลของจุดเชื่อมโยง (Anchor)',anchorName:'ชื่อ',anchorId:'ไอดี',emailAddress:'อีเมล์ (E-Mail)',emailSubject:'หัวเรื่อง',emailBody:'ข้อความ',noAnchors:'(ยังไม่มีจุดเชื่อมโยงภายในหน้าเอ�สารนี้)',noUrl:'�รุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)',noEmail:'�รุณาระบุอีเมล์ (E-mail)'},anchor:{toolbar:'�ทร�/��้ไข Anchor',menu:'รายละเอียด Anchor',title:'รายละเอียด Anchor',name:'ชื่อ Anchor',errorName:'�รุณาระบุชื่อของ Anchor',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'ค้นหา',replace:'ค้นหา�ละ�ทนที่',findWhat:'ค้นหาคำว่า:',replaceWith:'�ทนที่ด้วย:',notFoundMsg:'ไม่พบคำที่ค้นหา.',findOptions:'Find Options',matchCase:'ตัวโห�่-เล็� ต้องตรง�ัน',matchWord:'ต้องตรง�ันทุ�คำ',matchCyclic:'Match cyclic',replaceAll:'�ทนที่ทั้งหมดที่พบ',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'ตาราง',title:'คุณสมบัติของ ตาราง',menu:'คุณสมบัติของ ตาราง',deleteTable:'ลบตาราง',rows:'�ถว',columns:'สดมน์',border:'ขนาดเส้นขอบ',widthPx:'จุดสี',widthPc:'เปอร์เซ็น',widthUnit:'width unit',cellSpace:'ระยะ�นวนอนน',cellPad:'ระยะ�นวตั้ง',caption:'หัวเรื่องของตาราง',summary:'สรุปความ',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'ช่องตาราง',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'ลบช่อง',merge:'ผสานช่อง',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'�ถว',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'ลบ�ถว'},column:{menu:'คอลัมน์',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'ลบสดมน์'}},button:{title:'รายละเอียดของ ปุ่ม',text:'ข้อความ (ค่าตัว�ปร)',type:'ข้อความ',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'คุณสมบัติของ เช็คบ๊อ�',radioTitle:'คุณสมบัติของ เรดิโอบัตตอน',value:'ค่าตัว�ปร',selected:'เลือ�เป็นค่าเริ่มต้น'},form:{title:'คุณสมบัติของ �บบฟอร์ม',menu:'คุณสมบัติของ �บบฟอร์ม',action:'�อคชั่น',method:'เมธอด',encoding:'Encoding'},select:{title:'คุณสมบัติของ �ถบตัวเลือ�',selectInfo:'อินโฟ',opAvail:'ราย�ารตัวเลือ�',value:'ค่าตัว�ปร',size:'ขนาด',lines:'บรรทัด',chkMulti:'เลือ�หลายค่าได้',opText:'ข้อความ',opValue:'ค่าตัว�ปร',btnAdd:'เพิ่ม',btnModify:'��้ไข',btnUp:'บน',btnDown:'ล่าง',btnSetValue:'เลือ�เป็นค่าเริ่มต้น',btnDelete:'ลบ'},textarea:{title:'คุณสมบัติของ เท็��อเรีย',cols:'สดมภ์',rows:'�ถว'},textfield:{title:'คุณสมบัติของ เท็�ซ์ฟิลด์',name:'ชื่อ',value:'ค่าตัว�ปร',charWidth:'ความ�ว้าง',maxChars:'จำนวนตัวอั�ษรสูงสุด',type:'ชนิด',typeText:'ข้อความ',typePass:'รหัสผ่าน'},hidden:{title:'คุณสมบัติของ ฮิดเดนฟิลด์',name:'ชื่อ',value:'ค่าตัว�ปร'},image:{title:'คุณสมบัติของ รูปภาพ',titleButton:'คุณสมบัติของ ปุ่ม�บบรูปภาพ',menu:'คุณสมบัติของ รูปภาพ',infoTab:'ข้อมูลของรูปภาพ',btnUpload:'อัพโหลดไฟล์ไปเ�็บไว้ที่เครื่อง�ม่ข่าย (เซิร์ฟเวอร์)',upload:'อัพโหลดไฟล์',alt:'คำประ�อบรูปภาพ',lockRatio:'�ำหนดอัตราส่วน �ว้าง-สูง �บบคงที่',resetSize:'�ำหนดรูปเท่าขนาดจริง',border:'ขนาดขอบรูป',hSpace:'ระยะ�นวนอน',vSpace:'ระยะ�นวตั้ง',alertUrl:'�รุณาระบุที่อยู่อ้างอิงออนไลน์ของไฟล์รูปภาพ (URL)',linkTab:'ลิ้งค์',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'คุณสมบัติของไฟล์ Flash',propertiesTab:'Properties',title:'คุณสมบัติของไฟล์ Flash',chkPlay:'เล่นอัตโนมัติ Auto Play',chkLoop:'เล่นวนรอบ Loop',chkMenu:'ให้ใช้งานเมนูของ Flash',chkFull:'Allow Fullscreen',scale:'อัตราส่วน Scale',scaleAll:'�สดงให้เห็นทั้งหมด Show all',scaleNoBorder:'ไม่�สดงเส้นขอบ No Border',scaleFit:'�สดงให้พอดี�ับพื้นที่ Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'ชิดด้านล่างสุด',alignAbsMiddle:'�ึ่ง�ลาง',alignBaseline:'ชิดบรรทัด',alignTextTop:'ใต้ตัวอั�ษร',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'สีพื้นหลัง',hSpace:'ระยะ�นวนอน',vSpace:'ระยะ�นวตั้ง',validateSrc:'�รุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'ตรวจ�ารสะ�ดคำ',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'ไม่พบในดิ�ชันนารี',changeTo:'��้ไขเป็น',btnIgnore:'ย�เว้น',btnIgnoreAll:'ย�เว้นทั้งหมด',btnReplace:'�ทนที่',btnReplaceAll:'�ทนที่ทั้งหมด',btnUndo:'ย�เลิ�',noSuggestions:'- ไม่มีคำ�นะนำใดๆ -',progress:'�ำลังตรวจสอบคำสะ�ด...',noMispell:'ตรวจสอบคำสะ�ดเสร็จสิ้น: ไม่พบคำสะ�ดผิด',noChanges:'ตรวจสอบคำสะ�ดเสร็จสิ้น: ไม่มี�าร��้คำใดๆ',oneChange:'ตรวจสอบคำสะ�ดเสร็จสิ้น: ��้ไข1คำ',manyChanges:'ตรวจสอบคำสะ�ดเสร็จสิ้น:: ��้ไข %1 คำ',ieSpellDownload:'ไม่ได้ติดตั้งระบบตรวจสอบคำสะ�ด. ต้อง�ารติดตั้งไหมครับ?'},smiley:{toolbar:'รูปสื่ออารมณ์',title:'�ทร�สั�ลั�ษณ์สื่ออารมณ์',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'ลำดับราย�าร�บบตัวเลข',bulletedlist:'ลำดับราย�าร�บบสั�ลั�ษณ์',indent:'เพิ่มระยะย่อหน้า',outdent:'ลดระยะย่อหน้า',justify:{left:'จัดชิดซ้าย',center:'จัด�ึ่ง�ลาง',right:'จัดชิดขวา',block:'จัดพอดีหน้า�ระดาษ'},blockquote:'Block Quote',clipboard:{title:'วาง',cutError:'ไม่สามารถตัดข้อความที่เลือ�ไว้ได้เนื่องจา��าร�ำหนดค่าระดับความปลอดภัย. �รุณาใช้ปุ่มลัดเพื่อวางข้อความ�ทน (�ดปุ่ม Ctrl/Cmd �ละตัว X พร้อม�ัน).',copyError:'ไม่สามารถสำเนาข้อความที่เลือ�ไว้ได้เนื่องจา��าร�ำหนดค่าระดับความปลอดภัย. �รุณาใช้ปุ่มลัดเพื่อวางข้อความ�ทน (�ดปุ่ม Ctrl/Cmd �ละตัว C พร้อม�ัน).',pasteMsg:'�รุณาใช้คีย์บอร์ดเท่านั้น โดย�ดปุ๋ม (<strong>Ctrl/Cmd �ละ V</strong>)พร้อมๆ�ัน �ละ�ด <strong>OK</strong>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'วางสำเนาจา�ตัวอั�ษรเวิร์ด',title:'วางสำเนาจา�ตัวอั�ษรเวิร์ด',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'วาง�บบตัวอั�ษรธรรมดา',title:'วาง�บบตัวอั�ษรธรรมดา'},templates:{button:'เทมเพลต',title:'เทมเพลตของส่วนเนื้อหาเว็บไซต์',options:'Template Options',insertOption:'�ทนที่เนื้อหาเว็บไซต์ที่เลือ�',selectPromptMsg:'�รุณาเลือ� เทมเพลต เพื่อนำไป��้ไขในอีดิตเตอร์<br />(เนื้อหาส่วนนี้จะหายไป):',emptyListMsg:'(ยังไม่มี�าร�ำหนดเทมเพลต)'},showBlocks:'Show Blocks',stylesCombo:{label:'ลั�ษณะ',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'รูป�บบ',panelTitle:'รูป�บบ',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Paragraph (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'�บบอั�ษร',voiceLabel:'Font',panelTitle:'�บบอั�ษร'},fontSize:{label:'ขนาด',voiceLabel:'Font Size',panelTitle:'ขนาด'},colorButton:{textColorTitle:'สีตัวอั�ษร',bgColorTitle:'สีพื้นหลัง',panelTitle:'Colors',auto:'สีอัตโนมัติ',more:'เลือ�สีอื่นๆ...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',noSuggestions:' ไม่มีคำ�นะนำใดๆ ',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'คุณสมบัติของเอ�สาร',title:'คุณสมบัติของเอ�สาร',design:'Design',meta:'ข้อมูลสำหรับเสิร์ชเอนจิ้น',chooseColor:'Choose',other:'<อื่น ๆ>',docTitle:'ชื่อไตเติ้ล',charset:'ชุดตัวอั�ษร',charsetOther:'ชุดตัวอั�ษรอื่นๆ',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'ประเภทของเอ�สาร',docTypeOther:'ประเภทเอ�สารอื่นๆ',xhtmlDec:'รวมเอา  XHTML Declarations ไว้ด้วย',bgColor:'สีพื้นหลัง',bgImage:'ที่อยู่อ้างอิงออนไลน์ของรูปพื้นหลัง (Image URL)',bgFixed:'พื้นหลัง�บบไม่มี�ถบเลื่อน',txtColor:'สีตัวอั�ษร',margin:'ระยะขอบของหน้าเอ�สาร',marginTop:'ด้านบน',marginLeft:'ด้านซ้าย',marginRight:'ด้านขวา',marginBottom:'ด้านล่าง',metaKeywords:'คำสำคั�อธิบายเอ�สาร (คั่นคำด้วย คอมม่า)',metaDescription:'ประโยคอธิบายเ�ี่ยว�ับเอ�สาร',metaAuthor:'ผู้สร้างเอ�สาร',metaCopyright:'สงวนลิขสิทธิ์',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/tr.js b/web/imcms/ckeditor/lang/tr.js
new file mode 100644
index 0000000000..c405fad8a0
--- /dev/null
+++ b/web/imcms/ckeditor/lang/tr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.tr={dir:'ltr',editorTitle:'Zengin metin editörü, %1',editorHelp:'Yardım için ALT 0 tuşuna basın',toolbars:'Araç çubukları Editörü',editor:'Zengin Metin Editörü',source:'Kaynak',newPage:'Yeni Sayfa',save:'Kaydet',preview:'Ön İzleme',cut:'Kes',copy:'Kopyala',paste:'Yapıştır',print:'Yazdır',underline:'Altı Çizgili',bold:'Kalın',italic:'İtalik',selectAll:'Tümünü Seç',removeFormat:'Biçimi Kaldır',strike:'Üstü Çizgili',subscript:'Alt Simge',superscript:'Üst Simge',horizontalrule:'Yatay Satır Ekle',pagebreak:'Sayfa Sonu Ekle',pagebreakAlt:'Sayfa Sonu',unlink:'Köprü Kaldır',undo:'Geri Al',redo:'Tekrarla',common:{browseServer:'Sunucuyu Gez',url:'URL',protocol:'Protokol',upload:'Karşıya Yükle',uploadSubmit:'Sunucuya Yolla',image:'Resim',flash:'Flash',form:'Form',checkbox:'Onay Kutusu',radio:'Seçenek Düğmesi',textField:'Metin Girişi',textarea:'Çok Satırlı Metin',hiddenField:'Gizli Veri',button:'Düğme',select:'Seçim Menüsü',imageButton:'Resimli Düğme',notSet:'<tanımlanmamış>',id:'Kimlik',name:'Ad',langDir:'Dil Yönü',langDirLtr:'Soldan Sağa (LTR)',langDirRtl:'Sağdan Sola (RTL)',langCode:'Dil Kodlaması',longDescr:'Uzun Tanımlı URL',cssClass:'Biçem Sayfası Sınıfları',advisoryTitle:'Danışma Başlığı',cssStyle:'Biçem',ok:'Tamam',cancel:'İptal',close:'Kapat',preview:'Ön gösterim',generalTab:'Genel',advancedTab:'Gelişmiş',validateNumberFailed:'Bu değer sayı değildir.',confirmNewPage:'İceriğiniz kayıt edilmediğinden dolayı kaybolacaktır. Yeni bir sayfa yüklemek istediğinize eminsiniz?',confirmCancel:'Bazı seçenekler değişmiştir. Dialog penceresini kapatmak istediğinize eminmisiniz?',options:'Seçenekler',target:'Hedef',targetNew:'Yeni Pencere (_blank)',targetTop:'Enüst Pencere (_top)',targetSelf:'Aynı Pencere (_self)',targetParent:'Ana Pencere (_parent)',langDirLTR:'Soldan Sağa (LTR)',langDirRTL:'Sağdan Sola (RTL)',styles:'Stil',cssClasses:'Stil sayfası Sınıfı',width:'Genişlik',height:'Yükseklik',align:'Hizalama',alignLeft:'Sol',alignRight:'Sağ',alignCenter:'Merkez',alignTop:'Tepe',alignMiddle:'Orta',alignBottom:'Alt',invalidValue:'Invalid value.',invalidHeight:'Yükseklik sayı olmalıdır.',invalidWidth:'Genişlik bir sayı olmalıdır.',invalidCssLength:'Belirttiğiniz sayı "%1" alanı için pozitif bir sayı CSS birim değeri olmalıdır (px, %, in, cm, mm, em, ex, pt, veya pc).',invalidHtmlLength:'Belirttiğiniz sayı "%1" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).',invalidInlineStyle:'Noktalı virgülle ayrılmış: "değer adı," inline stil için belirtilen değer biçiminde bir veya daha fazla dizilerden oluşmalıdır.',cssLengthTooltip:'Pikseller için bir numara girin veya geçerli bir CSS numarası (px, %, in, cm, mm, em, ex, pt, veya pc).',unavailable:'%1<span class="cke_accessibility">, hazır değildir</span>'},contextmenu:{options:'İçerik Menüsü Seçenekleri'},specialChar:{toolbar:'Özel Karakter Ekle',title:'Özel Karakter Seç',options:'Özel Karakter Seçenekleri'},link:{toolbar:'Link Ekle/Düzenle',other:'<diğer>',menu:'Link Düzenle',title:'Link',info:'Link Bilgisi',target:'Hedef',upload:'Karşıya Yükle',advanced:'Gelişmiş',type:'Link Türü',toUrl:'URL',toAnchor:'Bu sayfada çapa',toEmail:'E-Posta',targetFrame:'<çerçeve>',targetPopup:'<yeni açılan pencere>',targetFrameName:'Hedef Çerçeve Adı',targetPopupName:'Yeni Açılan Pencere Adı',popupFeatures:'Yeni Açılan Pencere Özellikleri',popupResizable:'Resizable',popupStatusBar:'Durum Çubuğu',popupLocationBar:'Yer Çubuğu',popupToolbar:'Araç Çubuğu',popupMenuBar:'Menü Çubuğu',popupFullScreen:'Tam Ekran (IE)',popupScrollBars:'Kaydırma Çubukları',popupDependent:'Bağımlı (Netscape)',popupLeft:'Sola Göre Konum',popupTop:'Yukarıya Göre Konum',id:'Id',langDir:'Dil Yönü',langDirLTR:'Soldan Sağa (LTR)',langDirRTL:'Sağdan Sola (RTL)',acccessKey:'Erişim Tuşu',name:'Ad',langCode:'Dil Yönü',tabIndex:'Sekme İndeksi',advisoryTitle:'Danışma Başlığı',advisoryContentType:'Danışma İçerik Türü',cssClasses:'Biçem Sayfası Sınıfları',charset:'Bağlı Kaynak Karakter Gurubu',styles:'Biçem',rel:'İlişki',selectAnchor:'Bağlantı Seç',anchorName:'Bağlantı Adı ile',anchorId:'Eleman Kimlik Numarası ile',emailAddress:'E-Posta Adresi',emailSubject:'İleti Konusu',emailBody:'İleti Gövdesi',noAnchors:'(Bu belgede hiç çapa yok)',noUrl:"Lütfen Link URL'sini yazın",noEmail:'Lütfen E-posta adresini yazın'},anchor:{toolbar:'Bağlantı Ekle/Düzenle',menu:'Bağlantı Özellikleri',title:'Bağlantı Özellikleri',name:'Bağlantı Adı',errorName:'Lütfen bağlantı için ad giriniz',remove:'Bağlantıyı Kaldır'},list:{numberedTitle:'Sayılandırılmış Liste Özellikleri',bulletedTitle:'Simgeli Liste Özellikleri',type:'Tipi',start:'Başla',validateStartNumber:'Liste başlangıcı tam sayı olmalıdır.',circle:'Daire',disc:'Disk',square:'Kare',none:'Yok',notset:'<ayarlanmamış>',armenian:'Ermenice sayılandırma',georgian:'Gürcüce numaralandırma (an, ban, gan, vs.)',lowerRoman:'Küçük Roman (i, ii, iii, iv, v, vs.)',upperRoman:'Büyük Roman (I, II, III, IV, V, vs.)',lowerAlpha:'Küçük Alpha (a, b, c, d, e, vs.)',upperAlpha:'Büyük Alpha (A, B, C, D, E, vs.)',lowerGreek:'Küçük Greek (alpha, beta, gamma, vs.)',decimal:'Ondalık (1, 2, 3, vs.)',decimalLeadingZero:'Başı sıfırlı ondalık (01, 02, 03, vs.)'},findAndReplace:{title:'Bul ve Değiştir',find:'Bul',replace:'Değiştir',findWhat:'Aranan:',replaceWith:'Bununla değiştir:',notFoundMsg:'Belirtilen yazı bulunamadı.',findOptions:'Seçenekleri Bul',matchCase:'Büyük/küçük harf duyarlı',matchWord:'Kelimenin tamamı uysun',matchCyclic:'Eşleşen döngü',replaceAll:'Tümünü Değiştir',replaceSuccessMsg:'%1 bulunanlardan değiştirildi.'},table:{toolbar:'Tablo',title:'Tablo Özellikleri',menu:'Tablo Özellikleri',deleteTable:'Tabloyu Sil',rows:'Satırlar',columns:'Sütunlar',border:'Kenar Kalınlığı',widthPx:'piksel',widthPc:'yüzde',widthUnit:'genişlik birimi',cellSpace:'Izgara kalınlığı',cellPad:'Izgara yazı arası',caption:'Başlık',summary:'Özet',headers:'Başlıklar',headersNone:'Yok',headersColumn:'İlk Sütun',headersRow:'İlk Satır',headersBoth:'Her İkisi',invalidRows:'Satır sayısı 0 sayısından büyük olmalıdır.',invalidCols:'Sütün sayısı 0 sayısından büyük olmalıdır.',invalidBorder:'Çerceve büyüklüklüğü sayı olmalıdır.',invalidWidth:'Tablo genişliği sayı olmalıdır.',invalidHeight:'Tablo yüksekliği sayı olmalıdır.',invalidCellSpacing:'Hücre boşluğu (spacing) sayı olmalıdır.',invalidCellPadding:'Hücre aralığı (padding) sayı olmalıdır.',cell:{menu:'Hücre',insertBefore:'Hücre Ekle - Önce',insertAfter:'Hücre Ekle - Sonra',deleteCell:'Hücre Sil',merge:'Hücreleri Birleştir',mergeRight:'Birleştir - Sağdaki İle ',mergeDown:'Birleştir - Aşağıdaki İle ',splitHorizontal:'Hücreyi Yatay Böl',splitVertical:'Hücreyi Dikey Böl',title:'Hücre Özellikleri',cellType:'Hücre Tipi',rowSpan:'Satırlar Mesafesi (Span)',colSpan:'Sütünlar Mesafesi (Span)',wordWrap:'Kelime Kaydırma',hAlign:'Düşey Hizalama',vAlign:'Yataş Hizalama',alignBaseline:'Tabana',bgColor:'Arkaplan Rengi',borderColor:'Çerçeve Rengi',data:'Veri',header:'Başlık',yes:'Evet',no:'Hayır',invalidWidth:'Hücre genişliği sayı olmalıdır.',invalidHeight:'Hücre yüksekliği sayı olmalıdır.',invalidRowSpan:'Satırların mesafesi tam sayı olmalıdır.',invalidColSpan:'Sütünların mesafesi tam sayı olmalıdır.',chooseColor:'Seçiniz'},row:{menu:'Satır',insertBefore:'Satır Ekle - Önce',insertAfter:'Satır Ekle - Sonra',deleteRow:'Satır Sil'},column:{menu:'Sütun',insertBefore:'Kolon Ekle - Önce',insertAfter:'Kolon Ekle - Sonra',deleteColumn:'Sütun Sil'}},button:{title:'Düğme Özellikleri',text:'Metin (Değer)',type:'Tip',typeBtn:'Düğme',typeSbm:'Gönder',typeRst:'Sıfırla'},checkboxAndRadio:{checkboxTitle:'Onay Kutusu Özellikleri',radioTitle:'Seçenek Düğmesi Özellikleri',value:'Değer',selected:'Seçili'},form:{title:'Form Özellikleri',menu:'Form Özellikleri',action:'İşlem',method:'Yöntem',encoding:'Kodlama'},select:{title:'Seçim Menüsü Özellikleri',selectInfo:'Bilgi',opAvail:'Mevcut Seçenekler',value:'Değer',size:'Boyut',lines:'satır',chkMulti:'Çoklu seçime izin ver',opText:'Metin',opValue:'Değer',btnAdd:'Ekle',btnModify:'Düzenle',btnUp:'Yukarı',btnDown:'Aşağı',btnSetValue:'Seçili değer olarak ata',btnDelete:'Sil'},textarea:{title:'Çok Satırlı Metin Özellikleri',cols:'Sütunlar',rows:'Satırlar'},textfield:{title:'Metin Girişi Özellikleri',name:'Ad',value:'Değer',charWidth:'Karakter Genişliği',maxChars:'En Fazla Karakter',type:'Tür',typeText:'Metin',typePass:'Şifre'},hidden:{title:'Gizli Veri Özellikleri',name:'Ad',value:'Değer'},image:{title:'Resim Özellikleri',titleButton:'Resimli Düğme Özellikleri',menu:'Resim Özellikleri',infoTab:'Resim Bilgisi',btnUpload:'Sunucuya Yolla',upload:'Karşıya Yükle',alt:'Alternatif Yazı',lockRatio:'Oranı Kilitle',resetSize:'Boyutu Başa Döndür',border:'Kenar',hSpace:'Yatay Boşluk',vSpace:'Dikey Boşluk',alertUrl:"Lütfen resmin URL'sini yazınız",linkTab:'Köprü',button2Img:'Seçili resim butonunu basit resime çevirmek istermisiniz?',img2Button:'Seçili olan resimi, resimli butona çevirmek istermisiniz?',urlMissing:'Resmin URL kaynağı eksiktir.',validateBorder:'Çerçeve tam sayı olmalıdır.',validateHSpace:'HSpace tam sayı olmalıdır.',validateVSpace:'VSpace tam sayı olmalıdır.'},flash:{properties:'Flash Özellikleri',propertiesTab:'Özellikler',title:'Flash Özellikleri',chkPlay:'Otomatik Oynat',chkLoop:'Döngü',chkMenu:'Flash Menüsünü Kullan',chkFull:'Tam ekrana İzinver',scale:'Boyutlandır',scaleAll:'Hepsini Göster',scaleNoBorder:'Kenar Yok',scaleFit:'Tam Sığdır',access:'Kod İzni',accessAlways:'Herzaman',accessSameDomain:'Aynı domain',accessNever:'Asla',alignAbsBottom:'Tam Altı',alignAbsMiddle:'Tam Ortası',alignBaseline:'Taban Çizgisi',alignTextTop:'Yazı Tepeye',quality:'Kalite',qualityBest:'En iyi',qualityHigh:'Yüksek',qualityAutoHigh:'Otomatik Yükseklik',qualityMedium:'Orta',qualityAutoLow:'Otomatik Düşüklük',qualityLow:'Düşük',windowModeWindow:'Pencere',windowModeOpaque:'Opak',windowModeTransparent:'Şeffaf',windowMode:'Pencere modu',flashvars:'Flash Değerleri',bgcolor:'Arka Renk',hSpace:'Yatay Boşluk',vSpace:'Dikey Boşluk',validateSrc:"Lütfen köprü URL'sini yazın",validateHSpace:'HSpace sayı olmalıdır.',validateVSpace:'VSpace sayı olmalıdır.'},spellCheck:{toolbar:'Yazım Denetimi',title:'Yazımı Denetle',notAvailable:'Üzügünüz, bu servis şuanda hizmet dışıdır.',errorLoading:'Uygulamada yüklerken hata oluştu: %s.',notInDic:'Sözlükte Yok',changeTo:'Şuna değiştir:',btnIgnore:'Yoksay',btnIgnoreAll:'Tümünü Yoksay',btnReplace:'Değiştir',btnReplaceAll:'Tümünü Değiştir',btnUndo:'Geri Al',noSuggestions:'- Öneri Yok -',progress:'Yazım denetimi işlemde...',noMispell:'Yazım denetimi tamamlandı: Yanlış yazıma rastlanmadı',noChanges:'Yazım denetimi tamamlandı: Hiçbir kelime değiştirilmedi',oneChange:'Yazım denetimi tamamlandı: Bir kelime değiştirildi',manyChanges:'Yazım denetimi tamamlandı: %1 kelime değiştirildi',ieSpellDownload:'Yazım denetimi yüklenmemiş. Şimdi yüklemek ister misiniz?'},smiley:{toolbar:'İfade',title:'İfade Ekle',options:'İfade Seçenekleri'},elementsPath:{eleLabel:'Elementlerin yolu',eleTitle:'%1 elementi'},numberedlist:'Numaralı Liste',bulletedlist:'Simgeli Liste',indent:'Sekme Arttır',outdent:'Sekme Azalt',justify:{left:'Sola Dayalı',center:'Ortalanmış',right:'Sağa Dayalı',block:'İki Kenara Yaslanmış'},blockquote:'Blok Oluştur',clipboard:{title:'Yapıştır',cutError:'Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.',copyError:'Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.',pasteMsg:'Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.',securityMsg:'Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..',pasteArea:'Yapıştırma Alanı'},pastefromword:{confirmCleanup:"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?",toolbar:"Word'den Yapıştır",title:"Word'den Yapıştır",error:'Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir'},pasteText:{button:'Düz Metin Olarak Yapıştır',title:'Düz Metin Olarak Yapıştır'},templates:{button:'Şablonlar',title:'İçerik Şablonları',options:'Şablon Seçenekleri',insertOption:'Mevcut içerik ile değiştir',selectPromptMsg:'Düzenleyicide açmak için lütfen bir şablon seçin.<br>(hali hazırdaki içerik kaybolacaktır.):',emptyListMsg:'(Belirli bir şablon seçilmedi)'},showBlocks:'Blokları Göster',stylesCombo:{label:'Biçem',panelTitle:'Stilleri Düzenliyor',panelTitle1:'Blok Stilleri',panelTitle2:'Inline Stilleri',panelTitle3:'Nesne Stilleri'},format:{label:'Biçim',panelTitle:'Biçim',tag_p:'Normal',tag_pre:'Biçimli',tag_address:'Adres',tag_h1:'Başlık 1',tag_h2:'Başlık 2',tag_h3:'Başlık 3',tag_h4:'Başlık 4',tag_h5:'Başlık 5',tag_h6:'Başlık 6',tag_div:'Paragraf (DIV)'},div:{title:'Div İçeriği Oluştur',toolbar:'Div İçeriği Oluştur',cssClassInputLabel:'Stilltipi Sınıfı',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Dil Kodu',inlineStyleInputLabel:'Inline Stili',advisoryTitleInputLabel:'Tavsiye Başlığı',langDirLabel:'Dil Yönü',langDirLTRLabel:'Soldan sağa (LTR)',langDirRTLLabel:'Sağdan sola (RTL)',edit:'Div Düzenle',remove:'Div Kaldır'},iframe:{title:'IFrame Özellikleri',toolbar:'IFrame',noUrl:'Lütfen IFrame köprü (URL) bağlantısını yazın',scrolling:'Kaydırma çubuklarını aktif et',border:'Çerceve sınırlarını göster'},font:{label:'Yazı Türü',voiceLabel:'Font',panelTitle:'Yazı Türü'},fontSize:{label:'Boyut',voiceLabel:'Font Size',panelTitle:'Boyut'},colorButton:{textColorTitle:'Yazı Rengi',bgColorTitle:'Arka Renk',panelTitle:'Renkler',auto:'Otomatik',more:'Diğer renkler...'},colors:{'000':'Siyah',800000:'Kestane','8B4513':'Koyu Kahverengi','2F4F4F':'Koyu Kurşuni Gri','008080':'Teal','000080':'Mavi','4B0082':'Çivit Mavisi',696969:'Silik Gri',B22222:'Ateş Tuğlası',A52A2A:'Kahverengi',DAA520:'Altun Sırık','006400':'Koyu Yeşil','40E0D0':'Turkuaz','0000CD':'Orta Mavi',800080:'Pembe',808080:'Gri',F00:'Kırmızı',FF8C00:'Koyu Portakal',FFD700:'Altın','008000':'Yeşil','0FF':'Ciyan','00F':'Mavi',EE82EE:'Menekşe',A9A9A9:'Koyu Gri',FFA07A:'Açık Sarımsı',FFA500:'Portakal',FFFF00:'Sarı','00FF00':'Açık Yeşil',AFEEEE:'Sönük Turkuaz',ADD8E6:'Açık Mavi',DDA0DD:'Mor',D3D3D3:'Açık Gri',FFF0F5:'Eflatun Pembe',FAEBD7:'Antik Beyaz',FFFFE0:'Açık Sarı',F0FFF0:'Balsarısı',F0FFFF:'Gök Mavisi',F0F8FF:'Reha Mavi',E6E6FA:'Eflatun',FFF:'Beyaz'},scayt:{title:'Girmiş olduğunuz kelime denetimi',opera_title:'Opera tarafından desteklenmemektedir',enable:"SCAYT'ı etkinleştir",disable:"SCAYT'ı pasifleştir",about:"SCAYT'ı hakkında",toggle:"SCAYT'ı değiştir",options:'Seçenekler',langs:'Diller',moreSuggestions:'Daha fazla öneri',ignore:'Yoksay',ignoreAll:'Tümünü Yoksay',addWord:'Kelime Ekle',emptyDic:'Sözlük adı boş olamaz.',noSuggestions:'Öneri Yok',optionsTab:'Seçenekler',allCaps:'Tüm büyük küçük kelimeleri yoksay',ignoreDomainNames:'Domain adlarını yoksay',mixedCase:'Karışık büyüklük ile Sözcükler yoksay',mixedWithDigits:'Sayılarla Kelimeler yoksay',languagesTab:'Diller',dictionariesTab:'Sözlükler',dic_field_name:'Sözlük adı',dic_create:'Oluştur',dic_restore:'Geri al',dic_delete:'Sil',dic_rename:'Yeniden adlandır',dic_info:'Başlangıçta Kullanıcı Sözlüğü bir çerezde saklanır. Ancak, Çerezler boyutu sınırlıdır. Kullanıcı Sözlüğü, çerezin içinde saklanamayacağı bir noktada, bizim sunucularımızın içindeki sözlükte saklanabilir. Bizim sunucu üzerinde kişisel Sözlük saklamanız için, Sözlüğe bir ad belirtmelisiniz. Eğer zaten bir saklı Sözlük varsa, lütfen adını yazın ve Geri Yükle düğmesini tıklayın.',aboutTab:'Hakkında'},about:{title:'CKEditor Hakkında',dlgTitle:'CKEditor Hakkında',help:'Yardım için $1 kontrol edin.',userGuide:'CKEditor Kullanıcı Kılavuzu',moreInfo:'Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:',copy:'Copyright &copy; $1. Tüm hakları saklıdır.'},maximize:'Büyült',minimize:'Küçült',fakeobjects:{anchor:'Bağlantı',flash:'Flash Animasyonu',iframe:'IFrame',hiddenfield:'Gizli Alan',unknown:'Bilinmeyen Nesne'},resize:'Boyutlandırmak için sürükle',colordialog:{title:'Renk seç',options:'Renk Seçenekleri',highlight:'İşaretle',selected:'Seçilmiş',clear:'Temizle'},toolbarCollapse:'Araç çubuklarını topla',toolbarExpand:'Araç çubuklarını aç',toolbarGroups:{document:'Belge',clipboard:'Pano/Geri al',editing:'Düzenleme',forms:'Formlar',basicstyles:'Temel Stiller',paragraph:'Paragraf',links:'Bağlantılar',insert:'Ekle',styles:'Stiller',colors:'Renkler',tools:'Araçlar'},bidi:{ltr:'Metin yönü soldan sağa',rtl:'Metin yönü sağdan sola'},docprops:{label:'Belge Özellikleri',title:'Belge Özellikleri',design:'Dizayn',meta:'Tanım Bilgisi (Meta)',chooseColor:'Seçiniz',other:'<diğer>',docTitle:'Sayfa Başlığı',charset:'Karakter Kümesi Kodlaması',charsetOther:'Diğer Karakter Kümesi Kodlaması',charsetASCII:'ASCII',charsetCE:'Orta Avrupa',charsetCT:'Geleneksel Çince (Big5)',charsetCR:'Kiril',charsetGR:'Yunanca',charsetJP:'Japonca',charsetKR:'Korece',charsetTR:'Türkçe',charsetUN:'Evrensel Kod (UTF-8)',charsetWE:'Batı Avrupa',docType:'Belge Türü Başlığı',docTypeOther:'Diğer Belge Türü Başlığı',xhtmlDec:'XHTML Bildirimlerini Dahil Et',bgColor:'Arka Plan Rengi',bgImage:'Arka Plan Resim URLsi',bgFixed:'Sabit Arka Plan',txtColor:'Yazı Rengi',margin:'Kenar Boşlukları',marginTop:'Tepe',marginLeft:'Sol',marginRight:'Sağ',marginBottom:'Alt',metaKeywords:'Belge Dizinleme Anahtar Kelimeleri (virgülle ayrılmış)',metaDescription:'Belge Tanımı',metaAuthor:'Yazar',metaCopyright:'Telif',previewHtml:'<p>Bu bir <strong>örnek metindir</strong>. <a href="javascript:void(0)">CKEditor</a> kullanıyorsunuz.</p>'}};
diff --git a/web/imcms/ckeditor/lang/ug.js b/web/imcms/ckeditor/lang/ug.js
new file mode 100644
index 0000000000..d1b85af24b
--- /dev/null
+++ b/web/imcms/ckeditor/lang/ug.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ug={dir:'rtl',editorTitle:'كۆرۈنۈشچان تەھرىرلىگۈچ، %1',editorHelp:'ALT+0 نى ب�سىپ ياردەمنى كۆرۈڭ',toolbars:'قورال بالداق',editor:'تەھرىرلىگۈچ',source:'مەنبە',newPage:'ي�ڭى بەت',save:'ساقلا',preview:'ئالدىن كۆزەت',cut:'كەس',copy:'نەشر ھوقۇقىغا ئىگە بەلگىسى',paste:'چاپلا',print:'باس ',underline:'ئاستى سىزىق',bold:'توم',italic:'يانتۇ',selectAll:'ھەممىنى تاللا',removeFormat:'پىچىمنى چىقىرىۋەت',strike:'ئۆچۈرۈش سىزىقى',subscript:'تۆۋەن ئىند�كس',superscript:'يۇقىرى ئىند�كس',horizontalrule:'توغرا سىزىق قىستۇر',pagebreak:'بەت ئايرىغۇچ قىستۇر',pagebreakAlt:'بەت ئايرىغۇچ',unlink:'ئۇلانما بىكار قىل',undo:'ي�نىۋال',redo:'قايتىلا ',common:{browseServer:'كۆرسىتىش مۇلازىم�تىر',url:'ئەسلى ھۆججەت',protocol:'ك�لىشىم',upload:'يۈكلە',uploadSubmit:'مۇلازىم�تىرغا يۈكلە',image:'سۈرەت',flash:'Flash',form:'جەدۋەل',checkbox:'كۆپ تاللاش رامكىسى',radio:'يەككە تاللاش توپچىسى',textField:'يەككە قۇر ت�كىست',textarea:'كۆپ قۇر ت�كىست',hiddenField:'يوشۇرۇن دائىرە',button:'توپچا',select:'تىزىم/تىزىملىك',imageButton:'سۈرەت دائىرە',notSet:'‹تەڭشەلمىگەن›',id:'ID',name:'ئات',langDir:'تىل يۆنىلىشى',langDirLtr:'سولدىن ئوڭغا (LTR)',langDirRtl:'ئوڭدىن سولغا (RTL)',langCode:'تىل كودى',longDescr:'تەپسىلىي چۈشەندۈرۈش ئادر�سى',cssClass:'ئۇسلۇب خىلىنىڭ ئاتى',advisoryTitle:'ماۋزۇ',cssStyle:'قۇر ئىچىدىكى ئۇسلۇبى',ok:'جەزملە',cancel:'ۋاز كەچ',close:'تاقا',preview:'ئالدىن كۆزەت',generalTab:'ئادەتتىكى',advancedTab:'ئالىي',validateNumberFailed:'سان پىچىمىدا كىرگۈزۈش زۆرۈر',confirmNewPage:'نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، ي�ڭى پۈتۈك قۇرامسىز؟',confirmCancel:'قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟',options:'تاللانما',target:'نىشان كۆزنەك',targetNew:'ي�ڭى كۆزنەك (_blank)',targetTop:'پۈتۈن بەت (_top)',targetSelf:'مەزكۇر كۆزنەك (_self)',targetParent:'ئاتا كۆزنەك (_parent)',langDirLTR:'سولدىن ئوڭغا (LTR)',langDirRTL:'ئوڭدىن سولغا (RTL)',styles:'ئۇسلۇبلار',cssClasses:'ئۇسلۇب خىللىرى',width:'كەڭلىك',height:'ئ�گىزلىك',align:'توغرىلىنىشى',alignLeft:'سول',alignRight:'ئوڭ',alignCenter:'ئوتتۇرا',alignTop:'ئۈستى',alignMiddle:'ئوتتۇرا',alignBottom:'ئاستى',invalidValue:'Invalid value.',invalidHeight:'ئ�گىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر',invalidWidth:'كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر',invalidCssLength:'بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)',invalidHtmlLength:'بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى ك�رەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)',invalidInlineStyle:'ئىچكى باغلانما ئۇسلۇبى چوقۇم چ�كىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم',cssLengthTooltip:'بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى ك�رەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)',unavailable:'%1<span class=\\\\"cke_accessibility\\\\">، ئىشلەتكىلى بولمايدۇ</span>'},contextmenu:{options:'قىسقا يول تىزىملىك تاللانمىسى'},specialChar:{toolbar:'ئالاھىدە ھەرپ قىستۇر',title:'ئالاھىدە ھەرپ تاللاڭ',options:'ئالاھىدە ھەرپ تاللانمىسى'},link:{toolbar:'ئۇلانما قىستۇر/تەھرىرلە',other:'‹باشقا›',menu:'ئۇلانما تەھرىر',title:'ئۇلانما',info:'ئۇلانما ئۇچۇرى',target:'نىشان',upload:'يۈكلە',advanced:'ئالىي',type:'ئۇلانما تىپى',toUrl:'ئادر�س',toAnchor:'بەت ئىچىدىكى لەڭگەرلىك نۇقتا ئۇلانمىسى',toEmail:'ئ�لخەت',targetFrame:'‹كاندۇك›',targetPopup:'‹قاڭقىش كۆزنەك›',targetFrameName:'نىشان كاندۇك ئاتى',targetPopupName:'قاڭقىش كۆزنەك ئاتى',popupFeatures:'قاڭقىش كۆزنەك خاسلىقى',popupResizable:'چوڭلۇقى ئۆزگەرتىشچان',popupStatusBar:'ھالەت بالداق',popupLocationBar:'ئادر�س بالداق',popupToolbar:'قورال بالداق',popupMenuBar:'تىزىملىك بالداق',popupFullScreen:'پۈتۈن ئ�كران (IE)',popupScrollBars:'دومىلىما سۈرگۈچ',popupDependent:'تەۋە (NS)',popupLeft:'سول',popupTop:'ئوڭ',id:'ID',langDir:'تىل يۆنىلىشى',langDirLTR:'سولدىن ئوڭغا (LTR)',langDirRTL:'ئوڭدىن سولغا (RTL)',acccessKey:'زىيارەت كۇنۇپكا',name:'ئات',langCode:'تىل كودى',tabIndex:'Tab تەرتىپى',advisoryTitle:'ماۋزۇ',advisoryContentType:'مەزمۇن تىپى',cssClasses:'ئۇسلۇب خىلى ئاتى',charset:'ھەرپ كودلىنىشى',styles:'قۇر ئىچىدىكى ئۇسلۇبى',rel:'باغلىنىش',selectAnchor:'بىر لەڭگەرلىك نۇقتا تاللاڭ',anchorName:'لەڭگەرلىك نۇقتا ئاتى بويىچە',anchorId:'لەڭگەرلىك نۇقتا ID سى بويىچە',emailAddress:'ئادر�س',emailSubject:'ماۋزۇ',emailBody:'مەزمۇن',noAnchors:'(بۇ پۈتۈكتە ئىشلەتكىلى بولىدىغان لەڭگەرلىك نۇقتا يوق)',noUrl:'ئۇلانما ئادر�سىنى كىرگۈزۈڭ',noEmail:'ئ�لخەت ئادر�سىنى كىرگۈزۈڭ'},anchor:{toolbar:'لەڭگەرلىك نۇقتا ئۇلانمىسى قىستۇر/تەھرىرلە',menu:'لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى',title:'لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى',name:'لەڭگەرلىك نۇقتا ئاتى',errorName:'لەڭگەرلىك نۇقتا ئاتىنى كىرگۈزۈڭ',remove:'لەڭگەرلىك نۇقتا ئۆچۈر'},list:{numberedTitle:'تەرتىپ نومۇر تىزىم خاسلىقى',bulletedTitle:'تۈر بەلگە تىزىم خاسلىقى',type:'بەلگە تىپى',start:'باشلىنىش نومۇرى',validateStartNumber:'تىزىم باشلىنىش تەرتىپ نومۇرى چوقۇم پۈتۈن سان پىچىمىدا بولۇشى لازىم',circle:'بوش چەمبەر',disc:'تولدۇرۇلغان چەمبەر',square:'تولدۇرۇلغان تۆت چاسا',none:'بەلگە يوق',notset:'‹تەڭشەلمىگەن›',armenian:'قەدىمكى ئەرمىنىيە تەرتىپ نومۇرى شەكلى',georgian:'قەدىمكى جورجىيە تەرتىپ نومۇرى شەكلى (an, ban, gan قاتارلىق)',lowerRoman:'كىچىك ھەرپلىك رىم رەقىمى (i, ii, iii, iv, v قاتارلىق)',upperRoman:'چوڭ ھەرپلىك رىم رەقىمى (I, II, III, IV, V قاتارلىق)',lowerAlpha:'ئىنگلىزچە كىچىك ھەرپ (a, b, c, d, e قاتارلىق)',upperAlpha:'ئىنگلىزچە چوڭ ھەرپ (A, B, C, D, E قاتارلىق)',lowerGreek:'گر�كچە كىچىك ھەرپ (alpha, beta, gamma قاتارلىق)',decimal:'سان (1, 2, 3 قاتارلىق)',decimalLeadingZero:'نۆلدىن باشلانغان سان بەلگە (01, 02, 03 قاتارلىق)'},findAndReplace:{title:'ئىزدەپ ئالماشتۇر',find:'ئىزدە',replace:'ئالماشتۇر',findWhat:'ئىزدە:',replaceWith:'ئالماشتۇر:',notFoundMsg:'بەلگىلەنگەن ت�كىستنى تاپالمىدى',findOptions:'ئىزدەش تاللانمىسى',matchCase:'چوڭ كىچىك ھەرپنى پەرقلەندۈر',matchWord:'پۈتۈن سۆز ماسلىشىش',matchCyclic:'ئايلانما ماسلىشىش',replaceAll:'ھەممىنى ئالماشتۇر',replaceSuccessMsg:'جەمئى %1 جايدىكى ئالماشتۇرۇش تاماملاندى'},table:{toolbar:'جەدۋەل',title:'جەدۋەل خاسلىقى',menu:'جەدۋەل خاسلىقى',deleteTable:'جەدۋەل ئۆچۈر',rows:'قۇر سانى',columns:'ئىستون سانى',border:'گىرۋەك',widthPx:'پىكس�ل',widthPc:'پىرسەنت',widthUnit:'كەڭلىك بىرلىكى',cellSpace:'ئارىلىق',cellPad:'يان ئارىلىق',caption:'ماۋزۇ',summary:'ئۈزۈندە',headers:'ماۋزۇ كاتەكچە',headersNone:'يوق',headersColumn:'بىرىنچى ئىستون',headersRow:'بىرىنچى قۇر',headersBoth:'بىرىنچى ئىستون ۋە بىرىنچى قۇر',invalidRows:'بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ',invalidCols:'بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ',invalidBorder:'گىرۋەك توملۇقى چوقۇم سان بولىدۇ',invalidWidth:'جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ',invalidHeight:'جەدۋەل ئ�گىزلىكى چوقۇم سان بولىدۇ',invalidCellSpacing:'كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ',invalidCellPadding:'كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ',cell:{menu:'كاتەكچە',insertBefore:'سولغا كاتەكچە قىستۇر',insertAfter:'ئوڭغا كاتەكچە قىستۇر',deleteCell:'كەتەكچە ئۆچۈر',merge:'كاتەكچە بىرلەشتۈر',mergeRight:'كاتەكچىنى ئوڭغا بىرلەشتۈر',mergeDown:'كاتەكچىنى ئاستىغا بىرلەشتۈر',splitHorizontal:'كاتەكچىنى توغرىسىغا بىرلەشتۈر',splitVertical:'كاتەكچىنى بويىغا بىرلەشتۈر',title:'كاتەكچە خاسلىقى',cellType:'كاتەكچە تىپى',rowSpan:'بويىغا چات ئارىسى قۇر سانى',colSpan:'توغرىسىغا چات ئارىسى ئىستون سانى',wordWrap:'ئۆزلۈكىدىن قۇر قاتلا',hAlign:'توغرىسىغا توغرىلا',vAlign:'بويىغا توغرىلا',alignBaseline:'ئاساسىي سىزىق',bgColor:'تەگلىك رەڭگى',borderColor:'گىرۋەك رەڭگى',data:'سانلىق مەلۇمات',header:'جەدۋەل باشى',yes:'ھەئە',no:'ياق',invalidWidth:'كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ',invalidHeight:'كاتەكچە ئ�گىزلىكى چوقۇم سان بولىدۇ',invalidRowSpan:'قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ',invalidColSpan:'ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ',chooseColor:'تاللاڭ'},row:{menu:'قۇر',insertBefore:'ئۈستىگە قۇر قىستۇر',insertAfter:'ئاستىغا قۇر قىستۇر',deleteRow:'قۇر ئۆچۈر'},column:{menu:'ئىستون',insertBefore:'سولغا ئىستون قىستۇر',insertAfter:'ئوڭغا ئىستون قىستۇر',deleteColumn:'ئىستون ئۆچۈر'}},button:{title:'توپچا خاسلىقى',text:'بەلگە (قىممەت)',type:'تىپى',typeBtn:'توپچا',typeSbm:'تاپشۇر',typeRst:'ئەسلىگە قايتۇر'},checkboxAndRadio:{checkboxTitle:'كۆپ تاللاش خاسلىقى',radioTitle:'تاق تاللاش توپچا خاسلىقى',value:'تاللىغان قىممەت',selected:'تاللانغان'},form:{title:'جەدۋەل خاسلىقى',menu:'جەدۋەل خاسلىقى',action:'مەشغۇلات',method:'ئۇسۇل',encoding:'جەدۋەل كودلىنىشى'},select:{title:'جەدۋەل/تىزىم خاسلىقى',selectInfo:'ئۇچۇر تاللاڭ',opAvail:'تاللاش تۈرلىرى',value:'قىممەت',size:'ئ�گىزلىكى',lines:'قۇر',chkMulti:'كۆپ تاللاشچان',opText:'تاللانما ت�كىستى',opValue:'تاللانما قىممىتى',btnAdd:'قوش',btnModify:'ئۆزگەرت',btnUp:'ئۈستىگە',btnDown:'ئاستىغا',btnSetValue:'دەسلەپكى تاللانما قىممىتىگە تەڭشە',btnDelete:'ئۆچۈر'},textarea:{title:' كۆپ قۇرلۇق ت�كىست خاسلىقى',cols:'ھەرپ كەڭلىكى',rows:'قۇر سانى'},textfield:{title:'تاق قۇرلۇق ت�كىست خاسلىقى',name:'ئات',value:'دەسلەپكى قىممىتى',charWidth:'ھەرپ كەڭلىكى',maxChars:'ئەڭ كۆپ ھەرپ سانى',type:'تىپى',typeText:'ت�كىست',typePass:'ئىم'},hidden:{title:'يوشۇرۇن دائىرە خاسلىقى',name:'ئات',value:'دەسلەپكى قىممىتى'},image:{title:'سۈرەت خاسلىقى',titleButton:'سۈرەت دائىرە خاسلىقى',menu:'سۈرەت خاسلىقى',infoTab:'سۈرەت',btnUpload:'مۇلازىم�تىرغا يۈكلە',upload:'يۈكلە',alt:'ت�كىست ئالماشتۇر',lockRatio:'نىسبەتنى قۇلۇپلا',resetSize:'ئەسلى چوڭلۇق',border:'گىرۋەك چوڭلۇقى',hSpace:'توغرىسىغا ئارىلىقى',vSpace:'بويىغا ئارىلىقى',alertUrl:'سۈرەت ئادر�سىنى كىرگۈزۈڭ',linkTab:'ئۇلانما',button2Img:'نۆۋەتتىكى توپچىنى سۈرەتكە ئۆزگەرتەمسىز؟',img2Button:'نۆۋەتتىكى سۈرەتنى توپچىغا ئۆزگەرتەمسىز؟',urlMissing:'سۈرەتنىڭ ئەسلى ھۆججەت ئادر�سى كەم',validateBorder:'گىرۋەك چوڭلۇقى چوقۇم سان بولىدۇ',validateHSpace:'توغرىسىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ',validateVSpace:'بويىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ'},flash:{properties:'Flash خاسلىق',propertiesTab:'خاسلىق',title:'ماۋزۇ',chkPlay:'ئۆزلۈكىدىن چال',chkLoop:'دەۋرىي',chkMenu:'Flash تىزىملىكنى قوزغات',chkFull:'پۈتۈن ئ�كراننى قوزغات',scale:'نىسبىتى',scaleAll:'ھەممىنى كۆرسەت',scaleNoBorder:'گىرۋەك يوق',scaleFit:'قەتئىي ماسلىشىش',access:'قوليازما زىيارەتكە يول قوي',accessAlways:'ھەمىشە',accessSameDomain:'ئوخشاش دائىرىدە',accessNever:'ھەرگىز',alignAbsBottom:'مۇتلەق ئاستى',alignAbsMiddle:'مۇتلەق ئوتتۇرا',alignBaseline:'ئاساسىي سىزىق',alignTextTop:'ت�كىست ئۈستىدە',quality:'سۈپەت',qualityBest:'ئەڭ ياخشى',qualityHigh:'يۇقىرى',qualityAutoHigh:'يۇقىرى (ئاپتوماتىك)',qualityMedium:'ئوتتۇرا (ئاپتوماتىك)',qualityAutoLow:'تۆۋەن (ئاپتوماتىك)',qualityLow:'تۆۋەن',windowModeWindow:'كۆزنەك گەۋدىسى',windowModeOpaque:'خىرە',windowModeTransparent:'سۈزۈك',windowMode:'كۆزنەك ھالىتى',flashvars:'Flash  ئۆزگەرگۈچى',bgcolor:'تەگلىك رەڭگى',hSpace:'توغرىسىغا ئارىلىق',vSpace:'بويىغا ئارىلىق',validateSrc:'ئەسلى ھۆججەت ئادر�سىنى كىرگۈزۈڭ',validateHSpace:'توغرىسىغا ئارىلىق چوقۇم سان بولىدۇ',validateVSpace:'بويىغا ئارىلىق چوقۇم سان بولىدۇ'},spellCheck:{toolbar:'ئىملا تەكشۈر',title:'ئىملا تەكشۈر',notAvailable:'كەچۈرۈڭ، مۇلازىم�تىرنى ۋاقتىنچە ئىشلەتكىلى بولمايدۇ',errorLoading:'لازىملىق مۇلازىم�تىرنى يۈكلىگەندە خاتالىق كۆرۈلدى: %s.',notInDic:'لۇغەتتە يوق',changeTo:'ئۆزگەرت',btnIgnore:'پەرۋا قىلما',btnIgnoreAll:'ھەممىگە پەرۋا قىلما',btnReplace:'ئالماشتۇر',btnReplaceAll:'ھەممىنى ئالماشتۇر',btnUndo:'ي�نىۋال',noSuggestions:'-تەكلىپ يوق-',progress:'ئىملا تەكشۈرۈۋاتىدۇ…',noMispell:'ئىملا تەكشۈرۈش تامام: ئىملا خاتالىقى بايقالمىدى',noChanges:'ئىملا تەكشۈرۈش تامام: ھ�چقانداق سۆزنى ئۆزگەرتمىدى',oneChange:'ئىملا تەكشۈرۈش تامام: بىر سۆزنى ئۆزگەرتتى',manyChanges:'ئىملا تەكشۈرۈش تامام: %1  سۆزنى ئۆزگەرتتى',ieSpellDownload:'ئىملا تەكشۈرۈش قىستۇرمىسى ت�خى ئورنىتىلمىغان، ھازىرلا چۈشۈرەمسىز؟'},smiley:{toolbar:'چىراي ئىپادە',title:'چىراي ئىپادە سىنبەلگە قىستۇر',options:'چىراي ئىپادە سىنبەلگە تاللانمىسى'},elementsPath:{eleLabel:'ئ�ل�م�نت يولى',eleTitle:'%1 ئ�ل�م�نت'},numberedlist:'تەرتىپ نومۇر تىزىمى',bulletedlist:'تۈر بەلگە تىزىمى',indent:'تارايت',outdent:'كەڭەيت',justify:{left:'سولغا توغرىلا',center:'ئوتتۇرىغا توغرىلا',right:'ئوڭغا توغرىلا',block:'ئىككى تەرەپتىن توغرىلا'},blockquote:'بۆلەك نەقىل',clipboard:{title:'چاپلا',cutError:'تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا ت�ز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ',copyError:'تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا ت�ز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ',pasteMsg:'ھەرپتاختا ت�ز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ مەزمۇننى تۆۋەندىكى رامكىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەزملە</STRONG>نى ب�سىڭ',securityMsg:'توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى مەزمۇننى بىۋاستە زىيارەت قىلالمايدۇ، بۇ كۆزنەكتە قايتا بىر ق�تىم چاپلىشىڭىز ك�رەك.',pasteArea:'چاپلاش دائىرىسى'},pastefromword:{confirmCleanup:'سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن ك�يىن ئاندىن چاپلامدۇ؟',toolbar:'MS Word تىن چاپلا',title:'MS Word تىن چاپلا',error:'ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ'},pasteText:{button:'پىچىمى يوق ت�كىست سۈپىتىدە چاپلا',title:'پىچىمى يوق ت�كىست سۈپىتىدە چاپلا'},templates:{button:'ق�لىپ',title:'مەزمۇن ق�لىپى',options:'ق�لىپ تاللانمىسى',insertOption:'نۆۋەتتىكى مەزمۇننى ئالماشتۇر',selectPromptMsg:'تەھرىرلىگۈچنىڭ مەزمۇن ق�لىپىنى تاللاڭ:',emptyListMsg:'(ق�لىپ يوق)'},showBlocks:'بۆلەكنى كۆرسەت',stylesCombo:{label:'ئۇسلۇب',panelTitle:'ئۇسلۇب',panelTitle1:'بۆلەك دەرىجىسىدىكى ئ�ل�م�نت ئۇسلۇبى',panelTitle2:'ئىچكى باغلانما ئ�ل�م�نت ئۇسلۇبى',panelTitle3:'نەڭ (Object) ئ�ل�م�نت ئۇسلۇبى'},format:{label:'پىچىم',panelTitle:'پىچىم',tag_p:'ئادەتتىكى',tag_pre:'تىزىلغان پىچىم',tag_address:'ئادر�س',tag_h1:'ماۋزۇ 1',tag_h2:'ماۋزۇ 2',tag_h3:'ماۋزۇ 3',tag_h4:'ماۋزۇ 4',tag_h5:'ماۋزۇ 5',tag_h6:'ماۋزۇ 6',tag_div:'ئابزاس (DIV)'},div:{title:'DIV قاچا قۇر',toolbar:'DIV قاچا قۇر',cssClassInputLabel:'ئۇسلۇب تىپىنىڭ ئاتى',styleSelectLabel:'ئۇسلۇب',IdInputLabel:'ID',languageCodeInputLabel:'تىل كودى',inlineStyleInputLabel:'قۇر ئىچىدىكى ئۇسلۇبى',advisoryTitleInputLabel:'ماۋزۇ',langDirLabel:'تىل يۆنىلىشى',langDirLTRLabel:'سولدىن ئوڭغا (LTR)',langDirRTLLabel:'ئوڭدىن سولغا (RTL)',edit:'DIV تەھرىر',remove:'DIV چىقىرىۋەت'},iframe:{title:'IFrame خاسلىق',toolbar:'IFrame ',noUrl:'كاندۇكنىڭ ئادر�سى(Url)نى كىرگۈزۈڭ',scrolling:'دومىلىما سۈرگۈچكە يول قوي',border:'كاندۇك گىرۋەكلىرىنى كۆرسەت'},font:{label:'خەت نۇسخا',voiceLabel:'خەت نۇسخا',panelTitle:'خەت نۇسخا'},fontSize:{label:'چوڭلۇقى',voiceLabel:'خەت چوڭلۇقى',panelTitle:'چوڭلۇقى'},colorButton:{textColorTitle:'ت�كىست رەڭگى',bgColorTitle:'تەگلىك رەڭگى',panelTitle:'رەڭ',auto:'ئۆزلۈكىدىن',more:'باشقا رەڭ'},colors:{'000':'قارا',800000:'قىزغۇچ س�رىق','8B4513':'توق قوڭۇر','2F4F4F':'قارامتۇل ي�شىل','008080':'كۆكۈش ي�شىل','000080':'قارامتۇل كۆك','4B0082':'كۆكۈش كۈلرەڭ',696969:'قارامتۇل كۈلرەڭ',B22222:'خىش قىزىل',A52A2A:'قوڭۇر',DAA520:'ئالتۇن س�رىق','006400':'توق ي�شىل','40E0D0':'كۆكۈچ ي�شىل','0000CD':'ئوتتۇراھال كۆك',800080:'بىنەپشە',808080:'كۈلرەڭ',F00:'قىزىل',FF8C00:'توق قىزغۇچ س�رىق',FFD700:'ئالتۇن','008000':'ي�شىل','0FF':'ي�شىل كۆك','00F':'كۆك',EE82EE:'قىزغۇچ بىنەپشە',A9A9A9:'توق كۈلرەڭ',FFA07A:'كاۋا چ�چىكى س�رىق',FFA500:'قىزغۇچ س�رىق',FFFF00:'س�رىق','00FF00':'Lime',AFEEEE:'سۇس ھاۋا رەڭ',ADD8E6:'ئوچۇق كۆك',DDA0DD:'قىزغۇچ بىنەپشە',D3D3D3:'سۇس كۆكۈچ كۈلرەڭ',FFF0F5:'سۇس قىزغۇچ بىنەپشە',FAEBD7:'Antique White',FFFFE0:'سۇس س�رىق',F0FFF0:'Honeydew',F0FFFF:'ئاسمان كۆكى',F0F8FF:'سۇس كۆك',E6E6FA:'سۇس بىنەپشە',FFF:'ئاق'},scayt:{title:'شۇئان ئىملا تەكشۈر',opera_title:'Opera توركۆرگۈنى قوللىمايدۇ',enable:'شۇئان ئىملا تەكشۈرۈشنى قوزغات',disable:'شۇئان ئىملا تەكشۈرۈشنى چەكلە',about:'شۇئان ئىملا تەكشۈرۈش ھەققىدە',toggle:'شۇئان ئىملا تەكشۈرۈشنى ۋاقىتلىق توختات/قوزغات',options:'تاللانما',langs:'تىل',moreSuggestions:'ت�خىمۇ كۆپ ئىملا تەۋسىيەسى',ignore:'پەرۋا قىلما',ignoreAll:'ھەممىسىگە پەرۋا قىلما',addWord:'سۆز قوش',emptyDic:'لۇغەت ئاتى بوش قالمايدۇ',noSuggestions:'No suggestions',optionsTab:'تاللانما',allCaps:'چوڭ ھەرپتە ي�زىلغان ھەممە سۆزگە پەرۋا قىلما',ignoreDomainNames:'دائىرە ئاتىغا پەرۋا قىلما',mixedCase:'چوڭ كىچىك ھەرپ بىلەن ئارىلاش ي�زىلغان سۆزگە پەرۋا قىلما',mixedWithDigits:'سان بار سۆزگە پەرۋا قىلما',languagesTab:'تىل',dictionariesTab:'لۇغەت',dic_field_name:'لۇغەت ئاتى',dic_create:'قۇر',dic_restore:'ئەسلىگە كەلتۈر',dic_delete:'ئۆچۈر',dic_rename:'ئات ئۆزگەرت',dic_info:'باشلىنىشتا ئىشلەتكۈچى لۇغىتى Cookie  غا ساقلىنىدۇ ئەمما Cookie نىڭ سىغىمى چەكلىك بولغاچقا، ئىشلەتكۈچى لۇغىتى كۆپىيىپ Cookie  چەكلىمىسىدىن ئ�شىپ كەتكەندە ساقلىغىلى بولمايدۇ، بۇ چاغدا لۇغىتىڭىزنى مۇلازىم�تىرىمىزغا ساقلىسىڭىز بولىدۇ. شەخسىي لۇغىتىڭىزنى مۇلازىم�تىرىمىزغا ساقلىماقچى بولسىڭىز لۇغىتىڭىزگە ئاتتىن بىرنى قويۇڭ، ئەگەر مۇلازىمت�رىمىزدا سىزنىڭ لۇغىتىڭىزدىن بىرسى بولسا لۇغەت ئاتىنى كىرگۈزۈپ ئەسلىگە قايتۇر توپچىسىنى ب�سىڭ.',aboutTab:'ھەققىدە'},about:{title:'CKEditor ھەققىدە',dlgTitle:'CKEditor ھەققىدە',help:'$1 نى زىيارەت قىلىپ ياردەمگە ئ�رىشىڭ',userGuide:'CKEditor ئىشلەتكۈچى قوللانمىسى',moreInfo:'تور تۇرايىمىزنى زىيارەت قىلىپ ك�لىشىمگە ئائىت ت�خىمۇ كۆپ ئۇچۇرغا ئ�رىشىڭ',copy:'Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە'},maximize:'چوڭايت',minimize:'كىچىكلەت',fakeobjects:{anchor:'لەڭگەرلىك نۇقتا',flash:'Flash جانلاندۇرۇم',iframe:'IFrame',hiddenfield:'يوشۇرۇن دائىرە',unknown:'يوچۇن نەڭ'},resize:'چوڭلۇقىنى ئۆزگەرت',colordialog:{title:'رەڭ تاللاڭ',options:'رەڭ تاللانمىسى',highlight:'يورۇت',selected:'رەڭ تاللاڭ',clear:'تازىلا'},toolbarCollapse:'قورال بالداقنى قاتلا',toolbarExpand:'قورال بالداقنى ياي',toolbarGroups:{document:'پۈتۈك',clipboard:'چاپلاش تاختىسى/ي�نىۋال',editing:'تەھرىر',forms:'جەدۋەل',basicstyles:'ئاساسىي ئۇسلۇب',paragraph:'ئابزاس',links:'ئۇلانما',insert:'قىستۇر',styles:'ئۇسلۇب',colors:'رەڭ',tools:'قورال'},bidi:{ltr:'ت�كىست يۆنىلىشى سولدىن ئوڭغا',rtl:'ت�كىست يۆنىلىشى ئوڭدىن سولغا'},docprops:{label:'بەت خاسلىقى',title:'بەت خاسلىقى',design:'لايىھە',meta:'م�تا سانلىق مەلۇمات',chooseColor:'تاللاڭ',other:'باشقا',docTitle:'بەت ماۋزۇسى',charset:'ھەرپ كودلىنىشى',charsetOther:'باشقا ھەرپ كودلىنىشى',charsetASCII:'ASCII',charsetCE:'ئوتتۇرا ياۋرۇپا',charsetCT:'مۇرەككەپ خەنزۇچە (Big5)',charsetCR:'سىلاۋيانچە',charsetGR:'گىر�كچە',charsetJP:'ياپونچە',charsetKR:'كۆرىيەچە',charsetTR:'تۈركچە',charsetUN:'يۇنىكود (UTF-8)',charsetWE:'غەربىي ياۋرۇپا',docType:'پۈتۈك تىپى',docTypeOther:'باشقا پۈتۈك تىپى',xhtmlDec:'XHTML ئ�نىقلىمىسىنى ئۆز ئىچىگە ئالىدۇ',bgColor:'تەگلىك رەڭگى',bgImage:'تەگلىك سۈرەت',bgFixed:'تەگلىك سۈرەتنى دومىلاتما',txtColor:'ت�كىست رەڭگى',margin:'بەت گىرۋەك',marginTop:'ئۈستى',marginLeft:'سول',marginRight:'ئوڭ',marginBottom:'ئاستى',metaKeywords:'بەت يۈزى ئىند�كىس ھالقىلىق سۆزى (ئىنگلىزچە پەش [,] بىلەن ئايرىلىدۇ)',metaDescription:'بەت يۈزى چۈشەندۈرۈشى',metaAuthor:'يازغۇچى',metaCopyright:'نەشر ھوقۇقى',previewHtml:'<p>بۇ بىر قىسىم <strong>كۆرسەتمىگە ئىشلىتىدىغان ت�كىست </strong>سىز نۆۋەتتە <a href=\\\\"javascript:void(0)\\\\">CKEditor</a>.نى ئىشلىتىۋاتىسىز.</p>'}};
diff --git a/web/imcms/ckeditor/lang/uk.js b/web/imcms/ckeditor/lang/uk.js
new file mode 100644
index 0000000000..3e51776430
--- /dev/null
+++ b/web/imcms/ckeditor/lang/uk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.uk={dir:'ltr',editorTitle:'Тек�товий редактор, %1',editorHelp:'нати�ніть ALT 0 дл� довідки',toolbars:'Панель ін�трументів редактора',editor:'Тек�товий редактор',source:'Джерело',newPage:'�ова �торінка',save:'Зберегти',preview:'Попередній перегл�д',cut:'Вирізати',copy:'Копіювати',paste:'В�тавити',print:'Друк',underline:'Підкре�лений',bold:'Жирний',italic:'Кур�ив',selectAll:'Виділити в�е',removeFormat:'Очи�тити форматуванн�',strike:'Закре�лений',subscript:'�ижній індек�',superscript:'Верхній індек�',horizontalrule:'Горизонтальна ліні�',pagebreak:'В�тавити розрив �торінки',pagebreakAlt:'Розрив Сторінки',unlink:'Видалити по�иланн�',undo:'Повернути',redo:'Повторити',common:{browseServer:'Огл�д',url:'URL',protocol:'Протокол',upload:'�аді�лати',uploadSubmit:'�аді�лати на �ервер',image:'Зображенн�',flash:'Flash',form:'Форма',checkbox:'Галочка',radio:'Кнопка вибору',textField:'Тек�тове поле',textarea:'Тек�това обла�ть',hiddenField:'Приховане поле',button:'Кнопка',select:'Спи�ок',imageButton:'Кнопка із зображенн�м',notSet:'<не визначено>',id:'Ідентифікатор',name:"Ім'�",langDir:'�апр�мок мови',langDirLtr:'Зліва направо (LTR)',langDirRtl:'Справа наліво (RTL)',langCode:'Код мови',longDescr:'Довгий опи� URL',cssClass:'Кла� CSS',advisoryTitle:'Заголовок',cssStyle:'Стиль CSS',ok:'ОК',cancel:'Ска�увати',close:'Закрити',preview:'Попередній перегл�д',generalTab:'О�новне',advancedTab:'Додаткове',validateNumberFailed:'Значенн� не є цілим чи�лом.',confirmNewPage:'В�і незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову �торінку?',confirmCancel:'Де�кі опції змінено. Закрити вікно без збереженн� змін?',options:'Опції',target:'Ціль',targetNew:'�ове вікно (_blank)',targetTop:'Поточне вікно (_top)',targetSelf:'Поточний фрейм/вікно (_self)',targetParent:'Батьків�ький фрейм/вікно (_parent)',langDirLTR:'Зліва направо (LTR)',langDirRTL:'Справа наліво (RTL)',styles:'Стиль CSS',cssClasses:'Кла� CSS',width:'Ширина',height:'Ви�ота',align:'Вирівнюванн�',alignLeft:'По лівому краю',alignRight:'По правому краю',alignCenter:'По центру',alignTop:'По верхньому краю',alignMiddle:'По �ередині',alignBottom:'По нижньому краю',invalidValue:'Invalid value.',invalidHeight:'Ви�ота повинна бути цілим чи�лом.',invalidWidth:'Ширина повинна бути цілим чи�лом.',invalidCssLength:'Значенн�, вказане дл� "%1" в полі повинно бути позитивним чи�лом або без дій�ного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Значенн�, вказане дл� "%1" в полі повинно бути позитивним чи�лом або без дій�ного виміру HTML блоку (px or %).',invalidInlineStyle:'Значенн�, вказане дл� вбудованого �тилю повинне �кладати�� з одного чи кількох кортежів у форматі "ім\'� : значенн�", розділених крапкою з комою.',cssLengthTooltip:'Введіть номер значенн� в пік�ел�х або чи�ло з дій�ною одиниці CSS (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, не до�тупне</span>'},contextmenu:{options:'Опції контек�тного меню'},specialChar:{toolbar:'Спеціальний �имвол',title:'Оберіть �пеціальний �имвол',options:'Опції'},link:{toolbar:'В�тавити/Редагувати по�иланн�',other:'<інший>',menu:'В�тавити по�иланн�',title:'По�иланн�',info:'Інформаці� по�иланн�',target:'Ціль',upload:'�аді�лати',advanced:'Додаткове',type:'Тип по�иланн�',toUrl:'URL',toAnchor:'Якір на цю �торінку',toEmail:'Ел. пошта',targetFrame:'<фрейм>',targetPopup:'<випливаюче вікно>',targetFrameName:"Ім'� цільового фрейму",targetPopupName:"Ім'� випливаючого вікна",popupFeatures:'Вла�тиво�ті випливаючого вікна',popupResizable:'Ма�штабоване',popupStatusBar:'Р�док �тату�у',popupLocationBar:'Панель локації',popupToolbar:'Панель ін�трументів',popupMenuBar:'Панель меню',popupFullScreen:'Повний екран (IE)',popupScrollBars:'Стрічки прокрутки',popupDependent:'Залежний (Netscape)',popupLeft:'Позиці� зліва',popupTop:'Позиці� зверху',id:'Ідентифікатор',langDir:'�апр�мок мови',langDirLTR:'Зліва направо (LTR)',langDirRTL:'Справа наліво (RTL)',acccessKey:'Гар�ча клавіша',name:"Ім'�",langCode:'Код мови',tabIndex:'По�лідовні�ть переходу',advisoryTitle:'Заголовок',advisoryContentType:'Тип вмі�ту',cssClasses:'Кла� CSS',charset:'Кодуванн�',styles:'Стиль CSS',rel:"Зв'�зок",selectAnchor:'Оберіть �кір',anchorName:"За ім'�м елементу",anchorId:'За ідентифікатором елементу',emailAddress:'�дре�а ел. пошти',emailSubject:'Тема ли�та',emailBody:'Тіло повідомленн�',noAnchors:'(В цьому документі немає �корів)',noUrl:'Будь ла�ка, вкажіть URL по�иланн�',noEmail:'Будь ла�ка, вкажіть адре� ел. пошти'},anchor:{toolbar:'В�тавити/Редагувати �кір',menu:'Вла�тиво�ті �кор�',title:'Вла�тиво�ті �кор�',name:"Ім'� �кор�",errorName:"Будь ла�ка, вкажіть ім'� �кор�",remove:'Прибрати �кір'},list:{numberedTitle:'Опції нумерованого �пи�ку',bulletedTitle:'Опції маркованого �пи�ку',type:'Тип',start:'Почати з...',validateStartNumber:'Початковий номер �пи�ку повинен бути цілим чи�лом.',circle:'Кільце',disc:'Кружечок',square:'Квадратик',none:'�ема',notset:'<не вказано>',armenian:'Вірмен�ька нумераці�',georgian:'Грузин�ька нумераці� (an, ban, gan і т.д.)',lowerRoman:'Малі рим�ькі (i, ii, iii, iv, v і т.д.)',upperRoman:'Великі рим�ькі (I, II, III, IV, V і т.д.)',lowerAlpha:'Малі лат. букви (a, b, c, d, e і т.д.)',upperAlpha:'Великі лат. букви (A, B, C, D, E і т.д.)',lowerGreek:'Малі гр. букви (альфа, бета, гамма і т.д.)',decimal:'Де��ткові (1, 2, 3 і т.д.)',decimalLeadingZero:'Де��ткові з нулем (01, 02, 03 і т.д.)'},findAndReplace:{title:'Знайти і замінити',find:'Пошук',replace:'Заміна',findWhat:'Шукати:',replaceWith:'Замінити на:',notFoundMsg:'Вказаний тек�т не знайдено.',findOptions:'Параметри Пошуку',matchCase:'Враховувати регі�тр',matchWord:'Збіг цілих �лів',matchCyclic:'Циклічна заміна',replaceAll:'Замінити в�е',replaceSuccessMsg:'%1 �півпадінь(н�) замінено.'},table:{toolbar:'Таблиц�',title:'Вла�тиво�ті таблиці',menu:'Вла�тиво�ті таблиці',deleteTable:'Видалити таблицю',rows:'Р�дки',columns:'Стовбці',border:'Розмір рамки',widthPx:'пік�елів',widthPc:'від�отків',widthUnit:'Одиниці вимір.',cellSpace:'Проміжок',cellPad:'Внутр. від�туп',caption:'Заголовок таблиці',summary:'Детальний опи� заголовку таблиці',headers:'Заголовки �товбців/р�дків',headersNone:'Без заголовків',headersColumn:'Стовбці',headersRow:'Р�дки',headersBoth:'Стовбці і р�дки',invalidRows:'Кількі�ть р�дків повинна бути більшою 0.',invalidCols:'Кількі�ть �товбців повинна бути більшою 0.',invalidBorder:'Розмір рамки повинен бути цілим чи�лом.',invalidWidth:'Ширина таблиці повинна бути цілим чи�лом.',invalidHeight:'Ви�ота таблиці повинна бути цілим чи�лом.',invalidCellSpacing:'Проміжок між комірками повинен бути цілим чи�лом.',invalidCellPadding:'Внутр. від�туп комірки повинен бути цілим чи�лом.',cell:{menu:'Комірки',insertBefore:'В�тавити комірку перед',insertAfter:'В�тавити комірку пі�л�',deleteCell:'Видалити комірки',merge:"Об'єднати комірки",mergeRight:"Об'єднати �права",mergeDown:"Об'єднати донизу",splitHorizontal:'Розділити комірку по горизонталі',splitVertical:'Розділити комірку по вертикалі',title:'Вла�тиво�ті комірки',cellType:'Тип комірки',rowSpan:"Об'єднанн� р�дків",colSpan:"Об'єднанн� �товпців",wordWrap:'�втоперене�енн� тек�ту',hAlign:'Гориз. вирівнюванн�',vAlign:'Верт. вирівнюванн�',alignBaseline:'По базовій лінії',bgColor:'Колір фону',borderColor:'Колір рамки',data:'Дані',header:'Заголовок',yes:'Так',no:'�і',invalidWidth:'Ширина комірки повинна бути цілим чи�лом.',invalidHeight:'Ви�ота комірки повинна бути цілим чи�лом.',invalidRowSpan:"Кількі�ть об'єднуваних р�дків повинна бути цілим чи�лом.",invalidColSpan:"Кількі�ть об'єднуваних �товбців повинна бути цілим чи�лом.",chooseColor:'Обрати'},row:{menu:'Р�дки',insertBefore:'В�тавити р�док перед',insertAfter:'В�тавити р�док пі�л�',deleteRow:'Видалити р�дки'},column:{menu:'Стовбці',insertBefore:'В�тавити �товбець перед',insertAfter:'В�тавити �товбець пі�л�',deleteColumn:'Видалити �товбці'}},button:{title:'Вла�тиво�ті кнопки',text:'Значенн�',type:'Тип',typeBtn:'Кнопка (button)',typeSbm:'�аді�лати (submit)',typeRst:'Очи�тити (reset)'},checkboxAndRadio:{checkboxTitle:'Вла�тиво�ті галочки',radioTitle:'Вла�тиво�ті кнопки вибору',value:'Значенн�',selected:'Обрана'},form:{title:'Вла�тиво�ті форми',menu:'Вла�тиво�ті форми',action:'Ді�',method:'Метод',encoding:'Кодуванн�'},select:{title:'Вла�тиво�ті �пи�ку',selectInfo:'Інфо',opAvail:'До�тупні варіанти',value:'Значенн�',size:'Кількі�ть',lines:'видимих позицій у �пи�ку',chkMulti:'Спи�ок з мультивибором',opText:'Тек�т',opValue:'Значенн�',btnAdd:'Добавити',btnModify:'Змінити',btnUp:'Вгору',btnDown:'Вниз',btnSetValue:'В�тановити �к обране значенн�',btnDelete:'Видалити'},textarea:{title:'Вла�тиво�ті тек�тової обла�ті',cols:'Стовбці',rows:'Р�дки'},textfield:{title:'Вла�тиво�ті тек�тового пол�',name:"Ім'�",value:'Значенн�',charWidth:'Ширина',maxChars:'Мак�. к-ть �имволів',type:'Тип',typeText:'Тек�т',typePass:'Пароль'},hidden:{title:'Вла�тиво�ті прихованого пол�',name:"Ім'�",value:'Значенн�'},image:{title:'Вла�тиво�ті зображенн�',titleButton:'Вла�тиво�ті кнопки із зображенн�м',menu:'Вла�тиво�ті зображенн�',infoTab:'Інформаці� про зображенн�',btnUpload:'�аді�лати на �ервер',upload:'�аді�лати',alt:'�льтернативний тек�т',lockRatio:'Зберегти пропорції',resetSize:'Очи�тити пол� розмірів',border:'Рамка',hSpace:'Гориз. від�туп',vSpace:'Верт. від�туп',alertUrl:'Будь ла�ка, вкажіть URL зображенн�',linkTab:'По�иланн�',button2Img:'Бажаєте перетворити обрану кнопку-зображенн� на про�те зображенн�?',img2Button:'Бажаєте перетворити обране зображенн� на кнопку-зображенн�?',urlMissing:'Вкажіть URL зображенн�.',validateBorder:'Ширина рамки повинна бути цілим чи�лом.',validateHSpace:'Гориз. від�туп повинен бути цілим чи�лом.',validateVSpace:'Верт. від�туп повинен бути цілим чи�лом.'},flash:{properties:'Вла�тиво�ті Flash',propertiesTab:'Вла�тиво�ті',title:'Вла�тиво�ті Flash',chkPlay:'�втопрограванн�',chkLoop:'Циклічно',chkMenu:'Дозволити меню Flash',chkFull:'Дозволити повноекранний перегл�д',scale:'Ма�штаб',scaleAll:'Показати в�е',scaleNoBorder:'Без рамки',scaleFit:'Поч. розмір',access:'До�туп до �крипта',accessAlways:'Завжди',accessSameDomain:'З того ж домена',accessNever:'�іколи',alignAbsBottom:'По нижньому краю (abs)',alignAbsMiddle:'По �ередині (abs)',alignBaseline:'По базовій лінії',alignTextTop:'Тек�т по верхньому краю',quality:'Які�ть',qualityBest:'Відмінна',qualityHigh:'Ви�ока',qualityAutoHigh:'�втом. відмінна',qualityMedium:'Середн�',qualityAutoLow:'�втом. низька',qualityLow:'�изька',windowModeWindow:'Вікно',windowModeOpaque:'�епрозорі�ть',windowModeTransparent:'Прозорі�ть',windowMode:'Віконний режим',flashvars:'Змінні Flash',bgcolor:'Колір фону',hSpace:'Гориз. від�туп',vSpace:'Верт. від�туп',validateSrc:'Будь ла�ка, вкажіть URL по�иланн�',validateHSpace:'Гориз. від�туп повинен бути цілим чи�лом.',validateVSpace:'Верт. від�туп повинен бути цілим чи�лом.'},spellCheck:{toolbar:'Перевірити орфографію',title:'Перевірка орфографії',notAvailable:'Вибачте, але �ерві� наразі недо�тупний.',errorLoading:'Помилка завантаженн� : %s.',notInDic:'�емає в �ловнику',changeTo:'Замінити на',btnIgnore:'Пропу�тити',btnIgnoreAll:'Пропу�тити в�е',btnReplace:'Замінити',btnReplaceAll:'Замінити в�е',btnUndo:'�азад',noSuggestions:'- немає варіантів -',progress:'Виконуєть�� перевірка орфографії...',noMispell:'Перевірку орфографії завершено: помилок не знайдено',noChanges:'Перевірку орфографії завершено: жодне �лово не змінено',oneChange:'Перевірку орфографії завершено: змінено одне �лово',manyChanges:'Перевірку орфографії завершено: 1% �лів(ова) змінено',ieSpellDownload:'Модуль перевірки орфографії не в�тановлено. Бажаєте завантажити його зараз?'},smiley:{toolbar:'Смайлик',title:'В�тавити �майлик',options:'Опції �майликів'},elementsPath:{eleLabel:'Шл�х',eleTitle:'%1 елемент'},numberedlist:'�умерований �пи�ок',bulletedlist:'Маркірований �пи�ок',indent:'Збільшити від�туп',outdent:'Зменшити від�туп',justify:{left:'По лівому краю',center:'По центру',right:'По правому краю',block:'По ширині'},blockquote:'Цитата',clipboard:{title:'В�тавити',cutError:'�алаштуванн� безпеки Вашого браузера не дозвол�ють редактору автоматично виконувати операції вирізуванн�. Будь ла�ка, викори�товуйте клавіатуру дл� цього (Ctrl/Cmd+X)',copyError:'�алаштуванн� безпеки Вашого браузера не дозвол�ють редактору автоматично виконувати операції копіюванн�. Будь ла�ка, викори�товуйте клавіатуру дл� цього (Ctrl/Cmd+C).',pasteMsg:'Будь ла�ка, в�тавте інформацію з буфера обміну в цю обла�ть, кори�туючи�ь комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та нати�ніть <STRONG>OK</STRONG>.',securityMsg:"Редактор не може отримати пр�мий до�туп до буферу обміну у зв'�зку з налаштуванн�ми Вашого браузера. Вам потрібно в�тавити інформацію в це вікно.",pasteArea:'Обла�ть в�тавки'},pastefromword:{confirmCleanup:'Тек�т, що Ви намагаєте�ь в�тавити, �хожий на �копійований з Word. Бажаєте очи�тити його форматуванн� перед в�тавл�нн�м?',toolbar:'В�тавити з Word',title:'В�тавити з Word',error:'�еможливо очи�тити форматуванн� через внутрішню помилку.'},pasteText:{button:'В�тавити тільки тек�т',title:'В�тавити тільки тек�т'},templates:{button:'Шаблони',title:'Шаблони змі�ту',options:'Опції шаблону',insertOption:'Замінити поточний вмі�т',selectPromptMsg:'Оберіть, будь ла�ка, шаблон дл� відкритт� в редакторі<br>(поточний змі�т буде втрачено):',emptyListMsg:'(�е знайдено жодного шаблону)'},showBlocks:'Показувати блоки',stylesCombo:{label:'Стиль',panelTitle:'Стилі форматуванн�',panelTitle1:'Блочні �тилі',panelTitle2:'Р�дкові �тилі',panelTitle3:"Об'єктні �тилі"},format:{label:'Форматуванн�',panelTitle:'Форматуванн� параграфа',tag_p:'�ормальний',tag_pre:'Форматований',tag_address:'�дре�а',tag_h1:'Заголовок 1',tag_h2:'Заголовок 2',tag_h3:'Заголовок 3',tag_h4:'Заголовок 4',tag_h5:'Заголовок 5',tag_h6:'Заголовок 6',tag_div:'�ормальний (div)'},div:{title:'Створити блок-контейнер',toolbar:'Створити блок-контейнер',cssClassInputLabel:'Кла� CSS',styleSelectLabel:'Стиль CSS',IdInputLabel:'Ідентифікатор',languageCodeInputLabel:'Код мови',inlineStyleInputLabel:'Впи�аний �тиль',advisoryTitleInputLabel:'Змі�т випливаючої підказки',langDirLabel:'�апр�мок мови',langDirLTRLabel:'Зліва направо (LTR)',langDirRTLLabel:'Справа наліво (RTL)',edit:'Редагувати блок',remove:'Видалити блок'},iframe:{title:'�алаштуванн� дл� IFrame',toolbar:'IFrame',noUrl:'Будь ла�ка введіть по�иланн� дл� IFrame',scrolling:'Увімкнути прокрутку',border:'Показати рамки фрейму'},font:{label:'Шрифт',voiceLabel:'Шрифт',panelTitle:'Шрифт'},fontSize:{label:'Розмір',voiceLabel:'Розмір шрифту',panelTitle:'Розмір'},colorButton:{textColorTitle:'Колір тек�ту',bgColorTitle:'Колір фону',panelTitle:'Кольори',auto:'�вто',more:'Кольори...'},colors:{'000':'Чорний',800000:'Бордовий','8B4513':'Коричневий','2F4F4F':'Темний �іро-зелений','008080':'Мор�ької хвилі','000080':'Сливовий','4B0082':'Індиго',696969:'Темно�ірий',B22222:'Темночервоний',A52A2A:'Каштановий',DAA520:'Бежевий','006400':'Темнозелений','40E0D0':'Бірюзовий','0000CD':'Темно�иній',800080:'Пурпурний',808080:'Сірий',F00:'Червоний',FF8C00:'Темнооранжевий',FFD700:'Жовтий','008000':'Зелений','0FF':'Синьо-зелений','00F':'Синій',EE82EE:'Фіолетовий',A9A9A9:'Світло�ірий',FFA07A:'Рожевий',FFA500:'Оранжевий',FFFF00:'Я�кравожовтий','00FF00':'Салатовий',AFEEEE:'Світлобірюзовий',ADD8E6:'Блакитний',DDA0DD:'Світлофіолетовий',D3D3D3:'Срібл��тий',FFF0F5:'Світлорожевий',FAEBD7:'Світлооранжевий',FFFFE0:'Світложовтий',F0FFF0:'Світлозелений',F0FFFF:'Світлий �иньо-зелений',F0F8FF:'Світлоблакитний',E6E6FA:'Лавандовий',FFF:'Білий'},scayt:{title:'Перефірка орфографії по мірі набору',opera_title:'�е підтримуєть�� в Opera',enable:'Ввімкнути SCAYT',disable:'Вимкнути SCAYT',about:'Про SCAYT',toggle:'Перемкнути SCAYT',options:'Опції',langs:'Мови',moreSuggestions:'Більше варіантів',ignore:'Пропу�тити',ignoreAll:'Пропу�тити в�і',addWord:'Додати �лово',emptyDic:'�азва �ловника повинна бути вказана.',noSuggestions:'�емає варіантів',optionsTab:'Опції',allCaps:'Пропу�тити пропи�ні �лова',ignoreDomainNames:'Пропу�тити доменні назви',mixedCase:'Пропу�тити �лова зі змішаним регі�тром',mixedWithDigits:'Пропу�тити �лова, що мі�т�ть цифри',languagesTab:'Мови',dictionariesTab:'Словники',dic_field_name:'�азва �ловника',dic_create:'Створити',dic_restore:'Відновити',dic_delete:'Видалити',dic_rename:'Перейменувати',dic_info:'Як правило, кори�тувацькі �ловники зберігають�� у cookie-файлах. Однак, cookie-файли мають обмеженн� на розмір. Якщо кори�тувацький �ловник зро�тає в об��зі на�тільки, що вже не може бути збережений у cookie-файлі, тоді його можна зберегти на нашому �ервері. Щоб зберегти Ваш пер�ональний �ловник на нашому �ервері необхідно вказати назву �ловника. Якщо Ви вже зберігали �ловник на �ервері, будь ла�ка, вкажіть назву збереженого �ловника і нати�ніть кнопку Відновити.',aboutTab:'Про SCAYT'},about:{title:'Про CKEditor',dlgTitle:'Про CKEditor',help:'Перевірте $1 дл� допомоги.',userGuide:'Ін�трукці� Кори�тувача дл� CKEditor',moreInfo:'Щодо інформації з ліцензуванн� завітайте на наш �айт:',copy:'Copyright &copy; $1. В�і права за�тережено.'},maximize:'Мак�имізувати',minimize:'Мінімізувати',fakeobjects:{anchor:'Якір',flash:'Flash-анімаці�',iframe:'IFrame',hiddenfield:'Приховані Пол�',unknown:"�евідомий об'єкт"},resize:'Пот�гніть дл� зміни розмірів',colordialog:{title:'Обрати колір',options:'Опції кольорів',highlight:'Колір, на �кий вказує кур�ор',selected:'Обраний колір',clear:'Очи�тити'},toolbarCollapse:'Згорнути панель ін�трументів',toolbarExpand:'Розгорнути панель ін�трументів',toolbarGroups:{document:'Документ',clipboard:'Буфер обміну / Ска�увати',editing:'Редагуванн�',forms:'Форми',basicstyles:'О�новний Стиль',paragraph:'Параграф',links:'По�иланн�',insert:'В�тавити',styles:'Стилі',colors:'Кольори',tools:'Ін�трументи'},bidi:{ltr:'�апр�мок тек�ту зліва направо',rtl:'�апр�мок тек�ту �права наліво'},docprops:{label:'Вла�тиво�ті документа',title:'Вла�тиво�ті документа',design:'Дизайн',meta:'Мета дані',chooseColor:'Обрати',other:'<інший>',docTitle:'Заголовок �торінки',charset:'Кодуванн� набору �имволів',charsetOther:'Інше кодуванн� набору �имволів',charsetASCII:'ASCII',charsetCE:'Центрально-європей�ька',charsetCT:'Китай�ька традиційна (Big5)',charsetCR:'Кирилиц�',charsetGR:'Грецька',charsetJP:'Япон�ька',charsetKR:'Корей�ька',charsetTR:'Турецька',charsetUN:'Юнікод (UTF-8)',charsetWE:'Західно-европей�ка�',docType:'Заголовок типу документу',docTypeOther:'Інший заголовок типу документу',xhtmlDec:'Ввімкнути XHTML оголошенн�',bgColor:'Колір тла',bgImage:'URL зображенн� тла',bgFixed:'Тло без прокрутки',txtColor:'Колір тек�ту',margin:'Від�тупи �торінки',marginTop:'Верхній',marginLeft:'Лівий',marginRight:'Правий',marginBottom:'�ижній',metaKeywords:'Ключові �лова документа (розділені комами)',metaDescription:'Опи� документа',metaAuthor:'�втор',metaCopyright:'�втор�ькі права',previewHtml:'<p>Це приклад<strong>тек�ту</strong>. Ви викори�товуєте<a href="javascript:void(0)"> CKEditor </a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/vi.js b/web/imcms/ckeditor/lang/vi.js
new file mode 100644
index 0000000000..8d937d1e1f
--- /dev/null
+++ b/web/imcms/ckeditor/lang/vi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.vi={dir:'ltr',editorTitle:'Trình soạn thảo phong phú, %1',editorHelp:'Nhấn ALT + 0 để được giúp đỡ',toolbars:'Thanh công cụ',editor:'Bộ soạn thảo',source:'Mã HTML',newPage:'Trang mới',save:'Lưu',preview:'Xem trước',cut:'Cắt',copy:'Sao chép',paste:'Dán',print:'In',underline:'Gạch chân',bold:'�ậm',italic:'Nghiêng',selectAll:'Ch�n tất cả',removeFormat:'Xoá định dạng',strike:'Gạch xuyên ngang',subscript:'Chỉ số dưới',superscript:'Chỉ số trên',horizontalrule:'Chèn đư�ng phân cách ngang',pagebreak:'Chèn ngắt trang',pagebreakAlt:'Ngắt trang',unlink:'Xoá liên kết',undo:'Khôi phục thao tác',redo:'Làm lại thao tác',common:{browseServer:'Duyệt trên máy chủ',url:'URL',protocol:'Giao thức',upload:'Tải lên',uploadSubmit:'Tải lên máy chủ',image:'Hình ảnh',flash:'Flash',form:'Biểu mẫu',checkbox:'Nút kiểm',radio:'Nút ch�n',textField:'Trư�ng văn bản',textarea:'Vùng văn bản',hiddenField:'Trư�ng ẩn',button:'Nút',select:'Ô ch�n',imageButton:'Nút hình ảnh',notSet:'<không thiết lập>',id:'�ịnh danh',name:'Tên',langDir:'Hướng ngôn ngữ',langDirLtr:'Trái sang phải (LTR)',langDirRtl:'Phải sang trái (RTL)',langCode:'Mã ngôn ngữ',longDescr:'Mô tả URL',cssClass:'Lớp Stylesheet',advisoryTitle:'Nhan đ� hướng dẫn',cssStyle:'Kiểu (style)',ok:'�ồng ý',cancel:'B� qua',close:'�óng',preview:'Xem trước',generalTab:'Tab chung',advancedTab:'Tab mở rộng',validateNumberFailed:'Giá trị này không phải là số.',confirmNewPage:'M�i thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?',confirmCancel:'Một vài tùy ch�n đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?',options:'Tùy ch�n',target:'�ích đến',targetNew:'Cửa sổ mới (_blank)',targetTop:'Cửa sổ trên cùng (_top)',targetSelf:'Tại trang (_self)',targetParent:'Cửa sổ cha (_parent)',langDirLTR:'Trái sang phải (LTR)',langDirRTL:'Phải sang trái (RTL)',styles:'Kiểu',cssClasses:'Lớp CSS',width:'Chi�u rộng',height:'chi�u cao',align:'Vị trí',alignLeft:'Trái',alignRight:'Phải',alignCenter:'Giữa',alignTop:'Trên',alignMiddle:'Giữa',alignBottom:'Dưới',invalidValue:'Invalid value.',invalidHeight:'Chi�u cao phải là số nguyên.',invalidWidth:'Chi�u rộng phải là số nguyên.',invalidCssLength:'Giá trị quy định cho trư�ng "%1" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).',invalidHtmlLength:'Giá trị quy định cho trư�ng "%1" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).',invalidInlineStyle:'Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhi�u dữ liệu với định dạng "tên:giá trị", cách nhau bằng dấu chấm phẩy.',cssLengthTooltip:'Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).',unavailable:'%1<span class="cke_accessibility">, không có</span>'},contextmenu:{options:'Tùy ch�n menu bổ xung'},specialChar:{toolbar:'Chèn ký tự đặc biệt',title:'Hãy ch�n ký tự đặc biệt',options:'Tùy ch�n các ký tự đặc biệt'},link:{toolbar:'Chèn/Sửa liên kết',other:'<khác>',menu:'Sửa liên kết',title:'Liên kết',info:'Thông tin liên kết',target:'�ích',upload:'Tải lên',advanced:'Mở rộng',type:'Kiểu liên kết',toUrl:'URL',toAnchor:'Neo trong trang này',toEmail:'Thư điện tử',targetFrame:'<khung>',targetPopup:'<cửa sổ popup>',targetFrameName:'Tên khung đích',targetPopupName:'Tên cửa sổ Popup',popupFeatures:'�ặc điểm của cửa sổ Popup',popupResizable:'Có thể thay đổi kích cỡ',popupStatusBar:'Thanh trạng thái',popupLocationBar:'Thanh vị trí',popupToolbar:'Thanh công cụ',popupMenuBar:'Thanh Menu',popupFullScreen:'Toàn màn hình (IE)',popupScrollBars:'Thanh cuộn',popupDependent:'Phụ thuộc (Netscape)',popupLeft:'Vị trí bên trái',popupTop:'Vị trí phía trên',id:'�ịnh danh',langDir:'Hướng ngôn ngữ',langDirLTR:'Trái sang phải (LTR)',langDirRTL:'Phải sang trái (RTL)',acccessKey:'Phím hỗ trợ truy cập',name:'Tên',langCode:'Mã ngôn ngữ',tabIndex:'Chỉ số của Tab',advisoryTitle:'Nhan đ� hướng dẫn',advisoryContentType:'Nội dung hướng dẫn',cssClasses:'Lớp Stylesheet',charset:'Bảng mã của tài nguyên được liên kết đến',styles:'Kiểu (style)',rel:'Quan hệ',selectAnchor:'Ch�n một điểm neo',anchorName:'Theo tên điểm neo',anchorId:'Theo định danh thành phần',emailAddress:'Thư điện tử',emailSubject:'Tiêu đ� thông điệp',emailBody:'Nội dung thông điệp',noAnchors:'(Không có điểm neo nào trong tài liệu)',noUrl:'Hãy đưa vào đư�ng dẫn liên kết (URL)',noEmail:'Hãy đưa vào địa chỉ thư điện tử'},anchor:{toolbar:'Chèn/Sửa điểm neo',menu:'Thuộc tính điểm neo',title:'Thuộc tính điểm neo',name:'Tên của điểm neo',errorName:'Hãy nhập vào tên của điểm neo',remove:'Xóa neo'},list:{numberedTitle:'Thuộc tính danh sách có thứ tự',bulletedTitle:'Thuộc tính danh sách không thứ tự',type:'Kiểu loại',start:'Bắt đầu',validateStartNumber:'Số bắt đầu danh sách phải là một số nguyên.',circle:'Khuyên tròn',disc:'Hình đĩa',square:'Hình vuông',none:'Không gì cả',notset:'<không thiết lập>',armenian:'Số theo kiểu Armenian',georgian:'Số theo kiểu Georgian (an, ban, gan...)',lowerRoman:'Số La Mã kiểu thư�ng (i, ii, iii, iv, v...)',upperRoman:'Số La Mã kiểu HOA (I, II, III, IV, V...)',lowerAlpha:'Kiểu abc thư�ng (a, b, c, d, e...)',upperAlpha:'Kiểu ABC HOA (A, B, C, D, E...)',lowerGreek:'Kiểu Hy Lạp (alpha, beta, gamma...)',decimal:'Kiểu số (1, 2, 3 ...)',decimalLeadingZero:'Kiểu số (01, 02, 03...)'},findAndReplace:{title:'Tìm kiếm và thay thế',find:'Tìm kiếm',replace:'Thay thế',findWhat:'Tìm chuỗi:',replaceWith:'Thay bằng:',notFoundMsg:'Không tìm thấy chuỗi cần tìm.',findOptions:'Tìm tùy ch�n',matchCase:'Phân biệt chữ hoa/thư�ng',matchWord:'Giống toàn bộ từ',matchCyclic:'Giống một phần',replaceAll:'Thay thế tất cả',replaceSuccessMsg:'%1 vị trí đã được thay thế.'},table:{toolbar:'Bảng',title:'Thuộc tính bảng',menu:'Thuộc tính bảng',deleteTable:'Xóa bảng',rows:'Số hàng',columns:'Số cột',border:'Kích thước đư�ng vi�n',widthPx:'�iểm ảnh (px)',widthPc:'Phần trăm (%)',widthUnit:'�ơn vị',cellSpace:'Khoảng cách giữa các ô',cellPad:'Khoảng đệm giữ ô và nội dung',caption:'�ầu đ�',summary:'Tóm lược',headers:'�ầu đ�',headersNone:'Không có',headersColumn:'Cột đầu tiên',headersRow:'Hàng đầu tiên',headersBoth:'Cả hai',invalidRows:'Số lượng hàng phải là một số lớn hơn 0.',invalidCols:'Số lượng cột phải là một số lớn hơn 0.',invalidBorder:'Kích cỡ của đư�ng biên phải là một số nguyên.',invalidWidth:'Chi�u rộng của bảng phải là một số nguyên.',invalidHeight:'Chi�u cao của bảng phải là một số nguyên.',invalidCellSpacing:'Khoảng cách giữa các ô phải là một số nguyên.',invalidCellPadding:'Khoảng đệm giữa ô và nội dung phải là một số nguyên.',cell:{menu:'Ô',insertBefore:'Chèn ô Phía trước',insertAfter:'Chèn ô Phía sau',deleteCell:'Xoá ô',merge:'Kết hợp ô',mergeRight:'Kết hợp sang phải',mergeDown:'Kết hợp xuống dưới',splitHorizontal:'Phân tách ô theo chi�u ngang',splitVertical:'Phân tách ô theo chi�u d�c',title:'Thuộc tính của ô',cellType:'Kiểu của ô',rowSpan:'Kết hợp hàng',colSpan:'Kết hợp cột',wordWrap:'Chữ li�n hàng',hAlign:'Canh l� ngang',vAlign:'Canh l� d�c',alignBaseline:'�ư�ng cơ sở',bgColor:'Màu n�n',borderColor:'Màu vi�n',data:'Dữ liệu',header:'�ầu đ�',yes:'Có',no:'Không',invalidWidth:'Chi�u rộng của ô phải là một số nguyên.',invalidHeight:'Chi�u cao của ô phải là một số nguyên.',invalidRowSpan:'Số hàng kết hợp phải là một số nguyên.',invalidColSpan:'Số cột kết hợp phải là một số nguyên.',chooseColor:'Ch�n màu'},row:{menu:'Hàng',insertBefore:'Chèn hàng phía trước',insertAfter:'Chèn hàng phía sau',deleteRow:'Xoá hàng'},column:{menu:'Cột',insertBefore:'Chèn cột phía trước',insertAfter:'Chèn cột phía sau',deleteColumn:'Xoá cột'}},button:{title:'Thuộc tính của nút',text:'Chuỗi hiển thị (giá trị)',type:'Kiểu',typeBtn:'Nút bấm',typeSbm:'Nút gửi',typeRst:'Nút nhập lại'},checkboxAndRadio:{checkboxTitle:'Thuộc tính nút kiểm',radioTitle:'Thuộc tính nút ch�n',value:'Giá trị',selected:'�ược ch�n'},form:{title:'Thuộc tính biểu mẫu',menu:'Thuộc tính biểu mẫu',action:'Hành động',method:'Phương thức',encoding:'Bảng mã'},select:{title:'Thuộc tính ô ch�n',selectInfo:'Thông tin',opAvail:'Các tùy ch�n có thể sử dụng',value:'Giá trị',size:'Kích cỡ',lines:'dòng',chkMulti:'Cho phép ch�n nhi�u',opText:'Văn bản',opValue:'Giá trị',btnAdd:'Thêm',btnModify:'Thay đổi',btnUp:'Lên',btnDown:'Xuống',btnSetValue:'Giá trị được ch�n',btnDelete:'Nút xoá'},textarea:{title:'Thuộc tính vùng văn bản',cols:'Số cột',rows:'Số hàng'},textfield:{title:'Thuộc tính trư�ng văn bản',name:'Tên',value:'Giá trị',charWidth:'�ộ rộng của ký tự',maxChars:'Số ký tự tối đa',type:'Kiểu',typeText:'Ký tự',typePass:'Mật khẩu'},hidden:{title:'Thuộc tính trư�ng ẩn',name:'Tên',value:'Giá trị'},image:{title:'Thuộc tính của ảnh',titleButton:'Thuộc tính nút của ảnh',menu:'Thuộc tính của ảnh',infoTab:'Thông tin của ảnh',btnUpload:'Tải lên máy chủ',upload:'Tải lên',alt:'Chú thích ảnh',lockRatio:'Giữ nguyên tỷ lệ',resetSize:'Kích thước gốc',border:'�ư�ng vi�n',hSpace:'Khoảng đệm ngang',vSpace:'Khoảng đệm d�c',alertUrl:'Hãy đưa vào đư�ng dẫn của ảnh',linkTab:'Tab liên kết',button2Img:'Bạn có muốn chuyển nút bấm bằng ảnh được ch�n thành ảnh?',img2Button:'Bạn có muốn chuyển đổi ảnh được ch�n thành nút bấm bằng ảnh?',urlMissing:'Thiếu đư�ng dẫn hình ảnh',validateBorder:'Chi�u rộng của đư�ng vi�n phải là một số nguyên dương',validateHSpace:'Khoảng đệm ngang phải là một số nguyên dương',validateVSpace:'Khoảng đệm d�c phải là một số nguyên dương'},flash:{properties:'Thuộc tính Flash',propertiesTab:'Thuộc tính',title:'Thuộc tính Flash',chkPlay:'Tự động chạy',chkLoop:'Lặp',chkMenu:'Cho phép bật menu của Flash',chkFull:'Cho phép toàn màn hình',scale:'Tỷ lệ',scaleAll:'Hiển thị tất cả',scaleNoBorder:'Không đư�ng vi�n',scaleFit:'Vừa vặn',access:'Truy cập mã',accessAlways:'Luôn luôn',accessSameDomain:'Cùng tên mi�n',accessNever:'Không bao gi�',alignAbsBottom:'Dưới tuyệt đối',alignAbsMiddle:'Giữa tuyệt đối',alignBaseline:'�ư�ng cơ sở',alignTextTop:'Phía trên chữ',quality:'Chất lượng',qualityBest:'Tốt nhất',qualityHigh:'Cao',qualityAutoHigh:'Cao tự động',qualityMedium:'Trung bình',qualityAutoLow:'Thấp tự động',qualityLow:'Thấp',windowModeWindow:'Cửa sổ',windowModeOpaque:'M� đục',windowModeTransparent:'Trong suốt',windowMode:'Chế độ cửa sổ',flashvars:'Các biến số dành cho Flash',bgcolor:'Màu n�n',hSpace:'Khoảng đệm ngang',vSpace:'Khoảng đệm d�c',validateSrc:'Hãy đưa vào đư�ng dẫn liên kết',validateHSpace:'Khoảng đệm ngang phải là số nguyên.',validateVSpace:'Khoảng đệm d�c phải là số nguyên.'},spellCheck:{toolbar:'Kiểm tra chính tả',title:'Kiểm tra chính tả',notAvailable:'Xin lỗi, dịch vụ này hiện tại không có.',errorLoading:'Lỗi khi đang nạp dịch vụ ứng dụng: %s.',notInDic:'Không có trong từ điển',changeTo:'Chuyển thành',btnIgnore:'B� qua',btnIgnoreAll:'B� qua tất cả',btnReplace:'Thay thế',btnReplaceAll:'Thay thế tất cả',btnUndo:'Phục hồi lại',noSuggestions:'- Không đưa ra gợi ý v� từ -',progress:'�ang tiến hành kiểm tra chính tả...',noMispell:'Hoàn tất kiểm tra chính tả: Không có lỗi chính tả',noChanges:'Hoàn tất kiểm tra chính tả: Không có từ nào được thay đổi',oneChange:'Hoàn tất kiểm tra chính tả: Một từ đã được thay đổi',manyChanges:'Hoàn tất kiểm tra chính tả: %1 từ đã được thay đổi',ieSpellDownload:'Chức năng kiểm tra chính tả chưa được cài đặt. Bạn có muốn tải v� ngay bây gi�?'},smiley:{toolbar:'Hình biểu lộ cảm xúc (mặt cư�i)',title:'Chèn hình biểu lộ cảm xúc (mặt cư�i)',options:'Tùy ch�n hình  biểu lộ cảm xúc'},elementsPath:{eleLabel:'Nhãn thành phần',eleTitle:'%1 thành phần'},numberedlist:'Chèn/Xoá Danh sách có thứ tự',bulletedlist:'Chèn/Xoá Danh sách không thứ tự',indent:'Dịch vào trong',outdent:'Dịch ra ngoài',justify:{left:'Canh trái',center:'Canh giữa',right:'Canh phải',block:'Canh đ�u'},blockquote:'Khối trích dẫn',clipboard:{title:'Dán',cutError:'Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).',copyError:'Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).',pasteMsg:'Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>�ồng ý</STRONG>.',securityMsg:'Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.',pasteArea:'Khu vực dán'},pastefromword:{confirmCleanup:'Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại b� định dạng Word trước khi dán?',toolbar:'Dán với định dạng Word',title:'Dán với định dạng Word',error:'Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ'},pasteText:{button:'Dán theo định dạng văn bản thuần',title:'Dán theo định dạng văn bản thuần'},templates:{button:'Mẫu dựng sẵn',title:'Nội dung Mẫu dựng sẵn',options:'Tùy ch�n mẫu dựng sẵn',insertOption:'Thay thế nội dung hiện tại',selectPromptMsg:'Hãy ch�n mẫu dựng sẵn để mở trong trình biên tập<br>(nội dung hiện tại sẽ bị mất):',emptyListMsg:'(Không có mẫu dựng sẵn nào được định nghĩa)'},showBlocks:'Hiển thị các khối',stylesCombo:{label:'Kiểu',panelTitle:'Phong cách định dạng',panelTitle1:'Kiểu khối',panelTitle2:'Kiểu trực tiếp',panelTitle3:'Kiểu đối tượng'},format:{label:'�ịnh dạng',panelTitle:'�ịnh dạng',tag_p:'Bình thư�ng (P)',tag_pre:'�ã thiết lập',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Bình thư�ng (DIV)'},div:{title:'Tạo khối các thành phần',toolbar:'Tạo khối các thành phần',cssClassInputLabel:'Các lớp CSS',styleSelectLabel:'Kiểu (style)',IdInputLabel:'�ịnh danh (id)',languageCodeInputLabel:'Mã ngôn ngữ',inlineStyleInputLabel:'Kiểu nội dòng',advisoryTitleInputLabel:'Nhan đ� hướng dẫn',langDirLabel:'Hướng ngôn ngữ',langDirLTRLabel:'Trái sang phải (LTR)',langDirRTLLabel:'Phải qua trái (RTL)',edit:'Chỉnh sửa',remove:'Xóa b�'},iframe:{title:'Thuộc tính iframe',toolbar:'Iframe',noUrl:'Vui lòng nhập địa chỉ iframe',scrolling:'Kích hoạt thanh cuộn',border:'Hiển thị vi�n khung'},font:{label:'Phông',voiceLabel:'Phông',panelTitle:'Phông'},fontSize:{label:'Cỡ chữ',voiceLabel:'Kích cỡ phông',panelTitle:'Cỡ chữ'},colorButton:{textColorTitle:'Màu chữ',bgColorTitle:'Màu n�n',panelTitle:'Màu sắc',auto:'Tự động',more:'Màu khác...'},colors:{'000':'�en',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Nâu',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Xám',F00:'��',FF8C00:'Dark Orange',FFD700:'Vàng','008000':'Xanh lá cây','0FF':'Cyan','00F':'Xanh da tr�i',EE82EE:'Tím',A9A9A9:'Xám tối',FFA07A:'Light Salmon',FFA500:'Màu cam',FFFF00:'Vàng','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'Trắng'},scayt:{title:'Kiểm tra chính tả ngay khi gõ chữ (SCAYT)',opera_title:'Không hỗ trợ trên trình duyệt Opera',enable:'Bật SCAYT',disable:'Tắt SCAYT',about:'Thông tin v� SCAYT',toggle:'Bật tắt SCAYT',options:'Tùy ch�n',langs:'Ngôn ngữ',moreSuggestions:'�� xuất thêm',ignore:'B� qua',ignoreAll:'B� qua tất cả',addWord:'Thêm từ',emptyDic:'Tên của từ điển không được để trống.',noSuggestions:'Không đưa ra gợi ý v� từ',optionsTab:'Tùy ch�n',allCaps:'Không phân biệt chữ HOA chữ thư�ng',ignoreDomainNames:'B� qua tên mi�n',mixedCase:'Không phân biệt loại chữ',mixedWithDigits:'Không phân biệt chữ và số',languagesTab:'Tab ngôn ngữ',dictionariesTab:'Từ điển',dic_field_name:'Tên từ điển',dic_create:'Tạo',dic_restore:'Phục hồi',dic_delete:'Xóa',dic_rename:'Thay tên',dic_info:'Ban đầu, từ điển ngư�i dùng được lưu trữ trong một cookie. Tuy nhiên, kích thước cookie bị giới hạn. Khi ngư�i sử dụng từ điển phát triển đến điểm không thể được lưu trữ trong cookie, từ điển sẽ được lưu trữ trên máy chủ của chúng tôi. �ể lưu trữ từ điển cá nhân của bạn trên máy chủ của chúng tôi, bạn nên xác định một tên cho từ điển của bạn. Nếu bạn đã có một cuốn từ điển được lưu trữ, xin vui lòng gõ tên của nó và nhấn vào nút Khôi phục.',aboutTab:'Thông tin'},about:{title:'Thông tin v� CKEditor',dlgTitle:'Thông tin v� CKEditor',help:'Kiểm tra $1 để được giúp đỡ.',userGuide:'Hướng dẫn sử dụng CKEditor',moreInfo:'Vui lòng ghé thăm trang web của chúng tôi để có thông tin v� giấy phép:',copy:'Bản quy�n &copy; $1. Giữ toàn quy�n.'},maximize:'Phóng to tối đa',minimize:'Thu nh�',fakeobjects:{anchor:'�iểm neo',flash:'Flash',iframe:'IFrame',hiddenfield:'Trư�ng ẩn',unknown:'�ối tượng không rõ ràng'},resize:'Kéo rê để thay đổi kích cỡ',colordialog:{title:'Ch�n màu',options:'Tùy ch�n màu',highlight:'Màu ch�n',selected:'Màu đã ch�n',clear:'Xóa b�'},toolbarCollapse:'Thu g�n thanh công cụ',toolbarExpand:'Mở rộng thnah công cụ',toolbarGroups:{document:'Tài liệu',clipboard:'Clipboard/Undo',editing:'Chỉnh sửa',forms:'Bảng biểu',basicstyles:'Kiểu cơ bản',paragraph:'�oạn',links:'Liên kết',insert:'Chèn',styles:'Kiểu',colors:'Màu sắc',tools:'Công cụ'},bidi:{ltr:'Văn bản hướng từ trái sang phải',rtl:'Văn bản hướng từ phải sang trái'},docprops:{label:'Thuộc tính Tài liệu',title:'Thuộc tính Tài liệu',design:'Thiết kế',meta:'Siêu dữ liệu',chooseColor:'Ch�n màu',other:'<khác>',docTitle:'Tiêu đ� Trang',charset:'Bảng mã ký tự',charsetOther:'Bảng mã ký tự khác',charsetASCII:'ASCII',charsetCE:'Trung Âu',charsetCT:'Tiếng Trung Quốc (Big5)',charsetCR:'Tiếng Kirin',charsetGR:'Tiếng Hy Lạp',charsetJP:'Tiếng Nhật',charsetKR:'Tiếng Hàn',charsetTR:'Tiếng Thổ Nhĩ Kỳ',charsetUN:'Unicode (UTF-8)',charsetWE:'Tây Âu',docType:'Kiểu �� mục Tài liệu',docTypeOther:'Kiểu �� mục Tài liệu khác',xhtmlDec:'Bao gồm cả định nghĩa XHTML',bgColor:'Màu n�n',bgImage:'URL của Hình ảnh n�n',bgFixed:'Không cuộn n�n',txtColor:'Màu chữ',margin:'�ư�ng biên của Trang',marginTop:'Trên',marginLeft:'Trái',marginRight:'Phải',marginBottom:'Dưới',metaKeywords:'Các từ khóa chỉ mục tài liệu (phân cách bởi dấu phẩy)',metaDescription:'Mô tả tài liệu',metaAuthor:'Tác giả',metaCopyright:'Bản quy�n',previewHtml:'<p>�ây là một số <strong>văn bản mẫu</strong>. Bạn đang sử dụng <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/lang/zh-cn.js b/web/imcms/ckeditor/lang/zh-cn.js
new file mode 100644
index 0000000000..4faf796eaf
--- /dev/null
+++ b/web/imcms/ckeditor/lang/zh-cn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['zh-cn']={dir:'ltr',editorTitle:'富文本编辑器，%1',editorHelp:'按 ALT+0 获得帮助',toolbars:'工具�',editor:'所��所得编辑器',source:'��',newPage:'新建',save:'�存',preview:'预览',cut:'剪切',copy:'�制',paste:'粘贴',print:'打�',underline:'下划线',bold:'加粗',italic:'倾斜',selectAll:'全选',removeFormat:'清除格�',strike:'删除线',subscript:'下标',superscript:'上标',horizontalrule:'�入水平线',pagebreak:'�入分页符',pagebreakAlt:'分页符',unlink:'�消超链接',undo:'撤消',redo:'��',common:{browseServer:'�览�务器',url:'�文件',protocol:'�议',upload:'上传',uploadSubmit:'上传到�务器上',image:'图象',flash:'Flash',form:'表�',checkbox:'�选框',radio:'�选按钮',textField:'�行文本',textarea:'多行文本',hiddenField:'��域',button:'按钮',select:'列表/��',imageButton:'图�域',notSet:'<没有设置>',id:'ID',name:'�称',langDir:'语言方�',langDirLtr:'从左到� (LTR)',langDirRtl:'从�到左 (RTL)',langCode:'语言代�',longDescr:'详细说明地�',cssClass:'样�类�称',advisoryTitle:'标题',cssStyle:'行内样�',ok:'确定',cancel:'�消',close:'关闭',preview:'预览',generalTab:'常规',advancedTab:'高级',validateNumberFailed:'需�输入数字格�',confirmNewPage:'当�文档内容未�存,是�确认新建文档？',confirmCancel:'部分修改尚未�存，是�确认关闭对�框？',options:'选项',target:'目标窗�',targetNew:'新窗� (_blank)',targetTop:'整页 (_top)',targetSelf:'本窗� (_self)',targetParent:'父窗� (_parent)',langDirLTR:'从左到� (LTR)',langDirRTL:'从�到左 (RTL)',styles:'样�',cssClasses:'样�类',width:'宽度',height:'高度',align:'对�方�',alignLeft:'左对�',alignRight:'�对�',alignCenter:'居中',alignTop:'顶端',alignMiddle:'居中',alignBottom:'底部',invalidValue:'无效的值。',invalidHeight:'高度必须为数字格�',invalidWidth:'宽度必须为数字格�',invalidCssLength:'该字段必须为��的CSS长度值，包括��(px, %, in, cm, mm, em, ex, pt 或 pc)',invalidHtmlLength:'该字段必须为��的HTML长度值，包括��(px 或 %)',invalidInlineStyle:'内�样�必须为格�是以分�分隔的一个或多个“属性� : 属性值�',cssLengthTooltip:'该字段必须为��的CSS长度值，包括��(px, %, in, cm, mm, em, ex, pt 或 pc)',unavailable:'%1<span class="cke_accessibility">, ��用</span>'},contextmenu:{options:'快���选项'},specialChar:{toolbar:'�入特殊符�',title:'选择特殊符�',options:'特殊符�选项'},link:{toolbar:'�入/编辑超链接',other:'<其他>',menu:'编辑超链接',title:'超链接',info:'超链接信�',target:'目标',upload:'上传',advanced:'高级',type:'超链接类型',toUrl:'地�',toAnchor:'页内锚点链接',toEmail:'电�邮件',targetFrame:'<框架>',targetPopup:'<弹出窗�>',targetFrameName:'目标框架�称',targetPopupName:'弹出窗��称',popupFeatures:'弹出窗�属性',popupResizable:'�缩放',popupStatusBar:'状��',popupLocationBar:'地��',popupToolbar:'工具�',popupMenuBar:'���',popupFullScreen:'全� (IE)',popupScrollBars:'滚动�',popupDependent:'�附 (NS)',popupLeft:'左',popupTop:'�',id:'ID',langDir:'语言方�',langDirLTR:'从左到� (LTR)',langDirRTL:'从�到左 (RTL)',acccessKey:'访问键',name:'�称',langCode:'语言代�',tabIndex:'Tab 键次�',advisoryTitle:'标题',advisoryContentType:'内容类型',cssClasses:'样�类�称',charset:'字符编�',styles:'行内样�',rel:'关�',selectAnchor:'选择一个锚点',anchorName:'按锚点�称',anchorId:'按锚点 ID',emailAddress:'地�',emailSubject:'主题',emailBody:'内容',noAnchors:'(此文档没有�用的锚点)',noUrl:'请输入超链接地�',noEmail:'请输入电�邮件地�'},anchor:{toolbar:'�入/编辑锚点链接',menu:'锚点链接属性',title:'锚点链接属性',name:'锚点�称',errorName:'请输入锚点�称',remove:'删除锚点'},list:{numberedTitle:'编�列表属性',bulletedTitle:'项目列表属性',type:'标记类型',start:'开始��',validateStartNumber:'列表开始��必须为整数格�',circle:'空心圆',disc:'实心圆',square:'实心方�',none:'无标记',notset:'<没有设置>',armenian:'传统的亚美尼亚编�方�',georgian:'传统的乔治亚编�方�(an, ban, gan, 等)',lowerRoman:'�写罗马数字(i, ii, iii, iv, v, 等)',upperRoman:'大写罗马数字(I, II, III, IV, V, 等)',lowerAlpha:'�写英文字�(a, b, c, d, e, 等)',upperAlpha:'大写英文字�(A, B, C, D, E, 等)',lowerGreek:'�写希腊字�(alpha, beta, gamma, 等)',decimal:'数字 (1, 2, 3, 等)',decimalLeadingZero:'0开头的数字标记(01, 02, 03, 等)'},findAndReplace:{title:'查找和替�',find:'查找',replace:'替�',findWhat:'查找:',replaceWith:'替�:',notFoundMsg:'指定文本没有找到',findOptions:'查找选项',matchCase:'区分大�写',matchWord:'全字匹�',matchCyclic:'循环匹�',replaceAll:'全部替�',replaceSuccessMsg:'共完� %1 处替�.'},table:{toolbar:'表格',title:'表格属性',menu:'表格属性',deleteTable:'删除表格',rows:'行数',columns:'列数',border:'边框',widthPx:'�素',widthPc:'百分比',widthUnit:'宽度��',cellSpace:'间�',cellPad:'边�',caption:'标题',summary:'摘�',headers:'标题�元格',headersNone:'无',headersColumn:'第一列',headersRow:'第一行',headersBoth:'第一列和第一行',invalidRows:'指定的列数必须大于零',invalidCols:'指定的行数必须大于零',invalidBorder:'边框粗细必须为数字格�',invalidWidth:'表格宽度必须为数字格�',invalidHeight:'表格高度必须为数字格�',invalidCellSpacing:'�元格间�必须为数字格�',invalidCellPadding:'�元格填充必须为数字格�',cell:{menu:'�元格',insertBefore:'在左侧�入�元格',insertAfter:'在�侧�入�元格',deleteCell:'删除�元格',merge:'�并�元格',mergeRight:'���并�元格',mergeDown:'�下�并�元格',splitHorizontal:'水平拆分�元格',splitVertical:'垂直拆分�元格',title:'�元格属性',cellType:'�元格类型',rowSpan:'纵跨行数',colSpan:'横跨列数',wordWrap:'自动�行',hAlign:'水平对�',vAlign:'垂直对�',alignBaseline:'基线',bgColor:'背景颜色',borderColor:'边框颜色',data:'数�',header:'表头',yes:'是',no:'�',invalidWidth:'�元格宽度必须为数字格�',invalidHeight:'�元格高度必须为数字格�',invalidRowSpan:'行跨度必须为整数格�',invalidColSpan:'列跨度必须为整数格�',chooseColor:'选择'},row:{menu:'行',insertBefore:'在上方�入行',insertAfter:'在下方�入行',deleteRow:'删除行'},column:{menu:'列',insertBefore:'在左侧�入列',insertAfter:'在�侧�入列',deleteColumn:'删除列'}},button:{title:'按钮属性',text:'标签(值)',type:'类型',typeBtn:'按钮',typeSbm:'�交',typeRst:'�设'},checkboxAndRadio:{checkboxTitle:'�选框属性',radioTitle:'�选按钮属性',value:'选定值',selected:'已勾选'},form:{title:'表�属性',menu:'表�属性',action:'动作',method:'方法',encoding:'表�编�'},select:{title:'��/列表属性',selectInfo:'选择信�',opAvail:'�选项',value:'值',size:'高度',lines:'行',chkMulti:'�许多选',opText:'选项文本',opValue:'选项值',btnAdd:'添加',btnModify:'修改',btnUp:'上移',btnDown:'下移',btnSetValue:'设为�始选定',btnDelete:'删除'},textarea:{title:'多行文本属性',cols:'字符宽度',rows:'行数'},textfield:{title:'�行文本属性',name:'�称',value:'�始值',charWidth:'字符宽度',maxChars:'最多字符数',type:'类型',typeText:'文本',typePass:'密�'},hidden:{title:'��域属性',name:'�称',value:'�始值'},image:{title:'图象属性',titleButton:'图�域属性',menu:'图象属性',infoTab:'图象',btnUpload:'上传到�务器上',upload:'上传',alt:'替�文本',lockRatio:'�定比例',resetSize:'原始尺寸',border:'边框大�',hSpace:'水平间�',vSpace:'垂直间�',alertUrl:'请输入图象地�',linkTab:'链接',button2Img:'确定�把当�按钮改�为图��?',img2Button:'确定�把当�图�改�为按钮�?',urlMissing:'缺少图��文件地�',validateBorder:'边框大�必须为整数格�',validateHSpace:'水平间�必须为整数格�',validateVSpace:'垂直间�必须为整数格�'},flash:{properties:'Flash 属性',propertiesTab:'属性',title:'标题',chkPlay:'自动播放',chkLoop:'循环',chkMenu:'�用 Flash ��',chkFull:'�用全�',scale:'缩放',scaleAll:'全部显示',scaleNoBorder:'无边框',scaleFit:'严格匹�',access:'�许脚本访问',accessAlways:'总是',accessSameDomain:'�域',accessNever:'从�',alignAbsBottom:'�对底部',alignAbsMiddle:'�对居中',alignBaseline:'基线',alignTextTop:'文本上方',quality:'质�',qualityBest:'最好',qualityHigh:'高',qualityAutoHigh:'高(自动)',qualityMedium:'中(自动)',qualityAutoLow:'低(自动)',qualityLow:'低',windowModeWindow:'窗体',windowModeOpaque:'��明',windowModeTransparent:'�明',windowMode:'窗体模�',flashvars:'Flash ��',bgcolor:'背景颜色',hSpace:'水平间�',vSpace:'垂直间�',validateSrc:'请输入�文件地�',validateHSpace:'水平间�必须为数字格�',validateVSpace:'垂直间�必须为数字格�'},spellCheck:{toolbar:'拼写检查',title:'拼写检查',notAvailable:'抱歉, �务目�暂��用',errorLoading:'加载应该�务主机时出错: %s.',notInDic:'没有在字典里',changeTo:'更改为',btnIgnore:'忽略',btnIgnoreAll:'全部忽略',btnReplace:'替�',btnReplaceAll:'全部替�',btnUndo:'撤消',noSuggestions:'- 没有建议 -',progress:'正在进行拼写检查...',noMispell:'拼写检查完�: 没有�现拼写错误',noChanges:'拼写检查完�: 没有更改任何��',oneChange:'拼写检查完�: 更改了一个��',manyChanges:'拼写检查完�: 更改了 %1 个��',ieSpellDownload:'拼写检查�件还没安装, 您是�想现在就下载?'},smiley:{toolbar:'表情符',title:'�入表情图标',options:'表情图标选项'},elementsPath:{eleLabel:'元素路径',eleTitle:'%1 元素'},numberedlist:'编�列表',bulletedlist:'项目列表',indent:'增加缩进�',outdent:'�少缩进�',justify:{left:'左对�',center:'居中',right:'�对�',block:'两端对�'},blockquote:'�引用',clipboard:{title:'粘贴',cutError:'您的�览器安全设置��许编辑器自动执行剪切�作, 请使用键盘快�键(Ctrl/Cmd+X)�完�',copyError:'您的�览器安全设置��许编辑器自动执行�制�作, 请使用键盘快�键(Ctrl/Cmd+C)�完�',pasteMsg:'请使用键盘快�键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下�的方框里，�按 <STRONG>确定</STRONG>',securityMsg:'因为您的�览器的安全设置原因, 本编辑器�能直接访问您的剪贴�内容, 你需�在本窗��新粘贴一次。',pasteArea:'粘贴区域'},pastefromword:{confirmCleanup:'您�粘贴的内容好�是�自 MS Word, 是��清除 MS Word 格���粘贴?',toolbar:'从 MS Word 粘贴',title:'从 MS Word 粘贴',error:'由于内部错误无法清��粘贴的数�'},pasteText:{button:'粘贴为无格�文本',title:'粘贴为无格�文本'},templates:{button:'模�',title:'内容模�',options:'模�选项',insertOption:'替�当�内容',selectPromptMsg:'请选择编辑器内容模�:',emptyListMsg:'(没有模�)'},showBlocks:'显示区�',stylesCombo:{label:'样�',panelTitle:'样�',panelTitle1:'�级元素样�',panelTitle2:'内�元素样�',panelTitle3:'对象元素样�'},format:{label:'格�',panelTitle:'格�',tag_p:'普通',tag_pre:'已编排格�',tag_address:'地�',tag_h1:'标题 1',tag_h2:'标题 2',tag_h3:'标题 3',tag_h4:'标题 4',tag_h5:'标题 5',tag_h6:'标题 6',tag_div:'段�(DIV)'},div:{title:'创建 DIV 容器',toolbar:'创建 DIV 容器',cssClassInputLabel:'样�类�称',styleSelectLabel:'样�',IdInputLabel:'ID',languageCodeInputLabel:'语言代�',inlineStyleInputLabel:'行内样�',advisoryTitleInputLabel:'标题',langDirLabel:'语言方�',langDirLTRLabel:'从左到� (LTR)',langDirRTLLabel:'从�到左 (RTL)',edit:'编辑 DIV',remove:'移除 DIV'},iframe:{title:'IFrame 属性',toolbar:'IFrame',noUrl:'请输入框架的 URL',scrolling:'�许滚动�',border:'显示框架边框'},font:{label:'字体',voiceLabel:'字体',panelTitle:'字体'},fontSize:{label:'大�',voiceLabel:'文字大�',panelTitle:'大�'},colorButton:{textColorTitle:'文本颜色',bgColorTitle:'背景颜色',panelTitle:'颜色',auto:'自动',more:'其它颜色...'},colors:{'000':'黑',800000:'�红','8B4513':'深�','2F4F4F':'墨绿','008080':'绿�石','000080':'海军�','4B0082':'��',696969:'暗�',B22222:'砖红',A52A2A:'�',DAA520:'金黄','006400':'深绿','40E0D0':'�绿','0000CD':'中�',800080:'紫',808080:'�',F00:'红',FF8C00:'深橙',FFD700:'金','008000':'绿','0FF':'�','00F':'�',EE82EE:'紫罗兰',A9A9A9:'深�',FFA07A:'亮橙',FFA500:'橙',FFFF00:'黄','00FF00':'水绿',AFEEEE:'粉�',ADD8E6:'亮�',DDA0DD:'梅红',D3D3D3:'淡�',FFF0F5:'淡紫红',FAEBD7:'�董白',FFFFE0:'淡黄',F0FFF0:'蜜白',F0FFFF:'天�',F0F8FF:'淡�',E6E6FA:'淡紫',FFF:'白'},scayt:{title:'�时拼写检查',opera_title:'�支� Opera �览器',enable:'�用�时拼写检查',disable:'�用�时拼写检查',about:'关于�时拼写检查',toggle:'暂�/�用�时拼写检查',options:'选项',langs:'语言',moreSuggestions:'更多拼写建议',ignore:'忽略',ignoreAll:'全部忽略',addWord:'添加��',emptyDic:'字典��应为空.',noSuggestions:'没有建议',optionsTab:'选项',allCaps:'忽略所有大写��',ignoreDomainNames:'忽略域�',mixedCase:'忽略大�写混�的��',mixedWithDigits:'忽略带数字的��',languagesTab:'语言',dictionariesTab:'字典',dic_field_name:'字典�称',dic_create:'创建',dic_restore:'还原',dic_delete:'删除',dic_rename:'�命�',dic_info:'一开始用户�典储存在 Cookie 中, 但是 Cookies 的容�是有�的, 当用户�典增长到超出 Cookie �制时就无法�储存了, 这时您�以将�典储存到我们的�务器上. �把您的个人�典到储存到我们的�务器上的�, 需�为您的�典指定一个�称, 如果您在我们的�务器上已�有储存有一个�典, 请输入�典�称并按还原按钮.',aboutTab:'关于'},about:{title:'关于CKEditor',dlgTitle:'关于CKEditor',help:'请访问 $1 以获�帮助.',userGuide:'CKEditor 用户�导',moreInfo:'访问我们的网站以获�更多关于�议的信�',copy:'Copyright &copy; $1. 版�所有。'},maximize:'全�',minimize:'最�化',fakeobjects:{anchor:'锚点',flash:'Flash 动画',iframe:'IFrame',hiddenfield:'��域',unknown:'未知对象'},resize:'拖拽以改�尺寸',colordialog:{title:'选择颜色',options:'颜色选项',highlight:'高亮',selected:'选择颜色',clear:'清除'},toolbarCollapse:'折�工具�',toolbarExpand:'展开工具�',toolbarGroups:{document:'文档',clipboard:'剪贴�/撤销',editing:'编辑',forms:'表�',basicstyles:'基本格�',paragraph:'段�',links:'链接',insert:'�入',styles:'样�',colors:'颜色',tools:'工具'},bidi:{ltr:'文字方�为从左至�',rtl:'文字方�为从�至左'},docprops:{label:'页�属性',title:'页�属性',design:'设计',meta:'Meta 数�',chooseColor:'选择',other:'<其他>',docTitle:'页�标题',charset:'字符编�',charsetOther:'其它字符编�',charsetASCII:'ASCII',charsetCE:'中欧',charsetCT:'�体中文 (Big5)',charsetCR:'西里尔文',charsetGR:'希腊文',charsetJP:'日文',charsetKR:'韩文',charsetTR:'土耳其文',charsetUN:'Unicode (UTF-8)',charsetWE:'西欧',docType:'文档类型',docTypeOther:'其它文档类型',xhtmlDec:'包� XHTML 声明',bgColor:'背景颜色',bgImage:'背景图�',bgFixed:'�滚动背景图�',txtColor:'文本颜色',margin:'页�边�',marginTop:'上',marginLeft:'左',marginRight:'�',marginBottom:'下',metaKeywords:'页�索引关键字 (用�角逗�[,]分隔)',metaDescription:'页�说明',metaAuthor:'作者',metaCopyright:'版�',previewHtml:'<p>这是一些<strong>演示用文字</strong>。您当�正在使用<a href="javascript:void(0)">CKEditor</a>。</p>'}};
diff --git a/web/imcms/ckeditor/lang/zh.js b/web/imcms/ckeditor/lang/zh.js
new file mode 100644
index 0000000000..b274125b6a
--- /dev/null
+++ b/web/imcms/ckeditor/lang/zh.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.zh={dir:'ltr',editorTitle:'富文本編輯器，%1',editorHelp:'按 ALT+0 以�得幫助',toolbars:'編輯器工具欄',editor:'富文本編輯器',source:'原始碼',newPage:'開新檔案',save:'儲存',preview:'�覽',cut:'剪下',copy:'複製',paste:'貼上',print:'列�',underline:'底線',bold:'粗體',italic:'斜體',selectAll:'全�',removeFormat:'清除格�',strike:'刪除線',subscript:'下標',superscript:'上標',horizontalrule:'�入水平線',pagebreak:'�入分�符號',pagebreakAlt:'分�符號',unlink:'移除超連�',undo:'復原',redo:'�複',common:{browseServer:'�覽伺�器端',url:'URL',protocol:'通訊�定',upload:'上傳',uploadSubmit:'上傳至伺�器',image:'影�',flash:'Flash',form:'表單',checkbox:'核�方塊',radio:'�項按鈕',textField:'文字方塊',textarea:'文字�域',hiddenField:'隱�欄�',button:'按鈕',select:'清單/�單',imageButton:'影�按鈕',notSet:'<尚未設定>',id:'ID',name:'�稱',langDir:'語言方�',langDirLtr:'由左而� (LTR)',langDirRtl:'由�而左 (RTL)',langCode:'語言代碼',longDescr:'詳細 URL',cssClass:'樣�表類別',advisoryTitle:'標題',cssStyle:'樣�',ok:'確定',cancel:'�消',close:'关闭',preview:'预览',generalTab:'一般',advancedTab:'進階',validateNumberFailed:'需�輸入數字格�',confirmNewPage:'�存的修改尚未儲存，�開新檔案？',confirmCancel:'部份�項尚未儲存，�關閉�話盒？',options:'选项',target:'目标',targetNew:'新窗�(_blank)',targetTop:'整页(_top)',targetSelf:'本窗�(_self)',targetParent:'父窗�(_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'寬度',height:'高度',align:'�齊',alignLeft:'�左�齊',alignRight:'���齊',alignCenter:'置中',alignTop:'�上�齊',alignMiddle:'置中�齊',alignBottom:'�下�齊',invalidValue:'Invalid value.',invalidHeight:'高度必須為數字格�',invalidWidth:'寬度必須為數字格�',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, 已關閉</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'�入特殊符號',title:'請�擇特殊符號',options:'Special Character Options'},link:{toolbar:'�入/編輯超連�',other:'<其他>',menu:'編輯超連�',title:'超連�',info:'超連�資訊',target:'目標',upload:'上傳',advanced:'進階',type:'超連接類型',toUrl:'URL',toAnchor:'本�錨點',toEmail:'電�郵件',targetFrame:'<框架>',targetPopup:'<快顯視窗>',targetFrameName:'目標框架�稱',targetPopupName:'快顯視窗�稱',popupFeatures:'快顯視窗屬性',popupResizable:'�縮放',popupStatusBar:'狀態列',popupLocationBar:'網�列',popupToolbar:'工具列',popupMenuBar:'�單列',popupFullScreen:'全螢幕 (IE)',popupScrollBars:'�軸',popupDependent:'從屬 (NS)',popupLeft:'左',popupTop:'�',id:'ID',langDir:'語言方�',langDirLTR:'由左而� (LTR)',langDirRTL:'由�而左 (RTL)',acccessKey:'存��',name:'�稱',langCode:'語言方�',tabIndex:'定�順�',advisoryTitle:'標題',advisoryContentType:'內容類型',cssClasses:'樣�表類別',charset:'連�資�之編碼',styles:'樣�',rel:'Relationship',selectAnchor:'請�擇錨點',anchorName:'�錨點�稱',anchorId:'�元件 ID',emailAddress:'電�郵件',emailSubject:'郵件主旨',emailBody:'郵件內容',noAnchors:'(本文件尚無�用之錨點)',noUrl:'請輸入欲連�的 URL',noEmail:'請輸入電�郵件��'},anchor:{toolbar:'�入/編輯錨點',menu:'錨點屬性',title:'錨點屬性',name:'錨點�稱',errorName:'請輸入錨點�稱',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'尋找與�代',find:'尋找',replace:'�代',findWhat:'尋找:',replaceWith:'�代:',notFoundMsg:'未找到指定的文字。',findOptions:'Find Options',matchCase:'大�寫須相符',matchWord:'全字相符',matchCyclic:'循環�索',replaceAll:'全部�代',replaceSuccessMsg:'共完� %1 次�代'},table:{toolbar:'表格',title:'表格屬性',menu:'表格屬性',deleteTable:'刪除表格',rows:'列數',columns:'欄數',border:'邊框',widthPx:'�素',widthPc:'百分比',widthUnit:'width unit',cellSpace:'間�',cellPad:'內�',caption:'標題',summary:'摘�',headers:'標題',headersNone:'無標題',headersColumn:'第一欄',headersRow:'第一列',headersBoth:'第一欄和第一列',invalidRows:'必須有一或更多的列',invalidCols:'必須有一或更多的欄',invalidBorder:'邊框大�必須為數字格�',invalidWidth:'表格寬度必須為數字格�',invalidHeight:'表格高度必須為數字格�',invalidCellSpacing:'儲存格間�必須為數字格�',invalidCellPadding:'儲存格內�必須為數字格�',cell:{menu:'儲存格',insertBefore:'�左�入儲存格',insertAfter:'���入儲存格',deleteCell:'刪除儲存格',merge:'�併儲存格',mergeRight:'���併儲存格',mergeDown:'�下�併儲存格',splitHorizontal:'橫�分割儲存格',splitVertical:'縱�分割儲存格',title:'儲存格屬性',cellType:'儲存格類別',rowSpan:'儲存格列數',colSpan:'儲存格欄數',wordWrap:'自動�行',hAlign:'水平�齊',vAlign:'垂直�齊',alignBaseline:'基線�齊',bgColor:'背景�色',borderColor:'邊框�色',data:'數據',header:'標題',yes:'是',no:'�',invalidWidth:'儲存格寬度必須為數字格�',invalidHeight:'儲存格高度必須為數字格�',invalidRowSpan:'儲存格列數必須為整數格�',invalidColSpan:'儲存格欄數度必須為整數格�',chooseColor:'Choose'},row:{menu:'列',insertBefore:'�上�入列',insertAfter:'�下�入列',deleteRow:'刪除列'},column:{menu:'欄',insertBefore:'�左�入欄',insertAfter:'���入欄',deleteColumn:'刪除欄'}},button:{title:'按鈕屬性',text:'顯示文字 (值)',type:'類型',typeBtn:'按鈕 (Button)',typeSbm:'�出 (Submit)',typeRst:'�設 (Reset)'},checkboxAndRadio:{checkboxTitle:'核�方塊屬性',radioTitle:'�項按鈕屬性',value:'��值',selected:'已��'},form:{title:'表單屬性',menu:'表單屬性',action:'動作',method:'方法',encoding:'表單編碼'},select:{title:'清單/�單屬性',selectInfo:'資訊',opAvail:'�用�項',value:'值',size:'大�',lines:'行',chkMulti:'�多�',opText:'顯示文字',opValue:'��值',btnAdd:'新增',btnModify:'修改',btnUp:'上移',btnDown:'下移',btnSetValue:'設為�設值',btnDelete:'刪除'},textarea:{title:'文字�域屬性',cols:'字元寬度',rows:'列數'},textfield:{title:'文字方塊屬性',name:'�稱',value:'值',charWidth:'字元寬度',maxChars:'最多字元數',type:'類型',typeText:'文字',typePass:'密碼'},hidden:{title:'隱�欄�屬性',name:'�稱',value:'值'},image:{title:'影�屬性',titleButton:'影�按鈕屬性',menu:'影�屬性',infoTab:'影�資訊',btnUpload:'上傳至伺�器',upload:'上傳',alt:'替代文字',lockRatio:'等比例',resetSize:'�設為原大�',border:'邊框',hSpace:'水平�離',vSpace:'垂直�離',alertUrl:'請輸入影� URL',linkTab:'超連�',button2Img:'�把影�按鈕改�影�嗎？',img2Button:'�把影�改�影�按鈕嗎？',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash 屬性',propertiesTab:'屬性',title:'Flash 屬性',chkPlay:'自動播放',chkLoop:'�複',chkMenu:'開啟�單',chkFull:'啟動全螢幕顯示',scale:'縮放',scaleAll:'全部顯示',scaleNoBorder:'無邊框',scaleFit:'精確符�',access:'�許腳本訪�',accessAlways:'永�',accessSameDomain:'相�域�',accessNever:'永�',alignAbsBottom:'絕�下方',alignAbsMiddle:'絕�中間',alignBaseline:'基準線',alignTextTop:'文字上方',quality:'質素',qualityBest:'最好',qualityHigh:'高',qualityAutoHigh:'高（自動）',qualityMedium:'中（自動）',qualityAutoLow:'低（自動）',qualityLow:'低',windowModeWindow:'視窗',windowModeOpaque:'��明',windowModeTransparent:'�明',windowMode:'視窗模�',flashvars:'Flash 變數',bgcolor:'背景�色',hSpace:'水平�離',vSpace:'垂直�離',validateSrc:'請輸入欲連�的 URL',validateHSpace:'水平間�必須為數字格�',validateVSpace:'垂直間�必須為數字格�'},spellCheck:{toolbar:'拼字檢查',title:'拼字檢查',notAvailable:'抱歉，�務目�暫��用',errorLoading:'無法�系��器: %s.',notInDic:'�在字典中',changeTo:'更改為',btnIgnore:'忽略',btnIgnoreAll:'全部忽略',btnReplace:'�代',btnReplaceAll:'全部�代',btnUndo:'復原',noSuggestions:'- 無建議值 -',progress:'進行拼字檢查中…',noMispell:'拼字檢查完�：未發�拼字錯誤',noChanges:'拼字檢查完�：未更改任何單字',oneChange:'拼字檢查完�：更改了 1 個單字',manyChanges:'拼字檢查完�：更改了 %1 個單字',ieSpellDownload:'尚未安�拼字檢查元件。您是�想��在下載？'},smiley:{toolbar:'表情符號',title:'�入表情符號',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 元素'},numberedlist:'編號清單',bulletedlist:'項目清單',indent:'增加縮排',outdent:'減少縮排',justify:{left:'�左�齊',center:'置中',right:'���齊',block:'左��齊'},blockquote:'引用文字',clipboard:{title:'貼上',cutError:'�覽器的安全性設定��許編輯器自動執行剪下動作。請使用快�� (Ctrl/Cmd+X) 剪下。',copyError:'�覽器的安全性設定��許編輯器自動執行複製動作。請使用快�� (Ctrl/Cmd+C) 複製。',pasteMsg:'請使用快�� (<strong>Ctrl/Cmd+V</strong>) 貼到下方�域中並按下 <strong>確定</strong>',securityMsg:'因為�覽器的安全性設定，本編輯器無法直接存�您的剪貼簿資料，請您自行在本視窗進行貼上動作。',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'您想貼上的文字似乎是自 Word 複製而來，請�您是��先清除 Word 的格�後�行貼上？',toolbar:'自 Word 貼上',title:'自 Word 貼上',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'貼為純文字格�',title:'貼為純文字格�'},templates:{button:'樣版',title:'內容樣版',options:'Template Options',insertOption:'�代原有內容',selectPromptMsg:'請�擇欲開啟的樣版<br> (原有的內容將會被清除):',emptyListMsg:'(無樣版)'},showBlocks:'顯示�塊',stylesCombo:{label:'樣�',panelTitle:'Formatting Styles',panelTitle1:'塊級元素樣�',panelTitle2:'內�元素樣�',panelTitle3:'物件元素樣�'},format:{label:'格�',panelTitle:'格�',tag_p:'一般',tag_pre:'已格�化',tag_address:'��',tag_h1:'標題 1',tag_h2:'標題 2',tag_h3:'標題 3',tag_h4:'標題 4',tag_h5:'標題 5',tag_h6:'標題 6',tag_div:'一般 (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'字體',voiceLabel:'字體',panelTitle:'字體'},fontSize:{label:'大�',voiceLabel:'文字大�',panelTitle:'大�'},colorButton:{textColorTitle:'文字�色',bgColorTitle:'背景�色',panelTitle:'Colors',auto:'自動',more:'更多�色…'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'�時拼寫檢查',opera_title:'Not supported by Opera',enable:'啟用�時拼寫檢查',disable:'關閉�時拼寫檢查',about:'關於�時拼寫檢查',toggle:'啟用�關閉�時拼寫檢查',options:'�項',langs:'語言',moreSuggestions:'更多拼寫建議',ignore:'忽略',ignoreAll:'全部忽略',addWord:'添加單詞',emptyDic:'字典��應為空.',noSuggestions:'無建議值',optionsTab:'�項',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'語言',dictionariesTab:'字典',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'關於'},about:{title:'關於 CKEditor',dlgTitle:'關於 CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'訪�我們的網站以��更多關於�議的信�',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'最大化',minimize:'最�化',fakeobjects:{anchor:'錨點',flash:'Flash 動畫',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'�明物件'},resize:'拖拽改變大�',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'折�工具�',toolbarExpand:'展开工具�',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'文件屬性',title:'文件屬性',design:'Design',meta:'Meta 資料',chooseColor:'Choose',other:'<其他>',docTitle:'��標題',charset:'字元編碼',charsetOther:'其他字元編碼',charsetASCII:'ASCII',charsetCE:'中�語系',charsetCT:'正體中文 (Big5)',charsetCR:'斯拉夫文',charsetGR:'希臘文',charsetJP:'日文',charsetKR:'韓文',charsetTR:'土耳其文',charsetUN:'Unicode (UTF-8)',charsetWE:'西�語系',docType:'文件類型',docTypeOther:'其他文件類型',xhtmlDec:'包� XHTML 定義',bgColor:'背景�色',bgImage:'背景影�',bgFixed:'浮水�',txtColor:'文字�色',margin:'��邊界',marginTop:'上',marginLeft:'左',marginRight:'�',marginBottom:'下',metaKeywords:'文件索引關�字 (用�形逗號[,]分隔)',metaDescription:'文件說明',metaAuthor:'作者',metaCopyright:'版權所有',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/web/imcms/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
new file mode 100644
index 0000000000..ff03f20b94
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('a11yHelp',function(a){var b=a.lang.accessibilityHelp,c=CKEDITOR.tools.getNextId(),d={8:'BACKSPACE',9:'TAB',13:'ENTER',16:'SHIFT',17:'CTRL',18:'ALT',19:'PAUSE',20:'CAPSLOCK',27:'ESCAPE',33:'PAGE UP',34:'PAGE DOWN',35:'END',36:'HOME',37:'LEFT ARROW',38:'UP ARROW',39:'RIGHT ARROW',40:'DOWN ARROW',45:'INSERT',46:'DELETE',91:'LEFT WINDOW KEY',92:'RIGHT WINDOW KEY',93:'SELECT KEY',96:'NUMPAD  0',97:'NUMPAD  1',98:'NUMPAD  2',99:'NUMPAD  3',100:'NUMPAD  4',101:'NUMPAD  5',102:'NUMPAD  6',103:'NUMPAD  7',104:'NUMPAD  8',105:'NUMPAD  9',106:'MULTIPLY',107:'ADD',109:'SUBTRACT',110:'DECIMAL POINT',111:'DIVIDE',112:'F1',113:'F2',114:'F3',115:'F4',116:'F5',117:'F6',118:'F7',119:'F8',120:'F9',121:'F10',122:'F11',123:'F12',144:'NUM LOCK',145:'SCROLL LOCK',186:'SEMI-COLON',187:'EQUAL SIGN',188:'COMMA',189:'DASH',190:'PERIOD',191:'FORWARD SLASH',192:'GRAVE ACCENT',219:'OPEN BRACKET',220:'BACK SLASH',221:'CLOSE BRAKET',222:'SINGLE QUOTE'};d[CKEDITOR.ALT]='ALT';d[CKEDITOR.SHIFT]='SHIFT';d[CKEDITOR.CTRL]='CTRL';var e=[CKEDITOR.ALT,CKEDITOR.SHIFT,CKEDITOR.CTRL];function f(j){var k,l,m=[];for(var n=0;n<e.length;n++){l=e[n];k=j/e[n];if(k>1&&k<=2){j-=l;m.push(d[l]);}}m.push(d[j]||String.fromCharCode(j));return m.join('+');};var g=/\$\{(.*?)\}/g;function h(j,k){var l=a.config.keystrokes,m,n=l.length;for(var o=0;o<n;o++){m=l[o];if(m[1]==k)break;}return f(m[0]);};function i(){var j='<div class="cke_accessibility_legend" role="document" aria-labelledby="'+c+'_arialbl" tabIndex="-1">%1</div>'+'<span id="'+c+'_arialbl" class="cke_voice_label">'+b.contents+' </span>',k='<h1>%1</h1><dl>%2</dl>',l='<dt>%1</dt><dd>%2</dd>',m=[],n=b.legend,o=n.length;for(var p=0;p<o;p++){var q=n[p],r=[],s=q.items,t=s.length;for(var u=0;u<t;u++){var v=s[u],w;w=l.replace('%1',v.name).replace('%2',v.legend.replace(g,h));r.push(w);}m.push(k.replace('%1',q.name).replace('%2',r.join('')));}return j.replace('%1',m.join(''));};return{title:b.title,minWidth:600,minHeight:400,contents:[{id:'info',label:a.lang.common.generalTab,expand:true,elements:[{type:'html',id:'legends',style:'white-space:normal;',focus:function(){},html:i()+'<style type="text/css">'+'.cke_accessibility_legend'+'{'+'width:600px;'+'height:400px;'+'padding-right:5px;'+'overflow-y:auto;'+'overflow-x:hidden;'+'}'+'.cke_browser_quirks .cke_accessibility_legend,'+'.cke_browser_ie6 .cke_accessibility_legend'+'{'+'height:390px'+'}'+'.cke_accessibility_legend *'+'{'+'white-space:normal;'+'}'+'.cke_accessibility_legend h1'+'{'+'font-size: 20px;'+'border-bottom: 1px solid #AAA;'+'margin: 5px 0px 15px;'+'}'+'.cke_accessibility_legend dl'+'{'+'margin-left: 5px;'+'}'+'.cke_accessibility_legend dt'+'{'+'font-size: 13px;'+'font-weight: bold;'+'}'+'.cke_accessibility_legend dd'+'{'+'margin:10px'+'}'+'</style>'}]}],buttons:[CKEDITOR.dialog.cancelButton]};
+});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt b/web/imcms/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt
new file mode 100644
index 0000000000..253ed748a2
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt
@@ -0,0 +1,28 @@
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+cs.js      Found: 30 Missing: 0
+cy.js      Found: 30 Missing: 0
+da.js      Found: 12 Missing: 18
+de.js      Found: 30 Missing: 0
+el.js      Found: 25 Missing: 5
+eo.js      Found: 30 Missing: 0
+fa.js      Found: 30 Missing: 0
+fi.js      Found: 30 Missing: 0
+fr.js      Found: 30 Missing: 0
+gu.js      Found: 12 Missing: 18
+he.js      Found: 30 Missing: 0
+it.js      Found: 30 Missing: 0
+ku.js      Found: 30 Missing: 0
+lv.js      Found: 30 Missing: 0
+mk.js      Found: 5 Missing: 25
+nb.js      Found: 30 Missing: 0
+nl.js      Found: 30 Missing: 0
+no.js      Found: 30 Missing: 0
+pt-br.js   Found: 30 Missing: 0
+ro.js      Found: 6 Missing: 24
+sk.js      Found: 30 Missing: 0
+tr.js      Found: 30 Missing: 0
+ug.js      Found: 27 Missing: 3
+vi.js      Found: 6 Missing: 24
+zh-cn.js   Found: 30 Missing: 0
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/cs.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/cs.js
new file mode 100644
index 0000000000..ac8e19fa05
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/cs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','cs',{accessibilityHelp:{title:'Instrukce pro přístupnost',contents:'Obsah nápovědy. Pro uzavření tohoto dialogu stiskněte klávesu ESC.',legend:[{name:'Obecné',items:[{name:'Panel nástrojů editoru',legend:'Stiskněte${toolbarFocus} k procházení panelu nástrojů. Přejděte na další a předchozí skupiny pomocí TAB a SHIFT-TAB. Přechod na další a předchozí tla�ítko panelu nástrojů je pomocí ŠIPKA VPRAVO nebo ŠIPKA VLEVO. Stisknutím mezerníku nebo klávesy ENTER tla�ítko aktivujete.'},{name:'Dialogové okno editoru',legend:'Uvnitř dialogového okna stiskněte TAB pro přesunutí na další pole, stiskněte SHIFT + TAB pro přesun na předchozí pole, stiskněte ENTER pro odeslání dialogu, stiskněte ESC pro jeho zrušení. Pro dialogová okna, která mají mnoho karet stiskněte ALT + F10 pr oprocházení seznamu karet. Pak se přesuňte na další kartu pomocí TAB nebo ŠIPKA VPRAVO. Pro přesun na předchozí stiskněte SHIFT + TAB nebo ŠIPKA VLEVO. Stiskněte MEZERN�K nebo ENTER pro vybrání stránky karet.'},{name:'Kontextové menu editoru',legend:'Stiskněte ${contextMenu} nebo klávesu APPLICATION k otevření kontextového menu. Pak se přesuňte na další možnost menu pomocí TAB nebo ŠIPKY DOLŮ. Přesuňte se na předchozí možnost pomocí  SHIFT+TAB nebo ŠIPKY NAHORU. Stiskněte MEZERN�K nebo ENTER pro zvolení možnosti menu. Podmenu sou�asné možnosti otevřete pomocí MEZERN�KU nebo ENTER �i ŠIPKY DOLEVA. Kontextové menu uzavřete stiskem ESC.'},{name:'Ráme�ek seznamu editoru',legend:'Uvnitř ráme�ku seznamu se přesunete na další položku menu pomocí TAB nebo ŠIPKA DOLŮ. Na předchozí položku se přesunete SHIFT + TAB nebo ŠIPKA NAHORU. Stiskněte MEZERN�K nebo ENTER pro zvolení možnosti seznamu. Stiskněte ESC pro uzavření seznamu.'},{name:'Lišta cesty prvku v editoru',legend:'Stiskněte ${elementsPathFocus} pro procházení lišty cesty prvku. Na další tla�ítko prvku se přesunete pomocí TAB nebo ŠIPKA VPRAVO. Na předchozí položku se přesunete pomocí SHIFT + TAB nebo ŠIPKA VLEVO. Stiskněte MEZERN�K nebo ENTER pro vybrání prvku v editoru.'}]},{name:'Příkazy',items:[{name:' Příkaz Zpět',legend:'Stiskněte ${undo}'},{name:' Příkaz Znovu',legend:'Stiskněte ${redo}'},{name:' Příkaz Tu�né',legend:'Stiskněte ${bold}'},{name:' Příkaz Kurzíva',legend:'Stiskněte ${italic}'},{name:' Příkaz Podtržení',legend:'Stiskněte ${underline}'},{name:' Příkaz Odkaz',legend:'Stiskněte ${link}'},{name:' Příkaz Skrýt panel nástrojů',legend:'Stiskněte ${toolbarCollapse}'},{name:' Nápověda přístupnosti',legend:'Stiskněte ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/cy.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/cy.js
new file mode 100644
index 0000000000..1d653e7a95
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/cy.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','cy',{accessibilityHelp:{title:'Canllawiau Hygyrchedd',contents:'Cynnwys Cymorth. I gau y deialog hwn, pwyswch ESC.',legend:[{name:'Cyffredinol',items:[{name:'Bar Offer y Golygydd',legend:"Pwyswch $ {toolbarFocus} i fynd at y bar offer. Symudwch i'r grŵp bar offer nesaf a blaenorol gyda TAB a SHIFT-TAB. Symudwch i'r botwm bar offer nesaf a blaenorol gyda SAETH DDE neu SAETH CHWITH. Pwyswch SPACE neu ENTER i wneud botwm y bar offer yn weithredol."},{name:'Deialog y Golygydd',legend:"Tu mewn i'r deialog, pwyswch TAB i fynd i'r maes nesaf ar y deialog, pwyswch SHIFT + TAB i symud i faes blaenorol, pwyswch ENTER i gyflwyno'r deialog, pwyswch ESC i ddiddymu'r deialog. Ar gyfer deialogau sydd â thudalennau aml-tab, pwyswch ALT + F10 i lywio'r tab-restr. Yna symudwch i'r tab nesaf gyda TAB neu SAETH DDE. Symudwch i dab blaenorol gyda SHIFT + TAB neu'r SAETH CHWITH. Pwyswch SPACE neu ENTER i ddewis y dudalen tab."},{name:'Dewislen Cyd-destun y Golygydd',legend:"Pwyswch $ {contextMenu} neu'r ALLWEDD 'APPLICATION' i agor y ddewislen cyd-destun. Yna symudwch i'r opsiwn ddewislen nesaf gyda'r TAB neu'r SAETH I LAWR. Symudwch i'r opsiwn blaenorol gyda SHIFT + TAB neu'r SAETH I FYNY. Pwyswch SPACE neu ENTER i ddewis yr opsiwn ddewislen. Agorwch is-dewislen yr opsiwn cyfredol gyda SPACE neu ENTER neu SAETH DDE. Ewch yn ôl i'r eitem ar y ddewislen uwch gydag ESC neu SAETH CHWITH. Ceuwch y ddewislen cyd-destun gydag ESC."},{name:'Blwch Rhestr y Golygydd',legend:"Tu mewn rhestr-bocs, ewch i'r eitem rhestr nesaf gyda TAB neu'r SAETH I LAWR. Symudwch i restr eitem flaenorol gyda SHIFT + TAB neu SAETH I FYNY. Pwyswch SPACE neu ENTER i ddewis yr opsiwn o'r rhestr. Pwyswch ESC i gau'r rhestr."},{name:'Bar Llwybr Elfen y Golygydd',legend:"Pwyswch $ {elementsPathFocus} i fynd i'r elfennau llwybr bar. Symudwch i fotwm yr elfen nesaf gyda TAB neu SAETH DDE. Symudwch i fotwm blaenorol gyda SHIFT + TAB neu SAETH CHWITH. Pwyswch SPACE neu ENTER i ddewis yr elfen yn y golygydd."}]},{name:'Gorchmynion',items:[{name:'Gorchymyn dadwneud',legend:'Pwyswch ${undo}'},{name:'Gorchymyn ailadrodd',legend:'Pwyswch ${redo}'},{name:'Gorchymyn Bras',legend:'Pwyswch ${bold}'},{name:'Gorchymyn italig',legend:'Pwyswch ${italig}'},{name:'Gorchymyn tanlinellu',legend:'Pwyso ${underline}'},{name:'Gorchymyn dolen',legend:'Pwyswch ${link}'},{name:"Gorchymyn Cwympo'r Dewislen",legend:'Pwyswch ${toolbarCollapse}'},{name:'Cymorth Hygyrchedd',legend:'Pwyswch ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/da.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/da.js
new file mode 100644
index 0000000000..c58197b35f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/da.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','da',{accessibilityHelp:{title:'Tilgængelighedsinstrukser',contents:'Help Contents. To close this dialog press ESC.',legend:[{name:'Generelt',items:[{name:'Editor værktøjslinje',legend:'Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT-TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.'},{name:'Editor Dialog',legend:'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW. Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'},{name:'Editor Context Menu',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'Editor List Box',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'Editor Element Path Bar',legend:'Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'}]},{name:'Kommandoer',items:[{name:'Fortryd kommando',legend:'Klik på ${undo}'},{name:'Gentag kommando',legend:'Klik ${redo}'},{name:' Bold command',legend:'Klik ${bold}'},{name:' Italic command',legend:'Press ${italic}'},{name:' Underline command',legend:'Klik ${underline}'},{name:' Link command',legend:'Klik ${link}'},{name:' Toolbar Collapse command',legend:'Press ${toolbarCollapse}'},{name:' Accessibility Help',legend:'Kilk ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/de.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/de.js
new file mode 100644
index 0000000000..0334d1a10a
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/de.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','de',{accessibilityHelp:{title:'Barrierefreiheitinformationen',contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste 'ESC' drücken.",legend:[{name:'Allgemein',items:[{name:'Editor Symbolleiste',legend:'Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT-TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren.'},{name:'Editor Dialog',legend:'Innerhalb des Dialogs drücken Sie TAB um zum nächsten Dialogfeld zu gelangen, drücken Sie SHIFT-TAG um zum vorherigen Feld zu wechseln, drücken Sie ENTER um den Dialog abzusenden und ESC um den Dialog zu abzubrechen. Um zwischen den Reitern innerhalb eines Dialogs zu wechseln drücken sie ALT-F10. Um zum nächsten Reiter zu gelangen können Sie TAB oder die rechte Pfeiltaste. Zurück gelangt man mit SHIFT-TAB oder der linken Pfeiltaste. Mit der Leertaste oder Enter kann man den Reiter auswählen.'},{name:'Editor Kontextmenü',legend:'Dürcken Sie ${contextMenu} oder die Anwendungstaste um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste.'},{name:'Editor Listen',legend:'Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeilrunter-Taste den nächsten Menüeintrag wählen. Mit der Shift-TAB Tastenkombination oder der Pfeilhoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs.'},{name:'Editor Elementpfadleiste',legend:'Drücken Sie ${elementsPathFocus} um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen drücken Sie TAB oder die Pfeilrechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT-TAB oder der Pfeillinks-Taste. Drücken Sie die Leertaste oder Enter um das Element auszuwählen.'}]},{name:'Befehle',items:[{name:'Wiederholen Befehl',legend:'Drücken Sie ${undo}'},{name:'Rückgängig Befehl',legend:'Drücken Sie ${redo}'},{name:'Fettschrift Befehl',legend:'Drücken Sie ${bold}'},{name:'Italic Befehl',legend:'Drücken Sie ${italic}'},{name:'Unterstreichung Befehl',legend:'Drücken Sie ${underline}'},{name:'Link Befehl',legend:'Drücken Sie ${link}'},{name:'Symbolleiste zuammenklappen Befehl',legend:'Drücken Sie ${toolbarCollapse}'},{name:'Eingabehilfen',legend:'Drücken Sie ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/el.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/el.js
new file mode 100644
index 0000000000..6d5263c349
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/el.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','el',{accessibilityHelp:{title:'Οδηγίες Π�οσβασιμότητας',contents:'Πε�ιεχόμενα Βοήθειας. Πατήστε ESC για κλείσιμο.',legend:[{name:'Γενικά',items:[{name:'Ε�γαλειοθήκη Επεξε�γαστή',legend:'Πατήστε ${toolbarFocus} για να πε�ιηγηθείτε στην γ�αμμή ε�γαλείων. Μετακινηθείτε ανάμεσα στις ομάδες της γ�αμμής ε�γαλείων με TAB και Shift-TAB. Μετακινηθείτε ανάμεσα στα κουμπία ε�γαλείων με ΔΕΞΙ και ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Πατήστε ΚΕ�Ο ή ENTER για να ενε�γοποιήσετε το ενε�γό κουμπί ε�γαλείου.'},{name:'Πα�άθυ�ο Διαλόγου Επεξε�γαστή',legend:'Μέσα σε ένα πα�άθυ�ο διαλόγου, πατήστε TAB για να μεταβείτε στο επόμενο πεδίο ή SHIFT + TAB για να μεταβείτε στο π�οηγο�μενο. Πατήστε ENTER για να υποβάλετε την φό�μα. Πατήστε ESC για να ακυ�ώσετε την διαδικασία της φό�μας. Για πα�άθυ�α διαλόγων που έχουν πολλές σελίδες σε κα�τέλες πατήστε ALT + F10 για να μεταβείτε στην λίστα των κα�τέλων. Στην συνέχεια μπο�είτε να μεταβείτε στην επόμενη κα�τέλα πατώντας TAB ή RIGHT ARROW. Μπο�είτε να μεταβείτε στην π�οηγο�μενη κα�τέλα πατώντας SHIFT + TAB ή LEFT ARROW. Πατήστε SPACE ή ENTER για να επιλέξετε την κα�τέλα για π�οβολή.'},{name:'Αναδυόμενο Μενο� Επεξε�γαστή',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'Editor List Box',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'Editor Element Path Bar',legend:'Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'}]},{name:'Εντολές',items:[{name:' Εντολή αναί�εσης',legend:'Πατήστε ${undo}'},{name:' Εντολή επανάληψης',legend:'Πατήστε ${redo}'},{name:' Εντολή έντονης γ�αφής',legend:'Πατήστε ${bold}'},{name:' Εντολή πλάγιας γ�αφής',legend:'Πατήστε ${italic}'},{name:' Εντολή υπογ�άμμισης',legend:'Πατήστε ${underline}'},{name:' Εντολή συνδέσμου',legend:'Πατήστε ${link}'},{name:' Εντολή Σ�μπτηξης Ε�γαλειοθήκης',legend:'Πατήστε ${toolbarCollapse}'},{name:' Βοήθεια Π�οσβασιμότητας',legend:'Πατήστε ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/en.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/en.js
new file mode 100644
index 0000000000..996bf06d5f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/en.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','en',{accessibilityHelp:{title:'Accessibility Instructions',contents:'Help Contents. To close this dialog press ESC.',legend:[{name:'General',items:[{name:'Editor Toolbar',legend:'Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT-TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.'},{name:'Editor Dialog',legend:'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW. Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'},{name:'Editor Context Menu',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'Editor List Box',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'Editor Element Path Bar',legend:'Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'}]},{name:'Commands',items:[{name:' Undo command',legend:'Press ${undo}'},{name:' Redo command',legend:'Press ${redo}'},{name:' Bold command',legend:'Press ${bold}'},{name:' Italic command',legend:'Press ${italic}'},{name:' Underline command',legend:'Press ${underline}'},{name:' Link command',legend:'Press ${link}'},{name:' Toolbar Collapse command',legend:'Press ${toolbarCollapse}'},{name:' Accessibility Help',legend:'Press ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/eo.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/eo.js
new file mode 100644
index 0000000000..3171b72af2
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/eo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','eo',{accessibilityHelp:{title:'Uzindikoj pri atingeblo',contents:'Helpilenhavo. Por fermi tiun dialogon, premu la ESKAPAN klavon.',legend:[{name:'Ĝeneralaĵoj',items:[{name:'Ilbreto de la redaktilo',legend:'Premu ${toolbarFocus} por atingi la ilbreton. Movi�u al la sekva aŭ antaŭa grupoj de la ilbreto per la klavoj TABA kaj MAJUSKLIGA-TABA. Movi�u al la sekva aŭ antaŭa butonoj de la ilbreto per la klavoj SAGO DEKSTREN kaj SAGO MALDEKSTREN. Premu la SPACETklavon aŭ la ENENklavon por aktivigi la ilbretbutonon.'},{name:'Redaktildialogo',legend:'En dialogo, premu la TABAN klavon por navigi al la sekva dialogkampo, premu la MAJUSKLIGAN + TABAN klavojn por reveni al la antaŭa kampo, premu la ENENklavon por sendi la dialogon, premu la ESKAPAN klavon por nuligi la dialogon. Por dialogoj kun pluraj retpa�oj sub langetoj, premu ALT + F10 por navigi al la langetlisto. Poste movi�u al la sekva langeto per la klavo TABA aŭ SAGO DEKSTREN. Movi�u al la antaŭa langeto per la klavoj MAJUSKLIGA + TABA aŭ  SAGO MALDEKSTREN. Premu la SPACETklavon aŭ la ENENklavon por selekti la langetretpa�on.'},{name:'Kunteksta menuo de la redaktilo',legend:'Premu ${contextMenu} aŭ entajpu la KLAVKOMBINAĴON por malfermi la kuntekstan menuon. Poste movi�u al la sekva opcio de la menuo per la klavoj TABA aŭ SAGO SUBEN. Movi�u al la antaŭa opcio per la klavoj MAJUSKLGA + TABA aŭ SAGO SUPREN. Premu la SPACETklavon aŭ ENENklavon por selekti la menuopcion. Malfermu la submenuon de la kuranta opcio per la SPACETklavo aŭ la ENENklavo aŭ la SAGO DEKSTREN. Revenu al la elemento de la patra menuo per la klavoj ESKAPA aŭ SAGO MALDEKSTREN. Fermu la kuntekstan menuon per la ESKAPA klavo.'},{name:'Fallisto de la redaktilo',legend:'En fallisto, movi�u al la sekva listelemento per la klavoj TABA aŭ SAGO SUBEN. Movi�u al la antaŭa listelemento per la klavoj MAJUSKLIGA + TABA aŭ SAGO SUPREN. Premu la SPACETklavon aŭ ENENklavon por selekti la opcion en la listo. Premu la ESKAPAN klavon por fermi la falmenuon.'},{name:'Breto indikanta la vojon al la redaktilelementoj',legend:'Premu ${elementsPathFocus} por navigi al la breto indikanta la vojon al la redaktilelementoj. Movi�u al la butono de la sekva elemento per la klavoj TABA aŭ SAGO DEKSTREN. Movi�u al la butono de la antaŭa elemento per la klavoj MAJUSKLIGA + TABA aŭ SAGO MALDEKSTREN. Premu la SPACETklavon aŭ ENENklavon por selekti la elementon en la redaktilo.'}]},{name:'Komandoj',items:[{name:'Komando malfari',legend:'Premu ${undo}'},{name:'Komando refari',legend:'Premu ${redo}'},{name:'Komando grasa',legend:'Premu ${bold}'},{name:'Komando kursiva',legend:'Premu ${italic}'},{name:'Komando substreki',legend:'Premu ${underline}'},{name:'Komando ligilo',legend:'Premu ${link}'},{name:'Komando faldi la ilbreton',legend:'Premu ${toolbarCollapse}'},{name:'Helpilo pri atingeblo',legend:'Premu ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/fa.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/fa.js
new file mode 100644
index 0000000000..fb28b982da
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/fa.js
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'a11yhelp', 'fa',
+{
+	accessibilityHelp :
+	{
+		title : 'دستورالعمل‌های دسترسی',
+		contents : 'راهنمای �هرست مطالب. برای بستن این کادر محاوره‌ای ESC را �شار دهید.',
+		legend :
+		[
+			{
+				name : 'عمومی',
+				items :
+						[
+							{
+								name : 'نوار ابزار ویرایشگر',
+								legend:
+									'${toolbarFocus} را برای باز کردن نوار ابزار ب�شارید. با کلید Tab و Shif-Tab در مجموعه نوار ابزار بعدی و قبلی حرکت کنید. برای حرکت در کلید نوار ابزار قبلی و بعدی با کلید جهت‌نمای راست و چپ جابجا شوید. کلید Space یا Enter را برای �عال کردن کلید نوار ابزار ب�شارید.'
+							},
+
+							{
+								name : 'پنجره محاوره‌ای ویرایشگر',
+								legend :
+									'در داخل یک پنجره محاوره‌ای، کلید Tab را ب�شارید تا به پنجره‌ی بعدی بروید، Shift+Tab برای حرکت به �یلد قبلی، �شردن Enter برای ثبت اطلاعات پنجره‌، �شردن Esc برای لغو پنجره محاوره‌ای و برای پنجره‌هایی که چندین برگه دارند، �شردن Alt+F10 جهت ر�تن به Tab-List. در نهایت حرکت به برگه بعدی با Tab یا کلید جهت‌نمای راست. حرکت به برگه قبلی با Shift+Tab یا کلید جهت‌نمای چپ. �شردن Space یا Enter برای انتخاب یک برگه.'
+							},
+
+							{
+								name : 'منوی متنی ویرایشگر',
+								legend :
+									'${contextMenu} یا کلید برنامه‌های کاربردی را برای باز کردن منوی متن را ب�شارید. سپس می‌توانید برای حرکت به گزینه بعدی منو با کلید Tab و یا کلید جهت‌نمای پایین جابجا شوید. حرکت به گزینه قبلی با Shift+Tab یا کلید جهت‌نمای بالا. �شردن Space یا Enter برای انتخاب یک گزینه از منو. باز کردن زیر شاخه گزینه منو جاری با کلید Space یا Enter و یا کلید جهت‌نمای راست و چپ. بازگشت به منوی والد با کلید Esc یا کلید جهت‌نمای چپ. بستن منوی متن با Esc.'
+							},
+
+							{
+								name : 'جعبه �هرست ویرایشگر',
+								legend :
+									'در داخل جعبه لیست، قلم دوم از اقلام لیست بعدی را با TAB و یا Arrow Down حرکت دهید. انتقال به قلم دوم از اقلام لیست قبلی را با SHIFT + TAB یا UP ARROW. کلید Space یا ENTER را برای انتخاب گزینه لیست ب�شارید. کلید ESC را برای بستن جعبه لیست ب�شارید.'
+							},
+
+							{
+								name : 'ویرایشگر عنصر نوار راه',
+								legend :
+									'برای ر�تن به مسیر عناصر ${elementsPathFocus} را ب�شارید. حرکت به کلید عنصر بعدی با کلید Tab یا  کلید جهت‌نمای راست. برگشت به کلید قبلی با Shift+Tab یا کلید جهت‌نمای چپ. �شردن Space یا Enter برای انتخاب یک عنصر در ویرایشگر.'
+							}
+						]
+			},
+			{
+				name : '�رمان‌ها',
+				items :
+						[
+							{
+								name : 'بازگشت �رمان',
+								legend : '�شردن ${undo}'
+							},
+							{
+								name : 'انجام مجدد �رمان',
+								legend : '�شردن ${redo}'
+							},
+							{
+								name : '�رمان متن درشت',
+								legend : '�شردن ${bold}'
+							},
+							{
+								name : '�رمان متن کج',
+								legend : '�شردن ${italic}'
+							},
+							{
+								name : '�رمان متن زیرخط‌دار',
+								legend : '�شردن ${underline}'
+							},
+							{
+								name : '�رمان پیوند',
+								legend : '�شردن ${link}'
+							},
+							{
+								name : 'بستن نوار ابزار �رمان',
+								legend : '�شردن ${toolbarCollapse}'
+							},
+							{
+								name : 'راهنمای دسترسی',
+								legend : '�شردن ${a11yHelp}'
+							}
+						]
+			}
+		]
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/fi.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/fi.js
new file mode 100644
index 0000000000..e11d387bc6
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/fi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','fi',{accessibilityHelp:{title:'Saavutettavuus ohjeet',contents:'Ohjeen sisällöt. Sulkeaksesi tämän dialogin paina ESC.',legend:[{name:'Yleinen',items:[{name:'Editorin työkalupalkki',legend:'Paina ${toolbarFocus} siirtyäksesi työkalupalkkiin. Siirry seuraavaan ja edelliseen työkalupalkin ryhmään TAB ja SHIFT-TAB näppäimillä. Siirry seuraavaan ja edelliseen työkalupainikkeeseen käyttämällä NUOLI OIKEALLE tai NUOLI VASEMMALLE näppäimillä. Paina VÄLILYÖNTI tai ENTER näppäintä aktivoidaksesi työkalupainikkeen.'},{name:'Editorin dialogi',legend:'Dialogin sisällä, painamalla TAB siirryt seuraavaan dialogin kenttään, painamalla SHIFT+TAB siirryt aiempaan kenttään, painamalla ENTER lähetät dialogin, painamalla ESC peruutat dialogin. Dialogeille joissa on useita välilehtiä, paina ALT+F10 siirtyäksesi välillehtilistaan. Siirtyäksesi seuraavaan välilehteen paina TAB tai NUOLI OIKEALLE. Siirry edelliseen välilehteen painamalla SHIFT+TAB tai nuoli vasemmalle. Paina VÄLILYÖNTI tai ENTER valitaksesi välilehden.'},{name:'Editorin oheisvalikko',legend:'Paina ${contextMenu} tai SOVELLUSPAINIKETTA avataksesi oheisvalikon. Liiku seuraavaan valikon vaihtoehtoon TAB tai NUOLI ALAS näppäimillä. Siirry edelliseen vaihtoehtoon SHIFT+TAB tai NUOLI YLÖS näppäimillä. Paina VÄLILYÖNTI tai ENTER valitaksesi valikon kohdan. Avataksesi nykyisen kohdan alivalikon paina VÄLILYÖNTI tai ENTER tai NUOLI OIKEALLE painiketta. Siirtyäksesi takaisin valikon ylemmälle tasolle paina ESC tai NUOLI vasemmalle. Oheisvalikko suljetaan ESC painikkeella.'},{name:'Editorin listalaatikko',legend:'Listalaatikon sisällä siirry seuraavaan listan kohtaan TAB tai NUOLI ALAS painikkeilla. Siirry edelliseen listan kohtaan SHIFT+TAB tai NUOLI YLÖS painikkeilla. Paina VÄLILYÖNTI tai ENTER valitaksesi listan vaihtoehdon. Paina ESC sulkeaksesi listalaatikon.'},{name:'Editorin elementtipolun palkki',legend:'Paina ${elementsPathFocus} siirtyäksesi elementtipolun palkkiin. Siirry seuraavaan elementtipainikkeeseen TAB tai NUOLI OIKEALLE painikkeilla. Siirry aiempaan painikkeeseen SHIFT+TAB tai NUOLI VASEMMALLE painikkeilla. Paina VÄLILYÖNTI tai ENTER valitaksesi elementin editorissa.'}]},{name:'Komennot',items:[{name:'Peruuta komento',legend:'Paina ${undo}'},{name:'Tee uudelleen komento',legend:'Paina ${redo}'},{name:'Lihavoi komento',legend:'Paina ${bold}'},{name:'Kursivoi komento',legend:'Paina ${italic}'},{name:'Alleviivaa komento',legend:'Paina ${underline}'},{name:'Linkki komento',legend:'Paina ${link}'},{name:'Pienennä työkalupalkki komento',legend:'Paina ${toolbarCollapse}'},{name:'Saavutettavuus ohjeet',legend:'Paina ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/fr.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/fr.js
new file mode 100644
index 0000000000..126602e3d8
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/fr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','fr',{accessibilityHelp:{title:"Instructions pour l'accessibilité",contents:"Contenu de l'aide. Pour fermer ce dialogue, appuyez sur la touche ESC (Echappement).",legend:[{name:'Général',items:[{name:"Barre d'outils de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers les groupes suivant ou précédent de la barre d'outil avec les touches TAB et SHIFT-TAB. Se déplacer vers les boutons suivant ou précédent de la barre d'outils avec les touches FLECHE DROITE et FLECHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRER pour activer le bouton de barre d'outils."},{name:'Dialogue de léditeur',legend:"A l'intérieur d'un dialogue, appuyer sur la touche TAB pour naviguer jusqu'au champ de dalogue suivant, appuyez sur les touches SHIFT + TAB pour revenir au champ précédent, appuyez sur la touche ENTRER pour soumettre le dialogue, appuyer sur la touche ESC pour annuler le dialogue. Pour les dialogues avec plusieurs pages d'onglets, appuyer sur ALT + F10 pour naviguer jusqu'à la liste des onglets. Puis se déplacer vers l'onglet suivant avec la touche TAB ou FLECHE DROITE. Se déplacer vers l'onglet précédent avec les touches SHIFT + TAB ou FLECHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRER pour sélectionner la page de l'onglet."},{name:"Menu contextuel de l'éditeur",legend:"Appuyer sur ${contextMenu} ou entrer le RACCOURCI CLAVIER pour ouvrir le menu contextuel. Puis se déplacer vers l'option suivante du menu avec les touches TAB ou FLECHE BAS. Se déplacer vers l'option précédente avec les touches  SHIFT+TAB ou FLECHE HAUT. appuyer sur la BARRE D'ESPACE ou la touche ENTREE pour sélectionner l'option du menu. Oovrir le sous-menu de l'option courante avec la BARRE D'ESPACE ou les touches ENTREE ou FLECHE DROITE. Revenir à l'élément de menu parent avec les touches ESC ou FLECHE GAUCHE. Fermer le menu contextuel avec ESC."},{name:"Zone de liste en menu déroulant de l'éditeur",legend:"A l'intérieur d'une liste en menu déroulant, se déplacer vers l'élément suivant de la liste avec les touches TAB ou FLECHE BAS. Se déplacer vers l'élément précédent de la liste avec les touches SHIFT + TAB ou FLECHE HAUT. Appuyer sur la BARRE D'ESPACE ou sur ENTREE pour sélectionner l'option dans la liste. Appuyer sur ESC pour fermer le menu déroulant."},{name:"Barre d'emplacement des éléments de léditeur",legend:"Appuyer sur ${elementsPathFocus} pour naviguer vers la barre d'emplacement des éléments de léditeur. Se déplacer vers le bouton d'élément suivant avec les touches TAB ou FLECHE DROITE. Se déplacer vers le bouton d'élément précédent avec les touches SHIFT+TAB ou FLECHE GAUCHE. Appuyer sur la BARRE D'ESPACE ou sur ENTREE pour sélectionner l'élément dans l'éditeur."}]},{name:'Commandes',items:[{name:' Commande défaire',legend:'Appuyer sur ${undo}'},{name:' Commande refaire',legend:'Appuyer sur ${redo}'},{name:' Commande gras',legend:'Appuyer sur ${bold}'},{name:' Commande italique',legend:'Appuyer sur ${italic}'},{name:' Commande souligné',legend:'Appuyer sur ${underline}'},{name:' Commande lien',legend:'Appuyer sur ${link}'},{name:" Commande enrouler la barre d'outils",legend:'Appuyer sur ${toolbarCollapse}'},{name:' Aide Accessibilité',legend:'Appuyer sur ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/gu.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/gu.js
new file mode 100644
index 0000000000..a04b2c1ff5
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/gu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','gu',{accessibilityHelp:{title:'�ક�ક�ષેબિલિટી ની વિગતો',contents:'હેલ�પ. આ બંધ કરવા ESC દબાવો.',legend:[{name:'જનરલ',items:[{name:'�ડિટર ટૂલબાર',legend:'Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT-TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.'},{name:'�ડિટર ડાયલોગ',legend:'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW. Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'},{name:'Editor Context Menu',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'Editor List Box',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'Editor Element Path Bar',legend:'Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'}]},{name:'કમાંડસ',items:[{name:'અન�ડ�ં કમાંડ',legend:'$ દબાવો {undo}'},{name:'ફરી કરો કમાંડ',legend:'$ દબાવો {redo}'},{name:'બોલ�દનો કમાંડ',legend:'$ દબાવો {bold}'},{name:' Italic command',legend:'Press ${italic}'},{name:' Underline command',legend:'Press ${underline}'},{name:' Link command',legend:'Press ${link}'},{name:' Toolbar Collapse command',legend:'Press ${toolbarCollapse}'},{name:' Accessibility Help',legend:'Press ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/he.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/he.js
new file mode 100644
index 0000000000..d02a1fbb48
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/he.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','he',{accessibilityHelp:{title:'הור�ות נגישות',contents:'הור�ות נגישות. לסגירה לחץ �סקייפ (ESC).',legend:[{name:'כללי',items:[{name:'סרגל הכלי�',legend:'לחץ על ${toolbarFocus} כדי לנווט לסרגל הכלי�. עבור לכפתור הב� ע� מקש הט�ב (TAB) �ו חץ שמ�לי. עבור לכפתור הקוד� ע� מקש השיפט (SHIFT) + ט�ב (TAB) �ו חץ ימני. לחץ רווח �ו �נטר (ENTER) כדי להפעיל �ת הכפתור הנבחר.'},{name:'די�לוגי� (חלונות תש�ול)',legend:'בתוך די�לוג, לחץ ט�ב (TAB) כדי לנווט לשדה הב�, לחץ שיפט (SHIFT) + ט�ב (TAB) כדי לנווט לשדה הקוד�, לחץ �נטר (ENTER) כדי לשלוח �ת הדי�לוג, לחץ �סקייפ (ESC) כדי לבטל. בתוך די�לוגי� בעלי מספר ט�בי� (לשוניות), לחץ �לט (ALT) + F10 כדי לנווט לשורת הט�בי�. נווט לט�ב הב� ע� ט�ב (TAB) �ו חץ שמ�לי. עבור לט�ב הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ שמ�לי. לחץ רווח �ו �נטר (ENTER) כדי להיכנס לט�ב.'},{name:'תפריט ההקשר (Context Menu)',legend:'לחץ ${contextMenu} �ו APPLICATION KEYכדי לפתוח �ת תפריט ההקשר. עבור ל�פשרות הב�ה ע� ט�ב (TAB) �ו חץ למטה. עבור ל�פשרות הקודמת ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ למעלה. לחץ רווח �ו �נטר (ENTER) כדי לבחור �ת ה�פשרות. פתח �ת תת התפריט (Sub-menu) של ה�פשרות הנוכחית ע� רווח �ו �נטר (ENTER) �ו חץ שמ�לי. חזור לתפריט ה�ב ע� �סקייפ (ESC) �ו חץ שמ�לי. סגור �ת תפריט ההקשר ע� �סקייפ (ESC).'},{name:'תפריטי� צפי� (List boxes)',legend:'בתוך תפריט צף, עבור לפריט הב� ע� ט�ב (TAB) �ו חץ למטה. עבור לתפריט הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) or חץ עליון. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'עץ �למנטי� (Elements Path)',legend:'לחץ ${elementsPathFocus} כדי לנווט לעץ ה�למנטי�. עבור לפריט הב� ע� ט�ב (TAB) �ו חץ ימני. עבור לפריט הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ שמ�לי. לחץ רווח �ו �נטר (ENTER) כדי לבחור �ת ה�למנט בעורך.'}]},{name:'פקודות',items:[{name:' ביטול צעד �חרון',legend:'לחץ ${undo}'},{name:' חזרה על צעד �חרון',legend:'לחץ ${redo}'},{name:' הדגשה',legend:'לחץ ${bold}'},{name:' הטייה',legend:'לחץ ${italic}'},{name:' הוספת קו תחתון',legend:'לחץ ${underline}'},{name:' הוספת לינק',legend:'לחץ ${link}'},{name:' כיווץ סרגל הכלי�',legend:'לחץ ${toolbarCollapse}'},{name:' הור�ות נגישות',legend:'לחץ ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/it.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/it.js
new file mode 100644
index 0000000000..c8da8eb5fb
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/it.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','it',{accessibilityHelp:{title:'Istruzioni di Accessibilità',contents:'Contenuti di Aiuto. Per chiudere questa finestra premi ESC.',legend:[{name:'Generale',items:[{name:'Barra degli strumenti Editor',legend:'Premi ${toolbarFocus} per navigare fino alla barra degli strumenti. Muoviti tra i gruppi della barra degli strumenti con i tasti Tab e Maiusc-Tab. Spostati tra il successivo ed il precedente pulsante della barra degli strumenti usando le frecce direzionali Destra e Sinistra. Premi Spazio o Invio per attivare il pulsante della barra degli strumenti.'},{name:'Finestra Editor',legend:"All'interno di una finestra di dialogo, premi Tab per navigare fino al campo successivo della finestra di dialogo, premi Maiusc-Tab per tornare al campo precedente, premi Invio per inviare la finestra di dialogo, premi Esc per uscire. Per le finestre che hanno schede multiple, premi Alt+F10 per navigare nella lista delle schede. Quindi spostati alla scheda successiva con il tasto Tab oppure con la Freccia Destra. Torna alla scheda precedente con Maiusc+Tab oppure con la Freccia Sinistra. Premi Spazio o Invio per scegliere la scheda."},{name:'Menù contestuale Editor',legend:"Premi ${contextMenu} o TASTO APPLICAZIONE per aprire il menu contestuale. Dunque muoviti all'opzione successiva del menu con il tasto TAB o con la Freccia Sotto. Muoviti all'opzione precedente con  MAIUSC+TAB o con Freccia Sopra. Premi SPAZIO o INVIO per scegliere l'opzione di menu. Apri il sottomenu dell'opzione corrente con SPAZIO o INVIO oppure con la Freccia Destra. Torna indietro al menu superiore con ESC oppure Freccia Sinistra. Chiudi il menu contestuale con ESC."},{name:'Box Lista Editor',legend:"Dentro un box-lista, muoviti al prossimo elemento della lista con TAB o con la Freccia direzionale giù. Spostati all'elemento precedente con MAIUSC+TAB oppure con Freccia direzionale sopra. Premi SPAZIO o INVIO per scegliere l'opzione della lista. Premi ESC per chiudere il box-lista."},{name:'Barra percorso elementi editor',legend:"Premi ${elementsPathFocus} per navigare tra gli elementi della barra percorso. Muoviti al prossimo pulsante di elemento con TAB o la Freccia direzionale destra. Muoviti al pulsante precedente con MAIUSC+TAB o la Freccia Direzionale Sinistra. Premi SPAZIO o INVIO per scegliere l'elemento nell'editor."}]},{name:'Comandi',items:[{name:' Annulla comando',legend:'Premi ${undo}'},{name:' Ripeti comando',legend:'Premi ${redo}'},{name:' Comando Grassetto',legend:'Premi ${bold}'},{name:' Comando Corsivo',legend:'Premi ${italic}'},{name:' Comando Sottolineato',legend:'Premi ${underline}'},{name:' Comando Link',legend:'Premi ${link}'},{name:' Comando riduci barra degli strumenti',legend:'Premi ${toolbarCollapse}'},{name:' Aiuto Accessibilità',legend:'Premi ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/ku.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/ku.js
new file mode 100644
index 0000000000..aa6e9d3ca0
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/ku.js
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'a11yhelp', 'ku',
+{
+	accessibilityHelp :
+	{
+		title : 'ڕێنمای لەبەردەستدابوون',
+		contents : 'پێکهاتەی یارمەتی. کلیك ESC بۆ داخستنی ئەم دیالۆگه.',
+		legend :
+		[
+			{
+				name : 'گشتی',
+				items :
+						[
+							{
+								name : 'تووڵامرازی ده‌ستكاریكه‌ر',
+								legend:
+									'کلیك ${toolbarFocus} بۆ ڕابەری تووڵامراز. بۆ گواستنەوەی پێشوو داهاتووی گرووپی تووڵامرازی داگرتنی کلیلی TAB له‌گه‌ڵ‌ SHIFT-TAB. بۆ گواستنەوەی پێشوو داهاتووی دووگمەی تووڵامرازی لەڕێی کلیلی تیری دەستی ڕاست یان کلیلی تیری دەستی چەپ. کلیکی کلیلی SPACE یان ENTER بۆ چالاککردنی دووگمەی تووڵامراز.'
+							},
+
+							{
+								name : 'دیالۆگی ده‌ستكاریكه‌ر',
+								legend :
+									'لەهەمانکاتدا کەتۆ لەدیالۆگی, کلیکی کلیلی TAB بۆ ڕابەری خانەی دیالۆگێکی تر, داگرتنی کلیلی SHIFT + TAB بۆ گواستنەوەی بۆ خانەی پێشووتر, کلیكی کلیلی ENTER بۆ ڕازیکردنی دیالۆگەکە, کلیكی کلیلی ESC بۆ هەڵوەشاندنەوەی دیالۆگەکە. بۆ دیالۆگی لەبازدەری (تابی) زیاتر, کلیكی کلیلی ALT + F10 بۆ ڕابه‌ری لیستی بازده‌ره‌کان. بۆ چوونه‌ بازده‌ری تابی داهاتوو کلیكی کلیلی TAB یان کلیلی تیری ده‌ستی ڕاست. بۆچوونه‌ بازده‌ری تابی پێشوو داگرتنی کلیلی SHIFT + TAB یان کلیلی تیری ده‌ستی چه‌پ. کلیی کلیلی SPACE یان ENTER بۆ هه‌ڵبژاردنی بازده‌ر (تاب).'
+							},
+
+							{
+								name : 'پێڕستی سه‌رنووسه‌ر',
+								legend :
+									'کلیك ${contextMenu} یان دوگمه‌ی لیسته‌(Menu) بۆ کردنه‌وه‌ی لیسته‌ی ده‌ق. بۆ چوونه‌ هه‌ڵبژارده‌یه‌کی تر له‌ لیسته‌ کلیکی کلیلی TAB یان کلیلی تیری ڕوو له‌خواره‌وه‌ بۆ چوون بۆ هه‌ڵبژارده‌ی پێشوو کلیکی کلیلی SHIFT+TAB یان کلیلی تیری ڕوو له‌ سه‌ره‌وه. داگرتنی کلیلی SPACE یان ENTER بۆ هه‌ڵبژاردنی هه‌ڵبژارده‌ی لیسته‌. بۆ کردنه‌وه‌ی لقی ژێر لیسته‌ له‌هه‌ڵبژارده‌ی لیسته‌ کلیکی کلیلی SPACE یان ENTER یان کلیلی تیری ده‌ستی ڕاست. بۆ گه‌ڕانه‌وه بۆ سه‌ره‌وه‌ی لیسته‌ کلیکی کلیلی ESC یان کلیلی تیری ده‌ستی چه‌پ. بۆ داخستنی لیسته‌ کلیكی کلیلی ESC بکه.'
+							},
+
+							{
+								name : 'لیستی سنووقی سه‌رنووسه‌ر',
+								legend :
+									'له‌ناو سنوقی لیست, چۆن بۆ هه‌ڵنبژارده‌ی لیستێکی تر کلیکی کلیلی TAB یان کلیلی تیری ڕوو له‌خوار. چوون بۆ هه‌ڵبژارده‌ی لیستی پێشوو کلیکی کلیلی SHIFT + TAB یان کلیلی تیری ڕوو له‌سه‌ره‌وه‌. کلیکی کلیلی SPACE یان ENTER بۆ دیاریکردنی ‌هه‌ڵبژارده‌ی لیست. کلیکی کلیلی ESC بۆ داخستنی سنوقی لیست.'
+							},
+
+							{
+								name : 'تووڵامرازی توخم',
+								legend :
+									'کلیك ${elementsPathFocus} بۆ ڕابه‌ری تووڵامرازی توخمه‌کان. چوون بۆ دوگمه‌ی توخمێکی تر کلیکی کلیلی TAB یان کلیلی تیری ده‌ستی ڕاست. چوون بۆ دوگمه‌ی توخمی پێشوو کلیلی SHIFT+TAB یان کلیکی کلیلی تیری ده‌ستی چه‌پ. داگرتنی کلیلی SPACE یان ENTER بۆ دیاریکردنی توخمه‌که‌ له‌سه‌رنووسه.'
+							}
+						]
+			},
+			{
+				name : '�ه‌رمانه‌کان',
+				items :
+						[
+							{
+								name : '�ه‌رمانی پووچکردنه‌وه',
+								legend : 'کلیك ${undo}'
+							},
+							{
+								name : '�ه‌رمانی هه‌ڵگه‌ڕانه‌وه',
+								legend : 'کلیك ${redo}'
+							},
+							{
+								name : '�ه‌رمانی ده‌قی قه‌ڵه‌و',
+								legend : 'کلیك ${bold}'
+							},
+							{
+								name : '�ه‌رمانی ده‌قی لار',
+								legend : 'کلیك ${italic}'
+							},
+							{
+								name : '�ه‌رمانی ژێرهێڵ',
+								legend : 'کلیك ${underline}'
+							},
+							{
+								name : '�ه‌رمانی به‌سته‌ر',
+								legend : 'کلیك ${link}'
+							},
+							{
+								name : 'شارده‌نه‌وه‌ی تووڵامراز',
+								legend : 'کلیك ${toolbarCollapse}'
+							},
+							{
+								name : 'ده‌ستپێگه‌یشتنی یارمه‌تی',
+								legend : 'کلیك ${a11yHelp}'
+							}
+						]
+			}
+		]
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/lv.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/lv.js
new file mode 100644
index 0000000000..422e41032f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/lv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','lv',{accessibilityHelp:{title:'Pieejamības instrukcija',contents:'Palīdzības saturs. Lai aizvērtu ciet šo dialogu nospiediet ESC.',legend:[{name:'Galvenais',items:[{name:'Redaktora rīkjosla',legend:'Nospiediet ${toolbarFocus} lai p�rvietotos uz rīkjoslu. Lai p�rvietotos uz n�košo vai iepriekšējo rīkjoslas grupu izmantojiet pogu TAB un SHIFT+TAB.  Lai p�rvietotos uz n�košo vai iepriekšējo rīkjoslas pogu izmantojiet Kreiso vai Labo bultiņu. Nospiediet Atstarpi vai ENTER lai aktivizētu rīkjosla pogu.'},{name:'Redaktora dialoga  logs',legend:'Dialoga log� nospiediet pogu TAB lai p�rvietotos uz n�košo dialoga loga lauku, nospiediet SHIFT+TAB lai atgrieztos iepriekšēj� lauk�, nospiediet ENTER lai apstiprin�tu dialoga datus, nospiediet ESC lai aizvērtu šo dialogu. Dialogam kuram ir vair�kas cilnes, nospiediet ALT+F10 lai p�rvietotos uz nepieciešamo cilni.  Lai p�rvietotos uz n�košo cilni izmantojiet pogu TAB vai Labo bultiņu. Lai p�rvietotos uz iepriekšējo cilni nospiediet SHIFT+TAB vai kreiso bultiņu. Nospiediet SPACE vai ENTER lai izvēlētos lapas cilni.'},{name:'Redaktora satura izvēle',legend:'Nospiediet ${contextMenu} vai APPLICATION KEY lai atvērtu satura izvēlni. Lai p�rvietotos uz n�košo izvēlnes opciju izmantojiet pogu TAB vai pogu Bultiņu uz leju. Lai p�rvietotos uz iepriekšējo opciju izmantojiet  SHIFT+TAB vai pogu Bultiņa uz augšu. Nospiediet SPACE vai ENTER lai izvelētos izvēlnes opciju. Atveriet tekošaj� opcija apakšizvēlni ar SAPCE vai ENTER ka ari to var izdarīt ar Labo bultiņu. Lai atgrieztos atpakaļ uz sakuma izvēlni nospiediet ESC vai Kreiso bultiņu. Lai aizvērtu ciet izvēlnes saturu nospiediet ESC.'},{name:'Redaktora saraksta lauks',legend:'Saraksta lauk�, lai p�rvietotos uz n�košo saraksta elementu nospiediet TAB vai pogu Bultiņa uz leju. Lai p�rvietotos uz iepriekšējo saraksta elementu nospiediet SHIFT+TAB vai pogu Bultiņa uz augšu. Nospiediet SPACE vai ENTER lai izvēlētos saraksta opcijas. Nospiediet ESC lai aizvērtu saraksta lauku. '},{name:'Redaktora elementa ceļa josla',legend:'Nospiediet ${elementsPathFocus} lai p�rvietotos uz  elementa ceļa joslu. Lai p�rvietotos uz n�košo elementa pogu izmantojiet TAB vai Labo bultiņu. Lai p�rvietotos uz iepriekšējo elementa pogu  izmantojiet SHIFT + TAB vai Kreiso bultiņu. Nospiediet SPACE vai ENTER lai izvēlētos elementu redaktor�.'}]},{name:'Komandas',items:[{name:'Komanda atcelt darbību',legend:'Nospiediet ${undo}'},{name:'Komanda atk�rtot darbību',legend:'Nospiediet ${redo}'},{name:'Treknraksta komanda',legend:'Nospiediet ${bold}'},{name:'Kursīva komanda',legend:'Nospiediet ${italic}'},{name:'Apakšsvītras komanda ',legend:'Nospiediet ${underline}'},{name:'Hipersaites komanda',legend:'Nospiediet ${link}'},{name:'Rīkjoslas aizvēršanas komanda',legend:'Nospiediet ${toolbarCollapse}'},{name:'Pieejamības palīdzība',legend:'Nospiediet ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/mk.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/mk.js
new file mode 100644
index 0000000000..33cfe6a670
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/mk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','mk',{accessibilityHelp:{title:'Ин�трукции за при�тапно�т',contents:'Содржина на делот за помош. За да го затворите овој дијалот прити�нете ESC.',legend:[{name:'Општо',items:[{name:'Мени за едиторот',legend:'Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT-TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.'},{name:'Дијалот за едиторот',legend:'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW. Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'},{name:'Editor Context Menu',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'Editor List Box',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'Editor Element Path Bar',legend:'Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'}]},{name:'Commands',items:[{name:' Undo command',legend:'Press ${undo}'},{name:' Redo command',legend:'Press ${redo}'},{name:' Bold command',legend:'Press ${bold}'},{name:' Italic command',legend:'Press ${italic}'},{name:' Underline command',legend:'Press ${underline}'},{name:' Link command',legend:'Press ${link}'},{name:' Toolbar Collapse command',legend:'Press ${toolbarCollapse}'},{name:' Accessibility Help',legend:'Press ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/nb.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/nb.js
new file mode 100644
index 0000000000..1985b049ce
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/nb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','nb',{accessibilityHelp:{title:'Instruksjoner for tilgjengelighet',contents:'Innhold for hjelp. Trykk ESC for å lukke denne dialogen.',legend:[{name:'Generelt',items:[{name:'Verktøylinje for editor',legend:'Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT-TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen.'},{name:'Dialog for editor',legend:'Mens du er i en dialog, trykk TAB for å navigere til neste dialogfelt, press SHIFT + TAB for å flytte til forrige felt, trykk ENTER for å akseptere dialogen, trykk ESC for å avbryte dialogen. For dialoger med flere faner, trykk ALT + F10 for å navigere til listen over faner. Gå til neste fane med TAB eller HØYRE PILTAST. Gå til forrige fane med SHIFT + TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge fanen.'},{name:'Kontekstmeny for editor',legend:'Trykk ${contextMenu} eller MENYKNAPP for å åpne kontekstmeny. Gå til neste alternativ i menyen med TAB eller PILTAST NED. Gå til forrige alternativ med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge menyalternativet. Åpne undermenyen på valgt alternativ med MELLOMROM eller ENTER eller HØYRE PILTAST. Gå tilbake til overordnet menyelement med ESC eller VENSTRE PILTAST. Lukk kontekstmenyen med ESC.'},{name:'Listeboks for editor',legend:'I en listeboks, gå til neste alternativ i listen med TAB eller PILTAST NED. Gå til forrige alternativ i listen med SHIFT + TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge alternativet i listen. Trykk ESC for å lukke listeboksen.'},{name:'Verktøylinje for elementsti',legend:'Trykk ${elementsPathFocus} for å navigere til verktøylinjen som viser elementsti. Gå til neste elementknapp med TAB eller HØYRE PILTAST. Gå til forrige elementknapp med SHIFT+TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge elementet i editoren.'}]},{name:'Kommandoer',items:[{name:'Angre',legend:'Trykk ${undo}'},{name:'Gjør om',legend:'Trykk ${redo}'},{name:'Fet tekst',legend:'Trykk ${bold}'},{name:'Kursiv tekst',legend:'Trykk ${italic}'},{name:'Understreking',legend:'Trykk ${underline}'},{name:'Link',legend:'Trykk ${link}'},{name:'Skjul verktøylinje',legend:'Trykk ${toolbarCollapse}'},{name:'Hjelp for tilgjengelighet',legend:'Trykk ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/nl.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/nl.js
new file mode 100644
index 0000000000..f2b9e95749
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/nl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','nl',{accessibilityHelp:{title:'Toegankelijkheidsinstructies',contents:'Help inhoud. Druk op ESC om dit dialoog te sluiten.',legend:[{name:'Algemeen',items:[{name:'Werkbalk tekstverwerker',legend:'Druk op ${toolbarFocus} om naar de werkbalk te navigeren. Om te schakelen naar de volgende en vorige werkbalkgroep, gebruik TAB en SHIFT+TAB. Om te schakelen naar de volgende en vorige werkbalkknop, gebruik de PIJL RECHTS en PIJL LINKS. Druk op SPATIE of ENTER om een werkbalkknop te activeren.'},{name:'Dialoog tekstverwerker',legend:'In een dialoogvenster, druk op TAB om te navigeren naar het volgende veld. Druk op SHIFT+TAB om naar het vorige veld te navigeren. Druk op ENTER om het dialoogvenster te verzenden. Druk op ESC om het dialoogvenster te sluiten. Voor dialoogvensters met meerdere tabbladen, druk op ALT+F10 om naar de tabset te navigeren. Schakel naar het volgende tabblad met TAB of PIJL RECHTS. Schakel naar het vorige tabblad met SHIFT+TAB of PIJL LINKS. Druk op SPATIE of ENTER om het tabblad te selecteren.'},{name:'Contextmenu tekstverwerker',legend:'Druk op ${contextMenu} of APPLICATION KEY om het contextmenu te openen. Schakel naar de volgende menuoptie met TAB of PIJL OMLAAG. Schakel naar de vorige menuoptie met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om een menuoptie te selecteren. Op een submenu van de huidige optie met SPATIE, ENTER of PIJL RECHTS. Ga terug naar de bovenliggende menuoptie met ESC of PIJL LINKS. Sluit het contextmenu met ESC.'},{name:'Keuzelijst tekstverwerker',legend:'In een keuzelijst, schakel naar het volgende item met TAB of PIJL OMLAAG. Schakel naar het vorige item met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om het item te selecteren. Druk op ESC om de keuzelijst te sluiten.'},{name:'Elementenpad werkbalk tekstverwerker',legend:'Druk op ${elementsPathFocus} om naar het elementenpad te navigeren. Om te schakelen naar het volgende element, gebruik TAB of PIJL RECHTS. Om te schakelen naar het vorige element, gebruik SHIFT+TAB or PIJL LINKS. Druk op SPATIE of ENTER om een element te selecteren in de tekstverwerker.'}]},{name:'Opdrachten',items:[{name:'Ongedaan maken opdracht',legend:'Druk op ${undo}'},{name:'Opnieuw uitvoeren opdracht',legend:'Druk op ${redo}'},{name:'Vetgedrukt opdracht',legend:'Druk up ${bold}'},{name:'Cursief opdracht',legend:'Druk op ${italic}'},{name:'Onderstrepen opdracht',legend:'Druk op ${underline}'},{name:'Link opdracht',legend:'Druk op ${link}'},{name:'Werkbalk inklappen opdracht',legend:'Druk op ${toolbarCollapse}'},{name:'Toegankelijkheidshulp',legend:'Druk op ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/no.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/no.js
new file mode 100644
index 0000000000..5a2ffc68c0
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/no.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','no',{accessibilityHelp:{title:'Instruksjoner for tilgjengelighet',contents:'Innhold for hjelp. Trykk ESC for å lukke denne dialogen.',legend:[{name:'Generelt',items:[{name:'Verktøylinje for editor',legend:'Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT-TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen.'},{name:'Dialog for editor',legend:'Mens du er i en dialog, trykk TAB for å navigere til neste dialogfelt, press SHIFT + TAB for å flytte til forrige felt, trykk ENTER for å akseptere dialogen, trykk ESC for å avbryte dialogen. For dialoger med flere faner, trykk ALT + F10 for å navigere til listen over faner. Gå til neste fane med TAB eller HØYRE PILTAST. Gå til forrige fane med SHIFT + TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge fanen.'},{name:'Kontekstmeny for editor',legend:'Trykk ${contextMenu} eller MENYKNAPP for å åpne kontekstmeny. Gå til neste alternativ i menyen med TAB eller PILTAST NED. Gå til forrige alternativ med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge menyalternativet. Åpne undermenyen på valgt alternativ med MELLOMROM eller ENTER eller HØYRE PILTAST. Gå tilbake til overordnet menyelement med ESC eller VENSTRE PILTAST. Lukk kontekstmenyen med ESC.'},{name:'Listeboks for editor',legend:'I en listeboks, gå til neste alternativ i listen med TAB eller PILTAST NED. Gå til forrige alternativ i listen med SHIFT + TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge alternativet i listen. Trykk ESC for å lukke listeboksen.'},{name:'Verktøylinje for elementsti',legend:'Trykk ${elementsPathFocus} for å navigere til verktøylinjen som viser elementsti. Gå til neste elementknapp med TAB eller HØYRE PILTAST. Gå til forrige elementknapp med SHIFT+TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge elementet i editoren.'}]},{name:'Kommandoer',items:[{name:'Angre',legend:'Trykk ${undo}'},{name:'Gjør om',legend:'Trykk ${redo}'},{name:'Fet tekst',legend:'Trykk ${bold}'},{name:'Kursiv tekst',legend:'Trykk ${italic}'},{name:'Understreking',legend:'Trykk ${underline}'},{name:'Link',legend:'Trykk ${link}'},{name:'Skjul verktøylinje',legend:'Trykk ${toolbarCollapse}'},{name:'Hjelp for tilgjengelighet',legend:'Trykk ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/pt-br.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/pt-br.js
new file mode 100644
index 0000000000..e4ef7d2cf7
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/pt-br.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','pt-br',{accessibilityHelp:{title:'Instruções de Acessibilidade',contents:'Conteúdo da Ajuda. Para fechar este diálogo pressione ESC.',legend:[{name:'Geral',items:[{name:'Barra de Ferramentas do Editor',legend:'Pressione ${toolbarFocus} para navegar para a barra de ferramentas. Mova para o anterior ou próximo grupo de ferramentas com TAB e SHIFT-TAB. Mova para o anterior ou próximo botão com SETA PARA DIREITA or SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para ativar o botão da barra de ferramentas.'},{name:'Diálogo do Editor',legend:'Dentro de um diálogo, pressione TAB para navegar para o próximo campo, pressione SHIFT + TAB para mover para o campo anterior, pressione ENTER para enviar o diálogo, pressione ESC para cancelar o diálogo. Para diálogos que tem múltiplas abas, pressione ALT + F10 para navegar para a lista de abas, então mova para a próxima aba com SHIFT + TAB ou SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para selecionar a aba.'},{name:'Menu de Contexto do Editor',legend:'Pressione ${contextMenu} ou TECLA DE MENU para abrir o menu de contexto, então mova para a próxima opção com TAB ou SETA PARA BAIXO. Mova para a anterior com SHIFT+TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar a opção do menu. Abra o submenu da opção atual com ESPAÇO ou ENTER ou SETA PARA DIREITA. Volte para o menu pai com ESC ou SETA PARA ESQUERDA. Feche o menu de contexto com ESC.'},{name:'Caixa de Lista do Editor',legend:'Dentro de uma caixa de lista, mova para o próximo item com TAB ou SETA PARA BAIXO. Mova para o item anterior com SHIFT + TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar uma opção na lista. Pressione ESC para fechar a caixa de lista.'},{name:'Barra de Caminho do Elementos do Editor',legend:'Pressione ${elementsPathFocus} para a barra de caminho dos elementos. Mova para o próximo botão de elemento com TAB ou SETA PARA DIREITA. Mova para o botão anterior com  SHIFT+TAB ou SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para selecionar o elemento no editor.'}]},{name:'Comandos',items:[{name:' Comando Desfazer',legend:'Pressione ${undo}'},{name:' Comando Refazer',legend:'Pressione ${redo}'},{name:' Comando Negrito',legend:'Pressione ${bold}'},{name:' Comando Itálico',legend:'Pressione ${italic}'},{name:' Comando Sublinhado',legend:'Pressione ${underline}'},{name:' Comando Link',legend:'Pressione ${link}'},{name:' Comando Fechar Barra de Ferramentas',legend:'Pressione ${toolbarCollapse}'},{name:' Ajuda de Acessibilidade',legend:'Pressione ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/ro.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/ro.js
new file mode 100644
index 0000000000..aa227b1b86
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/ro.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','ro',{accessibilityHelp:{title:'Instrucțiuni de accesibilitate',contents:'Cuprins. Pentru a închide acest dialog, apăsați tasta ESC.',legend:[{name:'General',items:[{name:'Editează bara.',legend:'Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT-TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.'},{name:'Dialog editor',legend:'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW. Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'},{name:'Editor meniu contextual',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'Editor List Box',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'Editor Element Path Bar',legend:'Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'}]},{name:'Commands',items:[{name:' Undo command',legend:'Press ${undo}'},{name:' Redo command',legend:'Press ${redo}'},{name:' Bold command',legend:'Press ${bold}'},{name:' Italic command',legend:'Press ${italic}'},{name:' Underline command',legend:'Press ${underline}'},{name:' Link command',legend:'Press ${link}'},{name:' Toolbar Collapse command',legend:'Press ${toolbarCollapse}'},{name:' Accessibility Help',legend:'Press ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/sk.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/sk.js
new file mode 100644
index 0000000000..06e36d36ee
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/sk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','sk',{accessibilityHelp:{title:'Inštrukcie prístupnosti',contents:'Pomocný obsah. Pre zatvorenie tohto okna, stla�te ESC.',legend:[{name:'Všeobecne',items:[{name:'Lišta nástrojov editora',legend:'Stla�te ${toolbarFocus} pre navigáciu na lištu nástrojov. Medzi �alšou a predchádzajúcou lištou nástrojov sa pohybujete s TAB a SHIFT-TAB. Medzi �alším a predchádzajúcim tla�idlom na lište nástrojov sa pohybujete s pravou šípkou a ľavou šípkou. Stla�te medzerník alebo ENTER pre aktiváciu tla�idla lišty nástrojov.'},{name:'Editorový dialóg',legend:'V dialogu, stla�te TAB pre navigáciu na �alšie dialógové pole, stla�te STIFT + TAB pre presun na predchádzajúce pole, stla�te ENTER pre odoslanie dialógu, stla�te ESC pre zrušenie dialógu. Pre dialógy, ktoré majú viac záložiek, stla�te ALT + F10 pre navigácou do zoznamu záložiek. Potom sa posúvajte k �alšej žáložke pomocou TAB alebo pravou šípkou. Pre presun k predchádzajúcej záložke, stla�te SHIFT + TAB alebo ľavú šípku. Stla�te medzerník alebo ENTER pre vybranie záložky.'},{name:'Editorové kontextové menu',legend:'Stla�te ${contextMenu} alebo APPLICATION KEY pre otvorenie kontextového menu. Potom sa presúvajte na �alšie možnosti menu s TAB alebo dolnou šípkou. Presunte sa k predchádzajúcej možnosti s SHIFT + TAB alebo hornou šípkou. Stla�te medzerník alebo ENTER pre výber možnosti menu. Otvorte pod-menu danej možnosti s medzerníkom, alebo ENTER, alebo pravou šípkou. Vráťte sa späť do položky rodi�ovského menu s ESC alebo ľavou šípkou. Zatvorte kontextové menu s ESC.'},{name:'Editorov box zoznamu',legend:'V boxe zoznamu, presuňte sa na �alšiu položku v zozname s TAB alebo dolnou šípkou. Presuňte sa k predchádzajúcej položke v zozname so SHIFT + TAB alebo hornou šípkou. Stla�te medzerník alebo ENTER pre výber možnosti zoznamu. Stla�te ESC pre zatvorenie boxu zoznamu.'},{name:'Editorove pásmo cesty prvku',legend:'Stla�te ${elementsPathFocus} pre navigovanie na pásmo cesty elementu. Presuňte sa na tla�idlo �alšieho prvku s TAB alebo pravou šípkou. Presuňte sa k predchádzajúcemu tla�idlu s SHIFT + TAB alebo ľavou šípkou. Stla�te medzerník alebo ENTER pre výber prvku v editore.'}]},{name:'Príkazy',items:[{name:'Vrátiť príkazy',legend:'Stla�te ${undo}'},{name:'Nanovo vrátiť príkaz',legend:'Stla�te ${redo}'},{name:'Príkaz na stu�nenie',legend:'Stla�te ${bold}'},{name:'Príkaz na kurzívu',legend:'Stla�te ${italic}'},{name:'Príkaz na pod�iarknutie',legend:'Stla�te ${underline}'},{name:'Príkaz na odkaz',legend:'Stla�te ${link}'},{name:'Príkaz na zbalenie lišty nástrojov',legend:'Stla�te ${toolbarCollapse}'},{name:'Pomoc prístupnosti',legend:'Stla�te ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/tr.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/tr.js
new file mode 100644
index 0000000000..c532c0ed71
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/tr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','tr',{accessibilityHelp:{title:'Erişilebilirlik Talimatları',contents:'Yardım içeriği. Bu pencereyi kapatmak için ESC tuşuna basın.',legend:[{name:'Genel',items:[{name:'Araç Çubuğu Editörü',legend:'Araç çubuğunda gezinmek için ${toolbarFocus} basın. TAB ve SHIFT-TAB ile önceki ve sonraki araç çubuğu grubuna taşıyın. SAĞ OK veya SOL OK ile önceki ve sonraki bir araç çubuğu düğmesini hareket ettirin. SPACE tuşuna basın veya araç çubuğu düğmesini etkinleştirmek için ENTER tuşna basın.'},{name:'Dialog Editörü',legend:'Dialog penceresi içinde, sonraki iletişim alanına gitmek için SEKME tuşuna basın, önceki alana geçmek için SHIFT + TAB tuşuna basın, pencereyi göndermek için ENTER tuşuna basın, dialog penceresini iptal etmek için ESC tuşuna basın. Birden çok sekme sayfaları olan diyalogların, sekme listesine gitmek için ALT + F10 tuşlarına basın. Sonra TAB veya SAĞ OK sonraki sekmeye taşıyın. SHIFT + TAB veya SOL OK ile önceki sekmeye geçin. Sekme sayfayı seçmek için SPACE veya ENTER tuşuna basın.'},{name:'İçerik Menü Editörü',legend:"İçerik menüsünü açmak için ${contextMenu} veya UYGULAMA TUŞU'na basın. Daha sonra SEKME veya AŞAĞI OK ile bir sonraki menü seçeneği taşıyın. SHIFT + TAB veya YUKARI OK ile önceki seçeneğe gider. Menü seçeneğini seçmek için SPACE veya ENTER tuşuna basın. Seçili seçeneğin alt menüsünü SPACE ya da ENTER veya SAĞ OK açın. Üst menü öğesini geçmek için ESC veya SOL OK ile geri dönün. ESC ile bağlam menüsünü kapatın."},{name:'Liste Kutusu Editörü',legend:'Liste kutusu içinde, bir sonraki liste öğesine SEKME VEYA AŞAĞI OK ile taşıyın. SHIFT + TAB veya YUKARI önceki liste öğesi taşıyın. Liste seçeneği seçmek için SPACE veya ENTER tuşuna basın. Liste kutusunu kapatmak için ESC tuşuna basın.'},{name:'Element Yol Çubuğu Editörü',legend:'Elementlerin yol çubuğunda gezinmek için ${ElementsPathFocus} basın. SEKME veya SAĞ OK ile sonraki element düğmesine taşıyın. SHIFT + TAB veya SOL OK önceki düğmeye hareket ettirin. Editör içindeki elementi seçmek için ENTER veya SPACE tuşuna basın.'}]},{name:'Komutlar',items:[{name:'Komutu geri al',legend:'${undo} basın'},{name:' Tekrar komutu uygula',legend:'${redo} basın'},{name:' Kalın komut',legend:'${bold} basın'},{name:' İtalik komutu',legend:'${italic} basın'},{name:' Alttan çizgi komutu',legend:'${underline} basın'},{name:' Bağlantı komutu',legend:'${link} basın'},{name:' Araç çubuğu Toplama komutu',legend:'${toolbarCollapse} basın'},{name:'Erişilebilirlik Yardımı',legend:'${a11yHelp} basın'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/ug.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/ug.js
new file mode 100644
index 0000000000..bd801ad554
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/ug.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','ug',{accessibilityHelp:{title:'قوشۇمچە چۈشەندۈرۈش',contents:'ياردەم مەزمۇنى. بۇ سۆزلەشكۈنى ياپماقچى بولسىڭىز ESC نى ب�سىڭ.',legend:[{name:'ئادەتتىكى',items:[{name:'قورال بالداق تەھرىر',legend:'${toolbarFocus} ب�سىلسا قورال بالداققا ي�تەكلەيدۇ، TAB ياكى SHIFT+TAB ئارقىلىق قورال بالداق گۇرۇپپىسى تاللىنىدۇ، ئوڭ سول يا ئوقتا توپچا تاللىنىدۇ، بوشلۇق ياكى Enter كۇنۇپكىسىدا تاللانغان توپچىنى قوللىنىدۇ.'},{name:'تەھرىرلىگۈچ سۆزلەشكۈسى',legend:'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW. Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'},{name:'تەھرىرلىگۈچ تىل مۇھىت تىزىملىكى',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'تەھرىرلىگۈچ تىزىمى',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'تەھرىرلىگۈچ ئ�ل�م�نت يول بالداق',legend:'${elementsPathFocus} ب�سىلسا ئ�ل�م�نت يول بالداققا ي�تەكلەيدۇ، TAB ياكى ئوڭ يا ئوقتا ك�يىنكى ئ�ل�م�نت تاللىنىدۇ،  SHIFT+TAB ياكى سول يا ئوقتا ئالدىنقى ئ�ل�م�نت تاللىنىدۇ،  بوشلۇق ياكى Enter كۇنۇپكىسىدا تەھرىرلىگۈچتىكى ئ�ل�م�نت تاللىنىدۇ.'}]},{name:'بۇيرۇق',items:[{name:'بۇيرۇقتىن ي�نىۋال',legend:'${undo} نى ب�سىڭ'},{name:'قايتىلاش بۇيرۇقى',legend:'${redo} نى ب�سىڭ'},{name:'توملىتىش بۇيرۇقى',legend:'${bold} نى ب�سىڭ'},{name:'يانتۇ بۇيرۇقى',legend:'${italic} نى ب�سىڭ'},{name:'ئاستى سىزىق بۇيرۇقى',legend:'${underline} نى ب�سىڭ'},{name:'ئۇلانما بۇيرۇقى',legend:'${link} نى ب�سىڭ'},{name:'قورال بالداق قاتلاش بۇيرۇقى',legend:'${toolbarCollapse} نى ب�سىڭ'},{name:'توسالغۇسىز لايىھە چۈشەندۈرۈشى',legend:'${a11yHelp} نى ب�سىڭ'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/vi.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/vi.js
new file mode 100644
index 0000000000..d984d353ea
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/vi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','vi',{accessibilityHelp:{title:'Accessibility Instructions',contents:'Nội dung Hỗ trợ. Nhấn ESC để đóng hộp thoại.',legend:[{name:'Chung',items:[{name:'Thanh công cụ soạn th',legend:'Nhấn ${toolbarFocus} để đi�u hướng đến thanh công cụ. Nhấn TAB và SHIFT-TAB để chuyển đến nhóm thanh công cụ khác. Nhấn MŨI TÊN PHẢI hoặc MŨI TÊN TR�I để chuyển sang nút khác trên thanh công cụ. Nhấn PH�M C�CH hoặc ENTER để kích hoạt nút trên thanh công c.'},{name:'Hộp thoại Biên t',legend:'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW. Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'},{name:'Trình đơn Ngữ cảnh cBộ soạn thảo',legend:'Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC.'},{name:'Editor List Box',legend:'Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'},{name:'Editor Element Path Bar',legend:'Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'}]},{name:'Commands',items:[{name:' Undo command',legend:'Press ${undo}'},{name:' Redo command',legend:'Press ${redo}'},{name:' Bold command',legend:'Press ${bold}'},{name:' Italic command',legend:'Press ${italic}'},{name:' Underline command',legend:'Press ${underline}'},{name:' Link command',legend:'Press ${link}'},{name:' Toolbar Collapse command',legend:'Press ${toolbarCollapse}'},{name:' Accessibility Help',legend:'Press ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/a11yhelp/lang/zh-cn.js b/web/imcms/ckeditor/plugins/a11yhelp/lang/zh-cn.js
new file mode 100644
index 0000000000..a08ed95385
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/a11yhelp/lang/zh-cn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('a11yhelp','zh-cn',{accessibilityHelp:{title:'辅助说明',contents:'帮助内容。�关闭此对�框请按 ESC 键。',legend:[{name:'常规',items:[{name:'编辑器工具�',legend:'按 ${toolbarFocus} 导航到工具�，使用 TAB 键或 SHIFT+TAB 组�键选择工具�组，使用左�箭头键选择按钮，按空格键或回车键以应用选中的按钮。'},{name:'编辑器对�框',legend:'在对�框内，TAB 键移动到下一个字段，SHIFT + TAB 组�键移动到上一个字段，ENTER 键�交对�框，ESC 键�消对�框。对于有多标签的对�框，用ALT + F10�移到标签列表。然�用 TAB 键或者��箭头�移动到下一个标签；SHIFT + TAB 组�键或者�左箭头移动到上一个标签。用 SPACE 键或者 ENTER 键选择标签。'},{name:'编辑器上下文��',legend:'用 ${contextMenu}或者 应用程�键 打开上下文��。然�用 TAB 键或者下箭头键�移动到下一个��项；SHIFT + TAB 组�键或者上箭头键移动到上一个��项。用 SPACE 键或者 ENTER 键选择��项。用 SPACE 键，ENTER 键或者�箭头键打开���。返回��用 ESC 键或者左箭头键。用 ESC 键关闭上下文��。'},{name:'编辑器列表框',legend:'在列表框中，移到下一列表项用 TAB 键或者下箭头键。移到上一列表项用SHIFT + TAB 组�键或者上箭头键，用 SPACE 键或者 ENTER 键选择列表项。用 ESC 键收起列表框。'},{name:'编辑器元素路径�',legend:'按 ${elementsPathFocus} 以导航到元素路径�，使用 TAB 键或�箭头键选择下一个元素，使用 SHIFT+TAB 组�键或左箭头键选择上一个元素，按空格键或回车键以选定编辑器里的元素。'}]},{name:'命令',items:[{name:' 撤消命令',legend:'按 ${undo}'},{name:' ��命令',legend:'按 ${redo}'},{name:' 加粗命令',legend:'按 ${bold}'},{name:' 倾斜命令',legend:'按 ${italic}'},{name:' 下划线命令',legend:'按 ${underline}'},{name:' 链接命令',legend:'按 ${link}'},{name:' 工具�折�命令',legend:'按 ${toolbarCollapse}'},{name:' 无障�设计说明',legend:'按 ${a11yHelp}'}]}]}});
diff --git a/web/imcms/ckeditor/plugins/about/dialogs/about.js b/web/imcms/ckeditor/plugins/about/dialogs/about.js
new file mode 100644
index 0000000000..71b286b8fc
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/about/dialogs/about.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('about',function(a){var b=a.lang.about;return{title:CKEDITOR.env.ie?b.dlgTitle:b.title,minWidth:390,minHeight:230,contents:[{id:'tab1',label:'',title:'',expand:true,padding:0,elements:[{type:'html',html:'<style type="text/css">.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+CKEDITOR.plugins.get('about').path+'dialogs/logo_ckeditor.png);'+'background-position:center; '+'background-repeat:no-repeat;'+'margin-bottom:10px;'+'}'+'.cke_about_container a'+'{'+'cursor:pointer !important;'+'color:blue !important;'+'text-decoration:underline !important;'+'}'+'</style>'+'<div class="cke_about_container">'+'<div class="cke_about_logo"></div>'+'<p>'+'CKEditor '+CKEDITOR.version+' (revision '+CKEDITOR.revision+')<br>'+'<a href="http://ckeditor.com/">http://ckeditor.com</a>'+'</p>'+'<p>'+b.help.replace('$1','<a href="http://docs.cksource.com/CKEditor_3.x/Users_Guide/Quick_Reference">'+b.userGuide+'</a>')+'</p>'+'<p>'+b.moreInfo+'<br>'+'<a href="http://ckeditor.com/license">http://ckeditor.com/license</a>'+'</p>'+'<p>'+b.copy.replace('$1','<a href="http://cksource.com/">CKSource</a> - Frederico Knabben')+'</p>'+'</div>'}]}],buttons:[CKEDITOR.dialog.cancelButton]};});
diff --git a/web/imcms/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/web/imcms/ckeditor/plugins/about/dialogs/logo_ckeditor.png
new file mode 100644
index 0000000000..ad0190218c
Binary files /dev/null and b/web/imcms/ckeditor/plugins/about/dialogs/logo_ckeditor.png differ
diff --git a/web/imcms/ckeditor/plugins/adobeair/plugin.js b/web/imcms/ckeditor/plugins/adobeair/plugin.js
new file mode 100644
index 0000000000..fc2d4c11e3
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/adobeair/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=['click','keydown','mousedown','keypress','mouseover','mouseout'];function b(c){var d=c.getElementsByTag('*'),e=d.count(),f;for(var g=0;g<e;g++){f=d.getItem(g);(function(h){for(var i=0;i<a.length;i++)(function(j){var k=h.getAttribute('on'+j);if(h.hasAttribute('on'+j)){h.removeAttribute('on'+j);h.on(j,function(l){var m=/(return\s*)?CKEDITOR\.tools\.callFunction\(([^)]+)\)/.exec(k),n=m&&m[1],o=m&&m[2].split(','),p=/return false;/.test(k);if(o){var q=o.length,r;for(var s=0;s<q;s++){o[s]=r=CKEDITOR.tools.trim(o[s]);var t=r.match(/^(["'])([^"']*?)\1$/);if(t){o[s]=t[2];continue;}if(r.match(/\d+/)){o[s]=parseInt(r,10);continue;}switch(r){case 'this':o[s]=h.$;break;case 'event':o[s]=l.data.$;break;case 'null':o[s]=null;break;}}var u=CKEDITOR.tools.callFunction.apply(window,o);if(n&&u===false)p=1;}if(p)l.data.preventDefault();});}})(a[i]);})(f);}};CKEDITOR.plugins.add('adobeair',{init:function(c){if(!CKEDITOR.env.air)return;c.addCss('body { padding: 8px }');c.on('uiReady',function(){b(c.container);if(c.sharedSpaces)for(var d in c.sharedSpaces)b(c.sharedSpaces[d]);c.on('elementsPathUpdate',function(e){b(e.data.space);});});c.on('contentDom',function(){c.document.on('click',function(d){d.data.preventDefault(true);});});}});CKEDITOR.ui.on('ready',function(c){var d=c.data;if(d._.panel){var e=d._.panel._.panel,f;(function(){if(!e.isLoaded){setTimeout(arguments.callee,30);return;}f=e._.holder;b(f);})();}else if(d instanceof CKEDITOR.dialog)b(d._.element);});})();CKEDITOR.dom.document.prototype.write=CKEDITOR.tools.override(CKEDITOR.dom.document.prototype.write,function(a){function b(c,d,e,f){var g=c.append(d),h=CKEDITOR.htmlParser.fragment.fromHtml(e).children[0].attributes;h&&g.setAttributes(h);f&&g.append(c.getDocument().createText(f));};return function(c,d){if(this.getBody()){var e=this,f=this.getHead();c=c.replace(/(<style[^>]*>)([\s\S]*?)<\/style>/gi,function(g,h,i){b(f,'style',h,i);return '';});c=c.replace(/<base\b[^>]*\/>/i,function(g){b(f,'base',g);return '';});c=c.replace(/<title>([\s\S]*)<\/title>/i,function(g,h){e.$.title=h;return '';});c=c.replace(/<head>([\s\S]*)<\/head>/i,function(g){var h=new CKEDITOR.dom.element('div',e);h.setHtml(g);h.moveChildren(f);return '';});c.replace(/(<body[^>]*>)([\s\S]*)(?=$|<\/body>)/i,function(g,h,i){e.getBody().setHtml(i);var j=CKEDITOR.htmlParser.fragment.fromHtml(h).children[0].attributes;j&&e.getBody().setAttributes(j);});}else a.apply(this,arguments);};});
diff --git a/web/imcms/ckeditor/plugins/ajax/plugin.js b/web/imcms/ckeditor/plugins/ajax/plugin.js
new file mode 100644
index 0000000000..810d0e9f75
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/ajax/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){CKEDITOR.plugins.add('ajax',{requires:['xml']});CKEDITOR.ajax=(function(){var a=function(){if(!CKEDITOR.env.ie||location.protocol!='file:')try{return new XMLHttpRequest();}catch(f){}try{return new ActiveXObject('Msxml2.XMLHTTP');}catch(g){}try{return new ActiveXObject('Microsoft.XMLHTTP');}catch(h){}return null;},b=function(f){return f.readyState==4&&(f.status>=200&&f.status<300||f.status==304||f.status===0||f.status==1223);},c=function(f){if(b(f))return f.responseText;return null;},d=function(f){if(b(f)){var g=f.responseXML;return new CKEDITOR.xml(g&&g.firstChild?g:f.responseText);}return null;},e=function(f,g,h){var i=!!g,j=a();if(!j)return null;j.open('GET',f,i);if(i)j.onreadystatechange=function(){if(j.readyState==4){g(h(j));j=null;}};j.send(null);return i?'':h(j);};return{load:function(f,g){return e(f,g,c);},loadXml:function(f,g){return e(f,g,d);}};})();})();
diff --git a/web/imcms/ckeditor/plugins/autogrow/plugin.js b/web/imcms/ckeditor/plugins/autogrow/plugin.js
new file mode 100644
index 0000000000..4b518a290f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/autogrow/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){function a(d){var e=d.getStyle('overflow-y'),f=d.getDocument(),g=CKEDITOR.dom.element.createFromHtml('<span style="margin:0;padding:0;border:0;clear:both;width:1px;height:1px;display:block;">'+(CKEDITOR.env.webkit?'&nbsp;':'')+'</span>',f);f[CKEDITOR.env.ie?'getBody':'getDocumentElement']().append(g);var h=g.getDocumentPosition(f).y+g.$.offsetHeight;g.remove();d.setStyle('overflow-y',e);return h;};function b(d){var e=d.document,f=e.getBody(),g=e.getDocumentElement();return e.$.compatMode=='BackCompat'?f:g;};var c=function(d){if(!d.window)return;var e=b(d),f=d.window.getViewPaneSize().height,g=a(e);g+=d.config.autoGrow_bottomSpace||0;var h=d.config.autoGrow_minHeight!=undefined?d.config.autoGrow_minHeight:200,i=d.config.autoGrow_maxHeight||Infinity;g=Math.max(g,h);g=Math.min(g,i);if(g!=f){g=d.fire('autoGrow',{currentHeight:f,newHeight:g}).newHeight;d.resize(d.container.getStyle('width'),g,true);}if(e.$.scrollHeight>e.$.clientHeight&&g<i)e.setStyle('overflow-y','hidden');else e.removeStyle('overflow-y');};CKEDITOR.plugins.add('autogrow',{init:function(d){d.addCommand('autogrow',{exec:c,modes:{wysiwyg:1},readOnly:1,canUndo:false,editorFocus:false});var e={contentDom:1,key:1,selectionChange:1,insertElement:1,mode:1};d.config.autoGrow_onStartup&&(e.instanceReady=1);for(var f in e)d.on(f,function(g){var h=d.getCommand('maximize');if(g.editor.mode=='wysiwyg'&&(!h||h.state!=CKEDITOR.TRISTATE_ON))setTimeout(function(){c(g.editor);c(g.editor);},100);});d.on('beforeCommandExec',function(g){if(g.data.name=='maximize'&&g.editor.mode=='wysiwyg')if(g.data.command.state==CKEDITOR.TRISTATE_OFF){var h=b(d);h.removeStyle('overflow');}else c(d);});}});})();
diff --git a/web/imcms/ckeditor/plugins/bbcode/plugin.js b/web/imcms/ckeditor/plugins/bbcode/plugin.js
new file mode 100644
index 0000000000..374ef56384
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/bbcode/plugin.js
@@ -0,0 +1,9 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){CKEDITOR.on('dialogDefinition',function(r){var s,t=r.data.name,u=r.data.definition;if(t=='link'){u.removeContents('target');u.removeContents('upload');u.removeContents('advanced');s=u.getContents('info');s.remove('emailSubject');s.remove('emailBody');}else if(t=='image'){u.removeContents('advanced');s=u.getContents('Link');s.remove('cmbTarget');s=u.getContents('info');s.remove('txtAlt');s.remove('basic');}});var a={b:'strong',u:'u',i:'em',color:'span',size:'span',quote:'blockquote',code:'code',url:'a',email:'span',img:'span','*':'li',list:'ol'},b={strong:'b',b:'b',u:'u',em:'i',i:'i',code:'code',li:'*'},c={strong:'b',em:'i',u:'u',li:'*',ul:'list',ol:'list',code:'code',a:'link',img:'img',blockquote:'quote'},d={color:'color',size:'font-size'},e={url:'href',email:'mailhref',quote:'cite',list:'listType'},f=CKEDITOR.dtd,g=CKEDITOR.tools.extend({table:1},f.$block,f.$listItem,f.$tableContent,f.$list),h=/\s*(?:;\s*|$)/;function i(r){var s='';for(var t in r){var u=r[t],v=(t+':'+u).replace(h,';');s+=v;}return s;};function j(r){var s={};(r||'').replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(t,u,v){s[u.toLowerCase()]=v;});return s;};function k(r){return r.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(s,t,u,v){t=parseInt(t,10).toString(16);u=parseInt(u,10).toString(16);v=parseInt(v,10).toString(16);var w=[t,u,v];for(var x=0;x<w.length;x++)w[x]=String('0'+w[x]).slice(-2);return '#'+w.join('');});};var l={smiley:':)',sad:':(',wink:';)',laugh:':D',cheeky:':P',blush:':*)',surprise:':-o',indecision:':|',angry:'>:(',angel:'o:)',cool:'8-)',devil:'>:-)',crying:';(',kiss:':-*'},m={},n=[];for(var o in l){m[l[o]]=o;n.push(l[o].replace(/\(|\)|\:|\/|\*|\-|\|/g,function(r){return '\\'+r;}));}n=new RegExp(n.join('|'),'g');var p=(function(){var r=[],s={nbsp:'\xa0',shy:'­',gt:'>',lt:'<'};for(var t in s)r.push(t);r=new RegExp('&('+r.join('|')+');','g');return function(u){return u.replace(r,function(v,w){return s[w];});};})();CKEDITOR.BBCodeParser=function(){this._={bbcPartsRegex:/(?:\[([^\/\]=]*?)(?:=([^\]]*?))?\])|(?:\[\/([a-z]{1,16})\])/ig};};CKEDITOR.BBCodeParser.prototype={parse:function(r){var B=this;var s,t,u=0;while(s=B._.bbcPartsRegex.exec(r)){var v=s.index;if(v>u){var w=r.substring(u,v);B.onText(w,1);}u=B._.bbcPartsRegex.lastIndex;t=(s[1]||s[3]||'').toLowerCase();if(t&&!a[t]){B.onText(s[0]);continue;}if(s[1]){var x=a[t],y={},z={},A=s[2];if(A){if(t=='list')if(!isNaN(A))A='decimal';else if(/^[a-z]+$/.test(A))A='lower-alpha';
+else if(/^[A-Z]+$/.test(A))A='upper-alpha';if(d[t]){if(t=='size')A+='%';z[d[t]]=A;y.style=i(z);}else if(e[t])y[e[t]]=A;}if(t=='email'||t=='img')y.bbcode=t;B.onTagOpen(x,y,CKEDITOR.dtd.$empty[x]);}else if(s[3])B.onTagClose(a[t]);}if(r.length>u)B.onText(r.substring(u,r.length),1);}};CKEDITOR.htmlParser.fragment.fromBBCode=function(r){var s=new CKEDITOR.BBCodeParser(),t=new CKEDITOR.htmlParser.fragment(),u=[],v=0,w=t,x;function y(D){if(u.length>0)for(var E=0;E<u.length;E++){var F=u[E],G=F.name,H=CKEDITOR.dtd[G],I=w.name&&CKEDITOR.dtd[w.name];if((!I||I[G])&&(!D||!H||H[D]||!CKEDITOR.dtd[D])){F=F.clone();F.parent=w;w=F;u.splice(E,1);E--;}}};function z(D,E){var F=w.children.length,G=F>0&&w.children[F-1],H=!G&&q.getRule(c[w.name],'breakAfterOpen'),I=G&&G.type==CKEDITOR.NODE_ELEMENT&&q.getRule(c[G.name],'breakAfterClose'),J=D&&q.getRule(c[D],E?'breakBeforeClose':'breakBeforeOpen');if(v&&(H||I||J))v--;if(v&&D in g)v++;while(v&&v--)w.children.push(G=new CKEDITOR.htmlParser.element('br'));};function A(D,E){z(D.name,1);E=E||w||t;var F=E.children.length,G=F>0&&E.children[F-1]||null;D.previous=G;D.parent=E;E.children.push(D);if(D.returnPoint){w=D.returnPoint;delete D.returnPoint;}};s.onTagOpen=function(D,E,F){var G=new CKEDITOR.htmlParser.element(D,E);if(CKEDITOR.dtd.$removeEmpty[D]){u.push(G);return;}var H=w.name,I=H&&(CKEDITOR.dtd[H]||(w._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span));if(I&&!I[D]){var J=false,K;if(D==H)A(w,w.parent);else if(D in CKEDITOR.dtd.$listItem){s.onTagOpen('ul',{});K=w;J=true;}else{A(w,w.parent);u.unshift(w);J=true;}if(K)w=K;else w=w.returnPoint||w.parent;if(J){s.onTagOpen.apply(this,arguments);return;}}y(D);z(D);G.parent=w;G.returnPoint=x;x=0;if(G.isEmpty)A(G);else w=G;};s.onTagClose=function(D){for(var E=u.length-1;E>=0;E--){if(D==u[E].name){u.splice(E,1);return;}}var F=[],G=[],H=w;while(H.type&&H.name!=D){if(!H._.isBlockLike)G.unshift(H);F.push(H);H=H.parent;}if(H.type){for(E=0;E<F.length;E++){var I=F[E];A(I,I.parent);}w=H;A(H,H.parent);if(H==w)w=w.parent;u=u.concat(G);}};s.onText=function(D){var E=CKEDITOR.dtd[w.name];if(!E||E['#']){z();y();D.replace(/([\r\n])|[^\r\n]*/g,function(F,G){if(G!==undefined&&G.length)v++;else if(F.length){var H=0;F.replace(n,function(I,J){A(new CKEDITOR.htmlParser.text(F.substring(H,J)),w);A(new CKEDITOR.htmlParser.element('smiley',{desc:m[I]}),w);H=J+I.length;});if(H!=F.length)A(new CKEDITOR.htmlParser.text(F.substring(H,F.length)),w);}});}};s.parse(CKEDITOR.tools.htmlEncode(r));while(w.type){var B=w.parent,C=w;
+A(C,B);w=B;}return t;};CKEDITOR.htmlParser.BBCodeWriter=CKEDITOR.tools.createClass({$:function(){var r=this;r._={output:[],rules:[]};r.setRules('list',{breakBeforeOpen:1,breakAfterOpen:1,breakBeforeClose:1,breakAfterClose:1});r.setRules('*',{breakBeforeOpen:1,breakAfterOpen:0,breakBeforeClose:1,breakAfterClose:0});r.setRules('quote',{breakBeforeOpen:1,breakAfterOpen:0,breakBeforeClose:0,breakAfterClose:1});},proto:{setRules:function(r,s){var t=this._.rules[r];if(t)CKEDITOR.tools.extend(t,s,true);else this._.rules[r]=s;},getRule:function(r,s){return this._.rules[r]&&this._.rules[r][s];},openTag:function(r,s){if(r in a){if(this.getRule(r,'breakBeforeOpen'))this.lineBreak(1);this.write('[',r);}},openTagClose:function(r){var s=this;if(r=='br')s._.output.push('\n');else if(r in a){s.write(']');if(s.getRule(r,'breakAfterOpen'))s.lineBreak(1);}},attribute:function(r,s){if(r=='option'){if(typeof s=='string')s=s.replace(/&amp;/g,'&');this.write('=',s);}},closeTag:function(r){var s=this;if(r in a){if(s.getRule(r,'breakBeforeClose'))s.lineBreak(1);r!='*'&&s.write('[/',r,']');if(s.getRule(r,'breakAfterClose'))s.lineBreak(1);}},text:function(r){this.write(r);},comment:function(){},lineBreak:function(){var r=this;if(!r._.hasLineBreak&&r._.output.length){r.write('\n');r._.hasLineBreak=1;}},write:function(){this._.hasLineBreak=0;var r=Array.prototype.join.call(arguments,'');this._.output.push(r);},reset:function(){this._.output=[];this._.hasLineBreak=0;},getHtml:function(r){var s=this._.output.join('');if(r)this.reset();return p(s);}}});var q=new CKEDITOR.htmlParser.BBCodeWriter();CKEDITOR.plugins.add('bbcode',{requires:['htmldataprocessor','entities'],beforeInit:function(r){var s=r.config;CKEDITOR.tools.extend(s,{enterMode:CKEDITOR.ENTER_BR,basicEntities:false,entities:false,fillEmptyBlocks:false},true);},init:function(r){var s=r.config;function t(v){var w=CKEDITOR.htmlParser.fragment.fromBBCode(v),x=new CKEDITOR.htmlParser.basicWriter();w.writeHtml(x,u);return x.getHtml(true);};var u=new CKEDITOR.htmlParser.filter();u.addRules({elements:{blockquote:function(v){var w=new CKEDITOR.htmlParser.element('div');w.children=v.children;v.children=[w];var x=v.attributes.cite;if(x){var y=new CKEDITOR.htmlParser.element('cite');y.add(new CKEDITOR.htmlParser.text(x.replace(/^"|"$/g,'')));delete v.attributes.cite;v.children.unshift(y);}},span:function(v){var w;if(w=v.attributes.bbcode){if(w=='img'){v.name='img';v.attributes.src=v.children[0].value;v.children=[];}else if(w=='email'){v.name='a';
+v.attributes.href='mailto:'+v.children[0].value;}delete v.attributes.bbcode;}},ol:function(v){if(v.attributes.listType){if(v.attributes.listType!='decimal')v.attributes.style='list-style-type:'+v.attributes.listType;}else v.name='ul';delete v.attributes.listType;},a:function(v){if(!v.attributes.href)v.attributes.href=v.children[0].value;},smiley:function(v){v.name='img';var w=v.attributes.desc,x=s.smiley_images[CKEDITOR.tools.indexOf(s.smiley_descriptions,w)],y=CKEDITOR.tools.htmlEncode(s.smiley_path+x);v.attributes={src:y,'data-cke-saved-src':y,title:w,alt:w};}}});r.dataProcessor.htmlFilter.addRules({elements:{$:function(v){var w=v.attributes,x=j(w.style),y,z=v.name;if(z in b)z=b[z];else if(z=='span'){if(y=x.color){z='color';y=k(y);}else if(y=x['font-size']){var A=y.match(/(\d+)%$/);if(A){y=A[1];z='size';}}}else if(z=='ol'||z=='ul'){if(y=x['list-style-type']){switch(y){case 'lower-alpha':y='a';break;case 'upper-alpha':y='A';break;}}else if(z=='ol')y=1;z='list';}else if(z=='blockquote'){try{var B=v.children[0],C=v.children[1],D=B.name=='cite'&&B.children[0].value;if(D){y='"'+D+'"';v.children=C.children;}}catch(G){}z='quote';}else if(z=='a'){if(y=w.href)if(y.indexOf('mailto:')!==-1){z='email';v.children=[new CKEDITOR.htmlParser.text(y.replace('mailto:',''))];y='';}else{var E=v.children.length==1&&v.children[0];if(E&&E.type==CKEDITOR.NODE_TEXT&&E.value==y)y='';z='url';}}else if(z=='img'){v.isEmpty=0;var F=w['data-cke-saved-src'];if(F&&F.indexOf(r.config.smiley_path)!=-1)return new CKEDITOR.htmlParser.text(l[w.alt]);else v.children=[new CKEDITOR.htmlParser.text(F)];}v.name=z;y&&(v.attributes.option=y);return null;},br:function(v){var w=v.next;if(w&&w.name in g)return false;}}},1);r.dataProcessor.writer=q;r.on('beforeSetMode',function(v){v.removeListener();var w=r._.modes.wysiwyg;w.loadData=CKEDITOR.tools.override(w.loadData,function(x){return function(y){return x.call(this,t(y));};});});},afterInit:function(r){var s;if(r._.elementsPath)if(s=r._.elementsPath.filters)s.push(function(t){var u=t.getName(),v=c[u]||false;if(v=='link'&&t.getAttribute('href').indexOf('mailto:')===0)v='email';else if(u=='span'){if(t.getStyle('font-size'))v='size';else if(t.getStyle('color'))v='color';}else if(v=='img'){var w=t.data('cke-saved-src');if(w&&w.indexOf(r.config.smiley_path)===0)v='smiley';}return v;});}});})();
diff --git a/web/imcms/ckeditor/plugins/clipboard/dialogs/paste.js b/web/imcms/ckeditor/plugins/clipboard/dialogs/paste.js
new file mode 100644
index 0000000000..9526fdeaaf
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('paste',function(a){var b=a.lang.clipboard,c=CKEDITOR.env.isCustomDomain();function d(e){var f=new CKEDITOR.dom.document(e.document),g=f.$,h=f.getById('cke_actscrpt');h&&h.remove();CKEDITOR.env.ie?g.body.contentEditable='true':g.designMode='on';if(CKEDITOR.env.ie&&CKEDITOR.env.version<8)f.getWindow().on('blur',function(){g.selection.empty();});f.on('keydown',function(i){var j=i.data,k=j.getKeystroke(),l;switch(k){case 27:this.hide();l=1;break;case 9:case CKEDITOR.SHIFT+9:this.changeFocus(1);l=1;}l&&j.preventDefault();},this);a.fire('ariaWidget',new CKEDITOR.dom.element(e.frameElement));};return{title:b.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?370:350,minHeight:CKEDITOR.env.quirks?250:245,onShow:function(){this.parts.dialog.$.offsetHeight;this.setupContent();},onHide:function(){if(CKEDITOR.env.ie)this.getParentEditor().document.getBody().$.contentEditable='true';},onLoad:function(){if((CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&a.lang.dir=='rtl')this.parts.contents.setStyle('overflow','hidden');},onOk:function(){this.commitContent();},contents:[{id:'general',label:a.lang.common.generalTab,elements:[{type:'html',id:'securityMsg',html:'<div style="white-space:normal;width:340px;">'+b.securityMsg+'</div>'},{type:'html',id:'pasteMsg',html:'<div style="white-space:normal;width:340px;">'+b.pasteMsg+'</div>'},{type:'html',id:'editing_area',style:'width: 100%; height: 100%;',html:'',focus:function(){var e=this.getInputElement().$.contentWindow;setTimeout(function(){e.focus();},500);},setup:function(){var e=this.getDialog(),f='<html dir="'+a.config.contentsLangDirection+'"'+' lang="'+(a.config.contentsLanguage||a.langCode)+'">'+'<head><style>body { margin: 3px; height: 95%; } </style></head><body>'+'<script id="cke_actscrpt" type="text/javascript">'+'window.parent.CKEDITOR.tools.callFunction( '+CKEDITOR.tools.addFunction(d,e)+', this );'+'</script></body>'+'</html>',g=CKEDITOR.env.air?'javascript:void(0)':c?"javascript:void((function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})())"':'',h=CKEDITOR.dom.element.createFromHtml('<iframe class="cke_pasteframe" frameborder="0"  allowTransparency="true" src="'+g+'"'+' role="region"'+' aria-label="'+b.pasteArea+'"'+' aria-describedby="'+e.getContentElement('general','pasteMsg').domId+'"'+' aria-multiple="true"'+'></iframe>');h.on('load',function(k){k.removeListener();var l=h.getFrameDocument();l.write(f);if(CKEDITOR.env.air)d.call(this,l.getWindow().$);
+},e);h.setCustomData('dialog',e);var i=this.getElement();i.setHtml('');i.append(h);if(CKEDITOR.env.ie){var j=CKEDITOR.dom.element.createFromHtml('<span tabindex="-1" style="position:absolute;" role="presentation"></span>');j.on('focus',function(){h.$.contentWindow.focus();});i.append(j);this.focus=function(){j.focus();this.fire('focus');};}this.getInputElement=function(){return h;};if(CKEDITOR.env.ie){i.setStyle('display','block');i.setStyle('height',h.$.offsetHeight+2+'px');}},commit:function(e){var f=this.getElement(),g=this.getDialog().getParentEditor(),h=this.getInputElement().getFrameDocument().getBody(),i=h.getBogus(),j;i&&i.remove();j=h.getHtml();setTimeout(function(){g.fire('paste',{html:j});},0);}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/colordialog/dialogs/colordialog.js b/web/imcms/ckeditor/plugins/colordialog/dialogs/colordialog.js
new file mode 100644
index 0000000000..441d55fd23
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('colordialog',function(a){var b=CKEDITOR.dom.element,c=CKEDITOR.document,d=a.lang.colordialog,e,f={type:'html',html:'&nbsp;'},g;function h(){c.getById(u).removeStyle('background-color');e.getContentElement('picker','selectedColor').setValue('');g&&g.removeAttribute('aria-selected');g=null;};function i(w){var x=w.data.getTarget(),y;if(x.getName()=='td'&&(y=x.getChild(0).getHtml())){g=x;g.setAttribute('aria-selected',true);e.getContentElement('picker','selectedColor').setValue(y);}};function j(w){w=w.replace(/^#/,'');for(var x=0,y=[];x<=2;x++)y[x]=parseInt(w.substr(x*2,2),16);var z=0.2126*y[0]+0.7152*y[1]+0.0722*y[2];return '#'+(z>=165?'000':'fff');};var k,l;function m(w){!w.name&&(w=new CKEDITOR.event(w));var x=!/mouse/.test(w.name),y=w.data.getTarget(),z;if(y.getName()=='td'&&(z=y.getChild(0).getHtml())){o(w);x?k=y:l=y;if(x){y.setStyle('border-color',j(z));y.setStyle('border-style','dotted');}c.getById(s).setStyle('background-color',z);c.getById(t).setHtml(z);}};function n(){var w=k.getChild(0).getHtml();k.setStyle('border-color',w);k.setStyle('border-style','solid');c.getById(s).removeStyle('background-color');c.getById(t).setHtml('&nbsp;');k=null;};function o(w){var x=!/mouse/.test(w.name),y=x&&k;if(y){var z=y.getChild(0).getHtml();y.setStyle('border-color',z);y.setStyle('border-style','solid');}if(!(k||l)){c.getById(s).removeStyle('background-color');c.getById(t).setHtml('&nbsp;');}};function p(w){var x=w.data,y=x.getTarget(),z,A,B=x.getKeystroke(),C=a.lang.dir=='rtl';switch(B){case 38:if(z=y.getParent().getPrevious()){A=z.getChild([y.getIndex()]);A.focus();}x.preventDefault();break;case 40:if(z=y.getParent().getNext()){A=z.getChild([y.getIndex()]);if(A&&A.type==1)A.focus();}x.preventDefault();break;case 32:case 13:i(w);x.preventDefault();break;case C?37:39:if(A=y.getNext()){if(A.type==1){A.focus();x.preventDefault(true);}}else if(z=y.getParent().getNext()){A=z.getChild([0]);if(A&&A.type==1){A.focus();x.preventDefault(true);}}break;case C?39:37:if(A=y.getPrevious()){A.focus();x.preventDefault(true);}else if(z=y.getParent().getPrevious()){A=z.getLast();A.focus();x.preventDefault(true);}break;default:return;}};function q(){v=CKEDITOR.dom.element.createFromHtml('<table tabIndex="-1" aria-label="'+d.options+'"'+' role="grid" style="border-collapse:separate;" cellspacing="0">'+'<caption class="cke_voice_label">'+d.options+'</caption>'+'<tbody role="presentation"></tbody></table>');v.on('mouseover',m);v.on('mouseout',o);var w=['00','33','66','99','cc','ff'];
+function x(C,D){for(var E=C;E<C+3;E++){var F=new b(v.$.insertRow(-1));F.setAttribute('role','row');for(var G=D;G<D+3;G++)for(var H=0;H<6;H++)y(F.$,'#'+w[G]+w[H]+w[E]);}};function y(C,D){var E=new b(C.insertCell(-1));E.setAttribute('class','ColorCell');E.setAttribute('tabIndex',-1);E.setAttribute('role','gridcell');E.on('keydown',p);E.on('click',i);E.on('focus',m);E.on('blur',o);E.setStyle('background-color',D);E.setStyle('border','1px solid '+D);E.setStyle('width','14px');E.setStyle('height','14px');var F=r('color_table_cell');E.setAttribute('aria-labelledby',F);E.append(CKEDITOR.dom.element.createFromHtml('<span id="'+F+'" class="cke_voice_label">'+D+'</span>',CKEDITOR.document));};x(0,0);x(3,0);x(0,3);x(3,3);var z=new b(v.$.insertRow(-1));z.setAttribute('role','row');for(var A=0;A<6;A++)y(z.$,'#'+w[A]+w[A]+w[A]);for(var B=0;B<12;B++)y(z.$,'#000000');};var r=function(w){return CKEDITOR.tools.getNextId()+'_'+w;},s=r('hicolor'),t=r('hicolortext'),u=r('selhicolor'),v;q();return{title:d.title,minWidth:360,minHeight:220,onLoad:function(){e=this;},onHide:function(){h();n();},contents:[{id:'picker',label:d.title,accessKey:'I',elements:[{type:'hbox',padding:0,widths:['70%','10%','30%'],children:[{type:'html',html:'<div></div>',onLoad:function(){CKEDITOR.document.getById(this.domId).append(v);},focus:function(){(k||this.getElement().getElementsByTag('td').getItem(0)).focus();}},f,{type:'vbox',padding:0,widths:['70%','5%','25%'],children:[{type:'html',html:'<span>'+d.highlight+'</span>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+s+'" style="border: 1px solid; height: 74px; width: 74px;"></div>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+t+'">&nbsp;</div><span>'+d.selected+'</span>\t\t\t\t\t\t\t\t\t\t\t\t<div id="'+u+'" style="border: 1px solid; height: 20px; width: 74px;"></div>'},{type:'text',label:d.selected,labelStyle:'display:none',id:'selectedColor',style:'width: 74px',onChange:function(){try{c.getById(u).setStyle('background-color',this.getValue());}catch(w){h();}}},f,{type:'button',id:'clear',style:'margin-top: 5px',label:d.clear,onClick:h}]}]}]}]};});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/_translationstatus.txt b/web/imcms/ckeditor/plugins/devtools/lang/_translationstatus.txt
new file mode 100644
index 0000000000..2b7429a2de
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/_translationstatus.txt
@@ -0,0 +1,31 @@
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+bg.js      Found: 5 Missing: 0
+cs.js      Found: 5 Missing: 0
+cy.js      Found: 5 Missing: 0
+da.js      Found: 5 Missing: 0
+de.js      Found: 5 Missing: 0
+el.js      Found: 5 Missing: 0
+eo.js      Found: 5 Missing: 0
+et.js      Found: 5 Missing: 0
+fa.js      Found: 5 Missing: 0
+fi.js      Found: 5 Missing: 0
+fr.js      Found: 5 Missing: 0
+gu.js      Found: 5 Missing: 0
+he.js      Found: 5 Missing: 0
+hr.js      Found: 5 Missing: 0
+it.js      Found: 5 Missing: 0
+ku.js      Found: 5 Missing: 0
+lv.js      Found: 5 Missing: 0
+nb.js      Found: 5 Missing: 0
+nl.js      Found: 5 Missing: 0
+no.js      Found: 5 Missing: 0
+pl.js      Found: 5 Missing: 0
+pt-br.js   Found: 5 Missing: 0
+sk.js      Found: 5 Missing: 0
+tr.js      Found: 5 Missing: 0
+ug.js      Found: 5 Missing: 0
+uk.js      Found: 5 Missing: 0
+vi.js      Found: 5 Missing: 0
+zh-cn.js   Found: 5 Missing: 0
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/bg.js b/web/imcms/ckeditor/plugins/devtools/lang/bg.js
new file mode 100644
index 0000000000..3a873f5ebd
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/bg.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','bg',{devTools:{title:'Информаци� за елемента',dialogName:'Име на диалогови� прозорец',tabName:'Име на таб',elementId:'ID на елемента',elementType:'Тип на елемента'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/cs.js b/web/imcms/ckeditor/plugins/devtools/lang/cs.js
new file mode 100644
index 0000000000..57aded150e
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/cs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','cs',{devTools:{title:'Informace o prvku',dialogName:'Název dialogového okna',tabName:'Název karty',elementId:'ID prvku',elementType:'Typ prvku'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/cy.js b/web/imcms/ckeditor/plugins/devtools/lang/cy.js
new file mode 100644
index 0000000000..2c37ddc0b9
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/cy.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','cy',{devTools:{title:'Gwybodaeth am yr Elfen',dialogName:'Enw ffenestr y deialog',tabName:"Enw'r tab",elementId:'ID yr Elfen',elementType:'Math yr elfen'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/da.js b/web/imcms/ckeditor/plugins/devtools/lang/da.js
new file mode 100644
index 0000000000..09d605b64f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/da.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','da',{devTools:{title:'Information på elementet',dialogName:'Dialogboks',tabName:'Tab beskrivelse',elementId:'ID på element',elementType:'Type af element'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/de.js b/web/imcms/ckeditor/plugins/devtools/lang/de.js
new file mode 100644
index 0000000000..692e0fbf63
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/de.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','de',{devTools:{title:'Elementinformation',dialogName:'Dialogfenstername',tabName:'Reitername',elementId:'Element ID',elementType:'Elementtyp'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/el.js b/web/imcms/ckeditor/plugins/devtools/lang/el.js
new file mode 100644
index 0000000000..47dd2ff339
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/el.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','el',{devTools:{title:'Πλη�οφο�ίες Στοιχείου',dialogName:'Όνομα πα�αθ��ου διαλόγου',tabName:'Όνομα κα�τέλας',elementId:'ID Στοιχείου',elementType:'Τ�πος στοιχείου'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/en.js b/web/imcms/ckeditor/plugins/devtools/lang/en.js
new file mode 100644
index 0000000000..831f1de717
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/en.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','en',{devTools:{title:'Element Information',dialogName:'Dialog window name',tabName:'Tab name',elementId:'Element ID',elementType:'Element type'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/eo.js b/web/imcms/ckeditor/plugins/devtools/lang/eo.js
new file mode 100644
index 0000000000..9171e249c6
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/eo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','eo',{devTools:{title:'Informo pri la elemento',dialogName:'Nomo de la dialogfenestro',tabName:'Langetnomo',elementId:'ID de la elemento',elementType:'Tipo de la elemento'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/et.js b/web/imcms/ckeditor/plugins/devtools/lang/et.js
new file mode 100644
index 0000000000..025bca2295
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/et.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','et',{devTools:{title:'Elemendi andmed',dialogName:'Dialoogiakna nimi',tabName:'Saki nimi',elementId:'Elemendi ID',elementType:'Elemendi liik'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/fa.js b/web/imcms/ckeditor/plugins/devtools/lang/fa.js
new file mode 100644
index 0000000000..d44c27ece2
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/fa.js
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'devtools', 'fa',
+{
+	devTools :
+	{
+		title		: 'اطلاعات عنصر',
+		dialogName	: 'نام پنجره محاوره‌ای',
+		tabName		: 'نام برگه',
+		elementId	: 'ID عنصر',
+		elementType	: 'نوع عنصر'
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/fi.js b/web/imcms/ckeditor/plugins/devtools/lang/fi.js
new file mode 100644
index 0000000000..4ef10f18db
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/fi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','fi',{devTools:{title:'Elementin tiedot',dialogName:'Dialogi-ikkunan nimi',tabName:'Välilehden nimi',elementId:'Elementin ID',elementType:'Elementin tyyppi'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/fr.js b/web/imcms/ckeditor/plugins/devtools/lang/fr.js
new file mode 100644
index 0000000000..746fe7292b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/fr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','fr',{devTools:{title:"Information sur l'élément",dialogName:'Nom de la fenêtre de dialogue',tabName:"Nom de l'onglet",elementId:"ID de l'élément",elementType:"Type de l'élément"}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/gu.js b/web/imcms/ckeditor/plugins/devtools/lang/gu.js
new file mode 100644
index 0000000000..edfac66c6d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/gu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','gu',{devTools:{title:'પ�રાથમિક માહિતી',dialogName:'વિન�ડોન�ં નામ',tabName:'ટેબન�ં નામ',elementId:'પ�રાથમિક આઈડી',elementType:'પ�રાથમિક પ�રકાર'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/he.js b/web/imcms/ckeditor/plugins/devtools/lang/he.js
new file mode 100644
index 0000000000..0502290bc6
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/he.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','he',{devTools:{title:'מידע על ה�למנט',dialogName:'ש� הדי�לוג',tabName:'ש� הט�ב',elementId:'ID של ה�למנט',elementType:'סוג ה�למנט'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/hr.js b/web/imcms/ckeditor/plugins/devtools/lang/hr.js
new file mode 100644
index 0000000000..6427348328
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/hr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','hr',{devTools:{title:'Informacije elementa',dialogName:'Naziv prozora za dijalog',tabName:'Naziva jaha�a',elementId:'ID elementa',elementType:'Vrsta elementa'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/it.js b/web/imcms/ckeditor/plugins/devtools/lang/it.js
new file mode 100644
index 0000000000..43e4993b2d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/it.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','it',{devTools:{title:'Informazioni elemento',dialogName:'Nome finestra di dialogo',tabName:'Nome Tab',elementId:'ID Elemento',elementType:'Tipo elemento'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/ku.js b/web/imcms/ckeditor/plugins/devtools/lang/ku.js
new file mode 100644
index 0000000000..9f177e9407
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/ku.js
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'devtools', 'ku',
+{
+	devTools :
+	{
+		title		: 'زانیاری توخم',
+		dialogName	: 'ناوی په‌نجه‌ره‌ی دیالۆگ',
+		tabName		: 'ناوی بازده‌ر تاب',
+		elementId	: 'ناسنامه‌ی توخم',
+		elementType	: 'جۆری توخم'
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/lv.js b/web/imcms/ckeditor/plugins/devtools/lang/lv.js
new file mode 100644
index 0000000000..5d99e5371b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/lv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','lv',{devTools:{title:'Elementa inform�cija',dialogName:'Dialoga loga nosaukums',tabName:'Cilnes nosaukums',elementId:'Elementa ID',elementType:'Elementa tips'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/nb.js b/web/imcms/ckeditor/plugins/devtools/lang/nb.js
new file mode 100644
index 0000000000..06962da360
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/nb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','nb',{devTools:{title:'Elementinformasjon',dialogName:'Navn på dialogvindu',tabName:'Navn på fane',elementId:'Element-ID',elementType:'Elementtype'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/nl.js b/web/imcms/ckeditor/plugins/devtools/lang/nl.js
new file mode 100644
index 0000000000..2243fd07c5
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/nl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','nl',{devTools:{title:'Elementinformatie',dialogName:'Naam dialoogvenster',tabName:'Tabnaam',elementId:'Element ID',elementType:'Elementtype'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/no.js b/web/imcms/ckeditor/plugins/devtools/lang/no.js
new file mode 100644
index 0000000000..e41c028987
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/no.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','no',{devTools:{title:'Elementinformasjon',dialogName:'Navn på dialogvindu',tabName:'Navn på fane',elementId:'Element-ID',elementType:'Elementtype'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/pl.js b/web/imcms/ckeditor/plugins/devtools/lang/pl.js
new file mode 100644
index 0000000000..4ce422c954
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/pl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','pl',{devTools:{title:'Informacja o elemencie',dialogName:'Nazwa okna dialogowego',tabName:'Nazwa zakładki',elementId:'ID elementu',elementType:'Typ elementu'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/pt-br.js b/web/imcms/ckeditor/plugins/devtools/lang/pt-br.js
new file mode 100644
index 0000000000..e359c3c4bc
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/pt-br.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','pt-br',{devTools:{title:'Informação do Elemento',dialogName:'Nome da janela de diálogo',tabName:'Nome da aba',elementId:'ID do elemento',elementType:'Tipo do elemento'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/sk.js b/web/imcms/ckeditor/plugins/devtools/lang/sk.js
new file mode 100644
index 0000000000..49df271697
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/sk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','sk',{devTools:{title:'Informácie o prvku',dialogName:'Názov okna dialógu',tabName:'Názov záložky',elementId:'ID prvku',elementType:'Typ prvku'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/tr.js b/web/imcms/ckeditor/plugins/devtools/lang/tr.js
new file mode 100644
index 0000000000..eeb93a8d63
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/tr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','tr',{devTools:{title:'Eleman Bilgisi',dialogName:'İletişim pencere ismi',tabName:'Sekme adı',elementId:'Eleman ID',elementType:'Eleman türü'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/ug.js b/web/imcms/ckeditor/plugins/devtools/lang/ug.js
new file mode 100644
index 0000000000..2d1224251d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/ug.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','ug',{devTools:{title:'ئ�ل�م�نت ئۇچۇرى',dialogName:'سۆزلەشكۈ كۆزنەك ئاتى',tabName:'Tab ئاتى',elementId:'ئ�ل�م�نت كىملىكى',elementType:'ئ�ل�م�نت تىپى'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/uk.js b/web/imcms/ckeditor/plugins/devtools/lang/uk.js
new file mode 100644
index 0000000000..193fbdd51f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/uk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','uk',{devTools:{title:'Відомо�ті про Елемент',dialogName:'Заголовок діалогового вікна',tabName:'�азва вкладки',elementId:'Ідентифікатор Елемента',elementType:'Тип Елемента'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/vi.js b/web/imcms/ckeditor/plugins/devtools/lang/vi.js
new file mode 100644
index 0000000000..eb93f65383
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/vi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','vi',{devTools:{title:'Thông tin thành ph',dialogName:'Tên hộp tho',tabName:'Tên th',elementId:'Mã thành ph',elementType:'Loại thành ph'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/lang/zh-cn.js b/web/imcms/ckeditor/plugins/devtools/lang/zh-cn.js
new file mode 100644
index 0000000000..cb6c03e8c0
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/lang/zh-cn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('devtools','zh-cn',{devTools:{title:'元素信�',dialogName:'对�框窗��称',tabName:'Tab �称',elementId:'元素 ID',elementType:'元素类型'}});
diff --git a/web/imcms/ckeditor/plugins/devtools/plugin.js b/web/imcms/ckeditor/plugins/devtools/plugin.js
new file mode 100644
index 0000000000..e0b72277cd
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/devtools/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add('devtools',{lang:['en','bg','cs','cy','da','de','el','eo','et','fa','fi','fr','gu','he','hr','it','ku','nb','nl','no','pl','pt-br','sk','tr','ug','uk','vi','zh-cn'],init:function(a){a._.showDialogDefinitionTooltips=1;},onLoad:function(){CKEDITOR.document.appendStyleText(CKEDITOR.config.devtools_styles||'#cke_tooltip { padding: 5px; border: 2px solid #333; background: #ffffff }#cke_tooltip h2 { font-size: 1.1em; border-bottom: 1px solid; margin: 0; padding: 1px; }#cke_tooltip ul { padding: 0pt; list-style-type: none; }');}});(function(){function a(d,e,f,g){var h=d.lang.devTools,i='<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.definition.'+(f?f.type=='text'?'textInput':f.type:'content')+'.html" target="_blank">'+(f?f.type:'content')+'</a>',j='<h2>'+h.title+'</h2>'+'<ul>'+'<li><strong>'+h.dialogName+'</strong> : '+e.getName()+'</li>'+'<li><strong>'+h.tabName+'</strong> : '+g+'</li>';if(f)j+='<li><strong>'+h.elementId+'</strong> : '+f.id+'</li>';j+='<li><strong>'+h.elementType+'</strong> : '+i+'</li>';return j+'</ul>';};function b(d,e,f,g,h,i){var j=e.getDocumentPosition(),k={'z-index':CKEDITOR.dialog._.currentZIndex+10,top:j.y+e.getSize('height')+'px'};c.setHtml(d(f,g,h,i));c.show();if(f.lang.dir=='rtl'){var l=CKEDITOR.document.getWindow().getViewPaneSize();k.right=l.width-j.x-e.getSize('width')+'px';}else k.left=j.x+'px';c.setStyles(k);};var c;CKEDITOR.on('reset',function(){c&&c.remove();c=null;});CKEDITOR.on('dialogDefinition',function(d){var e=d.editor;if(e._.showDialogDefinitionTooltips){if(!c){c=CKEDITOR.dom.element.createFromHtml('<div id="cke_tooltip" tabindex="-1" style="position: absolute"></div>',CKEDITOR.document);c.hide();c.on('mouseover',function(){this.show();});c.on('mouseout',function(){this.hide();});c.appendTo(CKEDITOR.document.getBody());}var f=d.data.definition.dialog,g=e.config.devtools_textCallback||a;f.on('load',function(){var h=f.parts.tabs.getChildren(),i;for(var j=0,k=h.count();j<k;j++){i=h.getItem(j);i.on('mouseover',function(){var l=this.$.id;b(g,this,e,f,null,l.substring(4,l.lastIndexOf('_')));});i.on('mouseout',function(){c.hide();});}f.foreach(function(l){if(l.type in {hbox:1,vbox:1})return;var m=l.getElement();if(m){m.on('mouseover',function(){b(g,this,e,f,l,f._.currentTabId);});m.on('mouseout',function(){c.hide();});}});});}});})();
diff --git a/web/imcms/ckeditor/plugins/dialog/dialogDefinition.js b/web/imcms/ckeditor/plugins/dialog/dialogDefinition.js
new file mode 100644
index 0000000000..03bf9ecde1
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/dialog/dialogDefinition.js
@@ -0,0 +1,4 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
diff --git a/web/imcms/ckeditor/plugins/div/dialogs/div.js b/web/imcms/ckeditor/plugins/div/dialogs/div.js
new file mode 100644
index 0000000000..d1dd6442f0
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/div/dialogs/div.js
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){function a(d,e,f){if(!e.is||!e.getCustomData('block_processed')){e.is&&CKEDITOR.dom.element.setMarker(f,e,'block_processed',true);d.push(e);}};function b(d){var e=[],f=d.getChildren();for(var g=0;g<f.count();g++){var h=f.getItem(g);if(!(h.type===CKEDITOR.NODE_TEXT&&/^[ \t\n\r]+$/.test(h.getText())))e.push(h);}return e;};function c(d,e){var f=(function(){var p=CKEDITOR.tools.extend({},CKEDITOR.dtd.$blockLimit);delete p.div;if(d.config.div_wrapTable){delete p.td;delete p.th;}return p;})(),g=CKEDITOR.dtd.div;function h(p){var q=new CKEDITOR.dom.elementPath(p).elements,r;for(var s=0;s<q.length;s++){if(q[s].getName() in f){r=q[s];break;}}return r;};function i(){this.foreach(function(p){if(/^(?!vbox|hbox)/.test(p.type)){if(!p.setup)p.setup=function(q){p.setValue(q.getAttribute(p.id)||'');};if(!p.commit)p.commit=function(q){var r=this.getValue();if('dir'==p.id&&q.getComputedStyle('direction')==r)return;if(r)q.setAttribute(p.id,r);else q.removeAttribute(p.id);};}});};function j(p){var q=[],r={},s=[],t,u=p.document.getSelection(),v=u.getRanges(),w=u.createBookmarks(),x,y,z=p.config.enterMode==CKEDITOR.ENTER_DIV?'div':'p';for(x=0;x<v.length;x++){y=v[x].createIterator();while(t=y.getNextParagraph()){if(t.getName() in f){var A,B=t.getChildren();for(A=0;A<B.count();A++)a(s,B.getItem(A),r);}else{while(!g[t.getName()]&&t.getName()!='body')t=t.getParent();a(s,t,r);}}}CKEDITOR.dom.element.clearAllMarkers(r);var C=l(s),D,E,F;for(x=0;x<C.length;x++){var G=C[x][0];D=G.getParent();for(A=1;A<C[x].length;A++)D=D.getCommonAncestor(C[x][A]);F=new CKEDITOR.dom.element('div',p.document);for(A=0;A<C[x].length;A++){G=C[x][A];while(!G.getParent().equals(D))G=G.getParent();C[x][A]=G;}var H=null;for(A=0;A<C[x].length;A++){G=C[x][A];if(!(G.getCustomData&&G.getCustomData('block_processed'))){G.is&&CKEDITOR.dom.element.setMarker(r,G,'block_processed',true);if(!A)F.insertBefore(G);F.append(G);}}CKEDITOR.dom.element.clearAllMarkers(r);q.push(F);}u.selectBookmarks(w);return q;};function k(p){var q=new CKEDITOR.dom.elementPath(p.getSelection().getStartElement()),r=q.blockLimit,s=r&&r.getAscendant('div',true);return s;};function l(p){var q=[],r=null,s,t;for(var u=0;u<p.length;u++){t=p[u];var v=h(t);if(!v.equals(r)){r=v;q.push([]);}q[q.length-1].push(t);}return q;};function m(p){var q=this.getDialog(),r=q._element&&q._element.clone()||new CKEDITOR.dom.element('div',d.document);this.commit(r,true);p=[].concat(p);var s=p.length,t;for(var u=0;u<s;u++){t=q.getContentElement.apply(q,p[u].split(':'));
+t&&t.setup&&t.setup(r,true);}};var n={},o=[];return{title:d.lang.div.title,minWidth:400,minHeight:165,contents:[{id:'info',label:d.lang.common.generalTab,title:d.lang.common.generalTab,elements:[{type:'hbox',widths:['50%','50%'],children:[{id:'elementStyle',type:'select',style:'width: 100%;',label:d.lang.div.styleSelectLabel,'default':'',items:[[d.lang.common.notSet,'']],onChange:function(){m.call(this,['info:class','advanced:dir','advanced:style']);},setup:function(p){for(var q in n)n[q].checkElementRemovable(p,true)&&this.setValue(q);},commit:function(p){var q;if(q=this.getValue()){var r=n[q],s=p.getCustomData('elementStyle')||'';r.applyToObject(p);p.setCustomData('elementStyle',s+r._.definition.attributes.style);}}},{id:'class',type:'text',label:d.lang.common.cssClass,'default':''}]}]},{id:'advanced',label:d.lang.common.advancedTab,title:d.lang.common.advancedTab,elements:[{type:'vbox',padding:1,children:[{type:'hbox',widths:['50%','50%'],children:[{type:'text',id:'id',label:d.lang.common.id,'default':''},{type:'text',id:'lang',label:d.lang.link.langCode,'default':''}]},{type:'hbox',children:[{type:'text',id:'style',style:'width: 100%;',label:d.lang.common.cssStyle,'default':'',commit:function(p){var q=this.getValue()+(p.getCustomData('elementStyle')||'');p.setAttribute('style',q);}}]},{type:'hbox',children:[{type:'text',id:'title',style:'width: 100%;',label:d.lang.common.advisoryTitle,'default':''}]},{type:'select',id:'dir',style:'width: 100%;',label:d.lang.common.langDir,'default':'',items:[[d.lang.common.notSet,''],[d.lang.common.langDirLtr,'ltr'],[d.lang.common.langDirRtl,'rtl']]}]}]}],onLoad:function(){i.call(this);var p=this,q=this.getContentElement('info','elementStyle');d.getStylesSet(function(r){var s;if(r)for(var t=0;t<r.length;t++){var u=r[t];if(u.element&&u.element=='div'){s=u.name;n[s]=new CKEDITOR.style(u);q.items.push([s,s]);q.add(s,s);}}q[q.items.length>1?'enable':'disable']();setTimeout(function(){q.setup(p._element);},0);});},onShow:function(){if(e=='editdiv'){var p=k(d);p&&this.setupContent(this._element=p);}},onOk:function(){if(e=='editdiv')o=[this._element];else o=j(d,true);var p=o.length;for(var q=0;q<p;q++){this.commitContent(o[q]);!o[q].getAttribute('style')&&o[q].removeAttribute('style');}this.hide();},onHide:function(){if(e=='editdiv')this._element.removeCustomData('elementStyle');delete this._element;}};};CKEDITOR.dialog.add('creatediv',function(d){return c(d,'creatediv');});CKEDITOR.dialog.add('editdiv',function(d){return c(d,'editdiv');
+});})();
diff --git a/web/imcms/ckeditor/plugins/docprops/dialogs/docprops.js b/web/imcms/ckeditor/plugins/docprops/dialogs/docprops.js
new file mode 100644
index 0000000000..2138b0e886
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/docprops/dialogs/docprops.js
@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('docProps',function(a){var b=a.lang.docprops,c=a.lang.common,d={};function e(n,o){var p=function(){q(this);o(this,this._.parentDialog);},q=function(s){s.removeListener('ok',p);s.removeListener('cancel',q);},r=function(s){s.on('ok',p);s.on('cancel',q);};a.execCommand(n);if(a._.storedDialogs.colordialog)r(a._.storedDialogs.colordialog);else CKEDITOR.on('dialogDefinition',function(s){if(s.data.name!=n)return;var t=s.data.definition;s.removeListener();t.onLoad=CKEDITOR.tools.override(t.onLoad,function(u){return function(){r(this);t.onLoad=u;if(typeof u=='function')u.call(this);};});});};function f(){var n=this.getDialog(),o=n.getContentElement('general',this.id+'Other');if(!o)return;if(this.getValue()=='other'){o.getInputElement().removeAttribute('readOnly');o.focus();o.getElement().removeClass('cke_disabled');}else{o.getInputElement().setAttribute('readOnly',true);o.getElement().addClass('cke_disabled');}};function g(n,o,p){return function(q,r,s){var t=d,u=typeof p!='undefined'?p:this.getValue();if(!u&&n in t)t[n].remove();else if(u&&n in t)t[n].setAttribute('content',u);else if(u){var v=new CKEDITOR.dom.element('meta',a.document);v.setAttribute(o?'http-equiv':'name',n);v.setAttribute('content',u);s.append(v);}};};function h(n,o){return function(){var p=d,q=n in p?p[n].getAttribute('content')||'':'';if(o)return q;this.setValue(q);return null;};};function i(n){return function(o,p,q,r){r.removeAttribute('margin'+n);var s=this.getValue();if(s!=='')r.setStyle('margin-'+n,CKEDITOR.tools.cssLength(s));else r.removeStyle('margin-'+n);};};function j(n){var o={},p=n.getElementsByTag('meta'),q=p.count();for(var r=0;r<q;r++){var s=p.getItem(r);o[s.getAttribute(s.hasAttribute('http-equiv')?'http-equiv':'name').toLowerCase()]=s;}return o;};function k(n,o,p){n.removeStyle(o);if(n.getComputedStyle(o)!=p)n.setStyle(o,p);};var l=function(n,o,p){return{type:'hbox',padding:0,widths:['60%','40%'],children:[CKEDITOR.tools.extend({type:'text',id:n,label:b[o]},p||{},1),{type:'button',id:n+'Choose',label:b.chooseColor,className:'colorChooser',onClick:function(){var q=this;e('colordialog',function(r){var s=q.getDialog();s.getContentElement(s._.currentTabId,n).setValue(r.getContentElement('picker','selectedColor').getValue());});}}]};},m='javascript:void((function(){'+encodeURIComponent('document.open();'+(CKEDITOR.env.isCustomDomain()?"document.domain='"+document.domain+"';":'')+'document.write( \'<html style="background-color: #ffffff; height: 100%"><head></head><body style="width: 100%; height: 100%; margin: 0px">'+b.previewHtml+"</body></html>' );"+'document.close();')+'})())';
+return{title:b.title,minHeight:330,minWidth:500,onShow:function(){var n=a.document,o=n.getElementsByTag('html').getItem(0),p=n.getHead(),q=n.getBody();d=j(n);this.setupContent(n,o,p,q);},onHide:function(){d={};},onOk:function(){var n=a.document,o=n.getElementsByTag('html').getItem(0),p=n.getHead(),q=n.getBody();this.commitContent(n,o,p,q);},contents:[{id:'general',label:c.generalTab,elements:[{type:'text',id:'title',label:b.docTitle,setup:function(n){this.setValue(n.getElementsByTag('title').getItem(0).data('cke-title'));},commit:function(n,o,p,q,r){if(r)return;n.getElementsByTag('title').getItem(0).data('cke-title',this.getValue());}},{type:'hbox',children:[{type:'select',id:'dir',label:c.langDir,style:'width: 100%',items:[[c.notSet,''],[c.langDirLtr,'ltr'],[c.langDirRtl,'rtl']],setup:function(n,o,p,q){this.setValue(q.getDirection()||'');},commit:function(n,o,p,q){var r=this.getValue();if(r)q.setAttribute('dir',r);else q.removeAttribute('dir');q.removeStyle('direction');}},{type:'text',id:'langCode',label:c.langCode,setup:function(n,o){this.setValue(o.getAttribute('xml:lang')||o.getAttribute('lang')||'');},commit:function(n,o,p,q,r){if(r)return;var s=this.getValue();if(s)o.setAttributes({'xml:lang':s,lang:s});else o.removeAttributes({'xml:lang':1,lang:1});}}]},{type:'hbox',children:[{type:'select',id:'charset',label:b.charset,style:'width: 100%',items:[[c.notSet,''],[b.charsetASCII,'us-ascii'],[b.charsetCE,'iso-8859-2'],[b.charsetCT,'big5'],[b.charsetCR,'iso-8859-5'],[b.charsetGR,'iso-8859-7'],[b.charsetJP,'iso-2022-jp'],[b.charsetKR,'iso-2022-kr'],[b.charsetTR,'iso-8859-9'],[b.charsetUN,'utf-8'],[b.charsetWE,'iso-8859-1'],[b.other,'other']],'default':'',onChange:function(){var n=this;n.getDialog().selectedCharset=n.getValue()!='other'?n.getValue():'';f.call(n);},setup:function(){var q=this;q.metaCharset='charset' in d;var n=h(q.metaCharset?'charset':'content-type',1,1),o=n.call(q);!q.metaCharset&&o.match(/charset=[^=]+$/)&&(o=o.substring(o.indexOf('=')+1));if(o){q.setValue(o.toLowerCase());if(!q.getValue()){q.setValue('other');var p=q.getDialog().getContentElement('general','charsetOther');p&&p.setValue(o);}q.getDialog().selectedCharset=o;}f.call(q);},commit:function(n,o,p,q,r){var v=this;if(r)return;var s=v.getValue(),t=v.getDialog().getContentElement('general','charsetOther');s=='other'&&(s=t?t.getValue():'');s&&!v.metaCharset&&(s=(d['content-type']?d['content-type'].getAttribute('content').split(';')[0]:'text/html')+'; charset='+s);var u=g(v.metaCharset?'charset':'content-type',1,s);
+u.call(v,n,o,p);}},{type:'text',id:'charsetOther',label:b.charsetOther,onChange:function(){this.getDialog().selectedCharset=this.getValue();}}]},{type:'hbox',children:[{type:'select',id:'docType',label:b.docType,style:'width: 100%',items:[[c.notSet,''],['XHTML 1.1','<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'],['XHTML 1.0 Transitional','<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'],['XHTML 1.0 Strict','<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'],['XHTML 1.0 Frameset','<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">'],['HTML 5','<!DOCTYPE html>'],['HTML 4.01 Transitional','<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'],['HTML 4.01 Strict','<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'],['HTML 4.01 Frameset','<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'],['HTML 3.2','<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'],['HTML 2.0','<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">'],[b.other,'other']],onChange:f,setup:function(){var o=this;if(a.docType){o.setValue(a.docType);if(!o.getValue()){o.setValue('other');var n=o.getDialog().getContentElement('general','docTypeOther');n&&n.setValue(a.docType);}}f.call(o);},commit:function(n,o,p,q,r){if(r)return;var s=this.getValue(),t=this.getDialog().getContentElement('general','docTypeOther');a.docType=s=='other'?t?t.getValue():'':s;}},{type:'text',id:'docTypeOther',label:b.docTypeOther}]},{type:'checkbox',id:'xhtmlDec',label:b.xhtmlDec,setup:function(){this.setValue(!!a.xmlDeclaration);},commit:function(n,o,p,q,r){if(r)return;if(this.getValue()){a.xmlDeclaration='<?xml version="1.0" encoding="'+(this.getDialog().selectedCharset||'utf-8')+'"?>';o.setAttribute('xmlns','http://www.w3.org/1999/xhtml');}else{a.xmlDeclaration='';o.removeAttribute('xmlns');}}}]},{id:'design',label:b.design,elements:[{type:'hbox',widths:['60%','40%'],children:[{type:'vbox',children:[l('txtColor','txtColor',{setup:function(n,o,p,q){this.setValue(q.getComputedStyle('color'));},commit:function(n,o,p,q,r){if(this.isChanged()||r){q.removeAttribute('text');var s=this.getValue();if(s)q.setStyle('color',s);else q.removeStyle('color');}}}),l('bgColor','bgColor',{setup:function(n,o,p,q){var r=q.getComputedStyle('background-color')||'';
+this.setValue(r=='transparent'?'':r);},commit:function(n,o,p,q,r){if(this.isChanged()||r){q.removeAttribute('bgcolor');var s=this.getValue();if(s)q.setStyle('background-color',s);else k(q,'background-color','transparent');}}}),{type:'hbox',widths:['60%','40%'],padding:1,children:[{type:'text',id:'bgImage',label:b.bgImage,setup:function(n,o,p,q){var r=q.getComputedStyle('background-image')||'';if(r=='none')r='';else r=r.replace(/url\(\s*(["']?)\s*([^\)]*)\s*\1\s*\)/i,function(s,t,u){return u;});this.setValue(r);},commit:function(n,o,p,q){q.removeAttribute('background');var r=this.getValue();if(r)q.setStyle('background-image','url('+r+')');else k(q,'background-image','none');}},{type:'button',id:'bgImageChoose',label:c.browseServer,style:'display:inline-block;margin-top:10px;',hidden:true,filebrowser:'design:bgImage'}]},{type:'checkbox',id:'bgFixed',label:b.bgFixed,setup:function(n,o,p,q){this.setValue(q.getComputedStyle('background-attachment')=='fixed');},commit:function(n,o,p,q){if(this.getValue())q.setStyle('background-attachment','fixed');else k(q,'background-attachment','scroll');}}]},{type:'vbox',children:[{type:'html',id:'marginTitle',html:'<div style="text-align: center; margin: 0px auto; font-weight: bold">'+b.margin+'</div>'},{type:'text',id:'marginTop',label:b.marginTop,style:'width: 80px; text-align: center',align:'center',inputStyle:'text-align: center',setup:function(n,o,p,q){this.setValue(q.getStyle('margin-top')||q.getAttribute('margintop')||'');},commit:i('top')},{type:'hbox',children:[{type:'text',id:'marginLeft',label:b.marginLeft,style:'width: 80px; text-align: center',align:'center',inputStyle:'text-align: center',setup:function(n,o,p,q){this.setValue(q.getStyle('margin-left')||q.getAttribute('marginleft')||'');},commit:i('left')},{type:'text',id:'marginRight',label:b.marginRight,style:'width: 80px; text-align: center',align:'center',inputStyle:'text-align: center',setup:function(n,o,p,q){this.setValue(q.getStyle('margin-right')||q.getAttribute('marginright')||'');},commit:i('right')}]},{type:'text',id:'marginBottom',label:b.marginBottom,style:'width: 80px; text-align: center',align:'center',inputStyle:'text-align: center',setup:function(n,o,p,q){this.setValue(q.getStyle('margin-bottom')||q.getAttribute('marginbottom')||'');},commit:i('bottom')}]}]}]},{id:'meta',label:b.meta,elements:[{type:'textarea',id:'metaKeywords',label:b.metaKeywords,setup:h('keywords'),commit:g('keywords')},{type:'textarea',id:'metaDescription',label:b.metaDescription,setup:h('description'),commit:g('description')},{type:'text',id:'metaAuthor',label:b.metaAuthor,setup:h('author'),commit:g('author')},{type:'text',id:'metaCopyright',label:b.metaCopyright,setup:h('copyright'),commit:g('copyright')}]},{id:'preview',label:c.preview,elements:[{type:'html',id:'previewHtml',html:'<iframe src="'+m+'" style="width: 100%; height: 310px" hidefocus="true" frameborder="0" '+'id="cke_docProps_preview_iframe"></iframe>',onLoad:function(){this.getDialog().on('selectPage',function(n){if(n.data.page=='preview'){var o=this;
+setTimeout(function(){var p=CKEDITOR.document.getById('cke_docProps_preview_iframe').getFrameDocument(),q=p.getElementsByTag('html').getItem(0),r=p.getHead(),s=p.getBody();o.commitContent(p,q,r,s,1);},50);}});CKEDITOR.document.getById('cke_docProps_preview_iframe').getAscendant('table').setStyle('height','100%');}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/docprops/plugin.js b/web/imcms/ckeditor/plugins/docprops/plugin.js
new file mode 100644
index 0000000000..514edb1cea
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/docprops/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add('docprops',{init:function(a){var b=new CKEDITOR.dialogCommand('docProps');b.modes={wysiwyg:a.config.fullPage};a.addCommand('docProps',b);CKEDITOR.dialog.add('docProps',this.path+'dialogs/docprops.js');a.ui.addButton('DocProps',{label:a.lang.docprops.label,command:'docProps'});}});
diff --git a/web/imcms/ckeditor/plugins/find/dialogs/find.js b/web/imcms/ckeditor/plugins/find/dialogs/find.js
new file mode 100644
index 0000000000..a300cdf170
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/find/dialogs/find.js
@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a;function b(i){return i.type==CKEDITOR.NODE_TEXT&&i.getLength()>0&&(!a||!i.isReadOnly());};function c(i){return!(i.type==CKEDITOR.NODE_ELEMENT&&i.isBlockBoundary(CKEDITOR.tools.extend({},CKEDITOR.dtd.$empty,CKEDITOR.dtd.$nonEditable)));};var d=function(){var i=this;return{textNode:i.textNode,offset:i.offset,character:i.textNode?i.textNode.getText().charAt(i.offset):null,hitMatchBoundary:i._.matchBoundary};},e=['find','replace'],f=[['txtFindFind','txtFindReplace'],['txtFindCaseChk','txtReplaceCaseChk'],['txtFindWordChk','txtReplaceWordChk'],['txtFindCyclic','txtReplaceCyclic']];function g(i){var j,k,l,m;j=i==='find'?1:0;k=1-j;var n,o=f.length;for(n=0;n<o;n++){l=this.getContentElement(e[j],f[n][j]);m=this.getContentElement(e[k],f[n][k]);m.setValue(l.getValue());}};var h=function(i,j){var k=new CKEDITOR.style(CKEDITOR.tools.extend({attributes:{'data-cke-highlight':1},fullMatch:1,ignoreReadonly:1,childRule:function(){return 0;}},i.config.find_highlight,true)),l=function(y,z){var A=this,B=new CKEDITOR.dom.walker(y);B.guard=z?c:function(C){!c(C)&&(A._.matchBoundary=true);};B.evaluator=b;B.breakOnFalse=1;if(y.startContainer.type==CKEDITOR.NODE_TEXT){this.textNode=y.startContainer;this.offset=y.startOffset-1;}this._={matchWord:z,walker:B,matchBoundary:false};};l.prototype={next:function(){return this.move();},back:function(){return this.move(true);},move:function(y){var A=this;var z=A.textNode;if(z===null)return d.call(A);A._.matchBoundary=false;if(z&&y&&A.offset>0){A.offset--;return d.call(A);}else if(z&&A.offset<z.getLength()-1){A.offset++;return d.call(A);}else{z=null;while(!z){z=A._.walker[y?'previous':'next'].call(A._.walker);if(A._.matchWord&&!z||A._.walker._.end)break;}A.textNode=z;if(z)A.offset=y?z.getLength()-1:0;else A.offset=0;}return d.call(A);}};var m=function(y,z){this._={walker:y,cursors:[],rangeLength:z,highlightRange:null,isMatched:0};};m.prototype={toDomRange:function(){var y=new CKEDITOR.dom.range(i.document),z=this._.cursors;if(z.length<1){var A=this._.walker.textNode;if(A)y.setStartAfter(A);else return null;}else{var B=z[0],C=z[z.length-1];y.setStart(B.textNode,B.offset);y.setEnd(C.textNode,C.offset+1);}return y;},updateFromDomRange:function(y){var B=this;var z,A=new l(y);B._.cursors=[];do{z=A.next();if(z.character)B._.cursors.push(z);}while(z.character);B._.rangeLength=B._.cursors.length;},setMatched:function(){this._.isMatched=true;},clearMatched:function(){this._.isMatched=false;},isMatched:function(){return this._.isMatched;
+},highlight:function(){var B=this;if(B._.cursors.length<1)return;if(B._.highlightRange)B.removeHighlight();var y=B.toDomRange(),z=y.createBookmark();k.applyToRange(y);y.moveToBookmark(z);B._.highlightRange=y;var A=y.startContainer;if(A.type!=CKEDITOR.NODE_ELEMENT)A=A.getParent();A.scrollIntoView();B.updateFromDomRange(y);},removeHighlight:function(){var z=this;if(!z._.highlightRange)return;var y=z._.highlightRange.createBookmark();k.removeFromRange(z._.highlightRange);z._.highlightRange.moveToBookmark(y);z.updateFromDomRange(z._.highlightRange);z._.highlightRange=null;},isReadOnly:function(){if(!this._.highlightRange)return 0;return this._.highlightRange.startContainer.isReadOnly();},moveBack:function(){var A=this;var y=A._.walker.back(),z=A._.cursors;if(y.hitMatchBoundary)A._.cursors=z=[];z.unshift(y);if(z.length>A._.rangeLength)z.pop();return y;},moveNext:function(){var A=this;var y=A._.walker.next(),z=A._.cursors;if(y.hitMatchBoundary)A._.cursors=z=[];z.push(y);if(z.length>A._.rangeLength)z.shift();return y;},getEndCharacter:function(){var y=this._.cursors;if(y.length<1)return null;return y[y.length-1].character;},getNextCharacterRange:function(y){var z,A,B=this._.cursors;if((z=B[B.length-1])&&z.textNode)A=new l(n(z));else A=this._.walker;return new m(A,y);},getCursors:function(){return this._.cursors;}};function n(y,z){var A=new CKEDITOR.dom.range();A.setStart(y.textNode,z?y.offset:y.offset+1);A.setEndAt(i.document.getBody(),CKEDITOR.POSITION_BEFORE_END);return A;};function o(y){var z=new CKEDITOR.dom.range();z.setStartAt(i.document.getBody(),CKEDITOR.POSITION_AFTER_START);z.setEnd(y.textNode,y.offset);return z;};var p=0,q=1,r=2,s=function(y,z){var A=[-1];if(z)y=y.toLowerCase();for(var B=0;B<y.length;B++){A.push(A[B]+1);while(A[B+1]>0&&y.charAt(B)!=y.charAt(A[B+1]-1))A[B+1]=A[A[B+1]-1]+1;}this._={overlap:A,state:0,ignoreCase:!!z,pattern:y};};s.prototype={feedCharacter:function(y){var z=this;if(z._.ignoreCase)y=y.toLowerCase();for(;;){if(y==z._.pattern.charAt(z._.state)){z._.state++;if(z._.state==z._.pattern.length){z._.state=0;return r;}return q;}else if(!z._.state)return p;else z._.state=z._.overlap[z._.state];}return null;},reset:function(){this._.state=0;}};var t=/[.,"'?!;: \u0085\u00a0\u1680\u280e\u2028\u2029\u202f\u205f\u3000]/,u=function(y){if(!y)return true;var z=y.charCodeAt(0);return z>=9&&z<=13||z>=8192&&z<=8202||t.test(y);},v={searchRange:null,matchRange:null,find:function(y,z,A,B,C,D){var O=this;if(!O.matchRange)O.matchRange=new m(new l(O.searchRange),y.length);
+else{O.matchRange.removeHighlight();O.matchRange=O.matchRange.getNextCharacterRange(y.length);}var E=new s(y,!z),F=p,G='%';while(G!==null){O.matchRange.moveNext();while(G=O.matchRange.getEndCharacter()){F=E.feedCharacter(G);if(F==r)break;if(O.matchRange.moveNext().hitMatchBoundary)E.reset();}if(F==r){if(A){var H=O.matchRange.getCursors(),I=H[H.length-1],J=H[0],K=o(J),L=n(I);K.trim();L.trim();var M=new l(K,true),N=new l(L,true);if(!(u(M.back().character)&&u(N.next().character)))continue;}O.matchRange.setMatched();if(C!==false)O.matchRange.highlight();return true;}}O.matchRange.clearMatched();O.matchRange.removeHighlight();if(B&&!D){O.searchRange=w(1);O.matchRange=null;return arguments.callee.apply(O,Array.prototype.slice.call(arguments).concat([true]));}return false;},replaceCounter:0,replace:function(y,z,A,B,C,D,E){var J=this;a=1;var F=0;if(J.matchRange&&J.matchRange.isMatched()&&!J.matchRange._.isReplaced&&!J.matchRange.isReadOnly()){J.matchRange.removeHighlight();var G=J.matchRange.toDomRange(),H=i.document.createText(A);if(!E){var I=i.getSelection();I.selectRanges([G]);i.fire('saveSnapshot');}G.deleteContents();G.insertNode(H);if(!E){I.selectRanges([G]);i.fire('saveSnapshot');}J.matchRange.updateFromDomRange(G);if(!E)J.matchRange.highlight();J.matchRange._.isReplaced=true;J.replaceCounter++;F=1;}else F=J.find(z,B,C,D,!E);a=0;return F;}};function w(y){var z,A=i.getSelection(),B=i.document.getBody();if(A&&!y){z=A.getRanges()[0].clone();z.collapse(true);}else{z=new CKEDITOR.dom.range();z.setStartAt(B,CKEDITOR.POSITION_AFTER_START);}z.setEndAt(B,CKEDITOR.POSITION_BEFORE_END);return z;};var x=i.lang.findAndReplace;return{title:x.title,resizable:CKEDITOR.DIALOG_RESIZE_NONE,minWidth:350,minHeight:170,buttons:[CKEDITOR.dialog.cancelButton],contents:[{id:'find',label:x.find,title:x.find,accessKey:'',elements:[{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtFindFind',label:x.findWhat,isChanged:false,labelLayout:'horizontal',accessKey:'F'},{type:'button',id:'btnFind',align:'left',style:'width:100%',label:x.find,onClick:function(){var y=this.getDialog();if(!v.find(y.getValueOf('find','txtFindFind'),y.getValueOf('find','txtFindCaseChk'),y.getValueOf('find','txtFindWordChk'),y.getValueOf('find','txtFindCyclic')))alert(x.notFoundMsg);}}]},{type:'fieldset',label:CKEDITOR.tools.htmlEncode(x.findOptions),style:'margin-top:29px',children:[{type:'vbox',padding:0,children:[{type:'checkbox',id:'txtFindCaseChk',isChanged:false,label:x.matchCase},{type:'checkbox',id:'txtFindWordChk',isChanged:false,label:x.matchWord},{type:'checkbox',id:'txtFindCyclic',isChanged:false,'default':true,label:x.matchCyclic}]}]}]},{id:'replace',label:x.replace,accessKey:'M',elements:[{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtFindReplace',label:x.findWhat,isChanged:false,labelLayout:'horizontal',accessKey:'F'},{type:'button',id:'btnFindReplace',align:'left',style:'width:100%',label:x.replace,onClick:function(){var y=this.getDialog();
+if(!v.replace(y,y.getValueOf('replace','txtFindReplace'),y.getValueOf('replace','txtReplace'),y.getValueOf('replace','txtReplaceCaseChk'),y.getValueOf('replace','txtReplaceWordChk'),y.getValueOf('replace','txtReplaceCyclic')))alert(x.notFoundMsg);}}]},{type:'hbox',widths:['230px','90px'],children:[{type:'text',id:'txtReplace',label:x.replaceWith,isChanged:false,labelLayout:'horizontal',accessKey:'R'},{type:'button',id:'btnReplaceAll',align:'left',style:'width:100%',label:x.replaceAll,isChanged:false,onClick:function(){var y=this.getDialog(),z;v.replaceCounter=0;v.searchRange=w(1);if(v.matchRange){v.matchRange.removeHighlight();v.matchRange=null;}i.fire('saveSnapshot');while(v.replace(y,y.getValueOf('replace','txtFindReplace'),y.getValueOf('replace','txtReplace'),y.getValueOf('replace','txtReplaceCaseChk'),y.getValueOf('replace','txtReplaceWordChk'),false,true)){}if(v.replaceCounter){alert(x.replaceSuccessMsg.replace(/%1/,v.replaceCounter));i.fire('saveSnapshot');}else alert(x.notFoundMsg);}}]},{type:'fieldset',label:CKEDITOR.tools.htmlEncode(x.findOptions),children:[{type:'vbox',padding:0,children:[{type:'checkbox',id:'txtReplaceCaseChk',isChanged:false,label:x.matchCase},{type:'checkbox',id:'txtReplaceWordChk',isChanged:false,label:x.matchWord},{type:'checkbox',id:'txtReplaceCyclic',isChanged:false,'default':true,label:x.matchCyclic}]}]}]}],onLoad:function(){var y=this,z,A,B=0;this.on('hide',function(){B=0;});this.on('show',function(){B=1;});this.selectPage=CKEDITOR.tools.override(this.selectPage,function(C){return function(D){C.call(y,D);var E=y._.tabs[D],F,G,H;G=D==='find'?'txtFindFind':'txtFindReplace';H=D==='find'?'txtFindWordChk':'txtReplaceWordChk';z=y.getContentElement(D,G);A=y.getContentElement(D,H);if(!E.initialized){F=CKEDITOR.document.getById(z._.inputId);E.initialized=true;}if(B)g.call(this,D);};});},onShow:function(){var B=this;v.searchRange=w();var y=B.getParentEditor().getSelection().getSelectedText(),z=j=='find'?'txtFindFind':'txtFindReplace',A=B.getContentElement(j,z);A.setValue(y);A.select();B.selectPage(j);B[(j=='find'&&B._.editor.readOnly?'hide':'show')+'Page']('replace');},onHide:function(){var y;if(v.matchRange&&v.matchRange.isMatched()){v.matchRange.removeHighlight();i.focus();y=v.matchRange.toDomRange();if(y)i.getSelection().selectRanges([y]);}delete v.matchRange;},onFocus:function(){if(j=='replace')return this.getContentElement('replace','txtFindReplace');else return this.getContentElement('find','txtFindFind');}};};CKEDITOR.dialog.add('find',function(i){return h(i,'find');
+});CKEDITOR.dialog.add('replace',function(i){return h(i,'replace');});})();
diff --git a/web/imcms/ckeditor/plugins/flash/dialogs/flash.js b/web/imcms/ckeditor/plugins/flash/dialogs/flash.js
new file mode 100644
index 0000000000..1584bccc98
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/flash/dialogs/flash.js
@@ -0,0 +1,9 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=1,b=2,c=4,d={id:[{type:a,name:'id'}],classid:[{type:a,name:'classid'}],codebase:[{type:a,name:'codebase'}],pluginspage:[{type:c,name:'pluginspage'}],src:[{type:b,name:'movie'},{type:c,name:'src'},{type:a,name:'data'}],name:[{type:c,name:'name'}],align:[{type:a,name:'align'}],'class':[{type:a,name:'class'},{type:c,name:'class'}],width:[{type:a,name:'width'},{type:c,name:'width'}],height:[{type:a,name:'height'},{type:c,name:'height'}],hSpace:[{type:a,name:'hSpace'},{type:c,name:'hSpace'}],vSpace:[{type:a,name:'vSpace'},{type:c,name:'vSpace'}],style:[{type:a,name:'style'},{type:c,name:'style'}],type:[{type:c,name:'type'}]},e=['play','loop','menu','quality','scale','salign','wmode','bgcolor','base','flashvars','allowScriptAccess','allowFullScreen'];for(var f=0;f<e.length;f++)d[e[f]]=[{type:c,name:e[f]},{type:b,name:e[f]}];e=['allowFullScreen','play','loop','menu'];for(f=0;f<e.length;f++)d[e[f]][0]['default']=d[e[f]][1]['default']=true;var g=CKEDITOR.tools.cssLength;function h(j,k,l){var r=this;var m=d[r.id];if(!m)return;var n=r instanceof CKEDITOR.ui.dialog.checkbox;for(var o=0;o<m.length;o++){var p=m[o];switch(p.type){case a:if(!j)continue;if(j.getAttribute(p.name)!==null){var q=j.getAttribute(p.name);if(n)r.setValue(q.toLowerCase()=='true');else r.setValue(q);return;}else if(n)r.setValue(!!p['default']);break;case b:if(!j)continue;if(p.name in l){q=l[p.name];if(n)r.setValue(q.toLowerCase()=='true');else r.setValue(q);return;}else if(n)r.setValue(!!p['default']);break;case c:if(!k)continue;if(k.getAttribute(p.name)){q=k.getAttribute(p.name);if(n)r.setValue(q.toLowerCase()=='true');else r.setValue(q);return;}else if(n)r.setValue(!!p['default']);}}};function i(j,k,l){var t=this;var m=d[t.id];if(!m)return;var n=t.getValue()==='',o=t instanceof CKEDITOR.ui.dialog.checkbox;for(var p=0;p<m.length;p++){var q=m[p];switch(q.type){case a:if(!j||q.name=='data'&&k&&!j.hasAttribute('data'))continue;var r=t.getValue();if(n||o&&r===q['default'])j.removeAttribute(q.name);else j.setAttribute(q.name,r);break;case b:if(!j)continue;r=t.getValue();if(n||o&&r===q['default']){if(q.name in l)l[q.name].remove();}else if(q.name in l)l[q.name].setAttribute('value',r);else{var s=CKEDITOR.dom.element.createFromHtml('<cke:param></cke:param>',j.getDocument());s.setAttributes({name:q.name,value:r});if(j.getChildCount()<1)s.appendTo(j);else s.insertBefore(j.getFirst());}break;case c:if(!k)continue;r=t.getValue();if(n||o&&r===q['default'])k.removeAttribute(q.name);else k.setAttribute(q.name,r);
+}}};CKEDITOR.dialog.add('flash',function(j){var k=!j.config.flashEmbedTagOnly,l=j.config.flashAddEmbedTag||j.config.flashEmbedTagOnly,m,n='<div>'+CKEDITOR.tools.htmlEncode(j.lang.common.preview)+'<br>'+'<div id="cke_FlashPreviewLoader'+CKEDITOR.tools.getNextNumber()+'" style="display:none"><div class="loading">&nbsp;</div></div>'+'<div id="cke_FlashPreviewBox'+CKEDITOR.tools.getNextNumber()+'" class="FlashPreviewBox"></div></div>';return{title:j.lang.flash.title,minWidth:420,minHeight:310,onShow:function(){var A=this;A.fakeImage=A.objectNode=A.embedNode=null;m=new CKEDITOR.dom.element('embed',j.document);var o=A.getSelectedElement();if(o&&o.data('cke-real-element-type')&&o.data('cke-real-element-type')=='flash'){A.fakeImage=o;var p=j.restoreRealElement(o),q=null,r=null,s={};if(p.getName()=='cke:object'){q=p;var t=q.getElementsByTag('embed','cke');if(t.count()>0)r=t.getItem(0);var u=q.getElementsByTag('param','cke');for(var v=0,w=u.count();v<w;v++){var x=u.getItem(v),y=x.getAttribute('name'),z=x.getAttribute('value');s[y]=z;}}else if(p.getName()=='cke:embed')r=p;A.objectNode=q;A.embedNode=r;A.setupContent(q,r,s,o);}},onOk:function(){var y=this;var o=null,p=null,q=null;if(!y.fakeImage){if(k){o=CKEDITOR.dom.element.createFromHtml('<cke:object></cke:object>',j.document);var r={classid:'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000',codebase:'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'};o.setAttributes(r);}if(l){p=CKEDITOR.dom.element.createFromHtml('<cke:embed></cke:embed>',j.document);p.setAttributes({type:'application/x-shockwave-flash',pluginspage:'http://www.macromedia.com/go/getflashplayer'});if(o)p.appendTo(o);}}else{o=y.objectNode;p=y.embedNode;}if(o){q={};var s=o.getElementsByTag('param','cke');for(var t=0,u=s.count();t<u;t++)q[s.getItem(t).getAttribute('name')]=s.getItem(t);}var v={},w={};y.commitContent(o,p,q,v,w);var x=j.createFakeElement(o||p,'cke_flash','flash',true);x.setAttributes(w);x.setStyles(v);if(y.fakeImage){x.replace(y.fakeImage);j.getSelection().selectElement(x);}else j.insertElement(x);},onHide:function(){if(this.preview)this.preview.setHtml('');},contents:[{id:'info',label:j.lang.common.generalTab,accessKey:'I',elements:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['280px','110px'],align:'right',children:[{id:'src',type:'text',label:j.lang.common.url,required:true,validate:CKEDITOR.dialog.validate.notEmpty(j.lang.flash.validateSrc),setup:h,commit:i,onLoad:function(){var o=this.getDialog(),p=function(q){m.setAttribute('src',q);
+o.preview.setHtml('<embed height="100%" width="100%" src="'+CKEDITOR.tools.htmlEncode(m.getAttribute('src'))+'" type="application/x-shockwave-flash"></embed>');};o.preview=o.getContentElement('info','preview').getElement().getChild(3);this.on('change',function(q){if(q.data&&q.data.value)p(q.data.value);});this.getInputElement().on('change',function(q){p(this.getValue());},this);}},{type:'button',id:'browse',filebrowser:'info:src',hidden:true,style:'display:inline-block;margin-top:10px;',label:j.lang.common.browseServer}]}]},{type:'hbox',widths:['25%','25%','25%','25%','25%'],children:[{type:'text',id:'width',style:'width:95px',label:j.lang.common.width,validate:CKEDITOR.dialog.validate.htmlLength(j.lang.common.invalidHtmlLength.replace('%1',j.lang.common.width)),setup:h,commit:i},{type:'text',id:'height',style:'width:95px',label:j.lang.common.height,validate:CKEDITOR.dialog.validate.htmlLength(j.lang.common.invalidHtmlLength.replace('%1',j.lang.common.height)),setup:h,commit:i},{type:'text',id:'hSpace',style:'width:95px',label:j.lang.flash.hSpace,validate:CKEDITOR.dialog.validate.integer(j.lang.flash.validateHSpace),setup:h,commit:i},{type:'text',id:'vSpace',style:'width:95px',label:j.lang.flash.vSpace,validate:CKEDITOR.dialog.validate.integer(j.lang.flash.validateVSpace),setup:h,commit:i}]},{type:'vbox',children:[{type:'html',id:'preview',style:'width:95%;',html:n}]}]},{id:'Upload',hidden:true,filebrowser:'uploadButton',label:j.lang.common.upload,elements:[{type:'file',id:'upload',label:j.lang.common.upload,size:38},{type:'fileButton',id:'uploadButton',label:j.lang.common.uploadSubmit,filebrowser:'info:src','for':['Upload','upload']}]},{id:'properties',label:j.lang.flash.propertiesTab,elements:[{type:'hbox',widths:['50%','50%'],children:[{id:'scale',type:'select',label:j.lang.flash.scale,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.scaleAll,'showall'],[j.lang.flash.scaleNoBorder,'noborder'],[j.lang.flash.scaleFit,'exactfit']],setup:h,commit:i},{id:'allowScriptAccess',type:'select',label:j.lang.flash.access,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.accessAlways,'always'],[j.lang.flash.accessSameDomain,'samedomain'],[j.lang.flash.accessNever,'never']],setup:h,commit:i}]},{type:'hbox',widths:['50%','50%'],children:[{id:'wmode',type:'select',label:j.lang.flash.windowMode,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.windowModeWindow,'window'],[j.lang.flash.windowModeOpaque,'opaque'],[j.lang.flash.windowModeTransparent,'transparent']],setup:h,commit:i},{id:'quality',type:'select',label:j.lang.flash.quality,'default':'high',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.flash.qualityBest,'best'],[j.lang.flash.qualityHigh,'high'],[j.lang.flash.qualityAutoHigh,'autohigh'],[j.lang.flash.qualityMedium,'medium'],[j.lang.flash.qualityAutoLow,'autolow'],[j.lang.flash.qualityLow,'low']],setup:h,commit:i}]},{type:'hbox',widths:['50%','50%'],children:[{id:'align',type:'select',label:j.lang.common.align,'default':'',style:'width : 100%;',items:[[j.lang.common.notSet,''],[j.lang.common.alignLeft,'left'],[j.lang.flash.alignAbsBottom,'absBottom'],[j.lang.flash.alignAbsMiddle,'absMiddle'],[j.lang.flash.alignBaseline,'baseline'],[j.lang.common.alignBottom,'bottom'],[j.lang.common.alignMiddle,'middle'],[j.lang.common.alignRight,'right'],[j.lang.flash.alignTextTop,'textTop'],[j.lang.common.alignTop,'top']],setup:h,commit:function(o,p,q,r,s){var t=this.getValue();
+i.apply(this,arguments);t&&(s.align=t);}},{type:'html',html:'<div></div>'}]},{type:'fieldset',label:CKEDITOR.tools.htmlEncode(j.lang.flash.flashvars),children:[{type:'vbox',padding:0,children:[{type:'checkbox',id:'menu',label:j.lang.flash.chkMenu,'default':true,setup:h,commit:i},{type:'checkbox',id:'play',label:j.lang.flash.chkPlay,'default':true,setup:h,commit:i},{type:'checkbox',id:'loop',label:j.lang.flash.chkLoop,'default':true,setup:h,commit:i},{type:'checkbox',id:'allowFullScreen',label:j.lang.flash.chkFull,'default':true,setup:h,commit:i}]}]}]},{id:'advanced',label:j.lang.common.advancedTab,elements:[{type:'hbox',children:[{type:'text',id:'id',label:j.lang.common.id,setup:h,commit:i}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',id:'bgcolor',label:j.lang.flash.bgcolor,setup:h,commit:i},{type:'text',id:'class',label:j.lang.common.cssClass,setup:h,commit:i}]},{type:'text',id:'style',validate:CKEDITOR.dialog.validate.inlineStyle(j.lang.common.invalidInlineStyle),label:j.lang.common.cssStyle,setup:h,commit:i}]}]};});})();
diff --git a/web/imcms/ckeditor/plugins/flash/images/placeholder.png b/web/imcms/ckeditor/plugins/flash/images/placeholder.png
new file mode 100644
index 0000000000..0bc6caa7a6
Binary files /dev/null and b/web/imcms/ckeditor/plugins/flash/images/placeholder.png differ
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/button.js b/web/imcms/ckeditor/plugins/forms/dialogs/button.js
new file mode 100644
index 0000000000..add301ddff
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/button.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('button',function(a){function b(c){var e=this;var d=e.getValue();if(d){c.attributes[e.id]=d;if(e.id=='name')c.attributes['data-cke-saved-name']=d;}else{delete c.attributes[e.id];if(e.id=='name')delete c.attributes['data-cke-saved-name'];}};return{title:a.lang.button.title,minWidth:350,minHeight:150,onShow:function(){var e=this;delete e.button;var c=e.getParentEditor().getSelection().getSelectedElement();if(c&&c.is('input')){var d=c.getAttribute('type');if(d in {button:1,reset:1,submit:1}){e.button=c;e.setupContent(c);}}},onOk:function(){var c=this.getParentEditor(),d=this.button,e=!d,f=d?CKEDITOR.htmlParser.fragment.fromHtml(d.getOuterHtml()).children[0]:new CKEDITOR.htmlParser.element('input');this.commitContent(f);var g=new CKEDITOR.htmlParser.basicWriter();f.writeHtml(g);var h=CKEDITOR.dom.element.createFromHtml(g.getHtml(),c.document);if(e)c.insertElement(h);else{h.replace(d);c.getSelection().selectElement(h);}},contents:[{id:'info',label:a.lang.button.title,title:a.lang.button.title,elements:[{id:'name',type:'text',label:a.lang.common.name,'default':'',setup:function(c){this.setValue(c.data('cke-saved-name')||c.getAttribute('name')||'');},commit:b},{id:'value',type:'text',label:a.lang.button.text,accessKey:'V','default':'',setup:function(c){this.setValue(c.getAttribute('value')||'');},commit:b},{id:'type',type:'select',label:a.lang.button.type,'default':'button',accessKey:'T',items:[[a.lang.button.typeBtn,'button'],[a.lang.button.typeSbm,'submit'],[a.lang.button.typeRst,'reset']],setup:function(c){this.setValue(c.getAttribute('type')||'');},commit:b}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/checkbox.js b/web/imcms/ckeditor/plugins/forms/dialogs/checkbox.js
new file mode 100644
index 0000000000..8a61431d19
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/checkbox.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('checkbox',function(a){return{title:a.lang.checkboxAndRadio.checkboxTitle,minWidth:350,minHeight:140,onShow:function(){var c=this;delete c.checkbox;var b=c.getParentEditor().getSelection().getSelectedElement();if(b&&b.getAttribute('type')=='checkbox'){c.checkbox=b;c.setupContent(b);}},onOk:function(){var b,c=this.checkbox,d=!c;if(d){b=this.getParentEditor();c=b.document.createElement('input');c.setAttribute('type','checkbox');b.insertElement(c);}this.commitContent({element:c});},contents:[{id:'info',label:a.lang.checkboxAndRadio.checkboxTitle,title:a.lang.checkboxAndRadio.checkboxTitle,startupFocus:'txtName',elements:[{id:'txtName',type:'text',label:a.lang.common.name,'default':'',accessKey:'N',setup:function(b){this.setValue(b.data('cke-saved-name')||b.getAttribute('name')||'');},commit:function(b){var c=b.element;if(this.getValue())c.data('cke-saved-name',this.getValue());else{c.data('cke-saved-name',false);c.removeAttribute('name');}}},{id:'txtValue',type:'text',label:a.lang.checkboxAndRadio.value,'default':'',accessKey:'V',setup:function(b){var c=b.getAttribute('value');this.setValue(CKEDITOR.env.ie&&c=='on'?'':c);},commit:function(b){var c=b.element,d=this.getValue();if(d&&!(CKEDITOR.env.ie&&d=='on'))c.setAttribute('value',d);else if(CKEDITOR.env.ie){var e=new CKEDITOR.dom.element('input',c.getDocument());c.copyAttributes(e,{value:1});e.replace(c);a.getSelection().selectElement(e);b.element=e;}else c.removeAttribute('value');}},{id:'cmbSelected',type:'checkbox',label:a.lang.checkboxAndRadio.selected,'default':'',accessKey:'S',value:'checked',setup:function(b){this.setValue(b.getAttribute('checked'));},commit:function(b){var c=b.element;if(CKEDITOR.env.ie){var d=!!c.getAttribute('checked'),e=!!this.getValue();if(d!=e){var f=CKEDITOR.dom.element.createFromHtml('<input type="checkbox"'+(e?' checked="checked"':'')+'/>',a.document);c.copyAttributes(f,{type:1,checked:1});f.replace(c);a.getSelection().selectElement(f);b.element=f;}}else{var g=this.getValue();if(g)c.setAttribute('checked','checked');else c.removeAttribute('checked');}}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/form.js b/web/imcms/ckeditor/plugins/forms/dialogs/form.js
new file mode 100644
index 0000000000..5c861a32ce
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/form.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('form',function(a){var b={action:1,id:1,method:1,enctype:1,target:1};return{title:a.lang.form.title,minWidth:350,minHeight:200,onShow:function(){var e=this;delete e.form;var c=e.getParentEditor().getSelection().getStartElement(),d=c&&c.getAscendant('form',true);if(d){e.form=d;e.setupContent(d);}},onOk:function(){var c,d=this.form,e=!d;if(e){c=this.getParentEditor();d=c.document.createElement('form');!CKEDITOR.env.ie&&d.append(c.document.createElement('br'));}if(e)c.insertElement(d);this.commitContent(d);},onLoad:function(){function c(e){this.setValue(e.getAttribute(this.id)||'');};function d(e){var f=this;if(f.getValue())e.setAttribute(f.id,f.getValue());else e.removeAttribute(f.id);};this.foreach(function(e){if(b[e.id]){e.setup=c;e.commit=d;}});},contents:[{id:'info',label:a.lang.form.title,title:a.lang.form.title,elements:[{id:'txtName',type:'text',label:a.lang.common.name,'default':'',accessKey:'N',setup:function(c){this.setValue(c.data('cke-saved-name')||c.getAttribute('name')||'');},commit:function(c){if(this.getValue())c.data('cke-saved-name',this.getValue());else{c.data('cke-saved-name',false);c.removeAttribute('name');}}},{id:'action',type:'text',label:a.lang.form.action,'default':'',accessKey:'T'},{type:'hbox',widths:['45%','55%'],children:[{id:'id',type:'text',label:a.lang.common.id,'default':'',accessKey:'I'},{id:'enctype',type:'select',label:a.lang.form.encoding,style:'width:100%',accessKey:'E','default':'',items:[[''],['text/plain'],['multipart/form-data'],['application/x-www-form-urlencoded']]}]},{type:'hbox',widths:['45%','55%'],children:[{id:'target',type:'select',label:a.lang.common.target,style:'width:100%',accessKey:'M','default':'',items:[[a.lang.common.notSet,''],[a.lang.common.targetNew,'_blank'],[a.lang.common.targetTop,'_top'],[a.lang.common.targetSelf,'_self'],[a.lang.common.targetParent,'_parent']]},{id:'method',type:'select',label:a.lang.form.method,accessKey:'M','default':'GET',items:[['GET','get'],['POST','post']]}]}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/hiddenfield.js b/web/imcms/ckeditor/plugins/forms/dialogs/hiddenfield.js
new file mode 100644
index 0000000000..46d0fcda33
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/hiddenfield.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('hiddenfield',function(a){return{title:a.lang.hidden.title,hiddenField:null,minWidth:350,minHeight:110,onShow:function(){var e=this;delete e.hiddenField;var b=e.getParentEditor(),c=b.getSelection(),d=c.getSelectedElement();if(d&&d.data('cke-real-element-type')&&d.data('cke-real-element-type')=='hiddenfield'){e.hiddenField=d;d=b.restoreRealElement(e.hiddenField);e.setupContent(d);c.selectElement(e.hiddenField);}},onOk:function(){var g=this;var b=g.getValueOf('info','_cke_saved_name'),c=g.getValueOf('info','value'),d=g.getParentEditor(),e=CKEDITOR.env.ie&&!(CKEDITOR.document.$.documentMode>=8)?d.document.createElement('<input name="'+CKEDITOR.tools.htmlEncode(b)+'">'):d.document.createElement('input');e.setAttribute('type','hidden');g.commitContent(e);var f=d.createFakeElement(e,'cke_hidden','hiddenfield');if(!g.hiddenField)d.insertElement(f);else{f.replace(g.hiddenField);d.getSelection().selectElement(f);}return true;},contents:[{id:'info',label:a.lang.hidden.title,title:a.lang.hidden.title,elements:[{id:'_cke_saved_name',type:'text',label:a.lang.hidden.name,'default':'',accessKey:'N',setup:function(b){this.setValue(b.data('cke-saved-name')||b.getAttribute('name')||'');},commit:function(b){if(this.getValue())b.setAttribute('name',this.getValue());else b.removeAttribute('name');}},{id:'value',type:'text',label:a.lang.hidden.value,'default':'',accessKey:'V',setup:function(b){this.setValue(b.getAttribute('value')||'');},commit:function(b){if(this.getValue())b.setAttribute('value',this.getValue());else b.removeAttribute('value');}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/radio.js b/web/imcms/ckeditor/plugins/forms/dialogs/radio.js
new file mode 100644
index 0000000000..73262355b8
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/radio.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('radio',function(a){return{title:a.lang.checkboxAndRadio.radioTitle,minWidth:350,minHeight:140,onShow:function(){var c=this;delete c.radioButton;var b=c.getParentEditor().getSelection().getSelectedElement();if(b&&b.getName()=='input'&&b.getAttribute('type')=='radio'){c.radioButton=b;c.setupContent(b);}},onOk:function(){var b,c=this.radioButton,d=!c;if(d){b=this.getParentEditor();c=b.document.createElement('input');c.setAttribute('type','radio');}if(d)b.insertElement(c);this.commitContent({element:c});},contents:[{id:'info',label:a.lang.checkboxAndRadio.radioTitle,title:a.lang.checkboxAndRadio.radioTitle,elements:[{id:'name',type:'text',label:a.lang.common.name,'default':'',accessKey:'N',setup:function(b){this.setValue(b.data('cke-saved-name')||b.getAttribute('name')||'');},commit:function(b){var c=b.element;if(this.getValue())c.data('cke-saved-name',this.getValue());else{c.data('cke-saved-name',false);c.removeAttribute('name');}}},{id:'value',type:'text',label:a.lang.checkboxAndRadio.value,'default':'',accessKey:'V',setup:function(b){this.setValue(b.getAttribute('value')||'');},commit:function(b){var c=b.element;if(this.getValue())c.setAttribute('value',this.getValue());else c.removeAttribute('value');}},{id:'checked',type:'checkbox',label:a.lang.checkboxAndRadio.selected,'default':'',accessKey:'S',value:'checked',setup:function(b){this.setValue(b.getAttribute('checked'));},commit:function(b){var c=b.element;if(!(CKEDITOR.env.ie||CKEDITOR.env.opera)){if(this.getValue())c.setAttribute('checked','checked');else c.removeAttribute('checked');}else{var d=c.getAttribute('checked'),e=!!this.getValue();if(d!=e){var f=CKEDITOR.dom.element.createFromHtml('<input type="radio"'+(e?' checked="checked"':'')+'></input>',a.document);c.copyAttributes(f,{type:1,checked:1});f.replace(c);a.getSelection().selectElement(f);b.element=f;}}}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/select.js b/web/imcms/ckeditor/plugins/forms/dialogs/select.js
new file mode 100644
index 0000000000..7ff20bf4af
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/select.js
@@ -0,0 +1,9 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('select',function(a){function b(k,l,m,n,o){k=j(k);var p;if(n)p=n.createElement('OPTION');else p=document.createElement('OPTION');if(k&&p&&p.getName()=='option'){if(CKEDITOR.env.ie){if(!isNaN(parseInt(o,10)))k.$.options.add(p.$,o);else k.$.options.add(p.$);p.$.innerHTML=l.length>0?l:'';p.$.value=m;}else{if(o!==null&&o<k.getChildCount())k.getChild(o<0?0:o).insertBeforeMe(p);else k.append(p);p.setText(l.length>0?l:'');p.setValue(m);}}else return false;return p;};function c(k){k=j(k);var l=g(k);for(var m=k.getChildren().count()-1;m>=0;m--){if(k.getChild(m).$.selected)k.getChild(m).remove();}h(k,l);};function d(k,l,m,n){k=j(k);if(l<0)return false;var o=k.getChild(l);o.setText(m);o.setValue(n);return o;};function e(k){k=j(k);while(k.getChild(0)&&k.getChild(0).remove()){}};function f(k,l,m){k=j(k);var n=g(k);if(n<0)return false;var o=n+l;o=o<0?0:o;o=o>=k.getChildCount()?k.getChildCount()-1:o;if(n==o)return false;var p=k.getChild(n),q=p.getText(),r=p.getValue();p.remove();p=b(k,q,r,!m?null:m,o);h(k,o);return p;};function g(k){k=j(k);return k?k.$.selectedIndex:-1;};function h(k,l){k=j(k);if(l<0)return null;var m=k.getChildren().count();k.$.selectedIndex=l>=m?m-1:l;return k;};function i(k){k=j(k);return k?k.getChildren():false;};function j(k){if(k&&k.domId&&k.getInputElement().$)return k.getInputElement();else if(k&&k.$)return k;return false;};return{title:a.lang.select.title,minWidth:CKEDITOR.env.ie?460:395,minHeight:CKEDITOR.env.ie?320:300,onShow:function(){var n=this;delete n.selectBox;n.setupContent('clear');var k=n.getParentEditor().getSelection().getSelectedElement();if(k&&k.getName()=='select'){n.selectBox=k;n.setupContent(k.getName(),k);var l=i(k);for(var m=0;m<l.count();m++)n.setupContent('option',l.getItem(m));}},onOk:function(){var k=this.getParentEditor(),l=this.selectBox,m=!l;if(m)l=k.document.createElement('select');this.commitContent(l);if(m){k.insertElement(l);if(CKEDITOR.env.ie){var n=k.getSelection(),o=n.createBookmarks();setTimeout(function(){n.selectBookmarks(o);},0);}}},contents:[{id:'info',label:a.lang.select.selectInfo,title:a.lang.select.selectInfo,accessKey:'',elements:[{id:'txtName',type:'text',widths:['25%','75%'],labelLayout:'horizontal',label:a.lang.common.name,'default':'',accessKey:'N',style:'width:350px',setup:function(k,l){if(k=='clear')this.setValue(this['default']||'');else if(k=='select')this.setValue(l.data('cke-saved-name')||l.getAttribute('name')||'');},commit:function(k){if(this.getValue())k.data('cke-saved-name',this.getValue());
+else{k.data('cke-saved-name',false);k.removeAttribute('name');}}},{id:'txtValue',type:'text',widths:['25%','75%'],labelLayout:'horizontal',label:a.lang.select.value,style:'width:350px','default':'',className:'cke_disabled',onLoad:function(){this.getInputElement().setAttribute('readOnly',true);},setup:function(k,l){if(k=='clear')this.setValue('');else if(k=='option'&&l.getAttribute('selected'))this.setValue(l.$.value);}},{type:'hbox',widths:['175px','170px'],children:[{id:'txtSize',type:'text',labelLayout:'horizontal',label:a.lang.select.size,'default':'',accessKey:'S',style:'width:175px',validate:function(){var k=CKEDITOR.dialog.validate.integer(a.lang.common.validateNumberFailed);return this.getValue()===''||k.apply(this);},setup:function(k,l){if(k=='select')this.setValue(l.getAttribute('size')||'');if(CKEDITOR.env.webkit)this.getInputElement().setStyle('width','86px');},commit:function(k){if(this.getValue())k.setAttribute('size',this.getValue());else k.removeAttribute('size');}},{type:'html',html:'<span>'+CKEDITOR.tools.htmlEncode(a.lang.select.lines)+'</span>'}]},{type:'html',html:'<span>'+CKEDITOR.tools.htmlEncode(a.lang.select.opAvail)+'</span>'},{type:'hbox',widths:['115px','115px','100px'],children:[{type:'vbox',children:[{id:'txtOptName',type:'text',label:a.lang.select.opText,style:'width:115px',setup:function(k,l){if(k=='clear')this.setValue('');}},{type:'select',id:'cmbName',label:'',title:'',size:5,style:'width:115px;height:75px',items:[],onChange:function(){var k=this.getDialog(),l=k.getContentElement('info','cmbValue'),m=k.getContentElement('info','txtOptName'),n=k.getContentElement('info','txtOptValue'),o=g(this);h(l,o);m.setValue(this.getValue());n.setValue(l.getValue());},setup:function(k,l){if(k=='clear')e(this);else if(k=='option')b(this,l.getText(),l.getText(),this.getDialog().getParentEditor().document);},commit:function(k){var l=this.getDialog(),m=i(this),n=i(l.getContentElement('info','cmbValue')),o=l.getContentElement('info','txtValue').getValue();e(k);for(var p=0;p<m.count();p++){var q=b(k,m.getItem(p).getValue(),n.getItem(p).getValue(),l.getParentEditor().document);if(n.getItem(p).getValue()==o){q.setAttribute('selected','selected');q.selected=true;}}}}]},{type:'vbox',children:[{id:'txtOptValue',type:'text',label:a.lang.select.opValue,style:'width:115px',setup:function(k,l){if(k=='clear')this.setValue('');}},{type:'select',id:'cmbValue',label:'',size:5,style:'width:115px;height:75px',items:[],onChange:function(){var k=this.getDialog(),l=k.getContentElement('info','cmbName'),m=k.getContentElement('info','txtOptName'),n=k.getContentElement('info','txtOptValue'),o=g(this);
+h(l,o);m.setValue(l.getValue());n.setValue(this.getValue());},setup:function(k,l){var n=this;if(k=='clear')e(n);else if(k=='option'){var m=l.getValue();b(n,m,m,n.getDialog().getParentEditor().document);if(l.getAttribute('selected')=='selected')n.getDialog().getContentElement('info','txtValue').setValue(m);}}}]},{type:'vbox',padding:5,children:[{type:'button',id:'btnAdd',style:'',label:a.lang.select.btnAdd,title:a.lang.select.btnAdd,style:'width:100%;',onClick:function(){var k=this.getDialog(),l=k.getParentEditor(),m=k.getContentElement('info','txtOptName'),n=k.getContentElement('info','txtOptValue'),o=k.getContentElement('info','cmbName'),p=k.getContentElement('info','cmbValue');b(o,m.getValue(),m.getValue(),k.getParentEditor().document);b(p,n.getValue(),n.getValue(),k.getParentEditor().document);m.setValue('');n.setValue('');}},{type:'button',id:'btnModify',label:a.lang.select.btnModify,title:a.lang.select.btnModify,style:'width:100%;',onClick:function(){var k=this.getDialog(),l=k.getContentElement('info','txtOptName'),m=k.getContentElement('info','txtOptValue'),n=k.getContentElement('info','cmbName'),o=k.getContentElement('info','cmbValue'),p=g(n);if(p>=0){d(n,p,l.getValue(),l.getValue());d(o,p,m.getValue(),m.getValue());}}},{type:'button',id:'btnUp',style:'width:100%;',label:a.lang.select.btnUp,title:a.lang.select.btnUp,onClick:function(){var k=this.getDialog(),l=k.getContentElement('info','cmbName'),m=k.getContentElement('info','cmbValue');f(l,-1,k.getParentEditor().document);f(m,-1,k.getParentEditor().document);}},{type:'button',id:'btnDown',style:'width:100%;',label:a.lang.select.btnDown,title:a.lang.select.btnDown,onClick:function(){var k=this.getDialog(),l=k.getContentElement('info','cmbName'),m=k.getContentElement('info','cmbValue');f(l,1,k.getParentEditor().document);f(m,1,k.getParentEditor().document);}}]}]},{type:'hbox',widths:['40%','20%','40%'],children:[{type:'button',id:'btnSetValue',label:a.lang.select.btnSetValue,title:a.lang.select.btnSetValue,onClick:function(){var k=this.getDialog(),l=k.getContentElement('info','cmbValue'),m=k.getContentElement('info','txtValue');m.setValue(l.getValue());}},{type:'button',id:'btnDelete',label:a.lang.select.btnDelete,title:a.lang.select.btnDelete,onClick:function(){var k=this.getDialog(),l=k.getContentElement('info','cmbName'),m=k.getContentElement('info','cmbValue'),n=k.getContentElement('info','txtOptName'),o=k.getContentElement('info','txtOptValue');c(l);c(m);n.setValue('');o.setValue('');}},{id:'chkMulti',type:'checkbox',label:a.lang.select.chkMulti,'default':'',accessKey:'M',value:'checked',setup:function(k,l){if(k=='select')this.setValue(l.getAttribute('multiple'));
+if(CKEDITOR.env.webkit)this.getElement().getParent().setStyle('vertical-align','middle');},commit:function(k){if(this.getValue())k.setAttribute('multiple',this.getValue());else k.removeAttribute('multiple');}}]}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/textarea.js b/web/imcms/ckeditor/plugins/forms/dialogs/textarea.js
new file mode 100644
index 0000000000..7ce30f4c5b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/textarea.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('textarea',function(a){return{title:a.lang.textarea.title,minWidth:350,minHeight:220,onShow:function(){var c=this;delete c.textarea;var b=c.getParentEditor().getSelection().getSelectedElement();if(b&&b.getName()=='textarea'){c.textarea=b;c.setupContent(b);}},onOk:function(){var b,c=this.textarea,d=!c;if(d){b=this.getParentEditor();c=b.document.createElement('textarea');}this.commitContent(c);if(d)b.insertElement(c);},contents:[{id:'info',label:a.lang.textarea.title,title:a.lang.textarea.title,elements:[{id:'_cke_saved_name',type:'text',label:a.lang.common.name,'default':'',accessKey:'N',setup:function(b){this.setValue(b.data('cke-saved-name')||b.getAttribute('name')||'');},commit:function(b){if(this.getValue())b.data('cke-saved-name',this.getValue());else{b.data('cke-saved-name',false);b.removeAttribute('name');}}},{type:'hbox',widths:['50%','50%'],children:[{id:'cols',type:'text',label:a.lang.textarea.cols,'default':'',accessKey:'C',style:'width:50px',validate:CKEDITOR.dialog.validate.integer(a.lang.common.validateNumberFailed),setup:function(b){var c=b.hasAttribute('cols')&&b.getAttribute('cols');this.setValue(c||'');},commit:function(b){if(this.getValue())b.setAttribute('cols',this.getValue());else b.removeAttribute('cols');}},{id:'rows',type:'text',label:a.lang.textarea.rows,'default':'',accessKey:'R',style:'width:50px',validate:CKEDITOR.dialog.validate.integer(a.lang.common.validateNumberFailed),setup:function(b){var c=b.hasAttribute('rows')&&b.getAttribute('rows');this.setValue(c||'');},commit:function(b){if(this.getValue())b.setAttribute('rows',this.getValue());else b.removeAttribute('rows');}}]},{id:'value',type:'textarea',label:a.lang.textfield.value,'default':'',setup:function(b){this.setValue(b.$.defaultValue);},commit:function(b){b.$.value=b.$.defaultValue=this.getValue();}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/dialogs/textfield.js b/web/imcms/ckeditor/plugins/forms/dialogs/textfield.js
new file mode 100644
index 0000000000..ec3247b6e1
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/forms/dialogs/textfield.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('textfield',function(a){var b={value:1,size:1,maxLength:1},c={text:1,password:1};return{title:a.lang.textfield.title,minWidth:350,minHeight:150,onShow:function(){var e=this;delete e.textField;var d=e.getParentEditor().getSelection().getSelectedElement();if(d&&d.getName()=='input'&&(c[d.getAttribute('type')]||!d.getAttribute('type'))){e.textField=d;e.setupContent(d);}},onOk:function(){var d,e=this.textField,f=!e;if(f){d=this.getParentEditor();e=d.document.createElement('input');e.setAttribute('type','text');}if(f)d.insertElement(e);this.commitContent({element:e});},onLoad:function(){var d=function(f){var g=f.hasAttribute(this.id)&&f.getAttribute(this.id);this.setValue(g||'');},e=function(f){var g=f.element,h=this.getValue();if(h)g.setAttribute(this.id,h);else g.removeAttribute(this.id);};this.foreach(function(f){if(b[f.id]){f.setup=d;f.commit=e;}});},contents:[{id:'info',label:a.lang.textfield.title,title:a.lang.textfield.title,elements:[{type:'hbox',widths:['50%','50%'],children:[{id:'_cke_saved_name',type:'text',label:a.lang.textfield.name,'default':'',accessKey:'N',setup:function(d){this.setValue(d.data('cke-saved-name')||d.getAttribute('name')||'');},commit:function(d){var e=d.element;if(this.getValue())e.data('cke-saved-name',this.getValue());else{e.data('cke-saved-name',false);e.removeAttribute('name');}}},{id:'value',type:'text',label:a.lang.textfield.value,'default':'',accessKey:'V'}]},{type:'hbox',widths:['50%','50%'],children:[{id:'size',type:'text',label:a.lang.textfield.charWidth,'default':'',accessKey:'C',style:'width:50px',validate:CKEDITOR.dialog.validate.integer(a.lang.common.validateNumberFailed)},{id:'maxLength',type:'text',label:a.lang.textfield.maxChars,'default':'',accessKey:'M',style:'width:50px',validate:CKEDITOR.dialog.validate.integer(a.lang.common.validateNumberFailed)}],onLoad:function(){if(CKEDITOR.env.ie7Compat)this.getElement().setStyle('zoom','100%');}},{id:'type',type:'select',label:a.lang.textfield.type,'default':'text',accessKey:'M',items:[[a.lang.textfield.typeText,'text'],[a.lang.textfield.typePass,'password']],setup:function(d){this.setValue(d.getAttribute('type'));},commit:function(d){var e=d.element;if(CKEDITOR.env.ie){var f=e.getAttribute('type'),g=this.getValue();if(f!=g){var h=CKEDITOR.dom.element.createFromHtml('<input type="'+g+'"></input>',a.document);e.copyAttributes(h,{type:1});h.replace(e);a.getSelection().selectElement(h);d.element=h;}}else e.setAttribute('type',this.getValue());}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/forms/images/hiddenfield.gif b/web/imcms/ckeditor/plugins/forms/images/hiddenfield.gif
new file mode 100644
index 0000000000..953f643b60
Binary files /dev/null and b/web/imcms/ckeditor/plugins/forms/images/hiddenfield.gif differ
diff --git a/web/imcms/ckeditor/plugins/iframe/dialogs/iframe.js b/web/imcms/ckeditor/plugins/iframe/dialogs/iframe.js
new file mode 100644
index 0000000000..68b6fd93d7
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/iframe/dialogs/iframe.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a={scrolling:{'true':'yes','false':'no'},frameborder:{'true':'1','false':'0'}};function b(d){var g=this;var e=g instanceof CKEDITOR.ui.dialog.checkbox;if(d.hasAttribute(g.id)){var f=d.getAttribute(g.id);if(e)g.setValue(a[g.id]['true']==f.toLowerCase());else g.setValue(f);}};function c(d){var h=this;var e=h.getValue()==='',f=h instanceof CKEDITOR.ui.dialog.checkbox,g=h.getValue();if(e)d.removeAttribute(h.att||h.id);else if(f)d.setAttribute(h.id,a[h.id][g]);else d.setAttribute(h.att||h.id,g);};CKEDITOR.dialog.add('iframe',function(d){var e=d.lang.iframe,f=d.lang.common,g=d.plugins.dialogadvtab;return{title:e.title,minWidth:350,minHeight:260,onShow:function(){var j=this;j.fakeImage=j.iframeNode=null;var h=j.getSelectedElement();if(h&&h.data('cke-real-element-type')&&h.data('cke-real-element-type')=='iframe'){j.fakeImage=h;var i=d.restoreRealElement(h);j.iframeNode=i;j.setupContent(i);}},onOk:function(){var l=this;var h;if(!l.fakeImage)h=new CKEDITOR.dom.element('iframe');else h=l.iframeNode;var i={},j={};l.commitContent(h,i,j);var k=d.createFakeElement(h,'cke_iframe','iframe',true);k.setAttributes(j);k.setStyles(i);if(l.fakeImage){k.replace(l.fakeImage);d.getSelection().selectElement(k);}else d.insertElement(k);},contents:[{id:'info',label:f.generalTab,accessKey:'I',elements:[{type:'vbox',padding:0,children:[{id:'src',type:'text',label:f.url,required:true,validate:CKEDITOR.dialog.validate.notEmpty(e.noUrl),setup:b,commit:c}]},{type:'hbox',children:[{id:'width',type:'text',style:'width:100%',labelLayout:'vertical',label:f.width,validate:CKEDITOR.dialog.validate.htmlLength(f.invalidHtmlLength.replace('%1',f.width)),setup:b,commit:c},{id:'height',type:'text',style:'width:100%',labelLayout:'vertical',label:f.height,validate:CKEDITOR.dialog.validate.htmlLength(f.invalidHtmlLength.replace('%1',f.height)),setup:b,commit:c},{id:'align',type:'select','default':'',items:[[f.notSet,''],[f.alignLeft,'left'],[f.alignRight,'right'],[f.alignTop,'top'],[f.alignMiddle,'middle'],[f.alignBottom,'bottom']],style:'width:100%',labelLayout:'vertical',label:f.align,setup:function(h,i){b.apply(this,arguments);if(i){var j=i.getAttribute('align');this.setValue(j&&j.toLowerCase()||'');}},commit:function(h,i,j){c.apply(this,arguments);if(this.getValue())j.align=this.getValue();}}]},{type:'hbox',widths:['50%','50%'],children:[{id:'scrolling',type:'checkbox',label:e.scrolling,setup:b,commit:c},{id:'frameborder',type:'checkbox',label:e.border,setup:b,commit:c}]},{type:'hbox',widths:['50%','50%'],children:[{id:'name',type:'text',label:f.name,setup:b,commit:c},{id:'title',type:'text',label:f.advisoryTitle,setup:b,commit:c}]},{id:'longdesc',type:'text',label:f.longDescr,setup:b,commit:c}]},g&&g.createAdvancedTab(d,{id:1,classes:1,styles:1})]};
+});})();
diff --git a/web/imcms/ckeditor/plugins/iframe/images/placeholder.png b/web/imcms/ckeditor/plugins/iframe/images/placeholder.png
new file mode 100644
index 0000000000..b40c7b20fc
Binary files /dev/null and b/web/imcms/ckeditor/plugins/iframe/images/placeholder.png differ
diff --git a/web/imcms/ckeditor/plugins/iframedialog/plugin.js b/web/imcms/ckeditor/plugins/iframedialog/plugin.js
new file mode 100644
index 0000000000..65ca04ee5d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/iframedialog/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add('iframedialog',{requires:['dialog'],onLoad:function(){CKEDITOR.dialog.addIframe=function(a,b,c,d,e,f,g){var h={type:'iframe',src:c,width:'100%',height:'100%'};if(typeof f=='function')h.onContentLoad=f;else h.onContentLoad=function(){var k=this.getElement(),l=k.$.contentWindow;if(l.onDialogEvent){var m=this.getDialog(),n=function(o){return l.onDialogEvent(o);};m.on('ok',n);m.on('cancel',n);m.on('resize',n);m.on('hide',function(o){m.removeListener('ok',n);m.removeListener('cancel',n);m.removeListener('resize',n);o.removeListener();});l.onDialogEvent({name:'load',sender:this,editor:m._.editor});}};var i={title:b,minWidth:d,minHeight:e,contents:[{id:'iframe',label:b,expand:true,elements:[h]}]};for(var j in g)i[j]=g[j];this.add(a,function(){return i;});};(function(){var a=function(b,c,d){if(arguments.length<3)return;var e=this._||(this._={}),f=c.onContentLoad&&CKEDITOR.tools.bind(c.onContentLoad,this),g=CKEDITOR.tools.cssLength(c.width),h=CKEDITOR.tools.cssLength(c.height);e.frameId=CKEDITOR.tools.getNextId()+'_iframe';b.on('load',function(){var k=CKEDITOR.document.getById(e.frameId),l=k.getParent();l.setStyles({width:g,height:h});});var i={src:'%2',id:e.frameId,frameborder:0,allowtransparency:true},j=[];if(typeof c.onContentLoad=='function')i.onload='CKEDITOR.tools.callFunction(%1);';CKEDITOR.ui.dialog.uiElement.call(this,b,c,j,'iframe',{width:g,height:h},i,'');d.push('<div style="width:'+g+';height:'+h+';" id="'+this.domId+'"></div>');j=j.join('');b.on('show',function(){var k=CKEDITOR.document.getById(e.frameId),l=k.getParent(),m=CKEDITOR.tools.addFunction(f),n=j.replace('%1',m).replace('%2',CKEDITOR.tools.htmlEncode(c.src));l.setHtml(n);});};a.prototype=new CKEDITOR.ui.dialog.uiElement();CKEDITOR.dialog.addUIElement('iframe',{build:function(b,c,d){return new a(b,c,d);}});})();}});
diff --git a/web/imcms/ckeditor/plugins/image/dialogs/image.js b/web/imcms/ckeditor/plugins/image/dialogs/image.js
new file mode 100644
index 0000000000..1b868cdb59
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/image/dialogs/image.js
@@ -0,0 +1,13 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=function(b,c){var d=1,e=2,f=4,g=8,h=/^\s*(\d+)((px)|\%)?\s*$/i,i=/(^\s*(\d+)((px)|\%)?\s*$)|^$/i,j=/^\d+px$/,k=function(){var B=this.getValue(),C=this.getDialog(),D=B.match(h);if(D){if(D[2]=='%')p(C,false);B=D[1];}if(C.lockRatio){var E=C.originalElement;if(E.getCustomData('isReady')=='true')if(this.id=='txtHeight'){if(B&&B!='0')B=Math.round(E.$.width*(B/E.$.height));if(!isNaN(B))C.setValueOf('info','txtWidth',B);}else{if(B&&B!='0')B=Math.round(E.$.height*(B/E.$.width));if(!isNaN(B))C.setValueOf('info','txtHeight',B);}}l(C);},l=function(B){if(!B.originalElement||!B.preview)return 1;B.commitContent(f,B.preview);return 0;};function m(){var B=arguments,C=this.getContentElement('advanced','txtdlgGenStyle');C&&C.commit.apply(C,B);this.foreach(function(D){if(D.commit&&D.id!='txtdlgGenStyle')D.commit.apply(D,B);});};var n;function o(B){if(n)return;n=1;var C=this.getDialog(),D=C.imageElement;if(D){this.commit(d,D);B=[].concat(B);var E=B.length,F;for(var G=0;G<E;G++){F=C.getContentElement.apply(C,B[G].split(':'));F&&F.setup(d,D);}}n=0;};var p=function(B,C){if(!B.getContentElement('info','ratioLock'))return null;var D=B.originalElement;if(!D)return null;if(C=='check'){if(!B.userlockRatio&&D.getCustomData('isReady')=='true'){var E=B.getValueOf('info','txtWidth'),F=B.getValueOf('info','txtHeight'),G=D.$.width*1000/D.$.height,H=E*1000/F;B.lockRatio=false;if(!E&&!F)B.lockRatio=true;else if(!isNaN(G)&&!isNaN(H))if(Math.round(G)==Math.round(H))B.lockRatio=true;}}else if(C!=undefined)B.lockRatio=C;else{B.userlockRatio=1;B.lockRatio=!B.lockRatio;}var I=CKEDITOR.document.getById(w);if(B.lockRatio)I.removeClass('cke_btn_unlocked');else I.addClass('cke_btn_unlocked');I.setAttribute('aria-checked',B.lockRatio);if(CKEDITOR.env.hc){var J=I.getChild(0);J.setHtml(B.lockRatio?CKEDITOR.env.ie?'â– ':'â–£':CKEDITOR.env.ie?'â–¡':'â–¢');}return B.lockRatio;},q=function(B){var C=B.originalElement;if(C.getCustomData('isReady')=='true'){var D=B.getContentElement('info','txtWidth'),E=B.getContentElement('info','txtHeight');D&&D.setValue(C.$.width);E&&E.setValue(C.$.height);}l(B);},r=function(B,C){if(B!=d)return;function D(I,J){var K=I.match(h);if(K){if(K[2]=='%'){K[1]+='%';p(E,false);}return K[1];}return J;};var E=this.getDialog(),F='',G=this.id=='txtWidth'?'width':'height',H=C.getAttribute(G);if(H)F=D(H,F);F=D(C.getStyle(G),F);this.setValue(F);},s,t=function(){var B=this.originalElement;B.setCustomData('isReady','true');B.removeListener('load',t);B.removeListener('error',u);B.removeListener('abort',u);
+CKEDITOR.document.getById(y).setStyle('display','none');if(!this.dontResetSize)q(this);if(this.firstLoad)CKEDITOR.tools.setTimeout(function(){p(this,'check');},0,this);this.firstLoad=false;this.dontResetSize=false;},u=function(){var D=this;var B=D.originalElement;B.removeListener('load',t);B.removeListener('error',u);B.removeListener('abort',u);var C=CKEDITOR.getUrl(b.skinPath+'images/noimage.png');if(D.preview)D.preview.setAttribute('src',C);CKEDITOR.document.getById(y).setStyle('display','none');p(D,false);},v=function(B){return CKEDITOR.tools.getNextId()+'_'+B;},w=v('btnLockSizes'),x=v('btnResetSize'),y=v('ImagePreviewLoader'),z=v('previewLink'),A=v('previewImage');return{title:b.lang.image[c=='image'?'title':'titleButton'],minWidth:420,minHeight:360,onShow:function(){var H=this;H.imageElement=false;H.linkElement=false;H.imageEditMode=false;H.linkEditMode=false;H.lockRatio=true;H.userlockRatio=0;H.dontResetSize=false;H.firstLoad=true;H.addLink=false;var B=H.getParentEditor(),C=B.getSelection(),D=C&&C.getSelectedElement(),E=D&&D.getAscendant('a');CKEDITOR.document.getById(y).setStyle('display','none');s=new CKEDITOR.dom.element('img',B.document);H.preview=CKEDITOR.document.getById(A);H.originalElement=B.document.createElement('img');H.originalElement.setAttribute('alt','');H.originalElement.setCustomData('isReady','false');if(E){H.linkElement=E;H.linkEditMode=true;var F=E.getChildren();if(F.count()==1){var G=F.getItem(0).getName();if(G=='img'||G=='input'){H.imageElement=F.getItem(0);if(H.imageElement.getName()=='img')H.imageEditMode='img';else if(H.imageElement.getName()=='input')H.imageEditMode='input';}}if(c=='image')H.setupContent(e,E);}if(D&&D.getName()=='img'&&!D.data('cke-realelement')||D&&D.getName()=='input'&&D.getAttribute('type')=='image'){H.imageEditMode=D.getName();H.imageElement=D;}if(H.imageEditMode){H.cleanImageElement=H.imageElement;H.imageElement=H.cleanImageElement.clone(true,true);H.setupContent(d,H.imageElement);}else H.imageElement=B.document.createElement('img');p(H,true);if(!CKEDITOR.tools.trim(H.getValueOf('info','txtUrl'))){H.preview.removeAttribute('src');H.preview.setStyle('display','none');}},onOk:function(){var C=this;if(C.imageEditMode){var B=C.imageEditMode;if(c=='image'&&B=='input'&&confirm(b.lang.image.button2Img)){B='img';C.imageElement=b.document.createElement('img');C.imageElement.setAttribute('alt','');b.insertElement(C.imageElement);}else if(c!='image'&&B=='img'&&confirm(b.lang.image.img2Button)){B='input';C.imageElement=b.document.createElement('input');
+C.imageElement.setAttributes({type:'image',alt:''});b.insertElement(C.imageElement);}else{C.imageElement=C.cleanImageElement;delete C.cleanImageElement;}}else{if(c=='image')C.imageElement=b.document.createElement('img');else{C.imageElement=b.document.createElement('input');C.imageElement.setAttribute('type','image');}C.imageElement.setAttribute('alt','');}if(!C.linkEditMode)C.linkElement=b.document.createElement('a');C.commitContent(d,C.imageElement);C.commitContent(e,C.linkElement);if(!C.imageElement.getAttribute('style'))C.imageElement.removeAttribute('style');if(!C.imageEditMode){if(C.addLink){if(!C.linkEditMode){b.insertElement(C.linkElement);C.linkElement.append(C.imageElement,false);}else b.insertElement(C.imageElement);}else b.insertElement(C.imageElement);}else if(!C.linkEditMode&&C.addLink){b.insertElement(C.linkElement);C.imageElement.appendTo(C.linkElement);}else if(C.linkEditMode&&!C.addLink){b.getSelection().selectElement(C.linkElement);b.insertElement(C.imageElement);}},onLoad:function(){var C=this;if(c!='image')C.hidePage('Link');var B=C._.element.getDocument();if(C.getContentElement('info','ratioLock')){C.addFocusable(B.getById(x),5);C.addFocusable(B.getById(w),5);}C.commitContent=m;},onHide:function(){var B=this;if(B.preview)B.commitContent(g,B.preview);if(B.originalElement){B.originalElement.removeListener('load',t);B.originalElement.removeListener('error',u);B.originalElement.removeListener('abort',u);B.originalElement.remove();B.originalElement=false;}delete B.imageElement;},contents:[{id:'info',label:b.lang.image.infoTab,accessKey:'I',elements:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['280px','110px'],align:'right',children:[{id:'txtUrl',type:'text',label:b.lang.common.url,required:true,onChange:function(){var B=this.getDialog(),C=this.getValue();if(C.length>0){B=this.getDialog();var D=B.originalElement;B.preview.removeStyle('display');D.setCustomData('isReady','false');var E=CKEDITOR.document.getById(y);if(E)E.setStyle('display','');D.on('load',t,B);D.on('error',u,B);D.on('abort',u,B);D.setAttribute('src',C);s.setAttribute('src',C);B.preview.setAttribute('src',s.$.src);l(B);}else if(B.preview){B.preview.removeAttribute('src');B.preview.setStyle('display','none');}},setup:function(B,C){if(B==d){var D=C.data('cke-saved-src')||C.getAttribute('src'),E=this;this.getDialog().dontResetSize=true;E.setValue(D);E.setInitValue();}},commit:function(B,C){var D=this;if(B==d&&(D.getValue()||D.isChanged())){C.data('cke-saved-src',D.getValue());
+C.setAttribute('src',D.getValue());}else if(B==g){C.setAttribute('src','');C.removeAttribute('src');}},validate:CKEDITOR.dialog.validate.notEmpty(b.lang.image.urlMissing)},{type:'button',id:'browse',style:'display:inline-block;margin-top:10px;',align:'center',label:b.lang.common.browseServer,hidden:true,filebrowser:'info:txtUrl'}]}]},{id:'txtAlt',type:'text',label:b.lang.image.alt,accessKey:'T','default':'',onChange:function(){l(this.getDialog());},setup:function(B,C){if(B==d)this.setValue(C.getAttribute('alt'));},commit:function(B,C){var D=this;if(B==d){if(D.getValue()||D.isChanged())C.setAttribute('alt',D.getValue());}else if(B==f)C.setAttribute('alt',D.getValue());else if(B==g)C.removeAttribute('alt');}},{type:'hbox',children:[{id:'basic',type:'vbox',children:[{type:'hbox',widths:['50%','50%'],children:[{type:'vbox',padding:1,children:[{type:'text',width:'40px',id:'txtWidth',label:b.lang.common.width,onKeyUp:k,onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:function(){var B=this.getValue().match(i),C=!!(B&&parseInt(B[1],10)!==0);if(!C)alert(b.lang.common.invalidWidth);return C;},setup:r,commit:function(B,C,D){var E=this.getValue();if(B==d){if(E)C.setStyle('width',CKEDITOR.tools.cssLength(E));else C.removeStyle('width');!D&&C.removeAttribute('width');}else if(B==f){var F=E.match(h);if(!F){var G=this.getDialog().originalElement;if(G.getCustomData('isReady')=='true')C.setStyle('width',G.$.width+'px');}else C.setStyle('width',CKEDITOR.tools.cssLength(E));}else if(B==g){C.removeAttribute('width');C.removeStyle('width');}}},{type:'text',id:'txtHeight',width:'40px',label:b.lang.common.height,onKeyUp:k,onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:function(){var B=this.getValue().match(i),C=!!(B&&parseInt(B[1],10)!==0);if(!C)alert(b.lang.common.invalidHeight);return C;},setup:r,commit:function(B,C,D){var E=this.getValue();if(B==d){if(E)C.setStyle('height',CKEDITOR.tools.cssLength(E));else C.removeStyle('height');!D&&C.removeAttribute('height');}else if(B==f){var F=E.match(h);if(!F){var G=this.getDialog().originalElement;if(G.getCustomData('isReady')=='true')C.setStyle('height',G.$.height+'px');}else C.setStyle('height',CKEDITOR.tools.cssLength(E));}else if(B==g){C.removeAttribute('height');C.removeStyle('height');}}}]},{id:'ratioLock',type:'html',style:'margin-top:30px;width:40px;height:40px;',onLoad:function(){var B=CKEDITOR.document.getById(x),C=CKEDITOR.document.getById(w);if(B){B.on('click',function(D){q(this);D.data&&D.data.preventDefault();
+},this.getDialog());B.on('mouseover',function(){this.addClass('cke_btn_over');},B);B.on('mouseout',function(){this.removeClass('cke_btn_over');},B);}if(C){C.on('click',function(D){var I=this;var E=p(I),F=I.originalElement,G=I.getValueOf('info','txtWidth');if(F.getCustomData('isReady')=='true'&&G){var H=F.$.height/F.$.width*G;if(!isNaN(H)){I.setValueOf('info','txtHeight',Math.round(H));l(I);}}D.data&&D.data.preventDefault();},this.getDialog());C.on('mouseover',function(){this.addClass('cke_btn_over');},C);C.on('mouseout',function(){this.removeClass('cke_btn_over');},C);}},html:'<div><a href="javascript:void(0)" tabindex="-1" title="'+b.lang.image.lockRatio+'" class="cke_btn_locked" id="'+w+'" role="checkbox"><span class="cke_icon"></span><span class="cke_label">'+b.lang.image.lockRatio+'</span></a>'+'<a href="javascript:void(0)" tabindex="-1" title="'+b.lang.image.resetSize+'" class="cke_btn_reset" id="'+x+'" role="button"><span class="cke_label">'+b.lang.image.resetSize+'</span></a>'+'</div>'}]},{type:'vbox',padding:1,children:[{type:'text',id:'txtBorder',width:'60px',label:b.lang.image.border,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateBorder),setup:function(B,C){if(B==d){var D,E=C.getStyle('border-width');E=E&&E.match(/^(\d+px)(?: \1 \1 \1)?$/);D=E&&parseInt(E[1],10);isNaN(parseInt(D,10))&&(D=C.getAttribute('border'));this.setValue(D);}},commit:function(B,C,D){var E=parseInt(this.getValue(),10);if(B==d||B==f){if(!isNaN(E)){C.setStyle('border-width',CKEDITOR.tools.cssLength(E));C.setStyle('border-style','solid');}else if(!E&&this.isChanged())C.removeStyle('border');if(!D&&B==d)C.removeAttribute('border');}else if(B==g){C.removeAttribute('border');C.removeStyle('border-width');C.removeStyle('border-style');C.removeStyle('border-color');}}},{type:'text',id:'txtHSpace',width:'60px',label:b.lang.image.hSpace,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateHSpace),setup:function(B,C){if(B==d){var D,E,F,G=C.getStyle('margin-left'),H=C.getStyle('margin-right');G=G&&G.match(j);H=H&&H.match(j);E=parseInt(G,10);F=parseInt(H,10);D=E==F&&E;isNaN(parseInt(D,10))&&(D=C.getAttribute('hspace'));this.setValue(D);}},commit:function(B,C,D){var E=parseInt(this.getValue(),10);if(B==d||B==f){if(!isNaN(E)){C.setStyle('margin-left',CKEDITOR.tools.cssLength(E));
+C.setStyle('margin-right',CKEDITOR.tools.cssLength(E));}else if(!E&&this.isChanged()){C.removeStyle('margin-left');C.removeStyle('margin-right');}if(!D&&B==d)C.removeAttribute('hspace');}else if(B==g){C.removeAttribute('hspace');C.removeStyle('margin-left');C.removeStyle('margin-right');}}},{type:'text',id:'txtVSpace',width:'60px',label:b.lang.image.vSpace,'default':'',onKeyUp:function(){l(this.getDialog());},onChange:function(){o.call(this,'advanced:txtdlgGenStyle');},validate:CKEDITOR.dialog.validate.integer(b.lang.image.validateVSpace),setup:function(B,C){if(B==d){var D,E,F,G=C.getStyle('margin-top'),H=C.getStyle('margin-bottom');G=G&&G.match(j);H=H&&H.match(j);E=parseInt(G,10);F=parseInt(H,10);D=E==F&&E;isNaN(parseInt(D,10))&&(D=C.getAttribute('vspace'));this.setValue(D);}},commit:function(B,C,D){var E=parseInt(this.getValue(),10);if(B==d||B==f){if(!isNaN(E)){C.setStyle('margin-top',CKEDITOR.tools.cssLength(E));C.setStyle('margin-bottom',CKEDITOR.tools.cssLength(E));}else if(!E&&this.isChanged()){C.removeStyle('margin-top');C.removeStyle('margin-bottom');}if(!D&&B==d)C.removeAttribute('vspace');}else if(B==g){C.removeAttribute('vspace');C.removeStyle('margin-top');C.removeStyle('margin-bottom');}}},{id:'cmbAlign',type:'select',widths:['35%','65%'],style:'width:90px',label:b.lang.common.align,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.alignLeft,'left'],[b.lang.common.alignRight,'right']],onChange:function(){l(this.getDialog());o.call(this,'advanced:txtdlgGenStyle');},setup:function(B,C){if(B==d){var D=C.getStyle('float');switch(D){case 'inherit':case 'none':D='';}!D&&(D=(C.getAttribute('align')||'').toLowerCase());this.setValue(D);}},commit:function(B,C,D){var E=this.getValue();if(B==d||B==f){if(E)C.setStyle('float',E);else C.removeStyle('float');if(!D&&B==d){E=(C.getAttribute('align')||'').toLowerCase();switch(E){case 'left':case 'right':C.removeAttribute('align');}}}else if(B==g)C.removeStyle('float');}}]}]},{type:'vbox',height:'250px',children:[{type:'html',id:'htmlPreview',style:'width:95%;',html:'<div>'+CKEDITOR.tools.htmlEncode(b.lang.common.preview)+'<br>'+'<div id="'+y+'" class="ImagePreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>'+'<div class="ImagePreviewBox"><table><tr><td>'+'<a href="javascript:void(0)" target="_blank" onclick="return false;" id="'+z+'">'+'<img id="'+A+'" alt="" /></a>'+(b.config.image_previewText||'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.')+'</td></tr></table></div></div>'}]}]}]},{id:'Link',label:b.lang.link.title,padding:0,elements:[{id:'txtUrl',type:'text',label:b.lang.common.url,style:'width: 100%','default':'',setup:function(B,C){if(B==e){var D=C.data('cke-saved-href');
+if(!D)D=C.getAttribute('href');this.setValue(D);}},commit:function(B,C){var E=this;if(B==e)if(E.getValue()||E.isChanged()){var D=decodeURI(E.getValue());C.data('cke-saved-href',D);C.setAttribute('href',D);if(E.getValue()||!b.config.image_removeLinkByEmptyURL)E.getDialog().addLink=true;}}},{type:'button',id:'browse',filebrowser:{action:'Browse',target:'Link:txtUrl',url:b.config.filebrowserImageBrowseLinkUrl},style:'float:right',hidden:true,label:b.lang.common.browseServer},{id:'cmbTarget',type:'select',label:b.lang.common.target,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.targetNew,'_blank'],[b.lang.common.targetTop,'_top'],[b.lang.common.targetSelf,'_self'],[b.lang.common.targetParent,'_parent']],setup:function(B,C){if(B==e)this.setValue(C.getAttribute('target')||'');},commit:function(B,C){if(B==e)if(this.getValue()||this.isChanged())C.setAttribute('target',this.getValue());}}]},{id:'Upload',hidden:true,filebrowser:'uploadButton',label:b.lang.image.upload,elements:[{type:'file',id:'upload',label:b.lang.image.btnUpload,style:'height:40px',size:38},{type:'fileButton',id:'uploadButton',filebrowser:'info:txtUrl',label:b.lang.image.btnUpload,'for':['Upload','upload']}]},{id:'advanced',label:b.lang.common.advancedTab,elements:[{type:'hbox',widths:['50%','25%','25%'],children:[{type:'text',id:'linkId',label:b.lang.common.id,setup:function(B,C){if(B==d)this.setValue(C.getAttribute('id'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('id',this.getValue());}},{id:'cmbLangDir',type:'select',style:'width : 100px;',label:b.lang.common.langDir,'default':'',items:[[b.lang.common.notSet,''],[b.lang.common.langDirLtr,'ltr'],[b.lang.common.langDirRtl,'rtl']],setup:function(B,C){if(B==d)this.setValue(C.getAttribute('dir'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('dir',this.getValue());}},{type:'text',id:'txtLangCode',label:b.lang.common.langCode,'default':'',setup:function(B,C){if(B==d)this.setValue(C.getAttribute('lang'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('lang',this.getValue());}}]},{type:'text',id:'txtGenLongDescr',label:b.lang.common.longDescr,setup:function(B,C){if(B==d)this.setValue(C.getAttribute('longDesc'));},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('longDesc',this.getValue());}},{type:'hbox',widths:['50%','50%'],children:[{type:'text',id:'txtGenClass',label:b.lang.common.cssClass,'default':'',setup:function(B,C){if(B==d)this.setValue(C.getAttribute('class'));
+},commit:function(B,C){if(B==d)if(this.getValue()||this.isChanged())C.setAttribute('class',this.getValue());}},{type:'text',id:'txtGenTitle',label:b.lang.common.advisoryTitle,'default':'',onChange:function(){l(this.getDialog());},setup:function(B,C){if(B==d)this.setValue(C.getAttribute('title'));},commit:function(B,C){var D=this;if(B==d){if(D.getValue()||D.isChanged())C.setAttribute('title',D.getValue());}else if(B==f)C.setAttribute('title',D.getValue());else if(B==g)C.removeAttribute('title');}}]},{type:'text',id:'txtdlgGenStyle',label:b.lang.common.cssStyle,validate:CKEDITOR.dialog.validate.inlineStyle(b.lang.common.invalidInlineStyle),'default':'',setup:function(B,C){if(B==d){var D=C.getAttribute('style');if(!D&&C.$.style.cssText)D=C.$.style.cssText;this.setValue(D);var E=C.$.style.height,F=C.$.style.width,G=(E?E:'').match(h),H=(F?F:'').match(h);this.attributesInStyle={height:!!G,width:!!H};}},onChange:function(){o.call(this,['info:cmbFloat','info:cmbAlign','info:txtVSpace','info:txtHSpace','info:txtBorder','info:txtWidth','info:txtHeight']);l(this);},commit:function(B,C){if(B==d&&(this.getValue()||this.isChanged()))C.setAttribute('style',this.getValue());}}]}]};};CKEDITOR.dialog.add('image',function(b){return a(b,'image');});CKEDITOR.dialog.add('imagebutton',function(b){return a(b,'imagebutton');});})();
diff --git a/web/imcms/ckeditor/plugins/imcms_image/plugin.js b/web/imcms/ckeditor/plugins/imcms_image/plugin.js
new file mode 100644
index 0000000000..e5fc13bfd7
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/imcms_image/plugin.js
@@ -0,0 +1,211 @@
+
+(function() {
+	var commandName = 'imcms_image' ;
+	
+	var commandDef  = {
+		exec : function(editor) {
+			var image = editor.getSelection().getSelectedElement() ;
+			var outparam = null ;
+			
+			if (typeof image == 'undefined') {
+				image = image.getParent() ;
+				if (image && 'img' != image.getName()) {
+					image = null ;
+				}
+			}
+			
+			if (image) {
+				var src = image.getAttribute('src') ;
+				var url, format, width, height, cropX1, cropY1, cropX2, cropY2, rotateAngle, queryIndex, genFile, metaId ;
+				
+				if (src && (queryIndex = src.indexOf('?')) != -1) {
+					var parts = src.substring(queryIndex + 1).split('&') ;
+					
+					for (var i = 0; i < parts.length; ++i) {
+						var keyValue = parts[i].split('=') ;
+						
+						if (keyValue.length != 2) {
+							continue ;
+						}
+						
+						var key   = keyValue[0] ;
+						var value = keyValue[1] ;
+						
+						switch (key) {
+							case 'path':
+								url = contextPath + decodeURIComponent(value) ;
+								break ;
+							case 'file_id':
+								url = contextPath + value ;
+								break ;
+							case 'width':
+								width = value ;
+								break ;
+							case 'height':
+								height = value ;
+								break ;
+							case 'format':
+								format = value ;
+								break ;
+							case 'crop_x1':
+								cropX1 = value ;
+								break ;
+							case 'crop_y1':
+								cropY1 = value ;
+								break ;
+							case 'crop_x2':
+								cropX2 = value ;
+								break ;
+							case 'crop_y2':
+								cropY2 = value ;
+								break ;
+							case 'rangle':
+								rotateAngle = value ;
+								break ;
+                            case 'gen_file':
+                                genFile = value;
+                                break;
+                            case 'meta_id':
+                                metaId = value;
+                                break;
+							default:
+								break ;
+						}
+					}
+				}
+				
+				outparam = {
+					'imageref'     : url, 
+					'format_ext'   : format, 
+					'crop_x1'      : cropX1, 
+					'crop_y1'      : cropY1, 
+					'crop_x2'      : cropX2, 
+					'crop_y2'      : cropY2, 
+					'rotate_angle' : rotateAngle || 0, 
+					'alt_text'     : image.getAttribute('alt') || image.getAttribute('title'),
+					'image_width'  : (image.getStyle('width') || image.getAttribute('width') || width || '0').replace(/[^\d]/g, ''),
+					'image_height' : (image.getStyle('height') || image.getAttribute('height') || height || '0').replace(/[^\d]/g, ''),
+					'image_border' : (image.getStyle('border-width') || image.getAttribute('border') || '0').replace(/[^\d]/g, ''),
+					'image_align'  : image.getAttribute('align'),
+					'v_space'      : (image.getStyle('margin-top') || image.getAttribute('vspace') || '0').replace(/[^\d]/g, ''),
+					'h_space'      : (image.getStyle('margin-right') || image.getAttribute('hspace') || '0').replace(/[^\d]/g, ''),
+					'image_name'   : image.getAttribute('id') || image.getAttribute('name')
+				} ;
+
+                if (genFile) {
+                    outparam['gen_file'] = genFile;
+                }
+			}
+			
+            if (metaId == null) {
+                metaId = editor.config.imcmsMetaId;
+            }
+            if (metaId != null) {
+                outparam = outparam || {};
+                outparam['meta_id'] = metaId;
+            }
+            
+			var queryString = '' ;
+			
+			for (var p in outparam) {
+				if (outparam[p]) {
+					queryString += '&' + p + '=' + encodeURIComponent(outparam[p]) ;
+				}
+			}
+			
+			//console.log('queryString: ' + queryString) ;
+			
+			//console.log('image / image.src (before): ' + image + ' / ' + image.src + ' / ' + image.getAttribute('src')) ;
+			
+            window.handleImcmsReturnImage = function(returnImage) {
+                if (!returnImage) { // user must have pressed Cancel
+                    return ;
+                }
+
+                //console.log('image: ' + image + '\nreturnImage.src: ' + returnImage.src) ;
+
+                // Always recreate the image tag, otherwise the content will lag behind when
+                // editing existing images.
+                var img = editor.document.createElement('img') ;
+                img.setAttribute('src', returnImage.src) ;
+                editor.insertElement(img) ;
+
+                for (var parameter in returnImage) {
+                    var parameterValue = returnImage[parameter] ;
+                    //console.log(parameter + ' : ' + parameterValue) ;
+                    switch (parameter) {
+                        case 'alt':
+                            img.setAttribute('alt', parameterValue || '') ;
+                            img.setAttribute('title', parameterValue) ;
+                            break ;
+                        case 'border':
+                            img.setStyle('border-width', CKEDITOR.tools.cssLength(parameterValue)) ;
+                            img.setAttribute('border', parseInt(parameterValue, 10) + '') ;
+                            break ;
+                        case 'align':
+                            img.setAttribute('align', parameterValue) ;
+                            break ;
+                        case 'vert':
+                            img.setStyle('margin-top', CKEDITOR.tools.cssLength(parameterValue)) ;
+                            img.setStyle('margin-bottom', CKEDITOR.tools.cssLength(parameterValue)) ;
+                            break ;
+                        case 'horiz':
+                            img.setStyle('margin-left', CKEDITOR.tools.cssLength(parameterValue)) ;
+                            img.setStyle('margin-right', CKEDITOR.tools.cssLength(parameterValue)) ;
+                            break ;
+                        case 'width':
+                            img.setAttribute('width', parseInt(parameterValue, 10) + '') ;
+                            break ;
+                        case 'height':
+                            img.setAttribute('height', parseInt(parameterValue, 10) + '') ;
+                            break ;
+                        case 'name':
+                            img.setAttribute('id', parameterValue) ;
+                            break ;
+                    }
+                }
+            };
+            
+            window.open(CKEDITOR_imcmsImageEditPath + queryString, "_blank", "width=" + screen.availWidth + ",height=" + screen.availHeight);
+            
+		}
+	} ;
+	
+	CKEDITOR.plugins.add(commandName, {
+		init : function(editor) {
+			editor.addCommand(commandName, commandDef) ;
+			editor.ui.addButton('ImcmsImage',{
+				label   : editor.lang.common.image, 
+				icon    : this.path + 'toolBarButton.png',
+				command : commandName
+			}) ;
+			
+			editor.on('doubleclick', function(evt) {
+			var element = evt.data.element ;
+				if (element.is('img') && !element.getAttribute('_cke_realelement')) {
+					editor.execCommand(commandName) ;
+				}
+			}) ;
+			
+			if (editor.addMenuItems) {
+				editor.addMenuItems({
+					image : {
+						label   : editor.lang.image.menu,
+						command : commandName,
+						group   : 'image'
+					}
+				}) ;
+			}
+			
+			if (editor.contextMenu) {
+				editor.contextMenu.addListener(function(element, selection) {
+					if (!element || !element.is('img') || element.getAttribute('_cke_realelement') || element.isReadOnly()) {
+						return null ;
+					}
+					return { image : CKEDITOR.TRISTATE_OFF } ;
+				}) ;
+			}
+		}
+	}) ;
+	
+})() ;
\ No newline at end of file
diff --git a/web/imcms/ckeditor/plugins/imcms_image/return_image.jsp b/web/imcms/ckeditor/plugins/imcms_image/return_image.jsp
new file mode 100644
index 0000000000..fc12478bdd
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/imcms_image/return_image.jsp
@@ -0,0 +1,51 @@
+<%@ page
+	
+	import="org.apache.commons.lang.StringEscapeUtils,
+	        imcode.server.document.textdocument.ImageDomainObject,
+	        com.imcode.imcms.servlet.admin.EditImage,
+	        org.apache.commons.lang.StringUtils,
+	        imcode.util.ImcmsImageUtils"
+	
+  pageEncoding="UTF-8"
+	
+%><%
+
+ImageDomainObject image = EditImage.getImage(request);
+Integer metaId = EditImage.getMetaId(request);
+
+%><!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" xml:lang="sv" lang="sv">
+<head>
+	<title></title>
+
+<script type="text/javascript">
+var returnImage = null;<%
+if (null != image && StringUtils.isNotBlank(image.getUrlPathRelativeToContextPath())) { %>
+returnImage = {
+	src    : '<%= StringEscapeUtils.escapeJavaScript(ImcmsImageUtils.getImageUrl(metaId, image, request.getContextPath(), true)) %>',
+	alt    : '<%= StringEscapeUtils.escapeJavaScript(image.getAlternateText()) %>',<%
+	if (StringUtils.isNotBlank(image.getAlign())) { %>
+	align  : '<%= StringEscapeUtils.escapeJavaScript(image.getAlign()) %>',<%
+	} %>
+	border : '<%= image.getBorder() %>',
+	horiz  : '<%= image.getHorizontalSpace() %>',
+	vert   : '<%= image.getVerticalSpace() %>',<%
+	if (0 != image.getWidth()) { %>
+	width  : '<%= image.getWidth() %>',<%
+	}
+	if (0 != image.getHeight()) { %>
+	height : '<%= image.getHeight() %>',<%
+	} %>
+	name   : '<%= StringEscapeUtils.escapeJavaScript(image.getName()) %>'
+} ;<%
+} %>
+window.opener.handleImcmsReturnImage(returnImage);
+window.close();
+</script>
+
+</head>
+<body>
+</body>
+</html>
diff --git a/web/imcms/ckeditor/plugins/imcms_image/toolBarButton.png b/web/imcms/ckeditor/plugins/imcms_image/toolBarButton.png
new file mode 100644
index 0000000000..9b29efe816
Binary files /dev/null and b/web/imcms/ckeditor/plugins/imcms_image/toolBarButton.png differ
diff --git a/web/imcms/ckeditor/plugins/imcms_integration/imcms_config.js.jsp b/web/imcms/ckeditor/plugins/imcms_integration/imcms_config.js.jsp
new file mode 100644
index 0000000000..c4545ff48f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/imcms_integration/imcms_config.js.jsp
@@ -0,0 +1,93 @@
+<%@ page
+	
+	contentType="text/javascript"
+	
+	pageEncoding="UTF-8"
+	
+%><%
+
+boolean isInlineEditing = (null != request.getParameter("isInlineEditing")) ;
+
+%>
+//CKEDITOR.config.language                      = 'sv';
+CKEDITOR.config.skin                          = 'office2003' ; // kama || v2 || office2003
+CKEDITOR.config.tabSpaces                     = 2 ;
+CKEDITOR.config.entities                      = false ;
+CKEDITOR.config.resize_enabled                = true ;
+CKEDITOR.config.resize_dir                    = 'vertical' ;
+CKEDITOR.config.disableNativeSpellChecker     = false ;
+CKEDITOR.config.image_removeLinkByEmptyURL    = true ;
+CKEDITOR.config.startupFocus                  = true ;
+
+//CKEDITOR.config.pasteFromWordCleanupFile      = 'default' ;
+CKEDITOR.config.pasteFromWordPromptCleanup    = true ;
+CKEDITOR.config.pasteFromWordRemoveFontStyles = true ;
+CKEDITOR.config.pasteFromWordRemoveStyles     = true ;
+
+CKEDITOR.config.removeFormatAttributes        = 'class,style,lang,width,height,align,hspace,valign,hasbox' ;
+CKEDITOR.config.removeFormatTags              = 'big,code,del,dfn,font,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,var' ;
+
+//CKEDITOR.config.menu_groups                   = 'clipboard,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link' ;
+//CKEDITOR.config.removePlugins                 = 'image,form' ; // Doesn't work: http://dev.ckeditor.com/ticket/6221
+
+// Workaround for removing built-in image support
+CKEDITOR.config.plugins                       = '' +
+                                                'about,a11yhelp,basicstyles,bidi,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,dialogadvtab,' +
+																								'div,' +
+																								'elementspath,' +
+																								'enterkey,' +
+																								'entities,' +
+																					//			'filebrowser,' +
+																								'find,' +
+																					//			'flash,' +
+																								'font,' +
+																								'format,' +
+																					//			'forms,' +
+																								'horizontalrule,' +
+																								'htmldataprocessor,' +
+																					//			'image,' +
+                                                'indent,' +
+																								'justify,' +
+																								'keystrokes,' +
+																					//			'link,' +
+																								'list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,' +
+                                                'preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,' +
+                                                'specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc' ;
+
+
+CKEDITOR.config.extraPlugins                  = 'imcms_image,imcms_link,pastefromword,pastetext,tab<%= isInlineEditing ? ",autogrow" : "" %>' ;//,autogrow
+
+CKEDITOR.config.toolbar_imCMS_ALL = [
+	['Source','Maximize', 'Preview'],
+	['Cut','Copy','Paste','PasteText','PasteFromWord', 'SpellChecker'],
+	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+	['ImcmsLink','Unlink','Anchor'],['ImcmsImage','Table'],
+	['SpecialChar','ShowBlocks'],
+	'/',
+	['Format','-','Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
+	['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],['About']
+] ;
+
+CKEDITOR.config.toolbar_imCMS_SIMPLE_3 = [
+	['Source','Maximize','-','Format','-','Bold','Italic','Underline','Strike','-','ImcmsLink','ImcmsImage'],
+	['NumberedList','BulletedList','-','Outdent','Indent','-','SpecialChar']
+] ;
+
+CKEDITOR.config.toolbar_imCMS_SIMPLE_2 = [
+	['Source','Maximize','-','Bold','Italic','Underline','Strike','-','ImcmsLink','ImcmsImage'],'/',
+	['NumberedList','BulletedList','-','Outdent','Indent','-','SpecialChar']
+] ;
+
+CKEDITOR.config.toolbar_imCMS_SIMPLE_1 = [
+	['Source','Maximize'],
+	['Bold','Italic','Underline','-','ImcmsLink']
+] ;
+
+CKEDITOR.config.toolbar_imCMS_SIMPLE_0 = [
+	['Source','Maximize'],'/',
+	['Bold','Italic','Underline','-','ImcmsLink']
+] ;
+
+
+
diff --git a/web/imcms/ckeditor/plugins/imcms_integration/init.js.jsp b/web/imcms/ckeditor/plugins/imcms_integration/init.js.jsp
new file mode 100644
index 0000000000..1efe05e785
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/imcms_integration/init.js.jsp
@@ -0,0 +1,104 @@
+<%@ page
+	
+	import="java.io.File,
+	        imcode.server.Imcms,
+	        com.imcode.imcms.servlet.admin.EditImage,
+	        com.imcode.imcms.servlet.admin.EditLink,
+	        org.apache.commons.lang.StringUtils"
+	
+	contentType="text/javascript"
+	pageEncoding="UTF-8"
+	
+%><%
+
+String cp = request.getContextPath() ;
+
+String ckEditorPath      = cp + "/imcms/ckeditor/" ;
+String ckPluginImcmsPath = ckEditorPath + "plugins/imcms_integration/" ;
+
+File webRoot = Imcms.getPath() ;
+boolean hasOwnCss = false ;
+
+if (new File(webRoot, "/css/editor_site.css").exists()) {
+	hasOwnCss = true ;
+}
+
+%>
+
+var CKEDITOR_imcmsImageEditPath = '<%= EditImage.linkTo(request, "/imcms/ckeditor/plugins/imcms_image/return_image.jsp")%>' ;
+var CKEDITOR_imcmsLinkEditPath  = '<%= EditLink.linkTo(request, "/imcms/ckeditor/plugins/imcms_link/return_link.jsp")%>' ;
+var CKEDITOR_otherLinkParams    = [ '<%= StringUtils.join(EditLink.OTHER_PARAMETERS, "', '") %>' ] ;
+var contextPath                 = '<%= cp %>' ;
+
+
+function initCkEditor($, id, lang, width, toolBarSet, customConfig) {
+	var isInlineEditing = (id.toLowerCase().indexOf('inline') != -1) ;
+	var oConfig = {
+		customConfig       : '<%= ckPluginImcmsPath + "imcms_config.js.jsp?" + System.currentTimeMillis() %>' + (isInlineEditing ? '&isInlineEditing=true' : ''),
+		contentsCss        : '<%= cp + "/css/" + (hasOwnCss ? "editor_site.css" : "editor_default.css") %>',
+		width              : width,
+		language           : lang,
+		toolbar            : toolBarSet,
+		sharedSpaces       : { top : 'toolBar' }<%--,
+		autoGrow_minHeight : 300,
+		autoGrow_maxHeight : maxH--%>
+	} ;
+    oConfig = $.extend({}, oConfig, customConfig);
+	if (isInlineEditing) {
+		var iOffset = (/.*SIMPLE_[12]/.test(toolBarSet)) ? 200 : 300 ;
+		var winH    = $(window).height() ;
+		var wantedH = (winH - iOffset) ;
+		var maxH    = (wantedH > 700) ? 700 : (wantedH < 100) ? 100 : wantedH ;
+		if (maxH < 400) maxH = 400 ;<%-- Trying this value --%><%--
+		console.log('winH: ' + winH + ', maxH: ' + maxH) ; --%>
+		oConfig.autoGrow_minHeight = 100 ;
+		oConfig.autoGrow_maxHeight = maxH ;
+	}
+	CKEDITOR.replace(id, oConfig) ;
+	CKEDITOR.on('instanceReady', function(event) {
+		setSizeOfEditor($) ;
+		checkIframeScroll($) ;
+		<%-- Fix indentation on common tags --%>
+		var tags = ['p', 'li', 'table', 'tbody', 'tr'] ;
+		for (var key in tags) {
+			event.editor.dataProcessor.writer.setRules(tags[key], {
+					indent           : false,
+					breakBeforeOpen  : true,
+					breakAfterOpen   : false,
+					breakBeforeClose : false,
+					breakAfterClose  : true
+			}) ;
+		}
+		tags = ['td'] ;
+		for (key in tags) {
+			event.editor.dataProcessor.writer.setRules(tags[key], {
+					indent           : true,
+					breakBeforeOpen  : true,
+					breakAfterOpen   : false,
+					breakBeforeClose : false,
+					breakAfterClose  : true
+			}) ;
+		}
+		tags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'] ;
+		for (key in tags) {
+			event.editor.dataProcessor.writer.setRules(tags[key], {
+					indent           : false,
+					breakBeforeOpen  : true,
+					breakAfterOpen   : false,
+					breakBeforeClose : false,
+					breakAfterClose  : true
+			}) ;
+		}
+		<%-- Delete hasbox parameter --%>
+		event.editor.dataProcessor.htmlFilter.addRules({
+			elements : {
+				p : function( element ) {
+					if (element.attributes.hasbox) delete element.attributes.hasbox ;
+				},
+				img : function( element ) {
+					if (element.attributes.rel) delete element.attributes.rel ;
+				}
+			}
+		}) ;
+	}) ;
+}
diff --git a/web/imcms/xinha/plugins/ImcmsIntegration/create_link.js.jsp b/web/imcms/ckeditor/plugins/imcms_link/create_link.js.jsp
similarity index 100%
rename from web/imcms/xinha/plugins/ImcmsIntegration/create_link.js.jsp
rename to web/imcms/ckeditor/plugins/imcms_link/create_link.js.jsp
diff --git a/web/imcms/ckeditor/plugins/imcms_link/dialogs/anchor.js b/web/imcms/ckeditor/plugins/imcms_link/dialogs/anchor.js
new file mode 100644
index 0000000000..4d79b2ce24
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/imcms_link/dialogs/anchor.js
@@ -0,0 +1,99 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'anchor', function( editor )
+{
+	// Function called in onShow to load selected element.
+	var loadElements = function( editor, selection, element )
+	{
+		this.editMode = true;
+		this.editObj = element;
+
+		var attributeValue = this.editObj.getAttribute( 'name' );
+		if ( attributeValue )
+			this.setValueOf( 'info','txtName', attributeValue );
+		else
+			this.setValueOf( 'info','txtName', "" );
+	};
+
+	return {
+		title : editor.lang.anchor.title,
+		minWidth : 300,
+		minHeight : 60,
+		onOk : function()
+		{
+			// Always create a new anchor, because of IE BUG.
+			var name = this.getValueOf( 'info', 'txtName' ),
+				element = CKEDITOR.env.ie ?
+				editor.document.createElement( '<a name="' + CKEDITOR.tools.htmlEncode( name ) + '">' ) :
+				editor.document.createElement( 'a' );
+
+			// Move contents and attributes of old anchor to new anchor.
+			if ( this.editMode )
+			{
+				this.editObj.copyAttributes( element, { name : 1 } );
+				this.editObj.moveChildren( element );
+			}
+
+			// Set name.
+			element.removeAttribute( '_cke_saved_name' );
+			element.setAttribute( 'name', name );
+
+			// Insert a new anchor.
+			var fakeElement = editor.createFakeElement( element, 'cke_anchor', 'anchor' );
+			if ( !this.editMode )
+				editor.insertElement( fakeElement );
+			else
+			{
+				fakeElement.replace( this.fakeObj );
+				editor.getSelection().selectElement( fakeElement );
+			}
+
+			return true;
+		},
+		onShow : function()
+		{
+			this.editObj = false;
+			this.fakeObj = false;
+			this.editMode = false;
+
+			var selection = editor.getSelection();
+			var element = selection.getSelectedElement();
+			if ( element && element.getAttribute( '_cke_real_element_type' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
+			{
+				this.fakeObj = element;
+				element = editor.restoreRealElement( this.fakeObj );
+				loadElements.apply( this, [ editor, selection, element ] );
+				selection.selectElement( this.fakeObj );
+			}
+			this.getContentElement( 'info', 'txtName' ).focus();
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.anchor.title,
+				accessKey : 'I',
+				elements :
+				[
+					{
+						type : 'text',
+						id : 'txtName',
+						label : editor.lang.anchor.name,
+						required: true,
+						validate : function()
+						{
+							if ( !this.getValue() )
+							{
+								alert( editor.lang.anchor.errorName );
+								return false;
+							}
+							return true;
+						}
+					}
+				]
+			}
+		]
+	};
+} );
diff --git a/web/imcms/ckeditor/plugins/imcms_link/images/anchor.gif b/web/imcms/ckeditor/plugins/imcms_link/images/anchor.gif
new file mode 100644
index 0000000000..5aa797b224
Binary files /dev/null and b/web/imcms/ckeditor/plugins/imcms_link/images/anchor.gif differ
diff --git a/web/imcms/ckeditor/plugins/imcms_link/images/toolBarButton.png b/web/imcms/ckeditor/plugins/imcms_link/images/toolBarButton.png
new file mode 100644
index 0000000000..7141bf811b
Binary files /dev/null and b/web/imcms/ckeditor/plugins/imcms_link/images/toolBarButton.png differ
diff --git a/web/imcms/ckeditor/plugins/imcms_link/plugin.js b/web/imcms/ckeditor/plugins/imcms_link/plugin.js
new file mode 100644
index 0000000000..fa0bca373d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/imcms_link/plugin.js
@@ -0,0 +1,518 @@
+
+(function() {
+	var commandName = 'imcms_link' ;
+	
+	var commandDef  = {
+		exec : function(editor) {
+			
+			var selection = editor.getSelection() ;
+			var linkElement = null ;
+			var selectedText = '' ;
+			if (CKEDITOR.env.ie) {
+				selection.unlock(true) ;
+				selectedText = selection.getNative().createRange().text ;
+			} else {
+				selectedText = selection.getNative().toString();
+			}
+
+			// Fill in all the relevant fields if there's already one link selected.
+			if ( ( linkElement = getSelectedLink(editor)) && linkElement.hasAttribute( 'href' ) ) {
+				selection.selectElement( linkElement );
+				//console.log('selection.selectElement( linkElement );') ;
+			} else if ( ( linkElement = selection.getSelectedElement() ) && linkElement.is('img')
+					&& linkElement.getAttribute( '_cke_real_element_type' )
+					&& linkElement.getAttribute( '_cke_real_element_type' ) == 'anchor' ) {
+				this.fakeObj = linkElement;
+				linkElement = editor.restoreRealElement( this.fakeObj );
+				selection.selectElement( this.fakeObj );
+				//console.log('linkElement.is(\'img\')') ;
+			} else {
+				linkElement = null;
+				//console.log('linkElement = null;') ;
+				//console.log('selectedText = ' + selectedText + ';') ;
+			}
+
+			//element = parseLink(editor, element) ;
+			
+			var outparam = null ;
+			if (linkElement) {
+				var oldHref = linkElement.getAttribute('href') ;
+				var otherParams = '' ;
+				//console.log('linkElement: ' + linkElement.getOuterHtml()) ;
+				for (var o in CKEDITOR_otherLinkParams) {
+					var otherLinkParamName  = CKEDITOR_otherLinkParams[o] ;
+					var otherLinkParamValue = linkElement.getAttribute(otherLinkParamName) || linkElement.getAttribute('_cke_pa_' + otherLinkParamName) ;
+					//var otherLinkParamValue = linkElement.$.attributes.getNamedItem( otherLinkParamName ) ;
+					//console.log('param: ' + otherLinkParamName + ' = ' + otherLinkParamValue) ;
+					if (null != otherLinkParamValue && '' != otherLinkParamValue) {
+						otherParams += ' ' + otherLinkParamName + '="' + otherLinkParamValue + '"' ;
+					}
+				}
+				outparam = {
+					'TYPE'   : (/^\//.test(oldHref) ? 1 : oldHref.indexOf('://') != -1 ? 2 : 0),
+					'HREF'   : oldHref,
+					'TARGET' : linkElement.getAttribute('target'),
+					'TITLE'  : linkElement.getAttribute('title'),
+					'CLASS'  : linkElement.getAttribute('class'),
+					'STYLE'  : linkElement.getAttribute('style'),
+					'OTHER'  : otherParams
+				} ;
+			}
+			
+			var queryString = '' ;
+			
+			for (var p in outparam) {
+				if (outparam[p]) {
+					queryString += '&' + p + '=' + encodeURIComponent(outparam[p]) ;
+				}
+			}
+			
+            window.handleImcmsReturnLink = function(returnLink) {
+                if (!returnLink || '' == returnLink.HREF) { // user must have pressed Cancel
+                    return ;
+                }
+
+                //console.log('linkElement: ' + linkElement + '\nreturnLink.HREF: ' + returnLink.HREF) ;
+
+                var link = linkElement ;
+
+                //console.log('link.href (before): ' + (!link ? 'null' : link.getAttribute('href'))) ;
+
+                if (!link) { // If the <a/> tag doesn't exists in the editor - create it.
+                    var selectedElement = selection.getSelectedElement();
+                    var content = (selectedText !== '' && (typeof selectedText) != 'undefined')
+                        ? selectedText
+                        : (selectedElement && selectedElement.is('img'))
+                            ? selectedElement.getOuterHtml()
+                            : (returnLink.TITLE || returnLink.HREF);
+
+                    link = CKEDITOR.dom.element.createFromHtml('<a>' + content + '</a>') ;
+                    link.setAttribute('href', returnLink.HREF) ;
+                    editor.insertElement(link) ;
+                    //console.log('link (not exist) - Created: ' + link) ;
+                } else { // If the <a/> tag exists in the editor (var link = linkElement ;) - change it.
+                    link.setAttribute('href', returnLink.HREF) ;
+                    //console.log('link (exist): ' + link) ;
+                }
+                link.removeAttribute('_cke_saved_href') ;
+                link.removeAttribute('data-cke-saved-href') ;
+
+                //console.log('link.href (after): ' + link.getAttribute('href')) ;
+
+                var linkType = returnLink.TYPE ;
+                var hasTarget = (1 == linkType || 2 == linkType) ;
+
+                for (var parameter in returnLink) {
+                    var parameterValue = returnLink[parameter] ;
+                    //console.log(parameter + ' : ' + parameterValue) ;
+                    switch (parameter) {
+                        case 'TITLE':
+                            if ('' != parameterValue) link.setAttribute('title', parameterValue) ;
+                            break ;
+                        case 'TARGET':
+                            if (hasTarget && null != parameterValue) {
+                                link.setAttribute('target', parameterValue) ;
+                            }
+                            break ;
+                        case 'CLASS':
+                            if ('' != parameterValue) link.setAttribute('class', parameterValue) ;
+                            break ;
+                        case 'STYLE':
+                            if ('' != parameterValue) link.setAttribute('style', parameterValue) ;
+                            break ;
+                        case 'OTHER':
+                            if ('' != parameterValue) {
+                                for (var i in CKEDITOR_otherLinkParams) {
+                                    var returnOtherLinkParamName  = CKEDITOR_otherLinkParams[i] ;
+                                    var returnOtherLinkParamValue = paramFromString(returnOtherLinkParamName, returnLink.OTHER) ;
+                                    //console.log('PARSE OTHER: ' + returnOtherLinkParamName + ':' + returnOtherLinkParamValue) ;
+                                    if (null != returnOtherLinkParamValue && '' != returnOtherLinkParamValue) {
+                                        //console.log('SET OTHER: ' + returnOtherLinkParamName + '="' + returnOtherLinkParamValue + '"') ;
+                                        link.setAttribute(returnOtherLinkParamName, returnOtherLinkParamValue) ;
+                                        link.removeAttribute('_cke_pa_' + returnOtherLinkParamName) ;
+                                    }
+                                }
+                            }
+                            break ;
+                    }
+                }
+                if ('null' == link.getAttribute('target') || '' == link.getAttribute('target')) {
+                    link.removeAttribute('target') ;
+                }
+                //console.log('link.getOuterHtml():\n' + link.getOuterHtml()) ;
+                //console.log('editor.getSnapshot():\n' + editor.getSnapshot()) ;
+                //console.log('editor.getData():\n' + editor.getData()) ;
+
+            }
+			//console.log('queryString: ' + queryString) ;
+			
+            window.open(CKEDITOR_imcmsLinkEditPath + queryString, "_blank", "width=" + screen.availWidth + ",height=" + screen.availHeight);
+			
+		}
+	} ;
+	
+	CKEDITOR.plugins.add(commandName, {
+		init : function(editor) {
+			editor.addCommand(commandName, commandDef) ;
+			editor.ui.addButton('ImcmsLink',{
+				label   : editor.lang.link.toolbar, 
+				icon    : this.path + 'images/toolBarButton.png',
+				command : commandName
+			}) ;
+			
+			editor.addCommand('anchor', new CKEDITOR.dialogCommand('anchor')) ;
+			editor.addCommand('unlink', new CKEDITOR.unlinkCommand()) ;
+			
+			editor.ui.addButton('Unlink', {
+				label   : editor.lang.unlink,
+				command : 'unlink'
+			}) ;
+			editor.ui.addButton('Anchor', {
+				label   : editor.lang.anchor.toolbar,
+				command : 'anchor'
+			}) ;
+			
+			CKEDITOR.dialog.add('anchor', this.path + 'dialogs/anchor.js') ;
+			
+			// Add the CSS styles for anchor placeholders.
+			editor.addCss(
+			'img.cke_anchor {' +
+			' background-image: url(' + CKEDITOR.getUrl(this.path + 'images/anchor.gif' ) + ');' +
+			' background-position: center center;' +
+			' background-repeat: no-repeat;' +
+			' border: 1px solid #a9a9a9;' +
+			' width: 18px !important;' +
+			' height: 18px !important;' +
+			'}\n' +
+			'a.cke_anchor {' +
+			' background-image: url(' + CKEDITOR.getUrl(this.path + 'images/anchor.gif' ) + ');' +
+			' background-position: 0 center;' +
+			' background-repeat: no-repeat;' +
+			' border: 1px solid #a9a9a9;' +
+			' padding-left: 18px;' +
+			'}'
+			) ;
+			
+			editor.on('selectionChange', function(evt) {
+				var command = editor.getCommand('unlink'),
+				element = evt.data.path.lastElement && evt.data.path.lastElement.getAscendant('a', true) ;
+				if (element && element.getName() == 'a' && element.getAttribute('href')) {
+					command.setState( CKEDITOR.TRISTATE_OFF );
+				} else {
+					command.setState( CKEDITOR.TRISTATE_DISABLED );
+				}
+			}) ;
+			
+			editor.on('doubleclick', function(evt) {
+				var element = CKEDITOR.plugins.link.getSelectedLink( editor ) || evt.data.element;
+				if (element.is('a')) {
+					if (element.getAttribute('name') && !element.getAttribute('href')) {
+						evt.data.dialog = 'anchor'
+					} else {
+						editor.execCommand(commandName) ;
+					}
+				} else if ( element.is('img') && element.getAttribute('_cke_real_element_type') == 'anchor') {
+					evt.data.dialog = 'anchor';
+				}
+			}) ;
+			
+			if (editor.addMenuItems) {
+				editor.addMenuItems({
+					anchor : {
+						label   : editor.lang.anchor.menu,
+						command : 'anchor',
+						group   : 'anchor'
+					},
+					link : {
+						label   : editor.lang.link.menu,
+						command : commandName,
+						group   : 'link',
+						order   : 1
+					},
+					unlink : {
+						label   : editor.lang.unlink,
+						command : 'unlink',
+						group   : 'link',
+						order   : 5
+					}
+				}) ;
+			}
+			
+			if (editor.contextMenu) {
+				editor.contextMenu.addListener(function(element, selection) {
+						if (!element || element.isReadOnly()) {
+							return null ;
+						}
+						var isAnchor = (element.is('img') && element.getAttribute('_cke_real_element_type') == 'anchor') ;
+						if (!isAnchor) {
+							if (!(element = CKEDITOR.plugins.link.getSelectedLink(editor))) {
+								return null ;
+							}
+							isAnchor = (element.getAttribute('name') && !element.getAttribute('href')) ;
+						}
+						return isAnchor ?
+								{ anchor : CKEDITOR.TRISTATE_OFF } :
+								{ link : CKEDITOR.TRISTATE_OFF, unlink : CKEDITOR.TRISTATE_OFF } ;
+				}) ;
+			}
+		},
+		
+		afterInit : function(editor) {
+			var dataProcessor = editor.dataProcessor,
+			dataFilter = dataProcessor && dataProcessor.dataFilter ;
+			if (dataFilter) {
+				dataFilter.addRules({
+					elements : {
+						a : function( element ) {
+							var attributes = element.attributes;
+							if (attributes.name && !attributes.href) {
+								return editor.createFakeParserElement(element, 'cke_anchor', 'anchor') ;
+							}
+						}
+					}
+				}) ;
+			}
+		},
+		
+		requires : ['fakeobjects']/*
+		}*/
+	}) ;
+	
+})() ;
+
+function getSelectedLink(editor ) {
+	try {
+		var selection = editor.getSelection() ;
+		if (selection.getType() == CKEDITOR.SELECTION_ELEMENT) {
+			var selectedElement = selection.getSelectedElement() ;
+			if (selectedElement.is('a')) {
+				return selectedElement ;
+			}
+		}
+		var range = selection.getRanges(true)[0] ;
+		range.shrink(CKEDITOR.SHRINK_TEXT) ;
+		var root = range.getCommonAncestor() ;
+		return root.getAscendant('a', true) ;
+	} catch(e) {
+		return null ;
+	}
+}
+
+function paramFromString(paramName, inputString) {
+	var pattern = paramName + "=([\\\"'])([^\\1]+?)\\1" ;
+	var re      = new RegExp(pattern, 'gi') ;
+	var results = re.exec(inputString) ;
+	if (null != results) {
+		return results[2] ;
+	}
+	return '' ;
+}
+
+CKEDITOR.unlinkCommand = function(){};
+CKEDITOR.unlinkCommand.prototype = {
+	exec : function (editor) {
+		var selection = editor.getSelection(),
+			bookmarks = selection.createBookmarks(),
+			ranges = selection.getRanges(),
+			rangeRoot,
+			element;
+
+		for ( var i = 0 ; i < ranges.length ; i++ ) {
+			rangeRoot = ranges[i].getCommonAncestor( true );
+			element = rangeRoot.getAscendant( 'a', true );
+			if ( !element )
+				continue;
+			ranges[i].selectNodeContents( element );
+		}
+
+		selection.selectRanges( ranges );
+		editor.document.$.execCommand( 'unlink', false, null );
+		selection.selectBookmarks( bookmarks );
+	},
+
+	startDisabled : true
+} ;
+
+
+	// Loads the parameters in a selected link to the link dialog fields.
+	var javascriptProtocolRegex = /^javascript:/,
+		emailRegex = /^mailto:([^?]+)(?:\?(.+))?$/,
+		emailSubjectRegex = /subject=([^;?:@&=$,\/]*)/,
+		emailBodyRegex = /body=([^;?:@&=$,\/]*)/,
+		anchorRegex = /^#(.*)$/,
+		urlRegex = /^((?:http|https|ftp|news):\/\/)?(.*)$/,
+		selectableTargets = /^(_(?:self|top|parent|blank))$/,
+		encodedEmailLinkRegex = /^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,
+		functionCallProtectedEmailLinkRegex = /^javascript:([^(]+)\(([^)]+)\)$/;
+
+	var popupRegex =
+		/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/;
+	var popupFeaturesRegex = /(?:^|,)([^=]+)=(\d+|yes|no)/gi;
+
+	function parseLink( editor, element ) {
+		var href = ( element  && ( element.getAttribute( '_cke_saved_href' ) || element.getAttribute( 'href' ) ) ) || '',
+		 	javascriptMatch,
+			emailMatch,
+			anchorMatch,
+			urlMatch,
+			retval = {};
+
+		if ( ( javascriptMatch = href.match( javascriptProtocolRegex ) ) )
+		{
+			if ( emailProtection == 'encode' )
+			{
+				href = href.replace( encodedEmailLinkRegex,
+						function ( match, protectedAddress, rest )
+						{
+							return 'mailto:' +
+							       String.fromCharCode.apply( String, protectedAddress.split( ',' ) ) +
+							       ( rest && unescapeSingleQuote( rest ) );
+						});
+			}
+			// Protected email link as function call.
+			else if ( emailProtection )
+			{
+				href.replace( functionCallProtectedEmailLinkRegex, function( match, funcName, funcArgs )
+				{
+					if ( funcName == compiledProtectionFunction.name )
+					{
+						retval.type = 'email';
+						var email = retval.email = {};
+
+						var paramRegex = /[^,\s]+/g,
+							paramQuoteRegex = /(^')|('$)/g,
+							paramsMatch = funcArgs.match( paramRegex ),
+							paramsMatchLength = paramsMatch.length,
+							paramName,
+							paramVal;
+
+						for ( var i = 0; i < paramsMatchLength; i++ )
+						{
+							paramVal = decodeURIComponent( unescapeSingleQuote( paramsMatch[ i ].replace( paramQuoteRegex, '' ) ) );
+							paramName = compiledProtectionFunction.params[ i ].toLowerCase();
+							email[ paramName ] = paramVal;
+						}
+						email.address = [ email.name, email.domain ].join( '@' );
+					}
+				} );
+			}
+		}
+
+		if ( !retval.type )
+		{
+			if ( ( anchorMatch = href.match( anchorRegex ) ) )
+			{
+				retval.type = 'anchor';
+				retval.anchor = {};
+				retval.anchor.name = retval.anchor.id = anchorMatch[1];
+			}
+			// Protected email link as encoded string.
+			else if ( ( emailMatch = href.match( emailRegex ) ) )
+			{
+				var subjectMatch = href.match( emailSubjectRegex ),
+					bodyMatch = href.match( emailBodyRegex );
+
+				retval.type = 'email';
+				var email = ( retval.email = {} );
+				email.address = emailMatch[ 1 ];
+				subjectMatch && ( email.subject = decodeURIComponent( subjectMatch[ 1 ] ) );
+				bodyMatch && ( email.body = decodeURIComponent( bodyMatch[ 1 ] ) );
+			}
+			// urlRegex matches empty strings, so need to check for href as well.
+			else if (  href && ( urlMatch = href.match( urlRegex ) ) )
+			{
+				retval.type = 'url';
+				retval.url = {};
+				retval.url.protocol = urlMatch[1];
+				retval.url.url = urlMatch[2];
+			}
+			else
+				retval.type = 'url';
+		}
+
+		// Load target and popup settings.
+		if ( element )
+		{
+			var target = element.getAttribute( 'target' );
+			retval.target = {};
+			retval.adv = {};
+
+			// IE BUG: target attribute is an empty string instead of null in IE if it's not set.
+			if ( !target )
+			{
+				var onclick = element.getAttribute( '_cke_pa_onclick' ) || element.getAttribute( 'onclick' ),
+					onclickMatch = onclick && onclick.match( popupRegex );
+				if ( onclickMatch )
+				{
+					retval.target.type = 'popup';
+					retval.target.name = onclickMatch[1];
+
+					var featureMatch;
+					while ( ( featureMatch = popupFeaturesRegex.exec( onclickMatch[2] ) ) )
+					{
+						if ( featureMatch[2] == 'yes' || featureMatch[2] == '1' )
+							retval.target[ featureMatch[1] ] = true;
+						else if ( isFinite( featureMatch[2] ) )
+							retval.target[ featureMatch[1] ] = featureMatch[2];
+					}
+				}
+			}
+			else
+			{
+				var targetMatch = target.match( selectableTargets );
+				if ( targetMatch )
+					retval.target.type = retval.target.name = target;
+				else
+				{
+					retval.target.type = 'frame';
+					retval.target.name = target;
+				}
+			}
+
+			var me = this;
+			var advAttr = function( inputName, attrName )
+			{
+				var value = element.getAttribute( attrName );
+				if ( value !== null )
+					retval.adv[ inputName ] = value || '';
+			};
+			advAttr( 'advId', 'id' );
+			advAttr( 'advLangDir', 'dir' );
+			advAttr( 'advAccessKey', 'accessKey' );
+			advAttr( 'advName', 'name' );
+			advAttr( 'advLangCode', 'lang' );
+			advAttr( 'advTabIndex', 'tabindex' );
+			advAttr( 'advTitle', 'title' );
+			advAttr( 'advContentType', 'type' );
+			advAttr( 'advCSSClasses', 'class' );
+			advAttr( 'advCharset', 'charset' );
+			advAttr( 'advStyles', 'style' );
+		}
+
+		// Find out whether we have any anchors in the editor.
+		// Get all IMG elements in CK document.
+		var elements = editor.document.getElementsByTag( 'img' ),
+			realAnchors = new CKEDITOR.dom.nodeList( editor.document.$.anchors ),
+			anchors = retval.anchors = [];
+
+		for ( var i = 0; i < elements.count() ; i++ )
+		{
+			var item = elements.getItem( i );
+			if ( item.getAttribute( '_cke_realelement' ) && item.getAttribute( '_cke_real_element_type' ) == 'anchor' )
+				anchors.push( editor.restoreRealElement( item ) );
+		}
+
+		for ( i = 0 ; i < realAnchors.count() ; i++ )
+			anchors.push( realAnchors.getItem( i ) );
+
+		for ( i = 0 ; i < anchors.length ; i++ )
+		{
+			item = anchors[ i ];
+			anchors[ i ] = { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) };
+		}
+
+		// Record down the selected element in the dialog.
+		//this._.selectedElement = element;
+
+		return retval;
+	}
\ No newline at end of file
diff --git a/web/imcms/ckeditor/plugins/imcms_link/return_link.jsp b/web/imcms/ckeditor/plugins/imcms_link/return_link.jsp
new file mode 100644
index 0000000000..51a75ca726
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/imcms_link/return_link.jsp
@@ -0,0 +1,40 @@
+<%@ page
+	
+	import="com.imcode.imcms.servlet.admin.EditLink,
+	        org.apache.commons.lang.StringEscapeUtils"
+	
+  pageEncoding="UTF-8"
+	
+%><%
+
+EditLink.Link link = EditLink.getLink(request);
+
+
+%><!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" xml:lang="sv" lang="sv">
+<head>
+	<title></title>
+
+<script type="text/javascript">
+var returnLink = null;<%
+if (null != link) { %>
+returnLink = {
+	TYPE   : <%= link.getType() %>,
+	HREF   : '<%= StringEscapeUtils.escapeJavaScript(link.getHref()) %>',
+	TITLE  : '<%= StringEscapeUtils.escapeJavaScript(link.getTitle()) %>',
+	TARGET : '<%= StringEscapeUtils.escapeJavaScript(link.getTarget()) %>',
+	CLASS  : '<%= StringEscapeUtils.escapeJavaScript(link.getCssClass()) %>',
+	STYLE  : '<%= StringEscapeUtils.escapeJavaScript(link.getCssStyle()) %>',
+	OTHER  : '<%= StringEscapeUtils.escapeJavaScript(link.getOtherParams()) %>'
+} ;<%
+} %>
+window.opener.handleImcmsReturnLink(returnLink);
+window.close() ;
+</script> 
+
+</head>
+<body>
+</body>
+</html>
diff --git a/web/imcms/ckeditor/plugins/link/dialogs/anchor.js b/web/imcms/ckeditor/plugins/link/dialogs/anchor.js
new file mode 100644
index 0000000000..17893a9f9b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/link/dialogs/anchor.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('anchor',function(a){var b=function(d){this._.selectedElement=d;var e=d.data('cke-saved-name');this.setValueOf('info','txtName',e||'');};function c(d,e){return d.createFakeElement(e,'cke_anchor','anchor');};return{title:a.lang.anchor.title,minWidth:300,minHeight:60,onOk:function(){var k=this;var d=CKEDITOR.tools.trim(k.getValueOf('info','txtName')),e={id:d,name:d,'data-cke-saved-name':d};if(k._.selectedElement){if(k._.selectedElement.data('cke-realelement')){var f=c(a,a.document.createElement('a',{attributes:e}));f.replace(k._.selectedElement);}else k._.selectedElement.setAttributes(e);}else{var g=a.getSelection(),h=g&&g.getRanges()[0];if(h.collapsed){if(CKEDITOR.plugins.link.synAnchorSelector)e['class']='cke_anchor_empty';if(CKEDITOR.plugins.link.emptyAnchorFix){e.contenteditable='false';e['data-cke-editable']=1;}var i=a.document.createElement('a',{attributes:e});if(CKEDITOR.plugins.link.fakeAnchor)i=c(a,i);h.insertNode(i);}else{if(CKEDITOR.env.ie&&CKEDITOR.env.version<9)e['class']='cke_anchor';var j=new CKEDITOR.style({element:'a',attributes:e});j.type=CKEDITOR.STYLE_INLINE;j.apply(a.document);}}},onHide:function(){delete this._.selectedElement;},onShow:function(){var h=this;var d=a.getSelection(),e=d.getSelectedElement(),f;if(e){if(CKEDITOR.plugins.link.fakeAnchor){var g=CKEDITOR.plugins.link.tryRestoreFakeAnchor(a,e);g&&b.call(h,g);h._.selectedElement=e;}else if(e.is('a')&&e.hasAttribute('name'))b.call(h,e);}else{f=CKEDITOR.plugins.link.getSelectedLink(a);if(f){b.call(h,f);d.selectElement(f);}}h.getContentElement('info','txtName').focus();},contents:[{id:'info',label:a.lang.anchor.title,accessKey:'I',elements:[{type:'text',id:'txtName',label:a.lang.anchor.name,required:true,validate:function(){if(!this.getValue()){alert(a.lang.anchor.errorName);return false;}return true;}}]}]};});
diff --git a/web/imcms/ckeditor/plugins/link/dialogs/link.js b/web/imcms/ckeditor/plugins/link/dialogs/link.js
new file mode 100644
index 0000000000..9d5ff5353b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/link/dialogs/link.js
@@ -0,0 +1,12 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('link',function(a){var b=CKEDITOR.plugins.link,c=function(){var F=this.getDialog(),G=F.getContentElement('target','popupFeatures'),H=F.getContentElement('target','linkTargetName'),I=this.getValue();if(!G||!H)return;G=G.getElement();G.hide();H.setValue('');switch(I){case 'frame':H.setLabel(a.lang.link.targetFrameName);H.getElement().show();break;case 'popup':G.show();H.setLabel(a.lang.link.targetPopupName);H.getElement().show();break;default:H.setValue(I);H.getElement().hide();break;}},d=function(){var F=this.getDialog(),G=['urlOptions','anchorOptions','emailOptions'],H=this.getValue(),I=F.definition.getContents('upload'),J=I&&I.hidden;if(H=='url'){if(a.config.linkShowTargetTab)F.showPage('target');if(!J)F.showPage('upload');}else{F.hidePage('target');if(!J)F.hidePage('upload');}for(var K=0;K<G.length;K++){var L=F.getContentElement('info',G[K]);if(!L)continue;L=L.getElement().getParent().getParent();if(G[K]==H+'Options')L.show();else L.hide();}F.layout();},e=/^javascript:/,f=/^mailto:([^?]+)(?:\?(.+))?$/,g=/subject=([^;?:@&=$,\/]*)/,h=/body=([^;?:@&=$,\/]*)/,i=/^#(.*)$/,j=/^((?:http|https|ftp|news):\/\/)?(.*)$/,k=/^(_(?:self|top|parent|blank))$/,l=/^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,m=/^javascript:([^(]+)\(([^)]+)\)$/,n=/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/,o=/(?:^|,)([^=]+)=(\d+|yes|no)/gi,p=function(F,G){var H=G&&(G.data('cke-saved-href')||G.getAttribute('href'))||'',I,J,K,L,M={};if(I=H.match(e))if(y=='encode')H=H.replace(l,function(ae,af,ag){return 'mailto:'+String.fromCharCode.apply(String,af.split(','))+(ag&&w(ag));});else if(y)H.replace(m,function(ae,af,ag){if(af==z.name){M.type='email';var ah=M.email={},ai=/[^,\s]+/g,aj=/(^')|('$)/g,ak=ag.match(ai),al=ak.length,am,an;for(var ao=0;ao<al;ao++){an=decodeURIComponent(w(ak[ao].replace(aj,'')));am=z.params[ao].toLowerCase();ah[am]=an;}ah.address=[ah.name,ah.domain].join('@');}});if(!M.type)if(K=H.match(i)){M.type='anchor';M.anchor={};M.anchor.name=M.anchor.id=K[1];}else if(J=H.match(f)){var N=H.match(g),O=H.match(h);M.type='email';var P=M.email={};P.address=J[1];N&&(P.subject=decodeURIComponent(N[1]));O&&(P.body=decodeURIComponent(O[1]));}else if(H&&(L=H.match(j))){M.type='url';M.url={};M.url.protocol=L[1];M.url.url=L[2];}else M.type='url';if(G){var Q=G.getAttribute('target');M.target={};M.adv={};if(!Q){var R=G.data('cke-pa-onclick')||G.getAttribute('onclick'),S=R&&R.match(n);
+if(S){M.target.type='popup';M.target.name=S[1];var T;while(T=o.exec(S[2])){if((T[2]=='yes'||T[2]=='1')&&!(T[1] in {height:1,width:1,top:1,left:1}))M.target[T[1]]=true;else if(isFinite(T[2]))M.target[T[1]]=T[2];}}}else{var U=Q.match(k);if(U)M.target.type=M.target.name=Q;else{M.target.type='frame';M.target.name=Q;}}var V=this,W=function(ae,af){var ag=G.getAttribute(af);if(ag!==null)M.adv[ae]=ag||'';};W('advId','id');W('advLangDir','dir');W('advAccessKey','accessKey');M.adv.advName=G.data('cke-saved-name')||G.getAttribute('name')||'';W('advLangCode','lang');W('advTabIndex','tabindex');W('advTitle','title');W('advContentType','type');CKEDITOR.plugins.link.synAnchorSelector?M.adv.advCSSClasses=C(G):W('advCSSClasses','class');W('advCharset','charset');W('advStyles','style');W('advRel','rel');}var X=M.anchors=[],Y,Z,aa;if(CKEDITOR.plugins.link.emptyAnchorFix){var ab=F.document.getElementsByTag('a');for(Y=0,Z=ab.count();Y<Z;Y++){aa=ab.getItem(Y);if(aa.data('cke-saved-name')||aa.hasAttribute('name'))X.push({name:aa.data('cke-saved-name')||aa.getAttribute('name'),id:aa.getAttribute('id')});}}else{var ac=new CKEDITOR.dom.nodeList(F.document.$.anchors);for(Y=0,Z=ac.count();Y<Z;Y++){aa=ac.getItem(Y);X[Y]={name:aa.getAttribute('name'),id:aa.getAttribute('id')};}}if(CKEDITOR.plugins.link.fakeAnchor){var ad=F.document.getElementsByTag('img');for(Y=0,Z=ad.count();Y<Z;Y++){if(aa=CKEDITOR.plugins.link.tryRestoreFakeAnchor(F,ad.getItem(Y)))X.push({name:aa.getAttribute('name'),id:aa.getAttribute('id')});}}this._.selectedElement=G;return M;},q=function(F,G){if(G[F])this.setValue(G[F][this.id]||'');},r=function(F){return q.call(this,'target',F);},s=function(F){return q.call(this,'adv',F);},t=function(F,G){if(!G[F])G[F]={};G[F][this.id]=this.getValue()||'';},u=function(F){return t.call(this,'target',F);},v=function(F){return t.call(this,'adv',F);};function w(F){return F.replace(/\\'/g,"'");};function x(F){return F.replace(/'/g,'\\$&');};var y=a.config.emailProtection||'';if(y&&y!='encode'){var z={};y.replace(/^([^(]+)\(([^)]+)\)$/,function(F,G,H){z.name=G;z.params=[];H.replace(/[^,\s]+/g,function(I){z.params.push(I);});});}function A(F){var G,H=z.name,I=z.params,J,K;G=[H,'('];for(var L=0;L<I.length;L++){J=I[L].toLowerCase();K=F[J];L>0&&G.push(',');G.push("'",K?x(encodeURIComponent(F[J])):'',"'");}G.push(')');return G.join('');};function B(F){var G,H=F.length,I=[];for(var J=0;J<H;J++){G=F.charCodeAt(J);I.push(G);}return 'String.fromCharCode('+I.join(',')+')';};function C(F){var G=F.getAttribute('class');
+return G?G.replace(/\s*(?:cke_anchor_empty|cke_anchor)(?:\s*$)?/g,''):'';};var D=a.lang.common,E=a.lang.link;return{title:E.title,minWidth:350,minHeight:230,contents:[{id:'info',label:E.info,title:E.info,elements:[{id:'linkType',type:'select',label:E.type,'default':'url',items:[[E.toUrl,'url'],[E.toAnchor,'anchor'],[E.toEmail,'email']],onChange:d,setup:function(F){if(F.type)this.setValue(F.type);},commit:function(F){F.type=this.getValue();}},{type:'vbox',id:'urlOptions',children:[{type:'hbox',widths:['25%','75%'],children:[{id:'protocol',type:'select',label:D.protocol,'default':'http://',items:[['http://‎','http://'],['https://‎','https://'],['ftp://‎','ftp://'],['news://‎','news://'],[E.other,'']],setup:function(F){if(F.url)this.setValue(F.url.protocol||'');},commit:function(F){if(!F.url)F.url={};F.url.protocol=this.getValue();}},{type:'text',id:'url',label:D.url,required:true,onLoad:function(){this.allowOnChange=true;},onKeyUp:function(){var K=this;K.allowOnChange=false;var F=K.getDialog().getContentElement('info','protocol'),G=K.getValue(),H=/^(http|https|ftp|news):\/\/(?=.)/i,I=/^((javascript:)|[#\/\.\?])/i,J=H.exec(G);if(J){K.setValue(G.substr(J[0].length));F.setValue(J[0].toLowerCase());}else if(I.test(G))F.setValue('');K.allowOnChange=true;},onChange:function(){if(this.allowOnChange)this.onKeyUp();},validate:function(){var H=this;var F=H.getDialog();if(F.getContentElement('info','linkType')&&F.getValueOf('info','linkType')!='url')return true;if(/javascript\:/.test(H.getValue())){alert(D.invalidValue);return false;}if(H.getDialog().fakeObj)return true;var G=CKEDITOR.dialog.validate.notEmpty(E.noUrl);return G.apply(H);},setup:function(F){this.allowOnChange=false;if(F.url)this.setValue(F.url.url);this.allowOnChange=true;},commit:function(F){this.onChange();if(!F.url)F.url={};F.url.url=this.getValue();this.allowOnChange=false;}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().show();}},{type:'button',id:'browse',hidden:'true',filebrowser:'info:url',label:D.browseServer}]},{type:'vbox',id:'anchorOptions',width:260,align:'center',padding:0,children:[{type:'fieldset',id:'selectAnchorText',label:E.selectAnchor,setup:function(F){if(F.anchors.length>0)this.getElement().show();else this.getElement().hide();},children:[{type:'hbox',id:'selectAnchor',children:[{type:'select',id:'anchorName','default':'',label:E.anchorName,style:'width: 100%;',items:[['']],setup:function(F){var I=this;I.clear();I.add('');for(var G=0;G<F.anchors.length;
+G++){if(F.anchors[G].name)I.add(F.anchors[G].name);}if(F.anchor)I.setValue(F.anchor.name);var H=I.getDialog().getContentElement('info','linkType');if(H&&H.getValue()=='email')I.focus();},commit:function(F){if(!F.anchor)F.anchor={};F.anchor.name=this.getValue();}},{type:'select',id:'anchorId','default':'',label:E.anchorId,style:'width: 100%;',items:[['']],setup:function(F){var H=this;H.clear();H.add('');for(var G=0;G<F.anchors.length;G++){if(F.anchors[G].id)H.add(F.anchors[G].id);}if(F.anchor)H.setValue(F.anchor.id);},commit:function(F){if(!F.anchor)F.anchor={};F.anchor.id=this.getValue();}}],setup:function(F){if(F.anchors.length>0)this.getElement().show();else this.getElement().hide();}}]},{type:'html',id:'noAnchors',style:'text-align: center;',html:'<div role="note" tabIndex="-1">'+CKEDITOR.tools.htmlEncode(E.noAnchors)+'</div>',focus:true,setup:function(F){if(F.anchors.length<1)this.getElement().show();else this.getElement().hide();}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().hide();}},{type:'vbox',id:'emailOptions',padding:1,children:[{type:'text',id:'emailAddress',label:E.emailAddress,required:true,validate:function(){var F=this.getDialog();if(!F.getContentElement('info','linkType')||F.getValueOf('info','linkType')!='email')return true;var G=CKEDITOR.dialog.validate.notEmpty(E.noEmail);return G.apply(this);},setup:function(F){if(F.email)this.setValue(F.email.address);var G=this.getDialog().getContentElement('info','linkType');if(G&&G.getValue()=='email')this.select();},commit:function(F){if(!F.email)F.email={};F.email.address=this.getValue();}},{type:'text',id:'emailSubject',label:E.emailSubject,setup:function(F){if(F.email)this.setValue(F.email.subject);},commit:function(F){if(!F.email)F.email={};F.email.subject=this.getValue();}},{type:'textarea',id:'emailBody',label:E.emailBody,rows:3,'default':'',setup:function(F){if(F.email)this.setValue(F.email.body);},commit:function(F){if(!F.email)F.email={};F.email.body=this.getValue();}}],setup:function(F){if(!this.getDialog().getContentElement('info','linkType'))this.getElement().hide();}}]},{id:'target',label:E.target,title:E.target,elements:[{type:'hbox',widths:['50%','50%'],children:[{type:'select',id:'linkTargetType',label:D.target,'default':'notSet',style:'width : 100%;',items:[[D.notSet,'notSet'],[E.targetFrame,'frame'],[E.targetPopup,'popup'],[D.targetNew,'_blank'],[D.targetTop,'_top'],[D.targetSelf,'_self'],[D.targetParent,'_parent']],onChange:c,setup:function(F){if(F.target)this.setValue(F.target.type||'notSet');
+c.call(this);},commit:function(F){if(!F.target)F.target={};F.target.type=this.getValue();}},{type:'text',id:'linkTargetName',label:E.targetFrameName,'default':'',setup:function(F){if(F.target)this.setValue(F.target.name);},commit:function(F){if(!F.target)F.target={};F.target.name=this.getValue().replace(/\W/gi,'');}}]},{type:'vbox',width:'100%',align:'center',padding:2,id:'popupFeatures',children:[{type:'fieldset',label:E.popupFeatures,children:[{type:'hbox',children:[{type:'checkbox',id:'resizable',label:E.popupResizable,setup:r,commit:u},{type:'checkbox',id:'status',label:E.popupStatusBar,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'location',label:E.popupLocationBar,setup:r,commit:u},{type:'checkbox',id:'toolbar',label:E.popupToolbar,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'menubar',label:E.popupMenuBar,setup:r,commit:u},{type:'checkbox',id:'fullscreen',label:E.popupFullScreen,setup:r,commit:u}]},{type:'hbox',children:[{type:'checkbox',id:'scrollbars',label:E.popupScrollBars,setup:r,commit:u},{type:'checkbox',id:'dependent',label:E.popupDependent,setup:r,commit:u}]},{type:'hbox',children:[{type:'text',widths:['50%','50%'],labelLayout:'horizontal',label:D.width,id:'width',setup:r,commit:u},{type:'text',labelLayout:'horizontal',widths:['50%','50%'],label:E.popupLeft,id:'left',setup:r,commit:u}]},{type:'hbox',children:[{type:'text',labelLayout:'horizontal',widths:['50%','50%'],label:D.height,id:'height',setup:r,commit:u},{type:'text',labelLayout:'horizontal',label:E.popupTop,widths:['50%','50%'],id:'top',setup:r,commit:u}]}]}]}]},{id:'upload',label:E.upload,title:E.upload,hidden:true,filebrowser:'uploadButton',elements:[{type:'file',id:'upload',label:D.upload,style:'height:40px',size:29},{type:'fileButton',id:'uploadButton',label:D.uploadSubmit,filebrowser:'info:url','for':['upload','upload']}]},{id:'advanced',label:E.advanced,title:E.advanced,elements:[{type:'vbox',padding:1,children:[{type:'hbox',widths:['45%','35%','20%'],children:[{type:'text',id:'advId',label:E.id,setup:s,commit:v},{type:'select',id:'advLangDir',label:E.langDir,'default':'',style:'width:110px',items:[[D.notSet,''],[E.langDirLTR,'ltr'],[E.langDirRTL,'rtl']],setup:s,commit:v},{type:'text',id:'advAccessKey',width:'80px',label:E.acccessKey,maxLength:1,setup:s,commit:v}]},{type:'hbox',widths:['45%','35%','20%'],children:[{type:'text',label:E.name,id:'advName',setup:s,commit:v},{type:'text',label:E.langCode,id:'advLangCode',width:'110px','default':'',setup:s,commit:v},{type:'text',label:E.tabIndex,id:'advTabIndex',width:'80px',maxLength:5,setup:s,commit:v}]}]},{type:'vbox',padding:1,children:[{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.advisoryTitle,'default':'',id:'advTitle',setup:s,commit:v},{type:'text',label:E.advisoryContentType,'default':'',id:'advContentType',setup:s,commit:v}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.cssClasses,'default':'',id:'advCSSClasses',setup:s,commit:v},{type:'text',label:E.charset,'default':'',id:'advCharset',setup:s,commit:v}]},{type:'hbox',widths:['45%','55%'],children:[{type:'text',label:E.rel,'default':'',id:'advRel',setup:s,commit:v},{type:'text',label:E.styles,'default':'',id:'advStyles',validate:CKEDITOR.dialog.validate.inlineStyle(a.lang.common.invalidInlineStyle),setup:s,commit:v}]}]}]}],onShow:function(){var F=this.getParentEditor(),G=F.getSelection(),H=null;
+if((H=b.getSelectedLink(F))&&H.hasAttribute('href'))G.selectElement(H);else H=null;this.setupContent(p.apply(this,[F,H]));},onOk:function(){var F={},G=[],H={},I=this,J=this.getParentEditor();this.commitContent(H);switch(H.type||'url'){case 'url':var K=H.url&&H.url.protocol!=undefined?H.url.protocol:'http://',L=H.url&&CKEDITOR.tools.trim(H.url.url)||'';F['data-cke-saved-href']=L.indexOf('/')===0?L:K+L;break;case 'anchor':var M=H.anchor&&H.anchor.name,N=H.anchor&&H.anchor.id;F['data-cke-saved-href']='#'+(M||N||'');break;case 'email':var O,P=H.email,Q=P.address;switch(y){case '':case 'encode':var R=encodeURIComponent(P.subject||''),S=encodeURIComponent(P.body||''),T=[];R&&T.push('subject='+R);S&&T.push('body='+S);T=T.length?'?'+T.join('&'):'';if(y=='encode'){O=["javascript:void(location.href='mailto:'+",B(Q)];T&&O.push("+'",x(T),"'");O.push(')');}else O=['mailto:',Q,T];break;default:var U=Q.split('@',2);P.name=U[0];P.domain=U[1];O=['javascript:',A(P)];}F['data-cke-saved-href']=O.join('');break;}if(H.target)if(H.target.type=='popup'){var V=["window.open(this.href, '",H.target.name||'',"', '"],W=['resizable','status','location','toolbar','menubar','fullscreen','scrollbars','dependent'],X=W.length,Y=function(ai){if(H.target[ai])W.push(ai+'='+H.target[ai]);};for(var Z=0;Z<X;Z++)W[Z]=W[Z]+(H.target[W[Z]]?'=yes':'=no');Y('width');Y('left');Y('height');Y('top');V.push(W.join(','),"'); return false;");F['data-cke-pa-onclick']=V.join('');G.push('target');}else{if(H.target.type!='notSet'&&H.target.name)F.target=H.target.name;else G.push('target');G.push('data-cke-pa-onclick','onclick');}if(H.adv){var aa=function(ai,aj){var ak=H.adv[ai];if(ak)F[aj]=ak;else G.push(aj);};aa('advId','id');aa('advLangDir','dir');aa('advAccessKey','accessKey');if(H.adv.advName)F.name=F['data-cke-saved-name']=H.adv.advName;else G=G.concat(['data-cke-saved-name','name']);aa('advLangCode','lang');aa('advTabIndex','tabindex');aa('advTitle','title');aa('advContentType','type');aa('advCSSClasses','class');aa('advCharset','charset');aa('advStyles','style');aa('advRel','rel');}var ab=J.getSelection();F.href=F['data-cke-saved-href'];if(!this._.selectedElement){var ac=ab.getRanges(true);if(ac.length==1&&ac[0].collapsed){var ad=new CKEDITOR.dom.text(H.type=='email'?H.email.address:F['data-cke-saved-href'],J.document);ac[0].insertNode(ad);ac[0].selectNodeContents(ad);ab.selectRanges(ac);}var ae=new CKEDITOR.style({element:'a',attributes:F});ae.type=CKEDITOR.STYLE_INLINE;ae.apply(J.document);}else{var af=this._.selectedElement,ag=af.data('cke-saved-href'),ah=af.getHtml();
+af.setAttributes(F);af.removeAttributes(G);if(H.adv&&H.adv.advName&&CKEDITOR.plugins.link.synAnchorSelector)af.addClass(af.getChildCount()?'cke_anchor':'cke_anchor_empty');if(ag==ah||H.type=='email'&&ah.indexOf('@')!=-1)af.setHtml(H.type=='email'?H.email.address:F['data-cke-saved-href']);ab.selectElement(af);delete this._.selectedElement;}},onLoad:function(){if(!a.config.linkShowAdvancedTab)this.hidePage('advanced');if(!a.config.linkShowTargetTab)this.hidePage('target');},onFocus:function(){var F=this.getContentElement('info','linkType'),G;if(F&&F.getValue()=='url'){G=this.getContentElement('info','url');G.select();}}};});
diff --git a/web/imcms/ckeditor/plugins/link/images/anchor.gif b/web/imcms/ckeditor/plugins/link/images/anchor.gif
new file mode 100644
index 0000000000..5aa797b224
Binary files /dev/null and b/web/imcms/ckeditor/plugins/link/images/anchor.gif differ
diff --git a/web/imcms/ckeditor/plugins/liststyle/dialogs/liststyle.js b/web/imcms/ckeditor/plugins/liststyle/dialogs/liststyle.js
new file mode 100644
index 0000000000..21d10155d4
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/liststyle/dialogs/liststyle.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){function a(e,f){var g;try{g=e.getSelection().getRanges()[0];}catch(h){return null;}g.shrink(CKEDITOR.SHRINK_TEXT);return g.getCommonAncestor().getAscendant(f,1);};var b=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.is('li');},c={a:'lower-alpha',A:'upper-alpha',i:'lower-roman',I:'upper-roman',1:'decimal',disc:'disc',circle:'circle',square:'square'};function d(e,f){var g=e.lang.list;if(f=='bulletedListStyle')return{title:g.bulletedTitle,minWidth:300,minHeight:50,contents:[{id:'info',accessKey:'I',elements:[{type:'select',label:g.type,id:'type',align:'center',style:'width:150px',items:[[g.notset,''],[g.circle,'circle'],[g.disc,'disc'],[g.square,'square']],setup:function(i){var j=i.getStyle('list-style-type')||c[i.getAttribute('type')]||i.getAttribute('type')||'';this.setValue(j);},commit:function(i){var j=this.getValue();if(j)i.setStyle('list-style-type',j);else i.removeStyle('list-style-type');}}]}],onShow:function(){var i=this.getParentEditor(),j=a(i,'ul');j&&this.setupContent(j);},onOk:function(){var i=this.getParentEditor(),j=a(i,'ul');j&&this.commitContent(j);}};else if(f=='numberedListStyle'){var h=[[g.notset,''],[g.lowerRoman,'lower-roman'],[g.upperRoman,'upper-roman'],[g.lowerAlpha,'lower-alpha'],[g.upperAlpha,'upper-alpha'],[g.decimal,'decimal']];if(!CKEDITOR.env.ie||CKEDITOR.env.version>7)h.concat([[g.armenian,'armenian'],[g.decimalLeadingZero,'decimal-leading-zero'],[g.georgian,'georgian'],[g.lowerGreek,'lower-greek']]);return{title:g.numberedTitle,minWidth:300,minHeight:50,contents:[{id:'info',accessKey:'I',elements:[{type:'hbox',widths:['25%','75%'],children:[{label:g.start,type:'text',id:'start',validate:CKEDITOR.dialog.validate.integer(g.validateStartNumber),setup:function(i){var j=i.getFirst(b).getAttribute('value')||i.getAttribute('start')||1;j&&this.setValue(j);},commit:function(i){var j=i.getFirst(b),k=j.getAttribute('value')||i.getAttribute('start')||1;i.getFirst(b).removeAttribute('value');var l=parseInt(this.getValue(),10);if(isNaN(l))i.removeAttribute('start');else i.setAttribute('start',l);var m=j,n=k,o=isNaN(l)?1:l;while((m=m.getNext(b))&&n++){if(m.getAttribute('value')==n)m.setAttribute('value',o+n-k);}}},{type:'select',label:g.type,id:'type',style:'width: 100%;',items:h,setup:function(i){var j=i.getStyle('list-style-type')||c[i.getAttribute('type')]||i.getAttribute('type')||'';this.setValue(j);},commit:function(i){var j=this.getValue();if(j)i.setStyle('list-style-type',j);else i.removeStyle('list-style-type');}}]}]}],onShow:function(){var i=this.getParentEditor(),j=a(i,'ol');
+j&&this.setupContent(j);},onOk:function(){var i=this.getParentEditor(),j=a(i,'ol');j&&this.commitContent(j);}};}};CKEDITOR.dialog.add('numberedListStyle',function(e){return d(e,'numberedListStyle');});CKEDITOR.dialog.add('bulletedListStyle',function(e){return d(e,'bulletedListStyle');});})();
diff --git a/web/imcms/ckeditor/plugins/pagebreak/images/pagebreak.gif b/web/imcms/ckeditor/plugins/pagebreak/images/pagebreak.gif
new file mode 100644
index 0000000000..8d1cffd64a
Binary files /dev/null and b/web/imcms/ckeditor/plugins/pagebreak/images/pagebreak.gif differ
diff --git a/web/imcms/ckeditor/plugins/pastefromword/filter/default.js b/web/imcms/ckeditor/plugins/pastefromword/filter/default.js
new file mode 100644
index 0000000000..17cc020a2e
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/pastefromword/filter/default.js
@@ -0,0 +1,11 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=CKEDITOR.htmlParser.fragment.prototype,b=CKEDITOR.htmlParser.element.prototype;a.onlyChild=b.onlyChild=function(){var u=this.children,v=u.length,w=v==1&&u[0];return w||null;};b.removeAnyChildWithName=function(u){var v=this.children,w=[],x;for(var y=0;y<v.length;y++){x=v[y];if(!x.name)continue;if(x.name==u){w.push(x);v.splice(y--,1);}w=w.concat(x.removeAnyChildWithName(u));}return w;};b.getAncestor=function(u){var v=this.parent;while(v&&!(v.name&&v.name.match(u)))v=v.parent;return v;};a.firstChild=b.firstChild=function(u){var v;for(var w=0;w<this.children.length;w++){v=this.children[w];if(u(v))return v;else if(v.name){v=v.firstChild(u);if(v)return v;}}return null;};b.addStyle=function(u,v,w){var A=this;var x,y='';if(typeof v=='string')y+=u+':'+v+';';else{if(typeof u=='object')for(var z in u){if(u.hasOwnProperty(z))y+=z+':'+u[z]+';';}else y+=u;w=v;}if(!A.attributes)A.attributes={};x=A.attributes.style||'';x=(w?[y,x]:[x,y]).join(';');A.attributes.style=x.replace(/^;|;(?=;)/,'');};CKEDITOR.dtd.parentOf=function(u){var v={};for(var w in this){if(w.indexOf('$')==-1&&this[w][u])v[w]=1;}return v;};function c(u){var v=u.children,w,x,y=u.children.length,z,A,B=/list-style-type:(.*?)(?:;|$)/,C=CKEDITOR.plugins.pastefromword.filters.stylesFilter;x=u.attributes;if(B.exec(x.style))return;for(var D=0;D<y;D++){w=v[D];if(w.attributes.value&&Number(w.attributes.value)==D+1)delete w.attributes.value;z=B.exec(w.attributes.style);if(z)if(z[1]==A||!A)A=z[1];else{A=null;break;}}if(A){for(D=0;D<y;D++){x=v[D].attributes;x.style&&(x.style=C([['list-style-type']])(x.style)||'');}u.addStyle('list-style-type',A);}};var d=/^([.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i,e=/^(?:\b0[^\s]*\s*){1,4}$/,f='^m{0,4}(cm|cd|d?c{0,3})(xc|xl|l?x{0,3})(ix|iv|v?i{0,3})$',g=new RegExp(f),h=new RegExp(f.toUpperCase()),i={decimal:/\d+/,'lower-roman':g,'upper-roman':h,'lower-alpha':/^[a-z]+$/,'upper-alpha':/^[A-Z]+$/},j={disc:/[l\u00B7\u2002]/,circle:/[\u006F\u00D8]/,square:/[\u006E\u25C6]/},k={ol:i,ul:j},l=[[1000,'M'],[900,'CM'],[500,'D'],[400,'CD'],[100,'C'],[90,'XC'],[50,'L'],[40,'XL'],[10,'X'],[9,'IX'],[5,'V'],[4,'IV'],[1,'I']],m='ABCDEFGHIJKLMNOPQRSTUVWXYZ';function n(u){u=u.toUpperCase();var v=l.length,w=0;for(var x=0;x<v;++x)for(var y=l[x],z=y[1].length;u.substr(0,z)==y[1];u=u.substr(z))w+=y[0];return w;};function o(u){u=u.toUpperCase();var v=m.length,w=1;for(var x=1;u.length>0;x*=v){w+=m.indexOf(u.charAt(u.length-1))*x;u=u.substr(0,u.length-1);}return w;
+};var p=0,q=null,r,s=CKEDITOR.plugins.pastefromword={utils:{createListBulletMarker:function(u,v){var w=new CKEDITOR.htmlParser.element('cke:listbullet');w.attributes={'cke:listsymbol':u[0]};w.add(new CKEDITOR.htmlParser.text(v));return w;},isListBulletIndicator:function(u){var v=u.attributes&&u.attributes.style;if(/mso-list\s*:\s*Ignore/i.test(v))return true;},isContainingOnlySpaces:function(u){var v;return(v=u.onlyChild())&&/^(:?\s|&nbsp;)+$/.test(v.value);},resolveList:function(u){var v=u.attributes,w;if((w=u.removeAnyChildWithName('cke:listbullet'))&&w.length&&(w=w[0])){u.name='cke:li';if(v.style)v.style=s.filters.stylesFilter([['text-indent'],['line-height'],[/^margin(:?-left)?$/,null,function(x){var y=x.split(' ');x=CKEDITOR.tools.convertToPx(y[3]||y[1]||y[0]);if(!p&&q!==null&&x>q)p=x-q;q=x;v['cke:indent']=p&&Math.ceil(x/p)+1||1;}],[/^mso-list$/,null,function(x){x=x.split(' ');var y=Number(x[0].match(/\d+/)),z=Number(x[1].match(/\d+/));if(z==1){y!==r&&(v['cke:reset']=1);r=y;}v['cke:indent']=z;}]])(v.style,u)||'';if(!v['cke:indent']){q=0;v['cke:indent']=1;}CKEDITOR.tools.extend(v,w.attributes);return true;}else r=q=p=null;return false;},getStyleComponents:(function(){var u=CKEDITOR.dom.element.createFromHtml('<div style="position:absolute;left:-9999px;top:-9999px;"></div>',CKEDITOR.document);CKEDITOR.document.getBody().append(u);return function(v,w,x){u.setStyle(v,w);var y={},z=x.length;for(var A=0;A<z;A++)y[x[A]]=u.getStyle(x[A]);return y;};})(),listDtdParents:CKEDITOR.dtd.parentOf('ol')},filters:{flattenList:function(u,v){v=typeof v=='number'?v:1;var w=u.attributes,x;switch(w.type){case 'a':x='lower-alpha';break;case '1':x='decimal';break;}var y=u.children,z;for(var A=0;A<y.length;A++){z=y[A];if(z.name in CKEDITOR.dtd.$listItem){var B=z.attributes,C=z.children,D=C.length,E=C[D-1];if(E.name in CKEDITOR.dtd.$list){u.add(E,A+1);if(!--C.length)y.splice(A--,1);}z.name='cke:li';w.start&&!A&&(B.value=w.start);s.filters.stylesFilter([['tab-stops',null,function(H){var I=H.split(' ')[1].match(d);I&&(q=CKEDITOR.tools.convertToPx(I[0]));}],v==1?['mso-list',null,function(H){H=H.split(' ');var I=Number(H[0].match(/\d+/));I!==r&&(B['cke:reset']=1);r=I;}]:null])(B.style);B['cke:indent']=v;B['cke:listtype']=u.name;B['cke:list-style-type']=x;}else if(z.name in CKEDITOR.dtd.$list){arguments.callee.apply(this,[z,v+1]);y=y.slice(0,A).concat(z.children).concat(y.slice(A+1));u.children=[];for(var F=0,G=y.length;F<G;F++)u.add(y[F]);}}delete u.name;w['cke:list']=1;},assembleList:function(u){var v=u.children,w,x,y,z,A,B,C,D=[],E,F,G,H,I,J;
+for(var K=0;K<v.length;K++){w=v[K];if('cke:li'==w.name){w.name='li';x=w;y=x.attributes;G=y['cke:listsymbol'];G=G&&G.match(/^(?:[(]?)([^\s]+?)([.)]?)$/);H=I=J=null;if(y['cke:ignored']){v.splice(K--,1);continue;}y['cke:reset']&&(C=A=B=null);z=Number(y['cke:indent']);if(z!=A)F=E=null;if(!G){H=y['cke:listtype']||'ol';I=y['cke:list-style-type'];}else{if(F&&k[F][E].test(G[1])){H=F;I=E;}else for(var L in k)for(var M in k[L]){if(k[L][M].test(G[1]))if(L=='ol'&&/alpha|roman/.test(M)){var N=/roman/.test(M)?n(G[1]):o(G[1]);if(!J||N<J){J=N;H=L;I=M;}}else{H=L;I=M;break;}}!H&&(H=G[2]?'ol':'ul');}F=H;E=I||(H=='ol'?'decimal':'disc');if(I&&I!=(H=='ol'?'decimal':'disc'))x.addStyle('list-style-type',I);if(H=='ol'&&G){switch(I){case 'decimal':J=Number(G[1]);break;case 'lower-roman':case 'upper-roman':J=n(G[1]);break;case 'lower-alpha':case 'upper-alpha':J=o(G[1]);break;}x.attributes.value=J;}if(!C){D.push(C=new CKEDITOR.htmlParser.element(H));C.add(x);v[K]=C;}else{if(z>A){D.push(C=new CKEDITOR.htmlParser.element(H));C.add(x);B.add(C);}else if(z<A){var O=A-z,P;while(O--&&(P=C.parent))C=P.parent;C.add(x);}else C.add(x);v.splice(K--,1);}B=x;A=z;}else if(C)C=A=B=null;}for(K=0;K<D.length;K++)c(D[K]);C=A=B=r=q=p=null;},falsyFilter:function(u){return false;},stylesFilter:function(u,v){return function(w,x){var y=[];(w||'').replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(A,B,C){B=B.toLowerCase();B=='font-family'&&(C=C.replace(/["']/g,''));var D,E,F,G;for(var H=0;H<u.length;H++){if(u[H]){D=u[H][0];E=u[H][1];F=u[H][2];G=u[H][3];if(B.match(D)&&(!E||C.match(E))){B=G||B;v&&(F=F||C);if(typeof F=='function')F=F(C,x,B);if(F&&F.push)B=F[0],F=F[1];if(typeof F=='string')y.push([B,F]);return;}}}!v&&y.push([B,C]);});for(var z=0;z<y.length;z++)y[z]=y[z].join(':');return y.length?y.join(';')+';':false;};},elementMigrateFilter:function(u,v){return function(w){var x=v?new CKEDITOR.style(u,v)._.definition:u;w.name=x.element;CKEDITOR.tools.extend(w.attributes,CKEDITOR.tools.clone(x.attributes));w.addStyle(CKEDITOR.style.getStyleText(x));};},styleMigrateFilter:function(u,v){var w=this.elementMigrateFilter;return function(x,y){var z=new CKEDITOR.htmlParser.element(null),A={};A[v]=x;w(u,A)(z);z.children=y.children;y.children=[z];};},bogusAttrFilter:function(u,v){if(v.name.indexOf('cke:')==-1)return false;},applyStyleFilter:null},getRules:function(u){var v=CKEDITOR.dtd,w=CKEDITOR.tools.extend({},v.$block,v.$listItem,v.$tableContent),x=u.config,y=this.filters,z=y.falsyFilter,A=y.stylesFilter,B=y.elementMigrateFilter,C=CKEDITOR.tools.bind(this.filters.styleMigrateFilter,this.filters),D=this.utils.createListBulletMarker,E=y.flattenList,F=y.assembleList,G=this.utils.isListBulletIndicator,H=this.utils.isContainingOnlySpaces,I=this.utils.resolveList,J=function(O){O=CKEDITOR.tools.convertToPx(O);
+return isNaN(O)?O:O+'px';},K=this.utils.getStyleComponents,L=this.utils.listDtdParents,M=x.pasteFromWordRemoveFontStyles!==false,N=x.pasteFromWordRemoveStyles!==false;return{elementNames:[[/meta|link|script/,'']],root:function(O){O.filterChildren();F(O);},elements:{'^':function(O){var P;if(CKEDITOR.env.gecko&&(P=y.applyStyleFilter))P(O);},$:function(O){var P=O.name||'',Q=O.attributes;if(P in w&&Q.style)Q.style=A([[/^(:?width|height)$/,null,J]])(Q.style)||'';if(P.match(/h\d/)){O.filterChildren();if(I(O))return;B(x['format_'+P])(O);}else if(P in v.$inline){O.filterChildren();if(H(O))delete O.name;}else if(P.indexOf(':')!=-1&&P.indexOf('cke')==-1){O.filterChildren();if(P=='v:imagedata'){var R=O.attributes['o:href'];if(R)O.attributes.src=R;O.name='img';return;}delete O.name;}if(P in L){O.filterChildren();F(O);}},style:function(O){if(CKEDITOR.env.gecko){var P=O.onlyChild().value.match(/\/\* Style Definitions \*\/([\s\S]*?)\/\*/),Q=P&&P[1],R={};if(Q){Q.replace(/[\n\r]/g,'').replace(/(.+?)\{(.+?)\}/g,function(S,T,U){T=T.split(',');var V=T.length,W;for(var X=0;X<V;X++)CKEDITOR.tools.trim(T[X]).replace(/^(\w+)(\.[\w-]+)?$/g,function(Y,Z,aa){Z=Z||'*';aa=aa.substring(1,aa.length);if(aa.match(/MsoNormal/))return;if(!R[Z])R[Z]={};if(aa)R[Z][aa]=U;else R[Z]=U;});});y.applyStyleFilter=function(S){var T=R['*']?'*':S.name,U=S.attributes&&S.attributes['class'],V;if(T in R){V=R[T];if(typeof V=='object')V=V[U];V&&S.addStyle(V,true);}};}}return false;},p:function(O){if(/MsoListParagraph/.exec(O.attributes['class'])){var P=O.firstChild(function(S){return S.type==CKEDITOR.NODE_TEXT&&!H(S.parent);}),Q=P&&P.parent,R=Q&&Q.attributes;R&&!R.style&&(R.style='mso-list: Ignore;');}O.filterChildren();if(I(O))return;if(x.enterMode==CKEDITOR.ENTER_BR){delete O.name;O.add(new CKEDITOR.htmlParser.element('br'));}else B(x['format_'+(x.enterMode==CKEDITOR.ENTER_P?'p':'div')])(O);},div:function(O){var P=O.onlyChild();if(P&&P.name=='table'){var Q=O.attributes;P.attributes=CKEDITOR.tools.extend(P.attributes,Q);Q.style&&P.addStyle(Q.style);var R=new CKEDITOR.htmlParser.element('div');R.addStyle('clear','both');O.add(R);delete O.name;}},td:function(O){if(O.getAncestor('thead'))O.name='th';},ol:E,ul:E,dl:E,font:function(O){if(G(O.parent)){delete O.name;return;}O.filterChildren();var P=O.attributes,Q=P.style,R=O.parent;if('font'==R.name){CKEDITOR.tools.extend(R.attributes,O.attributes);Q&&R.addStyle(Q);delete O.name;}else{Q=Q||'';if(P.color){P.color!='#000000'&&(Q+='color:'+P.color+';');delete P.color;
+}if(P.face){Q+='font-family:'+P.face+';';delete P.face;}if(P.size){Q+='font-size:'+(P.size>3?'large':P.size<3?'small':'medium')+';';delete P.size;}O.name='span';O.addStyle(Q);}},span:function(O){if(G(O.parent))return false;O.filterChildren();if(H(O)){delete O.name;return null;}if(G(O)){var P=O.firstChild(function(Y){return Y.value||Y.name=='img';}),Q=P&&(P.value||'l.'),R=Q&&Q.match(/^(?:[(]?)([^\s]+?)([.)]?)$/);if(R){var S=D(R,Q),T=O.getAncestor('span');if(T&&/ mso-hide:\s*all|display:\s*none /.test(T.attributes.style))S.attributes['cke:ignored']=1;return S;}}var U=O.children,V=O.attributes,W=V&&V.style,X=U&&U[0];if(W)V.style=A([['line-height'],[/^font-family$/,null,!M?C(x.font_style,'family'):null],[/^font-size$/,null,!M?C(x.fontSize_style,'size'):null],[/^color$/,null,!M?C(x.colorButton_foreStyle,'color'):null],[/^background-color$/,null,!M?C(x.colorButton_backStyle,'color'):null]])(W,O)||'';return null;},b:B(x.coreStyles_bold),i:B(x.coreStyles_italic),u:B(x.coreStyles_underline),s:B(x.coreStyles_strike),sup:B(x.coreStyles_superscript),sub:B(x.coreStyles_subscript),a:function(O){var P=O.attributes;if(P&&!P.href&&P.name)delete O.name;else if(CKEDITOR.env.webkit&&P.href&&P.href.match(/file:\/\/\/[\S]+#/i))P.href=P.href.replace(/file:\/\/\/[^#]+/i,'');},'cke:listbullet':function(O){if(O.getAncestor(/h\d/)&&!x.pasteFromWordNumberedHeadingToList)delete O.name;}},attributeNames:[[/^onmouse(:?out|over)/,''],[/^onload$/,''],[/(?:v|o):\w+/,''],[/^lang/,'']],attributes:{style:A(N?[[/^list-style-type$/,null],[/^margin$|^margin-(?!bottom|top)/,null,function(O,P,Q){if(P.name in {p:1,div:1}){var R=x.contentsLangDirection=='ltr'?'margin-left':'margin-right';if(Q=='margin')O=K(Q,O,[R])[R];else if(Q!=R)return null;if(O&&!e.test(O))return[R,O];}return null;}],[/^clear$/],[/^border.*|margin.*|vertical-align|float$/,null,function(O,P){if(P.name=='img')return O;}],[/^width|height$/,null,function(O,P){if(P.name in {table:1,td:1,th:1,img:1})return O;}]]:[[/^mso-/],[/-color$/,null,function(O){if(O=='transparent')return false;if(CKEDITOR.env.gecko)return O.replace(/-moz-use-text-color/g,'transparent');}],[/^margin$/,e],['text-indent','0cm'],['page-break-before'],['tab-stops'],['display','none'],M?[/font-?/]:null],N),width:function(O,P){if(P.name in v.$tableContent)return false;},border:function(O,P){if(P.name in v.$tableContent)return false;},'class':z,bgcolor:z,valign:N?z:function(O,P){P.addStyle('vertical-align',O);return false;}},comment:!CKEDITOR.env.ie?function(O,P){var Q=O.match(/<img.*?>/),R=O.match(/^\[if !supportLists\]([\s\S]*?)\[endif\]$/);
+if(R){var S=R[1]||Q&&'l.',T=S&&S.match(/>(?:[(]?)([^\s]+?)([.)]?)</);return D(T,S);}if(CKEDITOR.env.gecko&&Q){var U=CKEDITOR.htmlParser.fragment.fromHtml(Q[0]).children[0],V=P.previous,W=V&&V.value.match(/<v:imagedata[^>]*o:href=['"](.*?)['"]/),X=W&&W[1];X&&(U.attributes.src=X);return U;}return false;}:z};}},t=function(){this.dataFilter=new CKEDITOR.htmlParser.filter();};t.prototype={toHtml:function(u){var v=CKEDITOR.htmlParser.fragment.fromHtml(u,false),w=new CKEDITOR.htmlParser.basicWriter();v.writeHtml(w,this.dataFilter);return w.getHtml(true);}};CKEDITOR.cleanWord=function(u,v){if(CKEDITOR.env.gecko)u=u.replace(/(<!--\[if[^<]*?\])-->([\S\s]*?)<!--(\[endif\]-->)/gi,'$1$2$3');var w=new t(),x=w.dataFilter;x.addRules(CKEDITOR.plugins.pastefromword.getRules(v));v.fire('beforeCleanWord',{filter:x});try{u=w.toHtml(u,false);}catch(y){alert(v.lang.pastefromword.error);}u=u.replace(/cke:.*?".*?"/g,'');u=u.replace(/style=""/g,'');u=u.replace(/<span>/g,'');return u;};})();
diff --git a/web/imcms/ckeditor/plugins/pastetext/dialogs/pastetext.js b/web/imcms/ckeditor/plugins/pastetext/dialogs/pastetext.js
new file mode 100644
index 0000000000..a2f3f1373a
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/pastetext/dialogs/pastetext.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){CKEDITOR.dialog.add('pastetext',function(a){return{title:a.lang.pasteText.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?368:350,minHeight:240,onShow:function(){this.setupContent();},onOk:function(){this.commitContent();},contents:[{label:a.lang.common.generalTab,id:'general',elements:[{type:'html',id:'pasteMsg',html:'<div style="white-space:normal;width:340px;">'+a.lang.clipboard.pasteMsg+'</div>'},{type:'textarea',id:'content',className:'cke_pastetext',onLoad:function(){var b=this.getDialog().getContentElement('general','pasteMsg').getElement(),c=this.getElement().getElementsByTag('textarea').getItem(0);c.setAttribute('aria-labelledby',b.$.id);c.setStyle('direction',a.config.contentsLangDirection);},focus:function(){this.getElement().focus();},setup:function(){this.setValue('');},commit:function(){var b=this.getValue();setTimeout(function(){a.fire('paste',{text:b});},0);}}]}]};});})();
diff --git a/web/imcms/ckeditor/plugins/placeholder/dialogs/placeholder.js b/web/imcms/ckeditor/plugins/placeholder/dialogs/placeholder.js
new file mode 100644
index 0000000000..95675e8d16
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/dialogs/placeholder.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){function a(b,c){var d=b.lang.placeholder,e=b.lang.common.generalTab;return{title:d.title,minWidth:300,minHeight:80,contents:[{id:'info',label:e,title:e,elements:[{id:'text',type:'text',style:'width: 100%;',label:d.text,'default':'',required:true,validate:CKEDITOR.dialog.validate.notEmpty(d.textMissing),setup:function(f){if(c)this.setValue(f.getText().slice(2,-2));},commit:function(f){var g='[['+this.getValue()+']]';CKEDITOR.plugins.placeholder.createPlaceholder(b,f,g);}}]}],onShow:function(){if(c)this._element=CKEDITOR.plugins.placeholder.getSelectedPlaceHoder(b);this.setupContent(this._element);},onOk:function(){this.commitContent(this._element);delete this._element;}};};CKEDITOR.dialog.add('createplaceholder',function(b){return a(b);});CKEDITOR.dialog.add('editplaceholder',function(b){return a(b,1);});})();
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/_translationstatus.txt b/web/imcms/ckeditor/plugins/placeholder/lang/_translationstatus.txt
new file mode 100644
index 0000000000..a8e19f91fa
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/_translationstatus.txt
@@ -0,0 +1,30 @@
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+bg.js      Found: 5 Missing: 0
+cs.js      Found: 5 Missing: 0
+cy.js      Found: 5 Missing: 0
+da.js      Found: 5 Missing: 0
+de.js      Found: 5 Missing: 0
+el.js      Found: 5 Missing: 0
+eo.js      Found: 5 Missing: 0
+et.js      Found: 5 Missing: 0
+fa.js      Found: 5 Missing: 0
+fi.js      Found: 5 Missing: 0
+fr.js      Found: 5 Missing: 0
+he.js      Found: 5 Missing: 0
+hr.js      Found: 5 Missing: 0
+it.js      Found: 5 Missing: 0
+ku.js      Found: 5 Missing: 0
+lv.js      Found: 5 Missing: 0
+nb.js      Found: 5 Missing: 0
+nl.js      Found: 5 Missing: 0
+no.js      Found: 5 Missing: 0
+pl.js      Found: 5 Missing: 0
+pt-br.js   Found: 5 Missing: 0
+sk.js      Found: 5 Missing: 0
+tr.js      Found: 5 Missing: 0
+ug.js      Found: 5 Missing: 0
+uk.js      Found: 5 Missing: 0
+vi.js      Found: 4 Missing: 1
+zh-cn.js   Found: 5 Missing: 0
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/bg.js b/web/imcms/ckeditor/plugins/placeholder/lang/bg.js
new file mode 100644
index 0000000000..c7cd1c9ba6
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/bg.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','bg',{placeholder:{title:'�а�тройки на контейнера',toolbar:'�ов контейнер',text:'Тек�т за контейнера',edit:'Пром�на на контейнер',textMissing:'Контейнера тр�бва да �ъдържа тек�т.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/cs.js b/web/imcms/ckeditor/plugins/placeholder/lang/cs.js
new file mode 100644
index 0000000000..ec3ee52329
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/cs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','cs',{placeholder:{title:'Vlastnosti vyhrazeného prostoru',toolbar:'Vytvořit vyhrazený prostor',text:'Vyhrazený text',edit:'Upravit vyhrazený prostor',textMissing:'Vyhrazený prostor musí obsahovat text.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/cy.js b/web/imcms/ckeditor/plugins/placeholder/lang/cy.js
new file mode 100644
index 0000000000..de0a44999c
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/cy.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','cy',{placeholder:{title:"Priodweddau'r Daliwr Geiriau",toolbar:'Creu Daliwr Geiriau',text:'Testun y Daliwr Geiriau',edit:"Golygu'r Dailwr Geiriau",textMissing:"Mae'n rhaid i'r daliwr geiriau gynnwys testun."}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/da.js b/web/imcms/ckeditor/plugins/placeholder/lang/da.js
new file mode 100644
index 0000000000..3451d075f9
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/da.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','da',{placeholder:{title:'Egenskaber for pladsholder',toolbar:'Opret pladsholder',text:'Tekst til pladsholder',edit:'Redigér pladsholder',textMissing:'Pladsholder skal indeholde tekst'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/de.js b/web/imcms/ckeditor/plugins/placeholder/lang/de.js
new file mode 100644
index 0000000000..ce62a462d8
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/de.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','de',{placeholder:{title:'Platzhalter Einstellungen',toolbar:'Platzhalter erstellen',text:'Platzhalter Text',edit:'Platzhalter bearbeiten',textMissing:'Der Platzhalter muss einen Text beinhalten.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/el.js b/web/imcms/ckeditor/plugins/placeholder/lang/el.js
new file mode 100644
index 0000000000..77b479cad3
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/el.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','el',{placeholder:{title:'Ιδιότητες Υποκατάστατου Κειμένου',toolbar:'Δημιου�γία Υποκατάσταστου Κειμένου',text:'Υποκαθιστόμενο Κείμενο',edit:'Επεξε�γασία Υποκατάσταστου Κειμένου',textMissing:'Π�έπει να υπά�χει υποκαθιστόμενο κείμενο.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/en.js b/web/imcms/ckeditor/plugins/placeholder/lang/en.js
new file mode 100644
index 0000000000..7735a5ed1f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/en.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','en',{placeholder:{title:'Placeholder Properties',toolbar:'Create Placeholder',text:'Placeholder Text',edit:'Edit Placeholder',textMissing:'The placeholder must contain text.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/eo.js b/web/imcms/ckeditor/plugins/placeholder/lang/eo.js
new file mode 100644
index 0000000000..412307982e
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/eo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','eo',{placeholder:{title:'Atributoj de la rezervita spaco',toolbar:'Krei la rezervitan spacon',text:'Texto de la rezervita spaco',edit:'Modifi la rezervitan spacon',textMissing:'La rezervita spaco devas enteni tekston.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/et.js b/web/imcms/ckeditor/plugins/placeholder/lang/et.js
new file mode 100644
index 0000000000..128e2d386d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/et.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','et',{placeholder:{title:'Kohahoidja omadused',toolbar:'Kohahoidja loomine',text:'Kohahoidja tekst',edit:'Kohahoidja muutmine',textMissing:'Kohahoidja peab sisaldama teksti.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/fa.js b/web/imcms/ckeditor/plugins/placeholder/lang/fa.js
new file mode 100644
index 0000000000..8bf6ba0980
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/fa.js
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'fa',
+{
+	placeholder :
+	{
+		title		: 'ویژگی‌های محل نگهداری',
+		toolbar		: 'ایجاد یک محل نگهداری',
+		text		: 'متن محل نگهداری',
+		edit		: 'ویرایش محل نگهداری',
+		textMissing	: 'محل نگهداری باید محتوی متن باشد.'
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/fi.js b/web/imcms/ckeditor/plugins/placeholder/lang/fi.js
new file mode 100644
index 0000000000..2e363429bf
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/fi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','fi',{placeholder:{title:'Paikkamerkin ominaisuudet',toolbar:'Luo paikkamerkki',text:'Paikkamerkin teksti',edit:'Muokkaa paikkamerkkiä',textMissing:'Paikkamerkin täytyy sisältää tekstiä'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/fr.js b/web/imcms/ckeditor/plugins/placeholder/lang/fr.js
new file mode 100644
index 0000000000..4689abd38f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/fr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','fr',{placeholder:{title:"Propriétés de l'Espace réservé",toolbar:"Créer l'Espace réservé",text:"Texte de l'Espace réservé",edit:"Modifier l'Espace réservé",textMissing:"L'Espace réservé doit contenir du texte."}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/he.js b/web/imcms/ckeditor/plugins/placeholder/lang/he.js
new file mode 100644
index 0000000000..5f7848a0a6
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/he.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','he',{placeholder:{title:'מ�פייני שומר מקו�',toolbar:'צור שומר מקו�',text:'תוכן שומר המקו�',edit:'ערוך שומר מקו�',textMissing:'שומר המקו� חייב להכיל טקסט.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/hr.js b/web/imcms/ckeditor/plugins/placeholder/lang/hr.js
new file mode 100644
index 0000000000..9c67e69533
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/hr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','hr',{placeholder:{title:'Svojstva rezerviranog mjesta',toolbar:'Napravi rezervirano mjesto',text:'Tekst rezerviranog mjesta',edit:'Uredi rezervirano mjesto',textMissing:'Rezervirano mjesto mora sadržavati tekst.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/it.js b/web/imcms/ckeditor/plugins/placeholder/lang/it.js
new file mode 100644
index 0000000000..8fe7f17d46
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/it.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','it',{placeholder:{title:'Proprietà segnaposto',toolbar:'Crea segnaposto',text:'Testo segnaposto',edit:'Modifica segnaposto',textMissing:'Il segnaposto deve contenere del testo.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/ku.js b/web/imcms/ckeditor/plugins/placeholder/lang/ku.js
new file mode 100644
index 0000000000..788c985eab
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/ku.js
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'ku',
+{
+	placeholder :
+	{
+		title		: 'خاسیه‌تی شوێن هه‌ڵگر',
+		toolbar		: 'درووستکردنی شوێن هه‌ڵگر',
+		text		: 'ده‌ق بۆ شوێن هه‌ڵگڕ',
+		edit		: 'چاکسازی شوێن هه‌ڵگڕ',
+		textMissing	: 'شوێن هه‌ڵگڕ ده‌بێت له‌ده‌ق پێکهاتبێت.'
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/lv.js b/web/imcms/ckeditor/plugins/placeholder/lang/lv.js
new file mode 100644
index 0000000000..3de26d6ea8
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/lv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','lv',{placeholder:{title:'Viettura uzst�dījumi',toolbar:'Izveidot vietturi',text:'Viettura teksts',edit:'Labot vietturi',textMissing:'Vietturim j�satur tekstu'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/nb.js b/web/imcms/ckeditor/plugins/placeholder/lang/nb.js
new file mode 100644
index 0000000000..3c1f424d8b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/nb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','nb',{placeholder:{title:'Egenskaper for plassholder',toolbar:'Opprett plassholder',text:'Tekst for plassholder',edit:'Rediger plassholder',textMissing:'Plassholderen må inneholde tekst.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/nl.js b/web/imcms/ckeditor/plugins/placeholder/lang/nl.js
new file mode 100644
index 0000000000..0606772705
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/nl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','nl',{placeholder:{title:'Eigenschappen placeholder',toolbar:'Placeholder aanmaken',text:'Placeholder tekst',edit:'Placeholder wijzigen',textMissing:'De placeholder moet tekst bevatten.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/no.js b/web/imcms/ckeditor/plugins/placeholder/lang/no.js
new file mode 100644
index 0000000000..0983200d9d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/no.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','no',{placeholder:{title:'Egenskaper for plassholder',toolbar:'Opprett plassholder',text:'Tekst for plassholder',edit:'Rediger plassholder',textMissing:'Plassholderen må inneholde tekst.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/pl.js b/web/imcms/ckeditor/plugins/placeholder/lang/pl.js
new file mode 100644
index 0000000000..f9f93e0a1d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/pl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','pl',{placeholder:{title:'Właściwości wypełniacza',toolbar:'Utwórz wypełniacz',text:'Tekst wypełnienia',edit:'Edytuj wypełnienie',textMissing:'Wypełnienie musi posiadać jakiś tekst.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/pt-br.js b/web/imcms/ckeditor/plugins/placeholder/lang/pt-br.js
new file mode 100644
index 0000000000..c351cdc23b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/pt-br.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','pt-br',{placeholder:{title:'Propriedades do Espaço Reservado',toolbar:'Criar Espaço Reservado',text:'Texto do Espaço Reservado',edit:'Editar Espaço Reservado',textMissing:'O espaço reservado deve conter texto.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/sk.js b/web/imcms/ckeditor/plugins/placeholder/lang/sk.js
new file mode 100644
index 0000000000..8c131e4442
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/sk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','sk',{placeholder:{title:'Vlastnosti placeholdera',toolbar:'Vytvoriť placeholder',text:'Text placeholdera',edit:'Upraviť placeholder',textMissing:'Placeholder musí obsahovať text.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/tr.js b/web/imcms/ckeditor/plugins/placeholder/lang/tr.js
new file mode 100644
index 0000000000..7614a0ba25
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/tr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','tr',{placeholder:{title:'Yer tutucu özellikleri',toolbar:'Yer tutucu oluşturun',text:'Yer tutucu metini',edit:'Yer tutucuyu düzenle',textMissing:'Yer tutucu metin içermelidir.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/ug.js b/web/imcms/ckeditor/plugins/placeholder/lang/ug.js
new file mode 100644
index 0000000000..e4d446faed
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/ug.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','ug',{placeholder:{title:'ئورۇن بەلگە خاسلىقى',toolbar:'ئورۇن بەلگە قۇر',text:'ئورۇن بەلگە ت�كىستى',edit:'ئورۇن بەلگە تەھرىر',textMissing:'ئورۇن بەلگىسىدە چوقۇم ت�كىست بولۇشى لازىم'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/uk.js b/web/imcms/ckeditor/plugins/placeholder/lang/uk.js
new file mode 100644
index 0000000000..529dbc449a
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/uk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','uk',{placeholder:{title:'�алаштуванн� Заповнювача',toolbar:'Створити Заповнювач',text:'Тек�т Заповнювача',edit:'Редагувати Заповнювач',textMissing:'Заповнювач повинен мі�тити тек�т.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/vi.js b/web/imcms/ckeditor/plugins/placeholder/lang/vi.js
new file mode 100644
index 0000000000..87461f0939
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/vi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','vi',{placeholder:{title:'Thuộc tính đặt chỗ',toolbar:'Tạo đặt chỗ',text:'Văn bản đặt chỗ',edit:'Chỉnh sửa ',textMissing:'The placeholder must contain text.'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/lang/zh-cn.js b/web/imcms/ckeditor/plugins/placeholder/lang/zh-cn.js
new file mode 100644
index 0000000000..9ebb0e9a6b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/lang/zh-cn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('placeholder','zh-cn',{placeholder:{title:'��符属性',toolbar:'创建��符',text:'��符文字',edit:'编辑��符',textMissing:'��符必须包�文字。'}});
diff --git a/web/imcms/ckeditor/plugins/placeholder/placeholder.gif b/web/imcms/ckeditor/plugins/placeholder/placeholder.gif
new file mode 100644
index 0000000000..c07078c176
Binary files /dev/null and b/web/imcms/ckeditor/plugins/placeholder/placeholder.gif differ
diff --git a/web/imcms/ckeditor/plugins/placeholder/plugin.js b/web/imcms/ckeditor/plugins/placeholder/plugin.js
new file mode 100644
index 0000000000..6102a2f4ef
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/placeholder/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=/\[\[[^\]]+\]\]/g;CKEDITOR.plugins.add('placeholder',{requires:['dialog'],lang:['bg','cs','cy','da','de','el','en','eo','et','fa','fi','fr','he','hr','it','ku','nb','nl','no','pl','pt-br','sk','tr','ug','uk','vi','zh-cn'],init:function(b){var c=b.lang.placeholder;b.addCommand('createplaceholder',new CKEDITOR.dialogCommand('createplaceholder'));b.addCommand('editplaceholder',new CKEDITOR.dialogCommand('editplaceholder'));b.ui.addButton('CreatePlaceholder',{label:c.toolbar,command:'createplaceholder',icon:this.path+'placeholder.gif'});if(b.addMenuItems){b.addMenuGroup('placeholder',20);b.addMenuItems({editplaceholder:{label:c.edit,command:'editplaceholder',group:'placeholder',order:1,icon:this.path+'placeholder.gif'}});if(b.contextMenu)b.contextMenu.addListener(function(d,e){if(!d||!d.data('cke-placeholder'))return null;return{editplaceholder:CKEDITOR.TRISTATE_OFF};});}b.on('doubleclick',function(d){if(CKEDITOR.plugins.placeholder.getSelectedPlaceHoder(b))d.data.dialog='editplaceholder';});b.addCss('.cke_placeholder{background-color: #ffff00;'+(CKEDITOR.env.gecko?'cursor: default;':'')+'}');b.on('contentDom',function(){b.document.getBody().on('resizestart',function(d){if(b.getSelection().getSelectedElement().data('cke-placeholder'))d.data.preventDefault();});});CKEDITOR.dialog.add('createplaceholder',this.path+'dialogs/placeholder.js');CKEDITOR.dialog.add('editplaceholder',this.path+'dialogs/placeholder.js');},afterInit:function(b){var c=b.dataProcessor,d=c&&c.dataFilter,e=c&&c.htmlFilter;if(d)d.addRules({text:function(f){return f.replace(a,function(g){return CKEDITOR.plugins.placeholder.createPlaceholder(b,null,g,1);});}});if(e)e.addRules({elements:{span:function(f){if(f.attributes&&f.attributes['data-cke-placeholder'])delete f.name;}}});}});})();CKEDITOR.plugins.placeholder={createPlaceholder:function(a,b,c,d){var e=new CKEDITOR.dom.element('span',a.document);e.setAttributes({contentEditable:'false','data-cke-placeholder':1,'class':'cke_placeholder'});c&&e.setText(c);if(d)return e.getOuterHtml();if(b){if(CKEDITOR.env.ie){e.insertAfter(b);setTimeout(function(){b.remove();e.focus();},10);}else e.replace(b);}else a.insertElement(e);return null;},getSelectedPlaceHoder:function(a){var b=a.getSelection().getRanges()[0];b.shrink(CKEDITOR.SHRINK_TEXT);var c=b.startContainer;while(c&&!(c.type==CKEDITOR.NODE_ELEMENT&&c.data('cke-placeholder')))c=c.getParent();return c;}};
diff --git a/web/imcms/ckeditor/plugins/preview/preview.html b/web/imcms/ckeditor/plugins/preview/preview.html
new file mode 100644
index 0000000000..d6c4937c1c
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/preview/preview.html
@@ -0,0 +1,10 @@
+<script>
+
+var doc = document;
+doc.open();
+doc.write( window.opener._cke_htmlToLoad );
+doc.close();
+
+delete window.opener._cke_htmlToLoad;
+
+</script>
diff --git a/web/imcms/ckeditor/plugins/scayt/dialogs/options.js b/web/imcms/ckeditor/plugins/scayt/dialogs/options.js
new file mode 100644
index 0000000000..7d52198f19
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/scayt/dialogs/options.js
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('scaytcheck',function(a){var b=true,c,d=CKEDITOR.document,e=a.name,f=CKEDITOR.plugins.scayt.getUiTabs(a),g,h=[],i=0,j=['dic_create_'+e+',dic_restore_'+e,'dic_rename_'+e+',dic_delete_'+e],k=['mixedCase','mixedWithDigits','allCaps','ignoreDomainNames'];function l(){if(typeof document.forms['optionsbar_'+e]!='undefined')return document.forms['optionsbar_'+e].options;return[];};function m(){if(typeof document.forms['languagesbar_'+e]!='undefined')return document.forms['languagesbar_'+e].scayt_lang;return[];};function n(z,A){if(!z)return;var B=z.length;if(B==undefined){z.checked=z.value==A.toString();return;}for(var C=0;C<B;C++){z[C].checked=false;if(z[C].value==A.toString())z[C].checked=true;}};var o=a.lang.scayt,p=[{id:'options',label:o.optionsTab,elements:[{type:'html',id:'options',html:'<form name="optionsbar_'+e+'"><div class="inner_options">'+'\t<div class="messagebox"></div>'+'\t<div style="display:none;">'+'\t\t<input type="checkbox" name="options"  id="allCaps_'+e+'" />'+'\t\t<label for="allCaps" id="label_allCaps_'+e+'"></label>'+'\t</div>'+'\t<div style="display:none;">'+'\t\t<input name="options" type="checkbox"  id="ignoreDomainNames_'+e+'" />'+'\t\t<label for="ignoreDomainNames" id="label_ignoreDomainNames_'+e+'"></label>'+'\t</div>'+'\t<div style="display:none;">'+'\t<input name="options" type="checkbox"  id="mixedCase_'+e+'" />'+'\t\t<label for="mixedCase" id="label_mixedCase_'+e+'"></label>'+'\t</div>'+'\t<div style="display:none;">'+'\t\t<input name="options" type="checkbox"  id="mixedWithDigits_'+e+'" />'+'\t\t<label for="mixedWithDigits" id="label_mixedWithDigits_'+e+'"></label>'+'\t</div>'+'</div></form>'}]},{id:'langs',label:o.languagesTab,elements:[{type:'html',id:'langs',html:'<form name="languagesbar_'+e+'"><div class="inner_langs">'+'\t<div class="messagebox"></div>\t'+'   <div style="float:left;width:45%;margin-left:5px;" id="scayt_lcol_'+e+'" ></div>'+'   <div style="float:left;width:45%;margin-left:15px;" id="scayt_rcol_'+e+'"></div>'+'</div></form>'}]},{id:'dictionaries',label:o.dictionariesTab,elements:[{type:'html',style:'',id:'dictionaries',html:'<form name="dictionarybar_'+e+'"><div class="inner_dictionary" style="text-align:left; white-space:normal; width:320px; overflow: hidden;">'+'\t<div style="margin:5px auto; width:80%;white-space:normal; overflow:hidden;" id="dic_message_'+e+'"> </div>'+'\t<div style="margin:5px auto; width:80%;white-space:normal;"> '+'       <span class="cke_dialog_ui_labeled_label" >Dictionary name</span><br>'+'\t\t<span class="cke_dialog_ui_labeled_content" >'+'\t\t\t<div class="cke_dialog_ui_input_text">'+'\t\t\t\t<input id="dic_name_'+e+'" type="text" class="cke_dialog_ui_input_text"/>'+'\t\t</div></span></div>'+'\t\t<div style="margin:5px auto; width:80%;white-space:normal;">'+'\t\t\t<a style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_create_'+e+'">'+'\t\t\t\t</a>'+'\t\t\t<a  style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_delete_'+e+'">'+'\t\t\t\t</a>'+'\t\t\t<a  style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_rename_'+e+'">'+'\t\t\t\t</a>'+'\t\t\t<a  style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_restore_'+e+'">'+'\t\t\t\t</a>'+'\t\t</div>'+'\t<div style="margin:5px auto; width:95%;white-space:normal;" id="dic_info_'+e+'"></div>'+'</div></form>'}]},{id:'about',label:o.aboutTab,elements:[{type:'html',id:'about',style:'margin: 5px 5px;',html:'<div id="scayt_about_'+e+'"></div>'}]}],q={title:o.title,minWidth:360,minHeight:220,onShow:function(){var z=this;
+z.data=a.fire('scaytDialog',{});z.options=z.data.scayt_control.option();z.chosed_lang=z.sLang=z.data.scayt_control.sLang;if(!z.data||!z.data.scayt||!z.data.scayt_control){alert('Error loading application service');z.hide();return;}var A=0;if(b)z.data.scayt.getCaption(a.langCode||'en',function(B){if(A++>0)return;c=B;s.apply(z);t.apply(z);b=false;});else t.apply(z);z.selectPage(z.data.tab);},onOk:function(){var z=this.data.scayt_control;z.option(this.options);var A=this.chosed_lang;z.setLang(A);z.refresh();},onCancel:function(){var z=l();for(var A in z)z[A].checked=false;n(m(),'');},contents:h},r=CKEDITOR.plugins.scayt.getScayt(a);for(g=0;g<f.length;g++){if(f[g]==1)h[h.length]=p[g];}if(f[2]==1)i=1;var s=function(){var z=this,A=z.data.scayt.getLangList(),B=['dic_create','dic_delete','dic_rename','dic_restore'],C=[],D=[],E=k,F;if(i){for(F=0;F<B.length;F++){C[F]=B[F]+'_'+e;d.getById(C[F]).setHtml('<span class="cke_dialog_ui_button">'+c['button_'+B[F]]+'</span>');}d.getById('dic_info_'+e).setHtml(c.dic_info);}if(f[0]==1)for(F in E){var G='label_'+E[F],H=G+'_'+e,I=d.getById(H);if('undefined'!=typeof I&&'undefined'!=typeof c[G]&&'undefined'!=typeof z.options[E[F]]){I.setHtml(c[G]);var J=I.getParent();J.$.style.display='block';}}var K='<p><img src="'+window.scayt.getAboutInfo().logoURL+'" /></p>'+'<p>'+c.version+window.scayt.getAboutInfo().version.toString()+'</p>'+'<p>'+c.about_throwt_copy+'</p>';d.getById('scayt_about_'+e).setHtml(K);var L=function(U,V){var W=d.createElement('label');W.setAttribute('for','cke_option'+U);W.setHtml(V[U]);if(z.sLang==U)z.chosed_lang=U;var X=d.createElement('div'),Y=CKEDITOR.dom.element.createFromHtml('<input id="cke_option'+U+'" type="radio" '+(z.sLang==U?'checked="checked"':'')+' value="'+U+'" name="scayt_lang" />');Y.on('click',function(){this.$.checked=true;z.chosed_lang=U;});X.append(Y);X.append(W);return{lang:V[U],code:U,radio:X};};if(f[1]==1){for(F in A.rtl)D[D.length]=L(F,A.ltr);for(F in A.ltr)D[D.length]=L(F,A.ltr);D.sort(function(U,V){return V.lang>U.lang?-1:1;});var M=d.getById('scayt_lcol_'+e),N=d.getById('scayt_rcol_'+e);for(F=0;F<D.length;F++){var O=F<D.length/2?M:N;O.append(D[F].radio);}}var P={};P.dic_create=function(U,V,W){var X=W[0]+','+W[1],Y=c.err_dic_create,Z=c.succ_dic_create;window.scayt.createUserDictionary(V,function(aa){x(X);w(W[1]);Z=Z.replace('%s',aa.dname);v(Z);},function(aa){Y=Y.replace('%s',aa.dname);u(Y+'( '+(aa.message||'')+')');});};P.dic_rename=function(U,V){var W=c.err_dic_rename||'',X=c.succ_dic_rename||'';
+window.scayt.renameUserDictionary(V,function(Y){X=X.replace('%s',Y.dname);y(V);v(X);},function(Y){W=W.replace('%s',Y.dname);y(V);u(W+'( '+(Y.message||'')+' )');});};P.dic_delete=function(U,V,W){var X=W[0]+','+W[1],Y=c.err_dic_delete,Z=c.succ_dic_delete;window.scayt.deleteUserDictionary(function(aa){Z=Z.replace('%s',aa.dname);x(X);w(W[0]);y('');v(Z);},function(aa){Y=Y.replace('%s',aa.dname);u(Y);});};P.dic_restore=z.dic_restore||(function(U,V,W){var X=W[0]+','+W[1],Y=c.err_dic_restore,Z=c.succ_dic_restore;window.scayt.restoreUserDictionary(V,function(aa){Z=Z.replace('%s',aa.dname);x(X);w(W[1]);v(Z);},function(aa){Y=Y.replace('%s',aa.dname);u(Y);});});function Q(U){var V=d.getById('dic_name_'+e).getValue();if(!V){u(' Dictionary name should not be empty. ');return false;}try{var W=U.data.getTarget().getParent(),X=/(dic_\w+)_[\w\d]+/.exec(W.getId())[1];P[X].apply(null,[W,V,j]);}catch(Y){u(' Dictionary error. ');}return true;};var R=(j[0]+','+j[1]).split(','),S;for(F=0,S=R.length;F<S;F+=1){var T=d.getById(R[F]);if(T)T.on('click',Q,this);}},t=function(){var z=this;if(f[0]==1){var A=l();for(var B=0,C=A.length;B<C;B++){var D=A[B].id,E=d.getById(D);if(E){A[B].checked=false;if(z.options[D.split('_')[0]]==1)A[B].checked=true;if(b)E.on('click',function(){z.options[this.getId().split('_')[0]]=this.$.checked?1:0;});}}}if(f[1]==1){var F=d.getById('cke_option'+z.sLang);n(F.$,z.sLang);}if(i){window.scayt.getNameUserDictionary(function(G){var H=G.dname;x(j[0]+','+j[1]);if(H){d.getById('dic_name_'+e).setValue(H);w(j[1]);}else w(j[0]);},function(){d.getById('dic_name_'+e).setValue('');});v('');}};function u(z){d.getById('dic_message_'+e).setHtml('<span style="color:red;">'+z+'</span>');};function v(z){d.getById('dic_message_'+e).setHtml('<span style="color:blue;">'+z+'</span>');};function w(z){z=String(z);var A=z.split(',');for(var B=0,C=A.length;B<C;B+=1)d.getById(A[B]).$.style.display='inline';};function x(z){z=String(z);var A=z.split(',');for(var B=0,C=A.length;B<C;B+=1)d.getById(A[B]).$.style.display='none';};function y(z){d.getById('dic_name_'+e).$.value=z;};return q;});
diff --git a/web/imcms/ckeditor/plugins/scayt/dialogs/toolbar.css b/web/imcms/ckeditor/plugins/scayt/dialogs/toolbar.css
new file mode 100644
index 0000000000..a44d1594fb
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/scayt/dialogs/toolbar.css
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+a{text-decoration:none;padding:2px 4px 4px 6px;display:block;border-width:1px;border-style:solid;margin:0;}a.cke_scayt_toogle:hover,a.cke_scayt_toogle:focus,a.cke_scayt_toogle:active{border-color:#316ac5;background-color:#dff1ff;color:#000;cursor:pointer;margin:0;}a.cke_scayt_toogle{color:#316ac5;border-color:#fff;}.scayt_enabled a.cke_scayt_item{color:#316ac5;border-color:#fff;margin:0;}.scayt_disabled a.cke_scayt_item{color:gray;border-color:#fff;}.scayt_enabled a.cke_scayt_item:hover,.scayt_enabled a.cke_scayt_item:focus,.scayt_enabled a.cke_scayt_item:active{border-color:#316ac5;background-color:#dff1ff;color:#000;cursor:pointer;}.scayt_disabled a.cke_scayt_item:hover,.scayt_disabled a.cke_scayt_item:focus,.scayt_disabled a.cke_scayt_item:active{border-color:gray;background-color:#dff1ff;color:gray;cursor:no-drop;}.cke_scayt_set_on,.cke_scayt_set_off{display:none;}.scayt_enabled .cke_scayt_set_on{display:none;}.scayt_disabled .cke_scayt_set_on{display:inline;}.scayt_disabled .cke_scayt_set_off{display:none;}.scayt_enabled .cke_scayt_set_off{display:inline;}
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_address.png b/web/imcms/ckeditor/plugins/showblocks/images/block_address.png
new file mode 100644
index 0000000000..1ee67aa245
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_address.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_blockquote.png b/web/imcms/ckeditor/plugins/showblocks/images/block_blockquote.png
new file mode 100644
index 0000000000..cae3aec621
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_blockquote.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_div.png b/web/imcms/ckeditor/plugins/showblocks/images/block_div.png
new file mode 100644
index 0000000000..c71f397880
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_div.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_h1.png b/web/imcms/ckeditor/plugins/showblocks/images/block_h1.png
new file mode 100644
index 0000000000..3a64347350
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_h1.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_h2.png b/web/imcms/ckeditor/plugins/showblocks/images/block_h2.png
new file mode 100644
index 0000000000..8062ebe8e4
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_h2.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_h3.png b/web/imcms/ckeditor/plugins/showblocks/images/block_h3.png
new file mode 100644
index 0000000000..5b6a403028
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_h3.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_h4.png b/web/imcms/ckeditor/plugins/showblocks/images/block_h4.png
new file mode 100644
index 0000000000..6c7f7951d4
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_h4.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_h5.png b/web/imcms/ckeditor/plugins/showblocks/images/block_h5.png
new file mode 100644
index 0000000000..e153de0998
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_h5.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_h6.png b/web/imcms/ckeditor/plugins/showblocks/images/block_h6.png
new file mode 100644
index 0000000000..c8d993a9d2
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_h6.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_p.png b/web/imcms/ckeditor/plugins/showblocks/images/block_p.png
new file mode 100644
index 0000000000..4e6035d209
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_p.png differ
diff --git a/web/imcms/ckeditor/plugins/showblocks/images/block_pre.png b/web/imcms/ckeditor/plugins/showblocks/images/block_pre.png
new file mode 100644
index 0000000000..d11a0fffbe
Binary files /dev/null and b/web/imcms/ckeditor/plugins/showblocks/images/block_pre.png differ
diff --git a/web/imcms/ckeditor/plugins/smiley/dialogs/smiley.js b/web/imcms/ckeditor/plugins/smiley/dialogs/smiley.js
new file mode 100644
index 0000000000..96beb8a7c7
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/smiley/dialogs/smiley.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('smiley',function(a){var b=a.config,c=a.lang.smiley,d=b.smiley_images,e=b.smiley_columns||8,f,g,h=function(o){var p=o.data.getTarget(),q=p.getName();if(q=='a')p=p.getChild(0);else if(q!='img')return;var r=p.getAttribute('cke_src'),s=p.getAttribute('title'),t=a.document.createElement('img',{attributes:{src:r,'data-cke-saved-src':r,title:s,alt:s,width:p.$.width,height:p.$.height}});a.insertElement(t);g.hide();o.data.preventDefault();},i=CKEDITOR.tools.addFunction(function(o,p){o=new CKEDITOR.dom.event(o);p=new CKEDITOR.dom.element(p);var q,r,s=o.getKeystroke(),t=a.lang.dir=='rtl';switch(s){case 38:if(q=p.getParent().getParent().getPrevious()){r=q.getChild([p.getParent().getIndex(),0]);r.focus();}o.preventDefault();break;case 40:if(q=p.getParent().getParent().getNext()){r=q.getChild([p.getParent().getIndex(),0]);if(r)r.focus();}o.preventDefault();break;case 32:h({data:o});o.preventDefault();break;case t?37:39:if(q=p.getParent().getNext()){r=q.getChild(0);r.focus();o.preventDefault(true);}else if(q=p.getParent().getParent().getNext()){r=q.getChild([0,0]);if(r)r.focus();o.preventDefault(true);}break;case t?39:37:if(q=p.getParent().getPrevious()){r=q.getChild(0);r.focus();o.preventDefault(true);}else if(q=p.getParent().getParent().getPrevious()){r=q.getLast().getChild(0);r.focus();o.preventDefault(true);}break;default:return;}}),j=CKEDITOR.tools.getNextId()+'_smiley_emtions_label',k=['<div><span id="'+j+'" class="cke_voice_label">'+c.options+'</span>','<table role="listbox" aria-labelledby="'+j+'" style="width:100%;height:100%" cellspacing="2" cellpadding="2"',CKEDITOR.env.ie&&CKEDITOR.env.quirks?' style="position:absolute;"':'','><tbody>'],l=d.length;for(f=0;f<l;f++){if(f%e===0)k.push('<tr role="presentation">');var m='cke_smile_label_'+f+'_'+CKEDITOR.tools.getNextNumber();k.push('<td class="cke_dark_background cke_centered" style="vertical-align: middle;" role="presentation"><a href="javascript:void(0)" role="option"',' aria-posinset="'+(f+1)+'"',' aria-setsize="'+l+'"',' aria-labelledby="'+m+'"',' class="cke_smile cke_hand" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ',i,', event, this );">','<img class="cke_hand" title="',b.smiley_descriptions[f],'" cke_src="',CKEDITOR.tools.htmlEncode(b.smiley_path+d[f]),'" alt="',b.smiley_descriptions[f],'"',' src="',CKEDITOR.tools.htmlEncode(b.smiley_path+d[f]),'"',CKEDITOR.env.ie?" onload=\"this.setAttribute('width', 2); this.removeAttribute('width');\" ":'','><span id="'+m+'" class="cke_voice_label">'+b.smiley_descriptions[f]+'</span>'+'</a>','</td>');
+if(f%e==e-1)k.push('</tr>');}if(f<e-1){for(;f<e-1;f++)k.push('<td></td>');k.push('</tr>');}k.push('</tbody></table></div>');var n={type:'html',id:'smileySelector',html:k.join(''),onLoad:function(o){g=o.sender;},focus:function(){var o=this;setTimeout(function(){var p=o.getElement().getElementsByTag('a').getItem(0);p.focus();},0);},onClick:h,style:'width: 100%; border-collapse: separate;'};return{title:a.lang.smiley.title,minWidth:270,minHeight:120,contents:[{id:'tab1',label:'',title:'',expand:true,padding:0,elements:[n]}],buttons:[CKEDITOR.dialog.cancelButton]};});
diff --git a/web/imcms/ckeditor/plugins/smiley/images/angel_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/angel_smile.gif
new file mode 100644
index 0000000000..2cf4894758
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/angel_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/angry_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/angry_smile.gif
new file mode 100644
index 0000000000..40b52d3a77
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/angry_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/broken_heart.gif b/web/imcms/ckeditor/plugins/smiley/images/broken_heart.gif
new file mode 100644
index 0000000000..b6d0166a47
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/broken_heart.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/confused_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/confused_smile.gif
new file mode 100644
index 0000000000..a52db7a4e5
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/confused_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/cry_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/cry_smile.gif
new file mode 100644
index 0000000000..1ef6ba4fb5
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/cry_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/devil_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/devil_smile.gif
new file mode 100644
index 0000000000..bfb25077de
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/devil_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/embaressed_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/embaressed_smile.gif
new file mode 100644
index 0000000000..d9cedc56bd
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/embaressed_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/envelope.gif b/web/imcms/ckeditor/plugins/smiley/images/envelope.gif
new file mode 100644
index 0000000000..94e0b1fa59
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/envelope.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/heart.gif b/web/imcms/ckeditor/plugins/smiley/images/heart.gif
new file mode 100644
index 0000000000..680ae2fc1c
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/heart.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/kiss.gif b/web/imcms/ckeditor/plugins/smiley/images/kiss.gif
new file mode 100644
index 0000000000..70e5255141
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/kiss.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/lightbulb.gif b/web/imcms/ckeditor/plugins/smiley/images/lightbulb.gif
new file mode 100644
index 0000000000..d44c2ffe6a
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/lightbulb.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/omg_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/omg_smile.gif
new file mode 100644
index 0000000000..ab7ea69968
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/omg_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/regular_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/regular_smile.gif
new file mode 100644
index 0000000000..e5bc34be36
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/regular_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/sad_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/sad_smile.gif
new file mode 100644
index 0000000000..ae4cf1e35b
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/sad_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/shades_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/shades_smile.gif
new file mode 100644
index 0000000000..b454017503
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/shades_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/teeth_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/teeth_smile.gif
new file mode 100644
index 0000000000..7d734d1548
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/teeth_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/thumbs_down.gif b/web/imcms/ckeditor/plugins/smiley/images/thumbs_down.gif
new file mode 100644
index 0000000000..90b9978c09
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/thumbs_down.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/thumbs_up.gif b/web/imcms/ckeditor/plugins/smiley/images/thumbs_up.gif
new file mode 100644
index 0000000000..b6332848df
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/thumbs_up.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/tounge_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/tounge_smile.gif
new file mode 100644
index 0000000000..b2e657fa32
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/tounge_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
new file mode 100644
index 0000000000..77098821c6
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/smiley/images/wink_smile.gif b/web/imcms/ckeditor/plugins/smiley/images/wink_smile.gif
new file mode 100644
index 0000000000..b21029548f
Binary files /dev/null and b/web/imcms/ckeditor/plugins/smiley/images/wink_smile.gif differ
diff --git a/web/imcms/ckeditor/plugins/specialchar/dialogs/specialchar.js b/web/imcms/ckeditor/plugins/specialchar/dialogs/specialchar.js
new file mode 100644
index 0000000000..307f1cdb6a
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('specialchar',function(a){var b,c=a.lang.specialChar,d=function(j){var k,l;if(j.data)k=j.data.getTarget();else k=new CKEDITOR.dom.element(j);if(k.getName()=='a'&&(l=k.getChild(0).getHtml())){k.removeClass('cke_light_background');b.hide();var m=a.document.createElement('span');m.setHtml(l);a.insertText(m.getText());}},e=CKEDITOR.tools.addFunction(d),f,g=function(j,k){var l;k=k||j.data.getTarget();if(k.getName()=='span')k=k.getParent();if(k.getName()=='a'&&(l=k.getChild(0).getHtml())){if(f)h(null,f);var m=b.getContentElement('info','htmlPreview').getElement();b.getContentElement('info','charPreview').getElement().setHtml(l);m.setHtml(CKEDITOR.tools.htmlEncode(l));k.getParent().addClass('cke_light_background');f=k;}},h=function(j,k){k=k||j.data.getTarget();if(k.getName()=='span')k=k.getParent();if(k.getName()=='a'){b.getContentElement('info','charPreview').getElement().setHtml('&nbsp;');b.getContentElement('info','htmlPreview').getElement().setHtml('&nbsp;');k.getParent().removeClass('cke_light_background');f=undefined;}},i=CKEDITOR.tools.addFunction(function(j){j=new CKEDITOR.dom.event(j);var k=j.getTarget(),l,m,n=j.getKeystroke(),o=a.lang.dir=='rtl';switch(n){case 38:if(l=k.getParent().getParent().getPrevious()){m=l.getChild([k.getParent().getIndex(),0]);m.focus();h(null,k);g(null,m);}j.preventDefault();break;case 40:if(l=k.getParent().getParent().getNext()){m=l.getChild([k.getParent().getIndex(),0]);if(m&&m.type==1){m.focus();h(null,k);g(null,m);}}j.preventDefault();break;case 32:d({data:j});j.preventDefault();break;case o?37:39:if(l=k.getParent().getNext()){m=l.getChild(0);if(m.type==1){m.focus();h(null,k);g(null,m);j.preventDefault(true);}else h(null,k);}else if(l=k.getParent().getParent().getNext()){m=l.getChild([0,0]);if(m&&m.type==1){m.focus();h(null,k);g(null,m);j.preventDefault(true);}else h(null,k);}break;case o?39:37:if(l=k.getParent().getPrevious()){m=l.getChild(0);m.focus();h(null,k);g(null,m);j.preventDefault(true);}else if(l=k.getParent().getParent().getPrevious()){m=l.getLast().getChild(0);m.focus();h(null,k);g(null,m);j.preventDefault(true);}else h(null,k);break;default:return;}});return{title:c.title,minWidth:430,minHeight:280,buttons:[CKEDITOR.dialog.cancelButton],charColumns:17,onLoad:function(){var j=this.definition.charColumns,k=a.config.extraSpecialChars,l=a.config.specialChars,m=CKEDITOR.tools.getNextId()+'_specialchar_table_label',n=['<table role="listbox" aria-labelledby="'+m+'"'+' style="width: 320px; height: 100%; border-collapse: separate;"'+' align="center" cellspacing="2" cellpadding="2" border="0">'],o=0,p=l.length,q,r;
+while(o<p){n.push('<tr role="presentation">');for(var s=0;s<j;s++,o++){if(q=l[o]){r='';if(q instanceof Array){r=q[1];q=q[0];}else{var t=q.replace('&','').replace(';','').replace('#','');r=c[t]||q;}var u='cke_specialchar_label_'+o+'_'+CKEDITOR.tools.getNextNumber();n.push('<td class="cke_dark_background" style="cursor: default" role="presentation"><a href="javascript: void(0);" role="option" aria-posinset="'+(o+1)+'"',' aria-setsize="'+p+'"',' aria-labelledby="'+u+'"',' style="cursor: inherit; display: block; height: 1.25em; margin-top: 0.25em; text-align: center;" title="',CKEDITOR.tools.htmlEncode(r),'" onkeydown="CKEDITOR.tools.callFunction( '+i+', event, this )"'+' onclick="CKEDITOR.tools.callFunction('+e+', this); return false;"'+' tabindex="-1">'+'<span style="margin: 0 auto;cursor: inherit">'+q+'</span>'+'<span class="cke_voice_label" id="'+u+'">'+r+'</span></a>');}else n.push('<td class="cke_dark_background">&nbsp;');n.push('</td>');}n.push('</tr>');}n.push('</tbody></table>','<span id="'+m+'" class="cke_voice_label">'+c.options+'</span>');this.getContentElement('info','charContainer').getElement().setHtml(n.join(''));},contents:[{id:'info',label:a.lang.common.generalTab,title:a.lang.common.generalTab,padding:0,align:'top',elements:[{type:'hbox',align:'top',widths:['320px','90px'],children:[{type:'html',id:'charContainer',html:'',onMouseover:g,onMouseout:h,focus:function(){var j=this.getElement().getElementsByTag('a').getItem(0);setTimeout(function(){j.focus();g(null,j);},0);},onShow:function(){var j=this.getElement().getChild([0,0,0,0,0]);setTimeout(function(){j.focus();g(null,j);},0);},onLoad:function(j){b=j.sender;}},{type:'hbox',align:'top',widths:['100%'],children:[{type:'vbox',align:'top',children:[{type:'html',html:'<div></div>'},{type:'html',id:'charPreview',className:'cke_dark_background',style:"border:1px solid #eeeeee;font-size:28px;height:40px;width:70px;padding-top:9px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:'<div>&nbsp;</div>'},{type:'html',id:'htmlPreview',className:'cke_dark_background',style:"border:1px solid #eeeeee;font-size:14px;height:20px;width:70px;padding-top:2px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:'<div>&nbsp;</div>'}]}]}]}]}]};});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/_translationstatus.txt b/web/imcms/ckeditor/plugins/specialchar/lang/_translationstatus.txt
new file mode 100644
index 0000000000..3b5706a8df
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/_translationstatus.txt
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+cs.js      Found: 118 Missing: 0
+cy.js      Found: 118 Missing: 0
+de.js      Found: 118 Missing: 0
+el.js      Found: 16 Missing: 102
+eo.js      Found: 118 Missing: 0
+et.js      Found: 31 Missing: 87
+fa.js      Found: 24 Missing: 94
+fi.js      Found: 23 Missing: 95
+fr.js      Found: 118 Missing: 0
+he.js      Found: 1 Missing: 117
+hr.js      Found: 23 Missing: 95
+it.js      Found: 118 Missing: 0
+ku.js      Found: 118 Missing: 0
+lv.js      Found: 118 Missing: 0
+nb.js      Found: 118 Missing: 0
+nl.js      Found: 118 Missing: 0
+no.js      Found: 118 Missing: 0
+pt-br.js   Found: 118 Missing: 0
+sk.js      Found: 118 Missing: 0
+tr.js      Found: 118 Missing: 0
+ug.js      Found: 39 Missing: 79
+zh-cn.js   Found: 118 Missing: 0
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/cs.js b/web/imcms/ckeditor/plugins/specialchar/lang/cs.js
new file mode 100644
index 0000000000..fda5d33434
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/cs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','cs',{euro:'Znak eura',lsquo:'Po�áte�ní uvozovka jednoduchá',rsquo:'Koncová uvozovka jednoduchá',ldquo:'Po�áte�ní uvozovka dvojitá',rdquo:'Koncová uvozovka dvojitá',ndash:'En poml�ka',mdash:'Em poml�ka',iexcl:'Obrácený vykři�ník',cent:'Znak centu',pound:'Znak libry',curren:'Znak měny',yen:'Znak jenu',brvbar:'Přerušená svislá �ára',sect:'Znak oddílu',uml:'Přehláska',copy:'Znak copyrightu',ordf:'Ženský indikátor rodu',laquo:'Znak dvojitých lomených uvozovek vlevo',not:'Logistický zápor',reg:'Znak registrace',macr:'Poml�ka nad',deg:'Znak stupně',sup2:'Dvojka jako horní index',sup3:'Trojka jako horní index',acute:'Čárka nad vpravo',micro:'Znak mikro',para:'Znak odstavce',middot:'Te�ka uprostřed',cedil:'Ocásek vlevo',sup1:'Jedni�ka jako horní index',ordm:'Mužský indikátor rodu',raquo:'Znak dvojitých lomených uvozovek vpravo',frac14:'Oby�ejný zlomek jedna �tvrtina',frac12:'Oby�ejný zlomek jedna polovina',frac34:'Oby�ejný zlomek tři �tvrtiny',iquest:'Znak obráceného otazníku',Agrave:'Velké písmeno latinky A s �árkou nad vlevo',Aacute:'Velké písmeno latinky A s �árkou nad vpravo',Acirc:'Velké písmeno latinky A s vokáněm',Atilde:'Velké písmeno latinky A s tildou',Auml:'Velké písmeno latinky A s dvěma te�kami',Aring:'Velké písmeno latinky A s kroužkem nad',AElig:'Velké písmeno latinky Ae',Ccedil:'Velké písmeno latinky C s ocáskem vlevo',Egrave:'Velké písmeno latinky E s �árkou nad vlevo',Eacute:'Velké písmeno latinky E s �árkou nad vpravo',Ecirc:'Velké písmeno latinky E s vokáněm',Euml:'Velké písmeno latinky E s dvěma te�kami',Igrave:'Velké písmeno latinky I s �árkou nad vlevo',Iacute:'Velké písmeno latinky I s �árkou nad vpravo',Icirc:'Velké písmeno latinky I s vokáněm',Iuml:'Velké písmeno latinky I s dvěma te�kami',ETH:'Velké písmeno latinky Eth',Ntilde:'Velké písmeno latinky N s tildou',Ograve:'Velké písmeno latinky O s �árkou nad vlevo',Oacute:'Velké písmeno latinky O s �árkou nad vpravo',Ocirc:'Velké písmeno latinky O s vokáněm',Otilde:'Velké písmeno latinky O s tildou',Ouml:'Velké písmeno latinky O s dvěma te�kami',times:'Znak násobení',Oslash:'Velké písmeno latinky O přeškrtnuté',Ugrave:'Velké písmeno latinky U s �árkou nad vlevo',Uacute:'Velké písmeno latinky U s �árkou nad vpravo',Ucirc:'Velké písmeno latinky U s vokáněm',Uuml:'Velké písmeno latinky U s dvěma te�kami',Yacute:'Velké písmeno latinky Y s �árkou nad vpravo',THORN:'Velké písmeno latinky Thorn',szlig:'Malé písmeno latinky ostré s',agrave:'Malé písmeno latinky a s �árkou nad vlevo',aacute:'Malé písmeno latinky a s �árkou nad vpravo',acirc:'Malé písmeno latinky a s vokáněm',atilde:'Malé písmeno latinky a s tildou',auml:'Malé písmeno latinky a s dvěma te�kami',aring:'Malé písmeno latinky a s kroužkem nad',aelig:'Malé písmeno latinky ae',ccedil:'Malé písmeno latinky c s ocáskem vlevo',egrave:'Malé písmeno latinky e s �árkou nad vlevo',eacute:'Malé písmeno latinky e s �árkou nad vpravo',ecirc:'Malé písmeno latinky e s vokáněm',euml:'Malé písmeno latinky e s dvěma te�kami',igrave:'Malé písmeno latinky i s �árkou nad vlevo',iacute:'Malé písmeno latinky i s �árkou nad vpravo',icirc:'Malé písmeno latinky i s vokáněm',iuml:'Malé písmeno latinky i s dvěma te�kami',eth:'Malé písmeno latinky eth',ntilde:'Malé písmeno latinky n s tildou',ograve:'Malé písmeno latinky o s �árkou nad vlevo',oacute:'Malé písmeno latinky o s �árkou nad vpravo',ocirc:'Malé písmeno latinky o s vokáněm',otilde:'Malé písmeno latinky o s tildou',ouml:'Malé písmeno latinky o s dvěma te�kami',divide:'Znak dělení',oslash:'Malé písmeno latinky o přeškrtnuté',ugrave:'Malé písmeno latinky u s �árkou nad vlevo',uacute:'Malé písmeno latinky u s �árkou nad vpravo',ucirc:'Malé písmeno latinky u s vokáněm',uuml:'Malé písmeno latinky u s dvěma te�kami',yacute:'Malé písmeno latinky y s �árkou nad vpravo',thorn:'Malé písmeno latinky thorn',yuml:'Malé písmeno latinky y s dvěma te�kami',OElig:'Velká ligatura latinky OE',oelig:'Malá ligatura latinky OE',372:'Velké písmeno latinky W s vokáněm',374:'Velké písmeno latinky Y s vokáněm',373:'Malé písmeno latinky w s vokáněm',375:'Malé písmeno latinky y s vokáněm',sbquo:'Dolní 9 uvozovka jednoduchá',8219:'Horní obrácená 9 uvozovka jednoduchá',bdquo:'Dolní 9 uvozovka dvojitá',hellip:'Trojte�kový úvod',trade:'Obchodní zna�ka',9658:'Černý ukazatel směřující vpravo',bull:'Kole�ko',rarr:'Šipka vpravo',rArr:'Dvojitá šipka vpravo',hArr:'Dvojitá šipka vlevo a vpravo',diams:'Černé piky',asymp:'Téměř se rovná'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/cy.js b/web/imcms/ckeditor/plugins/specialchar/lang/cy.js
new file mode 100644
index 0000000000..fdc7567729
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/cy.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','cy',{euro:'Arwydd yr Ewro',lsquo:'Dyfynnod chwith unigol',rsquo:'Dyfynnod dde unigol',ldquo:'Dyfynnod chwith dwbl',rdquo:'Dyfynnod dde dwbl',ndash:'Cysylltnod en',mdash:'Cysylltnod em',iexcl:'Ebychnod gwrthdro',cent:'Arwydd sent',pound:'Arwydd punt',curren:'Arwydd arian cyfred',yen:'Arwydd yen',brvbar:'Bar toriedig',sect:'Arwydd adran',uml:'Didolnod',copy:'Arwydd hawlfraint',ordf:'Dangosydd benywaidd',laquo:"Dyfynnod dwbl ar ongl i'r chwith",not:'Arwydd Nid',reg:'Arwydd cofrestredig',macr:'Macron',deg:'Arwydd gradd',sup2:'Dau uwchsgript',sup3:'Tri uwchsgript',acute:'Acen ddyrchafedig',micro:'Arwydd micro',para:'Arwydd pilcrow',middot:'Dot canol',cedil:'Sedila',sup1:'Un uwchsgript',ordm:'Dangosydd gwrywaidd',raquo:"Dyfynnod dwbl ar ongl i'r dde",frac14:'Ffracsiwn cyffredin un cwarter',frac12:'Ffracsiwn cyffredin un hanner',frac34:'Ffracsiwn cyffredin tri chwarter',iquest:'Marc cwestiwn gwrthdroëdig',Agrave:'Priflythyren A Lladinaidd gydag acen ddisgynedig',Aacute:'Priflythyren A Lladinaidd gydag acen ddyrchafedig',Acirc:'Priflythyren A Lladinaidd gydag acen grom',Atilde:'Priflythyren A Lladinaidd gyda thild',Auml:'Priflythyren A Lladinaidd gyda didolnod',Aring:'Priflythyren A Lladinaidd gyda chylch uwchben',AElig:'Priflythyren Æ Lladinaidd',Ccedil:'Priflythyren C Lladinaidd gyda sedila',Egrave:'Priflythyren E Lladinaidd gydag acen ddisgynedig',Eacute:'Priflythyren E Lladinaidd gydag acen ddyrchafedig',Ecirc:'Priflythyren E Lladinaidd gydag acen grom',Euml:'Priflythyren E Lladinaidd gyda didolnod',Igrave:'Priflythyren I Lladinaidd gydag acen ddisgynedig',Iacute:'Priflythyren I Lladinaidd gydag acen ddyrchafedig',Icirc:'Priflythyren I Lladinaidd gydag acen grom',Iuml:'Priflythyren I Lladinaidd gyda didolnod',ETH:'Priflythyren Eth',Ntilde:'Priflythyren N Lladinaidd gyda thild',Ograve:'Priflythyren O Lladinaidd gydag acen ddisgynedig',Oacute:'Priflythyren O Lladinaidd gydag acen ddyrchafedig',Ocirc:'Priflythyren O Lladinaidd gydag acen grom',Otilde:'Priflythyren O Lladinaidd gyda thild',Ouml:'Priflythyren O Lladinaidd gyda didolnod',times:'Arwydd lluosi',Oslash:'Priflythyren O Lladinaidd gyda strôc',Ugrave:'Priflythyren U Lladinaidd gydag acen ddisgynedig',Uacute:'Priflythyren U Lladinaidd gydag acen ddyrchafedig',Ucirc:'Priflythyren U Lladinaidd gydag acen grom',Uuml:'Priflythyren U Lladinaidd gyda didolnod',Yacute:'Priflythyren Y Lladinaidd gydag acen ddyrchafedig',THORN:'Priflythyren Thorn',szlig:'Llythyren s fach Lladinaidd siarp ',agrave:'Llythyren a fach Lladinaidd gydag acen ddisgynedig',aacute:'Llythyren a fach Lladinaidd gydag acen ddyrchafedig',acirc:'Llythyren a fach Lladinaidd gydag acen grom',atilde:'Llythyren a fach Lladinaidd gyda thild',auml:'Llythyren a fach Lladinaidd gyda didolnod',aring:'Llythyren a fach Lladinaidd gyda chylch uwchben',aelig:'Llythyren æ fach Lladinaidd',ccedil:'Llythyren c fach Lladinaidd gyda sedila',egrave:'Llythyren e fach Lladinaidd gydag acen ddisgynedig',eacute:'Llythyren e fach Lladinaidd gydag acen ddyrchafedig',ecirc:'Llythyren e fach Lladinaidd gydag acen grom',euml:'Llythyren e fach Lladinaidd gyda didolnod',igrave:'Llythyren i fach Lladinaidd gydag acen ddisgynedig',iacute:'Llythyren i fach Lladinaidd gydag acen ddyrchafedig',icirc:'Llythyren i fach Lladinaidd gydag acen grom',iuml:'Llythyren i fach Lladinaidd gyda didolnod',eth:'Llythyren eth fach',ntilde:'Llythyren n fach Lladinaidd gyda thild',ograve:'Llythyren o fach Lladinaidd gydag acen ddisgynedig',oacute:'Llythyren o fach Lladinaidd gydag acen ddyrchafedig',ocirc:'Llythyren o fach Lladinaidd gydag acen grom',otilde:'Llythyren o fach Lladinaidd gyda thild',ouml:'Llythyren o fach Lladinaidd gyda didolnod',divide:'Arwydd rhannu',oslash:'Llyth',ugrave:'Llythyren u fach Lladinaidd gydag acen ddisgynedig',uacute:'Llythyren u fach Lladinaidd gydag acen ddyrchafedig',ucirc:'Llythyren u fach Lladinaidd gydag acen grom',uuml:'Llythyren u fach Lladinaidd gyda didolnod',yacute:'Llythyren y fach Lladinaidd gydag acen ddisgynedig',thorn:'Llythyren o fach Lladinaidd gyda strôc',yuml:'Llythyren y fach Lladinaidd gyda didolnod',OElig:'Priflythyren cwlwm OE Lladinaidd ',oelig:'Priflythyren cwlwm oe Lladinaidd ',372:'Priflythyren W gydag acen grom',374:'Priflythyren Y gydag acen grom',373:'Llythyren w fach gydag acen grom',375:'Llythyren y fach gydag acen grom',sbquo:'Dyfynnod sengl 9-isel',8219:'Dyfynnod sengl 9-uchel cildro',bdquo:'Dyfynnod dwbl 9-isel',hellip:'Coll geiriau llorweddol',trade:'Arwydd marc masnachol',9658:"Pwyntydd du i'r dde",bull:'Bwled',rarr:"Saeth i'r dde",rArr:"Saeth ddwbl i'r dde",hArr:"Saeth ddwbl i'r chwith",diams:'Siwt diemwnt du',asymp:'Bron yn hafal iddo'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/de.js b/web/imcms/ckeditor/plugins/specialchar/lang/de.js
new file mode 100644
index 0000000000..d686d9e193
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/de.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','de',{euro:'Euro Zeichen',lsquo:'Hochkomma links',rsquo:'Hochkomma rechts',ldquo:'Anführungszeichen links',rdquo:'Anführungszeichen rechts',ndash:'kleiner Strich',mdash:'mittlerer Strich',iexcl:'invertiertes Ausrufezeichen',cent:'Cent',pound:'Pfund',curren:'Währung',yen:'Yen',brvbar:'gestrichelte Linie',sect:'§ Zeichen',uml:'Diäresis',copy:'Copyright',ordf:'Feminine ordinal Anzeige',laquo:'Nach links zeigenden Doppel-Winkel Anführungszeichen',not:'Not-Zeichen',reg:'Registriert',macr:'Längezeichen',deg:'Grad',sup2:'Hoch 2',sup3:'Hoch 3',acute:'Akzentzeichen ',micro:'Micro',para:'Pilcrow-Zeichen',middot:'Mittelpunkt',cedil:'Cedilla',sup1:'Hoch 1',ordm:'Männliche Ordnungszahl Anzeige',raquo:'Nach rechts zeigenden Doppel-Winkel Anführungszeichen',frac14:'ein Viertel',frac12:'Hälfte',frac34:'Dreiviertel',iquest:'Umgekehrtes Fragezeichen',Agrave:'Lateinischer Buchstabe A mit AkzentGrave',Aacute:'Lateinischer Buchstabe A mit Akutakzent',Acirc:'Lateinischer Buchstabe A mit Zirkumflex',Atilde:'Lateinischer Buchstabe A mit Tilde',Auml:'Lateinischer Buchstabe A mit Trema',Aring:'Lateinischer Buchstabe A mit Ring oben',AElig:'Lateinischer Buchstabe Æ',Ccedil:'Lateinischer Buchstabe C mit Cedille',Egrave:'Lateinischer Buchstabe E mit AkzentGrave',Eacute:'Lateinischer Buchstabe E mit Akutakzent',Ecirc:'Lateinischer Buchstabe E mit Zirkumflex',Euml:'Lateinischer Buchstabe E Trema',Igrave:'Lateinischer Buchstabe I mit AkzentGrave',Iacute:'Lateinischer Buchstabe I mit Akutakzent',Icirc:'Lateinischer Buchstabe I mit Zirkumflex',Iuml:'Lateinischer Buchstabe I mit Trema',ETH:'Lateinischer Buchstabe Eth',Ntilde:'Lateinischer Buchstabe N mit Tilde',Ograve:'Lateinischer Buchstabe O mit AkzentGrave',Oacute:'Lateinischer Buchstabe O mit Akutakzent',Ocirc:'Lateinischer Buchstabe O mit Zirkumflex',Otilde:'Lateinischer Buchstabe O mit Tilde',Ouml:'Lateinischer Buchstabe O mit Trema',times:'Multiplikation',Oslash:'Lateinischer Buchstabe O durchgestrichen',Ugrave:'Lateinischer Buchstabe U mit Akzentgrave',Uacute:'Lateinischer Buchstabe U mit Akutakzent',Ucirc:'Lateinischer Buchstabe U mit Zirkumflex',Uuml:'Lateinischer Buchstabe a mit Trema',Yacute:'Lateinischer Buchstabe a mit Akzent',THORN:'Lateinischer Buchstabe mit Dorn',szlig:'Kleiner lateinischer Buchstabe scharfe s',agrave:'Kleiner lateinischer Buchstabe a mit Accent grave',aacute:'Kleiner lateinischer Buchstabe a mit Akut',acirc:'Lateinischer Buchstabe a mit Zirkumflex',atilde:'Lateinischer Buchstabe a mit Tilde',auml:'Kleiner lateinischer Buchstabe a mit Trema',aring:'Kleiner lateinischer Buchstabe a mit Ring oben',aelig:'Lateinischer Buchstabe æ',ccedil:'Kleiner lateinischer Buchstabe c mit Cedille',egrave:'Kleiner lateinischer Buchstabe e mit Accent grave',eacute:'Kleiner lateinischer Buchstabe e mit Akut',ecirc:'Kleiner lateinischer Buchstabe e mit Zirkumflex',euml:'Kleiner lateinischer Buchstabe e mit Trema',igrave:'Kleiner lateinischer Buchstabe i mit AkzentGrave',iacute:'Kleiner lateinischer Buchstabe i mit Akzent',icirc:'Kleiner lateinischer Buchstabe i mit Zirkumflex',iuml:'Kleiner lateinischer Buchstabe i mit Trema',eth:'Kleiner lateinischer Buchstabe eth',ntilde:'Kleiner lateinischer Buchstabe n mit Tilde',ograve:'Kleiner lateinischer Buchstabe o mit Accent grave',oacute:'Kleiner lateinischer Buchstabe o mit Akzent',ocirc:'Kleiner lateinischer Buchstabe o mit Zirkumflex',otilde:'Lateinischer Buchstabe i mit Tilde',ouml:'Kleiner lateinischer Buchstabe o mit Trema',divide:'Divisionszeichen',oslash:'Kleiner lateinischer Buchstabe o durchgestrichen',ugrave:'Kleiner lateinischer Buchstabe u mit Accent grave',uacute:'Kleiner lateinischer Buchstabe u mit Akut',ucirc:'Kleiner lateinischer Buchstabe u mit Zirkumflex',uuml:'Kleiner lateinischer Buchstabe u mit Trema',yacute:'Kleiner lateinischer Buchstabe y mit Akut',thorn:'Kleiner lateinischer Buchstabe Dorn',yuml:'Kleiner lateinischer Buchstabe y mit Trema',OElig:'Lateinischer Buchstabe Ligatur OE',oelig:'Kleiner lateinischer Buchstabe Ligatur OE',372:'Lateinischer Buchstabe W mit Zirkumflex',374:'Lateinischer Buchstabe Y mit Zirkumflex',373:'Kleiner lateinischer Buchstabe w mit Zirkumflex',375:'Kleiner lateinischer Buchstabe y mit Zirkumflex',sbquo:'Tiefergestelltes Komma',8219:'Rumgedrehtes Komma',bdquo:'Doppeltes Anführungszeichen unten',hellip:'horizontale Auslassungspunkte',trade:'Handelszeichen',9658:'Dreickspfeil rechts',bull:'Bullet',rarr:'Pfeil rechts',rArr:'Doppelpfeil rechts',hArr:'Doppelpfeil links',diams:'Karo',asymp:'Ungefähr'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/el.js b/web/imcms/ckeditor/plugins/specialchar/lang/el.js
new file mode 100644
index 0000000000..119c9182a0
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/el.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','el',{euro:'Σ�μβολο Ευ�ώ',lsquo:'Α�ιστε�ός χα�ακτή�ας μονο� εισαγωγικο�',rsquo:'Δεξιός χα�ακτή�ας μονο� εισαγωγικο�',ldquo:'Α�ιστε�ός χα�ακτή�ας διπλο� εισαγωγικο�',rdquo:'Δεξιός χα�ακτή�ας διπλο� εισαγωγικο�',ndash:'Πα�λα en',mdash:'Πα�λα em',iexcl:'Ανάποδο θαυμαστικό',cent:'Σ�μβολο Σεντ',pound:'Σ�μβολο λί�ας',curren:'Σ�μβολο συναλλαγματικής μονάδας',yen:'Σ�μβολο Γιέν',brvbar:'Σπασμένη μπά�α',sect:'Σ�μβολο τμήματος',uml:'Διαί�εση',copy:'Σ�μβολο πνευματικών δικαιωμάτων',ordf:'Feminine ordinal indicator',laquo:'Left-pointing double angle quotation mark',not:'Not sign',reg:'Registered sign',macr:'Macron',deg:'Degree sign',sup2:'Superscript two',sup3:'Superscript three',acute:'Acute accent',micro:'Micro sign',para:'Pilcrow sign',middot:'Middle dot',cedil:'Cedilla',sup1:'Superscript one',ordm:'Masculine ordinal indicator',raquo:'Right-pointing double angle quotation mark',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Inverted question mark',Agrave:'Latin capital letter A with grave accent',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Latin capital letter A with tilde',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'Latin capital letter O with grave accent',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Latin capital letter O with diaeresis',times:'Multiplication sign',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Latin capital letter U with circumflex',Uuml:'Latin capital letter U with diaeresis',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Latin small letter sharp s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Division sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Rightwards arrow',rArr:'Rightwards double arrow',hArr:'Left right double arrow',diams:'Black diamond suit',asymp:'Almost equal to'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/en.js b/web/imcms/ckeditor/plugins/specialchar/lang/en.js
new file mode 100644
index 0000000000..f8776de717
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/en.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','en',{euro:'Euro sign',lsquo:'Left single quotation mark',rsquo:'Right single quotation mark',ldquo:'Left double quotation mark',rdquo:'Right double quotation mark',ndash:'En dash',mdash:'Em dash',iexcl:'Inverted exclamation mark',cent:'Cent sign',pound:'Pound sign',curren:'Currency sign',yen:'Yen sign',brvbar:'Broken bar',sect:'Section sign',uml:'Diaeresis',copy:'Copyright sign',ordf:'Feminine ordinal indicator',laquo:'Left-pointing double angle quotation mark',not:'Not sign',reg:'Registered sign',macr:'Macron',deg:'Degree sign',sup2:'Superscript two',sup3:'Superscript three',acute:'Acute accent',micro:'Micro sign',para:'Pilcrow sign',middot:'Middle dot',cedil:'Cedilla',sup1:'Superscript one',ordm:'Masculine ordinal indicator',raquo:'Right-pointing double angle quotation mark',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Inverted question mark',Agrave:'Latin capital letter A with grave accent',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Latin capital letter A with tilde',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'Latin capital letter O with grave accent',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Latin capital letter O with diaeresis',times:'Multiplication sign',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Latin capital letter U with circumflex',Uuml:'Latin capital letter U with diaeresis',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Latin small letter sharp s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Division sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Rightwards arrow',rArr:'Rightwards double arrow',hArr:'Left right double arrow',diams:'Black diamond suit',asymp:'Almost equal to'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/eo.js b/web/imcms/ckeditor/plugins/specialchar/lang/eo.js
new file mode 100644
index 0000000000..869afc0abe
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/eo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','eo',{euro:'Eŭrosigno',lsquo:'Supra 6-citilo',rsquo:'Supra 9-citilo',ldquo:'Supra 66-citilo',rdquo:'Supra 99-citilo',ndash:'Streketo',mdash:'Substreko',iexcl:'Renversita krisigno',cent:'Cendosigno',pound:'Pundosigno',curren:'Monersigno',yen:'Enosigno',brvbar:'Rompita vertikala streko',sect:'Kurba paragrafo',uml:'Tremao',copy:'Kopirajtosigno',ordf:'Adjektiva numerfinaĵo',laquo:'Duobla malplio-citilo',not:'Negohoko',reg:'Registrita marko',macr:'Superstreko',deg:'Gradosigno',sup2:'Supra indico 2',sup3:'Supra indico 3',acute:'Dekstra korno',micro:'Mikrosigno',para:'Rekta paragrafo',middot:'Meza punkto',cedil:'Zoeto',sup1:'Supra indico 1',ordm:'Substantiva numerfinaĵo',raquo:'Duobla plio-citilo',frac14:'Kvaronosigno',frac12:'Duonosigno',frac34:'Trikvaronosigno',iquest:'renversita demandosigno',Agrave:'Latina ĉeflitero A kun liva korno',Aacute:'Latina ĉeflitero A kun dekstra korno',Acirc:'Latina ĉeflitero A kun ĉapelo',Atilde:'Latina ĉeflitero A kun tildo',Auml:'Latina ĉeflitero A kun tremao',Aring:'Latina ĉeflitero A kun superringo',AElig:'Latina ĉeflitera ligaturo Æ',Ccedil:'Latina ĉeflitero C kun zoeto',Egrave:'Latina ĉeflitero E kun liva korno',Eacute:'Latina ĉeflitero E kun dekstra korno',Ecirc:'Latina ĉeflitero E kun ĉapelo',Euml:'Latina ĉeflitero E kun tremao',Igrave:'Latina ĉeflitero I kun liva korno',Iacute:'Latina ĉeflitero I kun dekstra korno',Icirc:'Latina ĉeflitero I kun ĉapelo',Iuml:'Latina ĉeflitero I kun tremao',ETH:'Latina ĉeflitero islanda edo',Ntilde:'Latina ĉeflitero N kun tildo',Ograve:'Latina ĉeflitero O kun liva korno',Oacute:'Latina ĉeflitero O kun dekstra korno',Ocirc:'Latina ĉeflitero O kun ĉapelo',Otilde:'Latina ĉeflitero O kun tildo',Ouml:'Latina ĉeflitero O kun tremao',times:'Multipliko',Oslash:'Latina ĉeflitero O trastrekita',Ugrave:'Latina ĉeflitero U kun liva korno',Uacute:'Latina ĉeflitero U kun dekstra korno',Ucirc:'Latina ĉeflitero U kun ĉapelo',Uuml:'Latina ĉeflitero U kun tremao',Yacute:'Latina ĉeflitero Y kun dekstra korno',THORN:'Latina ĉeflitero islanda dorno',szlig:'Latina etlitero germana sozo (akra s)',agrave:'Latina etlitero a kun liva korno',aacute:'Latina etlitero a kun dekstra korno',acirc:'Latina etlitero a kun ĉapelo',atilde:'Latina etlitero a kun tildo',auml:'Latina etlitero a kun tremao',aring:'Latina etlitero a kun superringo',aelig:'Latina etlitera ligaturo æ',ccedil:'Latina etlitero c kun zoeto',egrave:'Latina etlitero e kun liva korno',eacute:'Latina etlitero e kun dekstra korno',ecirc:'Latina etlitero e kun ĉapelo',euml:'Latina etlitero e kun tremao',igrave:'Latina etlitero i kun liva korno',iacute:'Latina etlitero i kun dekstra korno',icirc:'Latina etlitero i kun ĉapelo',iuml:'Latina etlitero i kun tremao',eth:'Latina etlitero islanda edo',ntilde:'Latina etlitero n kun tildo',ograve:'Latina etlitero o kun liva korno',oacute:'Latina etlitero o kun dekstra korno',ocirc:'Latina etlitero o kun ĉapelo',otilde:'Latina etlitero o kun tildo',ouml:'Latina etlitero o kun tremao',divide:'Dividosigno',oslash:'Latina etlitero o trastrekita',ugrave:'Latina etlitero u kun liva korno',uacute:'Latina etlitero u kun dekstra korno',ucirc:'Latina etlitero u kun ĉapelo',uuml:'Latina etlitero u kun tremao',yacute:'Latina etlitero y kun dekstra korno',thorn:'Latina etlitero islanda dorno',yuml:'Latina etlitero y kun tremao',OElig:'Latina ĉeflitera ligaturo Œ',oelig:'Latina etlitera ligaturo œ',372:'Latina ĉeflitero W kun ĉapelo',374:'Latina ĉeflitero Y kun ĉapelo',373:'Latina etlitero w kun ĉapelo',375:'Latina etlitero y kun ĉapelo',sbquo:'Suba 9-citilo',8219:'Supra renversita 9-citilo',bdquo:'Suba 99-citilo',hellip:'Tripunkto',trade:'Varmarka signo',9658:'Nigra sago dekstren',bull:'Bulmarko',rarr:'Sago dekstren',rArr:'Duobla sago dekstren',hArr:'Duobla sago maldekstren',diams:'Nigra kvadrato',asymp:'Preskaŭ egala'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/et.js b/web/imcms/ckeditor/plugins/specialchar/lang/et.js
new file mode 100644
index 0000000000..a67bfab008
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/et.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','et',{euro:'Euromärk',lsquo:'Alustav ühekordne jutumärk',rsquo:'Lõpetav ühekordne jutumärk',ldquo:'Alustav kahekordne jutumärk',rdquo:'Lõpetav kahekordne jutumärk',ndash:'Enn-kriips',mdash:'Emm-kriips',iexcl:'Pööratud hüüumärk',cent:'Sendimärk',pound:'Naela märk',curren:'Valuutamärk',yen:'Jeeni märk',brvbar:'Katkestatud kriips',sect:'Lõigu märk',uml:'Täpid',copy:'Autoriõiguse märk',ordf:'Feminine ordinal indicator',laquo:'Left-pointing double angle quotation mark',not:'Ei-märk',reg:'Registered sign',macr:'Macron',deg:'Kraadimärk',sup2:'Ülaindeks kaks',sup3:'Ülaindeks kolm',acute:'Acute accent',micro:'Mikro-märk',para:'Pilcrow sign',middot:'Keskpunkt',cedil:'Cedilla',sup1:'Ülaindeks üks',ordm:'Masculine ordinal indicator',raquo:'Right-pointing double angle quotation mark',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Inverted question mark',Agrave:'Latin capital letter A with grave accent',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Ladina suur A tildega',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'Latin capital letter O with grave accent',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Täppidega ladina suur O',times:'Multiplication sign',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Kandilise katusega suur ladina U',Uuml:'Täppidega ladina suur U',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Ladina väike terav s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Kandilise katusega ladina väike a',atilde:'Tildega ladina väike a',auml:'Täppidega ladina väike a',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Division sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Rightwards arrow',rArr:'Rightwards double arrow',hArr:'Left right double arrow',diams:'Black diamond suit',asymp:'Almost equal to'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/fa.js b/web/imcms/ckeditor/plugins/specialchar/lang/fa.js
new file mode 100644
index 0000000000..c0512aa054
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/fa.js
@@ -0,0 +1,131 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'specialchar', 'fa',
+{
+	euro: 'نشان یورو',
+	lsquo: 'علامت نقل قول تکی چپ',
+	rsquo: 'علامت نقل قول تکی راست',
+	ldquo: 'علامت دوتایی نقل قول چپ',
+	rdquo: 'علامت دوتایی نقل قول راست',
+	ndash: 'En dash', // MISSING
+	mdash: 'Em dash', // MISSING
+	iexcl: 'علامت گذاری به عنوان علامت تعجب وارونه',
+	cent: 'نشان سنت',
+	pound: 'نشان پوند',
+	curren: 'نشان ارز',
+	yen: 'نشان ین',
+	brvbar: 'نوار شکسته',
+	sect: 'نشان بخش',
+	uml: 'Diaeresis', // MISSING
+	copy: 'نشان کپی رایت',
+	ordf: 'Feminine ordinal indicator', // MISSING
+	laquo: 'Left-pointing double angle quotation mark', // MISSING
+	not: 'علامت ثبت نشده',
+	reg: 'علامت ثبت شده',
+	macr: 'Macron', // MISSING
+	deg: 'نشان درجه',
+	sup2: 'بالانویس دو',
+	sup3: 'بالانویس سه',
+	acute: 'لهجه غلیظ',
+	micro: 'نشان مایکرو',
+	para: 'Pilcrow sign', // MISSING
+	middot: 'نقطه میانی',
+	cedil: 'Cedilla', // MISSING
+	sup1: 'Superscript one', // MISSING
+	ordm: 'Masculine ordinal indicator', // MISSING
+	raquo: 'نشان زاویه‌دار دوتایی نقل قول راست چین',
+	frac14: 'Vulgar fraction one quarter', // MISSING
+	frac12: 'Vulgar fraction one half', // MISSING
+	frac34: 'Vulgar fraction three quarters', // MISSING
+	iquest: 'Inverted question mark', // MISSING
+	Agrave: 'Latin capital letter A with grave accent', // MISSING
+	Aacute: 'Latin capital letter A with acute accent', // MISSING
+	Acirc: 'Latin capital letter A with circumflex', // MISSING
+	Atilde: 'Latin capital letter A with tilde', // MISSING
+	Auml: 'Latin capital letter A with diaeresis', // MISSING
+	Aring: 'Latin capital letter A with ring above', // MISSING
+	AElig: 'Latin Capital letter Æ', // MISSING
+	Ccedil: 'Latin capital letter C with cedilla', // MISSING
+	Egrave: 'Latin capital letter E with grave accent', // MISSING
+	Eacute: 'Latin capital letter E with acute accent', // MISSING
+	Ecirc: 'Latin capital letter E with circumflex', // MISSING
+	Euml: 'Latin capital letter E with diaeresis', // MISSING
+	Igrave: 'Latin capital letter I with grave accent', // MISSING
+	Iacute: 'Latin capital letter I with acute accent', // MISSING
+	Icirc: 'Latin capital letter I with circumflex', // MISSING
+	Iuml: 'Latin capital letter I with diaeresis', // MISSING
+	ETH: 'Latin capital letter Eth', // MISSING
+	Ntilde: 'Latin capital letter N with tilde', // MISSING
+	Ograve: 'Latin capital letter O with grave accent', // MISSING
+	Oacute: 'Latin capital letter O with acute accent', // MISSING
+	Ocirc: 'Latin capital letter O with circumflex', // MISSING
+	Otilde: 'Latin capital letter O with tilde', // MISSING
+	Ouml: 'Latin capital letter O with diaeresis', // MISSING
+	times: 'Multiplication sign', // MISSING
+	Oslash: 'Latin capital letter O with stroke', // MISSING
+	Ugrave: 'Latin capital letter U with grave accent', // MISSING
+	Uacute: 'Latin capital letter U with acute accent', // MISSING
+	Ucirc: 'Latin capital letter U with circumflex', // MISSING
+	Uuml: 'Latin capital letter U with diaeresis', // MISSING
+	Yacute: 'Latin capital letter Y with acute accent', // MISSING
+	THORN: 'Latin capital letter Thorn', // MISSING
+	szlig: 'Latin small letter sharp s', // MISSING
+	agrave: 'Latin small letter a with grave accent', // MISSING
+	aacute: 'Latin small letter a with acute accent', // MISSING
+	acirc: 'Latin small letter a with circumflex', // MISSING
+	atilde: 'Latin small letter a with tilde', // MISSING
+	auml: 'Latin small letter a with diaeresis', // MISSING
+	aring: 'Latin small letter a with ring above', // MISSING
+	aelig: 'Latin small letter æ', // MISSING
+	ccedil: 'Latin small letter c with cedilla', // MISSING
+	egrave: 'Latin small letter e with grave accent', // MISSING
+	eacute: 'Latin small letter e with acute accent', // MISSING
+	ecirc: 'Latin small letter e with circumflex', // MISSING
+	euml: 'Latin small letter e with diaeresis', // MISSING
+	igrave: 'Latin small letter i with grave accent', // MISSING
+	iacute: 'Latin small letter i with acute accent', // MISSING
+	icirc: 'Latin small letter i with circumflex', // MISSING
+	iuml: 'Latin small letter i with diaeresis', // MISSING
+	eth: 'Latin small letter eth', // MISSING
+	ntilde: 'Latin small letter n with tilde', // MISSING
+	ograve: 'Latin small letter o with grave accent', // MISSING
+	oacute: 'Latin small letter o with acute accent', // MISSING
+	ocirc: 'Latin small letter o with circumflex', // MISSING
+	otilde: 'Latin small letter o with tilde', // MISSING
+	ouml: 'Latin small letter o with diaeresis', // MISSING
+	divide: 'Division sign', // MISSING
+	oslash: 'Latin small letter o with stroke', // MISSING
+	ugrave: 'Latin small letter u with grave accent', // MISSING
+	uacute: 'Latin small letter u with acute accent', // MISSING
+	ucirc: 'Latin small letter u with circumflex', // MISSING
+	uuml: 'Latin small letter u with diaeresis', // MISSING
+	yacute: 'Latin small letter y with acute accent', // MISSING
+	thorn: 'Latin small letter thorn', // MISSING
+	yuml: 'Latin small letter y with diaeresis', // MISSING
+	OElig: 'Latin capital ligature OE', // MISSING
+	oelig: 'Latin small ligature oe', // MISSING
+	'372': 'Latin capital letter W with circumflex', // MISSING
+	'374': 'Latin capital letter Y with circumflex', // MISSING
+	'373': 'Latin small letter w with circumflex', // MISSING
+	'375': 'Latin small letter y with circumflex', // MISSING
+	sbquo: 'Single low-9 quotation mark', // MISSING
+	'8219': 'Single high-reversed-9 quotation mark', // MISSING
+	bdquo: 'Double low-9 quotation mark', // MISSING
+	hellip: 'Horizontal ellipsis', // MISSING
+	trade: 'Trade mark sign', // MISSING
+	'9658': 'Black right-pointing pointer', // MISSING
+	bull: 'Bullet', // MISSING
+	rarr: 'Rightwards arrow', // MISSING
+	rArr: 'Rightwards double arrow', // MISSING
+	hArr: 'جهت‌نمای دوتایی چپ به راست',
+	diams: 'Black diamond suit', // MISSING
+	asymp: 'تقریبا برابر با'
+});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/fi.js b/web/imcms/ckeditor/plugins/specialchar/lang/fi.js
new file mode 100644
index 0000000000..19e2ae638a
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/fi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','fi',{euro:'Euron merkki',lsquo:'Vasen yksittäinen lainausmerkki',rsquo:'Oikea yksittäinen lainausmerkki',ldquo:'Vasen kaksoislainausmerkki',rdquo:'Oikea kaksoislainausmerkki',ndash:'En dash',mdash:'Em dash',iexcl:'Inverted exclamation mark',cent:'Sentin merkki',pound:'Punnan merkki',curren:'Valuuttamerkki',yen:'Yenin merkki',brvbar:'Broken bar',sect:'Section sign',uml:'Diaeresis',copy:'Copyright sign',ordf:'Feminine ordinal indicator',laquo:'Left-pointing double angle quotation mark',not:'Not sign',reg:'Rekisteröity merkki',macr:'Macron',deg:'Asteen merkki',sup2:'Yläindeksi kaksi',sup3:'Yläindeksi kolme',acute:'Acute accent',micro:'Mikron merkki',para:'Pilcrow sign',middot:'Middle dot',cedil:'Cedilla',sup1:'Yläindeksi yksi',ordm:'Masculine ordinal indicator',raquo:'Right-pointing double angle quotation mark',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Ylösalaisin oleva kysymysmerkki',Agrave:'Latin capital letter A with grave accent',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Latin capital letter A with tilde',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'Latin capital letter O with grave accent',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Latin capital letter O with diaeresis',times:'Kertomerkki',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Latin capital letter U with circumflex',Uuml:'Latin capital letter U with diaeresis',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Latin small letter sharp s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Jakomerkki',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Tavaramerkki merkki',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Nuoli oikealle',rArr:'Kaksoisnuoli oikealle',hArr:'Kaksoisnuoli oikealle ja vasemmalle',diams:'Black diamond suit',asymp:'Noin'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/fr.js b/web/imcms/ckeditor/plugins/specialchar/lang/fr.js
new file mode 100644
index 0000000000..4714a9d8ef
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/fr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','fr',{euro:'Symbole Euro',lsquo:'Guillemet simple ouvrant',rsquo:'Guillemet simple fermant',ldquo:'Guillemet double ouvrant',rdquo:'Guillemet double fermant',ndash:'Tiret haut',mdash:'Tiret bas underscore',iexcl:"Point d'exclamation inversé",cent:'Symbole Cent',pound:'Symbole Livre Sterling',curren:'Symbole monétaire',yen:'Symbole Yen',brvbar:'Barre verticale scindée',sect:'Section',uml:'Tréma',copy:'Symbole Copyright',ordf:'Indicateur ordinal féminin',laquo:'Guillemet français ouvrant',not:'Crochet de négation',reg:'Marque déposée',macr:'Macron',deg:'Degré',sup2:'Exposant 2',sup3:'\\tExposant 3',acute:'Accent aigu',micro:'Omicron',para:'Paragraphe',middot:'Point médian',cedil:'Cédille',sup1:'\\tExposant 1',ordm:'Indicateur ordinal masculin',raquo:'Guillemet français fermant',frac14:'Un quart',frac12:'Un demi',frac34:'Trois quarts',iquest:"Point d'interrogation inversé",Agrave:'A majuscule accent grave',Aacute:'A majuscule accent aigu',Acirc:'A majuscule accent circonflexe',Atilde:'A majuscule avec caron',Auml:'A majuscule tréma',Aring:'A majuscule avec un rond au-dessus',AElig:'Æ majuscule ligaturés',Ccedil:'C majuscule cédille',Egrave:'E majuscule accent grave',Eacute:'E majuscule accent aigu',Ecirc:'E majuscule accent circonflexe',Euml:'E majuscule tréma',Igrave:'I majuscule accent grave',Iacute:'I majuscule accent aigu',Icirc:'I majuscule accent circonflexe',Iuml:'I majuscule tréma',ETH:'Lettre majuscule islandaise ED',Ntilde:'N majuscule avec caron',Ograve:'O majuscule accent grave',Oacute:'O majuscule accent aigu',Ocirc:'O majuscule accent circonflexe',Otilde:'O majuscule avec caron',Ouml:'O majuscule tréma',times:'Multiplication',Oslash:'O majuscule barré',Ugrave:'U majuscule accent grave',Uacute:'U majuscule accent aigu',Ucirc:'U majuscule accent circonflexe',Uuml:'U majuscule tréma',Yacute:'Y majuscule accent aigu',THORN:'Lettre islandaise Thorn majuscule',szlig:'Lettre minuscule allemande s dur',agrave:'a minuscule accent grave',aacute:'a minuscule accent aigu',acirc:'a minuscule accent circonflexe',atilde:'a minuscule avec caron',auml:'a minuscule tréma',aring:'a minuscule avec un rond au-dessus',aelig:'æ minuscule ligaturés',ccedil:'c minuscule cédille',egrave:'e minuscule accent grave',eacute:'e minuscule accent aigu',ecirc:'e minuscule accent circonflexe',euml:'e minuscule tréma',igrave:'i minuscule accent grave',iacute:'i minuscule accent aigu',icirc:'i minuscule accent circonflexe',iuml:'i minuscule tréma',eth:'Lettre minuscule islandaise ED',ntilde:'n minuscule avec caron',ograve:'o minuscule accent grave',oacute:'o minuscule accent aigu',ocirc:'o minuscule accent circonflexe',otilde:'o minuscule avec caron',ouml:'o minuscule tréma',divide:'Division',oslash:'o minuscule barré',ugrave:'u minuscule accent grave',uacute:'u minuscule accent aigu',ucirc:'u minuscule accent circonflexe',uuml:'u minuscule tréma',yacute:'y minuscule accent aigu',thorn:'Lettre islandaise thorn minuscule',yuml:'y minuscule tréma',OElig:'ligature majuscule latine Œ',oelig:'ligature minuscule latine œ',372:'W majuscule accent circonflexe',374:'Y majuscule accent circonflexe',373:'w minuscule accent circonflexe',375:'y minuscule accent circonflexe',sbquo:'Guillemet simple fermant (anglais)',8219:'Guillemet-virgule supérieur culbuté',bdquo:'Guillemet-virgule double inférieur',hellip:'Points de suspension',trade:'Marque commerciale (trade mark)',9658:'Flèche noire pointant vers la droite',bull:'Gros point médian',rarr:'Flèche vers la droite',rArr:'Double flèche vers la droite',hArr:'Double flèche vers la gauche',diams:'Carreau noir',asymp:'Presque égal'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/he.js b/web/imcms/ckeditor/plugins/specialchar/lang/he.js
new file mode 100644
index 0000000000..60d037eb33
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/he.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','he',{euro:'יורו',lsquo:'Left single quotation mark',rsquo:'Right single quotation mark',ldquo:'Left double quotation mark',rdquo:'Right double quotation mark',ndash:'En dash',mdash:'Em dash',iexcl:'Inverted exclamation mark',cent:'Cent sign',pound:'Pound sign',curren:'Currency sign',yen:'Yen sign',brvbar:'Broken bar',sect:'Section sign',uml:'Diaeresis',copy:'Copyright sign',ordf:'Feminine ordinal indicator',laquo:'Left-pointing double angle quotation mark',not:'Not sign',reg:'Registered sign',macr:'Macron',deg:'Degree sign',sup2:'Superscript two',sup3:'Superscript three',acute:'Acute accent',micro:'Micro sign',para:'Pilcrow sign',middot:'Middle dot',cedil:'Cedilla',sup1:'Superscript one',ordm:'Masculine ordinal indicator',raquo:'Right-pointing double angle quotation mark',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Inverted question mark',Agrave:'Latin capital letter A with grave accent',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Latin capital letter A with tilde',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'Latin capital letter O with grave accent',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Latin capital letter O with diaeresis',times:'Multiplication sign',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Latin capital letter U with circumflex',Uuml:'Latin capital letter U with diaeresis',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Latin small letter sharp s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Division sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Rightwards arrow',rArr:'Rightwards double arrow',hArr:'Left right double arrow',diams:'Black diamond suit',asymp:'Almost equal to'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/hr.js b/web/imcms/ckeditor/plugins/specialchar/lang/hr.js
new file mode 100644
index 0000000000..1baad6547c
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/hr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','hr',{euro:'Euro znak',lsquo:'Lijevi jednostruki navodnik',rsquo:'Desni jednostruki navodnik',ldquo:'Lijevi dvostruki navodnik',rdquo:'Desni dvostruki navodnik',ndash:'En crtica',mdash:'Em crtica',iexcl:'Naopaki uskli�nik',cent:'Cent znak',pound:'Funta znak',curren:'Znak valute',yen:'Yen znak',brvbar:'Potrgana pre�ka',sect:'Znak odjeljka',uml:'Diaeresis',copy:'Copyright znak',ordf:'Feminine ordinal indicator',laquo:'Lijevi dvostruki uglati navodnik',not:'Not znak',reg:'Registered znak',macr:'Macron',deg:'Stupanj znak',sup2:'Superscript two',sup3:'Superscript three',acute:'Acute accent',micro:'Micro sign',para:'Pilcrow sign',middot:'Srednja to�ka',cedil:'Cedilla',sup1:'Superscript one',ordm:'Masculine ordinal indicator',raquo:'Desni dvostruku uglati navodnik',frac14:'Vulgar fraction one quarter',frac12:'Vulgar fraction one half',frac34:'Vulgar fraction three quarters',iquest:'Naopaki upitnik',Agrave:'Veliko latinsko slovo A s akcentom',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Latin capital letter A with tilde',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'Latin capital letter O with grave accent',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Latin capital letter O with diaeresis',times:'Multiplication sign',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Latin capital letter U with circumflex',Uuml:'Latin capital letter U with diaeresis',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Latin small letter sharp s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'Latin small letter n with tilde',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Division sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'Rightwards arrow',rArr:'Rightwards double arrow',hArr:'Left right double arrow',diams:'Black diamond suit',asymp:'Almost equal to'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/it.js b/web/imcms/ckeditor/plugins/specialchar/lang/it.js
new file mode 100644
index 0000000000..a90fcc2b33
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/it.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','it',{euro:'Simbolo Euro',lsquo:'Virgoletta singola sinistra',rsquo:'Virgoletta singola destra',ldquo:'Virgolette aperte',rdquo:'Virgolette chiuse',ndash:'Trattino',mdash:'Trattino lungo',iexcl:'Punto esclavamativo invertito',cent:'Simbolo Cent',pound:'Simbolo Sterlina',curren:'Simbolo Moneta',yen:'Simbolo Yen',brvbar:'Barra interrotta',sect:'Simbolo di sezione',uml:'Dieresi',copy:'Simbolo Copyright',ordf:'Indicatore ordinale femminile',laquo:'Virgolette basse aperte',not:'Nessun segno',reg:'Simbolo Registrato',macr:'Macron',deg:'Simbolo Grado',sup2:'Apice Due',sup3:'Apice Tre',acute:'Accento acuto',micro:'Simbolo Micro',para:'Simbolo Paragrafo',middot:'Punto centrale',cedil:'Cediglia',sup1:'Apice Uno',ordm:'Indicatore ordinale maschile',raquo:'Virgolette basse chiuse',frac14:'Frazione volgare un quarto',frac12:'Frazione volgare un mezzo',frac34:'Frazione volgare tre quarti',iquest:'Punto interrogativo invertito',Agrave:'Lettera maiuscola latina A con accento grave',Aacute:'Lettera maiuscola latina A con accento acuto',Acirc:'Lettera maiuscola latina A con accento circonflesso',Atilde:'Lettera maiuscola latina A con tilde',Auml:'Lettera maiuscola latina A con dieresi',Aring:'Lettera maiuscola latina A con anello sopra',AElig:'Lettera maiuscola latina AE',Ccedil:'Lettera maiuscola latina C con cediglia',Egrave:'Lettera maiuscola latina E con accento grave',Eacute:'Lettera maiuscola latina E con accento acuto',Ecirc:'Lettera maiuscola latina E con accento circonflesso',Euml:'Lettera maiuscola latina E con dieresi',Igrave:'Lettera maiuscola latina I con accento grave',Iacute:'Lettera maiuscola latina I con accento acuto',Icirc:'Lettera maiuscola latina I con accento circonflesso',Iuml:'Lettera maiuscola latina I con dieresi',ETH:'Lettera maiuscola latina Eth',Ntilde:'Lettera maiuscola latina N con tilde',Ograve:'Lettera maiuscola latina O con accento grave',Oacute:'Lettera maiuscola latina O con accento acuto',Ocirc:'Lettera maiuscola latina O con accento circonflesso',Otilde:'Lettera maiuscola latina O con tilde',Ouml:'Lettera maiuscola latina O con dieresi',times:'Simbolo di moltiplicazione',Oslash:'Lettera maiuscola latina O barrata',Ugrave:'Lettera maiuscola latina U con accento grave',Uacute:'Lettera maiuscola latina U con accento acuto',Ucirc:'Lettera maiuscola latina U con accento circonflesso',Uuml:'Lettera maiuscola latina U con accento circonflesso',Yacute:'Lettera maiuscola latina Y con accento acuto',THORN:'Lettera maiuscola latina Thorn',szlig:'Lettera latina minuscola doppia S',agrave:'Lettera minuscola latina a con accento grave',aacute:'Lettera minuscola latina a con accento acuto',acirc:'Lettera minuscola latina a con accento circonflesso',atilde:'Lettera minuscola latina a con tilde',auml:'Lettera minuscola latina a con dieresi',aring:'Lettera minuscola latina a con anello superiore',aelig:'Lettera minuscola latina ae',ccedil:'Lettera minuscola latina c con cediglia',egrave:'Lettera minuscola latina e con accento grave',eacute:'Lettera minuscola latina e con accento acuto',ecirc:'Lettera minuscola latina e con accento circonflesso',euml:'Lettera minuscola latina e con dieresi',igrave:'Lettera minuscola latina i con accento grave',iacute:'Lettera minuscola latina i con accento acuto',icirc:'Lettera minuscola latina i con accento circonflesso',iuml:'Lettera minuscola latina i con dieresi',eth:'Lettera minuscola latina eth',ntilde:'Lettera minuscola latina n con tilde',ograve:'Lettera minuscola latina o con accento grave',oacute:'Lettera minuscola latina o con accento acuto',ocirc:'Lettera minuscola latina o con accento circonflesso',otilde:'Lettera minuscola latina o con tilde',ouml:'Lettera minuscola latina o con dieresi',divide:'Simbolo di divisione',oslash:'Lettera minuscola latina o barrata',ugrave:'Lettera minuscola latina u con accento grave',uacute:'Lettera minuscola latina u con accento acuto',ucirc:'Lettera minuscola latina u con accento circonflesso',uuml:'Lettera minuscola latina u con dieresi',yacute:'Lettera minuscola latina y con accento acuto',thorn:'Lettera minuscola latina thorn',yuml:'Lettera minuscola latina y con dieresi',OElig:'Legatura maiuscola latina OE',oelig:'Legatura minuscola latina oe',372:'Lettera maiuscola latina W con accento circonflesso',374:'Lettera maiuscola latina Y con accento circonflesso',373:'Lettera minuscola latina w con accento circonflesso',375:'Lettera minuscola latina y con accento circonflesso',sbquo:'Singola virgoletta bassa low-9',8219:'Singola virgoletta bassa low-9 inversa',bdquo:'Doppia virgoletta bassa low-9',hellip:'Ellissi orizzontale',trade:'Simbolo TM',9658:'Puntatore nero rivolto verso destra',bull:'Punto',rarr:'Freccia verso destra',rArr:'Doppia freccia verso destra',hArr:'Doppia freccia sinistra destra',diams:'Simbolo nero diamante',asymp:'Quasi uguale a'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/ku.js b/web/imcms/ckeditor/plugins/specialchar/lang/ku.js
new file mode 100644
index 0000000000..3ebcfb5952
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/ku.js
@@ -0,0 +1,131 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'specialchar', 'ku',
+{
+	euro: 'نیشانه‌ی یۆرۆ',
+	lsquo: 'نیشانه‌ی �اریزه‌ی سه‌رووژێری تاکی چه‌پ',
+	rsquo: 'نیشانه‌ی �اریزه‌ی سه‌رووژێری تاکی ڕاست',
+	ldquo: 'نیشانه‌ی �اریزه‌ی سه‌رووژێری دووهێنده‌ی چه‌پ',
+	rdquo: 'نیشانه‌ی �اریزه‌ی سه‌رووژێری دووهێنده‌ی ڕاست',
+	ndash: 'ته‌قه‌ڵی کورت',
+	mdash: 'ته‌قه‌ڵی درێژ',
+	iexcl: 'نیشانه‌ی هه‌ڵه‌وگێڕی سه‌رسوڕمێنه‌ر',
+	cent: 'نیشانه‌ی سه‌نت',
+	pound: 'نیشانه‌ی پاوه‌ند',
+	curren: 'نیشانه‌ی دراو',
+	yen: 'نیشانه‌ی یه‌نی ژاپۆنی',
+	brvbar: 'شریتی ئه‌ستوونی پچڕاو',
+	sect: 'نیشانه‌ی دوو s له‌سه‌ریه‌ك',
+	uml: 'خاڵ',
+	copy: 'نیشانه‌ی ما�ی چاپ',
+	ordf: 'هێڵ له‌سه‌ر پیتی a',
+	laquo: 'دوو تیری به‌دووایه‌کی چه‌پ',
+	not: 'نیشانه‌ی نه‌خێر',
+	reg: 'نیشانه‌ی R له‌ناو بازنه‌دا',
+	macr: 'ماکڕوون',
+	deg: 'نیشانه‌ی پله',
+	sup2: 'سه‌رنووسی دوو',
+	sup3: 'سه‌رنووسی سێ',
+	acute: 'لاری تیژ',
+	micro: 'نیشانه‌ی u لق درێژی چه‌پی خواروو',
+	para: 'نیشانه‌یپه‌ڕه‌گرا�',
+	middot: 'ناوه‌ڕاستی خاڵ',
+	cedil: 'نیشانه‌ی c ژێر چووکره‌',
+	sup1: 'سه‌رنووسی یه‌ك',
+	ordm: 'هێڵ له‌ژێر پیتی o',
+	raquo: 'دوو تیری به‌دووایه‌کی ڕاست',
+	frac14: 'یه‌ك له‌سه‌ر چووار',
+	frac12: 'یه‌ك له‌سه‌ر دوو',
+	frac34: 'سێ له‌سه‌ر چووار',
+	iquest: 'هێمای هه‌ڵه‌وگێری پرسیار',
+	Agrave: 'پیتی لاتینی A-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری لار',
+	Aacute: 'پیتی لاتینی A-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	Acirc: 'پیتی لاتینی A-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Atilde: 'پیتی لاتینی A-ی گه‌وره‌ له‌گه‌ڵ زه‌ڕه‌',
+	Auml: 'پیتی لاتینی A-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Aring: 'پیتی لاتینی گه‌وره‌ی Å',
+	AElig: 'پیتی لاتینی گه‌وره‌ی Æ',
+	Ccedil: 'پیتی لاتینی C-ی گه‌وره‌ له‌گه‌ڵ ژێر چووکره‌',
+	Egrave: 'پیتی لاتینی E-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری لار',
+	Eacute: 'پیتی لاتینی E-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	Ecirc: 'پیتی لاتینی E-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Euml: 'پیتی لاتینی E-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Igrave: 'پیتی لاتینی I-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری لار',
+	Iacute: 'پیتی لاتینی I-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	Icirc: 'پیتی لاتینی I-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Iuml: 'پیتی لاتینی I-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	ETH: 'پیتی لاتینی E-ی گه‌وره‌ی',
+	Ntilde: 'پیتی لاتینی N-ی گه‌وره‌ له‌گه‌ڵ زه‌ڕه‌',
+	Ograve: 'پیتی لاتینی O-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری لار',
+	Oacute: 'پیتی لاتینی O-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	Ocirc: 'پیتی لاتینی O-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Otilde: 'پیتی لاتینی O-ی گه‌وره‌ له‌گه‌ڵ زه‌ڕه‌',
+	Ouml: 'پیتی لاتینی O-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	times: 'نیشانه‌ی لێکدان',
+	Oslash: 'پیتی لاتینی گه‌وره‌ی Ø له‌گه‌ڵ هێمای دڵ وه‌ستان',
+	Ugrave: 'پیتی لاتینی U-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری لار',
+	Uacute: 'پیتی لاتینی U-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	Ucirc: 'پیتی لاتینی U-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Uuml: 'پیتی لاتینی U-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	Yacute: 'پیتی لاتینی Y-ی گه‌وره‌ له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	THORN: 'پیتی لاتینی دڕکی گه‌وره',
+	szlig: 'پیتی لاتنی نووك تیژی s',
+	agrave: 'پیتی لاتینی a-ی بچووك له‌گه‌ڵ ڕوومه‌تداری لار',
+	aacute: 'پیتی لاتینی a-ی بچووك له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	acirc: 'پیتی لاتینی a-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	atilde: 'پیتی لاتینی a-ی بچووك له‌گه‌ڵ زه‌ڕه‌',
+	auml: 'پیتی لاتینی a-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	aring: 'پیتی لاتینی å-ی بچووك',
+	aelig: 'پیتی لاتینی æ-ی بچووك',
+	ccedil: 'پیتی لاتینی c-ی بچووك له‌گه‌ڵ ژێر چووکره‌',
+	egrave: 'پیتی لاتینی e-ی بچووك له‌گه‌ڵ ڕوومه‌تداری لار',
+	eacute: 'پیتی لاتینی e-ی بچووك له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	ecirc: 'پیتی لاتینی e-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	euml: 'پیتی لاتینی e-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	igrave: 'پیتی لاتینی i-ی بچووك له‌گه‌ڵ ڕوومه‌تداری لار',
+	iacute: 'پیتی لاتینی i-ی بچووك له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	icirc: 'پیتی لاتینی i-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	iuml: 'پیتی لاتینی i-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	eth: 'پیتی لاتینی e-ی بچووك',
+	ntilde: 'پیتی لاتینی n-ی بچووك له‌گه‌ڵ زه‌ڕه‌',
+	ograve: 'پیتی لاتینی o-ی بچووك له‌گه‌ڵ ڕوومه‌تداری لار',
+	oacute: 'پیتی لاتینی o-ی بچووك له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	ocirc: 'پیتی لاتینی o-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	otilde: 'پیتی لاتینی o-ی بچووك له‌گه‌ڵ زه‌ڕه‌',
+	ouml: 'پیتی لاتینی o-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	divide: 'نیشانه‌ی دابه‌ش',
+	oslash: 'پیتی لاتینی گه‌وره‌ی ø له‌گه‌ڵ هێمای دڵ وه‌ستان',
+	ugrave: 'پیتی لاتینی u-ی بچووك له‌گه‌ڵ ڕوومه‌تداری لار',
+	uacute: 'پیتی لاتینی u-ی بچووك له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	ucirc: 'پیتی لاتینی u-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	uuml: 'پیتی لاتینی u-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	yacute: 'پیتی لاتینی y-ی بچووك له‌گه‌ڵ ڕوومه‌تداری تیژ',
+	thorn: 'پیتی لاتینی دڕکی بچووك',
+	yuml: 'پیتی لاتینی y-ی بچووك له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	OElig: 'پیتی لاتینی گه‌وره‌ی پێکه‌وه‌نووسراوی OE',
+	oelig: 'پیتی لاتینی بچووکی پێکه‌وه‌نووسراوی oe',
+	'372': 'پیتی لاتینی W-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	'374': 'پیتی لاتینی Y-ی گه‌وره‌ له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	'373': 'پیتی لاتینی w-ی بچووکی له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	'375': 'پیتی لاتینی y-ی بچووکی له‌گه‌ڵ نیشانه‌ له‌سه‌ری',
+	sbquo: 'نیشانه‌ی �اریزه‌ی نزم',
+	'8219': 'نیشانه‌ی �اریزه‌ی به‌رزی پێچه‌وانه',
+	bdquo: 'دوو �اریزه‌ی ته‌نیش یه‌ك',
+	hellip: 'ئاسۆیی بازنه',
+	trade: 'نیشانه‌ی بازرگانی',
+	'9658': 'ئاراسته‌ی ڕه‌شی ده‌ستی ڕاست',
+	bull: '�یشه‌ك',
+	rarr: 'تیری ده‌ستی ڕاست',
+	rArr: 'دووتیری ده‌ستی ڕاست',
+	hArr: 'دوو تیری ڕاست و چه‌پ',
+	diams: 'ڕه‌شی پاقڵاوه‌یی',
+	asymp: 'نیشانه‌ی یه‌کسانه'
+});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/lv.js b/web/imcms/ckeditor/plugins/specialchar/lang/lv.js
new file mode 100644
index 0000000000..ab3956a76c
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/lv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','lv',{euro:'Euro zīme',lsquo:'Kreis�  vienk�rtīga pēdiņa',rsquo:'Lab�  vienk�rtīga pēdiņa',ldquo:'Kreis�  dubult pēdiņa',rdquo:'Lab� dubult pēdiņa',ndash:'En svītra',mdash:'Em svītra',iexcl:'Apgriezta izsaukuma zīme',cent:'Centu naudas zīme',pound:'Sterliņu m�rciņu naudas zīme',curren:'Valūtas zīme',yen:'Jenu naudas zīme',brvbar:'Vertik�la p�rrauta līnija',sect:'Paragr�fa zīme',uml:'Diakritiska zīme',copy:'Autortiesību zīme',ordf:'Sievišķas k�rtas r�dīt�js',laquo:'Kreis� dubult stūra pēdiņu zīme',not:'Neparakstīts',reg:'Reģistrēta zīme',macr:'Garumzīme',deg:'Gr�du zīme',sup2:'Augšraksts divi',sup3:'Augšraksts trīs',acute:'Akūta uzsvara zīme',micro:'Mikro zīme',para:'Rindkopas zīme ',middot:'Vidējs punkts',cedil:'Āķītis zem burta',sup1:'Augšraksts viens',ordm:'Vīrišķīgas k�rtas r�dīt�js',raquo:'Lab� dubult stūra pēdiņu zīme',frac14:'Vulg�ra frakcija 1/4',frac12:'Vulg�ra frakcija 1/2',frac34:'Vulg�ra frakcija 3/4',iquest:'Apgriezta jaut�juma zīme',Agrave:'Lielais latīņu burts A ar uzsvara zīmi',Aacute:'Lielais  latīņu burts A ar akūtu uzsvara zīmi',Acirc:'Lielais latīņu burts A ar diakritisku zīmi',Atilde:'Lielais latīņu burts A ar tildi ',Auml:'Lielais latīņu burts A ar diakritisko zīmi',Aring:'Lielais latīņu burts A ar aplīti augš�',AElig:'Lielais latīņu burts Æ',Ccedil:'Lielais latīņu burts C ar �ķīti zem burta',Egrave:'Lielais latīņu burts E ar apostrofu',Eacute:'Lielais latīņu burts E ar akūtu uzsvara zīmi',Ecirc:'Lielais latīņu burts E ar diakritisko zīmi',Euml:'Lielais latīņu burts E ar diakritisko zīmi',Igrave:'Lielais latīņu burts I ar uzsvaras  zīmi',Iacute:'Lielais latīņu burts I ar akūtu uzsvara zīmi',Icirc:'Lielais latīņu burts I ar diakritisko zīmi',Iuml:'Lielais latīņu burts I ar diakritisko zīmi',ETH:'Lielais latīņu burts Eth',Ntilde:'Lielais latīņu burts N ar tildi',Ograve:'Lielais latīņu burts O ar uzsvara zīmi',Oacute:'Lielais latīņu burts O ar akūto uzsvara zīmi',Ocirc:'Lielais latīņu burts O ar diakritisko zīmi',Otilde:'Lielais latīņu burts O ar tildi',Ouml:'Lielais latīņu burts O ar diakritisko zīmi',times:'Reizin�šanas zīme ',Oslash:'Lielais latīņu burts O ar iesvītrojumu',Ugrave:'Lielais latīņu burts U ar uzsvaras zīmi',Uacute:'Lielais latīņu burts U ar akūto uzsvars zīmi',Ucirc:'Lielais latīņu burts U ar diakritisko zīmi',Uuml:'Lielais latīņu burts U ar diakritisko zīmi',Yacute:'Lielais latīņu burts Y ar akūto uzsvaras zīmi',THORN:'Lielais latīņu burts torn',szlig:'Mazs latīņu burts ar ligatūru',agrave:'Mazs latīņu burts a ar uzsvara zīmi',aacute:'Mazs latīņu burts a ar akūto uzsvara zīmi',acirc:'Mazs latīņu burts a ar diakritisko zīmi',atilde:'Mazs latīņu burts a ar tildi',auml:'Mazs latīņu burts a ar diakritisko zīmi',aring:'Mazs latīņu burts a ar aplīti augš�',aelig:'Mazs latīņu burts æ',ccedil:'Mazs latīņu burts c ar �ķīti zem burta',egrave:'Mazs latīņu burts e ar uzsvara zīmi ',eacute:'Mazs latīņu burts e ar akūtu uzsvara zīmi',ecirc:'Mazs latīņu burts e ar diakritisko zīmi',euml:'Mazs latīņu burts e ar diakritisko zīmi',igrave:'Mazs latīņu burts i ar uzsvara zīmi ',iacute:'Mazs latīņu burts i ar akūtu uzsvara zīmi',icirc:'Mazs latīņu burts i ar diakritisko zīmi',iuml:'Mazs latīņu burts i ar diakritisko zīmi',eth:'Mazs latīņu burts eth',ntilde:'Mazs latīņu burts n ar tildi',ograve:'Mazs latīņu burts o ar uzsvara zīmi ',oacute:'Mazs latīņu burts o ar akūtu uzsvara zīmi',ocirc:'Mazs latīņu burts o ar diakritisko zīmi',otilde:'Mazs latīņu burts o ar tildi',ouml:'Mazs latīņu burts o ar diakritisko zīmi',divide:'Dalīšanas zīme',oslash:'Mazs latīņu burts o ar iesvītrojumu',ugrave:'Mazs latīņu burts u ar uzsvara zīmi ',uacute:'Mazs latīņu burts u ar  akūtu uzsvara zīmi',ucirc:'Mazs latīņu burts u ar diakritisko zīmi',uuml:'Mazs latīņu burts u ar diakritisko zīmi',yacute:'Mazs latīņu burts y ar  akūtu uzsvaras zīmi',thorn:'Mazs latīņu burts torns',yuml:'Mazs latīņu burts y ar diakritisko zīmi',OElig:'Liela latīņu ligatūra OE',oelig:'Maza latīņu ligatūra oe',372:'Liels latīņu burts W ar diakritisko zīmi ',374:'Liels latīņu burts Y ar diakritisko zīmi ',373:'Mazs latīņu burts w ar diakritisko zīmi ',375:'Mazs latīņu burts y ar diakritisko zīmi ',sbquo:'Mazas-9 vienk�rtīgas pēdiņas',8219:'Lielas-9 vienk�rtīgas apgrieztas pēdiņas',bdquo:'Mazas-9 dubultas pēdiņas',hellip:'Horizont�li daudzpunkti',trade:'Pre�u zīmes zīme',9658:'Melns pa labi pagriezts radīt�js',bull:'Lode',rarr:'Bulta pa labi',rArr:'Dubulta Bulta pa labi',hArr:'Bulta pa kreisi',diams:'Dubulta Bulta pa kreisi',asymp:'Gandrīz vien�ds ar'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/nb.js b/web/imcms/ckeditor/plugins/specialchar/lang/nb.js
new file mode 100644
index 0000000000..bd99b198f1
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/nb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','nb',{euro:'Eurosymbol',lsquo:'Venstre enkelt anførselstegn',rsquo:'Høyre enkelt anførselstegn',ldquo:'Venstre dobbelt anførselstegn',rdquo:'Høyre anførsesltegn',ndash:'Kort tankestrek',mdash:'Lang tankestrek',iexcl:'Omvendt utropstegn',cent:'Centsymbol',pound:'Pundsymbol',curren:'Valutategn',yen:'Yensymbol',brvbar:'Brutt loddrett strek',sect:'Paragraftegn',uml:'Tøddel',copy:'Copyrighttegn',ordf:'Feminin ordensindikator',laquo:'Venstre anførselstegn',not:'Negasjonstegn',reg:'Registrert varemerke-tegn',macr:'Makron',deg:'Gradsymbol',sup2:'Hevet totall',sup3:'Hevet tretall',acute:'Akutt aksent',micro:'Mikrosymbol',para:'Avsnittstegn',middot:'Midtstilt prikk',cedil:'Cedille',sup1:'Hevet ettall',ordm:'Maskulin ordensindikator',raquo:'Høyre anførselstegn',frac14:'Fjerdedelsbrøk',frac12:'Halvbrøk',frac34:'Tre fjerdedelers brøk',iquest:'Omvendt spørsmålstegn',Agrave:'Stor A med grav aksent',Aacute:'Stor A med akutt aksent',Acirc:'Stor A med cirkumfleks',Atilde:'Stor A med tilde',Auml:'Stor A med tøddel',Aring:'Stor Å',AElig:'Stor Æ',Ccedil:'Stor C med cedille',Egrave:'Stor E med grav aksent',Eacute:'Stor E med akutt aksent',Ecirc:'Stor E med cirkumfleks',Euml:'Stor E med tøddel',Igrave:'Stor I med grav aksent',Iacute:'Stor I med akutt aksent',Icirc:'Stor I med cirkumfleks',Iuml:'Stor I med tøddel',ETH:'Stor Edd/stungen D',Ntilde:'Stor N med tilde',Ograve:'Stor O med grav aksent',Oacute:'Stor O med akutt aksent',Ocirc:'Stor O med cirkumfleks',Otilde:'Stor O med tilde',Ouml:'Stor O med tøddel',times:'Multiplikasjonstegn',Oslash:'Stor Ø',Ugrave:'Stor U med grav aksent',Uacute:'Stor U med akutt aksent',Ucirc:'Stor U med cirkumfleks',Uuml:'Stor U med tøddel',Yacute:'Stor Y med akutt aksent',THORN:'Stor Thorn',szlig:'Liten dobbelt-s/Eszett',agrave:'Liten a med grav aksent',aacute:'Liten a med akutt aksent',acirc:'Liten a med cirkumfleks',atilde:'Liten a med tilde',auml:'Liten a med tøddel',aring:'Liten å',aelig:'Liten æ',ccedil:'Liten c med cedille',egrave:'Liten e med grav aksent',eacute:'Liten e med akutt aksent',ecirc:'Liten e med cirkumfleks',euml:'Liten e med tøddel',igrave:'Liten i med grav aksent',iacute:'Liten i med akutt aksent',icirc:'Liten i med cirkumfleks',iuml:'Liten i med tøddel',eth:'Liten edd/stungen d',ntilde:'Liten n med tilde',ograve:'Liten o med grav aksent',oacute:'Liten o med akutt aksent',ocirc:'Liten o med cirkumfleks',otilde:'Liten o med tilde',ouml:'Liten o med tøddel',divide:'Divisjonstegn',oslash:'Liten ø',ugrave:'Liten u med grav aksent',uacute:'Liten u med akutt aksent',ucirc:'Liten u med cirkumfleks',uuml:'Liten u med tøddel',yacute:'Liten y med akutt aksent',thorn:'Liten thorn',yuml:'Liten y med tøddel',OElig:'Stor ligatur av O og E',oelig:'Liten ligatur av o og e',372:'Stor W med cirkumfleks',374:'Stor Y med cirkumfleks',373:'Liten w med cirkumfleks',375:'Liten y med cirkumfleks',sbquo:'Enkelt lavt 9-anførselstegn',8219:'Enkelt høyt reversert 9-anførselstegn',bdquo:'Dobbelt lavt 9-anførselstegn',hellip:'Ellipse',trade:'Varemerkesymbol',9658:'Svart høyrevendt peker',bull:'Tykk interpunkt',rarr:'Høyrevendt pil',rArr:'Dobbel høyrevendt pil',hArr:'Dobbel venstrevendt pil',diams:'Svart ruter',asymp:'Omtrent likhetstegn'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/nl.js b/web/imcms/ckeditor/plugins/specialchar/lang/nl.js
new file mode 100644
index 0000000000..8107f98818
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/nl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','nl',{euro:'Euro-teken',lsquo:'Linker enkel aanhalingsteken',rsquo:'Rechter enkel aanhalingsteken',ldquo:'Linker dubbel aanhalingsteken',rdquo:'Rechter dubbel aanhalingsteken',ndash:'En dash',mdash:'Em dash',iexcl:'Omgekeerd uitroepteken',cent:'Cent-teken',pound:'Pond-teken',curren:'Valuta-teken',yen:'Yen-teken',brvbar:'Gebroken streep',sect:'Paragraaf-teken',uml:'Trema',copy:'Copyright-teken',ordf:'Vrouwelijk ordinaal',laquo:'Linker guillemet',not:'Ongelijk-teken',reg:'Geregistreerd handelsmerk-teken',macr:'Macron',deg:'Graden-teken',sup2:'Superscript twee',sup3:'Superscript drie',acute:'Accent aigu',micro:'Mico-teken',para:'Alinea-teken',middot:'Halfhoge punt',cedil:'Cedille',sup1:'Superscript een',ordm:'Mannelijk ordinaal',raquo:'Rechter guillemet',frac14:'Breuk kwart',frac12:'Breuk half',frac34:'Breuk driekwart',iquest:'Omgekeerd vraagteken',Agrave:'Latijnse hoofdletter A met een accent grave',Aacute:'Latijnse hoofdletter A met een accent aigu',Acirc:'Latijnse hoofdletter A met een circonflexe',Atilde:'Latijnse hoofdletter A met een tilde',Auml:'Latijnse hoofdletter A met een trema',Aring:'Latijnse hoofdletter A met een corona',AElig:'Latijnse hoofdletter Æ',Ccedil:'Latijnse hoofdletter C met een cedille',Egrave:'Latijnse hoofdletter E met een accent grave',Eacute:'Latijnse hoofdletter E met een accent aigu',Ecirc:'Latijnse hoofdletter E met een circonflexe',Euml:'Latijnse hoofdletter E met een trema',Igrave:'Latijnse hoofdletter I met een accent grave',Iacute:'Latijnse hoofdletter I met een accent aigu',Icirc:'Latijnse hoofdletter I met een circonflexe',Iuml:'Latijnse hoofdletter I met een trema',ETH:'Latijnse hoofdletter Eth',Ntilde:'Latijnse hoofdletter N met een tilde',Ograve:'Latijnse hoofdletter O met een accent grave',Oacute:'Latijnse hoofdletter O met een accent aigu',Ocirc:'Latijnse hoofdletter O met een circonflexe',Otilde:'Latijnse hoofdletter O met een tilde',Ouml:'Latijnse hoofdletter O met een trema',times:'Maal-teken',Oslash:'Latijnse hoofdletter O met een schuine streep',Ugrave:'Latijnse hoofdletter U met een accent grave',Uacute:'Latijnse hoofdletter U met een accent aigu',Ucirc:'Latijnse hoofdletter U met een circonflexe',Uuml:'Latijnse hoofdletter U met een trema',Yacute:'Latijnse hoofdletter Y met een accent aigu',THORN:'Latijnse hoofdletter Thorn',szlig:'Latijnse kleine ringel-s',agrave:'Latijnse kleine letter a met een accent grave',aacute:'Latijnse kleine letter a met een accent aigu',acirc:'Latijnse kleine letter a met een circonflexe',atilde:'Latijnse kleine letter a met een tilde',auml:'Latijnse kleine letter a met een trema',aring:'Latijnse kleine letter a met een corona',aelig:'Latijnse kleine letter æ',ccedil:'Latijnse kleine letter c met een cedille',egrave:'Latijnse kleine letter e met een accent grave',eacute:'Latijnse kleine letter e met een accent aigu',ecirc:'Latijnse kleine letter e met een circonflexe',euml:'Latijnse kleine letter e met een trema',igrave:'Latijnse kleine letter i met een accent grave',iacute:'Latijnse kleine letter i met een accent aigu',icirc:'Latijnse kleine letter i met een circonflexe',iuml:'Latijnse kleine letter i met een trema',eth:'Latijnse kleine letter eth',ntilde:'Latijnse kleine letter n met een tilde',ograve:'Latijnse kleine letter o met een accent grave',oacute:'Latijnse kleine letter o met een accent aigu',ocirc:'Latijnse kleine letter o met een circonflexe',otilde:'Latijnse kleine letter o met een tilde',ouml:'Latijnse kleine letter o met een trema',divide:'Deel-teken',oslash:'Latijnse kleine letter o met een schuine streep',ugrave:'Latijnse kleine letter u met een accent grave',uacute:'Latijnse kleine letter u met een accent aigu',ucirc:'Latijnse kleine letter u met een circonflexe',uuml:'Latijnse kleine letter u met een trema',yacute:'Latijnse kleine letter y met een accent aigu',thorn:'Latijnse kleine letter thorn',yuml:'Latijnse kleine letter y met een trema',OElig:'Latijnse hoofdletter Œ',oelig:'Latijnse kleine letter œ',372:'Latijnse hoofdletter W met een circonflexe',374:'Latijnse hoofdletter Y met een circonflexe',373:'Latijnse kleine letter w met een circonflexe',375:'Latijnse kleine letter y met een circonflexe',sbquo:'Lage enkele aanhalingsteken',8219:'Hoge omgekeerde enkele aanhalingsteken',bdquo:'Lage dubbele aanhalingsteken',hellip:'Beletselteken',trade:'Trademark-teken',9658:'Zwarte driehoek naar rechts',bull:'Bullet',rarr:'Pijl naar rechts',rArr:'Dubbele pijl naar rechts',hArr:'Dubbele pijl naar links',diams:'Zwart ruitje',asymp:'Benaderingsteken'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/no.js b/web/imcms/ckeditor/plugins/specialchar/lang/no.js
new file mode 100644
index 0000000000..b9dfcc138d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/no.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','no',{euro:'Eurosymbol',lsquo:'Venstre enkelt anførselstegn',rsquo:'Høyre enkelt anførselstegn',ldquo:'Venstre dobbelt anførselstegn',rdquo:'Høyre anførsesltegn',ndash:'Kort tankestrek',mdash:'Lang tankestrek',iexcl:'Omvendt utropstegn',cent:'Centsymbol',pound:'Pundsymbol',curren:'Valutategn',yen:'Yensymbol',brvbar:'Brutt loddrett strek',sect:'Paragraftegn',uml:'Tøddel',copy:'Copyrighttegn',ordf:'Feminin ordensindikator',laquo:'Venstre anførselstegn',not:'Negasjonstegn',reg:'Registrert varemerke-tegn',macr:'Makron',deg:'Gradsymbol',sup2:'Hevet totall',sup3:'Hevet tretall',acute:'Akutt aksent',micro:'Mikrosymbol',para:'Avsnittstegn',middot:'Midtstilt prikk',cedil:'Cedille',sup1:'Hevet ettall',ordm:'Maskulin ordensindikator',raquo:'Høyre anførselstegn',frac14:'Fjerdedelsbrøk',frac12:'Halvbrøk',frac34:'Tre fjerdedelers brøk',iquest:'Omvendt spørsmålstegn',Agrave:'Stor A med grav aksent',Aacute:'Stor A med akutt aksent',Acirc:'Stor A med cirkumfleks',Atilde:'Stor A med tilde',Auml:'Stor A med tøddel',Aring:'Stor Å',AElig:'Stor Æ',Ccedil:'Stor C med cedille',Egrave:'Stor E med grav aksent',Eacute:'Stor E med akutt aksent',Ecirc:'Stor E med cirkumfleks',Euml:'Stor E med tøddel',Igrave:'Stor I med grav aksent',Iacute:'Stor I med akutt aksent',Icirc:'Stor I med cirkumfleks',Iuml:'Stor I med tøddel',ETH:'Stor Edd/stungen D',Ntilde:'Stor N med tilde',Ograve:'Stor O med grav aksent',Oacute:'Stor O med akutt aksent',Ocirc:'Stor O med cirkumfleks',Otilde:'Stor O med tilde',Ouml:'Stor O med tøddel',times:'Multiplikasjonstegn',Oslash:'Stor Ø',Ugrave:'Stor U med grav aksent',Uacute:'Stor U med akutt aksent',Ucirc:'Stor U med cirkumfleks',Uuml:'Stor U med tøddel',Yacute:'Stor Y med akutt aksent',THORN:'Stor Thorn',szlig:'Liten dobbelt-s/Eszett',agrave:'Liten a med grav aksent',aacute:'Liten a med akutt aksent',acirc:'Liten a med cirkumfleks',atilde:'Liten a med tilde',auml:'Liten a med tøddel',aring:'Liten å',aelig:'Liten æ',ccedil:'Liten c med cedille',egrave:'Liten e med grav aksent',eacute:'Liten e med akutt aksent',ecirc:'Liten e med cirkumfleks',euml:'Liten e med tøddel',igrave:'Liten i med grav aksent',iacute:'Liten i med akutt aksent',icirc:'Liten i med cirkumfleks',iuml:'Liten i med tøddel',eth:'Liten edd/stungen d',ntilde:'Liten n med tilde',ograve:'Liten o med grav aksent',oacute:'Liten o med akutt aksent',ocirc:'Liten o med cirkumfleks',otilde:'Liten o med tilde',ouml:'Liten o med tøddel',divide:'Divisjonstegn',oslash:'Liten ø',ugrave:'Liten u med grav aksent',uacute:'Liten u med akutt aksent',ucirc:'Liten u med cirkumfleks',uuml:'Liten u med tøddel',yacute:'Liten y med akutt aksent',thorn:'Liten thorn',yuml:'Liten y med tøddel',OElig:'Stor ligatur av O og E',oelig:'Liten ligatur av o og e',372:'Stor W med cirkumfleks',374:'Stor Y med cirkumfleks',373:'Liten w med cirkumfleks',375:'Liten y med cirkumfleks',sbquo:'Enkelt lavt 9-anførselstegn',8219:'Enkelt høyt reversert 9-anførselstegn',bdquo:'Dobbelt lavt 9-anførselstegn',hellip:'Ellipse',trade:'Varemerkesymbol',9658:'Svart høyrevendt peker',bull:'Tykk interpunkt',rarr:'Høyrevendt pil',rArr:'Dobbel høyrevendt pil',hArr:'Dobbel venstrevendt pil',diams:'Svart ruter',asymp:'Omtrent likhetstegn'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/pt-br.js b/web/imcms/ckeditor/plugins/specialchar/lang/pt-br.js
new file mode 100644
index 0000000000..171c7db050
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/pt-br.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','pt-br',{euro:'Euro',lsquo:'Aspas simples esquerda',rsquo:'Aspas simples direita',ldquo:'Aspas duplas esquerda',rdquo:'Aspas duplas direita',ndash:'Traço',mdash:'Travessão',iexcl:'Ponto de exclamação invertido',cent:'Cent',pound:'Cerquilha',curren:'Dinheiro',yen:'Yen',brvbar:'Bara interrompida',sect:'Símbolo de Parágrafo',uml:'Trema',copy:'Direito de Cópia',ordf:'Indicador ordinal feminino',laquo:'Aspas duplas angulares esquerda',not:'Negação',reg:'Marca Registrada',macr:'Mácron',deg:'Grau',sup2:'2 Superscrito',sup3:'3 Superscrito',acute:'Acento agudo',micro:'Micro',para:'Pé de mosca',middot:'Ponto mediano',cedil:'Cedilha',sup1:'1 Superscrito',ordm:'Indicador ordinal masculino',raquo:'Aspas duplas angulares direita',frac14:'Um quarto',frac12:'Um meio',frac34:'Três quartos',iquest:'Interrogação invertida',Agrave:'A maiúsculo com acento grave',Aacute:'A maiúsculo com acento agudo',Acirc:'A maiúsculo com acento circunflexo',Atilde:'A maiúsculo com til',Auml:'A maiúsculo com trema',Aring:'A maiúsculo com anel acima',AElig:'Æ maiúsculo',Ccedil:'Ç maiúlculo',Egrave:'E maiúsculo com acento grave',Eacute:'E maiúsculo com acento agudo',Ecirc:'E maiúsculo com acento circumflexo',Euml:'E maiúsculo com trema',Igrave:'I maiúsculo com acento grave',Iacute:'I maiúsculo com acento agudo',Icirc:'I maiúsculo com acento circunflexo',Iuml:'I maiúsculo com crase',ETH:'Eth maiúsculo',Ntilde:'N maiúsculo com til',Ograve:'O maiúsculo com acento grave',Oacute:'O maiúsculo com acento agudo',Ocirc:'O maiúsculo com acento circunflexo',Otilde:'O maiúsculo com til',Ouml:'O maiúsculo com trema',times:'Multiplicação',Oslash:'Diâmetro',Ugrave:'U maiúsculo com acento grave',Uacute:'U maiúsculo com acento agudo',Ucirc:'U maiúsculo com acento circunflexo',Uuml:'U maiúsculo com trema',Yacute:'Y maiúsculo com acento agudo',THORN:'Thorn maiúsculo',szlig:'Eszett minúsculo',agrave:'a minúsculo com acento grave',aacute:'a minúsculo com acento agudo',acirc:'a minúsculo com acento circunflexo',atilde:'a minúsculo com til',auml:'a minúsculo com trema',aring:'a minúsculo com anel acima',aelig:'æ minúsculo',ccedil:'ç minúsculo',egrave:'e minúsculo com acento grave',eacute:'e minúsculo com acento agudo',ecirc:'e minúsculo com acento circunflexo',euml:'e minúsculo com trema',igrave:'i minúsculo com acento grave',iacute:'i minúsculo com acento agudo',icirc:'i minúsculo com acento circunflexo',iuml:'i minúsculo com trema',eth:'eth minúsculo',ntilde:'n minúsculo com til',ograve:'o minúsculo com acento grave',oacute:'o minúsculo com acento agudo',ocirc:'o minúsculo com acento circunflexo',otilde:'o minúsculo com til',ouml:'o minúsculo com trema',divide:'Divisão',oslash:'o minúsculo com cortado ou diâmetro',ugrave:'u minúsculo com acento grave',uacute:'u minúsculo com acento agudo',ucirc:'u minúsculo com acento circunflexo',uuml:'u minúsculo com trema',yacute:'y minúsculo com acento agudo',thorn:'thorn minúsculo',yuml:'y minúsculo com trema',OElig:'Ligação tipográfica OE maiúscula',oelig:'Ligação tipográfica oe minúscula',372:'W maiúsculo com acento circunflexo',374:'Y maiúsculo com acento circunflexo',373:'w minúsculo com acento circunflexo',375:'y minúsculo com acento circunflexo',sbquo:'Aspas simples inferior direita',8219:'Aspas simples superior esquerda',bdquo:'Aspas duplas inferior direita',hellip:'Reticências',trade:'Trade mark',9658:'Ponta de seta preta para direita',bull:'Ponto lista',rarr:'Seta para direita',rArr:'Seta dupla para direita',hArr:'Seta dupla direita e esquerda',diams:'Ouros',asymp:'Aproximadamente'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/sk.js b/web/imcms/ckeditor/plugins/specialchar/lang/sk.js
new file mode 100644
index 0000000000..1a80c9e143
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/sk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','sk',{euro:'Znak eura',lsquo:'Ľavá jednoduchá úvodzovka',rsquo:'Pravá jednoduchá úvodzovka',ldquo:'Pravá dvojitá úvodzovka',rdquo:'Pravá dvojitá úvodzovka',ndash:'En poml�ka',mdash:'Em poml�ka',iexcl:'Obrátený výkri�ník',cent:'Znak centu',pound:'Znak libry',curren:'Znak meny',yen:'Znak jenu',brvbar:'Prerušená zvislá �iara',sect:'Znak odseku',uml:'Prehláska',copy:'Znak copyrightu',ordf:'Ženský indikátor rodu',laquo:'Znak dvojitých lomených úvodzoviek vľavo',not:'Logistický zápor',reg:'Znak registrácie',macr:'Poml�ka nad',deg:'Znak stupňa',sup2:'Dvojka ako horný index',sup3:'Trojka ako horný index',acute:'Dĺžeň',micro:'Znak mikro',para:'Znak odstavca',middot:'Bodka uprostred',cedil:'Chvost vľavo',sup1:'Jednotka ako horný index',ordm:'Mužský indikátor rodu',raquo:'Znak dvojitých lomených úvodzoviek vpravo',frac14:'Oby�ajný zlomok jedna štvrtina',frac12:'Oby�ajný zlomok jedna polovica',frac34:'Oby�ajný zlomok tri štvrtiny',iquest:'Oto�ený otáznik',Agrave:'Veľké písmeno latinky A s accentom',Aacute:'Veľké písmeno latinky A s dĺžňom',Acirc:'Veľké písmeno latinky A s mäk�eňom',Atilde:'Veľké písmeno latinky A s tildou',Auml:'Veľké písmeno latinky A s dvoma bodkami',Aring:'Veľké písmeno latinky A s krúžkom nad',AElig:'Veľké písmeno latinky Æ',Ccedil:'Veľké písmeno latinky C s chvostom vľavo',Egrave:'Veľké písmeno latinky E s accentom',Eacute:'Veľké písmeno latinky E s dĺžňom',Ecirc:'Veľké písmeno latinky E s mäk�eňom',Euml:'Veľké písmeno latinky E s dvoma bodkami',Igrave:'Veľké písmeno latinky I s accentom',Iacute:'Veľké písmeno latinky I s dĺžňom',Icirc:'Veľké písmeno latinky I s mäk�eňom',Iuml:'Veľké písmeno latinky I s dvoma bodkami',ETH:'Veľké písmeno latinky Eth',Ntilde:'Veľké písmeno latinky N s tildou',Ograve:'Veľké písmeno latinky O s accentom',Oacute:'Veľké písmeno latinky O s dĺžňom',Ocirc:'Veľké písmeno latinky O s mäk�eňom',Otilde:'Veľké písmeno latinky O s tildou',Ouml:'Veľké písmeno latinky O s dvoma bodkami',times:'Znak násobenia',Oslash:'Veľké písmeno latinky O preškrtnuté',Ugrave:'Veľké písmeno latinky U s accentom',Uacute:'Veľké písmeno latinky U s dĺžňom',Ucirc:'Veľké písmeno latinky U s mäk�eňom',Uuml:'Veľké písmeno latinky U s dvoma bodkami',Yacute:'Veľké písmeno latinky Y s dĺžňom',THORN:'Veľké písmeno latinky Thorn',szlig:'Malé písmeno latinky ostré s',agrave:'Malé písmeno latinky a s accentom',aacute:'Malé písmeno latinky a s dĺžňom',acirc:'Malé písmeno latinky a s mäk�eňom',atilde:'Malé písmeno latinky a s tildou',auml:'Malé písmeno latinky a s dvoma bodkami',aring:'Malé písmeno latinky a s krúžkom nad',aelig:'Malé písmeno latinky æ',ccedil:'Malé písmeno latinky c s chvostom vľavo',egrave:'Malé písmeno latinky e s accentom',eacute:'Malé písmeno latinky e s dĺžňom',ecirc:'Malé písmeno latinky e s mäk�eňom',euml:'Malé písmeno latinky e s dvoma bodkami',igrave:'Malé písmeno latinky i s accentom',iacute:'Malé písmeno latinky i s dĺžňom',icirc:'Malé písmeno latinky i s mäk�eňom',iuml:'Malé písmeno latinky i s dvoma bodkami',eth:'Malé písmeno latinky eth',ntilde:'Malé písmeno latinky n s tildou',ograve:'Malé písmeno latinky o s accentom',oacute:'Malé písmeno latinky o s dĺžňom',ocirc:'Malé písmeno latinky o s mäk�eňom',otilde:'Malé písmeno latinky o s tildou',ouml:'Malé písmeno latinky o s dvoma bodkami',divide:'Znak delenia',oslash:'Malé písmeno latinky o preškrtnuté',ugrave:'Malé písmeno latinky u s accentom',uacute:'Malé písmeno latinky u s dĺžňom',ucirc:'Malé písmeno latinky u s mäk�eňom',uuml:'Malé písmeno latinky u s dvoma bodkami',yacute:'Malé písmeno latinky y s dĺžňom',thorn:'Malé písmeno latinky thorn',yuml:'Malé písmeno latinky y s dvoma bodkami',OElig:'Veľká ligatúra latinky OE',oelig:'Malá ligatúra latinky OE',372:'Veľké písmeno latinky W s mäk�eňom',374:'Veľké písmeno latinky Y s mäk�eňom',373:'Malé písmeno latinky w s mäk�eňom',375:'Malé písmeno latinky y s mäk�eňom',sbquo:'Dolná jednoduchá 9-úvodzovka',8219:'Horná jednoduchá oto�ená 9-úvodzovka',bdquo:'Dolná dvojitá 9-úvodzovka',hellip:'Trojbodkový úvod',trade:'Znak ibchodnej zna�ky',9658:'Čierny ukazovateľ smerujúci vpravo',bull:'Kruh',rarr:'Šípka vpravo',rArr:'Dvojitá šipka vpravo',hArr:'Dvojitá šipka vľavo a vpravo',diams:'Čierne piky',asymp:'Skoro sa rovná'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/tr.js b/web/imcms/ckeditor/plugins/specialchar/lang/tr.js
new file mode 100644
index 0000000000..30a23a50cd
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/tr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','tr',{euro:'Euro işareti',lsquo:'Sol tek tırnak işareti',rsquo:'Sağ tek tırnak işareti',ldquo:'Sol çift tırnak işareti',rdquo:'Sağ çift tırnak işareti',ndash:'En tire',mdash:'Em tire',iexcl:'Ters ünlem işareti',cent:'Cent işareti',pound:'Pound işareti',curren:'Para birimi işareti',yen:'Yen işareti',brvbar:'Kırık bar',sect:'Bölüm işareti',uml:'İki sesli harfin ayrılması',copy:'Telif hakkı işareti',ordf:'Dişil sıralı gösterge',laquo:'Sol-işaret çift açı tırnak işareti',not:'Not işareti',reg:'Kayıtlı işareti',macr:'Makron',deg:'Derece işareti',sup2:'İkili üstsimge',sup3:'Üçlü üstsimge',acute:'Aksan işareti',micro:'Mikro işareti',para:'Pilcrow işareti',middot:'Orta nokta',cedil:'Kedilla',sup1:'Üstsimge',ordm:'Eril sıralı gösterge',raquo:'Sağ işaret çift açı tırnak işareti',frac14:'Bayağı kesrin dörtte biri',frac12:'Bayağı kesrin bir yarım',frac34:'Bayağı kesrin dörtte üç',iquest:'Ters soru işareti',Agrave:'Aksanlı latin harfi',Aacute:'Aşırı aksanıyla Latin harfi',Acirc:'Çarpık Latin harfi',Atilde:'Tilde latin harfi',Auml:'Sesli harf ayrılımlıı latin harfi',Aring:'Halkalı latin büyük A harfi',AElig:'Latin büyük Æ harfi',Ccedil:'Latin büyük C harfi ile kedilla',Egrave:'Aksanlı latin büyük E harfi',Eacute:'Aşırı vurgulu latin büyük E harfi',Ecirc:'Çarpık latin büyük E harfi',Euml:'Sesli harf ayrılımlıı latin büyük E harfi',Igrave:'Aksanlı latin büyük I harfi',Iacute:'Aşırı aksanlı latin büyük I harfi',Icirc:'Çarpık latin büyük I harfi',Iuml:'Sesli harf ayrılımlıı latin büyük I harfi',ETH:'Latin büyük Eth harfi',Ntilde:'Tildeli latin büyük N harfi',Ograve:'Aksanlı latin büyük O harfi',Oacute:'Aşırı aksanlı latin büyük O harfi',Ocirc:'Çarpık latin büyük O harfi',Otilde:'Tildeli latin büyük O harfi',Ouml:'Sesli harf ayrılımlı latin büyük O harfi',times:'Çarpma işareti',Oslash:'Vurgulu latin büyük O harfi',Ugrave:'Aksanlı latin büyük U harfi',Uacute:'Aşırı aksanlı latin büyük U harfi',Ucirc:'Çarpık latin büyük U harfi',Uuml:'Sesli harf ayrılımlı latin büyük U harfi',Yacute:'Aşırı aksanlı latin büyük Y harfi',THORN:'Latin büyük Thorn harfi',szlig:'Latin küçük keskin s harfi',agrave:'Aksanlı latin küçük a harfi',aacute:'Aşırı aksanlı latin küçük a harfi',acirc:'Çarpık latin küçük a harfi',atilde:'Tildeli latin küçük a harfi',auml:'Sesli harf ayrılımlı latin küçük a harfi',aring:'Halkalı latin küçük a harfi',aelig:'Latin büyük æ harfi',ccedil:'Kedillalı latin küçük c harfi',egrave:'Aksanlı latin küçük e harfi',eacute:'Aşırı aksanlı latin küçük e harfi',ecirc:'Çarpık latin küçük e harfi',euml:'Sesli harf ayrılımlı latin küçük e harfi',igrave:'Aksanlı latin küçük i harfi',iacute:'Aşırı aksanlı latin küçük i harfi',icirc:'Çarpık latin küçük i harfi',iuml:'Sesli harf ayrılımlı latin küçük i harfi',eth:'Latin küçük eth harfi',ntilde:'Tildeli latin küçük n harfi',ograve:'Aksanlı latin küçük o harfi',oacute:'Aşırı aksanlı latin küçük o harfi',ocirc:'Çarpık latin küçük o harfi',otilde:'Tildeli latin küçük o harfi',ouml:'Sesli harf ayrılımlı latin küçük o harfi',divide:'Bölme işareti',oslash:'Vurgulu latin küçük o harfi',ugrave:'Aksanlı latin küçük u harfi',uacute:'Aşırı aksanlı latin küçük u harfi',ucirc:'Çarpık latin küçük u harfi',uuml:'Sesli harf ayrılımlı latin küçük u harfi',yacute:'Aşırı aksanlı latin küçük y harfi',thorn:'Latin küçük thorn harfi',yuml:'Sesli harf ayrılımlı latin küçük y harfi',OElig:'Latin büyük bağlı OE harfi',oelig:'Latin küçük bağlı oe harfi',372:'Çarpık latin büyük W harfi',374:'Çarpık latin büyük Y harfi',373:'Çarpık latin küçük w harfi',375:'Çarpık latin küçük y harfi',sbquo:'Tek düşük-9 tırnak işareti',8219:'Tek yüksek-ters-9 tırnak işareti',bdquo:'Çift düşük-9 tırnak işareti',hellip:'Yatay elips',trade:'Marka tescili işareti',9658:'Siyah sağ işaret işaretçisi',bull:'Koyu nokta',rarr:'Sağa doğru ok',rArr:'Sağa doğru çift ok',hArr:'Sol, sağ çift ok',diams:'Siyah elmas takımı',asymp:'Hemen hemen eşit'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/ug.js b/web/imcms/ckeditor/plugins/specialchar/lang/ug.js
new file mode 100644
index 0000000000..2b95a6ae81
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/ug.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','ug',{euro:'ياۋرو بەلگىسى',lsquo:'يالاڭ پەش سول',rsquo:'يالاڭ پەش ئوڭ',ldquo:'قوش پەش سول',rdquo:'قوش پەش ئوڭ',ndash:'سىزىقچە',mdash:'سىزىق',iexcl:'ئۈندەش',cent:'تىيىن بەلگىسى',pound:'�وند ست�رلىڭ',curren:'پۇل بەلگىسى',yen:'ياپونىيە يىنى',brvbar:'ئۈزۈك بالداق',sect:'پاراگرا� بەلگىسى',uml:'تاۋۇش ئايرىش بەلگىسى',copy:'نەشر ھوقۇقى بەلگىسى',ordf:'Feminine ordinal indicator',laquo:'قوش تىرناق سول',not:'غەيرى بەلگە',reg:'خەتلەتكەن تاۋار ماركىسى',macr:'سوزۇش بەلگىسى',deg:'گىرادۇس بەلگىسى',sup2:'يۇقىرى ئىند�كىس 2',sup3:'يۇقىرى ئىند�كىس 3',acute:'ئۇرغۇ بەلگىسى',micro:'Micro sign',para:'ئابزاس بەلگىسى',middot:'ئوتتۇرا چ�كىت',cedil:'ئاستىغا قوشۇلىدىغان بەلگە',sup1:'يۇقىرى ئىند�كىس 1',ordm:'Masculine ordinal indicator',raquo:'قوش تىرناق ئوڭ',frac14:'ئاددىي كەسىر تۆتتىن بىر',frac12:'ئاددىي كەسىر ئىككىدىن بىر',frac34:'ئاددىي كەسىر ئۈچتىن تۆرت',iquest:'Inverted question mark',Agrave:'Latin capital letter A with grave accent',Aacute:'Latin capital letter A with acute accent',Acirc:'Latin capital letter A with circumflex',Atilde:'Latin capital letter A with tilde',Auml:'Latin capital letter A with diaeresis',Aring:'Latin capital letter A with ring above',AElig:'Latin Capital letter Æ',Ccedil:'Latin capital letter C with cedilla',Egrave:'Latin capital letter E with grave accent',Eacute:'Latin capital letter E with acute accent',Ecirc:'Latin capital letter E with circumflex',Euml:'Latin capital letter E with diaeresis',Igrave:'Latin capital letter I with grave accent',Iacute:'Latin capital letter I with acute accent',Icirc:'Latin capital letter I with circumflex',Iuml:'Latin capital letter I with diaeresis',ETH:'Latin capital letter Eth',Ntilde:'Latin capital letter N with tilde',Ograve:'قوش پەش ئوڭ',Oacute:'Latin capital letter O with acute accent',Ocirc:'Latin capital letter O with circumflex',Otilde:'Latin capital letter O with tilde',Ouml:'Latin capital letter O with diaeresis',times:'Multiplication sign',Oslash:'Latin capital letter O with stroke',Ugrave:'Latin capital letter U with grave accent',Uacute:'Latin capital letter U with acute accent',Ucirc:'Latin capital letter U with circumflex',Uuml:'Latin capital letter U with diaeresis',Yacute:'Latin capital letter Y with acute accent',THORN:'Latin capital letter Thorn',szlig:'Latin small letter sharp s',agrave:'Latin small letter a with grave accent',aacute:'Latin small letter a with acute accent',acirc:'Latin small letter a with circumflex',atilde:'Latin small letter a with tilde',auml:'Latin small letter a with diaeresis',aring:'Latin small letter a with ring above',aelig:'Latin small letter æ',ccedil:'Latin small letter c with cedilla',egrave:'Latin small letter e with grave accent',eacute:'Latin small letter e with acute accent',ecirc:'Latin small letter e with circumflex',euml:'Latin small letter e with diaeresis',igrave:'Latin small letter i with grave accent',iacute:'Latin small letter i with acute accent',icirc:'Latin small letter i with circumflex',iuml:'Latin small letter i with diaeresis',eth:'Latin small letter eth',ntilde:'تىك موللاق سوئال بەلگىسى',ograve:'Latin small letter o with grave accent',oacute:'Latin small letter o with acute accent',ocirc:'Latin small letter o with circumflex',otilde:'Latin small letter o with tilde',ouml:'Latin small letter o with diaeresis',divide:'Division sign',oslash:'Latin small letter o with stroke',ugrave:'Latin small letter u with grave accent',uacute:'Latin small letter u with acute accent',ucirc:'Latin small letter u with circumflex',uuml:'Latin small letter u with diaeresis',yacute:'Latin small letter y with acute accent',thorn:'Latin small letter thorn',yuml:'Latin small letter y with diaeresis',OElig:'Latin capital ligature OE',oelig:'Latin small ligature oe',372:'Latin capital letter W with circumflex',374:'Latin capital letter Y with circumflex',373:'Latin small letter w with circumflex',375:'Latin small letter y with circumflex',sbquo:'Single low-9 quotation mark',8219:'Single high-reversed-9 quotation mark',bdquo:'Double low-9 quotation mark',hellip:'Horizontal ellipsis',trade:'Trade mark sign',9658:'Black right-pointing pointer',bull:'Bullet',rarr:'ئوڭ يا ئوق',rArr:'ئوڭ قوش سىزىق يا ئوق',hArr:'ئوڭ سول قوش سىزىق يا ئوق',diams:'ئۇيۇل غىچ',asymp:'تەخمىنەن تەڭ'});
diff --git a/web/imcms/ckeditor/plugins/specialchar/lang/zh-cn.js b/web/imcms/ckeditor/plugins/specialchar/lang/zh-cn.js
new file mode 100644
index 0000000000..b1c538b275
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/specialchar/lang/zh-cn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('specialchar','zh-cn',{euro:'欧元符�',lsquo:'左�引�',rsquo:'��引�',ldquo:'左�引�',rdquo:'��引�',ndash:'短划线',mdash:'破折�',iexcl:'竖翻��',cent:'分�标记',pound:'英镑标记',curren:'货�标记',yen:'日元标记',brvbar:'间断�',sect:'节标记',uml:'分音符',copy:'版�所有标记',ordf:'阴性顺�指示符',laquo:'左指�尖引�',not:'�标记',reg:'注册标记',macr:'长音符',deg:'度标记',sup2:'上标二',sup3:'上标三',acute:'�音符',micro:'微符',para:'段�标记',middot:'中间点',cedil:'下加符',sup1:'上标一',ordm:'阳性顺�指示符',raquo:'�指�尖引�',frac14:'普通分数四分之一',frac12:'普通分数二分之一',frac34:'普通分数四分之三',iquest:'竖翻问�',Agrave:'带抑音符的拉�文大写字� A',Aacute:'带�音符的拉�文大写字� A',Acirc:'带扬抑符的拉�文大写字� A',Atilde:'带颚化符的拉�文大写字� A',Auml:'带分音符的拉�文大写字� A',Aring:'带上圆圈的拉�文大写字� A',AElig:'拉�文大写字� Ae',Ccedil:'带下加符的拉�文大写字� C',Egrave:'带抑音符的拉�文大写字� E',Eacute:'带�音符的拉�文大写字� E',Ecirc:'带扬抑符的拉�文大写字� E',Euml:'带分音符的拉�文大写字� E',Igrave:'带抑音符的拉�文大写字� I',Iacute:'带�音符的拉�文大写字� I',Icirc:'带扬抑符的拉�文大写字� I',Iuml:'带分音符的拉�文大写字� I',ETH:'拉�文大写字� Eth',Ntilde:'带颚化符的拉�文大写字� N',Ograve:'带抑音符的拉�文大写字� O',Oacute:'带�音符的拉�文大写字� O',Ocirc:'带扬抑符的拉�文大写字� O',Otilde:'带颚化符的拉�文大写字� O',Ouml:'带分音符的拉�文大写字� O',times:'乘�',Oslash:'带粗线的拉�文大写字� O',Ugrave:'带抑音符的拉�文大写字� U',Uacute:'带�音符的拉�文大写字� U',Ucirc:'带扬抑符的拉�文大写字� U',Uuml:'带分音符的拉�文大写字� U',Yacute:'带抑音符的拉�文大写字� Y',THORN:'拉�文大写字� Thorn',szlig:'拉�文�写字�清音 S',agrave:'带抑音符的拉�文�写字� A',aacute:'带�音符的拉�文�写字� A',acirc:'带扬抑符的拉�文�写字� A',atilde:'带颚化符的拉�文�写字� A',auml:'带分音符的拉�文�写字� A',aring:'带上圆圈的拉�文�写字� A',aelig:'拉�文�写字� Ae',ccedil:'带下加符的拉�文�写字� C',egrave:'带抑音符的拉�文�写字� E',eacute:'带�音符的拉�文�写字� E',ecirc:'带扬抑符的拉�文�写字� E',euml:'带分音符的拉�文�写字� E',igrave:'带抑音符的拉�文�写字� I',iacute:'带�音符的拉�文�写字� I',icirc:'带扬抑符的拉�文�写字� I',iuml:'带分音符的拉�文�写字� I',eth:'拉�文�写字� Eth',ntilde:'带颚化符的拉�文�写字� N',ograve:'带抑音符的拉�文�写字� O',oacute:'带�音符的拉�文�写字� O',ocirc:'带扬抑符的拉�文�写字� O',otilde:'带颚化符的拉�文�写字� O',ouml:'带分音符的拉�文�写字� O',divide:'除�',oslash:'带粗线的拉�文�写字� O',ugrave:'带抑音符的拉�文�写字� U',uacute:'带�音符的拉�文�写字� U',ucirc:'带扬抑符的拉�文�写字� U',uuml:'带分音符的拉�文�写字� U',yacute:'带抑音符的拉�文�写字� Y',thorn:'拉�文�写字� Thorn',yuml:'带分音符的拉�文�写字� Y',OElig:'拉�文大写连字 Oe',oelig:'拉�文�写连字 Oe',372:'带扬抑符的拉�文大写字� W',374:'带扬抑符的拉�文大写字� Y',373:'带扬抑符的拉�文�写字� W',375:'带扬抑符的拉�文�写字� Y',sbquo:'�下 9 形引�',8219:'�高横翻 9 形引�',bdquo:'�下 9 形引�',hellip:'水平�略�',trade:'商标标志',9658:'实心�指指针',bull:'加��',rarr:'��箭头',rArr:'���线箭头',hArr:'左��线箭头',diams:'实心方�纸牌',asymp:'约等于'});
diff --git a/web/imcms/ckeditor/plugins/styles/styles/default.js b/web/imcms/ckeditor/plugins/styles/styles/default.js
new file mode 100644
index 0000000000..9fdc98fa04
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/styles/styles/default.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.stylesSet.add('default',[{name:'Blue Title',element:'h3',styles:{color:'Blue'}},{name:'Red Title',element:'h3',styles:{color:'Red'}},{name:'Marker: Yellow',element:'span',styles:{'background-color':'Yellow'}},{name:'Marker: Green',element:'span',styles:{'background-color':'Lime'}},{name:'Big',element:'big'},{name:'Small',element:'small'},{name:'Typewriter',element:'tt'},{name:'Computer Code',element:'code'},{name:'Keyboard Phrase',element:'kbd'},{name:'Sample Text',element:'samp'},{name:'Variable',element:'var'},{name:'Deleted Text',element:'del'},{name:'Inserted Text',element:'ins'},{name:'Cited Work',element:'cite'},{name:'Inline Quotation',element:'q'},{name:'Language: RTL',element:'span',attributes:{dir:'rtl'}},{name:'Language: LTR',element:'span',attributes:{dir:'ltr'}},{name:'Image on Left',element:'img',attributes:{style:'padding: 5px; margin-right: 5px',border:'2',align:'left'}},{name:'Image on Right',element:'img',attributes:{style:'padding: 5px; margin-left: 5px',border:'2',align:'right'}},{name:'Borderless Table',element:'table',styles:{'border-style':'hidden','background-color':'#E6E6FA'}},{name:'Square Bulleted List',element:'ul',styles:{'list-style-type':'square'}}]);
diff --git a/web/imcms/ckeditor/plugins/stylesheetparser/plugin.js b/web/imcms/ckeditor/plugins/stylesheetparser/plugin.js
new file mode 100644
index 0000000000..935d449a61
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/stylesheetparser/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){function a(c,d,e){var f=c.join(' ');f=f.replace(/(,|>|\+|~)/g,' ');f=f.replace(/\[[^\]]*/g,'');f=f.replace(/#[^\s]*/g,'');f=f.replace(/\:{1,2}[^\s]*/g,'');f=f.replace(/\s+/g,' ');var g=f.split(' '),h=[];for(var i=0;i<g.length;i++){var j=g[i];if(e.test(j)&&!d.test(j))if(CKEDITOR.tools.indexOf(h,j)==-1)h.push(j);}return h;};function b(c,d,e){var f=[],g=[],h;for(h=0;h<c.styleSheets.length;h++){var i=c.styleSheets[h],j=i.ownerNode||i.owningElement;if(j.getAttribute('data-cke-temp'))continue;if(i.href&&i.href.substr(0,9)=='chrome://')continue;var k=i.cssRules||i.rules;for(var l=0;l<k.length;l++)g.push(k[l].selectorText);}var m=a(g,d,e);for(h=0;h<m.length;h++){var n=m[h].split('.'),o=n[0].toLowerCase(),p=n[1];f.push({name:o+'.'+p,element:o,attributes:{'class':p}});}return f;};CKEDITOR.plugins.add('stylesheetparser',{requires:['styles'],onLoad:function(){var c=CKEDITOR.editor.prototype;c.getStylesSet=CKEDITOR.tools.override(c.getStylesSet,function(d){return function(e){var f=this;d.call(this,function(g){var h=f.config.stylesheetParser_skipSelectors||/(^body\.|^\.)/i,i=f.config.stylesheetParser_validSelectors||/\w+\.\w+/;e(f._.stylesDefinitions=g.concat(b(f.document.$,h,i)));});};});}});})();
diff --git a/web/imcms/ckeditor/plugins/table/dialogs/table.js b/web/imcms/ckeditor/plugins/table/dialogs/table.js
new file mode 100644
index 0000000000..12541f3efb
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/table/dialogs/table.js
@@ -0,0 +1,9 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=CKEDITOR.tools.cssLength,b=function(f){var g=this.id;if(!f.info)f.info={};f.info[g]=this.getValue();};function c(f){var g=0,h=0;for(var i=0,j,k=f.$.rows.length;i<k;i++){j=f.$.rows[i],g=0;for(var l=0,m,n=j.cells.length;l<n;l++){m=j.cells[l];g+=m.colSpan;}g>h&&(h=g);}return h;};function d(f){return function(){var g=this.getValue(),h=!!(CKEDITOR.dialog.validate.integer()(g)&&g>0);if(!h){alert(f);this.select();}return h;};};function e(f,g){var h=function(j){return new CKEDITOR.dom.element(j,f.document);},i=f.plugins.dialogadvtab;return{title:f.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?310:280,onLoad:function(){var j=this,k=j.getContentElement('advanced','advStyles');if(k)k.on('change',function(l){var m=this.getStyle('width',''),n=j.getContentElement('info','txtWidth');n&&n.setValue(m,true);var o=this.getStyle('height',''),p=j.getContentElement('info','txtHeight');p&&p.setValue(o,true);});},onShow:function(){var r=this;var j=f.getSelection(),k=j.getRanges(),l=null,m=r.getContentElement('info','txtRows'),n=r.getContentElement('info','txtCols'),o=r.getContentElement('info','txtWidth'),p=r.getContentElement('info','txtHeight');if(g=='tableProperties'){if(l=j.getSelectedElement())l=l.getAscendant('table',true);else if(k.length>0){if(CKEDITOR.env.webkit)k[0].shrink(CKEDITOR.NODE_ELEMENT);var q=k[0].getCommonAncestor(true);l=q.getAscendant('table',true);}r._.selectedElement=l;}if(l){r.setupContent(l);m&&m.disable();n&&n.disable();}else{m&&m.enable();n&&n.enable();}o&&o.onChange();p&&p.onChange();},onOk:function(){var j=f.getSelection(),k=this._.selectedElement&&j.createBookmarks(),l=this._.selectedElement||h('table'),m=this,n={};this.commitContent(n,l);if(n.info){var o=n.info;if(!this._.selectedElement){var p=l.append(h('tbody')),q=parseInt(o.txtRows,10)||0,r=parseInt(o.txtCols,10)||0;for(var s=0;s<q;s++){var t=p.append(h('tr'));for(var u=0;u<r;u++){var v=t.append(h('td'));if(!CKEDITOR.env.ie)v.append(h('br'));}}}var w=o.selHeaders;if(!l.$.tHead&&(w=='row'||w=='both')){var x=new CKEDITOR.dom.element(l.$.createTHead());p=l.getElementsByTag('tbody').getItem(0);var y=p.getElementsByTag('tr').getItem(0);for(s=0;s<y.getChildCount();s++){var z=y.getChild(s);if(z.type==CKEDITOR.NODE_ELEMENT&&!z.data('cke-bookmark')){z.renameNode('th');z.setAttribute('scope','col');}}x.append(y.remove());}if(l.$.tHead!==null&&!(w=='row'||w=='both')){x=new CKEDITOR.dom.element(l.$.tHead);p=l.getElementsByTag('tbody').getItem(0);var A=p.getFirst();while(x.getChildCount()>0){y=x.getFirst();
+for(s=0;s<y.getChildCount();s++){var B=y.getChild(s);if(B.type==CKEDITOR.NODE_ELEMENT){B.renameNode('td');B.removeAttribute('scope');}}y.insertBefore(A);}x.remove();}if(!this.hasColumnHeaders&&(w=='col'||w=='both'))for(t=0;t<l.$.rows.length;t++){B=new CKEDITOR.dom.element(l.$.rows[t].cells[0]);B.renameNode('th');B.setAttribute('scope','row');}if(this.hasColumnHeaders&&!(w=='col'||w=='both'))for(s=0;s<l.$.rows.length;s++){t=new CKEDITOR.dom.element(l.$.rows[s]);if(t.getParent().getName()=='tbody'){B=new CKEDITOR.dom.element(t.$.cells[0]);B.renameNode('td');B.removeAttribute('scope');}}o.txtHeight?l.setStyle('height',o.txtHeight):l.removeStyle('height');o.txtWidth?l.setStyle('width',o.txtWidth):l.removeStyle('width');if(!l.getAttribute('style'))l.removeAttribute('style');}if(!this._.selectedElement){f.insertElement(l);setTimeout(function(){var C=new CKEDITOR.dom.element(l.$.rows[0].cells[0]),D=new CKEDITOR.dom.range(f.document);D.moveToPosition(C,CKEDITOR.POSITION_AFTER_START);D.select(1);},0);}else try{j.selectBookmarks(k);}catch(C){}},contents:[{id:'info',label:f.lang.table.title,elements:[{type:'hbox',widths:[null,null],styles:['vertical-align:top'],children:[{type:'vbox',padding:0,children:[{type:'text',id:'txtRows','default':3,label:f.lang.table.rows,required:true,controlStyle:'width:5em',validate:d(f.lang.table.invalidRows),setup:function(j){this.setValue(j.$.rows.length);},commit:b},{type:'text',id:'txtCols','default':2,label:f.lang.table.columns,required:true,controlStyle:'width:5em',validate:d(f.lang.table.invalidCols),setup:function(j){this.setValue(c(j));},commit:b},{type:'html',html:'&nbsp;'},{type:'select',id:'selHeaders','default':'',label:f.lang.table.headers,items:[[f.lang.table.headersNone,''],[f.lang.table.headersRow,'row'],[f.lang.table.headersColumn,'col'],[f.lang.table.headersBoth,'both']],setup:function(j){var k=this.getDialog();k.hasColumnHeaders=true;for(var l=0;l<j.$.rows.length;l++){var m=j.$.rows[l].cells[0];if(m&&m.nodeName.toLowerCase()!='th'){k.hasColumnHeaders=false;break;}}if(j.$.tHead!==null)this.setValue(k.hasColumnHeaders?'both':'row');else this.setValue(k.hasColumnHeaders?'col':'');},commit:b},{type:'text',id:'txtBorder','default':1,label:f.lang.table.border,controlStyle:'width:3em',validate:CKEDITOR.dialog.validate.number(f.lang.table.invalidBorder),setup:function(j){this.setValue(j.getAttribute('border')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('border',this.getValue());else k.removeAttribute('border');
+}},{id:'cmbAlign',type:'select','default':'',label:f.lang.common.align,items:[[f.lang.common.notSet,''],[f.lang.common.alignLeft,'left'],[f.lang.common.alignCenter,'center'],[f.lang.common.alignRight,'right']],setup:function(j){this.setValue(j.getAttribute('align')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('align',this.getValue());else k.removeAttribute('align');}}]},{type:'vbox',padding:0,children:[{type:'hbox',widths:['5em'],children:[{type:'text',id:'txtWidth',controlStyle:'width:5em',label:f.lang.common.width,title:f.lang.common.cssLengthTooltip,'default':500,getValue:a,validate:CKEDITOR.dialog.validate.cssLength(f.lang.common.invalidCssLength.replace('%1',f.lang.common.width)),onChange:function(){var j=this.getDialog().getContentElement('advanced','advStyles');j&&j.updateStyle('width',this.getValue());},setup:function(j){var k=j.getStyle('width');k&&this.setValue(k);},commit:b}]},{type:'hbox',widths:['5em'],children:[{type:'text',id:'txtHeight',controlStyle:'width:5em',label:f.lang.common.height,title:f.lang.common.cssLengthTooltip,'default':'',getValue:a,validate:CKEDITOR.dialog.validate.cssLength(f.lang.common.invalidCssLength.replace('%1',f.lang.common.height)),onChange:function(){var j=this.getDialog().getContentElement('advanced','advStyles');j&&j.updateStyle('height',this.getValue());},setup:function(j){var k=j.getStyle('height');k&&this.setValue(k);},commit:b}]},{type:'html',html:'&nbsp;'},{type:'text',id:'txtCellSpace',controlStyle:'width:3em',label:f.lang.table.cellSpace,'default':1,validate:CKEDITOR.dialog.validate.number(f.lang.table.invalidCellSpacing),setup:function(j){this.setValue(j.getAttribute('cellSpacing')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('cellSpacing',this.getValue());else k.removeAttribute('cellSpacing');}},{type:'text',id:'txtCellPad',controlStyle:'width:3em',label:f.lang.table.cellPad,'default':1,validate:CKEDITOR.dialog.validate.number(f.lang.table.invalidCellPadding),setup:function(j){this.setValue(j.getAttribute('cellPadding')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('cellPadding',this.getValue());else k.removeAttribute('cellPadding');}}]}]},{type:'html',align:'right',html:''},{type:'vbox',padding:0,children:[{type:'text',id:'txtCaption',label:f.lang.table.caption,setup:function(j){var n=this;n.enable();var k=j.getElementsByTag('caption');if(k.count()>0){var l=k.getItem(0),m=l.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));if(m&&!m.equals(l.getBogus())){n.disable();
+n.setValue(l.getText());return;}l=CKEDITOR.tools.trim(l.getText());n.setValue(l);}},commit:function(j,k){if(!this.isEnabled())return;var l=this.getValue(),m=k.getElementsByTag('caption');if(l){if(m.count()>0){m=m.getItem(0);m.setHtml('');}else{m=new CKEDITOR.dom.element('caption',f.document);if(k.getChildCount())m.insertBefore(k.getFirst());else m.appendTo(k);}m.append(new CKEDITOR.dom.text(l,f.document));}else if(m.count()>0)for(var n=m.count()-1;n>=0;n--)m.getItem(n).remove();}},{type:'text',id:'txtSummary',label:f.lang.table.summary,setup:function(j){this.setValue(j.getAttribute('summary')||'');},commit:function(j,k){if(this.getValue())k.setAttribute('summary',this.getValue());else k.removeAttribute('summary');}}]}]},i&&i.createAdvancedTab(f)]};};CKEDITOR.dialog.add('table',function(f){return e(f,'table');});CKEDITOR.dialog.add('tableProperties',function(f){return e(f,'tableProperties');});})();
diff --git a/web/imcms/ckeditor/plugins/tableresize/plugin.js b/web/imcms/ckeditor/plugins/tableresize/plugin.js
new file mode 100644
index 0000000000..64d24bf222
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/tableresize/plugin.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=CKEDITOR.tools.cssLength,b=CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks||CKEDITOR.env.version<7);function c(k){return CKEDITOR.env.ie?k.$.clientWidth:parseInt(k.getComputedStyle('width'),10);};function d(k,l){var m=k.getComputedStyle('border-'+l+'-width'),n={thin:'0px',medium:'1px',thick:'2px'};if(m.indexOf('px')<0)if(m in n&&k.getComputedStyle('border-style')!='none')m=n[m];else m=0;return parseInt(m,10);};function e(k){var l=k.$.rows,m=0,n,o,p;for(var q=0,r=l.length;q<r;q++){p=l[q];n=p.cells.length;if(n>m){m=n;o=p;}}return o;};function f(k){var l=[],m=-1,n=k.getComputedStyle('direction')=='rtl',o=e(k),p=new CKEDITOR.dom.element(k.$.tBodies[0]),q=p.getDocumentPosition();for(var r=0,s=o.cells.length;r<s;r++){var t=new CKEDITOR.dom.element(o.cells[r]),u=o.cells[r+1]&&new CKEDITOR.dom.element(o.cells[r+1]);m+=t.$.colSpan||1;var v,w,x,y=t.getDocumentPosition().x;n?w=y+d(t,'left'):v=y+t.$.offsetWidth-d(t,'right');if(u){y=u.getDocumentPosition().x;n?v=y+u.$.offsetWidth-d(u,'right'):w=y+d(u,'left');}else{y=k.getDocumentPosition().x;n?v=y:w=y+k.$.offsetWidth;}x=Math.max(w-v,3);l.push({table:k,index:m,x:v,y:q.y,width:x,height:p.$.offsetHeight,rtl:n});}return l;};function g(k,l){for(var m=0,n=k.length;m<n;m++){var o=k[m];if(l>=o.x&&l<=o.x+o.width)return o;}return null;};function h(k){(k.data||k).preventDefault();};function i(k){var l,m,n,o,p,q,r,s,t,u;function v(){l=null;q=0;o=0;m.removeListener('mouseup',A);n.removeListener('mousedown',z);n.removeListener('mousemove',B);m.getBody().setStyle('cursor','auto');b?n.remove():n.hide();};function w(){var D=l.index,E=CKEDITOR.tools.buildTableMap(l.table),F=[],G=[],H=Number.MAX_VALUE,I=H,J=l.rtl;for(var K=0,L=E.length;K<L;K++){var M=E[K],N=M[D+(J?1:0)],O=M[D+(J?0:1)];N=N&&new CKEDITOR.dom.element(N);O=O&&new CKEDITOR.dom.element(O);if(!N||!O||!N.equals(O)){N&&(H=Math.min(H,c(N)));O&&(I=Math.min(I,c(O)));F.push(N);G.push(O);}}r=F;s=G;t=l.x-H;u=l.x+I;n.setOpacity(0.5);p=parseInt(n.getStyle('left'),10);q=0;o=1;n.on('mousemove',B);m.on('dragstart',h);};function x(){o=0;n.setOpacity(0);q&&y();var D=l.table;setTimeout(function(){D.removeCustomData('_cke_table_pillars');},0);m.removeListener('dragstart',h);};function y(){var D=l.rtl,E=D?s.length:r.length;for(var F=0;F<E;F++){var G=r[F],H=s[F],I=l.table;CKEDITOR.tools.setTimeout(function(J,K,L,M,N,O){J&&J.setStyle('width',a(Math.max(K+O,0)));L&&L.setStyle('width',a(Math.max(M-O,0)));if(N)I.setStyle('width',a(N+O*(D?-1:1)));},0,this,[G,G&&c(G),H,H&&c(H),(!G||!H)&&c(I)+d(I,'left')+d(I,'right'),q]);
+}};function z(D){h(D);w();m.on('mouseup',A,this);};function A(D){D.removeListener();x();};function B(D){C(D.data.getPageOffset().x);};m=k.document;n=CKEDITOR.dom.element.createFromHtml('<div data-cke-temp=1 contenteditable=false unselectable=on style="position:absolute;cursor:col-resize;filter:alpha(opacity=0);opacity:0;padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"></div>',m);if(!b)m.getDocumentElement().append(n);this.attachTo=function(D){if(o)return;if(b){m.getBody().append(n);q=0;}l=D;n.setStyles({width:a(D.width),height:a(D.height),left:a(D.x),top:a(D.y)});b&&n.setOpacity(0.25);n.on('mousedown',z,this);m.getBody().setStyle('cursor','col-resize');n.show();};var C=this.move=function(D){if(!l)return 0;if(!o&&(D<l.x||D>l.x+l.width)){v();return 0;}var E=D-Math.round(n.$.offsetWidth/2);if(o){if(E==t||E==u)return 1;E=Math.max(E,t);E=Math.min(E,u);q=E-p;}n.setStyle('left',a(E));return 1;};};function j(k){var l=k.data.getTarget();if(k.name=='mouseout'){if(!l.is('table'))return;var m=new CKEDITOR.dom.element(k.data.$.relatedTarget||k.data.$.toElement);while(m&&m.$&&!m.equals(l)&&!m.is('body'))m=m.getParent();if(!m||m.equals(l))return;}l.getAscendant('table',1).removeCustomData('_cke_table_pillars');k.removeListener();};CKEDITOR.plugins.add('tableresize',{requires:['tabletools'],init:function(k){k.on('contentDom',function(){var l;k.document.getBody().on('mousemove',function(m){m=m.data;var n=m.getPageOffset().x;if(l&&l.move(n)){h(m);return;}var o=m.getTarget(),p,q;if(!o.is('table')&&!o.getAscendant('tbody',1))return;p=o.getAscendant('table',1);if(!(q=p.getCustomData('_cke_table_pillars'))){p.setCustomData('_cke_table_pillars',q=f(p));p.on('mouseout',j);p.on('mousedown',j);}var r=g(q,n);if(r){!l&&(l=new i(k));l.attachTo(r);}});});}});})();
diff --git a/web/imcms/ckeditor/plugins/tabletools/dialogs/tableCell.js b/web/imcms/ckeditor/plugins/tabletools/dialogs/tableCell.js
new file mode 100644
index 0000000000..fea02ccc9a
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('cellProperties',function(a){var b=a.lang.table,c=b.cell,d=a.lang.common,e=CKEDITOR.dialog.validate,f=/^(\d+(?:\.\d+)?)(px|%)$/,g=/^(\d+(?:\.\d+)?)px$/,h=CKEDITOR.tools.bind,i={type:'html',html:'&nbsp;'},j=a.lang.dir=='rtl';function k(l,m){var n=function(){var r=this;p(r);m(r,r._.parentDialog);r._.parentDialog.changeFocus();},o=function(){p(this);this._.parentDialog.changeFocus();},p=function(r){r.removeListener('ok',n);r.removeListener('cancel',o);},q=function(r){r.on('ok',n);r.on('cancel',o);};a.execCommand(l);if(a._.storedDialogs.colordialog)q(a._.storedDialogs.colordialog);else CKEDITOR.on('dialogDefinition',function(r){if(r.data.name!=l)return;var s=r.data.definition;r.removeListener();s.onLoad=CKEDITOR.tools.override(s.onLoad,function(t){return function(){q(this);s.onLoad=t;if(typeof t=='function')t.call(this);};});});};return{title:c.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?450:410,minHeight:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?230:220,contents:[{id:'info',label:c.title,accessKey:'I',elements:[{type:'hbox',widths:['40%','5%','40%'],children:[{type:'vbox',padding:0,children:[{type:'hbox',widths:['70%','30%'],children:[{type:'text',id:'width',width:'100px',label:d.width,validate:e.number(c.invalidWidth),onLoad:function(){var l=this.getDialog().getContentElement('info','widthType'),m=l.getElement(),n=this.getInputElement(),o=n.getAttribute('aria-labelledby');n.setAttribute('aria-labelledby',[o,m.$.id].join(' '));},setup:function(l){var m=parseInt(l.getAttribute('width'),10),n=parseInt(l.getStyle('width'),10);!isNaN(m)&&this.setValue(m);!isNaN(n)&&this.setValue(n);},commit:function(l){var m=parseInt(this.getValue(),10),n=this.getDialog().getValueOf('info','widthType');if(!isNaN(m))l.setStyle('width',m+n);else l.removeStyle('width');l.removeAttribute('width');},'default':''},{type:'select',id:'widthType',label:a.lang.table.widthUnit,labelStyle:'visibility:hidden','default':'px',items:[[b.widthPx,'px'],[b.widthPc,'%']],setup:function(l){var m=f.exec(l.getStyle('width')||l.getAttribute('width'));if(m)this.setValue(m[2]);}}]},{type:'hbox',widths:['70%','30%'],children:[{type:'text',id:'height',label:d.height,width:'100px','default':'',validate:e.number(c.invalidHeight),onLoad:function(){var l=this.getDialog().getContentElement('info','htmlHeightType'),m=l.getElement(),n=this.getInputElement(),o=n.getAttribute('aria-labelledby');n.setAttribute('aria-labelledby',[o,m.$.id].join(' '));},setup:function(l){var m=parseInt(l.getAttribute('height'),10),n=parseInt(l.getStyle('height'),10);
+!isNaN(m)&&this.setValue(m);!isNaN(n)&&this.setValue(n);},commit:function(l){var m=parseInt(this.getValue(),10);if(!isNaN(m))l.setStyle('height',CKEDITOR.tools.cssLength(m));else l.removeStyle('height');l.removeAttribute('height');}},{id:'htmlHeightType',type:'html',html:'<br />'+b.widthPx}]},i,{type:'select',id:'wordWrap',label:c.wordWrap,'default':'yes',items:[[c.yes,'yes'],[c.no,'no']],setup:function(l){var m=l.getAttribute('noWrap'),n=l.getStyle('white-space');if(n=='nowrap'||m)this.setValue('no');},commit:function(l){if(this.getValue()=='no')l.setStyle('white-space','nowrap');else l.removeStyle('white-space');l.removeAttribute('noWrap');}},i,{type:'select',id:'hAlign',label:c.hAlign,'default':'',items:[[d.notSet,''],[d.alignLeft,'left'],[d.alignCenter,'center'],[d.alignRight,'right']],setup:function(l){var m=l.getAttribute('align'),n=l.getStyle('text-align');this.setValue(n||m||'');},commit:function(l){var m=this.getValue();if(m)l.setStyle('text-align',m);else l.removeStyle('text-align');l.removeAttribute('align');}},{type:'select',id:'vAlign',label:c.vAlign,'default':'',items:[[d.notSet,''],[d.alignTop,'top'],[d.alignMiddle,'middle'],[d.alignBottom,'bottom'],[c.alignBaseline,'baseline']],setup:function(l){var m=l.getAttribute('vAlign'),n=l.getStyle('vertical-align');switch(n){case 'top':case 'middle':case 'bottom':case 'baseline':break;default:n='';}this.setValue(n||m||'');},commit:function(l){var m=this.getValue();if(m)l.setStyle('vertical-align',m);else l.removeStyle('vertical-align');l.removeAttribute('vAlign');}}]},i,{type:'vbox',padding:0,children:[{type:'select',id:'cellType',label:c.cellType,'default':'td',items:[[c.data,'td'],[c.header,'th']],setup:function(l){this.setValue(l.getName());},commit:function(l){l.renameNode(this.getValue());}},i,{type:'text',id:'rowSpan',label:c.rowSpan,'default':'',validate:e.integer(c.invalidRowSpan),setup:function(l){var m=parseInt(l.getAttribute('rowSpan'),10);if(m&&m!=1)this.setValue(m);},commit:function(l){var m=parseInt(this.getValue(),10);if(m&&m!=1)l.setAttribute('rowSpan',this.getValue());else l.removeAttribute('rowSpan');}},{type:'text',id:'colSpan',label:c.colSpan,'default':'',validate:e.integer(c.invalidColSpan),setup:function(l){var m=parseInt(l.getAttribute('colSpan'),10);if(m&&m!=1)this.setValue(m);},commit:function(l){var m=parseInt(this.getValue(),10);if(m&&m!=1)l.setAttribute('colSpan',this.getValue());else l.removeAttribute('colSpan');}},i,{type:'hbox',padding:0,widths:['60%','40%'],children:[{type:'text',id:'bgColor',label:c.bgColor,'default':'',setup:function(l){var m=l.getAttribute('bgColor'),n=l.getStyle('background-color');
+this.setValue(n||m);},commit:function(l){var m=this.getValue();if(m)l.setStyle('background-color',this.getValue());else l.removeStyle('background-color');l.removeAttribute('bgColor');}},{type:'button',id:'bgColorChoose','class':'colorChooser',label:c.chooseColor,onLoad:function(){this.getElement().getParent().setStyle('vertical-align','bottom');},onClick:function(){var l=this;k('colordialog',function(m){l.getDialog().getContentElement('info','bgColor').setValue(m.getContentElement('picker','selectedColor').getValue());});}}]},i,{type:'hbox',padding:0,widths:['60%','40%'],children:[{type:'text',id:'borderColor',label:c.borderColor,'default':'',setup:function(l){var m=l.getAttribute('borderColor'),n=l.getStyle('border-color');this.setValue(n||m);},commit:function(l){var m=this.getValue();if(m)l.setStyle('border-color',this.getValue());else l.removeStyle('border-color');l.removeAttribute('borderColor');}},{type:'button',id:'borderColorChoose','class':'colorChooser',label:c.chooseColor,style:(j?'margin-right':'margin-left')+': 10px',onLoad:function(){this.getElement().getParent().setStyle('vertical-align','bottom');},onClick:function(){var l=this;k('colordialog',function(m){l.getDialog().getContentElement('info','borderColor').setValue(m.getContentElement('picker','selectedColor').getValue());});}}]}]}]}]}],onShow:function(){var l=this;l.cells=CKEDITOR.plugins.tabletools.getSelectedCells(l._.editor.getSelection());l.setupContent(l.cells[0]);},onOk:function(){var p=this;var l=p._.editor.getSelection(),m=l.createBookmarks(),n=p.cells;for(var o=0;o<n.length;o++)p.commitContent(n[o]);p._.editor.forceNextSelectionCheck();l.selectBookmarks(m);p._.editor.selectionChange();}};});
diff --git a/web/imcms/ckeditor/plugins/templates/dialogs/templates.js b/web/imcms/ckeditor/plugins/templates/dialogs/templates.js
new file mode 100644
index 0000000000..e3439e9782
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/templates/dialogs/templates.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){var a=CKEDITOR.document;CKEDITOR.dialog.add('templates',function(b){function c(k,l){k.setHtml('');for(var m=0,n=l.length;m<n;m++){var o=CKEDITOR.getTemplates(l[m]),p=o.imagesPath,q=o.templates,r=q.length;for(var s=0;s<r;s++){var t=q[s],u=d(t,p);u.setAttribute('aria-posinset',s+1);u.setAttribute('aria-setsize',r);k.append(u);}}};function d(k,l){var m=CKEDITOR.dom.element.createFromHtml('<a href="javascript:void(0)" tabIndex="-1" role="option" ><div class="cke_tpl_item"></div></a>'),n='<table style="width:350px;" class="cke_tpl_preview" role="presentation"><tr>';if(k.image&&l)n+='<td class="cke_tpl_preview_img"><img src="'+CKEDITOR.getUrl(l+k.image)+'"'+(CKEDITOR.env.ie6Compat?' onload="this.width=this.width"':'')+' alt="" title=""></td>';n+='<td style="white-space:normal;"><span class="cke_tpl_title">'+k.title+'</span><br/>';if(k.description)n+='<span>'+k.description+'</span>';n+='</td></tr></table>';m.getFirst().setHtml(n);m.on('click',function(){e(k.html);});return m;};function e(k){var l=CKEDITOR.dialog.getCurrent(),m=l.getValueOf('selectTpl','chkInsertOpt');if(m){b.on('contentDom',function(n){n.removeListener();l.hide();var o=new CKEDITOR.dom.range(b.document);o.moveToElementEditStart(b.document.getBody());o.select(1);setTimeout(function(){b.fire('saveSnapshot');},0);});b.fire('saveSnapshot');b.setData(k);}else{b.insertHtml(k);l.hide();}};function f(k){var l=k.data.getTarget(),m=g.equals(l);if(m||g.contains(l)){var n=k.data.getKeystroke(),o=g.getElementsByTag('a'),p;if(o){if(m)p=o.getItem(0);else switch(n){case 40:p=l.getNext();break;case 38:p=l.getPrevious();break;case 13:case 32:l.fire('click');}if(p){p.focus();k.data.preventDefault();}}}};CKEDITOR.skins.load(b,'templates');var g,h='cke_tpl_list_label_'+CKEDITOR.tools.getNextNumber(),i=b.lang.templates,j=b.config;return{title:b.lang.templates.title,minWidth:CKEDITOR.env.ie?440:400,minHeight:340,contents:[{id:'selectTpl',label:i.title,elements:[{type:'vbox',padding:5,children:[{id:'selectTplText',type:'html',html:'<span>'+i.selectPromptMsg+'</span>'},{id:'templatesList',type:'html',focus:true,html:'<div class="cke_tpl_list" tabIndex="-1" role="listbox" aria-labelledby="'+h+'">'+'<div class="cke_tpl_loading"><span></span></div>'+'</div>'+'<span class="cke_voice_label" id="'+h+'">'+i.options+'</span>'},{id:'chkInsertOpt',type:'checkbox',label:i.insertOption,'default':j.templates_replaceContent}]}]}],buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var k=this.getContentElement('selectTpl','templatesList');
+g=k.getElement();CKEDITOR.loadTemplates(j.templates_files,function(){var l=(j.templates||'default').split(',');if(l.length){c(g,l);k.focus();}else g.setHtml('<div class="cke_tpl_empty"><span>'+i.emptyListMsg+'</span>'+'</div>');});this._.element.on('keydown',f);},onHide:function(){this._.element.removeListener('keydown',f);}};});})();
diff --git a/web/imcms/ckeditor/plugins/templates/templates/default.js b/web/imcms/ckeditor/plugins/templates/templates/default.js
new file mode 100644
index 0000000000..203d4afb25
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/templates/templates/default.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.addTemplates('default',{imagesPath:CKEDITOR.getUrl(CKEDITOR.plugins.getPath('templates')+'templates/images/'),templates:[{title:'Image and Title',image:'template1.gif',description:'One main image with a title and text that surround the image.',html:'<h3><img style="margin-right: 10px" height="100" width="100" align="left"/>Type the title here</h3><p>Type the text here</p>'},{title:'Strange Template',image:'template2.gif',description:'A template that defines two colums, each one with a title, and some text.',html:'<table cellspacing="0" cellpadding="0" style="width:100%" border="0"><tr><td style="width:50%"><h3>Title 1</h3></td><td></td><td style="width:50%"><h3>Title 2</h3></td></tr><tr><td>Text 1</td><td></td><td>Text 2</td></tr></table><p>More text goes here.</p>'},{title:'Text and Table',image:'template3.gif',description:'A title with some text and a table.',html:'<div style="width: 80%"><h3>Title goes here</h3><table style="width:150px;float: right" cellspacing="0" cellpadding="0" border="1"><caption style="border:solid 1px black"><strong>Table title</strong></caption></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table><p>Type the text here</p></div>'}]});
diff --git a/web/imcms/ckeditor/plugins/templates/templates/images/template1.gif b/web/imcms/ckeditor/plugins/templates/templates/images/template1.gif
new file mode 100644
index 0000000000..efdabbebd4
Binary files /dev/null and b/web/imcms/ckeditor/plugins/templates/templates/images/template1.gif differ
diff --git a/web/imcms/ckeditor/plugins/templates/templates/images/template2.gif b/web/imcms/ckeditor/plugins/templates/templates/images/template2.gif
new file mode 100644
index 0000000000..d1cebb3aed
Binary files /dev/null and b/web/imcms/ckeditor/plugins/templates/templates/images/template2.gif differ
diff --git a/web/imcms/ckeditor/plugins/templates/templates/images/template3.gif b/web/imcms/ckeditor/plugins/templates/templates/images/template3.gif
new file mode 100644
index 0000000000..db41cb4fb8
Binary files /dev/null and b/web/imcms/ckeditor/plugins/templates/templates/images/template3.gif differ
diff --git a/web/imcms/ckeditor/plugins/uicolor/dialogs/uicolor.js b/web/imcms/ckeditor/plugins/uicolor/dialogs/uicolor.js
new file mode 100644
index 0000000000..aaae8f5f54
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/dialogs/uicolor.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('uicolor',function(a){var b,c,d,e=a.getUiColor(),f='cke_uicolor_picker'+CKEDITOR.tools.getNextNumber();function g(j){if(/^#/.test(j))j=window.YAHOO.util.Color.hex2rgb(j.substr(1));c.setValue(j,true);c.refresh(f);};function h(j,k){if(k||b._.contents.tab1.livePeview.getValue())a.setUiColor(j);b._.contents.tab1.configBox.setValue('config.uiColor = "#'+c.get('hex')+'"');};d={id:'yuiColorPicker',type:'html',html:"<div id='"+f+"' class='cke_uicolor_picker' style='width: 360px; height: 200px; position: relative;'></div>",onLoad:function(j){var k=CKEDITOR.getUrl('plugins/uicolor/yui/');c=new window.YAHOO.widget.ColorPicker(f,{showhsvcontrols:true,showhexcontrols:true,images:{PICKER_THUMB:k+'assets/picker_thumb.png',HUE_THUMB:k+'assets/hue_thumb.png'}});if(e)g(e);c.on('rgbChange',function(){b._.contents.tab1.predefined.setValue('');h('#'+c.get('hex'));});var l=new CKEDITOR.dom.nodeList(c.getElementsByTagName('input'));for(var m=0;m<l.count();m++)l.getItem(m).addClass('cke_dialog_ui_input_text');}};var i=true;return{title:a.lang.uicolor.title,minWidth:360,minHeight:320,onLoad:function(){b=this;this.setupContent();if(CKEDITOR.env.ie7Compat)b.parts.contents.setStyle('overflow','hidden');},contents:[{id:'tab1',label:'',title:'',expand:true,padding:0,elements:[d,{id:'tab1',type:'vbox',children:[{id:'livePeview',type:'checkbox',label:a.lang.uicolor.preview,'default':1,onLoad:function(){i=true;},onChange:function(){if(i)return;var j=this.getValue(),k=j?'#'+c.get('hex'):e;h(k,true);}},{type:'hbox',children:[{id:'predefined',type:'select','default':'',label:a.lang.uicolor.predefined,items:[[''],['Light blue','#9AB8F3'],['Sand','#D2B48C'],['Metallic','#949AAA'],['Purple','#C2A3C7'],['Olive','#A2C980'],['Happy green','#9BD446'],['Jezebel Blue','#14B8C4'],['Burn','#FF893A'],['Easy red','#FF6969'],['Pisces 3','#48B4F2'],['Aquarius 5','#487ED4'],['Absinthe','#A8CF76'],['Scrambled Egg','#C7A622'],['Hello monday','#8E8D80'],['Lovely sunshine','#F1E8B1'],['Recycled air','#B3C593'],['Down','#BCBCA4'],['Mark Twain','#CFE91D'],['Specks of dust','#D1B596'],['Lollipop','#F6CE23']],onChange:function(){var j=this.getValue();if(j){g(j);h(j);CKEDITOR.document.getById('predefinedPreview').setStyle('background',j);}else CKEDITOR.document.getById('predefinedPreview').setStyle('background','');},onShow:function(){var j=a.getUiColor();if(j)this.setValue(j);}},{id:'predefinedPreview',type:'html',html:'<div id="cke_uicolor_preview" style="border: 1px solid black; padding: 3px; width: 30px;"><div id="predefinedPreview" style="width: 30px; height: 30px;">&nbsp;</div></div>'}]},{id:'configBox',type:'text',label:a.lang.uicolor.config,onShow:function(){var j=a.getUiColor();
+if(j)this.setValue('config.uiColor = "'+j+'"');}}]}]}],buttons:[CKEDITOR.dialog.okButton]};});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/_translationstatus.txt b/web/imcms/ckeditor/plugins/uicolor/lang/_translationstatus.txt
new file mode 100644
index 0000000000..0e8604d714
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/_translationstatus.txt
@@ -0,0 +1,31 @@
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+bg.js      Found: 4 Missing: 0
+cs.js      Found: 4 Missing: 0
+cy.js      Found: 4 Missing: 0
+da.js      Found: 4 Missing: 0
+de.js      Found: 4 Missing: 0
+el.js      Found: 4 Missing: 0
+eo.js      Found: 4 Missing: 0
+et.js      Found: 4 Missing: 0
+fa.js      Found: 4 Missing: 0
+fi.js      Found: 4 Missing: 0
+fr.js      Found: 4 Missing: 0
+he.js      Found: 4 Missing: 0
+hr.js      Found: 4 Missing: 0
+it.js      Found: 4 Missing: 0
+ku.js      Found: 4 Missing: 0
+lv.js      Found: 4 Missing: 0
+mk.js      Found: 4 Missing: 0
+nb.js      Found: 4 Missing: 0
+nl.js      Found: 4 Missing: 0
+no.js      Found: 4 Missing: 0
+pl.js      Found: 4 Missing: 0
+pt-br.js   Found: 4 Missing: 0
+sk.js      Found: 4 Missing: 0
+tr.js      Found: 4 Missing: 0
+ug.js      Found: 4 Missing: 0
+uk.js      Found: 4 Missing: 0
+vi.js      Found: 4 Missing: 0
+zh-cn.js   Found: 4 Missing: 0
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/bg.js b/web/imcms/ckeditor/plugins/uicolor/lang/bg.js
new file mode 100644
index 0000000000..f86eac25e7
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/bg.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','bg',{uicolor:{title:'ПИ избор на цв�т',preview:'Преглед',config:'Вмъкнете този низ във Ваши� config.js fajl',predefined:'Предефинирани цветови палитри'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/cs.js b/web/imcms/ckeditor/plugins/uicolor/lang/cs.js
new file mode 100644
index 0000000000..15cd595ffc
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/cs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','cs',{uicolor:{title:'Výběr barvy rozhraní',preview:'Živý náhled',config:'Vložte tento řetězec do Vašeho souboru config.js',predefined:'Přednastavené sady barev'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/cy.js b/web/imcms/ckeditor/plugins/uicolor/lang/cy.js
new file mode 100644
index 0000000000..19543aa226
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/cy.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','cy',{uicolor:{title:"Dewisydd Lliwiau'r UI",preview:'Rhagolwg Byw',config:"Gludwch y llinyn hwn i'ch ffeil config.js",predefined:"Setiau lliw wedi'u cyn-ddiffinio"}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/da.js b/web/imcms/ckeditor/plugins/uicolor/lang/da.js
new file mode 100644
index 0000000000..f0c2d78b88
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/da.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','da',{uicolor:{title:'Brugerflade på farvevælger',preview:'Vis liveeksempel',config:'Indsæt denne streng i din config.js fil',predefined:'Prædefinerede farveskemaer'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/de.js b/web/imcms/ckeditor/plugins/uicolor/lang/de.js
new file mode 100644
index 0000000000..dd4ae6fd7f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/de.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','de',{uicolor:{title:'UI Pipette',preview:'Live-Vorschau',config:"Fügen Sie diese Zeichenfolge in die 'config.js' Datei.",predefined:'Vordefinierte Farbsätze'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/el.js b/web/imcms/ckeditor/plugins/uicolor/lang/el.js
new file mode 100644
index 0000000000..96fc1a941f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/el.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','el',{uicolor:{title:'Διεπαφή Επιλογέα Χ�ωμάτων',preview:'Ζωντανή Π�οεπισκόπηση',config:'Επικολλήστε αυτό το κείμενο στο α�χείο config.js',predefined:'Π�οκαθο�ισμένα σ�νολα χ�ωμάτων'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/en.js b/web/imcms/ckeditor/plugins/uicolor/lang/en.js
new file mode 100644
index 0000000000..90b996181c
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/en.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','en',{uicolor:{title:'UI Color Picker',preview:'Live preview',config:'Paste this string into your config.js file',predefined:'Predefined color sets'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/eo.js b/web/imcms/ckeditor/plugins/uicolor/lang/eo.js
new file mode 100644
index 0000000000..11674321a2
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/eo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','eo',{uicolor:{title:'UI Kolorselektilo',preview:'Vidigi la aspekton',config:'Gluu tiun signoĉenon en vian dosieron config.js',predefined:'Antaŭdifinita koloraro'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/et.js b/web/imcms/ckeditor/plugins/uicolor/lang/et.js
new file mode 100644
index 0000000000..4e1ea17f77
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/et.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','et',{uicolor:{title:'Värvivalija kasutajaliides',preview:'Automaatne eelvaade',config:'Aseta see sõne oma config.js faili.',predefined:'Eelmääratud värvikomplektid'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/fa.js b/web/imcms/ckeditor/plugins/uicolor/lang/fa.js
new file mode 100644
index 0000000000..0b126ac7be
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/fa.js
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'uicolor', 'fa',
+{
+	uicolor :
+	{
+		title : 'انتخاب رنگ UI',
+		preview : 'پیش‌نمایش زنده',
+		config : 'این رشته را در �ایل config.js خود بچسبانید.',
+		predefined : 'مجموعه رنگ از پیش تعری� شده'
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/fi.js b/web/imcms/ckeditor/plugins/uicolor/lang/fi.js
new file mode 100644
index 0000000000..53ebfd8f62
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/fi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','fi',{uicolor:{title:'Käyttöliittymän värivalitsin',preview:'Esikatsele',config:'Liitä tämä merkkijono config.js tiedostoosi',predefined:'Esimääritellyt värijoukot'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/fr.js b/web/imcms/ckeditor/plugins/uicolor/lang/fr.js
new file mode 100644
index 0000000000..0dbd4c158b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/fr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','fr',{uicolor:{title:'UI Sélecteur de couleur',preview:'Aperçu',config:'Collez cette chaîne de caractères dans votre fichier config.js',predefined:'Palettes de couleurs prédéfinies'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/he.js b/web/imcms/ckeditor/plugins/uicolor/lang/he.js
new file mode 100644
index 0000000000..872ae947ef
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/he.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','he',{uicolor:{title:'בחירת צבע ממשק משתמש',preview:'תצוגה מקדימה',config:'הדבק �ת הטקסט הב� לתוך הקובץ config.js',predefined:'קבוצות צבעי� מוגדרות מר�ש'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/hr.js b/web/imcms/ckeditor/plugins/uicolor/lang/hr.js
new file mode 100644
index 0000000000..0a2380bd7c
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/hr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','hr',{uicolor:{title:'UI odabir boja',preview:'Pregled uživo',config:'Zalijepite ovaj tekst u Vašu config.js datoteku.',predefined:'Već postavljeni setovi boja'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/it.js b/web/imcms/ckeditor/plugins/uicolor/lang/it.js
new file mode 100644
index 0000000000..87ccad8b14
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/it.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','it',{uicolor:{title:'Selettore Colore UI',preview:'Anteprima Live',config:'Incolla questa stringa nel tuo file config.js',predefined:'Set di colori predefiniti'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/ku.js b/web/imcms/ckeditor/plugins/uicolor/lang/ku.js
new file mode 100644
index 0000000000..86e41b5b0d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/ku.js
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'uicolor', 'ku',
+{
+	uicolor :
+	{
+		title : 'هه‌ڵگری ڕه‌نگ بۆ ڕووکاری به‌کارهێنه‌ر',
+		preview : 'پێشبینین به‌ زیندوویی',
+		config : 'ئه‌م ده‌قانه‌ بلکێنه‌ به‌ په‌ڕگه‌ی config.js-fil',
+		predefined : 'کۆمه‌ڵه‌ ڕه‌نگه‌ دیاریکراوه‌کانی پێشوو'
+	}
+});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/lv.js b/web/imcms/ckeditor/plugins/uicolor/lang/lv.js
new file mode 100644
index 0000000000..1ec1d8767c
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/lv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','lv',{uicolor:{title:'UI kr�sas izvēle',preview:'Priekšskatījums',config:'Ielīmējiet šo rindu jūsu config.js fail�',predefined:'Predefinēti kr�su komplekti'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/mk.js b/web/imcms/ckeditor/plugins/uicolor/lang/mk.js
new file mode 100644
index 0000000000..62cef1ee90
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/mk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','mk',{uicolor:{title:'Палета �о бои',preview:'Преглед',config:'Залепи го овој тек�т во config.js датотеката',predefined:'Предефинирани множе�тва на бои'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/nb.js b/web/imcms/ckeditor/plugins/uicolor/lang/nb.js
new file mode 100644
index 0000000000..e414b19e67
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/nb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','nb',{uicolor:{title:'Fargevelger for brukergrensesnitt',preview:'Forhåndsvisning i sanntid',config:'Lim inn følgende tekst i din config.js-fil',predefined:'Forhåndsdefinerte fargesett'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/nl.js b/web/imcms/ckeditor/plugins/uicolor/lang/nl.js
new file mode 100644
index 0000000000..02f66af17b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/nl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','nl',{uicolor:{title:'UI Kleurenkiezer',preview:'Live voorbeeld',config:'Plak deze tekst in jouw config.js bestand',predefined:'Voorgedefinieerde kleurensets'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/no.js b/web/imcms/ckeditor/plugins/uicolor/lang/no.js
new file mode 100644
index 0000000000..332c58797f
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/no.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','no',{uicolor:{title:'Fargevelger for brukergrensesnitt',preview:'Forhåndsvisning i sanntid',config:'Lim inn følgende tekst i din config.js-fil',predefined:'Forhåndsdefinerte fargesett'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/pl.js b/web/imcms/ckeditor/plugins/uicolor/lang/pl.js
new file mode 100644
index 0000000000..530b5b2707
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/pl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','pl',{uicolor:{title:'Wybór koloru interfejsu',preview:'Podgląd na żywo',config:'Wklej poniższy łańcuch znaków do pliku config.js:',predefined:'Predefiniowane zestawy kolorów'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/pt-br.js b/web/imcms/ckeditor/plugins/uicolor/lang/pt-br.js
new file mode 100644
index 0000000000..f5dba83163
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/pt-br.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','pt-br',{uicolor:{title:'Paleta de Cores',preview:'Visualização ao vivo',config:'Cole o texto no seu arquivo config.js',predefined:'Conjuntos de cores predefinidos'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/sk.js b/web/imcms/ckeditor/plugins/uicolor/lang/sk.js
new file mode 100644
index 0000000000..1ec499faa6
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/sk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','sk',{uicolor:{title:'UI výber farby',preview:'Živý náhľad',config:'Vložte tento reťazec do vášho config.js súboru',predefined:'Preddefinované sady farieb'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/tr.js b/web/imcms/ckeditor/plugins/uicolor/lang/tr.js
new file mode 100644
index 0000000000..982333031a
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/tr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','tr',{uicolor:{title:'UI Renk Seçicisi',preview:'Canlı önizleme',config:'Bu dizeyi config.js dosyasının içine yapıştırın',predefined:'Önceden tanımlanmış renk kümeleri'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/ug.js b/web/imcms/ckeditor/plugins/uicolor/lang/ug.js
new file mode 100644
index 0000000000..04a89052a8
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/ug.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','ug',{uicolor:{title:'ئىشلەتكۈچى ئارايۈزى رەڭ تاللىغۇچ',preview:'شۇئان ئالدىن كۆزىتىش',config:'بۇ ھەرپ تىزىقىنى config.js ھۆججەتكە چاپلايدۇ',predefined:'ئالدىن بەلگىلەنگەن رەڭلەر'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/uk.js b/web/imcms/ckeditor/plugins/uicolor/lang/uk.js
new file mode 100644
index 0000000000..72ab8e3ead
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/uk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','uk',{uicolor:{title:'Color Picker Інтерфей�',preview:'Перегл�д наживо',config:'В�тавте цей р�док у файл config.js',predefined:'Стандартний набір кольорів'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/vi.js b/web/imcms/ckeditor/plugins/uicolor/lang/vi.js
new file mode 100644
index 0000000000..65e95bcbf3
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/vi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','vi',{uicolor:{title:'Giao diện ngư�i dùng Color Picker',preview:'Xem trước trực tiếp',config:'Dán chuỗi này vào tập tin config.js của bạn',predefined:'Tập màu định nghĩa sẵn'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/lang/zh-cn.js b/web/imcms/ckeditor/plugins/uicolor/lang/zh-cn.js
new file mode 100644
index 0000000000..2f0d334300
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/lang/zh-cn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang('uicolor','zh-cn',{uicolor:{title:'用户界�颜色选择器',preview:'�时预览',config:'粘贴此字符串到您的 config.js 文件',predefined:'预定义颜色集'}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/plugin.js b/web/imcms/ckeditor/plugins/uicolor/plugin.js
new file mode 100644
index 0000000000..0a91934f81
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add('uicolor',{requires:['dialog'],lang:['bg','cs','cy','da','de','el','en','eo','et','fa','fi','fr','he','hr','it','ku','mk','nb','nl','no','pl','pt-br','sk','tr','ug','uk','vi','zh-cn'],init:function(a){if(CKEDITOR.env.ie6Compat)return;a.addCommand('uicolor',new CKEDITOR.dialogCommand('uicolor'));a.ui.addButton('UIColor',{label:a.lang.uicolor.title,command:'uicolor',icon:this.path+'uicolor.gif'});CKEDITOR.dialog.add('uicolor',this.path+'dialogs/uicolor.js');CKEDITOR.scriptLoader.load(CKEDITOR.getUrl('plugins/uicolor/yui/yui.js'));a.element.getDocument().appendStyleSheet(CKEDITOR.getUrl('plugins/uicolor/yui/assets/yui.css'));}});
diff --git a/web/imcms/ckeditor/plugins/uicolor/uicolor.gif b/web/imcms/ckeditor/plugins/uicolor/uicolor.gif
new file mode 100644
index 0000000000..ec33de6e5b
Binary files /dev/null and b/web/imcms/ckeditor/plugins/uicolor/uicolor.gif differ
diff --git a/web/imcms/ckeditor/plugins/uicolor/yui/assets/hue_bg.png b/web/imcms/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
new file mode 100644
index 0000000000..d9bcdeb5c4
Binary files /dev/null and b/web/imcms/ckeditor/plugins/uicolor/yui/assets/hue_bg.png differ
diff --git a/web/imcms/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png b/web/imcms/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
new file mode 100644
index 0000000000..14d5db4862
Binary files /dev/null and b/web/imcms/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png differ
diff --git a/web/imcms/ckeditor/plugins/uicolor/yui/assets/picker_mask.png b/web/imcms/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
new file mode 100644
index 0000000000..f8d91932b3
Binary files /dev/null and b/web/imcms/ckeditor/plugins/uicolor/yui/assets/picker_mask.png differ
diff --git a/web/imcms/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png b/web/imcms/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
new file mode 100644
index 0000000000..78445a2fe0
Binary files /dev/null and b/web/imcms/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png differ
diff --git a/web/imcms/ckeditor/plugins/uicolor/yui/assets/yui.css b/web/imcms/ckeditor/plugins/uicolor/yui/assets/yui.css
new file mode 100644
index 0000000000..23799b83d1
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/yui/assets/yui.css
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.yui-h-slider,.yui-v-slider{position:relative;}.yui-h-slider .yui-slider-thumb,.yui-v-slider .yui-slider-thumb{position:absolute;cursor:default;}.yui-skin-sam .yui-h-slider{background:url(bg-h.gif) no-repeat 5px 0;height:28px;width:228px;}.yui-skin-sam .yui-h-slider .yui-slider-thumb{top:4px;}.yui-skin-sam .yui-v-slider{background:url(bg-v.gif) no-repeat 12px 0;height:228px;width:48px;}.cke_uicolor_picker .yui-picker-panel{background:#e3e3e3;border-color:#888;}.cke_uicolor_picker .yui-picker-panel .hd{background-color:#ccc;font-size:100%;line-height:100%;border:1px solid #e3e3e3;font-weight:bold;overflow:hidden;padding:6px;color:#000;}.cke_uicolor_picker .yui-picker-panel .bd{background:#e8e8e8;margin:1px;height:200px;}.cke_uicolor_picker .yui-picker-panel .ft{background:#e8e8e8;margin:1px;padding:1px;}.cke_uicolor_picker .yui-picker{position:relative;}.cke_uicolor_picker .yui-picker-hue-thumb{cursor:default;width:18px;height:18px;top:-8px;left:-2px;z-index:9;position:absolute;}.cke_uicolor_picker .yui-picker-hue-bg{-moz-outline:none;outline:0 none;position:absolute;left:200px;height:183px;width:14px;background:url(hue_bg.png) no-repeat;top:4px;}.cke_uicolor_picker .yui-picker-bg{-moz-outline:none;outline:0 none;position:absolute;top:4px;left:4px;height:182px;width:182px;background-color:#F00;background-image:url(picker_mask.png);}*html .cke_uicolor_picker .yui-picker-bg{background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='picker_mask.png',sizingMethod='scale');}.cke_uicolor_picker .yui-picker-mask{position:absolute;z-index:1;top:0;left:0;}.cke_uicolor_picker .yui-picker-thumb{cursor:default;width:11px;height:11px;z-index:9;position:absolute;top:-4px;left:-4px;}.cke_uicolor_picker .yui-picker-swatch{position:absolute;left:240px;top:4px;height:60px;width:55px;border:1px solid #888;}.cke_uicolor_picker .yui-picker-websafe-swatch{position:absolute;left:304px;top:4px;height:24px;width:24px;border:1px solid #888;}.cke_uicolor_picker .yui-picker-controls{position:absolute;top:72px;left:226px;font:1em monospace;}.cke_uicolor_picker .yui-picker-controls .hd{background:transparent;border-width:0!important;}.cke_uicolor_picker .yui-picker-controls .bd{height:100px;border-width:0!important;}.cke_uicolor_picker .yui-picker-controls ul{float:left;padding:0 2px 0 0;margin:0;}.cke_uicolor_picker .yui-picker-controls li{padding:2px;list-style:none;margin:0;}.cke_uicolor_picker .yui-picker-controls input{font-size:.85em;width:2.4em;}.cke_uicolor_picker .yui-picker-hex-controls{clear:both;padding:2px;}.cke_uicolor_picker .yui-picker-hex-controls input{width:4.6em;}.cke_uicolor_picker .yui-picker-controls a{font:1em arial,helvetica,clean,sans-serif;display:block;*display:inline-block;padding:0;color:#000;}
diff --git a/web/imcms/ckeditor/plugins/uicolor/yui/yui.js b/web/imcms/ckeditor/plugins/uicolor/yui/yui.js
new file mode 100644
index 0000000000..89794fbe7d
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/uicolor/yui/yui.js
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/*jsl:ignoreall*/
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var A=arguments,E=null,C,B,D;for(C=0;C<A.length;C=C+1){D=(""+A[C]).split(".");E=YAHOO;for(B=(D[0]=="YAHOO")?1:0;B<D.length;B=B+1){E[D[B]]=E[D[B]]||{};E=E[D[B]];}}return E;};YAHOO.log=function(D,A,C){var B=YAHOO.widget.Logger;if(B&&B.log){return B.log(D,A,C);}else{return false;}};YAHOO.register=function(A,E,D){var I=YAHOO.env.modules,B,H,G,F,C;if(!I[A]){I[A]={versions:[],builds:[]};}B=I[A];H=D.version;G=D.build;F=YAHOO.env.listeners;B.name=A;B.version=H;B.build=G;B.versions.push(H);B.builds.push(G);B.mainClass=E;for(C=0;C<F.length;C=C+1){F[C](B);}if(E){E.VERSION=H;E.BUILD=G;}else{YAHOO.log("mainClass is undefined for module "+A,"warn");}};YAHOO.env=YAHOO.env||{modules:[],listeners:[]};YAHOO.env.getVersion=function(A){return YAHOO.env.modules[A]||null;};YAHOO.env.ua=function(){var C={ie:0,opera:0,gecko:0,webkit:0,mobile:null,air:0,caja:0},B=navigator.userAgent,A;if((/KHTML/).test(B)){C.webkit=1;}A=B.match(/AppleWebKit\/([^\s]*)/);if(A&&A[1]){C.webkit=parseFloat(A[1]);if(/ Mobile\//.test(B)){C.mobile="Apple";}else{A=B.match(/NokiaN[^\/]*/);if(A){C.mobile=A[0];}}A=B.match(/AdobeAIR\/([^\s]*)/);if(A){C.air=A[0];}}if(!C.webkit){A=B.match(/Opera[\s\/]([^\s]*)/);if(A&&A[1]){C.opera=parseFloat(A[1]);A=B.match(/Opera Mini[^;]*/);if(A){C.mobile=A[0];}}else{A=B.match(/MSIE\s([^;]*)/);if(A&&A[1]){C.ie=parseFloat(A[1]);}else{A=B.match(/Gecko\/([^\s]*)/);if(A){C.gecko=1;A=B.match(/rv:([^\s\)]*)/);if(A&&A[1]){C.gecko=parseFloat(A[1]);}}}}}A=B.match(/Caja\/([^\s]*)/);if(A&&A[1]){C.caja=parseFloat(A[1]);}return C;}();(function(){YAHOO.namespace("util","widget","example");if("undefined"!==typeof YAHOO_config){var B=YAHOO_config.listener,A=YAHOO.env.listeners,D=true,C;if(B){for(C=0;C<A.length;C=C+1){if(A[C]==B){D=false;break;}}if(D){A.push(B);}}}})();YAHOO.lang=YAHOO.lang||{};(function(){var B=YAHOO.lang,F="[object Array]",C="[object Function]",A=Object.prototype,E=["toString","valueOf"],D={isArray:function(G){return A.toString.apply(G)===F;},isBoolean:function(G){return typeof G==="boolean";},isFunction:function(G){return A.toString.apply(G)===C;},isNull:function(G){return G===null;},isNumber:function(G){return typeof G==="number"&&isFinite(G);},isObject:function(G){return(G&&(typeof G==="object"||B.isFunction(G)))||false;},isString:function(G){return typeof G==="string";},isUndefined:function(G){return typeof G==="undefined";},_IEEnumFix:(YAHOO.env.ua.ie)?function(I,H){var G,K,J;for(G=0;G<E.length;G=G+1){K=E[G];J=H[K];if(B.isFunction(J)&&J!=A[K]){I[K]=J;}}}:function(){},extend:function(J,K,I){if(!K||!J){throw new Error("extend failed, please check that "+"all dependencies are included.");}var H=function(){},G;H.prototype=K.prototype;J.prototype=new H();J.prototype.constructor=J;J.superclass=K.prototype;if(K.prototype.constructor==A.constructor){K.prototype.constructor=K;}if(I){for(G in I){if(B.hasOwnProperty(I,G)){J.prototype[G]=I[G];}}B._IEEnumFix(J.prototype,I);}},augmentObject:function(K,J){if(!J||!K){throw new Error("Absorb failed, verify dependencies.");}var G=arguments,I,L,H=G[2];if(H&&H!==true){for(I=2;I<G.length;I=I+1){K[G[I]]=J[G[I]];}}else{for(L in J){if(H||!(L in K)){K[L]=J[L];}}B._IEEnumFix(K,J);}},augmentProto:function(J,I){if(!I||!J){throw new Error("Augment failed, verify dependencies.");}var G=[J.prototype,I.prototype],H;for(H=2;H<arguments.length;H=H+1){G.push(arguments[H]);}B.augmentObject.apply(this,G);},dump:function(G,L){var I,K,N=[],O="{...}",H="f(){...}",M=", ",J=" => ";if(!B.isObject(G)){return G+"";}else{if(G instanceof Date||("nodeType" in G&&"tagName" in G)){return G;}else{if(B.isFunction(G)){return H;}}}L=(B.isNumber(L))?L:3;if(B.isArray(G)){N.push("[");for(I=0,K=G.length;I<K;I=I+1){if(B.isObject(G[I])){N.push((L>0)?B.dump(G[I],L-1):O);}else{N.push(G[I]);}N.push(M);}if(N.length>1){N.pop();}N.push("]");}else{N.push("{");for(I in G){if(B.hasOwnProperty(G,I)){N.push(I+J);if(B.isObject(G[I])){N.push((L>0)?B.dump(G[I],L-1):O);}else{N.push(G[I]);}N.push(M);}}if(N.length>1){N.pop();}N.push("}");}return N.join("");},substitute:function(V,H,O){var L,K,J,R,S,U,Q=[],I,M="dump",P=" ",G="{",T="}",N;for(;;){L=V.lastIndexOf(G);if(L<0){break;}K=V.indexOf(T,L);if(L+1>=K){break;}I=V.substring(L+1,K);R=I;U=null;J=R.indexOf(P);if(J>-1){U=R.substring(J+1);R=R.substring(0,J);}S=H[R];if(O){S=O(R,S,U);}if(B.isObject(S)){if(B.isArray(S)){S=B.dump(S,parseInt(U,10));}else{U=U||"";N=U.indexOf(M);if(N>-1){U=U.substring(4);}if(S.toString===A.toString||N>-1){S=B.dump(S,parseInt(U,10));}else{S=S.toString();}}}else{if(!B.isString(S)&&!B.isNumber(S)){S="~-"+Q.length+"-~";Q[Q.length]=I;}}V=V.substring(0,L)+S+V.substring(K+1);}for(L=Q.length-1;L>=0;L=L-1){V=V.replace(new RegExp("~-"+L+"-~"),"{"+Q[L]+"}","g");}return V;},trim:function(G){try{return G.replace(/^\s+|\s+$/g,"");}catch(H){return G;}},merge:function(){var J={},H=arguments,G=H.length,I;for(I=0;I<G;I=I+1){B.augmentObject(J,H[I],true);}return J;},later:function(N,H,O,J,K){N=N||0;H=H||{};var I=O,M=J,L,G;if(B.isString(O)){I=H[O];}if(!I){throw new TypeError("method undefined");}if(!B.isArray(M)){M=[J];}L=function(){I.apply(H,M);};G=(K)?setInterval(L,N):setTimeout(L,N);return{interval:K,cancel:function(){if(this.interval){clearInterval(G);}else{clearTimeout(G);}}};},isValue:function(G){return(B.isObject(G)||B.isString(G)||B.isNumber(G)||B.isBoolean(G));}};B.hasOwnProperty=(A.hasOwnProperty)?function(G,H){return G&&G.hasOwnProperty(H);}:function(G,H){return !B.isUndefined(G[H])&&G.constructor.prototype[H]!==G[H];};D.augmentObject(B,D,true);YAHOO.util.Lang=B;B.augment=B.augmentProto;YAHOO.augment=B.augmentProto;YAHOO.extend=B.extend;})();YAHOO.register("yahoo",YAHOO,{version:"2.7.0",build:"1796"});(function(){YAHOO.env._id_counter=YAHOO.env._id_counter||0;var E=YAHOO.util,L=YAHOO.lang,m=YAHOO.env.ua,A=YAHOO.lang.trim,d={},h={},N=/^t(?:able|d|h)$/i,X=/color$/i,K=window.document,W=K.documentElement,e="ownerDocument",n="defaultView",v="documentElement",t="compatMode",b="offsetLeft",P="offsetTop",u="offsetParent",Z="parentNode",l="nodeType",C="tagName",O="scrollLeft",i="scrollTop",Q="getBoundingClientRect",w="getComputedStyle",a="currentStyle",M="CSS1Compat",c="BackCompat",g="class",F="className",J="",B=" ",s="(?:^|\\s)",k="(?= |$)",U="g",p="position",f="fixed",V="relative",j="left",o="top",r="medium",q="borderLeftWidth",R="borderTopWidth",D=m.opera,I=m.webkit,H=m.gecko,T=m.ie;E.Dom={CUSTOM_ATTRIBUTES:(!W.hasAttribute)?{"for":"htmlFor","class":F}:{"htmlFor":"for","className":g},get:function(y){var AA,Y,z,x,G;if(y){if(y[l]||y.item){return y;}if(typeof y==="string"){AA=y;y=K.getElementById(y);if(y&&y.id===AA){return y;}else{if(y&&K.all){y=null;Y=K.all[AA];for(x=0,G=Y.length;x<G;++x){if(Y[x].id===AA){return Y[x];}}}}return y;}if(y.DOM_EVENTS){y=y.get("element");}if("length" in y){z=[];for(x=0,G=y.length;x<G;++x){z[z.length]=E.Dom.get(y[x]);}return z;}return y;}return null;},getComputedStyle:function(G,Y){if(window[w]){return G[e][n][w](G,null)[Y];}else{if(G[a]){return E.Dom.IE_ComputedStyle.get(G,Y);}}},getStyle:function(G,Y){return E.Dom.batch(G,E.Dom._getStyle,Y);},_getStyle:function(){if(window[w]){return function(G,y){y=(y==="float")?y="cssFloat":E.Dom._toCamel(y);var x=G.style[y],Y;if(!x){Y=G[e][n][w](G,null);if(Y){x=Y[y];}}return x;};}else{if(W[a]){return function(G,y){var x;switch(y){case"opacity":x=100;try{x=G.filters["DXImageTransform.Microsoft.Alpha"].opacity;}catch(z){try{x=G.filters("alpha").opacity;}catch(Y){}}return x/100;case"float":y="styleFloat";default:y=E.Dom._toCamel(y);x=G[a]?G[a][y]:null;return(G.style[y]||x);}};}}}(),setStyle:function(G,Y,x){E.Dom.batch(G,E.Dom._setStyle,{prop:Y,val:x});},_setStyle:function(){if(T){return function(Y,G){var x=E.Dom._toCamel(G.prop),y=G.val;if(Y){switch(x){case"opacity":if(L.isString(Y.style.filter)){Y.style.filter="alpha(opacity="+y*100+")";if(!Y[a]||!Y[a].hasLayout){Y.style.zoom=1;}}break;case"float":x="styleFloat";default:Y.style[x]=y;}}else{}};}else{return function(Y,G){var x=E.Dom._toCamel(G.prop),y=G.val;if(Y){if(x=="float"){x="cssFloat";}Y.style[x]=y;}else{}};}}(),getXY:function(G){return E.Dom.batch(G,E.Dom._getXY);},_canPosition:function(G){return(E.Dom._getStyle(G,"display")!=="none"&&E.Dom._inDoc(G));},_getXY:function(){if(K[v][Q]){return function(y){var z,Y,AA,AF,AE,AD,AC,G,x,AB=Math.floor,AG=false;if(E.Dom._canPosition(y)){AA=y[Q]();AF=y[e];z=E.Dom.getDocumentScrollLeft(AF);Y=E.Dom.getDocumentScrollTop(AF);AG=[AB(AA[j]),AB(AA[o])];if(T&&m.ie<8){AE=2;AD=2;AC=AF[t];G=S(AF[v],q);x=S(AF[v],R);if(m.ie===6){if(AC!==c){AE=0;AD=0;}}if((AC==c)){if(G!==r){AE=parseInt(G,10);}if(x!==r){AD=parseInt(x,10);}}AG[0]-=AE;AG[1]-=AD;}if((Y||z)){AG[0]+=z;AG[1]+=Y;}AG[0]=AB(AG[0]);AG[1]=AB(AG[1]);}else{}return AG;};}else{return function(y){var x,Y,AA,AB,AC,z=false,G=y;if(E.Dom._canPosition(y)){z=[y[b],y[P]];x=E.Dom.getDocumentScrollLeft(y[e]);Y=E.Dom.getDocumentScrollTop(y[e]);AC=((H||m.webkit>519)?true:false);while((G=G[u])){z[0]+=G[b];z[1]+=G[P];if(AC){z=E.Dom._calcBorders(G,z);}}if(E.Dom._getStyle(y,p)!==f){G=y;while((G=G[Z])&&G[C]){AA=G[i];AB=G[O];if(H&&(E.Dom._getStyle(G,"overflow")!=="visible")){z=E.Dom._calcBorders(G,z);}if(AA||AB){z[0]-=AB;z[1]-=AA;}}z[0]+=x;z[1]+=Y;}else{if(D){z[0]-=x;z[1]-=Y;}else{if(I||H){z[0]+=x;z[1]+=Y;}}}z[0]=Math.floor(z[0]);z[1]=Math.floor(z[1]);}else{}return z;};}}(),getX:function(G){var Y=function(x){return E.Dom.getXY(x)[0];};return E.Dom.batch(G,Y,E.Dom,true);},getY:function(G){var Y=function(x){return E.Dom.getXY(x)[1];};return E.Dom.batch(G,Y,E.Dom,true);},setXY:function(G,x,Y){E.Dom.batch(G,E.Dom._setXY,{pos:x,noRetry:Y});},_setXY:function(G,z){var AA=E.Dom._getStyle(G,p),y=E.Dom.setStyle,AD=z.pos,Y=z.noRetry,AB=[parseInt(E.Dom.getComputedStyle(G,j),10),parseInt(E.Dom.getComputedStyle(G,o),10)],AC,x;if(AA=="static"){AA=V;y(G,p,AA);}AC=E.Dom._getXY(G);if(!AD||AC===false){return false;}if(isNaN(AB[0])){AB[0]=(AA==V)?0:G[b];}if(isNaN(AB[1])){AB[1]=(AA==V)?0:G[P];}if(AD[0]!==null){y(G,j,AD[0]-AC[0]+AB[0]+"px");}if(AD[1]!==null){y(G,o,AD[1]-AC[1]+AB[1]+"px");}if(!Y){x=E.Dom._getXY(G);if((AD[0]!==null&&x[0]!=AD[0])||(AD[1]!==null&&x[1]!=AD[1])){E.Dom._setXY(G,{pos:AD,noRetry:true});}}},setX:function(Y,G){E.Dom.setXY(Y,[G,null]);},setY:function(G,Y){E.Dom.setXY(G,[null,Y]);},getRegion:function(G){var Y=function(x){var y=false;if(E.Dom._canPosition(x)){y=E.Region.getRegion(x);}else{}return y;};return E.Dom.batch(G,Y,E.Dom,true);},getClientWidth:function(){return E.Dom.getViewportWidth();},getClientHeight:function(){return E.Dom.getViewportHeight();},getElementsByClassName:function(AB,AF,AC,AE,x,AD){AB=L.trim(AB);AF=AF||"*";AC=(AC)?E.Dom.get(AC):null||K;if(!AC){return[];}var Y=[],G=AC.getElementsByTagName(AF),z=E.Dom.hasClass;for(var y=0,AA=G.length;y<AA;++y){if(z(G[y],AB)){Y[Y.length]=G[y];}}if(AE){E.Dom.batch(Y,AE,x,AD);}return Y;},hasClass:function(Y,G){return E.Dom.batch(Y,E.Dom._hasClass,G);},_hasClass:function(x,Y){var G=false,y;if(x&&Y){y=E.Dom.getAttribute(x,F)||J;if(Y.exec){G=Y.test(y);}else{G=Y&&(B+y+B).indexOf(B+Y+B)>-1;}}else{}return G;},addClass:function(Y,G){return E.Dom.batch(Y,E.Dom._addClass,G);},_addClass:function(x,Y){var G=false,y;if(x&&Y){y=E.Dom.getAttribute(x,F)||J;if(!E.Dom._hasClass(x,Y)){E.Dom.setAttribute(x,F,A(y+B+Y));G=true;}}else{}return G;},removeClass:function(Y,G){return E.Dom.batch(Y,E.Dom._removeClass,G);},_removeClass:function(y,x){var Y=false,AA,z,G;if(y&&x){AA=E.Dom.getAttribute(y,F)||J;E.Dom.setAttribute(y,F,AA.replace(E.Dom._getClassRegex(x),J));z=E.Dom.getAttribute(y,F);if(AA!==z){E.Dom.setAttribute(y,F,A(z));Y=true;if(E.Dom.getAttribute(y,F)===""){G=(y.hasAttribute&&y.hasAttribute(g))?g:F;y.removeAttribute(G);}}}else{}return Y;},replaceClass:function(x,Y,G){return E.Dom.batch(x,E.Dom._replaceClass,{from:Y,to:G});
+},_replaceClass:function(y,x){var Y,AB,AA,G=false,z;if(y&&x){AB=x.from;AA=x.to;if(!AA){G=false;}else{if(!AB){G=E.Dom._addClass(y,x.to);}else{if(AB!==AA){z=E.Dom.getAttribute(y,F)||J;Y=(B+z.replace(E.Dom._getClassRegex(AB),B+AA)).split(E.Dom._getClassRegex(AA));Y.splice(1,0,B+AA);E.Dom.setAttribute(y,F,A(Y.join(J)));G=true;}}}}else{}return G;},generateId:function(G,x){x=x||"yui-gen";var Y=function(y){if(y&&y.id){return y.id;}var z=x+YAHOO.env._id_counter++;if(y){if(y[e].getElementById(z)){return E.Dom.generateId(y,z+x);}y.id=z;}return z;};return E.Dom.batch(G,Y,E.Dom,true)||Y.apply(E.Dom,arguments);},isAncestor:function(Y,x){Y=E.Dom.get(Y);x=E.Dom.get(x);var G=false;if((Y&&x)&&(Y[l]&&x[l])){if(Y.contains&&Y!==x){G=Y.contains(x);}else{if(Y.compareDocumentPosition){G=!!(Y.compareDocumentPosition(x)&16);}}}else{}return G;},inDocument:function(G,Y){return E.Dom._inDoc(E.Dom.get(G),Y);},_inDoc:function(Y,x){var G=false;if(Y&&Y[C]){x=x||Y[e];G=E.Dom.isAncestor(x[v],Y);}else{}return G;},getElementsBy:function(Y,AF,AB,AD,y,AC,AE){AF=AF||"*";AB=(AB)?E.Dom.get(AB):null||K;if(!AB){return[];}var x=[],G=AB.getElementsByTagName(AF);for(var z=0,AA=G.length;z<AA;++z){if(Y(G[z])){if(AE){x=G[z];break;}else{x[x.length]=G[z];}}}if(AD){E.Dom.batch(x,AD,y,AC);}return x;},getElementBy:function(x,G,Y){return E.Dom.getElementsBy(x,G,Y,null,null,null,true);},batch:function(x,AB,AA,z){var y=[],Y=(z)?AA:window;x=(x&&(x[C]||x.item))?x:E.Dom.get(x);if(x&&AB){if(x[C]||x.length===undefined){return AB.call(Y,x,AA);}for(var G=0;G<x.length;++G){y[y.length]=AB.call(Y,x[G],AA);}}else{return false;}return y;},getDocumentHeight:function(){var Y=(K[t]!=M||I)?K.body.scrollHeight:W.scrollHeight,G=Math.max(Y,E.Dom.getViewportHeight());return G;},getDocumentWidth:function(){var Y=(K[t]!=M||I)?K.body.scrollWidth:W.scrollWidth,G=Math.max(Y,E.Dom.getViewportWidth());return G;},getViewportHeight:function(){var G=self.innerHeight,Y=K[t];if((Y||T)&&!D){G=(Y==M)?W.clientHeight:K.body.clientHeight;}return G;},getViewportWidth:function(){var G=self.innerWidth,Y=K[t];if(Y||T){G=(Y==M)?W.clientWidth:K.body.clientWidth;}return G;},getAncestorBy:function(G,Y){while((G=G[Z])){if(E.Dom._testElement(G,Y)){return G;}}return null;},getAncestorByClassName:function(Y,G){Y=E.Dom.get(Y);if(!Y){return null;}var x=function(y){return E.Dom.hasClass(y,G);};return E.Dom.getAncestorBy(Y,x);},getAncestorByTagName:function(Y,G){Y=E.Dom.get(Y);if(!Y){return null;}var x=function(y){return y[C]&&y[C].toUpperCase()==G.toUpperCase();};return E.Dom.getAncestorBy(Y,x);},getPreviousSiblingBy:function(G,Y){while(G){G=G.previousSibling;if(E.Dom._testElement(G,Y)){return G;}}return null;},getPreviousSibling:function(G){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getPreviousSiblingBy(G);},getNextSiblingBy:function(G,Y){while(G){G=G.nextSibling;if(E.Dom._testElement(G,Y)){return G;}}return null;},getNextSibling:function(G){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getNextSiblingBy(G);},getFirstChildBy:function(G,x){var Y=(E.Dom._testElement(G.firstChild,x))?G.firstChild:null;return Y||E.Dom.getNextSiblingBy(G.firstChild,x);},getFirstChild:function(G,Y){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getFirstChildBy(G);},getLastChildBy:function(G,x){if(!G){return null;}var Y=(E.Dom._testElement(G.lastChild,x))?G.lastChild:null;return Y||E.Dom.getPreviousSiblingBy(G.lastChild,x);},getLastChild:function(G){G=E.Dom.get(G);return E.Dom.getLastChildBy(G);},getChildrenBy:function(Y,y){var x=E.Dom.getFirstChildBy(Y,y),G=x?[x]:[];E.Dom.getNextSiblingBy(x,function(z){if(!y||y(z)){G[G.length]=z;}return false;});return G;},getChildren:function(G){G=E.Dom.get(G);if(!G){}return E.Dom.getChildrenBy(G);},getDocumentScrollLeft:function(G){G=G||K;return Math.max(G[v].scrollLeft,G.body.scrollLeft);},getDocumentScrollTop:function(G){G=G||K;return Math.max(G[v].scrollTop,G.body.scrollTop);},insertBefore:function(Y,G){Y=E.Dom.get(Y);G=E.Dom.get(G);if(!Y||!G||!G[Z]){return null;}return G[Z].insertBefore(Y,G);},insertAfter:function(Y,G){Y=E.Dom.get(Y);G=E.Dom.get(G);if(!Y||!G||!G[Z]){return null;}if(G.nextSibling){return G[Z].insertBefore(Y,G.nextSibling);}else{return G[Z].appendChild(Y);}},getClientRegion:function(){var x=E.Dom.getDocumentScrollTop(),Y=E.Dom.getDocumentScrollLeft(),y=E.Dom.getViewportWidth()+Y,G=E.Dom.getViewportHeight()+x;return new E.Region(x,y,G,Y);},setAttribute:function(Y,G,x){G=E.Dom.CUSTOM_ATTRIBUTES[G]||G;Y.setAttribute(G,x);},getAttribute:function(Y,G){G=E.Dom.CUSTOM_ATTRIBUTES[G]||G;return Y.getAttribute(G);},_toCamel:function(Y){var x=d;function G(y,z){return z.toUpperCase();}return x[Y]||(x[Y]=Y.indexOf("-")===-1?Y:Y.replace(/-([a-z])/gi,G));},_getClassRegex:function(Y){var G;if(Y!==undefined){if(Y.exec){G=Y;}else{G=h[Y];if(!G){Y=Y.replace(E.Dom._patterns.CLASS_RE_TOKENS,"\\$1");G=h[Y]=new RegExp(s+Y+k,U);}}}return G;},_patterns:{ROOT_TAG:/^body|html$/i,CLASS_RE_TOKENS:/([\.\(\)\^\$\*\+\?\|\[\]\{\}])/g},_testElement:function(G,Y){return G&&G[l]==1&&(!Y||Y(G));},_calcBorders:function(x,y){var Y=parseInt(E.Dom[w](x,R),10)||0,G=parseInt(E.Dom[w](x,q),10)||0;if(H){if(N.test(x[C])){Y=0;G=0;}}y[0]+=G;y[1]+=Y;return y;}};var S=E.Dom[w];if(m.opera){E.Dom[w]=function(Y,G){var x=S(Y,G);if(X.test(G)){x=E.Dom.Color.toRGB(x);}return x;};}if(m.webkit){E.Dom[w]=function(Y,G){var x=S(Y,G);if(x==="rgba(0, 0, 0, 0)"){x="transparent";}return x;};}})();YAHOO.util.Region=function(C,D,A,B){this.top=C;this.y=C;this[1]=C;this.right=D;this.bottom=A;this.left=B;this.x=B;this[0]=B;this.width=this.right-this.left;this.height=this.bottom-this.top;};YAHOO.util.Region.prototype.contains=function(A){return(A.left>=this.left&&A.right<=this.right&&A.top>=this.top&&A.bottom<=this.bottom);};YAHOO.util.Region.prototype.getArea=function(){return((this.bottom-this.top)*(this.right-this.left));};YAHOO.util.Region.prototype.intersect=function(E){var C=Math.max(this.top,E.top),D=Math.min(this.right,E.right),A=Math.min(this.bottom,E.bottom),B=Math.max(this.left,E.left);if(A>=C&&D>=B){return new YAHOO.util.Region(C,D,A,B);
+}else{return null;}};YAHOO.util.Region.prototype.union=function(E){var C=Math.min(this.top,E.top),D=Math.max(this.right,E.right),A=Math.max(this.bottom,E.bottom),B=Math.min(this.left,E.left);return new YAHOO.util.Region(C,D,A,B);};YAHOO.util.Region.prototype.toString=function(){return("Region {"+"top: "+this.top+", right: "+this.right+", bottom: "+this.bottom+", left: "+this.left+", height: "+this.height+", width: "+this.width+"}");};YAHOO.util.Region.getRegion=function(D){var F=YAHOO.util.Dom.getXY(D),C=F[1],E=F[0]+D.offsetWidth,A=F[1]+D.offsetHeight,B=F[0];return new YAHOO.util.Region(C,E,A,B);};YAHOO.util.Point=function(A,B){if(YAHOO.lang.isArray(A)){B=A[1];A=A[0];}YAHOO.util.Point.superclass.constructor.call(this,B,A,B,A);};YAHOO.extend(YAHOO.util.Point,YAHOO.util.Region);(function(){var B=YAHOO.util,A="clientTop",F="clientLeft",J="parentNode",K="right",W="hasLayout",I="px",U="opacity",L="auto",D="borderLeftWidth",G="borderTopWidth",P="borderRightWidth",V="borderBottomWidth",S="visible",Q="transparent",N="height",E="width",H="style",T="currentStyle",R=/^width|height$/,O=/^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz|%){1}?/i,M={get:function(X,Z){var Y="",a=X[T][Z];if(Z===U){Y=B.Dom.getStyle(X,U);}else{if(!a||(a.indexOf&&a.indexOf(I)>-1)){Y=a;}else{if(B.Dom.IE_COMPUTED[Z]){Y=B.Dom.IE_COMPUTED[Z](X,Z);}else{if(O.test(a)){Y=B.Dom.IE.ComputedStyle.getPixel(X,Z);}else{Y=a;}}}}return Y;},getOffset:function(Z,e){var b=Z[T][e],X=e.charAt(0).toUpperCase()+e.substr(1),c="offset"+X,Y="pixel"+X,a="",d;if(b==L){d=Z[c];if(d===undefined){a=0;}a=d;if(R.test(e)){Z[H][e]=d;if(Z[c]>d){a=d-(Z[c]-d);}Z[H][e]=L;}}else{if(!Z[H][Y]&&!Z[H][e]){Z[H][e]=b;}a=Z[H][Y];}return a+I;},getBorderWidth:function(X,Z){var Y=null;if(!X[T][W]){X[H].zoom=1;}switch(Z){case G:Y=X[A];break;case V:Y=X.offsetHeight-X.clientHeight-X[A];break;case D:Y=X[F];break;case P:Y=X.offsetWidth-X.clientWidth-X[F];break;}return Y+I;},getPixel:function(Y,X){var a=null,b=Y[T][K],Z=Y[T][X];Y[H][K]=Z;a=Y[H].pixelRight;Y[H][K]=b;return a+I;},getMargin:function(Y,X){var Z;if(Y[T][X]==L){Z=0+I;}else{Z=B.Dom.IE.ComputedStyle.getPixel(Y,X);}return Z;},getVisibility:function(Y,X){var Z;while((Z=Y[T])&&Z[X]=="inherit"){Y=Y[J];}return(Z)?Z[X]:S;},getColor:function(Y,X){return B.Dom.Color.toRGB(Y[T][X])||Q;},getBorderColor:function(Y,X){var Z=Y[T],a=Z[X]||Z.color;return B.Dom.Color.toRGB(B.Dom.Color.toHex(a));}},C={};C.top=C.right=C.bottom=C.left=C[E]=C[N]=M.getOffset;C.color=M.getColor;C[G]=C[P]=C[V]=C[D]=M.getBorderWidth;C.marginTop=C.marginRight=C.marginBottom=C.marginLeft=M.getMargin;C.visibility=M.getVisibility;C.borderColor=C.borderTopColor=C.borderRightColor=C.borderBottomColor=C.borderLeftColor=M.getBorderColor;B.Dom.IE_COMPUTED=C;B.Dom.IE_ComputedStyle=M;})();(function(){var C="toString",A=parseInt,B=RegExp,D=YAHOO.util;D.Dom.Color={KEYWORDS:{black:"000",silver:"c0c0c0",gray:"808080",white:"fff",maroon:"800000",red:"f00",purple:"800080",fuchsia:"f0f",green:"008000",lime:"0f0",olive:"808000",yellow:"ff0",navy:"000080",blue:"00f",teal:"008080",aqua:"0ff"},re_RGB:/^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i,re_hex:/^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i,re_hex3:/([0-9A-F])/gi,toRGB:function(E){if(!D.Dom.Color.re_RGB.test(E)){E=D.Dom.Color.toHex(E);}if(D.Dom.Color.re_hex.exec(E)){E="rgb("+[A(B.$1,16),A(B.$2,16),A(B.$3,16)].join(", ")+")";}return E;},toHex:function(H){H=D.Dom.Color.KEYWORDS[H]||H;if(D.Dom.Color.re_RGB.exec(H)){var G=(B.$1.length===1)?"0"+B.$1:Number(B.$1),F=(B.$2.length===1)?"0"+B.$2:Number(B.$2),E=(B.$3.length===1)?"0"+B.$3:Number(B.$3);H=[G[C](16),F[C](16),E[C](16)].join("");}if(H.length<6){H=H.replace(D.Dom.Color.re_hex3,"$1$1");}if(H!=="transparent"&&H.indexOf("#")<0){H="#"+H;}return H.toLowerCase();}};}());YAHOO.register("dom",YAHOO.util.Dom,{version:"2.7.0",build:"1796"});YAHOO.util.CustomEvent=function(D,C,B,A){this.type=D;this.scope=C||window;this.silent=B;this.signature=A||YAHOO.util.CustomEvent.LIST;this.subscribers=[];if(!this.silent){}var E="_YUICEOnSubscribe";if(D!==E){this.subscribeEvent=new YAHOO.util.CustomEvent(E,this,true);}this.lastError=null;};YAHOO.util.CustomEvent.LIST=0;YAHOO.util.CustomEvent.FLAT=1;YAHOO.util.CustomEvent.prototype={subscribe:function(A,B,C){if(!A){throw new Error("Invalid callback for subscriber to '"+this.type+"'");}if(this.subscribeEvent){this.subscribeEvent.fire(A,B,C);}this.subscribers.push(new YAHOO.util.Subscriber(A,B,C));},unsubscribe:function(D,F){if(!D){return this.unsubscribeAll();}var E=false;for(var B=0,A=this.subscribers.length;B<A;++B){var C=this.subscribers[B];if(C&&C.contains(D,F)){this._delete(B);E=true;}}return E;},fire:function(){this.lastError=null;var K=[],E=this.subscribers.length;if(!E&&this.silent){return true;}var I=[].slice.call(arguments,0),G=true,D,J=false;if(!this.silent){}var C=this.subscribers.slice(),A=YAHOO.util.Event.throwErrors;for(D=0;D<E;++D){var M=C[D];if(!M){J=true;}else{if(!this.silent){}var L=M.getScope(this.scope);if(this.signature==YAHOO.util.CustomEvent.FLAT){var B=null;if(I.length>0){B=I[0];}try{G=M.fn.call(L,B,M.obj);}catch(F){this.lastError=F;if(A){throw F;}}}else{try{G=M.fn.call(L,this.type,I,M.obj);}catch(H){this.lastError=H;if(A){throw H;}}}if(false===G){if(!this.silent){}break;}}}return(G!==false);},unsubscribeAll:function(){var A=this.subscribers.length,B;for(B=A-1;B>-1;B--){this._delete(B);}this.subscribers=[];return A;},_delete:function(A){var B=this.subscribers[A];if(B){delete B.fn;delete B.obj;}this.subscribers.splice(A,1);},toString:function(){return"CustomEvent: "+"'"+this.type+"', "+"context: "+this.scope;}};YAHOO.util.Subscriber=function(A,B,C){this.fn=A;this.obj=YAHOO.lang.isUndefined(B)?null:B;this.overrideContext=C;};YAHOO.util.Subscriber.prototype.getScope=function(A){if(this.overrideContext){if(this.overrideContext===true){return this.obj;}else{return this.overrideContext;}}return A;};YAHOO.util.Subscriber.prototype.contains=function(A,B){if(B){return(this.fn==A&&this.obj==B);}else{return(this.fn==A);}};YAHOO.util.Subscriber.prototype.toString=function(){return"Subscriber { obj: "+this.obj+", overrideContext: "+(this.overrideContext||"no")+" }";};if(!YAHOO.util.Event){YAHOO.util.Event=function(){var H=false;var I=[];var J=[];var G=[];var E=[];var C=0;var F=[];var B=[];var A=0;var D={63232:38,63233:40,63234:37,63235:39,63276:33,63277:34,25:9};var K=YAHOO.env.ua.ie?"focusin":"focus";var L=YAHOO.env.ua.ie?"focusout":"blur";return{POLL_RETRYS:2000,POLL_INTERVAL:20,EL:0,TYPE:1,FN:2,WFN:3,UNLOAD_OBJ:3,ADJ_SCOPE:4,OBJ:5,OVERRIDE:6,lastError:null,isSafari:YAHOO.env.ua.webkit,webkit:YAHOO.env.ua.webkit,isIE:YAHOO.env.ua.ie,_interval:null,_dri:null,DOMReady:false,throwErrors:false,startInterval:function(){if(!this._interval){var M=this;var N=function(){M._tryPreloadAttach();};this._interval=setInterval(N,this.POLL_INTERVAL);}},onAvailable:function(S,O,Q,R,P){var M=(YAHOO.lang.isString(S))?[S]:S;for(var N=0;N<M.length;N=N+1){F.push({id:M[N],fn:O,obj:Q,overrideContext:R,checkReady:P});}C=this.POLL_RETRYS;this.startInterval();},onContentReady:function(P,M,N,O){this.onAvailable(P,M,N,O,true);},onDOMReady:function(M,N,O){if(this.DOMReady){setTimeout(function(){var P=window;if(O){if(O===true){P=N;}else{P=O;}}M.call(P,"DOMReady",[],N);},0);}else{this.DOMReadyEvent.subscribe(M,N,O);}},_addListener:function(O,M,Y,S,W,b){if(!Y||!Y.call){return false;}if(this._isValidCollection(O)){var Z=true;for(var T=0,V=O.length;T<V;++T){Z=this.on(O[T],M,Y,S,W)&&Z;}return Z;}else{if(YAHOO.lang.isString(O)){var R=this.getEl(O);if(R){O=R;}else{this.onAvailable(O,function(){YAHOO.util.Event.on(O,M,Y,S,W);});return true;}}}if(!O){return false;}if("unload"==M&&S!==this){J[J.length]=[O,M,Y,S,W];return true;}var N=O;if(W){if(W===true){N=S;}else{N=W;}}var P=function(c){return Y.call(N,YAHOO.util.Event.getEvent(c,O),S);};var a=[O,M,Y,P,N,S,W];var U=I.length;I[U]=a;if(this.useLegacyEvent(O,M)){var Q=this.getLegacyIndex(O,M);if(Q==-1||O!=G[Q][0]){Q=G.length;B[O.id+M]=Q;G[Q]=[O,M,O["on"+M]];E[Q]=[];O["on"+M]=function(c){YAHOO.util.Event.fireLegacyEvent(YAHOO.util.Event.getEvent(c),Q);};}E[Q].push(a);}else{try{this._simpleAdd(O,M,P,b);}catch(X){this.lastError=X;this.removeListener(O,M,Y);return false;}}return true;},addListener:function(N,Q,M,O,P){return this._addListener(N,Q,M,O,P,false);},addFocusListener:function(N,M,O,P){return this._addListener(N,K,M,O,P,true);},removeFocusListener:function(N,M){return this.removeListener(N,K,M);},addBlurListener:function(N,M,O,P){return this._addListener(N,L,M,O,P,true);},removeBlurListener:function(N,M){return this.removeListener(N,L,M);},fireLegacyEvent:function(R,P){var T=true,M,V,U,N,S;V=E[P].slice();for(var O=0,Q=V.length;O<Q;++O){U=V[O];if(U&&U[this.WFN]){N=U[this.ADJ_SCOPE];S=U[this.WFN].call(N,R);T=(T&&S);}}M=G[P];if(M&&M[2]){M[2](R);}return T;},getLegacyIndex:function(N,O){var M=this.generateId(N)+O;if(typeof B[M]=="undefined"){return -1;}else{return B[M];}},useLegacyEvent:function(M,N){return(this.webkit&&this.webkit<419&&("click"==N||"dblclick"==N));},removeListener:function(N,M,V){var Q,T,X;if(typeof N=="string"){N=this.getEl(N);}else{if(this._isValidCollection(N)){var W=true;for(Q=N.length-1;Q>-1;Q--){W=(this.removeListener(N[Q],M,V)&&W);}return W;}}if(!V||!V.call){return this.purgeElement(N,false,M);}if("unload"==M){for(Q=J.length-1;Q>-1;Q--){X=J[Q];if(X&&X[0]==N&&X[1]==M&&X[2]==V){J.splice(Q,1);return true;}}return false;}var R=null;var S=arguments[3];if("undefined"===typeof S){S=this._getCacheIndex(N,M,V);}if(S>=0){R=I[S];}if(!N||!R){return false;}if(this.useLegacyEvent(N,M)){var P=this.getLegacyIndex(N,M);var O=E[P];if(O){for(Q=0,T=O.length;Q<T;++Q){X=O[Q];if(X&&X[this.EL]==N&&X[this.TYPE]==M&&X[this.FN]==V){O.splice(Q,1);break;}}}}else{try{this._simpleRemove(N,M,R[this.WFN],false);}catch(U){this.lastError=U;return false;}}delete I[S][this.WFN];delete I[S][this.FN];
+I.splice(S,1);return true;},getTarget:function(O,N){var M=O.target||O.srcElement;return this.resolveTextNode(M);},resolveTextNode:function(N){try{if(N&&3==N.nodeType){return N.parentNode;}}catch(M){}return N;},getPageX:function(N){var M=N.pageX;if(!M&&0!==M){M=N.clientX||0;if(this.isIE){M+=this._getScrollLeft();}}return M;},getPageY:function(M){var N=M.pageY;if(!N&&0!==N){N=M.clientY||0;if(this.isIE){N+=this._getScrollTop();}}return N;},getXY:function(M){return[this.getPageX(M),this.getPageY(M)];},getRelatedTarget:function(N){var M=N.relatedTarget;if(!M){if(N.type=="mouseout"){M=N.toElement;}else{if(N.type=="mouseover"){M=N.fromElement;}}}return this.resolveTextNode(M);},getTime:function(O){if(!O.time){var N=new Date().getTime();try{O.time=N;}catch(M){this.lastError=M;return N;}}return O.time;},stopEvent:function(M){this.stopPropagation(M);this.preventDefault(M);},stopPropagation:function(M){if(M.stopPropagation){M.stopPropagation();}else{M.cancelBubble=true;}},preventDefault:function(M){if(M.preventDefault){M.preventDefault();}else{M.returnValue=false;}},getEvent:function(O,M){var N=O||window.event;if(!N){var P=this.getEvent.caller;while(P){N=P.arguments[0];if(N&&Event==N.constructor){break;}P=P.caller;}}return N;},getCharCode:function(N){var M=N.keyCode||N.charCode||0;if(YAHOO.env.ua.webkit&&(M in D)){M=D[M];}return M;},_getCacheIndex:function(Q,R,P){for(var O=0,N=I.length;O<N;O=O+1){var M=I[O];if(M&&M[this.FN]==P&&M[this.EL]==Q&&M[this.TYPE]==R){return O;}}return -1;},generateId:function(M){var N=M.id;if(!N){N="yuievtautoid-"+A;++A;M.id=N;}return N;},_isValidCollection:function(N){try{return(N&&typeof N!=="string"&&N.length&&!N.tagName&&!N.alert&&typeof N[0]!=="undefined");}catch(M){return false;}},elCache:{},getEl:function(M){return(typeof M==="string")?document.getElementById(M):M;},clearCache:function(){},DOMReadyEvent:new YAHOO.util.CustomEvent("DOMReady",this),_load:function(N){if(!H){H=true;var M=YAHOO.util.Event;M._ready();M._tryPreloadAttach();}},_ready:function(N){var M=YAHOO.util.Event;if(!M.DOMReady){M.DOMReady=true;M.DOMReadyEvent.fire();M._simpleRemove(document,"DOMContentLoaded",M._ready);}},_tryPreloadAttach:function(){if(F.length===0){C=0;if(this._interval){clearInterval(this._interval);this._interval=null;}return;}if(this.locked){return;}if(this.isIE){if(!this.DOMReady){this.startInterval();return;}}this.locked=true;var S=!H;if(!S){S=(C>0&&F.length>0);}var R=[];var T=function(V,W){var U=V;if(W.overrideContext){if(W.overrideContext===true){U=W.obj;}else{U=W.overrideContext;}}W.fn.call(U,W.obj);};var N,M,Q,P,O=[];for(N=0,M=F.length;N<M;N=N+1){Q=F[N];if(Q){P=this.getEl(Q.id);if(P){if(Q.checkReady){if(H||P.nextSibling||!S){O.push(Q);F[N]=null;}}else{T(P,Q);F[N]=null;}}else{R.push(Q);}}}for(N=0,M=O.length;N<M;N=N+1){Q=O[N];T(this.getEl(Q.id),Q);}C--;if(S){for(N=F.length-1;N>-1;N--){Q=F[N];if(!Q||!Q.id){F.splice(N,1);}}this.startInterval();}else{if(this._interval){clearInterval(this._interval);this._interval=null;}}this.locked=false;},purgeElement:function(Q,R,T){var O=(YAHOO.lang.isString(Q))?this.getEl(Q):Q;var S=this.getListeners(O,T),P,M;if(S){for(P=S.length-1;P>-1;P--){var N=S[P];this.removeListener(O,N.type,N.fn);}}if(R&&O&&O.childNodes){for(P=0,M=O.childNodes.length;P<M;++P){this.purgeElement(O.childNodes[P],R,T);}}},getListeners:function(O,M){var R=[],N;if(!M){N=[I,J];}else{if(M==="unload"){N=[J];}else{N=[I];}}var T=(YAHOO.lang.isString(O))?this.getEl(O):O;for(var Q=0;Q<N.length;Q=Q+1){var V=N[Q];if(V){for(var S=0,U=V.length;S<U;++S){var P=V[S];if(P&&P[this.EL]===T&&(!M||M===P[this.TYPE])){R.push({type:P[this.TYPE],fn:P[this.FN],obj:P[this.OBJ],adjust:P[this.OVERRIDE],scope:P[this.ADJ_SCOPE],index:S});}}}}return(R.length)?R:null;},_unload:function(T){var N=YAHOO.util.Event,Q,P,O,S,R,U=J.slice(),M;for(Q=0,S=J.length;Q<S;++Q){O=U[Q];if(O){M=window;if(O[N.ADJ_SCOPE]){if(O[N.ADJ_SCOPE]===true){M=O[N.UNLOAD_OBJ];}else{M=O[N.ADJ_SCOPE];}}O[N.FN].call(M,N.getEvent(T,O[N.EL]),O[N.UNLOAD_OBJ]);U[Q]=null;}}O=null;M=null;J=null;if(I){for(P=I.length-1;P>-1;P--){O=I[P];if(O){N.removeListener(O[N.EL],O[N.TYPE],O[N.FN],P);}}O=null;}G=null;N._simpleRemove(window,"unload",N._unload);},_getScrollLeft:function(){return this._getScroll()[1];},_getScrollTop:function(){return this._getScroll()[0];},_getScroll:function(){var M=document.documentElement,N=document.body;if(M&&(M.scrollTop||M.scrollLeft)){return[M.scrollTop,M.scrollLeft];}else{if(N){return[N.scrollTop,N.scrollLeft];}else{return[0,0];}}},regCE:function(){},_simpleAdd:function(){if(window.addEventListener){return function(O,P,N,M){O.addEventListener(P,N,(M));};}else{if(window.attachEvent){return function(O,P,N,M){O.attachEvent("on"+P,N);};}else{return function(){};}}}(),_simpleRemove:function(){if(window.removeEventListener){return function(O,P,N,M){O.removeEventListener(P,N,(M));};}else{if(window.detachEvent){return function(N,O,M){N.detachEvent("on"+O,M);};}else{return function(){};}}}()};}();(function(){var EU=YAHOO.util.Event;EU.on=EU.addListener;EU.onFocus=EU.addFocusListener;EU.onBlur=EU.addBlurListener;
+/* DOMReady: based on work by: Dean Edwards/John Resig/Matthias Miller */
+if(EU.isIE){YAHOO.util.Event.onDOMReady(YAHOO.util.Event._tryPreloadAttach,YAHOO.util.Event,true);var n=document.createElement("p");EU._dri=setInterval(function(){try{n.doScroll("left");clearInterval(EU._dri);EU._dri=null;EU._ready();n=null;}catch(ex){}},EU.POLL_INTERVAL);}else{if(EU.webkit&&EU.webkit<525){EU._dri=setInterval(function(){var rs=document.readyState;if("loaded"==rs||"complete"==rs){clearInterval(EU._dri);EU._dri=null;EU._ready();}},EU.POLL_INTERVAL);}else{EU._simpleAdd(document,"DOMContentLoaded",EU._ready);}}EU._simpleAdd(window,"load",EU._load);EU._simpleAdd(window,"unload",EU._unload);EU._tryPreloadAttach();})();}YAHOO.util.EventProvider=function(){};YAHOO.util.EventProvider.prototype={__yui_events:null,__yui_subscribers:null,subscribe:function(A,C,F,E){this.__yui_events=this.__yui_events||{};var D=this.__yui_events[A];if(D){D.subscribe(C,F,E);
+}else{this.__yui_subscribers=this.__yui_subscribers||{};var B=this.__yui_subscribers;if(!B[A]){B[A]=[];}B[A].push({fn:C,obj:F,overrideContext:E});}},unsubscribe:function(C,E,G){this.__yui_events=this.__yui_events||{};var A=this.__yui_events;if(C){var F=A[C];if(F){return F.unsubscribe(E,G);}}else{var B=true;for(var D in A){if(YAHOO.lang.hasOwnProperty(A,D)){B=B&&A[D].unsubscribe(E,G);}}return B;}return false;},unsubscribeAll:function(A){return this.unsubscribe(A);},createEvent:function(G,D){this.__yui_events=this.__yui_events||{};var A=D||{};var I=this.__yui_events;if(I[G]){}else{var H=A.scope||this;var E=(A.silent);var B=new YAHOO.util.CustomEvent(G,H,E,YAHOO.util.CustomEvent.FLAT);I[G]=B;if(A.onSubscribeCallback){B.subscribeEvent.subscribe(A.onSubscribeCallback);}this.__yui_subscribers=this.__yui_subscribers||{};var F=this.__yui_subscribers[G];if(F){for(var C=0;C<F.length;++C){B.subscribe(F[C].fn,F[C].obj,F[C].overrideContext);}}}return I[G];},fireEvent:function(E,D,A,C){this.__yui_events=this.__yui_events||{};var G=this.__yui_events[E];if(!G){return null;}var B=[];for(var F=1;F<arguments.length;++F){B.push(arguments[F]);}return G.fire.apply(G,B);},hasEvent:function(A){if(this.__yui_events){if(this.__yui_events[A]){return true;}}return false;}};(function(){var A=YAHOO.util.Event,C=YAHOO.lang;YAHOO.util.KeyListener=function(D,I,E,F){if(!D){}else{if(!I){}else{if(!E){}}}if(!F){F=YAHOO.util.KeyListener.KEYDOWN;}var G=new YAHOO.util.CustomEvent("keyPressed");this.enabledEvent=new YAHOO.util.CustomEvent("enabled");this.disabledEvent=new YAHOO.util.CustomEvent("disabled");if(C.isString(D)){D=document.getElementById(D);}if(C.isFunction(E)){G.subscribe(E);}else{G.subscribe(E.fn,E.scope,E.correctScope);}function H(O,N){if(!I.shift){I.shift=false;}if(!I.alt){I.alt=false;}if(!I.ctrl){I.ctrl=false;}if(O.shiftKey==I.shift&&O.altKey==I.alt&&O.ctrlKey==I.ctrl){var J,M=I.keys,L;if(YAHOO.lang.isArray(M)){for(var K=0;K<M.length;K++){J=M[K];L=A.getCharCode(O);if(J==L){G.fire(L,O);break;}}}else{L=A.getCharCode(O);if(M==L){G.fire(L,O);}}}}this.enable=function(){if(!this.enabled){A.on(D,F,H);this.enabledEvent.fire(I);}this.enabled=true;};this.disable=function(){if(this.enabled){A.removeListener(D,F,H);this.disabledEvent.fire(I);}this.enabled=false;};this.toString=function(){return"KeyListener ["+I.keys+"] "+D.tagName+(D.id?"["+D.id+"]":"");};};var B=YAHOO.util.KeyListener;B.KEYDOWN="keydown";B.KEYUP="keyup";B.KEY={ALT:18,BACK_SPACE:8,CAPS_LOCK:20,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,META:224,NUM_LOCK:144,PAGE_DOWN:34,PAGE_UP:33,PAUSE:19,PRINTSCREEN:44,RIGHT:39,SCROLL_LOCK:145,SHIFT:16,SPACE:32,TAB:9,UP:38};})();YAHOO.register("event",YAHOO.util.Event,{version:"2.7.0",build:"1796"});YAHOO.register("yahoo-dom-event", YAHOO, {version: "2.7.0", build: "1796"});
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+if(!YAHOO.util.DragDropMgr){YAHOO.util.DragDropMgr=function(){var A=YAHOO.util.Event,B=YAHOO.util.Dom;return{useShim:false,_shimActive:false,_shimState:false,_debugShim:false,_createShim:function(){var C=document.createElement("div");C.id="yui-ddm-shim";if(document.body.firstChild){document.body.insertBefore(C,document.body.firstChild);}else{document.body.appendChild(C);}C.style.display="none";C.style.backgroundColor="red";C.style.position="absolute";C.style.zIndex="99999";B.setStyle(C,"opacity","0");this._shim=C;A.on(C,"mouseup",this.handleMouseUp,this,true);A.on(C,"mousemove",this.handleMouseMove,this,true);A.on(window,"scroll",this._sizeShim,this,true);},_sizeShim:function(){if(this._shimActive){var C=this._shim;C.style.height=B.getDocumentHeight()+"px";C.style.width=B.getDocumentWidth()+"px";C.style.top="0";C.style.left="0";}},_activateShim:function(){if(this.useShim){if(!this._shim){this._createShim();}this._shimActive=true;var C=this._shim,D="0";if(this._debugShim){D=".5";}B.setStyle(C,"opacity",D);this._sizeShim();C.style.display="block";}},_deactivateShim:function(){this._shim.style.display="none";this._shimActive=false;},_shim:null,ids:{},handleIds:{},dragCurrent:null,dragOvers:{},deltaX:0,deltaY:0,preventDefault:true,stopPropagation:true,initialized:false,locked:false,interactionInfo:null,init:function(){this.initialized=true;},POINT:0,INTERSECT:1,STRICT_INTERSECT:2,mode:0,_execOnAll:function(E,D){for(var F in this.ids){for(var C in this.ids[F]){var G=this.ids[F][C];if(!this.isTypeOfDD(G)){continue;}G[E].apply(G,D);}}},_onLoad:function(){this.init();A.on(document,"mouseup",this.handleMouseUp,this,true);A.on(document,"mousemove",this.handleMouseMove,this,true);A.on(window,"unload",this._onUnload,this,true);A.on(window,"resize",this._onResize,this,true);},_onResize:function(C){this._execOnAll("resetConstraints",[]);},lock:function(){this.locked=true;},unlock:function(){this.locked=false;},isLocked:function(){return this.locked;},locationCache:{},useCache:true,clickPixelThresh:3,clickTimeThresh:1000,dragThreshMet:false,clickTimeout:null,startX:0,startY:0,fromTimeout:false,regDragDrop:function(D,C){if(!this.initialized){this.init();}if(!this.ids[C]){this.ids[C]={};}this.ids[C][D.id]=D;},removeDDFromGroup:function(E,C){if(!this.ids[C]){this.ids[C]={};}var D=this.ids[C];if(D&&D[E.id]){delete D[E.id];}},_remove:function(E){for(var D in E.groups){if(D){var C=this.ids[D];if(C&&C[E.id]){delete C[E.id];}}}delete this.handleIds[E.id];},regHandle:function(D,C){if(!this.handleIds[D]){this.handleIds[D]={};}this.handleIds[D][C]=C;},isDragDrop:function(C){return(this.getDDById(C))?true:false;},getRelated:function(H,D){var G=[];for(var F in H.groups){for(var E in this.ids[F]){var C=this.ids[F][E];if(!this.isTypeOfDD(C)){continue;}if(!D||C.isTarget){G[G.length]=C;}}}return G;},isLegalTarget:function(G,F){var D=this.getRelated(G,true);for(var E=0,C=D.length;E<C;++E){if(D[E].id==F.id){return true;}}return false;},isTypeOfDD:function(C){return(C&&C.__ygDragDrop);},isHandle:function(D,C){return(this.handleIds[D]&&this.handleIds[D][C]);},getDDById:function(D){for(var C in this.ids){if(this.ids[C][D]){return this.ids[C][D];}}return null;},handleMouseDown:function(E,D){this.currentTarget=YAHOO.util.Event.getTarget(E);this.dragCurrent=D;var C=D.getEl();this.startX=YAHOO.util.Event.getPageX(E);this.startY=YAHOO.util.Event.getPageY(E);this.deltaX=this.startX-C.offsetLeft;this.deltaY=this.startY-C.offsetTop;this.dragThreshMet=false;this.clickTimeout=setTimeout(function(){var F=YAHOO.util.DDM;F.startDrag(F.startX,F.startY);F.fromTimeout=true;},this.clickTimeThresh);},startDrag:function(C,E){if(this.dragCurrent&&this.dragCurrent.useShim){this._shimState=this.useShim;this.useShim=true;}this._activateShim();clearTimeout(this.clickTimeout);var D=this.dragCurrent;if(D&&D.events.b4StartDrag){D.b4StartDrag(C,E);D.fireEvent("b4StartDragEvent",{x:C,y:E});}if(D&&D.events.startDrag){D.startDrag(C,E);D.fireEvent("startDragEvent",{x:C,y:E});}this.dragThreshMet=true;},handleMouseUp:function(C){if(this.dragCurrent){clearTimeout(this.clickTimeout);if(this.dragThreshMet){if(this.fromTimeout){this.fromTimeout=false;this.handleMouseMove(C);}this.fromTimeout=false;this.fireEvents(C,true);}else{}this.stopDrag(C);this.stopEvent(C);}},stopEvent:function(C){if(this.stopPropagation){YAHOO.util.Event.stopPropagation(C);}if(this.preventDefault){YAHOO.util.Event.preventDefault(C);}},stopDrag:function(E,D){var C=this.dragCurrent;if(C&&!D){if(this.dragThreshMet){if(C.events.b4EndDrag){C.b4EndDrag(E);C.fireEvent("b4EndDragEvent",{e:E});}if(C.events.endDrag){C.endDrag(E);C.fireEvent("endDragEvent",{e:E});}}if(C.events.mouseUp){C.onMouseUp(E);C.fireEvent("mouseUpEvent",{e:E});}}if(this._shimActive){this._deactivateShim();if(this.dragCurrent&&this.dragCurrent.useShim){this.useShim=this._shimState;this._shimState=false;}}this.dragCurrent=null;this.dragOvers={};},handleMouseMove:function(F){var C=this.dragCurrent;if(C){if(YAHOO.util.Event.isIE&&!F.button){this.stopEvent(F);return this.handleMouseUp(F);}else{if(F.clientX<0||F.clientY<0){}}if(!this.dragThreshMet){var E=Math.abs(this.startX-YAHOO.util.Event.getPageX(F));var D=Math.abs(this.startY-YAHOO.util.Event.getPageY(F));if(E>this.clickPixelThresh||D>this.clickPixelThresh){this.startDrag(this.startX,this.startY);}}if(this.dragThreshMet){if(C&&C.events.b4Drag){C.b4Drag(F);C.fireEvent("b4DragEvent",{e:F});}if(C&&C.events.drag){C.onDrag(F);C.fireEvent("dragEvent",{e:F});}if(C){this.fireEvents(F,false);}}this.stopEvent(F);}},fireEvents:function(V,L){var a=this.dragCurrent;if(!a||a.isLocked()||a.dragOnly){return;}var N=YAHOO.util.Event.getPageX(V),M=YAHOO.util.Event.getPageY(V),P=new YAHOO.util.Point(N,M),K=a.getTargetCoord(P.x,P.y),F=a.getDragEl(),E=["out","over","drop","enter"],U=new YAHOO.util.Region(K.y,K.x+F.offsetWidth,K.y+F.offsetHeight,K.x),I=[],D={},Q=[],c={outEvts:[],overEvts:[],dropEvts:[],enterEvts:[]};for(var S in this.dragOvers){var d=this.dragOvers[S];if(!this.isTypeOfDD(d)){continue;
+}if(!this.isOverTarget(P,d,this.mode,U)){c.outEvts.push(d);}I[S]=true;delete this.dragOvers[S];}for(var R in a.groups){if("string"!=typeof R){continue;}for(S in this.ids[R]){var G=this.ids[R][S];if(!this.isTypeOfDD(G)){continue;}if(G.isTarget&&!G.isLocked()&&G!=a){if(this.isOverTarget(P,G,this.mode,U)){D[R]=true;if(L){c.dropEvts.push(G);}else{if(!I[G.id]){c.enterEvts.push(G);}else{c.overEvts.push(G);}this.dragOvers[G.id]=G;}}}}}this.interactionInfo={out:c.outEvts,enter:c.enterEvts,over:c.overEvts,drop:c.dropEvts,point:P,draggedRegion:U,sourceRegion:this.locationCache[a.id],validDrop:L};for(var C in D){Q.push(C);}if(L&&!c.dropEvts.length){this.interactionInfo.validDrop=false;if(a.events.invalidDrop){a.onInvalidDrop(V);a.fireEvent("invalidDropEvent",{e:V});}}for(S=0;S<E.length;S++){var Y=null;if(c[E[S]+"Evts"]){Y=c[E[S]+"Evts"];}if(Y&&Y.length){var H=E[S].charAt(0).toUpperCase()+E[S].substr(1),X="onDrag"+H,J="b4Drag"+H,O="drag"+H+"Event",W="drag"+H;if(this.mode){if(a.events[J]){a[J](V,Y,Q);a.fireEvent(J+"Event",{event:V,info:Y,group:Q});}if(a.events[W]){a[X](V,Y,Q);a.fireEvent(O,{event:V,info:Y,group:Q});}}else{for(var Z=0,T=Y.length;Z<T;++Z){if(a.events[J]){a[J](V,Y[Z].id,Q[0]);a.fireEvent(J+"Event",{event:V,info:Y[Z].id,group:Q[0]});}if(a.events[W]){a[X](V,Y[Z].id,Q[0]);a.fireEvent(O,{event:V,info:Y[Z].id,group:Q[0]});}}}}}},getBestMatch:function(E){var G=null;var D=E.length;if(D==1){G=E[0];}else{for(var F=0;F<D;++F){var C=E[F];if(this.mode==this.INTERSECT&&C.cursorIsOver){G=C;break;}else{if(!G||!G.overlap||(C.overlap&&G.overlap.getArea()<C.overlap.getArea())){G=C;}}}}return G;},refreshCache:function(D){var F=D||this.ids;for(var C in F){if("string"!=typeof C){continue;}for(var E in this.ids[C]){var G=this.ids[C][E];if(this.isTypeOfDD(G)){var H=this.getLocation(G);if(H){this.locationCache[G.id]=H;}else{delete this.locationCache[G.id];}}}}},verifyEl:function(D){try{if(D){var C=D.offsetParent;if(C){return true;}}}catch(E){}return false;},getLocation:function(H){if(!this.isTypeOfDD(H)){return null;}var F=H.getEl(),K,E,D,M,L,N,C,J,G;try{K=YAHOO.util.Dom.getXY(F);}catch(I){}if(!K){return null;}E=K[0];D=E+F.offsetWidth;M=K[1];L=M+F.offsetHeight;N=M-H.padding[0];C=D+H.padding[1];J=L+H.padding[2];G=E-H.padding[3];return new YAHOO.util.Region(N,C,J,G);},isOverTarget:function(K,C,E,F){var G=this.locationCache[C.id];if(!G||!this.useCache){G=this.getLocation(C);this.locationCache[C.id]=G;}if(!G){return false;}C.cursorIsOver=G.contains(K);var J=this.dragCurrent;if(!J||(!E&&!J.constrainX&&!J.constrainY)){return C.cursorIsOver;}C.overlap=null;if(!F){var H=J.getTargetCoord(K.x,K.y);var D=J.getDragEl();F=new YAHOO.util.Region(H.y,H.x+D.offsetWidth,H.y+D.offsetHeight,H.x);}var I=F.intersect(G);if(I){C.overlap=I;return(E)?true:C.cursorIsOver;}else{return false;}},_onUnload:function(D,C){this.unregAll();},unregAll:function(){if(this.dragCurrent){this.stopDrag();this.dragCurrent=null;}this._execOnAll("unreg",[]);this.ids={};},elementCache:{},getElWrapper:function(D){var C=this.elementCache[D];if(!C||!C.el){C=this.elementCache[D]=new this.ElementWrapper(YAHOO.util.Dom.get(D));}return C;},getElement:function(C){return YAHOO.util.Dom.get(C);},getCss:function(D){var C=YAHOO.util.Dom.get(D);return(C)?C.style:null;},ElementWrapper:function(C){this.el=C||null;this.id=this.el&&C.id;this.css=this.el&&C.style;},getPosX:function(C){return YAHOO.util.Dom.getX(C);},getPosY:function(C){return YAHOO.util.Dom.getY(C);},swapNode:function(E,C){if(E.swapNode){E.swapNode(C);}else{var F=C.parentNode;var D=C.nextSibling;if(D==E){F.insertBefore(E,C);}else{if(C==E.nextSibling){F.insertBefore(C,E);}else{E.parentNode.replaceChild(C,E);F.insertBefore(E,D);}}}},getScroll:function(){var E,C,F=document.documentElement,D=document.body;if(F&&(F.scrollTop||F.scrollLeft)){E=F.scrollTop;C=F.scrollLeft;}else{if(D){E=D.scrollTop;C=D.scrollLeft;}else{}}return{top:E,left:C};},getStyle:function(D,C){return YAHOO.util.Dom.getStyle(D,C);},getScrollTop:function(){return this.getScroll().top;},getScrollLeft:function(){return this.getScroll().left;},moveToEl:function(C,E){var D=YAHOO.util.Dom.getXY(E);YAHOO.util.Dom.setXY(C,D);},getClientHeight:function(){return YAHOO.util.Dom.getViewportHeight();},getClientWidth:function(){return YAHOO.util.Dom.getViewportWidth();},numericSort:function(D,C){return(D-C);},_timeoutCount:0,_addListeners:function(){var C=YAHOO.util.DDM;if(YAHOO.util.Event&&document){C._onLoad();}else{if(C._timeoutCount>2000){}else{setTimeout(C._addListeners,10);if(document&&document.body){C._timeoutCount+=1;}}}},handleWasClicked:function(C,E){if(this.isHandle(E,C.id)){return true;}else{var D=C.parentNode;while(D){if(this.isHandle(E,D.id)){return true;}else{D=D.parentNode;}}}return false;}};}();YAHOO.util.DDM=YAHOO.util.DragDropMgr;YAHOO.util.DDM._addListeners();}(function(){var A=YAHOO.util.Event;var B=YAHOO.util.Dom;YAHOO.util.DragDrop=function(E,C,D){if(E){this.init(E,C,D);}};YAHOO.util.DragDrop.prototype={events:null,on:function(){this.subscribe.apply(this,arguments);},id:null,config:null,dragElId:null,handleElId:null,invalidHandleTypes:null,invalidHandleIds:null,invalidHandleClasses:null,startPageX:0,startPageY:0,groups:null,locked:false,lock:function(){this.locked=true;},unlock:function(){this.locked=false;},isTarget:true,padding:null,dragOnly:false,useShim:false,_domRef:null,__ygDragDrop:true,constrainX:false,constrainY:false,minX:0,maxX:0,minY:0,maxY:0,deltaX:0,deltaY:0,maintainOffset:false,xTicks:null,yTicks:null,primaryButtonOnly:true,available:false,hasOuterHandles:false,cursorIsOver:false,overlap:null,b4StartDrag:function(C,D){},startDrag:function(C,D){},b4Drag:function(C){},onDrag:function(C){},onDragEnter:function(C,D){},b4DragOver:function(C){},onDragOver:function(C,D){},b4DragOut:function(C){},onDragOut:function(C,D){},b4DragDrop:function(C){},onDragDrop:function(C,D){},onInvalidDrop:function(C){},b4EndDrag:function(C){},endDrag:function(C){},b4MouseDown:function(C){},onMouseDown:function(C){},onMouseUp:function(C){},onAvailable:function(){},getEl:function(){if(!this._domRef){this._domRef=B.get(this.id);
+}return this._domRef;},getDragEl:function(){return B.get(this.dragElId);},init:function(F,C,D){this.initTarget(F,C,D);A.on(this._domRef||this.id,"mousedown",this.handleMouseDown,this,true);for(var E in this.events){this.createEvent(E+"Event");}},initTarget:function(E,C,D){this.config=D||{};this.events={};this.DDM=YAHOO.util.DDM;this.groups={};if(typeof E!=="string"){this._domRef=E;E=B.generateId(E);}this.id=E;this.addToGroup((C)?C:"default");this.handleElId=E;A.onAvailable(E,this.handleOnAvailable,this,true);this.setDragElId(E);this.invalidHandleTypes={A:"A"};this.invalidHandleIds={};this.invalidHandleClasses=[];this.applyConfig();},applyConfig:function(){this.events={mouseDown:true,b4MouseDown:true,mouseUp:true,b4StartDrag:true,startDrag:true,b4EndDrag:true,endDrag:true,drag:true,b4Drag:true,invalidDrop:true,b4DragOut:true,dragOut:true,dragEnter:true,b4DragOver:true,dragOver:true,b4DragDrop:true,dragDrop:true};if(this.config.events){for(var C in this.config.events){if(this.config.events[C]===false){this.events[C]=false;}}}this.padding=this.config.padding||[0,0,0,0];this.isTarget=(this.config.isTarget!==false);this.maintainOffset=(this.config.maintainOffset);this.primaryButtonOnly=(this.config.primaryButtonOnly!==false);this.dragOnly=((this.config.dragOnly===true)?true:false);this.useShim=((this.config.useShim===true)?true:false);},handleOnAvailable:function(){this.available=true;this.resetConstraints();this.onAvailable();},setPadding:function(E,C,F,D){if(!C&&0!==C){this.padding=[E,E,E,E];}else{if(!F&&0!==F){this.padding=[E,C,E,C];}else{this.padding=[E,C,F,D];}}},setInitPosition:function(F,E){var G=this.getEl();if(!this.DDM.verifyEl(G)){if(G&&G.style&&(G.style.display=="none")){}else{}return;}var D=F||0;var C=E||0;var H=B.getXY(G);this.initPageX=H[0]-D;this.initPageY=H[1]-C;this.lastPageX=H[0];this.lastPageY=H[1];this.setStartPosition(H);},setStartPosition:function(D){var C=D||B.getXY(this.getEl());this.deltaSetXY=null;this.startPageX=C[0];this.startPageY=C[1];},addToGroup:function(C){this.groups[C]=true;this.DDM.regDragDrop(this,C);},removeFromGroup:function(C){if(this.groups[C]){delete this.groups[C];}this.DDM.removeDDFromGroup(this,C);},setDragElId:function(C){this.dragElId=C;},setHandleElId:function(C){if(typeof C!=="string"){C=B.generateId(C);}this.handleElId=C;this.DDM.regHandle(this.id,C);},setOuterHandleElId:function(C){if(typeof C!=="string"){C=B.generateId(C);}A.on(C,"mousedown",this.handleMouseDown,this,true);this.setHandleElId(C);this.hasOuterHandles=true;},unreg:function(){A.removeListener(this.id,"mousedown",this.handleMouseDown);this._domRef=null;this.DDM._remove(this);},isLocked:function(){return(this.DDM.isLocked()||this.locked);},handleMouseDown:function(J,I){var D=J.which||J.button;if(this.primaryButtonOnly&&D>1){return;}if(this.isLocked()){return;}var C=this.b4MouseDown(J),F=true;if(this.events.b4MouseDown){F=this.fireEvent("b4MouseDownEvent",J);}var E=this.onMouseDown(J),H=true;if(this.events.mouseDown){H=this.fireEvent("mouseDownEvent",J);}if((C===false)||(E===false)||(F===false)||(H===false)){return;}this.DDM.refreshCache(this.groups);var G=new YAHOO.util.Point(A.getPageX(J),A.getPageY(J));if(!this.hasOuterHandles&&!this.DDM.isOverTarget(G,this)){}else{if(this.clickValidator(J)){this.setStartPosition();this.DDM.handleMouseDown(J,this);this.DDM.stopEvent(J);}else{}}},clickValidator:function(D){var C=YAHOO.util.Event.getTarget(D);return(this.isValidHandleChild(C)&&(this.id==this.handleElId||this.DDM.handleWasClicked(C,this.id)));},getTargetCoord:function(E,D){var C=E-this.deltaX;var F=D-this.deltaY;if(this.constrainX){if(C<this.minX){C=this.minX;}if(C>this.maxX){C=this.maxX;}}if(this.constrainY){if(F<this.minY){F=this.minY;}if(F>this.maxY){F=this.maxY;}}C=this.getTick(C,this.xTicks);F=this.getTick(F,this.yTicks);return{x:C,y:F};},addInvalidHandleType:function(C){var D=C.toUpperCase();this.invalidHandleTypes[D]=D;},addInvalidHandleId:function(C){if(typeof C!=="string"){C=B.generateId(C);}this.invalidHandleIds[C]=C;},addInvalidHandleClass:function(C){this.invalidHandleClasses.push(C);},removeInvalidHandleType:function(C){var D=C.toUpperCase();delete this.invalidHandleTypes[D];},removeInvalidHandleId:function(C){if(typeof C!=="string"){C=B.generateId(C);}delete this.invalidHandleIds[C];},removeInvalidHandleClass:function(D){for(var E=0,C=this.invalidHandleClasses.length;E<C;++E){if(this.invalidHandleClasses[E]==D){delete this.invalidHandleClasses[E];}}},isValidHandleChild:function(F){var E=true;var H;try{H=F.nodeName.toUpperCase();}catch(G){H=F.nodeName;}E=E&&!this.invalidHandleTypes[H];E=E&&!this.invalidHandleIds[F.id];for(var D=0,C=this.invalidHandleClasses.length;E&&D<C;++D){E=!B.hasClass(F,this.invalidHandleClasses[D]);}return E;},setXTicks:function(F,C){this.xTicks=[];this.xTickSize=C;var E={};for(var D=this.initPageX;D>=this.minX;D=D-C){if(!E[D]){this.xTicks[this.xTicks.length]=D;E[D]=true;}}for(D=this.initPageX;D<=this.maxX;D=D+C){if(!E[D]){this.xTicks[this.xTicks.length]=D;E[D]=true;}}this.xTicks.sort(this.DDM.numericSort);},setYTicks:function(F,C){this.yTicks=[];this.yTickSize=C;var E={};for(var D=this.initPageY;D>=this.minY;D=D-C){if(!E[D]){this.yTicks[this.yTicks.length]=D;E[D]=true;}}for(D=this.initPageY;D<=this.maxY;D=D+C){if(!E[D]){this.yTicks[this.yTicks.length]=D;E[D]=true;}}this.yTicks.sort(this.DDM.numericSort);},setXConstraint:function(E,D,C){this.leftConstraint=parseInt(E,10);this.rightConstraint=parseInt(D,10);this.minX=this.initPageX-this.leftConstraint;this.maxX=this.initPageX+this.rightConstraint;if(C){this.setXTicks(this.initPageX,C);}this.constrainX=true;},clearConstraints:function(){this.constrainX=false;this.constrainY=false;this.clearTicks();},clearTicks:function(){this.xTicks=null;this.yTicks=null;this.xTickSize=0;this.yTickSize=0;},setYConstraint:function(C,E,D){this.topConstraint=parseInt(C,10);this.bottomConstraint=parseInt(E,10);this.minY=this.initPageY-this.topConstraint;this.maxY=this.initPageY+this.bottomConstraint;if(D){this.setYTicks(this.initPageY,D);
+}this.constrainY=true;},resetConstraints:function(){if(this.initPageX||this.initPageX===0){var D=(this.maintainOffset)?this.lastPageX-this.initPageX:0;var C=(this.maintainOffset)?this.lastPageY-this.initPageY:0;this.setInitPosition(D,C);}else{this.setInitPosition();}if(this.constrainX){this.setXConstraint(this.leftConstraint,this.rightConstraint,this.xTickSize);}if(this.constrainY){this.setYConstraint(this.topConstraint,this.bottomConstraint,this.yTickSize);}},getTick:function(I,F){if(!F){return I;}else{if(F[0]>=I){return F[0];}else{for(var D=0,C=F.length;D<C;++D){var E=D+1;if(F[E]&&F[E]>=I){var H=I-F[D];var G=F[E]-I;return(G>H)?F[D]:F[E];}}return F[F.length-1];}}},toString:function(){return("DragDrop "+this.id);}};YAHOO.augment(YAHOO.util.DragDrop,YAHOO.util.EventProvider);})();YAHOO.util.DD=function(C,A,B){if(C){this.init(C,A,B);}};YAHOO.extend(YAHOO.util.DD,YAHOO.util.DragDrop,{scroll:true,autoOffset:function(C,B){var A=C-this.startPageX;var D=B-this.startPageY;this.setDelta(A,D);},setDelta:function(B,A){this.deltaX=B;this.deltaY=A;},setDragElPos:function(C,B){var A=this.getDragEl();this.alignElWithMouse(A,C,B);},alignElWithMouse:function(C,G,F){var E=this.getTargetCoord(G,F);if(!this.deltaSetXY){var H=[E.x,E.y];YAHOO.util.Dom.setXY(C,H);var D=parseInt(YAHOO.util.Dom.getStyle(C,"left"),10);var B=parseInt(YAHOO.util.Dom.getStyle(C,"top"),10);this.deltaSetXY=[D-E.x,B-E.y];}else{YAHOO.util.Dom.setStyle(C,"left",(E.x+this.deltaSetXY[0])+"px");YAHOO.util.Dom.setStyle(C,"top",(E.y+this.deltaSetXY[1])+"px");}this.cachePosition(E.x,E.y);var A=this;setTimeout(function(){A.autoScroll.call(A,E.x,E.y,C.offsetHeight,C.offsetWidth);},0);},cachePosition:function(B,A){if(B){this.lastPageX=B;this.lastPageY=A;}else{var C=YAHOO.util.Dom.getXY(this.getEl());this.lastPageX=C[0];this.lastPageY=C[1];}},autoScroll:function(J,I,E,K){if(this.scroll){var L=this.DDM.getClientHeight();var B=this.DDM.getClientWidth();var N=this.DDM.getScrollTop();var D=this.DDM.getScrollLeft();var H=E+I;var M=K+J;var G=(L+N-I-this.deltaY);var F=(B+D-J-this.deltaX);var C=40;var A=(document.all)?80:30;if(H>L&&G<C){window.scrollTo(D,N+A);}if(I<N&&N>0&&I-N<C){window.scrollTo(D,N-A);}if(M>B&&F<C){window.scrollTo(D+A,N);}if(J<D&&D>0&&J-D<C){window.scrollTo(D-A,N);}}},applyConfig:function(){YAHOO.util.DD.superclass.applyConfig.call(this);this.scroll=(this.config.scroll!==false);},b4MouseDown:function(A){this.setStartPosition();this.autoOffset(YAHOO.util.Event.getPageX(A),YAHOO.util.Event.getPageY(A));},b4Drag:function(A){this.setDragElPos(YAHOO.util.Event.getPageX(A),YAHOO.util.Event.getPageY(A));},toString:function(){return("DD "+this.id);}});YAHOO.util.DDProxy=function(C,A,B){if(C){this.init(C,A,B);this.initFrame();}};YAHOO.util.DDProxy.dragElId="ygddfdiv";YAHOO.extend(YAHOO.util.DDProxy,YAHOO.util.DD,{resizeFrame:true,centerFrame:false,createFrame:function(){var B=this,A=document.body;if(!A||!A.firstChild){setTimeout(function(){B.createFrame();},50);return;}var F=this.getDragEl(),E=YAHOO.util.Dom;if(!F){F=document.createElement("div");F.id=this.dragElId;var D=F.style;D.position="absolute";D.visibility="hidden";D.cursor="move";D.border="2px solid #aaa";D.zIndex=999;D.height="25px";D.width="25px";var C=document.createElement("div");E.setStyle(C,"height","100%");E.setStyle(C,"width","100%");E.setStyle(C,"background-color","#ccc");E.setStyle(C,"opacity","0");F.appendChild(C);A.insertBefore(F,A.firstChild);}},initFrame:function(){this.createFrame();},applyConfig:function(){YAHOO.util.DDProxy.superclass.applyConfig.call(this);this.resizeFrame=(this.config.resizeFrame!==false);this.centerFrame=(this.config.centerFrame);this.setDragElId(this.config.dragElId||YAHOO.util.DDProxy.dragElId);},showFrame:function(E,D){var C=this.getEl();var A=this.getDragEl();var B=A.style;this._resizeProxy();if(this.centerFrame){this.setDelta(Math.round(parseInt(B.width,10)/2),Math.round(parseInt(B.height,10)/2));}this.setDragElPos(E,D);YAHOO.util.Dom.setStyle(A,"visibility","visible");},_resizeProxy:function(){if(this.resizeFrame){var H=YAHOO.util.Dom;var B=this.getEl();var C=this.getDragEl();var G=parseInt(H.getStyle(C,"borderTopWidth"),10);var I=parseInt(H.getStyle(C,"borderRightWidth"),10);var F=parseInt(H.getStyle(C,"borderBottomWidth"),10);var D=parseInt(H.getStyle(C,"borderLeftWidth"),10);if(isNaN(G)){G=0;}if(isNaN(I)){I=0;}if(isNaN(F)){F=0;}if(isNaN(D)){D=0;}var E=Math.max(0,B.offsetWidth-I-D);var A=Math.max(0,B.offsetHeight-G-F);H.setStyle(C,"width",E+"px");H.setStyle(C,"height",A+"px");}},b4MouseDown:function(B){this.setStartPosition();var A=YAHOO.util.Event.getPageX(B);var C=YAHOO.util.Event.getPageY(B);this.autoOffset(A,C);},b4StartDrag:function(A,B){this.showFrame(A,B);},b4EndDrag:function(A){YAHOO.util.Dom.setStyle(this.getDragEl(),"visibility","hidden");},endDrag:function(D){var C=YAHOO.util.Dom;var B=this.getEl();var A=this.getDragEl();C.setStyle(A,"visibility","");C.setStyle(B,"visibility","hidden");YAHOO.util.DDM.moveToEl(B,A);C.setStyle(A,"visibility","hidden");C.setStyle(B,"visibility","");},toString:function(){return("DDProxy "+this.id);}});YAHOO.util.DDTarget=function(C,A,B){if(C){this.initTarget(C,A,B);}};YAHOO.extend(YAHOO.util.DDTarget,YAHOO.util.DragDrop,{toString:function(){return("DDTarget "+this.id);}});YAHOO.register("dragdrop",YAHOO.util.DragDropMgr,{version:"2.7.0",build:"1796"});/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+(function(){var B=YAHOO.util.Dom.getXY,A=YAHOO.util.Event,D=Array.prototype.slice;function C(G,E,F,H){C.ANIM_AVAIL=(!YAHOO.lang.isUndefined(YAHOO.util.Anim));if(G){this.init(G,E,true);this.initSlider(H);this.initThumb(F);}}YAHOO.lang.augmentObject(C,{getHorizSlider:function(F,G,I,H,E){return new C(F,F,new YAHOO.widget.SliderThumb(G,F,I,H,0,0,E),"horiz");},getVertSlider:function(G,H,E,I,F){return new C(G,G,new YAHOO.widget.SliderThumb(H,G,0,0,E,I,F),"vert");},getSliderRegion:function(G,H,J,I,E,K,F){return new C(G,G,new YAHOO.widget.SliderThumb(H,G,J,I,E,K,F),"region");},SOURCE_UI_EVENT:1,SOURCE_SET_VALUE:2,SOURCE_KEY_EVENT:3,ANIM_AVAIL:false},true);YAHOO.extend(C,YAHOO.util.DragDrop,{_mouseDown:false,dragOnly:true,initSlider:function(E){this.type=E;this.createEvent("change",this);this.createEvent("slideStart",this);this.createEvent("slideEnd",this);this.isTarget=false;this.animate=C.ANIM_AVAIL;this.backgroundEnabled=true;this.tickPause=40;this.enableKeys=true;this.keyIncrement=20;this.moveComplete=true;this.animationDuration=0.2;this.SOURCE_UI_EVENT=1;this.SOURCE_SET_VALUE=2;this.valueChangeSource=0;this._silent=false;this.lastOffset=[0,0];},initThumb:function(F){var E=this;this.thumb=F;F.cacheBetweenDrags=true;if(F._isHoriz&&F.xTicks&&F.xTicks.length){this.tickPause=Math.round(360/F.xTicks.length);}else{if(F.yTicks&&F.yTicks.length){this.tickPause=Math.round(360/F.yTicks.length);}}F.onAvailable=function(){return E.setStartSliderState();};F.onMouseDown=function(){E._mouseDown=true;return E.focus();};F.startDrag=function(){E._slideStart();};F.onDrag=function(){E.fireEvents(true);};F.onMouseUp=function(){E.thumbMouseUp();};},onAvailable:function(){this._bindKeyEvents();},_bindKeyEvents:function(){A.on(this.id,"keydown",this.handleKeyDown,this,true);A.on(this.id,"keypress",this.handleKeyPress,this,true);},handleKeyPress:function(F){if(this.enableKeys){var E=A.getCharCode(F);switch(E){case 37:case 38:case 39:case 40:case 36:case 35:A.preventDefault(F);break;default:}}},handleKeyDown:function(J){if(this.enableKeys){var G=A.getCharCode(J),F=this.thumb,H=this.getXValue(),E=this.getYValue(),I=true;switch(G){case 37:H-=this.keyIncrement;break;case 38:E-=this.keyIncrement;break;case 39:H+=this.keyIncrement;break;case 40:E+=this.keyIncrement;break;case 36:H=F.leftConstraint;E=F.topConstraint;break;case 35:H=F.rightConstraint;E=F.bottomConstraint;break;default:I=false;}if(I){if(F._isRegion){this._setRegionValue(C.SOURCE_KEY_EVENT,H,E,true);}else{this._setValue(C.SOURCE_KEY_EVENT,(F._isHoriz?H:E),true);}A.stopEvent(J);}}},setStartSliderState:function(){this.setThumbCenterPoint();this.baselinePos=B(this.getEl());this.thumb.startOffset=this.thumb.getOffsetFromParent(this.baselinePos);if(this.thumb._isRegion){if(this.deferredSetRegionValue){this._setRegionValue.apply(this,this.deferredSetRegionValue);this.deferredSetRegionValue=null;}else{this.setRegionValue(0,0,true,true,true);}}else{if(this.deferredSetValue){this._setValue.apply(this,this.deferredSetValue);this.deferredSetValue=null;}else{this.setValue(0,true,true,true);}}},setThumbCenterPoint:function(){var E=this.thumb.getEl();if(E){this.thumbCenterPoint={x:parseInt(E.offsetWidth/2,10),y:parseInt(E.offsetHeight/2,10)};}},lock:function(){this.thumb.lock();this.locked=true;},unlock:function(){this.thumb.unlock();this.locked=false;},thumbMouseUp:function(){this._mouseDown=false;if(!this.isLocked()&&!this.moveComplete){this.endMove();}},onMouseUp:function(){this._mouseDown=false;if(this.backgroundEnabled&&!this.isLocked()&&!this.moveComplete){this.endMove();}},getThumb:function(){return this.thumb;},focus:function(){this.valueChangeSource=C.SOURCE_UI_EVENT;var E=this.getEl();if(E.focus){try{E.focus();}catch(F){}}this.verifyOffset();return !this.isLocked();},onChange:function(E,F){},onSlideStart:function(){},onSlideEnd:function(){},getValue:function(){return this.thumb.getValue();},getXValue:function(){return this.thumb.getXValue();},getYValue:function(){return this.thumb.getYValue();},setValue:function(){var E=D.call(arguments);E.unshift(C.SOURCE_SET_VALUE);return this._setValue.apply(this,E);},_setValue:function(I,L,G,H,E){var F=this.thumb,K,J;if(!F.available){this.deferredSetValue=arguments;return false;}if(this.isLocked()&&!H){return false;}if(isNaN(L)){return false;}if(F._isRegion){return false;}this._silent=E;this.valueChangeSource=I||C.SOURCE_SET_VALUE;F.lastOffset=[L,L];this.verifyOffset(true);this._slideStart();if(F._isHoriz){K=F.initPageX+L+this.thumbCenterPoint.x;this.moveThumb(K,F.initPageY,G);}else{J=F.initPageY+L+this.thumbCenterPoint.y;this.moveThumb(F.initPageX,J,G);}return true;},setRegionValue:function(){var E=D.call(arguments);E.unshift(C.SOURCE_SET_VALUE);return this._setRegionValue.apply(this,E);},_setRegionValue:function(F,J,H,I,G,K){var L=this.thumb,E,M;if(!L.available){this.deferredSetRegionValue=arguments;return false;}if(this.isLocked()&&!G){return false;}if(isNaN(J)){return false;}if(!L._isRegion){return false;}this._silent=K;this.valueChangeSource=F||C.SOURCE_SET_VALUE;L.lastOffset=[J,H];this.verifyOffset(true);this._slideStart();E=L.initPageX+J+this.thumbCenterPoint.x;M=L.initPageY+H+this.thumbCenterPoint.y;this.moveThumb(E,M,I);return true;},verifyOffset:function(F){var G=B(this.getEl()),E=this.thumb;if(!this.thumbCenterPoint||!this.thumbCenterPoint.x){this.setThumbCenterPoint();}if(G){if(G[0]!=this.baselinePos[0]||G[1]!=this.baselinePos[1]){this.setInitPosition();this.baselinePos=G;E.initPageX=this.initPageX+E.startOffset[0];E.initPageY=this.initPageY+E.startOffset[1];E.deltaSetXY=null;this.resetThumbConstraints();return false;}}return true;},moveThumb:function(K,J,I,G){var L=this.thumb,M=this,F,E,H;if(!L.available){return;}L.setDelta(this.thumbCenterPoint.x,this.thumbCenterPoint.y);E=L.getTargetCoord(K,J);F=[Math.round(E.x),Math.round(E.y)];if(this.animate&&L._graduated&&!I){this.lock();this.curCoord=B(this.thumb.getEl());this.curCoord=[Math.round(this.curCoord[0]),Math.round(this.curCoord[1])];setTimeout(function(){M.moveOneTick(F);
+},this.tickPause);}else{if(this.animate&&C.ANIM_AVAIL&&!I){this.lock();H=new YAHOO.util.Motion(L.id,{points:{to:F}},this.animationDuration,YAHOO.util.Easing.easeOut);H.onComplete.subscribe(function(){M.unlock();if(!M._mouseDown){M.endMove();}});H.animate();}else{L.setDragElPos(K,J);if(!G&&!this._mouseDown){this.endMove();}}}},_slideStart:function(){if(!this._sliding){if(!this._silent){this.onSlideStart();this.fireEvent("slideStart");}this._sliding=true;}},_slideEnd:function(){if(this._sliding&&this.moveComplete){var E=this._silent;this._sliding=false;this._silent=false;this.moveComplete=false;if(!E){this.onSlideEnd();this.fireEvent("slideEnd");}}},moveOneTick:function(F){var H=this.thumb,G=this,I=null,E,J;if(H._isRegion){I=this._getNextX(this.curCoord,F);E=(I!==null)?I[0]:this.curCoord[0];I=this._getNextY(this.curCoord,F);J=(I!==null)?I[1]:this.curCoord[1];I=E!==this.curCoord[0]||J!==this.curCoord[1]?[E,J]:null;}else{if(H._isHoriz){I=this._getNextX(this.curCoord,F);}else{I=this._getNextY(this.curCoord,F);}}if(I){this.curCoord=I;this.thumb.alignElWithMouse(H.getEl(),I[0]+this.thumbCenterPoint.x,I[1]+this.thumbCenterPoint.y);if(!(I[0]==F[0]&&I[1]==F[1])){setTimeout(function(){G.moveOneTick(F);},this.tickPause);}else{this.unlock();if(!this._mouseDown){this.endMove();}}}else{this.unlock();if(!this._mouseDown){this.endMove();}}},_getNextX:function(E,F){var H=this.thumb,J,G=[],I=null;if(E[0]>F[0]){J=H.tickSize-this.thumbCenterPoint.x;G=H.getTargetCoord(E[0]-J,E[1]);I=[G.x,G.y];}else{if(E[0]<F[0]){J=H.tickSize+this.thumbCenterPoint.x;G=H.getTargetCoord(E[0]+J,E[1]);I=[G.x,G.y];}else{}}return I;},_getNextY:function(E,F){var H=this.thumb,J,G=[],I=null;if(E[1]>F[1]){J=H.tickSize-this.thumbCenterPoint.y;G=H.getTargetCoord(E[0],E[1]-J);I=[G.x,G.y];}else{if(E[1]<F[1]){J=H.tickSize+this.thumbCenterPoint.y;G=H.getTargetCoord(E[0],E[1]+J);I=[G.x,G.y];}else{}}return I;},b4MouseDown:function(E){if(!this.backgroundEnabled){return false;}this.thumb.autoOffset();this.resetThumbConstraints();},onMouseDown:function(F){if(!this.backgroundEnabled||this.isLocked()){return false;}this._mouseDown=true;var E=A.getPageX(F),G=A.getPageY(F);this.focus();this._slideStart();this.moveThumb(E,G);},onDrag:function(F){if(this.backgroundEnabled&&!this.isLocked()){var E=A.getPageX(F),G=A.getPageY(F);this.moveThumb(E,G,true,true);this.fireEvents();}},endMove:function(){this.unlock();this.fireEvents();this.moveComplete=true;this._slideEnd();},resetThumbConstraints:function(){var E=this.thumb;E.setXConstraint(E.leftConstraint,E.rightConstraint,E.xTickSize);E.setYConstraint(E.topConstraint,E.bottomConstraint,E.xTickSize);},fireEvents:function(G){var F=this.thumb,I,H,E;if(!G){F.cachePosition();}if(!this.isLocked()){if(F._isRegion){I=F.getXValue();H=F.getYValue();if(I!=this.previousX||H!=this.previousY){if(!this._silent){this.onChange(I,H);this.fireEvent("change",{x:I,y:H});}}this.previousX=I;this.previousY=H;}else{E=F.getValue();if(E!=this.previousVal){if(!this._silent){this.onChange(E);this.fireEvent("change",E);}}this.previousVal=E;}}},toString:function(){return("Slider ("+this.type+") "+this.id);}});YAHOO.lang.augmentProto(C,YAHOO.util.EventProvider);YAHOO.widget.Slider=C;})();YAHOO.widget.SliderThumb=function(G,B,E,D,A,F,C){if(G){YAHOO.widget.SliderThumb.superclass.constructor.call(this,G,B);this.parentElId=B;}this.isTarget=false;this.tickSize=C;this.maintainOffset=true;this.initSlider(E,D,A,F,C);this.scroll=false;};YAHOO.extend(YAHOO.widget.SliderThumb,YAHOO.util.DD,{startOffset:null,dragOnly:true,_isHoriz:false,_prevVal:0,_graduated:false,getOffsetFromParent0:function(C){var A=YAHOO.util.Dom.getXY(this.getEl()),B=C||YAHOO.util.Dom.getXY(this.parentElId);return[(A[0]-B[0]),(A[1]-B[1])];},getOffsetFromParent:function(H){var A=this.getEl(),E,I,F,B,K,D,C,J,G;if(!this.deltaOffset){I=YAHOO.util.Dom.getXY(A);F=H||YAHOO.util.Dom.getXY(this.parentElId);E=[(I[0]-F[0]),(I[1]-F[1])];B=parseInt(YAHOO.util.Dom.getStyle(A,"left"),10);K=parseInt(YAHOO.util.Dom.getStyle(A,"top"),10);D=B-E[0];C=K-E[1];if(isNaN(D)||isNaN(C)){}else{this.deltaOffset=[D,C];}}else{J=parseInt(YAHOO.util.Dom.getStyle(A,"left"),10);G=parseInt(YAHOO.util.Dom.getStyle(A,"top"),10);E=[J+this.deltaOffset[0],G+this.deltaOffset[1]];}return E;},initSlider:function(D,C,A,E,B){this.initLeft=D;this.initRight=C;this.initUp=A;this.initDown=E;this.setXConstraint(D,C,B);this.setYConstraint(A,E,B);if(B&&B>1){this._graduated=true;}this._isHoriz=(D||C);this._isVert=(A||E);this._isRegion=(this._isHoriz&&this._isVert);},clearTicks:function(){YAHOO.widget.SliderThumb.superclass.clearTicks.call(this);this.tickSize=0;this._graduated=false;},getValue:function(){return(this._isHoriz)?this.getXValue():this.getYValue();},getXValue:function(){if(!this.available){return 0;}var A=this.getOffsetFromParent();if(YAHOO.lang.isNumber(A[0])){this.lastOffset=A;return(A[0]-this.startOffset[0]);}else{return(this.lastOffset[0]-this.startOffset[0]);}},getYValue:function(){if(!this.available){return 0;}var A=this.getOffsetFromParent();if(YAHOO.lang.isNumber(A[1])){this.lastOffset=A;return(A[1]-this.startOffset[1]);}else{return(this.lastOffset[1]-this.startOffset[1]);}},toString:function(){return"SliderThumb "+this.id;},onChange:function(A,B){}});(function(){var A=YAHOO.util.Event,B=YAHOO.widget;function C(I,F,H,D){var G=this,J={min:false,max:false},E,K;this.minSlider=I;this.maxSlider=F;this.activeSlider=I;this.isHoriz=I.thumb._isHoriz;E=this.minSlider.thumb.onMouseDown;K=this.maxSlider.thumb.onMouseDown;this.minSlider.thumb.onMouseDown=function(){G.activeSlider=G.minSlider;E.apply(this,arguments);};this.maxSlider.thumb.onMouseDown=function(){G.activeSlider=G.maxSlider;K.apply(this,arguments);};this.minSlider.thumb.onAvailable=function(){I.setStartSliderState();J.min=true;if(J.max){G.fireEvent("ready",G);}};this.maxSlider.thumb.onAvailable=function(){F.setStartSliderState();J.max=true;if(J.min){G.fireEvent("ready",G);}};I.onMouseDown=F.onMouseDown=function(L){return this.backgroundEnabled&&G._handleMouseDown(L);
+};I.onDrag=F.onDrag=function(L){G._handleDrag(L);};I.onMouseUp=F.onMouseUp=function(L){G._handleMouseUp(L);};I._bindKeyEvents=function(){G._bindKeyEvents(this);};F._bindKeyEvents=function(){};I.subscribe("change",this._handleMinChange,I,this);I.subscribe("slideStart",this._handleSlideStart,I,this);I.subscribe("slideEnd",this._handleSlideEnd,I,this);F.subscribe("change",this._handleMaxChange,F,this);F.subscribe("slideStart",this._handleSlideStart,F,this);F.subscribe("slideEnd",this._handleSlideEnd,F,this);this.createEvent("ready",this);this.createEvent("change",this);this.createEvent("slideStart",this);this.createEvent("slideEnd",this);D=YAHOO.lang.isArray(D)?D:[0,H];D[0]=Math.min(Math.max(parseInt(D[0],10)|0,0),H);D[1]=Math.max(Math.min(parseInt(D[1],10)|0,H),0);if(D[0]>D[1]){D.splice(0,2,D[1],D[0]);}this.minVal=D[0];this.maxVal=D[1];this.minSlider.setValue(this.minVal,true,true,true);this.maxSlider.setValue(this.maxVal,true,true,true);}C.prototype={minVal:-1,maxVal:-1,minRange:0,_handleSlideStart:function(E,D){this.fireEvent("slideStart",D);},_handleSlideEnd:function(E,D){this.fireEvent("slideEnd",D);},_handleDrag:function(D){B.Slider.prototype.onDrag.call(this.activeSlider,D);},_handleMinChange:function(){this.activeSlider=this.minSlider;this.updateValue();},_handleMaxChange:function(){this.activeSlider=this.maxSlider;this.updateValue();},_bindKeyEvents:function(D){A.on(D.id,"keydown",this._handleKeyDown,this,true);A.on(D.id,"keypress",this._handleKeyPress,this,true);},_handleKeyDown:function(D){this.activeSlider.handleKeyDown.apply(this.activeSlider,arguments);},_handleKeyPress:function(D){this.activeSlider.handleKeyPress.apply(this.activeSlider,arguments);},setValues:function(H,K,I,E,J){var F=this.minSlider,M=this.maxSlider,D=F.thumb,L=M.thumb,N=this,G={min:false,max:false};if(D._isHoriz){D.setXConstraint(D.leftConstraint,L.rightConstraint,D.tickSize);L.setXConstraint(D.leftConstraint,L.rightConstraint,L.tickSize);}else{D.setYConstraint(D.topConstraint,L.bottomConstraint,D.tickSize);L.setYConstraint(D.topConstraint,L.bottomConstraint,L.tickSize);}this._oneTimeCallback(F,"slideEnd",function(){G.min=true;if(G.max){N.updateValue(J);setTimeout(function(){N._cleanEvent(F,"slideEnd");N._cleanEvent(M,"slideEnd");},0);}});this._oneTimeCallback(M,"slideEnd",function(){G.max=true;if(G.min){N.updateValue(J);setTimeout(function(){N._cleanEvent(F,"slideEnd");N._cleanEvent(M,"slideEnd");},0);}});F.setValue(H,I,E,false);M.setValue(K,I,E,false);},setMinValue:function(F,H,I,E){var G=this.minSlider,D=this;this.activeSlider=G;D=this;this._oneTimeCallback(G,"slideEnd",function(){D.updateValue(E);setTimeout(function(){D._cleanEvent(G,"slideEnd");},0);});G.setValue(F,H,I);},setMaxValue:function(D,H,I,F){var G=this.maxSlider,E=this;this.activeSlider=G;this._oneTimeCallback(G,"slideEnd",function(){E.updateValue(F);setTimeout(function(){E._cleanEvent(G,"slideEnd");},0);});G.setValue(D,H,I);},updateValue:function(J){var E=this.minSlider.getValue(),K=this.maxSlider.getValue(),F=false,D,M,H,I,L,G;if(E!=this.minVal||K!=this.maxVal){F=true;D=this.minSlider.thumb;M=this.maxSlider.thumb;H=this.isHoriz?"x":"y";G=this.minSlider.thumbCenterPoint[H]+this.maxSlider.thumbCenterPoint[H];I=Math.max(K-G-this.minRange,0);L=Math.min(-E-G-this.minRange,0);if(this.isHoriz){I=Math.min(I,M.rightConstraint);D.setXConstraint(D.leftConstraint,I,D.tickSize);M.setXConstraint(L,M.rightConstraint,M.tickSize);}else{I=Math.min(I,M.bottomConstraint);D.setYConstraint(D.leftConstraint,I,D.tickSize);M.setYConstraint(L,M.bottomConstraint,M.tickSize);}}this.minVal=E;this.maxVal=K;if(F&&!J){this.fireEvent("change",this);}},selectActiveSlider:function(H){var E=this.minSlider,D=this.maxSlider,J=E.isLocked()||!E.backgroundEnabled,G=D.isLocked()||!E.backgroundEnabled,F=YAHOO.util.Event,I;if(J||G){this.activeSlider=J?D:E;}else{if(this.isHoriz){I=F.getPageX(H)-E.thumb.initPageX-E.thumbCenterPoint.x;}else{I=F.getPageY(H)-E.thumb.initPageY-E.thumbCenterPoint.y;}this.activeSlider=I*2>D.getValue()+E.getValue()?D:E;}},_handleMouseDown:function(D){if(!D._handled){D._handled=true;this.selectActiveSlider(D);return B.Slider.prototype.onMouseDown.call(this.activeSlider,D);}else{return false;}},_handleMouseUp:function(D){B.Slider.prototype.onMouseUp.apply(this.activeSlider,arguments);},_oneTimeCallback:function(F,D,E){F.subscribe(D,function(){F.unsubscribe(D,arguments.callee);E.apply({},[].slice.apply(arguments));});},_cleanEvent:function(K,E){var J,I,D,G,H,F;if(K.__yui_events&&K.events[E]){for(I=K.__yui_events.length;I>=0;--I){if(K.__yui_events[I].type===E){J=K.__yui_events[I];break;}}if(J){H=J.subscribers;F=[];G=0;for(I=0,D=H.length;I<D;++I){if(H[I]){F[G++]=H[I];}}J.subscribers=F;}}}};YAHOO.lang.augmentProto(C,YAHOO.util.EventProvider);B.Slider.getHorizDualSlider=function(H,J,K,G,F,D){var I=new B.SliderThumb(J,H,0,G,0,0,F),E=new B.SliderThumb(K,H,0,G,0,0,F);return new C(new B.Slider(H,H,I,"horiz"),new B.Slider(H,H,E,"horiz"),G,D);};B.Slider.getVertDualSlider=function(H,J,K,G,F,D){var I=new B.SliderThumb(J,H,0,0,0,G,F),E=new B.SliderThumb(K,H,0,0,0,G,F);return new B.DualSlider(new B.Slider(H,H,I,"vert"),new B.Slider(H,H,E,"vert"),G,D);};YAHOO.widget.DualSlider=C;})();YAHOO.register("slider",YAHOO.widget.Slider,{version:"2.7.0",build:"1796"});/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+YAHOO.util.Attribute=function(B,A){if(A){this.owner=A;this.configure(B,true);}};YAHOO.util.Attribute.prototype={name:undefined,value:null,owner:null,readOnly:false,writeOnce:false,_initialConfig:null,_written:false,method:null,setter:null,getter:null,validator:null,getValue:function(){var A=this.value;if(this.getter){A=this.getter.call(this.owner,this.name);}return A;},setValue:function(F,B){var E,A=this.owner,C=this.name;var D={type:C,prevValue:this.getValue(),newValue:F};if(this.readOnly||(this.writeOnce&&this._written)){return false;}if(this.validator&&!this.validator.call(A,F)){return false;}if(!B){E=A.fireBeforeChangeEvent(D);if(E===false){return false;}}if(this.setter){F=this.setter.call(A,F,this.name);if(F===undefined){}}if(this.method){this.method.call(A,F,this.name);}this.value=F;this._written=true;D.type=C;if(!B){this.owner.fireChangeEvent(D);}return true;},configure:function(B,C){B=B||{};if(C){this._written=false;}this._initialConfig=this._initialConfig||{};for(var A in B){if(B.hasOwnProperty(A)){this[A]=B[A];if(C){this._initialConfig[A]=B[A];}}}},resetValue:function(){return this.setValue(this._initialConfig.value);},resetConfig:function(){this.configure(this._initialConfig,true);},refresh:function(A){this.setValue(this.value,A);}};(function(){var A=YAHOO.util.Lang;YAHOO.util.AttributeProvider=function(){};YAHOO.util.AttributeProvider.prototype={_configs:null,get:function(C){this._configs=this._configs||{};var B=this._configs[C];if(!B||!this._configs.hasOwnProperty(C)){return null;}return B.getValue();},set:function(D,E,B){this._configs=this._configs||{};var C=this._configs[D];if(!C){return false;}return C.setValue(E,B);},getAttributeKeys:function(){this._configs=this._configs;var C=[],B;for(B in this._configs){if(A.hasOwnProperty(this._configs,B)&&!A.isUndefined(this._configs[B])){C[C.length]=B;}}return C;},setAttributes:function(D,B){for(var C in D){if(A.hasOwnProperty(D,C)){this.set(C,D[C],B);}}},resetValue:function(C,B){this._configs=this._configs||{};if(this._configs[C]){this.set(C,this._configs[C]._initialConfig.value,B);return true;}return false;},refresh:function(E,C){this._configs=this._configs||{};var F=this._configs;E=((A.isString(E))?[E]:E)||this.getAttributeKeys();for(var D=0,B=E.length;D<B;++D){if(F.hasOwnProperty(E[D])){this._configs[E[D]].refresh(C);}}},register:function(B,C){this.setAttributeConfig(B,C);},getAttributeConfig:function(C){this._configs=this._configs||{};var B=this._configs[C]||{};var D={};for(C in B){if(A.hasOwnProperty(B,C)){D[C]=B[C];}}return D;},setAttributeConfig:function(B,C,D){this._configs=this._configs||{};C=C||{};if(!this._configs[B]){C.name=B;this._configs[B]=this.createAttribute(C);}else{this._configs[B].configure(C,D);}},configureAttribute:function(B,C,D){this.setAttributeConfig(B,C,D);},resetAttributeConfig:function(B){this._configs=this._configs||{};this._configs[B].resetConfig();},subscribe:function(B,C){this._events=this._events||{};if(!(B in this._events)){this._events[B]=this.createEvent(B);}YAHOO.util.EventProvider.prototype.subscribe.apply(this,arguments);},on:function(){this.subscribe.apply(this,arguments);},addListener:function(){this.subscribe.apply(this,arguments);},fireBeforeChangeEvent:function(C){var B="before";B+=C.type.charAt(0).toUpperCase()+C.type.substr(1)+"Change";C.type=B;return this.fireEvent(C.type,C);},fireChangeEvent:function(B){B.type+="Change";return this.fireEvent(B.type,B);},createAttribute:function(B){return new YAHOO.util.Attribute(B,this);}};YAHOO.augment(YAHOO.util.AttributeProvider,YAHOO.util.EventProvider);})();(function(){var B=YAHOO.util.Dom,C=YAHOO.util.AttributeProvider;var A=function(D,E){this.init.apply(this,arguments);};A.DOM_EVENTS={"click":true,"dblclick":true,"keydown":true,"keypress":true,"keyup":true,"mousedown":true,"mousemove":true,"mouseout":true,"mouseover":true,"mouseup":true,"focus":true,"blur":true,"submit":true,"change":true};A.prototype={DOM_EVENTS:null,DEFAULT_HTML_SETTER:function(F,D){var E=this.get("element");if(E){E[D]=F;}},DEFAULT_HTML_GETTER:function(D){var E=this.get("element"),F;if(E){F=E[D];}return F;},appendChild:function(D){D=D.get?D.get("element"):D;return this.get("element").appendChild(D);},getElementsByTagName:function(D){return this.get("element").getElementsByTagName(D);},hasChildNodes:function(){return this.get("element").hasChildNodes();},insertBefore:function(D,E){D=D.get?D.get("element"):D;E=(E&&E.get)?E.get("element"):E;return this.get("element").insertBefore(D,E);},removeChild:function(D){D=D.get?D.get("element"):D;return this.get("element").removeChild(D);},replaceChild:function(D,E){D=D.get?D.get("element"):D;E=E.get?E.get("element"):E;return this.get("element").replaceChild(D,E);},initAttributes:function(D){},addListener:function(H,G,I,F){var E=this.get("element")||this.get("id");F=F||this;var D=this;if(!this._events[H]){if(E&&this.DOM_EVENTS[H]){YAHOO.util.Event.addListener(E,H,function(J){if(J.srcElement&&!J.target){J.target=J.srcElement;}D.fireEvent(H,J);},I,F);}this.createEvent(H,this);}return YAHOO.util.EventProvider.prototype.subscribe.apply(this,arguments);},on:function(){return this.addListener.apply(this,arguments);},subscribe:function(){return this.addListener.apply(this,arguments);},removeListener:function(E,D){return this.unsubscribe.apply(this,arguments);},addClass:function(D){B.addClass(this.get("element"),D);},getElementsByClassName:function(E,D){return B.getElementsByClassName(E,D,this.get("element"));},hasClass:function(D){return B.hasClass(this.get("element"),D);},removeClass:function(D){return B.removeClass(this.get("element"),D);},replaceClass:function(E,D){return B.replaceClass(this.get("element"),E,D);},setStyle:function(E,D){return B.setStyle(this.get("element"),E,D);},getStyle:function(D){return B.getStyle(this.get("element"),D);},fireQueue:function(){var E=this._queue;for(var F=0,D=E.length;F<D;++F){this[E[F][0]].apply(this,E[F][1]);}},appendTo:function(E,F){E=(E.get)?E.get("element"):B.get(E);this.fireEvent("beforeAppendTo",{type:"beforeAppendTo",target:E});
+F=(F&&F.get)?F.get("element"):B.get(F);var D=this.get("element");if(!D){return false;}if(!E){return false;}if(D.parent!=E){if(F){E.insertBefore(D,F);}else{E.appendChild(D);}}this.fireEvent("appendTo",{type:"appendTo",target:E});return D;},get:function(D){var F=this._configs||{},E=F.element;if(E&&!F[D]&&!YAHOO.lang.isUndefined(E.value[D])){this._setHTMLAttrConfig(D);}return C.prototype.get.call(this,D);},setAttributes:function(J,G){var E={},H=this._configOrder;for(var I=0,D=H.length;I<D;++I){if(J[H[I]]!==undefined){E[H[I]]=true;this.set(H[I],J[H[I]],G);}}for(var F in J){if(J.hasOwnProperty(F)&&!E[F]){this.set(F,J[F],G);}}},set:function(E,G,D){var F=this.get("element");if(!F){this._queue[this._queue.length]=["set",arguments];if(this._configs[E]){this._configs[E].value=G;}return;}if(!this._configs[E]&&!YAHOO.lang.isUndefined(F[E])){this._setHTMLAttrConfig(E);}return C.prototype.set.apply(this,arguments);},setAttributeConfig:function(D,E,F){this._configOrder.push(D);C.prototype.setAttributeConfig.apply(this,arguments);},createEvent:function(E,D){this._events[E]=true;return C.prototype.createEvent.apply(this,arguments);},init:function(E,D){this._initElement(E,D);},destroy:function(){var D=this.get("element");YAHOO.util.Event.purgeElement(D,true);this.unsubscribeAll();if(D&&D.parentNode){D.parentNode.removeChild(D);}this._queue=[];this._events={};this._configs={};this._configOrder=[];},_initElement:function(F,E){this._queue=this._queue||[];this._events=this._events||{};this._configs=this._configs||{};this._configOrder=[];E=E||{};E.element=E.element||F||null;var H=false;var D=A.DOM_EVENTS;this.DOM_EVENTS=this.DOM_EVENTS||{};for(var G in D){if(D.hasOwnProperty(G)){this.DOM_EVENTS[G]=D[G];}}if(typeof E.element==="string"){this._setHTMLAttrConfig("id",{value:E.element});}if(B.get(E.element)){H=true;this._initHTMLElement(E);this._initContent(E);}YAHOO.util.Event.onAvailable(E.element,function(){if(!H){this._initHTMLElement(E);}this.fireEvent("available",{type:"available",target:B.get(E.element)});},this,true);YAHOO.util.Event.onContentReady(E.element,function(){if(!H){this._initContent(E);}this.fireEvent("contentReady",{type:"contentReady",target:B.get(E.element)});},this,true);},_initHTMLElement:function(D){this.setAttributeConfig("element",{value:B.get(D.element),readOnly:true});},_initContent:function(D){this.initAttributes(D);this.setAttributes(D,true);this.fireQueue();},_setHTMLAttrConfig:function(D,F){var E=this.get("element");F=F||{};F.name=D;F.setter=F.setter||this.DEFAULT_HTML_SETTER;F.getter=F.getter||this.DEFAULT_HTML_GETTER;F.value=F.value||E[D];this._configs[D]=new YAHOO.util.Attribute(F,this);}};YAHOO.augment(A,C);YAHOO.util.Element=A;})();YAHOO.register("element",YAHOO.util.Element,{version:"2.7.0",build:"1796"});/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+YAHOO.util.Color=function(){var A="0",B=YAHOO.lang.isArray,C=YAHOO.lang.isNumber;return{real2dec:function(D){return Math.min(255,Math.round(D*256));},hsv2rgb:function(H,O,M){if(B(H)){return this.hsv2rgb.call(this,H[0],H[1],H[2]);}var D,I,L,G=Math.floor((H/60)%6),J=(H/60)-G,F=M*(1-O),E=M*(1-J*O),N=M*(1-(1-J)*O),K;switch(G){case 0:D=M;I=N;L=F;break;case 1:D=E;I=M;L=F;break;case 2:D=F;I=M;L=N;break;case 3:D=F;I=E;L=M;break;case 4:D=N;I=F;L=M;break;case 5:D=M;I=F;L=E;break;}K=this.real2dec;return[K(D),K(I),K(L)];},rgb2hsv:function(D,H,I){if(B(D)){return this.rgb2hsv.apply(this,D);}D/=255;H/=255;I/=255;var G,L,E=Math.min(Math.min(D,H),I),J=Math.max(Math.max(D,H),I),K=J-E,F;switch(J){case E:G=0;break;case D:G=60*(H-I)/K;if(H<I){G+=360;}break;case H:G=(60*(I-D)/K)+120;break;case I:G=(60*(D-H)/K)+240;break;}L=(J===0)?0:1-(E/J);F=[Math.round(G),L,J];return F;},rgb2hex:function(F,E,D){if(B(F)){return this.rgb2hex.apply(this,F);}var G=this.dec2hex;return G(F)+G(E)+G(D);},dec2hex:function(D){D=parseInt(D,10)|0;D=(D>255||D<0)?0:D;return(A+D.toString(16)).slice(-2).toUpperCase();},hex2dec:function(D){return parseInt(D,16);},hex2rgb:function(D){var E=this.hex2dec;return[E(D.slice(0,2)),E(D.slice(2,4)),E(D.slice(4,6))];},websafe:function(F,E,D){if(B(F)){return this.websafe.apply(this,F);}var G=function(H){if(C(H)){H=Math.min(Math.max(0,H),255);var I,J;for(I=0;I<256;I=I+51){J=I+51;if(H>=I&&H<=J){return(H-I>25)?J:I;}}}return H;};return[G(F),G(E),G(D)];}};}();(function(){var J=0,F=YAHOO.util,C=YAHOO.lang,D=YAHOO.widget.Slider,B=F.Color,E=F.Dom,I=F.Event,A=C.substitute,H="yui-picker";function G(L,K){J=J+1;K=K||{};if(arguments.length===1&&!YAHOO.lang.isString(L)&&!L.nodeName){K=L;L=K.element||null;}if(!L&&!K.element){L=this._createHostElement(K);}G.superclass.constructor.call(this,L,K);this.initPicker();}YAHOO.extend(G,YAHOO.util.Element,{ID:{R:H+"-r",R_HEX:H+"-rhex",G:H+"-g",G_HEX:H+"-ghex",B:H+"-b",B_HEX:H+"-bhex",H:H+"-h",S:H+"-s",V:H+"-v",PICKER_BG:H+"-bg",PICKER_THUMB:H+"-thumb",HUE_BG:H+"-hue-bg",HUE_THUMB:H+"-hue-thumb",HEX:H+"-hex",SWATCH:H+"-swatch",WEBSAFE_SWATCH:H+"-websafe-swatch",CONTROLS:H+"-controls",RGB_CONTROLS:H+"-rgb-controls",HSV_CONTROLS:H+"-hsv-controls",HEX_CONTROLS:H+"-hex-controls",HEX_SUMMARY:H+"-hex-summary",CONTROLS_LABEL:H+"-controls-label"},TXT:{ILLEGAL_HEX:"Illegal hex value entered",SHOW_CONTROLS:"Show color details",HIDE_CONTROLS:"Hide color details",CURRENT_COLOR:"Currently selected color: {rgb}",CLOSEST_WEBSAFE:"Closest websafe color: {rgb}. Click to select.",R:"R",G:"G",B:"B",H:"H",S:"S",V:"V",HEX:"#",DEG:"\u00B0",PERCENT:"%"},IMAGE:{PICKER_THUMB:"../../build/colorpicker/assets/picker_thumb.png",HUE_THUMB:"../../build/colorpicker/assets/hue_thumb.png"},DEFAULT:{PICKER_SIZE:180},OPT:{HUE:"hue",SATURATION:"saturation",VALUE:"value",RED:"red",GREEN:"green",BLUE:"blue",HSV:"hsv",RGB:"rgb",WEBSAFE:"websafe",HEX:"hex",PICKER_SIZE:"pickersize",SHOW_CONTROLS:"showcontrols",SHOW_RGB_CONTROLS:"showrgbcontrols",SHOW_HSV_CONTROLS:"showhsvcontrols",SHOW_HEX_CONTROLS:"showhexcontrols",SHOW_HEX_SUMMARY:"showhexsummary",SHOW_WEBSAFE:"showwebsafe",CONTAINER:"container",IDS:"ids",ELEMENTS:"elements",TXT:"txt",IMAGES:"images",ANIMATE:"animate"},skipAnim:true,_createHostElement:function(){var K=document.createElement("div");if(this.CSS.BASE){K.className=this.CSS.BASE;}return K;},_updateHueSlider:function(){var K=this.get(this.OPT.PICKER_SIZE),L=this.get(this.OPT.HUE);L=K-Math.round(L/360*K);if(L===K){L=0;}this.hueSlider.setValue(L,this.skipAnim);},_updatePickerSlider:function(){var L=this.get(this.OPT.PICKER_SIZE),M=this.get(this.OPT.SATURATION),K=this.get(this.OPT.VALUE);M=Math.round(M*L/100);K=Math.round(L-(K*L/100));this.pickerSlider.setRegionValue(M,K,this.skipAnim);},_updateSliders:function(){this._updateHueSlider();this._updatePickerSlider();},setValue:function(L,K){K=(K)||false;this.set(this.OPT.RGB,L,K);this._updateSliders();},hueSlider:null,pickerSlider:null,_getH:function(){var K=this.get(this.OPT.PICKER_SIZE),L=(K-this.hueSlider.getValue())/K;L=Math.round(L*360);return(L===360)?0:L;},_getS:function(){return this.pickerSlider.getXValue()/this.get(this.OPT.PICKER_SIZE);},_getV:function(){var K=this.get(this.OPT.PICKER_SIZE);return(K-this.pickerSlider.getYValue())/K;},_updateSwatch:function(){var M=this.get(this.OPT.RGB),O=this.get(this.OPT.WEBSAFE),N=this.getElement(this.ID.SWATCH),L=M.join(","),K=this.get(this.OPT.TXT);E.setStyle(N,"background-color","rgb("+L+")");N.title=A(K.CURRENT_COLOR,{"rgb":"#"+this.get(this.OPT.HEX)});N=this.getElement(this.ID.WEBSAFE_SWATCH);L=O.join(",");E.setStyle(N,"background-color","rgb("+L+")");N.title=A(K.CLOSEST_WEBSAFE,{"rgb":"#"+B.rgb2hex(O)});},_getValuesFromSliders:function(){this.set(this.OPT.RGB,B.hsv2rgb(this._getH(),this._getS(),this._getV()));},_updateFormFields:function(){this.getElement(this.ID.H).value=this.get(this.OPT.HUE);this.getElement(this.ID.S).value=this.get(this.OPT.SATURATION);this.getElement(this.ID.V).value=this.get(this.OPT.VALUE);this.getElement(this.ID.R).value=this.get(this.OPT.RED);this.getElement(this.ID.R_HEX).innerHTML=B.dec2hex(this.get(this.OPT.RED));this.getElement(this.ID.G).value=this.get(this.OPT.GREEN);this.getElement(this.ID.G_HEX).innerHTML=B.dec2hex(this.get(this.OPT.GREEN));this.getElement(this.ID.B).value=this.get(this.OPT.BLUE);this.getElement(this.ID.B_HEX).innerHTML=B.dec2hex(this.get(this.OPT.BLUE));this.getElement(this.ID.HEX).value=this.get(this.OPT.HEX);},_onHueSliderChange:function(N){var L=this._getH(),K=B.hsv2rgb(L,1,1),M="rgb("+K.join(",")+")";this.set(this.OPT.HUE,L,true);E.setStyle(this.getElement(this.ID.PICKER_BG),"background-color",M);if(this.hueSlider.valueChangeSource!==D.SOURCE_SET_VALUE){this._getValuesFromSliders();}this._updateFormFields();this._updateSwatch();},_onPickerSliderChange:function(M){var L=this._getS(),K=this._getV();this.set(this.OPT.SATURATION,Math.round(L*100),true);this.set(this.OPT.VALUE,Math.round(K*100),true);if(this.pickerSlider.valueChangeSource!==D.SOURCE_SET_VALUE){this._getValuesFromSliders();
+}this._updateFormFields();this._updateSwatch();},_getCommand:function(K){var L=I.getCharCode(K);if(L===38){return 3;}else{if(L===13){return 6;}else{if(L===40){return 4;}else{if(L>=48&&L<=57){return 1;}else{if(L>=97&&L<=102){return 2;}else{if(L>=65&&L<=70){return 2;}else{if("8, 9, 13, 27, 37, 39".indexOf(L)>-1||K.ctrlKey||K.metaKey){return 5;}else{return 0;}}}}}}}},_useFieldValue:function(L,K,N){var M=K.value;if(N!==this.OPT.HEX){M=parseInt(M,10);}if(M!==this.get(N)){this.set(N,M);}},_rgbFieldKeypress:function(M,K,O){var N=this._getCommand(M),L=(M.shiftKey)?10:1;switch(N){case 6:this._useFieldValue.apply(this,arguments);break;case 3:this.set(O,Math.min(this.get(O)+L,255));this._updateFormFields();break;case 4:this.set(O,Math.max(this.get(O)-L,0));this._updateFormFields();break;default:}},_hexFieldKeypress:function(L,K,N){var M=this._getCommand(L);if(M===6){this._useFieldValue.apply(this,arguments);}},_hexOnly:function(L,K){var M=this._getCommand(L);switch(M){case 6:case 5:case 1:break;case 2:if(K!==true){break;}default:I.stopEvent(L);return false;}},_numbersOnly:function(K){return this._hexOnly(K,true);},getElement:function(K){return this.get(this.OPT.ELEMENTS)[this.get(this.OPT.IDS)[K]];},_createElements:function(){var N,M,P,O,L,K=this.get(this.OPT.IDS),Q=this.get(this.OPT.TXT),S=this.get(this.OPT.IMAGES),R=function(U,V){var W=document.createElement(U);if(V){C.augmentObject(W,V,true);}return W;},T=function(U,V){var W=C.merge({autocomplete:"off",value:"0",size:3,maxlength:3},V);W.name=W.id;return new R(U,W);};L=this.get("element");N=new R("div",{id:K[this.ID.PICKER_BG],className:"yui-picker-bg",tabIndex:-1,hideFocus:true});M=new R("div",{id:K[this.ID.PICKER_THUMB],className:"yui-picker-thumb"});P=new R("img",{src:S.PICKER_THUMB});M.appendChild(P);N.appendChild(M);L.appendChild(N);N=new R("div",{id:K[this.ID.HUE_BG],className:"yui-picker-hue-bg",tabIndex:-1,hideFocus:true});M=new R("div",{id:K[this.ID.HUE_THUMB],className:"yui-picker-hue-thumb"});P=new R("img",{src:S.HUE_THUMB});M.appendChild(P);N.appendChild(M);L.appendChild(N);N=new R("div",{id:K[this.ID.CONTROLS],className:"yui-picker-controls"});L.appendChild(N);L=N;N=new R("div",{className:"hd"});M=new R("a",{id:K[this.ID.CONTROLS_LABEL],href:"#"});N.appendChild(M);L.appendChild(N);N=new R("div",{className:"bd"});L.appendChild(N);L=N;N=new R("ul",{id:K[this.ID.RGB_CONTROLS],className:"yui-picker-rgb-controls"});M=new R("li");M.appendChild(document.createTextNode(Q.R+" "));O=new T("input",{id:K[this.ID.R],className:"yui-picker-r"});M.appendChild(O);N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.G+" "));O=new T("input",{id:K[this.ID.G],className:"yui-picker-g"});M.appendChild(O);N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.B+" "));O=new T("input",{id:K[this.ID.B],className:"yui-picker-b"});M.appendChild(O);N.appendChild(M);L.appendChild(N);N=new R("ul",{id:K[this.ID.HSV_CONTROLS],className:"yui-picker-hsv-controls"});M=new R("li");M.appendChild(document.createTextNode(Q.H+" "));O=new T("input",{id:K[this.ID.H],className:"yui-picker-h"});M.appendChild(O);M.appendChild(document.createTextNode(" "+Q.DEG));N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.S+" "));O=new T("input",{id:K[this.ID.S],className:"yui-picker-s"});M.appendChild(O);M.appendChild(document.createTextNode(" "+Q.PERCENT));N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.V+" "));O=new T("input",{id:K[this.ID.V],className:"yui-picker-v"});M.appendChild(O);M.appendChild(document.createTextNode(" "+Q.PERCENT));N.appendChild(M);L.appendChild(N);N=new R("ul",{id:K[this.ID.HEX_SUMMARY],className:"yui-picker-hex_summary"});M=new R("li",{id:K[this.ID.R_HEX]});N.appendChild(M);M=new R("li",{id:K[this.ID.G_HEX]});N.appendChild(M);M=new R("li",{id:K[this.ID.B_HEX]});N.appendChild(M);L.appendChild(N);N=new R("div",{id:K[this.ID.HEX_CONTROLS],className:"yui-picker-hex-controls"});N.appendChild(document.createTextNode(Q.HEX+" "));M=new T("input",{id:K[this.ID.HEX],className:"yui-picker-hex",size:6,maxlength:6});N.appendChild(M);L.appendChild(N);L=this.get("element");N=new R("div",{id:K[this.ID.SWATCH],className:"yui-picker-swatch"});L.appendChild(N);N=new R("div",{id:K[this.ID.WEBSAFE_SWATCH],className:"yui-picker-websafe-swatch"});L.appendChild(N);},_attachRGBHSV:function(L,K){I.on(this.getElement(L),"keydown",function(N,M){M._rgbFieldKeypress(N,this,K);},this);I.on(this.getElement(L),"keypress",this._numbersOnly,this,true);I.on(this.getElement(L),"blur",function(N,M){M._useFieldValue(N,this,K);},this);},_updateRGB:function(){var K=[this.get(this.OPT.RED),this.get(this.OPT.GREEN),this.get(this.OPT.BLUE)];this.set(this.OPT.RGB,K);this._updateSliders();},_initElements:function(){var O=this.OPT,N=this.get(O.IDS),L=this.get(O.ELEMENTS),K,M,P;for(K in this.ID){if(C.hasOwnProperty(this.ID,K)){N[this.ID[K]]=N[K];}}M=E.get(N[this.ID.PICKER_BG]);if(!M){this._createElements();}else{}for(K in N){if(C.hasOwnProperty(N,K)){M=E.get(N[K]);P=E.generateId(M);N[K]=P;N[N[K]]=P;L[P]=M;}}},initPicker:function(){this._initSliders();this._bindUI();this.syncUI(true);},_initSliders:function(){var K=this.ID,L=this.get(this.OPT.PICKER_SIZE);this.hueSlider=D.getVertSlider(this.getElement(K.HUE_BG),this.getElement(K.HUE_THUMB),0,L);this.pickerSlider=D.getSliderRegion(this.getElement(K.PICKER_BG),this.getElement(K.PICKER_THUMB),0,L,0,L);this.set(this.OPT.ANIMATE,this.get(this.OPT.ANIMATE));},_bindUI:function(){var K=this.ID,L=this.OPT;this.hueSlider.subscribe("change",this._onHueSliderChange,this,true);this.pickerSlider.subscribe("change",this._onPickerSliderChange,this,true);I.on(this.getElement(K.WEBSAFE_SWATCH),"click",function(M){this.setValue(this.get(L.WEBSAFE));},this,true);I.on(this.getElement(K.CONTROLS_LABEL),"click",function(M){this.set(L.SHOW_CONTROLS,!this.get(L.SHOW_CONTROLS));I.preventDefault(M);},this,true);this._attachRGBHSV(K.R,L.RED);this._attachRGBHSV(K.G,L.GREEN);this._attachRGBHSV(K.B,L.BLUE);this._attachRGBHSV(K.H,L.HUE);
+this._attachRGBHSV(K.S,L.SATURATION);this._attachRGBHSV(K.V,L.VALUE);I.on(this.getElement(K.HEX),"keydown",function(N,M){M._hexFieldKeypress(N,this,L.HEX);},this);I.on(this.getElement(this.ID.HEX),"keypress",this._hexOnly,this,true);I.on(this.getElement(this.ID.HEX),"blur",function(N,M){M._useFieldValue(N,this,L.HEX);},this);},syncUI:function(K){this.skipAnim=K;this._updateRGB();this.skipAnim=false;},_updateRGBFromHSV:function(){var L=[this.get(this.OPT.HUE),this.get(this.OPT.SATURATION)/100,this.get(this.OPT.VALUE)/100],K=B.hsv2rgb(L);this.set(this.OPT.RGB,K);this._updateSliders();},_updateHex:function(){var N=this.get(this.OPT.HEX),K=N.length,O,M,L;if(K===3){O=N.split("");for(M=0;M<K;M=M+1){O[M]=O[M]+O[M];}N=O.join("");}if(N.length!==6){return false;}L=B.hex2rgb(N);this.setValue(L);},_hideShowEl:function(M,K){var L=(C.isString(M)?this.getElement(M):M);E.setStyle(L,"display",(K)?"":"none");},initAttributes:function(K){K=K||{};G.superclass.initAttributes.call(this,K);this.setAttributeConfig(this.OPT.PICKER_SIZE,{value:K.size||this.DEFAULT.PICKER_SIZE});this.setAttributeConfig(this.OPT.HUE,{value:K.hue||0,validator:C.isNumber});this.setAttributeConfig(this.OPT.SATURATION,{value:K.saturation||0,validator:C.isNumber});this.setAttributeConfig(this.OPT.VALUE,{value:C.isNumber(K.value)?K.value:100,validator:C.isNumber});this.setAttributeConfig(this.OPT.RED,{value:C.isNumber(K.red)?K.red:255,validator:C.isNumber});this.setAttributeConfig(this.OPT.GREEN,{value:C.isNumber(K.green)?K.green:255,validator:C.isNumber});this.setAttributeConfig(this.OPT.BLUE,{value:C.isNumber(K.blue)?K.blue:255,validator:C.isNumber});this.setAttributeConfig(this.OPT.HEX,{value:K.hex||"FFFFFF",validator:C.isString});this.setAttributeConfig(this.OPT.RGB,{value:K.rgb||[255,255,255],method:function(O){this.set(this.OPT.RED,O[0],true);this.set(this.OPT.GREEN,O[1],true);this.set(this.OPT.BLUE,O[2],true);var Q=B.websafe(O),P=B.rgb2hex(O),N=B.rgb2hsv(O);this.set(this.OPT.WEBSAFE,Q,true);this.set(this.OPT.HEX,P,true);if(N[1]){this.set(this.OPT.HUE,N[0],true);}this.set(this.OPT.SATURATION,Math.round(N[1]*100),true);this.set(this.OPT.VALUE,Math.round(N[2]*100),true);},readonly:true});this.setAttributeConfig(this.OPT.CONTAINER,{value:null,method:function(N){if(N){N.showEvent.subscribe(function(){this.pickerSlider.focus();},this,true);}}});this.setAttributeConfig(this.OPT.WEBSAFE,{value:K.websafe||[255,255,255]});var M=K.ids||C.merge({},this.ID),L;if(!K.ids&&J>1){for(L in M){if(C.hasOwnProperty(M,L)){M[L]=M[L]+J;}}}this.setAttributeConfig(this.OPT.IDS,{value:M,writeonce:true});this.setAttributeConfig(this.OPT.TXT,{value:K.txt||this.TXT,writeonce:true});this.setAttributeConfig(this.OPT.IMAGES,{value:K.images||this.IMAGE,writeonce:true});this.setAttributeConfig(this.OPT.ELEMENTS,{value:{},readonly:true});this.setAttributeConfig(this.OPT.SHOW_CONTROLS,{value:C.isBoolean(K.showcontrols)?K.showcontrols:true,method:function(N){var O=E.getElementsByClassName("bd","div",this.getElement(this.ID.CONTROLS))[0];this._hideShowEl(O,N);this.getElement(this.ID.CONTROLS_LABEL).innerHTML=(N)?this.get(this.OPT.TXT).HIDE_CONTROLS:this.get(this.OPT.TXT).SHOW_CONTROLS;}});this.setAttributeConfig(this.OPT.SHOW_RGB_CONTROLS,{value:C.isBoolean(K.showrgbcontrols)?K.showrgbcontrols:true,method:function(N){this._hideShowEl(this.ID.RGB_CONTROLS,N);}});this.setAttributeConfig(this.OPT.SHOW_HSV_CONTROLS,{value:C.isBoolean(K.showhsvcontrols)?K.showhsvcontrols:false,method:function(N){this._hideShowEl(this.ID.HSV_CONTROLS,N);if(N&&this.get(this.OPT.SHOW_HEX_SUMMARY)){this.set(this.OPT.SHOW_HEX_SUMMARY,false);}}});this.setAttributeConfig(this.OPT.SHOW_HEX_CONTROLS,{value:C.isBoolean(K.showhexcontrols)?K.showhexcontrols:false,method:function(N){this._hideShowEl(this.ID.HEX_CONTROLS,N);}});this.setAttributeConfig(this.OPT.SHOW_WEBSAFE,{value:C.isBoolean(K.showwebsafe)?K.showwebsafe:true,method:function(N){this._hideShowEl(this.ID.WEBSAFE_SWATCH,N);}});this.setAttributeConfig(this.OPT.SHOW_HEX_SUMMARY,{value:C.isBoolean(K.showhexsummary)?K.showhexsummary:true,method:function(N){this._hideShowEl(this.ID.HEX_SUMMARY,N);if(N&&this.get(this.OPT.SHOW_HSV_CONTROLS)){this.set(this.OPT.SHOW_HSV_CONTROLS,false);}}});this.setAttributeConfig(this.OPT.ANIMATE,{value:C.isBoolean(K.animate)?K.animate:true,method:function(N){if(this.pickerSlider){this.pickerSlider.animate=N;this.hueSlider.animate=N;}}});this.on(this.OPT.HUE+"Change",this._updateRGBFromHSV,this,true);this.on(this.OPT.SATURATION+"Change",this._updateRGBFromHSV,this,true);this.on(this.OPT.VALUE+"Change",this._updateRGBFromHSV,this,true);this.on(this.OPT.RED+"Change",this._updateRGB,this,true);this.on(this.OPT.GREEN+"Change",this._updateRGB,this,true);this.on(this.OPT.BLUE+"Change",this._updateRGB,this,true);this.on(this.OPT.HEX+"Change",this._updateHex,this,true);this._initElements();}});YAHOO.widget.ColorPicker=G;})();YAHOO.register("colorpicker",YAHOO.widget.ColorPicker,{version:"2.7.0",build:"1796"});
+
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+(function(){var B=YAHOO.util;var A=function(D,C,E,F){if(!D){}this.init(D,C,E,F);};A.NAME="Anim";A.prototype={toString:function(){var C=this.getEl()||{};var D=C.id||C.tagName;return(this.constructor.NAME+": "+D);},patterns:{noNegatives:/width|height|opacity|padding/i,offsetAttribute:/^((width|height)|(top|left))$/,defaultUnit:/width|height|top$|bottom$|left$|right$/i,offsetUnit:/\d+(em|%|en|ex|pt|in|cm|mm|pc)$/i},doMethod:function(C,E,D){return this.method(this.currentFrame,E,D-E,this.totalFrames);},setAttribute:function(C,F,E){var D=this.getEl();if(this.patterns.noNegatives.test(C)){F=(F>0)?F:0;}if("style" in D){B.Dom.setStyle(D,C,F+E);}else{if(C in D){D[C]=F;}}},getAttribute:function(C){var E=this.getEl();var G=B.Dom.getStyle(E,C);if(G!=="auto"&&!this.patterns.offsetUnit.test(G)){return parseFloat(G);}var D=this.patterns.offsetAttribute.exec(C)||[];var H=!!(D[3]);var F=!!(D[2]);if("style" in E){if(F||(B.Dom.getStyle(E,"position")=="absolute"&&H)){G=E["offset"+D[0].charAt(0).toUpperCase()+D[0].substr(1)];}else{G=0;}}else{if(C in E){G=E[C];}}return G;},getDefaultUnit:function(C){if(this.patterns.defaultUnit.test(C)){return"px";}return"";},setRuntimeAttribute:function(D){var I;var E;var F=this.attributes;this.runtimeAttributes[D]={};var H=function(J){return(typeof J!=="undefined");};if(!H(F[D]["to"])&&!H(F[D]["by"])){return false;}I=(H(F[D]["from"]))?F[D]["from"]:this.getAttribute(D);if(H(F[D]["to"])){E=F[D]["to"];}else{if(H(F[D]["by"])){if(I.constructor==Array){E=[];for(var G=0,C=I.length;G<C;++G){E[G]=I[G]+F[D]["by"][G]*1;}}else{E=I+F[D]["by"]*1;}}}this.runtimeAttributes[D].start=I;this.runtimeAttributes[D].end=E;this.runtimeAttributes[D].unit=(H(F[D].unit))?F[D]["unit"]:this.getDefaultUnit(D);return true;},init:function(E,J,I,C){var D=false;var F=null;var H=0;E=B.Dom.get(E);this.attributes=J||{};this.duration=!YAHOO.lang.isUndefined(I)?I:1;this.method=C||B.Easing.easeNone;this.useSeconds=true;this.currentFrame=0;this.totalFrames=B.AnimMgr.fps;this.setEl=function(M){E=B.Dom.get(M);};this.getEl=function(){return E;};this.isAnimated=function(){return D;};this.getStartTime=function(){return F;};this.runtimeAttributes={};this.animate=function(){if(this.isAnimated()){return false;}this.currentFrame=0;this.totalFrames=(this.useSeconds)?Math.ceil(B.AnimMgr.fps*this.duration):this.duration;if(this.duration===0&&this.useSeconds){this.totalFrames=1;}B.AnimMgr.registerElement(this);return true;};this.stop=function(M){if(!this.isAnimated()){return false;}if(M){this.currentFrame=this.totalFrames;this._onTween.fire();}B.AnimMgr.stop(this);};var L=function(){this.onStart.fire();this.runtimeAttributes={};for(var M in this.attributes){this.setRuntimeAttribute(M);}D=true;H=0;F=new Date();};var K=function(){var O={duration:new Date()-this.getStartTime(),currentFrame:this.currentFrame};O.toString=function(){return("duration: "+O.duration+", currentFrame: "+O.currentFrame);};this.onTween.fire(O);var N=this.runtimeAttributes;for(var M in N){this.setAttribute(M,this.doMethod(M,N[M].start,N[M].end),N[M].unit);}H+=1;};var G=function(){var M=(new Date()-F)/1000;var N={duration:M,frames:H,fps:H/M};N.toString=function(){return("duration: "+N.duration+", frames: "+N.frames+", fps: "+N.fps);};D=false;H=0;this.onComplete.fire(N);};this._onStart=new B.CustomEvent("_start",this,true);this.onStart=new B.CustomEvent("start",this);this.onTween=new B.CustomEvent("tween",this);this._onTween=new B.CustomEvent("_tween",this,true);this.onComplete=new B.CustomEvent("complete",this);this._onComplete=new B.CustomEvent("_complete",this,true);this._onStart.subscribe(L);this._onTween.subscribe(K);this._onComplete.subscribe(G);}};B.Anim=A;})();YAHOO.util.AnimMgr=new function(){var C=null;var B=[];var A=0;this.fps=1000;this.delay=1;this.registerElement=function(F){B[B.length]=F;A+=1;F._onStart.fire();this.start();};this.unRegister=function(G,F){F=F||E(G);if(!G.isAnimated()||F==-1){return false;}G._onComplete.fire();B.splice(F,1);A-=1;if(A<=0){this.stop();}return true;};this.start=function(){if(C===null){C=setInterval(this.run,this.delay);}};this.stop=function(H){if(!H){clearInterval(C);for(var G=0,F=B.length;G<F;++G){this.unRegister(B[0],0);}B=[];C=null;A=0;}else{this.unRegister(H);}};this.run=function(){for(var H=0,F=B.length;H<F;++H){var G=B[H];if(!G||!G.isAnimated()){continue;}if(G.currentFrame<G.totalFrames||G.totalFrames===null){G.currentFrame+=1;if(G.useSeconds){D(G);}G._onTween.fire();}else{YAHOO.util.AnimMgr.stop(G,H);}}};var E=function(H){for(var G=0,F=B.length;G<F;++G){if(B[G]==H){return G;}}return -1;};var D=function(G){var J=G.totalFrames;var I=G.currentFrame;var H=(G.currentFrame*G.duration*1000/G.totalFrames);var F=(new Date()-G.getStartTime());var K=0;if(F<G.duration*1000){K=Math.round((F/H-1)*G.currentFrame);}else{K=J-(I+1);}if(K>0&&isFinite(K)){if(G.currentFrame+K>=J){K=J-(I+1);}G.currentFrame+=K;}};};YAHOO.util.Bezier=new function(){this.getPosition=function(E,D){var F=E.length;var C=[];for(var B=0;B<F;++B){C[B]=[E[B][0],E[B][1]];}for(var A=1;A<F;++A){for(B=0;B<F-A;++B){C[B][0]=(1-D)*C[B][0]+D*C[parseInt(B+1,10)][0];C[B][1]=(1-D)*C[B][1]+D*C[parseInt(B+1,10)][1];}}return[C[0][0],C[0][1]];};};(function(){var A=function(F,E,G,H){A.superclass.constructor.call(this,F,E,G,H);};A.NAME="ColorAnim";A.DEFAULT_BGCOLOR="#fff";var C=YAHOO.util;YAHOO.extend(A,C.Anim);var D=A.superclass;var B=A.prototype;B.patterns.color=/color$/i;B.patterns.rgb=/^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i;B.patterns.hex=/^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i;B.patterns.hex3=/^#?([0-9A-F]{1})([0-9A-F]{1})([0-9A-F]{1})$/i;B.patterns.transparent=/^transparent|rgba\(0, 0, 0, 0\)$/;B.parseColor=function(E){if(E.length==3){return E;}var F=this.patterns.hex.exec(E);if(F&&F.length==4){return[parseInt(F[1],16),parseInt(F[2],16),parseInt(F[3],16)];}F=this.patterns.rgb.exec(E);if(F&&F.length==4){return[parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10)];}F=this.patterns.hex3.exec(E);if(F&&F.length==4){return[parseInt(F[1]+F[1],16),parseInt(F[2]+F[2],16),parseInt(F[3]+F[3],16)];
+}return null;};B.getAttribute=function(E){var G=this.getEl();if(this.patterns.color.test(E)){var I=YAHOO.util.Dom.getStyle(G,E);var H=this;if(this.patterns.transparent.test(I)){var F=YAHOO.util.Dom.getAncestorBy(G,function(J){return !H.patterns.transparent.test(I);});if(F){I=C.Dom.getStyle(F,E);}else{I=A.DEFAULT_BGCOLOR;}}}else{I=D.getAttribute.call(this,E);}return I;};B.doMethod=function(F,J,G){var I;if(this.patterns.color.test(F)){I=[];for(var H=0,E=J.length;H<E;++H){I[H]=D.doMethod.call(this,F,J[H],G[H]);}I="rgb("+Math.floor(I[0])+","+Math.floor(I[1])+","+Math.floor(I[2])+")";}else{I=D.doMethod.call(this,F,J,G);}return I;};B.setRuntimeAttribute=function(F){D.setRuntimeAttribute.call(this,F);if(this.patterns.color.test(F)){var H=this.attributes;var J=this.parseColor(this.runtimeAttributes[F].start);var G=this.parseColor(this.runtimeAttributes[F].end);if(typeof H[F]["to"]==="undefined"&&typeof H[F]["by"]!=="undefined"){G=this.parseColor(H[F].by);for(var I=0,E=J.length;I<E;++I){G[I]=J[I]+G[I];}}this.runtimeAttributes[F].start=J;this.runtimeAttributes[F].end=G;}};C.ColorAnim=A;})();
+/*
+TERMS OF USE - EASING EQUATIONS
+Open source under the BSD License.
+Copyright 2001 Robert Penner All rights reserved.
+
+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.
+ * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR 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.
+*/
+YAHOO.util.Easing={easeNone:function(B,A,D,C){return D*B/C+A;},easeIn:function(B,A,D,C){return D*(B/=C)*B+A;},easeOut:function(B,A,D,C){return -D*(B/=C)*(B-2)+A;},easeBoth:function(B,A,D,C){if((B/=C/2)<1){return D/2*B*B+A;}return -D/2*((--B)*(B-2)-1)+A;},easeInStrong:function(B,A,D,C){return D*(B/=C)*B*B*B+A;},easeOutStrong:function(B,A,D,C){return -D*((B=B/C-1)*B*B*B-1)+A;},easeBothStrong:function(B,A,D,C){if((B/=C/2)<1){return D/2*B*B*B*B+A;}return -D/2*((B-=2)*B*B*B-2)+A;},elasticIn:function(C,A,G,F,B,E){if(C==0){return A;}if((C/=F)==1){return A+G;}if(!E){E=F*0.3;}if(!B||B<Math.abs(G)){B=G;var D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}return -(B*Math.pow(2,10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E))+A;},elasticOut:function(C,A,G,F,B,E){if(C==0){return A;}if((C/=F)==1){return A+G;}if(!E){E=F*0.3;}if(!B||B<Math.abs(G)){B=G;var D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}return B*Math.pow(2,-10*C)*Math.sin((C*F-D)*(2*Math.PI)/E)+G+A;},elasticBoth:function(C,A,G,F,B,E){if(C==0){return A;}if((C/=F/2)==2){return A+G;}if(!E){E=F*(0.3*1.5);}if(!B||B<Math.abs(G)){B=G;var D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}if(C<1){return -0.5*(B*Math.pow(2,10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E))+A;}return B*Math.pow(2,-10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E)*0.5+G+A;},backIn:function(B,A,E,D,C){if(typeof C=="undefined"){C=1.70158;}return E*(B/=D)*B*((C+1)*B-C)+A;},backOut:function(B,A,E,D,C){if(typeof C=="undefined"){C=1.70158;}return E*((B=B/D-1)*B*((C+1)*B+C)+1)+A;},backBoth:function(B,A,E,D,C){if(typeof C=="undefined"){C=1.70158;}if((B/=D/2)<1){return E/2*(B*B*(((C*=(1.525))+1)*B-C))+A;}return E/2*((B-=2)*B*(((C*=(1.525))+1)*B+C)+2)+A;},bounceIn:function(B,A,D,C){return D-YAHOO.util.Easing.bounceOut(C-B,0,D,C)+A;},bounceOut:function(B,A,D,C){if((B/=C)<(1/2.75)){return D*(7.5625*B*B)+A;}else{if(B<(2/2.75)){return D*(7.5625*(B-=(1.5/2.75))*B+0.75)+A;}else{if(B<(2.5/2.75)){return D*(7.5625*(B-=(2.25/2.75))*B+0.9375)+A;}}}return D*(7.5625*(B-=(2.625/2.75))*B+0.984375)+A;},bounceBoth:function(B,A,D,C){if(B<C/2){return YAHOO.util.Easing.bounceIn(B*2,0,D,C)*0.5+A;}return YAHOO.util.Easing.bounceOut(B*2-C,0,D,C)*0.5+D*0.5+A;}};(function(){var A=function(H,G,I,J){if(H){A.superclass.constructor.call(this,H,G,I,J);}};A.NAME="Motion";var E=YAHOO.util;YAHOO.extend(A,E.ColorAnim);var F=A.superclass;var C=A.prototype;C.patterns.points=/^points$/i;C.setAttribute=function(G,I,H){if(this.patterns.points.test(G)){H=H||"px";F.setAttribute.call(this,"left",I[0],H);F.setAttribute.call(this,"top",I[1],H);}else{F.setAttribute.call(this,G,I,H);}};C.getAttribute=function(G){if(this.patterns.points.test(G)){var H=[F.getAttribute.call(this,"left"),F.getAttribute.call(this,"top")];}else{H=F.getAttribute.call(this,G);}return H;};C.doMethod=function(G,K,H){var J=null;if(this.patterns.points.test(G)){var I=this.method(this.currentFrame,0,100,this.totalFrames)/100;J=E.Bezier.getPosition(this.runtimeAttributes[G],I);}else{J=F.doMethod.call(this,G,K,H);}return J;};C.setRuntimeAttribute=function(P){if(this.patterns.points.test(P)){var H=this.getEl();var J=this.attributes;var G;var L=J["points"]["control"]||[];var I;var M,O;if(L.length>0&&!(L[0] instanceof Array)){L=[L];}else{var K=[];for(M=0,O=L.length;M<O;++M){K[M]=L[M];}L=K;}if(E.Dom.getStyle(H,"position")=="static"){E.Dom.setStyle(H,"position","relative");}if(D(J["points"]["from"])){E.Dom.setXY(H,J["points"]["from"]);
+}else{E.Dom.setXY(H,E.Dom.getXY(H));}G=this.getAttribute("points");if(D(J["points"]["to"])){I=B.call(this,J["points"]["to"],G);var N=E.Dom.getXY(this.getEl());for(M=0,O=L.length;M<O;++M){L[M]=B.call(this,L[M],G);}}else{if(D(J["points"]["by"])){I=[G[0]+J["points"]["by"][0],G[1]+J["points"]["by"][1]];for(M=0,O=L.length;M<O;++M){L[M]=[G[0]+L[M][0],G[1]+L[M][1]];}}}this.runtimeAttributes[P]=[G];if(L.length>0){this.runtimeAttributes[P]=this.runtimeAttributes[P].concat(L);}this.runtimeAttributes[P][this.runtimeAttributes[P].length]=I;}else{F.setRuntimeAttribute.call(this,P);}};var B=function(G,I){var H=E.Dom.getXY(this.getEl());G=[G[0]-H[0]+I[0],G[1]-H[1]+I[1]];return G;};var D=function(G){return(typeof G!=="undefined");};E.Motion=A;})();(function(){var D=function(F,E,G,H){if(F){D.superclass.constructor.call(this,F,E,G,H);}};D.NAME="Scroll";var B=YAHOO.util;YAHOO.extend(D,B.ColorAnim);var C=D.superclass;var A=D.prototype;A.doMethod=function(E,H,F){var G=null;if(E=="scroll"){G=[this.method(this.currentFrame,H[0],F[0]-H[0],this.totalFrames),this.method(this.currentFrame,H[1],F[1]-H[1],this.totalFrames)];}else{G=C.doMethod.call(this,E,H,F);}return G;};A.getAttribute=function(E){var G=null;var F=this.getEl();if(E=="scroll"){G=[F.scrollLeft,F.scrollTop];}else{G=C.getAttribute.call(this,E);}return G;};A.setAttribute=function(E,H,G){var F=this.getEl();if(E=="scroll"){F.scrollLeft=H[0];F.scrollTop=H[1];}else{C.setAttribute.call(this,E,H,G);}};B.Scroll=D;})();YAHOO.register("animation",YAHOO.util.Anim,{version:"2.7.0",build:"1799"});
diff --git a/web/imcms/ckeditor/plugins/wsc/dialogs/ciframe.html b/web/imcms/ckeditor/plugins/wsc/dialogs/ciframe.html
new file mode 100644
index 0000000000..8f10175e5b
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/wsc/dialogs/ciframe.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html>
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<script type="text/javascript">
+
+function gup( name )
+{
+	name = name.replace( /[\[]/, '\\\[' ).replace( /[\]]/, '\\\]' ) ;
+	var regexS = '[\\?&]' + name + '=([^&#]*)' ;
+	var regex = new RegExp( regexS ) ;
+	var results = regex.exec( window.location.href ) ;
+
+	if ( results )
+		return results[ 1 ] ;
+	else
+		return '' ;
+}
+
+var interval;
+
+function sendData2Master()
+{
+	var destination = window.parent.parent ;
+	try
+	{
+		if ( destination.XDTMaster )
+		{
+			var t = destination.XDTMaster.read( [ gup( 'cmd' ), gup( 'data' ) ] ) ;
+			window.clearInterval( interval ) ;
+		}
+	}
+	catch (e) {}
+}
+
+function onLoad()
+{
+	interval = window.setInterval( sendData2Master, 100 );
+}
+
+</script>
+</head>
+<body onload="onLoad()"><p></p></body>
+</html>
diff --git a/web/imcms/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/web/imcms/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
new file mode 100644
index 0000000000..c3a88b5662
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!--
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html>
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<script type="text/javascript">
+
+function doLoadScript( url )
+{
+	if ( !url )
+		return false ;
+
+	var s = document.createElement( "script" ) ;
+	s.type = "text/javascript" ;
+	s.src = url ;
+	document.getElementsByTagName( "head" )[ 0 ].appendChild( s ) ;
+
+	return true ;
+}
+
+var opener;
+function tryLoad()
+{
+	opener = window.parent;
+
+	// get access to global parameters
+	var oParams = window.opener.oldFramesetPageParams;
+
+	// make frameset rows string prepare
+	var sFramesetRows = ( parseInt( oParams.firstframeh, 10 ) || '30') + ",*," + ( parseInt( oParams.thirdframeh, 10 ) || '150' ) + ',0' ;
+	document.getElementById( 'itFrameset' ).rows = sFramesetRows ;
+
+	// dynamic including init frames and crossdomain transport code
+	// from config sproxy_js_frameset url
+	var addScriptUrl = oParams.sproxy_js_frameset ;
+	doLoadScript( addScriptUrl ) ;
+}
+
+	</script>
+</head>
+
+<frameset id="itFrameset" onload="tryLoad();" border="0" rows="30,*,*,0">
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="2" src="" name="navbar"></frame>
+    <frame scrolling="auto" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="0" src="" name="mid"></frame>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="bot"></frame>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="spellsuggestall"></frame>
+</frameset>
+</html>
diff --git a/web/imcms/ckeditor/plugins/wsc/dialogs/wsc.css b/web/imcms/ckeditor/plugins/wsc/dialogs/wsc.css
new file mode 100644
index 0000000000..9640009748
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/wsc/dialogs/wsc.css
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+html,body{background-color:transparent;margin:0;padding:0;}body{padding:10px;}body,td,input,select,textarea{font-size:11px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;}.midtext{padding:0;margin:10px;}.midtext p{padding:0;margin:10px;}.Button{border:#737357 1px solid;color:#3b3b1f;background-color:#c7c78f;}.PopupTabArea{color:#737357;background-color:#e3e3c7;}.PopupTitleBorder{border-bottom:#d5d59d 1px solid;}.PopupTabEmptyArea{padding-left:10px;border-bottom:#d5d59d 1px solid;}.PopupTab,.PopupTabSelected{border-right:#d5d59d 1px solid;border-top:#d5d59d 1px solid;border-left:#d5d59d 1px solid;padding:3px 5px 3px 5px;color:#737357;}.PopupTab{margin-top:1px;border-bottom:#d5d59d 1px solid;cursor:pointer;}.PopupTabSelected{font-weight:bold;cursor:default;padding-top:4px;border-bottom:#f1f1e3 1px solid;background-color:#f1f1e3;}
diff --git a/web/imcms/ckeditor/plugins/wsc/dialogs/wsc.js b/web/imcms/ckeditor/plugins/wsc/dialogs/wsc.js
new file mode 100644
index 0000000000..6f6e6782e2
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/wsc/dialogs/wsc.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add('checkspell',function(a){var b=CKEDITOR.tools.getNextNumber(),c='cke_frame_'+b,d='cke_data_'+b,e='cke_error_'+b,f,g=document.location.protocol||'http:',h=a.lang.spellCheck.notAvailable,i='<textarea style="display: none" id="'+d+'"'+' rows="10"'+' cols="40">'+' </textarea><div'+' id="'+e+'"'+' style="display:none;color:red;font-size:16px;font-weight:bold;padding-top:160px;text-align:center;z-index:11;">'+'</div><iframe'+' src=""'+' style="width:100%;background-color:#f1f1e3;"'+' frameborder="0"'+' name="'+c+'"'+' id="'+c+'"'+' allowtransparency="1">'+'</iframe>',j=a.config.wsc_customLoaderScript||g+'//loader.webspellchecker.net/sproxy_fck/sproxy.php'+'?plugin=fck2'+'&customerid='+a.config.wsc_customerId+'&cmd=script&doc=wsc&schema=22';if(a.config.wsc_customLoaderScript)h+='<p style="color:#000;font-size:11px;font-weight: normal;text-align:center;padding-top:10px">'+a.lang.spellCheck.errorLoading.replace(/%s/g,a.config.wsc_customLoaderScript)+'</p>';function k(m,n){var o=0;return function(){if(typeof window.doSpell=='function'){if(typeof f!='undefined')window.clearInterval(f);l(m);}else if(o++==180)window._cancelOnError(n);};};window._cancelOnError=function(m){if(typeof window.WSC_Error=='undefined'){CKEDITOR.document.getById(c).setStyle('display','none');var n=CKEDITOR.document.getById(e);n.setStyle('display','block');n.setHtml(m||a.lang.spellCheck.notAvailable);}};function l(m){var n=new window._SP_FCK_LangCompare(),o=CKEDITOR.getUrl(a.plugins.wsc.path+'dialogs/'),p=o+'tmpFrameset.html';window.gFCKPluginName='wsc';n.setDefaulLangCode(a.config.defaultLanguage);window.doSpell({ctrl:d,lang:a.config.wsc_lang||n.getSPLangCode(a.langCode),intLang:a.config.wsc_uiLang||n.getSPLangCode(a.langCode),winType:c,onCancel:function(){m.hide();},onFinish:function(q){a.focus();m.getParentEditor().setData(q.value);m.hide();},staticFrame:p,framesetPath:p,iframePath:o+'ciframe.html',schemaURI:o+'wsc.css',userDictionaryName:a.config.wsc_userDictionaryName,customDictionaryName:a.config.wsc_customDictionaryIds&&a.config.wsc_customDictionaryIds.split(','),domainName:a.config.wsc_domainName});CKEDITOR.document.getById(e).setStyle('display','none');CKEDITOR.document.getById(c).setStyle('display','block');};return{title:a.config.wsc_dialogTitle||a.lang.spellCheck.title,minWidth:485,minHeight:380,buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var m=this.getContentElement('general','content').getElement();m.setHtml(i);m.getChild(2).setStyle('height',this._.contentSize.height+'px');
+if(typeof window.doSpell!='function')CKEDITOR.document.getHead().append(CKEDITOR.document.createElement('script',{attributes:{type:'text/javascript',src:j}}));var n=a.getData();CKEDITOR.document.getById(d).setValue(n);f=window.setInterval(k(this,h),250);},onHide:function(){window.ooo=undefined;window.int_framsetLoaded=undefined;window.framesetLoaded=undefined;window.is_window_opened=false;},contents:[{id:'general',label:a.config.wsc_dialogTitle||a.lang.spellCheck.title,padding:0,elements:[{type:'html',id:'content',html:''}]}]};});CKEDITOR.dialog.on('resize',function(a){var b=a.data,c=b.dialog;if(c._.name=='checkspell'){var d=c.getContentElement('general','content').getElement(),e=d&&d.getChild(2);e&&e.setSize('height',b.height);e&&e.setSize('width',b.width);}});
diff --git a/web/imcms/ckeditor/plugins/xml/plugin.js b/web/imcms/ckeditor/plugins/xml/plugin.js
new file mode 100644
index 0000000000..4ed116b5d7
--- /dev/null
+++ b/web/imcms/ckeditor/plugins/xml/plugin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){CKEDITOR.plugins.add('xml',{});CKEDITOR.xml=function(a){var b=null;if(typeof a=='object')b=a;else{var c=(a||'').replace(/&nbsp;/g,'\xa0');if(window.DOMParser)b=new DOMParser().parseFromString(c,'text/xml');else if(window.ActiveXObject){try{b=new ActiveXObject('MSXML2.DOMDocument');}catch(d){try{b=new ActiveXObject('Microsoft.XmlDom');}catch(d){}}if(b){b.async=false;b.resolveExternals=false;b.validateOnParse=false;b.loadXML(c);}}}this.baseXml=b;};CKEDITOR.xml.prototype={selectSingleNode:function(a,b){var c=this.baseXml;if(b||(b=c))if(CKEDITOR.env.ie||b.selectSingleNode)return b.selectSingleNode(a);else if(c.evaluate){var d=c.evaluate(a,b,null,9,null);return d&&d.singleNodeValue||null;}return null;},selectNodes:function(a,b){var c=this.baseXml,d=[];if(b||(b=c))if(CKEDITOR.env.ie||b.selectNodes)return b.selectNodes(a);else if(c.evaluate){var e=c.evaluate(a,b,null,5,null);if(e){var f;while(f=e.iterateNext())d.push(f);}}return d;},getInnerXml:function(a,b){var c=this.selectSingleNode(a,b),d=[];if(c){c=c.firstChild;while(c){if(c.xml)d.push(c.xml);else if(window.XMLSerializer)d.push(new XMLSerializer().serializeToString(c));c=c.nextSibling;}}return d.length?d.join(''):null;}};})();
diff --git a/web/imcms/ckeditor/skins/kama/dialog.css b/web/imcms/ckeditor/skins/kama/dialog.css
new file mode 100644
index 0000000000..1fb5376820
--- /dev/null
+++ b/web/imcms/ckeditor/skins/kama/dialog.css
@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+body .cke_dialog{visibility:visible;}.cke_skin_kama table.cke_dialog.cke_browser_gecko{display:block;}.cke_skin_kama .cke_dialog_body{z-index:1;border:solid 1px #ddd;padding:5px;background-color:#fff;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;_position:static;}.cke_skin_kama .cke_dialog_tl,.cke_skin_kama .cke_dialog_tr,.cke_skin_kama .cke_dialog_tc,.cke_skin_kama .cke_dialog_bl,.cke_skin_kama .cke_dialog_br,.cke_skin_kama .cke_dialog_bc,.cke_skin_kama .cke_dialog_ml,.cke_skin_kama .cke_dialog_mr{display:none;}.cke_skin_kama .cke_dialog_title{font-weight:bold;font-size:14px;padding:3px 3px 8px;cursor:move;position:relative;border-bottom:1px solid #eee;}.cke_skin_kama .cke_browser_iequirks .cke_dialog_title,.cke_skin_kama .cke_browser_ie6 .cke_dialog_title,.cke_skin_kama .cke_browser_ie7 .cke_dialog_title{margin-bottom:22px;}.cke_skin_kama .cke_browser_iequirks.cke_single_page .cke_dialog_title,.cke_skin_kama .cke_browser_ie6.cke_single_page .cke_dialog_title,.cke_skin_kama .cke_browser_ie7.cke_single_page .cke_dialog_title{margin-bottom:10px;}.cke_skin_kama .cke_dialog_contents{background-color:#ebebeb;border:solid 1px #fff;border-bottom:none;overflow:auto;padding:17px 10px 5px 10px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;border-top-left-radius:5px;border-top-right-radius:5px;margin-top:22px;}.cke_skin_kama .cke_dialog_footer{text-align:right;background-color:#ebebeb;border:solid 1px #fff;border-bottom:none;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px;}.cke_skin_kama .cke_rtl .cke_dialog_footer{text-align:left;}.cke_skin_kama .cke_dialog_footer .cke_resizer{margin-top:20px;}.cke_skin_kama .cke_browser_iequirks .cke_dialog_footer .cke_resizer,.cke_skin_kama .cke_browser_ie6 .cke_dialog_footer .cke_resizer{margin-top:27px;}.cke_skin_kama .cke_dialog_tabs{height:23px;display:inline-block;_display:block;margin-left:10px;margin-right:10px;margin-top:11px;position:absolute;z-index:2;}.cke_skin_kama .cke_browser_iequirks .cke_dialog_tabs,.cke_skin_kama .cke_browser_ie6 .cke_dialog_tabs,.cke_skin_kama .cke_browser_ie7 .cke_dialog_tabs{top:33px;}.cke_skin_kama .cke_rtl .cke_dialog_tabs{right:10px;}.cke_skin_kama a.cke_dialog_tab,.cke_skin_kama a:link.cke_dialog_tab,.cke_skin_kama a:active.cke_dialog_tab,.cke_skin_kama a:hover.cke_dialog_tab,.cke_skin_kama a:visited.cke_dialog_tab{background-image:url(images/sprites.png);background-repeat:repeat-x;background-position:0 -1323px;background-color:#ebebeb;height:14px;padding:4px 8px;display:inline-block;cursor:pointer;}.cke_skin_kama .cke_browser_gecko18 a.cke_dialog_tab,.cke_skin_kama .cke_browser_gecko18 a:link.cke_dialog_tab,.cke_skin_kama .cke_browser_gecko18 a:active.cke_dialog_tab,.cke_skin_kama .cke_browser_gecko18 a:hover.cke_dialog_tab,.cke_skin_kama .cke_browser_gecko18 a:visited.cke_dialog_tab{display:inline;position:relative;top:6px;}.cke_skin_kama a:hover.cke_dialog_tab{background-color:#f1f1e3;}.cke_skin_kama .cke_hc a:hover.cke_dialog_tab{padding:2px 6px!important;border-width:3px;}.cke_skin_kama a.cke_dialog_tab_selected,.cke_skin_kama a:link.cke_dialog_tab_selected,.cke_skin_kama a:active.cke_dialog_tab_selected,.cke_skin_kama a:hover.cke_dialog_tab_selected,.cke_skin_kama a:visited.cke_dialog_tab_selected{background-position:0 -1279px;cursor:default;}.cke_skin_kama .cke_hc a.cke_dialog_tab_selected,.cke_skin_kama .cke_hc a:link.cke_dialog_tab_selected,.cke_skin_kama .cke_hc a:active.cke_dialog_tab_selected,.cke_skin_kama .cke_hc a:hover.cke_dialog_tab_selected,.cke_skin_kama .cke_hc a:visited.cke_dialog_tab_selected{padding:2px 6px!important;border-width:3px;}.cke_skin_kama .cke_single_page .cke_dialog_tabs{display:none;}.cke_skin_kama .cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:10px;}.cke_skin_kama .cke_dialog_ui_vbox table,.cke_skin_kama .cke_dialog_ui_hbox table{margin:auto;}
+.cke_skin_kama .cke_dialog_ui_vbox_child{padding:5px 0;}.cke_skin_kama input.cke_dialog_ui_input_text,.cke_skin_kama input.cke_dialog_ui_input_password{background-color:white;border:none;padding:0;width:100%;height:14px;}.cke_skin_kama div.cke_dialog_ui_input_text,.cke_skin_kama div.cke_dialog_ui_input_password{background-color:white;border:1px solid #a0a0a0;padding:1px 0;_width:99.9%;}.cke_skin_kama .cke_browser_ie7 input.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_ie7 input.cke_dialog_ui_input_password{position:absolute;}.cke_skin_kama .cke_browser_ie7 div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_ie7 div.cke_dialog_ui_input_password{height:14px;position:relative;}.cke_skin_kama .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_password,.cke_skin_kama .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px;}.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_password,.cke_skin_kama .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px;}.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_vbox_child,.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_child,.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important;}.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px;}.cke_skin_kama .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_password{border-width:0;}.cke_skin_kama .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_text,.cke_skin_kama .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_password{border-width:1px;}.cke_skin_kama textarea.cke_dialog_ui_input_textarea{background-color:white;border:none;padding:0;width:100%;_width:99%;overflow:auto;resize:none;}.cke_skin_kama div.cke_dialog_ui_input_textarea{background-color:white;border:1px solid #a0a0a0;padding:1px 0;}.cke_skin_kama div.cke_disabled .cke_dialog_ui_labeled_content *{background-color:#a0a0a0;cursor:default;}.cke_skin_kama .cke_rtl .cke_dialog_ui_labeled_content{_width:95%;}.cke_skin_kama .cke_dialog_ui_hbox{width:100%;}.cke_skin_kama .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_dialog_ui_hbox_child,.cke_skin_kama .cke_dialog_ui_hbox_last{vertical-align:top;}.cke_skin_kama .cke_ltr .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px;}.cke_skin_kama .cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_kama .cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px;}.cke_skin_kama a.cke_dialog_ui_button{border-collapse:separate;cursor:default;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background:transparent url(images/sprites.png) repeat-x scroll 0 -1069px;_background:none;padding:5px 0;text-align:center;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button{padding:0;}.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button span{width:70px;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span{width:100px;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button span{padding:5px 15px;text-align:center;color:#3b3b1f;background:#53D9F0 none;display:inline-block;cursor:default;}.cke_skin_kama .cke_browser_webkit a.cke_dialog_ui_button span.cke_dialog_ui_button{margin:0;}.cke_skin_kama .cke_browser_webkit a.cke_dialog_ui_button{display:inline-block;padding-top:3px;padding-bottom:2px;margin:2px 0;}.cke_skin_kama a.cke_dialog_ui_button_ok span,.cke_skin_kama a.cke_dialog_ui_button_cancel span{width:60px;padding-right:20px;padding-left:20px;}.cke_skin_kama a.cke_dialog_ui_button_ok{background-position:0 -1143px;}
+.cke_skin_kama a.cke_dialog_ui_button_ok span{background:transparent url(images/sprites.png) no-repeat scroll right -1219px;}.cke_skin_kama .cke_rtl a.cke_dialog_ui_button_ok span{background-position:left -1219px;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_ok span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_ok span{background-color:#B8E834;margin-right:0;}.cke_skin_kama a.cke_dialog_ui_button_cancel{background-position:0 -1104px;}.cke_skin_kama a.cke_dialog_ui_button_cancel span{background:transparent url(images/sprites.png) no-repeat scroll right -1245px;}.cke_skin_kama .cke_rtl a.cke_dialog_ui_button_cancel span{background-position:left -1245px;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_cancel span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_cancel span{background-color:#F65D20;}.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_cancel span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_cancel span,.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_ok span,.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_ok span{background-image:none;}.cke_skin_kama span.cke_dialog_ui_button{padding:2px 10px;text-align:center;color:#222;display:inline-block;cursor:default;min-width:60px;+margin:2px 0;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button{display:block;}.cke_skin_kama a.cke_dialog_ui_button span.cke_disabled{border:#898980 1px solid;color:#5e5e55;background-color:#c5c5b3;}.cke_skin_kama a:hover.cke_dialog_ui_button,.cke_skin_kama a:focus.cke_dialog_ui_button,.cke_skin_kama a:active.cke_dialog_ui_button{background-position:0 -1180px;}.cke_skin_kama .cke_hc a:hover.cke_dialog_ui_button,.cke_skin_kama .cke_hc a:focus.cke_dialog_ui_button,.cke_skin_kama .cke_hc a:active.cke_dialog_ui_button{border-width:2px;}.cke_skin_kama .cke_browser_iequirks a:hover.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a:focus.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_iequirks a:active.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a:hover.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a:focus.cke_dialog_ui_button span,.cke_skin_kama .cke_browser_ie6 a:active.cke_dialog_ui_button span{background-image:none;background:#F7A922;}.cke_skin_kama .cke_dialog_footer_buttons{display:inline-table;margin-right:12px;margin-left:12px;width:auto;position:relative;}.cke_skin_kama .cke_browser_ie7 .cke_dialog_footer_buttons{position:static;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons{display:inline;}.cke_skin_kama .cke_dialog_footer_buttons span.cke_dialog_ui_button{margin:7px 0;text-align:center;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons a.cke_dialog_ui_button{display:block;padding:0;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button{padding-bottom:5px;padding-top:6px;margin-bottom:0;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons .cke_dialog_ui_button_ok .cke_dialog_ui_button{background-position:right -1214px;}.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons .cke_dialog_ui_button_cancel .cke_dialog_ui_button{background-position:right -1242px;}.cke_skin_kama .cke_browser_ie9.cke_rtl .cke_dialog_footer_buttons td{padding-left:2px;}.cke_skin_kama strong{font-weight:bold;}.cke_skin_kama .cke_dialog .cke_dialog_body .cke_dialog_close_button{background-image:url(images/sprites.png);background-repeat:no-repeat;background-position:0 -1022px;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;_background-image:url(images/sprites_ie6.png);}.cke_skin_kama .cke_dialog_close_button span{display:none;}.cke_skin_kama .cke_dialog_close_button:hover{background-position:0 -1045px;}.cke_skin_kama .cke_ltr .cke_dialog_close_button{right:10px;}.cke_skin_kama .cke_browser_ie8.cke_rtl .cke_dialog_close_button{left:8px;}.cke_skin_kama .cke_rtl .cke_dialog_close_button{left:10px;}.cke_skin_kama .cke_browser_ie7.cke_rtl .cke_dialog_close_button{left:16px;top:0;}.cke_skin_kama .cke_browser_ie7.cke_rtl .cke_dialog_close_button{position:absolute;left:10px;top:5px;}
+.cke_skin_kama .cke_browser_ie7.cke_single_page .cke_dialog_footer{margin-top:22px;}.cke_skin_kama .cke_browser_ie6 .cke_dialog_close_button,.cke_skin_kama .cke_browser_iequirks .cke_dialog_close_button{top:7px;}.cke_skin_kama .cke_browser_ie7.cke_ltr .cke_dialog_close_button{margin-top:0;}.cke_skin_kama .cke_dialog_ui_input_select{border:1px solid #a0a0a0;background-color:white;}.cke_skin_kama .cke_dialog_ui_input_file{width:100%;height:25px;}.cke_skin_kama .cke_dialog .cke_dark_background{background-color:#eaead1;}.cke_skin_kama .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_kama .cke_dialog .cke_centered{text-align:center;}.cke_skin_kama .cke_dialog a.cke_btn_reset{float:right;background-position:0 -32px;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px;}.cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_reset{float:left;}.cke_skin_kama .cke_dialog a.cke_btn_locked,.cke_skin_kama .cke_dialog a.cke_btn_unlocked{float:left;background-position:0 0;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px;}.cke_skin_kama .cke_dialog a.cke_btn_locked .cke_icon{display:none;}.cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_locked,.cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_unlocked{float:right;}.cke_skin_kama .cke_dialog a.cke_btn_unlocked{background-position:0 -16px;background-image:url(images/mini.gif);}.cke_skin_kama .cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer;}.cke_skin_kama .cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white;}.cke_skin_kama .cke_dialog .ImagePreviewBox table td{white-space:normal;}.cke_skin_kama .cke_browser_iequirks .cke_dialog_page_contents{_position:absolute;}.cke_skin_kama .cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity=90);background-color:#e4e4e4;}.cke_skin_kama .cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white;}.cke_skin_kama .cke_dialog .cke_pastetext{width:346px;height:170px;}.cke_skin_kama .cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none;}.cke_skin_kama .cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid black;}.cke_skin_kama .cke_dialog .cke_dark_background{text-align:center;background-color:#eaead1;font-size:14px;}.cke_skin_kama .cke_dialog .cke_light_background{text-align:center;background-color:#ffffbe;}.cke_skin_kama .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_kama .cke_disabled{color:#a0a0a0;}.cke_skin_kama .cke_hc .cke_dialog_title,.cke_skin_kama .cke_hc .cke_dialog_tabs,.cke_skin_kama .cke_hc .cke_dialog_contents,.cke_skin_kama .cke_hc .cke_dialog_footer{border-left:1px solid;border-right:1px solid;}.cke_skin_kama .cke_hc .cke_dialog_title{border-top:1px solid;}.cke_skin_kama .cke_hc .cke_dialog_footer{border-bottom:1px solid;}.cke_skin_kama .cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px;}.cke_skin_kama .cke_dialog_body .cke_label{display:none;}.cke_skin_kama .cke_dialog_body label.cke_required{font-weight:bold;}.cke_skin_kama .cke_hc .cke_dialog_body .cke_label{display:inline;cursor:inherit;}.cke_skin_kama .cke_hc a.cke_btn_locked,.cke_skin_kama .cke_hc a.cke_btn_unlocked,.cke_skin_kama .cke_hc a.cke_btn_reset{border-style:solid;float:left;width:auto;height:auto;padding:0 2px;}.cke_skin_kama .cke_rtl.cke_hc a.cke_btn_locked,.cke_skin_kama .cke_rtl.cke_hc a.cke_btn_unlocked,.cke_skin_kama .cke_rtl.cke_hc a.cke_btn_reset{float:right;}.cke_skin_kama .cke_hc a.cke_btn_locked .cke_icon{display:inline;}.cke_skin_kama a.cke_smile img{border:2px solid #eaead1;}.cke_skin_kama a.cke_smile:focus img,.cke_skin_kama a.cke_smile:active img,.cke_skin_kama a.cke_smile:hover img{border-color:#C7C78F;}.cke_skin_kama .cke_hc .cke_dialog_tabs a,.cke_skin_kama .cke_hc .cke_dialog_footer a{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}
+.cke_skin_kama .cke_hc .ImagePreviewBox{width:260px;}.cke_skin_kama .cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px;}.cke_skin_kama .cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px;}.cke_skin_kama .cke_browser_gecko .cke_dialog_ui_checkbox_input:focus,.cke_skin_kama .cke_browser_gecko .cke_dialog_ui_radio_input:focus,.cke_skin_kama .cke_browser_opera .cke_dialog_ui_checkbox_input:focus,.cke_skin_kama .cke_browser_opera .cke_dialog_ui_radio_input:focus,.cke_skin_kama .cke_browser_gecko .cke_dialog_ui_input_select:focus,.cke_skin_kama .cke_browser_gecko .cke_btn_over,.cke_skin_kama .cke_browser_opera .cke_btn_over,.cke_skin_kama .cke_browser_ie .cke_btn_over{outline:1px dotted #696969;}.cke_skin_kama .cke_browser_ie .cke_dialog_ui_checkbox_input,.cke_skin_kama .cke_browser_ie .cke_dialog_ui_ratio_input,.cke_skin_kama .cke_browser_ie .cke_btn_reset,.cke_skin_kama .cke_browser_ie .cke_btn_locked,.cke_skin_kama .cke_browser_ie .cke_btn_unlocked{*border:1px solid transparent!important;-border:1px solid red!important;-filter:chroma(color=red);}.cke_skin_kama .cke_browser_ie .cke_dialog_ui_focused,.cke_skin_kama .cke_browser_ie .cke_btn_over{*border:1px dotted #696969!important;}.cke_skin_kama .cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity=0);width:100%;height:100%;}.cke_dialog label{display:inline;margin-bottom:auto;cursor:default;}
diff --git a/web/imcms/ckeditor/skins/kama/editor.css b/web/imcms/ckeditor/skins/kama/editor.css
new file mode 100644
index 0000000000..5af45b69b6
--- /dev/null
+++ b/web/imcms/ckeditor/skins/kama/editor.css
@@ -0,0 +1,13 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_kama *,.cke_skin_kama a:hover,.cke_skin_kama a:link,.cke_skin_kama a:visited,.cke_skin_kama a:active{margin:0;padding:0;border:0;background:transparent;text-decoration:none;font:normal normal normal 100% Sans-Serif;width:auto;height:auto;border-collapse:collapse;text-align:left;vertical-align:baseline;white-space:nowrap;cursor:auto;color:#000;float:none;font-size:12px;font-family:Arial,Helvetica,Tahoma,Verdana,Sans-Serif;}.cke_skin_kama .cke_rtl *,.cke_skin_kama .cke_rtl a:hover,.cke_skin_kama .cke_rtl a:link,.cke_skin_kama .cke_rtl a:visited,.cke_skin_kama .cke_rtl a:active,.cke_rtl .cke_skin_kama *,.cke_rtl .cke_skin_kama a:hover,.cke_rtl .cke_skin_kama a:link,.cke_rtl .cke_skin_kama a:visited,.cke_rtl .cke_skin_kama a:active{text-align:right;}.cke_skin_kama iframe{vertical-align:inherit;}.cke_skin_kama textarea{white-space:pre;}.cke_skin_kama .cke_browser_gecko textarea{cursor:text;}.cke_skin_kama .cke_browser_gecko textarea[disabled]{cursor:default;}.cke_skin_kama input[type="text"],.cke_skin_kama input[type="password"]{cursor:text;}.cke_skin_kama input[type="text"][disabled],.cke_skin_kama input[type="password"][disabled]{cursor:default;}.cke_skin_kama fieldset{padding:10px;border:2px groove #E0DFE3;}.cke_skin_kama{display:block;}span.cke_skin_kama{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;border:1px solid #D3D3D3;padding:5px;}.cke_skin_kama span.cke_browser_webkit,.cke_skin_kama span.cke_browser_gecko18{display:block;}.cke_skin_kama .cke_wrapper{-moz-border-radius:5px;-webkit-border-radius:5px;-webkit-touch-callout:none;border-radius:5px;background-color:#d3d3d3;background-image:url(images/sprites.png);background-repeat:repeat-x;background-position:0 -1950px;display:block;_display:inline-block;padding:5px;}.cke_shared .cke_skin_kama .cke_wrapper{padding-bottom:0;}.cke_skin_kama .cke_browser_ie6 .cke_wrapper,.cke_skin_kama .cke_browser_iequirks .cke_wrapper{background-image:none;}.cke_skin_kama .cke_editor{display:inline-table;width:100%;}.cke_skin_kama .cke_browser_ie .cke_editor,.cke_skin_kama .cke_browser_webkit .cke_editor{display:table;}.cke_skin_kama .ltr .cke_browser_ie iframe{margin-right:-10px;}.cke_skin_kama .rtl .cke_browser_ie iframe{margin-left:-10px;}.cke_skin_kama .cke_browser_opera .cke_editor.cke_skin_kama .cke_resizer{display:table;}.cke_skin_kama .cke_contents{margin:5px;}.cke_skin_kama .cke_hc .cke_contents{border:1px solid black;}.cke_skin_kama .cke_contents iframe{background-color:#fff;}.cke_skin_kama .cke_focus{outline:auto 5px -webkit-focus-ring-color;}.cke_skin_kama textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre;}.cke_skin_kama .cke_browser_iequirks textarea.cke_source{_white-space:normal;}.cke_skin_kama .cke_resizer{width:12px;height:12px;margin-top:9px;display:block;float:right;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1428px;background-repeat:no-repeat;cursor:se-resize;}.cke_skin_kama .cke_browser_air .cke_resizer,.cke_skin_kama .cke_browser_air .cke_rtl .cke_resizer{cursor:move;}.cke_skin_kama .cke_resizer_rtl{cursor:sw-resize;background-position:0 -1455px;float:left;}.cke_skin_kama .cke_resizer_horizontal,.cke_skin_kama .cke_rtl .cke_resizer_horizontal{cursor:e-resize;}.cke_skin_kama .cke_resizer_vertical,.cke_skin_kama .cke_rtl .cke_resizer_vertical{cursor:n-resize;}.cke_skin_kama .cke_maximized .cke_resizer{display:none;}.cke_skin_kama .cke_browser_ie6 .cke_contents textarea,.cke_skin_kama .cke_browser_ie7 .cke_contents textarea{position:absolute;}.cke_skin_kama .cke_browser_ie.cke_browser_quirks .cke_contents iframe{position:absolute;top:0;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_skin_kama .cke_browser_ie7 .cke_editor{display:inline-block;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_shared .cke_skin_kama .cke_browser_ie7 .cke_wrapper{padding-bottom:5px;}.cke_skin_kama .cke_voice_label{display:none;}.cke_skin_kama legend.cke_voice_label{display:none;}.cke_skin_kama .cke_browser_ie legend.cke_voice_label{position:absolute;display:block;width:0;height:0;overflow:hidden;}
+.cke_skin_kama .cke_panel{border:1px solid #8f8f73;background-color:#fff;width:120px;height:100px;overflow:hidden;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.cke_skin_kama .cke_contextmenu{margin:0;}.cke_skin_kama .cke_panel iframe{width:100%;height:100%;}html.cke_skin_kama_container{overflow:auto;overflow-x:hidden;}body.cke_panel_frame{overflow:auto;}.cke_panel_frame .cke_label{display:none;}ul.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap;}li.cke_panel_listItem{margin:0;}.cke_panel_listItem a{padding:2px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;}* html .cke_panel_listItem a{width:100%;color:#000;}*:first-child+html .cke_panel_listItem a{color:#000;}.cke_panel_listItem.cke_selected a{border:1px solid #ccc;background-color:#e9f5ff;}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#316ac5;background-color:#dff1ff;}.cke_hc .cke_panel_listItem.cke_selected a,.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border-width:3px;padding:0;}.cke_panel_grouptitle{font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;font-weight:bold;white-space:nowrap;background-color:#dcdcdc;color:#000;margin:0;padding:3px;}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:3px;margin-bottom:3px;}.cke_skin_kama .cke_button_textcolor_panel,.cke_skin_kama .cke_button_bgcolor_panel{width:150px;height:135px;}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000;}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left;}.cke_rtl span.cke_colorbox{float:right;}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;}.cke_rtl a.cke_colorbox{float:right;}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#316ac5 1px solid;background-color:#dff1ff;}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer;}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#316ac5 1px solid;background-color:#dff1ff;}@media print{.cke_skin_kama .cke_toolbox{display:none;}}.cke_skin_kama .cke_browser_webkit .cke_toolbox,.cke_skin_kama .cke_browser_webkit .cke_toolbox>span{white-space:normal;}.cke_skin_kama .cke_toolbox{clear:both;padding-bottom:1px;}.cke_skin_kama a.cke_toolbox_collapser,.cke_skin_kama a:hover.cke_toolbox_collapser{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:3px -1366px;background-repeat:no-repeat;width:11px;height:11px;float:right;border:1px outset #D3D3D3;margin:11px 0 2px;cursor:pointer;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser{float:left;}.cke_skin_kama a.cke_toolbox_collapser span{display:none;}.cke_skin_kama .cke_hc a.cke_toolbox_collapser span{font-size:10px;font-weight:bold;font-family:Arial;display:inline;}.cke_skin_kama a.cke_toolbox_collapser_min,.cke_skin_kama a:hover.cke_toolbox_collapser_min{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:4px -1387px;background-repeat:no-repeat;margin:2px 4px;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser_min,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser_min{background-position:4px -1408px;}.cke_skin_kama .cke_separator{display:inline-block;border-left:solid 1px #D3D3D3;margin:3px 2px 0;height:16px;vertical-align:top;}.cke_skin_kama .cke_break{font-size:0;clear:left;}.cke_skin_kama .cke_rtl .cke_break{clear:right;}.cke_skin_kama .cke_toolbar_start{display:none;}.cke_skin_kama .cke_toolgroup{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:repeat-x;background-position:0 -500px;float:left;margin-right:6px;margin-bottom:5px;padding:2px;display:inline;}
+.cke_skin_kama .cke_rtl .cke_toolgroup{float:right;margin-right:0;margin-left:6px;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active,.cke_skin_kama .cke_button a.cke_off{border-radius:3px;outline:none;padding:2px 4px;height:18px;display:inline-block;cursor:default;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a.cke_off{filter:alpha(opacity=70);opacity:.70;-moz-border-radius:3px;-webkit-border-radius:3px;}.cke_skin_kama .cke_hc .cke_button a,.cke_skin_kama .cke_hc .cke_button a.cke_off{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}.cke_skin_kama .cke_button a.cke_on{background-color:#a3d7ff;filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_hc .cke_button a.cke_on{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button a.cke_disabled *{filter:alpha(opacity=30);opacity:.3;}.cke_skin_kama .cke_browser_ie .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie6 .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *,.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *{filter:alpha(opacity=30);}.cke_skin_kama .cke_hc .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *{filter:alpha(opacity=60);opacity:.6;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on,.cke_skin_kama .cke_button a:hover.cke_off,.cke_skin_kama .cke_button a:focus.cke_off,.cke_skin_kama .cke_button a:active.cke_off{filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active{background-color:#dff1ff;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on{background-color:#86caff;}.cke_skin_kama .cke_hc .cke_button a:hover,.cke_skin_kama .cke_hc .cke_button a:focus,.cke_skin_kama .cke_hc .cke_button a:active{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;display:inline-block;cursor:default;}.cke_skin_kama .cke_rtl .cke_button .cke_icon{background-image:url(icons_rtl.png);}.cke_skin_kama .cke_browser_ie .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie6 .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon{filter:;}.cke_skin_kama .cke_button .cke_label{cursor:default;display:none;padding-left:3px;line-height:18px;vertical-align:middle;}.cke_skin_kama .cke_hc .cke_button .cke_label{padding:0;display:inline-block;}.cke_skin_kama .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_kama .cke_accessibility{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_kama .cke_button .cke_buttonarrow{display:inline-block;height:17px;width:8px;background-position:2px -1469px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;cursor:default;}.cke_skin_kama .cke_browser_ie .cke_button .cke_buttonarrow{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}
+.cke_skin_kama .cke_browser_ie6 .cke_button .cke_buttonarrow{filter:;}.cke_skin_kama .cke_browser_gecko .cke_toolbar,.cke_skin_kama .cke_browser_gecko .cke_button a,.cke_skin_kama .cke_browser_gecko .cke_button a.cke_off,.cke_skin_kama .cke_browser_gecko .cke_button .cke_icon,.cke_skin_kama .cke_browser_gecko .cke_button .cke_buttonarrow,.cke_skin_kama .cke_browser_gecko .cke_separator,.cke_skin_kama .cke_browser_gecko .cke_toolbar_start{display:block;float:left;}.cke_skin_kama .cke_browser_gecko.cke_hc .cke_button .cke_icon{display:none;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button a,.cke_skin_kama .cke_browser_gecko .cke_rtl.cke_button a.cke_off,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_icon,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_separator,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar_start{float:right;}.cke_skin_kama .cke_browser_gecko .cke_button .cke_label,.cke_skin_kama .cke_browser_gecko .cke_break{float:left;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_label,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_break,.cke_skin_kama .cke_browser_ie8 .cke_rtl .cke_break,.cke_skin_kama .cke_browser_ie9plus .cke_rtl .cke_break{float:right;}.cke_skin_kama .cke_browser_webkit .cke_toolbar{float:left;}.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_toolbar{float:right;}.cke_skin_kama .cke_browser_ie .cke_button .cke_label{line-height:16px;}.cke_skin_kama .cke_browser_ie .cke_rcombo,.cke_skin_kama .cke_browser_ie .cke_rcombo *{cursor:default;}.cke_skin_kama .cke_browser_ie .cke_toolbox{padding-bottom:5px;_padding-bottom:6px;}.cke_shared .cke_skin_kama .cke_browser_ie .cke_toolbox{padding-bottom:0;}.cke_skin_kama .cke_contextmenu{padding:2px;}.cke_skin_kama .cke_menuitem a{display:block;}.cke_skin_kama .cke_menuitem span{cursor:default;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{background-color:#D3D3D3;display:block;}.cke_hc .cke_menuitem a:hover,.cke_hc .cke_menuitem a:focus,.cke_hc .cke_menuitem a:active{border:2px solid;}.cke_skin_kama .cke_menuitem .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;background-color:transparent;width:16px;height:16px;float:left;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon{background-image:url(icons_rtl.png);}.cke_browser_ie .cke_skin_kama .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_icon,.cke_browser_ie .cke_skin_kama .cke_menuitem.cke_noalphafix .cke_icon{filter:;}.cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:alpha(opacity=70);opacity:.70;}.cke_browser_ie .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon,.cke_browser_ie .cke_skin_kama .cke_menuitem.cke_noalphafix .cke_disabled .cke_icon{filter:;}.cke_skin_kama .cke_menuitem .cke_icon_wrapper{background-color:#D3D3D3;border:solid 4px #D3D3D3;width:16px;height:16px;float:left;filter:alpha(opacity=70);opacity:.70;clear:both;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon_wrapper{float:right;}.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper{background-color:#9d9d9d;border:solid 4px #9d9d9d;filter:alpha(opacity=70);opacity:.70;}.cke_skin_kama .cke_menuitem a:hover.cke_disabled .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus.cke_disabled .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active.cke_disabled .cke_icon_wrapper{background-color:#D3D3D3;border:solid 4px #D3D3D3;}
+.cke_skin_kama .cke_menuitem .cke_label{display:block;padding-right:3px;padding-top:5px;padding-left:4px;height:19px;margin-left:24px;background-color:#fff;}.cke_skin_kama .cke_frameLoaded .cke_menuitem .cke_label{filter:alpha(opacity=70);opacity:.70;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_label{padding-right:0;margin-left:0;padding-left:3px;margin-right:28px;}.cke_skin_kama .cke_menuitem a.cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.30;}.cke_skin_kama .cke_menuitem a:hover .cke_label,.cke_skin_kama .cke_menuitem a:focus .cke_label,.cke_skin_kama .cke_menuitem a:active .cke_label{background-color:#D3D3D3;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label{background-color:transparent;}.cke_skin_kama .cke_menuseparator{background-color:#D3D3D3;height:2px;filter:alpha(opacity=70);opacity:.70;_font-size:0;}.cke_skin_kama .cke_menuarrow{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1411px;background-repeat:no-repeat;height:5px;width:3px;float:right;margin-right:2px;margin-top:3px;}.cke_rtl .cke_skin_kama .cke_menuarrow{float:left;margin-right:0;margin-left:2px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1390px;background-repeat:no-repeat;}.cke_skin_kama .cke_menuarrow span{display:none;}.cke_hc .cke_skin_kama .cke_menuarrow{width:auto;margin-top:0;}.cke_hc .cke_skin_kama .cke_menuarrow span{display:inline;}.cke_browser_ie.cke_ltr .cke_skin_kama .cke_menuarrow{position:absolute;right:2px;}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuarrow{position:absolute;left:2px;}.cke_skin_kama .cke_rcombo{display:inline;}.cke_skin_kama .cke_rcombopanel{border:1px solid #8F8F73;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;border-top-left-radius:0;height:auto;_height:100px;}.cke_skin_kama .cke_rcombo a,.cke_skin_kama .cke_rcombo a:active,.cke_skin_kama .cke_rcombo a:hover{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:repeat-x;background-position:0 -100px;border-bottom:1px solid #DAD9D9;border-right:1px solid #DAD9D9;float:left;padding:2px;height:21px;margin-right:6px;margin-bottom:5px;}.cke_skin_kama .cke_rtl .cke_rcombo a,.cke_skin_kama .cke_rtl .cke_rcombo a:active,.cke_skin_kama .cke_rtl .cke_rcombo a:hover{float:right;margin-right:0;margin-left:6px;}.cke_skin_kama .cke_hc .cke_rcombo a{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_kama .cke_rcombo .cke_label{display:none;line-height:26px;vertical-align:top;margin-right:5px;filter:alpha(opacity=70);opacity:.70;}.cke_skin_kama .cke_rtl .cke_rcombo .cke_label{margin-right:0;margin-left:5px;}.cke_skin_kama .cke_rcombo .cke_inline_label{line-height:21px;font-style:italic;color:#666;}.cke_skin_kama .cke_hc .cke_rcombo .cke_openbutton{vertical-align:top;}.cke_skin_kama .cke_hc .cke_rcombo .cke_label{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_kama .cke_rcombo .cke_text{filter:alpha(opacity=70);opacity:.70;height:21px;line-height:21px;width:60px;text-overflow:ellipsis;overflow:hidden;display:inline-block;margin:0 2px 0 4px;cursor:default;}.cke_skin_kama .cke_rtl .cke_rcombo .cke_text{margin:0 4px 0 2px;}.cke_skin_kama .cke_rcombo .cke_openbutton{display:inline-block;}.cke_skin_kama .cke_rcombo .cke_openbutton .cke_icon{display:inline-block;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -68px;background-repeat:no-repeat;width:17px;height:19px;margin:1px 2px;}.cke_skin_kama .cke_hc .cke_rcombo .cke_openbutton .cke_icon{background:none;}.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_openbutton{margin-bottom:0;}.cke_skin_kama .cke_rcombo .cke_off a:hover .cke_text,.cke_skin_kama .cke_rcombo .cke_off a:focus .cke_text,.cke_skin_kama .cke_rcombo .cke_off a:active .cke_text,.cke_skin_kama .cke_rcombo .cke_on .cke_text{border-color:#316ac5;filter:alpha(opacity=100);opacity:1;}
+.cke_skin_kama .cke_rcombo .cke_off a:hover .cke_openbutton,.cke_skin_kama .cke_rcombo .cke_off a:focus .cke_openbutton,.cke_skin_kama .cke_rcombo .cke_off a:active .cke_openbutton,.cke_skin_kama .cke_rcombo .cke_on .cke_openbutton{border-color:#316ac5;background-color:#dff1ff;}.cke_skin_kama .cke_rcombo .cke_on .cke_text{-moz-border-radius-bottomleft:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;}.cke_skin_kama .cke_rcombo .cke_on .cke_openbutton{-moz-border-radius-bottomright:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.cke_skin_kama .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.3;}.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=70);opacity:.7;}.cke_skin_kama .cke_rcombo .cke_disabled .cke_text,.cke_skin_kama .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);opacity:.5;}.cke_skin_kama .cke_browser_ie .cke_rcombo .cke_disabled .cke_openbutton{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=50);}.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);}.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_text,.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=80);opacity:.8;}.cke_skin_kama .cke_rcombo .cke_disabled .cke_text{color:#fff;}.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_openbutton,.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_openbutton{display:block;float:left;}.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_label,.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_label{float:left;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_rcombo .cke_label,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_rcombo .cke_openbutton,.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_rcombo .cke_label,.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_rcombo .cke_openbutton{float:right;}.cke_skin_kama .cke_browser_ie7 .cke_rcombo .cke_text{line-height:18px;}.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_text,.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_text{height:auto;line-height:17px;}.cke_skin_kama .cke_rtl .cke_rcombo .cke_font .cke_text,.cke_skin_kama .cke_rtl .cke_rcombo .cke_fontSize .cke_text{direction:ltr;}@media print{.cke_path{display:none;}}.cke_skin_kama .cke_path{display:inline-block;float:left;margin-top:5px;}.cke_skin_kama .cke_rtl .cke_path{float:right;}.cke_shared .cke_skin_kama .cke_path{_width:100%;margin:0 0 5px;}.cke_skin_kama .cke_path a,.cke_skin_kama .cke_path .cke_empty{display:inline-block;float:left;padding:1px 4px 0;color:#60676a;cursor:default;}.cke_skin_kama .cke_path .cke_empty{visibility:hidden;}.cke_skin_kama .cke_rtl .cke_path a,.cke_skin_kama .cke_rtl .cke_path cke_empty{float:right;}.cke_skin_kama .cke_path a:hover,.cke_skin_kama .cke_path a:focus,.cke_skin_kama .cke_path a:active{background-color:#dff1ff;padding:1px 4px 0;outline:none;color:#000;}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path a,.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path .cke_empty{float:none;}.cke_skin_kama .cke_path .cke_label{display:none;}.cke_skin_kama .cke_button_source .cke_icon{background-position:0 0;}.cke_skin_kama .cke_button_docProps .cke_icon{background-position:0 -16px;}.cke_skin_kama .cke_button_newpage .cke_icon{background-position:0 -48px;}.cke_skin_kama .cke_button_preview .cke_icon{background-position:0 -64px;}.cke_skin_kama .cke_button_cut .cke_icon{background-position:0 -96px;}.cke_skin_kama .cke_button_copy .cke_icon{background-position:0 -112px;}.cke_skin_kama .cke_button_paste .cke_icon{background-position:0 -128px;}.cke_skin_kama .cke_button_pastetext .cke_icon{background-position:0 -144px;}.cke_skin_kama .cke_button_find .cke_icon{background-position:0 -240px;}.cke_skin_kama .cke_button_replace .cke_icon{background-position:0 -256px;}
+.cke_skin_kama .cke_button_selectAll .cke_icon{background-position:0 -272px;}.cke_skin_kama .cke_button_removeFormat .cke_icon{background-position:0 -288px;}.cke_skin_kama .cke_button_bold .cke_icon{background-position:0 -304px;}.cke_skin_kama .cke_button_italic .cke_icon{background-position:0 -320px;}.cke_skin_kama .cke_button_underline .cke_icon{background-position:0 -336px;}.cke_skin_kama .cke_button_strike .cke_icon{background-position:0 -352px;}.cke_skin_kama .cke_button_subscript .cke_icon{background-position:0 -368px;}.cke_skin_kama .cke_button_superscript .cke_icon{background-position:0 -384px;}.cke_skin_kama .cke_button_table .cke_icon{background-position:0 -608px;}.cke_skin_kama .cke_button_horizontalrule .cke_icon{background-position:0 -624px;}.cke_skin_kama .cke_button_smiley .cke_icon{background-position:0 -640px;}.cke_skin_kama .cke_button_link .cke_icon{background-position:0 -528px;}.cke_skin_kama .cke_button_unlink .cke_icon{background-position:0 -544px;}.cke_skin_kama .cke_button_anchor .cke_icon{background-position:0 -560px;}.cke_skin_kama .cke_button_image .cke_icon{background-position:0 -576px;}.cke_skin_kama .cke_button_flash .cke_icon{background-position:0 -592px;}.cke_skin_kama .cke_button_specialchar .cke_icon{background-position:0 -656px;}.cke_skin_kama .cke_button_pagebreak .cke_icon{background-position:0 -672px;}.cke_skin_kama .cke_button_print .cke_icon{background-position:0 -176px;}.cke_skin_kama .cke_button_checkspell .cke_icon,.cke_skin_kama .cke_button_scayt .cke_icon{background-position:0 -192px;}.cke_skin_kama .cke_button_pagebreak .cke_icon{background-position:0 -672px;}.cke_skin_kama .cke_button_textcolor .cke_icon{background-position:0 -704px;}.cke_skin_kama .cke_button_bgcolor .cke_icon{background-position:0 -720px;}.cke_skin_kama .cke_button_form .cke_icon{background-position:0 -752px;}.cke_skin_kama .cke_button_checkbox .cke_icon{background-position:0 -768px;}.cke_skin_kama .cke_button_radio .cke_icon{background-position:0 -784px;}.cke_skin_kama .cke_button_textfield .cke_icon{background-position:0 -800px;}.cke_skin_kama .cke_button_textarea .cke_icon{background-position:0 -816px;}.cke_skin_kama .cke_button_showblocks .cke_icon{background-position:0 -1136px;}.cke_skin_kama .cke_button_select .cke_icon{background-position:0 -832px;}.cke_skin_kama .cke_button_button .cke_icon{background-position:0 -848px;}.cke_skin_kama .cke_button_imagebutton .cke_icon{background-position:0 -864px;}.cke_skin_kama .cke_button_hiddenfield .cke_icon{background-position:0 -880px;}.cke_skin_kama .cke_button_undo .cke_icon{background-position:0 -208px;}.cke_skin_kama .cke_rtl .cke_button_undo .cke_icon{background-position:0 -224px;}.cke_skin_kama .cke_button_redo .cke_icon{background-position:0 -224px;}.cke_skin_kama .cke_rtl .cke_button_redo .cke_icon{background-position:0 -208px;}.cke_skin_kama .cke_button_templates .cke_icon{background-position:0 -80px;}.cke_skin_kama .cke_button_numberedlist .cke_icon{background-position:0 -400px;}.cke_skin_kama .cke_button_bulletedlist .cke_icon{background-position:0 -416px;}.cke_skin_kama .cke_mixed_dir_content .cke_button_numberedlist .cke_icon{background-position:0 -1217px;}.cke_skin_kama .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon{background-position:0 -1233px;}.cke_skin_kama .cke_button_outdent .cke_icon{background-position:0 -432px;}.cke_skin_kama .cke_button_indent .cke_icon{background-position:0 -448px;}.cke_skin_kama .cke_mixed_dir_content .cke_button_indent .cke_icon{background-position:0 -1265px;}.cke_skin_kama .cke_mixed_dir_content .cke_button_outdent .cke_icon{background-position:0 -1249px;}.cke_skin_kama .cke_button_justifyleft .cke_icon{background-position:0 -464px;}.cke_skin_kama .cke_button_justifycenter .cke_icon{background-position:0 -480px;}.cke_skin_kama .cke_button_justifyright .cke_icon{background-position:0 -496px;}.cke_skin_kama .cke_button_justifyblock .cke_icon{background-position:0 -512px;}.cke_skin_kama .cke_button_blockquote .cke_icon{background-position:0 -1152px;}.cke_skin_kama .cke_button_creatediv .cke_icon{background-position:0 -1168px;}
+.cke_skin_kama .cke_button_editdiv .cke_icon{background-position:0 -1184px;}.cke_skin_kama .cke_button_removediv .cke_icon{background-position:0 -1200px;}.cke_skin_kama .cke_button_flash .cke_icon{background-position:0 -592px;}.cke_skin_kama .cke_button_pastefromword .cke_icon{background-position:0 -160px;}.cke_skin_kama .cke_button_save .cke_icon{background-position:0 -32px;}.cke_skin_kama .cke_button_about .cke_icon{background-position:0 -736px;}.cke_skin_kama .cke_button_maximize .cke_icon{background-position:0 -1040px;}.cke_skin_kama .cke_button_editdiv .cke_icon{background-position:0 -1184px;}.cke_skin_kama .cke_button_bidirtl .cke_icon{background-position:0 -1072px;}.cke_skin_kama .cke_button_bidiltr .cke_icon{background-position:0 -1056px;}.cke_skin_kama .cke_button_iframe .cke_icon{background-position:0 -1279px;}.cke_skin_kama .cke_button_source .cke_label{display:inline;}.cke_skin_kama .cke_styles_panel{width:150px;height:170px;}.cke_skin_kama .cke_format_panel{width:150px;height:170px;}.cke_skin_kama .cke_font_panel{width:150px;height:170px;}.cke_skin_kama .cke_fontSize_panel{height:170px;}.cke_skin_kama .cke_fontSize .cke_text{width:25px;}.cke_skin_kama .cke_browser_iequirks .cke_fontSize .cke_text{width:32px;}html .cke_skin_kama{visibility:inherit;}html.cke_skin_kama_container{visibility:visible;}
diff --git a/web/imcms/ckeditor/skins/kama/icons.png b/web/imcms/ckeditor/skins/kama/icons.png
new file mode 100644
index 0000000000..7c3bf195dd
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/icons.png differ
diff --git a/web/imcms/ckeditor/skins/kama/icons_rtl.png b/web/imcms/ckeditor/skins/kama/icons_rtl.png
new file mode 100644
index 0000000000..83eee28ac7
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/icons_rtl.png differ
diff --git a/web/imcms/ckeditor/skins/kama/images/dialog_sides.gif b/web/imcms/ckeditor/skins/kama/images/dialog_sides.gif
new file mode 100644
index 0000000000..8f91b4753a
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/dialog_sides.gif differ
diff --git a/web/imcms/ckeditor/skins/kama/images/dialog_sides.png b/web/imcms/ckeditor/skins/kama/images/dialog_sides.png
new file mode 100644
index 0000000000..1042a61cf9
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/dialog_sides.png differ
diff --git a/web/imcms/ckeditor/skins/kama/images/dialog_sides_rtl.png b/web/imcms/ckeditor/skins/kama/images/dialog_sides_rtl.png
new file mode 100644
index 0000000000..d7f7b49fcc
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/dialog_sides_rtl.png differ
diff --git a/web/imcms/ckeditor/skins/kama/images/mini.gif b/web/imcms/ckeditor/skins/kama/images/mini.gif
new file mode 100644
index 0000000000..54d9107416
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/mini.gif differ
diff --git a/web/imcms/ckeditor/skins/kama/images/noimage.png b/web/imcms/ckeditor/skins/kama/images/noimage.png
new file mode 100644
index 0000000000..159811305a
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/noimage.png differ
diff --git a/web/imcms/ckeditor/skins/kama/images/sprites.png b/web/imcms/ckeditor/skins/kama/images/sprites.png
new file mode 100644
index 0000000000..0cb4e1c6c3
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/sprites.png differ
diff --git a/web/imcms/ckeditor/skins/kama/images/sprites_ie6.png b/web/imcms/ckeditor/skins/kama/images/sprites_ie6.png
new file mode 100644
index 0000000000..5bb305c8d3
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/sprites_ie6.png differ
diff --git a/web/imcms/ckeditor/skins/kama/images/toolbar_start.gif b/web/imcms/ckeditor/skins/kama/images/toolbar_start.gif
new file mode 100644
index 0000000000..1774246c2e
Binary files /dev/null and b/web/imcms/ckeditor/skins/kama/images/toolbar_start.gif differ
diff --git a/web/imcms/ckeditor/skins/kama/skin.js b/web/imcms/ckeditor/skins/kama/skin.js
new file mode 100644
index 0000000000..523430ab47
--- /dev/null
+++ b/web/imcms/ckeditor/skins/kama/skin.js
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.skins.add('kama',(function(){var a='cke_ui_color';return{editor:{css:['editor.css']},dialog:{css:['dialog.css']},richcombo:{canGroup:false},templates:{css:['templates.css']},margins:[0,0,0,0],init:function(b){if(b.config.width&&!isNaN(b.config.width))b.config.width-=12;var c=[],d=/\$color/g,e='/* UI Color Support */.cke_skin_kama .cke_menuitem .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_label,.cke_skin_kama .cke_menuitem a:focus .cke_label,.cke_skin_kama .cke_menuitem a:active .cke_label{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label{\tbackground-color: transparent !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuseparator{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{\tbackground-color: $color !important;}';if(CKEDITOR.env.webkit){e=e.split('}').slice(0,-1);for(var f=0;f<e.length;f++)e[f]=e[f].split('{');}function g(j){var k=j.getById(a);if(!k){k=j.getHead().append('style');k.setAttribute('id',a);k.setAttribute('type','text/css');}return k;};function h(j,k,l){var m,n,o;for(var p=0;p<j.length;p++){if(CKEDITOR.env.webkit)for(n=0;n<k.length;n++){o=k[n][1];for(m=0;m<l.length;m++)o=o.replace(l[m][0],l[m][1]);j[p].$.sheet.addRule(k[n][0],o);}else{o=k;for(m=0;m<l.length;m++)o=o.replace(l[m][0],l[m][1]);if(CKEDITOR.env.ie)j[p].$.styleSheet.cssText+=o;else j[p].$.innerHTML+=o;}}};var i=/\$color/g;CKEDITOR.tools.extend(b,{uiColor:null,getUiColor:function(){return this.uiColor;},setUiColor:function(j){var k,l=g(CKEDITOR.document),m='.'+b.id,n=[m+' .cke_wrapper',m+'_dialog .cke_dialog_contents',m+'_dialog a.cke_dialog_tab',m+'_dialog .cke_dialog_footer'].join(','),o='background-color: $color !important;';
+if(CKEDITOR.env.webkit)k=[[n,o]];else k=n+'{'+o+'}';return(this.setUiColor=function(p){var q=[[i,p]];b.uiColor=p;h([l],k,q);h(c,e,q);})(j);}});b.on('menuShow',function(j){var k=j.data[0],l=k.element.getElementsByTag('iframe').getItem(0).getFrameDocument();if(!l.getById('cke_ui_color')){var m=g(l);c.push(m);var n=b.getUiColor();if(n)h([m],e,[[i,n]]);}});if(b.config.uiColor)b.setUiColor(b.config.uiColor);}};})());(function(){CKEDITOR.dialog?a():CKEDITOR.on('dialogPluginReady',a);function a(){CKEDITOR.dialog.on('resize',function(b){var c=b.data,d=c.width,e=c.height,f=c.dialog,g=f.parts.contents;if(c.skin!='kama')return;g.setStyles({width:d+'px',height:e+'px'});});};})();
diff --git a/web/imcms/ckeditor/skins/kama/templates.css b/web/imcms/ckeditor/skins/kama/templates.css
new file mode 100644
index 0000000000..c241cf2ce5
--- /dev/null
+++ b/web/imcms/ckeditor/skins/kama/templates.css
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_kama .cke_tpl_list{border:#dcdcdc 2px solid;background-color:#fff;overflow-y:auto;overflow-x:hidden;width:100%;height:220px;}.cke_skin_kama .cke_tpl_item{margin:5px;padding:7px;border:#eee 1px solid;*width:88%;}.cke_skin_kama .cke_tpl_preview{border-collapse:separate;text-indent:0;width:100%;}.cke_skin_kama .cke_tpl_preview td{padding:2px;vertical-align:middle;}.cke_skin_kama .cke_tpl_preview .cke_tpl_preview_img{width:100px;}.cke_skin_kama .cke_tpl_preview span{white-space:normal;}.cke_skin_kama .cke_tpl_title{font-weight:bold;}.cke_skin_kama .cke_tpl_list a:active .cke_tpl_item,.cke_skin_kama .cke_tpl_list a:hover .cke_tpl_item,.cke_skin_kama .cke_tpl_list a:focus .cke_tpl_item{border:#f93 1px solid;background-color:#fffacd;}.cke_skin_kama .cke_tpl_list a:active *,.cke_skin_kama .cke_tpl_list a:hover *,.cke_skin_kama .cke_tpl_list a:focus *{cursor:pointer;}.cke_skin_kama .cke_browser_ie6 .cke_tpl_list a:active,.cke_skin_kama .cke_browser_ie6 .cke_tpl_list a:hover,.cke_skin_kama .cke_browser_ie6 .cke_tpl_list a:focus{background-position:0 0;}.cke_skin_kama .cke_hc .cke_tpl_list a:active .cke_tpl_item,.cke_skin_kama .cke_hc .cke_tpl_list a:hover .cke_tpl_item,.cke_skin_kama .cke_hc .cke_tpl_list a:focus .cke_tpl_item{border-width:3px;}.cke_skin_kama .cke_tpl_empty,.cke_tpl_loading{text-align:center;padding:5px;}
diff --git a/web/imcms/ckeditor/skins/office2003/dialog.css b/web/imcms/ckeditor/skins/office2003/dialog.css
new file mode 100644
index 0000000000..f8dd37c3cf
--- /dev/null
+++ b/web/imcms/ckeditor/skins/office2003/dialog.css
@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+body .cke_dialog{visibility:visible;}.cke_skin_office2003 table.cke_dialog.cke_browser_gecko{display:block;}.cke_skin_office2003 .cke_dialog_body{margin-left:16px;margin-right:16px;margin-top:2px;margin-bottom:20px;z-index:1;_position:static;}.cke_skin_office2003 .cke_dialog_tl,.cke_skin_office2003 .cke_dialog_tr,.cke_skin_office2003 .cke_dialog_tc,.cke_skin_office2003 .cke_dialog_bl,.cke_skin_office2003 .cke_dialog_br,.cke_skin_office2003 .cke_dialog_bc{background-image:url(images/sprites.png);background-repeat:no-repeat;position:absolute;_background-image:url(images/sprites_ie6.png);z-index:-1;}.cke_skin_office2003 .cke_dialog_tl{background-position:-16px -16px;height:16px;width:16px;top:0;left:0;}.cke_skin_office2003 .cke_rtl .cke_dialog_tl{background-position:-16px -397px;}.cke_skin_office2003 .cke_dialog_tr{background-position:-16px -76px;height:16px;width:16px;top:0;right:0;}.cke_skin_office2003 .cke_rtl .cke_dialog_tr{background-position:-16px -457px;}.cke_skin_office2003 .cke_dialog_tc{background-position:0 -136px;background-repeat:repeat-x;height:16px;top:0;left:16px;right:16px;}.cke_skin_office2003 .cke_dialog_bl{background-position:-16px -196px;height:51px;width:30px;bottom:0;left:0;}.cke_skin_office2003 .cke_rtl .cke_dialog_bl{background-position:-16px -517px;}.cke_skin_office2003 .cke_dialog_br{background-position:-16px -263px;height:51px;width:30px;bottom:0;right:0;}.cke_skin_office2003 .cke_rtl .cke_dialog_br{background-position:-16px -584px;}.cke_skin_office2003 .cke_dialog_bc{background-position:0 -330px;background-repeat:repeat-x;height:51px;bottom:0;left:30px;right:30px;}.cke_skin_office2003 .cke_dialog_ml,.cke_skin_office2003 .cke_dialog_mr{background-image:url(images/dialog_sides.png);background-repeat:repeat-y;position:absolute;width:16px;top:16px;bottom:51px;_background-image:url(images/dialog_sides.gif);_top:auto;}.cke_skin_office2003 .cke_rtl .cke_dialog_ml,.cke_skin_office2003 .cke_rtl .cke_dialog_mr{background-image:url(images/dialog_sides_rtl.png);_background-image:url(images/dialog_sides.gif);}.cke_skin_office2003 .cke_dialog_ml{background-position:0 0;left:0;}.cke_skin_office2003 .cke_dialog_mr{background-position:-16px 0;right:0;}.cke_skin_office2003 .cke_browser_iequirks .cke_dialog_ml,.cke_skin_office2003 .cke_browser_iequirks .cke_dialog_mr{margin-top:3px;}.cke_skin_office2003 .cke_dialog_title{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -678px;background-repeat:repeat-x;font-weight:bold;font-size:14pt;color:#0E3460;background-color:#8db1ff;padding:3px 10px 26px 10px;cursor:move;position:relative;}.cke_skin_office2003 .cke_browser_ie.cke_rtl .cke_dialog_title{position:static;}.cke_skin_office2003 .cke_dialog_contents{background-color:#f7f8fd;border:#2b66c9 1px solid;overflow:auto;padding:5px 10px;}.cke_skin_office2003 .cke_dialog_footer{background-color:#8db1ff;text-align:right;}.cke_skin_office2003 .cke_rtl .cke_dialog_footer{text-align:left;}.cke_skin_office2003 .cke_dialog_footer .cke_resizer{margin-top:21px;}.cke_skin_office2003 .cke_dialog_tabs{height:23px;background-color:#8db1ff;display:inline-block;margin-left:10px;margin-right:10px;margin-top:-23px;position:absolute;z-index:2;}.cke_skin_office2003 .cke_rtl .cke_dialog_tabs{right:10px;}.cke_skin_office2003 a.cke_dialog_tab,.cke_skin_office2003 a:link.cke_dialog_tab,.cke_skin_office2003 a:active.cke_dialog_tab,.cke_skin_office2003 a:hover.cke_dialog_tab,.cke_skin_office2003 a:visited.cke_dialog_tab{color:#0E3460;border-left:1px solid #2b66c9;border-right:1px solid #2b66c9;border-top:1px solid #2b66c9;height:14px;padding:4px 5px;display:inline-block;cursor:pointer;}.cke_skin_office2003 .cke_browser_gecko18 a.cke_dialog_tab,.cke_skin_office2003 .cke_browser_gecko18 a:link.cke_dialog_tab,.cke_skin_office2003 .cke_browser_gecko18 a:active.cke_dialog_tab,.cke_skin_office2003 .cke_browser_gecko18 a:hover.cke_dialog_tab,.cke_skin_office2003 .cke_browser_gecko18 a:visited.cke_dialog_tab{display:inline;position:relative;top:6px;}.cke_skin_office2003 a:hover.cke_dialog_tab{background-color:#f7f8fd;}
+.cke_skin_office2003 .cke_hc a:hover.cke_dialog_tab{padding:2px 3px!important;border-width:3px;}.cke_skin_office2003 a.cke_dialog_tab_selected,.cke_skin_office2003 a:link.cke_dialog_tab_selected,.cke_skin_office2003 a:active.cke_dialog_tab_selected,.cke_skin_office2003 a:hover.cke_dialog_tab_selected,.cke_skin_office2003 a:visited.cke_dialog_tab_selected{border-bottom:1px solid #f7f8fd;background-color:#f7f8fd;font-weight:bold;cursor:default;}.cke_skin_office2003 .cke_hc a.cke_dialog_tab_selected,.cke_skin_office2003 .cke_hc a:link.cke_dialog_tab_selected,.cke_skin_office2003 .cke_hc a:active.cke_dialog_tab_selected,.cke_skin_office2003 .cke_hc a:hover.cke_dialog_tab_selected,.cke_skin_office2003 .cke_hc a:visited.cke_dialog_tab_selected{padding:2px 3px!important;border-width:3px;}.cke_skin_office2003 .cke_single_page .cke_dialog_tabs{display:none;}.cke_skin_office2003 .cke_hc .cke_dialog_tabs a,.cke_skin_office2003 .cke_hc .cke_dialog_footer a{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}.cke_skin_office2003 .cke_single_page .cke_dialog_title{padding-bottom:3px;}.cke_skin_office2003 .cke_dialog_ui_vbox table,.cke_skin_office2003 .cke_dialog_ui_hbox table{margin:auto;}.cke_skin_office2003 .cke_dialog_ui_vbox_child{padding:5px 0;}.cke_skin_office2003 input.cke_dialog_ui_input_text,.cke_skin_office2003 input.cke_dialog_ui_input_password{background-color:white;border:none;padding:0;width:100%;height:14px;}.cke_skin_office2003 div.cke_dialog_ui_input_text,.cke_skin_office2003 div.cke_dialog_ui_input_password{background-color:white;border:1px solid #a0a0a0;padding:1px 0;_width:99.9%;}.cke_skin_office2003 .cke_browser_ie7 input.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_ie7 input.cke_dialog_ui_input_password{position:absolute;}.cke_skin_office2003 .cke_browser_ie7 div.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_ie7 div.cke_dialog_ui_input_password{height:14px;position:relative;}.cke_skin_office2003 .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_password,.cke_skin_office2003 .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px;}.cke_skin_office2003 .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_password,.cke_skin_office2003 .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px;}.cke_skin_office2003 .cke_browser_ie.cke_rtl .cke_dialog_ui_vbox_child,.cke_skin_office2003 .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_child,.cke_skin_office2003 .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_office2003 .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important;}.cke_skin_office2003 .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px;}.cke_skin_office2003 .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_password{border-width:0;}.cke_skin_office2003 .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_text,.cke_skin_office2003 .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_password{border-width:1px;}.cke_skin_office2003 textarea.cke_dialog_ui_input_textarea{background-color:white;border:none;padding:0;width:100%;_width:99%;overflow:auto;resize:none;}.cke_skin_office2003 div.cke_dialog_ui_input_textarea{background-color:white;border:1px solid #a0a0a0;padding:1px 0;}.cke_skin_office2003 .cke_rtl .cke_dialog_ui_labeled_content{_width:95%;}.cke_skin_office2003 div.cke_disabled .cke_dialog_ui_labeled_content *{background-color:#a0a0a0;cursor:default;}.cke_skin_office2003 .cke_dialog_ui_hbox{width:100%;}.cke_skin_office2003 .cke_dialog_ui_hbox_first,.cke_skin_office2003 .cke_dialog_ui_hbox_child,.cke_skin_office2003 .cke_dialog_ui_hbox_last{vertical-align:top;}.cke_skin_office2003 .cke_ltr .cke_dialog_ui_hbox_first,.cke_skin_office2003 .cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px;}
+.cke_skin_office2003 .cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_office2003 .cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px;}.cke_skin_office2003 a.cke_dialog_ui_button{border-collapse:separate;cursor:default;}.cke_skin_office2003 a.cke_dialog_ui_button_ok span,.cke_skin_office2003 a.cke_dialog_ui_button_cancel span{width:60px;}.cke_skin_office2003 span.cke_dialog_ui_button{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -678px;background-repeat:repeat-x;border:#0E3460 1px solid;padding:2px 10px;text-align:center;color:#0E3460;background-color:#8db1ff;display:inline-block;cursor:default;}.cke_skin_office2003 .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button{display:block;}.cke_skin_office2003 a.cke_dialog_ui_button span.cke_disabled{border:#898980 1px solid;color:#5e5e55;background-color:#c5c5b3;}.cke_skin_office2003 a:focus span.cke_dialog_ui_button,.cke_skin_office2003 a:active span.cke_dialog_ui_button{background-color:#8db1ff;}.cke_skin_office2003 .cke_hc a:focus span.cke_dialog_ui_button,.cke_skin_office2003 .cke_hc a:active span.cke_dialog_ui_button{border-width:2px;}.cke_skin_office2003 .cke_dialog_footer_buttons{display:inline-table;margin-right:12px;margin-left:12px;width:auto;position:relative;}.cke_skin_office2003 .cke_browser_gecko18 .cke_dialog_footer_buttons{display:inline;}.cke_skin_office2003 .cke_dialog_footer_buttons span.cke_dialog_ui_button{margin:7px 0;}.cke_skin_office2003 .cke_browser_ie7 .cke_dialog_footer_buttons{position:static;}.cke_skin_office2003 strong{font-weight:bold;}.cke_skin_office2003 a.cke_dialog_close_button,.cke_skin_office2003 a:hover.cke_dialog_close_button,.cke_skin_office2003 .cke_browser_ie6 a.cke_dialog_close_button,.cke_skin_office2003 .cke_browser_ie6 a:hover.cke_dialog_close_button{background-image:url(images/sprites.png);background-repeat:no-repeat;background-position:-20px -655px;position:absolute;cursor:pointer;text-align:center;height:21px;width:21px;top:4px;_background-image:url(images/sprites_ie6.png);}.cke_skin_office2003 a.cke_dialog_close_button span{display:none;}.cke_skin_office2003 .cke_ltr a.cke_dialog_close_button{right:22px;}.cke_skin_office2003 .cke_rtl a.cke_dialog_close_button,.cke_skin_office2003 .cke_rtl a:hover.cke_dialog_close_button{left:16px;_top:6px;}.cke_skin_office2003 .cke_browser_ie6.cke_rtl a.cke_dialog_close_button,.cke_skin_office2003 .cke_browser_ie6.cke_rtl a:hover.cke_dialog_close_button{position:relative;float:left;margin-top:-55px;margin-left:-7px;}.cke_skin_office2003 .cke_browser_iequirks.cke_rtl.cke_single_page a.cke_dialog_close_button,.cke_skin_office2003 .cke_browser_iequirks.cke_rtl.cke_single_page a:hover.cke_dialog_close_button{margin-top:-32px;}.cke_skin_office2003 .cke_browser_iequirks.cke_ltr a.cke_dialog_close_button,.cke_skin_office2003 .cke_browser_iequirks.cke_ltr a:hover.cke_dialog_close_button{margin-top:0;}.cke_skin_office2003 .cke_dialog_ui_input_select{border:1px solid #a0a0a0;background-color:white;}.cke_skin_office2003 .cke_dialog_ui_input_file{width:100%;height:25px;}.cke_skin_office2003 .cke_dialog .cke_dark_background{background-color:#eaead1;}.cke_skin_office2003 .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_office2003 .cke_dialog .cke_centered{text-align:center;}.cke_skin_office2003 .cke_dialog a.cke_btn_reset{float:right;background-position:0 -32px;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px;}.cke_skin_office2003 .cke_rtl .cke_dialog a.cke_btn_reset{float:left;}.cke_skin_office2003 .cke_dialog a.cke_btn_locked,.cke_skin_office2003 .cke_dialog a.cke_btn_unlocked{float:left;background-position:0 0;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px;}.cke_skin_office2003 .cke_dialog a.cke_btn_locked .cke_icon{display:none;}.cke_skin_office2003 .cke_rtl .cke_dialog a.cke_btn_locked,.cke_skin_office2003 .cke_rtl .cke_dialog a.cke_btn_unlocked{float:right;}.cke_skin_office2003 .cke_dialog a.cke_btn_unlocked{background-position:0 -16px;background-image:url(images/mini.gif);}
+.cke_skin_office2003 .cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer;}.cke_skin_office2003 .cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:210px;width:230px;padding:2px;background-color:white;}.cke_skin_office2003 .cke_dialog .ImagePreviewBox table td{white-space:normal;}.cke_skin_office2003 .cke_browser_iequirks .cke_dialog_page_contents{_position:absolute;}.cke_skin_office2003 .cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity=90);background-color:#e4e4e4;}.cke_skin_office2003 .cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white;}.cke_skin_office2003 .cke_dialog .cke_pastetext{width:346px;height:170px;}.cke_skin_office2003 .cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none;}.cke_skin_office2003 .cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid black;}.cke_skin_office2003 .cke_dialog .cke_dark_background{text-align:center;background-color:#eaead1;font-size:14px;}.cke_skin_office2003 .cke_dialog .cke_light_background{text-align:center;background-color:#ffffbe;}.cke_skin_office2003 .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_office2003 .cke_disabled{color:#a0a0a0;}.cke_skin_office2003 .cke_hc .cke_dialog_title,.cke_skin_office2003 .cke_hc .cke_dialog_tabs,.cke_skin_office2003 .cke_hc .cke_dialog_contents,.cke_skin_office2003 .cke_hc .cke_dialog_footer{border-left:1px solid;border-right:1px solid;}.cke_skin_office2003 .cke_hc .cke_dialog_title{border-top:1px solid;}.cke_skin_office2003 .cke_hc .cke_dialog_footer{border-bottom:1px solid;}.cke_skin_office2003 .cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px;}.cke_skin_office2003 .cke_dialog_body .cke_label{display:none;}.cke_skin_office2003 .cke_dialog_body label.cke_required{font-weight:bold;}.cke_skin_office2003 .cke_hc .cke_dialog_body .cke_label{display:inline;cursor:inherit;}.cke_skin_office2003 .cke_hc a.cke_btn_locked,.cke_skin_office2003 .cke_hc a.cke_btn_unlocked,.cke_skin_office2003 .cke_hc a.cke_btn_reset{border-style:solid;float:left;width:auto;height:auto;padding:0 2px;}.cke_skin_office2003 .cke_hc a.cke_btn_locked .cke_icon{display:inline;}.cke_skin_office2003 .cke_rtl.cke_hc a.cke_btn_locked,.cke_skin_office2003 .cke_rtl.cke_hc a.cke_btn_unlocked,.cke_skin_office2003 .cke_rtl.cke_hc a.cke_btn_reset{float:right;}.cke_skin_office2003 .cke_dialog_contents a.colorChooser{display:block;margin-top:12px;margin-left:10px;width:40px;}.cke_skin_office2003 .cke_dialog_contents a.colorChooser .cke_dialog_ui_button{width:100%;}.cke_skin_office2003 .cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px;}.cke_skin_office2003 .cke_browser_gecko .cke_dialog_ui_checkbox_input:focus,.cke_skin_office2003 .cke_browser_gecko .cke_dialog_ui_radio_input:focus,.cke_skin_office2003 .cke_browser_opera .cke_dialog_ui_checkbox_input:focus,.cke_skin_office2003 .cke_browser_opera .cke_dialog_ui_radio_input:focus,.cke_skin_office2003 .cke_browser_gecko .cke_dialog_ui_input_select:focus,.cke_skin_office2003 .cke_browser_gecko .cke_btn_over,.cke_skin_office2003 .cke_browser_opera .cke_btn_over,.cke_skin_office2003 .cke_browser_ie .cke_btn_over{outline:1px dotted #696969;}.cke_skin_office2003 .cke_browser_ie .cke_dialog_ui_checkbox_input,.cke_skin_office2003 .cke_browser_ie .cke_dialog_ui_ratio_input,.cke_skin_office2003 .cke_browser_ie .cke_btn_reset,.cke_skin_office2003 .cke_browser_ie .cke_btn_locked,.cke_skin_office2003 .cke_browser_ie .cke_btn_unlocked{*border:1px solid transparent!important;-border:1px solid red!important;-filter:chroma(color=red);}.cke_skin_office2003 .cke_browser_ie .cke_dialog_ui_focused,.cke_skin_office2003 .cke_browser_ie .cke_btn_over{*border:1px dotted #696969!important;}.cke_skin_office2003 .cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity=0);width:100%;height:100%;}
+.cke_dialog label{display:inline;margin-bottom:auto;cursor:default;}
diff --git a/web/imcms/ckeditor/skins/office2003/editor.css b/web/imcms/ckeditor/skins/office2003/editor.css
new file mode 100644
index 0000000000..e489330e76
--- /dev/null
+++ b/web/imcms/ckeditor/skins/office2003/editor.css
@@ -0,0 +1,14 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_office2003 *,.cke_skin_office2003 a:hover,.cke_skin_office2003 a:link,.cke_skin_office2003 a:visited,.cke_skin_office2003 a:active{margin:0;padding:0;border:0;background:transparent;text-decoration:none;font:normal normal normal 100% Sans-Serif;width:auto;height:auto;border-collapse:collapse;text-align:left;vertical-align:baseline;white-space:nowrap;cursor:auto;color:#000;float:none;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_skin_office2003 .cke_rtl *,.cke_skin_office2003 .cke_rtl a:hover,.cke_skin_office2003 .cke_rtl a:link,.cke_skin_office2003 .cke_rtl a:visited,.cke_skin_office2003 .cke_rtl a:active,.cke_rtl .cke_skin_office2003 *,.cke_rtl .cke_skin_office2003 a:hover,.cke_rtl .cke_skin_office2003 a:link,.cke_rtl .cke_skin_office2003 a:visited,.cke_rtl .cke_skin_office2003 a:active{text-align:right;}.cke_skin_office2003 iframe{vertical-align:inherit;}.cke_skin_office2003 textarea{white-space:pre;}.cke_skin_office2003 .cke_browser_gecko textarea{cursor:text;}.cke_skin_office2003 .cke_browser_gecko textarea[disabled]{cursor:default;}.cke_skin_office2003 input[type="text"],.cke_skin_office2003 input[type="password"]{cursor:text;}.cke_skin_office2003 input[type="text"][disabled],.cke_skin_office2003 input[type="password"][disabled]{cursor:default;}.cke_skin_office2003 fieldset{padding:10px;border:2px groove #E0DFE3;}.cke_skin_office2003 .cke_editor{display:inline-table;width:100%;}.cke_skin_office2003 .cke_browser_webkit .cke_editor{display:table;}.cke_skin_office2003 span.cke_browser_webkit,.cke_skin_office2003 span.cke_browser_gecko18{display:block;}.cke_skin_office2003,.cke_skin_office2003 .cke_wrapper{display:block;}.cke_skin_office2003 .cke_top,.cke_skin_office2003 .cke_bottom,.cke_shared .cke_skin_office2003{background-color:#f7f8fd;}.cke_skin_office2003 .cke_top{border-top:solid 1px #fafaf5;border-left:solid 1px #fafaf5;border-right:solid 1px #696969;border-bottom:solid 2px #696969;}.cke_skin_office2003 .cke_rtl .cke_top{border-left:solid 1px #696969;border-right:solid 1px #fafaf5;}.cke_skin_office2003 .cke_bottom{border-left:solid 1px #696969;border-right:solid 1px #696969;border-bottom:solid 1px #696969;}.cke_skin_office2003 .cke_contents{border:solid 1px #696969;background-color:white;}.cke_skin_office2003 .cke_focus{outline:auto 5px -webkit-focus-ring-color;}.cke_skin_office2003 textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;white-space:pre;background-color:#fff;}.cke_skin_office2003 .cke_browser_iequirks textarea.cke_source{_white-space:normal;}.cke_skin_office2003 .cke_resizer{width:12px;height:12px;margin-top:16px;display:block;float:right;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1088px;background-repeat:no-repeat;cursor:se-resize;}.cke_skin_office2003 .cke_browser_air .cke_resizer,.cke_skin_office2003 .cke_browser_air .cke_rtl .cke_resizer{cursor:move;}.cke_skin_office2003 .cke_resizer_rtl{cursor:sw-resize;background-position:0 -1115px;float:left;}.cke_skin_office2003 .cke_resizer_horizontal,.cke_skin_office2003 .cke_rtl .cke_resizer_horizontal{cursor:e-resize;}.cke_skin_office2003 .cke_resizer_vertical,.cke_skin_office2003 .cke_rtl .cke_resizer_vertical{cursor:n-resize;}.cke_skin_office2003 .cke_maximized .cke_resizer{display:none;}.cke_skin_office2003 .cke_browser_ie6 .cke_contents textarea,.cke_skin_office2003 .cke_browser_ie7 .cke_contents textarea{position:absolute;}.cke_skin_office2003 .cke_voice_label{display:none;}.cke_skin_office2003 legend.cke_voice_label{display:none;}.cke_skin_office2003 .cke_browser_ie legend.cke_voice_label{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_office2003 .cke_panel{border:1px solid #8f8f73;background-color:#fff;width:120px;height:100px;overflow:hidden;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.cke_skin_office2003 .cke_panel iframe{width:100%;height:100%;}cke_skin_office2003 .cke_panel_frame .cke_label{display:none;}html.cke_skin_office2003_container{overflow:auto;overflow-x:hidden;}
+body.cke_panel_frame{overflow:auto;}ul.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap;}li.cke_panel_listItem{margin:0;}.cke_panel_listItem a{padding:2px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;}* html .cke_panel_listItem a{width:100%;color:#000;}*:first-child+html .cke_panel_listItem a{color:#000;}.cke_panel_listItem.cke_selected a{border:1px solid #ccc;background-color:#e9f5ff;}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#316ac5;background-color:#dff1ff;}.cke_hc .cke_panel_listItem.cke_selected a,.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border-width:3px;padding:0;}.cke_panel_grouptitle{font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;font-weight:bold;white-space:nowrap;background-color:#dcdcdc;color:#000;margin:0;padding:3px;}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:3px;margin-bottom:3px;}.cke_skin_office2003 .cke_button_textcolor_panel,.cke_skin_office2003 .cke_button_bgcolor_panel{width:150px;height:135px;}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000;}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left;}.cke_rtl span.cke_colorbox{float:right;}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;}.cke_rtl a.cke_colorbox{float:right;}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#316ac5 1px solid;background-color:#dff1ff;}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer;}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#316ac5 1px solid;background-color:#dff1ff;}@media print{.cke_skin_office2003 .cke_toolbox{display:none;}}.cke_skin_office2003 .cke_browser_webkit .cke_toolbox,.cke_skin_office2003 .cke_browser_webkit .cke_toolbox>span{white-space:normal;}.cke_skin_office2003 .cke_toolbox{clear:both;padding-bottom:1px;}.cke_skin_office2003 a.cke_toolbox_collapser,.cke_skin_office2003 a:hover.cke_toolbox_collapser{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:3px -1026px;background-repeat:no-repeat;width:11px;height:11px;float:right;border:outset 1px;margin:11px 2px 2px;cursor:pointer;}.cke_skin_office2003 .cke_rtl a.cke_toolbox_collapser,.cke_skin_office2003 .cke_rtl a:hover.cke_toolbox_collapser{float:left;}.cke_skin_office2003 a.cke_toolbox_collapser span{display:none;}.cke_skin_office2003 .cke_hc a.cke_toolbox_collapser span{font-size:10px;font-weight:bold;font-family:Arial;display:inline;}.cke_skin_office2003 a.cke_toolbox_collapser_min,.cke_skin_office2003 a:hover.cke_toolbox_collapser_min{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:4px -1047px;background-repeat:no-repeat;margin:2px;}.cke_skin_office2003 .cke_rtl a.cke_toolbox_collapser_min,.cke_skin_office2003 .cke_rtl a:hover.cke_toolbox_collapser_min{background-position:4px -1068px;}.cke_skin_office2003 .cke_toolbar{background-color:#d6dff7;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -962px;background-repeat:repeat-x;display:inline-block;float:left;!height:28px;!line-height:28px;}.cke_skin_office2003 .cke_rtl .cke_toolbar{float:right;}.cke_skin_office2003 .cke_toolgroup{display:inline-block;float:left;height:28px;}.cke_skin_office2003 .cke_browser_ie .cke_toolgroup{#float:none;#display:inline;}.cke_skin_office2003 .cke_rtl .cke_toolgroup{float:right;}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolgroup{#float:none;}.cke_skin_office2003 .cke_separator{display:inline-block;float:left;border-left:solid 1px #B2CBFF;margin:6px 2px;height:16px;}
+.cke_skin_office2003 .cke_browser_ie .cke_separator{#float:none;#display:inline;}.cke_skin_office2003 .cke_rtl .cke_separator{float:right;}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_separator{#float:none;}.cke_skin_office2003 .cke_break{clear:left;}.cke_skin_office2003 .cke_rtl .cke_break{clear:right;}.cke_skin_office2003 .cke_toolbar_start{display:inline-block;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;background-position:-27px -765px;width:10px;height:28px;float:left;}.cke_skin_office2003 .cke_browser_ie .cke_toolbar_start{#float:none;#display:inline;}.cke_skin_office2003 .cke_rtl .cke_toolbar_start{background-position:-27px -816px;float:right;}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolbar_start{#float:none;}.cke_skin_office2003 .cke_toolbar_end{display:inline-block;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;background-position:-29px -861px;width:4px;height:28px;float:left;}.cke_skin_office2003 .cke_browser_ie .cke_toolbar_end{#float:none;#display:inline;}.cke_skin_office2003 .cke_rtl .cke_toolbar_end{background-position:-29px -907px;float:right;}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolbar_end{#float:none;}.cke_skin_office2003 .cke_browser_ie9plus .cke_rtl .cke_separator,.cke_skin_office2003 .cke_browser_ie9plus .cke_rtl .cke_toolbar_start,.cke_skin_office2003 .cke_browser_ie9plus .cke_rtl .cke_toolbar_end{vertical-align:middle;}.cke_skin_office2003 .cke_button a,.cke_skin_office2003 .cke_button a:hover,.cke_skin_office2003 .cke_button a:focus,.cke_skin_office2003 .cke_button a:active,.cke_skin_office2003 .cke_button a.cke_off{border:solid 1px transparent;border-radius:3px;outline:none;padding-top:2px;padding-left:4px;padding-right:4px;padding-bottom:2px;margin-top:2px;height:18px;vertical-align:top;_border:none;_margin:3px 1px 1px 1px;cursor:default;display:inline-block;}.cke_skin_office2003 .cke_button a,.cke_skin_office2003 .cke_button a.cke_off{filter:alpha(opacity=70);opacity:.70;-moz-border-radius:3px;-webkit-border-radius:3px;}.cke_skin_office2003 .cke_hc .cke_button a,.cke_skin_office2003 .cke_hc .cke_button a.cke_off{opacity:1.0;filter:alpha(opacity=100);_border:1px solid transparent;}.cke_skin_office2003 .cke_button a.cke_on{border:solid 1px #316ac5;background-color:#c1d2ee;filter:alpha(opacity=100);opacity:1;_margin:2px 0 0 0;}.cke_skin_office2003 .cke_hc .cke_button a:hover,.cke_skin_office2003 .cke_hc .cke_button a:focus,.cke_skin_office2003 .cke_hc .cke_button a:active{padding:0 2px!important;border-width:3px;}.cke_skin_office2003 .cke_button a.cke_disabled *{filter:alpha(opacity=30);opacity:.3;}.cke_skin_office2003 .cke_browser_ie .cke_button a.cke_disabled *,.cke_skin_office2003 .cke_browser_ie a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,.cke_skin_office2003 .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_office2003 .cke_browser_ie6 .cke_button a.cke_disabled *,.cke_skin_office2003 .cke_browser_ie6 a:hover.cke_button .cke_disabled *,.cke_skin_office2003 .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *{filter:alpha(opacity=30);}.cke_skin_office2003 .cke_hc .cke_button a.cke_disabled *,.cke_skin_office2003 .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *{filter:alpha(opacity=60);opacity:.6;}.cke_skin_office2003 .cke_button a:hover,.cke_skin_office2003 .cke_button a:focus,.cke_skin_office2003 .cke_button a:active{border:solid 1px #316ac5;background-color:#dff1ff;filter:alpha(opacity=100);opacity:1;vertical-align:top;_margin:2px 0 0 0;padding:2px 4px;}.cke_skin_office2003 .cke_button .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;display:inline-block;cursor:default;}
+.cke_skin_office2003 .cke_rtl .cke_button .cke_icon{background-image:url(icons_rtl.png);}.cke_skin_office2003 .cke_browser_ie .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_office2003 .cke_browser_ie6 .cke_button .cke_icon,.cke_skin_office2003 .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,.cke_skin_office2003 .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon{filter:;}.cke_skin_office2003 .cke_button .cke_label{display:none;padding-left:3px;cursor:default;vertical-align:middle;_background-image:url(images/sprites_ie6.png);_background-position:0 -970px;_background-repeat:repeat-x;}.cke_skin_office2003 .cke_button a:hover .cke_label{_background-color:#dff1ff;_background-image:none;}.cke_skin_office2003 .cke_button a.cke_on .cke_label{_background-color:#c1d2ee;_background-image:none;}.cke_skin_office2003 .cke_hc .cke_button .cke_label{padding:0;display:inline-block;}.cke_skin_office2003 .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_office2003 .cke_accessibility{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_office2003 .cke_button .cke_buttonarrow{display:inline-block;height:18px;width:8px;background-position:2px -1004px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;cursor:default;}.cke_skin_office2003 .cke_browser_ie .cke_button .cke_buttonarrow{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_office2003 .cke_browser_ie6 .cke_button .cke_buttonarrow{filter:;}.cke_skin_office2003 .cke_rtl .cke_button .cke_buttonarrow{background-position:0 -1004px;}.cke_skin_office2003 .cke_browser_gecko18 .cke_toolbar,.cke_skin_office2003 .cke_browser_gecko18 .cke_button a,.cke_skin_office2003 .cke_browser_gecko18 .cke_button a.cke_off,.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_icon,.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_buttonarrow,.cke_skin_office2003 .cke_browser_gecko18 .cke_separator,.cke_skin_office2003 .cke_browser_gecko18 .cke_toolbar_start,.cke_skin_office2003 .cke_browser_gecko18 .cke_toolbar_end{display:block;float:left;}.cke_skin_office2003 .cke_browser_gecko18 .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_toolbar,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button a,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button a.cke_off,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button .cke_icon,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button .cke_buttonarrow,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_separator,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_toolbar_start,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_toolbar_end{float:right;}.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_label,.cke_skin_office2003 .cke_browser_gecko18 .cke_break{float:left;}.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl span.cke_inline_label{float:right;}.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button .cke_label,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_break,.cke_skin_office2003 .cke_browser_ie8 .cke_rtl .cke_break,.cke_skin_office2003 .cke_browser_ie9plus .cke_rtl .cke_break{float:right;}.cke_skin_office2003 .cke_browser_gecko18 .cke_separator{margin-top:4px;}.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_label{padding-top:3px;}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolgroup,.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_separator,.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolbar_start,.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolbar_end{float:none;}.cke_skin_office2003 .cke_browser_ie8 .cke_toolbar,.cke_skin_office2003 .cke_browser_ie8 .cke_toolgroup{vertical-align:top;}
+.cke_skin_office2003 .cke_browser_iequirks.cke_browser_ie8 .cke_toolbar,.cke_skin_office2003 .cke_browser_iequirks.cke_browser_ie8 .cke_toolgroup{vertical-align:baseline;}.cke_skin_office2003 .cke_browser_iequirks .cke_separator{vertical-align:text-bottom;}.cke_skin_office2003 .cke_browser_ie .cke_rcombo,.cke_skin_office2003 .cke_browser_ie .cke_rcombo *{cursor:default;}.cke_skin_office2003 .cke_contextmenu{padding:2px;}.cke_skin_office2003 .cke_menuitem a{display:block;}.cke_skin_office2003 .cke_menuitem span{cursor:default;}.cke_skin_office2003 .cke_menuitem a:hover,.cke_skin_office2003 .cke_menuitem a:focus,.cke_skin_office2003 .cke_menuitem a:active{background-color:#8db1ff;display:block;}.cke_hc .cke_menuitem a:hover,.cke_hc .cke_menuitem a:focus,.cke_hc .cke_menuitem a:active{border:2px solid;}.cke_skin_office2003 .cke_menuitem .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;background-color:transparent;width:16px;height:16px;float:left;}.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_icon{background-image:url(icons_rtl.png);}.cke_browser_ie .cke_skin_office2003 .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_office2003 .cke_menuitem .cke_icon,.cke_browser_ie .cke_skin_office2003 .cke_menuitem.cke_noalphafix .cke_icon{filter:;}.cke_skin_office2003 .cke_menuitem .cke_disabled .cke_icon{filter:alpha(opacity=70);opacity:.70;}.cke_browser_ie .cke_skin_office2003 .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_office2003 .cke_menuitem .cke_disabled .cke_icon,.cke_browser_ie .cke_skin_office2003 .cke_menuitem.cke_noalphafix .cke_disabled .cke_icon{filter:;}.cke_skin_office2003 .cke_menuitem .cke_icon_wrapper{background-color:#f7f8fd;border:solid 4px #f7f8fd;width:16px;height:16px;float:left;filter:alpha(opacity=70);opacity:.70;clear:both;}.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_icon_wrapper{float:right;}.cke_skin_office2003 .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_office2003 .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_office2003 .cke_menuitem a:active .cke_icon_wrapper{background-color:#9d9d9d;border:solid 4px #9d9d9d;filter:alpha(opacity=70);opacity:.70;}.cke_skin_office2003 .cke_menuitem a:hover.cke_disabled .cke_icon_wrapper,.cke_skin_office2003 .cke_menuitem a:focus.cke_disabled .cke_icon_wrapper,.cke_skin_office2003 .cke_menuitem a:active.cke_disabled .cke_icon_wrapper{background-color:#f7f8fd;border:solid 4px #f7f8fd;}.cke_skin_office2003 .cke_menuitem .cke_label{display:block;padding-right:3px;padding-top:5px;padding-left:4px;height:19px;margin-left:24px;background-color:#fff;}.cke_skin_office2003 .cke_frameLoaded .cke_menuitem .cke_label{filter:alpha(opacity=70);opacity:.70;}.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_label{padding-right:0;margin-left:0;padding-left:3px;margin-right:28px;}.cke_skin_office2003 .cke_menuitem a.cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.30;}.cke_skin_office2003 .cke_menuitem a:hover .cke_label,.cke_skin_office2003 .cke_menuitem a:focus .cke_label,.cke_skin_office2003 .cke_menuitem a:active .cke_label{background-color:#8db1ff;}.cke_skin_office2003 .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_office2003 .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_office2003 .cke_menuitem a.cke_disabled:active .cke_label{background-color:transparent;}.cke_skin_office2003 .cke_menuseparator{background-color:#f7f8fd;height:2px;filter:alpha(opacity=70);opacity:.70;_font-size:0;}.cke_skin_office2003 .cke_menuarrow{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1071px;background-repeat:no-repeat;height:5px;width:3px;float:right;margin-right:2px;margin-top:3px;}
+.cke_rtl .cke_skin_office2003 .cke_menuarrow{float:left;margin-right:0;margin-left:2px;background-position:0 -1050px;}.cke_skin_office2003 .cke_menuarrow span{display:none;}.cke_hc .cke_skin_office2003 .cke_menuarrow{width:auto;margin-top:0;}.cke_hc .cke_skin_office2003 .cke_menuarrow span{display:inline;}.cke_browser_ie.cke_ltr .cke_skin_office2003 .cke_menuarrow{position:absolute;right:2px;}.cke_browser_ie.cke_rtl .cke_skin_office2003 .cke_menuarrow{position:absolute;left:2px;}.cke_skin_office2003 .cke_rcombo{display:inline-block;margin-left:2px;margin-right:2px;margin-top:2px;vertical-align:top;}.cke_skin_office2003 .cke_browser_ie .cke_rcombo{#display:inline;}.cke_skin_office2003 .cke_rcombopanel{border:1px solid #316ac5;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;border-top-left-radius:0;}.cke_skin_office2003 .cke_rcombo a{display:inline-block;float:left;filter:alpha(opacity=70);opacity:.70;}.cke_skin_office2003 .cke_rtl .cke_rcombo a{float:right;}.cke_skin_office2003 .cke_hc .cke_rcombo a{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_office2003 .cke_rcombo .cke_label{display:inline-block;float:left;cursor:default;line-height:24px;height:24px;vertical-align:top;padding-left:4px;padding-right:5px;filter:alpha(opacity=70);opacity:.70;_background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);_background-position:0 -962px;_background-repeat:repeat-x;}.cke_skin_office2003 .cke_rtl .cke_rcombo .cke_label{float:right;padding-right:4px;padding-left:5px;}.cke_skin_office2003 .cke_hc .cke_rcombo .cke_label{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_office2003 .cke_rcombo .cke_inline_label{color:#fff;}.cke_skin_office2003 .cke_rcombo .cke_text{border:1px solid #8f8f73;background-color:#fff;height:14px;width:60px;padding-top:4px;padding-bottom:4px;padding-left:5px;padding-right:5px;text-overflow:ellipsis;overflow:hidden;display:inline-block;vertical-align:top;cursor:default;}.cke_skin_office2003 .cke_ltr .cke_rcombo .cke_text{-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}.cke_skin_office2003 .cke_rtl .cke_rcombo .cke_text{-moz-border-radius-topright:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;}.cke_skin_office2003 .cke_browser_iequirks .cke_rcombo .cke_text{height:22px;}.cke_skin_office2003 .cke_rcombo .cke_openbutton{display:inline-block;border-top:1px solid #8f8f73;border-bottom:1px solid #8f8f73;}.cke_skin_office2003 .cke_rcombo .cke_openbutton .cke_icon{display:inline-block;background-position:5px -1002px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;width:14px;height:22px;}.cke_skin_office2003 .cke_browser_iequirks .cke_rcombo .cke_openbutton .cke_icon{height:20px;}.cke_skin_office2003 .cke_browser_ie .cke_rcombo .cke_openbutton .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_office2003 .cke_browser_ie6 .cke_rcombo .cke_openbutton .cke_icon{filter:;}.cke_skin_office2003 .cke_hc .cke_rcombo .cke_openbutton .cke_icon{background:none;filter:;}.cke_skin_office2003 .cke_ltr .cke_rcombo .cke_openbutton{border-right:1px solid #8f8f73;-moz-border-radius-topright:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;}.cke_skin_office2003 .cke_rtl .cke_rcombo .cke_openbutton{border-left:1px solid #8f8f73;-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}.cke_skin_office2003 .cke_rcombo .cke_off a:hover,.cke_skin_office2003 .cke_rcombo .cke_off a:focus,.cke_skin_office2003 .cke_rcombo .cke_off a:active,.cke_skin_office2003 .cke_rcombo .cke_on a{filter:alpha(opacity=100);opacity:1;}
+.cke_skin_office2003 .cke_rcombo .cke_off a:hover .cke_text,.cke_skin_office2003 .cke_rcombo .cke_off a:focus .cke_text,.cke_skin_office2003 .cke_rcombo .cke_off a:active .cke_text,.cke_skin_office2003 .cke_rcombo .cke_on .cke_text{border-color:#316ac5;}.cke_skin_office2003 .cke_rcombo .cke_off a:hover .cke_openbutton,.cke_skin_office2003 .cke_rcombo .cke_off a:focus .cke_openbutton,.cke_skin_office2003 .cke_rcombo .cke_off a:active .cke_openbutton,.cke_skin_office2003 .cke_rcombo .cke_on .cke_openbutton{border-color:#316ac5;background-color:#dff1ff;}.cke_skin_office2003 .cke_rcombo .cke_on .cke_text{-moz-border-radius-bottomleft:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;}.cke_skin_office2003 .cke_rcombo .cke_on .cke_openbutton{-moz-border-radius-bottomright:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.cke_skin_office2003 .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.3;}.cke_skin_office2003 .cke_hc .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=70);opacity:.7;}.cke_skin_office2003 .cke_rcombo .cke_disabled .cke_text,.cke_skin_office2003 .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);opacity:.5;}.cke_skin_office2003 .cke_browser_ie .cke_rcombo .cke_disabled .cke_openbutton{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=50);}.cke_skin_office2003 .cke_browser_ie6 .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);}.cke_skin_office2003 .cke_hc .cke_rcombo .cke_disabled .cke_text,.cke_skin_office2003 .cke_hc .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=80);opacity:.8;}.cke_skin_office2003 .cke_rcombo .cke_disabled .cke_text{color:#fff;}.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo,.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo .cke_label,.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo .cke_text,.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo .cke_openbutton,.cke_skin_office2003 .cke_browser_webkit .cke_rcombo .cke_label,.cke_skin_office2003 .cke_browser_webkit .cke_rcombo .cke_text,.cke_skin_office2003 .cke_browser_webkit .cke_rcombo .cke_openbutton{display:block;float:left;}.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_label,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_text,.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_openbutton,.cke_skin_office2003 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_label,.cke_skin_office2003 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_text,.cke_skin_office2003 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_openbutton{float:right;}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_rcombo,.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_rcombo a,.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_rcombo .cke_label{float:none;}.cke_skin_office2003 .cke_rtl .cke_rcombo .cke_font .cke_text,.cke_skin_office2003 .cke_rtl .cke_rcombo .cke_fontSize .cke_text{direction:ltr;}@media print{.cke_path{display:none;}}.cke_skin_office2003 .cke_path{padding:3px 3px 0 3px;display:inline-block;float:left;}.cke_skin_office2003 .cke_rtl .cke_path{float:right;}.cke_skin_office2003 .cke_path a,.cke_skin_office2003 .cke_path .cke_empty{display:inline-block;float:left;border:solid 1px #f7f8fd;background-color:#f7f8fd;padding-top:1px;padding-bottom:1px;padding-left:4px;padding-right:4px;margin-bottom:3px;cursor:default;}.cke_skin_office2003 .cke_path .cke_empty{visibility:hidden;}.cke_skin_office2003 .cke_rtl .cke_path a,.cke_skin_office2003 .cke_rtl .cke_path cke_empty{float:right;}.cke_skin_office2003 .cke_path a:hover,.cke_skin_office2003 .cke_path a:focus,.cke_skin_office2003 .cke_path a:active{border:solid 1px #316ac5;background-color:#dff1ff;padding-top:1px;padding-bottom:1px;padding-left:4px;padding-right:4px;outline:none;}.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_path a,.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_path .cke_empty{float:none;}.cke_skin_office2003 .cke_path .cke_label{display:none;}
+.cke_skin_office2003 .cke_button_source .cke_icon{background-position:0 0;}.cke_skin_office2003 .cke_button_docProps .cke_icon{background-position:0 -16px;}.cke_skin_office2003 .cke_button_newpage .cke_icon{background-position:0 -48px;}.cke_skin_office2003 .cke_button_preview .cke_icon{background-position:0 -64px;}.cke_skin_office2003 .cke_button_cut .cke_icon{background-position:0 -96px;}.cke_skin_office2003 .cke_button_copy .cke_icon{background-position:0 -112px;}.cke_skin_office2003 .cke_button_paste .cke_icon{background-position:0 -128px;}.cke_skin_office2003 .cke_button_pastetext .cke_icon{background-position:0 -144px;}.cke_skin_office2003 .cke_button_find .cke_icon{background-position:0 -240px;}.cke_skin_office2003 .cke_button_replace .cke_icon{background-position:0 -256px;}.cke_skin_office2003 .cke_button_selectAll .cke_icon{background-position:0 -272px;}.cke_skin_office2003 .cke_button_removeFormat .cke_icon{background-position:0 -288px;}.cke_skin_office2003 .cke_button_bold .cke_icon{background-position:0 -304px;}.cke_skin_office2003 .cke_button_italic .cke_icon{background-position:0 -320px;}.cke_skin_office2003 .cke_button_underline .cke_icon{background-position:0 -336px;}.cke_skin_office2003 .cke_button_strike .cke_icon{background-position:0 -352px;}.cke_skin_office2003 .cke_button_subscript .cke_icon{background-position:0 -368px;}.cke_skin_office2003 .cke_button_superscript .cke_icon{background-position:0 -384px;}.cke_skin_office2003 .cke_button_table .cke_icon{background-position:0 -608px;}.cke_skin_office2003 .cke_button_horizontalrule .cke_icon{background-position:0 -624px;}.cke_skin_office2003 .cke_button_smiley .cke_icon{background-position:0 -640px;}.cke_skin_office2003 .cke_button_link .cke_icon{background-position:0 -528px;}.cke_skin_office2003 .cke_button_unlink .cke_icon{background-position:0 -544px;}.cke_skin_office2003 .cke_button_anchor .cke_icon{background-position:0 -560px;}.cke_skin_office2003 .cke_button_image .cke_icon{background-position:0 -576px;}.cke_skin_office2003 .cke_button_flash .cke_icon{background-position:0 -592px;}.cke_skin_office2003 .cke_button_specialchar .cke_icon{background-position:0 -656px;}.cke_skin_office2003 .cke_button_pagebreak .cke_icon{background-position:0 -672px;}.cke_skin_office2003 .cke_button_print .cke_icon{background-position:0 -176px;}.cke_skin_office2003 .cke_button_checkspell .cke_icon,.cke_skin_office2003 .cke_button_scayt .cke_icon{background-position:0 -192px;}.cke_skin_office2003 .cke_button_pagebreak .cke_icon{background-position:0 -672px;}.cke_skin_office2003 .cke_button_textcolor .cke_icon{background-position:0 -704px;}.cke_skin_office2003 .cke_button_bgcolor .cke_icon{background-position:0 -720px;}.cke_skin_office2003 .cke_button_form .cke_icon{background-position:0 -752px;}.cke_skin_office2003 .cke_button_checkbox .cke_icon{background-position:0 -768px;}.cke_skin_office2003 .cke_button_radio .cke_icon{background-position:0 -784px;}.cke_skin_office2003 .cke_button_textfield .cke_icon{background-position:0 -800px;}.cke_skin_office2003 .cke_button_textarea .cke_icon{background-position:0 -816px;}.cke_skin_office2003 .cke_button_showblocks .cke_icon{background-position:0 -1136px;}.cke_skin_office2003 .cke_button_select .cke_icon{background-position:0 -832px;}.cke_skin_office2003 .cke_button_button .cke_icon{background-position:0 -848px;}.cke_skin_office2003 .cke_button_imagebutton .cke_icon{background-position:0 -864px;}.cke_skin_office2003 .cke_button_hiddenfield .cke_icon{background-position:0 -880px;}.cke_skin_office2003 .cke_button_undo .cke_icon{background-position:0 -208px;}.cke_skin_office2003 .cke_rtl .cke_button_undo .cke_icon{background-position:0 -224px;}.cke_skin_office2003 .cke_button_redo .cke_icon{background-position:0 -224px;}.cke_skin_office2003 .cke_rtl .cke_button_redo .cke_icon{background-position:0 -208px;}.cke_skin_office2003 .cke_button_templates .cke_icon{background-position:0 -80px;}.cke_skin_office2003 .cke_button_numberedlist .cke_icon{background-position:0 -400px;}.cke_skin_office2003 .cke_button_bulletedlist .cke_icon{background-position:0 -416px;}
+.cke_skin_office2003 .cke_mixed_dir_content .cke_button_numberedlist .cke_icon{background-position:0 -1217px;}.cke_skin_office2003 .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon{background-position:0 -1233px;}.cke_skin_office2003 .cke_button_outdent .cke_icon{background-position:0 -432px;}.cke_skin_office2003 .cke_button_indent .cke_icon{background-position:0 -448px;}.cke_skin_office2003 .cke_mixed_dir_content .cke_button_indent .cke_icon{background-position:0 -1265px;}.cke_skin_office2003 .cke_mixed_dir_content .cke_button_outdent .cke_icon{background-position:0 -1249px;}.cke_skin_office2003 .cke_button_justifyleft .cke_icon{background-position:0 -464px;}.cke_skin_office2003 .cke_button_justifycenter .cke_icon{background-position:0 -480px;}.cke_skin_office2003 .cke_button_justifyright .cke_icon{background-position:0 -496px;}.cke_skin_office2003 .cke_button_justifyblock .cke_icon{background-position:0 -512px;}.cke_skin_office2003 .cke_button_blockquote .cke_icon{background-position:0 -1152px;}.cke_skin_office2003 .cke_button_flash .cke_icon{background-position:0 -592px;}.cke_skin_office2003 .cke_button_pastefromword .cke_icon{background-position:0 -160px;}.cke_skin_office2003 .cke_button_save .cke_icon{background-position:0 -32px;}.cke_skin_office2003 .cke_button_about .cke_icon{background-position:0 -736px;}.cke_skin_office2003 .cke_button_maximize .cke_icon{background-position:0 -1040px;}.cke_skin_office2003 .cke_button_creatediv .cke_icon{background-position:0 -1168px;}.cke_skin_office2003 .cke_button_editdiv .cke_icon{background-position:0 -1184px;}.cke_skin_office2003 .cke_button_removediv .cke_icon{background-position:0 -1200px;}.cke_skin_office2003 .cke_button_bidirtl .cke_icon{background-position:0 -1072px;}.cke_skin_office2003 .cke_button_bidiltr .cke_icon{background-position:0 -1056px;}.cke_skin_office2003 .cke_button_iframe .cke_icon{background-position:0 -1279px;}.cke_skin_office2003 .cke_button_source .cke_label{display:inline;}.cke_skin_office2003 .cke_styles_panel{width:150px;height:170px;}.cke_skin_office2003 .cke_format_panel{width:150px;height:170px;}.cke_skin_office2003 .cke_font_panel{width:150px;height:170px;}.cke_skin_office2003 .cke_fontSize_panel{height:170px;}.cke_skin_office2003 .cke_fontSize .cke_text{width:20px;}.cke_skin_office2003 .cke_browser_iequirks .cke_fontSize .cke_text{width:32px;}html .cke_skin_office2003{visibility:inherit;}html.cke_skin_office2003_container{visibility:visible;}
diff --git a/web/imcms/ckeditor/skins/office2003/icons.png b/web/imcms/ckeditor/skins/office2003/icons.png
new file mode 100644
index 0000000000..7c3bf195dd
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/icons.png differ
diff --git a/web/imcms/ckeditor/skins/office2003/icons_rtl.png b/web/imcms/ckeditor/skins/office2003/icons_rtl.png
new file mode 100644
index 0000000000..83eee28ac7
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/icons_rtl.png differ
diff --git a/web/imcms/ckeditor/skins/office2003/images/dialog_sides.gif b/web/imcms/ckeditor/skins/office2003/images/dialog_sides.gif
new file mode 100644
index 0000000000..5840d01738
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/images/dialog_sides.gif differ
diff --git a/web/imcms/ckeditor/skins/office2003/images/dialog_sides.png b/web/imcms/ckeditor/skins/office2003/images/dialog_sides.png
new file mode 100644
index 0000000000..7da9821879
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/images/dialog_sides.png differ
diff --git a/web/imcms/ckeditor/skins/office2003/images/dialog_sides_rtl.png b/web/imcms/ckeditor/skins/office2003/images/dialog_sides_rtl.png
new file mode 100644
index 0000000000..24fe13aedb
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/images/dialog_sides_rtl.png differ
diff --git a/web/imcms/ckeditor/skins/office2003/images/mini.gif b/web/imcms/ckeditor/skins/office2003/images/mini.gif
new file mode 100644
index 0000000000..54d9107416
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/images/mini.gif differ
diff --git a/web/imcms/ckeditor/skins/office2003/images/noimage.png b/web/imcms/ckeditor/skins/office2003/images/noimage.png
new file mode 100644
index 0000000000..159811305a
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/images/noimage.png differ
diff --git a/web/imcms/ckeditor/skins/office2003/images/sprites.png b/web/imcms/ckeditor/skins/office2003/images/sprites.png
new file mode 100644
index 0000000000..a6d3a727b7
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/images/sprites.png differ
diff --git a/web/imcms/ckeditor/skins/office2003/images/sprites_ie6.png b/web/imcms/ckeditor/skins/office2003/images/sprites_ie6.png
new file mode 100644
index 0000000000..94073b2a45
Binary files /dev/null and b/web/imcms/ckeditor/skins/office2003/images/sprites_ie6.png differ
diff --git a/web/imcms/ckeditor/skins/office2003/skin.js b/web/imcms/ckeditor/skins/office2003/skin.js
new file mode 100644
index 0000000000..312be1c1bb
--- /dev/null
+++ b/web/imcms/ckeditor/skins/office2003/skin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.skins.add('office2003',(function(){return{editor:{css:['editor.css']},dialog:{css:['dialog.css']},separator:{canGroup:false},templates:{css:['templates.css']},margins:[0,14,18,14]};})());(function(){CKEDITOR.dialog?a():CKEDITOR.on('dialogPluginReady',a);function a(){CKEDITOR.dialog.on('resize',function(b){var c=b.data,d=c.width,e=c.height,f=c.dialog,g=f.parts.contents;if(c.skin!='office2003')return;g.setStyles({width:d+'px',height:e+'px'});if(!CKEDITOR.env.ie||CKEDITOR.env.ie9Compat)return;var h=function(){var i=f.parts.dialog.getChild([0,0,0]),j=i.getChild(0),k=j.getSize('width');e+=j.getChild(0).getSize('height')+1;var l=i.getChild(2);l.setSize('width',k);l=i.getChild(7);l.setSize('width',k-28);l=i.getChild(4);l.setSize('height',e);l=i.getChild(5);l.setSize('height',e);};setTimeout(h,100);if(b.editor.lang.dir=='rtl')setTimeout(h,1000);});};})();
diff --git a/web/imcms/ckeditor/skins/office2003/templates.css b/web/imcms/ckeditor/skins/office2003/templates.css
new file mode 100644
index 0000000000..5cf85c896b
--- /dev/null
+++ b/web/imcms/ckeditor/skins/office2003/templates.css
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_office2003 .cke_tpl_list{border:#dcdcdc 2px solid;background-color:#fff;overflow:auto;width:100%;height:220px;}.cke_skin_office2003 .cke_tpl_item{margin:5px;padding:7px;border:#eee 1px solid;*width:88%;}.cke_skin_office2003 .cke_tpl_preview{border-collapse:separate;text-indent:0;width:100%;}.cke_skin_office2003 .cke_tpl_preview td{padding:2px;vertical-align:middle;}.cke_skin_office2003 .cke_tpl_preview .cke_tpl_preview_img{width:100px;}.cke_skin_office2003 .cke_tpl_preview span{white-space:normal;}.cke_skin_office2003 .cke_tpl_title{font-weight:bold;}.cke_skin_office2003 .cke_tpl_list a:active .cke_tpl_item,.cke_skin_office2003 .cke_tpl_list a:hover .cke_tpl_item,.cke_skin_office2003 .cke_tpl_list a:focus .cke_tpl_item{border:#f93 1px solid!important;background-color:#fffacd!important;}.cke_skin_office2003 .cke_tpl_list a:active *,.cke_skin_office2003 .cke_tpl_list a:hover *,.cke_skin_office2003 .cke_tpl_list a:focus *{cursor:pointer;}.cke_skin_office2003 .cke_browser_ie6 .cke_tpl_list a:active,.cke_skin_office2003 .cke_browser_ie6 .cke_tpl_list a:hover,.cke_skin_office2003 .cke_browser_ie6 .cke_tpl_list a:focus{background-position:0 0;}.cke_skin_office2003 .cke_tpl_list a:active .cke_tpl_item,.cke_skin_office2003 .cke_tpl_list a:hover .cke_tpl_item,.cke_skin_office2003 .cke_tpl_list a:focus .cke_tpl_item{border-width:3px;}.cke_skin_office2003 .cke_tpl_empty,.cke_tpl_loading{text-align:center;padding:5px;}
diff --git a/web/imcms/ckeditor/skins/v2/dialog.css b/web/imcms/ckeditor/skins/v2/dialog.css
new file mode 100644
index 0000000000..dddaed06c8
--- /dev/null
+++ b/web/imcms/ckeditor/skins/v2/dialog.css
@@ -0,0 +1,9 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+body .cke_dialog{visibility:visible;}.cke_skin_v2 table.cke_dialog.cke_browser_gecko{display:block;}.cke_skin_v2 .cke_dialog_body{margin-left:16px;margin-right:16px;margin-top:2px;margin-bottom:20px;z-index:1;_position:static;}.cke_skin_v2 .cke_dialog_tl,.cke_skin_v2 .cke_dialog_tr,.cke_skin_v2 .cke_dialog_tc,.cke_skin_v2 .cke_dialog_bl,.cke_skin_v2 .cke_dialog_br,.cke_skin_v2 .cke_dialog_bc{background-image:url(images/sprites.png);background-repeat:no-repeat;position:absolute;_background-image:url(images/sprites_ie6.png);z-index:-1;}.cke_skin_v2 .cke_dialog_tl{background-position:-16px -16px;height:16px;width:16px;top:0;left:0;}.cke_skin_v2 .cke_rtl .cke_dialog_tl{background-position:-16px -397px;}.cke_skin_v2 .cke_dialog_tr{background-position:-16px -76px;height:16px;width:16px;top:0;right:0;}.cke_skin_v2 .cke_rtl .cke_dialog_tr{background-position:-16px -457px;}.cke_skin_v2 .cke_dialog_tc{background-position:0 -136px;background-repeat:repeat-x;height:16px;top:0;left:16px;right:16px;}.cke_skin_v2 .cke_dialog_bl{background-position:-16px -196px;height:51px;width:30px;bottom:0;left:0;}.cke_skin_v2 .cke_rtl .cke_dialog_bl{background-position:-16px -517px;}.cke_skin_v2 .cke_dialog_br{background-position:-16px -263px;height:51px;width:30px;bottom:0;right:0;}.cke_skin_v2 .cke_rtl .cke_dialog_br{background-position:-16px -584px;}.cke_skin_v2 .cke_dialog_bc{background-position:0 -330px;background-repeat:repeat-x;height:51px;bottom:0;left:30px;right:30px;}.cke_skin_v2 .cke_dialog_ml,.cke_skin_v2 .cke_dialog_mr{background-image:url(images/dialog_sides.png);background-repeat:repeat-y;position:absolute;width:16px;top:16px;bottom:51px;_background-image:url(images/dialog_sides.gif);_top:auto;}.cke_skin_v2 .cke_rtl .cke_dialog_ml,.cke_skin_v2 .cke_rtl .cke_dialog_mr{background-image:url(images/dialog_sides_rtl.png);_background-image:url(images/dialog_sides.gif);}.cke_skin_v2 .cke_dialog_ml{background-position:0 0;left:0;}.cke_skin_v2 .cke_dialog_mr{background-position:-16px 0;right:0;}.cke_skin_v2 .cke_browser_iequirks .cke_dialog_ml,.cke_skin_v2 .cke_browser_iequirks .cke_dialog_mr{margin-top:3px;}.cke_skin_v2 .cke_dialog_title{font-weight:bold;font-size:14pt;color:#737357;background-color:#e3e3c7;padding:3px 10px 26px 10px;cursor:move;position:relative;}.cke_skin_v2 .cke_browser_ie.cke_rtl .cke_dialog_title{position:static;}.cke_skin_v2 .cke_dialog_contents{background-color:#f1f1e3;border:#d5d59d 1px solid;overflow:auto;padding:5px 10px;}.cke_skin_v2 .cke_dialog_footer{background-color:#e3e3c7;text-align:right;}.cke_skin_v2 .cke_rtl .cke_dialog_footer{text-align:left;}.cke_skin_v2 .cke_dialog_footer .cke_resizer{margin-top:21px;}.cke_skin_v2 .cke_dialog_tabs{height:23px;background-color:#e3e3c7;display:inline-block;margin-left:10px;margin-right:10px;margin-top:-23px;position:absolute;z-index:2;}.cke_skin_v2 .cke_rtl .cke_dialog_tabs{right:10px;}.cke_skin_v2 a.cke_dialog_tab,.cke_skin_v2 a:link.cke_dialog_tab,.cke_skin_v2 a:active.cke_dialog_tab,.cke_skin_v2 a:hover.cke_dialog_tab,.cke_skin_v2 a:visited.cke_dialog_tab{color:#737357;border-left:1px solid #d5d59d;border-right:1px solid #d5d59d;border-top:1px solid #d5d59d;height:14px;padding:4px 5px;display:inline-block;cursor:pointer;}.cke_skin_v2 .cke_browser_gecko18 a.cke_dialog_tab,.cke_skin_v2 .cke_browser_gecko18 a:link.cke_dialog_tab,.cke_skin_v2 .cke_browser_gecko18 a:active.cke_dialog_tab,.cke_skin_v2 .cke_browser_gecko18 a:hover.cke_dialog_tab,.cke_skin_v2 .cke_browser_gecko18 a:visited.cke_dialog_tab{display:inline;position:relative;top:6px;}.cke_skin_v2 a:hover.cke_dialog_tab{background-color:#f1f1e3;}.cke_skin_v2 .cke_hc a:hover.cke_dialog_tab{padding:2px 3px!important;border-width:3px;}.cke_skin_v2 a.cke_dialog_tab_selected,.cke_skin_v2 a:link.cke_dialog_tab_selected,.cke_skin_v2 a:active.cke_dialog_tab_selected,.cke_skin_v2 a:hover.cke_dialog_tab_selected,.cke_skin_v2 a:visited.cke_dialog_tab_selected{border-bottom:1px solid #f1f1e3;background-color:#f1f1e3;font-weight:bold;cursor:default;}.cke_skin_v2 .cke_hc a.cke_dialog_tab_selected,.cke_skin_v2 .cke_hc a:link.cke_dialog_tab_selected,.cke_skin_v2 .cke_hc a:active.cke_dialog_tab_selected,.cke_skin_v2 .cke_hc a:hover.cke_dialog_tab_selected,.cke_skin_v2 .cke_hc a:visited.cke_dialog_tab_selected{padding:2px 3px!important;border-width:3px;}
+.cke_skin_v2 .cke_hc .cke_dialog_tabs a,.cke_skin_v2 .cke_hc .cke_dialog_footer a{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}.cke_skin_v2 .cke_single_page .cke_dialog_tabs{display:none;}.cke_skin_v2 .cke_single_page .cke_dialog_title{padding-bottom:3px;}.cke_skin_v2 .cke_dialog_ui_vbox table,.cke_skin_v2 .cke_dialog_ui_hbox table{margin:auto;}.cke_skin_v2 .cke_dialog_ui_vbox_child{padding:5px 0;}.cke_skin_v2 input.cke_dialog_ui_input_text,.cke_skin_v2 input.cke_dialog_ui_input_password{background-color:white;border:none;padding:0;width:100%;height:14px;}.cke_skin_v2 .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_password{border-width:0;}.cke_skin_v2 .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_password{border-width:1px;}.cke_skin_v2 .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_password,.cke_skin_v2 .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px;}.cke_skin_v2 .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_password,.cke_skin_v2 .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px;}.cke_skin_v2 .cke_browser_ie.cke_rtl .cke_dialog_ui_vbox_child,.cke_skin_v2 .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_child,.cke_skin_v2 .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_v2 .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important;}.cke_skin_v2 div.cke_dialog_ui_input_text,.cke_skin_v2 div.cke_dialog_ui_input_password{background-color:white;border:1px solid #a0a0a0;padding:1px 0;_width:99.9%;}.cke_skin_v2 .cke_browser_ie7 input.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_ie7 input.cke_dialog_ui_input_password{position:absolute;}.cke_skin_v2 .cke_browser_ie7 div.cke_dialog_ui_input_text,.cke_skin_v2 .cke_browser_ie7 div.cke_dialog_ui_input_password{height:14px;position:relative;}.cke_skin_v2 .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px;}.cke_skin_v2 textarea.cke_dialog_ui_input_textarea{background-color:white;border:none;padding:0;width:100%;_width:99%;overflow:auto;resize:none;}.cke_skin_v2 div.cke_dialog_ui_input_textarea{background-color:white;border:1px solid #a0a0a0;padding:1px 0;}.cke_skin_v2 .cke_rtl .cke_dialog_ui_labeled_content{_width:95%;}.cke_skin_v2 div.cke_disabled .cke_dialog_ui_labeled_content *{background-color:#a0a0a0;cursor:default;}.cke_skin_v2 .cke_dialog_ui_hbox{width:100%;}.cke_skin_v2 .cke_dialog_ui_hbox_first,.cke_skin_v2 .cke_dialog_ui_hbox_child,.cke_skin_v2 .cke_dialog_ui_hbox_last{vertical-align:top;}.cke_skin_v2 .cke_ltr .cke_dialog_ui_hbox_first,.cke_skin_v2 .cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px;}.cke_skin_v2 .cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_v2 .cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px;}.cke_skin_v2 a.cke_dialog_ui_button{border-collapse:separate;cursor:default;}.cke_skin_v2 a.cke_dialog_ui_button_ok span,.cke_skin_v2 a.cke_dialog_ui_button_cancel span{width:60px;}.cke_skin_v2 span.cke_dialog_ui_button{border:#737357 1px solid;padding:2px 10px;text-align:center;color:#3b3b1f;background-color:#c7c78f;display:inline-block;cursor:default;}.cke_skin_v2 .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button{display:block;}.cke_skin_v2 a.cke_dialog_ui_button span.cke_disabled{border:#898980 1px solid;color:#5e5e55;background-color:#c5c5b3;}.cke_skin_v2 a:focus span.cke_dialog_ui_button,.cke_skin_v2 a:active span.cke_dialog_ui_button{background-color:#e3e3c7;}.cke_skin_v2 .cke_hc a:focus span.cke_dialog_ui_button,.cke_skin_v2 .cke_hc a:active span.cke_dialog_ui_button{border-width:2px;}.cke_skin_v2 .cke_dialog_footer_buttons{display:inline-table;margin-right:12px;margin-left:12px;width:auto;position:relative;}
+.cke_skin_v2 .cke_browser_gecko18 .cke_dialog_footer_buttons{display:inline;}.cke_skin_v2 .cke_dialog_footer_buttons span.cke_dialog_ui_button{margin:7px 0;}.cke_skin_v2 .cke_browser_ie7 .cke_dialog_footer_buttons{position:static;}.cke_skin_v2 strong{font-weight:bold;}.cke_skin_v2 a.cke_dialog_close_button,.cke_skin_v2 a:hover.cke_dialog_close_button,.cke_skin_v2 .cke_browser_ie6 a.cke_dialog_close_button,.cke_skin_v2 .cke_browser_ie6 a:hover.cke_dialog_close_button{background-image:url(images/sprites.png);background-repeat:no-repeat;background-position:-16px -651px;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;_background-image:url(images/sprites_ie6.png);}.cke_skin_v2 a.cke_dialog_close_button span{display:none;}.cke_skin_v2 a:hover.cke_dialog_close_button{background-position:-16px -687px;}.cke_skin_v2 .cke_ltr a.cke_dialog_close_button,.cke_skin_v2 .cke_ltr a:hover.cke_dialog_close_button{right:22px;}.cke_skin_v2 .cke_rtl a.cke_dialog_close_button,.cke_skin_v2 .cke_rtl a:hover.cke_dialog_close_button{left:16px;_top:7px;}.cke_skin_v2 .cke_browser_ie6.cke_rtl a.cke_dialog_close_button,.cke_skin_v2 .cke_browser_ie6.cke_rtl a:hover.cke_dialog_close_button{position:relative;float:left;margin-top:-55px;margin-left:-7px;}.cke_skin_v2 .cke_browser_iequirks.cke_rtl.cke_single_page a.cke_dialog_close_button,.cke_skin_v2 .cke_browser_iequirks.cke_rtl.cke_single_page a:hover.cke_dialog_close_button{margin-top:-32px;}.cke_skin_v2 .cke_browser_iequirks.cke_ltr a.cke_dialog_close_button,.cke_skin_v2 .cke_browser_iequirks.cke_ltr a:hover.cke_dialog_close_button{margin-top:0;}.cke_skin_v2 .cke_dialog_ui_input_select{border:1px solid #a0a0a0;background-color:white;}.cke_skin_v2 .cke_dialog_ui_input_file{width:100%;height:25px;}.cke_skin_v2 .cke_dialog .cke_dark_background{background-color:#eaead1;}.cke_skin_v2 .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_v2 .cke_dialog .cke_centered{text-align:center;}.cke_skin_v2 .cke_dialog a.cke_btn_reset{float:right;background-position:0 -32px;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px;}.cke_skin_v2 .cke_rtl .cke_dialog a.cke_btn_reset{float:left;}.cke_skin_v2 .cke_dialog a.cke_btn_locked,.cke_skin_v2 .cke_dialog a.cke_btn_unlocked{float:left;background-position:0 0;background-image:url(images/mini.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px;}.cke_skin_v2 .cke_dialog a.cke_btn_locked .cke_icon{display:none;}.cke_skin_v2 .cke_rtl .cke_dialog a.cke_btn_locked,.cke_skin_v2 .cke_rtl .cke_dialog a.cke_btn_unlocked{float:right;}.cke_skin_v2 .cke_dialog a.cke_btn_unlocked{background-position:0 -16px;background-image:url(images/mini.gif);}.cke_skin_v2 .cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer;}.cke_skin_v2 .cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:210px;width:230px;padding:2px;background-color:white;}.cke_skin_v2 .cke_dialog .ImagePreviewBox table td{white-space:normal;}.cke_skin_v2 .cke_browser_iequirks .cke_dialog_page_contents{_position:absolute;}.cke_skin_v2 .cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity=90);background-color:#e4e4e4;}.cke_skin_v2 .cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white;}.cke_skin_v2 .cke_dialog .cke_pastetext{width:346px;height:170px;}.cke_skin_v2 .cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none;}.cke_skin_v2 .cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid black;}.cke_skin_v2 .cke_dialog .cke_dark_background{text-align:center;background-color:#eaead1;font-size:14px;}.cke_skin_v2 .cke_dialog .cke_light_background{text-align:center;background-color:#ffffbe;}.cke_skin_v2 .cke_dialog .cke_hand{cursor:pointer;}.cke_skin_v2 .cke_disabled{color:#a0a0a0;}.cke_skin_v2 .cke_hc .cke_dialog_title,.cke_skin_v2 .cke_hc .cke_dialog_tabs,.cke_skin_v2 .cke_hc .cke_dialog_contents,.cke_skin_v2 .cke_hc .cke_dialog_footer{border-left:1px solid;border-right:1px solid;}
+.cke_skin_v2 .cke_hc .cke_dialog_title{border-top:1px solid;}.cke_skin_v2 .cke_hc .cke_dialog_footer{border-bottom:1px solid;}.cke_skin_v2 .cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px;}.cke_skin_v2 .cke_dialog_body .cke_label{display:none;}.cke_skin_v2 .cke_dialog_body label.cke_required{font-weight:bold;}.cke_skin_v2 .cke_hc .cke_dialog_body .cke_label{display:inline;cursor:inherit;}.cke_skin_v2 .cke_hc a.cke_btn_locked,.cke_skin_v2 .cke_hc a.cke_btn_unlocked,.cke_skin_v2 .cke_hc a.cke_btn_reset{border-style:solid;float:left;width:auto;height:auto;padding:0 2px;}.cke_skin_v2 .cke_hc a.cke_btn_locked .cke_icon{display:inline;}.cke_skin_v2 .cke_rtl.cke_hc a.cke_btn_locked,.cke_skin_v2 .cke_rtl.cke_hc a.cke_btn_unlocked,.cke_skin_v2 .cke_rtl.cke_hc a.cke_btn_reset{float:right;}.cke_skin_v2 a.cke_smile img{border:2px solid #eaead1;}.cke_skin_v2 a.cke_smile:focus img,.cke_skin_v2 a.cke_smile:active img,.cke_skin_v2 a.cke_smile:hover img{border-color:#C7C78F;}.cke_skin_v2 .cke_dialog_contents a.colorChooser{display:block;margin-top:12px;margin-left:10px;width:40px;}.cke_skin_v2 .cke_dialog_contents a.colorChooser .cke_dialog_ui_button{width:100%;}.cke_skin_v2 .cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px;}.cke_skin_v2 .cke_browser_gecko .cke_dialog_ui_checkbox_input:focus,.cke_skin_v2 .cke_browser_gecko .cke_dialog_ui_radio_input:focus,.cke_skin_v2 .cke_browser_opera .cke_dialog_ui_checkbox_input:focus,.cke_skin_v2 .cke_browser_opera .cke_dialog_ui_radio_input:focus,.cke_skin_v2 .cke_browser_gecko .cke_dialog_ui_input_select:focus,.cke_skin_v2 .cke_browser_gecko .cke_btn_over,.cke_skin_v2 .cke_browser_opera .cke_btn_over,.cke_skin_v2 .cke_browser_ie .cke_btn_over{outline:1px dotted #696969;}.cke_skin_v2 .cke_browser_ie .cke_dialog_ui_checkbox_input,.cke_skin_v2 .cke_browser_ie .cke_dialog_ui_ratio_input,.cke_skin_v2 .cke_browser_ie .cke_btn_reset,.cke_skin_v2 .cke_browser_ie .cke_btn_locked,.cke_skin_v2 .cke_browser_ie .cke_btn_unlocked{*border:1px solid transparent!important;-border:1px solid red!important;-filter:chroma(color=red);}.cke_skin_v2 .cke_browser_ie .cke_dialog_ui_focused,.cke_skin_v2 .cke_browser_ie .cke_btn_over{*border:1px dotted #696969!important;}.cke_skin_v2 .cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity=0);width:100%;height:100%;}.cke_dialog label{display:inline;margin-bottom:auto;cursor:default;}
diff --git a/web/imcms/ckeditor/skins/v2/editor.css b/web/imcms/ckeditor/skins/v2/editor.css
new file mode 100644
index 0000000000..cf2dcb82a7
--- /dev/null
+++ b/web/imcms/ckeditor/skins/v2/editor.css
@@ -0,0 +1,13 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_v2 *,.cke_skin_v2 a:hover,.cke_skin_v2 a:link,.cke_skin_v2 a:visited,.cke_skin_v2 a:active{margin:0;padding:0;border:0;background:transparent;text-decoration:none;font:normal normal normal 100% Sans-Serif;width:auto;height:auto;border-collapse:collapse;text-align:left;vertical-align:baseline;white-space:nowrap;cursor:auto;color:#000;float:none;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_skin_v2 .cke_rtl *,.cke_skin_v2 .cke_rtl a:hover,.cke_skin_v2 .cke_rtl a:link,.cke_skin_v2 .cke_rtl a:visited,.cke_skin_v2 .cke_rtl a:active,.cke_rtl .cke_skin_v2 *,.cke_rtl .cke_skin_v2 a:hover,.cke_rtl .cke_skin_v2 a:link,.cke_rtl .cke_skin_v2 a:visited,.cke_rtl .cke_skin_v2 a:active{text-align:right;}.cke_skin_v2 iframe{vertical-align:inherit;}.cke_skin_v2 textarea{white-space:pre;}.cke_skin_v2 .cke_browser_gecko textarea{cursor:text;}.cke_skin_v2 .cke_browser_gecko textarea[disabled]{cursor:default;}.cke_skin_v2 input[type="text"],.cke_skin_v2 input[type="password"]{cursor:text;}.cke_skin_v2 input[type="text"][disabled],.cke_skin_v2 input[type="password"][disabled]{cursor:default;}.cke_skin_v2 fieldset{padding:10px;border:2px groove #E0DFE3;}.cke_skin_v2 .cke_editor{display:inline-table;width:100%;}.cke_skin_v2 .cke_browser_webkit .cke_editor{display:table;}.cke_skin_v2{display:block;}.cke_skin_v2 span.cke_browser_webkit,.cke_skin_v2 span.cke_browser_gecko18{display:block;}.cke_skin_v2 .cke_wrapper{display:block;}.cke_skin_v2 .cke_browser_opera .cke_editor{display:table;}.cke_skin_v2 .cke_top,.cke_skin_v2 .cke_bottom,.cke_shared .cke_skin_v2{background-color:#efefde;}.cke_skin_v2 .cke_top{border-top:solid 1px #fafaf5;border-left:solid 1px #fafaf5;border-right:solid 1px #696969;border-bottom:solid 2px #696969;}.cke_skin_v2 .cke_rtl .cke_top{border-left:solid 1px #696969;border-right:solid 1px #fafaf5;}.cke_skin_v2 .cke_bottom{border-left:solid 1px #696969;border-right:solid 1px #696969;border-bottom:solid 1px #696969;}.cke_skin_v2 .cke_contents{border:solid 1px #696969;background-color:white;}.cke_skin_v2 .cke_focus{outline:auto 5px -webkit-focus-ring-color;}.cke_skin_v2 textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre;}.cke_skin_v2 .cke_browser_iequirks textarea.cke_source{_white-space:normal;}.cke_skin_v2 .cke_resizer{width:12px;height:12px;margin-top:16px;display:block;float:right;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -801px;background-repeat:no-repeat;cursor:se-resize;}.cke_skin_v2 .cke_browser_air .cke_resizer,.cke_skin_v2 .cke_browser_air .cke_rtl .cke_resizer{cursor:move;}.cke_skin_v2 .cke_resizer_rtl{cursor:sw-resize;background-position:0 -828px;float:left;}.cke_skin_v2 .cke_resizer_horizontal,.cke_skin_v2 .cke_rtl .cke_resizer_horizontal{cursor:e-resize;}.cke_skin_v2 .cke_resizer_vertical,.cke_skin_v2 .cke_rtl .cke_resizer_vertical{cursor:n-resize;}.cke_skin_v2 .cke_maximized .cke_resizer{display:none;}.cke_skin_v2 .cke_browser_ie6 .cke_contents textarea,.cke_skin_v2 .cke_browser_ie7 .cke_contents textarea{position:absolute;}.cke_skin_v2 .cke_voice_label{display:none;}.cke_skin_v2 legend.cke_voice_label{display:none;}.cke_skin_v2 .cke_browser_ie legend.cke_voice_label{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_v2 .cke_panel{border:1px solid #8f8f73;background-color:#fff;width:120px;height:100px;overflow:hidden;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.cke_skin_v2 .cke_panel iframe{width:100%;height:100%;}.cke_skin_v2 .cke_panel_frame .cke_label{display:none;}html.cke_skin_v2_container{overflow:auto;overflow-x:hidden;}body.cke_panel_frame{overflow:auto;}ul.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap;}li.cke_panel_listItem{margin:0;}.cke_panel_listItem a{padding:2px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;}* html .cke_panel_listItem a{width:100%;color:#000;}*:first-child+html .cke_panel_listItem a{color:#000;}
+.cke_panel_listItem.cke_selected a{border:1px solid #ccc;background-color:#e9f5ff;}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#316ac5;background-color:#dff1ff;}.cke_hc .cke_panel_listItem.cke_selected a,.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border-width:3px;padding:0;}.cke_panel_grouptitle{font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;font-weight:bold;white-space:nowrap;background-color:#dcdcdc;color:#000;margin:0;padding:3px;}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:3px;margin-bottom:3px;}.cke_skin_v2 .cke_button_textcolor_panel,.cke_skin_v2 .cke_button_bgcolor_panel{width:150px;height:135px;}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000;}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left;}.cke_rtl span.cke_colorbox{float:right;}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;}.cke_rtl a.cke_colorbox{float:right;}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#316ac5 1px solid;background-color:#dff1ff;}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer;}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#316ac5 1px solid;background-color:#dff1ff;}@media print{.cke_skin_v2 .cke_toolbox{display:none;}}.cke_skin_v2 .cke_browser_webkit .cke_toolbox,.cke_skin_v2 .cke_browser_webkit .cke_toolbox>span{white-space:normal;}.cke_skin_v2 .cke_toolbox{clear:both;padding-bottom:1px;}.cke_skin_v2 a.cke_toolbox_collapser,.cke_skin_v2 a:hover.cke_toolbox_collapser{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:3px -739px;background-repeat:no-repeat;width:11px;height:11px;float:right;border:outset 1px;margin:11px 2px 2px;cursor:pointer;}.cke_skin_v2 a.cke_toolbox_collapser span{display:none;}.cke_skin_v2 .cke_hc a.cke_toolbox_collapser span{font-size:10px;font-weight:bold;font-family:Arial;display:inline;}.cke_skin_v2 .cke_rtl a.cke_toolbox_collapser,.cke_skin_v2 .cke_rtl a:hover.cke_toolbox_collapser{float:left;}.cke_skin_v2 a.cke_toolbox_collapser_min,.cke_skin_v2 a:hover.cke_toolbox_collapser_min{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:4px -760px;background-repeat:no-repeat;margin:2px;}.cke_skin_v2 .cke_rtl a.cke_toolbox_collapser_min,.cke_skin_v2 .cke_rtl a:hover.cke_toolbox_collapser_min{background-position:4px -781px;}.cke_skin_v2 .cke_toolbar{padding-top:1px;padding-bottom:1px;display:inline-block;float:left;}.cke_skin_v2 .cke_rtl .cke_toolbar{float:right;}.cke_skin_v2 .cke_toolgroup{display:inline-block;float:left;}.cke_skin_v2 .cke_browser_ie .cke_toolgroup{#float:none;#display:inline;}.cke_skin_v2 .cke_rtl .cke_toolgroup{float:right;}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolgroup{#float:none;}.cke_skin_v2 .cke_separator{display:inline-block;float:left;border-left:solid 1px #999;margin:4px 2px;height:16px;}.cke_skin_v2 .cke_browser_ie .cke_separator{#float:none;#display:inline;}.cke_skin_v2 .cke_rtl .cke_separator{float:right;}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_separator{#float:none;}.cke_skin_v2 .cke_break{clear:left;}.cke_skin_v2 .cke_rtl .cke_break{clear:right;}.cke_skin_v2 .cke_toolbar_start{display:inline-block;background-image:url(images/toolbar_start.gif);background-repeat:no-repeat;margin:4px 2px 0 2px;width:3px;height:20px;float:left;}.cke_skin_v2 .cke_browser_ie .cke_toolbar_start{#float:none;#display:inline;}.cke_skin_v2 .cke_rtl .cke_toolbar_start{float:right;}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolbar_start{#float:none;}.cke_skin_v2 .cke_toolbar_end{display:inline-block;float:left;}
+.cke_skin_v2 .cke_browser_ie .cke_toolbar_end{#float:none;#display:inline;}.cke_skin_v2 .cke_rtl .cke_toolbar_end{float:right;}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolbar_end{#float:none;}.cke_skin_v2 .cke_browser_ie9plus .cke_rtl .cke_separator,.cke_skin_v2 .cke_browser_ie9plus .cke_rtl .cke_toolbar_start,.cke_skin_v2 .cke_browser_ie9plus .cke_rtl .cke_toolbar_end{vertical-align:middle;}.cke_skin_v2 .cke_button a,.cke_skin_v2 .cke_button a:hover,.cke_skin_v2 .cke_button a:focus,.cke_skin_v2 .cke_button a:active,.cke_skin_v2 .cke_button a.cke_off{border:solid 1px #efefde;display:inline-block;border-radius:3px;outline:none;padding-top:2px;padding-left:4px;padding-right:4px;padding-bottom:2px;height:18px;cursor:default;}.cke_skin_v2 .cke_button a,.cke_skin_v2 .cke_button a.cke_off{background-color:#efefde;filter:alpha(opacity=70);opacity:.70;-moz-border-radius:3px;-webkit-border-radius:3px;}.cke_skin_v2 .cke_hc .cke_button a,.cke_skin_v2 .cke_hc .cke_button a.cke_off{opacity:1.0;filter:alpha(opacity=100);}.cke_skin_v2 .cke_button a.cke_on{border:solid 1px #316ac5;background-color:#a3d7ff;filter:alpha(opacity=100);opacity:1;}.cke_skin_v2 .cke_button a.cke_disabled *{filter:alpha(opacity=30);opacity:.3;}.cke_skin_v2 .cke_browser_ie .cke_button a.cke_disabled *,.cke_skin_v2 .cke_browser_ie a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,.cke_skin_v2 .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_v2 .cke_browser_ie6 .cke_button a.cke_disabled *,.cke_skin_v2 .cke_browser_ie6 a:hover.cke_button .cke_disabled *,.cke_skin_v2 .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *{filter:alpha(opacity=30);}.cke_skin_v2 .cke_hc .cke_button a.cke_disabled *,.cke_skin_v2 .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *{filter:alpha(opacity=60);opacity:.6;}.cke_skin_v2 .cke_button a:hover,.cke_skin_v2 .cke_button a:focus,.cke_skin_v2 .cke_button a:active{border:solid 1px #316ac5;background-color:#dff1ff;padding:2px 4px;}.cke_skin_v2 .cke_hc .cke_button a:hover,.cke_skin_v2 .cke_hc .cke_button a:focus,.cke_skin_v2 .cke_hc .cke_button a:active{padding:0 2px!important;border-width:3px;}.cke_skin_v2 .cke_button .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;display:inline-block;cursor:default;}.cke_skin_v2 .cke_rtl .cke_button .cke_icon{background-image:url(icons_rtl.png);}.cke_skin_v2 .cke_browser_ie .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_v2 .cke_browser_ie6 .cke_button .cke_icon,.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,.cke_skin_v2 .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon{filter:;}.cke_skin_v2 .cke_button .cke_label{cursor:default;display:none;padding-left:3px;vertical-align:middle;}.cke_skin_v2 .cke_hc .cke_button .cke_label{padding:0;display:inline-block;}.cke_skin_v2 .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_v2 .cke_accessibility{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_v2 .cke_button .cke_buttonarrow{display:inline-block;height:17px;width:8px;background-position:2px -717px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;cursor:default;}.cke_skin_v2 .cke_rtl .cke_button .cke_buttonarrow{background-position:0 -717px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);}.cke_skin_v2 .cke_browser_gecko18 .cke_toolbar,.cke_skin_v2 .cke_browser_gecko18 .cke_button a,.cke_skin_v2 .cke_browser_gecko18 .cke_button a.cke_off,.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_icon,.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_buttonarrow,.cke_skin_v2 .cke_browser_gecko18 .cke_separator,.cke_skin_v2 .cke_browser_gecko18 .cke_toolbar_start{display:block;float:left;}
+.cke_skin_v2 .cke_browser_gecko18 .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_toolbar,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button a,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button a.cke_off,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button .cke_icon,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button .cke_buttonarrow,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_separator,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_toolbar_start{float:right;}.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_label,.cke_skin_v2 .cke_browser_gecko18 .cke_break{float:left;}.cke_skin_v2 .cke_browser_gecko18 .cke_rtl span.cke_inline_label{float:right;}.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button .cke_label,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_break,.cke_skin_v2 .cke_browser_ie8 .cke_rtl .cke_break,.cke_skin_v2 .cke_browser_ie9plus .cke_rtl .cke_break{float:right;}.cke_skin_v2 .cke_browser_gecko18 .cke_separator{margin-top:4px;}.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_label{padding-top:3px;}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolgroup,.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_separator,.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolbar_start,.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolbar_end{float:none;}.cke_skin_v2 .cke_browser_ie8 .cke_toolbar,.cke_skin_v2 .cke_browser_ie8 .cke_toolgroup{vertical-align:top;}.cke_skin_v2 .cke_browser_iequirks.cke_browser_ie8 .cke_toolbar,.cke_skin_v2 .cke_browser_iequirks.cke_browser_ie8 .cke_toolgroup{vertical-align:baseline;}.cke_skin_v2 .cke_browser_ie .cke_rcombo,.cke_skin_v2 .cke_browser_ie .cke_rcombo *{cursor:default;}.cke_skin_v2 .cke_contextmenu{padding:2px;}.cke_skin_v2 .cke_menuitem a{display:block;}.cke_skin_v2 .cke_menuitem span{cursor:default;}.cke_skin_v2 .cke_menuitem a:hover,.cke_skin_v2 .cke_menuitem a:focus,.cke_skin_v2 .cke_menuitem a:active{background-color:#8f8f73;display:block;}.cke_hc .cke_menuitem a:hover,.cke_hc .cke_menuitem a:focus,.cke_hc .cke_menuitem a:active{border:2px solid;}.cke_skin_v2 .cke_menuitem .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;background-color:transparent;width:16px;height:16px;float:left;}.cke_rtl .cke_skin_v2 .cke_menuitem .cke_icon{background-image:url(icons_rtl.png);}.cke_browser_ie .cke_skin_v2 .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_v2 .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_icon,.cke_browser_ie .cke_skin_v2 .cke_menuitem.cke_noalphafix .cke_icon{filter:;}.cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon{filter:alpha(opacity=70);opacity:.70;}.cke_browser_ie .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon,.cke_browser_ie .cke_skin_v2 .cke_menuitem.cke_noalphafix .cke_disabled .cke_icon{filter:;}.cke_skin_v2 .cke_menuitem .cke_icon_wrapper{background-color:#e3e3c7;border:solid 4px #e3e3c7;width:16px;height:16px;float:left;filter:alpha(opacity=70);opacity:.70;clear:both;}.cke_rtl .cke_skin_v2 .cke_menuitem .cke_icon_wrapper{float:right;}.cke_skin_v2 .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_v2 .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_v2 .cke_menuitem a:active .cke_icon_wrapper{background-color:#9d9d9d;border:solid 4px #9d9d9d;filter:alpha(opacity=70);opacity:.70;}.cke_skin_v2 .cke_menuitem a:hover.cke_disabled .cke_icon_wrapper,.cke_skin_v2 .cke_menuitem a:focus.cke_disabled .cke_icon_wrapper,.cke_skin_v2 .cke_menuitem a:active.cke_disabled .cke_icon_wrapper{background-color:#e3e3c7;border:solid 4px #e3e3c7;}.cke_skin_v2 .cke_menuitem .cke_label{display:block;padding-right:3px;padding-top:5px;padding-left:4px;height:19px;margin-left:24px;background-color:#fff;}
+.cke_skin_v2 .cke_frameLoaded .cke_menuitem .cke_label{filter:alpha(opacity=70);opacity:.70;}.cke_rtl .cke_skin_v2 .cke_menuitem .cke_label{padding-right:0;margin-left:0;padding-left:3px;margin-right:28px;}.cke_skin_v2 .cke_menuitem a.cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.30;}.cke_skin_v2 .cke_menuitem a:hover .cke_label,.cke_skin_v2 .cke_menuitem a:focus .cke_label,.cke_skin_v2 .cke_menuitem a:active .cke_label{background-color:#8f8f73;color:white;}.cke_skin_v2 .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_v2 .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_v2 .cke_menuitem a.cke_disabled:active .cke_label{background-color:transparent;color:black;}.cke_skin_v2 .cke_menuseparator{background-color:#e3e3c7;height:2px;filter:alpha(opacity=70);opacity:.70;_font-size:0;}.cke_skin_v2 .cke_menuarrow{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -784px;background-repeat:no-repeat;height:5px;width:3px;float:right;margin-right:2px;margin-top:3px;}.cke_rtl .cke_skin_v2 .cke_menuarrow{float:left;margin-right:0;margin-left:2px;background-position:0 -763px;}.cke_skin_v2 .cke_menuarrow span{display:none;}.cke_hc .cke_skin_v2 .cke_menuarrow{width:auto;margin-top:0;}.cke_hc .cke_skin_v2 .cke_menuarrow span{display:inline;}.cke_browser_ie.cke_ltr .cke_skin_v2 .cke_menuarrow{position:absolute;right:2px;}.cke_browser_ie.cke_rtl .cke_skin_v2 .cke_menuarrow{position:absolute;left:2px;}.cke_skin_v2 .cke_rcombo{display:inline-block;margin-left:2px;margin-right:2px;margin-top:2px;vertical-align:top;}.cke_skin_v2 .cke_browser_ie .cke_rcombo{#display:inline;}.cke_skin_v2 .cke_rcombopanel{border:1px solid #316ac5;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;border-top-left-radius:0;}.cke_skin_v2 .cke_rcombo a{display:inline-block;float:left;filter:alpha(opacity=70);opacity:.70;}.cke_skin_v2 .cke_rtl .cke_rcombo a{float:right;}.cke_skin_v2 .cke_hc .cke_rcombo a{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_v2 .cke_rcombo .cke_label{float:left;line-height:20px;line-height:22px\9;height:22px;padding-left:4px;padding-right:5px;filter:alpha(opacity=70);opacity:.70;background-color:#f1f1e3;cursor:default;}.cke_skin_v2 .cke_rtl .cke_rcombo .cke_label{float:right;padding-right:4px;padding-left:5px;}.cke_skin_v2 .cke_hc .cke_rcombo .cke_label{filter:alpha(opacity=100);opacity:1.0;}.cke_skin_v2 .cke_rcombo .cke_inline_label{color:#fff;}.cke_skin_v2 .cke_rcombo .cke_text{border:1px solid #8f8f73;background-color:#fff;height:12px;width:60px;padding-top:4px;padding-bottom:4px;padding-left:5px;padding-right:5px;text-overflow:ellipsis;overflow:hidden;display:inline-block;vertical-align:top;cursor:default;}.cke_skin_v2 .cke_ltr .cke_rcombo .cke_text{-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}.cke_skin_v2 .cke_rtl .cke_rcombo .cke_text{-moz-border-radius-topright:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;}.cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_text{height:22px;}.cke_skin_v2 .cke_rcombo .cke_openbutton{display:inline-block;border-top:1px solid #8f8f73;border-bottom:1px solid #8f8f73;}.cke_skin_v2 .cke_rcombo .cke_openbutton .cke_icon{display:inline-block;background-position:5px -715px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;width:14px;height:20px;}.cke_skin_v2 .cke_browser_ie .cke_rcombo .cke_openbutton .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_v2 .cke_browser_ie6 .cke_rcombo .cke_openbutton .cke_icon{filter:;}.cke_skin_v2 .cke_hc .cke_rcombo .cke_openbutton .cke_icon{background:none;filter:;}.cke_skin_v2 .cke_ltr .cke_rcombo .cke_openbutton{border-right:1px solid #8f8f73;-moz-border-radius-topright:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;}
+.cke_skin_v2 .cke_rtl .cke_rcombo .cke_openbutton{border-left:1px solid #8f8f73;-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}.cke_skin_v2 .cke_rcombo .cke_off a:hover,.cke_skin_v2 .cke_rcombo .cke_off a:focus,.cke_skin_v2 .cke_rcombo .cke_off a:active,.cke_skin_v2 .cke_rcombo .cke_on a{filter:alpha(opacity=100);opacity:1;}.cke_skin_v2 .cke_rcombo .cke_off a:hover .cke_text,.cke_skin_v2 .cke_rcombo .cke_off a:focus .cke_text,.cke_skin_v2 .cke_rcombo .cke_off a:active .cke_text,.cke_skin_v2 .cke_rcombo .cke_on .cke_text{border-color:#316ac5;}.cke_skin_v2 .cke_rcombo .cke_off a:hover .cke_openbutton,.cke_skin_v2 .cke_rcombo .cke_off a:focus .cke_openbutton,.cke_skin_v2 .cke_rcombo .cke_off a:active .cke_openbutton,.cke_skin_v2 .cke_rcombo .cke_on .cke_openbutton{border-color:#316ac5;background-color:#dff1ff;}.cke_skin_v2 .cke_rcombo .cke_on .cke_text{-moz-border-radius-bottomleft:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;}.cke_skin_v2 .cke_rcombo .cke_on .cke_openbutton{-moz-border-radius-bottomright:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.cke_skin_v2 .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=30);opacity:.3;}.cke_skin_v2 .cke_hc .cke_rcombo .cke_disabled .cke_label{filter:alpha(opacity=70);opacity:.7;}.cke_skin_v2 .cke_rcombo .cke_disabled .cke_text,.cke_skin_v2 .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);opacity:.5;}.cke_skin_v2 .cke_browser_ie .cke_rcombo .cke_disabled .cke_openbutton{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=50);}.cke_skin_v2 .cke_browser_ie6 .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=50);}.cke_skin_v2 .cke_hc .cke_rcombo .cke_disabled .cke_text,.cke_skin_v2 .cke_hc .cke_rcombo .cke_disabled .cke_openbutton{filter:alpha(opacity=80);opacity:.8;}.cke_skin_v2 .cke_rcombo .cke_disabled .cke_text{color:#fff;}.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo,.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo .cke_label,.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo .cke_text,.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo .cke_openbutton,.cke_skin_v2 .cke_browser_webkit .cke_rcombo .cke_label,.cke_skin_v2 .cke_browser_webkit .cke_rcombo .cke_text,.cke_skin_v2 .cke_browser_webkit .cke_rcombo .cke_openbutton{display:block;float:left;}.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_label,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_text,.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_openbutton,.cke_skin_v2 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_label,.cke_skin_v2 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_text,.cke_skin_v2 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_openbutton{float:right;}.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_rcombo,.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_rcombo a,.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_rcombo .cke_label{float:none;}.cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_openbutton{height:22px;}.cke_skin_v2 .cke_rtl .cke_rcombo .cke_font .cke_text,.cke_skin_v2 .cke_rtl .cke_rcombo .cke_fontSize .cke_text{direction:ltr;}@media print{.cke_path{display:none;}}.cke_skin_v2 .cke_path{padding:3px 3px 0 3px;display:inline-block;float:left;}.cke_skin_v2 .cke_rtl .cke_path{float:right;}.cke_skin_v2 .cke_path a,.cke_skin_v2 .cke_path .cke_empty{display:inline-block;float:left;border:solid 1px #efefde;background-color:#efefde;padding-top:1px;padding-bottom:1px;padding-left:4px;padding-right:4px;margin-bottom:3px;cursor:default;}.cke_skin_v2 .cke_path .cke_empty{visibility:hidden;}.cke_skin_v2 .cke_rtl .cke_path a,.cke_skin_v2 .cke_rtl .cke_path cke_empty{float:right;}.cke_skin_v2 .cke_path a:hover,.cke_skin_v2 .cke_path a:focus,.cke_skin_v2 .cke_path a:active{border:solid 1px #316ac5;background-color:#dff1ff;padding-top:1px;padding-bottom:1px;padding-left:4px;padding-right:4px;outline:none;}
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_path a,.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_path .cke_empty{float:none;}.cke_skin_v2 .cke_path .cke_label{display:none;}.cke_skin_v2 .cke_button_source .cke_icon{background-position:0 0;}.cke_skin_v2 .cke_button_docProps .cke_icon{background-position:0 -16px;}.cke_skin_v2 .cke_button_newpage .cke_icon{background-position:0 -48px;}.cke_skin_v2 .cke_button_preview .cke_icon{background-position:0 -64px;}.cke_skin_v2 .cke_button_cut .cke_icon{background-position:0 -96px;}.cke_skin_v2 .cke_button_copy .cke_icon{background-position:0 -112px;}.cke_skin_v2 .cke_button_paste .cke_icon{background-position:0 -128px;}.cke_skin_v2 .cke_button_pastetext .cke_icon{background-position:0 -144px;}.cke_skin_v2 .cke_button_find .cke_icon{background-position:0 -240px;}.cke_skin_v2 .cke_button_replace .cke_icon{background-position:0 -256px;}.cke_skin_v2 .cke_button_selectAll .cke_icon{background-position:0 -272px;}.cke_skin_v2 .cke_button_removeFormat .cke_icon{background-position:0 -288px;}.cke_skin_v2 .cke_button_bold .cke_icon{background-position:0 -304px;}.cke_skin_v2 .cke_button_italic .cke_icon{background-position:0 -320px;}.cke_skin_v2 .cke_button_underline .cke_icon{background-position:0 -336px;}.cke_skin_v2 .cke_button_strike .cke_icon{background-position:0 -352px;}.cke_skin_v2 .cke_button_subscript .cke_icon{background-position:0 -368px;}.cke_skin_v2 .cke_button_superscript .cke_icon{background-position:0 -384px;}.cke_skin_v2 .cke_button_table .cke_icon{background-position:0 -608px;}.cke_skin_v2 .cke_button_horizontalrule .cke_icon{background-position:0 -624px;}.cke_skin_v2 .cke_button_smiley .cke_icon{background-position:0 -640px;}.cke_skin_v2 .cke_button_link .cke_icon{background-position:0 -528px;}.cke_skin_v2 .cke_button_unlink .cke_icon{background-position:0 -544px;}.cke_skin_v2 .cke_button_anchor .cke_icon{background-position:0 -560px;}.cke_skin_v2 .cke_button_image .cke_icon{background-position:0 -576px;}.cke_skin_v2 .cke_button_flash .cke_icon{background-position:0 -592px;}.cke_skin_v2 .cke_button_specialchar .cke_icon{background-position:0 -656px;}.cke_skin_v2 .cke_button_pagebreak .cke_icon{background-position:0 -672px;}.cke_skin_v2 .cke_button_print .cke_icon{background-position:0 -176px;}.cke_skin_v2 .cke_button_checkspell .cke_icon,.cke_skin_v2 .cke_button_scayt .cke_icon{background-position:0 -192px;}.cke_skin_v2 .cke_button_pagebreak .cke_icon{background-position:0 -672px;}.cke_skin_v2 .cke_button_textcolor .cke_icon{background-position:0 -704px;}.cke_skin_v2 .cke_button_bgcolor .cke_icon{background-position:0 -720px;}.cke_skin_v2 .cke_button_form .cke_icon{background-position:0 -752px;}.cke_skin_v2 .cke_button_checkbox .cke_icon{background-position:0 -768px;}.cke_skin_v2 .cke_button_radio .cke_icon{background-position:0 -784px;}.cke_skin_v2 .cke_button_textfield .cke_icon{background-position:0 -800px;}.cke_skin_v2 .cke_button_textarea .cke_icon{background-position:0 -816px;}.cke_skin_v2 .cke_button_showblocks .cke_icon{background-position:0 -1136px;}.cke_skin_v2 .cke_button_select .cke_icon{background-position:0 -832px;}.cke_skin_v2 .cke_button_button .cke_icon{background-position:0 -848px;}.cke_skin_v2 .cke_button_imagebutton .cke_icon{background-position:0 -864px;}.cke_skin_v2 .cke_button_hiddenfield .cke_icon{background-position:0 -880px;}.cke_skin_v2 .cke_button_undo .cke_icon{background-position:0 -208px;}.cke_skin_v2 .cke_rtl .cke_button_undo .cke_icon{background-position:0 -224px;}.cke_skin_v2 .cke_button_redo .cke_icon{background-position:0 -224px;}.cke_skin_v2 .cke_rtl .cke_button_redo .cke_icon{background-position:0 -208px;}.cke_skin_v2 .cke_button_templates .cke_icon{background-position:0 -80px;}.cke_skin_v2 .cke_button_numberedlist .cke_icon{background-position:0 -400px;}.cke_skin_v2 .cke_button_bulletedlist .cke_icon{background-position:0 -416px;}.cke_skin_v2 .cke_mixed_dir_content .cke_button_numberedlist .cke_icon{background-position:0 -1217px;}.cke_skin_v2 .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon{background-position:0 -1233px;}.cke_skin_v2 .cke_button_outdent .cke_icon{background-position:0 -432px;}
+.cke_skin_v2 .cke_button_indent .cke_icon{background-position:0 -448px;}.cke_skin_v2 .cke_mixed_dir_content .cke_button_indent .cke_icon{background-position:0 -1265px;}.cke_skin_v2 .cke_mixed_dir_content .cke_button_outdent .cke_icon{background-position:0 -1249px;}.cke_skin_v2 .cke_button_justifyleft .cke_icon{background-position:0 -464px;}.cke_skin_v2 .cke_button_justifycenter .cke_icon{background-position:0 -480px;}.cke_skin_v2 .cke_button_justifyright .cke_icon{background-position:0 -496px;}.cke_skin_v2 .cke_button_justifyblock .cke_icon{background-position:0 -512px;}.cke_skin_v2 .cke_button_blockquote .cke_icon{background-position:0 -1152px;}.cke_skin_v2 .cke_button_flash .cke_icon{background-position:0 -592px;}.cke_skin_v2 .cke_button_pastefromword .cke_icon{background-position:0 -160px;}.cke_skin_v2 .cke_button_save .cke_icon{background-position:0 -32px;}.cke_skin_v2 .cke_button_about .cke_icon{background-position:0 -736px;}.cke_skin_v2 .cke_button_maximize .cke_icon{background-position:0 -1040px;}.cke_skin_v2 .cke_button_creatediv .cke_icon{background-position:0 -1168px;}.cke_skin_v2 .cke_button_editdiv .cke_icon{background-position:0 -1184px;}.cke_skin_v2 .cke_button_removediv .cke_icon{background-position:0 -1200px;}.cke_skin_v2 .cke_button_bidirtl .cke_icon{background-position:0 -1072px;}.cke_skin_v2 .cke_button_bidiltr .cke_icon{background-position:0 -1056px;}.cke_skin_v2 .cke_button_iframe .cke_icon{background-position:0 -1279px;}.cke_skin_v2 .cke_button_source .cke_label{display:inline;display:inline-block;}.cke_skin_v2 .cke_styles_panel{width:150px;height:170px;}.cke_skin_v2 .cke_format_panel{width:150px;height:170px;}.cke_skin_v2 .cke_font_panel{width:150px;height:170px;}.cke_skin_v2 .cke_fontSize_panel{height:170px;}.cke_skin_v2 .cke_fontSize .cke_text{width:20px;}.cke_skin_v2 .cke_browser_iequirks .cke_fontSize .cke_text{width:32px;}html .cke_skin_v2{visibility:inherit;}html.cke_skin_v2_container{visibility:visible;}
diff --git a/web/imcms/ckeditor/skins/v2/icons.png b/web/imcms/ckeditor/skins/v2/icons.png
new file mode 100644
index 0000000000..7c3bf195dd
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/icons.png differ
diff --git a/web/imcms/ckeditor/skins/v2/icons_rtl.png b/web/imcms/ckeditor/skins/v2/icons_rtl.png
new file mode 100644
index 0000000000..83eee28ac7
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/icons_rtl.png differ
diff --git a/web/imcms/ckeditor/skins/v2/images/dialog_sides.gif b/web/imcms/ckeditor/skins/v2/images/dialog_sides.gif
new file mode 100644
index 0000000000..8f91b4753a
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/dialog_sides.gif differ
diff --git a/web/imcms/ckeditor/skins/v2/images/dialog_sides.png b/web/imcms/ckeditor/skins/v2/images/dialog_sides.png
new file mode 100644
index 0000000000..1042a61cf9
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/dialog_sides.png differ
diff --git a/web/imcms/ckeditor/skins/v2/images/dialog_sides_rtl.png b/web/imcms/ckeditor/skins/v2/images/dialog_sides_rtl.png
new file mode 100644
index 0000000000..d7f7b49fcc
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/dialog_sides_rtl.png differ
diff --git a/web/imcms/ckeditor/skins/v2/images/mini.gif b/web/imcms/ckeditor/skins/v2/images/mini.gif
new file mode 100644
index 0000000000..54d9107416
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/mini.gif differ
diff --git a/web/imcms/ckeditor/skins/v2/images/noimage.png b/web/imcms/ckeditor/skins/v2/images/noimage.png
new file mode 100644
index 0000000000..159811305a
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/noimage.png differ
diff --git a/web/imcms/ckeditor/skins/v2/images/sprites.png b/web/imcms/ckeditor/skins/v2/images/sprites.png
new file mode 100644
index 0000000000..982717bf33
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/sprites.png differ
diff --git a/web/imcms/ckeditor/skins/v2/images/sprites_ie6.png b/web/imcms/ckeditor/skins/v2/images/sprites_ie6.png
new file mode 100644
index 0000000000..4389b65b8a
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/sprites_ie6.png differ
diff --git a/web/imcms/ckeditor/skins/v2/images/toolbar_start.gif b/web/imcms/ckeditor/skins/v2/images/toolbar_start.gif
new file mode 100644
index 0000000000..1774246c2e
Binary files /dev/null and b/web/imcms/ckeditor/skins/v2/images/toolbar_start.gif differ
diff --git a/web/imcms/ckeditor/skins/v2/skin.js b/web/imcms/ckeditor/skins/v2/skin.js
new file mode 100644
index 0000000000..42130952d5
--- /dev/null
+++ b/web/imcms/ckeditor/skins/v2/skin.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.skins.add('v2',(function(){return{editor:{css:['editor.css']},dialog:{css:['dialog.css']},separator:{canGroup:false},templates:{css:['templates.css']},margins:[0,14,18,14]};})());(function(){CKEDITOR.dialog?a():CKEDITOR.on('dialogPluginReady',a);function a(){CKEDITOR.dialog.on('resize',function(b){var c=b.data,d=c.width,e=c.height,f=c.dialog,g=f.parts.contents;if(c.skin!='v2')return;g.setStyles({width:d+'px',height:e+'px'});if(!CKEDITOR.env.ie||CKEDITOR.env.ie9Compat)return;setTimeout(function(){var h=f.parts.dialog.getChild([0,0,0]),i=h.getChild(0),j=i.getSize('width');e+=i.getChild(0).getSize('height')+1;var k=h.getChild(2);k.setSize('width',j);k=h.getChild(7);k.setSize('width',j-28);k=h.getChild(4);k.setSize('height',e);k=h.getChild(5);k.setSize('height',e);},100);});};})();
diff --git a/web/imcms/ckeditor/skins/v2/templates.css b/web/imcms/ckeditor/skins/v2/templates.css
new file mode 100644
index 0000000000..943d0d3e03
--- /dev/null
+++ b/web/imcms/ckeditor/skins/v2/templates.css
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_v2 .cke_tpl_list{border:#dcdcdc 2px solid;background-color:#fff;overflow:auto;width:100%;height:220px;}.cke_skin_v2 .cke_tpl_item{margin:5px;padding:7px;border:#eee 1px solid;*width:88%;}.cke_skin_v2 .cke_tpl_preview{border-collapse:separate;text-indent:0;width:100%;}.cke_skin_v2 .cke_tpl_preview td{padding:2px;vertical-align:middle;}.cke_skin_v2 .cke_tpl_preview .cke_tpl_preview_img{width:100px;}.cke_skin_v2 .cke_tpl_preview span{white-space:normal;}.cke_skin_v2 .cke_tpl_title{font-weight:bold;}.cke_skin_v2 .cke_tpl_list a:active .cke_tpl_item,.cke_skin_v2 .cke_tpl_list a:hover .cke_tpl_item,.cke_skin_v2 .cke_tpl_list a:focus .cke_tpl_item{border:#f93 1px solid!important;background-color:#fffacd!important;}.cke_skin_v2 .cke_tpl_list a:active *,.cke_skin_v2 .cke_tpl_list a:hover *,.cke_skin_v2 .cke_tpl_list a:focus *{cursor:pointer;}.cke_skin_v2 .cke_browser_ie6 .cke_tpl_list a:active,.cke_skin_v2 .cke_browser_ie6 .cke_tpl_list a:hover,.cke_skin_v2 .cke_browser_ie6 .cke_tpl_list a:focus{background-position:0 0;}.cke_skin_v2 .cke_tpl_list a:active .cke_tpl_item,.cke_skin_v2 .cke_tpl_list a:hover .cke_tpl_item,.cke_skin_v2 .cke_tpl_list a:focus .cke_tpl_item{border-width:3px;}.cke_skin_v2 .cke_tpl_empty,.cke_tpl_loading{text-align:center;padding:5px;}
diff --git a/web/imcms/ckeditor/themes/default/theme.js b/web/imcms/ckeditor/themes/default/theme.js
new file mode 100644
index 0000000000..5398bec57e
--- /dev/null
+++ b/web/imcms/ckeditor/themes/default/theme.js
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.themes.add('default',(function(){var a={};function b(c,d){var e,f;f=c.config.sharedSpaces;f=f&&f[d];f=f&&CKEDITOR.document.getById(f);if(f){var g='<span class="cke_shared " dir="'+c.lang.dir+'"'+'>'+'<span class="'+c.skinClass+' '+c.id+' cke_editor_'+c.name+'">'+'<span class="'+CKEDITOR.env.cssClass+'">'+'<span class="cke_wrapper cke_'+c.lang.dir+'">'+'<span class="cke_editor">'+'<div class="cke_'+d+'">'+'</div></span></span></span></span></span>',h=f.append(CKEDITOR.dom.element.createFromHtml(g,f.getDocument()));if(f.getCustomData('cke_hasshared'))h.hide();else f.setCustomData('cke_hasshared',1);e=h.getChild([0,0,0,0]);!c.sharedSpaces&&(c.sharedSpaces={});c.sharedSpaces[d]=e;c.on('focus',function(){for(var i=0,j,k=f.getChildren();j=k.getItem(i);i++){if(j.type==CKEDITOR.NODE_ELEMENT&&!j.equals(h)&&j.hasClass('cke_shared'))j.hide();}h.show();});c.on('destroy',function(){h.remove();});}return e;};return{build:function(c,d){var e=c.name,f=c.element,g=c.elementMode;if(!f||g==CKEDITOR.ELEMENT_MODE_NONE)return;if(g==CKEDITOR.ELEMENT_MODE_REPLACE)f.hide();var h=c.fire('themeSpace',{space:'top',html:''}).html,i=c.fire('themeSpace',{space:'contents',html:''}).html,j=c.fireOnce('themeSpace',{space:'bottom',html:''}).html,k=i&&c.config.height,l=c.config.tabIndex||c.element.getAttribute('tabindex')||0;if(!i)k='auto';else if(!isNaN(k))k+='px';var m='',n=c.config.width;if(n){if(!isNaN(n))n+='px';m+='width: '+n+';';}var o=h&&b(c,'top'),p=b(c,'bottom');o&&(o.setHtml(h),h='');p&&(p.setHtml(j),j='');var q='<style>.'+c.skinClass+'{visibility:hidden;}</style>';if(a[c.skinClass])q='';else a[c.skinClass]=1;var r=CKEDITOR.dom.element.createFromHtml(['<span id="cke_',e,'" class="',c.skinClass,' ',c.id,' cke_editor_',e,'" dir="',c.lang.dir,'" title="',CKEDITOR.env.gecko?' ':'','" lang="',c.langCode,'"'+(CKEDITOR.env.webkit?' tabindex="'+l+'"':'')+' role="application"'+' aria-labelledby="cke_',e,'_arialbl"'+(m?' style="'+m+'"':'')+'>'+'<span id="cke_',e,'_arialbl" class="cke_voice_label">'+c.lang.editor+'</span>'+'<span class="',CKEDITOR.env.cssClass,'" role="presentation"><span class="cke_wrapper cke_',c.lang.dir,'" role="presentation"><table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody><tr',h?'':' style="display:none"',' role="presentation"><td id="cke_top_',e,'" class="cke_top" role="presentation">',h,'</td></tr><tr',i?'':' style="display:none"',' role="presentation"><td id="cke_contents_',e,'" class="cke_contents" style="height:',k,'" role="presentation">',i,'</td></tr><tr',j?'':' style="display:none"',' role="presentation"><td id="cke_bottom_',e,'" class="cke_bottom" role="presentation">',j,'</td></tr></tbody></table>'+q+'</span>'+'</span>'+'</span>'].join(''));
+r.getChild([1,0,0,0,0]).unselectable();r.getChild([1,0,0,0,2]).unselectable();if(g==CKEDITOR.ELEMENT_MODE_REPLACE)r.insertAfter(f);else f.append(r);c.container=r;r.disableContextMenu();c.on('contentDirChanged',function(s){var t=(c.lang.dir!=s.data?'add':'remove')+'Class';r.getChild(1)[t]('cke_mixed_dir_content');var u=this.sharedSpaces&&this.sharedSpaces[this.config.toolbarLocation];u&&u.getParent().getParent()[t]('cke_mixed_dir_content');});c.fireOnce('themeLoaded');c.fireOnce('uiReady');},buildDialog:function(c){var d=CKEDITOR.tools.getNextNumber(),e=CKEDITOR.dom.element.createFromHtml(['<div class="',c.id,'_dialog cke_editor_',c.name.replace('.','\\.'),'_dialog cke_skin_',c.skinName,'" dir="',c.lang.dir,'" lang="',c.langCode,'" role="dialog" aria-labelledby="%title#"><table class="cke_dialog',' '+CKEDITOR.env.cssClass,' cke_',c.lang.dir,'" style="position:absolute" role="presentation"><tr><td role="presentation"><div class="%body" role="presentation"><div id="%title#" class="%title" role="presentation"></div><a id="%close_button#" class="%close_button" href="javascript:void(0)" title="'+c.lang.common.close+'" role="button"><span class="cke_label">X</span></a>'+'<div id="%tabs#" class="%tabs" role="tablist"></div>'+'<table class="%contents" role="presentation">'+'<tr>'+'<td id="%contents#" class="%contents" role="presentation"></td>'+'</tr>'+'<tr>'+'<td id="%footer#" class="%footer" role="presentation"></td>'+'</tr>'+'</table>'+'</div>'+'<div id="%tl#" class="%tl"></div>'+'<div id="%tc#" class="%tc"></div>'+'<div id="%tr#" class="%tr"></div>'+'<div id="%ml#" class="%ml"></div>'+'<div id="%mr#" class="%mr"></div>'+'<div id="%bl#" class="%bl"></div>'+'<div id="%bc#" class="%bc"></div>'+'<div id="%br#" class="%br"></div>'+'</td></tr>'+'</table>',CKEDITOR.env.ie?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+d).replace(/%/g,'cke_dialog_')),f=e.getChild([0,0,0,0,0]),g=f.getChild(0),h=f.getChild(1);if(CKEDITOR.env.ie&&!CKEDITOR.env.ie6Compat){var i=CKEDITOR.env.isCustomDomain(),j='javascript:void(function(){'+encodeURIComponent('document.open();'+(i?'document.domain="'+document.domain+'";':'')+'document.close();')+'}())',k=CKEDITOR.dom.element.createFromHtml('<iframe frameBorder="0" class="cke_iframe_shim" src="'+j+'"'+' tabIndex="-1"'+'></iframe>');k.appendTo(f.getParent());}g.unselectable();h.unselectable();return{element:e,parts:{dialog:e.getChild(0),title:g,close:h,tabs:f.getChild(2),contents:f.getChild([3,0,0,0]),footer:f.getChild([3,0,1,0])}};
+},destroy:function(c){var d=c.container,e=c.element;if(d){d.clearCustomData();d.remove();}if(e){e.clearCustomData();c.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&e.show();delete c.element;}}};})());CKEDITOR.editor.prototype.getThemeSpace=function(a){var b='cke_'+a,c=this._[b]||(this._[b]=CKEDITOR.document.getById(b+'_'+this.name));return c;};CKEDITOR.editor.prototype.resize=function(a,b,c,d){var j=this;var e=j.container,f=CKEDITOR.document.getById('cke_contents_'+j.name),g=CKEDITOR.env.webkit&&j.document&&j.document.getWindow().$.frameElement,h=d?e.getChild(1):e;h.setSize('width',a,true);g&&(g.style.width='1%');var i=c?0:(h.$.offsetHeight||0)-(f.$.clientHeight||0);f.setStyle('height',Math.max(b-i,0)+'px');g&&(g.style.width='100%');j.fire('resize');};CKEDITOR.editor.prototype.getResizable=function(a){return a?CKEDITOR.document.getById('cke_contents_'+this.name):this.container;};
diff --git a/web/imcms/css/imcms4_admin.css.jsp b/web/imcms/css/imcms4_admin.css.jsp
new file mode 100644
index 0000000000..e118dd739a
--- /dev/null
+++ b/web/imcms/css/imcms4_admin.css.jsp
@@ -0,0 +1,286 @@
+<%@ page
+	
+	import="imcode.server.Imcms,
+	        java.io.BufferedReader,
+	        java.io.InputStream,
+	        java.io.InputStreamReader,
+	        java.net.URL,
+	        java.net.URLConnection,
+	        org.apache.commons.lang.StringUtils,
+	        org.apache.commons.lang.StringUtils,
+	        org.apache.oro.text.perl.Perl5Util,
+	        org.apache.oro.text.perl.Perl5Util"
+	
+	contentType="text/css"
+	pageEncoding="UTF-8"
+	
+%><%
+
+/*
+
+	Parsed in to all templates - If the user has an admin panel.
+
+*/
+
+boolean isTextMode = ("true".equals(StringUtils.defaultString(request.getParameter("textMode")))) ;
+
+Perl5Util re = new Perl5Util() ;
+
+/* Check browser */
+
+String uAgent   = StringUtils.defaultString(request.getHeader("USER-AGENT")) ;
+boolean isIE    = re.match("/(MSIE \\d)/i", uAgent) ;
+boolean isGecko = re.match("/Gecko/i", uAgent) ;
+//boolean isWebKit = re.match("/webkit/i", uAgent) ;
+
+String BORDER_COLOR_NORMAL = "#668db6 #000 #000 #668db6" ;
+
+if (isGecko) {
+	BORDER_COLOR_NORMAL = "#466d96 #333 #333 #466d96" ;
+}
+
+%>
+.imcms_label,
+.imcms_label:link,
+.imcms_label:visited {
+	font: 10px Verdana !important;
+	color: #c00000 !important;
+	text-decoration: none !important;
+	background-color: #ffc !important;
+}
+.imcms_label:active,
+.imcms_label:hover {
+	font: 10px Verdana !important;
+	color: #009 !important;
+	text-decoration: underline !important;
+	background-color: #ffc !important;
+}
+
+<%-- Inline Text Edit - [Save], [Abort] --%>
+
+.imcmsFormBtnSmall {
+	background-color: #20568d;
+	color: #fff;
+	font: 10px Tahoma, Arial, sans-serif;
+	border: <%= isGecko ? 1 : 2 %>px outset #668db6;
+	border-color: <%= BORDER_COLOR_NORMAL %>;
+	cursor:pointer;
+	padding: <%= isGecko ? 1 : 0 %>px 2px;
+}
+
+#imcmsInlineEditMessage_ok {
+	display: none;
+	margin: 5px 0 !important;
+	padding: 10px !important;
+	text-align: center !important;
+	font: bold italic 14px Tahoma, Arial, sans-serif !important;<%----%>
+	color: #0b0;
+	background-color: #ffc !important;
+	border: 1px solid #000 !important;
+}
+
+#imcmsInlineEditMessage_error {
+	display: none;
+	margin: 5px 0 !important;
+	padding: 10px !important;
+	text-align: center !important;
+	font: bold italic 14px Tahoma, Arial, sans-serif !important;<%----%>
+	color: #f00;
+	background-color: #ffc !important;
+	border: 1px solid #000 !important;
+}
+
+.imcmsFormBtnDiv {
+	margin-top: -2px !important;
+	padding: 3px;
+	background-color: #f0f0f2;
+	border: 1px solid #ccc !important;
+	border-top: 0 !important;
+}
+
+.imcmsFormBtnDiv .textMode {
+	float: left;
+	padding: 2px 0 0 0;
+	white-space: pre;
+	font: bold normal 11px 'Courier New', Courier, monospace !important;
+	color: #999 !important;
+}
+
+
+<%-- adminMode --%>
+
+#adminPanelDiv {
+	padding: 15px 0 10px 0 !important;
+}
+.adminPanelTable {
+	border-width: 1px 2px 2px 1px !important;
+	border-style: solid !important;
+	border-color: #ccc #000 #000 #ccc !important;
+	background-color: #f5f5f7 !important;
+}
+.adminPanelTd1 {
+	padding: 2px !important;
+	background-color: #20568D !important;
+}
+#adminPanelTd1_1 {}
+.adminPanelLogo {
+	font: bold 11px Verdana,Geneva,sans-serif !important;
+	color: #ddf !important;
+	letter-spacing: -1px !important;
+}
+#adminPanelTd1_2 {}
+.adminPanelText,
+.adminPanelText SPAN {
+	font: 11px Verdana,Geneva,sans-serif !important;
+	color: #fff !important;
+}
+#adminPanelTd1_2 .adminPanelText SPAN {
+	white-space: nowrap !important;
+}
+#adminPanelTd1_3 {
+	text-align: right !important;
+}
+.adminPanelTd2 {
+	padding: 3px !important;
+	height: 32px !important;
+	vertical-align: top !important;
+}
+
+.adminPanelTd2 A:hover IMG {<%
+	if (isGecko) { %>
+	<%= "-moz-opacity: 0.5 !important;" %><%
+	} else if (isIE) { %>
+	<%= "filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=0, xray=0, mirror=0, invert=0, opacity=0.5, rotation=0) !important;" %><%
+	} else { %>
+	<%= "opacity: 0.5 !important;" %><%
+	} %>
+}
+.adminPanelTable B {
+	font-weight: bold !important;
+}
+
+<%-- changePage --%>
+
+#changePageDiv {
+	padding: 0 0 10px 0 !important;
+}
+#changePageTable {
+	border-width: 1px 2px 2px 1px !important;
+	border-style: solid !important;
+	border-color: #ccc #000 #000 #ccc !important;
+	background-color: #f5f5f7 !important;
+}
+#changePageTdTop {
+	padding: 2px !important;
+	background-color: #20568d !important;
+}
+#changePageTd1 {
+	font: 10px Verdana,Geneva,sans-serif !important;
+	color: #fff !important;
+	padding-left: 5px !important;
+}
+#changePageTd1 SPAN {
+	white-space: nowrap !important;
+}
+#changePageTd2 {
+	padding-left: 10px !important;
+}
+.changePageTdBottom TD {
+	padding-top: 3px !important;
+}
+.changePageSelect {
+	font: 10px Verdana,Geneva,sans-serif !important;
+	color: #000 !important;
+}
+.changePageHeading {
+	font: 10px Verdana,Geneva,sans-serif !important;
+	color: #fff !important;
+}
+.changePageButton {
+	background-color: #e2e2e4 !important;
+	font: 10px Tahoma, Arial, sans-serif !important;
+	color: #000 !important;
+	padding: 0 4px !important;
+	border-width: 1px !important;
+	border-style: outset !important;
+	border-color: #ccc #666 #666 #ccc !important;
+	cursor:pointer !important;
+}
+#changePageDiv .imcmsFormBtnSmall {
+	background-color: #20568d !important;
+	color: #fff !important;
+	font: 10px Tahoma, Arial, sans-serif !important;
+	border: 1px outset #668db6 !important;
+	border-color: #668db6 #000 #000 #668db6 !important;
+	padding: 0 2px !important;
+	cursor: pointer !important;
+}
+#changePageTable B {
+	font-weight: bold !important;
+}
+A.imLinkHelp:link,
+A.imLinkHelp:visited,
+A.imLinkHelp:active,
+A.imLinkHelp:hover {
+	font: bold 15px Arial, Tahoma,Verdana,sans-serif !important;
+	color: #ee0 !important;
+	text-decoration:none !important;
+}
+
+<%--
+imCMS version of jQuery UI CSS:
+--%>
+
+<jsp:include page="imcms_jquery-ui.css.jsp" />
+
+<%-- Testing feature --%>
+.ui-effects-transfer {
+	border: 2px dotted #20568d !important;
+}
+
+
+<%--!
+
+// Make new imCMS version of jQuery UI CSS: https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/redmond/jquery-ui.css
+
+
+private final static int CONNECTION_TIMEOUT_MILLIS = 3000 ;
+
+public static String getURLcontent( String urlString, String encoding ) {
+		try {
+				URL url = new URL(urlString) ;
+				URLConnection con = url.openConnection() ;
+				con.setConnectTimeout(CONNECTION_TIMEOUT_MILLIS);
+				con.connect() ;
+				InputStream is = (InputStream) con.getContent() ;
+				InputStreamReader isr = new InputStreamReader(is, encoding) ;
+				BufferedReader br = new BufferedReader(isr) ;
+				String line = br.readLine() ;
+				StringBuffer retVal = new StringBuffer();
+				while (line != null) {
+						retVal.append( line ).append( "\n" ) ;
+						line = br.readLine() ;
+				}
+				br.close() ;
+				return retVal.toString();
+		} catch (Exception ex) {
+				return null ;
+		}
+}
+
+%><%
+
+if (true) {
+	try {
+		String jQueryUiCss = getURLcontent("https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/redmond/jquery-ui.css", Imcms.UTF_8_ENCODING).replace("@VERSION", "1.8.16") ;
+		
+		out.print("\n\n\n\n" + jQueryUiCss.replaceAll("\\n.ui-", "\n.imcmsAdmin.ui-")) ;
+		
+		out.print("\n\n\n\n" + jQueryUiCss.replaceAll("\\n.ui-", "\n.imcmsAdmin .ui-")) ;
+		
+	} catch (Exception e) {
+		out.print("/* ERROR: " + e.getMessage() + " */");
+	}
+}
+
+--%>
\ No newline at end of file
diff --git a/web/imcms/css/imcms_admin.css.jsp b/web/imcms/css/imcms_admin.css.jsp
index 4b4770bc54..658e054860 100644
--- a/web/imcms/css/imcms_admin.css.jsp
+++ b/web/imcms/css/imcms_admin.css.jsp
@@ -1,8 +1,14 @@
 <%@ page
-	import="org.apache.oro.text.perl.Perl5Util"
+	import="org.apache.commons.lang.StringUtils, org.apache.oro.text.perl.Perl5Util"
 	contentType="text/css"
 %><%!
 
+/*
+
+	CSS for the blue/white admin UI
+
+*/
+
 /* *******************************************************************************************
  *         Method that writes the right fontSize, depending on the browser                   *
  ******************************************************************************************* */
@@ -15,20 +21,23 @@ private int fontSize( int size, boolean isNS ) {
 
 Perl5Util re = new Perl5Util() ;
 
+String cp = request.getContextPath() ;
+
 /* Check browser */
 
-String uAgent = request.getHeader("USER-AGENT") ;
-boolean isIE  = re.match("/(MSIE 4|MSIE 5|MSIE 5\\.5|MSIE 6|MSIE 7)/i", uAgent) ;
-boolean isGecko = re.match("/Gecko/i", uAgent) ;
-boolean isNS  = re.match("/Mozilla/i", uAgent) && !isGecko && !isIE ;
+String uAgent    = StringUtils.defaultString(request.getHeader("USER-AGENT")).toLowerCase() ;
+boolean isIE     = re.match("/(msie \\d)/i", uAgent) ;
+boolean isGecko  = re.match("/gecko/i", uAgent) ;
+boolean isWebKit = re.match("/webkit/i", uAgent) ;
+boolean isNS     = !isIE && !isGecko && !isWebKit && re.match("/mozilla/i", uAgent) ;
 
-String BORDER_COLOR_NORMAL     = "#668DB6 #000000 #000000 #668DB6" ;
-String BORDER_COLOR_NORMAL_SUB = "#668DB6 #999999 #999999 #668DB6" ;
-String BORDER_COLOR_NORMAL_ACT = "#000000 #668DB6 #668DB6 #000000" ;
-String BORDER_COLOR_DISABLED   = "#DAE4EF #999999 #999999 #DAE4EF" ;
+String BORDER_COLOR_NORMAL     = "#668db6 #000 #000 #668db6" ;
+String BORDER_COLOR_NORMAL_SUB = "#668db6 #999 #999 #668db6" ;
+String BORDER_COLOR_NORMAL_ACT = "#000 #668db6 #668db6 #000" ;
+String BORDER_COLOR_DISABLED   = "#dae4ef #999 #999 #dae4ef" ;
 
 if (isGecko) {
-	BORDER_COLOR_NORMAL   = "#466D96 #333333 #333333 #466D96" ;
+	BORDER_COLOR_NORMAL   = "#466d96 #333 #333 #466d96" ;
 }
 
 /* *******************************************************************************************
@@ -39,34 +48,38 @@ if (isGecko) {
 	font-weight: bold;
 	font-size: <%= fontSize(17, isNS) %>px;
 	font-family: Tahoma,Arial,Verdana,sans-serif;
-	color: #ffffff;
-	padding: 5 0 0 0;
+	color: #fff;
+	padding: 5px 0 0 0;
 }
 
 .imcmsAdmHeading {
 	font-weight: bold;
 	font-size: <%= fontSize(11, isNS) %>px;
 	font-family: Tahoma,Arial,sans-serif;
-	color: #20568D;
-	padding: 5 0 0 0;
+	color: #20568d;
+	padding: 5px 0 0 0;
 }
 
 .imcmsAdmText, .imcmsAdmTable TD, INPUT, SELECT, TEXTAREA, .imcmsAdmForm {
 	font-size: <%= fontSize(11, isNS) %>px;
 	font-family: Tahoma,Arial,sans-serif;
-	color: #000000;
+	color: #000;
+}
+TEXTAREA.FileAdminEditEditor {
+	font: 11px "Courier New", Courier, monospace;
+	overflow: auto;
 }
 
 .imcmsAdmComment, .imcmsAdmTable .imcmsAdmComment, .imcmsAdmTextSmall, .imcmsAdmTable .imcmsAdmTextSmall, .imcmsAdmFormSmall {
 	font-size: <%= fontSize(10, isNS) %>px;
 	font-family: Tahoma,Arial,sans-serif;
-	color: #000000;
+	color: #000;
 }
 
 .imcmsAdmDim, .imcmsAdmTable .imcmsAdmDim {
 	font-size: <%= fontSize(10, isNS) %>px;
 	font-family: Tahoma,Arial,sans-serif;
-	color: #999999;
+	color: #999;
 }
 
 <%  /* DocFoot notations */ %>
@@ -74,13 +87,56 @@ if (isGecko) {
 .imNote {
 	font-size: <%= fontSize(10, isNS) %>px;
 	font-family: Tahoma,Arial,sans-serif;
-	color: #cc0000;
+	color: #c00;
 }
 
 .imNoteComment {
 	font-size: <%= fontSize(10, isNS) %>px;
 	font-family: Tahoma,Arial,sans-serif;
-	color: #999999;
+	color: #999;
+}
+
+#imcms-login-container-tabs{
+    border-bottom: 1px solid #20568d;
+}
+.imcms-typed-form-container{
+    margin-top:10px;
+}
+.imcms-tab{
+    text-align:center;
+    color: #fff;
+    font-size: 12px;
+    font-family: Tahoma, Arial, sans-serif;
+    margin-left:10px;
+    float:left;
+    background-color:#20568d;
+    width:100px;
+    height:21px;
+    line-height:21px;
+    border-top:1px solid #20568d;
+    border-left:1px solid #20568d;
+    border-right:1px solid #20568d;
+}
+.imcms-tab-active{
+    position:relative;
+    color: #000;
+    top: 1px;
+    border-top:1px solid #20568d;
+    border-left:1px solid #20568d;
+    border-right:1px solid #20568d;
+    border-bottom:0px solid #f5f5f7;
+    margin-left :10px;
+    float:left;
+    background-color:#f5f5f7;
+    width:100px;
+    height:21px;
+    line-height:21px;
+}
+
+iframe{
+    border:none;
+    width:100%;
+    height:100%;
 }
 
 <%
@@ -88,9 +144,10 @@ if (isGecko) {
  *         BG Colors                                                                         *
  ******************************************************************************************* */ %>
 
-.imcmsAdmBgHead { background-color:#20568D; color:#ffffff; }
-.imcmsAdmBgCont { background-color:#f5f5f7; color:#000000; }
+.imcmsAdmBgHead { background-color:#20568d; color:#fff; }
+.imcmsAdmBgCont { background-color:#f5f5f7; color:#000; }
 .imcmsAdmBorder { background-color:#e1ded9; }
+input.imcmsDisabled { background-color:#ccc; }
 
 <%
 /* *******************************************************************************************
@@ -102,98 +159,188 @@ if (isNS) { %>
 .imcmsFormBtn, .imcmsFormBtnActive, .imcmsFormBtnDisabled, .imcmsAdmTable TD .imcmsFormBtn {
 	font-size: 12px;
 	font-family: Tahoma, Arial, sans-serif;
-	color: #ffffff;
+	color: #000;
 }
 
 .imcmsFormBtnSmall, .imcmsFormBtnSmallDisabled {
 	font-size: 11px;
 	font-family: Tahoma, Arial, sans-serif;
-	color: #ffffff;
+	color: #000;
 }<%
 } else { %>
 
 <% /* Normal */ %>
 
 .imcmsFormBtn {
-	background-color: #20568D;
-	color: #ffffff;
+	background-color: #20568d;
+	color: #fff;
 	font: 11px Tahoma, Arial, sans-serif;
-	border: <%= isGecko ? 1 : 2 %>px outset #668DB6;
+	border: <%= isGecko ? 1 : 2 %>px outset #668db6;
 	border-color: <%= BORDER_COLOR_NORMAL %>;
 	cursor:pointer;
-	padding: <%= isGecko ? 3 : 2 %> 8; }
+	padding: <%= isGecko ? 3 : 2 %>px 8px; }
 
 .imcmsFormBtnSub {
-	background-color: #4076ad;
-	color: #ffffff;
+	background-color: #4076AD;
+	color: #fff;
 	font: 11px Tahoma, Arial, sans-serif;
-	border: <%= isGecko ? 1 : 2 %>px outset #668DB6;
+	border: <%= isGecko ? 1 : 2 %>px outset #668db6;
 	border-color: <%= BORDER_COLOR_NORMAL_SUB %>;
 	cursor:pointer;
-	padding: <%= isGecko ? 3 : 2 %> 8; }
+	padding: <%= isGecko ? 3 : 2 %>px 8px; }
 
 .imcmsFormBtnActive {
-	background-color: #30669D;
-	color: #ffffff;
+	background-color: #30669d;
+	color: #fff;
 	font: 11px Tahoma, Arial, sans-serif;
-	border: <%= isGecko ? 1 : 2 %>px inset #668DB6;
+	border: <%= isGecko ? 1 : 2 %>px inset #668db6;
 	border-color: <%= BORDER_COLOR_NORMAL_ACT %>;
 	cursor:pointer;
-	padding: 3 8 1 8; }
+	padding: 3px 8px 1px 8px; }
 
 .imcmsFormBtnDisabled {
-	background-color: #B8C6D5;
-	color: #ffffff;
+	background-color: #b8c6d5;
+	color: #fff;
 	font: 11px Tahoma, Arial, sans-serif;
-	border: <%= isGecko ? 1 : 2 %>px outset #DAE4EF;
+	border: <%= isGecko ? 1 : 2 %>px outset #dae4ef;
 	border-color: <%= BORDER_COLOR_DISABLED %>;
-	cursor:pointer;
-	padding: <%= isGecko ? 3 : 2 %> 8; }
+	cursor:default;
+	padding: <%= isGecko ? 3 : 2 %>px 8px; }
 
 .imcmsFormBtnSubDisabled {
-	background-color: #B8C6D5;
-	color: #ffffff;
+	background-color: #b8c6d5;
+	color: #fff;
 	font: 11px Tahoma, Arial, sans-serif;
-	border: <%= isGecko ? 1 : 2 %>px outset #DAE4EF;
+	border: <%= isGecko ? 1 : 2 %>px outset #dae4ef;
 	border-color: <%= BORDER_COLOR_DISABLED %>;
 	cursor:pointer;
-	padding: <%= isGecko ? 3 : 2 %> 8; }
+	padding: <%= isGecko ? 3 : 2 %>px 8px; }
 
 <% /* Small */ %>
 
 .imcmsFormBtnSmall {
-	background-color: #20568D;
-	color: #ffffff;
+	background-color: #20568d;
+	color: #fff;
 	font: 10px Tahoma, Arial, sans-serif;
-	border: <%= isGecko ? 1 : 2 %>px outset #668DB6;
+	border: <%= isGecko ? 1 : 2 %>px outset #668db6;
 	border-color: <%= BORDER_COLOR_NORMAL %>;
 	cursor:pointer;
-	padding: <%= isGecko ? 1 : 0 %> 2; }
+	padding: <%= isGecko ? 1 : 0 %>px 2px; }
 
 .imcmsFormBtnSmallDisabled {
-	background-color: #B8C6D5;
-	color: #ffffff;
+	background-color: #b8c6d5;
+	color: #fff;
 	font: 10px Tahoma, Arial, sans-serif;
-	border: <%= isGecko ? 1 : 2 %>px outset #DAE4EF;
+	border: <%= isGecko ? 1 : 2 %>px outset #dae4ef;
 	border-color: <%= BORDER_COLOR_DISABLED %>;
-	cursor:pointer;
-	padding: <%= isGecko ? 1 : 0 %> 2; }<%
+	cursor:default;
+	padding: <%= isGecko ? 1 : 0 %>px 2px; }<%
+} %>
+
+.multiselect {
+    width: 100px;
+}
+
+.selectBox {
+    position: relative;
+}
+
+.selectBox select {
+    width: 100%;
+    font-weight: bold;
+}
+
+.overSelect {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+
+#checkboxes {
+    display: none;
+    border: 1px #dadada solid;
+}
+
+#checkboxes label {
+    display: block;
+}
+
+#checkboxes label:hover {
+    background-color: #1e90ff;
+}
+
+#linkSaveRoles {
+    display: none;
+}
+
+<% /* Medium - Used as extra, to get higher buttons: class=" imcmsFormBtnSmall imcmsFormBtnMedium" */ %>
+
+.imcmsFormBtnMedium {
+	padding: <%= isGecko ? 3 : 2 %>px 2px; }
+
+
+.imcmsFormBtnCancel {
+	background-color: #dc4d4d;
+	border-color: #dc4d4d;
+}
+
+.imcmsFormBtnDefault {
+	background-color: #61b863;
+	border-color: #61b863;
+}
+
+#validateBtn {
+	padding-left: 20px;
+	background-position: 0 -3px !important;
+	background-repeat: no-repeat;
+	cursor: pointer;<%--
+	filter: alpha(opacity=80);
+	-moz-opacity: 0.8;
+	-khtml-opacity: 0.8;
+	opacity: 0.8;--%>
 }
 
+.iconValidate_pending {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_validate_pending.gif);
+}
+.iconValidate_true {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_validate_true.gif);
+}
+.iconValidate_false {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_validate_false.gif);
+}
+
+#menuItems .ui-sortable-handle {
+	width: 50px;
+	height: 20px;
+	margin: 0;
+	padding: 0;
+	cursor: move;
+	background: transparent url(<%= cp %>/imcms/images/icons/icon_move.gif) 50% 50% no-repeat;
+}
+#handleHeading {
+	width: 50px;
+	margin: 0;
+	padding: 0 0 5px 0;
+	font-weight: bold;
+}
+
+<%
 /* *******************************************************************************************
  *         Misc                                                                              *
  ******************************************************************************************* */ %>
 
-.red   { color:#cc0000; }
-.white { color:#ffffff; }
-.lighterBlue { color:#20568D;}
+.red   { color:#c00; }
+.white { color:#fff; }
+.lighterBlue { color:#20568d;}
 
 .error { color: red; }
 
 BODY {
-	margin: 30 10;
+	margin: 30px 10px;
 	background-color:#efece7;
-	overflow: -moz-scrollbars-vertical;
 }
 
 TH   { text-align: left; }
@@ -216,9 +363,128 @@ SPAN.NavBtnTextAct, SPAN.NavBtnTextAct A:link, SPAN.NavBtnTextAct A:visited, SPA
 
 SPAN.NavBtnTextInact, SPAN.NavBtnTextInact A:link, SPAN.NavBtnTextInact A:visited, SPAN.NavBtnTextInact A:hover {
 	font: 10px Verdana, Geneva, Helvetica, sans-serif;
-	color:#ffffff;
+	color:#fff;
 	text-decoration:none;
 }
 
 TD.NavBtnTextAct   { cursor: default; }
 TD.NavBtnTextInact { cursor: pointer; }
+
+
+/* *******************************************************************************************
+ *         toolTip                                                                           *
+ ******************************************************************************************* */
+
+#toolTipPop {
+	position: absolute !important;
+	border: 1px solid #000 !important;
+	border-radius: 4px !important;
+	<%= isGecko ? "-moz-border-radius: 4px !important;" : "" %>
+	<%= isWebKit ? "-webkit-border-radius: 4px !important;" : "" %>
+	padding: 5px 5px 5px 25px !important;
+	font: 11px Verdana,Geneva,sans-serif !important;
+	color: #000 !important;
+	text-shadow: 0 1px 0 #ccc !important;
+	text-align: left !important;
+	background: #fff url(<%= cp %>/imcms/images/icons/icon_info.gif) 4px 5px no-repeat !important;
+	z-index: 20000010 !important;
+	display: none;
+}
+
+/* *******************************************************************************************
+ *         export checkmark statuses                                                         *
+ ******************************************************************************************* */
+.checkmark {
+	display: inline-block;
+	width: 25px;
+	height: 18px;
+	-ms-transform: rotate(45deg); /* IE 9 */
+	-webkit-transform: rotate(45deg); /* Chrome, Safari, Opera */
+	transform: rotate(45deg);
+}
+
+.checkmark:before {
+	content: "";
+	position: absolute;
+	background-color: green;
+	width: 3px;
+	height: 9px;
+	left: 11px;
+	top: 6px;
+}
+
+.checkmark:after {
+	content: "";
+	position: absolute;
+	width: 3px;
+	background-color: green;
+	height: 3px;
+	left: 8px;
+	top: 12px;
+}
+
+.close {
+	width: 16px;
+	height: 16px;
+	position: relative;
+	display: inline-block;
+}
+
+.close:after {
+	background-color: red;
+	content: '';
+	height: 16px;
+	position: absolute;
+	width: 2px;
+	transform: rotate(45deg);
+	left: 9px;
+}
+
+.close:before {
+	background-color: red;
+	content: '';
+	width: 2px;
+	height: 16px;
+	position: absolute;
+	transform: rotate(-45deg);
+	left: 9px;
+}
+
+.loading-animation {
+	position: relative;
+	left: 7px;
+	top: 19px;
+	width: 25px;
+	height: 25px;
+	text-align: center;
+	font-size: 14px;
+}
+
+.loading-animation::before {
+	content: '';
+	position: absolute;
+	left: -7px;
+	top: -19px;
+	width: 100%;
+	height: 100%;
+	border: 4px solid #d4d4d4;
+	border-top: 4px solid #20568d;
+	border-radius: 50%;
+	animation: spin 1.5s linear infinite;
+}
+
+#documentsTable>tbody{
+	display: block;
+	height: 550px;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
+
+@keyframes spin {
+	0% {
+		transform: rotate(0deg);
+	}
+	100% {
+		transform: rotate(360deg);
+	}
+}
diff --git a/web/imcms/css/imcms_jquery-ui.css.jsp b/web/imcms/css/imcms_jquery-ui.css.jsp
new file mode 100644
index 0000000000..10ea217a5f
--- /dev/null
+++ b/web/imcms/css/imcms_jquery-ui.css.jsp
@@ -0,0 +1,1154 @@
+<%@ page
+
+	contentType="text/css"
+	pageEncoding="UTF-8"
+	
+%>
+/*
+ * imCMS version of: https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/redmond/jquery-ui.css
+ * Has .imcmsAdmin.ui-... before everything, so it won't collide with site's jquery-ui.css
+ * So it needs the imcmsAdmin class on every feature.
+ * <%-- Generate in imcms4_admin.css.jsp --%>
+ */
+
+	/*
+	 * jQuery UI CSS Framework 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Theming/API
+	 */
+
+	/* Layout helpers
+	----------------------------------*/
+	.imcmsAdmin.ui-helper-hidden { display: none; }
+	.imcmsAdmin.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+	.imcmsAdmin.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+	.imcmsAdmin.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+	.imcmsAdmin.ui-helper-clearfix { display: inline-block; }
+	/* required comment for clearfix to work in Opera \*/
+	* html .ui-helper-clearfix { height:1%; }
+	.imcmsAdmin.ui-helper-clearfix { display:block; }
+	/* end clearfix */
+	.imcmsAdmin.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+	/* Interaction Cues
+	----------------------------------*/
+	.imcmsAdmin.ui-state-disabled { cursor: default !important; }
+
+
+	/* Icons
+	----------------------------------*/
+
+	/* states and images */
+	.imcmsAdmin.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+	/* Misc visuals
+	----------------------------------*/
+
+	/* Overlays */
+	.imcmsAdmin.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+	/*
+	 * jQuery UI CSS Framework 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Theming/API
+	 *
+	 * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+	 */
+
+
+	/* Component containers
+	----------------------------------*/
+	.imcmsAdmin.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
+	.imcmsAdmin.ui-widget .ui-widget { font-size: 1em; }
+	.imcmsAdmin.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
+	.imcmsAdmin.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
+	.imcmsAdmin.ui-widget-content a { color: #222222; }
+	.imcmsAdmin.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+	.imcmsAdmin.ui-widget-header a { color: #ffffff; }
+
+	/* Interaction states
+	----------------------------------*/
+	.imcmsAdmin.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
+	.imcmsAdmin.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
+	.imcmsAdmin.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
+	.imcmsAdmin.ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; }
+	.imcmsAdmin.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; }
+	.imcmsAdmin.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; }
+	.imcmsAdmin.ui-widget :active { outline: none; }
+
+	/* Interaction Cues
+	----------------------------------*/
+	.imcmsAdmin.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; }
+	.imcmsAdmin.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+	.imcmsAdmin.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+	.imcmsAdmin.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+	.imcmsAdmin.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+	.imcmsAdmin.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+	.imcmsAdmin.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+	.imcmsAdmin.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+	/* Icons
+	----------------------------------*/
+
+	/* states and images */
+	.imcmsAdmin.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); }
+	.imcmsAdmin.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); }
+	.imcmsAdmin.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
+	.imcmsAdmin.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); }
+	.imcmsAdmin.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); }
+	.imcmsAdmin.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); }
+	.imcmsAdmin.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+	.imcmsAdmin.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+	/* positioning */
+	.imcmsAdmin.ui-icon-carat-1-n { background-position: 0 0; }
+	.imcmsAdmin.ui-icon-carat-1-ne { background-position: -16px 0; }
+	.imcmsAdmin.ui-icon-carat-1-e { background-position: -32px 0; }
+	.imcmsAdmin.ui-icon-carat-1-se { background-position: -48px 0; }
+	.imcmsAdmin.ui-icon-carat-1-s { background-position: -64px 0; }
+	.imcmsAdmin.ui-icon-carat-1-sw { background-position: -80px 0; }
+	.imcmsAdmin.ui-icon-carat-1-w { background-position: -96px 0; }
+	.imcmsAdmin.ui-icon-carat-1-nw { background-position: -112px 0; }
+	.imcmsAdmin.ui-icon-carat-2-n-s { background-position: -128px 0; }
+	.imcmsAdmin.ui-icon-carat-2-e-w { background-position: -144px 0; }
+	.imcmsAdmin.ui-icon-triangle-1-n { background-position: 0 -16px; }
+	.imcmsAdmin.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+	.imcmsAdmin.ui-icon-triangle-1-e { background-position: -32px -16px; }
+	.imcmsAdmin.ui-icon-triangle-1-se { background-position: -48px -16px; }
+	.imcmsAdmin.ui-icon-triangle-1-s { background-position: -64px -16px; }
+	.imcmsAdmin.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+	.imcmsAdmin.ui-icon-triangle-1-w { background-position: -96px -16px; }
+	.imcmsAdmin.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+	.imcmsAdmin.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+	.imcmsAdmin.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+	.imcmsAdmin.ui-icon-arrow-1-n { background-position: 0 -32px; }
+	.imcmsAdmin.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+	.imcmsAdmin.ui-icon-arrow-1-e { background-position: -32px -32px; }
+	.imcmsAdmin.ui-icon-arrow-1-se { background-position: -48px -32px; }
+	.imcmsAdmin.ui-icon-arrow-1-s { background-position: -64px -32px; }
+	.imcmsAdmin.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+	.imcmsAdmin.ui-icon-arrow-1-w { background-position: -96px -32px; }
+	.imcmsAdmin.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+	.imcmsAdmin.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+	.imcmsAdmin.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+	.imcmsAdmin.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+	.imcmsAdmin.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+	.imcmsAdmin.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+	.imcmsAdmin.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+	.imcmsAdmin.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+	.imcmsAdmin.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+	.imcmsAdmin.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+	.imcmsAdmin.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+	.imcmsAdmin.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+	.imcmsAdmin.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+	.imcmsAdmin.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+	.imcmsAdmin.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+	.imcmsAdmin.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+	.imcmsAdmin.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+	.imcmsAdmin.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+	.imcmsAdmin.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+	.imcmsAdmin.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+	.imcmsAdmin.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+	.imcmsAdmin.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+	.imcmsAdmin.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+	.imcmsAdmin.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+	.imcmsAdmin.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+	.imcmsAdmin.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+	.imcmsAdmin.ui-icon-arrow-4 { background-position: 0 -80px; }
+	.imcmsAdmin.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+	.imcmsAdmin.ui-icon-extlink { background-position: -32px -80px; }
+	.imcmsAdmin.ui-icon-newwin { background-position: -48px -80px; }
+	.imcmsAdmin.ui-icon-refresh { background-position: -64px -80px; }
+	.imcmsAdmin.ui-icon-shuffle { background-position: -80px -80px; }
+	.imcmsAdmin.ui-icon-transfer-e-w { background-position: -96px -80px; }
+	.imcmsAdmin.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+	.imcmsAdmin.ui-icon-folder-collapsed { background-position: 0 -96px; }
+	.imcmsAdmin.ui-icon-folder-open { background-position: -16px -96px; }
+	.imcmsAdmin.ui-icon-document { background-position: -32px -96px; }
+	.imcmsAdmin.ui-icon-document-b { background-position: -48px -96px; }
+	.imcmsAdmin.ui-icon-note { background-position: -64px -96px; }
+	.imcmsAdmin.ui-icon-mail-closed { background-position: -80px -96px; }
+	.imcmsAdmin.ui-icon-mail-open { background-position: -96px -96px; }
+	.imcmsAdmin.ui-icon-suitcase { background-position: -112px -96px; }
+	.imcmsAdmin.ui-icon-comment { background-position: -128px -96px; }
+	.imcmsAdmin.ui-icon-person { background-position: -144px -96px; }
+	.imcmsAdmin.ui-icon-print { background-position: -160px -96px; }
+	.imcmsAdmin.ui-icon-trash { background-position: -176px -96px; }
+	.imcmsAdmin.ui-icon-locked { background-position: -192px -96px; }
+	.imcmsAdmin.ui-icon-unlocked { background-position: -208px -96px; }
+	.imcmsAdmin.ui-icon-bookmark { background-position: -224px -96px; }
+	.imcmsAdmin.ui-icon-tag { background-position: -240px -96px; }
+	.imcmsAdmin.ui-icon-home { background-position: 0 -112px; }
+	.imcmsAdmin.ui-icon-flag { background-position: -16px -112px; }
+	.imcmsAdmin.ui-icon-calendar { background-position: -32px -112px; }
+	.imcmsAdmin.ui-icon-cart { background-position: -48px -112px; }
+	.imcmsAdmin.ui-icon-pencil { background-position: -64px -112px; }
+	.imcmsAdmin.ui-icon-clock { background-position: -80px -112px; }
+	.imcmsAdmin.ui-icon-disk { background-position: -96px -112px; }
+	.imcmsAdmin.ui-icon-calculator { background-position: -112px -112px; }
+	.imcmsAdmin.ui-icon-zoomin { background-position: -128px -112px; }
+	.imcmsAdmin.ui-icon-zoomout { background-position: -144px -112px; }
+	.imcmsAdmin.ui-icon-search { background-position: -160px -112px; }
+	.imcmsAdmin.ui-icon-wrench { background-position: -176px -112px; }
+	.imcmsAdmin.ui-icon-gear { background-position: -192px -112px; }
+	.imcmsAdmin.ui-icon-heart { background-position: -208px -112px; }
+	.imcmsAdmin.ui-icon-star { background-position: -224px -112px; }
+	.imcmsAdmin.ui-icon-link { background-position: -240px -112px; }
+	.imcmsAdmin.ui-icon-cancel { background-position: 0 -128px; }
+	.imcmsAdmin.ui-icon-plus { background-position: -16px -128px; }
+	.imcmsAdmin.ui-icon-plusthick { background-position: -32px -128px; }
+	.imcmsAdmin.ui-icon-minus { background-position: -48px -128px; }
+	.imcmsAdmin.ui-icon-minusthick { background-position: -64px -128px; }
+	.imcmsAdmin.ui-icon-close { background-position: -80px -128px; }
+	.imcmsAdmin.ui-icon-closethick { background-position: -96px -128px; }
+	.imcmsAdmin.ui-icon-key { background-position: -112px -128px; }
+	.imcmsAdmin.ui-icon-lightbulb { background-position: -128px -128px; }
+	.imcmsAdmin.ui-icon-scissors { background-position: -144px -128px; }
+	.imcmsAdmin.ui-icon-clipboard { background-position: -160px -128px; }
+	.imcmsAdmin.ui-icon-copy { background-position: -176px -128px; }
+	.imcmsAdmin.ui-icon-contact { background-position: -192px -128px; }
+	.imcmsAdmin.ui-icon-image { background-position: -208px -128px; }
+	.imcmsAdmin.ui-icon-video { background-position: -224px -128px; }
+	.imcmsAdmin.ui-icon-script { background-position: -240px -128px; }
+	.imcmsAdmin.ui-icon-alert { background-position: 0 -144px; }
+	.imcmsAdmin.ui-icon-info { background-position: -16px -144px; }
+	.imcmsAdmin.ui-icon-notice { background-position: -32px -144px; }
+	.imcmsAdmin.ui-icon-help { background-position: -48px -144px; }
+	.imcmsAdmin.ui-icon-check { background-position: -64px -144px; }
+	.imcmsAdmin.ui-icon-bullet { background-position: -80px -144px; }
+	.imcmsAdmin.ui-icon-radio-off { background-position: -96px -144px; }
+	.imcmsAdmin.ui-icon-radio-on { background-position: -112px -144px; }
+	.imcmsAdmin.ui-icon-pin-w { background-position: -128px -144px; }
+	.imcmsAdmin.ui-icon-pin-s { background-position: -144px -144px; }
+	.imcmsAdmin.ui-icon-play { background-position: 0 -160px; }
+	.imcmsAdmin.ui-icon-pause { background-position: -16px -160px; }
+	.imcmsAdmin.ui-icon-seek-next { background-position: -32px -160px; }
+	.imcmsAdmin.ui-icon-seek-prev { background-position: -48px -160px; }
+	.imcmsAdmin.ui-icon-seek-end { background-position: -64px -160px; }
+	.imcmsAdmin.ui-icon-seek-start { background-position: -80px -160px; }
+	/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+	.imcmsAdmin.ui-icon-seek-first { background-position: -80px -160px; }
+	.imcmsAdmin.ui-icon-stop { background-position: -96px -160px; }
+	.imcmsAdmin.ui-icon-eject { background-position: -112px -160px; }
+	.imcmsAdmin.ui-icon-volume-off { background-position: -128px -160px; }
+	.imcmsAdmin.ui-icon-volume-on { background-position: -144px -160px; }
+	.imcmsAdmin.ui-icon-power { background-position: 0 -176px; }
+	.imcmsAdmin.ui-icon-signal-diag { background-position: -16px -176px; }
+	.imcmsAdmin.ui-icon-signal { background-position: -32px -176px; }
+	.imcmsAdmin.ui-icon-battery-0 { background-position: -48px -176px; }
+	.imcmsAdmin.ui-icon-battery-1 { background-position: -64px -176px; }
+	.imcmsAdmin.ui-icon-battery-2 { background-position: -80px -176px; }
+	.imcmsAdmin.ui-icon-battery-3 { background-position: -96px -176px; }
+	.imcmsAdmin.ui-icon-circle-plus { background-position: 0 -192px; }
+	.imcmsAdmin.ui-icon-circle-minus { background-position: -16px -192px; }
+	.imcmsAdmin.ui-icon-circle-close { background-position: -32px -192px; }
+	.imcmsAdmin.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+	.imcmsAdmin.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+	.imcmsAdmin.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+	.imcmsAdmin.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+	.imcmsAdmin.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+	.imcmsAdmin.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+	.imcmsAdmin.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+	.imcmsAdmin.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+	.imcmsAdmin.ui-icon-circle-zoomin { background-position: -176px -192px; }
+	.imcmsAdmin.ui-icon-circle-zoomout { background-position: -192px -192px; }
+	.imcmsAdmin.ui-icon-circle-check { background-position: -208px -192px; }
+	.imcmsAdmin.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+	.imcmsAdmin.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+	.imcmsAdmin.ui-icon-circlesmall-close { background-position: -32px -208px; }
+	.imcmsAdmin.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+	.imcmsAdmin.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+	.imcmsAdmin.ui-icon-squaresmall-close { background-position: -80px -208px; }
+	.imcmsAdmin.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+	.imcmsAdmin.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+	.imcmsAdmin.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+	.imcmsAdmin.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+	.imcmsAdmin.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+	.imcmsAdmin.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+	/* Misc visuals
+	----------------------------------*/
+
+	/* Corner radius */
+	.imcmsAdmin.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -khtml-border-top-left-radius: 5px; border-top-left-radius: 5px; }
+	.imcmsAdmin.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -khtml-border-top-right-radius: 5px; border-top-right-radius: 5px; }
+	.imcmsAdmin.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
+	.imcmsAdmin.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; -khtml-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
+
+	/* Overlays */
+	.imcmsAdmin.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+	.imcmsAdmin.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+	 * jQuery UI Resizable 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Resizable#theming
+	 */
+	.imcmsAdmin.ui-resizable { position: relative;}
+	.imcmsAdmin.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+	.imcmsAdmin.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+	.imcmsAdmin.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+	.imcmsAdmin.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+	.imcmsAdmin.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+	.imcmsAdmin.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+	.imcmsAdmin.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+	.imcmsAdmin.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+	.imcmsAdmin.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+	.imcmsAdmin.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+	 * jQuery UI Selectable 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Selectable#theming
+	 */
+	.imcmsAdmin.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+	/*
+	 * jQuery UI Accordion 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Accordion#theming
+	 */
+	/* IE/Win - Fix animation bug - #4615 */
+	.imcmsAdmin.ui-accordion { width: 100%; }
+	.imcmsAdmin.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+	.imcmsAdmin.ui-accordion .ui-accordion-li-fix { display: inline; }
+	.imcmsAdmin.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+	.imcmsAdmin.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+	.imcmsAdmin.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+	.imcmsAdmin.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+	.imcmsAdmin.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+	.imcmsAdmin.ui-accordion .ui-accordion-content-active { display: block; }
+	/*
+	 * jQuery UI Autocomplete 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Autocomplete#theming
+	 */
+	.imcmsAdmin.ui-autocomplete { position: absolute; cursor: default; }	
+
+	/* workarounds */
+	* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+	/*
+	 * jQuery UI Menu 1.8.16
+	 *
+	 * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Menu#theming
+	 */
+	.imcmsAdmin.ui-menu {
+		list-style:none;
+		padding: 2px;
+		margin: 0;
+		display:block;
+		float: left;
+	}
+	.imcmsAdmin.ui-menu .ui-menu {
+		margin-top: -3px;
+	}
+	.imcmsAdmin.ui-menu .ui-menu-item {
+		margin:0;
+		padding: 0;
+		zoom: 1;
+		float: left;
+		clear: left;
+		width: 100%;
+	}
+	.imcmsAdmin.ui-menu .ui-menu-item a {
+		text-decoration:none;
+		display:block;
+		padding:.2em .4em;
+		line-height:1.5;
+		zoom:1;
+	}
+	.imcmsAdmin.ui-menu .ui-menu-item a.ui-state-hover,
+	.imcmsAdmin.ui-menu .ui-menu-item a.ui-state-active {
+		font-weight: normal;
+		margin: -1px;
+	}
+	/*
+	 * jQuery UI Button 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Button#theming
+	 */
+	.imcmsAdmin.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+	.imcmsAdmin.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+	button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+	.imcmsAdmin.ui-button-icons-only { width: 3.4em; } 
+	button.ui-button-icons-only { width: 3.7em; } 
+
+	/*button text element */
+	.imcmsAdmin.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+	.imcmsAdmin.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+	.imcmsAdmin.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+	.imcmsAdmin.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+	.imcmsAdmin.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+	.imcmsAdmin.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+	/* no icon support for input elements, provide padding by default */
+	input.ui-button { padding: .4em 1em; }
+
+	/*button icon element(s) */
+	.imcmsAdmin.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+	.imcmsAdmin.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+	.imcmsAdmin.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+	.imcmsAdmin.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+	.imcmsAdmin.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+	/*button sets*/
+	.imcmsAdmin.ui-buttonset { margin-right: 7px; }
+	.imcmsAdmin.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+	/* workarounds */
+	button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+	/*
+	 * jQuery UI Dialog 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Dialog#theming
+	 */
+	.imcmsAdmin.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+	.imcmsAdmin.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+	.imcmsAdmin.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+	.imcmsAdmin.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+	.imcmsAdmin.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+	.imcmsAdmin.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+	.imcmsAdmin.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+	.imcmsAdmin.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+	.imcmsAdmin.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+	.imcmsAdmin.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+	.imcmsAdmin.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+	.imcmsAdmin.ui-draggable .ui-dialog-titlebar { cursor: move; }
+	/*
+	 * jQuery UI Slider 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Slider#theming
+	 */
+	.imcmsAdmin.ui-slider { position: relative; text-align: left; }
+	.imcmsAdmin.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+	.imcmsAdmin.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+	.imcmsAdmin.ui-slider-horizontal { height: .8em; }
+	.imcmsAdmin.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+	.imcmsAdmin.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+	.imcmsAdmin.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+	.imcmsAdmin.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+	.imcmsAdmin.ui-slider-vertical { width: .8em; height: 100px; }
+	.imcmsAdmin.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+	.imcmsAdmin.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+	.imcmsAdmin.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+	.imcmsAdmin.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+	 * jQuery UI Tabs 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Tabs#theming
+	 */
+	.imcmsAdmin.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	.imcmsAdmin.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+	.imcmsAdmin.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+	.imcmsAdmin.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+	.imcmsAdmin.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+	.imcmsAdmin.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+	.imcmsAdmin.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+	.imcmsAdmin.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+	.imcmsAdmin.ui-tabs .ui-tabs-hide { display: none !important; }
+	/*
+	 * jQuery UI Datepicker 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Datepicker#theming
+	 */
+	.imcmsAdmin.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-prev { left:2px; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-next { right:2px; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+	.imcmsAdmin.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+	.imcmsAdmin.ui-datepicker select.ui-datepicker-month, 
+	.imcmsAdmin.ui-datepicker select.ui-datepicker-year { width: 49%;}
+	.imcmsAdmin.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+	.imcmsAdmin.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+	.imcmsAdmin.ui-datepicker td { border: 0; padding: 1px; }
+	.imcmsAdmin.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+	.imcmsAdmin.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+	/* with multiple calendars */
+	.imcmsAdmin.ui-datepicker.ui-datepicker-multi { width:auto; }
+	.imcmsAdmin.ui-datepicker-multi .ui-datepicker-group { float:left; }
+	.imcmsAdmin.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+	.imcmsAdmin.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+	.imcmsAdmin.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+	.imcmsAdmin.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+	.imcmsAdmin.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+	.imcmsAdmin.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+	.imcmsAdmin.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+	.imcmsAdmin.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+	/* RTL support */
+	.imcmsAdmin.ui-datepicker-rtl { direction: rtl; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+	.imcmsAdmin.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+	/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+	.imcmsAdmin.ui-datepicker-cover {
+	    display: none; /*sorry for IE5*/
+	    display/**/: block; /*sorry for IE5*/
+	    position: absolute; /*must have*/
+	    z-index: -1; /*must have*/
+	    filter: mask(); /*must have*/
+	    top: -4px; /*must have*/
+	    left: -4px; /*must have*/
+	    width: 200px; /*must have*/
+	    height: 200px; /*must have*/
+	}/*
+	 * jQuery UI Progressbar 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Progressbar#theming
+	 */
+	.imcmsAdmin.ui-progressbar { height:2em; text-align: left; }
+	.imcmsAdmin.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+
+
+
+
+	/*
+	 * jQuery UI CSS Framework 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Theming/API
+	 */
+
+	/* Layout helpers
+	----------------------------------*/
+	.imcmsAdmin .ui-helper-hidden { display: none; }
+	.imcmsAdmin .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+	.imcmsAdmin .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+	.imcmsAdmin .ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+	.imcmsAdmin .ui-helper-clearfix { display: inline-block; }
+	/* required comment for clearfix to work in Opera \*/
+	* html .ui-helper-clearfix { height:1%; }
+	.imcmsAdmin .ui-helper-clearfix { display:block; }
+	/* end clearfix */
+	.imcmsAdmin .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+	/* Interaction Cues
+	----------------------------------*/
+	.imcmsAdmin .ui-state-disabled { cursor: default !important; }
+
+
+	/* Icons
+	----------------------------------*/
+
+	/* states and images */
+	.imcmsAdmin .ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+	/* Misc visuals
+	----------------------------------*/
+
+	/* Overlays */
+	.imcmsAdmin .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+	/*
+	 * jQuery UI CSS Framework 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Theming/API
+	 *
+	 * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+	 */
+
+
+	/* Component containers
+	----------------------------------*/
+	.imcmsAdmin .ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
+	.imcmsAdmin .ui-widget .ui-widget { font-size: 1em; }
+	.imcmsAdmin .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
+	.imcmsAdmin .ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
+	.imcmsAdmin .ui-widget-content a { color: #222222; }
+	.imcmsAdmin .ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+	.imcmsAdmin .ui-widget-header a { color: #ffffff; }
+
+	/* Interaction states
+	----------------------------------*/
+	.imcmsAdmin .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
+	.imcmsAdmin .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
+	.imcmsAdmin .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
+	.imcmsAdmin .ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; }
+	.imcmsAdmin .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; }
+	.imcmsAdmin .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; }
+	.imcmsAdmin .ui-widget :active { outline: none; }
+
+	/* Interaction Cues
+	----------------------------------*/
+	.imcmsAdmin .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; }
+	.imcmsAdmin .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+	.imcmsAdmin .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+	.imcmsAdmin .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+	.imcmsAdmin .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+	.imcmsAdmin .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+	.imcmsAdmin .ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+	.imcmsAdmin .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+	/* Icons
+	----------------------------------*/
+
+	/* states and images */
+	.imcmsAdmin .ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); }
+	.imcmsAdmin .ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); }
+	.imcmsAdmin .ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
+	.imcmsAdmin .ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); }
+	.imcmsAdmin .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); }
+	.imcmsAdmin .ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); }
+	.imcmsAdmin .ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+	.imcmsAdmin .ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+	/* positioning */
+	.imcmsAdmin .ui-icon-carat-1-n { background-position: 0 0; }
+	.imcmsAdmin .ui-icon-carat-1-ne { background-position: -16px 0; }
+	.imcmsAdmin .ui-icon-carat-1-e { background-position: -32px 0; }
+	.imcmsAdmin .ui-icon-carat-1-se { background-position: -48px 0; }
+	.imcmsAdmin .ui-icon-carat-1-s { background-position: -64px 0; }
+	.imcmsAdmin .ui-icon-carat-1-sw { background-position: -80px 0; }
+	.imcmsAdmin .ui-icon-carat-1-w { background-position: -96px 0; }
+	.imcmsAdmin .ui-icon-carat-1-nw { background-position: -112px 0; }
+	.imcmsAdmin .ui-icon-carat-2-n-s { background-position: -128px 0; }
+	.imcmsAdmin .ui-icon-carat-2-e-w { background-position: -144px 0; }
+	.imcmsAdmin .ui-icon-triangle-1-n { background-position: 0 -16px; }
+	.imcmsAdmin .ui-icon-triangle-1-ne { background-position: -16px -16px; }
+	.imcmsAdmin .ui-icon-triangle-1-e { background-position: -32px -16px; }
+	.imcmsAdmin .ui-icon-triangle-1-se { background-position: -48px -16px; }
+	.imcmsAdmin .ui-icon-triangle-1-s { background-position: -64px -16px; }
+	.imcmsAdmin .ui-icon-triangle-1-sw { background-position: -80px -16px; }
+	.imcmsAdmin .ui-icon-triangle-1-w { background-position: -96px -16px; }
+	.imcmsAdmin .ui-icon-triangle-1-nw { background-position: -112px -16px; }
+	.imcmsAdmin .ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+	.imcmsAdmin .ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+	.imcmsAdmin .ui-icon-arrow-1-n { background-position: 0 -32px; }
+	.imcmsAdmin .ui-icon-arrow-1-ne { background-position: -16px -32px; }
+	.imcmsAdmin .ui-icon-arrow-1-e { background-position: -32px -32px; }
+	.imcmsAdmin .ui-icon-arrow-1-se { background-position: -48px -32px; }
+	.imcmsAdmin .ui-icon-arrow-1-s { background-position: -64px -32px; }
+	.imcmsAdmin .ui-icon-arrow-1-sw { background-position: -80px -32px; }
+	.imcmsAdmin .ui-icon-arrow-1-w { background-position: -96px -32px; }
+	.imcmsAdmin .ui-icon-arrow-1-nw { background-position: -112px -32px; }
+	.imcmsAdmin .ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+	.imcmsAdmin .ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+	.imcmsAdmin .ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+	.imcmsAdmin .ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+	.imcmsAdmin .ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+	.imcmsAdmin .ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+	.imcmsAdmin .ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+	.imcmsAdmin .ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+	.imcmsAdmin .ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+	.imcmsAdmin .ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+	.imcmsAdmin .ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+	.imcmsAdmin .ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+	.imcmsAdmin .ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+	.imcmsAdmin .ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+	.imcmsAdmin .ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+	.imcmsAdmin .ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+	.imcmsAdmin .ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+	.imcmsAdmin .ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+	.imcmsAdmin .ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+	.imcmsAdmin .ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+	.imcmsAdmin .ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+	.imcmsAdmin .ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+	.imcmsAdmin .ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+	.imcmsAdmin .ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+	.imcmsAdmin .ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+	.imcmsAdmin .ui-icon-arrow-4 { background-position: 0 -80px; }
+	.imcmsAdmin .ui-icon-arrow-4-diag { background-position: -16px -80px; }
+	.imcmsAdmin .ui-icon-extlink { background-position: -32px -80px; }
+	.imcmsAdmin .ui-icon-newwin { background-position: -48px -80px; }
+	.imcmsAdmin .ui-icon-refresh { background-position: -64px -80px; }
+	.imcmsAdmin .ui-icon-shuffle { background-position: -80px -80px; }
+	.imcmsAdmin .ui-icon-transfer-e-w { background-position: -96px -80px; }
+	.imcmsAdmin .ui-icon-transferthick-e-w { background-position: -112px -80px; }
+	.imcmsAdmin .ui-icon-folder-collapsed { background-position: 0 -96px; }
+	.imcmsAdmin .ui-icon-folder-open { background-position: -16px -96px; }
+	.imcmsAdmin .ui-icon-document { background-position: -32px -96px; }
+	.imcmsAdmin .ui-icon-document-b { background-position: -48px -96px; }
+	.imcmsAdmin .ui-icon-note { background-position: -64px -96px; }
+	.imcmsAdmin .ui-icon-mail-closed { background-position: -80px -96px; }
+	.imcmsAdmin .ui-icon-mail-open { background-position: -96px -96px; }
+	.imcmsAdmin .ui-icon-suitcase { background-position: -112px -96px; }
+	.imcmsAdmin .ui-icon-comment { background-position: -128px -96px; }
+	.imcmsAdmin .ui-icon-person { background-position: -144px -96px; }
+	.imcmsAdmin .ui-icon-print { background-position: -160px -96px; }
+	.imcmsAdmin .ui-icon-trash { background-position: -176px -96px; }
+	.imcmsAdmin .ui-icon-locked { background-position: -192px -96px; }
+	.imcmsAdmin .ui-icon-unlocked { background-position: -208px -96px; }
+	.imcmsAdmin .ui-icon-bookmark { background-position: -224px -96px; }
+	.imcmsAdmin .ui-icon-tag { background-position: -240px -96px; }
+	.imcmsAdmin .ui-icon-home { background-position: 0 -112px; }
+	.imcmsAdmin .ui-icon-flag { background-position: -16px -112px; }
+	.imcmsAdmin .ui-icon-calendar { background-position: -32px -112px; }
+	.imcmsAdmin .ui-icon-cart { background-position: -48px -112px; }
+	.imcmsAdmin .ui-icon-pencil { background-position: -64px -112px; }
+	.imcmsAdmin .ui-icon-clock { background-position: -80px -112px; }
+	.imcmsAdmin .ui-icon-disk { background-position: -96px -112px; }
+	.imcmsAdmin .ui-icon-calculator { background-position: -112px -112px; }
+	.imcmsAdmin .ui-icon-zoomin { background-position: -128px -112px; }
+	.imcmsAdmin .ui-icon-zoomout { background-position: -144px -112px; }
+	.imcmsAdmin .ui-icon-search { background-position: -160px -112px; }
+	.imcmsAdmin .ui-icon-wrench { background-position: -176px -112px; }
+	.imcmsAdmin .ui-icon-gear { background-position: -192px -112px; }
+	.imcmsAdmin .ui-icon-heart { background-position: -208px -112px; }
+	.imcmsAdmin .ui-icon-star { background-position: -224px -112px; }
+	.imcmsAdmin .ui-icon-link { background-position: -240px -112px; }
+	.imcmsAdmin .ui-icon-cancel { background-position: 0 -128px; }
+	.imcmsAdmin .ui-icon-plus { background-position: -16px -128px; }
+	.imcmsAdmin .ui-icon-plusthick { background-position: -32px -128px; }
+	.imcmsAdmin .ui-icon-minus { background-position: -48px -128px; }
+	.imcmsAdmin .ui-icon-minusthick { background-position: -64px -128px; }
+	.imcmsAdmin .ui-icon-close { background-position: -80px -128px; }
+	.imcmsAdmin .ui-icon-closethick { background-position: -96px -128px; }
+	.imcmsAdmin .ui-icon-key { background-position: -112px -128px; }
+	.imcmsAdmin .ui-icon-lightbulb { background-position: -128px -128px; }
+	.imcmsAdmin .ui-icon-scissors { background-position: -144px -128px; }
+	.imcmsAdmin .ui-icon-clipboard { background-position: -160px -128px; }
+	.imcmsAdmin .ui-icon-copy { background-position: -176px -128px; }
+	.imcmsAdmin .ui-icon-contact { background-position: -192px -128px; }
+	.imcmsAdmin .ui-icon-image { background-position: -208px -128px; }
+	.imcmsAdmin .ui-icon-video { background-position: -224px -128px; }
+	.imcmsAdmin .ui-icon-script { background-position: -240px -128px; }
+	.imcmsAdmin .ui-icon-alert { background-position: 0 -144px; }
+	.imcmsAdmin .ui-icon-info { background-position: -16px -144px; }
+	.imcmsAdmin .ui-icon-notice { background-position: -32px -144px; }
+	.imcmsAdmin .ui-icon-help { background-position: -48px -144px; }
+	.imcmsAdmin .ui-icon-check { background-position: -64px -144px; }
+	.imcmsAdmin .ui-icon-bullet { background-position: -80px -144px; }
+	.imcmsAdmin .ui-icon-radio-off { background-position: -96px -144px; }
+	.imcmsAdmin .ui-icon-radio-on { background-position: -112px -144px; }
+	.imcmsAdmin .ui-icon-pin-w { background-position: -128px -144px; }
+	.imcmsAdmin .ui-icon-pin-s { background-position: -144px -144px; }
+	.imcmsAdmin .ui-icon-play { background-position: 0 -160px; }
+	.imcmsAdmin .ui-icon-pause { background-position: -16px -160px; }
+	.imcmsAdmin .ui-icon-seek-next { background-position: -32px -160px; }
+	.imcmsAdmin .ui-icon-seek-prev { background-position: -48px -160px; }
+	.imcmsAdmin .ui-icon-seek-end { background-position: -64px -160px; }
+	.imcmsAdmin .ui-icon-seek-start { background-position: -80px -160px; }
+	/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+	.imcmsAdmin .ui-icon-seek-first { background-position: -80px -160px; }
+	.imcmsAdmin .ui-icon-stop { background-position: -96px -160px; }
+	.imcmsAdmin .ui-icon-eject { background-position: -112px -160px; }
+	.imcmsAdmin .ui-icon-volume-off { background-position: -128px -160px; }
+	.imcmsAdmin .ui-icon-volume-on { background-position: -144px -160px; }
+	.imcmsAdmin .ui-icon-power { background-position: 0 -176px; }
+	.imcmsAdmin .ui-icon-signal-diag { background-position: -16px -176px; }
+	.imcmsAdmin .ui-icon-signal { background-position: -32px -176px; }
+	.imcmsAdmin .ui-icon-battery-0 { background-position: -48px -176px; }
+	.imcmsAdmin .ui-icon-battery-1 { background-position: -64px -176px; }
+	.imcmsAdmin .ui-icon-battery-2 { background-position: -80px -176px; }
+	.imcmsAdmin .ui-icon-battery-3 { background-position: -96px -176px; }
+	.imcmsAdmin .ui-icon-circle-plus { background-position: 0 -192px; }
+	.imcmsAdmin .ui-icon-circle-minus { background-position: -16px -192px; }
+	.imcmsAdmin .ui-icon-circle-close { background-position: -32px -192px; }
+	.imcmsAdmin .ui-icon-circle-triangle-e { background-position: -48px -192px; }
+	.imcmsAdmin .ui-icon-circle-triangle-s { background-position: -64px -192px; }
+	.imcmsAdmin .ui-icon-circle-triangle-w { background-position: -80px -192px; }
+	.imcmsAdmin .ui-icon-circle-triangle-n { background-position: -96px -192px; }
+	.imcmsAdmin .ui-icon-circle-arrow-e { background-position: -112px -192px; }
+	.imcmsAdmin .ui-icon-circle-arrow-s { background-position: -128px -192px; }
+	.imcmsAdmin .ui-icon-circle-arrow-w { background-position: -144px -192px; }
+	.imcmsAdmin .ui-icon-circle-arrow-n { background-position: -160px -192px; }
+	.imcmsAdmin .ui-icon-circle-zoomin { background-position: -176px -192px; }
+	.imcmsAdmin .ui-icon-circle-zoomout { background-position: -192px -192px; }
+	.imcmsAdmin .ui-icon-circle-check { background-position: -208px -192px; }
+	.imcmsAdmin .ui-icon-circlesmall-plus { background-position: 0 -208px; }
+	.imcmsAdmin .ui-icon-circlesmall-minus { background-position: -16px -208px; }
+	.imcmsAdmin .ui-icon-circlesmall-close { background-position: -32px -208px; }
+	.imcmsAdmin .ui-icon-squaresmall-plus { background-position: -48px -208px; }
+	.imcmsAdmin .ui-icon-squaresmall-minus { background-position: -64px -208px; }
+	.imcmsAdmin .ui-icon-squaresmall-close { background-position: -80px -208px; }
+	.imcmsAdmin .ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+	.imcmsAdmin .ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+	.imcmsAdmin .ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+	.imcmsAdmin .ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+	.imcmsAdmin .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+	.imcmsAdmin .ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+	/* Misc visuals
+	----------------------------------*/
+
+	/* Corner radius */
+	.imcmsAdmin .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -khtml-border-top-left-radius: 5px; border-top-left-radius: 5px; }
+	.imcmsAdmin .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -khtml-border-top-right-radius: 5px; border-top-right-radius: 5px; }
+	.imcmsAdmin .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
+	.imcmsAdmin .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; -khtml-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
+
+	/* Overlays */
+	.imcmsAdmin .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+	.imcmsAdmin .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+	 * jQuery UI Resizable 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Resizable#theming
+	 */
+	.imcmsAdmin .ui-resizable { position: relative;}
+	.imcmsAdmin .ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+	.imcmsAdmin .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+	.imcmsAdmin .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+	.imcmsAdmin .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+	.imcmsAdmin .ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+	.imcmsAdmin .ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+	.imcmsAdmin .ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+	.imcmsAdmin .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+	.imcmsAdmin .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+	.imcmsAdmin .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+	 * jQuery UI Selectable 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Selectable#theming
+	 */
+	.imcmsAdmin .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+	/*
+	 * jQuery UI Accordion 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Accordion#theming
+	 */
+	/* IE/Win - Fix animation bug - #4615 */
+	.imcmsAdmin .ui-accordion { width: 100%; }
+	.imcmsAdmin .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+	.imcmsAdmin .ui-accordion .ui-accordion-li-fix { display: inline; }
+	.imcmsAdmin .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+	.imcmsAdmin .ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+	.imcmsAdmin .ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+	.imcmsAdmin .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+	.imcmsAdmin .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+	.imcmsAdmin .ui-accordion .ui-accordion-content-active { display: block; }
+	/*
+	 * jQuery UI Autocomplete 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Autocomplete#theming
+	 */
+	.imcmsAdmin .ui-autocomplete { position: absolute; cursor: default; }	
+
+	/* workarounds */
+	* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+	/*
+	 * jQuery UI Menu 1.8.16
+	 *
+	 * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Menu#theming
+	 */
+	.imcmsAdmin .ui-menu {
+		list-style:none;
+		padding: 2px;
+		margin: 0;
+		display:block;
+		float: left;
+	}
+	.imcmsAdmin .ui-menu .ui-menu {
+		margin-top: -3px;
+	}
+	.imcmsAdmin .ui-menu .ui-menu-item {
+		margin:0;
+		padding: 0;
+		zoom: 1;
+		float: left;
+		clear: left;
+		width: 100%;
+	}
+	.imcmsAdmin .ui-menu .ui-menu-item a {
+		text-decoration:none;
+		display:block;
+		padding:.2em .4em;
+		line-height:1.5;
+		zoom:1;
+	}
+	.imcmsAdmin .ui-menu .ui-menu-item a.ui-state-hover,
+	.imcmsAdmin .ui-menu .ui-menu-item a.ui-state-active {
+		font-weight: normal;
+		margin: -1px;
+	}
+	/*
+	 * jQuery UI Button 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Button#theming
+	 */
+	.imcmsAdmin .ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+	.imcmsAdmin .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+	button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+	.imcmsAdmin .ui-button-icons-only { width: 3.4em; } 
+	button.ui-button-icons-only { width: 3.7em; } 
+
+	/*button text element */
+	.imcmsAdmin .ui-button .ui-button-text { display: block; line-height: 1.4;  }
+	.imcmsAdmin .ui-button-text-only .ui-button-text { padding: .4em 1em; }
+	.imcmsAdmin .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+	.imcmsAdmin .ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+	.imcmsAdmin .ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+	.imcmsAdmin .ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+	/* no icon support for input elements, provide padding by default */
+	input.ui-button { padding: .4em 1em; }
+
+	/*button icon element(s) */
+	.imcmsAdmin .ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+	.imcmsAdmin .ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+	.imcmsAdmin .ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+	.imcmsAdmin .ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+	.imcmsAdmin .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+	/*button sets*/
+	.imcmsAdmin .ui-buttonset { margin-right: 7px; }
+	.imcmsAdmin .ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+	/* workarounds */
+	button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+	/*
+	 * jQuery UI Dialog 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Dialog#theming
+	 */
+	.imcmsAdmin .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+	.imcmsAdmin .ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+	.imcmsAdmin .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+	.imcmsAdmin .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+	.imcmsAdmin .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+	.imcmsAdmin .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+	.imcmsAdmin .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+	.imcmsAdmin .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+	.imcmsAdmin .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+	.imcmsAdmin .ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+	.imcmsAdmin .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+	.imcmsAdmin .ui-draggable .ui-dialog-titlebar { cursor: move; }
+	/*
+	 * jQuery UI Slider 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Slider#theming
+	 */
+	.imcmsAdmin .ui-slider { position: relative; text-align: left; }
+	.imcmsAdmin .ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+	.imcmsAdmin .ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+	.imcmsAdmin .ui-slider-horizontal { height: .8em; }
+	.imcmsAdmin .ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+	.imcmsAdmin .ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+	.imcmsAdmin .ui-slider-horizontal .ui-slider-range-min { left: 0; }
+	.imcmsAdmin .ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+	.imcmsAdmin .ui-slider-vertical { width: .8em; height: 100px; }
+	.imcmsAdmin .ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+	.imcmsAdmin .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+	.imcmsAdmin .ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+	.imcmsAdmin .ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+	 * jQuery UI Tabs 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Tabs#theming
+	 */
+	.imcmsAdmin .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	.imcmsAdmin .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+	.imcmsAdmin .ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+	.imcmsAdmin .ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+	.imcmsAdmin .ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+	.imcmsAdmin .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+	.imcmsAdmin .ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+	.imcmsAdmin .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+	.imcmsAdmin .ui-tabs .ui-tabs-hide { display: none !important; }
+	/*
+	 * jQuery UI Datepicker 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Datepicker#theming
+	 */
+	.imcmsAdmin .ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-prev { left:2px; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-next { right:2px; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-next-hover { right:1px; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+	.imcmsAdmin .ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+	.imcmsAdmin .ui-datepicker select.ui-datepicker-month, 
+	.imcmsAdmin .ui-datepicker select.ui-datepicker-year { width: 49%;}
+	.imcmsAdmin .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+	.imcmsAdmin .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+	.imcmsAdmin .ui-datepicker td { border: 0; padding: 1px; }
+	.imcmsAdmin .ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+	.imcmsAdmin .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+	/* with multiple calendars */
+	.imcmsAdmin .ui-datepicker.ui-datepicker-multi { width:auto; }
+	.imcmsAdmin .ui-datepicker-multi .ui-datepicker-group { float:left; }
+	.imcmsAdmin .ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+	.imcmsAdmin .ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+	.imcmsAdmin .ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+	.imcmsAdmin .ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+	.imcmsAdmin .ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+	.imcmsAdmin .ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+	.imcmsAdmin .ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+	.imcmsAdmin .ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+	/* RTL support */
+	.imcmsAdmin .ui-datepicker-rtl { direction: rtl; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-group { float:right; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+	.imcmsAdmin .ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+	/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+	.imcmsAdmin .ui-datepicker-cover {
+	    display: none; /*sorry for IE5*/
+	    display/**/: block; /*sorry for IE5*/
+	    position: absolute; /*must have*/
+	    z-index: -1; /*must have*/
+	    filter: mask(); /*must have*/
+	    top: -4px; /*must have*/
+	    left: -4px; /*must have*/
+	    width: 200px; /*must have*/
+	    height: 200px; /*must have*/
+	}/*
+	 * jQuery UI Progressbar 1.8.16
+	 *
+	 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+	 * Dual licensed under the MIT or GPL Version 2 licenses.
+	 * http://jquery.org/license
+	 *
+	 * http://docs.jquery.com/UI/Progressbar#theming
+	 */
+	.imcmsAdmin .ui-progressbar { height:2em; text-align: left; }
+	.imcmsAdmin .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+
diff --git a/web/imcms/css/imcms_jquery.contextMenu.css.jsp b/web/imcms/css/imcms_jquery.contextMenu.css.jsp
new file mode 100644
index 0000000000..1b151f5989
--- /dev/null
+++ b/web/imcms/css/imcms_jquery.contextMenu.css.jsp
@@ -0,0 +1,97 @@
+<%@ page
+
+	contentType="text/css"
+	pageEncoding="UTF-8"
+
+%><%
+
+String cp = request.getContextPath() ;
+
+%>
+
+/* Generic context menu styles */
+
+.imcmsContextMenu {
+	position: absolute;
+	width: 300px;
+	z-index: 99999999;
+	border: solid 1px #000;
+	background: #f1eded;
+	padding: 0;
+	margin: 0;
+	white-space: nowrap;
+	font: 11px Tahoma,Arial,Verdana,sans-serif;
+	display: none;
+}
+
+.imcmsContextMenu LI {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	text-align: left;
+}
+
+.imcmsContextMenu A {
+	display: block;
+	color: #333;
+	text-decoration: none;
+	line-height: 20px;
+	height: 20px;
+	outline: none;
+	padding: 1px 5px 1px 24px;
+	background: url(<%= cp %>/imcms/images/icons/icon_checked_false.gif) 5px 6px no-repeat;
+}
+
+.imcmsContextMenu LI.active A {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_checked_true.gif);
+}
+.imcmsContextMenu LI.action A {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_dot_arrow.gif);
+}
+
+.imcmsContextMenu LI.disabled A {
+	color: #aaa !important;
+	cursor: default;
+}
+.imcmsContextMenu LI.action.disabled A {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_dot_arrow.gif) !important;
+}
+
+.imcmsContextMenu LI.hover.disabled A {
+	background-color: transparent;
+}
+
+.imcmsContextMenu LI.separator {
+	border-top: solid 1px #fff;
+}
+
+.imcmsContextMenu LI.hover A {
+	color: #fff;
+	background-color: #20568d;<%-- #f6851c --%>
+}
+.imcmsContextMenu LI.hover.action A {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_dot_arrow_inv.gif);
+}
+
+.imcmsContextMenu LI#li_SHOW_HELP A {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_help.gif);
+}
+.imcmsContextMenu LI#li_SHOW_HELP.hover A {
+	background-image: url(<%= cp %>/imcms/images/icons/icon_help_inv.gif);
+}
+
+/*
+	Adding Icons
+	
+	You can add icons to the context menu by adding
+	classes to the respective LI element(s)
+*/
+/*
+.imcmsContextMenu LI.edit A { background-image: url(images/page_white_edit.png); }
+.imcmsContextMenu LI.cut A { background-image: url(images/cut.png); }
+.imcmsContextMenu LI.copy A { background-image: url(images/page_white_copy.png); }
+.imcmsContextMenu LI.paste A { background-image: url(images/page_white_paste.png); }
+.imcmsContextMenu LI.delete A { background-image: url(images/page_white_delete.png); }
+.imcmsContextMenu LI.quit A { background-image: url(images/door.png); }
+
+*/
diff --git a/web/imcms/docs/apisamples/document_search.jsp b/web/imcms/docs/apisamples/document_search.jsp
index 2018cd1b8c..f5680d0feb 100644
--- a/web/imcms/docs/apisamples/document_search.jsp
+++ b/web/imcms/docs/apisamples/document_search.jsp
@@ -1,16 +1,14 @@
 <%@ page import="com.imcode.imcms.api.*,
                  imcode.server.Imcms,
-                 org.apache.lucene.document.DateField,
-                 org.apache.lucene.index.Term,
-                 org.apache.lucene.search.BooleanQuery,
-                 org.apache.lucene.search.RangeQuery,
-                 org.apache.lucene.search.Sort,
-                 org.apache.lucene.search.SortField,
-                 org.apache.lucene.search.TermQuery,
-                 java.util.Calendar, java.util.Date"
+                 org.apache.lucene.document.DateTools,
+                 org.apache.lucene.index.Term, org.apache.lucene.search.BooleanClause.Occur"
          errorPage="error.jsp"
 
          contentType="text/html; charset=UTF-8"%>
+<%@ page import="org.apache.lucene.search.*" %>
+<%@ page import="org.apache.lucene.util.BytesRef" %>
+<%@ page import="java.util.Calendar" %>
+<%@ page import="java.util.Date" %>
 <%
 	response.setContentType( "text/html; charset=" + Imcms.DEFAULT_ENCODING);
 	ContentManagementSystem imcmsSystem = ContentManagementSystem.fromRequest( request );
@@ -50,7 +48,10 @@
         <ul>
         <%
             query = new LuceneQuery(new TermQuery(new Term("section", section.getName())));
-            query.setSort(new Sort(new String[] { "meta_headline_keyword", "meta_id" }));
+            query.setSort(new Sort(
+                    new SortField("meta_headline_keyword", SortField.Type.STRING),
+                    new SortField("meta_id", SortField.Type.STRING)
+            ));
             documents = documentService.search(query);
 
             if (0 == documents.length) { %>No hits.<% }
@@ -65,17 +66,23 @@
             and modified between 2004-01-01 and 2005-01-01, sorted by modified time, newest first.</h2>
         <ul>
         <%
-            BooleanQuery luceneQuery = new BooleanQuery();
-            luceneQuery.add(new TermQuery(new Term("text1", "test")), true, false);
+            BooleanQuery.Builder luceneQueryBuilder = new BooleanQuery.Builder();
+            luceneQueryBuilder.add(new TermQuery(new Term("text1", "test")), Occur.MUST);
             Calendar calendar = Calendar.getInstance();
             calendar.clear();
             calendar.set(2004,Calendar.JANUARY,1) ;
             Date startDate = calendar.getTime() ;
             calendar.set(2005, Calendar.JANUARY, 1) ;
             Date endDate = calendar.getTime() ;
-            luceneQuery.add(new RangeQuery(new Term("modified_datetime", DateField.dateToString(startDate)), new Term("modified_datetime", DateField.dateToString(endDate)), false), true, false);
-            query = new LuceneQuery(luceneQuery);
-            query.setSort(new Sort("modified_datetime"));
+            final TermRangeQuery termRangeQuery = new TermRangeQuery(
+                    "modified_datetime",
+                    new BytesRef(DateTools.dateToString(startDate, DateTools.Resolution.MINUTE)),
+                    new BytesRef(DateTools.dateToString(endDate, DateTools.Resolution.MINUTE)),
+                    false, false
+            );
+            luceneQueryBuilder.add(termRangeQuery, Occur.MUST);
+            query = new LuceneQuery(luceneQueryBuilder.build());
+            query.setSort(new Sort(new SortField("modified_datetime", SortField.Type.STRING)));
             documents = documentService.search(query);
 
             if (0 == documents.length) { %>No hits.<% }
@@ -96,7 +103,7 @@
                     <ul>
                     <%
                     query = new LuceneQuery(new TermQuery(new Term("category_id", ""+category.getId())));
-                    query.setSort(new Sort("publication_start_datetime"));
+                    query.setSort(new Sort(new SortField("publication_start_datetime", SortField.Type.STRING)));
                     documents = documentService.search(query);
 
                     if (0 == documents.length) { %>No hits.<% }
@@ -114,7 +121,7 @@
         <ul>
         <%
             query = new LuceneQuery(new TermQuery(new Term("parent_menu_id", "1001_1")));
-            query.setSort(new Sort(new SortField[] { new SortField("meta_headline_keyword"), new SortField("archived_datetime", true) }));
+            query.setSort(new Sort(new SortField("meta_headline_keyword", SortField.Type.STRING), new SortField("archived_datetime", SortField.Type.STRING, true)));
             documents = documentService.search(query);
 
             if (0 == documents.length) { %>No hits.<% }
@@ -128,13 +135,13 @@
             sorted with oldest publication start date first.</h2>
         <ul>
         <%
-            luceneQuery = new BooleanQuery();
-            luceneQuery.add(new TermQuery(new Term("status", ""+Document.PublicationStatus.NEW)), true, false) ;
-            Term lowerTerm = new Term("publication_start_datetime", DateField.MIN_DATE_STRING());
-            Term upperTerm = new Term("publication_start_datetime", DateField.dateToString(new Date()));
-            luceneQuery.add(new RangeQuery(lowerTerm, upperTerm, false), true, false);
-            query = new LuceneQuery(luceneQuery) ;
-            query.setSort(new Sort("publication_start_datetime"));
+            luceneQueryBuilder = new BooleanQuery.Builder();
+            luceneQueryBuilder.add(new TermQuery(new Term("status", ""+Document.PublicationStatus.NEW)), Occur.MUST) ;
+            final BytesRef lowerRef = new BytesRef("0");
+            final BytesRef upperRef = new BytesRef(DateTools.dateToString(new Date(), DateTools.Resolution.MINUTE));
+            luceneQueryBuilder.add(new TermRangeQuery("publication_start_datetime", lowerRef, upperRef, false, false), Occur.MUST);
+            query = new LuceneQuery(luceneQueryBuilder.build()) ;
+            query.setSort(new Sort(new SortField("publication_start_datetime", SortField.Type.STRING)));
             documents = documentService.search(query) ;
 
             if (0 == documents.length) { %>No hits.<% }
diff --git a/web/imcms/docs/apisamples/mail_send_file_document.jsp b/web/imcms/docs/apisamples/mail_send_file_document.jsp
index 8159817088..7fc2f4c289 100644
--- a/web/imcms/docs/apisamples/mail_send_file_document.jsp
+++ b/web/imcms/docs/apisamples/mail_send_file_document.jsp
@@ -1,40 +1,45 @@
 <%@ page import="com.imcode.imcms.api.*,
-java.util.*,
-                 org.apache.commons.lang.StringUtils" errorPage="error.jsp" %>
+				 org.apache.commons.lang.StringUtils" errorPage="error.jsp" %>
 <%
-ContentManagementSystem imcmsSystem = ContentManagementSystem.fromRequest( request );
-User currentLoggedinUser = imcmsSystem.getCurrentUser();
-DocumentService documentService = imcmsSystem.getDocumentService() ;
+	ContentManagementSystem imcmsSystem = ContentManagementSystem.fromRequest(request);
+	User currentLoggedinUser = imcmsSystem.getCurrentUser();
+	DocumentService documentService = imcmsSystem.getDocumentService();
 %>
 <html>
-    <head>
-        <title>imCMS Mail</title>
-    </head>
-    <body>
-        <%
-            String emailAddress = currentLoggedinUser.getEmailAddress();
-            if ( StringUtils.isBlank( emailAddress ) ) {
-                %>You don't have an e-mail-address set.<%
-            } else {
-                FileDocument fileDocument = null ;
-                String fileDocumentIdStr = request.getParameter( "id");
-                try {
-                    fileDocument = (FileDocument)documentService.getDocument( Integer.parseInt(fileDocumentIdStr)) ;
-                } catch (Exception ignored) {
-                }
-                if (null == fileDocument) {
-                    if (null != fileDocumentIdStr) {
-                        %>Not a filedocument-id: <%= fileDocumentIdStr %><br><%
-                    }
-                    %><form>Filedocument-id: <input type="text" name="id"><input type="submit" value="Send filedocument to <%= emailAddress %>."></form><%
-                } else {
-                    MailService mailService = imcmsSystem.getMailService() ;
-                    Mail mail = new Mail(emailAddress, new String[] { emailAddress }, "imCMS filedocument "+fileDocument.getId(), "Please see attachments." );
-                    mail.setAttachments( fileDocument.getFiles() );
-                    mailService.sendMail( mail );
-                    %>Filedocument <%= fileDocument.getId() %> sent to <%= emailAddress %>.<%
-                }
-            }
-        %>
-    </body>
+<head>
+	<title>imCMS Mail</title>
+</head>
+<body>
+<%
+	String emailAddress = currentLoggedinUser.getEmailAddress();
+	if (StringUtils.isBlank(emailAddress)) {
+%>You don't have an e-mail-address set.<%
+} else {
+	FileDocument fileDocument = null;
+	String fileDocumentIdStr = request.getParameter("id");
+	try {
+		fileDocument = (FileDocument) documentService.getDocument(Integer.parseInt(fileDocumentIdStr));
+	} catch (Exception ignored) {
+	}
+	if (null == fileDocument) {
+		if (null != fileDocumentIdStr) {
+%>Not a filedocument-id: <%= fileDocumentIdStr %><br><%
+	}
+%>
+<form>Filedocument-id:
+	<input type="text" name="id">
+	<input type="submit" value="Send filedocument to <%= emailAddress %>.">
+</form>
+<%
+} else {
+
+	MailService mailService = imcmsSystem.getMailService();
+	Mail mail = new Mail(emailAddress, new String[]{emailAddress}, "imCMS filedocument " + fileDocument.getId(), "Please see attachments.");
+	mail.setAttachments(fileDocument.getFiles());
+	mailService.sendMail(mail);
+%>Filedocument <%= fileDocument.getId() %> sent to <%= emailAddress %>.<%
+		}
+	}
+%>
+</body>
 </html>
\ No newline at end of file
diff --git a/web/imcms/images/icons/ajax-loader.gif b/web/imcms/images/icons/ajax-loader.gif
new file mode 100644
index 0000000000..0b0a960f85
Binary files /dev/null and b/web/imcms/images/icons/ajax-loader.gif differ
diff --git a/web/imcms/images/icons/icon_checked_false.gif b/web/imcms/images/icons/icon_checked_false.gif
new file mode 100644
index 0000000000..54a3f69996
Binary files /dev/null and b/web/imcms/images/icons/icon_checked_false.gif differ
diff --git a/web/imcms/images/icons/icon_checked_true.gif b/web/imcms/images/icons/icon_checked_true.gif
new file mode 100644
index 0000000000..5d6f42ae75
Binary files /dev/null and b/web/imcms/images/icons/icon_checked_true.gif differ
diff --git a/web/imcms/images/icons/icon_dot_arrow.gif b/web/imcms/images/icons/icon_dot_arrow.gif
new file mode 100644
index 0000000000..9b3413bfa9
Binary files /dev/null and b/web/imcms/images/icons/icon_dot_arrow.gif differ
diff --git a/web/imcms/images/icons/icon_dot_arrow_inv.gif b/web/imcms/images/icons/icon_dot_arrow_inv.gif
new file mode 100644
index 0000000000..f8cef97b11
Binary files /dev/null and b/web/imcms/images/icons/icon_dot_arrow_inv.gif differ
diff --git a/web/imcms/images/icons/icon_help.gif b/web/imcms/images/icons/icon_help.gif
new file mode 100644
index 0000000000..19dc1c0a65
Binary files /dev/null and b/web/imcms/images/icons/icon_help.gif differ
diff --git a/web/imcms/images/icons/icon_help_inv.gif b/web/imcms/images/icons/icon_help_inv.gif
new file mode 100644
index 0000000000..7e51e9f074
Binary files /dev/null and b/web/imcms/images/icons/icon_help_inv.gif differ
diff --git a/web/imcms/images/icons/icon_info.gif b/web/imcms/images/icons/icon_info.gif
new file mode 100644
index 0000000000..e3596caee5
Binary files /dev/null and b/web/imcms/images/icons/icon_info.gif differ
diff --git a/web/imcms/images/icons/icon_move.gif b/web/imcms/images/icons/icon_move.gif
new file mode 100644
index 0000000000..3e85275cda
Binary files /dev/null and b/web/imcms/images/icons/icon_move.gif differ
diff --git a/web/imcms/images/icons/icon_validate_false.gif b/web/imcms/images/icons/icon_validate_false.gif
new file mode 100644
index 0000000000..706ef1e429
Binary files /dev/null and b/web/imcms/images/icons/icon_validate_false.gif differ
diff --git a/web/imcms/images/icons/icon_validate_pending.gif b/web/imcms/images/icons/icon_validate_pending.gif
new file mode 100644
index 0000000000..f63593d7d1
Binary files /dev/null and b/web/imcms/images/icons/icon_validate_pending.gif differ
diff --git a/web/imcms/images/icons/icon_validate_true.gif b/web/imcms/images/icons/icon_validate_true.gif
new file mode 100644
index 0000000000..55e159858f
Binary files /dev/null and b/web/imcms/images/icons/icon_validate_true.gif differ
diff --git a/web/imcms/images/img_loading.gif b/web/imcms/images/img_loading.gif
new file mode 100644
index 0000000000..b0bf089aa5
Binary files /dev/null and b/web/imcms/images/img_loading.gif differ
diff --git a/web/imcms/images/zoom_actual_size.gif b/web/imcms/images/zoom_actual_size.gif
new file mode 100644
index 0000000000..1a85dd5117
Binary files /dev/null and b/web/imcms/images/zoom_actual_size.gif differ
diff --git a/web/imcms/images/zoom_fit.gif b/web/imcms/images/zoom_fit.gif
new file mode 100644
index 0000000000..d442f2e8a5
Binary files /dev/null and b/web/imcms/images/zoom_fit.gif differ
diff --git a/web/imcms/images/zoom_in.gif b/web/imcms/images/zoom_in.gif
new file mode 100644
index 0000000000..e1897b63b4
Binary files /dev/null and b/web/imcms/images/zoom_in.gif differ
diff --git a/web/imcms/images/zoom_out.gif b/web/imcms/images/zoom_out.gif
new file mode 100644
index 0000000000..06839366e0
Binary files /dev/null and b/web/imcms/images/zoom_out.gif differ
diff --git a/web/imcms/internalerrorpage.jsp b/web/imcms/internalerrorpage.jsp
deleted file mode 100644
index 6ae52eb6c5..0000000000
--- a/web/imcms/internalerrorpage.jsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@ page import="imcode.server.user.UserDomainObject,
-                 imcode.util.Utility" %>
-<%
-    UserDomainObject user = Utility.getLoggedOnUser(request);
-    String language = "eng";
-    if ( null != user ) {
-        language = user.getLanguageIso639_2();
-    }
-    request.getRequestDispatcher("/imcms/" + language + "/jsp/internalerrorpage.jsp").forward(request, response);
-%>
\ No newline at end of file
diff --git a/web/imcms/jscropper/builder.js b/web/imcms/jscropper/builder.js
new file mode 100644
index 0000000000..5b15ba9397
--- /dev/null
+++ b/web/imcms/jscropper/builder.js
@@ -0,0 +1,101 @@
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// See scriptaculous.js for full license.
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+    
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
+    var element = parentElement.firstChild || null;
+      
+    // see if browser added wrapping tags
+    if(element && (element.tagName != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+    
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+    
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array)) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1]) 
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+            }
+        } 
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return element;
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute=='className' ? 'class' : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML() + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e)
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children)) 
+         element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  }
+}
\ No newline at end of file
diff --git a/web/imcms/jscropper/cropper.css b/web/imcms/jscropper/cropper.css
new file mode 100644
index 0000000000..c2e759818a
--- /dev/null
+++ b/web/imcms/jscropper/cropper.css
@@ -0,0 +1,182 @@
+.imgCrop_wrap {
+	/* width: 500px;   @done_in_js */
+	/* height: 375px;  @done_in_js */
+	position: relative;
+	cursor: crosshair;
+}
+
+/* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
+.imgCrop_wrap.opera8 .imgCrop_overlay,
+.imgCrop_wrap.opera8 .imgCrop_clickArea { 
+	background-color: transparent;
+}
+
+/* fix for IE displaying all boxes at line-height by default, although they are still 1 pixel high until we combine them with the pointless span */
+.imgCrop_wrap,
+.imgCrop_wrap * {
+	font-size: 0;
+}
+
+.imgCrop_overlay {
+	background-color: #000;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+	position: absolute;
+	width: 100%;
+	height: 100%;
+}
+
+.imgCrop_selArea {
+	position: absolute;
+	/* @done_in_js 
+	top: 20px;
+	left: 20px;
+	width: 200px;
+	height: 200px;
+	background: transparent url(castle.jpg) no-repeat  -210px -110px;
+	*/
+	cursor: move;
+	z-index: 2;
+}
+
+/* clickArea is all a fix for IE 5.5 & 6 to allow the user to click on the given area */
+.imgCrop_clickArea {
+	width: 100%;
+	height: 100%;
+	background-color: #FFF;
+	opacity: 0.01;
+	filter:alpha(opacity=01);
+}
+
+.imgCrop_marqueeHoriz {
+	position: absolute;
+	width: 100%;
+	height: 1px;
+	background: transparent url(marqueeHoriz.gif) repeat-x 0 0;
+	z-index: 3;
+}
+
+.imgCrop_marqueeVert {
+	position: absolute;
+	height: 100%;
+	width: 1px;
+	background: transparent url(marqueeVert.gif) repeat-y 0 0;
+	z-index: 3;
+}
+
+/* 
+ *  FIX MARCHING ANTS IN IE
+ *	As IE <6 tries to load background images we can uncomment the follwoing hack 
+ *  to remove that issue, not as pretty - but is anything in IE?
+ *  And yes I do know that 'filter' is evil, but it will make it look semi decent in IE
+ *
+* html .imgCrop_marqueeHoriz,
+* html .imgCrop_marqueeVert {
+	background: transparent;
+	filter: Invert; 
+}
+* html .imgCrop_marqueeNorth { border-top: 1px dashed #000; }
+* html .imgCrop_marqueeEast  { border-right: 1px dashed #000; }
+* html .imgCrop_marqueeSouth { border-bottom: 1px dashed #000; }
+* html .imgCrop_marqueeWest  { border-left: 1px dashed #000; }
+*/
+
+.imgCrop_marqueeNorth { top: 0; left: 0; }
+.imgCrop_marqueeEast  { top: 0; right: 0; }
+.imgCrop_marqueeSouth { bottom: 0px; left: 0; }
+.imgCrop_marqueeWest  { top: 0; left: 0; }
+
+
+.imgCrop_handle {
+	position: absolute;
+	border: 1px solid #333;
+	width: 6px;
+	height: 6px;
+	background: #FFF;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+	z-index: 4;
+}
+
+/* fix IE 5 box model */
+* html .imgCrop_handle {
+	width: 8px;
+	height: 8px;
+	wid\th: 6px;
+	hei\ght: 6px;
+}
+
+.imgCrop_handleN {
+	top: -3px;
+	left: 0;
+	/* margin-left: 49%;    @done_in_js */
+	cursor: n-resize;
+}
+
+.imgCrop_handleNE { 
+	top: -3px;
+	right: -3px;
+	cursor: ne-resize;
+}
+
+.imgCrop_handleE {
+	top: 0;
+	right: -3px;
+	/* margin-top: 49%;    @done_in_js */
+	cursor: e-resize;
+}
+
+.imgCrop_handleSE {
+	right: -3px;
+	bottom: -3px;
+	cursor: se-resize;
+}
+
+.imgCrop_handleS {
+	right: 0;
+	bottom: -3px;
+	/* margin-right: 49%; @done_in_js */
+	cursor: s-resize;
+}
+
+.imgCrop_handleSW {
+	left: -3px;
+	bottom: -3px;
+	cursor: sw-resize;
+}
+
+.imgCrop_handleW {
+	top: 0;
+	left: -3px;
+	/* margin-top: 49%;  @done_in_js */
+	cursor: w-resize;
+}
+
+.imgCrop_handleNW {
+	top: -3px;
+	left: -3px;
+	cursor: nw-resize;
+}
+
+/**
+ * Create an area to click & drag around on as the default browser behaviour is to let you drag the image 
+ */
+.imgCrop_dragArea {
+	width: 100%;
+	height: 100%;
+	z-index: 200;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.imgCrop_previewWrap {
+	/* width: 200px;  @done_in_js */
+	/* height: 200px; @done_in_js */
+	overflow: hidden;
+	position: relative;
+}
+
+.imgCrop_previewWrap img {
+	position: absolute;
+}
\ No newline at end of file
diff --git a/web/imcms/jscropper/cropper.js b/web/imcms/jscropper/cropper.js
new file mode 100644
index 0000000000..486a92ad91
--- /dev/null
+++ b/web/imcms/jscropper/cropper.js
@@ -0,0 +1,566 @@
+/** 
+ * Copyright (c) 2006, David Spurr (http://www.defusion.org.uk/)
+ * All rights reserved.
+ * 
+ * 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.
+ *     * Neither the name of the David Spurr nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR 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.
+ * 
+ * http://www.opensource.org/licenses/bsd-license.php
+ * 
+ * See scriptaculous.js for full scriptaculous licence
+ */
+
+var CropDraggable=Class.create();
+Object.extend(Object.extend(CropDraggable.prototype,Draggable.prototype),{initialize:function(_1){
+this.options=Object.extend({drawMethod:function(){
+}},arguments[1]||{});
+this.element=$(_1);
+this.handle=this.element;
+this.delta=this.currentDelta();
+this.dragging=false;
+this.eventMouseDown=this.initDrag.bindAsEventListener(this);
+Event.observe(this.handle,"mousedown",this.eventMouseDown);
+Draggables.register(this);
+},draw:function(_2){
+var _3=Position.cumulativeOffset(this.element);
+var d=this.currentDelta();
+_3[0]-=d[0];
+_3[1]-=d[1];
+var p=[0,1].map(function(i){
+return (_2[i]-_3[i]-this.offset[i]);
+}.bind(this));
+this.options.drawMethod(p);
+}});
+var Cropper={};
+Cropper.Img=Class.create();
+Cropper.Img.prototype={initialize:function(_7,_8){
+this.options=Object.extend({ratioDim:{x:0,y:0},minWidth:0,minHeight:0,displayOnInit:false,onEndCrop:Prototype.emptyFunction,captureKeys:true,onloadCoords:null,maxWidth:0,maxHeight:0},_8||{});
+this.img=$(_7);
+this.clickCoords={x:0,y:0};
+this.dragging=false;
+this.resizing=false;
+this.isWebKit=/Konqueror|Safari|KHTML/.test(navigator.userAgent);
+this.isIE=/MSIE/.test(navigator.userAgent);
+this.isOpera8=/Opera\s[1-8]/.test(navigator.userAgent);
+this.ratioX=0;
+this.ratioY=0;
+this.attached=false;
+this.fixedWidth=(this.options.maxWidth>0&&(this.options.minWidth>=this.options.maxWidth));
+this.fixedHeight=(this.options.maxHeight>0&&(this.options.minHeight>=this.options.maxHeight));
+if(typeof this.img=="undefined"){
+return;
+}
+$A(document.getElementsByTagName("script")).each(function(s){
+if(s.src.match(/cropper\.js/)){
+var _a=s.src.replace(/cropper\.js(.*)?/,"");
+var _b=document.createElement("link");
+_b.rel="stylesheet";
+_b.type="text/css";
+_b.href=_a+"cropper.css";
+_b.media="screen";
+document.getElementsByTagName("head")[0].appendChild(_b);
+}
+});
+if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){
+var _c=this.getGCD(this.options.ratioDim.x,this.options.ratioDim.y);
+this.ratioX=this.options.ratioDim.x/_c;
+this.ratioY=this.options.ratioDim.y/_c;
+}
+this.subInitialize();
+if(this.img.complete||this.isWebKit){
+this.onLoad();
+}else{
+Event.observe(this.img,"load",this.onLoad.bindAsEventListener(this));
+}
+},getGCD:function(a,b){
+if(b==0){
+return a;
+}
+return this.getGCD(b,a%b);
+},onLoad:function(){
+var _f="imgCrop_";
+var _10=this.img.parentNode;
+var _11="";
+if(this.isOpera8){
+_11=" opera8";
+}
+this.imgWrap=Builder.node("div",{"class":_f+"wrap"+_11});
+this.north=Builder.node("div",{"class":_f+"overlay "+_f+"north"},[Builder.node("span")]);
+this.east=Builder.node("div",{"class":_f+"overlay "+_f+"east"},[Builder.node("span")]);
+this.south=Builder.node("div",{"class":_f+"overlay "+_f+"south"},[Builder.node("span")]);
+this.west=Builder.node("div",{"class":_f+"overlay "+_f+"west"},[Builder.node("span")]);
+var _12=[this.north,this.east,this.south,this.west];
+this.dragArea=Builder.node("div",{"class":_f+"dragArea"},_12);
+this.handleN=Builder.node("div",{"class":_f+"handle "+_f+"handleN"});
+this.handleNE=Builder.node("div",{"class":_f+"handle "+_f+"handleNE"});
+this.handleE=Builder.node("div",{"class":_f+"handle "+_f+"handleE"});
+this.handleSE=Builder.node("div",{"class":_f+"handle "+_f+"handleSE"});
+this.handleS=Builder.node("div",{"class":_f+"handle "+_f+"handleS"});
+this.handleSW=Builder.node("div",{"class":_f+"handle "+_f+"handleSW"});
+this.handleW=Builder.node("div",{"class":_f+"handle "+_f+"handleW"});
+this.handleNW=Builder.node("div",{"class":_f+"handle "+_f+"handleNW"});
+this.selArea=Builder.node("div",{"class":_f+"selArea"},[Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeNorth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeEast"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeSouth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeWest"},[Builder.node("span")]),this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW,Builder.node("div",{"class":_f+"clickArea"})]);
+this.imgWrap.appendChild(this.img);
+this.imgWrap.appendChild(this.dragArea);
+this.dragArea.appendChild(this.selArea);
+this.dragArea.appendChild(Builder.node("div",{"class":_f+"clickArea"}));
+_10.appendChild(this.imgWrap);
+this.startDragBind=this.startDrag.bindAsEventListener(this);
+Event.observe(this.dragArea,"mousedown",this.startDragBind);
+this.onDragBind=this.onDrag.bindAsEventListener(this);
+Event.observe(document,"mousemove",this.onDragBind);
+this.endCropBind=this.endCrop.bindAsEventListener(this);
+Event.observe(document,"mouseup",this.endCropBind);
+this.resizeBind=this.startResize.bindAsEventListener(this);
+this.handles=[this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW];
+this.registerHandles(true);
+if(this.options.captureKeys){
+this.keysBind=this.handleKeys.bindAsEventListener(this);
+Event.observe(document,"keypress",this.keysBind);
+}
+new CropDraggable(this.selArea,{drawMethod:this.moveArea.bindAsEventListener(this)});
+this.setParams();
+},registerHandles:function(_13){
+for(var i=0;i<this.handles.length;i++){
+var _15=$(this.handles[i]);
+if(_13){
+var _16=false;
+if(this.fixedWidth&&this.fixedHeight){
+_16=true;
+}else{
+if(this.fixedWidth||this.fixedHeight){
+var _17=_15.className.match(/([S|N][E|W])$/);
+var _18=_15.className.match(/(E|W)$/);
+var _19=_15.className.match(/(N|S)$/);
+if(_17){
+_16=true;
+}else{
+if(this.fixedWidth&&_18){
+_16=true;
+}else{
+if(this.fixedHeight&&_19){
+_16=true;
+}
+}
+}
+}
+}
+if(_16){
+_15.hide();
+}else{
+Event.observe(_15,"mousedown",this.resizeBind);
+}
+}else{
+_15.show();
+Event.stopObserving(_15,"mousedown",this.resizeBind);
+}
+}
+},setParams:function(){
+this.imgW=this.img.width;
+this.imgH=this.img.height;
+$(this.north).setStyle({height:0});
+$(this.east).setStyle({width:0,height:0});
+$(this.south).setStyle({height:0});
+$(this.west).setStyle({width:0,height:0});
+$(this.imgWrap).setStyle({"width":this.imgW+"px","height":this.imgH+"px"});
+$(this.selArea).hide();
+var _1a={x1:0,y1:0,x2:0,y2:0};
+var _1b=false;
+if(this.options.onloadCoords!=null){
+_1a=this.cloneCoords(this.options.onloadCoords);
+_1b=true;
+}else{
+if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){
+_1a.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2);
+_1a.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2);
+_1a.x2=_1a.x1+this.options.ratioDim.x;
+_1a.y2=_1a.y1+this.options.ratioDim.y;
+_1b=true;
+}
+}
+this.setAreaCoords(_1a,false,false,1);
+if(this.options.displayOnInit&&_1b){
+this.selArea.show();
+this.drawArea();
+this.endCrop();
+}
+this.attached=true;
+},remove:function(){
+if(this.attached){
+this.attached=false;
+this.imgWrap.parentNode.insertBefore(this.img,this.imgWrap);
+this.imgWrap.parentNode.removeChild(this.imgWrap);
+Event.stopObserving(this.dragArea,"mousedown",this.startDragBind);
+Event.stopObserving(document,"mousemove",this.onDragBind);
+Event.stopObserving(document,"mouseup",this.endCropBind);
+this.registerHandles(false);
+if(this.options.captureKeys){
+Event.stopObserving(document,"keypress",this.keysBind);
+}
+}
+},reset:function(){
+if(!this.attached){
+this.onLoad();
+}else{
+this.setParams();
+}
+this.endCrop();
+},handleKeys:function(e){
+var dir={x:0,y:0};
+if(!this.dragging){
+switch(e.keyCode){
+case (37):
+dir.x=-1;
+break;
+case (38):
+dir.y=-1;
+break;
+case (39):
+dir.x=1;
+break;
+case (40):
+dir.y=1;
+break;
+}
+if(dir.x!=0||dir.y!=0){
+if(e.shiftKey){
+dir.x*=10;
+dir.y*=10;
+}
+this.moveArea([this.areaCoords.x1+dir.x,this.areaCoords.y1+dir.y]);
+Event.stop(e);
+}
+}
+},calcW:function(){
+return (this.areaCoords.x2-this.areaCoords.x1);
+},calcH:function(){
+return (this.areaCoords.y2-this.areaCoords.y1);
+},moveArea:function(_1e){
+this.setAreaCoords({x1:_1e[0],y1:_1e[1],x2:_1e[0]+this.calcW(),y2:_1e[1]+this.calcH()},true,false);
+this.drawArea();
+},cloneCoords:function(_1f){
+return {x1:_1f.x1,y1:_1f.y1,x2:_1f.x2,y2:_1f.y2};
+},setAreaCoords:function(_20,_21,_22,_23,_24){
+if(_21){
+var _25=_20.x2-_20.x1;
+var _26=_20.y2-_20.y1;
+if(_20.x1<0){
+_20.x1=0;
+_20.x2=_25;
+}
+if(_20.y1<0){
+_20.y1=0;
+_20.y2=_26;
+}
+if(_20.x2>this.imgW){
+_20.x2=this.imgW;
+_20.x1=this.imgW-_25;
+}
+if(_20.y2>this.imgH){
+_20.y2=this.imgH;
+_20.y1=this.imgH-_26;
+}
+}else{
+if(_20.x1<0){
+_20.x1=0;
+}
+if(_20.y1<0){
+_20.y1=0;
+}
+if(_20.x2>this.imgW){
+_20.x2=this.imgW;
+}
+if(_20.y2>this.imgH){
+_20.y2=this.imgH;
+}
+if(_23!=null){
+if(this.ratioX>0){
+this.applyRatio(_20,{x:this.ratioX,y:this.ratioY},_23,_24);
+}else{
+if(_22){
+this.applyRatio(_20,{x:1,y:1},_23,_24);
+}
+}
+var _27=[this.options.minWidth,this.options.minHeight];
+var _28=[this.options.maxWidth,this.options.maxHeight];
+if(_27[0]>0||_27[1]>0||_28[0]>0||_28[1]>0){
+var _29={a1:_20.x1,a2:_20.x2};
+var _2a={a1:_20.y1,a2:_20.y2};
+var _2b={min:0,max:this.imgW};
+var _2c={min:0,max:this.imgH};
+if((_27[0]!=0||_27[1]!=0)&&_22){
+if(_27[0]>0){
+_27[1]=_27[0];
+}else{
+if(_27[1]>0){
+_27[0]=_27[1];
+}
+}
+}
+if((_28[0]!=0||_28[0]!=0)&&_22){
+if(_28[0]>0&&_28[0]<=_28[1]){
+_28[1]=_28[0];
+}else{
+if(_28[1]>0&&_28[1]<=_28[0]){
+_28[0]=_28[1];
+}
+}
+}
+if(_27[0]>0){
+this.applyDimRestriction(_29,_27[0],_23.x,_2b,"min");
+}
+if(_27[1]>1){
+this.applyDimRestriction(_2a,_27[1],_23.y,_2c,"min");
+}
+if(_28[0]>0){
+this.applyDimRestriction(_29,_28[0],_23.x,_2b,"max");
+}
+if(_28[1]>1){
+this.applyDimRestriction(_2a,_28[1],_23.y,_2c,"max");
+}
+_20={x1:_29.a1,y1:_2a.a1,x2:_29.a2,y2:_2a.a2};
+}
+}
+}
+this.areaCoords=_20;
+},applyDimRestriction:function(_2d,val,_2f,_30,_31){
+var _32;
+if(_31=="min"){
+_32=((_2d.a2-_2d.a1)<val);
+}else{
+_32=((_2d.a2-_2d.a1)>val);
+}
+if(_32){
+if(_2f==1){
+_2d.a2=_2d.a1+val;
+}else{
+_2d.a1=_2d.a2-val;
+}
+if(_2d.a1<_30.min){
+_2d.a1=_30.min;
+_2d.a2=val;
+}else{
+if(_2d.a2>_30.max){
+_2d.a1=_30.max-val;
+_2d.a2=_30.max;
+}
+}
+}
+},applyRatio:function(_33,_34,_35,_36){
+var _37;
+if(_36=="N"||_36=="S"){
+_37=this.applyRatioToAxis({a1:_33.y1,b1:_33.x1,a2:_33.y2,b2:_33.x2},{a:_34.y,b:_34.x},{a:_35.y,b:_35.x},{min:0,max:this.imgW});
+_33.x1=_37.b1;
+_33.y1=_37.a1;
+_33.x2=_37.b2;
+_33.y2=_37.a2;
+}else{
+_37=this.applyRatioToAxis({a1:_33.x1,b1:_33.y1,a2:_33.x2,b2:_33.y2},{a:_34.x,b:_34.y},{a:_35.x,b:_35.y},{min:0,max:this.imgH});
+_33.x1=_37.a1;
+_33.y1=_37.b1;
+_33.x2=_37.a2;
+_33.y2=_37.b2;
+}
+},applyRatioToAxis:function(_38,_39,_3a,_3b){
+var _3c=Object.extend(_38,{});
+var _3d=_3c.a2-_3c.a1;
+var _3e=Math.floor(_3d*_39.b/_39.a);
+var _3f;
+var _40;
+var _41=null;
+if(_3a.b==1){
+_3f=_3c.b1+_3e;
+if(_3f>_3b.max){
+_3f=_3b.max;
+_41=_3f-_3c.b1;
+}
+_3c.b2=_3f;
+}else{
+_3f=_3c.b2-_3e;
+if(_3f<_3b.min){
+_3f=_3b.min;
+_41=_3f+_3c.b2;
+}
+_3c.b1=_3f;
+}
+if(_41!=null){
+_40=Math.floor(_41*_39.a/_39.b);
+if(_3a.a==1){
+_3c.a2=_3c.a1+_40;
+}else{
+_3c.a1=_3c.a1=_3c.a2-_40;
+}
+}
+return _3c;
+},drawArea:function(){
+var _42=this.calcW();
+var _43=this.calcH();
+var px="px";
+var _45=[this.areaCoords.x1+px,this.areaCoords.y1+px,_42+px,_43+px,this.areaCoords.x2+px,this.areaCoords.y2+px,(this.img.width-this.areaCoords.x2)+px,(this.img.height-this.areaCoords.y2)+px];
+var _46=this.selArea.style;
+_46.left=_45[0];
+_46.top=_45[1];
+_46.width=_45[2];
+_46.height=_45[3];
+var _47=Math.ceil((_42-6)/2)+px;
+var _48=Math.ceil((_43-6)/2)+px;
+this.handleN.style.left=_47;
+this.handleE.style.top=_48;
+this.handleS.style.left=_47;
+this.handleW.style.top=_48;
+this.north.style.height=_45[1];
+var _49=this.east.style;
+_49.top=_45[1];
+_49.height=_45[3];
+_49.left=_45[4];
+_49.width=_45[6];
+var _4a=this.south.style;
+_4a.top=_45[5];
+_4a.height=_45[7];
+var _4b=this.west.style;
+_4b.top=_45[1];
+_4b.height=_45[3];
+_4b.width=_45[0];
+this.subDrawArea();
+this.forceReRender();
+},forceReRender:function(){
+if(this.isIE||this.isWebKit){
+var n=document.createTextNode(" ");
+var d,el,fixEL,i;
+if(this.isIE){
+fixEl=this.selArea;
+}else{
+if(this.isWebKit){
+fixEl=document.getElementsByClassName("imgCrop_marqueeSouth",this.imgWrap)[0];
+d=Builder.node("div","");
+d.style.visibility="hidden";
+var _4e=["SE","S","SW"];
+for(i=0;i<_4e.length;i++){
+el=document.getElementsByClassName("imgCrop_handle"+_4e[i],this.selArea)[0];
+if(el.childNodes.length){
+el.removeChild(el.childNodes[0]);
+}
+el.appendChild(d);
+}
+}
+}
+fixEl.appendChild(n);
+fixEl.removeChild(n);
+}
+},startResize:function(e){
+this.startCoords=this.cloneCoords(this.areaCoords);
+this.resizing=true;
+this.resizeHandle=Event.element(e).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,"");
+Event.stop(e);
+},startDrag:function(e){
+this.selArea.show();
+this.clickCoords=this.getCurPos(e);
+this.setAreaCoords({x1:this.clickCoords.x,y1:this.clickCoords.y,x2:this.clickCoords.x,y2:this.clickCoords.y},false,false,null);
+this.dragging=true;
+this.onDrag(e);
+Event.stop(e);
+},getCurPos:function(e){
+var el=this.imgWrap,wrapOffsets=Position.cumulativeOffset(el);
+while(el.nodeName!="BODY"){
+wrapOffsets[1]-=el.scrollTop||0;
+wrapOffsets[0]-=el.scrollLeft||0;
+el=el.parentNode;
+}
+return curPos={x:Event.pointerX(e)-wrapOffsets[0],y:Event.pointerY(e)-wrapOffsets[1]};
+},onDrag:function(e){
+if(this.dragging||this.resizing){
+var _54=null;
+var _55=this.getCurPos(e);
+var _56=this.cloneCoords(this.areaCoords);
+var _57={x:1,y:1};
+if(this.dragging){
+if(_55.x<this.clickCoords.x){
+_57.x=-1;
+}
+if(_55.y<this.clickCoords.y){
+_57.y=-1;
+}
+this.transformCoords(_55.x,this.clickCoords.x,_56,"x");
+this.transformCoords(_55.y,this.clickCoords.y,_56,"y");
+}else{
+if(this.resizing){
+_54=this.resizeHandle;
+if(_54.match(/E/)){
+this.transformCoords(_55.x,this.startCoords.x1,_56,"x");
+if(_55.x<this.startCoords.x1){
+_57.x=-1;
+}
+}else{
+if(_54.match(/W/)){
+this.transformCoords(_55.x,this.startCoords.x2,_56,"x");
+if(_55.x<this.startCoords.x2){
+_57.x=-1;
+}
+}
+}
+if(_54.match(/N/)){
+this.transformCoords(_55.y,this.startCoords.y2,_56,"y");
+if(_55.y<this.startCoords.y2){
+_57.y=-1;
+}
+}else{
+if(_54.match(/S/)){
+this.transformCoords(_55.y,this.startCoords.y1,_56,"y");
+if(_55.y<this.startCoords.y1){
+_57.y=-1;
+}
+}
+}
+}
+}
+this.setAreaCoords(_56,false,e.shiftKey,_57,_54);
+this.drawArea();
+Event.stop(e);
+}
+},transformCoords:function(_58,_59,_5a,_5b){
+var _5c=[_58,_59];
+if(_58>_59){
+_5c.reverse();
+}
+_5a[_5b+"1"]=_5c[0];
+_5a[_5b+"2"]=_5c[1];
+},endCrop:function(){
+this.dragging=false;
+this.resizing=false;
+this.options.onEndCrop(this.areaCoords,{width:this.calcW(),height:this.calcH()});
+},subInitialize:function(){
+},subDrawArea:function(){
+}};
+Cropper.ImgWithPreview=Class.create();
+Object.extend(Object.extend(Cropper.ImgWithPreview.prototype,Cropper.Img.prototype),{subInitialize:function(){
+this.hasPreviewImg=false;
+if(typeof (this.options.previewWrap)!="undefined"&&this.options.minWidth>0&&this.options.minHeight>0){
+this.previewWrap=$(this.options.previewWrap);
+this.previewImg=this.img.cloneNode(false);
+this.previewImg.id="imgCrop_"+this.previewImg.id;
+this.options.displayOnInit=true;
+this.hasPreviewImg=true;
+this.previewWrap.addClassName("imgCrop_previewWrap");
+this.previewWrap.setStyle({width:this.options.minWidth+"px",height:this.options.minHeight+"px"});
+this.previewWrap.appendChild(this.previewImg);
+}
+},subDrawArea:function(){
+if(this.hasPreviewImg){
+var _5d=this.calcW();
+var _5e=this.calcH();
+var _5f={x:this.imgW/_5d,y:this.imgH/_5e};
+var _60={x:_5d/this.options.minWidth,y:_5e/this.options.minHeight};
+var _61={w:Math.ceil(this.options.minWidth*_5f.x)+"px",h:Math.ceil(this.options.minHeight*_5f.y)+"px",x:"-"+Math.ceil(this.areaCoords.x1/_60.x)+"px",y:"-"+Math.ceil(this.areaCoords.y1/_60.y)+"px"};
+var _62=this.previewImg.style;
+_62.width=_61.w;
+_62.height=_61.h;
+_62.left=_61.x;
+_62.top=_61.y;
+}
+}});
+
diff --git a/web/imcms/jscropper/dragdrop.js b/web/imcms/jscropper/dragdrop.js
new file mode 100644
index 0000000000..be2a30f538
--- /dev/null
+++ b/web/imcms/jscropper/dragdrop.js
@@ -0,0 +1,915 @@
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+// 
+// See scriptaculous.js for full license.
+
+/*--------------------------------------------------------------------------*/
+
+var Droppables = {
+  drops: [],
+
+  remove: function(element) {
+    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+  },
+
+  add: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      greedy:     true,
+      hoverclass: null,
+      tree:       false
+    }, arguments[1] || {});
+
+    // cache containers
+    if(options.containment) {
+      options._containers = [];
+      var containment = options.containment;
+      if((typeof containment == 'object') && 
+        (containment.constructor == Array)) {
+        containment.each( function(c) { options._containers.push($(c)) });
+      } else {
+        options._containers.push($(containment));
+      }
+    }
+    
+    if(options.accept) options.accept = [options.accept].flatten();
+
+    Element.makePositioned(element); // fix IE
+    options.element = element;
+
+    this.drops.push(options);
+  },
+  
+  findDeepestChild: function(drops) {
+    deepest = drops[0];
+      
+    for (i = 1; i < drops.length; ++i)
+      if (Element.isParent(drops[i].element, deepest.element))
+        deepest = drops[i];
+    
+    return deepest;
+  },
+
+  isContained: function(element, drop) {
+    var containmentNode;
+    if(drop.tree) {
+      containmentNode = element.treeNode; 
+    } else {
+      containmentNode = element.parentNode;
+    }
+    return drop._containers.detect(function(c) { return containmentNode == c });
+  },
+  
+  isAffected: function(point, element, drop) {
+    return (
+      (drop.element!=element) &&
+      ((!drop._containers) ||
+        this.isContained(element, drop)) &&
+      ((!drop.accept) ||
+        (Element.classNames(element).detect( 
+          function(v) { return drop.accept.include(v) } ) )) &&
+      Position.within(drop.element, point[0], point[1]) );
+  },
+
+  deactivate: function(drop) {
+    if(drop.hoverclass)
+      Element.removeClassName(drop.element, drop.hoverclass);
+    this.last_active = null;
+  },
+
+  activate: function(drop) {
+    if(drop.hoverclass)
+      Element.addClassName(drop.element, drop.hoverclass);
+    this.last_active = drop;
+  },
+
+  show: function(point, element) {
+    if(!this.drops.length) return;
+    var affected = [];
+    
+    if(this.last_active) this.deactivate(this.last_active);
+    this.drops.each( function(drop) {
+      if(Droppables.isAffected(point, element, drop))
+        affected.push(drop);
+    });
+        
+    if(affected.length>0) {
+      drop = Droppables.findDeepestChild(affected);
+      Position.within(drop.element, point[0], point[1]);
+      if(drop.onHover)
+        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
+      
+      Droppables.activate(drop);
+    }
+  },
+
+  fire: function(event, element) {
+    if(!this.last_active) return;
+    Position.prepare();
+
+    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
+      if (this.last_active.onDrop) 
+        this.last_active.onDrop(element, this.last_active.element, event);
+  },
+
+  reset: function() {
+    if(this.last_active)
+      this.deactivate(this.last_active);
+  }
+}
+
+var Draggables = {
+  drags: [],
+  observers: [],
+  
+  register: function(draggable) {
+    if(this.drags.length == 0) {
+      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
+      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+      
+      Event.observe(document, "mouseup", this.eventMouseUp);
+      Event.observe(document, "mousemove", this.eventMouseMove);
+      Event.observe(document, "keypress", this.eventKeypress);
+    }
+    this.drags.push(draggable);
+  },
+  
+  unregister: function(draggable) {
+    this.drags = this.drags.reject(function(d) { return d==draggable });
+    if(this.drags.length == 0) {
+      Event.stopObserving(document, "mouseup", this.eventMouseUp);
+      Event.stopObserving(document, "mousemove", this.eventMouseMove);
+      Event.stopObserving(document, "keypress", this.eventKeypress);
+    }
+  },
+  
+  activate: function(draggable) {
+    window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+    this.activeDraggable = draggable;
+  },
+  
+  deactivate: function() {
+    this.activeDraggable = null;
+  },
+  
+  updateDrag: function(event) {
+    if(!this.activeDraggable) return;
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    // Mozilla-based browsers fire successive mousemove events with
+    // the same coordinates, prevent needless redrawing (moz bug?)
+    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
+    this._lastPointer = pointer;
+    this.activeDraggable.updateDrag(event, pointer);
+  },
+  
+  endDrag: function(event) {
+    if(!this.activeDraggable) return;
+    this._lastPointer = null;
+    this.activeDraggable.endDrag(event);
+    this.activeDraggable = null;
+  },
+  
+  keyPress: function(event) {
+    if(this.activeDraggable)
+      this.activeDraggable.keyPress(event);
+  },
+  
+  addObserver: function(observer) {
+    this.observers.push(observer);
+    this._cacheObserverCallbacks();
+  },
+  
+  removeObserver: function(element) {  // element instead of observer fixes mem leaks
+    this.observers = this.observers.reject( function(o) { return o.element==element });
+    this._cacheObserverCallbacks();
+  },
+  
+  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
+    if(this[eventName+'Count'] > 0)
+      this.observers.each( function(o) {
+        if(o[eventName]) o[eventName](eventName, draggable, event);
+      });
+  },
+  
+  _cacheObserverCallbacks: function() {
+    ['onStart','onEnd','onDrag'].each( function(eventName) {
+      Draggables[eventName+'Count'] = Draggables.observers.select(
+        function(o) { return o[eventName]; }
+      ).length;
+    });
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var Draggable = Class.create();
+Draggable.prototype = {
+  initialize: function(element) {
+    var options = Object.extend({
+      handle: false,
+      starteffect: function(element) {
+        element._opacity = Element.getOpacity(element); 
+        new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
+      },
+      reverteffect: function(element, top_offset, left_offset) {
+        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
+        element._revert = new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur});
+      },
+      endeffect: function(element) {
+        var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity}); 
+      },
+      zindex: 1000,
+      revert: false,
+      scroll: false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      snap: false   // false, or xy or [x,y] or function(x,y){ return [x,y] }
+    }, arguments[1] || {});
+
+    this.element = $(element);
+    
+    if(options.handle && (typeof options.handle == 'string')) {
+      var h = Element.childrenWithClassName(this.element, options.handle, true);
+      if(h.length>0) this.handle = h[0];
+    }
+    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = this.element;
+    
+    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML)
+      options.scroll = $(options.scroll);
+
+    Element.makePositioned(this.element); // fix IE    
+
+    this.delta    = this.currentDelta();
+    this.options  = options;
+    this.dragging = false;   
+
+    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
+    Event.observe(this.handle, "mousedown", this.eventMouseDown);
+    
+    Draggables.register(this);
+  },
+  
+  destroy: function() {
+    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
+    Draggables.unregister(this);
+  },
+  
+  currentDelta: function() {
+    return([
+      parseInt(Element.getStyle(this.element,'left') || '0'),
+      parseInt(Element.getStyle(this.element,'top') || '0')]);
+  },
+  
+  initDrag: function(event) {
+    if(Event.isLeftClick(event)) {    
+      // abort on form elements, fixes a Firefox issue
+      var src = Event.element(event);
+      if(src.tagName && (
+        src.tagName=='INPUT' ||
+        src.tagName=='SELECT' ||
+        src.tagName=='OPTION' ||
+        src.tagName=='BUTTON' ||
+        src.tagName=='TEXTAREA')) return;
+        
+      if(this.element._revert) {
+        this.element._revert.cancel();
+        this.element._revert = null;
+      }
+      
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      var pos     = Position.cumulativeOffset(this.element);
+      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
+      
+      Draggables.activate(this);
+      Event.stop(event);
+    }
+  },
+  
+  startDrag: function(event) {
+    this.dragging = true;
+    
+    if(this.options.zindex) {
+      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+      this.element.style.zIndex = this.options.zindex;
+    }
+    
+    if(this.options.ghosting) {
+      this._clone = this.element.cloneNode(true);
+      Position.absolutize(this.element);
+      this.element.parentNode.insertBefore(this._clone, this.element);
+    }
+    
+    if(this.options.scroll) {
+      if (this.options.scroll == window) {
+        var where = this._getWindowScroll(this.options.scroll);
+        this.originalScrollLeft = where.left;
+        this.originalScrollTop = where.top;
+      } else {
+        this.originalScrollLeft = this.options.scroll.scrollLeft;
+        this.originalScrollTop = this.options.scroll.scrollTop;
+      }
+    }
+    
+    Draggables.notify('onStart', this, event);
+    if(this.options.starteffect) this.options.starteffect(this.element);
+  },
+  
+  updateDrag: function(event, pointer) {
+    if(!this.dragging) this.startDrag(event);
+    Position.prepare();
+    Droppables.show(pointer, this.element);
+    Draggables.notify('onDrag', this, event);
+    this.draw(pointer);
+    if(this.options.change) this.options.change(this);
+    
+    if(this.options.scroll) {
+      this.stopScrolling();
+      
+      var p;
+      if (this.options.scroll == window) {
+        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
+      } else {
+        p = Position.page(this.options.scroll);
+        p[0] += this.options.scroll.scrollLeft;
+        p[1] += this.options.scroll.scrollTop;
+        p.push(p[0]+this.options.scroll.offsetWidth);
+        p.push(p[1]+this.options.scroll.offsetHeight);
+      }
+      var speed = [0,0];
+      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
+      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
+      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
+      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
+      this.startScrolling(speed);
+    }
+    
+    // fix AppleWebKit rendering
+    if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+    
+    Event.stop(event);
+  },
+  
+  finishDrag: function(event, success) {
+    this.dragging = false;
+
+    if(this.options.ghosting) {
+      Position.relativize(this.element);
+      Element.remove(this._clone);
+      this._clone = null;
+    }
+
+    if(success) Droppables.fire(event, this.element);
+    Draggables.notify('onEnd', this, event);
+
+    var revert = this.options.revert;
+    if(revert && typeof revert == 'function') revert = revert(this.element);
+    
+    var d = this.currentDelta();
+    if(revert && this.options.reverteffect) {
+      this.options.reverteffect(this.element, 
+        d[1]-this.delta[1], d[0]-this.delta[0]);
+    } else {
+      this.delta = d;
+    }
+
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
+
+    if(this.options.endeffect) 
+      this.options.endeffect(this.element);
+
+    Draggables.deactivate(this);
+    Droppables.reset();
+  },
+  
+  keyPress: function(event) {
+    if(event.keyCode!=Event.KEY_ESC) return;
+    this.finishDrag(event, false);
+    Event.stop(event);
+  },
+  
+  endDrag: function(event) {
+    if(!this.dragging) return;
+    this.stopScrolling();
+    this.finishDrag(event, true);
+    Event.stop(event);
+  },
+  
+  draw: function(point) {
+    var pos = Position.cumulativeOffset(this.element);
+    var d = this.currentDelta();
+    pos[0] -= d[0]; pos[1] -= d[1];
+    
+    if(this.options.scroll && (this.options.scroll != window)) {
+      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
+      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
+    }
+    
+    var p = [0,1].map(function(i){ 
+      return (point[i]-pos[i]-this.offset[i]) 
+    }.bind(this));
+    
+    if(this.options.snap) {
+      if(typeof this.options.snap == 'function') {
+        p = this.options.snap(p[0],p[1],this);
+      } else {
+      if(this.options.snap instanceof Array) {
+        p = p.map( function(v, i) {
+          return Math.round(v/this.options.snap[i])*this.options.snap[i] }.bind(this))
+      } else {
+        p = p.map( function(v) {
+          return Math.round(v/this.options.snap)*this.options.snap }.bind(this))
+      }
+    }}
+    
+    var style = this.element.style;
+    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
+      style.left = p[0] + "px";
+    if((!this.options.constraint) || (this.options.constraint=='vertical'))
+      style.top  = p[1] + "px";
+    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+  
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+      Draggables._lastScrollPointer = null;
+    }
+  },
+  
+  startScrolling: function(speed) {
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+  
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    if(this.options.scroll == window) {
+      with (this._getWindowScroll(this.options.scroll)) {
+        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+          var d = delta / 1000;
+          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
+        }
+      }
+    } else {
+      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    }
+    
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+    Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+    Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+    if (Draggables._lastScrollPointer[0] < 0)
+      Draggables._lastScrollPointer[0] = 0;
+    if (Draggables._lastScrollPointer[1] < 0)
+      Draggables._lastScrollPointer[1] = 0;
+    this.draw(Draggables._lastScrollPointer);
+    
+    if(this.options.change) this.options.change(this);
+  },
+  
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var SortableObserver = Class.create();
+SortableObserver.prototype = {
+  initialize: function(element, observer) {
+    this.element   = $(element);
+    this.observer  = observer;
+    this.lastValue = Sortable.serialize(this.element);
+  },
+  
+  onStart: function() {
+    this.lastValue = Sortable.serialize(this.element);
+  },
+  
+  onEnd: function() {
+    Sortable.unmark();
+    if(this.lastValue != Sortable.serialize(this.element))
+      this.observer(this.element)
+  }
+}
+
+var Sortable = {
+  sortables: {},
+  
+  _findRootElement: function(element) {
+    while (element.tagName != "BODY") {  
+      if(element.id && Sortable.sortables[element.id]) return element;
+      element = element.parentNode;
+    }
+  },
+
+  options: function(element) {
+    element = Sortable._findRootElement($(element));
+    if(!element) return;
+    return Sortable.sortables[element.id];
+  },
+  
+  destroy: function(element){
+    var s = Sortable.options(element);
+    
+    if(s) {
+      Draggables.removeObserver(s.element);
+      s.droppables.each(function(d){ Droppables.remove(d) });
+      s.draggables.invoke('destroy');
+      
+      delete Sortable.sortables[s.element.id];
+    }
+  },
+
+  create: function(element) {
+    element = $(element);
+    var options = Object.extend({ 
+      element:     element,
+      tag:         'li',       // assumes li children, override with tag: 'tagname'
+      dropOnEmpty: false,
+      tree:        false,
+      treeTag:     'ul',
+      overlap:     'vertical', // one of 'vertical', 'horizontal'
+      constraint:  'vertical', // one of 'vertical', 'horizontal', false
+      containment: element,    // also takes array of elements (or id's); or false
+      handle:      false,      // or a CSS class
+      only:        false,
+      hoverclass:  null,
+      ghosting:    false,
+      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      format:      /^[^_]*_(.*)$/,
+      onChange:    Prototype.emptyFunction,
+      onUpdate:    Prototype.emptyFunction
+    }, arguments[1] || {});
+
+    // clear any old sortable with same element
+    this.destroy(element);
+
+    // build options for the draggables
+    var options_for_draggable = {
+      revert:      true,
+      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
+      ghosting:    options.ghosting,
+      constraint:  options.constraint,
+      handle:      options.handle };
+
+    if(options.starteffect)
+      options_for_draggable.starteffect = options.starteffect;
+
+    if(options.reverteffect)
+      options_for_draggable.reverteffect = options.reverteffect;
+    else
+      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
+        element.style.top  = 0;
+        element.style.left = 0;
+      };
+
+    if(options.endeffect)
+      options_for_draggable.endeffect = options.endeffect;
+
+    if(options.zindex)
+      options_for_draggable.zindex = options.zindex;
+
+    // build options for the droppables  
+    var options_for_droppable = {
+      overlap:     options.overlap,
+      containment: options.containment,
+      tree:        options.tree,
+      hoverclass:  options.hoverclass,
+      onHover:     Sortable.onHover
+      //greedy:      !options.dropOnEmpty
+    }
+    
+    var options_for_tree = {
+      onHover:      Sortable.onEmptyHover,
+      overlap:      options.overlap,
+      containment:  options.containment,
+      hoverclass:   options.hoverclass
+    }
+
+    // fix for gecko engine
+    Element.cleanWhitespace(element); 
+
+    options.draggables = [];
+    options.droppables = [];
+
+    // drop on empty handling
+    if(options.dropOnEmpty || options.tree) {
+      Droppables.add(element, options_for_tree);
+      options.droppables.push(element);
+    }
+
+    (this.findElements(element, options) || []).each( function(e) {
+      // handles are per-draggable
+      var handle = options.handle ? 
+        Element.childrenWithClassName(e, options.handle)[0] : e;    
+      options.draggables.push(
+        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
+      Droppables.add(e, options_for_droppable);
+      if(options.tree) e.treeNode = element;
+      options.droppables.push(e);      
+    });
+    
+    if(options.tree) {
+      (Sortable.findTreeElements(element, options) || []).each( function(e) {
+        Droppables.add(e, options_for_tree);
+        e.treeNode = element;
+        options.droppables.push(e);
+      });
+    }
+
+    // keep reference
+    this.sortables[element.id] = options;
+
+    // for onupdate
+    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
+
+  },
+
+  // return all suitable-for-sortable elements in a guaranteed order
+  findElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.tag);
+  },
+  
+  findTreeElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.treeTag);
+  },
+
+  onHover: function(element, dropon, overlap) {
+    if(Element.isParent(dropon, element)) return;
+
+    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
+      return;
+    } else if(overlap>0.5) {
+      Sortable.mark(dropon, 'before');
+      if(dropon.previousSibling != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, dropon);
+        if(dropon.parentNode!=oldParentNode) 
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    } else {
+      Sortable.mark(dropon, 'after');
+      var nextElement = dropon.nextSibling || null;
+      if(nextElement != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, nextElement);
+        if(dropon.parentNode!=oldParentNode) 
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    }
+  },
+  
+  onEmptyHover: function(element, dropon, overlap) {
+    var oldParentNode = element.parentNode;
+    var droponOptions = Sortable.options(dropon);
+        
+    if(!Element.isParent(dropon, element)) {
+      var index;
+      
+      var children = Sortable.findElements(dropon, {tag: droponOptions.tag});
+      var child = null;
+            
+      if(children) {
+        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+        
+        for (index = 0; index < children.length; index += 1) {
+          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
+            offset -= Element.offsetSize (children[index], droponOptions.overlap);
+          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
+            child = index + 1 < children.length ? children[index + 1] : null;
+            break;
+          } else {
+            child = children[index];
+            break;
+          }
+        }
+      }
+      
+      dropon.insertBefore(element, child);
+      
+      Sortable.options(oldParentNode).onChange(element);
+      droponOptions.onChange(element);
+    }
+  },
+
+  unmark: function() {
+    if(Sortable._marker) Element.hide(Sortable._marker);
+  },
+
+  mark: function(dropon, position) {
+    // mark on ghosting only
+    var sortable = Sortable.options(dropon.parentNode);
+    if(sortable && !sortable.ghosting) return; 
+
+    if(!Sortable._marker) {
+      Sortable._marker = $('dropmarker') || document.createElement('DIV');
+      Element.hide(Sortable._marker);
+      Element.addClassName(Sortable._marker, 'dropmarker');
+      Sortable._marker.style.position = 'absolute';
+      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
+    }    
+    var offsets = Position.cumulativeOffset(dropon);
+    Sortable._marker.style.left = offsets[0] + 'px';
+    Sortable._marker.style.top = offsets[1] + 'px';
+    
+    if(position=='after')
+      if(sortable.overlap == 'horizontal') 
+        Sortable._marker.style.left = (offsets[0]+dropon.clientWidth) + 'px';
+      else
+        Sortable._marker.style.top = (offsets[1]+dropon.clientHeight) + 'px';
+    
+    Element.show(Sortable._marker);
+  },
+  
+  _tree: function(element, options, parent) {
+    var children = Sortable.findElements(element, options) || [];
+  
+    for (var i = 0; i < children.length; ++i) {
+      var match = children[i].id.match(options.format);
+
+      if (!match) continue;
+      
+      var child = {
+        id: encodeURIComponent(match ? match[1] : null),
+        element: element,
+        parent: parent,
+        children: new Array,
+        position: parent.children.length,
+        container: Sortable._findChildrenElement(children[i], options.treeTag.toUpperCase())
+      }
+      
+      /* Get the element containing the children and recurse over it */
+      if (child.container)
+        this._tree(child.container, options, child)
+      
+      parent.children.push (child);
+    }
+
+    return parent; 
+  },
+
+  /* Finds the first element of the given tag type within a parent element.
+    Used for finding the first LI[ST] within a L[IST]I[TEM].*/
+  _findChildrenElement: function (element, containerTag) {
+    if (element && element.hasChildNodes)
+      for (var i = 0; i < element.childNodes.length; ++i)
+        if (element.childNodes[i].tagName == containerTag)
+          return element.childNodes[i];
+  
+    return null;
+  },
+
+  tree: function(element) {
+    element = $(element);
+    var sortableOptions = this.options(element);
+    var options = Object.extend({
+      tag: sortableOptions.tag,
+      treeTag: sortableOptions.treeTag,
+      only: sortableOptions.only,
+      name: element.id,
+      format: sortableOptions.format
+    }, arguments[1] || {});
+    
+    var root = {
+      id: null,
+      parent: null,
+      children: new Array,
+      container: element,
+      position: 0
+    }
+    
+    return Sortable._tree (element, options, root);
+  },
+
+  /* Construct a [i] index for a particular node */
+  _constructIndex: function(node) {
+    var index = '';
+    do {
+      if (node.id) index = '[' + node.position + ']' + index;
+    } while ((node = node.parent) != null);
+    return index;
+  },
+
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || {});
+    
+    return $(this.findElements(element, options) || []).map( function(item) {
+      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+    });
+  },
+
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || {});
+    
+    var nodeMap = {};
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+   
+    new_sequence.each(function(ident) {
+      var n = nodeMap[ident];
+      if (n) {
+        n[1].appendChild(n[0]);
+        delete nodeMap[ident];
+      }
+    });
+  },
+  
+  serialize: function(element) {
+    element = $(element);
+    var options = Object.extend(Sortable.options(element), arguments[1] || {});
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
+    
+    if (options.tree) {
+      return Sortable.tree(element, arguments[1]).children.map( function (item) {
+        return [name + Sortable._constructIndex(item) + "=" + 
+                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
+      }).flatten().join('&');
+    } else {
+      return Sortable.sequence(element, arguments[1]).map( function(item) {
+        return name + "[]=" + encodeURIComponent(item);
+      }).join('&');
+    }
+  }
+}
+
+/* Returns true if child is contained within element */
+Element.isParent = function(child, element) {
+  if (!child.parentNode || child == element) return false;
+
+  if (child.parentNode == element) return true;
+
+  return Element.isParent(child.parentNode, element);
+}
+
+Element.findChildren = function(element, only, recursive, tagName) {    
+  if(!element.hasChildNodes()) return null;
+  tagName = tagName.toUpperCase();
+  if(only) only = [only].flatten();
+  var elements = [];
+  $A(element.childNodes).each( function(e) {
+    if(e.tagName && e.tagName.toUpperCase()==tagName &&
+      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
+        elements.push(e);
+    if(recursive) {
+      var grandchildren = Element.findChildren(e, only, recursive, tagName);
+      if(grandchildren) elements.push(grandchildren);
+    }
+  });
+
+  return (elements.length>0 ? elements.flatten() : []);
+}
+
+Element.offsetSize = function (element, type) {
+  if (type == 'vertical' || type == 'height')
+    return element.offsetHeight;
+  else
+    return element.offsetWidth;
+}
\ No newline at end of file
diff --git a/web/imcms/jscropper/marqueeHoriz.gif b/web/imcms/jscropper/marqueeHoriz.gif
new file mode 100644
index 0000000000..25317e5738
Binary files /dev/null and b/web/imcms/jscropper/marqueeHoriz.gif differ
diff --git a/web/imcms/jscropper/marqueeVert.gif b/web/imcms/jscropper/marqueeVert.gif
new file mode 100644
index 0000000000..354070bb45
Binary files /dev/null and b/web/imcms/jscropper/marqueeVert.gif differ
diff --git a/web/imcms/jscropper/prototype.js b/web/imcms/jscropper/prototype.js
new file mode 100644
index 0000000000..0caf9cd7f0
--- /dev/null
+++ b/web/imcms/jscropper/prototype.js
@@ -0,0 +1,2006 @@
+/*  Prototype JavaScript framework, version 1.5.0_rc0
+ *  (c) 2005 Sam Stephenson <sam@conio.net>
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Prototype web site: http://prototype.conio.net/
+ *
+/*--------------------------------------------------------------------------*/
+
+var Prototype = {
+  Version: '1.5.0_rc0',
+  ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
+
+  emptyFunction: function() {},
+  K: function(x) {return x}
+}
+
+var Class = {
+  create: function() {
+    return function() {
+      this.initialize.apply(this, arguments);
+    }
+  }
+}
+
+var Abstract = new Object();
+
+Object.extend = function(destination, source) {
+  for (var property in source) {
+    destination[property] = source[property];
+  }
+  return destination;
+}
+
+Object.inspect = function(object) {
+  try {
+    if (object == undefined) return 'undefined';
+    if (object == null) return 'null';
+    return object.inspect ? object.inspect() : object.toString();
+  } catch (e) {
+    if (e instanceof RangeError) return '...';
+    throw e;
+  }
+}
+
+Function.prototype.bind = function() {
+  var __method = this, args = $A(arguments), object = args.shift();
+  return function() {
+    return __method.apply(object, args.concat($A(arguments)));
+  }
+}
+
+Function.prototype.bindAsEventListener = function(object) {
+  var __method = this;
+  return function(event) {
+    return __method.call(object, event || window.event);
+  }
+}
+
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    var digits = this.toString(16);
+    if (this < 16) return '0' + digits;
+    return digits;
+  },
+
+  succ: function() {
+    return this + 1;
+  },
+
+  times: function(iterator) {
+    $R(0, this, true).each(iterator);
+    return this;
+  }
+});
+
+var Try = {
+  these: function() {
+    var returnValue;
+
+    for (var i = 0; i < arguments.length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) {}
+    }
+
+    return returnValue;
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var PeriodicalExecuter = Class.create();
+PeriodicalExecuter.prototype = {
+  initialize: function(callback, frequency) {
+    this.callback = callback;
+    this.frequency = frequency;
+    this.currentlyExecuting = false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting = true;
+        this.callback();
+      } finally {
+        this.currentlyExecuting = false;
+      }
+    }
+  }
+}
+Object.extend(String.prototype, {
+  gsub: function(pattern, replacement) {
+    var result = '', source = this, match;
+    replacement = arguments.callee.prepareReplacement(replacement);
+
+    while (source.length > 0) {
+      if (match = source.match(pattern)) {
+        result += source.slice(0, match.index);
+        result += (replacement(match) || '').toString();
+        source  = source.slice(match.index + match[0].length);
+      } else {
+        result += source, source = '';
+      }
+    }
+    return result;
+  },
+
+  sub: function(pattern, replacement, count) {
+    replacement = this.gsub.prepareReplacement(replacement);
+    count = count === undefined ? 1 : count;
+
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  },
+
+  scan: function(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return this;
+  },
+
+  truncate: function(length, truncation) {
+    length = length || 30;
+    truncation = truncation === undefined ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : this;
+  },
+
+  strip: function() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  },
+
+  stripTags: function() {
+    return this.replace(/<\/?[^>]+>/gi, '');
+  },
+
+  stripScripts: function() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  },
+
+  extractScripts: function() {
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  },
+
+  evalScripts: function() {
+    return this.extractScripts().map(function(script) { return eval(script) });
+  },
+
+  escapeHTML: function() {
+    var div = document.createElement('div');
+    var text = document.createTextNode(this);
+    div.appendChild(text);
+    return div.innerHTML;
+  },
+
+  unescapeHTML: function() {
+    var div = document.createElement('div');
+    div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
+  },
+
+  toQueryParams: function() {
+    var pairs = this.match(/^\??(.*)$/)[1].split('&');
+    return pairs.inject({}, function(params, pairString) {
+      var pair = pairString.split('=');
+      params[pair[0]] = pair[1];
+      return params;
+    });
+  },
+
+  toArray: function() {
+    return this.split('');
+  },
+
+  camelize: function() {
+    var oStringList = this.split('-');
+    if (oStringList.length == 1) return oStringList[0];
+
+    var camelizedString = this.indexOf('-') == 0
+      ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
+      : oStringList[0];
+
+    for (var i = 1, len = oStringList.length; i < len; i++) {
+      var s = oStringList[i];
+      camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
+    }
+
+    return camelizedString;
+  },
+
+  inspect: function() {
+    return "'" + this.replace(/\\/g, '\\\\').replace(/'/g, '\\\'') + "'";
+  }
+});
+
+String.prototype.gsub.prepareReplacement = function(replacement) {
+  if (typeof replacement == 'function') return replacement;
+  var template = new Template(replacement);
+  return function(match) { return template.evaluate(match) };
+}
+
+String.prototype.parseQuery = String.prototype.toQueryParams;
+
+var Template = Class.create();
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+Template.prototype = {
+  initialize: function(template, pattern) {
+    this.template = template.toString();
+    this.pattern  = pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    return this.template.gsub(this.pattern, function(match) {
+      var before = match[1];
+      if (before == '\\') return match[2];
+      return before + (object[match[3]] || '').toString();
+    });
+  }
+}
+
+var $break    = new Object();
+var $continue = new Object();
+
+var Enumerable = {
+  each: function(iterator) {
+    var index = 0;
+    try {
+      this._each(function(value) {
+        try {
+          iterator(value, index++);
+        } catch (e) {
+          if (e != $continue) throw e;
+        }
+      });
+    } catch (e) {
+      if (e != $break) throw e;
+    }
+  },
+
+  all: function(iterator) {
+    var result = true;
+    this.each(function(value, index) {
+      result = result && !!(iterator || Prototype.K)(value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  },
+
+  any: function(iterator) {
+    var result = true;
+    this.each(function(value, index) {
+      if (result = !!(iterator || Prototype.K)(value, index))
+        throw $break;
+    });
+    return result;
+  },
+
+  collect: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      results.push(iterator(value, index));
+    });
+    return results;
+  },
+
+  detect: function (iterator) {
+    var result;
+    this.each(function(value, index) {
+      if (iterator(value, index)) {
+        result = value;
+        throw $break;
+      }
+    });
+    return result;
+  },
+
+  findAll: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      if (iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  grep: function(pattern, iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      var stringValue = value.toString();
+      if (stringValue.match(pattern))
+        results.push((iterator || Prototype.K)(value, index));
+    })
+    return results;
+  },
+
+  include: function(object) {
+    var found = false;
+    this.each(function(value) {
+      if (value == object) {
+        found = true;
+        throw $break;
+      }
+    });
+    return found;
+  },
+
+  inject: function(memo, iterator) {
+    this.each(function(value, index) {
+      memo = iterator(memo, value, index);
+    });
+    return memo;
+  },
+
+  invoke: function(method) {
+    var args = $A(arguments).slice(1);
+    return this.collect(function(value) {
+      return value[method].apply(value, args);
+    });
+  },
+
+  max: function(iterator) {
+    var result;
+    this.each(function(value, index) {
+      value = (iterator || Prototype.K)(value, index);
+      if (result == undefined || value >= result)
+        result = value;
+    });
+    return result;
+  },
+
+  min: function(iterator) {
+    var result;
+    this.each(function(value, index) {
+      value = (iterator || Prototype.K)(value, index);
+      if (result == undefined || value < result)
+        result = value;
+    });
+    return result;
+  },
+
+  partition: function(iterator) {
+    var trues = [], falses = [];
+    this.each(function(value, index) {
+      ((iterator || Prototype.K)(value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  },
+
+  pluck: function(property) {
+    var results = [];
+    this.each(function(value, index) {
+      results.push(value[property]);
+    });
+    return results;
+  },
+
+  reject: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      if (!iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  sortBy: function(iterator) {
+    return this.collect(function(value, index) {
+      return {value: value, criteria: iterator(value, index)};
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  },
+
+  toArray: function() {
+    return this.collect(Prototype.K);
+  },
+
+  zip: function() {
+    var iterator = Prototype.K, args = $A(arguments);
+    if (typeof args.last() == 'function')
+      iterator = args.pop();
+
+    var collections = [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      return iterator(collections.pluck(index));
+    });
+  },
+
+  inspect: function() {
+    return '#<Enumerable:' + this.toArray().inspect() + '>';
+  }
+}
+
+Object.extend(Enumerable, {
+  map:     Enumerable.collect,
+  find:    Enumerable.detect,
+  select:  Enumerable.findAll,
+  member:  Enumerable.include,
+  entries: Enumerable.toArray
+});
+var $A = Array.from = function(iterable) {
+  if (!iterable) return [];
+  if (iterable.toArray) {
+    return iterable.toArray();
+  } else {
+    var results = [];
+    for (var i = 0; i < iterable.length; i++)
+      results.push(iterable[i]);
+    return results;
+  }
+}
+
+Object.extend(Array.prototype, Enumerable);
+
+if (!Array.prototype._reverse)
+  Array.prototype._reverse = Array.prototype.reverse;
+
+Object.extend(Array.prototype, {
+  _each: function(iterator) {
+    for (var i = 0; i < this.length; i++)
+      iterator(this[i]);
+  },
+
+  clear: function() {
+    this.length = 0;
+    return this;
+  },
+
+  first: function() {
+    return this[0];
+  },
+
+  last: function() {
+    return this[this.length - 1];
+  },
+
+  compact: function() {
+    return this.select(function(value) {
+      return value != undefined || value != null;
+    });
+  },
+
+  flatten: function() {
+    return this.inject([], function(array, value) {
+      return array.concat(value && value.constructor == Array ?
+        value.flatten() : [value]);
+    });
+  },
+
+  without: function() {
+    var values = $A(arguments);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  },
+
+  indexOf: function(object) {
+    for (var i = 0; i < this.length; i++)
+      if (this[i] == object) return i;
+    return -1;
+  },
+
+  reverse: function(inline) {
+    return (inline !== false ? this : this.toArray())._reverse();
+  },
+
+  inspect: function() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  }
+});
+var Hash = {
+  _each: function(iterator) {
+    for (var key in this) {
+      var value = this[key];
+      if (typeof value == 'function') continue;
+
+      var pair = [key, value];
+      pair.key = key;
+      pair.value = value;
+      iterator(pair);
+    }
+  },
+
+  keys: function() {
+    return this.pluck('key');
+  },
+
+  values: function() {
+    return this.pluck('value');
+  },
+
+  merge: function(hash) {
+    return $H(hash).inject($H(this), function(mergedHash, pair) {
+      mergedHash[pair.key] = pair.value;
+      return mergedHash;
+    });
+  },
+
+  toQueryString: function() {
+    return this.map(function(pair) {
+      return pair.map(encodeURIComponent).join('=');
+    }).join('&');
+  },
+
+  inspect: function() {
+    return '#<Hash:{' + this.map(function(pair) {
+      return pair.map(Object.inspect).join(': ');
+    }).join(', ') + '}>';
+  }
+}
+
+function $H(object) {
+  var hash = Object.extend({}, object || {});
+  Object.extend(hash, Enumerable);
+  Object.extend(hash, Hash);
+  return hash;
+}
+ObjectRange = Class.create();
+Object.extend(ObjectRange.prototype, Enumerable);
+Object.extend(ObjectRange.prototype, {
+  initialize: function(start, end, exclusive) {
+    this.start = start;
+    this.end = end;
+    this.exclusive = exclusive;
+  },
+
+  _each: function(iterator) {
+    var value = this.start;
+    do {
+      iterator(value);
+      value = value.succ();
+    } while (this.include(value));
+  },
+
+  include: function(value) {
+    if (value < this.start)
+      return false;
+    if (this.exclusive)
+      return value < this.end;
+    return value <= this.end;
+  }
+});
+
+var $R = function(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+}
+
+var Ajax = {
+  getTransport: function() {
+    return Try.these(
+      function() {return new XMLHttpRequest()},
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+}
+
+Ajax.Responders = {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responderToAdd) {
+    if (!this.include(responderToAdd))
+      this.responders.push(responderToAdd);
+  },
+
+  unregister: function(responderToRemove) {
+    this.responders = this.responders.without(responderToRemove);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (responder[callback] && typeof responder[callback] == 'function') {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) {}
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate: function() {
+    Ajax.activeRequestCount++;
+  },
+
+  onComplete: function() {
+    Ajax.activeRequestCount--;
+  }
+});
+
+Ajax.Base = function() {};
+Ajax.Base.prototype = {
+  setOptions: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      contentType:  'application/x-www-form-urlencoded',
+      parameters:   ''
+    }
+    Object.extend(this.options, options || {});
+  },
+
+  responseIsSuccess: function() {
+    return this.transport.status == undefined
+        || this.transport.status == 0
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+
+  responseIsFailure: function() {
+    return !this.responseIsSuccess();
+  }
+}
+
+Ajax.Request = Class.create();
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+  initialize: function(url, options) {
+    this.transport = Ajax.getTransport();
+    this.setOptions(options);
+    this.request(url);
+  },
+
+  request: function(url) {
+    var parameters = this.options.parameters || '';
+    if (parameters.length > 0) parameters += '&_=';
+
+    try {
+      this.url = url;
+      if (this.options.method == 'get' && parameters.length > 0)
+        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
+
+      Ajax.Responders.dispatch('onCreate', this, this.transport);
+
+      this.transport.open(this.options.method, this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) {
+        this.transport.onreadystatechange = this.onStateChange.bind(this);
+        setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
+      }
+
+      this.setRequestHeaders();
+
+      var body = this.options.postBody ? this.options.postBody : parameters;
+      this.transport.send(this.options.method == 'post' ? body : null);
+
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  setRequestHeaders: function() {
+    var requestHeaders =
+      ['X-Requested-With', 'XMLHttpRequest',
+       'X-Prototype-Version', Prototype.Version,
+       'Accept', 'text/javascript, text/html, application/xml, text/xml, */*'];
+
+    if (this.options.method == 'post') {
+      requestHeaders.push('Content-type', this.options.contentType);
+
+      /* Force "Connection: close" for Mozilla browsers to work around
+       * a bug where XMLHttpReqeuest sends an incorrect Content-length
+       * header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType)
+        requestHeaders.push('Connection', 'close');
+    }
+
+    if (this.options.requestHeaders)
+      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+
+    for (var i = 0; i < requestHeaders.length; i += 2)
+      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState != 1)
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  header: function(name) {
+    try {
+      return this.transport.getResponseHeader(name);
+    } catch (e) {}
+  },
+
+  evalJSON: function() {
+    try {
+      return eval('(' + this.header('X-JSON') + ')');
+    } catch (e) {}
+  },
+
+  evalResponse: function() {
+    try {
+      return eval(this.transport.responseText);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  respondToReadyState: function(readyState) {
+    var event = Ajax.Request.Events[readyState];
+    var transport = this.transport, json = this.evalJSON();
+
+    if (event == 'Complete') {
+      try {
+        (this.options['on' + this.transport.status]
+         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(transport, json);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + event] || Prototype.emptyFunction)(transport, json);
+      Ajax.Responders.dispatch('on' + event, this, transport, json);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
+    if (event == 'Complete')
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Updater = Class.create();
+
+Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
+  initialize: function(container, url, options) {
+    this.containers = {
+      success: container.success ? $(container.success) : $(container),
+      failure: container.failure ? $(container.failure) :
+        (container.success ? null : $(container))
+    }
+
+    this.transport = Ajax.getTransport();
+    this.setOptions(options);
+
+    var onComplete = this.options.onComplete || Prototype.emptyFunction;
+    this.options.onComplete = (function(transport, object) {
+      this.updateContent();
+      onComplete(transport, object);
+    }).bind(this);
+
+    this.request(url);
+  },
+
+  updateContent: function() {
+    var receiver = this.responseIsSuccess() ?
+      this.containers.success : this.containers.failure;
+    var response = this.transport.responseText;
+
+    if (!this.options.evalScripts)
+      response = response.stripScripts();
+
+    if (receiver) {
+      if (this.options.insertion) {
+        new this.options.insertion(receiver, response);
+      } else {
+        Element.update(receiver, response);
+      }
+    }
+
+    if (this.responseIsSuccess()) {
+      if (this.onComplete)
+        setTimeout(this.onComplete.bind(this), 10);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create();
+Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
+  initialize: function(container, url, options) {
+    this.setOptions(options);
+    this.onComplete = this.options.onComplete;
+
+    this.frequency = (this.options.frequency || 2);
+    this.decay = (this.options.decay || 1);
+
+    this.updater = {};
+    this.container = container;
+    this.url = url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete = this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.onComplete = undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(request) {
+    if (this.options.decay) {
+      this.decay = (request.responseText == this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText = request.responseText;
+    }
+    this.timer = setTimeout(this.onTimerEvent.bind(this),
+      this.decay * this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    this.updater = new Ajax.Updater(this.container, this.url, this.options);
+  }
+});
+function $() {
+  var results = [], element;
+  for (var i = 0; i < arguments.length; i++) {
+    element = arguments[i];
+    if (typeof element == 'string')
+      element = document.getElementById(element);
+    results.push(Element.extend(element));
+  }
+  return results.length < 2 ? results[0] : results;
+}
+
+document.getElementsByClassName = function(className, parentElement) {
+  var children = ($(parentElement) || document.body).getElementsByTagName('*');
+  return $A(children).inject([], function(elements, child) {
+    if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      elements.push(Element.extend(child));
+    return elements;
+  });
+}
+
+/*--------------------------------------------------------------------------*/
+
+if (!window.Element)
+  var Element = new Object();
+
+Element.extend = function(element) {
+  if (!element) return;
+  if (_nativeExtensions) return element;
+
+  if (!element._extended && element.tagName && element != window) {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+      var value = methods[property];
+      if (typeof value == 'function')
+        element[property] = cache.findOrStore(value);
+    }
+  }
+
+  element._extended = true;
+  return element;
+}
+
+Element.extend.cache = {
+  findOrStore: function(value) {
+    return this[value] = this[value] || function() {
+      return value.apply(null, [this].concat($A(arguments)));
+    }
+  }
+}
+
+Element.Methods = {
+  visible: function(element) {
+    return $(element).style.display != 'none';
+  },
+
+  toggle: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      Element[Element.visible(element) ? 'hide' : 'show'](element);
+    }
+  },
+
+  hide: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = 'none';
+    }
+  },
+
+  show: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = '';
+    }
+  },
+
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+  },
+
+  update: function(element, html) {
+    $(element).innerHTML = html.stripScripts();
+    setTimeout(function() {html.evalScripts()}, 10);
+  },
+
+  replace: function(element, html) {
+    element = $(element);
+    if (element.outerHTML) {
+      element.outerHTML = html.stripScripts();
+    } else {
+      var range = element.ownerDocument.createRange();
+      range.selectNodeContents(element);
+      element.parentNode.replaceChild(
+        range.createContextualFragment(html.stripScripts()), element);
+    }
+    setTimeout(function() {html.evalScripts()}, 10);
+  },
+
+  getHeight: function(element) {
+    element = $(element);
+    return element.offsetHeight;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).include(className);
+  },
+
+  addClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).add(className);
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).remove(className);
+  },
+
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element = $(element);
+    for (var i = 0; i < element.childNodes.length; i++) {
+      var node = element.childNodes[i];
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        Element.remove(node);
+    }
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.match(/^\s*$/);
+  },
+
+  childOf: function(element, ancestor) {
+    element = $(element), ancestor = $(ancestor);
+    while (element = element.parentNode)
+      if (element == ancestor) return true;
+    return false;
+  },
+
+  scrollTo: function(element) {
+    element = $(element);
+    var x = element.x ? element.x : element.offsetLeft,
+        y = element.y ? element.y : element.offsetTop;
+    window.scrollTo(x, y);
+  },
+
+  getStyle: function(element, style) {
+    element = $(element);
+    var value = element.style[style.camelize()];
+    if (!value) {
+      if (document.defaultView && document.defaultView.getComputedStyle) {
+        var css = document.defaultView.getComputedStyle(element, null);
+        value = css ? css.getPropertyValue(style) : null;
+      } else if (element.currentStyle) {
+        value = element.currentStyle[style.camelize()];
+      }
+    }
+
+    if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
+      if (Element.getStyle(element, 'position') == 'static') value = 'auto';
+
+    return value == 'auto' ? null : value;
+  },
+
+  setStyle: function(element, style) {
+    element = $(element);
+    for (var name in style)
+      element.style[name.camelize()] = style[name];
+  },
+
+  getDimensions: function(element) {
+    element = $(element);
+    if (Element.getStyle(element, 'display') != 'none')
+      return {width: element.offsetWidth, height: element.offsetHeight};
+
+    // All *Width and *Height properties give 0 on elements with display none,
+    // so enable the element temporarily
+    var els = element.style;
+    var originalVisibility = els.visibility;
+    var originalPosition = els.position;
+    els.visibility = 'hidden';
+    els.position = 'absolute';
+    els.display = '';
+    var originalWidth = element.clientWidth;
+    var originalHeight = element.clientHeight;
+    els.display = 'none';
+    els.position = originalPosition;
+    els.visibility = originalVisibility;
+    return {width: originalWidth, height: originalHeight};
+  },
+
+  makePositioned: function(element) {
+    element = $(element);
+    var pos = Element.getStyle(element, 'position');
+    if (pos == 'static' || !pos) {
+      element._madePositioned = true;
+      element.style.position = 'relative';
+      // Opera returns the offset relative to the positioning context, when an
+      // element is position relative but top and left have not been defined
+      if (window.opera) {
+        element.style.top = 0;
+        element.style.left = 0;
+      }
+    }
+  },
+
+  undoPositioned: function(element) {
+    element = $(element);
+    if (element._madePositioned) {
+      element._madePositioned = undefined;
+      element.style.position =
+        element.style.top =
+        element.style.left =
+        element.style.bottom =
+        element.style.right = '';
+    }
+  },
+
+  makeClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return;
+    element._overflow = element.style.overflow;
+    if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
+      element.style.overflow = 'hidden';
+  },
+
+  undoClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return;
+    element.style.overflow = element._overflow;
+    element._overflow = undefined;
+  }
+}
+
+Object.extend(Element, Element.Methods);
+
+var _nativeExtensions = false;
+
+if(!HTMLElement && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+  var HTMLElement = {}
+  HTMLElement.prototype = document.createElement('div').__proto__;
+}
+
+Element.addMethods = function(methods) {
+  Object.extend(Element.Methods, methods || {});
+
+  if(typeof HTMLElement != 'undefined') {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+      var value = methods[property];
+      if (typeof value == 'function')
+        HTMLElement.prototype[property] = cache.findOrStore(value);
+    }
+    _nativeExtensions = true;
+  }
+}
+
+Element.addMethods();
+
+var Toggle = new Object();
+Toggle.display = Element.toggle;
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.Insertion = function(adjacency) {
+  this.adjacency = adjacency;
+}
+
+Abstract.Insertion.prototype = {
+  initialize: function(element, content) {
+    this.element = $(element);
+    this.content = content.stripScripts();
+
+    if (this.adjacency && this.element.insertAdjacentHTML) {
+      try {
+        this.element.insertAdjacentHTML(this.adjacency, this.content);
+      } catch (e) {
+        var tagName = this.element.tagName.toLowerCase();
+        if (tagName == 'tbody' || tagName == 'tr') {
+          this.insertContent(this.contentFromAnonymousTable());
+        } else {
+          throw e;
+        }
+      }
+    } else {
+      this.range = this.element.ownerDocument.createRange();
+      if (this.initializeRange) this.initializeRange();
+      this.insertContent([this.range.createContextualFragment(this.content)]);
+    }
+
+    setTimeout(function() {content.evalScripts()}, 10);
+  },
+
+  contentFromAnonymousTable: function() {
+    var div = document.createElement('div');
+    div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
+    return $A(div.childNodes[0].childNodes[0].childNodes);
+  }
+}
+
+var Insertion = new Object();
+
+Insertion.Before = Class.create();
+Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
+  initializeRange: function() {
+    this.range.setStartBefore(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.parentNode.insertBefore(fragment, this.element);
+    }).bind(this));
+  }
+});
+
+Insertion.Top = Class.create();
+Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(true);
+  },
+
+  insertContent: function(fragments) {
+    fragments.reverse(false).each((function(fragment) {
+      this.element.insertBefore(fragment, this.element.firstChild);
+    }).bind(this));
+  }
+});
+
+Insertion.Bottom = Class.create();
+Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.appendChild(fragment);
+    }).bind(this));
+  }
+});
+
+Insertion.After = Class.create();
+Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
+  initializeRange: function() {
+    this.range.setStartAfter(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.parentNode.insertBefore(fragment,
+        this.element.nextSibling);
+    }).bind(this));
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Element.ClassNames = Class.create();
+Element.ClassNames.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+  },
+
+  _each: function(iterator) {
+    this.element.className.split(/\s+/).select(function(name) {
+      return name.length > 0;
+    })._each(iterator);
+  },
+
+  set: function(className) {
+    this.element.className = className;
+  },
+
+  add: function(classNameToAdd) {
+    if (this.include(classNameToAdd)) return;
+    this.set(this.toArray().concat(classNameToAdd).join(' '));
+  },
+
+  remove: function(classNameToRemove) {
+    if (!this.include(classNameToRemove)) return;
+    this.set(this.select(function(className) {
+      return className != classNameToRemove;
+    }).join(' '));
+  },
+
+  toString: function() {
+    return this.toArray().join(' ');
+  }
+}
+
+Object.extend(Element.ClassNames.prototype, Enumerable);
+var Selector = Class.create();
+Selector.prototype = {
+  initialize: function(expression) {
+    this.params = {classNames: []};
+    this.expression = expression.toString().strip();
+    this.parseExpression();
+    this.compileMatcher();
+  },
+
+  parseExpression: function() {
+    function abort(message) { throw 'Parse error in selector: ' + message; }
+
+    if (this.expression == '')  abort('empty expression');
+
+    var params = this.params, expr = this.expression, match, modifier, clause, rest;
+    while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) {
+      params.attributes = params.attributes || [];
+      params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''});
+      expr = match[1];
+    }
+
+    if (expr == '*') return this.params.wildcard = true;
+
+    while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) {
+      modifier = match[1], clause = match[2], rest = match[3];
+      switch (modifier) {
+        case '#':       params.id = clause; break;
+        case '.':       params.classNames.push(clause); break;
+        case '':
+        case undefined: params.tagName = clause.toUpperCase(); break;
+        default:        abort(expr.inspect());
+      }
+      expr = rest;
+    }
+
+    if (expr.length > 0) abort(expr.inspect());
+  },
+
+  buildMatchExpression: function() {
+    var params = this.params, conditions = [], clause;
+
+    if (params.wildcard)
+      conditions.push('true');
+    if (clause = params.id)
+      conditions.push('element.id == ' + clause.inspect());
+    if (clause = params.tagName)
+      conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
+    if ((clause = params.classNames).length > 0)
+      for (var i = 0; i < clause.length; i++)
+        conditions.push('Element.hasClassName(element, ' + clause[i].inspect() + ')');
+    if (clause = params.attributes) {
+      clause.each(function(attribute) {
+        var value = 'element.getAttribute(' + attribute.name.inspect() + ')';
+        var splitValueBy = function(delimiter) {
+          return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
+        }
+
+        switch (attribute.operator) {
+          case '=':       conditions.push(value + ' == ' + attribute.value.inspect()); break;
+          case '~=':      conditions.push(splitValueBy(' ') + '.include(' + attribute.value.inspect() + ')'); break;
+          case '|=':      conditions.push(
+                            splitValueBy('-') + '.first().toUpperCase() == ' + attribute.value.toUpperCase().inspect()
+                          ); break;
+          case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
+          case '':
+          case undefined: conditions.push(value + ' != null'); break;
+          default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
+        }
+      });
+    }
+
+    return conditions.join(' && ');
+  },
+
+  compileMatcher: function() {
+    this.match = new Function('element', 'if (!element.tagName) return false; \
+      return ' + this.buildMatchExpression());
+  },
+
+  findElements: function(scope) {
+    var element;
+
+    if (element = $(this.params.id))
+      if (this.match(element))
+        if (!scope || Element.childOf(element, scope))
+          return [element];
+
+    scope = (scope || document).getElementsByTagName(this.params.tagName || '*');
+
+    var results = [];
+    for (var i = 0; i < scope.length; i++)
+      if (this.match(element = scope[i]))
+        results.push(Element.extend(element));
+
+    return results;
+  },
+
+  toString: function() {
+    return this.expression;
+  }
+}
+
+function $$() {
+  return $A(arguments).map(function(expression) {
+    return expression.strip().split(/\s+/).inject([null], function(results, expr) {
+      var selector = new Selector(expr);
+      return results.map(selector.findElements.bind(selector)).flatten();
+    });
+  }).flatten();
+}
+var Field = {
+  clear: function() {
+    for (var i = 0; i < arguments.length; i++)
+      $(arguments[i]).value = '';
+  },
+
+  focus: function(element) {
+    $(element).focus();
+  },
+
+  present: function() {
+    for (var i = 0; i < arguments.length; i++)
+      if ($(arguments[i]).value == '') return false;
+    return true;
+  },
+
+  select: function(element) {
+    $(element).select();
+  },
+
+  activate: function(element) {
+    element = $(element);
+    element.focus();
+    if (element.select)
+      element.select();
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var Form = {
+  serialize: function(form) {
+    var elements = Form.getElements($(form));
+    var queryComponents = new Array();
+
+    for (var i = 0; i < elements.length; i++) {
+      var queryComponent = Form.Element.serialize(elements[i]);
+      if (queryComponent)
+        queryComponents.push(queryComponent);
+    }
+
+    return queryComponents.join('&');
+  },
+
+  getElements: function(form) {
+    form = $(form);
+    var elements = new Array();
+
+    for (var tagName in Form.Element.Serializers) {
+      var tagElements = form.getElementsByTagName(tagName);
+      for (var j = 0; j < tagElements.length; j++)
+        elements.push(tagElements[j]);
+    }
+    return elements;
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name)
+      return inputs;
+
+    var matchingInputs = new Array();
+    for (var i = 0; i < inputs.length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) ||
+          (name && input.name != name))
+        continue;
+      matchingInputs.push(input);
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    var elements = Form.getElements(form);
+    for (var i = 0; i < elements.length; i++) {
+      var element = elements[i];
+      element.blur();
+      element.disabled = 'true';
+    }
+  },
+
+  enable: function(form) {
+    var elements = Form.getElements(form);
+    for (var i = 0; i < elements.length; i++) {
+      var element = elements[i];
+      element.disabled = '';
+    }
+  },
+
+  findFirstElement: function(form) {
+    return Form.getElements(form).find(function(element) {
+      return element.type != 'hidden' && !element.disabled &&
+        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    Field.activate(Form.findFirstElement(form));
+  },
+
+  reset: function(form) {
+    $(form).reset();
+  }
+}
+
+Form.Element = {
+  serialize: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    var parameter = Form.Element.Serializers[method](element);
+
+    if (parameter) {
+      var key = encodeURIComponent(parameter[0]);
+      if (key.length == 0) return;
+
+      if (parameter[1].constructor != Array)
+        parameter[1] = [parameter[1]];
+
+      return parameter[1].map(function(value) {
+        return key + '=' + encodeURIComponent(value);
+      }).join('&');
+    }
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    var parameter = Form.Element.Serializers[method](element);
+
+    if (parameter)
+      return parameter[1];
+  }
+}
+
+Form.Element.Serializers = {
+  input: function(element) {
+    switch (element.type.toLowerCase()) {
+      case 'submit':
+      case 'hidden':
+      case 'password':
+      case 'text':
+        return Form.Element.Serializers.textarea(element);
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element);
+    }
+    return false;
+  },
+
+  inputSelector: function(element) {
+    if (element.checked)
+      return [element.name, element.value];
+  },
+
+  textarea: function(element) {
+    return [element.name, element.value];
+  },
+
+  select: function(element) {
+    return Form.Element.Serializers[element.type == 'select-one' ?
+      'selectOne' : 'selectMany'](element);
+  },
+
+  selectOne: function(element) {
+    var value = '', opt, index = element.selectedIndex;
+    if (index >= 0) {
+      opt = element.options[index];
+      value = opt.value || opt.text;
+    }
+    return [element.name, value];
+  },
+
+  selectMany: function(element) {
+    var value = [];
+    for (var i = 0; i < element.length; i++) {
+      var opt = element.options[i];
+      if (opt.selected)
+        value.push(opt.value || opt.text);
+    }
+    return [element.name, value];
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var $F = Form.Element.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.TimedObserver = function() {}
+Abstract.TimedObserver.prototype = {
+  initialize: function(element, frequency, callback) {
+    this.frequency = frequency;
+    this.element   = $(element);
+    this.callback  = callback;
+
+    this.lastValue = this.getValue();
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+}
+
+Form.Element.Observer = Class.create();
+Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create();
+Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = function() {}
+Abstract.EventObserver.prototype = {
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    var elements = Form.getElements(this.element);
+    for (var i = 0; i < elements.length; i++)
+      this.registerCallback(elements[i]);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        case 'password':
+        case 'text':
+        case 'textarea':
+        case 'select-one':
+        case 'select-multiple':
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+}
+
+Form.Element.EventObserver = Class.create();
+Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create();
+Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) {
+  var Event = new Object();
+}
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+
+  element: function(event) {
+    return event.target || event.srcElement;
+  },
+
+  isLeftClick: function(event) {
+    return (((event.which) && (event.which == 1)) ||
+            ((event.button) && (event.button == 1)));
+  },
+
+  pointerX: function(event) {
+    return event.pageX || (event.clientX +
+      (document.documentElement.scrollLeft || document.body.scrollLeft));
+  },
+
+  pointerY: function(event) {
+    return event.pageY || (event.clientY +
+      (document.documentElement.scrollTop || document.body.scrollTop));
+  },
+
+  stop: function(event) {
+    if (event.preventDefault) {
+      event.preventDefault();
+      event.stopPropagation();
+    } else {
+      event.returnValue = false;
+      event.cancelBubble = true;
+    }
+  },
+
+  // find the first node with the given tagName, starting from the
+  // node the event was triggered on; traverses the DOM upwards
+  findElement: function(event, tagName) {
+    var element = Event.element(event);
+    while (element.parentNode && (!element.tagName ||
+        (element.tagName.toUpperCase() != tagName.toUpperCase())))
+      element = element.parentNode;
+    return element;
+  },
+
+  observers: false,
+
+  _observeAndCache: function(element, name, observer, useCapture) {
+    if (!this.observers) this.observers = [];
+    if (element.addEventListener) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.addEventListener(name, observer, useCapture);
+    } else if (element.attachEvent) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.attachEvent('on' + name, observer);
+    }
+  },
+
+  unloadCache: function() {
+    if (!Event.observers) return;
+    for (var i = 0; i < Event.observers.length; i++) {
+      Event.stopObserving.apply(this, Event.observers[i]);
+      Event.observers[i][0] = null;
+    }
+    Event.observers = false;
+  },
+
+  observe: function(element, name, observer, useCapture) {
+    var element = $(element);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.attachEvent))
+      name = 'keydown';
+
+    this._observeAndCache(element, name, observer, useCapture);
+  },
+
+  stopObserving: function(element, name, observer, useCapture) {
+    var element = $(element);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.detachEvent))
+      name = 'keydown';
+
+    if (element.removeEventListener) {
+      element.removeEventListener(name, observer, useCapture);
+    } else if (element.detachEvent) {
+      element.detachEvent('on' + name, observer);
+    }
+  }
+});
+
+/* prevent memory leaks in IE */
+if (navigator.appVersion.match(/\bMSIE\b/))
+  Event.observe(window, 'unload', Event.unloadCache, false);
+var Position = {
+  // set to true if needed, warning: firefox performance problems
+  // NOT neeeded for page scrolling, only if draggable contained in
+  // scrollable elements
+  includeScrollOffsets: false,
+
+  // must be called before calling withinIncludingScrolloffset, every time the
+  // page is scrolled
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
+  },
+
+  realOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  cumulativeOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  positionedOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        p = Element.getStyle(element, 'position');
+        if (p == 'relative' || p == 'absolute') break;
+      }
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  offsetParent: function(element) {
+    if (element.offsetParent) return element.offsetParent;
+    if (element == document.body) return element;
+
+    while ((element = element.parentNode) && element != document.body)
+      if (Element.getStyle(element, 'position') != 'static')
+        return element;
+
+    return document.body;
+  },
+
+  // caches x/y coordinate pair to use with overlap
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = this.cumulativeOffset(element);
+
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
+  },
+
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = this.realOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = this.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  // within must be called directly before
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+  clone: function(source, target) {
+    source = $(source);
+    target = $(target);
+    target.style.position = 'absolute';
+    var offsets = this.cumulativeOffset(source);
+    target.style.top    = offsets[1] + 'px';
+    target.style.left   = offsets[0] + 'px';
+    target.style.width  = source.offsetWidth + 'px';
+    target.style.height = source.offsetHeight + 'px';
+  },
+
+  page: function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent==document.body)
+        if (Element.getStyle(element,'position')=='absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      valueT -= element.scrollTop  || 0;
+      valueL -= element.scrollLeft || 0;
+    } while (element = element.parentNode);
+
+    return [valueL, valueT];
+  },
+
+  clone: function(source, target) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || {})
+
+    // find page position of source
+    source = $(source);
+    var p = Position.page(source);
+
+    // find coordinate system to use
+    target = $(target);
+    var delta = [0, 0];
+    var parent = null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(target,'position') == 'absolute') {
+      parent = Position.offsetParent(target);
+      delta = Position.page(parent);
+    }
+
+    // correct by body offsets (fixes Safari)
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    // set position
+    if(options.setLeft)   target.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if(options.setTop)    target.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if(options.setWidth)  target.style.width = source.offsetWidth + 'px';
+    if(options.setHeight) target.style.height = source.offsetHeight + 'px';
+  },
+
+  absolutize: function(element) {
+    element = $(element);
+    if (element.style.position == 'absolute') return;
+    Position.prepare();
+
+    var offsets = Position.positionedOffset(element);
+    var top     = offsets[1];
+    var left    = offsets[0];
+    var width   = element.clientWidth;
+    var height  = element.clientHeight;
+
+    element._originalLeft   = left - parseFloat(element.style.left  || 0);
+    element._originalTop    = top  - parseFloat(element.style.top || 0);
+    element._originalWidth  = element.style.width;
+    element._originalHeight = element.style.height;
+
+    element.style.position = 'absolute';
+    element.style.top    = top + 'px';;
+    element.style.left   = left + 'px';;
+    element.style.width  = width + 'px';;
+    element.style.height = height + 'px';;
+  },
+
+  relativize: function(element) {
+    element = $(element);
+    if (element.style.position == 'relative') return;
+    Position.prepare();
+
+    element.style.position = 'relative';
+    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
+    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.height = element._originalHeight;
+    element.style.width  = element._originalWidth;
+  }
+}
+
+// Safari returns margins on body which is incorrect if the child is absolutely
+// positioned.  For performance reasons, redefine Position.cumulativeOffset for
+// KHTML/WebKit only.
+if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+  Position.cumulativeOffset = function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == document.body)
+        if (Element.getStyle(element, 'position') == 'absolute') break;
+
+      element = element.offsetParent;
+    } while (element);
+
+    return [valueL, valueT];
+  }
+}
\ No newline at end of file
diff --git a/web/imcms/jscropper/scriptaculous.js b/web/imcms/jscropper/scriptaculous.js
new file mode 100644
index 0000000000..f61fc57f74
--- /dev/null
+++ b/web/imcms/jscropper/scriptaculous.js
@@ -0,0 +1,47 @@
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var Scriptaculous = {
+  Version: '1.6.1',
+  require: function(libraryName) {
+    // inserting via DOM fails in Safari 2.0, so brute force approach
+    document.write('<script type="text/javascript" src="'+libraryName+'"></script>');
+  },
+  load: function() {
+    if((typeof Prototype=='undefined') || 
+       (typeof Element == 'undefined') || 
+       (typeof Element.Methods=='undefined') ||
+       parseFloat(Prototype.Version.split(".")[0] + "." +
+                  Prototype.Version.split(".")[1]) < 1.5)
+       throw("script.aculo.us requires the Prototype JavaScript framework >= 1.5.0");
+    
+    $A(document.getElementsByTagName("script")).findAll( function(s) {
+      return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
+    }).each( function(s) {
+      var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
+      var includes = s.src.match(/\?.*load=([a-z,]*)/);
+      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider').split(',').each(
+       function(include) { Scriptaculous.require(path+include+'.js') });
+    });
+  }
+}
+
+Scriptaculous.load();
\ No newline at end of file
diff --git a/web/imcms/lang/html/link_editor.jsp b/web/imcms/lang/html/link_editor.jsp
index 71ab02c37f..ece49d4125 100644
--- a/web/imcms/lang/html/link_editor.jsp
+++ b/web/imcms/lang/html/link_editor.jsp
@@ -71,7 +71,7 @@
 		<td><input type="text" name="createLinkValue" size="54" maxlength="100" style="width: 100%" value="<? install/htdocs/imcms/html/link_editor.jsp/21/1 ?>"></td>
 	</tr>
 	<tr>
-		<td class="imcmsAdmText" nowrap><? install/htdocs/imcms/html/link_editor.jsp/22 ?></td>
+		<td class="imcmsAdmText" nowrap><? edit/link/cssClass ?></td>
 		<td><input type="text" name="createLinkCss" size="20" maxlength="50" style="width: 150" value=""></td>
 	</tr>
 	<tr>
diff --git a/web/imcms/lang/jsp/FileAdmin_edit.jsp b/web/imcms/lang/jsp/FileAdmin_edit.jsp
index 72d08232e8..271a2a31e6 100644
--- a/web/imcms/lang/jsp/FileAdmin_edit.jsp
+++ b/web/imcms/lang/jsp/FileAdmin_edit.jsp
@@ -1,15 +1,74 @@
 <%@ page language="java"
-
-	import="imcode.util.Utility,
+	import="com.glaforge.i18n.io.SmartEncodingInputStream,
+	        imcode.server.Imcms,
+	        imcode.server.user.UserDomainObject,
+	        imcode.util.Utility,
+	        org.apache.commons.lang.StringUtils,
 	        org.apache.oro.text.perl.Perl5Util,
-	        java.io.*,
-            imcode.server.user.UserDomainObject, imcode.server.Imcms"
-    contentType="text/html; charset=UTF-8"
+	        java.io.BufferedReader, java.io.File"
+
+	contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"
+%>
+<%@ page import="java.io.FileInputStream" %>
+<%@ page import="java.io.FileNotFoundException" %>
+<%@ page import="java.io.FileOutputStream" %>
+<%@ page import="java.io.IOException" %>
+<%@ page import="java.io.OutputStreamWriter" %>
+<%@ page import="java.io.Reader" %>
+<%@ page import="java.io.Writer" %>
+<%@ page import="java.nio.charset.StandardCharsets" %>
+<%@taglib prefix="vel" uri="imcmsvelocity" %>
+<%!
+
+private static String convertUtf8ToIso(String string) {
+	try {
+        return new String(string.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
+	} catch (Exception e) {
+		return string ;
+	}
+}
+private static String convertIsoToUtf8(String string) {
+	try {
+        return new String(string.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+	} catch (Exception e) {
+		return string ;
+	}
+}
+
+private static boolean isValidUtf8(String str) { // Not failsafe, but better than before!
+	String strIso       = convertUtf8ToIso(str) ;
+	String strUtf       = convertIsoToUtf8(str) ;
+	return (!strIso.contains("¿½") || strIso.equals(str) || strIso.equals(strUtf)) ;
+}
+
+/*
+http://svn.codehaus.org/guessencoding/trunk/src/main/java/com/glaforge/i18n/io/SmartEncodingInputStream.java
+*/
+
+private static String getFileContent(File file, String encoding) {
+	try {
+		FileInputStream fis   = new FileInputStream(file) ;
+		SmartEncodingInputStream smartIS = new SmartEncodingInputStream(fis, 8192, java.nio.charset.Charset.forName(encoding));
+		Reader reader = smartIS.getReader();
+		BufferedReader br = new BufferedReader(reader);
+		String fileLine, fileSrc = "" ;
+		while ((fileLine = br.readLine()) != null) {
+			String tempStr = fileLine + "\n" ;
+			if (tempStr.length() > 0) {
+				fileSrc += tempStr ;
+			}
+		}
+		br.close() ;
+		return fileSrc ;
+	} catch (IOException e) {}
+	return "" ;
+}
 
-%><%@taglib prefix="vel" uri="imcmsvelocity"%><%
+%><%
 
 request.setCharacterEncoding("UTF-8");
-    
+
 UserDomainObject user = Utility.getLoggedOnUser( request );
 if (!user.isSuperAdmin()) {
     return ;
@@ -19,9 +78,11 @@ if (!user.isSuperAdmin()) {
  *           SETTINGS                                                *
  ******************************************************************* */
 
-String acceptedExtPattern         = "/\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG)+$/i" ;
+String ren = "(\\.[\\d]+)?" ;
+
+String acceptedExtPattern         = "/\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG)+" + ren + "$/i" ;
 String acceptedExtPatternReadonly = "/" +
-	"(\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG)+$)" +
+	"(\\.(HTML?|CSS|JS|VBS|TXT|INC|JSP|ASP|FRAG)+" + ren + "$)" +
 	"|(\\.LOG+)" +
 	"/i" ;
 
@@ -42,6 +103,8 @@ boolean isReadonly = request.getParameter("readonly") != null ;
 
 String theSearchString = (request.getParameter("searchString") != null) ? request.getParameter("searchString") : "" ;
 
+if(file != null && file.contains("../")) return;
+
 /* reset file ? */
 
 boolean resetOrg   = false ;
@@ -86,10 +149,10 @@ boolean isEditable = re.match(acceptedExtPattern, fn.getName()) ;
 
 /* Check browser */
 
-String uAgent = request.getHeader("USER-AGENT") ;
-boolean hasDocumentAll  = re.match("/(MSIE 4|MSIE 5|MSIE 5\\.5|MSIE 6|MSIE 7)/i", uAgent) ;
-boolean hasDocumentLayers  = (re.match("/Mozilla/i", uAgent) && !re.match("/Gecko/i", uAgent) && !re.match("/MSIE/i", uAgent)) ;
-boolean hasGetElementById = re.match("/Gecko/i", uAgent) ;
+String uAgent = StringUtils.defaultString(request.getHeader("USER-AGENT")) ;
+boolean hasDocumentAll    = re.match("/(MSIE \\d)/i", uAgent) ;
+boolean hasGetElementById = re.match("/Gecko/i", uAgent) || hasDocumentAll ;
+boolean hasDocumentLayers = (re.match("/Mozilla/i", uAgent) && !hasDocumentAll && !hasGetElementById) ;
 boolean isMac = re.match("/Mac/i", uAgent) ;
 
 /* Special Character replacers */
@@ -122,7 +185,8 @@ if (doSave) {
 		/*for (int i = 0; i < fuckedUpUmlingBack.length; i = i + 2) {
 			fileSrc = fileSrc.replaceAll(fuckedUpUmlingBack[i],fuckedUpUmlingBack[i+1]) ;
 		}*/
-		fileOut = new OutputStreamWriter(new FileOutputStream(fn), Imcms.DEFAULT_ENCODING) ;
+		boolean isGuessedAsIsoFile = (null != request.getParameter("isGuessedAsIsoFile")) ;
+		fileOut = new OutputStreamWriter(new FileOutputStream(fn), isGuessedAsIsoFile ? Imcms.ISO_8859_1_ENCODING : Imcms.UTF_8_ENCODING) ;
 		fileOut.write(fileSrc) ;
 		isSaved = true ;
 	} catch (FileNotFoundException fnEx) {
@@ -134,26 +198,21 @@ if (doSave) {
 			fileOut.close() ;
 		}
 	}
+	response.sendRedirect(thisPage + "?file=" + java.net.URLEncoder.encode(file, Imcms.UTF_8_ENCODING) + (isReadonly ? "&readonly=1" : "")) ;
+	return ;
 }
 
 /* if Is editable file - Read file and show it */
 
-String fileLine ;
-String tempStr ;
+boolean isGuessedAsIsoFile = false ;
 
 if (isEditable && !doSave) {
 
-	BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(fn), "UTF-8")) ;
-
-	fileSrc = "" ;
-	while ((fileLine = br.readLine()) != null) {
-		tempStr = fileLine + "\n" ;
-		if (tempStr.length() > 0) {
-			fileSrc += tempStr ;
-		}
+	fileSrc = getFileContent(fn, Imcms.UTF_8_ENCODING) ;
+	if (!isValidUtf8(fileSrc)) {
+		fileSrc = getFileContent(fn, Imcms.ISO_8859_1_ENCODING) ;
+		isGuessedAsIsoFile = true ;
 	}
-	br.close() ;
-
 
 } else if (!isEditable) {
 
@@ -225,7 +284,7 @@ if (isHelpWin) { %>
 		%>100%<%
 	} else {
 		%>380<%
-	} %>" height="6" vspace="5"></td>
+	} %>" height="6" vspace="5" alt=""></td>
 </tr>
 <tr>
 	<td class="imcmsAdmText"><%
@@ -263,14 +322,23 @@ if (isHelpWin) { %>
 <html>
 <head>
 <title>:: imCMS ::</title>
-
+<!--
+Encoding: <%= isGuessedAsIsoFile ? "ISO 8859-1" : "UTF-8" %>
+-->
 <vel:velocity>
 <link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+<script type="text/javascript" src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp"></script>
+<script type="text/javascript" src="$contextPath/imcms/$language/scripts/imcms_jquery.textarea.js"></script>
 </vel:velocity>
 
-<script language="JavaScript">
+<script type="text/javascript">
 <!--
+<% if (!isReadonly) { %>
+jQ(document).ready(function($) {
+	$('#txtField').tabby() ;
+}) ;
+<% } %>
+
 function closeIt() {
 	window.close();
 	if (parent.opener) parent.opener.focus();
@@ -340,13 +408,13 @@ function checkSaved(ch) {
 		var isSaved = <%= isSaved %>;
 		var el = document.getElementById("btnSave");
 		if (isSaved && !ch) {
+			el.disabled = true;
 			el.style.cursor = "default";
 			el.style.filter = "progid:DXImageTransform.Microsoft.BasicImage( Rotation=0,Mirror=0,Invert=1,XRay=0,Grayscale=1,Opacity=0.60)";
-			el.disabled = 1;
 		} else {
-			el.style.cursor = (hasDocumentAll) ? "hand" : "pointer";
+			el.disabled = false;
+			el.style.cursor = "pointer";
 			el.style.filter = "";
-			el.disabled = 0;
 		}<%
 		} %>
 		resizeEditField();
@@ -365,8 +433,8 @@ function resizeEditField() {
 			availW = parseInt(innerWidth);
 			availH = parseInt(innerHeight);
 		}
-		if (availW > 0) elEdit.style.width = availW - 13;
-		if (availH > 0) elEdit.style.height = availH - 62;
+		if (availW > 0) elEdit.style.width = (availW - 13) + "px" ;
+		if (availH > 0) elEdit.style.height = (availH - <%= isReadonly ? 75 : 90 %>) + "px" ;
 	}
 }
 
@@ -415,12 +483,12 @@ function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll) {
 </script>
 
 </head>
-<body class="imcmsAdmBgCont" style="border:0px; margin:0px" onLoad="checkSaved(0);" onResize="resizeEditField()">
+<body class="imcmsAdmBgCont" style="border:0; margin:0;" onload="checkSaved(0);" onresize="resizeEditField()">
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%" height="100%">
 <tr>
 	<td valign="top">
-	<table border="0" cellspacing="0" cellpadding="0" width="100%">
+	<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
 	<tr class="imcmsAdmBgHead">
 		<td>
 		<table border="0" cellspacing="0" cellpadding="0">
@@ -458,30 +526,28 @@ function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll) {
 
 				}
 				out.print(fileNameToShow) ;
-			} %>&quot;</span></td>
+			} %>&quot; &nbsp; <span style="font-size:9px;">(<%= isGuessedAsIsoFile ? "ISO 8859-1" : "UTF-8" %>)</span></span></td>
 		</tr>
 		</table></td>
 
-		<td align="right"><%
-		if (!isReadonly) {
-			%>
+		<td align="right" style="padding-top:10px;"><%
+		if (!isReadonly) { %>
 		<table border="0" cellspacing="0" cellpadding="0">
 		<tr><%
 			if (hasDocumentAll && !isMac) { %>
 			<td>
+			<form name="searchForm" action="" onSubmit="findIt(document.forms[0].searchString.value); return false">
 			<table border="0" cellspacing="0" cellpadding="0">
-			<form name="searchForm" onSubmit="findIt(document.forms[0].searchString.value); return false">
 			<tr>
-				<td><input type="text" name="searchString" size="8" value="<%= theSearchString %>" style="width:50"></td>
+				<td><input type="text" name="searchString" size="8" value="<%= theSearchString %>" style="width:50px;"></td>
 				<td><a id="btnSearch" href="javascript://find()" onClick="findIt(document.forms[0].searchString.value);"><img src="<%= IMG_PATH %>btn_find.gif" border="0" hspace="5" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2001 ?>"></a></td>
 			</tr>
-			</form>
-			</table></td><%
+			</table>
+			</form></td><%
 			} %>
 			<td class="imcmsAdmText">&nbsp;&nbsp;</td>
 			<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-			<form name="resetForm">
+			<form name="resetForm" action="">
 			<input type="hidden" name="file" value="<%= file %>">
 			<input type="hidden" name="hdPath" value="<%= hdPath %>">
 			<input type="hidden" name="searchString" value="<%= theSearchString %>"><%
@@ -489,6 +555,7 @@ function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll) {
 			<input type="hidden" name="template" value="1">
 			<input type="hidden" name="templName" value="<%= templName %>"><%
 			} %>
+			<table border="0" cellspacing="0" cellpadding="0">
 			<tr>
 				<td class="imcmsAdmText"><a href="javascript://help" onClick="alert('Choose to reset the file to what it looked like when:\n\n - You saved it last.\n - You opened it.')"><span style="color:#ffffff; text-decoration:none; cursor:help;"><? install/htdocs/sv/jsp/FileAdmin_edit.jsp/4 ?></span></a>&nbsp;</td>
 				<td class="imcmsAdmText">
@@ -498,27 +565,30 @@ function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll) {
 					<option value="org"><? install/htdocs/sv/jsp/FileAdmin_edit.jsp/7 ?>
 				</select></td>
 			</tr>
-			</form>
-			</table></td>
+			</table>
+			</form></td>
 			<td class="imcmsAdmText">&nbsp;&nbsp;</td>
 			<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-			<form name="editForm" action="<%= thisPage %>" method="post" onSubmit="if (doSave()) return true; return false">
+			<form name="editForm" action="<%= thisPage %>" method="post" onSubmit="return doSave(); return false">
 			<input type="hidden" name="file" value="<%= file %>">
 			<input type="hidden" name="hdPath" value="<%= hdPath %>">
 			<input type="hidden" name="searchString" value="<%= theSearchString %>"><%
 			if (isTempl) { %>
 			<input type="hidden" name="template" value="1">
 			<input type="hidden" name="templName" value="<%= templName %>"><%
+			} %><%
+			if (isGuessedAsIsoFile) { %>
+			<input type="hidden" name="isGuessedAsIsoFile" value="true"><%
 			} %>
+			<table border="0" cellspacing="0" cellpadding="0">
 			<tr>
-				<td><input name="btnSave" id="btnSave" type="image" src="<%= IMG_PATH %>btn_save.gif" border="0" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2002 ?>"></td>
+				<td><input name="btnSave" id="btnSave" type="image" src="<%= IMG_PATH %>btn_save.gif" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2002 ?>"></td>
 				<td class="imcmsAdmText">&nbsp;&nbsp;</td>
 				<td><%
 				if (hasDocumentLayers) {
 					%><a href="javascript: closeIt();"><img src="<%= IMG_PATH %>btn_close.gif" border="0" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2003 ?>"></a><%
 				} else {
-					%><input name="btnClose" id="btnClose" type="image" src="<%= IMG_PATH %>btn_close.gif" border="0" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2004 ?>" onClick="closeIt(); return false"><%
+					%><input name="btnClose" id="btnClose" type="image" src="<%= IMG_PATH %>btn_close.gif" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2004 ?>" onClick="closeIt(); return false"><%
 				} %></td>
 				<td>&nbsp;&nbsp;</td>
 			</tr>
@@ -526,14 +596,14 @@ function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll) {
 		</tr>
 		</table><%
 		} else { // readonly %>
+		<%= "<form name=\"editForm\" action=\"" + thisPage + "\" method=\"post\" onSubmit=\"return doSave(); return false\">" %>
 		<table border="0" cellspacing="0" cellpadding="0">
-		<form name="editForm" action="<%= thisPage %>" method="post" onSubmit="if (doSave()) return true; return false">
 		<tr>
 			<td><%
 			if (hasDocumentLayers) {
-				%><a href="javascript: closeIt();"><img src="<%= IMG_PATH %>btn_close.gif" border="0" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2005 ?>"></a><%
+				%><a href="javascript:closeIt();"><img src="<%= IMG_PATH %>btn_close.gif" border="0" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2005 ?>"></a><%
 			} else {
-				%><input name="btnClose" id="btnClose" type="image" src="<%= IMG_PATH %>btn_close.gif" border="0" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2006 ?>" onClick="closeIt(); return false"><%
+				%><input name="btnClose" id="btnClose" type="image" src="<%= IMG_PATH %>btn_close.gif" alt="<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/2006 ?>" onClick="closeIt(); return false"><%
 			} %></td>
 			<td>&nbsp;&nbsp;</td>
 		</tr>
@@ -556,40 +626,43 @@ function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll) {
 			}
 			if (!sError.equals("")) {
 				%><div class="imcmsAdmTextSmall" style="color:#cc0000"><%= sError %></div><%
-			} %></span></td>
+			} %></span><%
+			if (!isReadonly) { %>
+			<div class="imcmsAdmTextSmall" style="color:#999; padding: 4px 0 5px 8px;"><? install/htdocs/sv/jsp/FileAdmin_edit.jsp/1004/9 ?></div><%
+			} %></td>
 	</tr><%
 			String taRows = (isTempl && !(isMac && (hasDocumentLayers || hasDocumentAll))) ? "39" : "40" ;
 			if (hasDocumentAll || (isMac && hasGetElementById)) { %>
 	<tr class="imcmsAdmBgCont">
 		<td colspan="2" align="center">
-		<textarea name="txtField" id="txtField" cols="90" rows="<%= taRows %>" class="edit" style="width:790; height:<% if (isTempl || (isMac && hasDocumentAll)) { %>505<% } else { %>515<% } %>; overflow:auto" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
+		<textarea name="txtField" id="<%= "txtField" %>" cols="90" rows="<%= taRows %>" class="edit FileAdminEditEditor" style="width:790px; height:<%=(isTempl || (isMac && hasDocumentAll)) ? 505 : 515 %>px;" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
 			} else if (hasGetElementById) { %>
 	<tr class="imcmsAdmBgCont">
 		<td colspan="2" align="center" valign="top">
-		<textarea name="txtField" id="txtField" cols="90" rows="<%= taRows %>" wrap="soft" class="edit" style="width:98%; height:<% if (isTempl) { %>500<% } else { %>510<% } %>" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
+		<textarea name="txtField" id="<%= "txtField" %>" cols="90" rows="<%= taRows %>" class="edit FileAdminEditEditor" style="width:98%; height:<%= (isTempl) ? 500 : 510 %>px;" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
 			} else if (isMac && hasDocumentLayers) { %>
 	<tr class="imcmsAdmBgCont">
 		<td colspan="2" align="center" class="imcmsAdmText">
-		<textarea name="txtField" id="txtField" cols="125" rows="<%= taRows %>" wrap="soft" class="edit" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
+		<textarea name="txtField" id="<%= "txtField" %>" cols="125" rows="<%= taRows %>" class="edit FileAdminEditEditor" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
 			} else { %>
 	<tr class="imcmsAdmBgCont">
 		<td colspan="2" align="center" class="imcmsAdmText">
-		<textarea name="txtField" id="txtField" cols="82" rows="<%= taRows %>" wrap="soft" class="edit" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
+		<textarea name="txtField" id="<%= "txtField" %>" cols="82" rows="<%= taRows %>" class="edit FileAdminEditEditor" onKeyUp="checkSaved(1);"<%= sReadonly %>><%
 			} %>
 <%= fileSrc %></textarea></td>
 	</tr>
-	</form>
-	</table></td>
+	</table>
+	<%= "</form>" %></td>
 </tr>
 </table>
 <%
 if (isTempl && !(isMac && (hasDocumentLayers || hasDocumentAll))) { %>
-<script language="JavaScript">
+<script type="text/javascript">
 <!--
 function imScriptCount(imType) {
 	var hits,arr1,arr2;
-	var retStr = "<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/8 ?>\n������������������������������������������\n";
-	if (hasDocumentLayers) retStr += "<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/9 ?>\n������������������������������������������\n";
+	var retStr = "<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/8 ?>\n----------------------------------------\n";
+	if (hasDocumentLayers) retStr += "<? install/htdocs/sv/jsp/FileAdmin_edit.jsp/10/9 ?>\n----------------------------------------\n";
 	var head_1_a = ":: ";
 	var head_1_b = " ::";
 	var head_2_a = "        - ";
diff --git a/web/imcms/lang/jsp/FileAdmin_preview.jsp b/web/imcms/lang/jsp/FileAdmin_preview.jsp
index b904e4deee..a5de25892e 100644
--- a/web/imcms/lang/jsp/FileAdmin_preview.jsp
+++ b/web/imcms/lang/jsp/FileAdmin_preview.jsp
@@ -2,40 +2,46 @@
 	
 	import="imcode.server.Imcms,
 	        imcode.util.Utility,
+            imcode.util.image.ImageInfo,
+            imcode.util.image.Format,
 	        org.apache.oro.text.perl.Perl5Util,
 	        javax.imageio.ImageIO,
 	        java.awt.image.BufferedImage,
 	        java.io.BufferedReader,
 	        java.io.File,
 	        java.io.FileInputStream,
-	        java.io.InputStreamReader, java.text.DecimalFormat, org.apache.commons.lang.StringEscapeUtils, java.io.IOException"
-        contentType="text/html; charset=UTF-8"
+	        java.io.InputStreamReader, java.text.DecimalFormat, org.apache.commons.lang.StringEscapeUtils, java.io.IOException, org.apache.commons.lang.StringUtils, java.net.URLEncoder, imcode.server.document.textdocument.ImageDomainObject, imcode.server.document.textdocument.ImagesPathRelativePathImageSource, imcode.util.ImcmsImageUtils"
+	
+	contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"
 	
 %><%
 
+String cp = request.getContextPath() ;
+
 /* *******************************************************************
  *           SETTINGS                                                *
  ******************************************************************* */
 
-String acceptedExtPattern = "/" +
-	"(\\.(GIF|JPE?G|PNG|BMP|AVI|MPE?G|HTML?|CSS|JS|VBS|TXT|JSP|ASP|FRAG)+$)" +
-	"|(\\.LOG+)" +
-	"/i" ;
+String ren = "(\\.[\\d]+)?" ;
 
-String IMG_PATH   = request.getContextPath()+"/imcms/"+Utility.getLoggedOnUser( request ).getLanguageIso639_2()+"/images/admin/" ; // path to buttons (with trailing /)
+String IMG_PATH   = cp+"/imcms/"+Utility.getLoggedOnUser( request ).getLanguageIso639_2()+"/images/admin/" ; // path to buttons (with trailing /)
 
 /* *******************************************************************
  *           INIT                                                    *
  ******************************************************************* */
 
 String file       = request.getParameter("file") ;
+String orgFileParam = StringUtils.defaultString(request.getParameter("file")) ;
 
 String frame      = (request.getParameter("frame") != null) ? request.getParameter("frame") : "FRAME" ;
-String thisPage = request.getContextPath() + request.getServletPath();
+String thisPage = cp + request.getServletPath();
 
 String zoom       = "" ;
 String defZoom    = "1.0" ;
 
+if(file != null && file.contains("../")) return;
+
 if (request.getParameter("zoom") != null) {
 	zoom            = " style=\"zoom:" + request.getParameter("zoom") + "\"" ;
 	session.setAttribute("zoom", request.getParameter("zoom")) ;
@@ -49,37 +55,36 @@ String border     = "" ;
 boolean hasBorder = false ;
 if (request.getParameter("border") != null) {
 	border          = (request.getParameter("border").equals("1")) ? " border=\"1\"" : "" ;
-	hasBorder       = (request.getParameter("border").equals("1")) ? true : false ;
+	hasBorder       = (request.getParameter("border").equals("1")) ;
 	session.setAttribute("border", request.getParameter("border")) ;
 } else if (session.getAttribute("border") != null) {
 	border          = (session.getAttribute("border").equals("1")) ? " border=\"1\"" : "" ;
-	hasBorder       = (session.getAttribute("border").equals("1")) ? true : false ;
+	hasBorder       = (session.getAttribute("border").equals("1")) ;
 }
 
-    File webRoot    = Imcms.getPath() ;
+File webRoot    = Imcms.getPath() ;
 File fn = new File(webRoot, file) ;
 
 /* Is image? */
 Perl5Util re       = new Perl5Util() ;
-boolean isImage    = re.match(acceptedExtPattern, file) ;
 
 /* Check browser */
 
-String uAgent = request.getHeader("USER-AGENT") ;
-boolean hasDocumentAll  = re.match("/(MSIE 5\\.5|MSIE 6|MSIE 7)/i", uAgent) ;
-boolean hasDocumentLayers  = (re.match("/Mozilla/i", uAgent) && !re.match("/Gecko/i", uAgent)) ? true : false ;
-boolean hasGetElementById = re.match("/Gecko/i", uAgent) ;
+String uAgent = StringUtils.defaultString(request.getHeader("USER-AGENT")) ;
+boolean hasDocumentAll    = re.match("/(MSIE \\d)/i", uAgent) ;
+boolean hasGetElementById = re.match("/Gecko/i", uAgent) || hasDocumentAll ;
+boolean hasDocumentLayers = (re.match("/Mozilla/i", uAgent) && !hasDocumentAll && !hasGetElementById) ;
 boolean isMac = re.match("/Mac/i", uAgent) ;
 
 /* if Stat-Report - Read file and show it */
-boolean isStat    = (request.getParameter("isStat") != null) ? true : false ;
+boolean isStat    = (request.getParameter("isStat") != null) ;
 
 if (isStat && frame.equalsIgnoreCase("MAIN")) {
 
     BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(fn))) ;
 
-    String statSrc = "" ;
-    String fileLine = "" ;
+    String statSrc  ;
+    String fileLine ;
     StringBuffer strbuf = new StringBuffer();
     while ((fileLine = br.readLine())!= null) {
         strbuf.append(fileLine).append( "\n") ;
@@ -89,13 +94,13 @@ if (isStat && frame.equalsIgnoreCase("MAIN")) {
 
     statSrc = statSrc.replaceAll("<head>","<head>\n\n<base target=\"_blank\">");	/* add some buttons in some browsers */
 
-	String theButtons = "" ;
+	String theButtons ;
 	boolean hasInlineButtons = false ;
 
-	theButtons = "<table border=0 bgcolor=\"#d6d3ce\" align=\"right\">\n<tr>" ;
+	theButtons = "<table border=\"0\" bgcolor=\"#d6d3ce\" align=\"right\">\n<tr>" ;
 	if (hasGetElementById && !hasDocumentAll && !isMac) {
 		hasInlineButtons = true ;
-         theButtons += "\n   <td><a href=\"#\" onClick=\"find(); return false\"><img align=\"absmiddle\" src=\"" + IMG_PATH + "btn_find.gif\" border=\"0\" alt=\"Sök!\"></a></td>" ;
+         theButtons += "\n   <td><a href=\"#\" onClick=\"find(); return false\"><img align=\"absmiddle\" src=\"" + IMG_PATH + "btn_find.gif\" border=\"0\" alt=\"Sök!\"></a></td>" ;
 	}
 	if (isMac) {
 		hasInlineButtons = true ;
@@ -116,17 +121,22 @@ if (isStat && frame.equalsIgnoreCase("MAIN")) {
 /* Get formated file size */
 
 String size  = "" ;
-double iSize = 0 ;
+double iSize ;
 
 try {
 	iSize = (double) fn.length() ;
-	if (iSize >= 1024) {
+	if (iSize >= (1024*1024)) {
+		iSize = iSize / 1024 / 1024 ;
+		DecimalFormat df = new DecimalFormat("#.#") ;
+		size  = df.format(iSize) ;
+		size  = size.replaceAll(",", ".") + " MB" ;
+	} else if (iSize >= 1024) {
 		iSize = iSize / 1024 ;
 		DecimalFormat df = new DecimalFormat("#.#") ;
 		size  = df.format(iSize) ;
-		size  = ", " + size.replaceAll(",", ".") + "kB" ;
+		size  = size.replaceAll(",", ".") + " kB" ;
 	} else {
-		size  = ", " + fn.length() + " bytes" ;
+		size  = fn.length() + " bytes" ;
 	}
 } catch ( NumberFormatException ex ) {
 	// ignore
@@ -152,30 +162,44 @@ if (frame.equalsIgnoreCase("MAIN")) { %>
 <body class="imcmsAdmBgCont" style="margin:10px">
 
 <div align="center"><%
-
-if (isImage) {
-    try {
-        BufferedImage image = ImageIO.read( fn );
-        %><div class="imcmsAdmText" style="padding: 5 0 <%
-        if (hasBorder) {
-            %>5<%
-        } else {
-            %>6<%
-        } %> 0; color:#666666;">&quot;<%= file.replaceAll("\\\\","/") %>&quot;<%
-        if (image.getWidth() > 0 && image.getHeight() > 0 && !size.equals("")) {
+File imagesRoot = Imcms.getServices().getConfig().getImagePath() ;
+ImageDomainObject iDO = new ImageDomainObject() ;
+String path = file.replace(new File(imagesRoot, "/").toString(), "") ;
+ImagesPathRelativePathImageSource imageSource = new ImagesPathRelativePathImageSource(path) ;
+iDO.setSourceAndClearSize(imageSource) ;
+ImageInfo imageInfo = iDO.getImageInfo();
+
+if (imageInfo != null) {
+    try { %>
+	<div class="imcmsAdmText" style="padding: 5px 0 <%= hasBorder ? 7 : 8 %>px 0; color:#666;">
+		&quot;<%= cp %><%= file.replaceAll("\\\\","/") %>&quot;<%
+        if (imageInfo.getWidth() > 0 && imageInfo.getHeight() > 0 && !size.equals("")) {
             %> (<%
-            if (image.getWidth() > 0 && image.getHeight() > 0) {
-                %><%= image.getWidth() + "x" + image.getHeight() %><%
+            if (imageInfo.getWidth() > 0 && imageInfo.getHeight() > 0) {
+                %><%= imageInfo.getWidth() + "x" + imageInfo.getHeight() %> px, <%
+	            if (hasGetElementById && !hasDocumentAll && defZoom.matches("^\\d+\\.\\d+$")) {// Gecko
+		            double dZoom = Double.parseDouble(defZoom) ;
+		            double newWidth = (dZoom * imageInfo.getWidth()) ;
+		            //out.print(defZoom + " - " + dZoom + " - " + newWidth + " - " + Math.round(newWidth) + " - ");
+		            zoom = " style=\"width:" + Math.round(newWidth) + "px;\"" ;
+	            }
             }
             if (!size.equals("")) {
                 %><%= size %><%
             } %>)<%
-        } %></div><%
-    } catch( IOException ignored ) {}
-    %><img name="theImg" id="theImg" src="<%= request.getContextPath() + Utility.escapeUrl(file) %>"<%= border + zoom %>><%
-} else {
-	%><%
-} %></div>
+        } %>
+	</div><%
+    } catch( IOException ignored ) {
+	    //out.print(ignored);
+	    if (hasGetElementById && !hasDocumentAll) zoom = "" ;
+    } %><%--
+	<img name="theImg" id="theImg" src="$contextPath<%= Utility.escapeUrl(file).replaceAll("(%5C|%255C)","/") %>"<%= border + zoom %> alt="">--%><%
+        iDO.setFormat(Format.PNG);
+		String previewSrc = ImcmsImageUtils.getImageUrl(null, iDO, cp) ;
+		%>
+	<img name="theImg" id="theImg" src="<%= previewSrc %>"<%= border + zoom %> alt="" /><%
+} %>
+</div>
 
 </body>
 </html><%
@@ -229,7 +253,7 @@ function findIt(str) {
 		}
 	} else if ((hasDocumentAll || hasGetElementById) && str != "") {
 		txt = win.document.body.createTextRange();
-		for (i = 0; i <= n && (found = txt.findText(str)) != false; i++) {
+		for (i = 0; i <= n && (found = txt.findText(str)); i++) {
 			txt.moveStart("character", 1);
 			txt.moveEnd("textedit");
 		}
@@ -254,7 +278,7 @@ function findIt(str) {
 </script>
 
 </head>
-<body class="imcmsAdmBgHead" style="margin:0px; border:0px">
+<body class="imcmsAdmBgHead" style="margin:0; border:0;">
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%" height="100%" style="border-bottom: 1px solid #000000">
 <tr>
@@ -267,13 +291,12 @@ function findIt(str) {
 	} %> &nbsp;</span></td>
 
 	<td align="right"><%
-	if (isStat) {
-		%>
+	if (isStat) { %>
+	<form action="" onSubmit="findIt(document.forms[0].searchString.value); return false">
 	<table border="0" cellspacing="0" cellpadding="0">
-	<form onSubmit="findIt(document.forms[0].searchString.value); return false">
 	<tr><%
 		if (hasDocumentAll || hasDocumentLayers) { %>
-		<td class="imcmsAdmText"><input type="text" name="searchString" size="15" value="" class="imcmsAdmText" style="width:100"></td>
+		<td class="imcmsAdmText"><input type="text" name="searchString" size="15" value="" class="imcmsAdmText" style="width:100px;"></td>
 		<td><a id="btnSearch" href="javascript://find()" onClick="findIt(document.forms[0].searchString.value);"><img src="<%= IMG_PATH %>btn_find.gif" border="0" hspace="5" alt="<? install/htdocs/sv/jsp/FileAdmin_preview.jsp/2001 ?>"></a></td><%
 		} %>
 		<td class="imcmsAdmText">&nbsp;&nbsp;</td><%
@@ -283,27 +306,27 @@ function findIt(str) {
 		<td><a href="javascript://close()" onClick="closeIt();"><img src="<%= IMG_PATH %>btn_close.gif" border="0" hspace="5" alt="<? install/htdocs/sv/jsp/FileAdmin_preview.jsp/2003 ?>"></a></td>
 		<td class="imcmsAdmText">&nbsp;&nbsp;&nbsp;&nbsp;</td>
 	</tr>
-	</form>
-	</table><%
+	</table>
+	</form><%
 	} else { /* image */ %>
 	<table border="0" cellspacing="0" cellpadding="0">
 	<form action="<%= thisPage %>" target="main">
 	<input type="hidden" name="frame" value="main">
-	<input type="hidden" name="file" value="<%= Utility.escapeUrl(file) %>">
+	<input type="hidden" name="file" value="<%= StringEscapeUtils.escapeHtml(orgFileParam) %>">
 	<tr>
 		<td class="imcmsAdmText"><span class="imcmsAdmText" style="color:#ffffff;">| &nbsp; <%
-		if (hasDocumentAll) { %><span onDblClick="document.forms[0].zoom.selectedIndex = 3; document.forms[0].submit();"><? install/htdocs/sv/jsp/FileAdmin_preview.jsp/16 ?></span>&nbsp;</span></td>
+		if (hasGetElementById) { %><span onDblClick="document.forms[0].zoom.selectedIndex = 3; document.forms[0].submit();"><? install/htdocs/sv/jsp/FileAdmin_preview.jsp/16 ?></span>&nbsp;</span></td>
 		<td class="imcmsAdmText">
 		<select name="zoom" onChange="this.form.submit();">
-			<option value="0.25"<% if (defZoom.equals("0.25")) { %> selected<% } %>>25%
-			<option value="0.5"<%  if (defZoom.equals("0.5")) { %> selected<% } %>>50%
-			<option value="0.75"<% if (defZoom.equals("0.75")) { %> selected<% } %>>75%
-			<option value="1.0"<%  if (defZoom.equals("1.0")) { %> selected<% } %>>100%
-			<option value="1.5"<%  if (defZoom.equals("1.5")) { %> selected<% } %>>150%
-			<option value="2.0"<%  if (defZoom.equals("2.0")) { %> selected<% } %>>200%
-			<option value="4.0"<%  if (defZoom.equals("4.0")) { %> selected<% } %>>400%
-			<option value="8.0"<%  if (defZoom.equals("8.0")) { %> selected<% } %>>800%
-			<option value="16.0"<% if (defZoom.equals("16.0")) { %> selected<% } %>>1600%
+			<option value="0.25"<% if (defZoom.equals("0.25")) { %> selected<% } %>>25%</option>
+			<option value="0.5"<%  if (defZoom.equals("0.5")) { %> selected<% } %>>50%</option>
+			<option value="0.75"<% if (defZoom.equals("0.75")) { %> selected<% } %>>75%</option>
+			<option value="1.0"<%  if (defZoom.equals("1.0")) { %> selected<% } %>>100%</option>
+			<option value="1.5"<%  if (defZoom.equals("1.5")) { %> selected<% } %>>150%</option>
+			<option value="2.0"<%  if (defZoom.equals("2.0")) { %> selected<% } %>>200%</option>
+			<option value="4.0"<%  if (defZoom.equals("4.0")) { %> selected<% } %>>400%</option>
+			<option value="8.0"<%  if (defZoom.equals("8.0")) { %> selected<% } %>>800%</option>
+			<option value="16.0"<% if (defZoom.equals("16.0")) { %> selected<% } %>>1600%</option>
 		</select></td>
 		<td><span class="imcmsAdmText" style="color:#ffffff;"> &nbsp; | &nbsp; <%
 		} %><? install/htdocs/sv/jsp/FileAdmin_preview.jsp/1004/1 ?>
diff --git a/web/imcms/lang/jsp/ImageBrowse.jsp b/web/imcms/lang/jsp/ImageBrowse.jsp
index ee59c01c49..da73f68bdd 100644
--- a/web/imcms/lang/jsp/ImageBrowse.jsp
+++ b/web/imcms/lang/jsp/ImageBrowse.jsp
@@ -1,147 +1,538 @@
-<%@ page import="com.imcode.imcms.servlet.admin.ImageBrowse,
-                 com.imcode.imcms.servlet.admin.ImageBrowse,
-                 org.apache.commons.lang.StringEscapeUtils,
-                 com.imcode.imcms.servlet.admin.ImageBrowser,
-                 imcode.util.HttpSessionUtils,
-                 imcode.server.Imcms,
-                 com.imcode.imcms.util.l10n.LocalizedMessage,
-                 imcode.util.Utility"
-        contentType="text/html; charset=UTF-8" %>
-<%@taglib prefix="vel" uri="imcmsvelocity"%><%
+<%@ page
+	
+	import="com.imcode.imcms.addon.ui.DocumentPaging,
+	        com.imcode.imcms.servlet.admin.ImageBrowse,
+	        com.imcode.imcms.servlet.admin.ImageBrowser,
+	        com.imcode.imcms.util.l10n.LocalizedMessage,
+	        com.imcode.util.ImageSize,
+	        imcode.server.Imcms,
+	        imcode.server.document.textdocument.ImageDomainObject,
+	        imcode.server.document.textdocument.ImagesPathRelativePathImageSource,
+	        imcode.util.Html,
+	        imcode.util.HttpSessionUtils,
+	        imcode.util.ImcmsImageUtils,
+	        imcode.util.ToStringPairTransformer,
+	        imcode.util.Utility,
+	        imcode.util.image.Format,
+	        imcode.util.image.Resize,
+	        imcode.util.io.FileUtility,
+	        org.apache.commons.io.comparator.LastModifiedFileComparator,
+	        org.apache.commons.io.comparator.NameFileComparator,
+	        org.apache.commons.io.comparator.PathFileComparator"
+	
+	contentType="text/html; charset=UTF-8"
+  pageEncoding="UTF-8"
+	
+%>
+<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.lang.StringUtils" %>
+<%@ page import="org.apache.oro.text.perl.Perl5Util" %>
+<%@ page import="java.io.File" %>
+<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Collections" %>
+<%@ page import="java.util.List" %>
+<%@taglib prefix="vel" uri="imcmsvelocity"
+%><%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
+%><%!
+
+private final static int LAST_MOD_COUNT_ON_TOP                    = 5 ;
+private final static int LAST_MOD_COUNT_ON_TOP_ACTIVATED_ON_COUNT = 10 ;
+
+private final static int PAGING_FILE_COUNT_LIMIT = 100 ;
+private final static int HITS_PER_PAGE           = 100 ;
+
+private final static int THUMB_BOUNDARIES   = 130 ;
+
+private final static int MIN_CONTENT_WIDTH  = 760 ; // Entire table
+private final static int MIN_CONTENT_HEIGHT = 350 ; // Only div with images
+
+public static int getIntRequestParam(String paramName, int defaultValue, HttpServletRequest request) {
+	try {
+		return Integer.parseInt(request.getParameter(paramName)) ;
+	} catch(Exception e) {
+		return defaultValue ;
+	}
+}
+
+public String getDirectoriesOptionList(File currentDirectory) throws java.io.IOException {
+	final File imagesRoot = Imcms.getServices().getConfig().getImagePath() ;
+	Collection imageDirectories = Utility.collectImageDirectories() ;
+	List<File> imageDirectoriesList = new ArrayList<File>(imageDirectories);
+	Collections.sort(imageDirectoriesList, PathFileComparator.PATH_INSENSITIVE_COMPARATOR) ;
+	File currentDirectoryRelativeToImageRootParent = FileUtility.relativizeFile( imagesRoot.getParentFile(), currentDirectory ) ;
+	return Html.createOptionList(imageDirectoriesList, currentDirectoryRelativeToImageRootParent, new ToStringPairTransformer() {
+		public String[] transformToStringPair(Object input) {
+			File file = (File) input ;
+			return new String[] { FileUtility.relativeFileToString(file), FileUtility.relativeFileToString(file) } ;
+		}
+	}) ;
+}
+
+%><%
+
+Perl5Util re = new Perl5Util() ;
 
 boolean fromEditor = (request.getParameter("editor_image") != null && request.getParameter("editor_image").equals("true")) ;
 
-%>
-<vel:velocity>
-<html>
-<head>
+ImageBrowse.ImageBrowserPage imageBrowsePage = ImageBrowse.ImageBrowserPage.fromRequest(request) ;
+
+File currentDirectory = imageBrowsePage.getCurrentDirectory() ;
+
+File imagesRoot = Imcms.getServices().getConfig().getImagePath() ;
+List<File> images = new ArrayList<File>(imageBrowsePage.getImagesList()) ; // Can't modify an AbstractList
+Integer uploadedImageIndex = (
+       request.getMethod().equalsIgnoreCase("post")
+    && request.getParameter(ImageBrowse.REQUEST_PARAMETER__UPLOAD_BUTTON) != null
+    && imageBrowsePage.getErrorMessage() == null
+    && imageBrowsePage.getCurrentImage() != null
+    ) ? images.indexOf(imageBrowsePage.getCurrentImage())
+      : null;
+List<File> lastModImages = null ;
+if (images.size() > LAST_MOD_COUNT_ON_TOP_ACTIVATED_ON_COUNT) {
+	Collections.sort(images, LastModifiedFileComparator.LASTMODIFIED_REVERSE) ;
+	lastModImages = new ArrayList<File>(images.subList(0, LAST_MOD_COUNT_ON_TOP)) ;
+}
+Collections.sort(images, NameFileComparator.NAME_INSENSITIVE_COMPARATOR) ;
+boolean hasNewImagesFirst = false ;
+if (null != lastModImages) {
+	images.addAll(0, lastModImages) ;
+	hasNewImagesFirst = true ;
+}
+
+SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") ;
 
+String cp = request.getContextPath() ;
 
-<title><? install/htdocs/sv/jsp/ImageBrowse.html/1 ?></title>
 
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
+%><vel:velocity><!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" xml:lang="en" lang="en">
+<head>
+
+<title><fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/1" /></title>
+
+<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp" />
 <script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
 
+<style type="text/css">
+/* *******************************************************************************************
+ *         Paging                                                                            *
+ ******************************************************************************************* */
+<%
+String uAgent   = StringUtils.defaultString(request.getHeader("USER-AGENT")).toLowerCase() ;
+boolean isGecko = re.match("/gecko/i", uAgent) ;
+%>
+.paging {
+	clear: both;
+	margin: 10px auto;
+	padding: 10px;
+	text-align: center;
+	font: 10px Verdana;
+	color: #616d98 !important;
+}
+.pagingTop {
+	margin-top: 0;
+	border-bottom: 1px solid #eaeaea;
+}
+.paging A,
+.paging A:link,
+.paging A:visited,
+.paging SPAN {
+	<%= "display: -moz-inline-box;" %>
+	display: inline-block;<%-- IE 6 support only on non-block-elements!?! - And these are that... --%>
+	background-color: #b8c6d5;
+	color: #fff;
+	font: 11px Tahoma, Arial, sans-serif;
+	text-shadow: #000 1px 1px 1px;
+	border: <%= isGecko ? 1 : 2 %>px solid #999;
+	border-color: #dae4ef #999 #999 #dae4ef;
+	cursor:pointer;
+	padding: <%= isGecko ? 2 : 1 %>px 8px;
+	text-decoration: none !important;
+}
+.paging SPAN.paging_dots {
+	color: #666;
+	margin: 2px !important;
+	background: transparent !important;
+	border: 0 !important;
+}
+.paging .oneDigit {
+	padding: <%= isGecko ? 2 : 1 %>px 10px;
+}
+.paging .prevBtn {
+	margin-right: 5px !important;
+	padding: <%= isGecko ? 2 : 1 %>px 10px;
+}
+.paging .nextBtn {
+	margin-left: 5px !important;
+	padding: <%= isGecko ? 2 : 1 %>px 10px;
+}
+.paging .dim {
+	color: #999 !important;
+}
+.paging A:active,
+.paging A:hover,
+.paging .active {
+	background-color: #20568d;
+	border-color: #668db6 #000 #000 #668db6;
+}
+</style>
+<%--
+/* *******************************************************************************************
+ *         LAZY LOAD FIX                                                                     *
+ ******************************************************************************************* */
+--%>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+<script type="text/javascript" src="$contextPath/imcms/scripts/jquery.lazyload.min.js"></script>
+<script type="text/javascript">
+jQuery(document).ready(function($) {
+	$('img.lazy').lazyload({
+		container : $('#thumbsDiv'),
+		threshold : 200,
+		effect    : 'fadeIn'
+	}) ;
+    window.setTimeout(function() {
+        $('img.lazy').trigger('scroll') ;
+    }, 1000) ;
+}) ;
+</script>
+<%--
+/* *******************************************************************************************
+ *         END LAZY LOAD FIX                                                                 *
+ ******************************************************************************************* */
+--%>
+
+<%--
+    Selects uploaded image thumbnail.
+    If uploaded image thumbnail is not shown in 'recently added images' section then thumbnail is scrolled into view.
+--%>
+<%
+    if (uploadedImageIndex != null) {
+        if (hasNewImagesFirst) {
+            %>
+            <script>
+                // -vs- window.onload ???
+                jQ(function() {
+                    var imageCB = document.getElementById("imageCB0");
+                    if (imageCB) {
+                        imageCB.checked = true;
+                    }
+                });
+            </script>
+            <%
+        } else {
+            %>
+            <script>
+                // -vs- window.onload ???
+                jQ(function() {
+                    var imageCB = document.getElementById("imageCB"+<%=uploadedImageIndex%>);
+                    var imageDiv = document.getElementById("imageDiv"+<%=uploadedImageIndex%>);
+                    if (imageCB && imageDiv) {
+                        imageCB.checked = true;
+                        imageDiv.scrollIntoView(false);
+                    }
+                });
+            </script>
+            <%
+        }
+    }
+%>
+
 </head>
-<body bgcolor="#FFFFFF" onLoad="focusField(0,'text')"<%
-	if (fromEditor) {
-		%> style="overflow:auto;" scroll="auto"<%
-	} %>>
+<body style="margin-bottom:0 !important;<%= fromEditor ? " overflow:auto;" : "" %>"<%= fromEditor ? " scroll=\"auto\"" : "" %>>
 
 
 #gui_outer_start()
-#gui_head("<? global/imcms_administration ?>")
-<%
-    ImageBrowse.ImageBrowserPage imageBrowsePage = ImageBrowse.ImageBrowserPage.fromRequest(request) ;
-%>
+#gui_head("<fmt:message key="global/imcms_administration" />")
+<form action="ImageBrowse" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
+<input type="hidden" id="dir" name="dir" value="<%= ("\\" + FileUtility.relativizeFile( Imcms.getServices().getConfig().getImagePath().getParentFile(), currentDirectory ).toString()).replace("\\", "/") %>" />
+<input type="hidden" name="editor_image" value="<%= request.getParameter("editor_image") %>" />
+<input type="hidden" name="<%= ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER %>" value="<%=HttpSessionUtils.getSessionAttributeNameFromRequest(request, ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER)%>" /><%
+if (null != imageBrowsePage.getLabel() ) { %>
+<input type="hidden" name="<%= ImageBrowse.REQUEST_PARAMETER__LABEL %>" value="<%=imageBrowsePage.getLabel()%>" /><%
+} %>
 <table border="0" cellspacing="0" cellpadding="0">
-<form action="ImageBrowse" method="POST" enctype="multipart/form-data">
-<input type="hidden" name="editor_image" value="<%= request.getParameter("editor_image") %>">
-<input type="HIDDEN" name="<%= ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER %>" value="<%=HttpSessionUtils.getSessionAttributeNameFromRequest(request, ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER)%>">
-<% if (null != imageBrowsePage.getLabel() ) { %><input type="HIDDEN" name="<%= ImageBrowse.REQUEST_PARAMETER__LABEL %>" value="<%=imageBrowsePage.getLabel()%>"><% } %>
 <tr>
-	<td><input type="Submit" class="imcmsFormBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__CANCEL_BUTTON %>" value="<? install/htdocs/sv/jsp/ImageBrowse.html/2001 ?>"></td>
+	<td><input type="Submit" class="imcmsFormBtn imcmsFormBtnCancel" name="<%= ImageBrowse.REQUEST_PARAMETER__CANCEL_BUTTON %>" value="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/2001" />" /></td>
 	<td>&nbsp;</td>
-    <td><input type="button" value="<? install/htdocs/sv/jsp/ImageBrowse.html/2002 ?>" title="<? install/htdocs/sv/jsp/ImageBrowse.html/2003 ?>" class="imcmsFormBtn" onClick="openHelpW('ImageArchive')"></td>
+	<td><input type="button" value="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/2002" />" title="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/2003" />" class="imcmsFormBtn" onClick="openHelpW('ImageArchive')" /></td>
 </tr>
 </table>
 #gui_mid()
-<table border="0" cellspacing="0" cellpadding="2" width="660" align="center">
-<tr valign="top">
-	<td width="45%" align="right">
-        <table border="0" cellspacing="0" cellpadding="0">
-        <tr>
-            <td class="imcmsAdmText"><? install/htdocs/sv/jsp/ImageBrowse.html/5 ?></td>
-        </tr>
-        <tr>
-            <td>
-            <select name="<%= ImageBrowse.REQUEST_PARAMETER__IMAGE_DIRECTORY %>" size="15" onDblClick="document.forms[0].elements['<%= StringEscapeUtils.escapeJavaScript( ImageBrowse.REQUEST_PARAMETER__CHANGE_DIRECTORY_BUTTON ) %>'].click();" style="width:270">
-                <%=imageBrowsePage.getDirectoriesOptionList()%>
-            </select></td>
-        </tr>
-        </table>
-    </td>
-	<td width="10%" align="center">
-    	<input type="submit" class="imcmsFormBtnSmall" name="<%= ImageBrowse.REQUEST_PARAMETER__CHANGE_DIRECTORY_BUTTON %>" value="<? install/htdocs/sv/jsp/ImageBrowse.html/2004 ?>">
-    </td>
-	<td width="45%">
-        <table border="0" cellspacing="0" cellpadding="0">
-            <tr>
-                <td class="imcmsAdmText" align="right"><? install/htdocs/sv/jsp/ImageBrowse.html/7 ?></td>
-            </tr>
-            <tr>
-                <td>
-                    <select name="<%= ImageBrowse.REQUEST_PARAMETER__IMAGE_URL %>" size="15" onDblClick="document.forms[0].elements['<%= StringEscapeUtils.escapeJavaScript( ImageBrowse.REQUEST_PARAMETER__PREVIEW_BUTTON ) %>'].click();" style="width:270">
-                        <%=imageBrowsePage.getImagesOptionList()%>
-                    </select>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+<table id="mainTable" border="0" cellspacing="0" cellpadding="2" align="center" style="width:<%= MIN_CONTENT_WIDTH %>px;">
 <tr>
-	<td colspan="3">#gui_hr( "blue" )</td>
+	<td colspan="2">#gui_heading( "<fmt:message key="templates/sv/change_img.html/4/1" />" )</td>
 </tr>
 <tr>
-	<td colspan="3" align="right">
-        <table border="0" cellspacing="0" cellpadding="0">
-            <tr>
-                <td><input type="submit" class="imcmsFormBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__OK_BUTTON %>" value="<? install/htdocs/sv/jsp/ImageBrowse.html/2005 ?>"></td>
-                <td>&nbsp;</td>
-                <td><input type="submit" class="imcmsFormBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__PREVIEW_BUTTON %>" value="<? install/htdocs/sv/jsp/ImageBrowse.html/2006 ?>"></td>
-                <td>&nbsp;</td>
-                <td><input type="Submit" class="imcmsFormBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__CANCEL_BUTTON %>" value="<? install/htdocs/sv/jsp/ImageBrowse.html/2007 ?>"></td>
-            </tr>
-        </table></td>
+	<td style="width:260px;">
+	<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
+	<tr>
+		<td><b><fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/5" /></b></td>
+		<td align="right">
+		<input type="submit" class="imcmsFormBtnSmall" id="changeDir" name="<%= ImageBrowse.REQUEST_PARAMETER__CHANGE_DIRECTORY_BUTTON %>" value="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/2004" />" /></td>
+	</tr>
+	</table></td>
+	
+	<td style="padding-left:25px;">
+	<b><%= images.size() + " " %><fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/7" /></b>
+	<span class="imcmsAdmDim" style="padding-left:20px;">
+		<fmt:message key="image_browser.usage"/><%
+		if (hasNewImagesFirst) { %>
+		<fmt:message key="image_browser.recent" /><%
+		} %>
+	</span></td>
+</tr>
+<tr valign="top">
+	<td>
+	<select id="directorySelect" name="<%= ImageBrowse.REQUEST_PARAMETER__IMAGE_DIRECTORY %>" size="30" ondblclick="jQ('#changeDir').click();" style="width:260px; height:<%= MIN_CONTENT_HEIGHT + 10 %>px;">
+		<%= getDirectoriesOptionList(currentDirectory) %>
+		<%//=imageBrowsePage.getDirectoriesOptionList()%>
+	</select></td>
+	
+	<td style="padding-left:25px;">
+	<%--
+	<select name="<%= ImageBrowse.REQUEST_PARAMETER__IMAGE_URL %>" size="15"
+		ondblclick="document.forms[0].elements['<%= StringEscapeUtils.escapeJavaScript( ImageBrowse.REQUEST_PARAMETER__OK_BUTTON ) %>'].click();" style="width:270px;"><%
+	String imageOptionsList = imageBrowsePage.getImagesOptionList() ;
+	if (!"".equals(imageOptionsList)) { %>
+		<%= imageOptionsList %><%
+	} else { %>
+		<optgroup label="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/No_files" />" style="font-weight:normal !important; font-style:italic !important;"></optgroup><%
+	} %>
+	</select>
+	--%>
+	<div id="pagingTopDiv"></div>
+	<div id="thumbsDiv" style="margin: 10px 0; height:<%= MIN_CONTENT_HEIGHT %>px; overflow:auto;"><%
+		if (null != images) {
+			int pageIdx = getIntRequestParam("idx", 0, request) - 1 ;
+			int idx_0 = 0 ;
+			int idx_1 = images.size() ;
+			if (images.size() > PAGING_FILE_COUNT_LIMIT) {
+				idx_0 = (pageIdx > -1) ? pageIdx * HITS_PER_PAGE : 0 ;
+				idx_1 = (pageIdx > -1) ? (pageIdx + 1) * HITS_PER_PAGE : HITS_PER_PAGE ;
+				idx_1 = (images.size() < idx_1) ? images.size() : idx_1 ;
+			}
+			for (int i = idx_0; i < idx_1; i++) {
+				File file = images.get(i) ;
+				String filePath = file.getPath() ;
+				String fileName = file.getName();
+				String imgDimensions = "?" ;
+				ImageDomainObject iDO = new ImageDomainObject() ;
+				String path = filePath.replace(new File(imagesRoot, "/").toString(), "") ;
+				ImagesPathRelativePathImageSource imageSource = new ImagesPathRelativePathImageSource(path) ;
+				iDO.setFormat(fileName.toLowerCase().endsWith(".png") ? Format.PNG : fileName.toLowerCase().endsWith(".gif") ? Format.GIF : Format.JPEG);
+				iDO.setSourceAndClearSize(imageSource) ;
+				iDO.setWidth(THUMB_BOUNDARIES);
+				iDO.setHeight(THUMB_BOUNDARIES);
+				iDO.setResize(Resize.GREATER_THAN);
+				boolean canPreview = false;
+				try {
+					ImageSize realSize = ImcmsImageUtils.getCachedRealSize(iDO);
+					int orgWidth = realSize.getWidth();
+					int orgHeight = realSize.getHeight();
+					canPreview = (orgWidth > 0 && orgHeight > 0);
+					imgDimensions = orgWidth + " x " + orgHeight + ", " + ImageBrowse.getSimpleFileSize(file.length()) ;
+					if (0 == orgWidth || 0 == orgHeight || 0 == file.length()) {
+						continue ;
+					}
+				} catch (Exception ignore) {}
+				String previewSrc = ImcmsImageUtils.getImageUrl(null, iDO, cp);
+				String value = FileUtility.relativeFileToString(FileUtility.relativizeFile(imagesRoot, file)) ; %>
+		<div id="imageDiv<%= i %>" style="float:left; width:<%= THUMB_BOUNDARIES + 2 %>px; border: 1px solid #f5f5f7; border-width: 0 10px 10px 0; padding-bottom:5px;<%
+				if (hasNewImagesFirst && i < LAST_MOD_COUNT_ON_TOP) {
+					%> background-color:#ff9 !important;<%
+				} %>">
+			<table border="0" cellspacing="0" cellpadding="0" style="width:<%= THUMB_BOUNDARIES %>px; border: 1px solid #ccc; background-color:#fff;">
+			<tr>
+				<td style="height:<%= THUMB_BOUNDARIES %>px; text-align:center; vertical-align:middle;">
+				<a href="javascript://choose()" title="<%= StringEscapeUtils.escapeHtml(fileName) %>"
+				   onclick="jQ('#imageCB<%= i %>').attr('checked', 'checked'); return false"
+				   ondblclick="jQ('#imageCB<%= i %>').attr('checked', 'checked'); jQ('#useBtn').click(); return false"><%
+					%><img class="lazy previewImage" src="$contextPath/imcms/images/img_loading.gif" data-original="<%= previewSrc %>" style="margin:0; border:0;" longdesc="<%= i %>" alt="" /><%
+				%></a></td>
+			</tr>
+			</table>
+			<div style="padding:2px; text-align:center; color:#999; font-size:9px;">
+				<%= imgDimensions + "<br/>" + df.format(file.lastModified()) %>
+			</div>
+			<label for="imageCB<%= i %>" title="<%= StringEscapeUtils.escapeHtml(fileName) %>" style="cursor:pointer;">
+				<input type="radio"
+				       id="imageCB<%= i %>"
+				       name="<%= ImageBrowse.REQUEST_PARAMETER__IMAGE_URL %>"
+				       value="<%= StringEscapeUtils.escapeHtml(value) %>"
+                       data-canpreview="<%= canPreview %>"
+				       style="margin-right:5px; vertical-align:-2px;" />
+				<%= ImageBrowse.truncateString(fileName, 15) %>
+			</label>
+		</div><%
+			}
+			if (images.size() > PAGING_FILE_COUNT_LIMIT && !images.isEmpty()) {
+				DocumentPaging paging = new DocumentPaging("PAGE", pageIdx + 1, images.size(), HITS_PER_PAGE) ;
+				paging.setDivId("pagingBottomDiv") ;
+				paging.setDivClass("paging") ;
+				paging.setSpaceBetween("") ;
+				paging.setShortVisPagesCount(4) ;
+				paging.setMaxVisPagesCount(20) ;
+				String pagingHtml = paging.getPagingLinksAsHtml() ;
+				pagingHtml = re.substitute("s/href=\"[^\"]*?([\\d]+)[^\"]*?\"/href=\"#goToPage($1)\" onclick=\"goToPage($1); return false\"/gi", pagingHtml) ; %>
+			<%= pagingHtml %><%
+			}
+		} %>
+		<div style="clear:both;"></div>
+	</div>
+	
+	
+	
+	
+		
+	</td>
 </tr>
 <tr>
-    <td colspan="3">#gui_heading( "<? templates/sv/change_img.html/4/1 ?>" )</td>
+	<td colspan="2">#gui_hr( "blue" )</td>
 </tr>
-<%
-    LocalizedMessage errorMessage = imageBrowsePage.getErrorMessage() ;
-    if (null != errorMessage) {
-        %><tr>
-            <td colspan="3"><span style="color: red"><%= errorMessage.toLocalizedString(request) %></span></td>
-        </tr><%
-    }
-%>
 <tr>
-    <td colspan="3">
-        <table border="0" cellspacing="0" cellpadding="0" width="100%">
-            <tr>
-                <td>
-                    <input type="file" name="<%= ImageBrowse.REQUEST_PARAMETER__FILE %>" id="theFile" size="54">
-                </td>
-                <td align="right">
-                    <input type="submit" class="imcmsFormBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__UPLOAD_BUTTON %>" value="<? templates/sv/change_img.html/2005 ?>">
-                </td>
-            </tr>
-        </table>
-    </td>
+	<td colspan="2" align="right">
+	<table border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td><input type="submit" class="imcmsFormBtn imcmsFormBtnDefault" id="useBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__OK_BUTTON %>" value="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/2005" />" /></td>
+		<td>&nbsp;</td>
+		<td><input type="submit" class="imcmsFormBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__PREVIEW_BUTTON %>" value="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/2006" />"
+		onclick="return previewFile();"></td>
+		<td>&nbsp;</td>
+		<td><input type="Submit" class="imcmsFormBtn imcmsFormBtnCancel" name="<%= ImageBrowse.REQUEST_PARAMETER__CANCEL_BUTTON %>" value="<fmt:message key="install/htdocs/sv/jsp/ImageBrowse.html/2007" />"></td>
+	</tr>
+	</table></td>
 </tr>
 <tr>
-	<td colspan="3">#gui_hr( "blue" )</td>
+	<td colspan="2" style="padding-top:35px;">#gui_heading( "<fmt:message key="templates/sv/change_img.html/4/1" />" )</td>
+</tr><%
+LocalizedMessage errorMessage = imageBrowsePage.getErrorMessage() ;
+if (null != errorMessage) { %>
+<tr>
+	<td colspan="2"><span style="color: red"><%= errorMessage.toLocalizedString(request) %></span></td>
+</tr><%
+} %>
+<tr>
+	<td colspan="2">
+	<table border="0" cellspacing="0" cellpadding="0" width="100%">
+	<tr>
+		<td><input type="file" name="<%= ImageBrowse.REQUEST_PARAMETER__FILE %>" id="theFile" size="54" /></td>
+		<td align="right">
+		<input type="submit" class="imcmsFormBtn" name="<%= ImageBrowse.REQUEST_PARAMETER__UPLOAD_BUTTON %>" value="<fmt:message key="templates/sv/change_img.html/2005" />" /></td>
+	</tr>
+	</table></td>
 </tr>
 </table>
 </form>
+
+<form id="pagingForm" action="ImageBrowse" method="POST" enctype="multipart/form-data">
+	<input type="hidden" id="dir" name="dir" value="<%= ("\\" + FileUtility.relativizeFile( Imcms.getServices().getConfig().getImagePath().getParentFile(), currentDirectory ).toString()).replace("\\", "/") %>" />
+	<input type="hidden" name="editor_image" value="<%= request.getParameter("editor_image") %>" />
+	<input type="hidden" name="<%= ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER %>" value="<%=HttpSessionUtils.getSessionAttributeNameFromRequest(request, ImageBrowser.REQUEST_ATTRIBUTE_OR_PARAMETER__IMAGE_BROWSER)%>" /><%
+	if (null != imageBrowsePage.getLabel() ) { %>
+	<input type="hidden" name="<%= ImageBrowse.REQUEST_PARAMETER__LABEL %>" value="<%=imageBrowsePage.getLabel()%>" /><%
+	} %>
+	<input type="hidden" id="idx" name="idx" value="1" />
+</form>
+<script type="text/javascript">
+function goToPage(idx) {
+	jQ('#idx').val(idx) ;
+	jQ('#pagingForm').submit() ;
+}
+try {
+	if (jQ('#pagingBottomDiv')) jQ('#pagingTopDiv').addClass("paging").addClass("pagingTop").html(jQ('#pagingBottomDiv').html()) ;
+} catch(e) {}
+</script>
 #gui_bottom()
 #gui_outer_end()
-<% if (null != imageBrowsePage.getImageUrl()) { %>
-<div align="center" id="previewDiv"><img src="<%= StringEscapeUtils.escapeHtml( Utility.escapeUrl(request.getContextPath() + Imcms.getServices().getConfig().getImageUrl() + imageBrowsePage.getImageUrl() )) %>"></div>
-<% } %>
 
-<script language="JavaScript">
+</vel:velocity>
+<script type="text/javascript">
 <!--
-if (hasGetElementById) {
-	if (document.getElementById("previewDiv")) {
-		if (!/\./.test(document.getElementById("previewDiv").innerHTML.toString())) {
-			document.getElementById("previewDiv").style.display = "none" ;
+var pai = "\\.(GIF|JPE?G|PNG)$";
+
+function isImageFile(file) {
+	try {
+		var re = new RegExp(pai, 'gi');
+		return re.test(file);
+	} catch (e) {
+		return false ;
+	}
+}
+
+function getFile() {<%--
+	var theVal = "";
+	try {
+		var f = document.forms[0];
+		var oSel = f.<%= ImageBrowse.REQUEST_PARAMETER__IMAGE_URL %>;
+		if (oSel.selectedIndex > -1) theVal = oSel.options[oSel.selectedIndex].value;
+	} catch (e) {}
+	return theVal;--%>
+	var $selRadio = jQ(':radio[id^="imageCB"]:checked') ;
+    
+    if ($selRadio.length > 0) {
+        return {
+            path: $selRadio.val(), 
+            canPreview: ($selRadio.attr("data-canpreview") == "true")
+        };
+    }
+    
+    return null;
+}
+
+<vel:velocity>
+function previewFile() {
+	try {
+		var actFile = getFile() ;
+        if (actFile != null) {
+			var file = "<%= Imcms.getServices().getConfig().getImageUrl() %>" + actFile.path ;
+			if (actFile.canPreview) {
+				popWinOpen(800,570,"$contextPath/imcms/$language/jsp/FileAdmin_preview.jsp?file=" + encodeURIComponent(file),"",1,0);
+				return false;
+			}
 		}
+	} catch (e) {}
+	return true ;
+}
+</vel:velocity>
+jQ(document).ready(function($) {
+	resizeContent($) ;
+	$(window).resize(function() {
+		resizeContent($) ;
+	}) ;
+}) ;
+
+function resizeContent($) {
+	var $display = $(window) ;
+	var displayW = $display.width() ;
+	var displayH = $display.height() ;<%--
+	imLog('display: ' + displayW + ' x ' + displayH) ;--%>
+	var minW   = <%= MIN_CONTENT_WIDTH %> ;
+	var minH   = <%= MIN_CONTENT_HEIGHT %> ;
+	var offsetW = 140 ;
+	var offsetH = 420 ;
+	var newW, newH ;
+	if (displayW > (minW + offsetW)) {
+		newW = displayW - offsetW ;
+	} else {
+		newW = minW ;
 	}
+	if (displayH > (minH + offsetH)) {
+		newH = displayH - offsetH ;<%--
+		imLog('1, newH: ' + newH) ;--%>
+	} else {
+		newH = minH ;<%--
+		imLog('2, newH: ' + newH) ;--%>
+	}
+	$('#mainTable').css('width', newW + 'px') ;
+	$('#directorySelect').css('height', (newH + 10) + 'px') ;
+	$('#thumbsDiv').css('height', newH + 'px') ;
 }
 //-->
 </script>
 
 </body>
 </html>
-</vel:velocity>
diff --git a/web/imcms/lang/jsp/admin/adminbuttons.jsp b/web/imcms/lang/jsp/admin/adminbuttons.jsp
index b8ae8b73e7..349be2b946 100644
--- a/web/imcms/lang/jsp/admin/adminbuttons.jsp
+++ b/web/imcms/lang/jsp/admin/adminbuttons.jsp
@@ -1,133 +1,115 @@
-<%@ page contentType="text/html; charset=UTF-8"
-         import="imcode.server.document.DocumentDomainObject,
-                 imcode.server.document.DocumentPermissionSetDomainObject,
-                 imcode.server.document.TextDocumentPermissionSetDomainObject,
-                 imcode.server.document.textdocument.TextDocumentDomainObject,
-                 imcode.server.user.UserDomainObject"%>
-<%@ page import="imcode.util.Html"%>
-<%@ page import="imcode.util.Utility"%>
-<%@taglib uri="imcmsvelocity" prefix="vel" %>
-<%
-    UserDomainObject user = (UserDomainObject)request.getAttribute("user") ;
-    DocumentDomainObject document = (DocumentDomainObject)request.getAttribute("document") ;
-    DocumentPermissionSetDomainObject documentPermissionSet = user.getPermissionSetFor( document ) ;
+<%@ page
+	
+	import="imcode.server.document.DocumentDomainObject,
+	        imcode.server.document.DocumentPermissionSetDomainObject,
+	        imcode.server.document.TextDocumentPermissionSetDomainObject,
+	        imcode.server.document.textdocument.TextDocumentDomainObject,
+	        imcode.server.user.UserDomainObject,
+	        imcode.util.Html,
+	        imcode.util.Utility, org.apache.commons.lang.StringUtils, org.apache.commons.lang.StringEscapeUtils, imcode.server.document.DocumentTypeDomainObject"
+	
+	contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"
+	
+%><%@ taglib uri="imcmsvelocity" prefix="vel"
+%><%
 
-%><vel:velocity>
-<style type="text/css">
-<!--
-
-.imcms_label, .imcms_label:link, .imcms_label:visited { font: 10px Verdana; color:#c00000; text-decoration:none; background-color:#ffffcc }
-.imcms_label:active, .imcms_label:hover { font: 10px Verdana; color:#000099; text-decoration:underline; background-color:#ffffcc }
-
-/* adminMode */
+UserDomainObject user = (UserDomainObject)request.getAttribute("user") ;
+DocumentDomainObject document = (DocumentDomainObject)request.getAttribute("document") ;
+DocumentPermissionSetDomainObject documentPermissionSet = user.getPermissionSetFor( document ) ;
 
-#adminPanelDiv    { padding: 15px 0 10px 0; }
-.adminPanelTable  { border-right: 1px solid #000000; border-bottom: 1px solid #000000; background-color: #f5f5f7; }
-.adminPanelTd1    { padding: 2px; background-color: #20568D; }
-#adminPanelTd1_1  { }
-.adminPanelLogo   { font: bold 11px Verdana,Geneva,sans-serif; color: #ddddff; letter-spacing: -1px; }
-#adminPanelTd1_2  {  }
-.adminPanelText,
-.adminPanelText SPAN { font: 11px Verdana,Geneva,sans-serif; color: #ffffff; }
-#adminPanelTd1_3  {  }
-.adminPanelTd2    { padding: 3px; height: 32px; vertical-align: top; }
+boolean isTextDocument = (DocumentTypeDomainObject.TEXT == document.getDocumentType()) ;
 
-.adminPanelTd2 A:hover IMG {
-    filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=0, xray=0, mirror=0, invert=0, opacity=0.5, rotation=0);
-    -moz-opacity: 0.5;
-}
-B { font-weight: bold; }
--->
-</style>
+%><vel:velocity>
 <div id="adminPanelDiv">
-<table border="0" cellspacing="0" cellpadding="2" class="adminPanelTable">
-<tr>
-	<td class="adminPanelTd1">
-	<table border="0" cellspacing="0" cellpadding="0" width="100%">
+	<table border="0" cellspacing="0" cellpadding="2" class="adminPanelTable">
 	<tr>
-		<td id="adminPanelTd1_1" width="25%" nowrap>
-		<font face="Verdana, Arial, Helvetica, sans-serif" size="2" class="adminPanelLogo" onDblClick="window.open('http://www.imcms.net/')"><? templates/sv/adminbuttons/adminbuttons.html/1 ?> &nbsp;</font></td>
-		<td id="adminPanelTd1_2" width="50%" align="center" nowrap>
-		<font face="Verdana, Arial, Helvetica, sans-serif" size="2" class="adminPanelText">
-		<span title="<? web/imcms/lang/jsp/admin/adminbuttons.jsp/title_id ?>"><b>Id:</b> <%= document.getId() %></span> &nbsp; <span title="<? web/imcms/lang/jsp/admin/adminbuttons.jsp/title_type ?>"><b><? templates/sv/adminbuttons/adminbuttons.html/1001 ?>:</b> <%= document.getDocumentTypeName().toLocalizedString( request ) %></span> &nbsp;</font></td>
-		<td id="adminPanelTd1_3" width="25%" align="right"><%= Html.getLinkedStatusIconTemplate( document, user, request ) %></td>
+		<td class="adminPanelTd1">
+		<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
+		<tr>
+			<td id="adminPanelTd1_1" width="25%" nowrap="nowrap">
+			<span class="adminPanelLogo" ondblclick="window.open('http://www.imcms.net/')"><? templates/sv/adminbuttons/adminbuttons.html/1 ?> &nbsp;</span></td>
+			<td id="adminPanelTd1_2" width="50%" align="center" nowrap="nowrap">
+			<span class="adminPanelText">
+			<span title="<? web/imcms/lang/jsp/admin/adminbuttons.jsp/title_id ?>"><b>Id:</b> <%= document.getId() %></span> &nbsp;
+			<span title="<? web/imcms/lang/jsp/admin/adminbuttons.jsp/title_alias ?>"><b>Alias:</b> <%=
+			(null != document.getAlias()) ? "<span title=\"" + StringEscapeUtils.escapeHtml(document.getAlias()) + "\">" + StringUtils.abbreviate(document.getAlias(), (isTextDocument ? 37 : 23)) + "</span>" : "-" %></span><%
+			if (!isTextDocument) { %> &nbsp;
+			<span title="<? web/imcms/lang/jsp/admin/adminbuttons.jsp/title_type ?>"><b><? templates/sv/adminbuttons/adminbuttons.html/1001 ?>:</b>
+			<%= document.getDocumentTypeName().toLocalizedString( request ) %></span><%
+			} %> &nbsp;</span></td>
+			<td id="adminPanelTd1_3" width="25%" align="right"><%= Html.getLinkedStatusIconTemplate( document, user, request ) %></td>
+		</tr>
+		</table></td>
 	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td class="adminPanelTd2" align="center" nowrap>
-        <a href="$contextPath/servlet/BackDoc" id="admHrefBackdoc"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/foregaende.gif"<%
+	<tr>
+		<td class="adminPanelTd2" align="center" nowrap="nowrap">
+		<a href="$contextPath/servlet/BackDoc" id="admHrefBackdoc"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/foregaende.gif"<%
 				%> alt="<? templates/sv/adminbuttons/adminbuttons.html/2001 ?>"<%
-				%> title="<? templates/sv/adminbuttons/adminbuttons.html/2001 ?>" id="admBtnBackdoc" border="0"></a><%
+				%> title="<? templates/sv/adminbuttons/adminbuttons.html/2001 ?>" id="admBtnBackdoc" border="0" /></a><%
         if (user.canEdit( document )) {
             %><a href="<%= Utility.getAbsolutePathToDocument( request, document ) %>" id="admHrefNormal"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/normal.gif"<%
 				  %> alt="<? templates/sv/adminbuttons/adminbutton2_0.html/2001 ?>"<%
-				  %> title="<? templates/sv/adminbuttons/adminbutton2_0.html/2001 ?>" id="admBtnNormal" border="0"></a><%
+				  %> title="<? templates/sv/adminbuttons/adminbutton2_0.html/2001 ?>" id="admBtnNormal" border="0" /></a><%
         }
         if( document instanceof TextDocumentDomainObject) {
             TextDocumentPermissionSetDomainObject textDocumentPermissionSet = (TextDocumentPermissionSetDomainObject)documentPermissionSet ;
             if( textDocumentPermissionSet.getEditTexts() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=65536" id="admHrefText"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/btn_text.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=65536" id="admHrefText"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/btn_text.gif"<%
               %> alt="<? templates/sv/adminbuttons/adminbutton2_65536.html/2001 ?>"<%
-              %> title="<? templates/sv/adminbuttons/adminbutton2_65536.html/2001 ?>" id="admBtnText" border="0"></a><%
+              %> title="<? templates/sv/adminbuttons/adminbutton2_65536.html/2001 ?>" id="admBtnText" border="0" /></a><%
             }
             if( textDocumentPermissionSet.getEditImages() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=131072" id="admHrefBild"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/btn_image.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=131072" id="admHrefBild"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/btn_image.gif"<%
               %> alt="<? templates/sv/adminbuttons/adminbutton2_131072.html/2001 ?>"<%
-              %> title="<? templates/sv/adminbuttons/adminbutton2_131072.html/2001 ?>" id="admBtnBild" border="0"></a><%
+              %> title="<? templates/sv/adminbuttons/adminbutton2_131072.html/2001 ?>" id="admBtnBild" border="0" /></a><%
             }
             if( textDocumentPermissionSet.getEditMenus() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=262144" id="admHrefLank"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/meny.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=262144" id="admHrefLank"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/meny.gif"<%
               %> alt="<? templates/sv/adminbuttons/adminbutton2_262144.html/2001 ?>"<%
-              %> title="<? templates/sv/adminbuttons/adminbutton2_262144.html/2001 ?>" id="admBtnLank" border="0"></a><%
+              %> title="<? templates/sv/adminbuttons/adminbutton2_262144.html/2001 ?>" id="admBtnLank" border="0" /></a><%
             }
             if( textDocumentPermissionSet.getEditTemplates() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=524288" id="admHrefUtseende"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/utseende.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=524288" id="admHrefUtseende"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/utseende.gif"<%
               %> alt="<? templates/sv/adminbuttons/adminbutton2_524288.html/2001 ?>"<%
-              %> title="<? templates/sv/adminbuttons/adminbutton2_524288.html/2001 ?>" id="admBtnUtseende" border="0"></a><%
+              %> title="<? templates/sv/adminbuttons/adminbutton2_524288.html/2001 ?>" id="admBtnUtseende" border="0" /></a><%
             }
             if( textDocumentPermissionSet.getEditIncludes() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=1048576" id="admHrefInclude"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/include.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=1048576" id="admHrefInclude"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/include.gif"<%
               %> alt="<? templates/sv/adminbuttons/adminbutton2_1048576.html/2001 ?>"<%
-              %> title="<? templates/sv/adminbuttons/adminbutton2_1048576.html/2001 ?>" id="admBtnInclude" border="0"></a><%
+              %> title="<? templates/sv/adminbuttons/adminbutton2_1048576.html/2001 ?>" id="admBtnInclude" border="0" /></a><%
             }
         } else {
             if( documentPermissionSet.getEdit() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=65536" id="admHrefRedigera"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/redigera.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=65536" id="admHrefRedigera"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/redigera.gif"<%
               %> alt="<? templates/sv/adminbuttons/adminbutton7_65536.html/2001 ?>"<%
-              %> title="<? templates/sv/adminbuttons/adminbutton7_65536.html/2001 ?>" id="admBtnRedigera" border="0"></a><%
+              %> title="<? templates/sv/adminbuttons/adminbutton7_65536.html/2001 ?>" id="admBtnRedigera" border="0" /></a><%
             }
         }
         if( documentPermissionSet.getEditDocumentInformation() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=1" id="admHrefDokinfo"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/dokinfo.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=1" id="admHrefDokinfo"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/dokinfo.gif"<%
             %> alt="<? templates/sv/adminbuttons/adminbutton_1.html/2001 ?>"<%
-            %> title="<? templates/sv/adminbuttons/adminbutton_1.html/2001 ?>" id="admBtnDokinfo" border="0"></a><%
+            %> title="<? templates/sv/adminbuttons/adminbutton_1.html/2001 ?>" id="admBtnDokinfo" border="0" /></a><%
         }
         if( documentPermissionSet.getEditPermissions() ) {
-                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&flags=4" id="admHrefRattigheter"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/rattigheter.gif"<%
+                %><a href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>&amp;flags=4" id="admHrefRattigheter"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/rattigheter.gif"<%
             %> alt="<? templates/sv/adminbuttons/adminbutton_4.html/2001 ?>"<%
-            %> title="<? templates/sv/adminbuttons/adminbutton_4.html/2001 ?>" id="admBtnRattigheter" border="0"></a><%
+            %> title="<? templates/sv/adminbuttons/adminbutton_4.html/2001 ?>" id="admBtnRattigheter" border="0" /></a><%
         }
         if ( !user.isDefaultUser() ) {
             %><a href="$contextPath/servlet/LogOut" id="admHrefLoggaut"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/loggaut.gif"<%
             %> alt="<? templates/sv/adminbuttons/adminbuttons.html/2002 ?>"<%
-            %> title="<? templates/sv/adminbuttons/adminbuttons.html/2002 ?>" id="admBtnLoggaut" border="0"></a><%
+            %> title="<? templates/sv/adminbuttons/adminbuttons.html/2002 ?>" id="admBtnLoggaut" border="0" /></a><%
         }
         if ( user.canAccessAdminPages() ) {
             %><a href="$contextPath/servlet/AdminManager" target="_blank" id="admHrefAdmin"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/admin.gif"<%
             %> alt="<? templates/sv/adminbuttons/superadminbutton.html/2001 ?>"<%
-            %> title="<? templates/sv/adminbuttons/superadminbutton.html/2001 ?>" id="admBtnAdmin" border="0"></a><%
+            %> title="<? templates/sv/adminbuttons/superadminbutton.html/2001 ?>" id="admBtnAdmin" border="0" /></a><%
         }
-        %><a href="javascript:void(0)" onClick="openHelpW('HelpStart');return(false)" target="_blank"  id="admHrefHelp"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/help.gif"<%
+        %><a href="@documentationurl@/Help?name=HelpStart&amp;lang=$language" target="_blank" onclick="openHelpW('HelpStart'); return false"  id="admHrefHelp"><img src="$contextPath/imcms/$language/images/admin/adminbuttons/help.gif"<%
             %> alt="<? templates/sv/adminbuttons/adminbuttons.html/2003 ?>"<%
-            %> title="<? templates/sv/adminbuttons/adminbuttons.html/2003 ?>" id="admBtnHelp" border="0"></a></td>
-</tr>
-</table></div>
-<SCRIPT language=JavaScript>
-<!--
-function openHelpW(helpDocName){
-	window.open("@documentationurl@/Help?name=" + helpDocName + "&lang=$language","help");
-}
-//-->
-</SCRIPT>
+            %> title="<? templates/sv/adminbuttons/adminbuttons.html/2003 ?>" id="admBtnHelp" border="0" /></a></td>
+	</tr>
+	</table>
+</div>
 </vel:velocity>
\ No newline at end of file
diff --git a/web/imcms/lang/jsp/category_admin.jsp b/web/imcms/lang/jsp/category_admin.jsp
index db367c8ef1..de76599391 100644
--- a/web/imcms/lang/jsp/category_admin.jsp
+++ b/web/imcms/lang/jsp/category_admin.jsp
@@ -134,7 +134,7 @@ if (inDefaultMode) {
         }
         %>
         <input type="hidden" name="<%= AdminCategories.PARAMETER_MODE__ADD_CATEGORY_TYPE %>" value="1">
-        <% request.setAttribute( "categoryType", new CategoryTypeDomainObject( 0,"",1,true) );
+        <% request.setAttribute( "categoryType", new CategoryTypeDomainObject( 0,"",1,true, false) );
          %><jsp:include page="category_admin_category_type.jsp"/>
 
         <%if( messageToUser.length() > 0 ) { %>
diff --git a/web/imcms/lang/jsp/category_admin_category.included.jsp b/web/imcms/lang/jsp/category_admin_category.included.jsp
index dcea49bb68..93221170e6 100644
--- a/web/imcms/lang/jsp/category_admin_category.included.jsp
+++ b/web/imcms/lang/jsp/category_admin_category.included.jsp
@@ -36,9 +36,10 @@ String subHeading = inDeleteCategoryMode ? "<? install/htdocs/sv/jsp/category_ad
         </td>
         </tr>
         <tr>
-		    <td class="imcmsAdmText" nowrap><? install/htdocs/sv/jsp/category_admin/icon ?> &nbsp;</td>
+						<td class="imcmsAdmText" valign="top" style="padding-top:3px;" nowrap><? install/htdocs/sv/jsp/category_admin/icon ?> &nbsp;</td>
             <td>
-            <input type="text" name="icon" <% if (readonly) {%>readonly<%}%> size="30" maxlength="255" value="<%= StringEscapeUtils.escapeHtml((String)ObjectUtils.defaultIfNull(categoryToEdit.getImageUrl(),"")) %>">
+            <input type="text" name="icon" <% if (readonly) {%>readonly<%}%> size="30" maxlength="255" style="width:300px;"
+                   value="<%= StringEscapeUtils.escapeHtml((String)ObjectUtils.defaultIfNull(categoryToEdit.getImageUrl(),"")) %>">
             &nbsp;
             <% if (!readonly) { %><input type="submit" class="imcmsFormBtnSmall" name="<%= AdminCategories.PARAMETER__BROWSE_FOR_IMAGE %>" value=" Browse "><% } %>
             &nbsp;
diff --git a/web/imcms/lang/jsp/category_admin_category_type.jsp b/web/imcms/lang/jsp/category_admin_category_type.jsp
index 0f415fb51c..805ae7a3be 100644
--- a/web/imcms/lang/jsp/category_admin_category_type.jsp
+++ b/web/imcms/lang/jsp/category_admin_category_type.jsp
@@ -12,24 +12,28 @@
                 <td>
 							<table border="0" cellspacing="0" cellpadding="0">
 							<tr>
-								<td height="24"><input type="radio" name="<%=AdminCategories.PARAMETER__MAX_CHOICES%>" value="1" <%= categoryTypeToEdit.getMaxChoices() == 1 ?  "checked" : "" %> ></td>
+								<td height="24"><input type="radio" id="<%=AdminCategories.PARAMETER__MAX_CHOICES%>1" name="<%=AdminCategories.PARAMETER__MAX_CHOICES%>" value="1" <%= categoryTypeToEdit.getMaxChoices() == 1 ?  "checked" : "" %> ></td>
 								<td>&nbsp;&nbsp;</td>
-								<td><? install/htdocs/sv/jsp/category_admin/singel_choice ?></td>
+								<td><label for="<%=AdminCategories.PARAMETER__MAX_CHOICES%>1"><? install/htdocs/sv/jsp/category_admin/singel_choice ?></label></td>
 							</tr>
 							</table></td>
             </tr>
             <tr>
                 <td>&nbsp;</td>
                  <td>
-							<table border="0" cellspacing="0" cellpadding="0">
+							<table border="0" cellspacing="0" cellpadding="0" style="margin-bottom:5px;">
 							<tr>
-								<td height="24"><input type="radio" name="<%=AdminCategories.PARAMETER__MAX_CHOICES%>" value="0" <%= categoryTypeToEdit.getMaxChoices() == 0 ? "checked" : "" %> ></td>
+								<td height="24"><input type="radio" id="<%=AdminCategories.PARAMETER__MAX_CHOICES%>0" name="<%=AdminCategories.PARAMETER__MAX_CHOICES%>" value="0" <%= categoryTypeToEdit.getMaxChoices() == 0 ? "checked" : "" %> ></td>
 								<td>&nbsp;&nbsp;</td>
-								<td><? install/htdocs/sv/jsp/category_admin/multi_choice ?></td>
+								<td><label for="<%=AdminCategories.PARAMETER__MAX_CHOICES%>0"><? install/htdocs/sv/jsp/category_admin/multi_choice ?></label></td>
 							</tr>
 							</table></td>
             </tr>
             <tr>
-                <td><? install/htdocs/sv/jsp/category_admin/inherited ?></td>
-                <td><input type="checkbox" name="<%=AdminCategories.PARAMETER__INHERITED%>" value="1" <%= categoryTypeToEdit.isInherited() ? "checked" : "" %> ></td>
+                <td><label for="<%=AdminCategories.PARAMETER__INHERITED%>"><? install/htdocs/sv/jsp/category_admin/inherited ?></label></td>
+                <td><input type="checkbox" id="<%=AdminCategories.PARAMETER__INHERITED%>" name="<%=AdminCategories.PARAMETER__INHERITED%>" value="1" <%= categoryTypeToEdit.isInherited() ? "checked" : "" %> ></td>
+            </tr>
+            <tr>
+                <td><label for="<%=AdminCategories.PARAMETER__IMAGE_ARCHIVE%>"><? install/htdocs/sv/jsp/category_admin/image_archive ?></label></td>
+                <td><input type="checkbox" id="<%=AdminCategories.PARAMETER__IMAGE_ARCHIVE%>" name="<%=AdminCategories.PARAMETER__IMAGE_ARCHIVE%>" value="1" <%= categoryTypeToEdit.isImageArchive() ? "checked" : "" %> ></td>
             </tr>
diff --git a/web/imcms/lang/jsp/change_img.jsp b/web/imcms/lang/jsp/change_img.jsp
index d06d31ee96..d8a79d70e9 100644
--- a/web/imcms/lang/jsp/change_img.jsp
+++ b/web/imcms/lang/jsp/change_img.jsp
@@ -6,31 +6,70 @@
           imcode.server.document.FileDocumentDomainObject,
           imcode.server.document.textdocument.FileDocumentImageSource,
           imcode.server.document.textdocument.ImageDomainObject,
+          imcode.server.document.textdocument.ImageDomainObject.CropRegion,
           imcode.server.document.textdocument.ImageSource,
+          imcode.server.document.textdocument.TextDocumentDomainObject,
+          imcode.server.Imcms,
+          imcode.server.ImcmsConstants,
           imcode.server.user.UserDomainObject,
           imcode.util.Html,
           imcode.util.ImcmsImageUtils,
           imcode.util.Utility,
+          imcode.util.image.Format,
+          java.net.URLEncoder,
+          java.util.Properties,
           org.apache.commons.lang.StringEscapeUtils,
-          org.apache.commons.lang.StringUtils, java.util.Properties"
+          org.apache.commons.lang.StringUtils"
 
 	contentType="text/html; charset=UTF-8"
 
-%><%@taglib prefix="vel" uri="imcmsvelocity"%><%
+%><%@taglib prefix="vel" uri="imcmsvelocity"
+            %><%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"
+%><%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
+%><%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"
+%><%!
+
+final static int GUI_INNER_WIDTH = 900 ;
+
+%><%
 
     ImageEditPage imageEditPage = ImageEditPage.getFromRequest(request);
     assert null != imageEditPage;
+    TextDocumentDomainObject document = imageEditPage.getDocument();
     ImageDomainObject image = imageEditPage.getImage();
     assert null != image;
     ImageSize realImageSize = image.getRealImageSize();
     assert null != realImageSize;
+    ImageSize displayImageSize = image.getDisplayImageSize();
     UserDomainObject user = Utility.getLoggedOnUser( request );
+    CropRegion cropRegion = image.getCropRegion();
+
+String queryString = "" ;
+boolean activateUseFixedBtn = (imageEditPage.getMaxWidth() > 0 || imageEditPage.getMaxHeight() > 0) ;
+
+if (activateUseFixedBtn) {
+	Object[] args = {
+					((null != imageEditPage.getDocument()) ? imageEditPage.getDocument().getId() : 0),
+					imageEditPage.getImageIndex(),
+					URLEncoder.encode(imageEditPage.getLabel(), Imcms.UTF_8_ENCODING),
+					((imageEditPage.getMaxWidth() > 0) ? imageEditPage.getMaxWidth() : imageEditPage.getForcedWidth()),
+					((imageEditPage.getMaxHeight() > 0) ? imageEditPage.getMaxHeight() : imageEditPage.getForcedHeight())
+	} ;
+	queryString = String.format(
+					"?meta_id=%s" +
+					"&amp;img=%s" +
+					"&amp;label=%s" +
+					"&amp;width=%s" +
+					"&amp;height=%s" +
+					"&amp;max-width=0" +
+					"&amp;max-height=0", args) ;
+}
 
 %><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <vel:velocity>
 <html>
 <head>
-<title><? templates/sv/change_img.html/1 ?></title>
+<title><fmt:message key="templates/sv/change_img.html/1" /></title>
 
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/imcms/css/imcms_admin.css.jsp">
 <script src="<%=request.getContextPath()%>/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
@@ -51,16 +90,189 @@ BODY {
 	margin: 30px 10px !important;
 	padding: 0 !important;
 }
+.dim {
+    width: 60px;
+}
 </style>
 
 <script type="text/javascript">
 <!--
+$(function() {
+    function limitDimension(dimName) {
+        var maxDim = $("#max_" + dimName).val();
+        maxDim = parseInt(maxDim, 10);
+        
+        if (!isFinite(maxDim) || maxDim <= 0) {
+            return;
+        }
+        
+        function restrict() {
+            var input = $(this), 
+                value = input.val();
+            
+            if (/[^0-9\s]/.test(value)) {
+                value = value.replace(/[^0-9]+/, "");
+                input.val(value);
+            }
+            value = parseInt(value, 10);
+            
+            if (!isFinite(value) || value <= 0) {
+                input.val("");
+                return;
+            }
+            
+            if (value > maxDim) {
+                input.val(maxDim);
+            }
+        }
+        
+        var input = $("#image_" + dimName);
+        
+        input.bind("change keyup", restrict)
+        input.bind("cut paste", function(e) {
+            var self = this;
+            
+            setTimeout(function() {
+                restrict.call(self);
+            }, 1);
+        });
+    }
+    
+    limitDimension("width");
+    limitDimension("height");
+    
+    
+    var zoomFactors = [2, 5, 10, 30, 50, 67, 80, 90, 100, 110, 120, 133, 150, 170, 200, 240, 300], 
+        zoomActual, 
+        zoomIndex, 
+        zoom = 100;
+
+    for (var i = 0; i < zoomFactors.length; ++i) {
+        if (zoomFactors[i] == 100) {
+            zoomActual = i;
+            zoomIndex = i;
+            break;
+        }
+    }
+
+    var contWidth = 900, 
+        contHeight = 400, 
+        imageWidth = parseInt($("#display_width").val(), 10), 
+        imageHeight = parseInt($("#display_height").val(), 10), 
+        ratio = imageWidth / imageHeight;
+
+    function updateImageZoom() {
+        var cont = $("#previewDiv"), 
+            img = $("img", cont);
+
+        if (zoomIndex != -1) {
+            zoomIndex = Math.max(Math.min(zoomIndex, zoomFactors.length - 1), 0);
+            zoom = zoomFactors[zoomIndex];
+        }
+
+        var percent = zoom / 100, 
+            newWidth = Math.round(imageWidth * percent), 
+            newHeight = Math.round(newWidth / ratio);
+
+        img.css({
+            width: newWidth + "px", 
+            height: newHeight + "px"
+        });
+
+        cont.css({
+            height: (newHeight > contHeight ? contHeight + "px" : "auto"), 
+            overflow: (newWidth > contWidth || newHeight > contHeight ? "auto" : "visible")
+        });
+
+        $("#zoom-value").text(Math.floor(zoom));
+    }
+
+    $("#zoom-in,#zoom-out").click(function() {
+        var zoomin = ($(this).attr("id").indexOf("zoom-in") != -1);
+        
+        
+        if (zoomIndex == -1) {
+            var found = false, 
+                start = (zoomin ? 0 : zoomFactors.length - 1), 
+                end = (zoomin ? zoomFactors.length : -1);
+
+            for (var i = start; i != end; (zoomin ? ++i : --i)) {
+                if ((zoomin && zoomFactors[i] > zoom) ||
+                    (!zoomin && zoomFactors[i] < zoom)) {
+                    zoomIndex = i;
+                    found = true;
+                    break;
+                }
+            }
+            
+            if (!found) {
+                return false;
+            }
+        } else {
+            if (zoomin) {
+                ++zoomIndex;
+            } else {
+                --zoomIndex;
+            }
+        }
+        
+        updateImageZoom();
+        
+        return false;
+    });
+
+    $("#zoom-actual").click(function() {
+        zoomIndex = zoomActual;
+        updateImageZoom();
+        
+        return false;
+    });
+
+    function zoomFit() {
+        zoomIndex = -1;
+
+        if ((imageWidth > contWidth) || (imageHeight > contHeight)) {
+            var finalWidth;
+
+            if (imageWidth > contWidth && imageHeight > contHeight) {
+                var targetRatio = contWidth / contHeight;
+
+                if (ratio > targetRatio) {
+                    finalWidth = contWidth;
+                } else {
+                    finalWidth = Math.floor(contHeight * ratio);
+                }
+            } else if (imageWidth > contWidth) {
+                finalWidth = contWidth;
+            } else {
+                finalWidth = Math.floor(contHeight * ratio);
+            }
+
+            zoomIndex = -1;
+            zoom = (finalWidth / imageWidth) * 100;
+
+        } else {
+            zoomIndex = zoomActual;
+        }
+
+        updateImageZoom();
+    }
+
+    $("#zoom-fit").click(function() {
+        zoomFit();
+        return false;
+    });
+    
+    if ($("#zoom-fit").length != 0) {
+        zoomFit();
+    }
+});
+
 function addScrolling() {
 	if (window.opener) {
 		var obj = document.getElementById("outer_container") ;
 		obj.style.height = "100%" ;
-		obj.style.overflow = "scroll" ;
-		window.resizeTo(800,760) ;
+		obj.style.overflow = "auto" ;
 	}
 }
 
@@ -99,7 +311,7 @@ function checkLinkType() {<%
 	if (val == defValues[0] || val == defValues[1]) {
 		url.value = "" ;
 	} else if (/^\d+$/.test(val)) {
-		url.value = "GetDoc?meta_id=" + val ;
+		url.value = val ;
 	}
 	return true ;<%
 	} %>
@@ -128,6 +340,43 @@ function checkLinkOnBlur() {<%
 	}<%
 	} %>
 }
+
+function resetCrop() {
+    var cell = document.getElementById("crop_cell");
+    var cropButton = document.getElementById("crop_btn");
+
+    cell.removeChild(cell.getElementsByTagName("table")[0]);
+
+    var croppedSizeRow = document.getElementById("croppedSize");
+    var croppedSizeLabelRow = document.getElementById("croppedSizeLabel");
+
+    croppedSizeRow.parentNode.removeChild(croppedSizeRow);
+    croppedSizeLabelRow.parentNode.removeChild(croppedSizeLabelRow);
+
+    document.getElementById("h_crop_x1").value = "-1";
+    document.getElementById("h_crop_y1").value = "-1";
+    document.getElementById("h_crop_x2").value = "-1";
+    document.getElementById("h_crop_y2").value = "-1";
+
+    var forcedWidth = parseInt(document.getElementById("forced_width").value, 10), 
+        forcedHeight = parseInt(document.getElementById("forced_height").value, 10);
+
+    var widthInput = document.getElementById("image_width");
+    if (forcedWidth > 0) {
+        widthInput.value = forcedWidth;
+    } else {
+        widthInput.readOnly = false;
+    }
+
+    var heightInput = document.getElementById("image_height");
+    if (forcedHeight > 0) {
+        heightInput.value = forcedHeight;
+    } else {
+        heightInput.readOnly = false;
+    }
+
+    cropButton.style.display = "inline";
+}
 //-->
 </script>
 
@@ -137,18 +386,34 @@ function checkLinkOnBlur() {<%
 <div id="outer_container">
 	<div id="inner_container">
 #gui_outer_start()
-#gui_head( "<? global/imcms_administration ?>" )
+#gui_head( "<fmt:message key="global/imcms_administration" />" )
 <form method="POST" action="<%= request.getContextPath() %>/servlet/PageDispatcher" onsubmit="checkLinkType();">
 <%= Page.htmlHidden(request) %>
-    
+<input type="hidden" name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_ARCHIVE_IMAGE_ID %>" value="<%= image.getArchiveImageId() %>"/>
+<input type="hidden" id="display_width" value="<%= displayImageSize.getWidth() %>"/>
+<input type="hidden" id="display_height" value="<%= displayImageSize.getHeight() %>"/>
+<input type="hidden" id="forced_width" value="<%= imageEditPage.getForcedWidth() %>"/>
+<input type="hidden" id="forced_height" value="<%= imageEditPage.getForcedHeight() %>"/>
+<input type="hidden" id="max_width" value="<%= imageEditPage.getMaxWidth() %>"/>
+<input type="hidden" id="max_height" value="<%= imageEditPage.getMaxHeight() %>"/>
+<input type="hidden" id="h_crop_x1" name="<%= ImageEditPage.REQUEST_PARAMETER__CROP_X1 %>" value="<%= cropRegion.getCropX1() %>"/>
+<input type="hidden" id="h_crop_y1" name="<%= ImageEditPage.REQUEST_PARAMETER__CROP_Y1 %>" value="<%= cropRegion.getCropY1() %>"/>
+<input type="hidden" id="h_crop_x2" name="<%= ImageEditPage.REQUEST_PARAMETER__CROP_X2 %>" value="<%= cropRegion.getCropX2() %>"/>
+<input type="hidden" id="h_crop_y2" name="<%= ImageEditPage.REQUEST_PARAMETER__CROP_Y2 %>" value="<%= cropRegion.getCropY2() %>"/>
+<input type="hidden" name="<%= ImageEditPage.REQUEST_PARAMETER__ROTATE_ANGLE %>" value="<%= image.getRotateDirection().getAngle() %>"/><%
+
+// Sometimes it jumped wrong if this wasn't here.
+if (null != imageEditPage.getReturnUrl() && !"".equals(imageEditPage.getReturnUrl())) { %>
+<input type="hidden" name="<%= ImcmsConstants.REQUEST_PARAM__RETURN_URL %>" value="<%= StringEscapeUtils.escapeHtml(imageEditPage.getReturnUrl()) %>" /><%
+} %>
     <table border="0" cellspacing="0" cellpadding="0">
     <tr>
         <td>
         <table border="0" cellspacing="0" cellpadding="0">
         <tr>
-            <td><input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__CANCEL_BUTTON %>" value="<? global/back ?>"></td>
+            <td><input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__CANCEL_BUTTON %>" value="<fmt:message key="global/back" />"></td>
             <td>&nbsp;</td>
-            <td><input type="button" value="<? templates/sv/change_img.html/2002 ?>" title="<? templates/sv/change_img.html/2003 ?>" class="imcmsFormBtn" onClick="openHelpW('ImageAdmin')"></td>
+            <td><input type="button" value="<fmt:message key="templates/sv/change_img.html/2002" />" title="<fmt:message key="templates/sv/change_img.html/2003" />" class="imcmsFormBtn" onClick="openHelpW('ImageAdmin')"></td>
         </tr>
         </table></td>
         <td>&nbsp;</td>
@@ -156,20 +421,52 @@ function checkLinkOnBlur() {<%
     </table>
     #gui_mid()
 
-    <table border="0" cellspacing="0" cellpadding="2" width="660" align="center">
+    <table border="0" cellspacing="0" cellpadding="2" width="<%= GUI_INNER_WIDTH %>" align="center">
         <tr>
             <td colspan="2">
                 &nbsp;<br>
                 <% if (null != imageEditPage.getHeading()) { %>
                 #gui_heading( "<%= imageEditPage.getHeading().toLocalizedString(request) %>" )
                 <% } %>
-                <%=
-            "<div id=\"theLabel\" class=\"imcmsAdmText\"><i>" + StringEscapeUtils.escapeHtml(imageEditPage.getLabel()) + "</i></div>"  %></td>
+                <div id="theLabel" class="imcmsAdmText">
+                    <i><%= StringEscapeUtils.escapeHtml(imageEditPage.getLabel()) %></i>
+                    <% if (!image.isEmpty()) { %>
+                    <fmt:message var="bestFitText" key="templates/sv/change_img.html/best_fit"/>
+                    <a id="zoom-fit" href="#" style="float:right;margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_fit.gif" width="22" height="22" alt="${fn:escapeXml(bestFitText)}" title="${fn:escapeXml(bestFitText)}" style="border:none;"/></a>
+                    
+                    <fmt:message var="actualSizeText" key="templates/sv/change_img.html/actual_size"/>
+                    <a id="zoom-actual" href="#" style="float:right;margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_actual_size.gif" width="22" height="22" alt="${fn:escapeXml(actualSizeText)}" title="${fn:escapeXml(actualSizeText)}" style="border:none;"/></a>
+                    
+                    <fmt:message var="zoomOutText" key="templates/sv/change_img.html/zoom_out"/>
+                    <a id="zoom-out" href="#" style="float:right;margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_out.gif" width="22" height="22" alt="${fn:escapeXml(zoomOutText)}" title="${fn:escapeXml(zoomOutText)}" style="border:none;"/></a>
+                    
+                    <fmt:message var="zoomInText" key="templates/sv/change_img.html/zoom_in"/>
+                    <a id="zoom-in" href="#" style="float:right;margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_in.gif" width="22" height="22" alt="${fn:escapeXml(zoomInText)}" title="${fn:escapeXml(zoomInText)}" style="border:none;"/></a>
+                    
+                    <fmt:message var="zoomText" key="templates/sv/change_img.html/zoom"/>
+                    <div style="float:right;line-height:20px;"><c:out value="${zoomText}"/>: <span id="zoom-value">100</span>%</div>
+                    <% } %>
+                </div>
+            </td>
         </tr><%
-		if (!image.isEmpty()) { %>
+		if (!image.isEmpty()) {
+			int previewW = GUI_INNER_WIDTH ;
+			int previewH = 0 ;
+			String overFlow = " overflow:auto;" ;
+			try {
+				int width  = displayImageSize.getWidth();
+				int height = displayImageSize.getHeight();
+				
+				if (height > 400) {
+					previewH = 400 ;
+				}
+			} catch (Exception e) {}
+        %>
 		<tr>
-			<td colspan="2" align="center">
-			<div id="previewDiv"><%= !image.isEmpty() ? ImcmsImageUtils.getImageHtmlTag( image, request, new Properties()) : "" %></div></td>
+			<td colspan="2" align="center" style="padding:0;">
+			<div id="previewDiv" style="padding:0; text-align:center;<%= previewW > 0 ? " width:" + previewW + "px;" : "" %><%= previewH > 0 ? " height:" + previewH + "px;" : "" %>">
+				<%= !image.isEmpty() ? ImcmsImageUtils.getImagePreviewHtmlTag(image, request, new Properties()) : "" %>
+			</div></td>
 		</tr><%
 				ImageSource imageSource = image.getSource();
 				if ( imageSource instanceof FileDocumentImageSource) { %>
@@ -186,30 +483,31 @@ function checkLinkOnBlur() {<%
 		} %>
 		<tr>
 			<td colspan="2" align="center">
+            <% if (ImageEditPage.allowImageArchive(user) || ImageEditPage.allowChooseFile(user)) { %>
 			<table>
-			<tr><%
-					if (imageEditPage.canAddImageFiles(user)) { %>
-				<td><input type="submit" <%
-							%>name="<%= ImageEditPage.REQUEST_PARAMETER__GO_TO_ADD_RESTRICTED_IMAGE_BUTTON %>" <%
-							%>class="imcmsFormBtnSmall" style="width:200px" <%
-							%>value="<? web/imcms/lang/jsp/change_img.jsp/add_restricted_image ?>" ></td><%
-					} %>
+			<tr>
+                <% if (ImageEditPage.allowImageArchive(user)) { %>
+                <td><input type="submit" <%
+                    %>name="<%= ImageEditPage.REQUEST_PARAMETER__GO_TO_IMAGE_ARCHIVE_BUTTON %>" <%
+                    %>class="imcmsFormBtnSmall" style="width:200px" <%
+                    %>value="<fmt:message key="templates/sv/change_img.html/2010" />"></td>
+                <% } %>
+                <% if (ImageEditPage.allowChooseFile(user)) { %>
 				<td><input type="submit" <%
-						%>name="<%= ImageEditPage.REQUEST_PARAMETER__GO_TO_IMAGE_SEARCH_BUTTON %>" <%
+						%>name="<%= ImageEditPage.REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER_BUTTON %>" <%
 						%>class="imcmsFormBtnSmall" style="width:200px" <%
-						%>value="<? web/imcms/lang/jsp/change_img.jsp/image_search ?>" ></td>
-				<td><input type="submit" <%
-					%>name="<%= ImageEditPage.REQUEST_PARAMETER__GO_TO_IMAGE_BROWSER_BUTTON %>" <%
-					%>class="imcmsFormBtnSmall" style="width:200px" <%
-					%>value="<? templates/sv/change_img.html/2004 ?>"></td>
+						%>value="<fmt:message key="templates/sv/change_img.html/2004" />" ></td>
+                <% } %>
 			</tr>
-			</table></td>
+			</table>
+            <% } %>
+            </td>
 		</tr>
         <tr>
             <td colspan="2">#gui_hr( "blue" )</td>
         </tr>
         <tr>
-            <td nowrap><? templates/sv/change_img.html/12 ?></td>
+            <td nowrap><fmt:message key="templates/sv/change_img.html/12" /></td>
             <td>
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
             <tr>
@@ -217,66 +515,173 @@ function checkLinkOnBlur() {<%
 								%>name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_URL %>" <%
 								%>id="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_URL %>" <%
 								String path = image.getUrlPathRelativeToContextPath();
-                %>size="50" maxlength="255" style="width: 350" value="<%= StringUtils.isBlank(path) ? "" : StringEscapeUtils.escapeHtml(request.getContextPath()+path) %>"></td>
+                %>size="50" maxlength="255" style="width:350px;" value="<%= StringUtils.isBlank(path) ? "" : StringEscapeUtils.escapeHtml(request.getContextPath()+path) %>"></td>
             </tr>
             </table></td>
         </tr>
         <tr>
-            <td nowrap><? templates/sv/change_img.html/14 ?></td>
+            <td nowrap><fmt:message key="templates/sv/change_img.html/14" /></td>
             <td><input type="text" <%
 								%>name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_NAME %>" <%
 								%>id="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_NAME %>" <%
-								%>size="50" maxlength="255" style="width: 350" value="<%=
+								%>size="50" maxlength="255" style="width:350px;" value="<%=
 						StringEscapeUtils.escapeHtml(StringUtils.defaultString(image.getName())) %>"></td>
         </tr>
 				<tr>
-					<td nowrap><? templates/sv/change_img.html/16 ?></td>
+					<td nowrap><fmt:message key="templates/sv/change_img.html/16" /></td>
 					<td>
 					<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td><? templates/sv/change_img.html/17 ?></td>
+						<td><% 
+                        if (imageEditPage.getMaxWidth() > 0) {
+                            %><fmt:message key="templates/sv/change_img.html/4012" /><%
+                        } else {
+                            %><fmt:message key="templates/sv/change_img.html/17" /><%
+                        }
+                        %></td>
 						<td>&nbsp;</td>
-						<td><? templates/sv/change_img.html/18 ?></td>
+						<td><%
+                        if (imageEditPage.getMaxHeight() > 0) {
+                            %><fmt:message key="templates/sv/change_img.html/4013" /><%
+                        } else {
+                            %><fmt:message key="templates/sv/change_img.html/18" /><%
+                        }
+                        %></td>
 						<td>&nbsp;</td>
-						<td><? templates/sv/change_img.html/19 ?></td>
+						<td><fmt:message key="templates/sv/change_img.html/19" /></td>
 						<td>&nbsp;</td>
 						<td>&nbsp;</td>
 					</tr>
 					<tr>
-						<td><input type="text" <%
+						<td><input class="dim" type="text" <%
 						%>name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_WIDTH %>" <%
 						%>id="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_WIDTH %>" <%
 						%>size="4" maxlength="4" value="<%
 						if (image.getWidth() > 0) {
 							%><%= image.getWidth() %><%
-						} %>"></td>
+						} %>" <%= (imageEditPage.getForcedWidth() > 0 ? "readonly='readonly' class='imcmsDisabled'" : "") %> ></td>
 						<td>&nbsp;X&nbsp;</td>
-						<td><input type="text" <%
+						<td><input class="dim" type="text" <%
 						%>name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_HEIGHT %>" <%
 						%>id="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_HEIGHT %>" <%
 						%>size="4" maxlength="4" value="<%
 						if (image.getHeight() > 0) {
 							%><%= image.getHeight() %><%
-						} %>"></td>
+						} %>" <%= (imageEditPage.getForcedHeight() > 0 ? "readonly='readonly' class='imcmsDisabled'" : "") %> ></td>
 						<td>&nbsp;</td>
-						<td><input type="text" <%
+						<td><input class="dim" type="text" <%
 						%>name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_BORDER %>" <%
 						%>id="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_BORDER %>" <%
 						%>size="4" maxlength="4" value="<%= image.getBorder() %>"></td>
 						<td>&nbsp;</td>
-						<td><? templates/sv/change_img.html/size_explanation ?></td>
-					</tr>
-					<tr>
-						<td height="20">&nbsp;<%= realImageSize.getWidth() %></td>
-						<td>&nbsp;X&nbsp;</td>
-						<td>&nbsp;<%= realImageSize.getHeight() %></td>
-						<td>&nbsp;</td>
-						<td colspan="3"><? templates/sv/change_img.html/originalSize ?></td>
+						<td><input type="submit" name="<%= ImageEditPage.REQUEST_PARAMETER__PREVIEW_BUTTON %>" 
+                                   class="imcmsFormBtnSmall" value="<fmt:message key="templates/sv/change_img.html/2006" />"/></td>
 					</tr>
 					</table></td>
+        </tr>
+        <% if (activateUseFixedBtn) { %>
+				<tr>
+					<td>&nbsp;</td>
+					<td><input type="button" onclick="document.location = '<%= request.getContextPath() + "/servlet/ChangeImage" + queryString %>'; return false"
+					           class="imcmsFormBtnSmall" value="<fmt:message key="templates/sv/change_img.html/use_fixed_btn_text" />"/> &nbsp;
+						<span class="imcmsAdmDim"><fmt:message key="templates/sv/change_img.html/use_fixed_info" /></span></td>
 				</tr>
+        <% } %>
+        <% if (!image.isEmpty()) { %>
+            <tr height="38">
+                <td nowrap><fmt:message key="templates/sv/change_img.html/4003" /></td>
+                <td id="crop_cell">
+                    <% if (cropRegion.isValid()) { %>
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tr>
+                                <td>
+                                    <label for="crop_x1"><b><fmt:message key="templates/sv/change_img.html/4004" /></b></label>
+                                </td>
+                                <td>
+                                    <label for="crop_y1"><b><fmt:message key="templates/sv/change_img.html/4005" /></b></label>
+                                </td>
+                                <td>&nbsp;&nbsp;</td>
+                                <td>
+                                    <label for="crop_x2"><b><fmt:message key="templates/sv/change_img.html/4006" /></b></label>
+                                </td>
+                                <td>
+                                    <label for="crop_y2"><b><fmt:message key="templates/sv/change_img.html/4007" /></b></label>
+                                </td>
+                                <td>&nbsp;&nbsp;</td>
+                                <td></td>
+                                <td>&nbsp;</td>
+                                <td></td>
+                            </tr>
+                            <tr>
+                                <td><input id="crop_x1" type="text" value="<%= cropRegion.getCropX1() %>" readonly="readonly" class="imcmsDisabled" size="4" maxlength="4"/></td>
+                                <td><input id="crop_y1" type="text" value="<%= cropRegion.getCropY1() %>" readonly="readonly" class="imcmsDisabled" size="4" maxlength="4"/></td>
+                                <td>&nbsp;&nbsp;</td>
+                                <td><input id="crop_x2" type="text" value="<%= cropRegion.getCropX2() %>" readonly="readonly" class="imcmsDisabled" size="4" maxlength="4"/></td>
+                                <td><input id="crop_y2" type="text" value="<%= cropRegion.getCropY2() %>" readonly="readonly" class="imcmsDisabled" size="4" maxlength="4"/></td>
+                                <td>&nbsp;&nbsp;</td>
+                                <td>
+                                    <input type="submit" name="<%= ImageEditPage.REQUEST_PARAMETER__GO_TO_CROP_IMAGE %>" 
+                                           class="imcmsFormBtnSmall" value="<fmt:message key="templates/sv/change_img.html/4002" />"/>
+                                </td>
+                                <td>&nbsp;</td>
+                                <td>
+                                    <input type="button" class="imcmsFormBtnSmall" onclick="resetCrop();" value="<fmt:message key="templates/sv/change_img.html/4008" />"/>
+                                </td>
+                            </tr>
+                        </table>
+                    <% } %>
+                    
+                    <input id="crop_btn" type="submit" name="<%= ImageEditPage.REQUEST_PARAMETER__GO_TO_CROP_IMAGE %>"
+                           style='<%= (cropRegion.isValid() ? "display:none;" : "") %>' 
+                           class="imcmsFormBtnSmall" value="<fmt:message key="templates/sv/change_img.html/4002" />"/>
+                </td>
+            </tr>
+        <% } %>
+        <tr>
+            <td nowrap>
+                <table cellspacing="0" cellpadding="0" border="0">
+                    <% if (cropRegion.isValid()) { %>
+                    <tr id="croppedSizeLabel">
+                        <td height="25"><fmt:message key="templates/sv/change_img.html/4010" /></td>
+                    </tr>
+                    <% } %>
+                    <tr>
+                        <td height="25"><fmt:message key="templates/sv/change_img.html/4011" /></td>
+                    </tr>
+                </table>
+            </td>
+            <td>
+                <table cellspacing="0" cellpadding="0" border="0">
+                    <% if (cropRegion.isValid()) { %>
+                    <tr id="croppedSize">
+                        <td height="25"><%= cropRegion.getWidth() %></td>
+                        <td>&nbsp;&nbsp;X&nbsp;&nbsp;</td>
+                        <td><%= cropRegion.getHeight() %></td>
+                    </tr>
+                    <% } %>
+                    <tr>
+                        <td height="25"><%= realImageSize.getWidth() %></td>
+                        <td>&nbsp;&nbsp;X&nbsp;&nbsp;</td>
+                        <td><%= realImageSize.getHeight() %></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        
+        <tr>
+            <td nowrap><label for="format"><fmt:message key="templates/sv/change_img.html/4009" /></label></td>
+            <td>
+                <select id="format" name="<%= ImageEditPage.REQUEST_PARAMETER__FORMAT %>">
+                    <% for (Format format : ImageEditPage.ALLOWED_FORMATS) { %>
+                        <option value="<%= format.getOrdinal() %>" <% if (format == image.getFormat()) { %> selected="selected" <% } %>>
+                            <%= format.getFormat() %>
+                        </option>
+                    <% } %>
+                </select>
+            </td>
+        </tr>
         <tr>
-            <td nowrap><? templates/sv/change_img.html/25 ?></td>
+            <td nowrap><fmt:message key="templates/sv/change_img.html/25" /></td>
             <td>
             <table border="0" cellspacing="0" cellpadding="0">
             <tr>
@@ -285,32 +690,32 @@ function checkLinkOnBlur() {<%
 								%>id="<%= ImageEditPage.REQUEST_PARAMETER__VERTICAL_SPACE %>" <%
 								%>size="4" maxlength="4" value="<%= image.getVerticalSpace() %>"></td>
                 <td>&nbsp;</td>
-                <td><? templates/sv/change_img.html/27 ?></td>
+                <td><fmt:message key="templates/sv/change_img.html/27" /></td>
                 <td>&nbsp; &nbsp;</td>
                 <td><input type="text" <%
 								%>name="<%= ImageEditPage.REQUEST_PARAMETER__HORIZONTAL_SPACE %>" <%
 								%>id="<%= ImageEditPage.REQUEST_PARAMETER__HORIZONTAL_SPACE %>" <%
 								%>size="4" maxlength="4" value="<%= image.getHorizontalSpace() %>"></td>
                 <td>&nbsp;</td>
-                <td><? templates/sv/change_img.html/29 ?></td>
+                <td><fmt:message key="templates/sv/change_img.html/29" /></td>
             </tr>
             </table></td>
         </tr>
         <tr>
-            <td nowrap><? templates/sv/change_img.html/30 ?></td>
+            <td nowrap><fmt:message key="templates/sv/change_img.html/30" /></td>
             <td>
 						<select name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_ALIGN %>" id="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_ALIGN %>" size="1"><%
 							String align = image.getAlign() ; %>
-							<option value="" <%      if (StringUtils.isBlank(align)) { %> selected <% } %>><? templates/sv/change_img.html/31 ?></option>
-							<option value="top" <%       if ("top".equalsIgnoreCase(align)) { %> selected <% } %>><? templates/sv/change_img.html/33 ?></option>
-							<option value="middle" <%    if ("middle".equalsIgnoreCase(align)) { %> selected <% } %>><? templates/sv/change_img.html/34 ?></option>
-							<option value="bottom" <%    if ("bottom".equalsIgnoreCase(align)) { %> selected <% } %>><? templates/sv/change_img.html/35 ?></option>
-							<option value="left" <%      if ("left".equalsIgnoreCase(align)) { %> selected <% } %>><? templates/sv/change_img.html/39 ?></option>
-							<option value="right" <%     if ("right".equalsIgnoreCase(align)) { %> selected <% } %>><? templates/sv/change_img.html/40 ?></option>
+							<option value="" <%      if (StringUtils.isBlank(align)) { %> selected <% } %>><fmt:message key="templates/sv/change_img.html/31" /></option>
+							<option value="top" <%       if ("top".equalsIgnoreCase(align)) { %> selected <% } %>><fmt:message key="templates/sv/change_img.html/33" /></option>
+							<option value="middle" <%    if ("middle".equalsIgnoreCase(align)) { %> selected <% } %>><fmt:message key="templates/sv/change_img.html/34" /></option>
+							<option value="bottom" <%    if ("bottom".equalsIgnoreCase(align)) { %> selected <% } %>><fmt:message key="templates/sv/change_img.html/35" /></option>
+							<option value="left" <%      if ("left".equalsIgnoreCase(align)) { %> selected <% } %>><fmt:message key="templates/sv/change_img.html/39" /></option>
+							<option value="right" <%     if ("right".equalsIgnoreCase(align)) { %> selected <% } %>><fmt:message key="templates/sv/change_img.html/40" /></option>
 						</select></td>
         </tr>
         <tr>
-            <td nowrap><? templates/sv/change_img.html/41 ?></td>
+            <td nowrap><fmt:message key="templates/sv/change_img.html/41" /></td>
             <td><input type="text" <%
 						%>name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_ALT %>" <%
 						%>id="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_ALT %>" <%
@@ -319,26 +724,26 @@ function checkLinkOnBlur() {<%
         </tr>
         <% if (imageEditPage.isLinkable()) { %>
         <tr>
-            <td colspan="2">&nbsp;<br>#gui_heading( "<? templates/sv/change_img.html/43/1 ?>" )</td>
+            <td colspan="2">&nbsp;<br>#gui_heading( "<fmt:message key="templates/sv/change_img.html/43/1" />" )</td>
         </tr>
         <tr>
             <td nowrap>
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
             <tr>
-                <td rowspan="2" nowrap><? templates/sv/change_img.html/44 ?></td>
+                <td rowspan="2" nowrap><fmt:message key="templates/sv/change_img.html/44" /></td>
                 <td><input type="radio" name="linkType" id="linkType0" value="0" onClick="changeLinkType(0);"></td>
-                <td><label for="linkType0"><? templates/sv/change_img.html/4000 ?></label></td>
+                <td><label for="linkType0"><fmt:message key="templates/sv/change_img.html/4000" /></label></td>
             </tr>
             <tr>
                 <td><input type="radio" name="linkType" id="linkType1" value="1" onClick="changeLinkType(1);"></td>
-                <td><label for="linkType1"><? templates/sv/change_img.html/4001 ?></label></td>
+                <td><label for="linkType1"><fmt:message key="templates/sv/change_img.html/4001" /></label></td>
             </tr>
             </table></td>
             <td><input type="text" name="<%= ImageEditPage.REQUEST_PARAMETER__LINK_URL %>" size="92" maxlength="255" style="width: 100%" value="<%=
 						StringEscapeUtils.escapeHtml(StringUtils.defaultString(image.getLinkUrl())) %>" onFocus="checkLinkOnFocus()" onBlur="checkLinkOnBlur()"></td>
         </tr>
         <tr>
-            <td nowrap><? templates/sv/change_img.html/46 ?></td>
+            <td nowrap><fmt:message key="templates/sv/change_img.html/46" /></td>
             <td>
             <table border="0" cellspacing="0" cellpadding="0">
             <tr>
@@ -350,11 +755,11 @@ function checkLinkOnBlur() {<%
 									boolean targetParent = "_parent".equalsIgnoreCase(target);
 									boolean targetSelf   = "_self".equalsIgnoreCase(target) || StringUtils.isWhitespace(target);
 									boolean targetOther  = !(targetTop || targetBlank || targetParent || targetSelf) ; %>
-									<option value="_top" <% if (targetTop) { %> selected<% } %>><? templates/sv/change_img.html/47 ?></option>
-									<option value="_blank" <% if (targetBlank) { %> selected<% } %>><? templates/sv/change_img.html/48 ?></option>
-									<option value="_parent" <% if (targetParent) { %> selected<% } %>><? templates/sv/change_img.html/49 ?></option>
-									<option value="_self" <% if (targetSelf) { %> selected<% } %>><? templates/sv/change_img.html/50 ?></option>
-									<option <% if (targetOther) { %> selected<% } %>><? templates/sv/change_img.html/51 ?></option>
+									<option value="_top" <% if (targetTop) { %> selected<% } %>><fmt:message key="templates/sv/change_img.html/47" /></option>
+									<option value="_blank" <% if (targetBlank) { %> selected<% } %>><fmt:message key="templates/sv/change_img.html/48" /></option>
+									<option value="_parent" <% if (targetParent) { %> selected<% } %>><fmt:message key="templates/sv/change_img.html/49" /></option>
+									<option value="_self" <% if (targetSelf) { %> selected<% } %>><fmt:message key="templates/sv/change_img.html/50" /></option>
+									<option <% if (targetOther) { %> selected<% } %>><fmt:message key="templates/sv/change_img.html/51" /></option>
 								</select></td>
                 <td>&nbsp;&nbsp;</td>
                 <td><input type="text" name="<%= ImageEditPage.REQUEST_PARAMETER__LINK_TARGET %>" size="10" maxlength="20" value="<%= StringEscapeUtils.escapeHtml(targetOther ? target : "") %>"></td>
@@ -367,18 +772,17 @@ function checkLinkOnBlur() {<%
         </tr>
         <tr>
             <td colspan="2" align="right">
-            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__PREVIEW_BUTTON %>" value="  <? templates/sv/change_img.html/2006 ?>  ">
-            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__OK_BUTTON %>" value="  <? templates/sv/change_img.html/2007 ?>  ">
-            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__DELETE_BUTTON %>" value="  <? templates/sv/change_img.html/2009 ?>  ">
-            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__CANCEL_BUTTON %>" value=" <? templates/sv/change_img.html/2008 ?> "></td>
+            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__PREVIEW_BUTTON %>" value="  <fmt:message key="templates/sv/change_img.html/2006" />  ">
+            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__OK_BUTTON %>" value="  <fmt:message key="templates/sv/change_img.html/2007" />  ">
+            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__DELETE_BUTTON %>" value="  <fmt:message key="templates/sv/change_img.html/2009" />  ">
+            <input type="SUBMIT" class="imcmsFormBtn" name="<%= ImageEditPage.REQUEST_PARAMETER__CANCEL_BUTTON %>" value=" <fmt:message key="templates/sv/change_img.html/2008" /> "></td>
         </tr>
         <tr>
-            <td><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/1x1.gif" width="156" height="1" alt=""></td>
-            <td><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/1x1.gif" width="1" height="1" alt=""></td>
+            <td style="padding:0; width:170px;"><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/1x1.gif" width="170" height="1" alt=""></td>
+            <td style="padding:0;"><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/1x1.gif" width="1" height="1" alt=""></td>
         </tr>
-        <input type="hidden" name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_LOWSRC %>" value="<%=
-				StringEscapeUtils.escapeHtml(StringUtils.defaultString(image.getLowResolutionUrl())) %>">
     </table>
+<input type="hidden" name="<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_LOWSRC %>" value="<%= StringEscapeUtils.escapeHtml(StringUtils.defaultString(image.getLowResolutionUrl())) %>">
 </form>
 #gui_bottom()
 #gui_outer_end()
@@ -386,4 +790,4 @@ function checkLinkOnBlur() {<%
 </div>
 </body>
 </html>
-</vel:velocity>
\ No newline at end of file
+</vel:velocity>
diff --git a/web/imcms/lang/jsp/change_menu.jsp b/web/imcms/lang/jsp/change_menu.jsp
index 2dcc8b8169..2d9aec9719 100644
--- a/web/imcms/lang/jsp/change_menu.jsp
+++ b/web/imcms/lang/jsp/change_menu.jsp
@@ -1,120 +1,207 @@
-<%@ page import="com.imcode.imcms.flow.OkCancelPage, com.imcode.imcms.flow.Page, com.imcode.imcms.servlet.admin.MenuEditPage, com.imcode.imcms.util.l10n.LocalizedMessage, com.imcode.util.HtmlBuilder, imcode.server.document.DocumentDomainObject, imcode.server.document.DocumentTypeDomainObject, imcode.server.document.TextDocumentPermissionSetDomainObject, imcode.server.document.textdocument.MenuDomainObject, imcode.server.document.textdocument.MenuItemDomainObject, imcode.server.document.textdocument.TextDocumentDomainObject, imcode.server.document.textdocument.TreeSortKeyDomainObject, imcode.server.user.UserDomainObject, imcode.util.Html, imcode.util.IdLocalizedNamePair, imcode.util.IdLocalizedNamePairToOptionTransformer, imcode.util.Utility, org.apache.commons.collections.CollectionUtils, org.apache.commons.collections.Predicate, org.apache.commons.lang.StringEscapeUtils, org.apache.commons.lang.StringUtils, java.util.ArrayList, java.util.Arrays, java.util.List, java.util.Set"%>
-<%@ page contentType="text/html; charset=UTF-8"%><%
-    
-    MenuEditPage menuEditPage = (MenuEditPage) Page.fromRequest(request);
-    final MenuDomainObject menu = menuEditPage.getMenu();
-    UserDomainObject user = Utility.getLoggedOnUser(request);
-    MenuItemDomainObject[] menuItemsUserCanSee = menu.getMenuItemsUserCanSee(user);
-    TextDocumentDomainObject textDocument = menuEditPage.getTextDocument();
+<%@ page
+	
+	import="com.imcode.imcms.flow.OkCancelPage,
+	        com.imcode.imcms.flow.Page,
+	        com.imcode.imcms.servlet.admin.MenuEditPage,
+	        com.imcode.imcms.util.l10n.LocalizedMessage,
+	        com.imcode.util.HtmlBuilder,
+	        imcode.server.ImcmsConstants,
+	        imcode.server.document.DocumentDomainObject,
+	        imcode.server.document.DocumentTypeDomainObject,
+	        imcode.server.document.TextDocumentPermissionSetDomainObject,
+	        imcode.server.document.textdocument.MenuDomainObject,
+	        imcode.server.document.textdocument.MenuItemDomainObject,
+	        imcode.server.document.textdocument.TextDocumentDomainObject,
+	        imcode.server.document.textdocument.TreeSortKeyDomainObject,
+	        imcode.server.user.UserDomainObject,
+	        imcode.util.Html,
+	        imcode.util.IdLocalizedNamePair,
+	        imcode.util.IdLocalizedNamePairToOptionTransformer,
+	        imcode.util.Utility,
+	        org.apache.commons.collections.CollectionUtils,
+	        org.apache.commons.collections.Predicate,
+	        org.apache.commons.lang.StringEscapeUtils,
+	        org.apache.commons.lang.StringUtils,
+	        java.util.ArrayList,
+	        java.util.Arrays,
+	        java.util.List,
+	        java.util.Set"
+	
+	contentType="text/html; charset=UTF-8"
 
-%><%@taglib prefix="vel" uri="imcmsvelocity" %><vel:velocity><html>
-    <head>
-        <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
-    </head>
-    <body>
-        <form action="<%= request.getContextPath() %>/servlet/PageDispatcher" method="POST">
-            <%= Page.htmlHidden(request) %>
+%>
+<%@ taglib prefix="vel" uri="imcmsvelocity"
+%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
+%><%
 
-        #gui_outer_start()
-        #gui_head( "<? global/imcms_administration ?>" )
-		<input type="submit" tabindex="10" value="<? global/back ?>" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>" class="imcmsFormBtn">
+    MenuEditPage menuEditPage = Page.fromRequest(request);
+final MenuDomainObject menu = menuEditPage.getMenu();
+UserDomainObject user = Utility.getLoggedOnUser(request);
+MenuItemDomainObject[] menuItemsUserCanSee = menu.getMenuItemsUserCanSee(user);
+TextDocumentDomainObject textDocument = menuEditPage.getTextDocument();
 
-        #gui_mid()
-        
-            <div>
-                <? templates/sv/textdoc/add_doc.html/2 ?>
-                <select name="<%= MenuEditPage.DOCUMENT_TYPE_ID %>">
-                            <%
-                                TextDocumentPermissionSetDomainObject permissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor( textDocument );
-                                final Set allowedDocumentTypeIds = permissionSet.getAllowedDocumentTypeIds();
-                                final List docTypeIdsOrder = new ArrayList(Arrays.asList(new IdLocalizedNamePair[] {
-                                        DocumentTypeDomainObject.TEXT,
-                                        new IdLocalizedNamePair( 0, new LocalizedMessage( "templates/sv/textdoc/existing_doc_name.html/internal_link" ) ),
-                                        DocumentTypeDomainObject.URL,
-                                        DocumentTypeDomainObject.FILE,
-                                        DocumentTypeDomainObject.BROWSER,
-                                        DocumentTypeDomainObject.HTML,
-                                }));
-                                CollectionUtils.filter(docTypeIdsOrder, new Predicate() {
-                                    public boolean evaluate(Object object) {
-                                        IdLocalizedNamePair pair = (IdLocalizedNamePair) object ;
-                                        return 0 == pair.getId() || allowedDocumentTypeIds.contains(pair.getId()) ;
-                                    }
-                                });
-                                HtmlBuilder html = new HtmlBuilder(); %>
-                               <%= html.options(docTypeIdsOrder, new IdLocalizedNamePairToOptionTransformer(user.getLanguageIso639_2())) %>
-                </select>
-                <input type="submit" name="<%= MenuEditPage.CREATE %>" value="<? global/create ?>" class="imcmsFormBtnSmall">
-            </div>
-            #gui_hr("cccccc")
-            <div>
-                <select name="<%= MenuEditPage.SORT_ORDER %>">
-                    <%= html.options(Arrays.asList(new IdLocalizedNamePair[] {
-                            new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_HEADLINE, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_headline")),
-                            new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_manual_key")),
-                            new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_manual_tree_key")),
-                            new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_modified_datetime")),
-                            new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_published_datetime")),
-                    }), new IdLocalizedNamePairToOptionTransformer(user.getLanguageIso639_2()),
-                        new Predicate() {
-                            public boolean evaluate(Object object) {
-                                IdLocalizedNamePair pair = (IdLocalizedNamePair) object ;
-                                return pair.getId() == menu.getSortOrder() ;
-                            }
-                        }) %>
-                </select>
-                <input type="submit" name="<%= MenuEditPage.SORT %>" value="<? templates/sv/textdoc/archive_del_button.html/1 ?>" class="imcmsFormBtnSmall">
-            </div>
-            #gui_hr("cccccc")
-            <div>
-            <%
-                for ( MenuItemDomainObject menuItem : menuItemsUserCanSee ) {
-                    DocumentDomainObject menuItemDocument = menuItem.getDocument();
-                    String headline = menuItemDocument.getHeadline();
-                    if ( StringUtils.isBlank(headline) ) {
-                        headline = "_" ;
-                    }
-                    %>
-                    <div>
-                        <%
-                            if (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER || menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED ) {
-                                TreeSortKeyDomainObject treeSortKey = menuItem.getTreeSortKey();
-                                String sortKey = treeSortKey.toString() ;
-                                if (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED) {
-                                    sortKey =  menuItem.getSortKey() == null ? "" : menuItem.getSortKey().toString() ;
-                                }
-                                %><input type="text" name="<%= MenuEditPage.SORT_KEY %><%= menuItemDocument.getId() %>" size="<%= (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER) ? 25 : 5 %>" value="<%= StringEscapeUtils.escapeHtml(sortKey) %>"><%
-                            }
-                        %><%= Html.getLinkedStatusIconTemplate( menuItem.getDocument(), user, request ) %> 
-                        <input type="checkbox" name="<%= MenuEditPage.SELECTED %>" value="<%= menuItemDocument.getId() %>">
-                        <% if (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER) {
-                            %><%= StringUtils.repeat("&nbsp;", menuItem.getTreeSortKey().getLevelCount()*2) %><%
-                        } %>
-                        <a href="<%= request.getContextPath() %>/<%= menuItemDocument.getName() %>"><%= StringEscapeUtils.escapeHtml(headline) %></a>
-                        <% if (user.canEdit(menuItemDocument)) {
-                            %>&nbsp;<a href="<%= request.getContextPath() %>/servlet/AdminDoc?meta_id=<%= menuItemDocument.getId() %>"><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/ico_txt.gif" border="0"></a><%
-                        } %>
-                    </div>
-                    <%
-                }
-            %>
-            </div>
-            #gui_hr("cccccc")
-            <div>
-                <input type="submit" name="<%= MenuEditPage.COPY %>" value="<? templates/sv/textdoc/archive_del_button.html/2001 ?>" class="imcmsFormBtnSmall">
-                <input type="submit" name="<%= MenuEditPage.ARCHIVE %>" value="<? templates/sv/textdoc/archive_del_button.html/2002 ?>" class="imcmsFormBtnSmall">
-                <input type="submit" name="<%= MenuEditPage.REMOVE %>" value="<? templates/sv/textdoc/archive_del_button.html/2003 ?>" class="imcmsFormBtnSmall">
-            </div>
-            #gui_hr("cccccc")
-            <div style="text-align: right;">
-                <input type="submit" name="<%= OkCancelPage.REQUEST_PARAMETER__OK %>" value="<? global/OK ?>" class="imcmsFormBtn">
-                <input type="submit" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>" value="<? global/cancel ?>" class="imcmsFormBtn">
-            </div>
+String cp = request.getContextPath() ;
 
-        #gui_bottom()
-        #gui_outer_end()
+%><vel:velocity><html>
+<head>
 
-        </form>
+<link rel="stylesheet" type="text/css" href="<%= cp %>/imcms/css/imcms_admin.css.jsp">
+<script type="text/javascript" src="<%= cp %>/imcms/$language/scripts/imcms_admin.js.jsp"></script>
 
-    </body>
-</html></vel:velocity>
+</head>
+<body>
+
+
+<form action="<%= cp %>/servlet/PageDispatcher" method="POST">
+<%= Page.htmlHidden(request) %>
+
+    <%
+        if (null != menuEditPage.getReturnUrl() && !"".equals(menuEditPage.getReturnUrl())) { %>
+    <input type="hidden" name="<%= ImcmsConstants.REQUEST_PARAM__RETURN_URL %>"
+           value="<%= StringEscapeUtils.escapeHtml(menuEditPage.getReturnUrl()) %>"/><%
+    } %>
+
+#gui_outer_start()
+#gui_head( "<fmt:message key="global/imcms_administration" />" )
+<input type="submit" tabindex="10" value="<fmt:message key="global/back" />" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>" class="imcmsFormBtn">
+#gui_mid()
+		
+	<div>
+		<fmt:message key="templates/sv/textdoc/add_doc.html/2" />
+		<select name="<%= MenuEditPage.DOCUMENT_TYPE_ID %>">
+				<%
+					TextDocumentPermissionSetDomainObject permissionSet = (TextDocumentPermissionSetDomainObject)user.getPermissionSetFor( textDocument );
+					final Set allowedDocumentTypeIds = permissionSet.getAllowedDocumentTypeIds();
+                    final List docTypeIdsOrder = new ArrayList(Arrays.asList(DocumentTypeDomainObject.TEXT,
+                            new IdLocalizedNamePair(0, new LocalizedMessage("templates/sv/textdoc/existing_doc_name.html/internal_link")),
+                            DocumentTypeDomainObject.URL,
+                            DocumentTypeDomainObject.FILE,
+                            DocumentTypeDomainObject.BROWSER,
+                            DocumentTypeDomainObject.HTML));
+					CollectionUtils.filter(docTypeIdsOrder, new Predicate() {
+						public boolean evaluate(Object object) {
+							IdLocalizedNamePair pair = (IdLocalizedNamePair) object ;
+							return 0 == pair.getId() || allowedDocumentTypeIds.contains(pair.getId()) ;
+						}
+					});
+					HtmlBuilder html = new HtmlBuilder(); %>
+				<%= html.options(docTypeIdsOrder, new IdLocalizedNamePairToOptionTransformer(user.getLanguageIso639_2())) %>
+		</select>
+		<input type="submit" name="<%= MenuEditPage.CREATE %>" value="<fmt:message key="global/create" />" class="imcmsFormBtnSmall">
+	</div>
+#gui_hr("cccccc")
+	<div>
+		<select name="<%= MenuEditPage.SORT_ORDER %>">
+            <%= html.options(Arrays.asList(new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_HEADLINE, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_headline")),
+                    new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_manual_key")),
+                    new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_manual_tree_key")),
+                    new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_MODIFIED_DATETIME_REVERSED, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_modified_datetime")),
+                    new IdLocalizedNamePair(MenuDomainObject.MENU_SORT_ORDER__BY_PUBLISHED_DATETIME_REVERSED, new LocalizedMessage("templates/sv/textdoc/sort_order.html/by_published_datetime"))), new IdLocalizedNamePairToOptionTransformer(user.getLanguageIso639_2()),
+				new Predicate() {
+					public boolean evaluate(Object object) {
+						IdLocalizedNamePair pair = (IdLocalizedNamePair) object ;
+						return pair.getId() == menu.getSortOrder() ;
+					}
+				}) %>
+		</select>
+		<input type="submit" name="<%= MenuEditPage.SORT %>" value="<fmt:message key="templates/sv/textdoc/archive_del_button.html/1" />" class="imcmsFormBtnSmall">
+	</div>
+#gui_hr("cccccc")
+		<div id="handleHeading" style="display:none;">
+			<fmt:message key="templates/sv/textdoc/archive_del_button.html/drag_drop" />
+		</div>
+		<%= "<div id=\"menuItems\" style=\"width:" + (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER ? 600 : 500) + "px;\">" %><%
+			for ( MenuItemDomainObject menuItem : menuItemsUserCanSee ) {
+				DocumentDomainObject menuItemDocument = menuItem.getDocument();
+				String headline = menuItemDocument.getHeadline();
+				if ( StringUtils.isBlank(headline) ) {
+					headline = "_" ;
+				} %>
+			<div class="menuItem" id="menuItem<%= menuItemDocument.getId() %>">
+				<table border="0" cellspacing="0" cellpadding="3">
+				<tr><%
+				if (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER || menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED ) {
+					TreeSortKeyDomainObject treeSortKey = menuItem.getTreeSortKey();
+					String sortKey = treeSortKey.toString() ;
+					if (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED) {
+						sortKey =  menuItem.getSortKey() == null ? "" : menuItem.getSortKey().toString() ;
+					} %>
+					<td><input type="text" class="sortKeyField" id="<%=
+					MenuEditPage.SORT_KEY %><%= menuItemDocument.getId() %>" name="<%=
+					MenuEditPage.SORT_KEY %><%= menuItemDocument.getId() %>" size="<%=
+					(menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER) ? 25 : 5 %>" value="<%=
+					StringEscapeUtils.escapeHtml(sortKey) %>" />
+					<div class="handle"></div></td><%
+				} %>
+					<td><%= Html.getLinkedStatusIconTemplate( menuItem.getDocument(), user, request ) %></td>
+					<td><input type="checkbox" name="<%= MenuEditPage.SELECTED %>" value="<%= menuItemDocument.getId() %>" /></td>
+					<td<%= (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_TREE_ORDER) ? " style=\"padding-left:" + ((menuItem.getTreeSortKey().getLevelCount() * 10) - 7) + "px\"" : "" %>>
+					<a href="<%= cp %>/<%= menuItemDocument.getName() %>"><%= StringEscapeUtils.escapeHtml(headline) %></a><%
+				if (user.canEdit(menuItemDocument)) {
+					%>&nbsp;<a href="<%= cp %>/servlet/AdminDoc?meta_id=<%= menuItemDocument.getId() %>"><img src="<%=
+					cp %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/ico_txt.gif" border="0" alt="" /></a><%
+				} %></td>
+				</tr>
+				</table>
+			</div><%
+			} %>
+		<%= "<div>" %>
+#gui_hr("cccccc")
+	<div>
+		<input type="submit" name="<%= MenuEditPage.COPY %>" value="<fmt:message key="templates/sv/textdoc/archive_del_button.html/2001" />" class="imcmsFormBtnSmall">
+		<input type="submit" name="<%= MenuEditPage.ARCHIVE %>" value="<fmt:message key="templates/sv/textdoc/archive_del_button.html/2002" />" class="imcmsFormBtnSmall">
+		<input type="submit" name="<%= MenuEditPage.REMOVE %>" value="<fmt:message key="templates/sv/textdoc/archive_del_button.html/2003" />" class="imcmsFormBtnSmall">
+	</div>
+#gui_hr("cccccc")
+	<div style="text-align: right;">
+		<input type="submit" name="<%= OkCancelPage.REQUEST_PARAMETER__OK %>" value="<fmt:message key="global/OK" />" class="imcmsFormBtn">
+		<input type="submit" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>" value="<fmt:message key="global/cancel" />" class="imcmsFormBtn">
+	</div>
+#gui_bottom()
+#gui_outer_end()
+</form>
+</vel:velocity>
+<%
+if (menu.getSortOrder() == MenuDomainObject.MENU_SORT_ORDER__BY_MANUAL_ORDER_REVERSED) { %>
+<%--
+/* *******************************************************************************************
+ *         Drag & Drop sorting                                                               *
+ ******************************************************************************************* */
+--%>
+<script type="text/javascript">
+jQ(document).ready(function($) {
+	$('#menuItems .menuItem .sortKeyField').hide(0, function() {
+		$('#menuItems .menuItem .handle').addClass('ui-sortable-handle').show(0) ;
+		$('#handleHeading').show(0) ;
+	}) ;
+	$('#menuItems').sortable(
+		{
+			items:   '.menuItem',
+			handle:  '.handle',
+			helper:  'clone',
+			axis : 	 'y',
+			opacity: 0.5,
+			update : function() {
+				var $this = $(this) ;
+				$this.sortable('option', 'disabled', true) ;
+				getSortData($this) ;
+			}
+		}
+	) ;
+}) ;
+function getSortData($this) {
+	var arrNewOrderMetaIds = $this.sortable('toArray').join(',').replace(/menuItem/g, '').replace(/,$/, '').split(',') ;
+	if (null != arrNewOrderMetaIds && arrNewOrderMetaIds.length > 0) {
+		var sortKey = 500 ;
+		for (var i = arrNewOrderMetaIds.length - 1; i >= 0 ; i--) {
+			$('#<%= MenuEditPage.SORT_KEY %>' + arrNewOrderMetaIds[i]).val(sortKey) ;
+			sortKey += 10 ;
+		}
+	}
+	$this.sortable('option', 'disabled', false) ;
+}
+</script><%
+} %>
+
+</body>
+</html>
diff --git a/web/imcms/lang/jsp/change_text.jsp b/web/imcms/lang/jsp/change_text.jsp
index 3fd5b0332d..fe61510d78 100644
--- a/web/imcms/lang/jsp/change_text.jsp
+++ b/web/imcms/lang/jsp/change_text.jsp
@@ -2,6 +2,7 @@
 
 	import="com.imcode.imcms.servlet.admin.ChangeText,
 	        imcode.server.Imcms,
+	        imcode.server.ImcmsConstants,
 	        imcode.server.LanguageMapper,
 	        imcode.server.document.textdocument.TextDomainObject,
 	        imcode.util.Utility,
@@ -9,20 +10,34 @@
 	        java.util.ArrayList,
 	        java.util.Arrays,
 	        java.util.List,
-	        com.imcode.imcms.api.ContentManagementSystem"
+	        com.imcode.imcms.api.ContentManagementSystem,
+	        com.imcode.imcms.servlet.AjaxServlet"
 
     contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"
+
+%>
+<%@ page import="com.imcode.imcms.domain.services.api.W3CValidationService" %>
+<%@taglib prefix="vel" uri="imcmsvelocity"
+%><%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
+%><%
+
+boolean DEBUG_SESSION_TIMER = false ;
+boolean DEBUG_VALIDATION    = false ;
+boolean DEBUG_EDITOR        = false ;
+boolean DEBUG_CHANGED       = false ;
+boolean DEBUG_CHANGED_CONT  = false ;
+boolean DEBUG_SAVE          = false ;
 
-%><%@taglib prefix="vel" uri="imcmsvelocity"
 %><%!
 
 private String getCookie( String name, HttpServletRequest request ) {
 	String retVal = "" ;
 	Cookie[] cookies = request.getCookies() ;
-	if (cookies != null) {
-		for (int i = 0; i < cookies.length; i++) {
-			if (cookies[i].getName().equals(name)) {
-				retVal = cookies[i].getValue() ;
+	if (null != cookies) {
+		for (Cookie cookie : cookies) {
+			if (cookie.getName().equals(name)) {
+				retVal = cookie.getValue() ;
 				break ;
 			}
 		}
@@ -32,11 +47,13 @@ private String getCookie( String name, HttpServletRequest request ) {
 
 %><%
 
+String cp = request.getContextPath() ;
+
 response.setContentType( "text/html; charset=" + Imcms.DEFAULT_ENCODING );
 ChangeText.TextEditPage textEditPage = (ChangeText.TextEditPage) request.getAttribute(ChangeText.TextEditPage.REQUEST_ATTRIBUTE__PAGE);
 
 List<String> formats = new ArrayList<String>();
-String[] formatParameterValues = request.getParameterValues("format");
+String[] formatParameterValues = textEditPage.getFormats();
 if (null != formatParameterValues) {
     formats.addAll(Arrays.asList(formatParameterValues));
     formats.remove("");
@@ -46,44 +63,75 @@ boolean showModeEditor = formats.isEmpty();
 boolean showModeText   = formats.contains("text") || showModeEditor;
 boolean showModeHtml   = formats.contains("html") || formats.contains("none") || showModeEditor ;
 boolean editorHidden   = getCookie("imcms_hide_editor", request).equals("true") ;
-int rows = (request.getParameter("rows") != null && request.getParameter("rows").matches("^\\d+$")) ? Integer.parseInt(request.getParameter("rows")) : 0 ;
+int rows = (null != textEditPage.getRows() && textEditPage.getRows().matches("^\\d+$")) ? Integer.parseInt(textEditPage.getRows()) : 0 ;
 
 if (rows > 0) {
 	showModeEditor = false;
 }
 
+int width = (null != textEditPage.getWidth() && textEditPage.getWidth().matches("^\\d+$")) ? Integer.parseInt(textEditPage.getWidth()) : 0 ;
+
+if (!(width >= 150 && width <= 600)) {
+	width = 0 ;
+}
+
+boolean editorActive = (TextDomainObject.TEXT_TYPE_HTML == textEditPage.getType() && !editorHidden) ;
+boolean validationIsActive = W3CValidationService.isAvailable() && !"false".equals(getCookie("validationActive", request));
+
 boolean isSwe = false ;
 try {
 	isSwe =	ContentManagementSystem.fromRequest(request).getCurrentUser().getLanguage().getIsoCode639_2().equals("swe");
 } catch (Exception e) {}
-%>
+
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <vel:velocity>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="sv" lang="sv">
 <head>
-<title><? templates/sv/change_text.html/1 ?></title>
+	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
+	<title><? templates/sv/change_text.html/1 ?></title>
+
+	<link rel="stylesheet" type="text/css" href="<%= cp %>/imcms/css/imcms_admin.css.jsp" />
+	<link rel="stylesheet" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/redmond/jquery-ui.css" />
+	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
+	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="<%= cp %>/imcms/$language/scripts/imcms_admin.js.jsp"></script>
+	<script type="text/javascript" src="<%= cp %>/imcms/$language/scripts/imcms_jquery.textarea.js"></script>
+	<script type="text/javascript" src="<%= cp %>/imcms/ckeditor/ckeditor.js"></script>
+	<script type="text/javascript" src="<%= cp %>/imcms/ckeditor/plugins/imcms_integration/init.js.jsp"></script>
+
+</vel:velocity>
+<style type="text/css">
+body {
+	<%= "overflow: -moz-scrollbars-vertical;" %>
+}
+</style>
+<vel:velocity>
 
-<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
-<script src="<%= request.getContextPath() %>/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
 </head>
-<body bgcolor="#FFFFFF" style="margin-bottom:0px;">
-<% if (showModeEditor && !editorHidden) { %>
-<script type="text/javascript">
-    _editor_url  = "<%=request.getContextPath()%>/imcms/xinha/"  // (preferably absolute) URL (including trailing slash) where Xinha is installed
-    _editor_lang = "<%= LanguageMapper.convert639_2to639_1(Utility.getLoggedOnUser(request).getLanguageIso639_2()) %>";      // And the language we need to use in the editor.
-</script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/imcms/xinha/XinhaCore.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/imcms/xinha/plugins/ImcmsIntegration/init.js.jsp<%
-if (TextDomainObject.TEXT_TYPE_HTML==textEditPage.getType() && !editorHidden) { %>?html=true<% } %>"></script>
-<% } %>
-<form method="POST" action="<%= request.getContextPath() %>/servlet/SaveText">
-<input type="hidden" name="meta_id"  value="<%= textEditPage.getDocumentId() %>">
-<input type="hidden" name="txt_no"   value="<%= textEditPage.getTextIndex() %>">
-
-<%
-if (rows > 0) {
-	%><input type="hidden" name="rows"  value="<%=rows%>"><%
+<body bgcolor="#fff" style="margin-bottom:0;">
+
+
+<form id="mainForm" method="POST" action="<%= cp %>/servlet/SaveText">
+<input type="hidden" name="meta_id" value="<%= textEditPage.getDocumentId() %>" />
+<input type="hidden" name="txt_no" value="<%= textEditPage.getTextIndex() %>" /><%
+if (null != textEditPage.getLabel() && !"".equals(textEditPage.getLabel())) { %>
+<input type="hidden" name="label" value="<%= StringEscapeUtils.escapeHtml(textEditPage.getLabel()) %>" /><%
 }
-%>
+if (null != textEditPage.getFormats()) {
+	for (String format : textEditPage.getFormats()) { %>
+<input type="hidden" name="format" value="<%= StringEscapeUtils.escapeHtml(format) %>" /><%
+	}
+}
+if (null != textEditPage.getWidth() && !"".equals(textEditPage.getWidth())) { %>
+<input type="hidden" name="width" value="<%= StringEscapeUtils.escapeHtml(textEditPage.getWidth()) %>" /><%
+}
+if (rows > 0) { %>
+<input type="hidden" name="rows"  value="<%=rows%>" /><%
+}
+if (null != textEditPage.getReturnUrl() && !"".equals(textEditPage.getReturnUrl())) { %>
+<input type="hidden" name="<%= ImcmsConstants.REQUEST_PARAM__RETURN_URL %>" value="<%= StringEscapeUtils.escapeHtml(textEditPage.getReturnUrl()) %>" /><%
+} %>
 
 #gui_outer_start()
 #gui_head( "<? global/imcms_administration ?>" )
@@ -94,34 +142,51 @@ if (rows > 0) {
 	<table border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td>
-		<input type="submit" value="<? global/back ?>" name="cancel" class="imcmsFormBtn"></td><%
+		<input type="submit" id="backBtnTop" value="<? global/back ?>" name="cancel" class="imcmsFormBtn leaveChangeTextBtn" /></td><%
 		if (showModeEditor) { %>
-		<td style="color:#ffffff;" nowrap>&nbsp; &nbsp; <? install/htdocs/sv/htmleditor/editor/editor.jsp/3000 ?> &nbsp;</td>
+		<td style="color:#fff; padding: 0 10px 0 20px;" nowrap="nowrap"><? install/htdocs/sv/htmleditor/editor/editor.jsp/3000 ?></td>
 		<td><%
 			if (editorHidden) { %>
-		<button id="editorOnOffBtn0" onClick="toggleEditorOnOff(0); return false"
+		<button id="editorOnOffBtn0" onclick="toggleEditorOnOff(0); return false"
 			class="imcmsFormBtn" style="width:40px;"><? global/off ?></button>
-		<button id="editorOnOffBtn1" onClick="toggleEditorOnOff(1); return false"
+		<button id="editorOnOffBtn1" onclick="toggleEditorOnOff(1); return false"
 			class="imcmsFormBtnActive" style="width:40px; display:none"><? global/on ?></button><%
 			} else { %>
-		<button id="editorOnOffBtn0" onClick="toggleEditorOnOff(0); return false"
+		<button id="editorOnOffBtn0" onclick="toggleEditorOnOff(0); return false"
 			class="imcmsFormBtn" style="width:40px; display:none"><? global/off ?></button>
-		<button id="editorOnOffBtn1" onClick="toggleEditorOnOff(1); return false"
+		<button id="editorOnOffBtn1" onclick="toggleEditorOnOff(1); return false"
 			class="imcmsFormBtnActive" style="width:40px;"><? global/on ?></button><%
 			} %></td><%
 		} %>
+		<td style="color:#fff; padding-left:20px;" nowrap="nowrap">
+			<div id="contentChangedDiv" style="display:block; float:left; margin-right:10px;">
+				<div id="contentChangedDiv_true" style="display:none; color:#faa; font-style:italic;">
+					<%= isSwe ? "Innehållet har ändrats!" : "The content has been changed!" %>
+				</div>
+				<div id="contentChangedDiv_false" style="display:block; color:#afa; font-style:italic;">
+					<%= "&nbsp;" %>
+				</div>
+			</div>
+			<div id="contentSavedDiv_true" style="display:none; float:left; color:#afa; font-style:italic; font-weight:bold;">
+				<%= isSwe ? "Innehållet har sparats!" : "The content has been saved!" %>
+			</div>
+			<div id="contentSavedDiv_false" style="display:none; float:left; color:#faa; font-style:italic; font-weight:bold;">
+				<%= isSwe ? "Innehållet kunde inte sparats!" : "The content could not be saved!" %>
+			</div>
+			<div style="clear:both;"></div>
+		</td>
 	</tr>
 	</table></td>
 
 	<td align="right">
-	<input type="button" tabindex="12" value="<? templates/sv/change_text.html/2004 ?>" title="<? templates/sv/change_text.html/2005 ?>" class="imcmsFormBtn" onClick="openHelpW('EditText')"></td>
+	<input type="button" tabindex="12" value="<? templates/sv/change_text.html/2004 ?>" title="<? templates/sv/change_text.html/2005 ?>" class="imcmsFormBtn" onclick="openHelpW('EditText')" /></td>
 
 </tr>
 </table>
 
 #gui_mid()
 
-<table border="0" cellspacing="0" cellpadding="2" width="720" align="center">
+<table id="mainTable" border="0" cellspacing="0" cellpadding="2" width="720" align="center">
 <tr>
 	<td colspan="2">
 	<table border="0" cellspacing="0" cellpadding="2" width="100%;">
@@ -130,133 +195,440 @@ if (rows > 0) {
 		<div id="theLabel"><%= StringEscapeUtils.escapeHtml( textEditPage.getLabel() ) %></div>
 		<div id="messageDiv" style="display:none; color:#cc0000; padding:10px 0;"></div></td>
 		
-		<td width="20%" align="right" style="padding-top:3px; padding-left:15px;">
-		<input tabindex="6" type="button" class="imcmsFormBtnSmall" value="<%= isSwe ? "Återställ tidigare versioner" : "Restore earlier versions" %>" onclick="openTextRestorer(); return false"></td>
+		<td width="20%" align="right" style="padding-top:3px; padding-left:15px; white-space:nowrap;">
+		<label for="validationActive" class="toolTip" style="<%=!validationIsActive ? "display: none;":" "%>" title="<%=
+			StringEscapeUtils.escapeHtml(isSwe ?
+					"Om denna är ikryssad körs automatiskt en<br/>" +
+					"validering på texten när en ändring registerats.<br/>" +
+					"En validering körs alltid när sidan laddats.<br/>" +
+					"Man kan även köra en manuell validering<br/>" +
+					"med knappen &#91;Validera texten&#93;.<br/>" +
+					"Automatisk validering kräver en del kraft,<br/>" +
+					"så stäng av den när den inte behövs." :
+					
+					"If this is checked a validation is automatically executed<br/>" +
+					"on the text when changes in the text has been registered.<br/>" +
+					"A validation is always executed when the page is loaded.<br/>" +
+					"You may also run a manual validation<br/>" +
+					"with the button &#91;Validate the text&#93;.<br/>" +
+					"Automatic validation require some memory,<br/>" +
+					"so turn it off when it's not needed.")
+			%>"><input type="checkbox" id="validationActive" value="true"<%=
+			validationIsActive ? " checked=\"checked\"" : "" %> style="vertical-align:-2px;<%=!validationIsActive ? "display: none;":" "%>" />
+			<%= isSwe ? "Validera automatiskt" : "Validate automatically" %></label>
+		<button id="validateBtn" class="imcmsFormBtnSmall imcmsFormBtnMedium toolTip iconValidate_pending" style="width:110px; margin-left:10px; <%=!validationIsActive ? "display: none;":" "%>"
+			      title="<%= StringEscapeUtils.escapeHtml(isSwe ?
+					"Validera texten och visa resultat av<br/>" +
+					"W3C-valideringen i ett popupfönster.<br/>" +
+					"Genom resultatet kan du se vilken rad<br/>" +
+					"ev. fel ligger på." :
+					
+					"Validera the text and show the result of<br/>" +
+					"the W3C validation in a popup window.<br/>" +
+					"Through the result you may see what row<br/>" +
+					"any faults are on, if there are any.") %>"><%= isSwe ? "Validera texten" : "Validate the text" %></button>
+		<input tabindex="6" type="button" class="imcmsFormBtnSmall imcmsFormBtnMedium" value="<%=
+			isSwe ? "Återställ tidigare versioner" : "Restore earlier versions"
+			%>" onclick="openTextRestorer('$language'); return false" /></td>
 	</tr>
 	</table></td>
 <tr>
 </vel:velocity>
 <tr>
 	<td colspan="2" class="imcmsAdmForm">
-        <div id="editor"><%
-	        if (rows == 1) { %>
-	          <input type="text" name="text" id="text_1row" tabindex="1" value="<%= StringEscapeUtils.escapeHtml( textEditPage.getTextString() ) %>" style="width:100%;" /><%
-	        } else { %>
-            <textarea name="text" tabindex="1" id="text" cols="125" rows="<%= (rows > 1) ? rows : 25 %>" style="overflow: auto; width: 100%;"><%= StringEscapeUtils.escapeHtml( textEditPage.getTextString() ) %></textarea><%
-	        } %>
-        </div>
-    </td>
+		<div id="toolBar"></div>
+	</td>
+</tr><%
+	if (width > 0) { %>
+<tr>
+	<td colspan="2" class="imcmsAdmForm" style="padding: 3px 0 0 5px;">
+	<%= isSwe ? "Innehåll - Bredd: " + width + "px." : "Content - Width: " + width + "px." %> &nbsp;
+	<a id="resetWidthLink" href="javascript://resetWidth()"><%=
+			isSwe ? "Ladda om och visa med normal bredd" : "Reload and show with normal width"
+			%> &raquo;</a></td>
+</tr><%
+	} %>
+<tr>
+	<td colspan="2" class="imcmsAdmForm">
+	<div id="editor"><%
+	if (1 == rows) { %>
+	<input type="text" name="text" id="text_1row" tabindex="1" value="<%= StringEscapeUtils.escapeHtml( textEditPage.getTextString() ) %>" style="width:100%; font: 11px 'Courier New', Courier, monospace;" /><%
+	} else { %>
+	<textarea name="text" tabindex="1" id="text" cols="125" rows="<%= (rows > 1) ? rows : 25 %>" style="overflow: auto; width:<%= width > 0 ? (width + 6) + "px" : "100%" %>; font: 11px 'Courier New', Courier, monospace;"><%=
+	StringEscapeUtils.escapeHtml( textEditPage.getTextString() ) %></textarea><%
+	} %>
+	</div></td>
 </tr>
 <vel:velocity>
 <tr>
-	<td>
-        <% if (showModeEditor) { %>
+	<td><%
+
+	if (showModeText && showModeHtml) { %>
+	<label for="format_type_text">
+		<input type="radio" name="format_type" id="format_type_text" value="<%= TextDomainObject.TEXT_TYPE_PLAIN %>"<%=
+		(TextDomainObject.TEXT_TYPE_PLAIN == textEditPage.getType()) ? " checked=\"checked\"" : "" %><%
+		if (showModeEditor) {
+			%> onclick="setTextMode()"<%
+		} %> /> Text
+	</label>
+	
+	<label for="format_type_html">
+		<input type="radio" name="format_type" id="format_type_html" value="<%= TextDomainObject.TEXT_TYPE_HTML %>"<%=
+		(TextDomainObject.TEXT_TYPE_HTML==textEditPage.getType()) ? " checked=\"checked\"" : "" %><%
+		if (showModeEditor) {
+			%> onclick="setHtmlMode()"<%
+		} %> /> <%= showModeEditor ? "Editor/" : "" %>HTML
+	</label><%
+	} else if (showModeText) { %>
+	<input type="hidden" name="format_type" id="format_type_text_hidden" value="<%= TextDomainObject.TEXT_TYPE_PLAIN %>" /><%
+	} else if (showModeHtml) { %>
+	<input type="hidden" name="format_type" id="format_type_html_hidden" value="<%= TextDomainObject.TEXT_TYPE_HTML %>" /><%
+	} %></td>
+	
+	<td align="right">
+	<input tabindex="2" type="submit" class="imcmsFormBtn" id="saveCloseBtn" name="ok" value="<fmt:message key="templates/sv/change_text.html/2006" />" />
+	<input tabindex="3" type="submit" class="imcmsFormBtn" id="saveBtn" name="save" value="<fmt:message key="templates/sv/change_text.html/save" />" />
+	<input tabindex="4" type="submit" class="imcmsFormBtn" id="reloadBtn" value="<fmt:message key="templates/sv/change_text.html/reload" />" />
+	<input tabindex="5" type="reset" class="imcmsFormBtn" id="resetFormBtn" value="<fmt:message key="templates/sv/change_text.html/2007" />" />
+	<input tabindex="6" type="submit" class="imcmsFormBtn leaveChangeTextBtn" id="backBtn" name="cancel" value="<fmt:message key="global/back" />" /></td>
+</tr>
+</table>
+#gui_bottom()
+#gui_outer_end()
+</form>
+<form action="#dummy"><%
+// jQuery's changed check got different content if I only used type='hidden' or display:none
+if (1 == rows) { %>
+<input type="text" id="savedHtml" style="position:absolute; top:-1000px;" value="<%= StringEscapeUtils.escapeHtml( textEditPage.getTextString() ) %>" /><%
+} else { %>
+<textarea id="savedHtml" cols="1" rows="<%= (rows > 1) ? rows : 25 %>" style="position:absolute; top:-1000px;"><%= StringEscapeUtils.escapeHtml( textEditPage.getTextString() ) %></textarea><%
+} %>
+</form>
+</vel:velocity>
+
+<style type="text/css">
+#validationDiv {<%--
+	display: none;
+	position: absolute;
+	top: 10px;
+	right: 10px;
+	width: 700px;
+	height: 600px;
+	overflow: auto;
+	background-color: #ffc;
+	border: 1px solid #000;--%>
+	font-family: Verdana;
+}
+#validationDiv #validationHeading {
+	margin: 0;
+	padding: 5px 10px;
+	background-color: #0b0;
+	color: #fff;
+	border: 1px solid #000;
+	border-width: 1px 0;
+}
+#validationDiv h2.error {
+	background-color: #f00 !important;
+	color: #fff;
+}
+#validationDiv h2.message {
+	background-color: #0b0 !important;
+	color: #fff;
+}
+#validationDiv ol.source li {
+	font: 11px 'Courier New', Courier, monospace;
+}
+#validationDiv ol.source li.heading {
+	font-size: 13px;
+	font-weight: bold !important;
+}
+#validationDiv ol.source li.errorLine {
+	background-color: #f99;
+}
+#validationDiv #validationDebug,
+#validationDiv LI,
+#validationDiv P {
+	font-size: 11px;
+}
+</style>
+<div id="disableDiv" style="position:absolute; display:none; top:0; left:0; background-color:#f5f5f7;"></div>
+
+<div id="disableDivInfoValidation" style="<%
+	%>position:absolute; display:none; top:0; left:0; width:300px; padding:20px; background-color:#ffd;<%
+	%>border: 1px solid #ccc; font-size:13px !important; font-style:italic; color:#000; text-align:center;">
+	<img src="<%= cp %>/imcms/images/icons/ajax-loader.gif" alt="" style="vertical-align:middle; margin-right:10px;" /><%
+	%><%= isSwe ? "Validerar" : "Validating" %><span id="validationInfoCount"></span>...
+	<div style="font-size:12px !important; padding-top:15px;">
+		<%= isSwe ? "Denna ruta stängs automatiskt när" : "This box closes automatically when" %><br/>
+		<%= isSwe ? "valideringen är genomförd." : "the validation is completed." %>
+	</div>
+	<div id="disableDivInfoValidationClose"
+	     style="position:absolute; top:5px; right:5px; padding: 2px 3px; background-color:#f33; color:#fff; font-weight:bold; font-style:normal; cursor:pointer;">X</div>
+</div>
+
+<div id="disableDivInfoSaving" style="<%
+	%>position:absolute; display:none; top:0; left:0; width:300px; padding:20px; background-color:#ffd;<%
+	%>border: 1px solid #ccc; font-size:13px !important; font-style:italic; color:#000; text-align:center;">
+	<img src="<%= cp %>/imcms/images/icons/ajax-loader.gif" alt="" style="vertical-align:middle; margin-right:10px;" /><%
+	%><%= isSwe ? "Sparar" : "Saving" %>...
+	<div style="font-size:12px !important; padding-top:15px;">
+		<%= isSwe ? "Denna ruta stängs automatiskt" : "This box closes automatically" %><br/>
+		<%= isSwe ? "när detta är genomfört." : "when this is completed." %>
+	</div>
+	<div id="disableDivInfoSavingClose"
+	     style="position:absolute; top:5px; right:5px; padding: 2px 3px; background-color:#f33; color:#fff; font-weight:bold; font-style:normal; cursor:pointer;">X</div>
+</div>
+
+<div style="display:none;">
+	<div id="validationDiv" title="<%= isSwe ? "Validering - Resultat" : "Validation - Result" %>">
+		<a name="jumpbar"></a>
+		<h2 id="validationHeading"></h2>
+		<div id="validationResult"></div>
+		<div id="validationSource"></div><%
+		if (DEBUG_VALIDATION) { %>
+		<div id="validationDebug">
+			<b>All:</b><br/>
+			<textarea id="responseAllTa" rows="30" cols="50" style="width:100%;"></textarea>
+		</div><%
+		} %>
+	</div>
+</div>
+
+<%--
+/* *******************************************************************************************
+ *         Editor initiation                                                                 *
+ ******************************************************************************************* */
+--%>
+
 <script type="text/javascript">
 
-function getElementsByClassAttribute(node, tagname, sClass) {
+function setTextMode() {<%
+	if (showModeEditor) { %>
+	enableFormButtons(jQuery) ;
 	try {
-		var result = new Array();
-		var elements = node.getElementsByTagName(tagname);
-		for (i = 0, j = 0; i < elements.length; ++i) {
-				var element = elements[i];
-				if (element.className == sClass) {
-						result[j++] = element;
-				}
+		var editor = CKEDITOR.instances['text'] ;
+		if (editor) {
+			editor.destroy() ;
 		}
-		return result;
-	} catch (e) {
-		return null ;
-	}
+	} catch (e) {}<%
+	} %>
+	addEventsToNoEditor(jQuery) ;
 }
-				
-function setTextMode() {
+
+function setHtmlMode() {<%
+	if (showModeEditor) { %>
+	enableFormButtons(jQuery) ;
 	try {
-		var editors = getElementsByClassAttribute(document, "table", "htmlarea") ;
-		var editor = editors[0];
-		if (editor) {
-			var textarea = document.getElementById("text");
-			textarea.value = xinha_editors.text.getHTML();
-			xinha_editors.text.deactivateEditor();
-			editor.parentNode.replaceChild(textarea,editor);
-			textarea.style.width = editor.style.width;
-			textarea.style.height = editor.style.height;
-			textarea.style.display = "block";
-			document.forms[0].onsubmit = null ;
+		var editor = CKEDITOR.instances['text'] ;
+		if (undefined == editor && 'true' != getCookie("imcms_hide_editor")) {
+			initEditor(jQuery) ;
+			addEventsToEditor(jQuery) ;
 		}
-	} catch (e) {}
+	} catch (e) {}<%
+	} %>
 }
-function setHtmlMode() {
-		var hasEditor = false ;
-		try {
-			var editors = getElementsByClassAttribute(document, "table", "htmlarea");
-			hasEditor = editors[0];
-			if (!hasEditor && getCookie("imcms_hide_editor") != "true") {
-				Xinha.startEditors(xinha_editors) ;
-				setTimeout(function() {
-					try {
-						xinha_editors.text.focusEditor() ;
-					} catch (e) {}
-				}, 500);
+
+function toggleEditorOnOff(on) {
+	if (on) {
+		setCookie("imcms_hide_editor", "true") ;
+		jQuery('#editorOnOffBtn1').hide(0) ;
+		jQuery('#editorOnOffBtn0').show(0) ;
+	} else {
+		setCookie("imcms_hide_editor", "") ;
+		jQuery('#editorOnOffBtn1').show(0) ;
+		jQuery('#editorOnOffBtn0').hide(0) ;
+	}
+}
+
+function checkIframeScroll($, theEditor) {<%
+	if (width > 0) { %>
+	var wantedW = <%= width %> ;
+	var editor  = (theEditor || CKEDITOR.instances['text']) ;
+	var $iframeBody = $('#editor iframe:first').contents().find('body') ;
+	if ($iframeBody && editor) {
+		var $editorContainer = $('#cke_text') ;
+		var containerW   = $editorContainer.data('orgWidth') || $editorContainer.width() ;
+		if (containerW > 0) {
+			var iframeBodyW  = $iframeBody.width() ;
+			var noScrollDiff = $editorContainer.data('noScrollDiff') || (containerW - wantedW) ;
+			if ('' == $editorContainer.data('noScrollDiff')) {
+				$editorContainer.data('noScrollDiff', noScrollDiff) ;
+			}<%--
+			console.log(', iframeBodyW: ' + iframeBodyW + ', wantedW: ' + wantedW + ', (iframeBodyW < wantedW): ' + (iframeBodyW < wantedW) + ', containerW: ' + containerW + ', noScrollDiff: ' + noScrollDiff) ; --%>
+			if (iframeBodyW < wantedW) {
+				$editorContainer.data('orgWidth', containerW) ;
+				$editorContainer.width(wantedW + (wantedW - iframeBodyW) + noScrollDiff) ;<%--
+				console.log('checkIframeScroll: (SCROLL) ' + (wantedW + (wantedW - iframeBodyW) + noScrollDiff)) ; --%>
+			} else if (iframeBodyW > wantedW) {
+				$editorContainer.width(wantedW + noScrollDiff) ;<%--
+				console.log('checkIframeScroll: (NO SCROLL) ' + (wantedW + noScrollDiff)) ;
+			} else {
+				console.log('checkIframeScroll: (NO CHANGE) - (iframeBodyW == wantedW): ' + (iframeBodyW == wantedW)) ; --%>
 			}
-		} catch (e) {}
+		}
+	}<%
+	} %>
 }
-</script>
-        <% } %>
-        <% if (showModeText && showModeHtml) { %>
-        <input type="radio" name="format_type" id="format_type_text" value="0" <% if (TextDomainObject.TEXT_TYPE_PLAIN==textEditPage.getType()) { %> checked<% } %>
-               <% if (showModeEditor) { %>onclick="setTextMode()"<% } %>>
-        <label for="format_type_text">Text</label>
-        <input type="radio" name="format_type" id="format_type_html" value="1" <% if (TextDomainObject.TEXT_TYPE_HTML==textEditPage.getType()) { %> checked<% } %> 
-               <% if (showModeEditor) { %>onclick="setHtmlMode()"<% } %>>
-        <label for="format_type_html">Editor/HTML</label>
-        <% } else if (showModeText) { %>
-            <input type="hidden" name="format_type" id="format_type_text_hidden" value="<%= TextDomainObject.TEXT_TYPE_PLAIN %>">
-        <% } else if (showModeHtml) { %>
-            <input type="hidden" name="format_type" id="format_type_html_hidden" value="<%= TextDomainObject.TEXT_TYPE_HTML %>">
-        <% } %>
-    </td>
-    <td align="right">
-            <input tabindex="2" type="submit" class="imcmsFormBtn" name="ok" value="  <? templates/sv/change_text.html/2006 ?>  ">
-            <input tabindex="3" type="submit" class="imcmsFormBtn" name="save" value="  <? templates/sv/change_text.html/save ?>  ">
-            <input tabindex="4" type="reset" class="imcmsFormBtn" value="<? templates/sv/change_text.html/2007 ?>">
-            <input tabindex="5" type="submit" class="imcmsFormBtn" name="cancel" value=" <? global/back ?> ">
-    </td>
-</tr>
-</table>
-#gui_bottom()
-#gui_outer_end()
-</form><%
 
-if (showModeEditor) { %>
+function setSizeOfEditor($) {
+	var newH = $(window).height() - 350 ;
+	if (newH < 200) {
+		newH = 200 ;
+	}
+	if ($('#editor iframe:first').length > 0) $('#editor iframe:first').height(newH) ;
+	if ($('textarea.cke_source').length > 0) $('textarea.cke_source').height(newH) ;
+	if ($('#cke_contents_text').length > 0) $('#cke_contents_text').height(newH) ;
+}
+
+var editorHasBeenInitiated = false ;
 
-<script type="text/javascript"><%
-if (TextDomainObject.TEXT_TYPE_PLAIN == textEditPage.getType() && !editorHidden) { %>
-var oTimerHide = null ;
-if (window.attachEvent) {
-	window.attachEvent("onload",      function(){ oTimerHide = window.setInterval("hideLoadingDivBug()", 50); }) ;
-} else if (window.addEventListener) {
-	window.addEventListener("load",   function(){ oTimerHide = window.setInterval("hideLoadingDivBug()", 50); }, true) ;
+function initEditor($) {
+	if ($('textarea#text').length > 0) {
+		startCkEditor($) ;
+		if (!editorHasBeenInitiated) {
+			$(window).resize(function() {
+				setSizeOfEditor($) ;
+				checkIframeScroll($) ;
+			}) ;
+			editorHasBeenInitiated = true ;
+		}
+	}
 }
-function hideLoadingDivBug() {
+
+function startCkEditor($) {
+    var customConfig = {
+        imcmsMetaId: '<%= textEditPage.getDocumentId() %>'
+    };
+	initCkEditor($, 'text', '<%= LanguageMapper.convert639_2to639_1(Utility.getLoggedOnUser(request).getLanguageIso639_2()) %>', '<%= (width > 0) ? (width+18) + "" : "" %>', 'imCMS_ALL', customConfig) ;
+}
+
+function setTextAreaSize($) {
+	if ($('#text').length > 0) {
+		var winH = $(window).height() ;
+		if (winH > 400) {
+			$('#text').height(winH - 270) ;
+		}
+	}
+}
+
+jQuery(document).ready(function($) {<%
+	
+	if (editorActive && showModeEditor && !editorHidden) { %>
+	initEditor($) ;<%
+	}
+	
+	if (0 == rows) { %>
+	setTextAreaSize($) ;
+	
+	$(window).resize(function() {
+		setTextAreaSize($) ;
+	}) ;<%
+	} %>
+	
+	initSessionChecker($) ;
+	
+	if ($.browser.msie && $.browser.version < 9) {
+		window.setTimeout(function() {
+			var $viewSourceBtn = $('a.cke_button_source') ;
+			$viewSourceBtn.live('click', function() {
+				$('#infoIeSource').remove() ;
+				$('#format_type_text').click().parent().parent().append('<div id="infoIeSource"><i><%= isSwe ?
+				"Redigera källa fungerar inte klokt i IE 7/8. Använd text-läget i editorn." :
+				"Edit source doesn\\'t work properly in IE 7/8. Use the text mode in the editor." %></i></div>'); return false ;
+			}) ;
+		}, 500) ;
+	}
+	
+}) ;
+
+jQ(document).ready(function($) {
+	$('#txtField').tabby() ;
+}) ;
+
+<%--
+/* *******************************************************************************************
+ *         Check Session TimeOut                                                             *
+ ******************************************************************************************* */
+--%>
+
+var oSessionTimer ;
+var sessionTimeOutMs = <%= session.getMaxInactiveInterval() * 1000 %> ;<%-- session.getMaxInactiveInterval() * 1000 --%>
+var firstVarningTimeMs = 300000 ;<%-- 5 minutes (300000 ms) --%>
+var secondCountTimeS = 60 ;<%-- Count every second for the last minute --%>
+var timeLoaded = (new Date()).getTime() ;
+var hasQuickRefresh = false ;
+
+function initSessionChecker($) {
 	try {
-		xinha_editors.text.removeLoadingMessage() ;
-		window.clearInterval(oTimerHide) ;
-	} catch (e) {}
-}<%
-} %>
+		oSessionTimer = setInterval(function() {
+			sessionChecker($) ;
+		}, 10000) ;
+	} catch(e) {}
+}
 
-function toggleEditorOnOff(on) {
-	if (on) {
-		setCookie("imcms_hide_editor", "true") ;
-		document.getElementById("editorOnOffBtn1").style.display = "none" ;
-		document.getElementById("editorOnOffBtn0").style.display = "block" ;
+function sessionChecker($) {
+	try {
+		var timeNow = (new Date()).getTime() ;<%
+		if (DEBUG_SESSION_TIMER) { %>
+		var mess = "timeLoaded: " + timeLoaded + ", timeNow: " + timeNow + ", diff: " + (timeNow - timeLoaded) ;
+		mess += ", (sessionTimeOutMs - firstVarningTimeMs): " + (sessionTimeOutMs - firstVarningTimeMs) ;<%
+		} %>
+		if ((timeNow - timeLoaded) > (sessionTimeOutMs - firstVarningTimeMs)) {
+			var timeLeft = Math.round(-((timeNow - timeLoaded) - sessionTimeOutMs)/1000) ;<%
+			if (DEBUG_SESSION_TIMER) { %>
+			mess += " - timeLeft: " + timeLeft ;<%
+			} %>
+			if (!hasQuickRefresh && timeLeft <= secondCountTimeS + 10) {
+				hasQuickRefresh = true ;
+				clearInterval(oSessionTimer) ;
+				oSessionTimer = setInterval(function() {
+					sessionChecker($) ;
+				}, 1000) ;
+			}
+			if (timeLeft >= secondCountTimeS) {
+				$('#messageDiv').html('<%= isSwe ?
+						"<b>Varning!<b/> Din sessionstid går ut om ' + Math.ceil(timeLeft/60) + ' minuter. Spara dina ändringar!" :
+						"<b>Warning!<b/> Your session time will expire in ' + Math.ceil(timeLeft/60) + ' minutes. Please save your changes!" %>') ;
+			} else if (timeLeft > 0) {
+				$('#messageDiv').html('<%= isSwe ?
+						"<b>Varning!<b/> Din sessionstid går ut om ' + timeLeft + ' sekunder. Spara dina ändringar!" :
+						"<b>Warning!<b/> Your session time will expire in ' + timeLeft + ' seconds. Please save your changes!" %>') ;
+			} else {
+				clearInterval(oSessionTimer) ;
+				$('#messageDiv').html('<%= isSwe ?
+						"<b>Varning!<b/> Din sessionstid har gått ut. Öppna ett annat fönster och logga in - återvänd sedan och spara dina ändringar!" :
+						"<b>Warning!<b/> Your session time has expired. Open another window and login - then return to this window and save your changes." %>') ;
+			}
+			$('#messageDiv').slideDown('slow') ;
+		}<%
+		if (DEBUG_SESSION_TIMER) { %>
+		console.log(mess) ;<%
+		} %>
+	} catch(e) {}
+}
+
+function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll,iStatus) {
+	if (screen) {
+		var winX, winY ;
+		if ((screen.height - winH) < 150) {
+			winX = (screen.width - winW) / 2;
+			winY = 0;
+		} else {
+			winX = (screen.width - winW) / 2;
+			winY = (screen.height - winH) / 2;
+		}
+		var popWindow = window.open(sUrl,sName,"resizable=" + iResize + ",menubar=0,scrollbars=" + iScroll + ",status=" + iStatus + ",width=" + winW + ",height=" + winH + ",top=" + winY + ",left=" + winX + "");
+		if (popWindow) popWindow.focus();
 	} else {
-		setCookie("imcms_hide_editor", "") ;
-		document.getElementById("editorOnOffBtn1").style.display = "block" ;
-		document.getElementById("editorOnOffBtn0").style.display = "none" ;
+		window.open(sUrl,sName,"resizable=" + iResize + ",menubar=0,scrollbars=" + iScroll + ",status=" + iStatus + ",width=" + winW + ",height=" + winH);
 	}
 }
 
+function openTextRestorer(lang) {
+	popWinOpen(800,600,"<%= cp %>/imcms/" + lang + "/jsp/text_restorer.jsp?meta_id=<%= textEditPage.getDocumentId() %>&txt=<%= textEditPage.getTextIndex() %>","textRestorerWin",1,1,1) ;
+}
+
+
 /* *******************************************************************************************
  *         Set Cookie                                                                        *
  ******************************************************************************************* */
@@ -267,7 +639,7 @@ function setCookie(name, value) {
 	var expire = new Date();
 	expire.setTime(today.getTime() + 1000*60*60*24*365); // 365 days
 	var sCookieCont = name + "=" + escape(value);
-	sCookieCont += (expire == null) ? "" : "\; expires=" + expire.toGMTString();
+	sCookieCont += (expire == null) ? "" : "; expires=" + expire.toGMTString();
 	sCookieCont += "; path=" + sPath;
 	document.cookie = sCookieCont;
 }
@@ -289,109 +661,721 @@ function getCookie(Name) {
 			return unescape(document.cookie.substring(offset, end));
 		}
 	}
+	return null ;
 }
-</script><%
-} %>
-<script type="text/javascript">
-var ua = navigator.userAgent.toLowerCase() ;
-var isIE7   = ua.indexOf("msie 7") != -1 ;
-var isGecko = ua.indexOf("gecko") != -1 ;
-var isMac   = ua.indexOf("mac") != -1 ;
-
-function setEditorSize() {
-	var oTextArea = document.getElementById("text") ;
-	if (oTextArea) {
-		var offsetH = (isMac && isGecko) ? 270 : (isIE7) ? 260 : 250 ;
-		var winH = (window.innerHeight) ? window.innerHeight : (document.body && document.body.offsetHeight) ? document.body.offsetHeight - 4 : document.body.clientHeight ;
-		if (winH > 400) {
-			oTextArea.style.height = (winH - offsetH) + "px" ;
+<%--
+/* *******************************************************************************************
+ *         Validate One Series - (series 0 = All)                                            *
+ ******************************************************************************************* */
+--%>
+var validationIsActive = <%= validationIsActive %> ;
+var $dialog = null ;
+
+function getHeightOfDialog($) {
+	var winH         = $(window).height() ;
+	var dialogMinH   = 400 ;
+	var dialogOffset = 100 ;
+	var dialogH      = (winH > (dialogMinH + dialogOffset)) ? (winH - dialogOffset) : dialogMinH ;<%
+	if (DEBUG_VALIDATION) { %>
+	if (console) console.log('winH:' + winH + ', dialogH:' + dialogH + ', (winH > (dialogMinH + dialogOffset)):' + (winH > (dialogMinH + dialogOffset))) ;<%
+	} %>
+	return dialogH ;
+}
+
+
+var oTimerChangeCheckNoEditor = null ;
+var oTimerChangeCheckEditor = null ;
+
+jQuery(document).ready(function($) {
+	
+	<%-- Validation dialog --%>
+	$dialog = $('#validationDiv').dialog({
+		width: 770,
+		height: getHeightOfDialog($),
+		minHeight: 300,
+		modal: true,
+		autoOpen: false,
+		buttons: {
+			'<%= isSwe ? "Stäng" : "Close" %>' : function() {
+				$(this).dialog("close");
+			}
 		}
+	}) ;
+	
+	$(window).resize(function() {
+		if ($dialog.dialog('isOpen')) {
+			var oldOuterH = $dialog.dialog('option', 'height') ;
+			var oldInnerH = $('#validationDiv').height() ;
+			var deltaH    = (oldOuterH - oldInnerH) ;
+			var newOuterH = getHeightOfDialog($) ;
+			var newInnerH = (newOuterH - deltaH) ;
+			$('#validationDiv').height(newInnerH) ;
+			$dialog.dialog('option', 'height', newOuterH) ;<%
+			if (DEBUG_VALIDATION) { %>
+			if (console) console.log('oldOuterH:' + oldOuterH + ', oldInnerH:' + oldInnerH + ', deltaH:' + deltaH + ', newOuterH:' + newOuterH + ', newInnerH:' + newInnerH) ;<%
+			} %>
+		} else {
+			$dialog.dialog('option', 'height', getHeightOfDialog($)) ;
+		}
+	}) ;
+	
+	checkValidationActive($, false) ;
+	
+	$('#validationActive').click(function() {
+		checkValidationActive($, true) ;
+	}) ;
+	
+	<%-- Validation initiation --%>
+	validateText($, false) ;
+	
+	$('#validateBtn').click(function(event) {
+		event.preventDefault() ;
+		validateText($, true) ;
+	}) ;
+	
+	<%-- Editor Start Events - Reset/Changed/Auto Validation --%>
+	var editor = CKEDITOR.instances['text'] ;
+	if (editor) {
+		addEventsToEditor($) ;
+	} else if (<%= !editorActive %>) {
+		addEventsToNoEditor($) ;
 	}
-}<%
-if (rows == 0) { %>
-setEditorSize() ;
-if (window.attachEvent) {
-	window.attachEvent("onresize",    function(){ setEditorSize(); }) ;
-} else if (window.addEventListener) {
-	window.addEventListener("resize", function(){ setEditorSize(); }, true) ;
-}<%
-} %>
+	
+}) ;
 
-var oSessionTimer ;
-var sessionTimeOutMs = <%= session.getMaxInactiveInterval() * 1000 %> ;
-var firstVarningTimeMs = 300000 ;<% /* 5 minutes */ %>
-var secondCountTimeS = 60 ;<% /* Count every second for the last minute */ %>
-var timeLoaded = (new Date()).getTime() ;
-var hasQuickRefresh = false ;
-var oMessageDiv ;
-try {
-	oMessageDiv = document.getElementById("messageDiv") ;
-} catch(e) {}
+function checkValidationActive($, doSetCookie) {
+	validationIsActive = $('#validationActive').is(':checked') ;<%
+	if (DEBUG_VALIDATION) { %>
+	if (console) console.log('checkValidationActive: ' + validationIsActive) ;<%
+	} %>
+	if (doSetCookie) {
+		setCookie('validationActive', validationIsActive + '') ;
+	}
+}
 
-function initSessionChecker() {
-	try {
-		oSessionTimer = setInterval("sessionChecker()", 10000) ;
-	} catch(e) {}
+var autoValidationTimer = null ;
+
+function autoValidation($) {
+	if (autoValidationTimer) {
+		window.clearTimeout(autoValidationTimer) ;<%
+		if (DEBUG_VALIDATION) { %>
+		if (console) console.log('window.clearTimeout(autoValidationTimer) ;') ;<%
+		} %>
+	}<%
+	if (DEBUG_VALIDATION) { %>
+	if (console) console.log('autoValidationTimer = window.setTimeout(validateText($, false), 5000) ;') ;<%
+	} %>
+	if (validationIsActive) {
+		autoValidationTimer = window.setTimeout(function() {<%
+			if (DEBUG_VALIDATION) { %>
+			if (console) console.log('TIMER: validateText($, false) ;') ;<%
+			} %>
+			validateText($, false) ;
+		}, 5000) ;<%
+	if (DEBUG_VALIDATION) { %>
+	} else {
+		if (console) console.log('autoValidation($) DISABLED - validationIsActive: ' + validationIsActive) ;<%
+	} %>
+	}
 }
-function sessionChecker() {
+
+<%--
+/* *******************************************************************************************
+ *         Check for changes                                                                 *
+ ******************************************************************************************* */
+--%>
+var isSaving  = false ;
+var isChanged = false ;<%
+if (DEBUG_CHANGED_CONT) { %>
+var hasCheckedCompare = false ;<%
+} %>
+var isCheckingEditorChanged = false ;
+
+function checkEditorChanged($, editor) {
+	isCheckingEditorChanged = true ;<%
+	if (DEBUG_CHANGED) { %>
+	if (console) console.log('function checkEditorChanged($, ' + (null != editor ? 'editor' : 'null') + ')') ;<%
+	} %>
 	try {
-		var timeNow = (new Date()).getTime() ;<% /*
-		//var mess = "timeLoaded: " + timeLoaded + ", timeNow: " + timeNow + ", diff: " + (timeNow - timeLoaded) ;
-		//mess += ", (sessionTimeOutMs - firstVarningTimeMs): " + (sessionTimeOutMs - firstVarningTimeMs) ;*/ %>
-		if ((timeNow - timeLoaded) > (sessionTimeOutMs - firstVarningTimeMs)) {
-			var timeLeft = Math.round(-((timeNow - timeLoaded) - sessionTimeOutMs)/1000) ;<%
-			//mess += " - timeLeft: " + timeLeft ;%>
-			if (!hasQuickRefresh && timeLeft <= secondCountTimeS + 10) {
-				hasQuickRefresh = true ;
-				clearInterval(oSessionTimer) ;
-				oSessionTimer = setInterval("sessionChecker()", 1000) ;
+		if (null == editor && $('#text,#text_1row').length > 0) {
+			var savedHtml  = $('#savedHtml').val() ;
+			var editedHtml = $('#text,#text_1row').first().val() ;
+			isChanged = (editedHtml != savedHtml) ;<%
+			if (DEBUG_CHANGED_CONT) { %>
+			if (console && !hasCheckedCompare) {
+				console.log('isChanged (NO EDITOR): ' + isChanged + ', savedHtml: ' + savedHtml.length + ', editedHtml: ' + editedHtml.length) ;
+				console.log('savedHtml: ' + savedHtml) ;
+				console.log('editedHtml: ' + editedHtml) ;
+				hasCheckedCompare = true ;
+			}<%
+			} %>
+		} else if (editor) {
+			isChanged = editor.checkDirty() ;<%
+			if (DEBUG_CHANGED) { %>
+			if (console) console.log('isChanged (EDITOR): ' + isChanged) ;<%
+			} %>
+		}
+	} catch (e) {<%
+	if (DEBUG_CHANGED) { %>
+	if (console) console.log('isChanged ERROR: ' + e) ;<%
+	} %>}<%
+	if (DEBUG_CHANGED) { %>
+	if (console) console.log('isChanged: ' + isChanged) ;<%
+	} %>
+	$(':submit.leaveChangeTextBtn').unbind('click') ;
+	$('#reloadBtn').unbind('click') ;
+	$('#resetWidthLink').unbind('click') ;
+	if (isChanged) {
+		var changedMessage = '<%= isSwe ? "Innehållet har ändrats!\\nVill du ladda om sidan utan att spara?" : "The content is changed!\\nDo you want to reload the page without saving?" %>' ;
+		$(':submit.leaveChangeTextBtn').bind('click', function() {
+			return confirm('<%= isSwe ? "Innehållet har ändrats!\\nVill du lämna utan att spara?" : "The content is changed!\\nDo you want to leave without saving?" %>') ;
+		}) ;
+		$('#reloadBtn').bind('click', function(event) {
+			event.preventDefault() ;
+			if (confirm(changedMessage)) {
+				location.replace(location.href) ;			
 			}
-			if (timeLeft >= secondCountTimeS) {
-				oMessageDiv.innerHTML = <%= isSwe ?
-						"'<b>Varning!<b/> Din sessionstid går ut om ' + Math.ceil(timeLeft/60) + ' minuter. Spara dina ändringar!'" :
-						"'<b>Warning!<b/> Your session time will expire in ' + Math.ceil(timeLeft/60) + ' minutes. Please save your changes!'" %> ;
-			} else if (timeLeft > 0) {
-				oMessageDiv.innerHTML = <%= isSwe ?
-						"'<b>Varning!<b/> Din sessionstid går ut om ' + timeLeft + ' sekunder. Spara dina ändringar!'" :
-						"'<b>Warning!<b/> Your session time will expire in ' + timeLeft + ' seconds. Please save your changes!'" %> ;
-			} else {
-				clearInterval(oSessionTimer) ;
-				oMessageDiv.innerHTML = <%= isSwe ?
-						"'<b>Varning!<b/> Din sessionstid har gått ut. Öppna ett annat fönster och logga in - återvänd sedan och spara dina ändringar!'" :
-						"'<b>Warning!<b/> Your session time has expired. Open another window and login - then return to this window and save your changes.'" %> ;
+		}) ;
+		$('#resetWidthLink').bind('click', function(event) {
+			event.preventDefault() ;
+			if (confirm(changedMessage)) {
+				location.replace(removeURLParam(location.href, 'width')) ;				
 			}
-			oMessageDiv.style.display = "block" ;
+		}) ;
+	} else {
+		$('#reloadBtn').bind('click', function(event) {
+			event.preventDefault() ;
+			location.replace(location.href) ;
+		}) ;
+		$('#resetWidthLink').bind('click', function(event) {
+			event.preventDefault() ;
+			location.replace(removeURLParam(location.href, 'width')) ;
+		}) ;
+	}
+	if (!isSaving) {
+		if (isChanged) {
+			$('#reloadBtn').disableImcmsBtn() ;
+		} else {
+			$('#reloadBtn').enableImcmsBtn() ;
+		}
+		$('#contentChangedDiv_' + !isChanged).fadeOut('fast', function() {
+			$('#contentChangedDiv_' + isChanged).fadeIn('fast') ;
+		}) ;
+	}
+	isCheckingEditorChanged = false ;
+}
+
+function resetChangedContent($) {
+	var editor  = CKEDITOR.instances['text'] ;
+	if (editor) {
+		editor.resetDirty() ;
+		editor.updateElement() ;
+	}
+	var editedHtml = $('#text,#text_1row').first().val() ;
+	$('#savedHtml').val(editedHtml) ;
+	isChanged = false ;
+	isSaving  = false ;
+	checkEditorChanged($, editor) ;
+}
+
+function disableFormButtons($) {
+	$('#resetFormBtn').disableImcmsBtn() ;
+}
+function enableFormButtons($) {
+	$('#resetFormBtn').enableImcmsBtn() ;
+}
+
+function getIFrameDocument(iframe) {
+	if (iframe.contentDocument) {
+		return iframe.contentDocument; 
+	} else if (iframe.contentWindow) {
+		return iframe.contentWindow.document;
+	} else if (iframe.document) {
+		return iframe.document;
+	} else {
+		return null;
+	}
+}
+
+function addEventsToNoEditor($) {<%
+	if (DEBUG_EDITOR) { %>
+	if (console) console.log('addEventsToNoEditor()!') ;<%
+	} %>
+	if (oTimerChangeCheckEditor) {
+		window.clearInterval(oTimerChangeCheckEditor) ;<%
+		if (DEBUG_CHANGED) { %>
+		if (console) console.log('EXEC: clearInterval(checkEditorChanged($, editor))') ;<%
+		} %>
+	}<%
+	if (DEBUG_CHANGED) { %>
+	if (console) console.log('EXEC: setInterval(checkEditorChanged($, null))') ;<%
+	} %>
+	oTimerChangeCheckNoEditor = window.setInterval(function() {
+		if (!isCheckingEditorChanged) checkEditorChanged($, null) ;
+	}, 2000) ;
+	$('#text,#text_1row').live('keyup mouseup blur paste', function() {
+		autoValidation($) ;
+	}) ;
+}
+
+function addEventsToEditor($) {
+	var editor = CKEDITOR.instances['text'] ;
+	if (editor) {<%
+		if (DEBUG_EDITOR) { %>
+		if (console) console.log('addEventsToEditor() : editor active!') ;<%
+		} %>
+		
+		if (!editor.document) {
+			window.setTimeout(function() {<%
+				if (DEBUG_EDITOR) { %>
+				if (console) console.log('NO editor.document - Retry...') ;<%
+				} %>
+				addEventsToEditor($) ;
+			}, 500) ;
+			return ;
+		}
+		try {
+			editor.document.on("keyup", function() {
+				autoValidation($) ;
+			}) ;
+			editor.document.on("mouseup", function() {
+				autoValidation($) ;
+			}) ;
+			editor.document.on("blur", function() {
+				autoValidation($) ;
+			}) ;
+			editor.document.on("paste", function() {
+				autoValidation($) ;
+			}) ;
+		} catch (e) {<%
+		if (DEBUG_EDITOR) { %>
+			if (console) console.log('editor.document:' + editor.document + ' - editor.document.on ERROR: ' + e) ;<%
+		} %>}
+
+		$('#resetFormBtn').live('click', function() {<%
+			if (DEBUG_EDITOR) { %>
+			if (console) console.log('resetFormBtn click()') ;<%
+			} %>
+			editor.setData($('#savedHtml').val()) ;<%-- The textarea is resetted but not the editor --%>
+		}) ;
+		
+		if (oTimerChangeCheckNoEditor) {
+			window.clearInterval(oTimerChangeCheckNoEditor) ;<%
+			if (DEBUG_CHANGED) { %>
+			if (console) console.log('EXEC: clearInterval(checkEditorChanged($, null))') ;<%
+			} %>
 		}<%
-		//document.getElementById("theLabel").innerHTML = mess ;%>
-	} catch(e) {}
+		if (DEBUG_CHANGED) { %>
+		if (console) console.log('EXEC: setInterval(checkEditorChanged($, editor))') ;<%
+		} %>
+		oTimerChangeCheckEditor = window.setInterval(function() {
+			if (!isCheckingEditorChanged) checkEditorChanged($, editor) ;
+			checkIframeScroll($, editor) ;
+		}, 2000) ;
+		
+		editor.on('afterCommandExec', function(e) {<%--
+			CKEDITOR.TRISTATE_DISABLED = 0
+			CKEDITOR.TRISTATE_ON       = 1
+			CKEDITOR.TRISTATE_OFF      = 2
+			--%>
+			if (CKEDITOR.TRISTATE_OFF == e.data.command.previousState && CKEDITOR.TRISTATE_DISABLED == e.data.command.state) {<%
+				
+				if (DEBUG_EDITOR) { %>
+				if (console) console.log('source - state: ' + e.data.command.state + ' / previousState: ' + e.data.command.previousState) ;<%
+				} %>
+				disableFormButtons($) ;
+				$(window).resize() ;<%-- Trigger it to get the right size. --%>
+				
+			} else if (CKEDITOR.TRISTATE_ON == e.data.command.previousState) {<%
+				
+				if (DEBUG_EDITOR) { %>
+				if (console) console.log('wysiwyg - addEventsToEditor($) - state: ' + e.data.command.state + ' / previousState: ' + e.data.command.previousState) ;<%
+				} %>
+				enableFormButtons($) ;
+				addEventsToEditor($) ;
+				$(window).resize() ;<%-- Trigger it to get the right size - WebKit/Crome. --%>
+				
+			} else if (CKEDITOR.TRISTATE_OFF == e.data.command.state) {<%
+				
+				if (DEBUG_EDITOR) { %>
+				if (console) console.log('off - state: ' + e.data.command.state + ' / previousState: ' + e.data.command.previousState) ;<%
+				} %>
+				disableFormButtons($) ;
+				
+			} else {<%
+				
+				if (DEBUG_EDITOR) { %>
+				if (console) console.log('ELSE - e.data.command.state: ' + e.data.command.state + ' / previousState: ' + e.data.command.previousState) ;<%
+				} %>
+				enableFormButtons($) ;
+				
+			}
+		}) ;
+		
+		editor.on('focus', function(e) {<%
+			if (DEBUG_EDITOR) { %>
+			if (console) console.log('focus') ;<%
+			} %>
+			enableFormButtons($) ;
+		}) ;
+		
+	} else if (<%= (showModeEditor && !editorHidden) %>) {<%
+		if (DEBUG_EDITOR) { %>
+		if (console) console.log('addEventsToEditor() : editor NOT active - RETRY!') ;<%
+		} %>
+		window.setTimeout(function() {
+			addEventsToEditor($) ;
+		}, 500) ;
+	}
 }
-if (window.attachEvent) {
-	window.attachEvent("onload",    function(){ initSessionChecker(); }) ;
-} else if (window.addEventListener) {
-	window.addEventListener("load", function(){ initSessionChecker(); }, true) ;
+	
+<%-- Button extensions --%>
+jQuery.fn.extend({
+	disableBtn: function(btnText){
+		$(this).html(btnText).fadeTo(100, 0.2).attr('disabled', 'disabled') ;<%
+		if (DEBUG_VALIDATION) { %>
+		if (console) console.log('disableBtn') ;<%
+		} %>
+	},
+	enableBtn: function(btnText){
+		$(this).html(btnText).fadeTo(100, 1).removeAttr('disabled') ;<%
+		if (DEBUG_VALIDATION) { %>
+		if (console) console.log('enableBtn') ;<%
+		} %>
+	},
+	enableBtnAndHide: function(btnText, speed){
+		$(this).html(btnText).fadeTo(100, 1).removeAttr('disabled').hide(speed) ;
+	},
+	enableImcmsBtn: function(){
+		$(this).removeAttr('disabled').addClass('imcmsFormBtn').removeClass('imcmsFormBtnDisabled') ;<%
+		if (DEBUG_VALIDATION) { %>
+		if (console) console.log('enableImcmsBtn') ;<%
+		} %>
+	},
+	disableImcmsBtn: function(){
+		$(this).addClass('imcmsFormBtnDisabled').removeClass('imcmsFormBtn').attr('disabled','disabled') ;<%
+		if (DEBUG_VALIDATION) { %>
+		if (console) console.log('disableImcmsBtn') ;<%
+		} %>
+	},
+	overBtn: function(){
+		//$(this).fadeTo(10, 1) ;
+	},
+	outBtn: function(){
+		//$(this).fadeTo(10, 0.8) ;
+	}
+}) ;
+
+
+function showDisableDiv($, isValidation, completeFn) {
+	var oMain    = $('#mainTable') ;
+	var oOverlay = $('#disableDiv') ;
+	var oInfo    = (isValidation) ? $('#disableDivInfoValidation') : $('#disableDivInfoSaving') ;
+	var oClose   = (isValidation) ? $('#disableDivInfoValidationClose') : $('#disableDivInfoSavingClose') ;
+	var oPos     = $(oMain).position() ;
+	if ($(oOverlay).is(':hidden')) {
+		$('#hoverTitleHeadDiv,#hoverTitleBody').hide(0) ;
+		$(oOverlay).css({
+			top: oPos.top + 'px',
+			left: oPos.left + 'px',
+			width: $(oMain).width() + 'px',
+			height: $(oMain).height() + 'px'
+		}).fadeTo(0, 0.8) ;
+		$(oInfo).css({
+			top: (oPos.top + 100) + 'px',
+			left: (oPos.left + ($(oMain).width()/2 - 150)) + 'px'
+		}).fadeIn(0) ;<%
+		if (DEBUG_VALIDATION) { %>
+		if (console) console.log('showDisableDiv()') ;<%
+		} %>
+		$(oClose).click(function() {
+			hideDisableDiv($, isValidation) ;
+		}) ;
+	}
+	if ($.isFunction(completeFn)) {
+		completeFn() ;
+	}
+}
+function hideDisableDiv($, isValidation, completeFn) {
+	var oOverlay = $('#disableDiv') ;
+	var oInfo    = (isValidation) ? $('#disableDivInfoValidation') : $('#disableDivInfoSaving') ;
+	if ($(oOverlay).is(':visible')) {
+		$(oInfo).fadeOut(0, function() {
+			$(oOverlay).fadeOut(0) ;<%
+			if (DEBUG_VALIDATION) { %>
+			if (console) console.log('hideDisableDiv()') ;<%
+			} %>
+		}) ;
+	}
+	if ($.isFunction(completeFn)) {
+		completeFn() ;
+	}
 }
 
-function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll,iStatus) {
-	if (screen) {
-		if ((screen.height - winH) < 150) {
-			var winX = (screen.width - winW) / 2;
-			var winY = 0;
-		} else {
-			var winX = (screen.width - winW) / 2;
-			var winY = (screen.height - winH) / 2;
+function validateText($, showResults) {
+	if (!validationIsActive) return;
+
+	var oBtn = $('#validateBtn') ;<%
+	if (DEBUG_VALIDATION) { %>
+	if (console) console.log('validateText($, ' + showResults + ')') ;<%
+	} %>
+	$(oBtn).disableBtn('<%= isSwe ? "Validerar..." : "Validates..." %>') ;
+	$('#validationErrorDiv').ajaxError(function(e, xhr, settings, exception){
+		hideDisableDiv($, true) ;
+		if (0 == $(this).find('#validationErrorDivStatus').length) {
+			$(this).append('<div id="validationErrorDivStatus" style="color:red;">Error i:<br/>' + getDataUrl + '<br/>' + settings.url + '<br/><i>' + xhr.statusText + '</i></div>').slideDown('slow') ;
 		}
-		var popWindow = window.open(sUrl,sName,"resizable=" + iResize + ",menubar=0,scrollbars=" + iScroll + ",status=" + iStatus + ",width=" + winW + ",height=" + winH + ",top=" + winY + ",left=" + winX + "");
-		if (popWindow) popWindow.focus();
-	} else {
-		window.open(sUrl,sName,"resizable=" + iResize + ",menubar=0,scrollbars=" + iScroll + ",status=" + iStatus + ",width=" + winW + ",height=" + winH);
+	}) ;
+	if (showResults) {
+		showDisableDiv($, true) ;
 	}
+	var textContent = '' ;
+	var editor = CKEDITOR.instances['text'] ;
+	if (editor) {
+		textContent = editor.getData() ;<%
+		if (DEBUG_VALIDATION) { %>
+		console.log('Validate editor!') ;<%
+		} %>
+	} else if ($('#text_1row').length > 0) {
+		textContent = $('#text_1row').val() ;<%
+		if (DEBUG_VALIDATION) { %>
+		console.log('Validate 1 row!') ;<%
+		} %>
+	} else if ($('#text').length > 0) {
+		var isTextMode = (<%= (showModeText && !showModeHtml) + " || " %>$('#format_type_text').is(':checked')) ;
+		textContent = (isTextMode) ? $('#text').html() : $('#text').val() ;<%
+		if (DEBUG_VALIDATION) { %>
+		console.log('Validate textarea! - isTextMode: ' + isTextMode) ;<%
+		} %>
+	}
+	textContent = textContent.replace(/<\?[^\?]+?\?>/g, '') ;
+	$.ajax({
+		url: '/servlet/w3cValidation',
+		type: 'POST',
+		dataType: 'json',
+		data: {
+			showResults: showResults,
+			htmlToValidate: textContent
+		},
+		success: function (response) {
+			let theClassName;
+			let isOk = (null != response && response.isOk);
+			let isValid = (null != response && response.isValid);
+			let errors = (null == response || !showResults) ? '' : response.errors;
+			let warnings = (null == response || !showResults) ? '' : response.warnings;
+			let responseError = (null == response) ? '' : response.error;
+
+			if (!isOk) {
+				hideDisableDiv($, true, function () {
+					if ('' != responseError && 0 == $(this).find('#validationErrorDivStatus').length) {
+						$('#validationErrorDiv').append('<div id="validationErrorDivStatus" style="color:red;">Error: <i>' + responseError + '</i></div>')
+					}
+					$('#validationErrorDiv').slideDown('slow');
+				});
+			} else {
+				if (!showResults) {
+					$(oBtn)
+						.removeClass('iconValidate_pending')
+						.removeClass('iconValidate_' + !isValid)
+						.addClass('iconValidate_' + isValid)
+						.enableBtn('<%= isSwe ? "Validera texten" : "Validate the text" %>');
+					hideDisableDiv($, true);
+				} else {
+					$(oBtn)
+						.removeClass('iconValidate_pending')
+						.removeClass('iconValidate_' + !isValid)
+						.addClass('iconValidate_' + isValid);
+					if (isValid) {
+						heading = "<%= isSwe ? "Godkänd XHTML!" : "Approved XHTML!" %>";
+						theClassName = "message";
+					} else {
+						heading = "<%= isSwe ? "Ej godkänd XHTML!" : "NOT approved XHTML!" %>";
+						theClassName = "error";
+					}
+					$('#validationHeading').attr('class', theClassName).html('').html(heading);
+					const $validationResult = $('#validationResult')
+					$validationResult.empty();
+
+					function appendValidationFailRow(item, pos) {
+						const $container = $("<div>"),
+							$sourceContainer = $("<div>");
+
+						const errorMessage = pos + 1 + ". " + item.message;
+						const $errorMessage = $("<div>").text(errorMessage);
+
+						const $invalidHtml = (!item.extract) ? "" : $("<code>")
+							.html(item.lastLine + ": " + item.extract.replace(/[<]/g, "&lt").replace(/[>]/g, "&gt"));
+
+						$sourceContainer.append($invalidHtml);
+						$container.append($errorMessage);
+						$container.append($sourceContainer);
+						$validationResult.append($container);
+					}
+
+					const $errorsTitle = $("<h3>").text("<%= isSwe ? "Fel: " : "Errors: "  %>");
+					const $warningsTitle = $("<h3>").text("<%= isSwe ? "Varningar: " : "Warnings: "  %>");
+					if (!isValid) {
+						$validationResult.append($errorsTitle);
+						errors.forEach(appendValidationFailRow);
+
+						$validationResult.append($warningsTitle);
+						warnings.forEach(appendValidationFailRow);
+					} else {
+						$validationResult.empty();
+					}
+
+					$('#validationDiv').scrollTop(0);
+					$(oBtn).enableBtn('<%= isSwe ? "Validera texten" : "Validate the text" %>');
+					hideDisableDiv($, true);
+					$dialog.dialog('open');
+				}
+			}
+		}
+	});
+}
+
+
+<%--
+/* *******************************************************************************************
+ *         Save changes through Ajax                                                         *
+ ******************************************************************************************* */
+--%>
+
+jQuery(document).ready(function($) {
+	$('#saveCloseBtn').live('click', function(event) {
+		event.preventDefault() ;
+		saveText($, true) ;
+	}) ;
+	$('#saveBtn').live('click', function(event) {
+		event.preventDefault() ;
+		saveText($, false) ;
+	}) ;
+}) ;
+
+function saveText($, closeAfter) {<%
+	if (DEBUG_SAVE) { %>
+	console.log('closeAfter: ' + closeAfter) ;<%
+	} %>
+	isSaving = true ;
+	var isSavedSuccess = false ;
+	var $btnSaveClose = $('#saveCloseBtn') ;
+	var $btnSave      = $('#saveBtn') ;
+	var $btnReset     = $('#resetBtn') ;
+	var $btnBack      = $('#backBtn') ;
+	$btnSaveClose.disableImcmsBtn() ;
+	$btnSave.disableImcmsBtn() ;
+	$btnReset.disableImcmsBtn() ;
+	$btnBack.disableImcmsBtn() ;
+	$('#validationErrorDiv').ajaxError(function(e, xhr, settings, exception){
+		hideDisableDiv($, false) ;
+		if (0 == $(this).find('#validationErrorDivStatus').length) {
+			$(this).append('<div id="validationErrorDivStatus" style="color:red;">Error i:<br/>' + getDataUrl + '<br/>' + settings.url + '<br/><i>' + xhr.statusText + '</i></div>').slideDown('slow') ;
+		}
+	}) ;
+	showDisableDiv($, false) ;
+	var textContent = '' ;
+	var editor = CKEDITOR.instances['text'] ;
+	if (editor) {
+		textContent = editor.getData() ;<%
+		if (DEBUG_SAVE) { %>
+		console.log('Save editor!') ;<%
+		} %>
+	} else if ($('#text_1row').length > 0) {
+		textContent = $('#text_1row').val() ;<%
+		if (DEBUG_SAVE) { %>
+		console.log('Save 1 row!') ;<%
+		} %>
+	} else if ($('#text').length > 0) {
+		textContent = $('#text').val() ;<%
+		if (DEBUG_SAVE) { %>
+		console.log('Save textarea!') ;<%
+		} %>
+	}
+	$.ajax({
+		url     : '<%= AjaxServlet.getPath(cp) %>',
+		type    : 'POST',
+		dataType : 'json',
+		contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+		data    : {
+			action  : 'saveText',
+			meta_id : <%= textEditPage.getDocumentId() %>,
+			txt_no  : <%= textEditPage.getTextIndex() %>,
+			do_log  : isChanged,
+			format  : $(':radio[name=format_type]:checked').val() || $('input[name=format_type]').val(),
+			text    : textContent
+		},
+		cache   : false,
+		success : function(response) {
+			var isSaved       = (null != response && response.isSaved) ;
+			var responseError = (null == response) ? '' : response.error ;
+			if (isSaved) {<%
+				if (DEBUG_SAVE) { %>
+				console.log('saved!') ;<%
+				} %>
+				$('#contentSavedDiv_true')
+					.fadeIn('fast')<%
+					for (int i = 0; i < 2; i++) { %>
+					.animate({color:'#20568d'}, 200)
+					.animate({color:'#afa'}, 200)<%
+					} %>
+					.delay(2000)
+					.slideUp('fast') ;
+				resetChangedContent($) ;
+				isSavedSuccess = true ;
+				isSaving = false ;<%
+				if (DEBUG_SAVE) { %>
+				console.log('closeAfter:' + closeAfter + ', isSavedSuccess:' + isSavedSuccess) ;<%
+				} %>
+				if (closeAfter && isSavedSuccess) {<%
+					if (DEBUG_SAVE) { %>
+					console.log('back') ;<%
+					} %>
+					$('#backBtnTop').trigger('click') ;
+				}
+			} else {<%
+				if (DEBUG_SAVE) { %>
+				console.log('NOT saved!') ;<%
+				} %>
+				hideDisableDiv($, false, function() {
+					if ('' != responseError && 0 == $(this).find('#validationErrorDivStatus').length) {
+						$('#validationErrorDiv').append('<div id="validationErrorDivStatus" style="color:red;">Error: <i>' + responseError + '</i></div>')
+					}
+					$('#validationErrorDiv').slideDown('slow') ;
+				}) ;
+				isSaving = false ;
+			}
+		},
+		error: function() {
+			$('#validationErrorDiv').slideDown('slow') ;
+			isSaving = false ;
+		}
+	}) ;
+	hideDisableDiv($, false, function() {
+		$btnSaveClose.enableImcmsBtn() ;
+		$btnSave.enableImcmsBtn() ;
+		$btnReset.enableImcmsBtn() ;
+		$btnBack.enableImcmsBtn() ;
+	}) ;
 }
-function openTextRestorer() {
-	popWinOpen(800,600,"<%= request.getContextPath() %>/imcms/eng/jsp/text_restorer.jsp?meta_id=<%= textEditPage.getDocumentId() %>&txt=<%= textEditPage.getTextIndex() %>","textRestorerWin",1,1,1) ;
+
+function removeURLParam(url, param) {
+ var urlparts= url.split('?');
+ if (urlparts.length>=2) {
+  var prefix= encodeURIComponent(param)+'=';
+  var pars= urlparts[1].split(/[&;]/g);
+  for (var i=pars.length; i-- > 0;)
+   if (pars[i].indexOf(prefix, 0)==0)
+    pars.splice(i, 1);
+  if (pars.length > 0)
+   return urlparts[0]+'?'+pars.join('&');
+  else
+   return urlparts[0];
+ } else
+  return url;
 }
+
 </script>
 
 
 </body>
 </html>
-</vel:velocity>
diff --git a/web/imcms/lang/jsp/changeexternaluser.jsp b/web/imcms/lang/jsp/changeexternaluser.jsp
index d4112de2b5..e48c038860 100644
--- a/web/imcms/lang/jsp/changeexternaluser.jsp
+++ b/web/imcms/lang/jsp/changeexternaluser.jsp
@@ -5,6 +5,7 @@
                  java.io.IOException,
                  java.util.Arrays,
                  java.util.HashSet"
+         pageEncoding="UTF-8"
 %><%@ page import="java.util.Iterator"%><%@ page import="java.util.Set"%><%@ page import="java.util.TreeSet"%><%@taglib prefix="vel" uri="imcmsvelocity"
 %><vel:velocity><%!
 
diff --git a/web/imcms/lang/jsp/crop_img.jsp b/web/imcms/lang/jsp/crop_img.jsp
new file mode 100644
index 0000000000..bf26d40616
--- /dev/null
+++ b/web/imcms/lang/jsp/crop_img.jsp
@@ -0,0 +1,442 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@taglib prefix="vel" uri="imcmsvelocity"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@page import="com.imcode.imcms.flow.Page"%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%--<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> --%>
+
+<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
+<vel:velocity>
+    <html xmlns="http://www.w3.org/1999/xhtml">
+        <head>
+            <title><? web/imcms/lang/jsp/crop_img.jsp/title ?></title>
+            
+            <link rel="stylesheet" type="text/css" href="${contextPath}/imcms/css/imcms_admin.css.jsp"/>
+            <script src="${contextPath}/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+            <script src="${contextPath}/imcms/jscropper/prototype.js" type="text/javascript"></script>
+            <script src="${contextPath}/imcms/jscropper/scriptaculous.js?load=builder,dragdrop" type="text/javascript"></script>
+            <script src="${contextPath}/imcms/jscropper/cropper.js" type="text/javascript"></script>
+
+            <script type="text/javascript">
+                
+                (function($) {
+                    $(function() {
+                        var CROPPER_SPACE = 6, 
+                            scale = 1, 
+                            contWidth = $(window).width() - (30 * 2 + 24 * 2), 
+                            contHeight = $(window).height() - $("#image").offset().top - (2 + 21 + 36 + 10 + 1 + 12 + 30 + CROPPER_SPACE), 
+                            imageWidth = parseInt($("#image_width").val(), 10), 
+                            imageHeight = parseInt($("#image_height").val(), 10), 
+                            ratio = imageWidth / imageHeight, 
+                            cropper;
+                        
+                        $("#image-cont").css({
+                            width: contWidth + "px", 
+                            height: contHeight + "px"
+                        });
+                        
+                        var zoomFactors = [2, 5, 10, 30, 50, 67, 80, 90, 100, 110, 120, 133, 150, 170, 200, 240, 300], 
+                            zoomActual, 
+                            zoomIndex, 
+                            zoom = 100;
+
+                        for (var i = 0; i < zoomFactors.length; ++i) {
+                            if (zoomFactors[i] == 100) {
+                                zoomActual = i;
+                                zoomIndex = i;
+                                break;
+                            }
+                        }
+
+                        function updateImageZoom() {
+                            var img = $("#image,.imgCrop_wrap");
+
+                            if (zoomIndex != -1) {
+                                zoomIndex = Math.max(Math.min(zoomIndex, zoomFactors.length - 1), 0);
+                                zoom = zoomFactors[zoomIndex];
+                            }
+
+                            var percent = zoom / 100, 
+                                newWidth = Math.round(imageWidth * percent), 
+                                newHeight = Math.round(newWidth / ratio);
+
+                            scale = imageWidth / newWidth;
+
+                            img.attr({
+                                width: newWidth, 
+                                height: newHeight
+                            });
+
+                            $("#zoom-value").text(Math.floor(zoom));
+                            
+                            if (cropper != null) {
+                                var cropX1 = parseInt($("#crop_x1").val(), 10), 
+                                    cropY1 = parseInt($("#crop_y1").val(), 10), 
+                                    cropX2 = parseInt($("#crop_x2").val(), 10), 
+                                    cropY2 = parseInt($("#crop_y2").val(), 10);
+
+                                var options = cropper.options;                                
+                                options.onloadCoords = null;
+                                
+                                if (!isNaN(cropX1)) {
+                                    var finalX1 = Math.min(cropX1, cropX2), 
+                                        finalX2 = Math.max(cropX1, cropX2),
+                                        finalY1 = Math.min(cropY1, cropY2), 
+                                        finalY2 = Math.max(cropY1, cropY2), 
+                                        area = (finalX2 - finalX1) * (finalY2 - finalY1);
+                                    
+                                    if (area > 0) {
+                                        options.onloadCoords = {
+                                            x1: Math.round(finalX1 / scale), 
+                                            y1: Math.round(finalY1 / scale), 
+                                            x2: Math.round(finalX2 / scale), 
+                                            y2: Math.round(finalY2 / scale)
+                                        };
+                                    }
+                                }
+
+                                options.displayOnInit = (options.onloadCoords != null);
+                                
+                                cropper.reset();
+                            }
+                        }
+                        
+                        $("#zoom-in,#zoom-out").click(function() {
+                            var zoomin = ($(this).attr("id").indexOf("zoom-in") != -1);
+
+
+                            if (zoomIndex == -1) {
+                                var found = false, 
+                                    start = (zoomin ? 0 : zoomFactors.length - 1), 
+                                    end = (zoomin ? zoomFactors.length : -1);
+
+                                for (var i = start; i != end; (zoomin ? ++i : --i)) {
+                                    if ((zoomin && zoomFactors[i] > zoom) ||
+                                        (!zoomin && zoomFactors[i] < zoom)) {
+                                        zoomIndex = i;
+                                        found = true;
+                                        break;
+                                    }
+                                }
+
+                                if (!found) {
+                                    return false;
+                                }
+                            } else {
+                                if (zoomin) {
+                                    ++zoomIndex;
+                                } else {
+                                    --zoomIndex;
+                                }
+                            }
+
+                            updateImageZoom();
+
+                            return false;
+                        });
+
+                        $("#zoom-actual").click(function() {
+                            zoomIndex = zoomActual;
+                            updateImageZoom();
+
+                            return false;
+                        });
+
+                        function zoomFit() {
+                            zoomIndex = -1;
+
+                            if ((imageWidth > contWidth) || (imageHeight > contHeight)) {
+                                var finalWidth;
+
+                                if (imageWidth > contWidth && imageHeight > contHeight) {
+                                    var targetRatio = contWidth / contHeight;
+
+                                    if (ratio > targetRatio) {
+                                        finalWidth = contWidth;
+                                    } else {
+                                        finalWidth = Math.floor(contHeight * ratio);
+                                    }
+                                } else if (imageWidth > contWidth) {
+                                    finalWidth = contWidth;
+                                } else {
+                                    finalWidth = Math.floor(contHeight * ratio);
+                                }
+
+                                zoomIndex = -1;
+                                zoom = (finalWidth / imageWidth) * 100;
+
+                            } else {
+                                zoomIndex = zoomActual;
+                            }
+
+                            updateImageZoom();
+                        }
+
+                        $("#zoom-fit").click(function() {
+                            zoomFit();
+                            return false;
+                        });
+
+                        if ($("#zoom-fit").length != 0) {
+                            zoomFit();
+                        }
+                        
+                        function updateValues(coords, dimensions) {
+                            var cropX1 = coords.x1 * scale, 
+                                cropY1 = coords.y1 * scale, 
+                                cropX2 = coords.x2 * scale, 
+                                cropY2 = coords.y2 * scale;
+                            
+                            <%-- little adjustment, it seems that at some scales the 
+                                 coordinates, also width and height can't reach maximum (image width/height) --%>
+                            
+                            if ((imageWidth - cropX2) < 0.6) {
+                                cropX2 = imageWidth;
+                            }
+                            if ((${imageHeight} - cropY2) < 0.6) {
+                                cropY2 = imageHeight;
+                            }
+
+                            cropX1 = Math.round(cropX1);
+                            cropY1 = Math.round(cropY1);
+                            cropX2 = Math.round(cropX2);
+                            cropY2 = Math.round(cropY2);
+
+                            var width = (cropX2 - cropX1), 
+                                height = (cropY2 - cropY1);
+                            
+                            $("#crop_x1").val(cropX1);
+                            $("#crop_y1").val(cropY1);
+                            $("#crop_x2").val(cropX2);
+                            $("#crop_y2").val(cropY2);
+                            $("#width").val(width);
+                            $("#height").val(height);
+                        }
+                        
+                        var options = {
+                        	onEndCrop: updateValues, 
+                            displayOnInit: true
+                        };
+
+                        if ($("#force_width").length != 0) {
+                            var forceWidth = parseInt($("#force_width").val(), 10), 
+                                forceHeight = parseInt($("#force_height").val(), 10);
+                            
+                            options.ratioDim = {
+                                x: forceWidth, 
+                                y: forceHeight
+                            };
+                        }
+                        
+                        if ($("#region_x1").length != 0) {
+                            var regionX1 = parseInt($("#region_x1").val(), 10), 
+                                regionY1 = parseInt($("#region_y1").val(), 10), 
+                                regionX2 = parseInt($("#region_x2").val(), 10), 
+                                regionY2 = parseInt($("#region_y2").val(), 10);
+                            
+                            
+                            options.onloadCoords = {
+                                x1: Math.round(regionX1 / scale), 
+                                y1: Math.round(regionY1 / scale), 
+                                x2: Math.round(regionX2 / scale), 
+                                y2: Math.round(regionY2 / scale)
+                            };
+                        }
+                        
+                        $("#image-cont").height((contHeight + CROPPER_SPACE) + "px");
+
+                        $("#reset").click(function() {
+                            var options = cropper.options;
+                            options.onloadCoords = null;
+                            options.displayOnInit = false;
+                            
+                            cropper.reset();
+
+                            var startCoords = { x1: 0, y1: 0, x2: 0, y2: 0 };
+                            cropper.setAreaCoords( startCoords, false, false, 1);
+                            
+                            $("#crop_x1,#crop_y1,#crop_x2,#crop_y2,#width,#height").val("0");
+                            
+                            return false;
+                        });
+                        
+                        var img = $("#image")[0];
+                        if (img.width > 0 || img.height > 0) {
+                            cropper = new Cropper.Img("image", options);
+                            
+                            if ($(".imgCrop_wrap").length == 0) {
+                                cropper.onLoad();
+                            }
+                            
+                        } else {
+                            $("#image").on("load", function() {
+                                cropper = new Cropper.Img("image", options);
+                            });
+                        }
+                    });
+                })(jQ);
+                
+            </script>
+
+            <style type="text/css">
+                HTML {
+                    height: 100%;
+                }
+                BODY {
+                    margin: 0 !important;
+                    padding: 0 !important;
+                }
+                #outer_container {
+                    margin: 0 !important;
+                    padding: 0 !important;
+                }
+                #inner_container {
+                    margin: 30px 10px !important;
+                    padding: 0 !important;
+                }
+                .imgCrop_wrap {
+                    margin: 0 auto;
+                }
+            </style>
+        </head>
+        <body id="body" bgcolor="#FFFFFF">
+            <div id="outer_container">
+                <div id="inner_container">
+                    #gui_outer_start()
+                    #gui_head( "<? global/imcms_administration ?>" )
+                    
+                    <form method="post" action="${contextPath}/servlet/PageDispatcher">
+                        <input type="hidden" name="${constant.IN_REQUEST}" value="${cropPage.sessionAttributeName}"/>
+                        <input type="hidden" id="image_width" value="${imageWidth}"/>
+                        <input type="hidden" id="image_height" value="${imageHeight}"/>
+                        
+                        <c:if test="${forceCropRatio and image.width gt 0 and image.height gt 0}">
+                            <input type="hidden" id="force_width" value="${image.width}"/>
+                            <input type="hidden" id="force_height" value="${image.height}"/>
+                        </c:if>
+                        
+                        <c:if test="${region.valid}">
+                            <input type="hidden" id="region_x1" value="${region.cropX1}"/>
+                            <input type="hidden" id="region_y1" value="${region.cropY1}"/>
+                            <input type="hidden" id="region_x2" value="${region.cropX2}"/>
+                            <input type="hidden" id="region_y2" value="${region.cropY2}"/>
+                        </c:if>
+                        #gui_mid()
+                    
+                        <table border="0" cellspacing="0" cellpadding="2" width="660" align="center">
+                            <tr>
+                                <td colspan="2">
+                                    <c:url var="imageUrl" value="/servlet/ImagePreview">
+                                        <c:param name="path" value="${image.urlPathRelativeToContextPath}"/>
+
+                                        <c:param name="rangle" value="${image.rotateDirection.angle}"/>
+                                    </c:url>
+                                    
+                                    <div id="image-cont" style="overflow:auto;">
+                                        <c:set var="alternateText" value="${fn:escapeXml(image.alternateText)}"/>
+                                        <img id="image" src="${fn:escapeXml(imageUrl)}" alt="${alternateText}" title="${alternateText}"/>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">#gui_hr( "blue" )</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table cellspacing="0" cellpadding="0" border="0">
+                                        <tr>
+                                            <td>
+                                                <label for="crop_x1">
+                                                    <b><? web/imcms/lang/jsp/crop_img.jsp/x1 ?></b>
+                                                </label>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td>
+                                                <label for="crop_y1">
+                                                    <b><? web/imcms/lang/jsp/crop_img.jsp/y1 ?></b>
+                                                </label>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td>
+                                                <label for="crop_x2">
+                                                    <b><? web/imcms/lang/jsp/crop_img.jsp/x2 ?></b>
+                                                </label>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td>
+                                                <label for="crop_y2">
+                                                    <b><? web/imcms/lang/jsp/crop_img.jsp/y2 ?></b>
+                                                </label>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td>
+                                                <label for="width">
+                                                    <b><? web/imcms/lang/jsp/crop_img.jsp/width ?></b>
+                                                </label>
+                                            </td>
+                                            <td></td>
+                                            <td>
+                                                <label for="height">
+                                                    <b><? web/imcms/lang/jsp/crop_img.jsp/height ?></b>
+                                                </label>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td></td>
+                                            <td>&nbsp;</td>
+                                            <td></td>
+                                            <td>&nbsp;</td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input id="crop_x1" name="${constant.PARAM_CROP_X1}" type="text" class="imcmsDisabled" readonly="readonly" size="4" maxlength="4" value="${region.valid ? region.cropX1 : ''}"/></td>
+                                            <td>&nbsp;</td>
+                                            <td><input id="crop_y1" name="${constant.PARAM_CROP_Y1}" type="text" class="imcmsDisabled" readonly="readonly" size="4" maxlength="4" value="${region.valid ? region.cropY1 : ''}"/></td>
+                                            <td>&nbsp;</td>
+                                            <td><input id="crop_x2" name="${constant.PARAM_CROP_X2}" type="text" class="imcmsDisabled" readonly="readonly" size="4" maxlength="4" value="${region.valid ? region.cropX2 : ''}"/></td>
+                                            <td>&nbsp;</td>
+                                            <td><input id="crop_y2" name="${constant.PARAM_CROP_Y2}" type="text" class="imcmsDisabled" readonly="readonly" size="4" maxlength="4" value="${region.valid ? region.cropY2 : ''}"/></td>
+                                            <td>&nbsp;&nbsp;</td>
+                                            <td><input id="width" type="text" class="imcmsDisabled" readonly="readonly" size="4" maxlength="4" value="${region.width}"/></td>
+                                            <td>&nbsp;X&nbsp;</td>
+                                            <td><input id="height" type="text" class="imcmsDisabled" readonly="readonly" size="4" maxlength="4" value="${region.height}"/></td>
+                                            <td>&nbsp;&nbsp;</td>
+                                            <td><input id="reset" type="button" class="imcmsFormBtnSmall" value="<? templates/sv/change_img.html/4008 ?>"/></td>
+
+                                            <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                                            <td><input type="submit" class="imcmsFormBtnSmall" name="${constant.REQUEST_PARAMETER__ROTATE_LEFT}" value="<? web/imcms/lang/jsp/crop_img.jsp/rotate_left ?>"/></td>
+                                            <td>&nbsp;</td>
+                                            <td><input type="submit" class="imcmsFormBtnSmall" name="${constant.REQUEST_PARAMETER__ROTATE_RIGHT}" value="<? web/imcms/lang/jsp/crop_img.jsp/rotate_right ?>"/></td>
+                                            <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                                            <td>
+                                                <fmt:message var="zoomText" key="web/imcms/lang/jsp/crop_img.jsp/zoom"/>
+                                                <c:out value="${zoomText}"/>: <span id="zoom-value">100</span>%
+                                                <fmt:message var="zoomInText" key="web/imcms/lang/jsp/crop_img.jsp/zoom_in"/>
+                                                <a id="zoom-in" href="#" style="margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_in.gif" width="22" height="22" style="vertical-align:middle;border:none;" alt="${fn:escapeXml(zoomInText)}" title="${fn:escapeXml(zoomInText)}"/></a>
+                                                <fmt:message var="zoomOutText" key="web/imcms/lang/jsp/crop_img.jsp/zoom_out"/>
+                                                <a id="zoom-out" href="#" style="margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_out.gif" width="22" height="22" style="vertical-align:middle;border:none;" alt="${fn:escapeXml(zoomOutText)}" title="${fn:escapeXml(zoomOutText)}"/></a>
+                                                <fmt:message var="zoomActualText" key="web/imcms/lang/jsp/crop_img.jsp/actual_size"/>
+                                                <a id="zoom-actual" href="#" style="margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_actual_size.gif" width="22" style="vertical-align:middle;border:none;" height="22" alt="${fn:escapeXml(zoomActualText)}" title="${fn:escapeXml(zoomActualText)}"/></a>
+                                                <fmt:message var="zoomFitText" key="web/imcms/lang/jsp/crop_img.jsp/best_fit"/>
+                                                <a id="zoom-fit" href="#" style="margin-left:10px;"><img src="<%=request.getContextPath()%>/imcms/images/zoom_fit.gif" width="22" height="22" style="vertical-align:middle;border:none;" alt="${fn:escapeXml(zoomFitText)}" title="${fn:escapeXml(zoomFitText)}"/></a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td align="right">
+                                    <input type="submit" class="imcmsFormBtn" name="${constant.REQUEST_PARAMETER__OK}" value=" <? web/imcms/lang/jsp/crop_img.jsp/crop ?> "/>
+                                    <input type="submit" class="imcmsFormBtn" name="${constant.REQUEST_PARAMETER__CANCEL}" value=" <? web/imcms/lang/jsp/crop_img.jsp/cancel ?> "/>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
+                    
+                    #gui_bottom()
+                    #gui_outer_end()
+                </div>
+            </div>
+        </body>
+    </html>
+</vel:velocity>
diff --git a/web/imcms/lang/jsp/docadmin/document_information.jsp b/web/imcms/lang/jsp/docadmin/document_information.jsp
index ef32a9ead2..d4346d9685 100644
--- a/web/imcms/lang/jsp/docadmin/document_information.jsp
+++ b/web/imcms/lang/jsp/docadmin/document_information.jsp
@@ -30,6 +30,7 @@
             java.util.Date,
             java.util.Set,
             java.util.TreeSet"%>
+<%@ page import="org.apache.poi.util.StringUtil" %>
 
 <%@	taglib prefix="vel" uri="imcmsvelocity"%><%
 
@@ -79,8 +80,10 @@ String formatTime(Date time) {
 <meta http-equiv="Cache-Control" content="must-revalidate">
 <meta http-equiv="Cache-Control" content="no-cache">
 
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp" />
+<script type="text/javascript" src="<%= request.getContextPath() %>/imcms/$language/scripts/imcms_admin.js.jsp"></script>
+<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms4_admin.css.jsp" />
+<script type="text/javascript" src="<%= request.getContextPath() %>/imcms/swe/scripts/imcms4_admin_script.js.jsp"></script>
 <%= jsCalendar.getHeadTagScripts() %>
 <script language="JavaScript">
 <!--
@@ -192,29 +195,37 @@ function checkFocus() {
 	</tr>
     <tr>
 	    <td colspan="2">#gui_hr( 'cccccc' )</td>
-	</tr><% if( !documentInformationPage.getErrors().isEmpty() &&
-            documentInformationPage.getErrors().contains(EditDocumentInformationPageFlow.ALIAS_ERROR__ALREADY_EXIST) ) {%>
-    <tr>
-        <td colspan="2" class="error"><span style='color:red'><%= EditDocumentInformationPageFlow.ALIAS_ERROR__ALREADY_EXIST.toLocalizedString(user) %></span></td>
-    </tr><%} else if( !documentInformationPage.getErrors().isEmpty() &&
-            documentInformationPage.getErrors().contains(EditDocumentInformationPageFlow.ALIAS_ERROR__USED_BY_SYSTEM) ) {%>
-    <tr>
-        <td colspan="2" class="error"><span style='color:red'><%= EditDocumentInformationPageFlow.ALIAS_ERROR__USED_BY_SYSTEM.toLocalizedString(user) %></span></td>
-    </tr><%}%>
-    <tr>
-        <td class="imcmsAdmText" nowrap><? global/Page_alias ?></td>
-        <td>
-        <table border="0" cellspacing="0" cellpadding="0" width="100%">
-        <tr>
-            <td  align="right" width="85%"><%= "http://" + request.getServerName() + request.getContextPath() + "/" %>&nbsp;<input type="text" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__DOCUMENT_ALIAS %>" size="40" maxlength="255"
-            value="<%= ObjectUtils.defaultIfNull( StringEscapeUtils.escapeHtml( document.getAlias() ), "" ) %>"></td>
-            <td align="right"><input type="submit" class="imcmsFormBtnSmall" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__GO_TO_ALIAS_LIST %>"
-            value=" <? global/view ?> "></td>
-        </tr>
-        </table></td>
-    </tr>
-
-    <tr>
+	</tr><%
+	if( !documentInformationPage.getErrors().isEmpty() && documentInformationPage.getErrors().contains(EditDocumentInformationPageFlow.ALIAS_ERROR__ALREADY_EXIST) ) {%>
+	<tr>
+		<td colspan="2" class="error"><span style='color:red'><%= EditDocumentInformationPageFlow.ALIAS_ERROR__ALREADY_EXIST.toLocalizedString(user) %></span></td>
+	</tr><%
+	} else if( !documentInformationPage.getErrors().isEmpty() &&
+		documentInformationPage.getErrors().contains(EditDocumentInformationPageFlow.ALIAS_ERROR__USED_BY_SYSTEM) ) {%>
+	<tr>
+		<td colspan="2" class="error"><span style='color:red'><%= EditDocumentInformationPageFlow.ALIAS_ERROR__USED_BY_SYSTEM.toLocalizedString(user) %></span></td>
+	</tr><%
+	} %>
+	<tr>
+		<td class="imcmsAdmText" nowrap><? global/Page_alias ?></td>
+		<td>
+		<table border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr><%
+			String aliasInfoPath = "http://" + request.getServerName() + request.getContextPath() + "/" ;
+			if (aliasInfoPath.length() > 40) {
+				aliasInfoPath = request.getContextPath() + "/" ;
+			} %>
+			<td width="10%" nowrap="nowrap"><%= aliasInfoPath %>&nbsp;</td>
+			<td width="70%" align="right"><input type="text"
+				name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__DOCUMENT_ALIAS %>" size="40" maxlength="255"
+				value="<%= ObjectUtils.defaultIfNull( ObjectUtils.defaultIfNull(request.getAttribute(DocumentPageFlow.REQUEST_PARAMETER__UNIQUE_ALIAS), StringEscapeUtils.escapeHtml( document.getAlias() )), "" ) %>" style="width:99%;" /></td>
+			<td align="right" style="padding-left:5px;"><input type="submit" class="imcmsFormBtnSmall" name="<%= DocumentPageFlow.REQUEST_PARAMETER__UNIQUE_ALIAS %>" value=" <? global/Suggest_alias ?> "></td>
+			<td align="right" style="padding-left:5px;"><input type="submit" class="imcmsFormBtnSmall" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__GO_TO_ALIAS_LIST %>" value=" <? global/view ?> "></td>
+		</tr>
+		</table></td>
+	</tr>
+	
+	<tr>
 		<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="96" height="1"></td>
 		<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="556" height="1"></td>
 	</tr>
@@ -313,24 +324,22 @@ function checkFocus() {
 		<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="556" height="1"></td>
 	</tr>
 	</table></td>
-</tr><%
+</tr>
+</table><%
 
 /* *******************************************************************************************
  *         ADVANCED                                                                          *
  ******************************************************************************************* */
 
 %>
-<tbody id="advanced">
+<div id="advanced">
+<table border="0" cellspacing="0" cellpadding="2" width="660" align="center" onMouseOver="checkFocus();">
 <tr>
 	<td>
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
 	<tr>
 		<td><span class="imcmsAdmHeading"><? install/htdocs/sv/jsp/docadmin/document_information.jsp/21/1 ?></span></td>
-		<script language="javascript">
-		if (hasGetElementById) {
-			document.writeln('<td align="right"><input type="button" id="advanced_button1" class="imcmsFormBtnSmall" value="<? install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button_hide ?>" onClick="toggleAdvanced()"></td>') ;
-		}
-		</script>
+		<td align="right"><input type="button" id="advanced_button1" class="imcmsFormBtnSmall advanced_button" value="<? install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button_hide ?>"></td>
 	</tr>
 	</table>
 	#gui_hr( "blue" )</td>
@@ -447,7 +456,7 @@ function checkFocus() {
 			CategoryDomainObject[] categories = categoryMapper.getAllCategoriesOfType(categoryType);
 			for (int k = 0; k < categories.length; k++) {
 				CategoryDomainObject category = categories[k];
-				boolean checked = documentCategoryIds.contains(new Integer(category.getId()));
+				boolean checked = documentCategoryIds.contains(category.getId());
 				String checkedStr = checked?"checked":"";
 				boolean hasImage = !category.getImageUrl().equals("");
 				String imageStr = hasImage ? "<img style=\"max-width: 10em; max-height: 10em;\" src=\"" + category.getImageUrl() + "\"/>" : ""; %>
@@ -484,18 +493,18 @@ function checkFocus() {
 		<td class="imcmsAdmText">
 		<table border="0" cellspacing="0" cellpadding="0">
 		<tr>
-			<td><input type="CHECKBOX" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__VISIBLE_IN_MENU_FOR_UNAUTHORIZED_USERS %>" value="1"<%
+			<td><input type="CHECKBOX" id="shareCb0" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__VISIBLE_IN_MENU_FOR_UNAUTHORIZED_USERS %>" value="1"<%
 			if (document.isLinkedForUnauthorizedUsers()) {
 				%> checked<%
 			} %>></td>
-			<td class="imcmsAdmText">&nbsp;<? install/htdocs/global/pageinfo/show_link_to_unauthorized_user ?></td>
+			<td class="imcmsAdmText">&nbsp;<label for="shareCb0"><? install/htdocs/global/pageinfo/show_link_to_unauthorized_user ?></label></td>
 		</tr>
 		<tr>
-			<td><input type="CHECKBOX" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS %>" value="1"<%
+			<td><input type="CHECKBOX" id="shareCb1" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS %>" value="1"<%
 			if (document.isLinkableByOtherUsers()) {
 				%> checked<%
 			} %>></td>
-			<td class="imcmsAdmText">&nbsp;<? install/htdocs/global/pageinfo/share ?></td>
+			<td class="imcmsAdmText">&nbsp;<label for="shareCb1"><? install/htdocs/global/pageinfo/share ?></label></td>
 		</tr>
 		</table></td>
 	</tr>
@@ -514,10 +523,10 @@ function checkFocus() {
 		<input type="text" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__KEYWORDS %>" size="48" maxlength="200" style="width: 100%"
 		value="<%= StringEscapeUtils.escapeHtml( keywordsParser.formatKeywords(keywords) )%>"><br>
 		<span class="imcmsAdmDim"><? install/htdocs/sv/jsp/docadmin/document_information.jsp/keywords_explanation ?></span><br>
-		<input type="CHECKBOX" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__SEARCH_DISABLED %>" value="1" <%
+		<input type="CHECKBOX" id="lucene0" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__SEARCH_DISABLED %>" value="1" <%
 		if (document.isSearchDisabled()) {
 			%> checked<%
-		} %>> <? install/htdocs/sv/jsp/docadmin/document_information.jsp/37 ?></td>
+		} %>> <label for="lucene0"><? install/htdocs/sv/jsp/docadmin/document_information.jsp/37 ?></label></td>
 	</tr>
 	<tr>
 		<td colspan="2">#gui_hr( "cccccc" )</td>
@@ -528,28 +537,28 @@ function checkFocus() {
 		<table border="0" cellspacing="0" cellpadding="0">
 		<tr><%
 			String target = document.getTarget() ; %>
-			<td><input type="radio" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" value="_self"<%
+			<td><input type="radio" id="targetCb0" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" value="_self"<%
 			if ("_self".equalsIgnoreCase( target ) || "".equals( target )) {
 				%> checked<%
 				target = null;
 			} %>></td>
-			<td class="imcmsAdmText">&nbsp;<? install/htdocs/sv/jsp/docadmin/document_information.jsp/1015 ?> &nbsp;</td>
-			<td><input type="radio" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" value="_blank"<%
+			<td class="imcmsAdmText">&nbsp;<label for="targetCb0"><? install/htdocs/sv/jsp/docadmin/document_information.jsp/1015 ?></label> &nbsp;</td>
+			<td><input type="radio" id="targetCb1" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" value="_blank"<%
 			if ("_blank".equalsIgnoreCase( target ) ) {
 				%> checked<%
 				target = null;
 			} %>></td>
-			<td class="imcmsAdmText">&nbsp;<? install/htdocs/sv/jsp/docadmin/document_information.jsp/1016 ?> &nbsp;</td>
-			<td><input type="radio" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" value="_top"<%
+			<td class="imcmsAdmText">&nbsp;<label for="targetCb1"><? install/htdocs/sv/jsp/docadmin/document_information.jsp/1016 ?></label> &nbsp;</td>
+			<td><input type="radio" id="targetCb2" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" value="_top"<%
 			if ("_top".equalsIgnoreCase( target ) ) {
 				%> checked<%
 				target = null;
 			} %>></td>
-			<td class="imcmsAdmText">&nbsp;<? install/htdocs/sv/jsp/docadmin/document_information.jsp/1017 ?> &nbsp;</td>
-			<td><input type="radio" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" <% if (null != target) { %> checked<% } %>></td>
-			<td class="imcmsAdmText">&nbsp;<? install/htdocs/sv/jsp/docadmin/document_information.jsp/1018 ?>&nbsp;</td>
+			<td class="imcmsAdmText">&nbsp;<label for="targetCb2"><? install/htdocs/sv/jsp/docadmin/document_information.jsp/1017 ?></label> &nbsp;</td>
+			<td><input type="radio" id="targetCb3" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" <% if (null != target) { %> checked<% } %> onclick="document.getElementById('otherTarget').focus();"></td>
+			<td class="imcmsAdmText">&nbsp;<label for="targetCb3"><? install/htdocs/sv/jsp/docadmin/document_information.jsp/1018 ?></label>&nbsp;</td>
 			<td>
-			<input type="text" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" size="9" maxlength="20" style="width:120"
+			<input type="text" id="otherTarget" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__TARGET %>" size="9" maxlength="20" style="width:120"
 			value="<%
 			if (null != target) {
 				%><%= StringEscapeUtils.escapeHtml( target ) %><%
@@ -588,7 +597,16 @@ function checkFocus() {
 			<td><input type="text" id="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__MODIFIED_TIME %>" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__MODIFIED_TIME %>" size="5" maxlength="5" style="width: 4em;"
 			value="<%= formatTime( document.getModifiedDatetime() ) %>"></td>
             <td><%= jsCalendar.getInstance(EditDocumentInformationPageFlow.REQUEST_PARAMETER__MODIFIED_DATE,
-			                               EditDocumentInformationPageFlow.REQUEST_PARAMETER__MODIFIED_TIME).getButton(calendarButtonTitle) %></td>
+			                               EditDocumentInformationPageFlow.REQUEST_PARAMETER__MODIFIED_TIME).getButton(calendarButtonTitle) %>
+                <%
+                    try {
+                        String modifiedBy = Utility.formatUser(userMapper.getUser(Integer.parseInt(document.getProperty(
+                                DocumentDomainObject.DOCUMENT_PROPERTIES__IMCMS_DOCUMENT_MODIFIED_BY))));
+
+                        %><? install/htdocs/sv/jsp/docadmin/document_information.jsp/created_by ?>&nbsp;<%=modifiedBy%><%
+                    } catch (Exception ignore) {}
+                %>
+            </td>
 		</tr>
 		</table></td>
 	</tr><%
@@ -600,7 +618,7 @@ function checkFocus() {
 		<td class="imcmsAdmText"><? global/Publisher ?></td>
 		<td class="imcmsAdmText">
 		<% Integer publisherId = document.getPublisherId();
-            UserDomainObject publisher = null == publisherId ? null : userMapper.getUser(publisherId.intValue()) ; %>
+            UserDomainObject publisher = null == publisherId ? null : userMapper.getUser(publisherId) ; %>
 		<%=
 		null == publisher
 		? "<? install/htdocs/sv/jsp/docadmin/document_information.jsp/no_publisher ?>"
@@ -613,11 +631,13 @@ function checkFocus() {
 	</tr>
 	</table></td>
 </tr>
-</tbody><%
+</table>
+</div><%
 /* *******************************************************************************************
  *         END ADVANCED                                                                      *
  ******************************************************************************************* */
 %>
+<table border="0" cellspacing="0" cellpadding="2" width="660" align="center" onMouseOver="checkFocus();">
 <tr>
 	<td>#gui_hr( "blue" )</td>
 </tr>
@@ -625,12 +645,8 @@ function checkFocus() {
 	<td align="right">
 	<table border="0" cellpadding="0" cellspacing="0">
 	<tr>
-		<script language="javascript">
-		if (hasGetElementById) {
-			document.writeln('<td><input type="button" id="advanced_button2" class="imcmsFormBtn" value="<? install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button ?>" onClick="toggleAdvanced()"></td>') ;
-			document.writeln('<td>&nbsp;&nbsp;</td>') ;
-		}
-		</script>
+		<td><input type="button" id="advanced_button2" class="imcmsFormBtn advanced_button" value="<? install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button ?>"></td>
+		<td>&nbsp;&nbsp;</td>
 		<td><input type="SUBMIT" class="imcmsFormBtn" name="<%= PageFlow.REQUEST_PARAMETER__OK_BUTTON %>" onClick="return singleclicked();"
 		value=" <? install/htdocs/sv/jsp/docadmin/document_information.jsp/2004 ?> "></td>
 		<td>&nbsp;</td>
@@ -655,7 +671,7 @@ if (!adminButtonsHidden) {
 	}
 }
 %>
-<script language="javascript">
+<script type="text/javascript">
 <!--<%
 String viewCookieName = "document_information_view" ;
 
@@ -672,35 +688,43 @@ if (all_cookies.length > 0) {
 } %>
 var viewCookieName = "<%= viewCookieName %>" ;
 var BTN_SHOW_VALUE = "<? install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button ?>" ;
-var BTN_HIDE_VALUE = "<? install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button_hide ?>" ;<%
-
-if (actCookieValue.equals("advanced")) { %>
-document.getElementById("advanced").style.display = (isGecko) ? "table-row-group" : "block" ;
-document.getElementById("advanced_button1").value = BTN_HIDE_VALUE ;
-document.getElementById("advanced_button2").value = BTN_HIDE_VALUE ;<%
-} else { %>
-document.getElementById("advanced").style.display = "none" ;
-document.getElementById("advanced_button1").value = BTN_SHOW_VALUE ;
-document.getElementById("advanced_button2").value = BTN_SHOW_VALUE ;<%
-} %>
-
-function toggleAdvanced(show) {
-	if (!hasGetElementById) {
-		return ;
-	}
-	var advancedDisplay = document.getElementById("advanced").style.display ;
+var BTN_HIDE_VALUE = "<? install/htdocs/sv/jsp/docadmin/document_information.jsp/advanced_button_hide ?>" ;
+
+jQ(document).ready(function($) {
+	
+	<% if (actCookieValue.equals("advanced")) { %>
+	$('#advanced').show(0) ;
+	$('#advanced_button1').val(BTN_HIDE_VALUE) ;
+	$('#advanced_button2').val(BTN_HIDE_VALUE) ;
+	<% } else { %>
+	$('#advanced').hide(0) ;
+	$('#advanced_button1').val(BTN_SHOW_VALUE) ;
+	$('#advanced_button2').val(BTN_SHOW_VALUE) ;
+	<% } %>
+	
+	$('.advanced_button').live('click', function(event) {
+		event.preventDefault() ;
+		toggleAdvanced($) ;
+	}) ;
+	
+}) ;
+
+function toggleAdvanced($) {
+	var isVisible = $('#advanced').is(':visible') ;
+	isVisible = !isVisible ;
 	var advancedButtonValue = BTN_SHOW_VALUE ;
 	var viewCookieValue = "simple" ;
-	if (advancedDisplay == "none") {
-		advancedDisplay = (isGecko) ? "table-row-group" : "block" ;
+	if (isVisible) {
 		advancedButtonValue = BTN_HIDE_VALUE ;
 		viewCookieValue = "advanced" ;
+	}
+	if (isVisible) {
+		$('#advanced').slideDown('slow') ;
 	} else {
-		advancedDisplay = "none" ;
+		$('#advanced').slideUp('slow') ;
 	}
-	document.getElementById("advanced").style.display = advancedDisplay ;
-	document.getElementById("advanced_button1").value = advancedButtonValue ;
-	document.getElementById("advanced_button2").value = advancedButtonValue ;
+	$('#advanced_button1').val(advancedButtonValue) ;
+	$('#advanced_button2').val(advancedButtonValue) ;
 	setCookie(viewCookieName, viewCookieValue) ;
 }
 
diff --git a/web/imcms/lang/jsp/docadmin/document_permission_set.jsp b/web/imcms/lang/jsp/docadmin/document_permission_set.jsp
index df2efabc95..7aa618977e 100644
--- a/web/imcms/lang/jsp/docadmin/document_permission_set.jsp
+++ b/web/imcms/lang/jsp/docadmin/document_permission_set.jsp
@@ -4,17 +4,17 @@
                  imcode.server.Imcms,
                  imcode.server.ImcmsServices,
                  imcode.server.document.DocumentPermissionSetDomainObject,
+                 imcode.server.document.DocumentPermissionSetTypeDomainObject,
                  imcode.server.document.TemplateDomainObject,
                  imcode.server.document.TemplateGroupDomainObject,
                  imcode.server.document.TextDocumentPermissionSetDomainObject,
+                 imcode.server.document.textdocument.TextDocumentDomainObject,
                  imcode.server.user.UserDomainObject,
                  imcode.util.Utility,
-                 org.apache.commons.lang.StringEscapeUtils,
-                 java.util.Iterator,
-                 java.util.Map"%>
-<%@ page import="java.util.Set"%>
-<%@ page import="imcode.server.document.DocumentPermissionSetTypeDomainObject"%>
-<%@ page import="imcode.server.document.textdocument.TextDocumentDomainObject, java.util.List"%>
+                 org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Map, java.util.Set" %>
 <%@ page contentType="text/html; charset=UTF-8"%><%@taglib uri="imcmsvelocity" prefix="vel"%><%
     DocumentPermissionSetPage documentPermissionSetPage = (DocumentPermissionSetPage)Page.fromRequest(request) ;
     DocumentPermissionSetDomainObject documentPermissionSet = documentPermissionSetPage.getDocumentPermissionSet() ;
@@ -90,7 +90,7 @@
                         Map.Entry entry = (Map.Entry)iterator.next();
                         Integer documentTypeId = (Integer)entry.getKey();
                         String documentTypeName = (String)entry.getValue();
-                        boolean allowedDocumentType = allowedDocumentTypeIds.contains(new Integer(documentTypeId.intValue())) ;
+                        boolean allowedDocumentType = allowedDocumentTypeIds.contains(documentTypeId);
                         %><option value="<%= documentTypeId %>" <% if( allowedDocumentType ) { %>selected<% } %>><%= StringEscapeUtils.escapeHtml( documentTypeName ) %></option><%
                     }
                 %>
@@ -107,7 +107,7 @@
                 Set allowedTemplateGroupIds = textDocumentPermissionSet.getAllowedTemplateGroupIds() ;
                 for ( int i = 0; i < allTemplateGroups.length; i++ ) {
                     TemplateGroupDomainObject templateGroup = allTemplateGroups[i];
-                    boolean allowedTemplateGroup = allowedTemplateGroupIds.contains(new Integer(templateGroup.getId())) ;
+                    boolean allowedTemplateGroup = allowedTemplateGroupIds.contains(templateGroup.getId()) ;
                     %><option value="<%= templateGroup.getId() %>" <% if( allowedTemplateGroup ) { %>selected<% } %>><%= templateGroup.getName() %></option><%
                 }
             %>
diff --git a/web/imcms/lang/jsp/docadmin/document_permissions.jsp b/web/imcms/lang/jsp/docadmin/document_permissions.jsp
index 39210759a9..050ef1bf8b 100644
--- a/web/imcms/lang/jsp/docadmin/document_permissions.jsp
+++ b/web/imcms/lang/jsp/docadmin/document_permissions.jsp
@@ -41,7 +41,10 @@
 <html>
 <head>
 <title><? templates/sv/docinfo/change_meta_rights.html/1 ?></title>
-<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
+<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp" />
+<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms4_admin.css.jsp" />
+<script type="text/javascript" src="<%= request.getContextPath() %>/imcms/swe/scripts/imcms4_admin_script.js.jsp"></script>
+
 </head>
 <body bgcolor="#FFFFFF">
 
@@ -166,8 +169,8 @@
                         <? templates/sv/permissions/sets_precedence.html/precedence ?>
                     </td>
                     <td class="imcmsAdmText">
-                        <input type="CHECKBOX" name="<%= DocumentPermissionsPage.REQUEST_PARAMETER__RESTRICTED_ONE_MORE_PRIVILEGED_THAN_RESTRICTED_TWO %>" value="1" <% if (document.isRestrictedOneMorePrivilegedThanRestrictedTwo()) { %>checked<% } %>>
-                        <? templates/sv/permissions/sets_precedence.html/1001 ?>
+                        <input type="CHECKBOX" id="setsPrecedenceCb" name="<%= DocumentPermissionsPage.REQUEST_PARAMETER__RESTRICTED_ONE_MORE_PRIVILEGED_THAN_RESTRICTED_TWO %>" value="1" <% if (document.isRestrictedOneMorePrivilegedThanRestrictedTwo()) { %>checked<% } %>>
+                        <label for="setsPrecedenceCb"><? templates/sv/permissions/sets_precedence.html/1001 ?></label>
                     </td>
                 </tr>
             <% } %>
@@ -203,12 +206,12 @@
                 <td>
                 <table border="0" cellspacing="0" cellpadding="0">
                 <tr>
-                    <td><input type="CHECKBOX" name="show_meta" value="1" <% if (document.isLinkedForUnauthorizedUsers()) {%>checked<% } %>></td>
-                    <td class="imcmsAdmText">&nbsp;<? templates/global/pageinfo/ShowLinkToUnuthorizedUser ?></td>
+                    <td><input type="CHECKBOX" id="showMetaCb" name="show_meta" value="1" <% if (document.isLinkedForUnauthorizedUsers()) {%>checked<% } %>></td>
+                    <td class="imcmsAdmText">&nbsp;<label for="showMetaCb"><? templates/global/pageinfo/ShowLinkToUnuthorizedUser ?></label></td>
                 </tr>
                 <tr>
-                    <td><input type="CHECKBOX" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS %>" value="1" <% if (document.isLinkableByOtherUsers()) {%>checked<% } %>></td>
-                    <td class="imcmsAdmText">&nbsp;<? templates/global/pageinfo/share ?></td>
+                    <td><input type="CHECKBOX" id="linkableCb" name="<%= EditDocumentInformationPageFlow.REQUEST_PARAMETER__LINKABLE_BY_OTHER_USERS %>" value="1" <% if (document.isLinkableByOtherUsers()) {%>checked<% } %>></td>
+                    <td class="imcmsAdmText">&nbsp;<label for="linkableCb"><? templates/global/pageinfo/share ?></label></td>
                 </tr>
                 </table>
                 </td>
diff --git a/web/imcms/lang/jsp/docadmin/text/edit_include.jsp b/web/imcms/lang/jsp/docadmin/text/edit_include.jsp
index d7dec2f7ba..2fe322a490 100644
--- a/web/imcms/lang/jsp/docadmin/text/edit_include.jsp
+++ b/web/imcms/lang/jsp/docadmin/text/edit_include.jsp
@@ -1,72 +1,72 @@
-<%@ page import="imcode.server.document.DocumentDomainObject,
-                 org.apache.commons.lang.StringEscapeUtils"%>
-<%@page contentType="text/html; charset=UTF-8"%><%@taglib uri="imcmsvelocity" prefix="vel" %>
-<%
-    String label = (String)request.getAttribute( "label" );
-    DocumentDomainObject includingDocument = (DocumentDomainObject)request.getAttribute( "includingDocument" ) ;
-    Integer includedDocumentId = (Integer)request.getAttribute( "includedDocumentId" ) ;
-    boolean validId = null != includedDocumentId;
-    String includedDocumentIdString = validId ? ""+includedDocumentId : "" ;
-    Integer includeIndex = (Integer)request.getAttribute( "includeIndex" ) ;
+<%@ page
+	
+	import="imcode.server.document.DocumentDomainObject,
+	        org.apache.commons.lang.StringEscapeUtils"
+	
+	contentType="text/html; charset=UTF-8"
+	
+%><%@taglib uri="imcmsvelocity" prefix="vel"
+%><%
+
+String label = (String)request.getAttribute( "label" );
+DocumentDomainObject includingDocument = (DocumentDomainObject)request.getAttribute( "includingDocument" ) ;
+Integer includedDocumentId = (Integer)request.getAttribute( "includedDocumentId" ) ;
+boolean validId = null != includedDocumentId;
+String includedDocumentIdString = validId ? ""+includedDocumentId : "" ;
+Integer includeIndex = (Integer)request.getAttribute( "includeIndex" ) ;
 
 %><vel:velocity>
 <style type="text/css">
-<!--
+/*<![CDATA[*/
 INPUT.imcmsFormBtnSmall {
 	background-color: #20568D;
-	color: #ffffff;
+	color: #fff;
 	font: 10px Tahoma, Arial, sans-serif;
 	border: 2px outset #668DB6;
-	border-color: #668DB6 #000000 #000000 #668DB6;
-	cursor:hand;
-	cursor:pointer;
-	padding: 0 2;
+	border-color: #668DB6 #000 #000 #668DB6;
+	padding: 0 2px;
+	cursor: pointer;
 }
 .changePageButton {
-	background-color:#e2e2e4;
+	background-color: #e2e2e4;
 	font: 10px Tahoma, Arial, sans-serif;
-	color:#000000;
-	padding: 0px 4px;
+	color: #000;
+	padding: 0 4px;
 	border-width: 1px;
 	border-style: outset;
-	border-color: #cccccc #666666 #666666 #cccccc;
-	cursor:hand;
-	cursor:pointer;
+	border-color: #ccc #666 #666 #ccc;
+	cursor: pointer;
+}
+/*]]>*/
+</style>
+
+<span class="imcms_label"><%
+if (validId) {
+	%><a href="$contextPath/servlet/GetDoc?meta_id=<%= includedDocumentIdString %>" class="imcms_label"><%
 }
--->
-</STYLE>
-<span class="imcms_label">
-    <% if (validId) { %>
-        <a href="$contextPath/servlet/GetDoc?meta_id=<%= includedDocumentIdString %>" class="imcms_label">
-    <% } %>
-    <%= StringEscapeUtils.escapeHtml( label )%>
-    <% if (validId) { %>
-        </a>
-    <% } %>
-</span>
-<form action="SaveInclude" method="POST">
-    <input type="HIDDEN" name="meta_id" value="<%= includingDocument.getId() %>">
-    <input type="HIDDEN" name="include_id" value="<%= includeIndex %>">
-    <table border="0" cellspacing="0" cellpadding="3" bgcolor="#f5f5f7" style="border: 1px solid #e1ded9">
-        <tr bgcolor="#20568D">
-            <td align="center"><span style="font: bold 9pt Tahoma,Verdana,sans-serif; color:#ffffff"><? templates/sv/change_include.html/1 ?></span></td>
-            <td align="right"><input type="button" value="<? global/help ?>" title="<? global/openthehelppage ?>" class="imcmsFormBtnSmall" onClick="openHelpW('Include')"></td>
-        </tr>
-        <tr>
-            <td height="35">
-                <input type="text" name="include_meta_id" value="<%= includedDocumentIdString %>" size="6" maxlength="6" style="font: 9pt Tahoma,Verdana,sans-serif">
-            </td>
-            <td align="right">
-                <input type="submit" name="ok" value=" <? templates/sv/change_include.html/2001 ?> " class="changePageButton">
-            </td>
-        </tr>
-        <tr>
-            <% if (validId) { %>
-            <td colspan="1" align="center">
-                <a href="$contextPath/servlet/GetDoc?meta_id=<%= includedDocumentId %>" target="_blank"><span style="font: x-small Verdana,Geneva,sans-serif; color:#000099; text-decoration:none"><? templates/sv/change_include.html/1001 ?></span></a>
-            </td>
-            <% } %>
-        </tr>
-    </table>
+%><%= StringEscapeUtils.escapeHtml( label ) %><%
+if (validId) {
+	%></a><%
+} %></span>
+
+<form action="SaveInclude" method="post">
+<input type="hidden" name="meta_id" value="<%= includingDocument.getId() %>" />
+<input type="hidden" name="include_id" value="<%= includeIndex %>" />
+<table border="0" cellspacing="0" cellpadding="3" style="border: 1px solid #e1ded9; background-color:#f5f5f7;">
+<tr bgcolor="#20568D">
+	<td align="center"><span style="font: bold 9pt Tahoma,Verdana,sans-serif; color:#fff"><? templates/sv/change_include.html/1 ?></span></td>
+	<td align="right"><input type="button" value="<? global/help ?>" title="<? global/openthehelppage ?>" class="imcmsFormBtnSmall" onclick="openHelpW('Include'); return false" /></td>
+</tr>
+<tr>
+	<td height="35"><input type="text" name="include_meta_id" value="<%= includedDocumentIdString %>" size="6" maxlength="6" style="font: 9pt Tahoma,Verdana,sans-serif" /></td>
+	<td align="right"><input type="submit" name="ok" value=" <? templates/sv/change_include.html/2001 ?> " class="changePageButton" /></td>
+</tr><%
+if (validId) { %>
+<tr>
+	<td colspan="1" align="center">
+	<a href="$contextPath/servlet/GetDoc?meta_id=<%= includedDocumentId %>" target="_blank"><span style="font: x-small Verdana,Geneva,sans-serif; color:#000099; text-decoration:none"><? templates/sv/change_include.html/1001 ?></span></a></td>
+</tr><%
+} %>
+</table>
 </form>
 </vel:velocity>
diff --git a/web/imcms/lang/jsp/docadmin/text/edit_menu.jsp b/web/imcms/lang/jsp/docadmin/text/edit_menu.jsp
index d19caa9562..b90645ce14 100644
--- a/web/imcms/lang/jsp/docadmin/text/edit_menu.jsp
+++ b/web/imcms/lang/jsp/docadmin/text/edit_menu.jsp
@@ -1,17 +1,30 @@
-<%@ page import="imcode.server.document.textdocument.TextDocumentDomainObject, imcode.server.user.UserDomainObject, imcode.util.Utility, imcode.server.parser.ParserParameters"%>
-<%
-    ParserParameters parserParameters = ParserParameters.fromRequest(request);
-    TextDocumentDomainObject document = (TextDocumentDomainObject) parserParameters.getDocumentRequest().getDocument();
-    Integer menuIndex = (Integer) request.getAttribute("menuIndex");
-    String label = (String) request.getAttribute("label") ;
-    Integer defaultUserCount = (Integer) request.getAttribute("defaultUserCount");
-    Integer userCount = (Integer) request.getAttribute("userCount");
-    String content = (String) request.getAttribute("content") ;
-    UserDomainObject user = parserParameters.getDocumentRequest().getUser();
+<%@ page
+	
+	import="imcode.server.document.textdocument.TextDocumentDomainObject,
+	        imcode.server.user.UserDomainObject,
+	        imcode.server.parser.ParserParameters"
+	
+	pageEncoding="UTF-8"
+	
+%><%
+
+ParserParameters parserParameters = ParserParameters.fromRequest(request);
+TextDocumentDomainObject document = (TextDocumentDomainObject) parserParameters.getDocumentRequest().getDocument();
+Integer menuIndex = (Integer) request.getAttribute("menuIndex");
+String label = (String) request.getAttribute("label") ;
+Integer defaultUserCount = (Integer) request.getAttribute("defaultUserCount");
+Integer userCount = (Integer) request.getAttribute("userCount");
+String content = (String) request.getAttribute("content") ;
+UserDomainObject user = parserParameters.getDocumentRequest().getUser();
+
+int metaId = document.getId() ;
+String cp = request.getContextPath() ;
+String lang = user.getLanguageIso639_2() ;
+
 %>
-<a href="<%= request.getContextPath() %>/servlet/ChangeMenu?documentId=<%= document.getId() %>&menuIndex=<%= menuIndex %>" class="imcms_label"><%-- 
+<a href="<%= cp %>/servlet/ChangeMenu?documentId=<%= metaId %>&amp;menuIndex=<%= menuIndex %>" class="imcms_label"><%-- 
     --%><%= label %> [<%= defaultUserCount %>/<%= userCount %>]&nbsp;<%-- 
-    --%><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/red.gif" border="0" alt="edit menu <%= menuIndex%>" align="bottom"></a>
+    --%><img src="<%= cp %>/imcms/<%= lang %>/images/admin/red.gif" alt="edit menu <%= menuIndex%>" align="bottom" style="border:0 !important;" /></a>
 <%= content %>
-    <a href="<%= request.getContextPath() %>/servlet/ChangeMenu?documentId=<%= document.getId() %>&menuIndex=<%= menuIndex %>"><%-- 
-    --%><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/ico_txt.gif" border="0" alt="edit menu <%= menuIndex%>"></a>
+    <a href="<%= cp %>/servlet/ChangeMenu?documentId=<%= metaId %>&amp;menuIndex=<%= menuIndex %>"><%-- 
+    --%><img src="<%= cp %>/imcms/<%= lang %>/images/admin/ico_txt.gif" alt="edit menu <%= menuIndex%>" style="border:0 !important;" /></a>
diff --git a/web/imcms/lang/jsp/docadmin/text/edit_text.jsp b/web/imcms/lang/jsp/docadmin/text/edit_text.jsp
index dce91a18f7..e845b1e1a1 100644
--- a/web/imcms/lang/jsp/docadmin/text/edit_text.jsp
+++ b/web/imcms/lang/jsp/docadmin/text/edit_text.jsp
@@ -1,33 +1,71 @@
-<%@ page import="imcode.server.document.DocumentDomainObject,
-                 imcode.server.user.UserDomainObject,
-                 imcode.util.Html,
-                 imcode.util.Utility,
-                 org.apache.commons.lang.StringEscapeUtils,
-                 org.apache.commons.lang.math.NumberUtils,
-                 java.net.URLEncoder, org.apache.commons.lang.StringUtils"%><%
-
-    DocumentDomainObject document = (DocumentDomainObject)request.getAttribute( "document" ) ;
-    Integer textIndex = (Integer)request.getAttribute( "textIndex" ) ;
-    String label = (String)request.getAttribute( "label" ) ;
-    String content = (String)request.getAttribute( "content" ) ;
-    String rows = (String) request.getAttribute("rows") ;
-    String[] formats = (String[])request.getAttribute( "formats" ) ;
-    UserDomainObject user = Utility.getLoggedOnUser( request ) ;
-
-    String url = request.getContextPath() +"/servlet/ChangeText?meta_id="+document.getId() +"&txt="+textIndex ;
-    if (null != label) {
-        url += "&label="+URLEncoder.encode( Html.removeTags(label) ) ;
-    }
-    if (null != formats) {
-        for ( String format : formats ) {
-            if ( StringUtils.isNotBlank(format) ) {
-                url += "&format=" + URLEncoder.encode(format);
-            }
-        }
-    }
-    if (null != rows && NumberUtils.isDigits( rows )) {
-        url += "&rows="+rows ;
-    }
-%><a href="<%= StringEscapeUtils.escapeHtml( url ) %>" class="imcms_label"><%= label %><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/red.gif" border="0"></a>
-<%= content %>
-<a href="<%= StringEscapeUtils.escapeHtml( url ) %>"><img src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/ico_txt.gif" border="0"></a>
+<%@ page
+	
+	import="imcode.server.document.DocumentDomainObject,
+	        imcode.server.user.UserDomainObject,
+	        imcode.util.Html,
+	        imcode.util.Utility,
+	        imcode.server.Imcms,
+	        java.net.URLEncoder,
+	        org.apache.commons.lang.math.NumberUtils,
+	        org.apache.commons.lang.StringUtils,
+	        org.apache.commons.lang.RandomStringUtils"
+	
+  pageEncoding="UTF-8"
+  
+%><%!
+
+final static boolean INLINE_EDITING_ACTIVE = true ;
+
+%><%
+
+UserDomainObject user         = Utility.getLoggedOnUser( request ) ;
+DocumentDomainObject document = (DocumentDomainObject)request.getAttribute( "document" ) ;
+Integer textIndex             = (Integer)request.getAttribute( "textIndex" ) ;
+String label                  = (String)request.getAttribute( "label" ) ;
+String content                = (String)request.getAttribute( "content" ) ;
+String rows                   = (String) request.getAttribute("rows") ;
+String[] formats              = (String[])request.getAttribute( "formats" ) ;
+int metaId                    = document.getId() ;
+
+String cp   = request.getContextPath() ;
+String lang = user.getLanguageIso639_2() ;
+
+String url = cp +"/servlet/ChangeText?meta_id=" + metaId + "&amp;txt=" + textIndex ;
+
+String imcmsInlineEditClassName = "imcmsInlineEditEditor" ;
+String mode = "html" ;
+
+if (null != label) {
+	url += "&amp;label=" + URLEncoder.encode( Html.removeTags(label), Imcms.UTF_8_ENCODING) ;
+}
+if (null != formats) {
+	for ( String format : formats ) {
+		if ( StringUtils.isNotBlank(format) ) {
+			url += "&amp;format=" + URLEncoder.encode(format, Imcms.UTF_8_ENCODING) ;
+			imcmsInlineEditClassName = "imcmsInlineEditTextarea" ;
+		}
+	}
+	if (1 == formats.length && "text".equals(formats[0])) {
+		mode = "text" ;
+	}
+}
+if (null != rows && NumberUtils.isDigits( rows )) {
+	url += "&amp;rows=" + rows ;
+	if ("1".equals(rows)) {
+		imcmsInlineEditClassName = "imcmsInlineEditInput" ;
+	}
+}
+
+// Added random string - If it's more editable instances. Else JS might fail.
+String uniqueId = "imcmsInlineTextEdit_" + metaId + "_" + textIndex + "_" + mode + "_" + RandomStringUtils.random(8, true, true) ;
+
+%><div id="<%= uniqueId %>_dummy" style="display:none;"></div><%-- Dummy for width check --%>
+<a id="<%= uniqueId %>_link" href="<%= url %>" class="imcms_text_admin imcms_label" rev="<%= uniqueId %>"><%= label %><%
+	%><img src="<%= cp %>/imcms/<%= lang %>/images/admin/red.gif" alt="" style="border:0 !important;" /></a><%
+if (INLINE_EDITING_ACTIVE) { %>
+<span id="<%= uniqueId %>_container" rev="<%= uniqueId %>" class="imcmsInlineEditContainer <%= imcmsInlineEditClassName %>"><%= content %></span><%
+} else { %>
+<%= content %><%
+} %>
+<a id="<%= uniqueId %>_link2" href="<%= url %>" class="imcms_text_admin" rev="<%= uniqueId %>"><%
+	%><img src="<%= cp %>/imcms/<%= lang %>/images/admin/ico_txt.gif" alt="" style="border:0 !important;" /></a>
diff --git a/web/imcms/lang/jsp/docadmin/url_document.jsp b/web/imcms/lang/jsp/docadmin/url_document.jsp
index e795ffa26f..3368b8a37f 100644
--- a/web/imcms/lang/jsp/docadmin/url_document.jsp
+++ b/web/imcms/lang/jsp/docadmin/url_document.jsp
@@ -42,7 +42,7 @@
 </tr>
 <tr>
 	<td class="imcmsAdmText"><? install/htdocs/sv/jsp/docadmin/url_document.jsp/1001 ?>&nbsp;</td>
-	<td><input type="text" name="<%= EditUrlDocumentPageFlow.REQUEST_PARAMETER__URL_DOC__URL %>" size="62" maxlength="255"
+	<td><input type="text" name="<%= EditUrlDocumentPageFlow.REQUEST_PARAMETER__URL_DOC__URL %>" size="62" maxlength="2000"
                 value="<%= StringEscapeUtils.escapeHtml( (String)ObjectUtils.defaultIfNull( document.getUrl(), "" )) %>"></td>
 </tr>
 <tr>
diff --git a/web/imcms/lang/jsp/document_alias_list.jsp b/web/imcms/lang/jsp/document_alias_list.jsp
index 1587f52117..b6ff7bd1ef 100644
--- a/web/imcms/lang/jsp/document_alias_list.jsp
+++ b/web/imcms/lang/jsp/document_alias_list.jsp
@@ -89,7 +89,7 @@ if (null != listDocumentAliasPage.aliasInSelectedRange) { %>
 	<td align="center"><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
     <%= Html.getLinkedStatusIconTemplate( document, user, request ) %></td>
 	<td nowrap><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<%= StringEscapeUtils.escapeHtml((String)documentTypes.get(new Integer( document.getDocumentTypeId() )))%>&nbsp;</td>
+	<%= StringEscapeUtils.escapeHtml((String)documentTypes.get(document.getDocumentTypeId()))%>&nbsp;</td>
 	<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
 	<a name="<%= document.getId() %>" href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>"><%=
 		document.getId() %> - <%= StringEscapeUtils.escapeHtml( document.getHeadline() ) %></a></td>
diff --git a/web/imcms/lang/jsp/document_list.jsp b/web/imcms/lang/jsp/document_list.jsp
index 250ffddbc6..9234e5ef71 100644
--- a/web/imcms/lang/jsp/document_list.jsp
+++ b/web/imcms/lang/jsp/document_list.jsp
@@ -71,7 +71,7 @@ if (null != formData.documentsIterator) { %>
     <td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
         <%= Html.getLinkedStatusIconTemplate( document, user, request ) %></td>
 	<td nowrap><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
-	<%= StringEscapeUtils.escapeHtml((String)documentTypes.get(new Integer( document.getDocumentTypeId() )))%>&nbsp;</td>
+	<%= StringEscapeUtils.escapeHtml((String)documentTypes.get(document.getDocumentTypeId()))%>&nbsp;</td>
 	<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
 	<a name="<%= document.getId() %>" href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>"><%=
 		document.getId() %> - <%= StringEscapeUtils.escapeHtml( document.getHeadline() ) %></a></td>
diff --git a/web/imcms/lang/jsp/export/export_document_list.jsp b/web/imcms/lang/jsp/export/export_document_list.jsp
new file mode 100644
index 0000000000..41e0cb9796
--- /dev/null
+++ b/web/imcms/lang/jsp/export/export_document_list.jsp
@@ -0,0 +1,399 @@
+<%@ page import="com.imcode.imcms.servlet.superadmin.ListDocuments,
+                 imcode.server.document.DocumentDomainObject,
+                 org.apache.commons.lang.StringEscapeUtils,
+                 imcode.server.Imcms,
+                 imcode.util.Utility,
+                 imcode.server.user.UserDomainObject,
+                 java.util.*,
+                 imcode.util.Html,
+                 com.imcode.imcms.mapping.DocumentMapper" %>
+<%@page contentType="text/html; charset=UTF-8" %>
+<%@taglib prefix="vel" uri="imcmsvelocity" %>
+<% ListDocuments.FormData formData = (ListDocuments.FormData) request.getAttribute(ListDocuments.REQUEST_ATTRIBUTE__FORM_DATA);%>
+<vel:velocity>
+	#gui_start_of_page( "<? imcms/lang/jsp/export/export_document_list.jsp/title ?>" "AdminManager" "" "ListDocument" "" )
+
+	<table border="0" cellspacing="0" cellpadding="2" width="680">
+		<tr>
+			<td>
+				<form method="GET" action="ListDocuments" id="form">
+                    <%
+                        if (formData.list != null) {
+                            for (int metaId : formData.list) {
+                                out.println(String.format("<input hidden value='%s' id='%s' name='documentsList'>", metaId, metaId));
+                            }
+                        }
+                    %>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td>
+								<button type="button" id="changeInput" class="imcmsFormBtnSmall"
+										style="margin-bottom: 5px;
+										width: 100px;">
+									Change input type
+								</button>
+							</td>
+						</tr>
+						<tr id="documentsList" <%=formData.list == null ? "style='display: none'" : "" %>>
+							<td>
+								<select name="<%= ListDocuments.PARAMETER__LIST %>"
+										id="documentsListSelect" multiple
+										style="text-align: center;
+											min-width: 100px;
+											min-height: 130px;">
+									<%
+										if (formData.list != null) {
+											for (int metaId : formData.list) {
+												out.println(String.format("<option value='%s' id='%s' name='documentsList'>%s</option>", metaId, metaId, metaId));
+											}
+										}
+									%>
+								</select>
+							</td>
+							<td style="display: block">
+								<div style="margin-left: 10px;">
+									<input type="text" id="metaIdInput" style="margin-bottom: 5px;">
+									<span>&nbsp;&nbsp;</span>
+									<div>
+										<button class="imcmsFormBtnSmall" type="button" id="addMetaIdBtn">Add</button>
+										<span>&nbsp;&nbsp;</span>
+										<button class="imcmsFormBtnSmall" type="button" id="deleteMetaIdBtn">Delete
+										</button>
+									</div>
+								</div>
+							</td>
+						</tr>
+						<tr id="documentsRange" <%=formData.list != null ? "style='display: none'" : "" %>>
+							<td><? imcms/lang/jsp/document_list.jsp/1003 ?></td>
+							<td>&nbsp;&nbsp;</td>
+							<td>
+								<input type="text" id="<%= ListDocuments.PARAMETER__LIST_START %>"
+									   name="<%= ListDocuments.PARAMETER__LIST_START %>"
+									   value="<%= formData.selectedRange.getMinimumInteger() %>" size="6">
+							</td>
+							<td>&nbsp;&nbsp;</td>
+							<td><? imcms/lang/jsp/document_list.jsp/1004 ?></td>
+							<td>&nbsp;&nbsp;</td>
+							<td>
+								<input type="text" id="<%= ListDocuments.PARAMETER__LIST_END %>"
+									   name="<%= ListDocuments.PARAMETER__LIST_END %>"
+									   value="<%= formData.selectedRange.getMaximumInteger() %>" size="6">
+							</td>
+							<td>&nbsp;&nbsp;</td>
+						</tr>
+						<tr style="display: block;margin-top: 5px">
+							<td>
+								<input type="hidden" name="<%=ListDocuments.PARAMETER__EXPORT_DOCUMENTS%>"
+									   value="true">
+							</td>
+							<td>
+								<input type="submit" class="imcmsFormBtnSmall"
+									   id="listBtn"
+									   name="<%= ListDocuments.PARAMETER_BUTTON__LIST %>"
+									   value=" <? imcms/lang/jsp/document_list.jsp/2002 ?> ">
+							</td>
+						</tr>
+					</table>
+				</form>
+			</td>
+		</tr>
+		<tr>
+			<td>#gui_hr( "blue" )</td>
+		</tr>
+	</table>
+	<%
+		if (null != formData.documentsIterator) { %>
+
+	<table border="0" cellspacing="0" cellpadding="2" width="680" id="documentsTable">
+		<tr>
+			<td style="width: 20%"><b><? global/Page_alias ?>&nbsp;</b></td>
+			<td style="width: 5%"><b><? web/imcms/lang/jsp/heading_status ?>&nbsp;</b></td>
+			<td style="width: 5%"><b><? web/imcms/lang/jsp/heading_type ?></b></td>
+			<td style="width: 64%"><b><? web/imcms/lang/jsp/heading_adminlink ?></b></td>
+			<td style="width: 5%"><b><? web/imcms/lang/jsp/export_allowed ?></b></td>
+			<td style="width: 1%"><b></b></td>
+		</tr>
+		<%
+			DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
+			UserDomainObject user = Utility.getLoggedOnUser(request);
+			Map documentTypes = documentMapper.getAllDocumentTypeIdsAndNamesInUsersLanguage(user);
+
+			while (formData.documentsIterator.hasNext()) {
+				DocumentDomainObject document = (DocumentDomainObject) formData.documentsIterator.next();
+		%>
+		<tr>
+			<td colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1_cccccc.gif" width="100%" height="1">
+			</td>
+		</tr>
+		<tr valign="top" data-id="<%= document.getId() %>" data-exported="<%= document.isExported() %>"><%
+			String alias = document.getAlias();
+			if (alias != null) {
+		%>
+			<td><a name="alias"
+			       href="$contextPath/<%= document.getAlias() %>"><%= StringEscapeUtils.escapeHtml(document.getAlias()) %>
+			</a></td>
+			<% } else { %>
+			<td>&nbsp;</td>
+			<%}%>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<%= Html.getLinkedStatusIconTemplate(document, user, request) %>
+			</td>
+			<td nowrap><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<%= StringEscapeUtils.escapeHtml((String) documentTypes.get(document.getDocumentTypeId()))%>&nbsp;
+			</td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<a name="<%= document.getId() %>"
+				   href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>"><%=
+				document.getId() %> - <%= StringEscapeUtils.escapeHtml(document.getHeadline()) %>
+				</a>
+			</td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<input <%= document.isPublished() ? "" : "disabled" %> name="allowedToExport"
+				                                                       onclick="onAllowedToExportCheckboxClick.call(this,<%=document.getId()%>)"
+				                                                       type="checkbox" <%= document.isExportAllowed() && document.isPublished() ? "checked":"" %> >
+			</td>
+			<% if (document.isExported()) {
+			%>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<span class="checkmark" title="<? web/imcms/lang/jsp/exported ?>"></span>
+			</td>
+			<%
+				}
+			%>
+		</tr>
+		<%
+			}%>
+		<tfoot>
+		<tr>
+			<td colspan="6">#gui_hr( "blue" )</td>
+		</tr>
+		<tr>
+			<td colspan="6" align="right">
+				<div class="loading-animation" style="display: none;float:left;" id="spinner"></div>
+				<%
+					if ((request.getParameter("start") != null && request.getParameter("end") != null) || request.getParameter("documentsList") != null) {
+				%>
+				<div style="display: inline-block; margin: 0 5px 0 0;">
+					<div style="display: inline-block;">
+						<div style="display: inline-block;"><input type="checkbox" name="skipExported" id="skipExported" checked></div>
+						<div style="display: inline-block;">
+							<label style="vertical-align: bottom" for="skipExported"><? imcms/lang/jsp/export/export_document_list.jsp/skip_exported ?></label>
+						</div>
+					</div>
+					<div style="display: inline-block;">
+						<div style="display: inline-block;"><input type="checkbox" name="exportImages" id="exportImages"></div>
+						<div style="display: inline-block;">
+							<label style="vertical-align: bottom" for="exportImages"><? imcms/lang/jsp/export/export_document_list.jsp/export_images ?></label>
+						</div>
+					</div>
+					<div style="display: inline-block;">
+						<div style="display: inline-block;"><input type="checkbox" name="exportFiles" id="exportFiles"></div>
+						<div style="display: inline-block;">
+							<label style="vertical-align: bottom" for="exportFiles"><? imcms/lang/jsp/export/export_document_list.jsp/export_files ?></label>
+						</div>
+					</div>
+				</div>
+				<%
+					}
+				%>
+				<form method="get" action="AdminManager" style="display: inline-block;">
+					<input type="submit" class="imcmsFormBtn" name="" id="cancelBtn" value="<? global/cancel ?>">
+				</form>
+				<div style="display: inline-block;">
+					<input type="submit" class="imcmsFormBtn" name="" id="exportBtn" value="<? global/export ?>">
+				</div>
+		</tr>
+		</tfoot>
+	</table>
+	<%
+		}%>
+	#gui_end_of_page()
+</vel:velocity>
+
+<script type="application/javascript">
+	const $form = document.getElementById("form");
+	const $documentsTable = document.getElementById("documentsTable");
+	const $cancelBtn = document.getElementById("cancelBtn");
+	const $exportBtn = document.getElementById("exportBtn");
+	const $listStartInput = document.getElementById("start");
+	const $listEndInput = document.getElementById("end");
+	const $skipExportedInput = document.getElementById("skipExported");
+	const $exportImagesInput = document.getElementById("exportImages");
+	const $exportFilesInput = document.getElementById("exportFiles");
+	const $tbody = $documentsTable?.querySelector("tbody");
+	const $spinner = document.getElementById("spinner");
+
+	const $documentsListSelect = document.getElementById("documentsListSelect");
+	const $metaIdInput = document.getElementById("metaIdInput");
+	const $addMetaIdBtn = document.getElementById("addMetaIdBtn");
+	const $deleteMetaIdBtn = document.getElementById("deleteMetaIdBtn");
+
+	const $documentsList = document.getElementById("documentsList");
+	const $documentsRange = document.getElementById("documentsRange");
+	const $changeInput=document.getElementById("changeInput");
+
+	function onAllowedToExportCheckboxClick(docId) {
+		const $row = this.closest("tr");
+		$row.style.opacity = "0.5";
+		const data = {
+			docId: docId,
+			allowedToExport: this.checked
+		};
+
+		const saveRequest = new Request("/servlet/UpdateDocumentExportStatusServlet", {
+			cache: "no-cache",
+			method: "POST",
+			body: JSON.stringify(data),
+		});
+
+		fetch(saveRequest)
+			.then(response => {
+				if (response.ok) {
+					$row.style.opacity = "1";
+				}
+			})
+	}
+
+	$exportBtn?.addEventListener('click', (e) => {
+		e.preventDefault();
+		disableButtons();
+
+		const documentsId = Array.from($documentsListSelect.options).map(option => option.value);
+		const url = new URLSearchParams();
+
+		if ($skipExportedInput.checked) url.append("skipExported", "true");
+        if ($exportImagesInput.checked) url.append("exportImages", "true");
+        if ($exportFilesInput.checked) url.append("exportFiles", "true");
+
+		url.append("start", $listStartInput.value);
+		url.append("end", $listEndInput.value);
+		url.append("documentsList", documentsId.toString());
+
+		const exportRequest = new Request("/servlet/ExportDocuments?" + url.toString(), {
+			cache: "no-cache",
+			method: "POST",
+		});
+
+		$spinner.style.display = "inline-block";
+		fetch(exportRequest)
+				.then(response => {
+					if (response.ok) {
+						window.location.replace("/servlet/ExportDocuments")
+					}
+					$spinner.style.display = "none";
+				})
+	})
+
+	function disableButtons() {
+		const $buttons = [$cancelBtn, $exportBtn];
+
+		$tbody.style.opacity = "0.5";
+		$buttons.forEach(button => {
+			button.disabled = true;
+			button.style.cursor = "not-allowed"
+		})
+	}
+
+	$metaIdInput.addEventListener("paste",function (e) {
+		e.preventDefault();
+
+		const data = (e.clipboardData || window.clipboardData).getData("text");
+		data.split(" ").forEach(metaId => {
+			if (!document.getElementById(metaId) && !isNaN(parseInt(metaId))) {
+				const $option = buildMetaIdOption(metaId);
+				$documentsListSelect.appendChild($option);
+
+				const $input = buildMetaIdInput(metaId);
+				$form.appendChild($input);
+			}
+		})
+
+		$metaIdInput.value = "";
+	})
+
+	$addMetaIdBtn.addEventListener('click', (e) => {
+		e.preventDefault();
+		const metaId = $metaIdInput.value;
+
+		if (isNaN(parseInt(metaId))) {
+			alert("Input only meta id");
+			return;
+		}
+
+		if (document.getElementById(metaId)){
+			alert("Duplicate meta id");
+			return;
+		}
+
+		const $option = buildMetaIdOption(metaId);
+		$documentsListSelect.appendChild($option);
+
+		const $input = buildMetaIdInput(metaId);
+		$form.appendChild($input);
+
+		$metaIdInput.value = "";
+	})
+	
+	function buildMetaIdOption(metaId) {
+		const $option = document.createElement("option");
+		$option.value = metaId;
+		$option.innerHTML = metaId;
+
+		return $option
+	}
+
+	function buildMetaIdInput(metaId) {
+		const $input = document.createElement("input");
+		$input.value = metaId;
+		$input.id = metaId;
+		$input.hidden = true;
+		$input.name = "documentsList";
+
+		return $input;
+	}
+
+	$deleteMetaIdBtn.addEventListener('click', (e) => {
+		e.preventDefault();
+		const selectedOptions = Array.from($documentsListSelect.selectedOptions);
+
+		if (!selectedOptions.length) {
+			alert("Select option/s first")
+		}
+
+		//iterate in reverse order to prevent index updating in select
+		for (let i = selectedOptions.length - 1; i >= 0; i--) {
+			$documentsListSelect.remove(selectedOptions[i].index);
+			document.getElementById(selectedOptions[i].value).remove();
+		}
+	})
+
+	const hideEvent = new Event("hide-element-event");
+	const showEvent = new Event("show-element-event");
+
+	$documentsList.addEventListener("show-element-event", (e) => {
+		$documentsList.style.display = "table-row";
+	})
+
+	$documentsList.addEventListener("hide-element-event", (e) => {
+		$documentsList.style.display = "none";
+	})
+
+	$documentsRange.addEventListener("show-element-event", (e) => {
+		$documentsRange.style.display = "table-row";
+	})
+
+	$documentsRange.addEventListener("hide-element-event", (e) => {
+		$documentsRange.style.display = "none";
+	})
+
+	$changeInput.addEventListener("click", (e) => {
+		if ($documentsRange.style.display !== "none") {
+			$documentsList.dispatchEvent(showEvent);
+			$documentsRange.dispatchEvent(hideEvent);
+		} else {
+			$documentsRange.dispatchEvent(showEvent);
+			$documentsList.dispatchEvent(hideEvent);
+		}
+	})
+
+</script>
diff --git a/web/imcms/lang/jsp/export/export_summary.jsp b/web/imcms/lang/jsp/export/export_summary.jsp
new file mode 100644
index 0000000000..05b48a51d1
--- /dev/null
+++ b/web/imcms/lang/jsp/export/export_summary.jsp
@@ -0,0 +1,113 @@
+<%@ page import="com.imcode.imcms.servlet.superadmin.ListDocuments,
+                 imcode.server.document.DocumentDomainObject,
+                 org.apache.commons.lang.StringEscapeUtils,
+                 imcode.server.Imcms,
+                 imcode.util.Utility,
+                 imcode.server.user.UserDomainObject,
+                 java.util.*,
+                 imcode.util.Html" %>
+<%@ page import="com.imcode.imcms.mapping.DocumentMapper" %>
+<%@ page import="com.imcode.imcms.domain.dto.export.DocumentExportHistory" %>
+<%@page contentType="text/html; charset=UTF-8" %>
+<%@taglib prefix="vel" uri="imcmsvelocity" %>
+<% final DocumentExportHistory history = (DocumentExportHistory) request.getAttribute("history");%>
+<vel:velocity>
+
+	#gui_start_of_page( "<? imcms/lang/jsp/export/export_summary.jsp/title ?>" "AdminManager" "" "ListDocument" "" )
+
+	<table border="0" cellspacing="0" cellpadding="2" width="680" id="documentsTable">
+		<tr>
+			<td style="width: 20%"><b><? global/Page_alias ?>&nbsp;</b></td>
+			<td style="width: 5%"><b><? web/imcms/lang/jsp/heading_status ?>&nbsp;</b></td>
+			<td style="width: 5%"><b><? web/imcms/lang/jsp/heading_type ?></b></td>
+			<td style="width: 64%"><b><? web/imcms/lang/jsp/heading_adminlink ?></b></td>
+			<td style="width: 1%"><b></b></td>
+		</tr>
+		<%
+
+			final DocumentMapper documentMapper = Imcms.getServices().getDocumentMapper();
+			final UserDomainObject user = Utility.getLoggedOnUser(request);
+			final Map documentTypes = documentMapper.getAllDocumentTypeIdsAndNamesInUsersLanguage(user);
+			Iterator iterator;
+			if (history.getDocumentList() != null) {
+				iterator = documentMapper.getDocumentsIteratorIn(history.getDocumentList());
+			} else {
+				iterator = documentMapper.getDocumentsIteratorInRange(history.getRange());
+			}
+
+			while (iterator.hasNext()) {
+				final DocumentDomainObject document = (DocumentDomainObject) iterator.next();
+		%>
+		<tr>
+			<td colspan="6"><img src="$contextPath/imcms/$language/images/admin/1x1_cccccc.gif" width="100%" height="1">
+			</td>
+		</tr>
+		<tr valign="top" id="<%= document.getId() %>"><%
+			String alias = document.getAlias();
+			if (alias != null) {
+		%>
+			<td><a name="alias"
+			       href="$contextPath/<%= document.getAlias() %>"><%= StringEscapeUtils.escapeHtml(document.getAlias()) %>
+			</a></td>
+			<% } else { %>
+			<td>&nbsp;</td>
+			<%}%>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<%= Html.getLinkedStatusIconTemplate(document, user, request) %>
+			</td>
+			<td nowrap><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<%= StringEscapeUtils.escapeHtml((String) documentTypes.get(document.getDocumentTypeId()))%>&nbsp;
+			</td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<a name="<%= document.getId() %>"
+				   href="$contextPath/servlet/AdminDoc?meta_id=<%= document.getId() %>"><%=
+				document.getId() %> - <%= StringEscapeUtils.escapeHtml(document.getHeadline()) %>
+				</a>
+			</td>
+			<td><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="2"><br>
+				<%
+					switch (history.getStatus(document.getId())) {
+						case SUCCESS:
+							out.write("<span title=\"Exported\" class=\"checkmark\"></span>");
+							break;
+						case FAILED:
+							out.write("<span title=\"Failed\" class=\"close\"></span>");
+							break;
+						case SKIPPED:
+							out.write("<span style=\"padding-left:3px;\">" +
+									"<svg width=\"16px\" height=\"16px\" viewBox=\"-1.6 -1.6 19.20 19.20\" xmlns=\"http://www.w3.org/2000/svg\"\n" +
+									"\t\t\t\t     fill=\"none\" stroke=\"grey\">\n" +
+									"<title> Skipped </title>" +
+									"\t\t\t\t\t<g id=\"SVGRepo_bgCarrier\" stroke-width=\"0\"></g>\n" +
+									"\t\t\t\t\t<g id=\"SVGRepo_iconCarrier\">\n" +
+									"\t\t\t\t\t\t<path fill=\"#20568d\" fill-rule=\"evenodd\"\n" +
+									"\t\t\t\t\t\t      d=\"M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 0110.535-5.096l-9.131 9.131A6.472 6.472 0 011.5 8zm2.465 5.096a6.5 6.5 0 009.131-9.131l-9.131 9.131z\"\n" +
+									"\t\t\t\t\t\t      clip-rule=\"evenodd\"></path>\n" +
+									"\t\t\t\t\t</g>\n" +
+									"\t\t\t\t</svg>" +
+									"</span>");
+							break;
+					}
+				%>
+			</td>
+		</tr>
+		<%
+			}%>
+		<tfoot>
+		<tr>
+			<td colspan="6">#gui_hr( "blue" )</td>
+		</tr>
+		<tr>
+			<td colspan="5" align="right">
+				<div style="display: inline-block;">
+					<a class="imcmsFormBtn" name="" style="text-decoration:none;"
+					   href="/servlet/ExportDocuments?download=true"><? global/download ?></a>
+				</div>
+			</td>
+		</tr>
+		</tfoot>
+	</table>
+	<%--	<%--%>
+	<%--		}%>--%>
+	#gui_end_of_page()
+</vel:velocity>
diff --git a/web/imcms/lang/jsp/internalerrorpage.jsp b/web/imcms/lang/jsp/internalerrorpage.jsp
deleted file mode 100644
index 3368f8d2fa..0000000000
--- a/web/imcms/lang/jsp/internalerrorpage.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@ page isErrorPage="true" import="java.io.*, org.apache.commons.lang.StringEscapeUtils"%>
-<%@ page contentType="text/html; charset=UTF8" %>  
-<html>
-<head>
-<title><? install/htdocs/sv/jsp/internalerrorpage.jsp/1 ?></title>
-
-</head>
-<body>
-<H1><? install/htdocs/sv/jsp/internalerrorpage.jsp/2 ?></H1>
-<p><? install/htdocs/sv/jsp/internalerrorpage.jsp/3 ?>
-</p>
-<p><? install/htdocs/sv/jsp/internalerrorpage.jsp/4 ?> </p>
-<p><? install/htdocs/sv/jsp/internalerrorpage.jsp/5 ?> </p>
-<h2><? install/htdocs/sv/jsp/internalerrorpage.jsp/6 ?></h2>
-<pre>
-<? install/htdocs/sv/jsp/internalerrorpage.jsp/7 ?>
-<%
-    Integer errorCode = (Integer)request.getAttribute("javax.servlet.error.status_code");
-    if( null != errorCode ) {
-        out.println( errorCode );
-    }
-%>
-<? install/htdocs/sv/jsp/internalerrorpage.jsp/8 ?>
-<%
-    String errorMessage = (String)request.getAttribute("javax.servlet.error.message");
-    if( null != errorMessage ) {
-        out.println( StringEscapeUtils.escapeHtml(errorMessage) );
-    }
-%>
-<? install/htdocs/sv/jsp/internalerrorpage.jsp/exception ?>
-<%
-    Throwable exceptionFromRequest = (Throwable)request.getAttribute("javax.servlet.error.exception");
-    if( null != exceptionFromRequest ) {
-        StringWriter writer = new StringWriter();
-        exceptionFromRequest.printStackTrace(new PrintWriter(writer));
-        out.println(StringEscapeUtils.escapeHtml(writer.toString()));
-    }
-%>
-</pre>
-</body>
-</html>
diff --git a/web/imcms/lang/jsp/search_documents_form.jsp b/web/imcms/lang/jsp/search_documents_form.jsp
index 9ca7ae2333..d66ea9e4d5 100644
--- a/web/imcms/lang/jsp/search_documents_form.jsp
+++ b/web/imcms/lang/jsp/search_documents_form.jsp
@@ -175,14 +175,14 @@
                 <select name="<%= SearchDocumentsPage.REQUEST_PARAMETER__DOCUMENTS_PER_PAGE %>">
                     <%
                         Integer[] ranges = new Integer[] {
-                            new Integer( 5 ),
-                            new Integer( 10 ),
-                            new Integer( 20 ),
-                            new Integer( 100 ),
-                            new Integer( 1000 ),
+                                5,
+                                10,
+                                20,
+                                100,
+                                1000,
                         } ;
                     %>
-                    <%= Html.createOptionList(Arrays.asList(ranges), new Integer( documentsPerPage ), new ToDoubleObjectStringPairTransformer()) %>
+                    <%= Html.createOptionList(Arrays.asList(ranges), documentsPerPage, new ToDoubleObjectStringPairTransformer()) %>
                 </select>
             </td>
         </tr>
diff --git a/web/imcms/lang/jsp/text_restorer.jsp b/web/imcms/lang/jsp/text_restorer.jsp
index 03036ce3ec..bc43961e76 100644
--- a/web/imcms/lang/jsp/text_restorer.jsp
+++ b/web/imcms/lang/jsp/text_restorer.jsp
@@ -111,7 +111,8 @@ if (action.equals("setDateSpan")) {
 } else if (session.getAttribute("EDITOR_SAVER_DATE_SPAN") != null) {
 	dateSpan = (String) session.getAttribute("EDITOR_SAVER_DATE_SPAN") ;
 } else {
-	dateSpan = " AND t.modified_datetime >= '" + dfD.format(new Date()) + "' AND t.modified_datetime <= '" + dfD.format(tomorrow) + "'" ;
+	// OLD DEFAULT - ONE DAY: dateSpan = " AND t.modified_datetime >= '" + dfD.format(new Date()) + "' AND t.modified_datetime <= '" + dfD.format(tomorrow) + "'" ;
+	dateSpan = "" ; // NEW DEFAULT - ALL
 }
 
 String sContent  = "" ;
@@ -291,12 +292,12 @@ function initRestore() {
 		
 		if (confirm("<%= isSwe ? "Vill du kopiera denna version till text-editorn?" : "Do you want to copy this version to the the text editor?" %>")) {
 			
-			var xinha = null ;
-			var xinhaActive = false ;
+			var editor = null ;
+			var editorActive = false ;
 			try {
-				xinha = eval("parent.parent.opener.xinha_editors.text") ;
-				var xinhaIframe = eval("parent.parent.opener.document.getElementById('XinhaIFrame_text')") ;
-				xinhaActive = (xinha && xinhaIframe) ;
+				editor = eval("parent.parent.opener.CKEDITOR.instances['text']") ;
+				//var xinhaIframe = eval("parent.parent.opener.document.getElementById('XinhaIFrame_text')") ;
+				editorActive = (undefined != editor) ;
 			} catch (ex) {}
 			
 			// Copy plain text
@@ -307,9 +308,11 @@ function initRestore() {
 				if (openerTextField) {
 					openerTextField.value = theContent ;
 					isCopied = true ;
-				} else if (xinhaActive) {
+				} else if (editorActive) {
 					parent.parent.opener.setTextMode() ;
-					window.setTimeout(function() { openerTextArea.value = theContent; }, 500) ;
+					window.setTimeout(function() {
+						openerTextArea.value = theContent;
+					}, 500) ;
 					isCopied = true ;
 				} else if (openerTextArea) {
 					openerTextArea.value = theContent ;
@@ -326,8 +329,8 @@ function initRestore() {
 				if (openerTextField) {
 					openerTextField.value = theContent ;
 					isCopied = true ;
-				} else if (xinhaActive) {
-					xinha.setEditorContent(theContent) ;
+				} else if (editorActive) {
+					editor.setData(theContent) ;
 					isCopied = true ;
 				} else if (openerTextArea) {
 					openerTextArea.value = theContent ;
@@ -377,7 +380,7 @@ String heading = isSwe ? "Tidigare versioner av textfält #TXT# på sida #META##
 
 String alias = thisDoc.getAlias() != null ? thisDoc.getAlias() : "" ;
 if (!alias.equals("")) {
-	alias = " &nbsp;<span style='font-size:11px; font-weight:normal;'>&quot;" + alias + "&quot;</span>" ;
+	alias = " &nbsp;<span style='font-size:11px; font-weight:normal;' title='" + StringEscapeUtils.escapeHtml(alias) + "'>&quot;" + StringUtils.abbreviate(alias, 45) + "&quot;</span>" ;
 }
 
 heading = heading
diff --git a/web/imcms/lang/jsp/userbrowser.jsp b/web/imcms/lang/jsp/userbrowser.jsp
index bed2a2407d..29c04f9831 100644
--- a/web/imcms/lang/jsp/userbrowser.jsp
+++ b/web/imcms/lang/jsp/userbrowser.jsp
@@ -26,22 +26,25 @@
 <script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
 
 </head>
-<body onLoad="focusField(0,'<%= UserBrowser.REQUEST_PARAMETER__SEARCH_STRING %>');">
+<body onLoad="focusField(1,'<%= UserBrowser.REQUEST_PARAMETER__SEARCH_STRING %>');">
 	#gui_outer_start()
 	#gui_head( "<? templates/sv/AdminManager_adminTask_element.htm/2 ?>" )
-    <table border="0" cellspacing="0" cellpadding="0">
+
 <form name="argumentForm" action="UserBrowser" method="GET" target="_top">
+<table border="0" cellspacing="0" cellpadding="0">
 <tr>
 	<td><input type="submit"  class="imcmsFormBtn" name="<%= UserBrowser.REQUEST_PARAMETER__CANCEL_BUTTON %>" value="<? global/back ?>"></td>
 	<td>&nbsp;</td>
 	<td><input type="button" value="<? global/help ?>" title="<? global/openthehelppage ?>" class="imcmsFormBtn" onClick="openHelpW('UserAdmin')"></td>
 </tr>
 </table>
+</form>
 #gui_mid()
 
+<form name="argumentForm" action="UserBrowser" method="GET" target="_top">
+<input type="hidden" name="<%= UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE %>"
+       value="<%= HttpSessionUtils.getSessionAttributeNameFromRequest( request, UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE ) %>">
 <table border="0" cellspacing="0" cellpadding="0" width="600" align="center">
-            <input type="hidden" name="<%= UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE %>"
-                                value="<%= HttpSessionUtils.getSessionAttributeNameFromRequest( request, UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE ) %>">
     <tr>
         <td colspan="2">#gui_heading( "<%= userFinder.getHeadline().toLocalizedString(request) %>" )</td>
     </tr>
@@ -50,7 +53,7 @@
         <td width="70%">
         <table border="0" cellspacing="0" cellpadding="0">
         <tr>
-            <td><input type="text" name="<%= UserBrowser.REQUEST_PARAMETER__SEARCH_STRING %>" size="20" maxlength="20" value="<%= StringEscapeUtils.escapeHtml(userBrowserPage.getSearchString()) %>"></td>
+            <td><input type="text" id="<%= UserBrowser.REQUEST_PARAMETER__SEARCH_STRING %>" name="<%= UserBrowser.REQUEST_PARAMETER__SEARCH_STRING %>" size="20" maxlength="250" value="<%= StringEscapeUtils.escapeHtml(userBrowserPage.getSearchString()) %>"></td>
             <td class="imcmsAdmDim">&nbsp; <? templates/sv/AdminChangeUser.htm/1001 ?></td>
         </tr>
         </table></td>
@@ -59,7 +62,7 @@
     <tr>
         <td class="imcmsAdmText"><? templates/sv/AdminChangeUser.htm/16 ?> </td>
         <td>
-            <select name="<%= UserBrowser.REQUEST_PARAMETER__ROLE_ID %>" size="5" multiple >
+            <select id="<%= UserBrowser.REQUEST_PARAMETER__ROLE_ID %>" name="<%= UserBrowser.REQUEST_PARAMETER__ROLE_ID %>" size="5" multiple >
             <%= Html.createOptionList(Arrays.asList(allRoles), userBrowserPage.getSelectedRoles(), new UserEditorPage.RoleToStringPairTransformer()) %>
 		    </select>
         </td>
@@ -76,11 +79,17 @@
             <td>&nbsp;</td>
         </tr>
         <tr>
-            <td><input type="submit" class="imcmsFormBtnSmall" name="<%= UserBrowser.REQUEST_PARAMETER__SHOW_USERS_BUTTON %>" value="<? templates/sv/AdminChangeUser.htm/2004 ?>"></td>
+            <td><input type="submit" class="imcmsFormBtnSmall" id="<%= UserBrowser.REQUEST_PARAMETER__SHOW_USERS_BUTTON %>" name="<%= UserBrowser.REQUEST_PARAMETER__SHOW_USERS_BUTTON %>" value="<? templates/sv/AdminChangeUser.htm/2004 ?>"></td>
         </tr>
         </table>
     </td>
     </tr>
+</table>
+</form>
+<form name="argumentForm" action="UserBrowser" method="GET" target="_top">
+<input type="hidden" name="<%= UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE %>"
+       value="<%= HttpSessionUtils.getSessionAttributeNameFromRequest( request, UserBrowser.REQUEST_ATTRIBUTE_PARAMETER__USER_BROWSE ) %>">
+<table border="0" cellspacing="0" cellpadding="0" width="600" align="center">
     <tr>
         <td colspan="2">#gui_hr( "cccccc" )</td>
     </tr>
@@ -95,7 +104,7 @@
         <table border="0" cellspacing="0" cellpadding="0" width="100%">
         <tr valign="top">
             <td width="80%">
-            <select name="<%= UserBrowser.REQUEST_PARAMETER__USER_ID %>" size="15" style="width: 100%;">
+            <select id="<%= UserBrowser.REQUEST_PARAMETER__USER_ID %>" name="<%= UserBrowser.REQUEST_PARAMETER__USER_ID %>" size="15" style="width: 100%;">
                 <%
 
                     for ( int i = 0; i < users.length; i++ ) {
@@ -105,9 +114,17 @@
             </select></td>
             <td width="20%" align="right">
             <input type="submit" class="imcmsFormBtnSmall"
+                id="<%= UserBrowser.REQUEST_PARAMETER__SELECT_USER_BUTTON %>"
                 name="<%= UserBrowser.REQUEST_PARAMETER__SELECT_USER_BUTTON %>"
                 value="<%= userFinder.getSelectButtonText().toLocalizedString(request) %>"
                 style="width:10em">
+
+                <div><img src="$contextPath/imcms/$language/images/admin/1x1.gif" width="1" height="3"></div>
+                <input type="submit" class="imcmsFormBtnSmall"
+                       name="<%= UserBrowser.REQUEST_PARAMETER__ARCHIVE_USER_BUTTON %>"
+                       value="<? templates/sv/AdminChangeUser.htm/2008 ?>"
+                       style="width:10em">
+
             <%
                 UserDomainObject user = Utility.getLoggedOnUser(request);
                 if (userFinder.isUsersAddable() && (user.isSuperAdmin() || user.isUserAdminAndCanEditAtLeastOneRole())) { %>
@@ -120,11 +137,34 @@
         </tr>
         </table></td>
     </tr>
-</form>
 </table>
+</form>
+
+<script type="text/javascript">
+jQ(document).ready(function($) {
+	<%--
+	When somethings selected in a selectBox and you click [Enter], then the default button is clicked.
+	--%>
+	$('#<%= UserBrowser.REQUEST_PARAMETER__ROLE_ID %>').keypress(function (e) {
+		if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
+			$('#<%= UserBrowser.REQUEST_PARAMETER__SHOW_USERS_BUTTON %>').click() ;
+			return false ;
+		} else {
+			return true ;
+		}
+	}) ;
+	
+	$('#<%= UserBrowser.REQUEST_PARAMETER__USER_ID %>').keypress(function (e) {
+		if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
+			$('#<%= UserBrowser.REQUEST_PARAMETER__SELECT_USER_BUTTON %>').click() ;
+			return false ;
+		} else {
+			return true ;
+		}
+	}) ;
+	
+}) ;
 
-<script language="JavaScript">
-<!--
 var sSearch = unescape(getParam("search")) ;
 if (sSearch != "" && sSearch != " ") document.forms[1].searchstring.value = sSearch ;
 
@@ -137,7 +177,6 @@ function evalEditUser() {
 		return true;
 	}
 }
-//-->
 </script>
 #gui_end_of_page()
 </vel:velocity>
\ No newline at end of file
diff --git a/web/imcms/lang/jsp/usereditor.jsp b/web/imcms/lang/jsp/usereditor.jsp
index 04357f27d8..ccd76aaa98 100644
--- a/web/imcms/lang/jsp/usereditor.jsp
+++ b/web/imcms/lang/jsp/usereditor.jsp
@@ -1,272 +1,362 @@
-<%@ page import="com.imcode.imcms.flow.OkCancelPage"%><%@ page  import="com.imcode.imcms.flow.Page"%>
-<%@ page import="com.imcode.imcms.servlet.superadmin.UserEditorPage"%><%@ page import="com.imcode.imcms.util.l10n.LocalizedMessage"%>
-<%@ page import="imcode.server.user.UserDomainObject"%><%@  page import="imcode.util.DateConstants"%>
-<%@ page import="imcode.util.Utility"%><%@ page import="org.apache.commons.lang.StringEscapeUtils"%>
-<%@ page import="java.text.SimpleDateFormat, imcode.server.Imcms"%>
+<%@ page import="com.imcode.imcms.flow.OkCancelPage" %>
+<%@ page import="com.imcode.imcms.flow.Page" %>
+<%@ page import="com.imcode.imcms.servlet.superadmin.UserEditorPage" %>
+<%@ page import="com.imcode.imcms.util.l10n.LocalizedMessage" %>
+<%@ page import="imcode.server.Imcms" %>
+<%@ page import="imcode.server.user.UserDomainObject" %>
+<%@ page import="imcode.util.DateConstants" %>
+<%@ page import="imcode.util.Utility" %>
+<%@ page import="org.apache.commons.lang.StringEscapeUtils, java.text.SimpleDateFormat" %>
+<%@ page import="static com.imcode.imcms.domain.services.core.TwoFactorAuthService.REQUEST_PARAMETER_2FA" %>
+<%@ page import="static com.imcode.imcms.domain.services.core.TwoFactorAuthService.PROPERTY_NAME_2FA" %>
+<%@ page import="static com.imcode.imcms.domain.services.core.TwoFactorAuthService.*" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%
     UserEditorPage userEditorPage = (UserEditorPage) Page.fromRequest(request);
-    UserDomainObject editedUser = userEditorPage.getEditedUser() ;
-		try {
-			if (editedUser != null && (editedUser.getLanguageIso639_2() == null || editedUser.getLanguageIso639_2().equals(""))) {
-				String defaultLanguage = Imcms.getServices().getLanguageMapper().getDefaultLanguage();
-				editedUser.setLanguageIso639_2(defaultLanguage);
-			}
-		} catch(Exception e) {}
+    UserDomainObject editedUser = userEditorPage.getEditedUser();
+    try {
+        if (editedUser != null && (editedUser.getLanguageIso639_2() == null || editedUser.getLanguageIso639_2().equals(""))) {
+            String defaultLanguage = Imcms.getServices().getLanguageMapper().getDefaultLanguage();
+            editedUser.setLanguageIso639_2(defaultLanguage);
+        }
+    } catch (Exception e) {
+    }
     UserDomainObject loggedOnUser = Utility.getLoggedOnUser(request);
-    LocalizedMessage errorMessage = userEditorPage.getErrorMessage() ;
-%><%@taglib prefix="vel" uri="imcmsvelocity"%><vel:velocity><html>
-<head>
-<title><? templates/sv/AdminUserResp.htm/1 ?></title>
-<link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
-<script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
-<script language="javascript">
-<!--
-function evalPrepareAdd() {
-	// Lets check that those fields which are mandatory
-	var valFieldsOk = true;
-	if( document.forms[0].login_name.value == "" ) valFieldsOk = false
+    LocalizedMessage errorMessage = userEditorPage.getErrorMessage();
 
-	if(!valFieldsOk) {
-		var msg = "<? templates/sv/AdminUserResp.htm/2/1 ?>"
-		alert(msg)
-		return false
-	}
+    final boolean is2FA = Imcms.getServices().getConfig().getAuthenticationConfiguration().containsKey(PROPERTY_NAME_2FA);
+%>
+<%@taglib prefix="vel" uri="imcmsvelocity" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<vel:velocity>
+    <html>
+    <head>
+        <title><? templates/sv/AdminUserResp.htm/1 ?></title>
+        <link rel="stylesheet" type="text/css" href="$contextPath/imcms/css/imcms_admin.css.jsp">
+        <script src="$contextPath/imcms/$language/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+        <script type="text/javascript">
+            var $pw1, $pw2;
 
-	if(document.forms[0].password1.value != document.forms[0].password2.value){
-		var msg = "<? templates/sv/AdminUserResp.htm/2/2 ?>"
-		document.forms[0].password1.value = ""
-		document.forms[0].password2.value = ""
-		document.forms[0].password1.focus()
-		alert(msg)
-		return false
-	}
+            jQ(document).ready(function ($) {
+                $pw1 = $('input[name=password1]');
+                $pw2 = $('input[name=password2]');
+                window.setTimeout(function () {
+                    $pw1.attr('autocomplete', 'off').focus().val('');
+                    <%-- FF has a bug. Ignores autocomplete=off sometimes --%>
+                }, 100);
+            });
 
-	return true
-}
+            function evalPrepareAdd() {
+                if ('' == jQ('input[name=login_name]').val()) {
+                    alert("<? templates/sv/AdminUserResp.htm/2/1 ?>");
+                    return false;
+                }
+                var $pw1 = jQ('input[name=password1]');
+                var $pw2 = jQ('input[name=password2]');
+                if ($pw1.val() != $pw2.val()) {
+                    $pw1.val('');
+                    $pw2.val('');
+                    $pw1.focus();
+                    alert("<? templates/sv/AdminUserResp.htm/2/2 ?>");
+                    return false;
+                }
+                return true;
+            }
+
+            function activateUseradmin_roles() {
+                if (document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %>) {
+                    var list = document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__ROLE_IDS %>;
+                    document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %>.disabled = true;
+                    for (i = 0; i < list.length; i++) {
+                        if (list.options[i].text == "Useradmin" && list.options[i].selected) {
+                            document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %>.disabled = false;
+                        }
+                    }
+                }
+            }
+        </script>
 
-function activateUseradmin_roles(){
-	if ( document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %> ){
-		var list = document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__ROLE_IDS %>;
-		document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %>.disabled = true;
-		for ( i = 0 ; i < list.length ; i++ ){
-			if ( list.options[i].text == "Useradmin"  && list.options[i].selected ){
-				document.forms[0].<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %>.disabled = false;
-			}
-		}
-	}
-}
+    </head>
+    <body bgcolor="#FFFFFF"
+          onLoad="focusField(0,'<%= UserEditorPage.REQUEST_PARAMETER__LOGIN_NAME %>'); activateUseradmin_roles(); return true">
 
-//-->
-</script>
 
-</head>
-<body bgcolor="#FFFFFF" onLoad="focusField(0,'<%= UserEditorPage.REQUEST_PARAMETER__LOGIN_NAME %>'); activateUseradmin_roles(); return true">
+    #gui_outer_start()
+    #gui_head( "<? global/imcms_administration ?>" )
 
+    <form method="post" action="$contextPath/servlet/PageDispatcher">
+        <%= Page.htmlHidden(request) %>
+        <table border="0" cellspacing="0" cellpadding="0">
+            <tr>
+                <td><input type="submit" class="imcmsFormBtn" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>"
+                           value="<? templates/sv/AdminUserResp.htm/2001 ?>"></td>
+                <td>&nbsp;</td>
+                <td><input type="button" value="<? templates/sv/AdminUserResp.htm/2002 ?>"
+                           title="<? templates/sv/AdminUserResp.htm/2003 ?>" class="imcmsFormBtn"
+                           onClick="openHelpW('UserEdit')"></td>
+            </tr>
+        </table>
+        #gui_mid()
 
-#gui_outer_start()
-#gui_head( "<? global/imcms_administration ?>" )
+        <table border="0" cellspacing="0" cellpadding="0" width="660" align="center">
+            <tr>
+                <td colspan="2">#gui_heading( "<? templates/sv/AdminUserResp.htm/5/1 ?>" )</td>
+            </tr>
+            <tr>
+                <td colspan="2" class="imcmsAdmText">
+                    <? templates/sv/AdminUserResp.htm/6 ?></td>
+            </tr>
+            <tr>
+                <td colspan="2">#gui_hr( "cccccc" )</td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/8 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__LOGIN_NAME %>" size="25"
+                           maxlength="250" value="<%= StringEscapeUtils.escapeHtml(editedUser.getLoginName()) %>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText" nowrap><? templates/sv/AdminUserResp.htm/10 ?> <span
+                        class="imcmsAdmDim"><? templates/sv/AdminUserResp.htm/11 ?></span> &nbsp;
+                </td>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <td><input type="password" name="<%= UserEditorPage.REQUEST_PARAMETER__PASSWORD1 %>"
+                                       size="16" maxlength="250" value=""></td>
+                            <td class="imcmsAdmText" nowrap>&nbsp; <? templates/sv/AdminUserResp.htm/1001 ?> &nbsp;</td>
+                            <td><input type="password" name="<%= UserEditorPage.REQUEST_PARAMETER__PASSWORD2 %>"
+                                       size="16" maxlength="250" value=""></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/14 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__FIRST_NAME %>" size="25"
+                           maxlength="25" value="<%= StringEscapeUtils.escapeHtml(editedUser.getFirstName()) %>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/16 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__LAST_NAME %>" size="25"
+                           maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getLastName()) %>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/18 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__TITLE %>" size="25" maxlength="30"
+                           value="<%= StringEscapeUtils.escapeHtml(editedUser.getTitle()) %>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/20 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__COMPANY %>" size="25" maxlength="30"
+                           value="<%= StringEscapeUtils.escapeHtml(editedUser.getCompany())%>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/22 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__ADDRESS %>" size="25" maxlength="30"
+                           value="<%= StringEscapeUtils.escapeHtml(editedUser.getAddress())%>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/24 ?></td>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__ZIP %>" size="7"
+                                       maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getZip())%>">
+                            </td>
+                            <td>&nbsp;</td>
+                            <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__CITY %>" size="25"
+                                       maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getCity())%>">
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/27 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__DISTRICT %>" size="25" maxlength="30"
+                           value="<%= StringEscapeUtils.escapeHtml(editedUser.getProvince())%>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/29 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__COUNTRY %>" size="25" maxlength="30"
+                           value="<%= StringEscapeUtils.escapeHtml(editedUser.getCountry())%>"></td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/30 ?></td>
+                <td><select
+                        name="<%= UserEditorPage.REQUEST_PARAMETER__LANGUAGE %>"><%= userEditorPage.createLanguagesHtmlOptionList(loggedOnUser, editedUser) %>
+                </select></td>
+            </tr>
+            <tr>
+                <td colspan="2">#gui_hr( "cccccc" )</td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/32 ?></td>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <td>
+                                <select name="<%= UserEditorPage.REQUEST_PARAMETER__PHONE_NUMBER_TYPE_ID %>" size="1">
+                                    <%= userEditorPage.createPhoneTypesHtmlOptionList(loggedOnUser, userEditorPage.getCurrentPhoneNumber().getType()) %>
+                                </select></td>
+                            <td>&nbsp;</td>
+                            <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__EDITED_PHONE_NUMBER %>"
+                                       size="16" maxlength="25" value="<%= userEditorPage.getCurrentPhoneNumber() %>">
+                            </td>
+                            <td>&nbsp;</td>
+                            <td><input type="submit" class="imcmsFormBtnSmall"
+                                       value="<? templates/sv/AdminUserResp.htm/2004 ?>"
+                                       name="<%= UserEditorPage.REQUEST_PARAMETER__ADD_PHONE_NUMBER %>"></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText">&nbsp;</td>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <td>
+                                <select size="1" name="<%= UserEditorPage.REQUEST_PARAMETER__SELECTED_PHONE_NUMBER %>">
+                                    <%= userEditorPage.getUserPhoneNumbersHtmlOptionList(request) %>
+                                </select></td>
+                            <td>&nbsp;</td>
+                            <td><input type="submit" class="imcmsFormBtnSmall"
+                                       name="<%= UserEditorPage.REQUEST_PARAMETER__EDIT_PHONE_NUMBER %>"
+                                       value="<? templates/sv/AdminUserResp.htm/2005 ?>"></td>
+                            <td>&nbsp;</td>
+                            <td><input type="submit" class="imcmsFormBtnSmall"
+                                       name="<%= UserEditorPage.REQUEST_PARAMETER__REMOVE_PHONE_NUMBER %>"
+                                       value="<? templates/sv/AdminUserResp.htm/2006 ?>"></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/36 ?></td>
+                <td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__EMAIL %>" size="50" maxlength="50"
+                           value="<%= StringEscapeUtils.escapeHtml(editedUser.getEmailAddress())%>"></td>
+            </tr>
+            <tr>
+                <td colspan="2">#gui_hr( "blue" )</td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp_superadmin_part.htm/2 ?></td>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <td><input type="checkbox" name="active" value="1"
+                                       <% if (editedUser.isActive()) { %>checked<% } %>></td>
+                            <td class="imcmsAdmText" nowrap>&nbsp;
+                                <% if (null != editedUser.getCreateDate()) { %>
+                                &nbsp; <? templates/sv/AdminUserResp_superadmin_part.htm/12 ?>
+                                &nbsp; <%= new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING).format(editedUser.getCreateDate()) %>
+                                <% } %>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
 
-<form method="post" action="$contextPath/servlet/PageDispatcher">
-<%= Page.htmlHidden(request) %>
-<table border="0" cellspacing="0" cellpadding="0">
-<tr>
-	<td><input type="submit" class="imcmsFormBtn" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>" value="<? templates/sv/AdminUserResp.htm/2001 ?>"></td>
-	<td>&nbsp;</td>
-    <td><input type="button" value="<? templates/sv/AdminUserResp.htm/2002 ?>" title="<? templates/sv/AdminUserResp.htm/2003 ?>" class="imcmsFormBtn" onClick="openHelpW('UserEdit')"></td>
-</tr>
-</table>
-#gui_mid()
+            <% if (loggedOnUser.isSuperAdmin() && is2FA) { %>
+            <tr>
+                <td colspan="2">#gui_hr( "blue" )</td>
+            </tr>
+            <tr>
+                <td class="imcmsAdmText"><? templates/sv/AdminUserResp_superadmin_part.htm/4 ?></td>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <td><input type="checkbox" name="<%= REQUEST_PARAMETER_2FA %>" value="1"
+                                       <% if (Boolean.parseBoolean(editedUser.getProperties().getOrDefault(USER_2FA_DISABLED_PROPERTY, "false"))) { %>checked<% } %>/>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <% } %>
 
-<table border="0" cellspacing="0" cellpadding="0" width="660" align="center">
-<tr>
-	<td colspan="2">#gui_heading( "<? templates/sv/AdminUserResp.htm/5/1 ?>" )</td>
-</tr>
-<tr>
-	<td colspan="2" class="imcmsAdmText">
-	<? templates/sv/AdminUserResp.htm/6 ?></td>
-</tr>
-<tr>
-	<td colspan="2">#gui_hr( "cccccc" )</td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/8 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__LOGIN_NAME %>" size="25" maxlength="50" value="<%= StringEscapeUtils.escapeHtml(editedUser.getLoginName()) %>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText" nowrap><? templates/sv/AdminUserResp.htm/10 ?> <span class="imcmsAdmDim"><? templates/sv/AdminUserResp.htm/11 ?></span> &nbsp;</td>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td><input type="password" name="<%= UserEditorPage.REQUEST_PARAMETER__PASSWORD1 %>" size="16" maxlength="15" value=""></td>
-		<td class="imcmsAdmText" nowrap>&nbsp; <? templates/sv/AdminUserResp.htm/1001 ?> &nbsp;</td>
-		<td><input type="password" name="<%= UserEditorPage.REQUEST_PARAMETER__PASSWORD2 %>" size="16" maxlength="15" value=""></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/14 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__FIRST_NAME %>" size="25" maxlength="25" value="<%= StringEscapeUtils.escapeHtml(editedUser.getFirstName()) %>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/16 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__LAST_NAME %>" size="25" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getLastName()) %>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/18 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__TITLE %>" size="25" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getTitle()) %>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/20 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__COMPANY %>" size="25" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getCompany())%>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/22 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__ADDRESS %>" size="25" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getAddress())%>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/24 ?></td>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__ZIP %>" size="7" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getZip())%>"></td>
-		<td>&nbsp;</td>
-		<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__CITY %>" size="25" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getCity())%>"></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/27 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__DISTRICT %>" size="25" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getProvince())%>"></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/29 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__COUNTRY %>" size="25" maxlength="30" value="<%= StringEscapeUtils.escapeHtml(editedUser.getCountry())%>"></td>
-</tr>
-<tr>
-    <td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/30 ?></td>
-    <td><select name="<%= UserEditorPage.REQUEST_PARAMETER__LANGUAGE %>"><%= userEditorPage.createLanguagesHtmlOptionList( loggedOnUser, editedUser ) %></select></td>
-</tr>
-<tr>
-	<td colspan="2">#gui_hr( "cccccc" )</td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/32 ?></td>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td>
-	  <select name="<%= UserEditorPage.REQUEST_PARAMETER__PHONE_NUMBER_TYPE_ID %>" size="1" >
-			<%= userEditorPage.createPhoneTypesHtmlOptionList(loggedOnUser,userEditorPage.getCurrentPhoneNumber().getType()) %>
-	  </select></td>
-		<td>&nbsp;</td>
-		<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__EDITED_PHONE_NUMBER %>" size="16" maxlength="25" value="<%= userEditorPage.getCurrentPhoneNumber() %>"></td>
-		<td>&nbsp;</td>
-		<td><input type="submit" class="imcmsFormBtnSmall" value="<? templates/sv/AdminUserResp.htm/2004 ?>" name="<%= UserEditorPage.REQUEST_PARAMETER__ADD_PHONE_NUMBER %>"></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText">&nbsp;</td>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td>
-		<select size="1" name="<%= UserEditorPage.REQUEST_PARAMETER__SELECTED_PHONE_NUMBER %>">
-		    <%= userEditorPage.getUserPhoneNumbersHtmlOptionList(request) %>
-		</select></td>
-		<td>&nbsp;</td>
-		<td><input type="submit" class="imcmsFormBtnSmall" name="<%= UserEditorPage.REQUEST_PARAMETER__EDIT_PHONE_NUMBER %>" value="<? templates/sv/AdminUserResp.htm/2005 ?>"></td>
-		<td>&nbsp;</td>
-		<td><input type="submit" class="imcmsFormBtnSmall" name="<%= UserEditorPage.REQUEST_PARAMETER__REMOVE_PHONE_NUMBER %>" value="<? templates/sv/AdminUserResp.htm/2006 ?>"></td>
-	</tr>
-	</table></td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp.htm/36 ?></td>
-	<td><input type="text" name="<%= UserEditorPage.REQUEST_PARAMETER__EMAIL %>" size="50" maxlength="50" value="<%= StringEscapeUtils.escapeHtml(editedUser.getEmailAddress())%>"></td>
-</tr>
-<tr>
-	<td colspan="2">#gui_hr( "blue" )</td>
-</tr>
-<tr>
-	<td class="imcmsAdmText"><? templates/sv/AdminUserResp_superadmin_part.htm/2 ?></td>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td><input type="checkbox" name="active" value="1" <% if (editedUser.isActive()) { %>checked<% } %>></td>
-		<td class="imcmsAdmText" nowrap>&nbsp;
-            <% if (null != editedUser.getCreateDate()) { %>
-                &nbsp; <? templates/sv/AdminUserResp_superadmin_part.htm/12 ?> &nbsp; <%= new SimpleDateFormat(DateConstants.DATETIME_FORMAT_STRING).format(editedUser.getCreateDate()) %>
+            <% if (loggedOnUser.canEditRolesFor(userEditorPage.getUneditedUser())) { %>
+            <tr>
+                <td colspan="2">&nbsp;<br>#gui_heading( "<? templates/sv/AdminUserResp_superadmin_part.htm/3/1 ?>" )
+                </td>
+            </tr>
+            <tr valign="top">
+                <td class="imcmsAdmText" nowrap>
+                    <? templates/sv/AdminUserResp_superadmin_part.htm/1001 ?> &nbsp;
+                </td>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr valign="top">
+                            <td>
+                                <select name="<%= UserEditorPage.REQUEST_PARAMETER__ROLE_IDS %>" size="5" multiple
+                                        onchange="activateUseradmin_roles(); return true;">
+                                    <%= userEditorPage.createRolesHtmlOptionList(request) %>
+                                </select></td>
+                            <% if (loggedOnUser.isSuperAdmin()) { %>
+                            <td>&nbsp;</td>
+                            <td class="imcmsAdmText" nowrap><? templates/sv/AdminUserResp_superadmin_part.htm/8 ?></td>
+                            <td>&nbsp;</td>
+                            <td>
+                                <select name="<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %>" size="5"
+                                        multiple>
+                                    <%= userEditorPage.createUserAdminRolesHtmlOptionList() %>
+                                </select></td>
+                            <% } %>
+                        </tr>
+                        <tr valign="top">
+                            <td class="imcmsAdmDim"><? templates/sv/AdminUserResp_superadmin_part.htm/10 ?></td>
+                            <% if (loggedOnUser.isSuperAdmin()) { %>
+                            <td colspan="3">&nbsp;</td>
+                            <td class="imcmsAdmDim"><? templates/sv/AdminUserResp_superadmin_part.htm/11 ?></td>
+                            <% } %>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
             <% } %>
-        </td>
-	</tr>
-	</table></td>
-</tr>
-<% if (loggedOnUser.canEditRolesFor(userEditorPage.getUneditedUser())) { %>
-<tr>
-	<td colspan="2">&nbsp;<br>#gui_heading( "<? templates/sv/AdminUserResp_superadmin_part.htm/3/1 ?>" )</td>
-</tr>
-<tr valign="top">
-	<td class="imcmsAdmText" nowrap>
-	<? templates/sv/AdminUserResp_superadmin_part.htm/1001 ?> &nbsp;</td>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr valign="top">
-		<td>
-		<select name="<%= UserEditorPage.REQUEST_PARAMETER__ROLE_IDS %>" size="5" multiple onchange="activateUseradmin_roles(); return true;">
-		    <%= userEditorPage.createRolesHtmlOptionList(request) %>
-		</select></td>
-        <% if (loggedOnUser.isSuperAdmin()) { %>
-            <td>&nbsp;</td>
-            <td class="imcmsAdmText" nowrap><? templates/sv/AdminUserResp_superadmin_part.htm/8 ?></td>
-            <td>&nbsp;</td>
-            <td>
-            <select name="<%= UserEditorPage.REQUEST_PARAMETER__USER_ADMIN_ROLE_IDS %>" size="5" multiple>
-                <%= userEditorPage.createUserAdminRolesHtmlOptionList() %>
-            </select></td>
-        <% } %>
-    </tr>
-	<tr valign="top">
-		<td class="imcmsAdmDim"><? templates/sv/AdminUserResp_superadmin_part.htm/10 ?></td>
-        <% if (loggedOnUser.isSuperAdmin()) { %>
-            <td colspan="3">&nbsp;</td>
-            <td class="imcmsAdmDim"><? templates/sv/AdminUserResp_superadmin_part.htm/11 ?></td>
-        <% } %>
-    </tr>
-	</table></td>
-</tr>
-<% } %>
-<tr>
-	<td colspan="2">#gui_hr( "blue" )</td>
-</tr>
-<tr>
-	<td colspan="2">
-	<table border="0" cellspacing="0" cellpadding="0" width="656">
-	<tr>
-		<td class="imcmsAdmComment"><? templates/sv/AdminUserResp.htm/40 ?></td>
-		<td align="right">
-		<table border="0" cellspacing="0" cellpadding="0">
-		<tr>
-            <%
-                if (null != errorMessage) {
-                    %><td><span class="error"><%= errorMessage.toLocalizedString(request) %></span></td><td>&nbsp;</td><%
-                }
-            %>
-			<td><input type="submit" class="imcmsFormBtn" name="<%= OkCancelPage.REQUEST_PARAMETER__OK %>" value="<? templates/sv/AdminUserResp.htm/2007 ?>" onClick="if( !evalPrepareAdd() ) return false;"></td>
-			<td>&nbsp;</td>
-			<td><input type="submit" class="imcmsFormBtn" value="<? templates/sv/AdminUserResp.htm/2008 ?>"></td>
-			<td>&nbsp;</td>
-			<td><input type="submit" class="imcmsFormBtn" name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>" value="<? templates/sv/AdminUserResp.htm/2009 ?>"></td>
-		</tr>
-		</table></td>
-	</tr>
-	</table></td>
-</tr>
-</table>
-</form>
-#gui_bottom()
-#gui_outer_end()
-</body>
-</html>
+            <tr>
+                <td colspan="2">#gui_hr( "blue" )</td>
+            </tr>
+            <tr>
+                <td colspan="2">
+                    <table border="0" cellspacing="0" cellpadding="0" width="656">
+                        <tr>
+                            <td class="imcmsAdmComment"><? templates/sv/AdminUserResp.htm/40 ?></td>
+                            <td align="right">
+                                <table border="0" cellspacing="0" cellpadding="0">
+                                    <tr>
+                                        <%
+                                            if (null != errorMessage) {
+                                        %>
+                                        <td><span class="error"><%= errorMessage.toLocalizedString(request) %></span>
+                                        </td>
+                                        <td>&nbsp;</td>
+                                        <%
+                                            }
+                                        %>
+                                        <td><input type="submit" class="imcmsFormBtn"
+                                                   name="<%= OkCancelPage.REQUEST_PARAMETER__OK %>"
+                                                   value="<? templates/sv/AdminUserResp.htm/2007 ?>"
+                                                   onClick="if( !evalPrepareAdd() ) return false;"></td>
+                                        <td>&nbsp;</td>
+                                        <td><input type="submit" class="imcmsFormBtn"
+                                                   value="<? templates/sv/AdminUserResp.htm/2008 ?>"></td>
+                                        <td>&nbsp;</td>
+                                        <td><input type="submit" class="imcmsFormBtn"
+                                                   name="<%= OkCancelPage.REQUEST_PARAMETER__CANCEL %>"
+                                                   value="<? templates/sv/AdminUserResp.htm/2009 ?>"></td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </form>
+    #gui_bottom()
+    #gui_outer_end()
+    </body>
+    </html>
 </vel:velocity>
diff --git a/web/imcms/lang/login/index.jsp b/web/imcms/lang/login/index.jsp
index 7a191525b5..16a5c738d7 100644
--- a/web/imcms/lang/login/index.jsp
+++ b/web/imcms/lang/login/index.jsp
@@ -1,95 +1,301 @@
-<%@ page import="com.imcode.imcms.servlet.VerifyUser"%><%@ page import="imcode.server.user.UserDomainObject"%><%@ page import="com.imcode.imcms.util.l10n.LocalizedMessage"%>
-<%@ page import="imcode.util.Utility"%><%@ page import="org.apache.commons.lang.StringEscapeUtils"%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@taglib prefix="vel" uri="imcmsvelocity"%>
+<%@ page import="com.imcode.imcms.domain.services.core.TwoFactorAuthService" %>
+<%@ page import="com.imcode.imcms.model.AuthenticationProvider" %>
+<%@ page import="com.imcode.imcms.servlet.VerifyUser" %>
+<%@ page import="com.imcode.imcms.util.l10n.LocalizedMessage" %>
+<%@ page import="imcode.server.AuthenticationMethodConfiguration" %>
+<%@ page import="imcode.server.Imcms" %>
+<%@ page import="imcode.server.user.UserDomainObject" %>
+<%@ page import="imcode.util.Utility" %>
+<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="java.io.IOException" %>
+<%@ page import="static com.imcode.imcms.servlet.VerifyUser.REQUEST_PARAMETER__USERNAME" %>
+<%@ page import="java.io.PrintWriter" %>
+<%@ page import="static com.imcode.imcms.domain.services.core.TwoFactorAuthService.PROPERTY_NAME_2FA" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Map" %>
+<%@ page contentType="text/html; charset=UTF-8" language="java" %>
+<%@taglib prefix="vel" uri="imcmsvelocity" %>
+<%@taglib prefix="im" uri="imcms" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <vel:velocity>
-<%
-    UserDomainObject user = Utility.getLoggedOnUser(request);
-%><html>
-<head>
-<title><? templates/login/index.html/1 ?></title>
-
+    <%!
+        void verifyUserViaBankId(HttpSession session, HttpServletRequest request, HttpServletResponse response) throws IOException {
+            session.setAttribute(VerifyUser.SESSION_ATTRIBUTE__NEXT_URL, request.getParameter(VerifyUser.REQUEST_PARAMETER__NEXT_URL));
+            session.setAttribute(VerifyUser.SESSION_ATTRIBUTE__NEXT_META, request.getParameter(VerifyUser.REQUEST_PARAMETER__NEXT_META));
+            response.sendRedirect(request.getContextPath() + "/VerifyUserViaBankId");
+        }
+    %>
+    <%
+        UserDomainObject user = Utility.getLoggedOnUser(request);
+        Map<String, AuthenticationMethodConfiguration> loginConfiguration = Imcms.getServices().getConfig().getAuthenticationConfiguration();
+        final boolean loginPassword = loginConfiguration.containsKey("loginPassword");
+        final boolean cgi = loginConfiguration.containsKey("cgi");
+        final boolean is2FA = loginConfiguration.containsKey(PROPERTY_NAME_2FA);
+        final boolean is2FAStep = null != session.getAttribute(REQUEST_PARAMETER__USERNAME);
+        final List<AuthenticationProvider> authenticationProviders = Imcms.getServices()
+                .getAuthenticationProviderService().getAuthenticationProviders();
 
-<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
-<script src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/scripts/imcms_admin.js.jsp" type="text/javascript"></script>
+        pageContext.setAttribute("is2FA", is2FA);
+        pageContext.setAttribute("is2FAStep", is2FAStep);
+        pageContext.setAttribute("authProviders", authenticationProviders);
 
-</head>
-<body bgcolor="#FFFFFF" onLoad="focusField(1,'name')">
-#gui_outer_start()
-#gui_head( "<? templates/login/index.html/2 ?>" )
-<table border="0" cellspacing="0" cellpadding="0" width="310">
-<form action="">
-<tr>
-	<td>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td><input type="button" class="imcmsFormBtn" style="width:100" value="<? templates/login/index.html/2001 ?>" onClick="top.location='<%= request.getContextPath() %>/servlet/StartDoc';"></td>
-		<td>&nbsp;</td>
-		<td><input type="button" class="imcmsFormBtn" style="width:115" value="<? templates/login/index.html/2002 ?>" onClick="top.location='<%= request.getContextPath() %>/servlet/PasswordMailReminder';"></td>
-		<td>&nbsp;</td>
-        <td><input type="button" value="<? templates/login/index.html/2003 ?>" title="<? templates/login/index.html/2004 ?>" class="imcmsFormBtn" onClick="openHelpW('LogIn')"></td>
-	</tr>
-	</table></td>
-</tr>
-</form>
-</table>
-#gui_mid()
-<table border="0" cellspacing="0" cellpadding="2" width="310">
-<tr>
-	<td colspan="2" nowrap><span class="imcmsAdmText">
-	<% LocalizedMessage error = (LocalizedMessage) request.getAttribute("error");
-        if (null != error) {
-            %><p><b><%= error.toLocalizedString(request) %></b></p><%
+        final boolean loginPasswordFirst = loginPassword && cgi && loginConfiguration.get("loginPassword").getOrder() < loginConfiguration.get("cgi").getOrder();
+        if (request.getParameter("activeLoginTab") != null) {
+            PrintWriter pw = response.getWriter();
+            if (loginPasswordFirst) {
+                pw.print("activeLoginTab(1)");
+            } else if (loginPassword) {
+                pw.print("activeLoginTab(2)");
+            } else {
+                pw.print("activeLoginTab('default')");
+            }
+            pw.flush();
+            pw.close();
+            return;
         }
-    %>        
-    <? templates/login/index.html/4 ?>
-	<img alt="" src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/1x1.gif" width="1" height="5"><? templates/login/index.html/1001 ?></span></td>
-</tr>
-<tr>
-	<td colspan="2">&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="2" align="center">
-	<table border="0" cellspacing="0" cellpadding="1">
-	<form action="<%= request.getContextPath() %>/servlet/VerifyUser" method="post">
-    <%
+    %>
+    <html>
+    <head>
+        <title><? templates/login/index.html/1 ?></title>
+
+
+        <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
+        <script src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/scripts/imcms_admin.js.jsp"
+                type="text/javascript"></script>
+
+    </head>
+    <body bgcolor="#FFFFFF" onLoad="${(is2FA and is2FAStep) ? "focusField(1,'two_fa')" : "focusField(1,'name')"}">
+    #gui_outer_start()
+    #gui_head( "<? templates/login/index.html/2 ?>" )
+    <table border="0" cellspacing="0" cellpadding="0" width="700">
+        <form action="">
+            <tr>
+                <td>
+                    <table border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <td><input type="button" class="imcmsFormBtn" style="width:100px"
+                                       value="<? templates/login/index.html/2001 ?>"
+                                       onClick="top.location='<%= request.getContextPath() %>/servlet/StartDoc';"></td>
+                            <td>&nbsp;</td>
+                            <td><input type="button" class="imcmsFormBtn" style="width:115px"
+                                       value="<? templates/login/index.html/2002 ?>"
+                                       onClick="top.location='<%= request.getContextPath() %>/servlet/PasswordReset';">
+                            </td>
+                            <td>&nbsp;</td>
+                            <td><input type="button" value="<? templates/login/index.html/2003 ?>"
+                                       title="<? templates/login/index.html/2004 ?>" class="imcmsFormBtn"
+                                       onClick="openHelpW('LogIn')"></td>
+
+                            <c:if test="${is2FA and is2FAStep}">
+                                <td>&nbsp;</td>
+                                <td><input type="button" value="<? web/imcms/login/back ?>"
+                                           class="imcmsFormBtn"
+                                           onClick="goToLoginPage()">
+                                </td>
+                            </c:if>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </form>
+    </table>
+    #gui_mid()
+    <div id="imcms-login-container">
+        <% if (loginConfiguration.size() > 1) {
+            if (loginPasswordFirst) { %>
+        <div id="imcms-login-container-tabs">
+            <div class="imcms-tab imcms-tab-active" id="imcms-default-tab"><? templates/login/index.html/2008 ?></div>
+            <div class="imcms-tab" id="imcms-bankid-tab"><? templates/login/index.html/2009 ?></div>
+            <c:if test="${not empty authProviders}">
+                <c:set var="provider" scope="session" value="${authProviders.get(0)}"/>
+                <div class="imcms-tab imcms-link-azure" id="imcms-azure-tab"
+                     onclick="top.location='<%= request.getContextPath() %>/api/external-identifiers/login/${provider.providerId}'"
+                     title="${provider.providerName}">Azure login
+                </div>
+            </c:if>
+            <div style="clear:both"></div>
+        </div>
+        <% } else if (is2FAStep && is2FA) {%>
+        <div id="imcms-login-container-tabs">
+            <div class="imcms-tab" id="imcms-bankid-tab"><? templates/login/index.html/2009 ?></div>
+            <div class="imcms-tab imcms-tab-active" id="imcms-default-tab"><? templates/login/index.html/2008 ?></div>
+            <div style="clear:both"></div>
+        </div>
+        <% } else if (request.getParameter("fromCgi") != null) {%>
+        <div id="imcms-login-container-tabs">
+            <div class="imcms-tab" id="imcms-bankid-tab"><? templates/login/index.html/2009 ?></div>
+            <div class="imcms-tab imcms-tab-active" id="imcms-default-tab"><? templates/login/index.html/2008 ?></div>
+            <div style="clear:both"></div>
+        </div>
+        <%
+            } else {
+                verifyUserViaBankId(session, request, response);
+            }
+        %>
+        <script>
+            $(document).ready(function () {
+                $(".imcms-tab-active").click();
+            });
+        </script>
+        <% } else if (loginConfiguration.size() == 1) {
+            if (cgi) {
+                verifyUserViaBankId(session, request, response);
+            } else {%>
+        <div class="imcms-tab imcms-tab-active" id="imcms-default-tab"><? templates/login/index.html/2008 ?></div>
+        <%
+            }%>
+
+        <script>
+            $(document).ready(function () {
+                $('#imcms-bankid-login-tab').css({height: 500});
+                var $imcmsTabActive = $(".imcms-tab-active");
+                $imcmsTabActive.click();
+                $imcmsTabActive.remove();
+            });
+        </script>
+        <%
+            }
+        %>
+
+        <div class="imcms-typed-form-container" id="imcms-bankid-login-tab" style="display:none">
+        </div>
+        <div class="imcms-typed-form-container" id="imcms-default-login-tab">
+
+            <table border="0" cellspacing="0" cellpadding="2" width="700">
+                <tr>
+                    <td colspan="2" nowrap><span class="imcmsAdmText">
+    <% LocalizedMessage error = (LocalizedMessage) request.getAttribute("error");
         String next_meta = request.getParameter(VerifyUser.REQUEST_PARAMETER__NEXT_META);
         String next_url = request.getParameter(VerifyUser.REQUEST_PARAMETER__NEXT_URL);
-    if( null != next_meta )  { %>
-    <input type="hidden" name="<%= VerifyUser.REQUEST_PARAMETER__NEXT_META %>" value="<%=StringEscapeUtils.escapeHtml(next_meta)%>">
-    <%}else if( null != next_url ) { %>
-    <input type="hidden" name="<%= VerifyUser.REQUEST_PARAMETER__NEXT_URL %>" value="<%=StringEscapeUtils.escapeHtml(next_url)%>">
-	<%}%>
-    <tr>
-		<td><span class="imcmsAdmText"><? templates/login/index.html/5 ?></span></td>
-		<td>&nbsp;</td>
-		<td><input type="text" name="<%= VerifyUser.REQUEST_PARAMETER__USERNAME %>" size="15" style="width:180"></td>
-	</tr>
-	<tr>
-		<td><span class="imcmsAdmText"><? templates/login/index.html/6 ?></span></td>
-		<td>&nbsp;</td>
-		<td><input type="password" name="<%= VerifyUser.REQUEST_PARAMETER__PASSWORD %>" size="15" style="width:180"></td>
-	</tr>
-	<tr>
-		<td colspan="3">&nbsp;</td>
-	</tr>
-	<tr>
-		<td colspan="2">&nbsp;</td>
-		<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td><input class="imcmsFormBtn" type="submit" value="<? templates/login/index.html/2005 ?>" style="width:80"></td>
-			<td>&nbsp;</td>
-			<td><input class="imcmsFormBtn" type="submit" name="<%= VerifyUser.REQUEST_PARAMETER__EDIT_USER %>" value="<? templates/login/index.html/2006 ?>" style="width:80"></td>
-		</tr>
-		</table></td>
-	</tr>
-	</form>
-	</table></td>
-</tr>
-</table>
-#gui_bottom()
-#gui_outer_end()
-</body>
-</html>
+        if (null != error) {
+    %><p><b><%= error.toLocalizedString(request) %>
+					</b></p><%
+                        }
+                    %>
+                        <c:choose>
+                            <c:when test="${is2FA and is2FAStep}">
+                                <b>
+                                    <? templates/login/index.html/8 ?>
+                                </b>
+                            </c:when>
+                            <c:otherwise>
+                                <? templates/login/index.html/4 ?>
+                            </c:otherwise>
+                        </c:choose>
+                        <img alt=""
+                             src="<%= request.getContextPath() %>/imcms/<%= user.getLanguageIso639_2() %>/images/admin/1x1.gif"
+                             width="1" height="5"><? templates/login/index.html/1001 ?></span></td>
+                </tr>
+                <tr>
+                    <td colspan="2">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td colspan="2" align="center">
+                        <table border="0" cellspacing="0" cellpadding="1">
+                            <form action="<%= request.getContextPath() %>/servlet/VerifyUser" method="post">
+                                <% if (null != next_meta) { %>
+                                <input type="hidden" name="<%= VerifyUser.REQUEST_PARAMETER__NEXT_META %>"
+                                       value="<%=StringEscapeUtils.escapeHtml(next_meta)%>">
+                                <%} else if (null != next_url) { %>
+                                <input type="hidden" name="<%= VerifyUser.REQUEST_PARAMETER__NEXT_URL %>"
+                                       value="<%=StringEscapeUtils.escapeHtml(next_url)%>">
+                                <%}%>
+
+                                <c:choose>
+                                    <c:when test="${is2FA and is2FAStep}">
+                                        <tr>
+                                            <td><span class="imcmsAdmText"><? templates/login/index.html/7 ?></span>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td><input type="password"
+                                                       name="<%= TwoFactorAuthService.REQUEST_PARAMETER_2FA %>"
+                                                       size="15" maxlength="250" style="width:180px"></td>
+                                        </tr>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <tr>
+                                            <td><span class="imcmsAdmText"><? templates/login/index.html/5 ?></span>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td><input type="text" name="<%= VerifyUser.REQUEST_PARAMETER__USERNAME %>"
+                                                       size="15" maxlength="250"
+                                                       style="width:180px"></td>
+                                        </tr>
+                                        <tr>
+                                            <td><span class="imcmsAdmText"><? templates/login/index.html/6 ?></span>
+                                            </td>
+                                            <td>&nbsp;</td>
+                                            <td><input type="password"
+                                                       name="<%= VerifyUser.REQUEST_PARAMETER__PASSWORD %>"
+                                                       size="15" maxlength="250" style="width:180px"></td>
+                                        </tr>
+                                    </c:otherwise>
+                                </c:choose>
+
+                                <c:if test="${is2FA}">
+                                    <input name="cancelVerification" type="hidden"/>
+                                </c:if>
+
+                                <tr>
+                                    <td colspan="3">&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2">&nbsp;</td>
+                                    <td>
+                                        <table border="0" cellspacing="0" cellpadding="0">
+                                            <tr>
+                                                <td><input class="imcmsFormBtn" type="submit"
+                                                           value="<? templates/login/index.html/2005 ?>"
+                                                           style="width:80px">
+                                                </td>
+                                                <td>&nbsp;</td>
+                                                <td><input class="imcmsFormBtn" type="submit"
+                                                           name="<%= VerifyUser.REQUEST_PARAMETER__EDIT_USER %>"
+                                                           value="<? templates/login/index.html/2006 ?>"
+                                                           style="width:80px">
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                            </form>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <%
+            if (null != next_meta) { %>
+        <input id="nextMeta" type="hidden" name="<%= VerifyUser.REQUEST_PARAMETER__NEXT_META %>"
+               value="<%=StringEscapeUtils.escapeHtml(next_meta)%>">
+        <%} else if (null != next_url) { %>
+        <input id="nextUrl" type="hidden" name="<%= VerifyUser.REQUEST_PARAMETER__NEXT_URL %>"
+               value="<%=StringEscapeUtils.escapeHtml(next_url)%>">
+        <%}%>
+
+        <script>
+            $(".imcms-tab").click(function (e) {
+                switch ($(this).attr('id')) {
+                    case "imcms-default-tab": {
+                    }
+                        break;
+                    case "imcms-bankid-tab": {
+                        location.href = location.protocol + '//' + location.host + "<%=request.getContextPath()+"/VerifyUserViaBankId" +( null != next_url?"?next_url="+next_url:"") %>";
+                    }
+                        break;
+                }
+            });
+
+            function goToLoginPage() {
+                $('[name=cancelVerification]').val(true);
+
+                var inputs = $('input.imcmsFormBtn');
+                $(inputs[inputs.size()-1]).click();
+            }
+        </script>
+    </div>
+    #gui_bottom()
+    #gui_outer_end()
+    </body>
+    </html>
 </vel:velocity>
diff --git a/web/imcms/lang/scripts/imcms4_admin_script.js.jsp b/web/imcms/lang/scripts/imcms4_admin_script.js.jsp
new file mode 100644
index 0000000000..1ae07acd0e
--- /dev/null
+++ b/web/imcms/lang/scripts/imcms4_admin_script.js.jsp
@@ -0,0 +1,358 @@
+<%@ page
+	
+	import="com.imcode.imcms.servlet.AjaxServlet,
+	        imcode.server.Imcms,
+	        java.net.URL,
+	        java.net.URLConnection,
+	        java.io.InputStream,
+	        java.io.InputStreamReader,
+	        java.io.BufferedReader,
+	        org.apache.oro.text.perl.Perl5Util,
+	        org.apache.commons.lang.StringUtils"
+	
+	contentType="text/javascript"
+	pageEncoding="UTF-8"
+	
+%><%@ taglib uri="imcmsvelocity" prefix="vel"
+%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
+%><%!
+
+private final static int CONNECTION_TIMEOUT_MILLIS = 3000 ;
+private final static String USE_INLINE_EDITING           = "imcms_text_use_inline_editing" ;
+private final static String USE_INLINE_EDITING_FORMATTED = "imcms_text_use_inline_editing_formatted" ;
+private final static String USE_WIDTH                    = "imcms_text_use_width" ;
+
+public static String getURLcontent( String urlString, String encoding ) {
+		try {
+				URL url = new URL(urlString) ;
+				URLConnection con = url.openConnection() ;
+				con.setConnectTimeout(CONNECTION_TIMEOUT_MILLIS);
+				con.connect() ;
+				InputStream is = (InputStream) con.getContent() ;
+				InputStreamReader isr = new InputStreamReader(is, encoding) ;
+				BufferedReader br = new BufferedReader(isr) ;
+				String line = br.readLine() ;
+				StringBuffer retVal = new StringBuffer();
+				while (line != null) {
+						retVal.append( line ).append( "\n" ) ;
+						line = br.readLine() ;
+				}
+				br.close() ;
+				return retVal.toString();
+		} catch (Exception ex) {
+				return null ;
+		}
+}
+
+%><%
+
+boolean isTextMode = ("true".equals(StringUtils.defaultString(request.getParameter("textMode")))) ;
+
+// Tured off in edit_link.jsp:
+boolean loadJq = (!"false".equals(StringUtils.defaultString(request.getParameter("loadJq")))) ;
+
+String cp = request.getContextPath() ;
+
+if (loadJq) { %>
+
+<%@ include file="imcms_jquery_1.7.1.js" %>
+
+<%@ include file="imcms_jquery-ui_1.8.16.js" %>
+
+(function($) {
+
+$.fn.outerHTML = function() {
+		return $('<div>').append( this.eq(0).clone() ).html();
+};
+
+window.imLog = function(mess) {
+	try {
+		if (window && window.console) {
+			window.console.log(mess) ;
+		}
+	} catch (e) {}
+};
+
+window.private_USE_INLINE_EDITING_FORMATTED = false;//('false' != imcmsGetCookie('<%= USE_INLINE_EDITING_FORMATTED %>')) ;
+window.private_USE_INLINE_EDITING           = (!private_USE_INLINE_EDITING_FORMATTED && 'false' != imcmsGetCookie('<%= USE_INLINE_EDITING %>')) ;
+window.private_USE_WIDTH                    = ('false' != imcmsGetCookie('<%= USE_WIDTH %>')) ;
+
+$(document).ready(function($) {
+	
+	<% if (isTextMode) { %>
+	<%--
+	Inline edit help dialog
+	--%>
+	
+	var $dialogHelpDiv = $('<div id="imcmsInlineEditHelpDiv" style="display:none; text-align:left;" title="<fmt:message key="global/help" /> - Inline Editing" />')
+					.load('<%= AjaxServlet.getPath(cp) + "?action=getHelpTextInlineEditing" %>')
+					.appendTo('body') ;
+	
+	$dialog = $dialogHelpDiv.dialog({
+		width: 400,
+		minHeight: 300,
+		modal: false,
+		autoOpen: false,
+		dialogClass: 'imcmsAdmin',
+		buttons: {
+			'<fmt:message key="global/close" />' : function() {
+				$(this).dialog("close");
+			}
+		}
+	}) ;
+	<% } %>
+	
+	<%--
+	Add &width=NNN to ChangeText?......
+	--%>
+	$('a.imcms_text_admin').live('click', function(event) {
+		event.preventDefault() ;
+		var $this = $(this) ;
+		var uniqueId = $this.attr('rev') ;
+		openTextEditNormal($, $this, uniqueId, event) ;
+	}) ;
+	
+	<%--
+	ContextMenu UL - HTML
+	--%>
+	$('body').append('' +
+        '<ul id="imcmsContextMenuTextField" class="imcmsContextMenu" style="display:none;">\n' +
+        '	<li id="li_OPEN_INLINE_EDITING" class="' + (!private_USE_INLINE_EDITING ? 'disabled ' : '') + 'action"><a href="#OPEN_INLINE_EDITING"><fmt:message
+						key="scripts/imcms4_admin_script.js.jsp/context_menu/open_inline" /></a></li>\n' +
+        '	<li class="action"><a href="#OPEN_NORMAL"><fmt:message
+						key="scripts/imcms4_admin_script.js.jsp/context_menu/open_normal" /></a></li>\n' +<%--
+        '	<li id="li_USE_INLINE_EDITING_FORMATTED" class="' + (private_USE_INLINE_EDITING_FORMATTED ? 'active ' : '') + 'separator"><a href="#USE_INLINE_EDITING_FORMATTED"><fmt:message
+						key="scripts/imcms4_admin_script.js.jsp/context_menu/use_inline_formatted" /></a></li>\n' +--%>
+        '	<li id="li_USE_INLINE_EDITING" class="' + (private_USE_INLINE_EDITING ? 'active' : '') + '"><a href="#USE_INLINE_EDITING"><fmt:message
+						key="scripts/imcms4_admin_script.js.jsp/context_menu/use_inline" /></a></li>\n' +
+        '	<li id="li_USE_WIDTH"' + (private_USE_WIDTH ? ' class="active"' : '') + '><a href="#USE_WIDTH"><fmt:message
+						key="scripts/imcms4_admin_script.js.jsp/context_menu/use_width" /></a></li>\n' +
+        '	<li id="li_SHOW_HELP" class="separator"><a href="#SHOW_HELP"><fmt:message
+						key="scripts/imcms4_admin_script.js.jsp/context_menu/show_help" /></a></li>\n' +
+        '</ul>') ;
+	
+	<%--
+	Set right width on contextMenu UL
+	--%>
+	try {
+		var aTagWidest = 0 ;
+		$('#imcmsContextMenuTextField').css('left', -1000).show() ;
+		$('#imcmsContextMenuTextField li a').each(function() {
+			var thisW = $(this).css('display', 'inline').width() ;
+			aTagWidest = Math.max(aTagWidest, thisW) ;
+			$(this).css('display', 'block') ;
+		}) ;
+		$('#imcmsContextMenuTextField').css('width', (aTagWidest + 30) + 'px').hide() ;
+	} catch (e) {}
+	
+	<%--
+	Init contextMenu
+	--%>
+	try {
+		if ($(".imcms_text_admin").length > 0) {
+			$(".imcms_text_admin").contextMenu(
+				{
+					menu: 'imcmsContextMenuTextField'
+				}, function abort(id, el) {<%--
+					console.log(
+						'ABORT:\n' +
+						'  id:     ' + id + '\n' +
+						'  href:   ' + $(el).attr('href')
+					) ;--%>
+				}, function callback(id, action, $el, pos) {<%--
+					console.log(
+						'CALLBACK:\n' +
+						'  id:     ' + id + '\n' +
+						'  action: ' + action + '\n' +
+						'  href:   ' + $el.attr('href') + '\n' +
+						'  rev:    ' + $el.attr('rev') + '\n' +
+						'  html:   ' + $el.outerHTML()
+					) ;--%>
+					switch (action) {
+						case 'OPEN_NORMAL':
+							window.setTimeout(function() {
+								openTextEditNormal($, $el, id, null) ;
+							}, 1000) ;
+							break ;
+						case 'OPEN_INLINE_EDITING':
+							$('#' + id + '_container').trigger('dblclick') ;
+							break ;<%--
+						case 'USE_INLINE_EDITING_FORMATTED':
+							private_USE_INLINE_EDITING_FORMATTED = !private_USE_INLINE_EDITING_FORMATTED ;
+							imcmsSetCookie('<%= USE_INLINE_EDITING_FORMATTED %>', private_USE_INLINE_EDITING_FORMATTED + '') ;
+							$('#li_USE_INLINE_EDITING_FORMATTED').removeClass('active') ;
+							if (private_USE_INLINE_EDITING_FORMATTED) {
+								$('#li_USE_INLINE_EDITING_FORMATTED').addClass('active') ;
+								if (private_USE_INLINE_EDITING) {
+									$('#li_USE_INLINE_EDITING').removeClass('active') ;
+									$('#li_OPEN_INLINE_EDITING').removeClass('disabled') ;
+									private_USE_INLINE_EDITING = false ;
+									imcmsSetCookie('<%= USE_INLINE_EDITING %>', private_USE_INLINE_EDITING + '') ;
+									$('#li_OPEN_INLINE_EDITING').addClass('disabled') ;
+									editablePluginDestroy($) ;
+								}
+							}
+							break ;--%>
+						case 'USE_INLINE_EDITING':
+							private_USE_INLINE_EDITING = !private_USE_INLINE_EDITING ;
+							imcmsSetCookie('<%= USE_INLINE_EDITING %>', private_USE_INLINE_EDITING + '') ;
+							$('#li_USE_INLINE_EDITING').removeClass('active') ;
+							$('#li_OPEN_INLINE_EDITING').removeClass('disabled') ;
+							if (private_USE_INLINE_EDITING) {
+								$('#li_USE_INLINE_EDITING').addClass('active') ;
+								editablePluginActivate($) ;
+								if (private_USE_INLINE_EDITING_FORMATTED) {
+									$('#li_USE_INLINE_EDITING_FORMATTED').removeClass('active') ;
+									private_USE_INLINE_EDITING_FORMATTED = false ;
+								}
+							} else {
+								$('#li_OPEN_INLINE_EDITING').addClass('disabled') ;
+								editablePluginDestroy($) ;
+							}
+							break ;
+						case 'USE_WIDTH':
+							private_USE_WIDTH = !private_USE_WIDTH ;
+							imcmsSetCookie('<%= USE_WIDTH %>', private_USE_WIDTH + '') ;
+							$('#li_USE_WIDTH').removeClass('active') ;
+							if (private_USE_WIDTH) {
+								$('#li_USE_WIDTH').addClass('active') ;
+							}
+							break ;
+						case 'SHOW_HELP':
+							$dialog.dialog('open') ;
+							break ;
+					}
+				}
+			) ;
+		}
+	} catch (e) {}
+	
+}) ;
+
+function openTextEditNormal($, $this, uniqueId, event) {
+	var linkHref = $this.attr('href') ;
+	if (private_USE_WIDTH) {
+		var $textFieldDummy = $('#' + uniqueId + '_dummy') ;
+		if (1 == $textFieldDummy.length) {
+			$textFieldDummy.show(0, function() {
+				var textW = $textFieldDummy.width() ;
+				if (textW >= 150 && textW <= 600) {
+					linkHref += '&amp;width=' + textW ;
+				}
+				$textFieldDummy.hide(0) ;
+			}) ;
+		}
+	}
+	imcmsOpenPath(event, linkHref.replace(/&amp;/g, '&')) ;
+}
+
+function imcmsOpenPath(event, path) {
+	if (event && (event.ctrlKey || event.shiftKey)) {
+		window.open(path) ;
+	} else {
+		document.location = path ;
+	}
+}
+
+/* *******************************************************************************************
+ *         Set Cookie                                                                        *
+ ******************************************************************************************* */
+
+function imcmsSetCookie(name, value) {
+	var sPath = '/';
+	var today = new Date();
+	var expire = new Date();
+	expire.setTime(today.getTime() + 1000*60*60*24*365); // 365 days
+	var sCookieCont = name + "=" + escape(value);
+	sCookieCont += (expire == null) ? "" : "; expires=" + expire.toGMTString();
+	sCookieCont += "; path=" + sPath;
+	document.cookie = sCookieCont;
+}
+
+/* *******************************************************************************************
+ *         Get Cookie                                                                        *
+ ******************************************************************************************* */
+
+function imcmsGetCookie(Name) {
+	var search = Name + "=";
+	if (document.cookie.length > 0) {
+		var offset = document.cookie.indexOf(search);
+		if (offset != -1) {
+			offset += search.length;
+			end = document.cookie.indexOf(";", offset);
+			if (end == -1) {
+				end = document.cookie.length;
+			}
+			return unescape(document.cookie.substring(offset, end));
+		}
+	}
+	return null ;
+}
+
+})(jQ);
+
+<% } %><%--
+
+
+// Make new jQ version of jQuery: <%
+
+Perl5Util re = new Perl5Util() ;
+
+String jQueryMain = getURLcontent("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js", Imcms.UTF_8_ENCODING) ;
+String jQueryUi   = getURLcontent("http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js", Imcms.UTF_8_ENCODING) ;
+
+jQueryMain = re.substitute("s#jQuery#jQ#g", jQueryMain).replace("* jQ", "* jQuery") ;
+jQueryUi   = re.substitute("s#jQuery#jQ#g", jQueryUi).replace("* jQ", "* jQuery") ;
+
+%>
+
+<%= jQueryMain %>
+
+<%= jQueryUi %>
+
+
+//Did some playing. Thought I'd continue later.
+
+
+jQ(document).ready(function($) {
+	
+	$('head').append('<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" />\n') ;
+	
+	$('<div id="adminPanelFixed" />').css({
+		'position' : 'fixed',
+		'padding' : '0',
+		'top' : '-2px',
+		'left' : '500px',
+		'width' : $('#adminPanelDiv .adminPanelTable').width() + 'px',
+		'height' : ($('#adminPanelDiv .adminPanelTable').height()) + 'px'
+	}).prependTo('body') ;
+	
+	$('#adminPanelDiv .adminPanelTable').show('transfer',{ to: '#adminPanelFixed', className: 'ui-effects-transfer' }, 2000, function() {
+		$('#adminPanelFixed').html($('#adminPanelDiv').html()) ;
+		$('#adminPanelDiv').html('').hide() ;
+		//alert('transfered!') ;
+	}) ;
+	
+	
+}) ;
+
+
+--%>
+<vel:velocity>
+
+<%-- Moved from inPage_admin.html --%>
+function imcmsTargetNewWindow() {
+	var exampelWindow = window.open("", "Exempelmall", "scrollbars=yes,toolbar=0,resizable=yes,location=0,directories=0,status=0,menubar=0,height=500,width=800") ;
+	document.changePageForm.target = "Exempelmall" ;
+	exampelWindow.focus() ;
+}
+function imcmsResetTarget() {
+	document.changePageForm.target = "" ;
+}
+
+<%-- Moved from adminbuttons.jsp --%>
+function openHelpW(helpDocName){
+	window.open('@documentationurl@/Help?name=' + helpDocName + '&lang=$language', 'imcmsHelpWin') ;
+}
+
+</vel:velocity>
\ No newline at end of file
diff --git a/web/imcms/lang/scripts/imcms_admin.js.jsp b/web/imcms/lang/scripts/imcms_admin.js.jsp
index 5a78dfe491..2d59af09e8 100644
--- a/web/imcms/lang/scripts/imcms_admin.js.jsp
+++ b/web/imcms/lang/scripts/imcms_admin.js.jsp
@@ -1,5 +1,91 @@
-<%@page contentType="text/javascript"%>
-<%@taglib prefix="vel" uri="imcmsvelocity"%>
+<%@ page
+	
+	contentType="text/javascript"
+	pageEncoding="UTF-8"
+	
+%><%@ taglib prefix="vel" uri="imcmsvelocity" %><%
+
+String cp = request.getContextPath() ;
+
+%>
+
+<%@ include file="imcms_jquery_1.7.1.js" %>
+
+<%@ include file="imcms_jquery-ui_1.8.16.js" %>
+
+
+jQ(document).ready(function($) {
+	toolTip($, 'body') ;
+}) ;
+
+function imLog(mess) {
+	try {
+		if (window && window.console) {
+			window.console.log(mess) ;
+		}
+	} catch (e) {}
+}
+
+<%--
+/* *******************************************************************************************
+ *         ToolTip - Mouse over white plate with (i) icon or doc format icon (PDF, ZIP etc.) *
+ ******************************************************************************************* */
+--%>
+/*
+ * Tooltip script 
+ * powered by jQuery (http://www.jquery.com)
+ * 
+ * written by Alen Grakalic (http://cssglobe.com)
+ * modified by Tommy Ullberg, imCode Partner AB (http://www.imcms.net/)
+ * 
+ * for more info visit http://cssglobe.com/post/1695/easiest-tooltip-and-image-preview-using-jquery
+ *
+ */
+
+var oToolTipTimer = null ;
+
+this.toolTip = function($, selector){
+	if (oToolTipTimer) {
+		window.clearTimeout(oToolTipTimer) ;
+	}
+	xOffset = 10;
+	yOffset = 20;
+	$(selector + ' .toolTip,' + selector + ' .toolTipHide').hover(function(e){
+		this.t = this.title;
+		this.title = "";
+		var fileData = $(this).attr("rel") ;
+		this.iconClass = "" ;
+		if (null != fileData && fileData.length > 7 && fileData.indexOf("FIL") != -1) {
+			var fileExt = fileData.substring(4,7) ;
+			if (/^(PDF|DOC|ZIP|JPG|PNG|GIF|MP3|AVI|MPG)$/i.test(fileExt)) {
+				this.iconClass = "toolTipIcon_" + fileExt.toUpperCase() ;
+			}
+		} else if (null != fileData && fileData.indexOf("URL") != -1) {
+			this.iconClass = "toolTipIcon_EXT_LINK" ;
+		}
+		$("body").append('<div id="toolTipPop">'+ this.t.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/#LT#/g, "&lt;").replace(/#GT#/g, "&gt;") + '</div>');
+		$("#toolTipPop")
+			.css("top",(e.pageY + yOffset) + "px")
+			.css("left",(e.pageX + xOffset) + "px")
+			.fadeIn(document.all ? "fast" : "slow");
+		if ($(this).hasClass('toolTipHide')) {
+			$("#toolTipPop").delay(1000).fadeTo(500, 0) ;
+			//this.title = this.t;
+		}
+	}, function(){
+		this.title = this.t;
+		$("#toolTipPop").remove();
+	});
+	$(".toolTip,.toolTipHide").mousemove(function(e){
+		$("#toolTipPop")
+			.css("top",(e.pageY + yOffset) + "px")
+			.css("left",(e.pageX + xOffset) + "px") ;
+		if ("" != this.iconClass) {
+			$("#toolTipPop").addClass(this.iconClass) ;
+		}
+	});
+};
+
 <vel:velocity>
 
 /* *******************************************************************************************
@@ -9,9 +95,9 @@
 var platf     = navigator.platform;
 var ua        = navigator.userAgent;
 
-var hasDocumentLayers = (document.layers) ? 1 : 0;
-var hasDocumentAll    = (document.all) ? 1 : 0;
-var hasGetElementById = (document.getElementById) ? 1 : 0;
+var hasDocumentLayers = (document.layers);
+var hasDocumentAll    = (document.all);
+var hasGetElementById = (document.getElementById);
 
 var isGecko   = inStr(ua,"Gecko");
 var isOpera   = inStr(ua,"Opera");
@@ -19,16 +105,16 @@ var isSafari  = inStr(ua,"Safari");
 var isWindows = inStr(platf,"Win32");
 var isMac     = inStr(platf,"Mac");
 
-var isIE55    = (isWindows && hasDocumentAll && hasGetElementById && (inStr(ua,"MSIE 5.5") || inStr(ua,"MSIE 6.0") || inStr(ua,"MSIE 6.5") || inStr(ua,"MSIE 7.0")) && !isOpera) ? 1 : 0;
+var isIE55    = (isWindows && hasDocumentAll && hasGetElementById && /MSIE \d+/.test(ua) && !isOpera);
 
 function inStr(str,val,cas) {
 	var ret;
 	if (cas) { /* Case sensitive */
-		ret = (str.indexOf(val) != -1) ? true : false;
+		ret = (str.indexOf(val) != -1);
 	} else { /* Not Case sensitive */
 		str = str.toUpperCase();
 		val = val.toUpperCase();
-		ret = (str.indexOf(val) != -1) ? true : false;
+		ret = (str.indexOf(val) != -1);
 	}
 	return ret;
 }
@@ -58,11 +144,10 @@ function focusField(theFormName, theElementName) {
 function getParam(attrib) {			// get querystring-parameters from document.location
 	var sParams = location.search;
 	var retVal = "";
-	var params = new Array();
 	if (sParams.indexOf('?') != -1) {
 		var pairs = sParams.substring(1, sParams.length).split('&');
 		for (var i=0; i<pairs.length; i++) {
-			nameVal = pairs[i].split('=');
+			var nameVal = pairs[i].split('=');
 			if (nameVal[0] == attrib) {
 				retVal = nameVal[1];
 			}
@@ -80,13 +165,14 @@ function openHelpW(helpDocName){
 }
 
 function popWinOpen(winW,winH,sUrl,sName,iResize,iScroll) {
+	var winX, winY ;
 	if (screen) {
 		if ((screen.height - winH) < 150) {
-			var winX = (screen.width - winW) / 2;
-			var winY = 0;
+			winX = (screen.width - winW) / 2;
+			winY = 0;
 		} else {
-			var winX = (screen.width - winW) / 2;
-			var winY = (screen.height - winH) / 2;
+			winX = (screen.width - winW) / 2;
+			winY = (screen.height - winH) / 2;
 		}
 		var popWindow = window.open(sUrl,sName,"resizable=" + iResize + ",menubar=0,scrollbars=" + iScroll + ",width=" + winW + ",height=" + winH + ",top=" + winY + ",left=" + winX + "");
 		if (popWindow) popWindow.focus();
diff --git a/web/imcms/lang/scripts/imcms_jquery-ui_1.8.16.js b/web/imcms/lang/scripts/imcms_jquery-ui_1.8.16.js
new file mode 100644
index 0000000000..5e1e922247
--- /dev/null
+++ b/web/imcms/lang/scripts/imcms_jquery-ui_1.8.16.js
@@ -0,0 +1,414 @@
+/*!
+ * jQuery UI 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(a,d){function c(h,g){var i=h.nodeName.toLowerCase();if("area"===i){g=h.parentNode;i=g.name;if(!h.href||!i||g.nodeName.toLowerCase()!=="map")return false;h=a("img[usemap=#"+i+"]")[0];return!!h&&e(h)}return(/input|select|textarea|button|object/.test(i)?!h.disabled:"a"==i?h.href||g:g)&&e(h)}function e(h){return!a(h).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.ui=a.ui||{};if(!a.ui.version){a.extend(a.ui,{version:"1.8.16",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(h,g){return typeof h==="number"?this.each(function(){var i=
+this;setTimeout(function(){a(i).focus();g&&g.call(i)},h)}):this._focus.apply(this,arguments)},scrollParent:function(){var h;h=a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,
+"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!h.length?a(document):h},zIndex:function(h){if(h!==d)return this.css("zIndex",h);if(this.length){h=a(this[0]);for(var g;h.length&&h[0]!==document;){g=h.css("position");if(g==="absolute"||g==="relative"||g==="fixed"){g=parseInt(h.css("zIndex"),10);if(!isNaN(g)&&g!==0)return g}h=h.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":
+"mousedown")+".ui-disableSelection",function(h){h.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});a.each(["Width","Height"],function(h,g){function i(l,o,n,k){a.each(b,function(){o-=parseFloat(a.curCSS(l,"padding"+this,true))||0;if(n)o-=parseFloat(a.curCSS(l,"border"+this+"Width",true))||0;if(k)o-=parseFloat(a.curCSS(l,"margin"+this,true))||0});return o}var b=g==="Width"?["Left","Right"]:["Top","Bottom"],f=g.toLowerCase(),j={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,
+outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+g]=function(l){if(l===d)return j["inner"+g].call(this);return this.each(function(){a(this).css(f,i(this,l)+"px")})};a.fn["outer"+g]=function(l,o){if(typeof l!=="number")return j["outer"+g].call(this,l);return this.each(function(){a(this).css(f,i(this,l,true,o)+"px")})}});a.extend(a.expr[":"],{data:function(h,g,i){return!!a.data(h,i[3])},focusable:function(h){return c(h,!isNaN(a.attr(h,"tabindex")))},tabbable:function(h){var g=a.attr(h,
+"tabindex"),i=isNaN(g);return(i||g>=0)&&c(h,!i)}});a(function(){var h=document.body,g=h.appendChild(g=document.createElement("div"));a.extend(g.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});a.support.minHeight=g.offsetHeight===100;a.support.selectstart="onselectstart"in g;h.removeChild(g).style.display="none"});a.extend(a.ui,{plugin:{add:function(h,g,i){h=a.ui[h].prototype;for(var b in i){h.plugins[b]=h.plugins[b]||[];h.plugins[b].push([g,i[b]])}},call:function(h,g,i){if((g=h.plugins[g])&&
+h.element[0].parentNode)for(var b=0;b<g.length;b++)h.options[g[b][0]]&&g[b][1].apply(h.element,i)}},contains:function(h,g){return document.compareDocumentPosition?h.compareDocumentPosition(g)&16:h!==g&&h.contains(g)},hasScroll:function(h,g){if(a(h).css("overflow")==="hidden")return false;g=g&&g==="left"?"scrollLeft":"scrollTop";var i=false;if(h[g]>0)return true;h[g]=1;i=h[g]>0;h[g]=0;return i},isOverAxis:function(h,g,i){return h>g&&h<g+i},isOver:function(h,g,i,b,f,j){return a.ui.isOverAxis(h,i,f)&&
+a.ui.isOverAxis(g,b,j)}})}})(jQ);
+(function(a,d){if(a.cleanData){var c=a.cleanData;a.cleanData=function(h){for(var g=0,i;(i=h[g])!=null;g++)try{a(i).triggerHandler("remove")}catch(b){}c(h)}}else{var e=a.fn.remove;a.fn.remove=function(h,g){return this.each(function(){if(!g)if(!h||a.filter(h,[this]).length)a("*",this).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(i){}});return e.call(a(this),h,g)})}}a.widget=function(h,g,i){var b=h.split(".")[0],f;h=h.split(".")[1];f=b+"-"+h;if(!i){i=g;g=a.Widget}a.expr[":"][f]=
+function(j){return!!a.data(j,h)};a[b]=a[b]||{};a[b][h]=function(j,l){arguments.length&&this._createWidget(j,l)};g=new g;g.options=a.extend(true,{},g.options);a[b][h].prototype=a.extend(true,g,{namespace:b,widgetName:h,widgetEventPrefix:a[b][h].prototype.widgetEventPrefix||h,widgetBaseClass:f},i);a.widget.bridge(h,a[b][h])};a.widget.bridge=function(h,g){a.fn[h]=function(i){var b=typeof i==="string",f=Array.prototype.slice.call(arguments,1),j=this;i=!b&&f.length?a.extend.apply(null,[true,i].concat(f)):
+i;if(b&&i.charAt(0)==="_")return j;b?this.each(function(){var l=a.data(this,h),o=l&&a.isFunction(l[i])?l[i].apply(l,f):l;if(o!==l&&o!==d){j=o;return false}}):this.each(function(){var l=a.data(this,h);l?l.option(i||{})._init():a.data(this,h,new g(i,this))});return j}};a.Widget=function(h,g){arguments.length&&this._createWidget(h,g)};a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(h,g){a.data(g,this.widgetName,this);this.element=a(g);this.options=
+a.extend(true,{},this.options,this._getCreateOptions(),h);var i=this;this.element.bind("remove."+this.widgetName,function(){i.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(h,g){var i=h;if(arguments.length===0)return a.extend({},this.options);if(typeof h==="string"){if(g===d)return this.options[h];i={};i[h]=g}this._setOptions(i);return this},_setOptions:function(h){var g=this;a.each(h,function(i,b){g._setOption(i,b)});return this},_setOption:function(h,g){this.options[h]=g;if(h==="disabled")this.widget()[g?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
+g);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(h,g,i){var b=this.options[h];g=a.Event(g);g.type=(h===this.widgetEventPrefix?h:this.widgetEventPrefix+h).toLowerCase();i=i||{};if(g.originalEvent){h=a.event.props.length;for(var f;h;){f=a.event.props[--h];g[f]=g.originalEvent[f]}}this.element.trigger(g,i);return!(a.isFunction(b)&&b.call(this.element[0],g,i)===false||g.isDefaultPrevented())}}})(jQ);
+(function(a){var d=false;a(document).mouseup(function(){d=false});a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var c=this;this.element.bind("mousedown."+this.widgetName,function(e){return c._mouseDown(e)}).bind("click."+this.widgetName,function(e){if(true===a.data(e.target,c.widgetName+".preventClickEvent")){a.removeData(e.target,c.widgetName+".preventClickEvent");e.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
+this.widgetName)},_mouseDown:function(c){if(!d){this._mouseStarted&&this._mouseUp(c);this._mouseDownEvent=c;var e=this,h=c.which==1,g=typeof this.options.cancel=="string"&&c.target.nodeName?a(c.target).closest(this.options.cancel).length:false;if(!h||g||!this._mouseCapture(c))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c)){this._mouseStarted=
+this._mouseStart(c)!==false;if(!this._mouseStarted){c.preventDefault();return true}}true===a.data(c.target,this.widgetName+".preventClickEvent")&&a.removeData(c.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(i){return e._mouseMove(i)};this._mouseUpDelegate=function(i){return e._mouseUp(i)};a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);c.preventDefault();return d=true}},_mouseMove:function(c){if(a.browser.msie&&
+!(document.documentMode>=9)&&!c.button)return this._mouseUp(c);if(this._mouseStarted){this._mouseDrag(c);return c.preventDefault()}if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,c)!==false)?this._mouseDrag(c):this._mouseUp(c);return!this._mouseStarted},_mouseUp:function(c){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
+false;c.target==this._mouseDownEvent.target&&a.data(c.target,this.widgetName+".preventClickEvent",true);this._mouseStop(c)}return false},_mouseDistanceMet:function(c){return Math.max(Math.abs(this._mouseDownEvent.pageX-c.pageX),Math.abs(this._mouseDownEvent.pageY-c.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQ);
+(function(a){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(d){var c=
+this.options;if(this.helper||c.disabled||a(d.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(d);if(!this.handle)return false;if(c.iframeFix)a(c.iframeFix===true?"iframe":c.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(a(this).offset()).appendTo("body")});return true},_mouseStart:function(d){var c=this.options;
+this.helper=this._createHelper(d);this._cacheHelperProportions();if(a.ui.ddmanager)a.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
+this.originalPosition=this.position=this._generatePosition(d);this.originalPageX=d.pageX;this.originalPageY=d.pageY;c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt);c.containment&&this._setContainment();if(this._trigger("start",d)===false){this._clear();return false}this._cacheHelperProportions();a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,d);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(d,true);a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,d);return true},
+_mouseDrag:function(d,c){this.position=this._generatePosition(d);this.positionAbs=this._convertPositionTo("absolute");if(!c){c=this._uiHash();if(this._trigger("drag",d,c)===false){this._mouseUp({});return false}this.position=c.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";a.ui.ddmanager&&a.ui.ddmanager.drag(this,d);return false},_mouseStop:function(d){var c=
+false;if(a.ui.ddmanager&&!this.options.dropBehaviour)c=a.ui.ddmanager.drop(this,d);if(this.dropped){c=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!c||this.options.revert=="valid"&&c||this.options.revert===true||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,c)){var e=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
+10),function(){e._trigger("stop",d)!==false&&e._clear()})}else this._trigger("stop",d)!==false&&this._clear();return false},_mouseUp:function(d){this.options.iframeFix===true&&a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,d);return a.ui.mouse.prototype._mouseUp.call(this,d)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(d){var c=!this.options.handle||
+!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==d.target)c=true});return c},_createHelper:function(d){var c=this.options;d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[d])):c.helper=="clone"?this.element.clone().removeAttr("id"):this.element;d.parents("body").length||d.appendTo(c.appendTo=="parent"?this.element[0].parentNode:c.appendTo);d[0]!=this.element[0]&&!/(fixed|absolute)/.test(d.css("position"))&&
+d.css("position","absolute");return d},_adjustOffsetFromHelper:function(d){if(typeof d=="string")d=d.split(" ");if(a.isArray(d))d={left:+d[0],top:+d[1]||0};if("left"in d)this.offset.click.left=d.left+this.margins.left;if("right"in d)this.offset.click.left=this.helperProportions.width-d.right+this.margins.left;if("top"in d)this.offset.click.top=d.top+this.margins.top;if("bottom"in d)this.offset.click.top=this.helperProportions.height-d.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
+this.helper.offsetParent();var d=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){d.left+=this.scrollParent.scrollLeft();d.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)d={top:0,left:0};return{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
+10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var d=this.element.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
+10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d=this.options;if(d.containment=="parent")d.containment=this.helper[0].parentNode;if(d.containment=="document"||d.containment=="window")this.containment=[d.containment=="document"?0:a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,d.containment=="document"?0:a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
+(d.containment=="document"?0:a(window).scrollLeft())+a(d.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d.containment=="document"?0:a(window).scrollTop())+(a(d.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(d.containment)&&d.containment.constructor!=Array){d=a(d.containment);var c=d[0];if(c){d.offset();var e=a(c).css("overflow")!=
+"hidden";this.containment=[(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0),(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0),(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),
+10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=d}}else if(d.containment.constructor==Array)this.containment=d.containment},_convertPositionTo:function(d,c){if(!c)c=this.position;d=d=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:c.top+
+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*d)}},_generatePosition:function(d){var c=this.options,e=this.cssPosition=="absolute"&&
+!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName),g=d.pageX,i=d.pageY;if(this.originalPosition){var b;if(this.containment){if(this.relative_container){b=this.relative_container.offset();b=[this.containment[0]+b.left,this.containment[1]+b.top,this.containment[2]+b.left,this.containment[3]+b.top]}else b=this.containment;if(d.pageX-this.offset.click.left<b[0])g=b[0]+this.offset.click.left;
+if(d.pageY-this.offset.click.top<b[1])i=b[1]+this.offset.click.top;if(d.pageX-this.offset.click.left>b[2])g=b[2]+this.offset.click.left;if(d.pageY-this.offset.click.top>b[3])i=b[3]+this.offset.click.top}if(c.grid){i=c.grid[1]?this.originalPageY+Math.round((i-this.originalPageY)/c.grid[1])*c.grid[1]:this.originalPageY;i=b?!(i-this.offset.click.top<b[1]||i-this.offset.click.top>b[3])?i:!(i-this.offset.click.top<b[1])?i-c.grid[1]:i+c.grid[1]:i;g=c.grid[0]?this.originalPageX+Math.round((g-this.originalPageX)/
+c.grid[0])*c.grid[0]:this.originalPageX;g=b?!(g-this.offset.click.left<b[0]||g-this.offset.click.left>b[2])?g:!(g-this.offset.click.left<b[0])?g-c.grid[0]:g+c.grid[0]:g}}return{top:i-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&a.browser.version<
+526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(d,c,e){e=e||this._uiHash();a.ui.plugin.call(this,d,[c,e]);if(d=="drag")this.positionAbs=this._convertPositionTo("absolute");return a.Widget.prototype._trigger.call(this,d,c,
+e)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});a.extend(a.ui.draggable,{version:"1.8.16"});a.ui.plugin.add("draggable","connectToSortable",{start:function(d,c){var e=a(this).data("draggable"),h=e.options,g=a.extend({},c,{item:e.element});e.sortables=[];a(h.connectToSortable).each(function(){var i=a.data(this,"sortable");if(i&&!i.options.disabled){e.sortables.push({instance:i,shouldRevert:i.options.revert});
+i.refreshPositions();i._trigger("activate",d,g)}})},stop:function(d,c){var e=a(this).data("draggable"),h=a.extend({},c,{item:e.element});a.each(e.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;e.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(d);this.instance.options.helper=this.instance.options._helper;e.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
+false;this.instance._trigger("deactivate",d,h)}})},drag:function(d,c){var e=a(this).data("draggable"),h=this;a.each(e.sortables,function(){this.instance.positionAbs=e.positionAbs;this.instance.helperProportions=e.helperProportions;this.instance.offset.click=e.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(h).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
+this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return c.helper[0]};d.target=this.instance.currentItem[0];this.instance._mouseCapture(d,true);this.instance._mouseStart(d,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;
+e._trigger("toSortable",d);e.dropped=this.instance.element;e.currentItem=e.element;this.instance.fromOutside=e}this.instance.currentItem&&this.instance._mouseDrag(d)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",d,this.instance._uiHash(this.instance));this.instance._mouseStop(d,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
+this.instance.placeholder.remove();e._trigger("fromSortable",d);e.dropped=false}})}});a.ui.plugin.add("draggable","cursor",{start:function(){var d=a("body"),c=a(this).data("draggable").options;if(d.css("cursor"))c._cursor=d.css("cursor");d.css("cursor",c.cursor)},stop:function(){var d=a(this).data("draggable").options;d._cursor&&a("body").css("cursor",d._cursor)}});a.ui.plugin.add("draggable","opacity",{start:function(d,c){d=a(c.helper);c=a(this).data("draggable").options;if(d.css("opacity"))c._opacity=
+d.css("opacity");d.css("opacity",c.opacity)},stop:function(d,c){d=a(this).data("draggable").options;d._opacity&&a(c.helper).css("opacity",d._opacity)}});a.ui.plugin.add("draggable","scroll",{start:function(){var d=a(this).data("draggable");if(d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML")d.overflowOffset=d.scrollParent.offset()},drag:function(d){var c=a(this).data("draggable"),e=c.options,h=false;if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML"){if(!e.axis||e.axis!=
+"x")if(c.overflowOffset.top+c.scrollParent[0].offsetHeight-d.pageY<e.scrollSensitivity)c.scrollParent[0].scrollTop=h=c.scrollParent[0].scrollTop+e.scrollSpeed;else if(d.pageY-c.overflowOffset.top<e.scrollSensitivity)c.scrollParent[0].scrollTop=h=c.scrollParent[0].scrollTop-e.scrollSpeed;if(!e.axis||e.axis!="y")if(c.overflowOffset.left+c.scrollParent[0].offsetWidth-d.pageX<e.scrollSensitivity)c.scrollParent[0].scrollLeft=h=c.scrollParent[0].scrollLeft+e.scrollSpeed;else if(d.pageX-c.overflowOffset.left<
+e.scrollSensitivity)c.scrollParent[0].scrollLeft=h=c.scrollParent[0].scrollLeft-e.scrollSpeed}else{if(!e.axis||e.axis!="x")if(d.pageY-a(document).scrollTop()<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()-e.scrollSpeed);else if(a(window).height()-(d.pageY-a(document).scrollTop())<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()+e.scrollSpeed);if(!e.axis||e.axis!="y")if(d.pageX-a(document).scrollLeft()<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()-
+e.scrollSpeed);else if(a(window).width()-(d.pageX-a(document).scrollLeft())<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()+e.scrollSpeed)}h!==false&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(c,d)}});a.ui.plugin.add("draggable","snap",{start:function(){var d=a(this).data("draggable"),c=d.options;d.snapElements=[];a(c.snap.constructor!=String?c.snap.items||":data(draggable)":c.snap).each(function(){var e=a(this),h=e.offset();this!=d.element[0]&&d.snapElements.push({item:this,
+width:e.outerWidth(),height:e.outerHeight(),top:h.top,left:h.left})})},drag:function(d,c){for(var e=a(this).data("draggable"),h=e.options,g=h.snapTolerance,i=c.offset.left,b=i+e.helperProportions.width,f=c.offset.top,j=f+e.helperProportions.height,l=e.snapElements.length-1;l>=0;l--){var o=e.snapElements[l].left,n=o+e.snapElements[l].width,k=e.snapElements[l].top,m=k+e.snapElements[l].height;if(o-g<i&&i<n+g&&k-g<f&&f<m+g||o-g<i&&i<n+g&&k-g<j&&j<m+g||o-g<b&&b<n+g&&k-g<f&&f<m+g||o-g<b&&b<n+g&&k-g<j&&
+j<m+g){if(h.snapMode!="inner"){var p=Math.abs(k-j)<=g,q=Math.abs(m-f)<=g,s=Math.abs(o-b)<=g,r=Math.abs(n-i)<=g;if(p)c.position.top=e._convertPositionTo("relative",{top:k-e.helperProportions.height,left:0}).top-e.margins.top;if(q)c.position.top=e._convertPositionTo("relative",{top:m,left:0}).top-e.margins.top;if(s)c.position.left=e._convertPositionTo("relative",{top:0,left:o-e.helperProportions.width}).left-e.margins.left;if(r)c.position.left=e._convertPositionTo("relative",{top:0,left:n}).left-e.margins.left}var u=
+p||q||s||r;if(h.snapMode!="outer"){p=Math.abs(k-f)<=g;q=Math.abs(m-j)<=g;s=Math.abs(o-i)<=g;r=Math.abs(n-b)<=g;if(p)c.position.top=e._convertPositionTo("relative",{top:k,left:0}).top-e.margins.top;if(q)c.position.top=e._convertPositionTo("relative",{top:m-e.helperProportions.height,left:0}).top-e.margins.top;if(s)c.position.left=e._convertPositionTo("relative",{top:0,left:o}).left-e.margins.left;if(r)c.position.left=e._convertPositionTo("relative",{top:0,left:n-e.helperProportions.width}).left-e.margins.left}if(!e.snapElements[l].snapping&&
+(p||q||s||r||u))e.options.snap.snap&&e.options.snap.snap.call(e.element,d,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=p||q||s||r||u}else{e.snapElements[l].snapping&&e.options.snap.release&&e.options.snap.release.call(e.element,d,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=false}}}});a.ui.plugin.add("draggable","stack",{start:function(){var d=a(this).data("draggable").options;d=a.makeArray(a(d.stack)).sort(function(e,h){return(parseInt(a(e).css("zIndex"),
+10)||0)-(parseInt(a(h).css("zIndex"),10)||0)});if(d.length){var c=parseInt(d[0].style.zIndex)||0;a(d).each(function(e){this.style.zIndex=c+e});this[0].style.zIndex=c+d.length}}});a.ui.plugin.add("draggable","zIndex",{start:function(d,c){d=a(c.helper);c=a(this).data("draggable").options;if(d.css("zIndex"))c._zIndex=d.css("zIndex");d.css("zIndex",c.zIndex)},stop:function(d,c){d=a(this).data("draggable").options;d._zIndex&&a(c.helper).css("zIndex",d._zIndex)}})})(jQ);
+(function(a){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var d=this.options,c=d.accept;this.isover=0;this.isout=1;this.accept=a.isFunction(c)?c:function(e){return e.is(c)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};a.ui.ddmanager.droppables[d.scope]=a.ui.ddmanager.droppables[d.scope]||[];a.ui.ddmanager.droppables[d.scope].push(this);
+d.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var d=a.ui.ddmanager.droppables[this.options.scope],c=0;c<d.length;c++)d[c]==this&&d.splice(c,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(d,c){if(d=="accept")this.accept=a.isFunction(c)?c:function(e){return e.is(c)};a.Widget.prototype._setOption.apply(this,arguments)},_activate:function(d){var c=a.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);c&&this._trigger("activate",d,this.ui(c))},_deactivate:function(d){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);c&&this._trigger("deactivate",d,this.ui(c))},_over:function(d){var c=a.ui.ddmanager.current;if(!(!c||(c.currentItem||c.element)[0]==this.element[0]))if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",d,this.ui(c))}},_out:function(d){var c=a.ui.ddmanager.current;if(!(!c||(c.currentItem||c.element)[0]==this.element[0]))if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",d,this.ui(c))}},_drop:function(d,c){var e=c||a.ui.ddmanager.current;if(!e||(e.currentItem||e.element)[0]==this.element[0])return false;var h=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+a.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==e.options.scope&&g.accept.call(g.element[0],e.currentItem||e.element)&&a.ui.intersect(e,a.extend(g,{offset:g.element.offset()}),g.options.tolerance)){h=true;return false}});if(h)return false;if(this.accept.call(this.element[0],e.currentItem||e.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+d,this.ui(e));return this.element}return false},ui:function(d){return{draggable:d.currentItem||d.element,helper:d.helper,position:d.position,offset:d.positionAbs}}});a.extend(a.ui.droppable,{version:"1.8.16"});a.ui.intersect=function(d,c,e){if(!c.offset)return false;var h=(d.positionAbs||d.position.absolute).left,g=h+d.helperProportions.width,i=(d.positionAbs||d.position.absolute).top,b=i+d.helperProportions.height,f=c.offset.left,j=f+c.proportions.width,l=c.offset.top,o=l+c.proportions.height;
+switch(e){case "fit":return f<=h&&g<=j&&l<=i&&b<=o;case "intersect":return f<h+d.helperProportions.width/2&&g-d.helperProportions.width/2<j&&l<i+d.helperProportions.height/2&&b-d.helperProportions.height/2<o;case "pointer":return a.ui.isOver((d.positionAbs||d.position.absolute).top+(d.clickOffset||d.offset.click).top,(d.positionAbs||d.position.absolute).left+(d.clickOffset||d.offset.click).left,l,f,c.proportions.height,c.proportions.width);case "touch":return(i>=l&&i<=o||b>=l&&b<=o||i<l&&b>o)&&(h>=
+f&&h<=j||g>=f&&g<=j||h<f&&g>j);default:return false}};a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(d,c){var e=a.ui.ddmanager.droppables[d.options.scope]||[],h=c?c.type:null,g=(d.currentItem||d.element).find(":data(droppable)").andSelf(),i=0;a:for(;i<e.length;i++)if(!(e[i].options.disabled||d&&!e[i].accept.call(e[i].element[0],d.currentItem||d.element))){for(var b=0;b<g.length;b++)if(g[b]==e[i].element[0]){e[i].proportions.height=0;continue a}e[i].visible=e[i].element.css("display")!=
+"none";if(e[i].visible){h=="mousedown"&&e[i]._activate.call(e[i],c);e[i].offset=e[i].element.offset();e[i].proportions={width:e[i].element[0].offsetWidth,height:e[i].element[0].offsetHeight}}}},drop:function(d,c){var e=false;a.each(a.ui.ddmanager.droppables[d.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&a.ui.intersect(d,this,this.options.tolerance))e=e||this._drop.call(this,c);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],d.currentItem||
+d.element)){this.isout=1;this.isover=0;this._deactivate.call(this,c)}}});return e},dragStart:function(d,c){d.element.parents(":not(body,html)").bind("scroll.droppable",function(){d.options.refreshPositions||a.ui.ddmanager.prepareOffsets(d,c)})},drag:function(d,c){d.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(d,c);a.each(a.ui.ddmanager.droppables[d.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var e=a.ui.intersect(d,this,this.options.tolerance);
+if(e=!e&&this.isover==1?"isout":e&&this.isover==0?"isover":null){var h;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){h=a.data(g[0],"droppable");h.greedyChild=e=="isover"?1:0}}if(h&&e=="isover"){h.isover=0;h.isout=1;h._out.call(h,c)}this[e]=1;this[e=="isout"?"isover":"isout"]=0;this[e=="isover"?"_over":"_out"].call(this,c);if(h&&e=="isout"){h.isout=0;h.isover=1;h._over.call(h,c)}}}})},dragStop:function(d,c){d.element.parents(":not(body,html)").unbind("scroll.droppable");
+d.options.refreshPositions||a.ui.ddmanager.prepareOffsets(d,c)}}})(jQ);
+(function(a){a.widget("ui.resizable",a.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var e=this,h=this.options;this.element.addClass("ui-resizable");a.extend(this,{_aspectRatio:!!h.aspectRatio,aspectRatio:h.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:h.helper||h.ghost||h.animate?h.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&a.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(a('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=h.handles||(!a(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var g=this.handles.split(",");this.handles={};for(var i=0;i<g.length;i++){var b=a.trim(g[i]),f=a('<div class="ui-resizable-handle '+("ui-resizable-"+b)+'"></div>');/sw|se|ne|nw/.test(b)&&f.css({zIndex:++h.zIndex});"se"==b&&f.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[b]=".ui-resizable-"+b;this.element.append(f)}}this._renderAxis=function(j){j=j||this.element;for(var l in this.handles){if(this.handles[l].constructor==
+String)this.handles[l]=a(this.handles[l],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var o=a(this.handles[l],this.element),n=0;n=/sw|ne|nw|se|n|s/.test(l)?o.outerHeight():o.outerWidth();o=["padding",/ne|nw|n/.test(l)?"Top":/se|sw|s/.test(l)?"Bottom":/^e$/.test(l)?"Right":"Left"].join("");j.css(o,n);this._proportionallyResize()}a(this.handles[l])}};this._renderAxis(this.element);this._handles=a(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!e.resizing){if(this.className)var j=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);e.axis=j&&j[1]?j[1]:"se"}});if(h.autoHide){this._handles.hide();a(this.element).addClass("ui-resizable-autohide").hover(function(){if(!h.disabled){a(this).removeClass("ui-resizable-autohide");e._handles.show()}},function(){if(!h.disabled)if(!e.resizing){a(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
+var e=function(g){a(g).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){e(this.element);var h=this.element;h.after(this.originalElement.css({position:h.css("position"),width:h.outerWidth(),height:h.outerHeight(),top:h.css("top"),left:h.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);e(this.originalElement);return this},_mouseCapture:function(e){var h=
+false;for(var g in this.handles)if(a(this.handles[g])[0]==e.target)h=true;return!this.options.disabled&&h},_mouseStart:function(e){var h=this.options,g=this.element.position(),i=this.element;this.resizing=true;this.documentScroll={top:a(document).scrollTop(),left:a(document).scrollLeft()};if(i.is(".ui-draggable")||/absolute/.test(i.css("position")))i.css({position:"absolute",top:g.top,left:g.left});a.browser.opera&&/relative/.test(i.css("position"))&&i.css({position:"relative",top:"auto",left:"auto"});
+this._renderProxy();g=d(this.helper.css("left"));var b=d(this.helper.css("top"));if(h.containment){g+=a(h.containment).scrollLeft()||0;b+=a(h.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:g,top:b};this.size=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalSize=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalPosition={left:g,top:b};this.sizeDiff=
+{width:i.outerWidth()-i.width(),height:i.outerHeight()-i.height()};this.originalMousePosition={left:e.pageX,top:e.pageY};this.aspectRatio=typeof h.aspectRatio=="number"?h.aspectRatio:this.originalSize.width/this.originalSize.height||1;h=a(".ui-resizable-"+this.axis).css("cursor");a("body").css("cursor",h=="auto"?this.axis+"-resize":h);i.addClass("ui-resizable-resizing");this._propagate("start",e);return true},_mouseDrag:function(e){var h=this.helper,g=this.originalMousePosition,i=this._change[this.axis];
+if(!i)return false;g=i.apply(this,[e,e.pageX-g.left||0,e.pageY-g.top||0]);this._updateVirtualBoundaries(e.shiftKey);if(this._aspectRatio||e.shiftKey)g=this._updateRatio(g,e);g=this._respectSize(g,e);this._propagate("resize",e);h.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(g);this._trigger("resize",e,this.ui());return false},
+_mouseStop:function(e){this.resizing=false;var h=this.options,g=this;if(this._helper){var i=this._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName);i=b&&a.ui.hasScroll(i[0],"left")?0:g.sizeDiff.height;b=b?0:g.sizeDiff.width;b={width:g.helper.width()-b,height:g.helper.height()-i};i=parseInt(g.element.css("left"),10)+(g.position.left-g.originalPosition.left)||null;var f=parseInt(g.element.css("top"),10)+(g.position.top-g.originalPosition.top)||null;h.animate||this.element.css(a.extend(b,
+{top:f,left:i}));g.helper.height(g.size.height);g.helper.width(g.size.width);this._helper&&!h.animate&&this._proportionallyResize()}a("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",e);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(e){var h=this.options,g,i,b;h={minWidth:c(h.minWidth)?h.minWidth:0,maxWidth:c(h.maxWidth)?h.maxWidth:Infinity,minHeight:c(h.minHeight)?h.minHeight:0,maxHeight:c(h.maxHeight)?h.maxHeight:
+Infinity};if(this._aspectRatio||e){e=h.minHeight*this.aspectRatio;i=h.minWidth/this.aspectRatio;g=h.maxHeight*this.aspectRatio;b=h.maxWidth/this.aspectRatio;if(e>h.minWidth)h.minWidth=e;if(i>h.minHeight)h.minHeight=i;if(g<h.maxWidth)h.maxWidth=g;if(b<h.maxHeight)h.maxHeight=b}this._vBoundaries=h},_updateCache:function(e){this.offset=this.helper.offset();if(c(e.left))this.position.left=e.left;if(c(e.top))this.position.top=e.top;if(c(e.height))this.size.height=e.height;if(c(e.width))this.size.width=
+e.width},_updateRatio:function(e){var h=this.position,g=this.size,i=this.axis;if(c(e.height))e.width=e.height*this.aspectRatio;else if(c(e.width))e.height=e.width/this.aspectRatio;if(i=="sw"){e.left=h.left+(g.width-e.width);e.top=null}if(i=="nw"){e.top=h.top+(g.height-e.height);e.left=h.left+(g.width-e.width)}return e},_respectSize:function(e){var h=this._vBoundaries,g=this.axis,i=c(e.width)&&h.maxWidth&&h.maxWidth<e.width,b=c(e.height)&&h.maxHeight&&h.maxHeight<e.height,f=c(e.width)&&h.minWidth&&
+h.minWidth>e.width,j=c(e.height)&&h.minHeight&&h.minHeight>e.height;if(f)e.width=h.minWidth;if(j)e.height=h.minHeight;if(i)e.width=h.maxWidth;if(b)e.height=h.maxHeight;var l=this.originalPosition.left+this.originalSize.width,o=this.position.top+this.size.height,n=/sw|nw|w/.test(g);g=/nw|ne|n/.test(g);if(f&&n)e.left=l-h.minWidth;if(i&&n)e.left=l-h.maxWidth;if(j&&g)e.top=o-h.minHeight;if(b&&g)e.top=o-h.maxHeight;if((h=!e.width&&!e.height)&&!e.left&&e.top)e.top=null;else if(h&&!e.top&&e.left)e.left=
+null;return e},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e=this.helper||this.element,h=0;h<this._proportionallyResizeElements.length;h++){var g=this._proportionallyResizeElements[h];if(!this.borderDif){var i=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],b=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=a.map(i,function(f,j){f=parseInt(f,10)||
+0;j=parseInt(b[j],10)||0;return f+j})}a.browser.msie&&(a(e).is(":hidden")||a(e).parents(":hidden").length)||g.css({height:e.height()-this.borderDif[0]-this.borderDif[2]||0,width:e.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var e=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||a('<div style="overflow:hidden;"></div>');var h=a.browser.msie&&a.browser.version<7,g=h?1:0;h=h?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
+h,height:this.element.outerHeight()+h,position:"absolute",left:this.elementOffset.left-g+"px",top:this.elementOffset.top-g+"px",zIndex:++e.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(e,h){return{width:this.originalSize.width+h}},w:function(e,h){return{left:this.originalPosition.left+h,width:this.originalSize.width-h}},n:function(e,h,g){return{top:this.originalPosition.top+g,height:this.originalSize.height-g}},s:function(e,h,g){return{height:this.originalSize.height+
+g}},se:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},sw:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,h,g]))},ne:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},nw:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,h,g]))}},_propagate:function(e,h){a.ui.plugin.call(this,e,[h,this.ui()]);
+e!="resize"&&this._trigger(e,h,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});a.extend(a.ui.resizable,{version:"1.8.16"});a.ui.plugin.add("resizable","alsoResize",{start:function(){var e=a(this).data("resizable").options,h=function(g){a(g).each(function(){var i=a(this);i.data("resizable-alsoresize",{width:parseInt(i.width(),
+10),height:parseInt(i.height(),10),left:parseInt(i.css("left"),10),top:parseInt(i.css("top"),10),position:i.css("position")})})};if(typeof e.alsoResize=="object"&&!e.alsoResize.parentNode)if(e.alsoResize.length){e.alsoResize=e.alsoResize[0];h(e.alsoResize)}else a.each(e.alsoResize,function(g){h(g)});else h(e.alsoResize)},resize:function(e,h){var g=a(this).data("resizable");e=g.options;var i=g.originalSize,b=g.originalPosition,f={height:g.size.height-i.height||0,width:g.size.width-i.width||0,top:g.position.top-
+b.top||0,left:g.position.left-b.left||0},j=function(l,o){a(l).each(function(){var n=a(this),k=a(this).data("resizable-alsoresize"),m={},p=o&&o.length?o:n.parents(h.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(p,function(q,s){if((q=(k[s]||0)+(f[s]||0))&&q>=0)m[s]=q||null});if(a.browser.opera&&/relative/.test(n.css("position"))){g._revertToRelativePosition=true;n.css({position:"absolute",top:"auto",left:"auto"})}n.css(m)})};typeof e.alsoResize=="object"&&!e.alsoResize.nodeType?
+a.each(e.alsoResize,function(l,o){j(l,o)}):j(e.alsoResize)},stop:function(){var e=a(this).data("resizable"),h=e.options,g=function(i){a(i).each(function(){var b=a(this);b.css({position:b.data("resizable-alsoresize").position})})};if(e._revertToRelativePosition){e._revertToRelativePosition=false;typeof h.alsoResize=="object"&&!h.alsoResize.nodeType?a.each(h.alsoResize,function(i){g(i)}):g(h.alsoResize)}a(this).removeData("resizable-alsoresize")}});a.ui.plugin.add("resizable","animate",{stop:function(e){var h=
+a(this).data("resizable"),g=h.options,i=h._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName),f=b&&a.ui.hasScroll(i[0],"left")?0:h.sizeDiff.height;b={width:h.size.width-(b?0:h.sizeDiff.width),height:h.size.height-f};f=parseInt(h.element.css("left"),10)+(h.position.left-h.originalPosition.left)||null;var j=parseInt(h.element.css("top"),10)+(h.position.top-h.originalPosition.top)||null;h.element.animate(a.extend(b,j&&f?{top:j,left:f}:{}),{duration:g.animateDuration,easing:g.animateEasing,
+step:function(){var l={width:parseInt(h.element.css("width"),10),height:parseInt(h.element.css("height"),10),top:parseInt(h.element.css("top"),10),left:parseInt(h.element.css("left"),10)};i&&i.length&&a(i[0]).css({width:l.width,height:l.height});h._updateCache(l);h._propagate("resize",e)}})}});a.ui.plugin.add("resizable","containment",{start:function(){var e=a(this).data("resizable"),h=e.element,g=e.options.containment;if(h=g instanceof a?g.get(0):/parent/.test(g)?h.parent().get(0):g){e.containerElement=
+a(h);if(/document/.test(g)||g==document){e.containerOffset={left:0,top:0};e.containerPosition={left:0,top:0};e.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight}}else{var i=a(h),b=[];a(["Top","Right","Left","Bottom"]).each(function(l,o){b[l]=d(i.css("padding"+o))});e.containerOffset=i.offset();e.containerPosition=i.position();e.containerSize={height:i.innerHeight()-b[3],width:i.innerWidth()-b[1]};g=e.containerOffset;
+var f=e.containerSize.height,j=e.containerSize.width;j=a.ui.hasScroll(h,"left")?h.scrollWidth:j;f=a.ui.hasScroll(h)?h.scrollHeight:f;e.parentData={element:h,left:g.left,top:g.top,width:j,height:f}}}},resize:function(e){var h=a(this).data("resizable"),g=h.options,i=h.containerOffset,b=h.position;e=h._aspectRatio||e.shiftKey;var f={top:0,left:0},j=h.containerElement;if(j[0]!=document&&/static/.test(j.css("position")))f=i;if(b.left<(h._helper?i.left:0)){h.size.width+=h._helper?h.position.left-i.left:
+h.position.left-f.left;if(e)h.size.height=h.size.width/g.aspectRatio;h.position.left=g.helper?i.left:0}if(b.top<(h._helper?i.top:0)){h.size.height+=h._helper?h.position.top-i.top:h.position.top;if(e)h.size.width=h.size.height*g.aspectRatio;h.position.top=h._helper?i.top:0}h.offset.left=h.parentData.left+h.position.left;h.offset.top=h.parentData.top+h.position.top;g=Math.abs((h._helper?h.offset.left-f.left:h.offset.left-f.left)+h.sizeDiff.width);i=Math.abs((h._helper?h.offset.top-f.top:h.offset.top-
+i.top)+h.sizeDiff.height);b=h.containerElement.get(0)==h.element.parent().get(0);f=/relative|absolute/.test(h.containerElement.css("position"));if(b&&f)g-=h.parentData.left;if(g+h.size.width>=h.parentData.width){h.size.width=h.parentData.width-g;if(e)h.size.height=h.size.width/h.aspectRatio}if(i+h.size.height>=h.parentData.height){h.size.height=h.parentData.height-i;if(e)h.size.width=h.size.height*h.aspectRatio}},stop:function(){var e=a(this).data("resizable"),h=e.options,g=e.containerOffset,i=e.containerPosition,
+b=e.containerElement,f=a(e.helper),j=f.offset(),l=f.outerWidth()-e.sizeDiff.width;f=f.outerHeight()-e.sizeDiff.height;e._helper&&!h.animate&&/relative/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f});e._helper&&!h.animate&&/static/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f})}});a.ui.plugin.add("resizable","ghost",{start:function(){var e=a(this).data("resizable"),h=e.options,g=e.size;e.ghost=e.originalElement.clone();e.ghost.css({opacity:0.25,
+display:"block",position:"relative",height:g.height,width:g.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");e.ghost.appendTo(e.helper)},resize:function(){var e=a(this).data("resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=a(this).data("resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}});a.ui.plugin.add("resizable","grid",{resize:function(){var e=
+a(this).data("resizable"),h=e.options,g=e.size,i=e.originalSize,b=e.originalPosition,f=e.axis;h.grid=typeof h.grid=="number"?[h.grid,h.grid]:h.grid;var j=Math.round((g.width-i.width)/(h.grid[0]||1))*(h.grid[0]||1);h=Math.round((g.height-i.height)/(h.grid[1]||1))*(h.grid[1]||1);if(/^(se|s|e)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h}else if(/^(ne)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}else{if(/^(sw)$/.test(f)){e.size.width=i.width+j;e.size.height=
+i.height+h}else{e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}e.position.left=b.left-j}}});var d=function(e){return parseInt(e,10)||0},c=function(e){return!isNaN(parseInt(e,10))}})(jQ);
+(function(a){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var d=this;this.element.addClass("ui-selectable");this.dragged=false;var c;this.refresh=function(){c=a(d.options.filter,d.element[0]);c.each(function(){var e=a(this),h=e.offset();a.data(this,"selectable-item",{element:this,$element:e,left:h.left,top:h.top,right:h.left+e.outerWidth(),bottom:h.top+e.outerHeight(),startselected:false,selected:e.hasClass("ui-selected"),
+selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})};this.refresh();this.selectees=c.addClass("ui-selectee");this._mouseInit();this.helper=a("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(d){var c=this;this.opos=[d.pageX,
+d.pageY];if(!this.options.disabled){var e=this.options;this.selectees=a(e.filter,this.element[0]);this._trigger("start",d);a(e.appendTo).append(this.helper);this.helper.css({left:d.clientX,top:d.clientY,width:0,height:0});e.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var h=a.data(this,"selectable-item");h.startselected=true;if(!d.metaKey){h.$element.removeClass("ui-selected");h.selected=false;h.$element.addClass("ui-unselecting");h.unselecting=true;c._trigger("unselecting",
+d,{unselecting:h.element})}});a(d.target).parents().andSelf().each(function(){var h=a.data(this,"selectable-item");if(h){var g=!d.metaKey||!h.$element.hasClass("ui-selected");h.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");h.unselecting=!g;h.selecting=g;(h.selected=g)?c._trigger("selecting",d,{selecting:h.element}):c._trigger("unselecting",d,{unselecting:h.element});return false}})}},_mouseDrag:function(d){var c=this;this.dragged=true;if(!this.options.disabled){var e=
+this.options,h=this.opos[0],g=this.opos[1],i=d.pageX,b=d.pageY;if(h>i){var f=i;i=h;h=f}if(g>b){f=b;b=g;g=f}this.helper.css({left:h,top:g,width:i-h,height:b-g});this.selectees.each(function(){var j=a.data(this,"selectable-item");if(!(!j||j.element==c.element[0])){var l=false;if(e.tolerance=="touch")l=!(j.left>i||j.right<h||j.top>b||j.bottom<g);else if(e.tolerance=="fit")l=j.left>h&&j.right<i&&j.top>g&&j.bottom<b;if(l){if(j.selected){j.$element.removeClass("ui-selected");j.selected=false}if(j.unselecting){j.$element.removeClass("ui-unselecting");
+j.unselecting=false}if(!j.selecting){j.$element.addClass("ui-selecting");j.selecting=true;c._trigger("selecting",d,{selecting:j.element})}}else{if(j.selecting)if(d.metaKey&&j.startselected){j.$element.removeClass("ui-selecting");j.selecting=false;j.$element.addClass("ui-selected");j.selected=true}else{j.$element.removeClass("ui-selecting");j.selecting=false;if(j.startselected){j.$element.addClass("ui-unselecting");j.unselecting=true}c._trigger("unselecting",d,{unselecting:j.element})}if(j.selected)if(!d.metaKey&&
+!j.startselected){j.$element.removeClass("ui-selected");j.selected=false;j.$element.addClass("ui-unselecting");j.unselecting=true;c._trigger("unselecting",d,{unselecting:j.element})}}}});return false}},_mouseStop:function(d){var c=this;this.dragged=false;a(".ui-unselecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-unselecting");e.unselecting=false;e.startselected=false;c._trigger("unselected",d,{unselected:e.element})});a(".ui-selecting",this.element[0]).each(function(){var e=
+a.data(this,"selectable-item");e.$element.removeClass("ui-selecting").addClass("ui-selected");e.selecting=false;e.selected=true;e.startselected=true;c._trigger("selected",d,{selected:e.element})});this._trigger("stop",d);this.helper.remove();return false}});a.extend(a.ui.selectable,{version:"1.8.16"})})(jQ);
+(function(a){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var d=this.options;this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?d.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var d=this.items.length-1;d>=0;d--)this.items[d].item.removeData("sortable-item");return this},_setOption:function(d,c){if(d===
+"disabled"){this.options[d]=c;this.widget()[c?"addClass":"removeClass"]("ui-sortable-disabled")}else a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(d,c){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(d);var e=null,h=this;a(d.target).parents().each(function(){if(a.data(this,"sortable-item")==h){e=a(this);return false}});if(a.data(d.target,"sortable-item")==h)e=a(d.target);if(!e)return false;if(this.options.handle&&
+!c){var g=false;a(this.options.handle,e).find("*").andSelf().each(function(){if(this==d.target)g=true});if(!g)return false}this.currentItem=e;this._removeCurrentsFromItems();return true},_mouseStart:function(d,c,e){c=this.options;var h=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(d);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
+left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(d);this.originalPageX=d.pageX;this.originalPageY=d.pageY;c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();c.containment&&this._setContainment();if(c.cursor){if(a("body").css("cursor"))this._storedCursor=a("body").css("cursor");a("body").css("cursor",c.cursor)}if(c.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",c.opacity)}if(c.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",c.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",d,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!e)for(e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("activate",d,h._uiHash(this));if(a.ui.ddmanager)a.ui.ddmanager.current=this;a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,d);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(d);
+return true},_mouseDrag:function(d){this.position=this._generatePosition(d);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var c=this.options,e=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-d.pageY<c.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop+c.scrollSpeed;else if(d.pageY-this.overflowOffset.top<
+c.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop-c.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-d.pageX<c.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft+c.scrollSpeed;else if(d.pageX-this.overflowOffset.left<c.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(d.pageY-a(document).scrollTop()<c.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()-
+c.scrollSpeed);else if(a(window).height()-(d.pageY-a(document).scrollTop())<c.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()+c.scrollSpeed);if(d.pageX-a(document).scrollLeft()<c.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed);else if(a(window).width()-(d.pageX-a(document).scrollLeft())<c.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()+c.scrollSpeed)}e!==false&&a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,
+d)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(c=this.items.length-1;c>=0;c--){e=this.items[c];var h=e.item[0],g=this._intersectsWithPointer(e);if(g)if(h!=this.currentItem[0]&&this.placeholder[g==1?"next":"prev"]()[0]!=h&&!a.ui.contains(this.placeholder[0],h)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],
+h):true)){this.direction=g==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e))this._rearrange(d,e);else break;this._trigger("change",d,this._uiHash());break}}this._contactContainers(d);a.ui.ddmanager&&a.ui.ddmanager.drag(this,d);this._trigger("sort",d,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(d,c){if(d){a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,d);if(this.options.revert){var e=this;c=e.placeholder.offset();
+e.reverting=true;a(this.helper).animate({left:c.left-this.offset.parent.left-e.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:c.top-this.offset.parent.top-e.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){e._clear(d)})}else this._clear(d,c);return false}},cancel:function(){var d=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,d._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,d._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();a.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(d){var c=this._getItemsAsjQuery(d&&d.connected),e=[];d=d||{};a(c).each(function(){var h=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||/(.+)[-=_](.+)/);if(h)e.push((d.key||h[1]+"[]")+"="+(d.key&&d.expression?h[1]:h[2]))});!e.length&&d.key&&e.push(d.key+"=");return e.join("&")},
+toArray:function(d){var c=this._getItemsAsjQuery(d&&d.connected),e=[];d=d||{};c.each(function(){e.push(a(d.item||this).attr(d.attribute||"id")||"")});return e},_intersectsWith:function(d){var c=this.positionAbs.left,e=c+this.helperProportions.width,h=this.positionAbs.top,g=h+this.helperProportions.height,i=d.left,b=i+d.width,f=d.top,j=f+d.height,l=this.offset.click.top,o=this.offset.click.left;l=h+l>f&&h+l<j&&c+o>i&&c+o<b;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>d[this.floating?"width":"height"]?l:i<c+this.helperProportions.width/2&&e-this.helperProportions.width/2<b&&f<h+this.helperProportions.height/2&&g-this.helperProportions.height/2<j},_intersectsWithPointer:function(d){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height);d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width);c=c&&d;d=this._getDragVerticalDirection();
+var e=this._getDragHorizontalDirection();if(!c)return false;return this.floating?e&&e=="right"||d=="down"?2:1:d&&(d=="down"?2:1)},_intersectsWithSides:function(d){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top+d.height/2,d.height);d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left+d.width/2,d.width);var e=this._getDragVerticalDirection(),h=this._getDragHorizontalDirection();return this.floating&&h?h=="right"&&d||h=="left"&&!d:e&&(e=="down"&&c||e=="up"&&!c)},
+_getDragVerticalDirection:function(){var d=this.positionAbs.top-this.lastPositionAbs.top;return d!=0&&(d>0?"down":"up")},_getDragHorizontalDirection:function(){var d=this.positionAbs.left-this.lastPositionAbs.left;return d!=0&&(d>0?"right":"left")},refresh:function(d){this._refreshItems(d);this.refreshPositions();return this},_connectWith:function(){var d=this.options;return d.connectWith.constructor==String?[d.connectWith]:d.connectWith},_getItemsAsjQuery:function(d){var c=[],e=[],h=this._connectWith();
+if(h&&d)for(d=h.length-1;d>=0;d--)for(var g=a(h[d]),i=g.length-1;i>=0;i--){var b=a.data(g[i],"sortable");if(b&&b!=this&&!b.options.disabled)e.push([a.isFunction(b.options.items)?b.options.items.call(b.element):a(b.options.items,b.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),b])}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(d=e.length-1;d>=0;d--)e[d][0].each(function(){c.push(this)});return a(c)},_removeCurrentsFromItems:function(){for(var d=this.currentItem.find(":data(sortable-item)"),c=0;c<this.items.length;c++)for(var e=0;e<d.length;e++)d[e]==this.items[c].item[0]&&this.items.splice(c,1)},_refreshItems:function(d){this.items=[];this.containers=[this];var c=this.items,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],d,{item:this.currentItem}):a(this.options.items,this.element),
+this]],h=this._connectWith();if(h)for(var g=h.length-1;g>=0;g--)for(var i=a(h[g]),b=i.length-1;b>=0;b--){var f=a.data(i[b],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element[0],d,{item:this.currentItem}):a(f.options.items,f.element),f]);this.containers.push(f)}}for(g=e.length-1;g>=0;g--){d=e[g][1];h=e[g][0];b=0;for(i=h.length;b<i;b++){f=a(h[b]);f.data("sortable-item",d);c.push({item:f,instance:d,width:0,height:0,left:0,top:0})}}},refreshPositions:function(d){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var c=this.items.length-1;c>=0;c--){var e=this.items[c];if(!(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0])){var h=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!d){e.width=h.outerWidth();e.height=h.outerHeight()}h=h.offset();e.left=h.left;e.top=h.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(c=
+this.containers.length-1;c>=0;c--){h=this.containers[c].element.offset();this.containers[c].containerCache.left=h.left;this.containers[c].containerCache.top=h.top;this.containers[c].containerCache.width=this.containers[c].element.outerWidth();this.containers[c].containerCache.height=this.containers[c].element.outerHeight()}return this},_createPlaceholder:function(d){var c=d||this,e=c.options;if(!e.placeholder||e.placeholder.constructor==String){var h=e.placeholder;e.placeholder={element:function(){var g=
+a(document.createElement(c.currentItem[0].nodeName)).addClass(h||c.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!h)g.style.visibility="hidden";return g},update:function(g,i){if(!(h&&!e.forcePlaceholderSize)){i.height()||i.height(c.currentItem.innerHeight()-parseInt(c.currentItem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0,10));i.width()||i.width(c.currentItem.innerWidth()-parseInt(c.currentItem.css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||
+0,10))}}}}c.placeholder=a(e.placeholder.element.call(c.element,c.currentItem));c.currentItem.after(c.placeholder);e.placeholder.update(c,c.placeholder)},_contactContainers:function(d){for(var c=null,e=null,h=this.containers.length-1;h>=0;h--)if(!a.ui.contains(this.currentItem[0],this.containers[h].element[0]))if(this._intersectsWith(this.containers[h].containerCache)){if(!(c&&a.ui.contains(this.containers[h].element[0],c.element[0]))){c=this.containers[h];e=h}}else if(this.containers[h].containerCache.over){this.containers[h]._trigger("out",
+d,this._uiHash(this));this.containers[h].containerCache.over=0}if(c)if(this.containers.length===1){this.containers[e]._trigger("over",d,this._uiHash(this));this.containers[e].containerCache.over=1}else if(this.currentContainer!=this.containers[e]){c=1E4;h=null;for(var g=this.positionAbs[this.containers[e].floating?"left":"top"],i=this.items.length-1;i>=0;i--)if(a.ui.contains(this.containers[e].element[0],this.items[i].item[0])){var b=this.items[i][this.containers[e].floating?"left":"top"];if(Math.abs(b-
+g)<c){c=Math.abs(b-g);h=this.items[i]}}if(h||this.options.dropOnEmpty){this.currentContainer=this.containers[e];h?this._rearrange(d,h,null,true):this._rearrange(d,null,this.containers[e].element,true);this._trigger("change",d,this._uiHash());this.containers[e]._trigger("change",d,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[e]._trigger("over",d,this._uiHash(this));this.containers[e].containerCache.over=1}}},_createHelper:function(d){var c=
+this.options;d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[d,this.currentItem])):c.helper=="clone"?this.currentItem.clone():this.currentItem;d.parents("body").length||a(c.appendTo!="parent"?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]);if(d[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(d[0].style.width==
+""||c.forceHelperSize)d.width(this.currentItem.width());if(d[0].style.height==""||c.forceHelperSize)d.height(this.currentItem.height());return d},_adjustOffsetFromHelper:function(d){if(typeof d=="string")d=d.split(" ");if(a.isArray(d))d={left:+d[0],top:+d[1]||0};if("left"in d)this.offset.click.left=d.left+this.margins.left;if("right"in d)this.offset.click.left=this.helperProportions.width-d.right+this.margins.left;if("top"in d)this.offset.click.top=d.top+this.margins.top;if("bottom"in d)this.offset.click.top=
+this.helperProportions.height-d.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var d=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){d.left+=this.scrollParent.scrollLeft();d.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)d=
+{top:0,left:0};return{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var d=this.currentItem.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d=this.options;if(d.containment=="parent")d.containment=this.helper[0].parentNode;if(d.containment=="document"||d.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(d.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(a(d.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(d.containment)){var c=a(d.containment)[0];d=a(d.containment).offset();var e=a(c).css("overflow")!="hidden";this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),
+10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(d,c){if(!c)c=
+this.position;d=d=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*d)}},_generatePosition:function(d){var c=this.options,e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var g=d.pageX,i=d.pageY;if(this.originalPosition){if(this.containment){if(d.pageX-this.offset.click.left<this.containment[0])g=this.containment[0]+this.offset.click.left;if(d.pageY-this.offset.click.top<this.containment[1])i=this.containment[1]+this.offset.click.top;if(d.pageX-this.offset.click.left>this.containment[2])g=this.containment[2]+this.offset.click.left;if(d.pageY-this.offset.click.top>this.containment[3])i=this.containment[3]+this.offset.click.top}if(c.grid){i=this.originalPageY+Math.round((i-
+this.originalPageY)/c.grid[1])*c.grid[1];i=this.containment?!(i-this.offset.click.top<this.containment[1]||i-this.offset.click.top>this.containment[3])?i:!(i-this.offset.click.top<this.containment[1])?i-c.grid[1]:i+c.grid[1]:i;g=this.originalPageX+Math.round((g-this.originalPageX)/c.grid[0])*c.grid[0];g=this.containment?!(g-this.offset.click.left<this.containment[0]||g-this.offset.click.left>this.containment[2])?g:!(g-this.offset.click.left<this.containment[0])?g-c.grid[0]:g+c.grid[0]:g}}return{top:i-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_rearrange:function(d,c,e,h){e?e[0].appendChild(this.placeholder[0]):c.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?c.item[0]:c.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var g=this,i=this.counter;window.setTimeout(function(){i==g.counter&&g.refreshPositions(!h)},0)},_clear:function(d,c){this.reverting=false;var e=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var h in this._storedCSS)if(this._storedCSS[h]=="auto"||this._storedCSS[h]=="static")this._storedCSS[h]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!c&&e.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!c)e.push(function(g){this._trigger("update",g,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){c||e.push(function(g){this._trigger("remove",
+g,this._uiHash())});for(h=this.containers.length-1;h>=0;h--)if(a.ui.contains(this.containers[h].element[0],this.currentItem[0])&&!c){e.push(function(g){return function(i){g._trigger("receive",i,this._uiHash(this))}}.call(this,this.containers[h]));e.push(function(g){return function(i){g._trigger("update",i,this._uiHash(this))}}.call(this,this.containers[h]))}}for(h=this.containers.length-1;h>=0;h--){c||e.push(function(g){return function(i){g._trigger("deactivate",i,this._uiHash(this))}}.call(this,
+this.containers[h]));if(this.containers[h].containerCache.over){e.push(function(g){return function(i){g._trigger("out",i,this._uiHash(this))}}.call(this,this.containers[h]));this.containers[h].containerCache.over=0}}this._storedCursor&&a("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!c){this._trigger("beforeStop",
+d,this._uiHash());for(h=0;h<e.length;h++)e[h].call(this,d);this._trigger("stop",d,this._uiHash())}return false}c||this._trigger("beforeStop",d,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!c){for(h=0;h<e.length;h++)e[h].call(this,d);this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(d){var c=d||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:d?d.element:null}}});a.extend(a.ui.sortable,{version:"1.8.16"})})(jQ);
+jQ.effects||function(a,d){function c(n){var k;if(n&&n.constructor==Array&&n.length==3)return n;if(k=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(n))return[parseInt(k[1],10),parseInt(k[2],10),parseInt(k[3],10)];if(k=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(n))return[parseFloat(k[1])*2.55,parseFloat(k[2])*2.55,parseFloat(k[3])*2.55];if(k=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(n))return[parseInt(k[1],
+16),parseInt(k[2],16),parseInt(k[3],16)];if(k=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(n))return[parseInt(k[1]+k[1],16),parseInt(k[2]+k[2],16),parseInt(k[3]+k[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(n))return j.transparent;return j[a.trim(n).toLowerCase()]}function e(n,k){var m;do{m=a.curCSS(n,k);if(m!=""&&m!="transparent"||a.nodeName(n,"body"))break;k="backgroundColor"}while(n=n.parentNode);return c(m)}function h(){var n=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+k={},m,p;if(n&&n.length&&n[0]&&n[n[0]])for(var q=n.length;q--;){m=n[q];if(typeof n[m]=="string"){p=m.replace(/\-(\w)/g,function(s,r){return r.toUpperCase()});k[p]=n[m]}}else for(m in n)if(typeof n[m]==="string")k[m]=n[m];return k}function g(n){var k,m;for(k in n){m=n[k];if(m==null||a.isFunction(m)||k in o||/scrollbar/.test(k)||!/color/i.test(k)&&isNaN(parseFloat(m)))delete n[k]}return n}function i(n,k){var m={_:0},p;for(p in k)if(n[p]!=k[p])m[p]=k[p];return m}function b(n,k,m,p){if(typeof n=="object"){p=
+k;m=null;k=n;n=k.effect}if(a.isFunction(k)){p=k;m=null;k={}}if(typeof k=="number"||a.fx.speeds[k]){p=m;m=k;k={}}if(a.isFunction(m)){p=m;m=null}k=k||{};m=m||k.duration;m=a.fx.off?0:typeof m=="number"?m:m in a.fx.speeds?a.fx.speeds[m]:a.fx.speeds._default;p=p||k.complete;return[n,k,m,p]}function f(n){if(!n||typeof n==="number"||a.fx.speeds[n])return true;if(typeof n==="string"&&!a.effects[n])return true;return false}a.effects={};a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(n,k){a.fx.step[k]=function(m){if(!m.colorInit){m.start=e(m.elem,k);m.end=c(m.end);m.colorInit=true}m.elem.style[k]="rgb("+Math.max(Math.min(parseInt(m.pos*(m.end[0]-m.start[0])+m.start[0],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[1]-m.start[1])+m.start[1],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[2]-m.start[2])+m.start[2],10),255),0)+")"}});var j={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},l=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(n,k,m,
+p){if(a.isFunction(m)){p=m;m=null}return this.queue(function(){var q=a(this),s=q.attr("style")||" ",r=g(h.call(this)),u,v=q.attr("class");a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});u=g(h.call(this));q.attr("class",v);q.animate(i(r,u),{queue:false,duration:k,easing:m,complete:function(){a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});if(typeof q.attr("style")=="object"){q.attr("style").cssText="";q.attr("style").cssText=s}else q.attr("style",s);p&&p.apply(this,arguments);a.dequeue(this)}})})};
+a.fn.extend({_addClass:a.fn.addClass,addClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{add:n},k,m,p]):this._addClass(n)},_removeClass:a.fn.removeClass,removeClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{remove:n},k,m,p]):this._removeClass(n)},_toggleClass:a.fn.toggleClass,toggleClass:function(n,k,m,p,q){return typeof k=="boolean"||k===d?m?a.effects.animateClass.apply(this,[k?{add:n}:{remove:n},m,p,q]):this._toggleClass(n,k):a.effects.animateClass.apply(this,
+[{toggle:n},k,m,p])},switchClass:function(n,k,m,p,q){return a.effects.animateClass.apply(this,[{add:k,remove:n},m,p,q])}});a.extend(a.effects,{version:"1.8.16",save:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.data("ec.storage."+k[m],n[0].style[k[m]])},restore:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.css(k[m],n.data("ec.storage."+k[m]))},setMode:function(n,k){if(k=="toggle")k=n.is(":hidden")?"show":"hide";return k},getBaseline:function(n,k){var m;switch(n[0]){case "top":m=
+0;break;case "middle":m=0.5;break;case "bottom":m=1;break;default:m=n[0]/k.height}switch(n[1]){case "left":n=0;break;case "center":n=0.5;break;case "right":n=1;break;default:n=n[1]/k.width}return{x:n,y:m}},createWrapper:function(n){if(n.parent().is(".ui-effects-wrapper"))return n.parent();var k={width:n.outerWidth(true),height:n.outerHeight(true),"float":n.css("float")},m=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),
+p=document.activeElement;n.wrap(m);if(n[0]===p||a.contains(n[0],p))a(p).focus();m=n.parent();if(n.css("position")=="static"){m.css({position:"relative"});n.css({position:"relative"})}else{a.extend(k,{position:n.css("position"),zIndex:n.css("z-index")});a.each(["top","left","bottom","right"],function(q,s){k[s]=n.css(s);if(isNaN(parseInt(k[s],10)))k[s]="auto"});n.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return m.css(k).show()},removeWrapper:function(n){var k,m=document.activeElement;
+if(n.parent().is(".ui-effects-wrapper")){k=n.parent().replaceWith(n);if(n[0]===m||a.contains(n[0],m))a(m).focus();return k}return n},setTransition:function(n,k,m,p){p=p||{};a.each(k,function(q,s){unit=n.cssUnit(s);if(unit[0]>0)p[s]=unit[0]*m+unit[1]});return p}});a.fn.extend({effect:function(n){var k=b.apply(this,arguments),m={options:k[1],duration:k[2],callback:k[3]};k=m.options.mode;var p=a.effects[n];if(a.fx.off||!p)return k?this[k](m.duration,m.callback):this.each(function(){m.callback&&m.callback.call(this)});
+return p.call(this,m)},_show:a.fn.show,show:function(n){if(f(n))return this._show.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="show";return this.effect.apply(this,k)}},_hide:a.fn.hide,hide:function(n){if(f(n))return this._hide.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="hide";return this.effect.apply(this,k)}},__toggle:a.fn.toggle,toggle:function(n){if(f(n)||typeof n==="boolean"||a.isFunction(n))return this.__toggle.apply(this,arguments);else{var k=b.apply(this,
+arguments);k[1].mode="toggle";return this.effect.apply(this,k)}},cssUnit:function(n){var k=this.css(n),m=[];a.each(["em","px","%","pt"],function(p,q){if(k.indexOf(q)>0)m=[parseFloat(k),q]});return m}});a.easing.jswing=a.easing.swing;a.extend(a.easing,{def:"easeOutQuad",swing:function(n,k,m,p,q){return a.easing[a.easing.def](n,k,m,p,q)},easeInQuad:function(n,k,m,p,q){return p*(k/=q)*k+m},easeOutQuad:function(n,k,m,p,q){return-p*(k/=q)*(k-2)+m},easeInOutQuad:function(n,k,m,p,q){if((k/=q/2)<1)return p/
+2*k*k+m;return-p/2*(--k*(k-2)-1)+m},easeInCubic:function(n,k,m,p,q){return p*(k/=q)*k*k+m},easeOutCubic:function(n,k,m,p,q){return p*((k=k/q-1)*k*k+1)+m},easeInOutCubic:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k+m;return p/2*((k-=2)*k*k+2)+m},easeInQuart:function(n,k,m,p,q){return p*(k/=q)*k*k*k+m},easeOutQuart:function(n,k,m,p,q){return-p*((k=k/q-1)*k*k*k-1)+m},easeInOutQuart:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k*k+m;return-p/2*((k-=2)*k*k*k-2)+m},easeInQuint:function(n,k,m,
+p,q){return p*(k/=q)*k*k*k*k+m},easeOutQuint:function(n,k,m,p,q){return p*((k=k/q-1)*k*k*k*k+1)+m},easeInOutQuint:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k*k*k+m;return p/2*((k-=2)*k*k*k*k+2)+m},easeInSine:function(n,k,m,p,q){return-p*Math.cos(k/q*(Math.PI/2))+p+m},easeOutSine:function(n,k,m,p,q){return p*Math.sin(k/q*(Math.PI/2))+m},easeInOutSine:function(n,k,m,p,q){return-p/2*(Math.cos(Math.PI*k/q)-1)+m},easeInExpo:function(n,k,m,p,q){return k==0?m:p*Math.pow(2,10*(k/q-1))+m},easeOutExpo:function(n,
+k,m,p,q){return k==q?m+p:p*(-Math.pow(2,-10*k/q)+1)+m},easeInOutExpo:function(n,k,m,p,q){if(k==0)return m;if(k==q)return m+p;if((k/=q/2)<1)return p/2*Math.pow(2,10*(k-1))+m;return p/2*(-Math.pow(2,-10*--k)+2)+m},easeInCirc:function(n,k,m,p,q){return-p*(Math.sqrt(1-(k/=q)*k)-1)+m},easeOutCirc:function(n,k,m,p,q){return p*Math.sqrt(1-(k=k/q-1)*k)+m},easeInOutCirc:function(n,k,m,p,q){if((k/=q/2)<1)return-p/2*(Math.sqrt(1-k*k)-1)+m;return p/2*(Math.sqrt(1-(k-=2)*k)+1)+m},easeInElastic:function(n,k,m,
+p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);return-(r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s))+m},easeOutElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);return r*Math.pow(2,-10*k)*Math.sin((k*q-n)*2*Math.PI/s)+p+m},easeInOutElastic:function(n,k,m,p,q){n=1.70158;var s=
+0,r=p;if(k==0)return m;if((k/=q/2)==2)return m+p;s||(s=q*0.3*1.5);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);if(k<1)return-0.5*r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)+m;return r*Math.pow(2,-10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)*0.5+p+m},easeInBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;return p*(k/=q)*k*((s+1)*k-s)+m},easeOutBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;return p*((k=k/q-1)*k*((s+1)*k+s)+1)+m},easeInOutBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;
+if((k/=q/2)<1)return p/2*k*k*(((s*=1.525)+1)*k-s)+m;return p/2*((k-=2)*k*(((s*=1.525)+1)*k+s)+2)+m},easeInBounce:function(n,k,m,p,q){return p-a.easing.easeOutBounce(n,q-k,0,p,q)+m},easeOutBounce:function(n,k,m,p,q){return(k/=q)<1/2.75?p*7.5625*k*k+m:k<2/2.75?p*(7.5625*(k-=1.5/2.75)*k+0.75)+m:k<2.5/2.75?p*(7.5625*(k-=2.25/2.75)*k+0.9375)+m:p*(7.5625*(k-=2.625/2.75)*k+0.984375)+m},easeInOutBounce:function(n,k,m,p,q){if(k<q/2)return a.easing.easeInBounce(n,k*2,0,p,q)*0.5+m;return a.easing.easeOutBounce(n,
+k*2-q,0,p,q)*0.5+p*0.5+m}})}(jQ);
+(function(a){a.effects.blind=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"vertical";a.effects.save(c,e);c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"}),b=g=="vertical"?"height":"width";g=g=="vertical"?i.height():i.width();h=="show"&&i.css(b,0);var f={};f[b]=h=="show"?g:0;i.animate(f,d.duration,d.options.easing,function(){h=="hide"&&c.hide();a.effects.restore(c,
+e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()})})}})(jQ);
+(function(a){a.effects.bounce=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"effect"),g=d.options.direction||"up",i=d.options.distance||20,b=d.options.times||5,f=d.duration||250;/show|hide/.test(h)&&e.push("opacity");a.effects.save(c,e);c.show();a.effects.createWrapper(c);var j=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";i=d.options.distance||(j=="top"?c.outerHeight({margin:true})/3:c.outerWidth({margin:true})/
+3);if(h=="show")c.css("opacity",0).css(j,g=="pos"?-i:i);if(h=="hide")i/=b*2;h!="hide"&&b--;if(h=="show"){var l={opacity:1};l[j]=(g=="pos"?"+=":"-=")+i;c.animate(l,f/2,d.options.easing);i/=2;b--}for(l=0;l<b;l++){var o={},n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;c.animate(o,f/2,d.options.easing).animate(n,f/2,d.options.easing);i=h=="hide"?i*2:i/2}if(h=="hide"){l={opacity:0};l[j]=(g=="pos"?"-=":"+=")+i;c.animate(l,f/2,d.options.easing,function(){c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);
+d.callback&&d.callback.apply(this,arguments)})}else{o={};n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;c.animate(o,f/2,d.options.easing).animate(n,f/2,d.options.easing,function(){a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments)})}c.queue("fx",function(){c.dequeue()});c.dequeue()})}})(jQ);
+(function(a){a.effects.clip=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","height","width"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"vertical";a.effects.save(c,e);c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"});i=c[0].tagName=="IMG"?i:c;var b={size:g=="vertical"?"height":"width",position:g=="vertical"?"top":"left"};g=g=="vertical"?i.height():i.width();if(h=="show"){i.css(b.size,0);i.css(b.position,
+g/2)}var f={};f[b.size]=h=="show"?g:0;f[b.position]=h=="show"?0:g/2;i.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()}})})}})(jQ);
+(function(a){a.effects.drop=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","opacity"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"left";a.effects.save(c,e);c.show();a.effects.createWrapper(c);var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=d.options.distance||(i=="top"?c.outerHeight({margin:true})/2:c.outerWidth({margin:true})/2);if(h=="show")c.css("opacity",0).css(i,g=="pos"?-b:b);var f={opacity:h==
+"show"?1:0};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;c.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQ);
+(function(a){a.effects.explode=function(d){return this.queue(function(){var c=d.options.pieces?Math.round(Math.sqrt(d.options.pieces)):3,e=d.options.pieces?Math.round(Math.sqrt(d.options.pieces)):3;d.options.mode=d.options.mode=="toggle"?a(this).is(":visible")?"hide":"show":d.options.mode;var h=a(this).show().css("visibility","hidden"),g=h.offset();g.top-=parseInt(h.css("marginTop"),10)||0;g.left-=parseInt(h.css("marginLeft"),10)||0;for(var i=h.outerWidth(true),b=h.outerHeight(true),f=0;f<c;f++)for(var j=
+0;j<e;j++)h.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-j*(i/e),top:-f*(b/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:i/e,height:b/c,left:g.left+j*(i/e)+(d.options.mode=="show"?(j-Math.floor(e/2))*(i/e):0),top:g.top+f*(b/c)+(d.options.mode=="show"?(f-Math.floor(c/2))*(b/c):0),opacity:d.options.mode=="show"?0:1}).animate({left:g.left+j*(i/e)+(d.options.mode=="show"?0:(j-Math.floor(e/2))*(i/e)),top:g.top+
+f*(b/c)+(d.options.mode=="show"?0:(f-Math.floor(c/2))*(b/c)),opacity:d.options.mode=="show"?1:0},d.duration||500);setTimeout(function(){d.options.mode=="show"?h.css({visibility:"visible"}):h.css({visibility:"visible"}).hide();d.callback&&d.callback.apply(h[0]);h.dequeue();a("div.ui-effects-explode").remove()},d.duration||500)})}})(jQ);
+(function(a){a.effects.fade=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"hide");c.animate({opacity:e},{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQ);
+(function(a){a.effects.fold=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.size||15,i=!!d.options.horizFirst,b=d.duration?d.duration/2:a.fx.speeds._default/2;a.effects.save(c,e);c.show();var f=a.effects.createWrapper(c).css({overflow:"hidden"}),j=h=="show"!=i,l=j?["width","height"]:["height","width"];j=j?[f.width(),f.height()]:[f.height(),f.width()];var o=/([0-9]+)%/.exec(g);if(o)g=parseInt(o[1],
+10)/100*j[h=="hide"?0:1];if(h=="show")f.css(i?{height:0,width:g}:{height:g,width:0});i={};o={};i[l[0]]=h=="show"?j[0]:g;o[l[1]]=h=="show"?j[1]:0;f.animate(i,b,d.options.easing).animate(o,b,d.options.easing,function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()})})}})(jQ);
+(function(a){a.effects.highlight=function(d){return this.queue(function(){var c=a(this),e=["backgroundImage","backgroundColor","opacity"],h=a.effects.setMode(c,d.options.mode||"show"),g={backgroundColor:c.css("backgroundColor")};if(h=="hide")g.opacity=0;a.effects.save(c,e);c.show().css({backgroundImage:"none",backgroundColor:d.options.color||"#ffff99"}).animate(g,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);h=="show"&&!a.support.opacity&&
+this.style.removeAttribute("filter");d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQ);
+(function(a){a.effects.pulsate=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"show");times=(d.options.times||5)*2-1;duration=d.duration?d.duration/2:a.fx.speeds._default/2;isVisible=c.is(":visible");animateTo=0;if(!isVisible){c.css("opacity",0).show();animateTo=1}if(e=="hide"&&isVisible||e=="show"&&!isVisible)times--;for(e=0;e<times;e++){c.animate({opacity:animateTo},duration,d.options.easing);animateTo=(animateTo+1)%2}c.animate({opacity:animateTo},duration,
+d.options.easing,function(){animateTo==0&&c.hide();d.callback&&d.callback.apply(this,arguments)});c.queue("fx",function(){c.dequeue()}).dequeue()})}})(jQ);
+(function(a){a.effects.puff=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"hide"),h=parseInt(d.options.percent,10)||150,g=h/100,i={height:c.height(),width:c.width()};a.extend(d.options,{fade:true,mode:e,percent:e=="hide"?h:100,from:e=="hide"?i:{height:i.height*g,width:i.width*g}});c.effect("scale",d.options,d.duration,d.callback);c.dequeue()})};a.effects.scale=function(d){return this.queue(function(){var c=a(this),e=a.extend(true,{},d.options),h=a.effects.setMode(c,
+d.options.mode||"effect"),g=parseInt(d.options.percent,10)||(parseInt(d.options.percent,10)==0?0:h=="hide"?0:100),i=d.options.direction||"both",b=d.options.origin;if(h!="effect"){e.origin=b||["middle","center"];e.restore=true}b={height:c.height(),width:c.width()};c.from=d.options.from||(h=="show"?{height:0,width:0}:b);g={y:i!="horizontal"?g/100:1,x:i!="vertical"?g/100:1};c.to={height:b.height*g.y,width:b.width*g.x};if(d.options.fade){if(h=="show"){c.from.opacity=0;c.to.opacity=1}if(h=="hide"){c.from.opacity=
+1;c.to.opacity=0}}e.from=c.from;e.to=c.to;e.mode=h;c.effect("size",e,d.duration,d.callback);c.dequeue()})};a.effects.size=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],g=["width","height","overflow"],i=["fontSize"],b=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],f=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
+j=a.effects.setMode(c,d.options.mode||"effect"),l=d.options.restore||false,o=d.options.scale||"both",n=d.options.origin,k={height:c.height(),width:c.width()};c.from=d.options.from||k;c.to=d.options.to||k;if(n){n=a.effects.getBaseline(n,k);c.from.top=(k.height-c.from.height)*n.y;c.from.left=(k.width-c.from.width)*n.x;c.to.top=(k.height-c.to.height)*n.y;c.to.left=(k.width-c.to.width)*n.x}var m={from:{y:c.from.height/k.height,x:c.from.width/k.width},to:{y:c.to.height/k.height,x:c.to.width/k.width}};
+if(o=="box"||o=="both"){if(m.from.y!=m.to.y){e=e.concat(b);c.from=a.effects.setTransition(c,b,m.from.y,c.from);c.to=a.effects.setTransition(c,b,m.to.y,c.to)}if(m.from.x!=m.to.x){e=e.concat(f);c.from=a.effects.setTransition(c,f,m.from.x,c.from);c.to=a.effects.setTransition(c,f,m.to.x,c.to)}}if(o=="content"||o=="both")if(m.from.y!=m.to.y){e=e.concat(i);c.from=a.effects.setTransition(c,i,m.from.y,c.from);c.to=a.effects.setTransition(c,i,m.to.y,c.to)}a.effects.save(c,l?e:h);c.show();a.effects.createWrapper(c);
+c.css("overflow","hidden").css(c.from);if(o=="content"||o=="both"){b=b.concat(["marginTop","marginBottom"]).concat(i);f=f.concat(["marginLeft","marginRight"]);g=e.concat(b).concat(f);c.find("*[width]").each(function(){child=a(this);l&&a.effects.save(child,g);var p={height:child.height(),width:child.width()};child.from={height:p.height*m.from.y,width:p.width*m.from.x};child.to={height:p.height*m.to.y,width:p.width*m.to.x};if(m.from.y!=m.to.y){child.from=a.effects.setTransition(child,b,m.from.y,child.from);
+child.to=a.effects.setTransition(child,b,m.to.y,child.to)}if(m.from.x!=m.to.x){child.from=a.effects.setTransition(child,f,m.from.x,child.from);child.to=a.effects.setTransition(child,f,m.to.x,child.to)}child.css(child.from);child.animate(child.to,d.duration,d.options.easing,function(){l&&a.effects.restore(child,g)})})}c.animate(c.to,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){c.to.opacity===0&&c.css("opacity",c.from.opacity);j=="hide"&&c.hide();a.effects.restore(c,
+l?e:h);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQ);
+(function(a){a.effects.shake=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"];a.effects.setMode(c,d.options.mode||"effect");var h=d.options.direction||"left",g=d.options.distance||20,i=d.options.times||3,b=d.duration||d.options.duration||140;a.effects.save(c,e);c.show();a.effects.createWrapper(c);var f=h=="up"||h=="down"?"top":"left",j=h=="up"||h=="left"?"pos":"neg";h={};var l={},o={};h[f]=(j=="pos"?"-=":"+=")+g;l[f]=(j=="pos"?"+=":"-=")+g*2;o[f]=
+(j=="pos"?"-=":"+=")+g*2;c.animate(h,b,d.options.easing);for(g=1;g<i;g++)c.animate(l,b,d.options.easing).animate(o,b,d.options.easing);c.animate(l,b,d.options.easing).animate(h,b/2,d.options.easing,function(){a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments)});c.queue("fx",function(){c.dequeue()});c.dequeue()})}})(jQ);
+(function(a){a.effects.slide=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"show"),g=d.options.direction||"left";a.effects.save(c,e);c.show();a.effects.createWrapper(c).css({overflow:"hidden"});var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=d.options.distance||(i=="top"?c.outerHeight({margin:true}):c.outerWidth({margin:true}));if(h=="show")c.css(i,g=="pos"?isNaN(b)?"-"+b:-b:b);
+var f={};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;c.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQ);
+(function(a){a.effects.transfer=function(d){return this.queue(function(){var c=a(this),e=a(d.options.to),h=e.offset();e={top:h.top,left:h.left,height:e.innerHeight(),width:e.innerWidth()};h=c.offset();var g=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(d.options.className).css({top:h.top,left:h.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(e,d.duration,d.options.easing,function(){g.remove();d.callback&&d.callback.apply(c[0],arguments);
+c.dequeue()})})}})(jQ);
+(function(a){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var d=this,c=d.options;d.running=0;d.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");d.headers=
+d.element.find(c.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){c.disabled||a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){c.disabled||a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){c.disabled||a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){c.disabled||a(this).removeClass("ui-state-focus")});d.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(c.navigation){var e=d.element.find("a").filter(c.navigationFilter).eq(0);if(e.length){var h=e.closest(".ui-accordion-header");d.active=h.length?h:e.closest(".ui-accordion-content").prev()}}d.active=d._findActive(d.active||c.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");d.active.next().addClass("ui-accordion-content-active");d._createIcons();d.resize();d.element.attr("role","tablist");d.headers.attr("role","tab").bind("keydown.accordion",
+function(g){return d._keydown(g)}).next().attr("role","tabpanel");d.headers.not(d.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();d.active.length?d.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):d.headers.eq(0).attr("tabIndex",0);a.browser.safari||d.headers.find("a").attr("tabIndex",-1);c.event&&d.headers.bind(c.event.split(" ").join(".accordion ")+".accordion",function(g){d._clickHandler.call(d,g,this);g.preventDefault()})},_createIcons:function(){var d=
+this.options;if(d.icons){a("<span></span>").addClass("ui-icon "+d.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(d.icons.header).toggleClass(d.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var d=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var c=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(d.autoHeight||d.fillHeight)c.css("height","");return a.Widget.prototype.destroy.call(this)},_setOption:function(d,c){a.Widget.prototype._setOption.apply(this,arguments);d=="active"&&this.activate(c);if(d=="icons"){this._destroyIcons();
+c&&this._createIcons()}if(d=="disabled")this.headers.add(this.headers.next())[c?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(d){if(!(this.options.disabled||d.altKey||d.ctrlKey)){var c=a.ui.keyCode,e=this.headers.length,h=this.headers.index(d.target),g=false;switch(d.keyCode){case c.RIGHT:case c.DOWN:g=this.headers[(h+1)%e];break;case c.LEFT:case c.UP:g=this.headers[(h-1+e)%e];break;case c.SPACE:case c.ENTER:this._clickHandler({target:d.target},d.target);
+d.preventDefault()}if(g){a(d.target).attr("tabIndex",-1);a(g).attr("tabIndex",0);g.focus();return false}return true}},resize:function(){var d=this.options,c;if(d.fillSpace){if(a.browser.msie){var e=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}c=this.element.parent().height();a.browser.msie&&this.element.parent().css("overflow",e);this.headers.each(function(){c-=a(this).outerHeight(true)});this.headers.next().each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+
+a(this).height()))}).css("overflow","auto")}else if(d.autoHeight){c=0;this.headers.next().each(function(){c=Math.max(c,a(this).height("").height())}).height(c)}return this},activate:function(d){this.options.active=d;d=this._findActive(d)[0];this._clickHandler({target:d},d);return this},_findActive:function(d){return d?typeof d==="number"?this.headers.filter(":eq("+d+")"):this.headers.not(this.headers.not(d)):d===false?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(d,c){var e=this.options;
+if(!e.disabled)if(d.target){d=a(d.currentTarget||c);c=d[0]===this.active[0];e.active=e.collapsible&&c?false:this.headers.index(d);if(!(this.running||!e.collapsible&&c)){var h=this.active;f=d.next();i=this.active.next();b={options:e,newHeader:c&&e.collapsible?a([]):d,oldHeader:this.active,newContent:c&&e.collapsible?a([]):f,oldContent:i};var g=this.headers.index(this.active[0])>this.headers.index(d[0]);this.active=c?a([]):d;this._toggle(f,i,b,c,g);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);
+if(!c){d.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(e.icons.header).addClass(e.icons.headerSelected);d.next().addClass("ui-accordion-content-active")}}}else if(e.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);this.active.next().addClass("ui-accordion-content-active");var i=this.active.next(),
+b={options:e,newHeader:a([]),oldHeader:e.active,newContent:a([]),oldContent:i},f=this.active=a([]);this._toggle(f,i,b)}},_toggle:function(d,c,e,h,g){var i=this,b=i.options;i.toShow=d;i.toHide=c;i.data=e;var f=function(){if(i)return i._completed.apply(i,arguments)};i._trigger("changestart",null,i.data);i.running=c.size()===0?d.size():c.size();if(b.animated){e={};e=b.collapsible&&h?{toShow:a([]),toHide:c,complete:f,down:g,autoHeight:b.autoHeight||b.fillSpace}:{toShow:d,toHide:c,complete:f,down:g,autoHeight:b.autoHeight||
+b.fillSpace};if(!b.proxied)b.proxied=b.animated;if(!b.proxiedDuration)b.proxiedDuration=b.duration;b.animated=a.isFunction(b.proxied)?b.proxied(e):b.proxied;b.duration=a.isFunction(b.proxiedDuration)?b.proxiedDuration(e):b.proxiedDuration;h=a.ui.accordion.animations;var j=b.duration,l=b.animated;if(l&&!h[l]&&!a.easing[l])l="slide";h[l]||(h[l]=function(o){this.slide(o,{easing:l,duration:j||700})});h[l](e)}else{if(b.collapsible&&h)d.toggle();else{c.hide();d.show()}f(true)}c.prev().attr({"aria-expanded":"false",
+"aria-selected":"false",tabIndex:-1}).blur();d.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(d){this.running=d?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});a.extend(a.ui.accordion,{version:"1.8.16",
+animations:{slide:function(d,c){d=a.extend({easing:"swing",duration:300},d,c);if(d.toHide.size())if(d.toShow.size()){var e=d.toShow.css("overflow"),h=0,g={},i={},b;c=d.toShow;b=c[0].style.width;c.width(parseInt(c.parent().width(),10)-parseInt(c.css("paddingLeft"),10)-parseInt(c.css("paddingRight"),10)-(parseInt(c.css("borderLeftWidth"),10)||0)-(parseInt(c.css("borderRightWidth"),10)||0));a.each(["height","paddingTop","paddingBottom"],function(f,j){i[j]="hide";f=(""+a.css(d.toShow[0],j)).match(/^([\d+-.]+)(.*)$/);
+g[j]={value:f[1],unit:f[2]||"px"}});d.toShow.css({height:0,overflow:"hidden"}).show();d.toHide.filter(":hidden").each(d.complete).end().filter(":visible").animate(i,{step:function(f,j){if(j.prop=="height")h=j.end-j.start===0?0:(j.now-j.start)/(j.end-j.start);d.toShow[0].style[j.prop]=h*g[j.prop].value+g[j.prop].unit},duration:d.duration,easing:d.easing,complete:function(){d.autoHeight||d.toShow.css("height","");d.toShow.css({width:b,overflow:e});d.complete()}})}else d.toHide.animate({height:"hide",
+paddingTop:"hide",paddingBottom:"hide"},d);else d.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},d)},bounceslide:function(d){this.slide(d,{easing:d.down?"easeOutBounce":"swing",duration:d.down?1E3:200})}}})})(jQ);
+(function(a){var d=0;a.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var c=this,e=this.element[0].ownerDocument,h;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(g){if(!(c.options.disabled||c.element.propAttr("readOnly"))){h=
+false;var i=a.ui.keyCode;switch(g.keyCode){case i.PAGE_UP:c._move("previousPage",g);break;case i.PAGE_DOWN:c._move("nextPage",g);break;case i.UP:c._move("previous",g);g.preventDefault();break;case i.DOWN:c._move("next",g);g.preventDefault();break;case i.ENTER:case i.NUMPAD_ENTER:if(c.menu.active){h=true;g.preventDefault()}case i.TAB:if(!c.menu.active)return;c.menu.select(g);break;case i.ESCAPE:c.element.val(c.term);c.close(g);break;default:clearTimeout(c.searching);c.searching=setTimeout(function(){if(c.term!=
+c.element.val()){c.selectedItem=null;c.search(null,g)}},c.options.delay);break}}}).bind("keypress.autocomplete",function(g){if(h){h=false;g.preventDefault()}}).bind("focus.autocomplete",function(){if(!c.options.disabled){c.selectedItem=null;c.previous=c.element.val()}}).bind("blur.autocomplete",function(g){if(!c.options.disabled){clearTimeout(c.searching);c.closing=setTimeout(function(){c.close(g);c._change(g)},150)}});this._initSource();this.response=function(){return c._response.apply(c,arguments)};
+this.menu=a("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.appendTo||"body",e)[0]).mousedown(function(g){var i=c.menu.element[0];a(g.target).closest(".ui-menu-item").length||setTimeout(function(){a(document).one("mousedown",function(b){b.target!==c.element[0]&&b.target!==i&&!a.ui.contains(i,b.target)&&c.close()})},1);setTimeout(function(){clearTimeout(c.closing)},13)}).menu({focus:function(g,i){i=i.item.data("item.autocomplete");false!==c._trigger("focus",g,{item:i})&&/^key/.test(g.originalEvent.type)&&
+c.element.val(i.value)},selected:function(g,i){var b=i.item.data("item.autocomplete"),f=c.previous;if(c.element[0]!==e.activeElement){c.element.focus();c.previous=f;setTimeout(function(){c.previous=f;c.selectedItem=b},1)}false!==c._trigger("select",g,{item:b})&&c.element.val(b.value);c.term=c.element.val();c.close(g);c.selectedItem=b},blur:function(){c.menu.element.is(":visible")&&c.element.val()!==c.term&&c.element.val(c.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
+a.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();a.Widget.prototype.destroy.call(this)},_setOption:function(c,e){a.Widget.prototype._setOption.apply(this,arguments);c==="source"&&this._initSource();if(c==="appendTo")this.menu.element.appendTo(a(e||"body",this.element[0].ownerDocument)[0]);c==="disabled"&&
+e&&this.xhr&&this.xhr.abort()},_initSource:function(){var c=this,e,h;if(a.isArray(this.options.source)){e=this.options.source;this.source=function(g,i){i(a.ui.autocomplete.filter(e,g.term))}}else if(typeof this.options.source==="string"){h=this.options.source;this.source=function(g,i){c.xhr&&c.xhr.abort();c.xhr=a.ajax({url:h,data:g,dataType:"json",autocompleteRequest:++d,success:function(b){this.autocompleteRequest===d&&i(b)},error:function(){this.autocompleteRequest===d&&i([])}})}}else this.source=
+this.options.source},search:function(c,e){c=c!=null?c:this.element.val();this.term=this.element.val();if(c.length<this.options.minLength)return this.close(e);clearTimeout(this.closing);if(this._trigger("search",e)!==false)return this._search(c)},_search:function(c){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:c},this.response)},_response:function(c){if(!this.options.disabled&&c&&c.length){c=this._normalize(c);this._suggest(c);this._trigger("open")}else this.close();
+this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(c){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",c)}},_change:function(c){this.previous!==this.element.val()&&this._trigger("change",c,{item:this.selectedItem})},_normalize:function(c){if(c.length&&c[0].label&&c[0].value)return c;return a.map(c,function(e){if(typeof e==="string")return{label:e,value:e};return a.extend({label:e.label||
+e.value,value:e.value||e.label},e)})},_suggest:function(c){var e=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(e,c);this.menu.deactivate();this.menu.refresh();e.show();this._resizeMenu();e.position(a.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:function(){var c=this.menu.element;c.outerWidth(Math.max(c.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(c,e){var h=this;
+a.each(e,function(g,i){h._renderItem(c,i)})},_renderItem:function(c,e){return a("<li></li>").data("item.autocomplete",e).append(a("<a></a>").text(e.label)).appendTo(c)},_move:function(c,e){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(c)||this.menu.last()&&/^next/.test(c)){this.element.val(this.term);this.menu.deactivate()}else this.menu[c](e);else this.search(null,e)},widget:function(){return this.menu.element}});a.extend(a.ui.autocomplete,{escapeRegex:function(c){return c.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
+"\\$&")},filter:function(c,e){var h=new RegExp(a.ui.autocomplete.escapeRegex(e),"i");return a.grep(c,function(g){return h.test(g.label||g.value||g)})}})})(jQ);
+(function(a){a.widget("ui.menu",{_create:function(){var d=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(c){if(a(c.target).closest(".ui-menu-item a").length){c.preventDefault();d.select(c)}});this.refresh()},refresh:function(){var d=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(c){d.activate(c,a(this).parent())}).mouseleave(function(){d.deactivate()})},activate:function(d,c){this.deactivate();if(this.hasScroll()){var e=c.offset().top-this.element.offset().top,h=this.element.scrollTop(),g=this.element.height();if(e<0)this.element.scrollTop(h+e);else e>=g&&this.element.scrollTop(h+e-g+c.height())}this.active=c.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",d,{item:c})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
+this._trigger("blur");this.active=null}},next:function(d){this.move("next",".ui-menu-item:first",d)},previous:function(d){this.move("prev",".ui-menu-item:last",d)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(d,c,e){if(this.active){d=this.active[d+"All"](".ui-menu-item").eq(0);d.length?this.activate(e,d):this.activate(e,this.element.children(c))}else this.activate(e,
+this.element.children(c))},nextPage:function(d){if(this.hasScroll())if(!this.active||this.last())this.activate(d,this.element.children(".ui-menu-item:first"));else{var c=this.active.offset().top,e=this.element.height(),h=this.element.children(".ui-menu-item").filter(function(){var g=a(this).offset().top-c-e+a(this).height();return g<10&&g>-10});h.length||(h=this.element.children(".ui-menu-item:last"));this.activate(d,h)}else this.activate(d,this.element.children(".ui-menu-item").filter(!this.active||
+this.last()?":first":":last"))},previousPage:function(d){if(this.hasScroll())if(!this.active||this.first())this.activate(d,this.element.children(".ui-menu-item:last"));else{var c=this.active.offset().top,e=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var h=a(this).offset().top-c+e-a(this).height();return h<10&&h>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(d,result)}else this.activate(d,this.element.children(".ui-menu-item").filter(!this.active||
+this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:function(d){this._trigger("selected",d,{item:this.active})}})})(jQ);
+(function(a){var d,c,e,h,g=function(){var b=a(this).find(":ui-button");setTimeout(function(){b.button("refresh")},1)},i=function(b){var f=b.name,j=b.form,l=a([]);if(f)l=j?a(j).find("[name='"+f+"']"):a("[name='"+f+"']",b.ownerDocument).filter(function(){return!this.form});return l};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",g);if(typeof this.options.disabled!==
+"boolean")this.options.disabled=this.element.propAttr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,f=this.options,j=this.type==="checkbox"||this.type==="radio",l="ui-state-hover"+(!j?" ui-state-active":"");if(f.label===null)f.label=this.buttonElement.html();if(this.element.is(":disabled"))f.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!f.disabled){a(this).addClass("ui-state-hover");
+this===d&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){f.disabled||a(this).removeClass(l)}).bind("click.button",function(o){if(f.disabled){o.preventDefault();o.stopImmediatePropagation()}});this.element.bind("focus.button",function(){b.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){b.buttonElement.removeClass("ui-state-focus")});if(j){this.element.bind("change.button",function(){h||b.refresh()});this.buttonElement.bind("mousedown.button",function(o){if(!f.disabled){h=
+false;c=o.pageX;e=o.pageY}}).bind("mouseup.button",function(o){if(!f.disabled)if(c!==o.pageX||e!==o.pageY)h=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).toggleClass("ui-state-active");b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed","true");
+var o=b.element[0];i(o).not(o).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")});else{this.buttonElement.bind("mousedown.button",function(){if(f.disabled)return false;a(this).addClass("ui-state-active");d=this;a(document).one("mouseup",function(){d=null})}).bind("mouseup.button",function(){if(f.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(o){if(f.disabled)return false;if(o.keyCode==a.ui.keyCode.SPACE||
+o.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(o){o.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",f.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
+"radio"){var b=this.element.parents().filter(":last"),f="label[for='"+this.element.attr("id")+"']";this.buttonElement=b.find(f);if(!this.buttonElement.length){b=b.length?b.siblings():this.element.siblings();this.buttonElement=b.filter(f);if(!this.buttonElement.length)this.buttonElement=b.find(f)}this.element.addClass("ui-helper-hidden-accessible");(b=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=this.element},
+widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
+a.Widget.prototype.destroy.call(this)},_setOption:function(b,f){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")f?this.element.propAttr("disabled",true):this.element.propAttr("disabled",false);else this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")i(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+"true"):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false")},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+f=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),j=this.options.icons,l=j.primary&&j.secondary,o=[];if(j.primary||j.secondary){if(this.options.text)o.push("ui-button-text-icon"+(l?"s":j.primary?"-primary":"-secondary"));j.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+j.primary+"'></span>");j.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+j.secondary+"'></span>");if(!this.options.text){o.push(l?"ui-button-icons-only":
+"ui-button-icon-only");this.hasTitle||b.attr("title",f)}}else o.push("ui-button-text-only");b.addClass(o.join(" "))}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,f){b==="disabled"&&this.buttons.button("option",b,f);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var b=this.element.css("direction")===
+"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(b?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(b?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
+a.Widget.prototype.destroy.call(this)}})})(jQ);
+(function(a,d){function c(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};a.extend(this._defaults,this.regional[""]);this.dpDiv=e(a('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function e(b){return b.bind("mouseout",
+function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");f.length&&f.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(a.datepicker._isDisabledDatepicker(i.inline?b.parent()[0]:i.input[0])||!f.length)){f.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+f.addClass("ui-state-hover");f.hasClass("ui-datepicker-prev")&&f.addClass("ui-datepicker-prev-hover");f.hasClass("ui-datepicker-next")&&f.addClass("ui-datepicker-next-hover")}})}function h(b,f){a.extend(b,f);for(var j in f)if(f[j]==null||f[j]==d)b[j]=f[j];return b}a.extend(a.ui,{datepicker:{version:"1.8.16"}});var g=(new Date).getTime(),i;a.extend(c.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
+setDefaults:function(b){h(this._defaults,b||{});return this},_attachDatepicker:function(b,f){var j=null;for(var l in this._defaults){var o=b.getAttribute("date:"+l);if(o){j=j||{};try{j[l]=eval(o)}catch(n){j[l]=o}}}l=b.nodeName.toLowerCase();o=l=="div"||l=="span";if(!b.id){this.uuid+=1;b.id="dp"+this.uuid}var k=this._newInst(a(b),o);k.settings=a.extend({},f||{},j||{});if(l=="input")this._connectDatepicker(b,k);else o&&this._inlineDatepicker(b,k)},_newInst:function(b,f){return{id:b[0].id.replace(/([^A-Za-z0-9_-])/g,
+"\\\\$1"),input:b,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:f,dpDiv:!f?this.dpDiv:e(a('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(b,f){var j=a(b);f.append=a([]);f.trigger=a([]);if(!j.hasClass(this.markerClassName)){this._attachments(j,f);j.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
+function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});this._autoSize(f);a.data(b,"datepicker",f);f.settings.disabled&&this._disableDatepicker(b)}},_attachments:function(b,f){var j=this._get(f,"appendText"),l=this._get(f,"isRTL");f.append&&f.append.remove();if(j){f.append=a('<span class="'+this._appendClass+'">'+j+"</span>");b[l?"before":"after"](f.append)}b.unbind("focus",this._showDatepicker);f.trigger&&f.trigger.remove();j=this._get(f,"showOn");if(j==
+"focus"||j=="both")b.focus(this._showDatepicker);if(j=="button"||j=="both"){j=this._get(f,"buttonText");var o=this._get(f,"buttonImage");f.trigger=a(this._get(f,"buttonImageOnly")?a("<img/>").addClass(this._triggerClass).attr({src:o,alt:j,title:j}):a('<button type="button"></button>').addClass(this._triggerClass).html(o==""?j:a("<img/>").attr({src:o,alt:j,title:j})));b[l?"before":"after"](f.trigger);f.trigger.click(function(){a.datepicker._datepickerShowing&&a.datepicker._lastInput==b[0]?a.datepicker._hideDatepicker():
+a.datepicker._showDatepicker(b[0]);return false})}},_autoSize:function(b){if(this._get(b,"autoSize")&&!b.inline){var f=new Date(2009,11,20),j=this._get(b,"dateFormat");if(j.match(/[DM]/)){var l=function(o){for(var n=0,k=0,m=0;m<o.length;m++)if(o[m].length>n){n=o[m].length;k=m}return k};f.setMonth(l(this._get(b,j.match(/MM/)?"monthNames":"monthNamesShort")));f.setDate(l(this._get(b,j.match(/DD/)?"dayNames":"dayNamesShort"))+20-f.getDay())}b.input.attr("size",this._formatDate(b,f).length)}},_inlineDatepicker:function(b,
+f){var j=a(b);if(!j.hasClass(this.markerClassName)){j.addClass(this.markerClassName).append(f.dpDiv).bind("setData.datepicker",function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});a.data(b,"datepicker",f);this._setDate(f,this._getDefaultDate(f),true);this._updateDatepicker(f);this._updateAlternate(f);f.settings.disabled&&this._disableDatepicker(b);f.dpDiv.css("display","block")}},_dialogDatepicker:function(b,f,j,l,o){b=this._dialogInst;if(!b){this.uuid+=
+1;this._dialogInput=a('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);a("body").append(this._dialogInput);b=this._dialogInst=this._newInst(this._dialogInput,false);b.settings={};a.data(this._dialogInput[0],"datepicker",b)}h(b.settings,l||{});f=f&&f.constructor==Date?this._formatDate(b,f):f;this._dialogInput.val(f);this._pos=o?o.length?o:[o.pageX,o.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
+2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");b.settings.onSelect=j;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);a.blockUI&&a.blockUI(this.dpDiv);a.data(this._dialogInput[0],"datepicker",b);return this},_destroyDatepicker:function(b){var f=
+a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();a.removeData(b,"datepicker");if(l=="input"){j.append.remove();j.trigger.remove();f.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(l=="div"||l=="span")f.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=
+b.nodeName.toLowerCase();if(l=="input"){b.disabled=false;j.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().removeClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o})}},_disableDatepicker:function(b){var f=a(b),j=a.data(b,
+"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=true;j.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().addClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==
+b?null:o});this._disabledInputs[this._disabledInputs.length]=b}},_isDisabledDatepicker:function(b){if(!b)return false;for(var f=0;f<this._disabledInputs.length;f++)if(this._disabledInputs[f]==b)return true;return false},_getInst:function(b){try{return a.data(b,"datepicker")}catch(f){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(b,f,j){var l=this._getInst(b);if(arguments.length==2&&typeof f=="string")return f=="defaults"?a.extend({},a.datepicker._defaults):l?f=="all"?
+a.extend({},l.settings):this._get(l,f):null;var o=f||{};if(typeof f=="string"){o={};o[f]=j}if(l){this._curInst==l&&this._hideDatepicker();var n=this._getDateDatepicker(b,true),k=this._getMinMaxDate(l,"min"),m=this._getMinMaxDate(l,"max");h(l.settings,o);if(k!==null&&o.dateFormat!==d&&o.minDate===d)l.settings.minDate=this._formatDate(l,k);if(m!==null&&o.dateFormat!==d&&o.maxDate===d)l.settings.maxDate=this._formatDate(l,m);this._attachments(a(b),l);this._autoSize(l);this._setDate(l,n);this._updateAlternate(l);
+this._updateDatepicker(l)}},_changeDatepicker:function(b,f,j){this._optionDatepicker(b,f,j)},_refreshDatepicker:function(b){(b=this._getInst(b))&&this._updateDatepicker(b)},_setDateDatepicker:function(b,f){if(b=this._getInst(b)){this._setDate(b,f);this._updateDatepicker(b);this._updateAlternate(b)}},_getDateDatepicker:function(b,f){(b=this._getInst(b))&&!b.inline&&this._setDateFromField(b,f);return b?this._getDate(b):null},_doKeyDown:function(b){var f=a.datepicker._getInst(b.target),j=true,l=f.dpDiv.is(".ui-datepicker-rtl");
+f._keyEvent=true;if(a.datepicker._datepickerShowing)switch(b.keyCode){case 9:a.datepicker._hideDatepicker();j=false;break;case 13:j=a("td."+a.datepicker._dayOverClass+":not(."+a.datepicker._currentClass+")",f.dpDiv);j[0]&&a.datepicker._selectDay(b.target,f.selectedMonth,f.selectedYear,j[0]);if(b=a.datepicker._get(f,"onSelect")){j=a.datepicker._formatDate(f);b.apply(f.input?f.input[0]:null,[j,f])}else a.datepicker._hideDatepicker();return false;case 27:a.datepicker._hideDatepicker();break;case 33:a.datepicker._adjustDate(b.target,
+b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 34:a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,"stepMonths"),"M");break;case 35:if(b.ctrlKey||b.metaKey)a.datepicker._clearDate(b.target);j=b.ctrlKey||b.metaKey;break;case 36:if(b.ctrlKey||b.metaKey)a.datepicker._gotoToday(b.target);j=b.ctrlKey||b.metaKey;break;case 37:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,l?+1:-1,"D");j=
+b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 38:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,-7,"D");j=b.ctrlKey||b.metaKey;break;case 39:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,l?-1:+1,"D");j=b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,
+"stepMonths"),"M");break;case 40:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,+7,"D");j=b.ctrlKey||b.metaKey;break;default:j=false}else if(b.keyCode==36&&b.ctrlKey)a.datepicker._showDatepicker(this);else j=false;if(j){b.preventDefault();b.stopPropagation()}},_doKeyPress:function(b){var f=a.datepicker._getInst(b.target);if(a.datepicker._get(f,"constrainInput")){f=a.datepicker._possibleChars(a.datepicker._get(f,"dateFormat"));var j=String.fromCharCode(b.charCode==d?b.keyCode:b.charCode);
+return b.ctrlKey||b.metaKey||j<" "||!f||f.indexOf(j)>-1}},_doKeyUp:function(b){b=a.datepicker._getInst(b.target);if(b.input.val()!=b.lastVal)try{if(a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,a.datepicker._getFormatConfig(b))){a.datepicker._setDateFromField(b);a.datepicker._updateAlternate(b);a.datepicker._updateDatepicker(b)}}catch(f){a.datepicker.log(f)}return true},_showDatepicker:function(b){b=b.target||b;if(b.nodeName.toLowerCase()!="input")b=a("input",
+b.parentNode)[0];if(!(a.datepicker._isDisabledDatepicker(b)||a.datepicker._lastInput==b)){var f=a.datepicker._getInst(b);if(a.datepicker._curInst&&a.datepicker._curInst!=f){a.datepicker._datepickerShowing&&a.datepicker._triggerOnClose(a.datepicker._curInst);a.datepicker._curInst.dpDiv.stop(true,true)}var j=a.datepicker._get(f,"beforeShow");j=j?j.apply(b,[b,f]):{};if(j!==false){h(f.settings,j);f.lastVal=null;a.datepicker._lastInput=b;a.datepicker._setDateFromField(f);if(a.datepicker._inDialog)b.value=
+"";if(!a.datepicker._pos){a.datepicker._pos=a.datepicker._findPos(b);a.datepicker._pos[1]+=b.offsetHeight}var l=false;a(b).parents().each(function(){l|=a(this).css("position")=="fixed";return!l});if(l&&a.browser.opera){a.datepicker._pos[0]-=document.documentElement.scrollLeft;a.datepicker._pos[1]-=document.documentElement.scrollTop}j={left:a.datepicker._pos[0],top:a.datepicker._pos[1]};a.datepicker._pos=null;f.dpDiv.empty();f.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});a.datepicker._updateDatepicker(f);
+j=a.datepicker._checkOffset(f,j,l);f.dpDiv.css({position:a.datepicker._inDialog&&a.blockUI?"static":l?"fixed":"absolute",display:"none",left:j.left+"px",top:j.top+"px"});if(!f.inline){j=a.datepicker._get(f,"showAnim");var o=a.datepicker._get(f,"duration"),n=function(){var k=f.dpDiv.find("iframe.ui-datepicker-cover");if(k.length){var m=a.datepicker._getBorders(f.dpDiv);k.css({left:-m[0],top:-m[1],width:f.dpDiv.outerWidth(),height:f.dpDiv.outerHeight()})}};f.dpDiv.zIndex(a(b).zIndex()+1);a.datepicker._datepickerShowing=
+true;a.effects&&a.effects[j]?f.dpDiv.show(j,a.datepicker._get(f,"showOptions"),o,n):f.dpDiv[j||"show"](j?o:null,n);if(!j||!o)n();f.input.is(":visible")&&!f.input.is(":disabled")&&f.input.focus();a.datepicker._curInst=f}}}},_updateDatepicker:function(b){this.maxRows=4;var f=a.datepicker._getBorders(b.dpDiv);i=b;b.dpDiv.empty().append(this._generateHTML(b));var j=b.dpDiv.find("iframe.ui-datepicker-cover");j.length&&j.css({left:-f[0],top:-f[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()});
+b.dpDiv.find("."+this._dayOverClass+" a").mouseover();f=this._getNumberOfMonths(b);j=f[1];b.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");j>1&&b.dpDiv.addClass("ui-datepicker-multi-"+j).css("width",17*j+"em");b.dpDiv[(f[0]!=1||f[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");b.dpDiv[(this._get(b,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");b==a.datepicker._curInst&&a.datepicker._datepickerShowing&&b.input&&b.input.is(":visible")&&
+!b.input.is(":disabled")&&b.input[0]!=document.activeElement&&b.input.focus();if(b.yearshtml){var l=b.yearshtml;setTimeout(function(){l===b.yearshtml&&b.yearshtml&&b.dpDiv.find("select.ui-datepicker-year:first").replaceWith(b.yearshtml);l=b.yearshtml=null},0)}},_getBorders:function(b){var f=function(j){return{thin:1,medium:2,thick:3}[j]||j};return[parseFloat(f(b.css("border-left-width"))),parseFloat(f(b.css("border-top-width")))]},_checkOffset:function(b,f,j){var l=b.dpDiv.outerWidth(),o=b.dpDiv.outerHeight(),
+n=b.input?b.input.outerWidth():0,k=b.input?b.input.outerHeight():0,m=document.documentElement.clientWidth+a(document).scrollLeft(),p=document.documentElement.clientHeight+a(document).scrollTop();f.left-=this._get(b,"isRTL")?l-n:0;f.left-=j&&f.left==b.input.offset().left?a(document).scrollLeft():0;f.top-=j&&f.top==b.input.offset().top+k?a(document).scrollTop():0;f.left-=Math.min(f.left,f.left+l>m&&m>l?Math.abs(f.left+l-m):0);f.top-=Math.min(f.top,f.top+o>p&&p>o?Math.abs(o+k):0);return f},_findPos:function(b){for(var f=
+this._get(this._getInst(b),"isRTL");b&&(b.type=="hidden"||b.nodeType!=1||a.expr.filters.hidden(b));)b=b[f?"previousSibling":"nextSibling"];b=a(b).offset();return[b.left,b.top]},_triggerOnClose:function(b){var f=this._get(b,"onClose");if(f)f.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b])},_hideDatepicker:function(b){var f=this._curInst;if(!(!f||b&&f!=a.data(b,"datepicker")))if(this._datepickerShowing){b=this._get(f,"showAnim");var j=this._get(f,"duration"),l=function(){a.datepicker._tidyDialog(f);
+this._curInst=null};a.effects&&a.effects[b]?f.dpDiv.hide(b,a.datepicker._get(f,"showOptions"),j,l):f.dpDiv[b=="slideDown"?"slideUp":b=="fadeIn"?"fadeOut":"hide"](b?j:null,l);b||l();a.datepicker._triggerOnClose(f);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(a.blockUI){a.unblockUI();a("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(b){b.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
+_checkExternalClick:function(b){if(a.datepicker._curInst){b=a(b.target);b[0].id!=a.datepicker._mainDivId&&b.parents("#"+a.datepicker._mainDivId).length==0&&!b.hasClass(a.datepicker.markerClassName)&&!b.hasClass(a.datepicker._triggerClass)&&a.datepicker._datepickerShowing&&!(a.datepicker._inDialog&&a.blockUI)&&a.datepicker._hideDatepicker()}},_adjustDate:function(b,f,j){b=a(b);var l=this._getInst(b[0]);if(!this._isDisabledDatepicker(b[0])){this._adjustInstDate(l,f+(j=="M"?this._get(l,"showCurrentAtPos"):
+0),j);this._updateDatepicker(l)}},_gotoToday:function(b){b=a(b);var f=this._getInst(b[0]);if(this._get(f,"gotoCurrent")&&f.currentDay){f.selectedDay=f.currentDay;f.drawMonth=f.selectedMonth=f.currentMonth;f.drawYear=f.selectedYear=f.currentYear}else{var j=new Date;f.selectedDay=j.getDate();f.drawMonth=f.selectedMonth=j.getMonth();f.drawYear=f.selectedYear=j.getFullYear()}this._notifyChange(f);this._adjustDate(b)},_selectMonthYear:function(b,f,j){b=a(b);var l=this._getInst(b[0]);l["selected"+(j=="M"?
+"Month":"Year")]=l["draw"+(j=="M"?"Month":"Year")]=parseInt(f.options[f.selectedIndex].value,10);this._notifyChange(l);this._adjustDate(b)},_selectDay:function(b,f,j,l){var o=a(b);if(!(a(l).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))){o=this._getInst(o[0]);o.selectedDay=o.currentDay=a("a",l).html();o.selectedMonth=o.currentMonth=f;o.selectedYear=o.currentYear=j;this._selectDate(b,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear))}},_clearDate:function(b){b=a(b);
+this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(b,f){b=this._getInst(a(b)[0]);f=f!=null?f:this._formatDate(b);b.input&&b.input.val(f);this._updateAlternate(b);var j=this._get(b,"onSelect");if(j)j.apply(b.input?b.input[0]:null,[f,b]);else b.input&&b.input.trigger("change");if(b.inline)this._updateDatepicker(b);else{this._hideDatepicker();this._lastInput=b.input[0];typeof b.input[0]!="object"&&b.input.focus();this._lastInput=null}},_updateAlternate:function(b){var f=this._get(b,"altField");
+if(f){var j=this._get(b,"altFormat")||this._get(b,"dateFormat"),l=this._getDate(b),o=this.formatDate(j,l,this._getFormatConfig(b));a(f).each(function(){a(this).val(o)})}},noWeekends:function(b){b=b.getDay();return[b>0&&b<6,""]},iso8601Week:function(b){b=new Date(b.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var f=b.getTime();b.setMonth(0);b.setDate(1);return Math.floor(Math.round((f-b)/864E5)/7)+1},parseDate:function(b,f,j){if(b==null||f==null)throw"Invalid arguments";f=typeof f=="object"?
+f.toString():f+"";if(f=="")return null;var l=(j?j.shortYearCutoff:null)||this._defaults.shortYearCutoff;l=typeof l!="string"?l:(new Date).getFullYear()%100+parseInt(l,10);for(var o=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,n=(j?j.dayNames:null)||this._defaults.dayNames,k=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort,m=(j?j.monthNames:null)||this._defaults.monthNames,p=j=-1,q=-1,s=-1,r=false,u=function(z){(z=H+1<b.length&&b.charAt(H+1)==z)&&H++;return z},v=function(z){var I=
+u(z);z=new RegExp("^\\d{1,"+(z=="@"?14:z=="!"?20:z=="y"&&I?4:z=="o"?3:2)+"}");z=f.substring(y).match(z);if(!z)throw"Missing number at position "+y;y+=z[0].length;return parseInt(z[0],10)},w=function(z,I,N){z=a.map(u(z)?N:I,function(D,E){return[[E,D]]}).sort(function(D,E){return-(D[1].length-E[1].length)});var J=-1;a.each(z,function(D,E){D=E[1];if(f.substr(y,D.length).toLowerCase()==D.toLowerCase()){J=E[0];y+=D.length;return false}});if(J!=-1)return J+1;else throw"Unknown name at position "+y;},x=
+function(){if(f.charAt(y)!=b.charAt(H))throw"Unexpected literal at position "+y;y++},y=0,H=0;H<b.length;H++)if(r)if(b.charAt(H)=="'"&&!u("'"))r=false;else x();else switch(b.charAt(H)){case "d":q=v("d");break;case "D":w("D",o,n);break;case "o":s=v("o");break;case "m":p=v("m");break;case "M":p=w("M",k,m);break;case "y":j=v("y");break;case "@":var C=new Date(v("@"));j=C.getFullYear();p=C.getMonth()+1;q=C.getDate();break;case "!":C=new Date((v("!")-this._ticksTo1970)/1E4);j=C.getFullYear();p=C.getMonth()+
+1;q=C.getDate();break;case "'":if(u("'"))x();else r=true;break;default:x()}if(y<f.length)throw"Extra/unparsed characters found in date: "+f.substring(y);if(j==-1)j=(new Date).getFullYear();else if(j<100)j+=(new Date).getFullYear()-(new Date).getFullYear()%100+(j<=l?0:-100);if(s>-1){p=1;q=s;do{l=this._getDaysInMonth(j,p-1);if(q<=l)break;p++;q-=l}while(1)}C=this._daylightSavingAdjust(new Date(j,p-1,q));if(C.getFullYear()!=j||C.getMonth()+1!=p||C.getDate()!=q)throw"Invalid date";return C},ATOM:"yy-mm-dd",
+COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(b,f,j){if(!f)return"";var l=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,o=(j?j.dayNames:null)||this._defaults.dayNames,n=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort;j=(j?j.monthNames:
+null)||this._defaults.monthNames;var k=function(u){(u=r+1<b.length&&b.charAt(r+1)==u)&&r++;return u},m=function(u,v,w){v=""+v;if(k(u))for(;v.length<w;)v="0"+v;return v},p=function(u,v,w,x){return k(u)?x[v]:w[v]},q="",s=false;if(f)for(var r=0;r<b.length;r++)if(s)if(b.charAt(r)=="'"&&!k("'"))s=false;else q+=b.charAt(r);else switch(b.charAt(r)){case "d":q+=m("d",f.getDate(),2);break;case "D":q+=p("D",f.getDay(),l,o);break;case "o":q+=m("o",Math.round(((new Date(f.getFullYear(),f.getMonth(),f.getDate())).getTime()-
+(new Date(f.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":q+=m("m",f.getMonth()+1,2);break;case "M":q+=p("M",f.getMonth(),n,j);break;case "y":q+=k("y")?f.getFullYear():(f.getYear()%100<10?"0":"")+f.getYear()%100;break;case "@":q+=f.getTime();break;case "!":q+=f.getTime()*1E4+this._ticksTo1970;break;case "'":if(k("'"))q+="'";else s=true;break;default:q+=b.charAt(r)}return q},_possibleChars:function(b){for(var f="",j=false,l=function(n){(n=o+1<b.length&&b.charAt(o+1)==n)&&o++;return n},o=
+0;o<b.length;o++)if(j)if(b.charAt(o)=="'"&&!l("'"))j=false;else f+=b.charAt(o);else switch(b.charAt(o)){case "d":case "m":case "y":case "@":f+="0123456789";break;case "D":case "M":return null;case "'":if(l("'"))f+="'";else j=true;break;default:f+=b.charAt(o)}return f},_get:function(b,f){return b.settings[f]!==d?b.settings[f]:this._defaults[f]},_setDateFromField:function(b,f){if(b.input.val()!=b.lastVal){var j=this._get(b,"dateFormat"),l=b.lastVal=b.input?b.input.val():null,o,n;o=n=this._getDefaultDate(b);
+var k=this._getFormatConfig(b);try{o=this.parseDate(j,l,k)||n}catch(m){this.log(m);l=f?"":l}b.selectedDay=o.getDate();b.drawMonth=b.selectedMonth=o.getMonth();b.drawYear=b.selectedYear=o.getFullYear();b.currentDay=l?o.getDate():0;b.currentMonth=l?o.getMonth():0;b.currentYear=l?o.getFullYear():0;this._adjustInstDate(b)}},_getDefaultDate:function(b){return this._restrictMinMax(b,this._determineDate(b,this._get(b,"defaultDate"),new Date))},_determineDate:function(b,f,j){var l=function(n){var k=new Date;
+k.setDate(k.getDate()+n);return k},o=function(n){try{return a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),n,a.datepicker._getFormatConfig(b))}catch(k){}var m=(n.toLowerCase().match(/^c/)?a.datepicker._getDate(b):null)||new Date,p=m.getFullYear(),q=m.getMonth();m=m.getDate();for(var s=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,r=s.exec(n);r;){switch(r[2]||"d"){case "d":case "D":m+=parseInt(r[1],10);break;case "w":case "W":m+=parseInt(r[1],10)*7;break;case "m":case "M":q+=parseInt(r[1],10);m=
+Math.min(m,a.datepicker._getDaysInMonth(p,q));break;case "y":case "Y":p+=parseInt(r[1],10);m=Math.min(m,a.datepicker._getDaysInMonth(p,q));break}r=s.exec(n)}return new Date(p,q,m)};if(f=(f=f==null||f===""?j:typeof f=="string"?o(f):typeof f=="number"?isNaN(f)?j:l(f):new Date(f.getTime()))&&f.toString()=="Invalid Date"?j:f){f.setHours(0);f.setMinutes(0);f.setSeconds(0);f.setMilliseconds(0)}return this._daylightSavingAdjust(f)},_daylightSavingAdjust:function(b){if(!b)return null;b.setHours(b.getHours()>
+12?b.getHours()+2:0);return b},_setDate:function(b,f,j){var l=!f,o=b.selectedMonth,n=b.selectedYear;f=this._restrictMinMax(b,this._determineDate(b,f,new Date));b.selectedDay=b.currentDay=f.getDate();b.drawMonth=b.selectedMonth=b.currentMonth=f.getMonth();b.drawYear=b.selectedYear=b.currentYear=f.getFullYear();if((o!=b.selectedMonth||n!=b.selectedYear)&&!j)this._notifyChange(b);this._adjustInstDate(b);if(b.input)b.input.val(l?"":this._formatDate(b))},_getDate:function(b){return!b.currentYear||b.input&&
+b.input.val()==""?null:this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay))},_generateHTML:function(b){var f=new Date;f=this._daylightSavingAdjust(new Date(f.getFullYear(),f.getMonth(),f.getDate()));var j=this._get(b,"isRTL"),l=this._get(b,"showButtonPanel"),o=this._get(b,"hideIfNoPrevNext"),n=this._get(b,"navigationAsDateFormat"),k=this._getNumberOfMonths(b),m=this._get(b,"showCurrentAtPos"),p=this._get(b,"stepMonths"),q=k[0]!=1||k[1]!=1,s=this._daylightSavingAdjust(!b.currentDay?
+new Date(9999,9,9):new Date(b.currentYear,b.currentMonth,b.currentDay)),r=this._getMinMaxDate(b,"min"),u=this._getMinMaxDate(b,"max");m=b.drawMonth-m;var v=b.drawYear;if(m<0){m+=12;v--}if(u){var w=this._daylightSavingAdjust(new Date(u.getFullYear(),u.getMonth()-k[0]*k[1]+1,u.getDate()));for(w=r&&w<r?r:w;this._daylightSavingAdjust(new Date(v,m,1))>w;){m--;if(m<0){m=11;v--}}}b.drawMonth=m;b.drawYear=v;w=this._get(b,"prevText");w=!n?w:this.formatDate(w,this._daylightSavingAdjust(new Date(v,m-p,1)),this._getFormatConfig(b));
+w=this._canAdjustMonth(b,-1,v,m)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', -"+p+", 'M');\" title=\""+w+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"e":"w")+'">'+w+"</span></a>":o?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+w+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"e":"w")+'">'+w+"</span></a>";var x=this._get(b,"nextText");x=!n?x:this.formatDate(x,this._daylightSavingAdjust(new Date(v,
+m+p,1)),this._getFormatConfig(b));o=this._canAdjustMonth(b,+1,v,m)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', +"+p+", 'M');\" title=\""+x+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"w":"e")+'">'+x+"</span></a>":o?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+x+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"w":"e")+'">'+x+"</span></a>";p=this._get(b,"currentText");x=this._get(b,"gotoCurrent")&&
+b.currentDay?s:f;p=!n?p:this.formatDate(p,x,this._getFormatConfig(b));n=!b.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+g+'.datepicker._hideDatepicker();">'+this._get(b,"closeText")+"</button>":"";l=l?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(j?n:"")+(this._isInRange(b,x)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+g+".datepicker._gotoToday('#"+b.id+"');\">"+p+"</button>":"")+(j?"":n)+"</div>":"";n=parseInt(this._get(b,"firstDay"),10);n=isNaN(n)?0:n;p=this._get(b,"showWeek");x=this._get(b,"dayNames");this._get(b,"dayNamesShort");var y=this._get(b,"dayNamesMin"),H=this._get(b,"monthNames"),C=this._get(b,"monthNamesShort"),z=this._get(b,"beforeShowDay"),I=this._get(b,"showOtherMonths"),N=this._get(b,"selectOtherMonths");this._get(b,"calculateWeek");for(var J=this._getDefaultDate(b),D="",E=0;E<k[0];E++){var P=
+"";this.maxRows=4;for(var L=0;L<k[1];L++){var Q=this._daylightSavingAdjust(new Date(v,m,b.selectedDay)),B=" ui-corner-all",F="";if(q){F+='<div class="ui-datepicker-group';if(k[1]>1)switch(L){case 0:F+=" ui-datepicker-group-first";B=" ui-corner-"+(j?"right":"left");break;case k[1]-1:F+=" ui-datepicker-group-last";B=" ui-corner-"+(j?"left":"right");break;default:F+=" ui-datepicker-group-middle";B="";break}F+='">'}F+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+B+'">'+(/all|left/.test(B)&&
+E==0?j?o:w:"")+(/all|right/.test(B)&&E==0?j?w:o:"")+this._generateMonthYearHeader(b,m,v,r,u,E>0||L>0,H,C)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var G=p?'<th class="ui-datepicker-week-col">'+this._get(b,"weekHeader")+"</th>":"";for(B=0;B<7;B++){var A=(B+n)%7;G+="<th"+((B+n+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+x[A]+'">'+y[A]+"</span></th>"}F+=G+"</tr></thead><tbody>";G=this._getDaysInMonth(v,m);if(v==b.selectedYear&&m==b.selectedMonth)b.selectedDay=Math.min(b.selectedDay,
+G);B=(this._getFirstDayOfMonth(v,m)-n+7)%7;G=Math.ceil((B+G)/7);this.maxRows=G=q?this.maxRows>G?this.maxRows:G:G;A=this._daylightSavingAdjust(new Date(v,m,1-B));for(var R=0;R<G;R++){F+="<tr>";var S=!p?"":'<td class="ui-datepicker-week-col">'+this._get(b,"calculateWeek")(A)+"</td>";for(B=0;B<7;B++){var M=z?z.apply(b.input?b.input[0]:null,[A]):[true,""],K=A.getMonth()!=m,O=K&&!N||!M[0]||r&&A<r||u&&A>u;S+='<td class="'+((B+n+6)%7>=5?" ui-datepicker-week-end":"")+(K?" ui-datepicker-other-month":"")+(A.getTime()==
+Q.getTime()&&m==b.selectedMonth&&b._keyEvent||J.getTime()==A.getTime()&&J.getTime()==Q.getTime()?" "+this._dayOverClass:"")+(O?" "+this._unselectableClass+" ui-state-disabled":"")+(K&&!I?"":" "+M[1]+(A.getTime()==s.getTime()?" "+this._currentClass:"")+(A.getTime()==f.getTime()?" ui-datepicker-today":""))+'"'+((!K||I)&&M[2]?' title="'+M[2]+'"':"")+(O?"":' onclick="DP_jQuery_'+g+".datepicker._selectDay('#"+b.id+"',"+A.getMonth()+","+A.getFullYear()+', this);return false;"')+">"+(K&&!I?"&#xa0;":O?'<span class="ui-state-default">'+
+A.getDate()+"</span>":'<a class="ui-state-default'+(A.getTime()==f.getTime()?" ui-state-highlight":"")+(A.getTime()==s.getTime()?" ui-state-active":"")+(K?" ui-priority-secondary":"")+'" href="#">'+A.getDate()+"</a>")+"</td>";A.setDate(A.getDate()+1);A=this._daylightSavingAdjust(A)}F+=S+"</tr>"}m++;if(m>11){m=0;v++}F+="</tbody></table>"+(q?"</div>"+(k[0]>0&&L==k[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");P+=F}D+=P}D+=l+(a.browser.msie&&parseInt(a.browser.version,10)<7&&!b.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
+"");b._keyEvent=false;return D},_generateMonthYearHeader:function(b,f,j,l,o,n,k,m){var p=this._get(b,"changeMonth"),q=this._get(b,"changeYear"),s=this._get(b,"showMonthAfterYear"),r='<div class="ui-datepicker-title">',u="";if(n||!p)u+='<span class="ui-datepicker-month">'+k[f]+"</span>";else{k=l&&l.getFullYear()==j;var v=o&&o.getFullYear()==j;u+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'M');\" >";for(var w=0;w<12;w++)if((!k||w>=l.getMonth())&&
+(!v||w<=o.getMonth()))u+='<option value="'+w+'"'+(w==f?' selected="selected"':"")+">"+m[w]+"</option>";u+="</select>"}s||(r+=u+(n||!(p&&q)?"&#xa0;":""));if(!b.yearshtml){b.yearshtml="";if(n||!q)r+='<span class="ui-datepicker-year">'+j+"</span>";else{m=this._get(b,"yearRange").split(":");var x=(new Date).getFullYear();k=function(y){y=y.match(/c[+-].*/)?j+parseInt(y.substring(1),10):y.match(/[+-].*/)?x+parseInt(y,10):parseInt(y,10);return isNaN(y)?x:y};f=k(m[0]);m=Math.max(f,k(m[1]||""));f=l?Math.max(f,
+l.getFullYear()):f;m=o?Math.min(m,o.getFullYear()):m;for(b.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'Y');\" >";f<=m;f++)b.yearshtml+='<option value="'+f+'"'+(f==j?' selected="selected"':"")+">"+f+"</option>";b.yearshtml+="</select>";r+=b.yearshtml;b.yearshtml=null}}r+=this._get(b,"yearSuffix");if(s)r+=(n||!(p&&q)?"&#xa0;":"")+u;r+="</div>";return r},_adjustInstDate:function(b,f,j){var l=b.drawYear+(j=="Y"?f:0),o=b.drawMonth+
+(j=="M"?f:0);f=Math.min(b.selectedDay,this._getDaysInMonth(l,o))+(j=="D"?f:0);l=this._restrictMinMax(b,this._daylightSavingAdjust(new Date(l,o,f)));b.selectedDay=l.getDate();b.drawMonth=b.selectedMonth=l.getMonth();b.drawYear=b.selectedYear=l.getFullYear();if(j=="M"||j=="Y")this._notifyChange(b)},_restrictMinMax:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");f=j&&f<j?j:f;return f=b&&f>b?b:f},_notifyChange:function(b){var f=this._get(b,"onChangeMonthYear");if(f)f.apply(b.input?
+b.input[0]:null,[b.selectedYear,b.selectedMonth+1,b])},_getNumberOfMonths:function(b){b=this._get(b,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(b,f){return this._determineDate(b,this._get(b,f+"Date"),null)},_getDaysInMonth:function(b,f){return 32-this._daylightSavingAdjust(new Date(b,f,32)).getDate()},_getFirstDayOfMonth:function(b,f){return(new Date(b,f,1)).getDay()},_canAdjustMonth:function(b,f,j,l){var o=this._getNumberOfMonths(b);j=this._daylightSavingAdjust(new Date(j,
+l+(f<0?f:o[0]*o[1]),1));f<0&&j.setDate(this._getDaysInMonth(j.getFullYear(),j.getMonth()));return this._isInRange(b,j)},_isInRange:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");return(!j||f.getTime()>=j.getTime())&&(!b||f.getTime()<=b.getTime())},_getFormatConfig:function(b){var f=this._get(b,"shortYearCutoff");f=typeof f!="string"?f:(new Date).getFullYear()%100+parseInt(f,10);return{shortYearCutoff:f,dayNamesShort:this._get(b,"dayNamesShort"),dayNames:this._get(b,
+"dayNames"),monthNamesShort:this._get(b,"monthNamesShort"),monthNames:this._get(b,"monthNames")}},_formatDate:function(b,f,j,l){if(!f){b.currentDay=b.selectedDay;b.currentMonth=b.selectedMonth;b.currentYear=b.selectedYear}f=f?typeof f=="object"?f:this._daylightSavingAdjust(new Date(l,j,f)):this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay));return this.formatDate(this._get(b,"dateFormat"),f,this._getFormatConfig(b))}});a.fn.datepicker=function(b){if(!this.length)return this;
+if(!a.datepicker.initialized){a(document).mousedown(a.datepicker._checkExternalClick).find("body").append(a.datepicker.dpDiv);a.datepicker.initialized=true}var f=Array.prototype.slice.call(arguments,1);if(typeof b=="string"&&(b=="isDisabled"||b=="getDate"||b=="widget"))return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));if(b=="option"&&arguments.length==2&&typeof arguments[1]=="string")return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));return this.each(function(){typeof b==
+"string"?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this].concat(f)):a.datepicker._attachDatepicker(this,b)})};a.datepicker=new c;a.datepicker.initialized=false;a.datepicker.uuid=(new Date).getTime();a.datepicker.version="1.8.16";window["DP_jQuery_"+g]=a})(jQ);
+(function(a,d){var c={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},e={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},h=a.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};a.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
+position:{my:"center",at:"center",collision:"fit",using:function(g){var i=a(this).css(g).offset().top;i<0&&a(this).css("top",g.top-i)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var g=this,i=g.options,b=i.title||"&#160;",f=a.ui.dialog.getTitleId(g.element),j=(g.uiDialog=a("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
+i.dialogClass).css({zIndex:i.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(n){if(i.closeOnEscape&&!n.isDefaultPrevented()&&n.keyCode&&n.keyCode===a.ui.keyCode.ESCAPE){g.close(n);n.preventDefault()}}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(n){g.moveToTop(false,n)});g.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j);var l=(g.uiDialogTitlebar=a("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j),
+o=a('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){o.addClass("ui-state-hover")},function(){o.removeClass("ui-state-hover")}).focus(function(){o.addClass("ui-state-focus")}).blur(function(){o.removeClass("ui-state-focus")}).click(function(n){g.close(n);return false}).appendTo(l);(g.uiDialogTitlebarCloseText=a("<span></span>")).addClass("ui-icon ui-icon-closethick").text(i.closeText).appendTo(o);a("<span></span>").addClass("ui-dialog-title").attr("id",
+f).html(b).prependTo(l);if(a.isFunction(i.beforeclose)&&!a.isFunction(i.beforeClose))i.beforeClose=i.beforeclose;l.find("*").add(l).disableSelection();i.draggable&&a.fn.draggable&&g._makeDraggable();i.resizable&&a.fn.resizable&&g._makeResizable();g._createButtons(i.buttons);g._isOpen=false;a.fn.bgiframe&&j.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var g=this;g.overlay&&g.overlay.destroy();g.uiDialog.hide();g.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
+g.uiDialog.remove();g.originalTitle&&g.element.attr("title",g.originalTitle);return g},widget:function(){return this.uiDialog},close:function(g){var i=this,b,f;if(false!==i._trigger("beforeClose",g)){i.overlay&&i.overlay.destroy();i.uiDialog.unbind("keypress.ui-dialog");i._isOpen=false;if(i.options.hide)i.uiDialog.hide(i.options.hide,function(){i._trigger("close",g)});else{i.uiDialog.hide();i._trigger("close",g)}a.ui.dialog.overlay.resize();if(i.options.modal){b=0;a(".ui-dialog").each(function(){if(this!==
+i.uiDialog[0]){f=a(this).css("z-index");isNaN(f)||(b=Math.max(b,f))}});a.ui.dialog.maxZ=b}return i}},isOpen:function(){return this._isOpen},moveToTop:function(g,i){var b=this,f=b.options;if(f.modal&&!g||!f.stack&&!f.modal)return b._trigger("focus",i);if(f.zIndex>a.ui.dialog.maxZ)a.ui.dialog.maxZ=f.zIndex;if(b.overlay){a.ui.dialog.maxZ+=1;b.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)}g={scrollTop:b.element.scrollTop(),scrollLeft:b.element.scrollLeft()};a.ui.dialog.maxZ+=1;
+b.uiDialog.css("z-index",a.ui.dialog.maxZ);b.element.attr(g);b._trigger("focus",i);return b},open:function(){if(!this._isOpen){var g=this,i=g.options,b=g.uiDialog;g.overlay=i.modal?new a.ui.dialog.overlay(g):null;g._size();g._position(i.position);b.show(i.show);g.moveToTop(true);i.modal&&b.bind("keypress.ui-dialog",function(f){if(f.keyCode===a.ui.keyCode.TAB){var j=a(":tabbable",this),l=j.filter(":first");j=j.filter(":last");if(f.target===j[0]&&!f.shiftKey){l.focus(1);return false}else if(f.target===
+l[0]&&f.shiftKey){j.focus(1);return false}}});a(g.element.find(":tabbable").get().concat(b.find(".ui-dialog-buttonpane :tabbable").get().concat(b.get()))).eq(0).focus();g._isOpen=true;g._trigger("open");return g}},_createButtons:function(g){var i=this,b=false,f=a("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),j=a("<div></div>").addClass("ui-dialog-buttonset").appendTo(f);i.uiDialog.find(".ui-dialog-buttonpane").remove();typeof g==="object"&&g!==null&&a.each(g,
+function(){return!(b=true)});if(b){a.each(g,function(l,o){o=a.isFunction(o)?{click:o,text:l}:o;var n=a('<button type="button"></button>').click(function(){o.click.apply(i.element[0],arguments)}).appendTo(j);a.each(o,function(k,m){if(k!=="click")k in h?n[k](m):n.attr(k,m)});a.fn.button&&n.button()});f.appendTo(i.uiDialog)}},_makeDraggable:function(){function g(l){return{position:l.position,offset:l.offset}}var i=this,b=i.options,f=a(document),j;i.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
+handle:".ui-dialog-titlebar",containment:"document",start:function(l,o){j=b.height==="auto"?"auto":a(this).height();a(this).height(a(this).height()).addClass("ui-dialog-dragging");i._trigger("dragStart",l,g(o))},drag:function(l,o){i._trigger("drag",l,g(o))},stop:function(l,o){b.position=[o.position.left-f.scrollLeft(),o.position.top-f.scrollTop()];a(this).removeClass("ui-dialog-dragging").height(j);i._trigger("dragStop",l,g(o));a.ui.dialog.overlay.resize()}})},_makeResizable:function(g){function i(l){return{originalPosition:l.originalPosition,
+originalSize:l.originalSize,position:l.position,size:l.size}}g=g===d?this.options.resizable:g;var b=this,f=b.options,j=b.uiDialog.css("position");g=typeof g==="string"?g:"n,e,s,w,se,sw,ne,nw";b.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:b.element,maxWidth:f.maxWidth,maxHeight:f.maxHeight,minWidth:f.minWidth,minHeight:b._minHeight(),handles:g,start:function(l,o){a(this).addClass("ui-dialog-resizing");b._trigger("resizeStart",l,i(o))},resize:function(l,o){b._trigger("resize",
+l,i(o))},stop:function(l,o){a(this).removeClass("ui-dialog-resizing");f.height=a(this).height();f.width=a(this).width();b._trigger("resizeStop",l,i(o));a.ui.dialog.overlay.resize()}}).css("position",j).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var g=this.options;return g.height==="auto"?g.minHeight:Math.min(g.minHeight,g.height)},_position:function(g){var i=[],b=[0,0],f;if(g){if(typeof g==="string"||typeof g==="object"&&"0"in g){i=g.split?g.split(" "):
+[g[0],g[1]];if(i.length===1)i[1]=i[0];a.each(["left","top"],function(j,l){if(+i[j]===i[j]){b[j]=i[j];i[j]=l}});g={my:i.join(" "),at:i.join(" "),offset:b.join(" ")}}g=a.extend({},a.ui.dialog.prototype.options.position,g)}else g=a.ui.dialog.prototype.options.position;(f=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(a.extend({of:window},g));f||this.uiDialog.hide()},_setOptions:function(g){var i=this,b={},f=false;a.each(g,function(j,l){i._setOption(j,l);
+if(j in c)f=true;if(j in e)b[j]=l});f&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",b)},_setOption:function(g,i){var b=this,f=b.uiDialog;switch(g){case "beforeclose":g="beforeClose";break;case "buttons":b._createButtons(i);break;case "closeText":b.uiDialogTitlebarCloseText.text(""+i);break;case "dialogClass":f.removeClass(b.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+i);break;case "disabled":i?f.addClass("ui-dialog-disabled"):
+f.removeClass("ui-dialog-disabled");break;case "draggable":var j=f.is(":data(draggable)");j&&!i&&f.draggable("destroy");!j&&i&&b._makeDraggable();break;case "position":b._position(i);break;case "resizable":(j=f.is(":data(resizable)"))&&!i&&f.resizable("destroy");j&&typeof i==="string"&&f.resizable("option","handles",i);!j&&i!==false&&b._makeResizable(i);break;case "title":a(".ui-dialog-title",b.uiDialogTitlebar).html(""+(i||"&#160;"));break}a.Widget.prototype._setOption.apply(b,arguments)},_size:function(){var g=
+this.options,i,b,f=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(g.minWidth>g.width)g.width=g.minWidth;i=this.uiDialog.css({height:"auto",width:g.width}).height();b=Math.max(0,g.minHeight-i);if(g.height==="auto")if(a.support.minHeight)this.element.css({minHeight:b,height:"auto"});else{this.uiDialog.show();g=this.element.css("height","auto").height();f||this.uiDialog.hide();this.element.height(Math.max(g,b))}else this.element.height(Math.max(g.height-
+i,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});a.extend(a.ui.dialog,{version:"1.8.16",uuid:0,maxZ:0,getTitleId:function(g){g=g.attr("id");if(!g){this.uuid+=1;g=this.uuid}return"ui-dialog-title-"+g},overlay:function(g){this.$el=a.ui.dialog.overlay.create(g)}});a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(g){return g+".dialog-overlay"}).join(" "),
+create:function(g){if(this.instances.length===0){setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()<a.ui.dialog.overlay.maxZ)return false})},1);a(document).bind("keydown.dialog-overlay",function(b){if(g.options.closeOnEscape&&!b.isDefaultPrevented()&&b.keyCode&&b.keyCode===a.ui.keyCode.ESCAPE){g.close(b);b.preventDefault()}});a(window).bind("resize.dialog-overlay",a.ui.dialog.overlay.resize)}var i=(this.oldInstances.pop()||
+a("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});a.fn.bgiframe&&i.bgiframe();this.instances.push(i);return i},destroy:function(g){var i=a.inArray(g,this.instances);i!=-1&&this.oldInstances.push(this.instances.splice(i,1)[0]);this.instances.length===0&&a([document,window]).unbind(".dialog-overlay");g.remove();var b=0;a.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var g,i;if(a.browser.msie&&
+a.browser.version<7){g=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);i=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return g<i?a(window).height()+"px":g+"px"}else return a(document).height()+"px"},width:function(){var g,i;if(a.browser.msie){g=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);i=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return g<i?a(window).width()+"px":g+"px"}else return a(document).width()+
+"px"},resize:function(){var g=a([]);a.each(a.ui.dialog.overlay.instances,function(){g=g.add(this)});g.css({width:0,height:0}).css({width:a.ui.dialog.overlay.width(),height:a.ui.dialog.overlay.height()})}});a.extend(a.ui.dialog.overlay.prototype,{destroy:function(){a.ui.dialog.overlay.destroy(this.$el)}})})(jQ);
+(function(a){a.ui=a.ui||{};var d=/left|center|right/,c=/top|center|bottom/,e=a.fn.position,h=a.fn.offset;a.fn.position=function(g){if(!g||!g.of)return e.apply(this,arguments);g=a.extend({},g);var i=a(g.of),b=i[0],f=(g.collision||"flip").split(" "),j=g.offset?g.offset.split(" "):[0,0],l,o,n;if(b.nodeType===9){l=i.width();o=i.height();n={top:0,left:0}}else if(b.setTimeout){l=i.width();o=i.height();n={top:i.scrollTop(),left:i.scrollLeft()}}else if(b.preventDefault){g.at="left top";l=o=0;n={top:g.of.pageY,
+left:g.of.pageX}}else{l=i.outerWidth();o=i.outerHeight();n=i.offset()}a.each(["my","at"],function(){var k=(g[this]||"").split(" ");if(k.length===1)k=d.test(k[0])?k.concat(["center"]):c.test(k[0])?["center"].concat(k):["center","center"];k[0]=d.test(k[0])?k[0]:"center";k[1]=c.test(k[1])?k[1]:"center";g[this]=k});if(f.length===1)f[1]=f[0];j[0]=parseInt(j[0],10)||0;if(j.length===1)j[1]=j[0];j[1]=parseInt(j[1],10)||0;if(g.at[0]==="right")n.left+=l;else if(g.at[0]==="center")n.left+=l/2;if(g.at[1]==="bottom")n.top+=
+o;else if(g.at[1]==="center")n.top+=o/2;n.left+=j[0];n.top+=j[1];return this.each(function(){var k=a(this),m=k.outerWidth(),p=k.outerHeight(),q=parseInt(a.curCSS(this,"marginLeft",true))||0,s=parseInt(a.curCSS(this,"marginTop",true))||0,r=m+q+(parseInt(a.curCSS(this,"marginRight",true))||0),u=p+s+(parseInt(a.curCSS(this,"marginBottom",true))||0),v=a.extend({},n),w;if(g.my[0]==="right")v.left-=m;else if(g.my[0]==="center")v.left-=m/2;if(g.my[1]==="bottom")v.top-=p;else if(g.my[1]==="center")v.top-=
+p/2;v.left=Math.round(v.left);v.top=Math.round(v.top);w={left:v.left-q,top:v.top-s};a.each(["left","top"],function(x,y){a.ui.position[f[x]]&&a.ui.position[f[x]][y](v,{targetWidth:l,targetHeight:o,elemWidth:m,elemHeight:p,collisionPosition:w,collisionWidth:r,collisionHeight:u,offset:j,my:g.my,at:g.at})});a.fn.bgiframe&&k.bgiframe();k.offset(a.extend(v,{using:g.using}))})};a.ui.position={fit:{left:function(g,i){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();g.left=
+b>0?g.left-b:Math.max(g.left-i.collisionPosition.left,g.left)},top:function(g,i){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();g.top=b>0?g.top-b:Math.max(g.top-i.collisionPosition.top,g.top)}},flip:{left:function(g,i){if(i.at[0]!=="center"){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();var f=i.my[0]==="left"?-i.elemWidth:i.my[0]==="right"?i.elemWidth:0,j=i.at[0]==="left"?i.targetWidth:-i.targetWidth,l=-2*i.offset[0];g.left+=
+i.collisionPosition.left<0?f+j+l:b>0?f+j+l:0}},top:function(g,i){if(i.at[1]!=="center"){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();var f=i.my[1]==="top"?-i.elemHeight:i.my[1]==="bottom"?i.elemHeight:0,j=i.at[1]==="top"?i.targetHeight:-i.targetHeight,l=-2*i.offset[1];g.top+=i.collisionPosition.top<0?f+j+l:b>0?f+j+l:0}}}};if(!a.offset.setOffset){a.offset.setOffset=function(g,i){if(/static/.test(a.curCSS(g,"position")))g.style.position="relative";var b=a(g),
+f=b.offset(),j=parseInt(a.curCSS(g,"top",true),10)||0,l=parseInt(a.curCSS(g,"left",true),10)||0;f={top:i.top-f.top+j,left:i.left-f.left+l};"using"in i?i.using.call(g,f):b.css(f)};a.fn.offset=function(g){var i=this[0];if(!i||!i.ownerDocument)return null;if(g)return this.each(function(){a.offset.setOffset(this,g)});return h.call(this)}}})(jQ);
+(function(a,d){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();a.Widget.prototype.destroy.apply(this,arguments)},value:function(c){if(c===d)return this._value();this._setOption("value",c);return this},_setOption:function(c,e){if(c==="value"){this.options.value=e;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var c=this.options.value;if(typeof c!=="number")c=0;return Math.min(this.options.max,Math.max(this.min,c))},_percentage:function(){return 100*
+this._value()/this.options.max},_refreshValue:function(){var c=this.value(),e=this._percentage();if(this.oldValue!==c){this.oldValue=c;this._trigger("change")}this.valueDiv.toggle(c>this.min).toggleClass("ui-corner-right",c===this.options.max).width(e.toFixed(0)+"%");this.element.attr("aria-valuenow",c)}});a.extend(a.ui.progressbar,{version:"1.8.16"})})(jQ);
+(function(a){a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var d=this,c=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),h=c.values&&c.values.length||1,g=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(c.disabled?" ui-slider-disabled ui-disabled":""));this.range=a([]);if(c.range){if(c.range===true){if(!c.values)c.values=[this._valueMin(),this._valueMin()];if(c.values.length&&c.values.length!==2)c.values=[c.values[0],c.values[0]]}this.range=a("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(c.range==="min"||c.range==="max"?" ui-slider-range-"+c.range:""))}for(var i=e.length;i<h;i+=1)g.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
+this.handles=e.add(a(g.join("")).appendTo(d.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(b){b.preventDefault()}).hover(function(){c.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){if(c.disabled)a(this).blur();else{a(".ui-slider .ui-state-focus").removeClass("ui-state-focus");a(this).addClass("ui-state-focus")}}).blur(function(){a(this).removeClass("ui-state-focus")});this.handles.each(function(b){a(this).data("index.ui-slider-handle",
+b)});this.handles.keydown(function(b){var f=true,j=a(this).data("index.ui-slider-handle"),l,o,n;if(!d.options.disabled){switch(b.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:f=false;if(!d._keySliding){d._keySliding=true;a(this).addClass("ui-state-active");l=d._start(b,j);if(l===false)return}break}n=d.options.step;l=d.options.values&&d.options.values.length?
+(o=d.values(j)):(o=d.value());switch(b.keyCode){case a.ui.keyCode.HOME:o=d._valueMin();break;case a.ui.keyCode.END:o=d._valueMax();break;case a.ui.keyCode.PAGE_UP:o=d._trimAlignValue(l+(d._valueMax()-d._valueMin())/5);break;case a.ui.keyCode.PAGE_DOWN:o=d._trimAlignValue(l-(d._valueMax()-d._valueMin())/5);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(l===d._valueMax())return;o=d._trimAlignValue(l+n);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(l===d._valueMin())return;o=d._trimAlignValue(l-
+n);break}d._slide(b,j,o);return f}}).keyup(function(b){var f=a(this).data("index.ui-slider-handle");if(d._keySliding){d._keySliding=false;d._stop(b,f);d._change(b,f);a(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
+return this},_mouseCapture:function(d){var c=this.options,e,h,g,i,b;if(c.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();e=this._normValueFromMouse({x:d.pageX,y:d.pageY});h=this._valueMax()-this._valueMin()+1;i=this;this.handles.each(function(f){var j=Math.abs(e-i.values(f));if(h>j){h=j;g=a(this);b=f}});if(c.range===true&&this.values(1)===c.min){b+=1;g=a(this.handles[b])}if(this._start(d,b)===false)return false;
+this._mouseSliding=true;i._handleIndex=b;g.addClass("ui-state-active").focus();c=g.offset();this._clickOffset=!a(d.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:d.pageX-c.left-g.width()/2,top:d.pageY-c.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(d,b,e);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(d){var c=
+this._normValueFromMouse({x:d.pageX,y:d.pageY});this._slide(d,this._handleIndex,c);return false},_mouseStop:function(d){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(d,this._handleIndex);this._change(d,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(d){var c;if(this.orientation==="horizontal"){c=
+this.elementSize.width;d=d.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{c=this.elementSize.height;d=d.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}c=d/c;if(c>1)c=1;if(c<0)c=0;if(this.orientation==="vertical")c=1-c;d=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+c*d)},_start:function(d,c){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);
+e.values=this.values()}return this._trigger("start",d,e)},_slide:function(d,c,e){var h;if(this.options.values&&this.options.values.length){h=this.values(c?0:1);if(this.options.values.length===2&&this.options.range===true&&(c===0&&e>h||c===1&&e<h))e=h;if(e!==this.values(c)){h=this.values();h[c]=e;d=this._trigger("slide",d,{handle:this.handles[c],value:e,values:h});this.values(c?0:1);d!==false&&this.values(c,e,true)}}else if(e!==this.value()){d=this._trigger("slide",d,{handle:this.handles[c],value:e});
+d!==false&&this.value(e)}},_stop:function(d,c){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);e.values=this.values()}this._trigger("stop",d,e)},_change:function(d,c){if(!this._keySliding&&!this._mouseSliding){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);e.values=this.values()}this._trigger("change",d,e)}},value:function(d){if(arguments.length){this.options.value=
+this._trimAlignValue(d);this._refreshValue();this._change(null,0)}else return this._value()},values:function(d,c){var e,h,g;if(arguments.length>1){this.options.values[d]=this._trimAlignValue(c);this._refreshValue();this._change(null,d)}else if(arguments.length)if(a.isArray(arguments[0])){e=this.options.values;h=arguments[0];for(g=0;g<e.length;g+=1){e[g]=this._trimAlignValue(h[g]);this._change(null,g)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(d):
+this.value();else return this._values()},_setOption:function(d,c){var e,h=0;if(a.isArray(this.options.values))h=this.options.values.length;a.Widget.prototype._setOption.apply(this,arguments);switch(d){case "disabled":if(c){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(e=0;e<h;e+=1)this._change(null,e);this._animateOff=false;break}},_value:function(){var d=this.options.value;return d=this._trimAlignValue(d)},_values:function(d){var c,e;if(arguments.length){c=this.options.values[d];
+return c=this._trimAlignValue(c)}else{c=this.options.values.slice();for(e=0;e<c.length;e+=1)c[e]=this._trimAlignValue(c[e]);return c}},_trimAlignValue:function(d){if(d<=this._valueMin())return this._valueMin();if(d>=this._valueMax())return this._valueMax();var c=this.options.step>0?this.options.step:1,e=(d-this._valueMin())%c;d=d-e;if(Math.abs(e)*2>=c)d+=e>0?c:-c;return parseFloat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var d=
+this.options.range,c=this.options,e=this,h=!this._animateOff?c.animate:false,g,i={},b,f,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(o){g=(e.values(o)-e._valueMin())/(e._valueMax()-e._valueMin())*100;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";a(this).stop(1,1)[h?"animate":"css"](i,c.animate);if(e.options.range===true)if(e.orientation==="horizontal"){if(o===0)e.range.stop(1,1)[h?"animate":"css"]({left:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({width:g-
+b+"%"},{queue:false,duration:c.animate})}else{if(o===0)e.range.stop(1,1)[h?"animate":"css"]({bottom:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({height:g-b+"%"},{queue:false,duration:c.animate})}b=g});else{f=this.value();j=this._valueMin();l=this._valueMax();g=l!==j?(f-j)/(l-j)*100:0;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";this.handle.stop(1,1)[h?"animate":"css"](i,c.animate);if(d==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[h?"animate":"css"]({width:g+"%"},
+c.animate);if(d==="max"&&this.orientation==="horizontal")this.range[h?"animate":"css"]({width:100-g+"%"},{queue:false,duration:c.animate});if(d==="min"&&this.orientation==="vertical")this.range.stop(1,1)[h?"animate":"css"]({height:g+"%"},c.animate);if(d==="max"&&this.orientation==="vertical")this.range[h?"animate":"css"]({height:100-g+"%"},{queue:false,duration:c.animate})}}});a.extend(a.ui.slider,{version:"1.8.16"})})(jQ);
+(function(a,d){function c(){return++h}function e(){return++g}var h=0,g=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='¤href¤'><span>¤label¤</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(i,b){if(i=="selected")this.options.collapsible&&
+b==this.options.selected||this.select(b);else{this.options[i]=b;this._tabify()}},_tabId:function(i){return i.title&&i.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+c()},_sanitizeSelector:function(i){return i.replace(/:/g,"\\:")},_cookie:function(){var i=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+e());return a.cookie.apply(null,[i].concat(a.makeArray(arguments)))},_ui:function(i,b){return{tab:i,panel:b,index:this.anchors.index(i)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var i=
+a(this);i.html(i.data("label.tabs")).removeData("label.tabs")})},_tabify:function(i){function b(r,u){r.css("display","");!a.support.opacity&&u.opacity&&r[0].style.removeAttribute("filter")}var f=this,j=this.options,l=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=a(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return a("a",this)[0]});this.panels=a([]);this.anchors.each(function(r,u){var v=a(u).attr("href"),w=v.split("#")[0],x;if(w&&(w===location.toString().split("#")[0]||
+(x=a("base")[0])&&w===x.href)){v=u.hash;u.href=v}if(l.test(v))f.panels=f.panels.add(f.element.find(f._sanitizeSelector(v)));else if(v&&v!=="#"){a.data(u,"href.tabs",v);a.data(u,"load.tabs",v.replace(/#.*$/,""));v=f._tabId(u);u.href="#"+v;u=f.element.find("#"+v);if(!u.length){u=a(j.panelTemplate).attr("id",v).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(f.panels[r-1]||f.list);u.data("destroy.tabs",true)}f.panels=f.panels.add(u)}else j.disabled.push(r)});if(i){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(j.selected===d){location.hash&&this.anchors.each(function(r,u){if(u.hash==location.hash){j.selected=r;return false}});if(typeof j.selected!=="number"&&j.cookie)j.selected=parseInt(f._cookie(),10);if(typeof j.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)j.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));j.selected=j.selected||(this.lis.length?0:-1)}else if(j.selected===null)j.selected=-1;j.selected=j.selected>=0&&this.anchors[j.selected]||j.selected<0?j.selected:0;j.disabled=a.unique(j.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(r){return f.lis.index(r)}))).sort();a.inArray(j.selected,j.disabled)!=-1&&j.disabled.splice(a.inArray(j.selected,j.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(j.selected>=0&&this.anchors.length){f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(j.selected).addClass("ui-tabs-selected ui-state-active");f.element.queue("tabs",function(){f._trigger("show",null,f._ui(f.anchors[j.selected],f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash))[0]))});this.load(j.selected)}a(window).bind("unload",function(){f.lis.add(f.anchors).unbind(".tabs");f.lis=f.anchors=f.panels=null})}else j.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[j.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");j.cookie&&this._cookie(j.selected,j.cookie);i=0;for(var o;o=this.lis[i];i++)a(o)[a.inArray(i,j.disabled)!=-1&&!a(o).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");j.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(j.event!=="mouseover"){var n=function(r,u){u.is(":not(.ui-state-disabled)")&&u.addClass("ui-state-"+r)},k=function(r,u){u.removeClass("ui-state-"+
+r)};this.lis.bind("mouseover.tabs",function(){n("hover",a(this))});this.lis.bind("mouseout.tabs",function(){k("hover",a(this))});this.anchors.bind("focus.tabs",function(){n("focus",a(this).closest("li"))});this.anchors.bind("blur.tabs",function(){k("focus",a(this).closest("li"))})}var m,p;if(j.fx)if(a.isArray(j.fx)){m=j.fx[0];p=j.fx[1]}else m=p=j.fx;var q=p?function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.hide().removeClass("ui-tabs-hide").animate(p,p.duration||"normal",
+function(){b(u,p);f._trigger("show",null,f._ui(r,u[0]))})}:function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.removeClass("ui-tabs-hide");f._trigger("show",null,f._ui(r,u[0]))},s=m?function(r,u){u.animate(m,m.duration||"normal",function(){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");b(u,m);f.element.dequeue("tabs")})}:function(r,u){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");f.element.dequeue("tabs")};
+this.anchors.bind(j.event+".tabs",function(){var r=this,u=a(r).closest("li"),v=f.panels.filter(":not(.ui-tabs-hide)"),w=f.element.find(f._sanitizeSelector(r.hash));if(u.hasClass("ui-tabs-selected")&&!j.collapsible||u.hasClass("ui-state-disabled")||u.hasClass("ui-state-processing")||f.panels.filter(":animated").length||f._trigger("select",null,f._ui(this,w[0]))===false){this.blur();return false}j.selected=f.anchors.index(this);f.abort();if(j.collapsible)if(u.hasClass("ui-tabs-selected")){j.selected=
+-1;j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){s(r,v)}).dequeue("tabs");this.blur();return false}else if(!v.length){j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this));this.blur();return false}j.cookie&&f._cookie(j.selected,j.cookie);if(w.length){v.length&&f.element.queue("tabs",function(){s(r,v)});f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this))}else throw"jQ UI Tabs: Mismatching fragment identifier.";
+a.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(i){if(typeof i=="string")i=this.anchors.index(this.anchors.filter("[href$="+i+"]"));return i},destroy:function(){var i=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var b=
+a.data(this,"href.tabs");if(b)this.href=b;var f=a(this).unbind(".tabs");a.each(["href","load","cache"],function(j,l){f.removeData(l+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});i.cookie&&this._cookie(null,i.cookie);return this},add:function(i,
+b,f){if(f===d)f=this.anchors.length;var j=this,l=this.options;b=a(l.tabTemplate.replace(/¤href¤/g,i).replace(/¤label¤/g,b));i=!i.indexOf("#")?i.replace("#",""):this._tabId(a("a",b)[0]);b.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var o=j.element.find("#"+i);o.length||(o=a(l.panelTemplate).attr("id",i).data("destroy.tabs",true));o.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(f>=this.lis.length){b.appendTo(this.list);o.appendTo(this.list[0].parentNode)}else{b.insertBefore(this.lis[f]);
+o.insertBefore(this.panels[f])}l.disabled=a.map(l.disabled,function(n){return n>=f?++n:n});this._tabify();if(this.anchors.length==1){l.selected=0;b.addClass("ui-tabs-selected ui-state-active");o.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){j._trigger("show",null,j._ui(j.anchors[0],j.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[f],this.panels[f]));return this},remove:function(i){i=this._getIndex(i);var b=this.options,f=this.lis.eq(i).remove(),j=this.panels.eq(i).remove();
+if(f.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(i+(i+1<this.anchors.length?1:-1));b.disabled=a.map(a.grep(b.disabled,function(l){return l!=i}),function(l){return l>=i?--l:l});this._tabify();this._trigger("remove",null,this._ui(f.find("a")[0],j[0]));return this},enable:function(i){i=this._getIndex(i);var b=this.options;if(a.inArray(i,b.disabled)!=-1){this.lis.eq(i).removeClass("ui-state-disabled");b.disabled=a.grep(b.disabled,function(f){return f!=i});this._trigger("enable",null,
+this._ui(this.anchors[i],this.panels[i]));return this}},disable:function(i){i=this._getIndex(i);var b=this.options;if(i!=b.selected){this.lis.eq(i).addClass("ui-state-disabled");b.disabled.push(i);b.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[i],this.panels[i]))}return this},select:function(i){i=this._getIndex(i);if(i==-1)if(this.options.collapsible&&this.options.selected!=-1)i=this.options.selected;else return this;this.anchors.eq(i).trigger(this.options.event+".tabs");return this},
+load:function(i){i=this._getIndex(i);var b=this,f=this.options,j=this.anchors.eq(i)[0],l=a.data(j,"load.tabs");this.abort();if(!l||this.element.queue("tabs").length!==0&&a.data(j,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(i).addClass("ui-state-processing");if(f.spinner){var o=a("span",j);o.data("label.tabs",o.html()).html(f.spinner)}this.xhr=a.ajax(a.extend({},f.ajaxOptions,{url:l,success:function(n,k){b.element.find(b._sanitizeSelector(j.hash)).html(n);b._cleanup();f.cache&&a.data(j,
+"cache.tabs",true);b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.success(n,k)}catch(m){}},error:function(n,k){b._cleanup();b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.error(n,k,i,j)}catch(m){}}}));b.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(i,b){this.anchors.eq(i).removeData("cache.tabs").data("load.tabs",b);return this},length:function(){return this.anchors.length}});a.extend(a.ui.tabs,{version:"1.8.16"});a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(i,b){var f=this,j=this.options,l=f._rotate||(f._rotate=function(o){clearTimeout(f.rotation);f.rotation=setTimeout(function(){var n=j.selected;f.select(++n<f.anchors.length?n:0)},i);o&&o.stopPropagation()});b=f._unrotate||(f._unrotate=!b?function(o){o.clientX&&
+f.rotate(null)}:function(){t=j.selected;l()});if(i){this.element.bind("tabsshow",l);this.anchors.bind(j.event+".tabs",b);l()}else{clearTimeout(f.rotation);this.element.unbind("tabsshow",l);this.anchors.unbind(j.event+".tabs",b);delete this._rotate;delete this._unrotate}return this}})})(jQ);
diff --git a/web/imcms/lang/scripts/imcms_jquery.textarea.js b/web/imcms/lang/scripts/imcms_jquery.textarea.js
new file mode 100644
index 0000000000..6caff2e59e
--- /dev/null
+++ b/web/imcms/lang/scripts/imcms_jquery.textarea.js
@@ -0,0 +1,267 @@
+/*
+ *	Tabby jQuery plugin version 0.12
+ *
+ *	Ted Devito - http://teddevito.com/demos/textarea.html
+ *
+ *	Copyright (c) 2009 Ted Devito
+ *	 
+ *	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following 
+ *	conditions are met:
+ *	
+ *		1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ *		2. 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.
+ *		3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written 
+ *			permission. 
+ *	 
+ *	THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
+ *
+ */
+ 
+// create closure
+
+(function($) {
+ 
+	// plugin definition
+
+	$.fn.tabby = function(options) {
+		//debug(this);
+		// build main options before element iteration
+		var opts = $.extend({}, $.fn.tabby.defaults, options);
+		var pressed = $.fn.tabby.pressed; 
+		
+		// iterate and reformat each matched element
+		return this.each(function() {
+			$this = $(this);
+			
+			// build element specific options
+			var options = $.meta ? $.extend({}, opts, $this.data()) : opts;
+			
+			$this.bind('keydown',function (e) {
+				var kc = $.fn.tabby.catch_kc(e);
+				if (16 == kc) pressed.shft = true;
+				/*
+				because both CTRL+TAB and ALT+TAB default to an event (changing tab/window) that 
+				will prevent js from capturing the keyup event, we'll set a timer on releasing them.
+				*/
+				if (17 == kc) {pressed.ctrl = true;	setTimeout("$.fn.tabby.pressed.ctrl = false;",1000);}
+				if (18 == kc) {pressed.alt = true; 	setTimeout("$.fn.tabby.pressed.alt = false;",1000);}
+					
+				if (9 == kc && !pressed.ctrl && !pressed.alt) {
+					e.preventDefault; // does not work in O9.63 ??
+					pressed.last = kc;	setTimeout("$.fn.tabby.pressed.last = null;",0);
+					process_keypress ($(e.target).get(0), pressed.shft, options);
+					return false;
+				}
+				
+			}).bind('keyup',function (e) {
+				if (16 == $.fn.tabby.catch_kc(e)) pressed.shft = false;
+			}).bind('blur',function (e) { // workaround for Opera -- http://www.webdeveloper.com/forum/showthread.php?p=806588
+				if (9 == pressed.last) $(e.target).one('focus',function (e) {pressed.last = null;}).get(0).focus();
+			});
+		
+		});
+	};
+	
+	// define and expose any extra methods
+	$.fn.tabby.catch_kc = function(e) { return e.keyCode ? e.keyCode : e.charCode ? e.charCode : e.which; };
+	$.fn.tabby.pressed = {shft : false, ctrl : false, alt : false, last: null};
+	
+	// private function for debugging
+	function debug($obj) {
+		if (window.console && window.console.log)
+		window.console.log('textarea count: ' + $obj.size());
+	};
+
+	function process_keypress (o,shft,options) {
+		var scrollTo = o.scrollTop;
+		//var tabString = String.fromCharCode(9);
+		
+		// gecko; o.setSelectionRange is only available when the text box has focus
+		if (o.setSelectionRange) gecko_tab (o, shft, options);
+		
+		// ie; document.selection is always available
+		else if (document.selection) ie_tab (o, shft, options);
+		
+		o.scrollTop = scrollTo;
+	}
+	
+	// plugin defaults
+	$.fn.tabby.defaults = {tabString : String.fromCharCode(9)};
+	
+	function gecko_tab (o, shft, options) {
+		var ss = o.selectionStart;
+		var es = o.selectionEnd;	
+				
+		// when there's no selection and we're just working with the caret, we'll add/remove the tabs at the caret, providing more control
+		if(ss == es) {
+			// SHIFT+TAB
+			if (shft) {
+				// check to the left of the caret first
+				if ("\t" == o.value.substring(ss-options.tabString.length, ss)) {
+					o.value = o.value.substring(0, ss-options.tabString.length) + o.value.substring(ss); // put it back together omitting one character to the left
+					o.focus();
+					o.setSelectionRange(ss - options.tabString.length, ss - options.tabString.length);
+				} 
+				// then check to the right of the caret
+				else if ("\t" == o.value.substring(ss, ss + options.tabString.length)) {
+					o.value = o.value.substring(0, ss) + o.value.substring(ss + options.tabString.length); // put it back together omitting one character to the right
+					o.focus();
+					o.setSelectionRange(ss,ss);
+				}
+			}
+			// TAB
+			else {			
+				o.value = o.value.substring(0, ss) + options.tabString + o.value.substring(ss);
+				o.focus();
+	    		o.setSelectionRange(ss + options.tabString.length, ss + options.tabString.length);
+			}
+		} 
+		// selections will always add/remove tabs from the start of the line
+		else {
+			// split the textarea up into lines and figure out which lines are included in the selection
+			var lines = o.value.split("\n");
+			var indices = new Array();
+			var sl = 0; // start of the line
+			var el = 0; // end of the line
+			var sel = false;
+			for (var i in lines) {
+				el = sl + lines[i].length;
+				indices.push({start: sl, end: el, selected: (sl <= ss && el > ss) || (el >= es && sl < es) || (sl > ss && el < es)});
+				sl = el + 1;// for "\n"
+			}
+			
+			// walk through the array of lines (indices) and add tabs where appropriate						
+			var modifier = 0;
+			for (var i in indices) {
+				if (indices[i].selected) {
+					var pos = indices[i].start + modifier; // adjust for tabs already inserted/removed
+					// SHIFT+TAB
+					if (shft && options.tabString == o.value.substring(pos,pos+options.tabString.length)) { // only SHIFT+TAB if there's a tab at the start of the line
+						o.value = o.value.substring(0,pos) + o.value.substring(pos + options.tabString.length); // omit the tabstring to the right
+						modifier -= options.tabString.length;
+					}
+					// TAB
+					else if (!shft) {
+						o.value = o.value.substring(0,pos) + options.tabString + o.value.substring(pos); // insert the tabstring
+						modifier += options.tabString.length;
+					}
+				}
+			}
+			o.focus();
+			var ns = ss + ((modifier > 0) ? options.tabString.length : (modifier < 0) ? -options.tabString.length : 0);
+			var ne = es + modifier;
+			o.setSelectionRange(ns,ne);
+		}
+	}
+	
+	function ie_tab (o, shft, options) {
+		var range = document.selection.createRange();
+		
+		if (o == range.parentElement()) {
+			// when there's no selection and we're just working with the caret, we'll add/remove the tabs at the caret, providing more control
+			if ('' == range.text) {
+				// SHIFT+TAB
+				if (shft) {
+					var bookmark = range.getBookmark();
+					//first try to the left by moving opening up our empty range to the left
+				    range.moveStart('character', -options.tabString.length);
+				    if (options.tabString == range.text) {
+				    	range.text = '';
+				    } else {
+				    	// if that didn't work then reset the range and try opening it to the right
+				    	range.moveToBookmark(bookmark);
+				    	range.moveEnd('character', options.tabString.length);
+				    	if (options.tabString == range.text) 
+				    		range.text = '';
+				    }
+				    // move the pointer to the start of them empty range and select it
+				    range.collapse(true);
+					range.select();
+				}
+				
+				else {
+					// very simple here. just insert the tab into the range and put the pointer at the end
+					range.text = options.tabString; 
+					range.collapse(false);
+					range.select();
+				}
+			}
+			// selections will always add/remove tabs from the start of the line
+			else {
+			
+				var selection_text = range.text;
+				var selection_len = selection_text.length;
+				var selection_arr = selection_text.split("\r\n");
+				
+				var before_range = document.body.createTextRange();
+				before_range.moveToElementText(o);
+				before_range.setEndPoint("EndToStart", range);
+				var before_text = before_range.text;
+				var before_arr = before_text.split("\r\n");
+				var before_len = before_text.length; // - before_arr.length + 1;
+				
+				var after_range = document.body.createTextRange();
+				after_range.moveToElementText(o);
+				after_range.setEndPoint("StartToEnd", range);
+				var after_text = after_range.text; // we can accurately calculate distance to the end because we're not worried about MSIE trimming a \r\n
+				
+				var end_range = document.body.createTextRange();
+				end_range.moveToElementText(o);
+				end_range.setEndPoint("StartToEnd", before_range);
+				var end_text = end_range.text; // we can accurately calculate distance to the end because we're not worried about MSIE trimming a \r\n
+								
+				var check_html = $(o).html();
+				$("#r3").text(before_len + " + " + selection_len + " + " + after_text.length + " = " + check_html.length);				
+				if((before_len + end_text.length) < check_html.length) {
+					before_arr.push("");
+					before_len += 2; // for the \r\n that was trimmed	
+					if (shft && options.tabString == selection_arr[0].substring(0,options.tabString.length))
+						selection_arr[0] = selection_arr[0].substring(options.tabString.length);
+					else if (!shft) selection_arr[0] = options.tabString + selection_arr[0];	
+				} else {
+					if (shft && options.tabString == before_arr[before_arr.length-1].substring(0,options.tabString.length)) 
+						before_arr[before_arr.length-1] = before_arr[before_arr.length-1].substring(options.tabString.length);
+					else if (!shft) before_arr[before_arr.length-1] = options.tabString + before_arr[before_arr.length-1];
+				}
+				
+				for (var i = 1; i < selection_arr.length; i++) {
+					if (shft && options.tabString == selection_arr[i].substring(0,options.tabString.length))
+						selection_arr[i] = selection_arr[i].substring(options.tabString.length);
+					else if (!shft) selection_arr[i] = options.tabString + selection_arr[i];
+				}
+				
+				if (1 == before_arr.length && 0 == before_len) {
+					if (shft && options.tabString == selection_arr[0].substring(0,options.tabString.length))
+						selection_arr[0] = selection_arr[0].substring(options.tabString.length);
+					else if (!shft) selection_arr[0] = options.tabString + selection_arr[0];
+				}
+
+				if ((before_len + selection_len + after_text.length) < check_html.length) {
+					selection_arr.push("");
+					selection_len += 2; // for the \r\n that was trimmed
+				}
+				
+				before_range.text = before_arr.join("\r\n");
+				range.text = selection_arr.join("\r\n");
+				
+				var new_range = document.body.createTextRange();
+				new_range.moveToElementText(o);
+				
+				if (0 < before_len)	new_range.setEndPoint("StartToEnd", before_range);
+				else new_range.setEndPoint("StartToStart", before_range);
+				new_range.setEndPoint("EndToEnd", range);
+				
+				new_range.select();
+				
+			} 
+		}
+	}
+
+// end of closure
+})(jQ);
diff --git a/web/imcms/lang/scripts/imcms_jquery_1.7.1.js b/web/imcms/lang/scripts/imcms_jquery_1.7.1.js
new file mode 100644
index 0000000000..df7c082fc0
--- /dev/null
+++ b/web/imcms/lang/scripts/imcms_jquery_1.7.1.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQ,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQ===e&&(a.jQ=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQ"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.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){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQ\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQ=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQ&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/web/imcms/loggedOut.jsp b/web/imcms/loggedOut.jsp
new file mode 100644
index 0000000000..98b7ea655d
--- /dev/null
+++ b/web/imcms/loggedOut.jsp
@@ -0,0 +1 @@
+<% request.getRequestDispatcher( "/servlet/StartDoc" ).forward( request, response ); %>
\ No newline at end of file
diff --git a/web/imcms/missingLoginData.jsp b/web/imcms/missingLoginData.jsp
new file mode 100644
index 0000000000..5305b17916
--- /dev/null
+++ b/web/imcms/missingLoginData.jsp
@@ -0,0 +1,63 @@
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@taglib prefix="vel" uri="imcmsvelocity" %>
+<vel:velocity>
+    <html>
+    <head>
+        <title><fmt:message key="missinglogindata.title"/></title>
+
+        <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/imcms/css/imcms_admin.css.jsp">
+    </head>
+    <body bgcolor="#FFFFFF">
+    #gui_outer_start()
+    #gui_head( "<fmt:message key="missinglogindata.title"/>" )
+    <table border="0" cellspacing="0" cellpadding="0">
+        <tr>
+            <td>
+                <table border="0" cellpadding="0" cellspacing="0">
+                    <form action="<%= request.getContextPath() %>/login">
+                        <tr>
+                            <td><input type="Submit" value="<fmt:message key="missinglogindata.login.page"/>"
+                                       class="imcmsFormBtn"></td>
+                        </tr>
+                    </form>
+                </table>
+            </td>
+            <td>&nbsp;</td>
+            <td>
+                <table border="0" cellpadding="0" cellspacing="0">
+                    <form action="<%= request.getContextPath() %>/servlet/StartDoc">
+                        <tr>
+                            <td><input type="Submit" value="<fmt:message key="templates/Startpage"/>" class="imcmsFormBtn">
+                            </td>
+                        </tr>
+                    </form>
+                </table>
+            </td>
+        </tr>
+    </table>
+    #gui_mid()
+
+    <table border="0" cellspacing="0" cellpadding="2" width="310">
+        <tr>
+            <td align="center" class="imcmsAdmText"><b><fmt:message key="missinglogindata.message"/></b><br>
+            </td>
+        </tr>
+    </table>
+    #gui_bottom()
+    #gui_outer_end()
+
+    <script language="JavaScript">
+        <!--
+        if (document.forms[1]) {
+            var f = document.forms[1];
+
+            if (f.elements[0]) {
+                f.elements[0].blur();
+            }
+        }
+        //-->
+    </script>
+
+    </body>
+    </html>
+</vel:velocity>
diff --git a/web/imcms/scripts/autocomplete/imcms_jquery.autocomplete.css.jsp b/web/imcms/scripts/autocomplete/imcms_jquery.autocomplete.css.jsp
new file mode 100644
index 0000000000..d5ffc7dfd5
--- /dev/null
+++ b/web/imcms/scripts/autocomplete/imcms_jquery.autocomplete.css.jsp
@@ -0,0 +1,63 @@
+<%@ page
+	
+	contentType="text/css"
+	pageEncoding="UTF-8"
+	
+%><%
+
+String cp = request.getContextPath() ;
+
+%>
+.ac_results {
+	padding: 0;
+	border: 1px solid #ccc;
+	border-top: 0;
+	background-color: white;
+	overflow: hidden;
+	z-index: 99999;
+}
+
+.ac_results ul {
+	width: 100%;
+	list-style-position: outside;
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+.ac_results li {
+	margin: 0;
+	padding: 2px 5px;
+	border-top: 1px solid #ccc;
+	cursor: pointer;
+	display: block;
+	/* 
+	if width will be 100% horizontal scrollbar will apear 
+	when scroll mode will be used
+	*/
+	/*width: 100%;*/
+	font: 10px Verdana,Geneva,sans-serif !important;
+	/* 
+	it is very important, if line-height not setted or setted 
+	in relative units scroll will be broken in firefox
+	*/
+	line-height: 16px !important;
+	overflow: hidden;
+	text-align: left;
+}
+
+.ac_loading {
+	background: white url('<%= cp %>/imcms/images/icons/ajax-loader.gif') right center no-repeat;
+}
+
+.ac_odd {
+	background-color: #fff;
+}
+.ac_even {
+	background-color: #fff;
+}
+
+.ac_over {
+	background-color: #dfebfc;
+	color: #000;
+}
diff --git a/web/imcms/scripts/autocomplete/imcms_jquery.autocomplete.min.js b/web/imcms/scripts/autocomplete/imcms_jquery.autocomplete.min.js
new file mode 100644
index 0000000000..a4322b0908
--- /dev/null
+++ b/web/imcms/scripts/autocomplete/imcms_jquery.autocomplete.min.js
@@ -0,0 +1,13 @@
+/*
+ * jQuery Autocomplete plugin 1.1
+ *
+ * Copyright (c) 2009 Jörn Zaefferer
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id: jquery.autocomplete.js 15 2009-08-22 10:30:27Z joern.zaefferer $
+ */;(function($){$.fn.extend({autocomplete:function(urlOrData,options){var isUrl=typeof urlOrData=="string";options=$.extend({},$.Autocompleter.defaults,{url:isUrl?urlOrData:null,data:isUrl?null:urlOrData,delay:isUrl?$.Autocompleter.defaults.delay:10,max:options&&!options.scroll?10:150},options);options.highlight=options.highlight||function(value){return value;};options.formatMatch=options.formatMatch||options.formatItem;return this.each(function(){new $.Autocompleter(this,options);});},result:function(handler){return this.bind("result",handler);},search:function(handler){return this.trigger("search",[handler]);},flushCache:function(){return this.trigger("flushCache");},setOptions:function(options){return this.trigger("setOptions",[options]);},unautocomplete:function(){return this.trigger("unautocomplete");}});$.Autocompleter=function(input,options){var KEY={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8};var $input=$(input).attr("autocomplete","off").addClass(options.inputClass);var timeout;var previousValue="";var cache=$.Autocompleter.Cache(options);var hasFocus=0;var lastKeyPressCode;var config={mouseDownOnSelect:false};var select=$.Autocompleter.Select(options,input,selectCurrent,config);var blockSubmit;$.browser.opera&&$(input.form).bind("submit.autocomplete",function(){if(blockSubmit){blockSubmit=false;return false;}});$input.bind(($.browser.opera?"keypress":"keydown")+".autocomplete",function(event){hasFocus=1;lastKeyPressCode=event.keyCode;switch(event.keyCode){case KEY.UP:event.preventDefault();if(select.visible()){select.prev();}else{onChange(0,true);}break;case KEY.DOWN:event.preventDefault();if(select.visible()){select.next();}else{onChange(0,true);}break;case KEY.PAGEUP:event.preventDefault();if(select.visible()){select.pageUp();}else{onChange(0,true);}break;case KEY.PAGEDOWN:event.preventDefault();if(select.visible()){select.pageDown();}else{onChange(0,true);}break;case options.multiple&&$.trim(options.multipleSeparator)==","&&KEY.COMMA:case KEY.TAB:case KEY.RETURN:if(selectCurrent()){event.preventDefault();blockSubmit=true;return false;}break;case KEY.ESC:select.hide();break;default:clearTimeout(timeout);timeout=setTimeout(onChange,options.delay);break;}}).focus(function(){hasFocus++;}).blur(function(){hasFocus=0;if(!config.mouseDownOnSelect){hideResults();}}).click(function(){if(hasFocus++>1&&!select.visible()){onChange(0,true);}}).bind("search",function(){var fn=(arguments.length>1)?arguments[1]:null;function findValueCallback(q,data){var result;if(data&&data.length){for(var i=0;i<data.length;i++){if(data[i].result.toLowerCase()==q.toLowerCase()){result=data[i];break;}}}if(typeof fn=="function")fn(result);else $input.trigger("result",result&&[result.data,result.value]);}$.each(trimWords($input.val()),function(i,value){request(value,findValueCallback,findValueCallback);});}).bind("flushCache",function(){cache.flush();}).bind("setOptions",function(){$.extend(options,arguments[1]);if("data"in arguments[1])cache.populate();}).bind("unautocomplete",function(){select.unbind();$input.unbind();$(input.form).unbind(".autocomplete");});function selectCurrent(){var selected=select.selected();if(!selected)return false;var v=selected.result;previousValue=v;if(options.multiple){var words=trimWords($input.val());if(words.length>1){var seperator=options.multipleSeparator.length;var cursorAt=$(input).selection().start;var wordAt,progress=0;$.each(words,function(i,word){progress+=word.length;if(cursorAt<=progress){wordAt=i;return false;}progress+=seperator;});words[wordAt]=v;v=words.join(options.multipleSeparator);}v+=options.multipleSeparator;}$input.val(v);hideResultsNow();$input.trigger("result",[selected.data,selected.value]);return true;}function onChange(crap,skipPrevCheck){if(lastKeyPressCode==KEY.DEL){select.hide();return;}var currentValue=$input.val();if(!skipPrevCheck&&currentValue==previousValue)return;previousValue=currentValue;currentValue=lastWord(currentValue);if(currentValue.length>=options.minChars){$input.addClass(options.loadingClass);if(!options.matchCase)currentValue=currentValue.toLowerCase();request(currentValue,receiveData,hideResultsNow);}else{stopLoading();select.hide();}};function trimWords(value){if(!value)return[""];if(!options.multiple)return[$.trim(value)];return $.map(value.split(options.multipleSeparator),function(word){return $.trim(value).length?$.trim(word):null;});}function lastWord(value){if(!options.multiple)return value;var words=trimWords(value);if(words.length==1)return words[0];var cursorAt=$(input).selection().start;if(cursorAt==value.length){words=trimWords(value)}else{words=trimWords(value.replace(value.substring(cursorAt),""));}return words[words.length-1];}function autoFill(q,sValue){if(options.autoFill&&(lastWord($input.val()).toLowerCase()==q.toLowerCase())&&lastKeyPressCode!=KEY.BACKSPACE){$input.val($input.val()+sValue.substring(lastWord(previousValue).length));$(input).selection(previousValue.length,previousValue.length+sValue.length);}};function hideResults(){clearTimeout(timeout);timeout=setTimeout(hideResultsNow,200);};function hideResultsNow(){var wasVisible=select.visible();select.hide();clearTimeout(timeout);stopLoading();if(options.mustMatch){$input.search(function(result){if(!result){if(options.multiple){var words=trimWords($input.val()).slice(0,-1);$input.val(words.join(options.multipleSeparator)+(words.length?options.multipleSeparator:""));}else{$input.val("");$input.trigger("result",null);}}});}};function receiveData(q,data){if(data&&data.length&&hasFocus){stopLoading();select.display(data,q);autoFill(q,data[0].value);select.show();}else{hideResultsNow();}};function request(term,success,failure){if(!options.matchCase)term=term.toLowerCase();var data=cache.load(term);if(data&&data.length){success(term,data);}else if((typeof options.url=="string")&&(options.url.length>0)){var extraParams={timestamp:+new Date()};$.each(options.extraParams,function(key,param){extraParams[key]=typeof param=="function"?param():param;});$.ajax({mode:"abort",port:"autocomplete"+input.name,dataType:options.dataType,url:options.url,data:$.extend({q:lastWord(term),limit:options.max},extraParams),success:function(data){var parsed=options.parse&&options.parse(data)||parse(data);cache.add(term,parsed);success(term,parsed);}});}else{select.emptyList();failure(term);}};function parse(data){var parsed=[];var rows=data.split("\n");for(var i=0;i<rows.length;i++){var row=$.trim(rows[i]);if(row){row=row.split("|");parsed[parsed.length]={data:row,value:row[0],result:options.formatResult&&options.formatResult(row,row[0])||row[0]};}}return parsed;};function stopLoading(){$input.removeClass(options.loadingClass);};};$.Autocompleter.defaults={inputClass:"ac_input",resultsClass:"ac_results",loadingClass:"ac_loading",minChars:1,delay:400,matchCase:false,matchSubset:true,matchContains:false,cacheLength:10,max:100,mustMatch:false,extraParams:{},selectFirst:true,formatItem:function(row){return row[0];},formatMatch:null,autoFill:false,width:0,multiple:false,multipleSeparator:", ",highlight:function(value,term){return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>");},scroll:true,scrollHeight:180};$.Autocompleter.Cache=function(options){var data={};var length=0;function matchSubset(s,sub){if(!options.matchCase)s=s.toLowerCase();var i=s.indexOf(sub);if(options.matchContains=="word"){i=s.toLowerCase().search("\\b"+sub.toLowerCase());}if(i==-1)return false;return i==0||options.matchContains;};function add(q,value){if(length>options.cacheLength){flush();}if(!data[q]){length++;}data[q]=value;}function populate(){if(!options.data)return false;var stMatchSets={},nullData=0;if(!options.url)options.cacheLength=1;stMatchSets[""]=[];for(var i=0,ol=options.data.length;i<ol;i++){var rawValue=options.data[i];rawValue=(typeof rawValue=="string")?[rawValue]:rawValue;var value=options.formatMatch(rawValue,i+1,options.data.length);if(value===false)continue;var firstChar=value.charAt(0).toLowerCase();if(!stMatchSets[firstChar])stMatchSets[firstChar]=[];var row={value:value,data:rawValue,result:options.formatResult&&options.formatResult(rawValue)||value};stMatchSets[firstChar].push(row);if(nullData++<options.max){stMatchSets[""].push(row);}};$.each(stMatchSets,function(i,value){options.cacheLength++;add(i,value);});}setTimeout(populate,25);function flush(){data={};length=0;}return{flush:flush,add:add,populate:populate,load:function(q){if(!options.cacheLength||!length)return null;if(!options.url&&options.matchContains){var csub=[];for(var k in data){if(k.length>0){var c=data[k];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub.push(x);}});}}return csub;}else
+if(data[q]){return data[q];}else
+if(options.matchSubset){for(var i=q.length-1;i>=options.minChars;i--){var c=data[q.substr(0,i)];if(c){var csub=[];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub[csub.length]=x;}});return csub;}}}return null;}};};$.Autocompleter.Select=function(options,input,select,config){var CLASSES={ACTIVE:"ac_over"};var listItems,active=-1,data,term="",needsInit=true,element,list;function init(){if(!needsInit)return;element=$("<div/>").hide().addClass(options.resultsClass).css("position","absolute").appendTo(document.body);list=$("<ul/>").appendTo(element).mouseover(function(event){if(target(event).nodeName&&target(event).nodeName.toUpperCase()=='LI'){active=$("li",list).removeClass(CLASSES.ACTIVE).index(target(event));$(target(event)).addClass(CLASSES.ACTIVE);}}).click(function(event){$(target(event)).addClass(CLASSES.ACTIVE);select();input.focus();return false;}).mousedown(function(){config.mouseDownOnSelect=true;}).mouseup(function(){config.mouseDownOnSelect=false;});if(options.width>0)element.css("width",options.width);needsInit=false;}function target(event){var element=event.target;while(element&&element.tagName!="LI")element=element.parentNode;if(!element)return[];return element;}function moveSelect(step){listItems.slice(active,active+1).removeClass(CLASSES.ACTIVE);movePosition(step);var activeItem=listItems.slice(active,active+1).addClass(CLASSES.ACTIVE);if(options.scroll){var offset=0;listItems.slice(0,active).each(function(){offset+=this.offsetHeight;});if((offset+activeItem[0].offsetHeight-list.scrollTop())>list[0].clientHeight){list.scrollTop(offset+activeItem[0].offsetHeight-list.innerHeight());}else if(offset<list.scrollTop()){list.scrollTop(offset);}}};function movePosition(step){active+=step;if(active<0){active=listItems.size()-1;}else if(active>=listItems.size()){active=0;}}function limitNumberOfItems(available){return options.max&&options.max<available?options.max:available;}function fillList(){list.empty();var max=limitNumberOfItems(data.length);for(var i=0;i<max;i++){if(!data[i])continue;var formatted=options.formatItem(data[i].data,i+1,max,data[i].value,term);if(formatted===false)continue;var li=$("<li/>").html(options.highlight(formatted,term)).addClass(i%2==0?"ac_even":"ac_odd").appendTo(list)[0];$.data(li,"ac_data",data[i]);}listItems=list.find("li");if(options.selectFirst){listItems.slice(0,1).addClass(CLASSES.ACTIVE);active=0;}if($.fn.bgiframe)list.bgiframe();}return{display:function(d,q){init();data=d;term=q;fillList();},next:function(){moveSelect(1);},prev:function(){moveSelect(-1);},pageUp:function(){if(active!=0&&active-8<0){moveSelect(-active);}else{moveSelect(-8);}},pageDown:function(){if(active!=listItems.size()-1&&active+8>listItems.size()){moveSelect(listItems.size()-1-active);}else{moveSelect(8);}},hide:function(){element&&element.hide();listItems&&listItems.removeClass(CLASSES.ACTIVE);active=-1;},visible:function(){return element&&element.is(":visible");},current:function(){return this.visible()&&(listItems.filter("."+CLASSES.ACTIVE)[0]||options.selectFirst&&listItems[0]);},show:function(){var offset=$(input).offset();element.css({width:typeof options.width=="string"||options.width>0?options.width:$(input).width(),top:offset.top+input.offsetHeight,left:offset.left}).show();if(options.scroll){list.scrollTop(0);list.css({maxHeight:options.scrollHeight,overflow:'auto'});if($.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var listHeight=0;listItems.each(function(){listHeight+=this.offsetHeight;});var scrollbarsVisible=listHeight>options.scrollHeight;list.css('height',scrollbarsVisible?options.scrollHeight:listHeight);if(!scrollbarsVisible){listItems.width(list.width()-parseInt(listItems.css("padding-left"))-parseInt(listItems.css("padding-right")));}}}},selected:function(){var selected=listItems&&listItems.filter("."+CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE);return selected&&selected.length&&$.data(selected[0],"ac_data");},emptyList:function(){list&&list.empty();},unbind:function(){element&&element.remove();}};};$.fn.selection=function(start,end){if(start!==undefined){return this.each(function(){if(this.createTextRange){var selRange=this.createTextRange();if(end===undefined||start==end){selRange.move("character",start);selRange.select();}else{selRange.collapse(true);selRange.moveStart("character",start);selRange.moveEnd("character",end);selRange.select();}}else if(this.setSelectionRange){this.setSelectionRange(start,end);}else if(this.selectionStart){this.selectionStart=start;this.selectionEnd=end;}});}var field=this[0];if(field.createTextRange){var range=document.selection.createRange(),orig=field.value,teststring="<->",textLength=range.text.length;range.text=teststring;var caretAt=field.value.indexOf(teststring);field.value=orig;this.selection(caretAt,caretAt+textLength);return{start:caretAt,end:caretAt+textLength}}else if(field.selectionStart!==undefined){return{start:field.selectionStart,end:field.selectionEnd}}};})(jQ);
\ No newline at end of file
diff --git a/web/imcms/scripts/defaultvalue/imcms_jquery.defaultValue.js b/web/imcms/scripts/defaultvalue/imcms_jquery.defaultValue.js
new file mode 100644
index 0000000000..3584d15b3a
--- /dev/null
+++ b/web/imcms/scripts/defaultvalue/imcms_jquery.defaultValue.js
@@ -0,0 +1,105 @@
+/*
+ * jQuery defaultValue plugin
+ *
+ * Copyright (c) 2011 Tommy Ullberg (www.imcode.com)
+ * Licensed under the GPL license and MIT:
+ *   http://www.opensource.org/licenses/GPL-license.php
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Version: 1.0
+ * 
+ * Usage :
+ *  jQuery(function($) {
+ *    $('form').defaultValue('lightgrey') ;
+ *  }) ;
+ *  form fields of type text|password or textareas that has class='defaultValue'.
+ *  Eg:
+ *  <input type="text" name="myInput" value="" class="formField defaultValue" title="My default value" />
+ *  ...are fixed so that they get another specified CSS class while not changed, and a default value from the title.
+ *  The title is then removed:
+ *  <input type="text" name="myInput" value="My default value" class="formField defaultValue lightgrey" title="" />
+ *  To temporarily remove the default values, eg. for validation - use:
+ *  $.defaultValueRemove() ;
+ *  To restore them again - use:
+ *  $.defaultValueRestore() ;
+ *  Note: Is has to be initiated before these are used. (line #13)
+ */
+
+var $defaultValueSelector = null ;
+
+jQ.fn.defaultValue = function(classWhileDefaultValue) {
+	$defaultValueSelector = this ;
+	return this.find('input[type=text],input[type=password],textarea').each(function() {
+		var $this = $(this) ;
+		var $thisType = $this.attr('type') ;
+		if (!$this.hasClass('defaultValue') || !/^(text|password|textarea)$/i.test($thisType)) {
+			return ;
+		}
+		var theValue = $this.attr('title').replace(/\r\n/g, '\n') ;
+		$this.data('defaultValue', theValue) ;
+		$this.removeAttr('title') ;
+		$this.focus(function() {
+			if (theValue == $this.val() || '' == $this.val()) {
+				$this.val('') ;
+				if (hasClass) {
+					$this.removeClass(classWhileDefaultValue) ;
+				}
+			}
+		}) ;
+		$this.blur(function() {
+			if (theValue == $this.val() || '' == $this.val()) {
+				$this.val(theValue) ;
+				if (hasClass) {
+					$this.addClass(classWhileDefaultValue) ;
+				}
+			}
+		}) ;
+		$this.parents('form').each(function() {
+			$(this).submit(function() {
+				if (theValue == $this.val()) {
+					$this.val('') ;
+					if (hasClass) {
+						$this.removeClass(classWhileDefaultValue) ;
+					}
+				}
+			}) ;
+		}) ;
+		var hasClass = (null != classWhileDefaultValue && '' != classWhileDefaultValue) ;
+		if ('' == $this.val()) {
+			$this.val(theValue) ;
+			if (hasClass) {
+				$this.addClass(classWhileDefaultValue) ;
+			}
+		}
+	}) ;
+} ;
+
+
+jQ.defaultValueRemove = function() {
+	$defaultValueSelector.find('input[type=text],input[type=password],textarea').each(function() {
+		var $this = $(this) ;
+		var $thisType = $this.attr('type') ;
+		if (!$this.hasClass('defaultValue') || !/^(text|password|textarea)$/i.test($thisType)) {
+			return ;
+		}
+		var theValue = $this.data('defaultValue') ;
+		if (theValue == $this.val()) {
+			$this.val('') ;
+		}
+	}) ;
+} ;
+
+jQ.defaultValueRestore = function() {
+	$defaultValueSelector.find('input[type=text],input[type=password],textarea').each(function() {
+		var $this = $(this) ;
+		var $thisType = $this.attr('type') ;
+		if (!$this.hasClass('defaultValue') || !/^(text|password|textarea)$/i.test($thisType)) {
+			return ;
+		}
+		var theValue = $this.data('defaultValue') ;
+		if ('' == $this.val()) {
+			$this.val(theValue) ;
+		}
+	}) ;
+} ;
+
diff --git a/web/imcms/scripts/imcms_inline_textedit.js.jsp b/web/imcms/scripts/imcms_inline_textedit.js.jsp
new file mode 100644
index 0000000000..42b2eb5c0b
--- /dev/null
+++ b/web/imcms/scripts/imcms_inline_textedit.js.jsp
@@ -0,0 +1,220 @@
+<%@ page
+	
+	import="imcode.util.Utility, imcode.server.LanguageMapper, com.imcode.imcms.api.ContentManagementSystem, com.imcode.imcms.servlet.AjaxServlet, imcode.server.document.textdocument.TextDomainObject"
+  
+	contentType="text/javascript"
+  pageEncoding="UTF-8"
+	
+%><%!
+
+boolean DEBUG_INIT = true ;
+boolean DEBUG_SAVE = false ;
+
+%><%
+
+boolean isSwe = false ;
+try {
+	isSwe =	ContentManagementSystem.fromRequest(request).getCurrentUser().getLanguage().getIsoCode639_2().equals("swe");
+} catch (Exception e) {}
+
+String cp = request.getContextPath() ;
+
+%>
+
+(function($) {
+
+$(document).ready(function($) {
+	if (private_USE_INLINE_EDITING) editablePluginActivate($) ;
+}) ;
+
+window.getImcmsTextFieldFromString = function($, string) {
+	var re = new RegExp('^imcmsInlineTextEdit_(\\d{4,6})_(\\d+)_(text|html)_.+$', '') ;
+	if (re.test(string)) {
+		var arrMatch = re.exec(string) ;
+		return {
+			meta_id : arrMatch[1],
+			txt_no  : arrMatch[2],
+			mode    : arrMatch[3]
+		} ;
+	}
+	return null ;
+};
+
+window.editablePluginActivate = function($) {<%
+	if (DEBUG_INIT) { %>
+	imLog('editablePluginActivate($) ;') ;<%
+	} %>
+	$('.imcmsInlineEditEditor').editable({
+		type:       'wysiwyg',
+		editBy:     'dblclick',
+		editor:     CKEDITOR,
+		editorLang: '<%= LanguageMapper.convert639_2to639_1(Utility.getLoggedOnUser(request).getLanguageIso639_2()) %>',
+		submit:     'Spara',
+		cancel:     'Avbryt',<%--
+		onEdit:     function(content) {
+			console.log('content.$container.attr(\'id\'): ' + content.$container.attr('id')) ;
+		}, --%>
+		onSubmit:   function(content) {
+			var textContainerId = content.$container.attr('id') ;
+			var oTextField = getImcmsTextFieldFromString($, textContainerId) ;
+			if (null != oTextField) {<%
+				if (DEBUG_SAVE) { %>
+				console.log('oTextField.meta_id: ' + oTextField.meta_id + '\noTextField.txt_no:  ' + oTextField.txt_no + '\noTextField.mode:    ' + oTextField.mode + '\ntextContainerId:    ' + textContainerId) ;
+				alert(content.current) ;<%
+				} %>
+				saveText($, textContainerId, oTextField.meta_id, oTextField.txt_no, oTextField.mode, content.current) ;
+			}
+		}
+	}) ;
+	$('.imcmsInlineEditInput').editable({
+		type:       'text',
+		editBy:     'dblclick',
+		submit:     'Spara',
+		cancel:     'Avbryt',
+		onEdit:     function(content) {
+			var textContainerId = content.$container.attr('id') ;
+			var oTextField = getImcmsTextFieldFromString($, textContainerId) ;
+			var $buttonDiv = $('#' + textContainerId).find('.imcmsFormBtnDiv:first') ;
+			if ($buttonDiv.length > 0) {
+				$buttonDiv.prepend('<div class="textMode imcmsToolTip" title="' + oTextField.mode + '<%= isSwe ? "läge" : "&nbsp;mode" %>">' + oTextField.mode + '</div>') ;
+			}
+		},
+		onSubmit:   function(content) {
+			var textContainerId = content.$container.attr('id') ;
+			var oTextField = getImcmsTextFieldFromString($, textContainerId) ;
+			if (null != oTextField) {<%
+				if (DEBUG_SAVE) { %>
+				console.log('oTextField.meta_id: ' + oTextField.meta_id + '\noTextField.txt_no:  ' + oTextField.txt_no + '\noTextField.mode:    ' + oTextField.mode + '\ntextContainerId:    ' + textContainerId) ;
+				alert(content.current) ;<%
+				} %>
+				saveText($, textContainerId, oTextField.meta_id, oTextField.txt_no, oTextField.mode, content.current) ;
+			}
+		}
+	}) ;
+	$('.imcmsInlineEditTextarea').editable({
+		type:       'textarea',
+		editBy:     'dblclick',
+		submit:     'Spara',
+		cancel:     'Avbryt',
+		onEdit:     function(content) {
+			var textContainerId = content.$container.attr('id') ;
+			var oTextField = getImcmsTextFieldFromString($, textContainerId) ;
+			var $buttonDiv = $('#' + textContainerId).find('.imcmsFormBtnDiv:first') ;
+			if ($buttonDiv.length > 0) {
+				$buttonDiv.prepend('<div class="textMode imcmsToolTip" title="' + oTextField.mode + '<%= isSwe ? "läge" : "&nbsp;mode" %>">' + oTextField.mode + '</div>') ;
+			}
+		},
+		onSubmit:   function(content) {
+			var textContainerId = content.$container.attr('id') ;
+			var oTextField = getImcmsTextFieldFromString($, textContainerId) ;
+			if (null != oTextField) {<%
+				if (DEBUG_SAVE) { %>
+				console.log('oTextField.meta_id: ' + oTextField.meta_id + '\noTextField.txt_no:  ' + oTextField.txt_no + '\noTextField.mode:    ' + oTextField.mode + '\ntextContainerId:    ' + textContainerId) ;
+				alert(content.current) ;<%
+				} %>
+				saveText($, textContainerId, oTextField.meta_id, oTextField.txt_no, oTextField.mode, content.current) ;
+			}
+		}
+	}) ;
+};
+
+window.editablePluginDestroy = function($) {<%
+	if (DEBUG_INIT) { %>
+	imLog('editablePluginDestroy($) ;') ;<%
+	} %>
+	$('.imcmsInlineEditEditor').editable('destroy') ;
+	$('.imcmsInlineEditInput').editable('destroy') ;
+	$('.imcmsInlineEditTextarea').editable('destroy') ;
+};
+
+<%--
+window.editablePluginConfig = function($, configStr) {
+	$('.imcmsInlineEditEditor').editable(configStr) ;
+	$('.imcmsInlineEditInput').editable(configStr) ;
+	$('.imcmsInlineEditTextarea').editable(configStr) ;
+};
+--%>
+
+window.setSizeOfEditor = function($) {<%-- Called by init. Not used here. --%>};
+window.checkIframeScroll = function($){<%-- Called by init. Not used here. --%>};
+
+
+
+window.saveText = function($, containerId, metaId, textNo, textFormat, textContent) {
+	var isSavedSuccess = false ;
+	var $container = $('#' + containerId) ;
+	$.ajax({
+		url     : '<%= AjaxServlet.getPath(cp) %>',
+		type    : 'POST',
+		dataType : 'json',
+		data    : {
+			action  : 'saveText',
+			meta_id : metaId,
+			txt_no  : textNo,
+			do_log  : true,
+			format  : (textFormat.indexOf('text') != -1 ? <%= TextDomainObject.TEXT_TYPE_PLAIN %> : <%= TextDomainObject.TEXT_TYPE_HTML %>),
+			text    : textContent
+		},
+		cache   : false,
+		success : function(response) {
+			var isSaved       = (null != response && response.isSaved) ;
+			var responseError = (null != response && '' != response.error) ? '<br/><i>' + response.error + '</i>' : '' ;
+			if (isSaved) {<%
+				if (DEBUG_SAVE) { %>
+				console.log('saved!') ;<%
+				} %>
+				var $messOk = $('<div id="imcmsInlineEditMessage_ok"><%= isSwe ? "Sparat!" : "Saved!" %></div>') ;// TODO: Put after div instead. Or disable doubleclick while it exists. Included in content.
+				$container.append($messOk) ;
+				$messOk
+					.fadeIn('fast')<%
+					for (int i = 0; i < 2; i++) { %>
+					.animate({color:'#fff'}, 200)
+					.animate({color:'#0b0'}, 200)<%
+					} %>
+					.delay(2000)
+					.hide('fast', function() {
+						$messOk.remove() ;
+					}) ;
+				isSavedSuccess = true ;<%
+				if (DEBUG_SAVE) { %>
+				console.log('isSavedSuccess:' + isSavedSuccess) ;<%
+				} %>
+			} else {<%
+				if (DEBUG_SAVE) { %>
+				console.log('NOT saved!') ;<%
+				} %>
+				var $messNotSaved = $('<div id="imcmsInlineEditMessage_error"><%= isSwe ? "ERROR! Ej sparat!" : "ERROR! Not saved!" %>' + responseError + '</div>') ;
+				$container.append($messNotSaved) ;
+				$messNotSaved
+					.fadeIn('fast')<%
+					for (int i = 0; i < 2; i++) { %>
+					.animate({color:'#fff'}, 200)
+					.animate({color:'#f00'}, 200)<%
+					} %>
+					.delay(2000)
+					.hide('fast', function() {
+						$messNotSaved.remove() ;
+					}) ;
+			}
+		},
+		error: function() {<%
+			if (DEBUG_SAVE) { %>
+			console.log('Save error!') ;<%
+			} %>
+			var $messError = $('<div id="imcmsInlineEditMessage_error"><%= isSwe ? "ERROR! Ej sparat!" : "ERROR! Not saved!" %></div>') ;
+			$container.append($messError) ;
+			$messError
+				.slideDown('fast')<%
+				for (int i = 0; i < 2; i++) { %>
+				.animate({color:'#fff'}, 200)
+				.animate({color:'#f00'}, 200)<%
+				} %>
+				.delay(2000)
+				.hide('fast', function() {
+					$messError.remove() ;
+				}) ;
+		}
+	}) ;
+};
+
+})(jQ);
diff --git a/web/imcms/scripts/imcms_jquery.contextMenu.js b/web/imcms/scripts/imcms_jquery.contextMenu.js
new file mode 100644
index 0000000000..bf434ad287
--- /dev/null
+++ b/web/imcms/scripts/imcms_jquery.contextMenu.js
@@ -0,0 +1,215 @@
+// jQuery Context Menu Plugin
+//
+// Version 1.01
+//
+// Cory S.N. LaViska
+// A Beautiful Site (http://abeautifulsite.net/)
+//
+// More info: http://abeautifulsite.net/2008/09/jquery-context-menu-plugin/
+//
+// Terms of Use
+//
+// This plugin is dual-licensed under the GNU General Public License
+//   and the MIT License and is copyright A Beautiful Site, LLC.
+// MODIFIED: Tommy Ullberg, imCode. 2011-02-24 16:57
+// Added onAbort
+//
+if(jQ)( function($) {
+	$.extend($.fn, {
+		
+		contextMenu: function(o, onAbort, callback) {
+			// Defaults
+			if( o.menu == undefined ) return false;
+			if( o.inSpeed == undefined ) o.inSpeed = 150;
+			if( o.outSpeed == undefined ) o.outSpeed = 75;
+			// 0 needs to be -1 for expected results (no fade)
+			if( o.inSpeed == 0 ) o.inSpeed = -1;
+			if( o.outSpeed == 0 ) o.outSpeed = -1;
+			// Loop each context menu
+			$(this).each( function() {
+				var el = $(this);
+				var offset = $(el).offset();
+				// Add contextMenu class
+				$('#' + o.menu).addClass('contextMenu');
+				// Simulate a true right click
+				$(this).mousedown( function(e) {
+					var evt = e;
+					evt.stopPropagation();
+					$(this).mouseup( function(e) {
+						e.stopPropagation();
+						var srcElement = $(this);
+						$(this).unbind('mouseup');
+						if( evt.button == 2 ) {
+							// Hide context menus that may be showing
+							$(".contextMenu").hide();
+							// Get this context menu
+							var menu = $('#' + o.menu);
+							
+							if( $(el).hasClass('disabled') ) return false;
+							
+							// Detect mouse position
+							var d = {}, x, y;
+							if( self.innerHeight ) {
+								d.pageYOffset = self.pageYOffset;
+								d.pageXOffset = self.pageXOffset;
+								d.innerHeight = self.innerHeight;
+								d.innerWidth = self.innerWidth;
+							} else if( document.documentElement &&
+								document.documentElement.clientHeight ) {
+								d.pageYOffset = document.documentElement.scrollTop;
+								d.pageXOffset = document.documentElement.scrollLeft;
+								d.innerHeight = document.documentElement.clientHeight;
+								d.innerWidth = document.documentElement.clientWidth;
+							} else if( document.body ) {
+								d.pageYOffset = document.body.scrollTop;
+								d.pageXOffset = document.body.scrollLeft;
+								d.innerHeight = document.body.clientHeight;
+								d.innerWidth = document.body.clientWidth;
+							}
+							(e.pageX) ? x = e.pageX : x = e.clientX + d.scrollLeft;
+							(e.pageY) ? y = e.pageY : x = e.clientY + d.scrollTop;
+							
+							// Show the menu
+							$(document).unbind('click');
+							$(menu).css({ top: y, left: x }).fadeIn(o.inSpeed);
+							// Hover events
+							$(menu).find('A').mouseover( function() {
+								$(menu).find('LI.hover').removeClass('hover');
+								$(this).parent().addClass('hover');
+							}).mouseout( function() {
+								$(menu).find('LI.hover').removeClass('hover');
+							});
+							
+							// Keyboard
+							$(document).keypress( function(e) {
+								switch( e.keyCode ) {
+									case 38: // up
+										if( $(menu).find('LI.hover').size() == 0 ) {
+											$(menu).find('LI:last').addClass('hover');
+										} else {
+											$(menu).find('LI.hover').removeClass('hover').prevAll('LI:not(.disabled)').eq(0).addClass('hover');
+											if( $(menu).find('LI.hover').size() == 0 ) $(menu).find('LI:last').addClass('hover');
+										}
+									break;
+									case 40: // down
+										if( $(menu).find('LI.hover').size() == 0 ) {
+											$(menu).find('LI:first').addClass('hover');
+										} else {
+											$(menu).find('LI.hover').removeClass('hover').nextAll('LI:not(.disabled)').eq(0).addClass('hover');
+											if( $(menu).find('LI.hover').size() == 0 ) $(menu).find('LI:first').addClass('hover');
+										}
+									break;
+									case 13: // enter
+										$(menu).find('LI.hover A').trigger('click');
+									break;
+									case 27: // esc
+										$(document).trigger('click');
+									break
+								}
+							});
+							
+							// When items are selected
+							$('#' + o.menu).find('A').unbind('click');
+							$('#' + o.menu).find('LI:not(.disabled) A').click( function() {
+								$(document).unbind('click').unbind('keypress');
+								$(".contextMenu").hide();
+								// Callback
+								if( callback ) callback( $(srcElement).attr('rev'), $(this).attr('href').substr(1), $(srcElement), {x: x - offset.left, y: y - offset.top, docX: x, docY: y} );
+								return false;
+							});
+							
+							// Hide bindings
+							setTimeout( function() { // Delay for Mozilla
+								$(document).click( function() {
+									$(document).unbind('click').unbind('keypress');
+									$(menu).fadeOut(o.outSpeed, function() {
+										if( onAbort ) onAbort( $(srcElement).attr('rev'), $(srcElement) );
+									});
+									return false;
+								});
+							}, 0);
+						}
+					});
+				});
+				
+				// Disable text selection
+				if( $.browser.mozilla ) {
+					$('#' + o.menu).each( function() { $(this).css({ 'MozUserSelect' : 'none' }); });
+				} else if( $.browser.msie ) {
+					$('#' + o.menu).each( function() { $(this).bind('selectstart.disableTextSelect', function() { return false; }); });
+				} else {
+					$('#' + o.menu).each(function() { $(this).bind('mousedown.disableTextSelect', function() { return false; }); });
+				}
+				// Disable browser context menu (requires both selectors to work in IE/Safari + FF/Chrome)
+				$(el).add($('UL.contextMenu')).bind('contextmenu', function() { return false; });
+				
+			});
+			return $(this);
+		},
+		
+		// Disable context menu items on the fly
+		disableContextMenuItems: function(o) {
+			if( o == undefined ) {
+				// Disable all
+				$(this).find('LI').addClass('disabled');
+				return( $(this) );
+			}
+			$(this).each( function() {
+				if( o != undefined ) {
+					var d = o.split(',');
+					for( var i = 0; i < d.length; i++ ) {
+						$(this).find('A[href="' + d[i] + '"]').parent().addClass('disabled');
+						
+					}
+				}
+			});
+			return( $(this) );
+		},
+		
+		// Enable context menu items on the fly
+		enableContextMenuItems: function(o) {
+			if( o == undefined ) {
+				// Enable all
+				$(this).find('LI.disabled').removeClass('disabled');
+				return( $(this) );
+			}
+			$(this).each( function() {
+				if( o != undefined ) {
+					var d = o.split(',');
+					for( var i = 0; i < d.length; i++ ) {
+						$(this).find('A[href="' + d[i] + '"]').parent().removeClass('disabled');
+						
+					}
+				}
+			});
+			return( $(this) );
+		},
+		
+		// Disable context menu(s)
+		disableContextMenu: function() {
+			$(this).each( function() {
+				$(this).addClass('disabled');
+			});
+			return( $(this) );
+		},
+		
+		// Enable context menu(s)
+		enableContextMenu: function() {
+			$(this).each( function() {
+				$(this).removeClass('disabled');
+			});
+			return( $(this) );
+		},
+		
+		// Destroy context menu(s)
+		destroyContextMenu: function() {
+			// Destroy specified context menus
+			$(this).each( function() {
+				// Disable action
+				$(this).unbind('mousedown').unbind('mouseup');
+			});
+			return( $(this) );
+		}
+		
+	});
+})(jQ);
\ No newline at end of file
diff --git a/web/imcms/scripts/imcms_jquery.ipweditor-1.2.1.js b/web/imcms/scripts/imcms_jquery.ipweditor-1.2.1.js
new file mode 100644
index 0000000000..f564b6a3d2
--- /dev/null
+++ b/web/imcms/scripts/imcms_jquery.ipweditor-1.2.1.js
@@ -0,0 +1,305 @@
+(function($){
+/*
+ * Editable 1.3.3
+ *
+ * Copyright (c) 2009 Arash Karimzadeh (arashkarimzadeh.com)
+ * Licensed under the MIT (MIT-LICENSE.txt)
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Date: Mar 02 2009
+ * MODIFIED: Tommy Ullberg, imCode. 2011-02-23 14:20
+ * Changed FCKeditor to CKeditor and added more features.
+ */
+$.fn.editable = function(options){
+	var defaults = {
+		onEdit: null,
+		onSubmit: null,
+		onCancel: null,
+		editClass: null,
+		disabledClass: 'imcmsInlineEditDisabled',
+		submit: null,
+		cancel: null,
+		type: 'text', //text, textarea or select
+		submitBy: 'blur', //blur,change,dblclick,click
+		editBy: 'click',
+		editor: 'non',
+		editorLang: null,
+		options: null
+	}
+	
+	
+	if(options=='disable')
+		return this.unbind(this.data('editable.options').editBy,this.data('editable.options').toEditable);
+	if(options=='enable')
+		return this.bind(this.data('editable.options').editBy,this.data('editable.options').toEditable);
+	if(options=='destroy')
+		return this.unbind(options.editBy).removeData() ;
+		/*return  this.unbind(this.data('editable.options').editBy,this.data('editable.options').toEditable)
+					.data('editable.previous',null)
+					.data('editable.current',null)
+					.data('editable.options',null);*/
+
+	var options = $.extend(defaults, options);
+
+	options.toEditable = function(){
+		$this = $(this);
+		// Check mode
+		var textContainerId = $this.attr('id') ;
+		var oTextField = getImcmsTextFieldFromString($, textContainerId) ;
+		var isTextMode = ('text' == oTextField.mode) ;
+		// Set data
+		if (isTextMode) {
+			$this.data('editable.current',$this.text().replace(/^\s*|\s*$/g, '')) ;
+			$this.data('editable.isTextMode', true) ;
+		} else {
+			$this.data('editable.current',this.innerHTML.replace(/^\s*|\s*$/g, '')) ;
+			$this.data('editable.isTextMode', false) ;
+		}
+		opts = $this.data('editable.options');
+		$.editableFactory[opts.type].toEditable($this.empty(),opts);
+		// Configure events,styles for changed content
+		$this.data('editable.previous',$this.data('editable.current'))
+					.children()
+					.addClass(opts.editClass);
+		try {
+			$this.focus() ;
+		} catch (e) {}
+		var $buttons = $('<div class="imcmsFormBtnDiv" style="text-align:right;" />') ;
+		// Submit Event
+		if (opts.submit) {
+			$('<button class="imcmsFormBtnSmall" />').appendTo($buttons)
+						.html(opts.submit)
+						.one('mouseup',function(){opts.toNonEditable($(this).parent().parent(),true)});
+		} else {
+			$this.one(opts.submitBy,function(){opts.toNonEditable($(this),true)})
+						.children()
+						.one(opts.submitBy,function(){opts.toNonEditable($(this).parent().parent(),true)});
+		}
+		// Cancel Event
+		if (opts.cancel) {
+			$('<button class="imcmsFormBtnSmall" />').appendTo($buttons)
+						.html(opts.cancel)
+						.one('mouseup',function(){opts.toNonEditable($(this).parent().parent(),false)});
+		}
+		if(opts.submit || opts.cancel){
+			$buttons.appendTo($this) ;
+		}
+		// Call User Function
+		if($.isFunction(opts.onEdit))
+			opts.onEdit.apply($this,
+				[{
+					$container : $this,
+					current    : $this.data('editable.current'),
+					previous   : $this.data('editable.previous')
+				}]
+			);
+	}
+	options.toNonEditable = function($this,change){
+
+		opts = $this.data('editable.options');
+		// Configure events,styles for changed content
+
+		$this.one(opts.editBy,opts.toEditable)
+			.data( 'editable.current', change ? $.editableFactory[opts.type].getValue($this,opts) : $.editableFactory[opts.type].doCancel($this,opts))
+			.sethtml(this, $this.data('editable.isTextMode'), opts.type=='password' ? '*****' : $this.data('editable.current')) ;
+		
+		// Call User Function
+		var func = null;
+		if($.isFunction(opts.onSubmit)&&change==true)
+			func = opts.onSubmit;
+		else if($.isFunction(opts.onCancel)&&change==false)
+			func = opts.onCancel;
+		if(func!=null)
+			func.apply($this,
+				[{
+					$container : $this,
+					current    : $this.data('editable.current'),
+					previous   : $this.data('editable.previous')
+				}]
+			);
+	}
+	this.data('editable.options',options);/*
+	console.log('$(this).hasClass(options.disabledClass): ' + $(this).hasClass(options.disabledClass)) ;
+	if ($(this).hasClass(options.disabledClass)) {
+		return ;
+	}*/
+	return this.one(options.editBy,options.toEditable);
+}
+$.editableFactory = {
+	'text': {
+		toEditable: function($this,options){
+			var containerWidth = $this.attr('style','display:block;').width() ;
+			$('<input type="text" style="width:' + (containerWidth - 6) + 'px;" />').appendTo($this)
+						 .val($this.data('editable.current'));
+		},
+		getValue: function($this,options){
+			return $this.removeAttr('style').children().val();
+		},
+		doCancel: function($this,options){
+			return $this.removeAttr('style').data('editable.current') ;
+		}
+	},
+	'password': {
+		toEditable: function($this,options){
+			$this.data('editable.current',$this.data('editable.password'));
+			$this.data('editable.previous',$this.data('editable.password'));
+			$('<input type="password" style="width:99%;" />').appendTo($this)
+										 .val($this.data('editable.current'));
+		},
+		getValue: function($this,options){
+			$this.data('editable.password',$this.children().val());
+			return $this.children().val();
+		},
+		doCancel: function($this,options){
+			return $this.children().val();
+		}
+	},
+	'textarea': {
+		toEditable: function($this,options){
+			$this.attr('style','display:block;') ;
+			var containerWidth = $this.width() ;
+			var containerHeight = $this.html($this.data('editable.current')).height() ;
+			$this.empty() ;
+			var winH    = $(window).height() ;
+			var wantedH = (winH - 200) ;
+			//console.log('winH: ' + winH + ', containerHeight: ' + containerHeight) ;
+			if (containerHeight < 20) {
+				containerHeight = 20 ;
+			} else if (containerHeight > wantedH) {
+				containerHeight = wantedH ;
+			}
+			containerHeight = (containerHeight + 20).roundTo(20, true) ;
+			//console.log('Set containerHeight: ' + containerHeight) ;
+			$('<textarea style="width:' + (containerWidth - 6) + 'px; overflow:auto;" />')
+							.height(containerHeight)
+							.appendTo($this)
+							.val($this.data('editable.current'));
+		},
+		getValue: function($this,options){
+			return $this.removeAttr('style').children().val();
+		},
+		doCancel: function($this,options){
+			return $this.removeAttr('style').children().val();
+		}
+	},
+	'wysiwyg': {
+		toEditable: function($this,options){
+			//options.elementId = ($this.attr('id') || options.elementId) ;
+			var thisId = $this.attr('id') ;
+			//var editorWidth = getWidthFromImcmsDummyElement($, thisId.replace(/^(.+)_container$/, '$1')) ;
+			var editorWidth = $this.attr('style','display:block;').width() ;
+			// CKEditor
+			if(CKEDITOR && options.editor){
+				$('<textarea name="'+options.elementId +'" id="ta_'+thisId +'" />')
+								.appendTo($this)
+								.val($this.data('editable.current'));
+				
+				var ckToolBar = (editorWidth <= 230) ? 'imCMS_SIMPLE_0' : (editorWidth <= 300) ? 'imCMS_SIMPLE_1' : (editorWidth <= 440) ? 'imCMS_SIMPLE_2' : (editorWidth <= 700) ? 'imCMS_SIMPLE_3' : 'imCMS_ALL' ;
+				
+				//console.log(CKEDITOR + ', ' + options.editor + ', ' + thisId + ', ' + options.editorLang + ', editorWidth:' + editorWidth + ', ' + ckToolBar) ;
+				
+				initCkEditor($, 'ta_' + thisId, options.editorLang, editorWidth, ckToolBar) ;
+			}else{
+				$('<textarea name="'+options.editor.id+'" id="'+options.editor.id+'" style="width:100%" />').appendTo($this)
+									.val($this.data('editable.current'));
+								  
+				var ed = new tinymce.Editor(options.editor.id, {});
+				ed.settings = options.editor.settings;
+				options.editor = ed;
+				options.editor.render();
+			}
+
+		},
+		getValue: function($this,options){
+			var thisId = $this.removeAttr('style').attr('id') ;
+			var retVal ;
+			if (CKEDITOR && options.editor) {
+				retVal = CKEDITOR.instances['ta_' + thisId].getData() ;
+				CKEDITOR.instances['ta_' + thisId].destroy() ;
+				return retVal ;
+			} else {
+				retVal =options.editor.getContent({format : 'text'}) ;
+				options.editor.remove() ;
+				return retVal ;
+			}
+		},
+		doCancel: function($this,options){
+			var thisId = $this.removeAttr('style').attr('id') ;
+			if (CKEDITOR && options.editor) {
+				CKEDITOR.instances['ta_' + thisId].destroy() ;
+			} else {
+				options.editor.remove() ;
+			}
+			return $this.data('editable.current') ;
+		}
+	},
+	'select': {
+		toEditable: function($this,options){
+			$select = $('<select/>').appendTo($this);
+			$.each( options.options,
+					function(key,value){
+						$('<option/>').appendTo($select)
+									.html(value)
+									.attr('value',key);
+					}
+				   )
+			$select.children().each(
+				function(){
+					var opt = $(this);
+					if(opt.text()==$this.data('editable.current'))
+						return opt.attr('selected', 'selected').text();
+				}
+			)
+		},
+		getValue: function($this,options){
+			var item = null;
+			$('select', $this).children().each(
+				function(){
+					if($(this).attr('selected'))
+						return item = $(this).text();
+				}
+			)
+			return item;
+		},
+		doCancel: function($this,options){
+			return $this.data('editable.current') ;
+		}
+	}
+}
+
+$.fn.sethtml = function(d, isTextMode, value){
+	if (isTextMode) {
+		value = value
+						.replace(/</g, '&lt;')
+						.replace(/>/g, '&gt;')
+						.replace(/(\r?\n)/g, '<br/>$1') ;
+		$(this[0]).html(value) ;
+		//console.log('isTextMode: ' + value) ;
+	} else {
+		this[0].innerHTML = value ;
+		//console.log('isHtmlMode: ' + value) ;
+	}
+} ;
+
+Number.prototype.roundTo = function(num, roundUp) {
+	var mo = this % num;
+	if (!roundUp && mo <= (num / 2)) { 
+		return this - mo ;
+	} else {
+		return this - mo + num ;
+	}
+}
+/*
+function getWidthFromImcmsDummyElement($, uniqueId) {
+	var textW = 150 ;
+	var $textFieldDummy = $('#' + uniqueId + '_dummy') ;
+	if (1 == $textFieldDummy.length) {
+		$textFieldDummy.attr('style', 'background:red; height:10px;').show(0, function() {
+			textW = $textFieldDummy.width() ;
+			$textFieldDummy.hide(0) ;
+		}) ;
+	}
+	return textW ;
+}
+*/
+})(jQ);
\ No newline at end of file
diff --git a/web/imcms/scripts/jquery.lazyload.min.js b/web/imcms/scripts/jquery.lazyload.min.js
new file mode 100644
index 0000000000..af37313fcd
--- /dev/null
+++ b/web/imcms/scripts/jquery.lazyload.min.js
@@ -0,0 +1,15 @@
+/*
+ * Lazy Load - jQuery plugin for lazy loading images
+ *
+ * Copyright (c) 2007-2012 Mika Tuupola
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Project home:
+ *   http://www.appelsiini.net/projects/lazyload
+ *
+ * Version:  1.8.1-dev
+ *
+ */
+(function(a,b){var c=a(b);a.fn.lazyload=function(d){function h(){var b=0;e.each(function(){var c=a(this);if(g.skip_invisible&&!c.is(":visible"))return;if(!a.abovethetop(this,g)&&!a.leftofbegin(this,g))if(!a.belowthefold(this,g)&&!a.rightoffold(this,g))c.trigger("appear"),b=0;else if(++b>g.failure_limit)return!1})}var e=this,f,g={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!0,appear:null,load:null};return d&&(undefined!==d.failurelimit&&(d.failure_limit=d.failurelimit,delete d.failurelimit),undefined!==d.effectspeed&&(d.effect_speed=d.effectspeed,delete d.effectspeed),a.extend(g,d)),f=g.container===undefined||g.container===b?c:a(g.container),0===g.event.indexOf("scroll")&&f.bind(g.event,function(a){return h()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,c.one("appear",function(){if(!this.loaded){if(g.appear){var d=e.length;g.appear.call(b,d,g)}a("<img />").bind("load",function(){c.hide().attr("src",c.data(g.data_attribute))[g.effect](g.effect_speed),b.loaded=!0;var d=a.grep(e,function(a){return!a.loaded});e=a(d);if(g.load){var f=e.length;g.load.call(b,f,g)}}).attr("src",c.data(g.data_attribute))}}),0!==g.event.indexOf("scroll")&&c.bind(g.event,function(a){b.loaded||c.trigger("appear")})}),c.bind("resize",function(a){h()}),a(document).ready(function(){h()}),this},a.belowthefold=function(d,e){var f;return e.container===undefined||e.container===b?f=c.height()+c.scrollTop():f=a(e.container).offset().top+a(e.container).height(),f<=a(d).offset().top-e.threshold},a.rightoffold=function(d,e){var f;return e.container===undefined||e.container===b?f=c.width()+c.scrollLeft():f=a(e.container).offset().left+a(e.container).width(),f<=a(d).offset().left-e.threshold},a.abovethetop=function(d,e){var f;return e.container===undefined||e.container===b?f=c.scrollTop():f=a(e.container).offset().top,f>=a(d).offset().top+e.threshold+a(d).height()},a.leftofbegin=function(d,e){var f;return e.container===undefined||e.container===b?f=c.scrollLeft():f=a(e.container).offset().left,f>=a(d).offset().left+e.threshold+a(d).width()},a.inviewport=function(b,c){return!a.rightofscreen(b,c)&&!a.leftofscreen(b,c)&&!a.belowthefold(b,c)&&!a.abovethetop(b,c)},a.extend(a.expr[":"],{"below-the-fold":function(b){return a.belowthefold(b,{threshold:0})},"above-the-top":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-screen":function(b){return a.rightoffold(b,{threshold:0})},"left-of-screen":function(b){return!a.rightoffold(b,{threshold:0})},"in-viewport":function(b){return!a.inviewport(b,{threshold:0})},"above-the-fold":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-fold":function(b){return a.rightoffold(b,{threshold:0})},"left-of-fold":function(b){return!a.rightoffold(b,{threshold:0})}})})(jQuery,window)
diff --git a/web/imcms/xinha/Xinha.css b/web/imcms/xinha/Xinha.css
deleted file mode 100644
index 2f42554b8e..0000000000
--- a/web/imcms/xinha/Xinha.css
+++ /dev/null
@@ -1,269 +0,0 @@
-.htmlarea { background: #fff; }
-.htmlarea td { margin:0;padding:0; }
-
-.htmlarea .toolbar {
-  cursor: default;
-  background: ButtonFace;
-  padding: 3px;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-.htmlarea .toolbar table { margin: 0; font-family: tahoma,verdana,sans-serif; font-size: 11px; }
-.htmlarea .toolbar img { border: none; vertical-align: top; }
-.htmlarea .toolbar .label { padding: 0px 3px; }
-
-.htmlarea .toolbar .button {
-  background: ButtonFace;
-  color: ButtonText;
-  border: 1px solid ButtonFace;
-  padding: 1px;
-  margin: 0px;
-  width: 18px;
-  height: 18px;
-}
-.htmlarea .toolbar a.button:hover {
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-.htmlarea .toolbar a.buttonDisabled:hover {
-  border-color: ButtonFace;
-}
-.htmlarea .toolbar .buttonActive,
-.htmlarea .toolbar .buttonPressed
-{
-  padding: 2px 0px 0px 2px;
-  border: 1px solid;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-.htmlarea .toolbar .buttonPressed {
-  background: ButtonHighlight;
-}
-.htmlarea .toolbar .indicator {
-  padding: 0px 3px;
-  overflow: hidden;
-  width: 20px;
-  text-align: center;
-  cursor: default;
-  border: 1px solid ButtonShadow;
-}
-
-.htmlarea .toolbar .buttonDisabled img {
-  filter: gray() alpha(opacity = 25);
-  -moz-opacity: 0.25;
-  opacity: 0.25;
-}
-
-.htmlarea .toolbar .separator {
-  /*position: relative;*/
-  margin:0 3px;
-  border-left: 1px solid ButtonShadow;
-  border-right: 1px solid ButtonHighlight;
-  width: 0px;
-  height: 18px;
-  padding: 0px;
-}
-
-.htmlarea .toolbar .space { width: 5px; }
-
-.htmlarea .toolbar select, .htmlarea .toolbar option { font: 11px Tahoma,Verdana,sans-serif;}
-
-.htmlarea .toolbar select,
-.htmlarea .toolbar select:hover,
-.htmlarea .toolbar select:active { 
-  margin-top: 2px;
-  margin-bottom: 1px;
-  color: ButtonText;
-  height: 17px;
-}
-
-.htmlarea iframe.xinha_iframe, .htmlarea textarea.xinha_textarea
-{
-  border: none; /*1px solid;*/
-}
-
-.htmlarea .statusBar {
-  border: 1px solid;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-  padding: 2px 4px;
-  background-color: ButtonFace;
-  color: ButtonText;
-  font: 11px Tahoma,Verdana,sans-serif;
-  height:16px;
-}
-
-.htmlarea .statusBar .statusBarTree a {
-  padding: 2px 5px;
-  color: #00f;
-}
-
-.htmlarea .statusBar .statusBarTree a:visited { color: #00f; }
-.htmlarea .statusBar .statusBarTree a:hover {
-  background-color: Highlight;
-  color: HighlightText;
-  padding: 1px 4px;
-  border: 1px solid HighlightText;
-}
-
-
-/* popup dialogs */
-
-.dialog {
-  color: ButtonText;
-  background: ButtonFace;
-}
-
-.dialog .content { padding: 2px; }
-
-.dialog, .dialog button, .dialog input, .dialog select, .dialog textarea, .dialog table {
-  font: 11px Tahoma,Verdana,sans-serif;
-}
-
-.dialog table { border-collapse: collapse; }
-
-.dialog .title, .dialog h1
-{
-  background: #008;
-  color: #ff8;
-  border-bottom: 1px solid #000;
-  padding: 1px 0px 2px 5px;
-  font-size: 12px;
-  font-weight: bold;
-  cursor: default;
-}
-.dialog h1 { margin:0px;}
-.dialog .title .button {
-  float: right;
-  border: 1px solid #66a;
-  padding: 0px 1px 0px 2px;
-  margin-right: 1px;
-  color: #fff;
-  text-align: center;
-}
-
-.dialog .title .button-hilite { border-color: #88f; background: #44c; }
-
-.dialog button {
-  width: 5em;
-  padding: 0px;
-}
-
-.dialog .buttonColor {
-  width :1em;
-  padding: 1px;
-  cursor: default;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-
-.dialog .buttonColor .chooser, .dialog .buttonColor .nocolor {
-  height: 0.6em;
-  border: 1px solid;
-  padding: 0px 1em;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.dialog .buttonClick {
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-.dialog .buttonColor-hilite {
-   border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.dialog .buttonColor .nocolor { padding: 0px; }
-.dialog .buttonColor .nocolor-hilite { background-color: #fff; color: #f00; }
-
-.dialog .label { text-align: right; width: 6em; }
-.dialog .value input { width: 100%; }
-.dialog .buttons { text-align: right; padding: 2px 4px 0px 4px; }
-
-.dialog legend { font-weight: bold; }
-.dialog fieldset table { margin: 2px 0px; }
-
-.popupwin {
-  padding: 0px;
-  margin: 0px;
-}
-
-.popupwin .title {
-  background: #fff;
-  color: #000;
-  font-weight: bold;
-  font-size: 120%;
-  padding: 3px 10px;
-  margin-bottom: 10px;
-  border-bottom: 1px solid black;
-  letter-spacing: 2px;
-}
-
-form { margin: 0px; border: none; }
-
-
-/** Panels **/
-.htmlarea .panels.top
-{
-  border-bottom : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panels.right
-{
-  border-left : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panels.left
-{
-  border-right : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panels.bottom
-{
-  border-top : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panel h1 {
-  background: ButtonFace;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-  margin:   0px;
-  padding:  0px;
-  font-size:100%;
-  font-weight:bold;
-  padding: 2px;
-  clear:left;
-  
-}
-
-.htmlarea .panel { overflow:hidden; }
-.htmlarea .panels.left  .panel { border-right:none; border-left:none; }
-.htmlarea .panels.left  h1     { border-right:none;  }
-.htmlarea .panels.right .panel { border-right:none; border-left:none; }
-.htmlarea .panels.left  h1     { border-left:none;  }
-.htmlarea { border: 1px solid black; }
-
-.loading
-{
-  font-family:sans-serif;
-  position:absolute;
-  z-index:998;
-  text-align:center;
-  width:212px;
-  padding: 55px 0 5px 0;
-  border:2px solid #ccc;
-  /* border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;*/
-  background: url(images/xinha_logo.gif) no-repeat #fff center 5px;
-}
-.loading_main
-{
-  font-size:11px;
-  color:#000;
- 
-}
-.loading_sub
-{
-  font-size:9px;
-  color:#666;
-  text-align:center;
-}
diff --git a/web/imcms/xinha/XinhaCore.js b/web/imcms/xinha/XinhaCore.js
deleted file mode 100644
index f5dbaf9e0e..0000000000
--- a/web/imcms/xinha/XinhaCore.js
+++ /dev/null
@@ -1,7082 +0,0 @@
- 
-/*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-  --  Xinha (is not htmlArea) - http://xinha.org
-  --
-  --  Use of Xinha is granted by the terms of the htmlArea License (based on
-  --  BSD license)  please read license.txt in this package for details.
-  --
-  --  Copyright (c) 2005-2007 Xinha Developer Team and contributors
-  --  
-  --  Xinha was originally based on work by Mihai Bazon which is:
-  --      Copyright (c) 2003-2004 dynarch.com.
-  --      Copyright (c) 2002-2003 interactivetools.com, inc.
-  --      This copyright notice MUST stay intact for use.
-  --
-  --  Developers - Coding Style:
-  --   For the sake of not committing needlessly conflicting changes,
-  --
-  --   * New code to be indented with 2 spaces ("soft tab").
-  --   * New code preferably uses BSD-Style Bracing
-  --      if ( foo )
-  --      {
-  --        bar();
-  --      }
-  --   * Don't change brace styles unless you're working on the non BSD-Style
-  --     area (so we don't get spurious changes in line numbering).
-  --   * Don't change indentation unless you're working on the badly indented
-  --     area (so we don't get spurious changes of large blocks of code).
-  --   * Jedit is the recommended editor, a comment of this format should be
-  --     included in the top 10 lines of the file (see the embedded edit mode)
-  --
-  --  Changed by imCode:
-  --    Line 2103 "createlink" commented. Overrides imCMS's own feature.
-  --
-  --  $HeadURL: http://svn.xinha.webfactional.com/trunk/XinhaCore.js $
-  --  $LastChangedDate: 2007-11-19 08:42:42 +1300 (Mon, 19 Nov 2007) $
-  --  $LastChangedRevision: 921 $
-  --  $LastChangedBy: ray $
-  --------------------------------------------------------------------------*/
-
-Xinha.version =
-{
-'Release'   : 'Trunk',
-'Head'      : '$HeadURL: http://svn.xinha.webfactional.com/trunk/XinhaCore.js $'.replace(/^[^:]*: (.*) \$$/, '$1'),
-'Date'      : '$LastChangedDate: 2007-11-19 08:42:42 +1300 (Mon, 19 Nov 2007) $'.replace(/^[^:]*: ([0-9-]*) ([0-9:]*) ([+0-9]*) \((.*)\) \$/, '$4 $2 $3'),
-'Revision'  : '$LastChangedRevision: 921 $'.replace(/^[^:]*: (.*) \$$/, '$1'),
-'RevisionBy': '$LastChangedBy: ray $'.replace(/^[^:]*: (.*) \$$/, '$1')
-};
-
-//must be here. it is called while converting _editor_url to absolute
-Xinha._resolveRelativeUrl = function( base, url )
-{
-if(url.match(/^([^:]+\:)?\//))
-{
-  return url;
-}
-else
-{
-  var b = base.split("/");
-  if(b[b.length - 1] == "")
-  {
-    b.pop();
-  }
-  var p = url.split("/");
-  if(p[0] == ".")
-  {
-    p.shift();
-  }
-  while(p[0] == "..")
-  {
-    b.pop();
-    p.shift();
-  }
-  return b.join("/") + "/" + p.join("/");
-}
-}
-
-if ( typeof _editor_url == "string" )
-{
-// Leave exactly one backslash at the end of _editor_url
-_editor_url = _editor_url.replace(/\x2f*$/, '/');
-  
-// convert _editor_url to absolute
-if(!_editor_url.match(/^([^:]+\:)?\//)){
-  var path = window.location.toString().split("/");
-  path.pop();
-  _editor_url = Xinha._resolveRelativeUrl(path.join("/"), _editor_url);
-}
-}
-else
-{
-alert("WARNING: _editor_url is not set!  You should set this variable to the editor files path; it should preferably be an absolute path, like in '/htmlarea/', but it can be relative if you prefer.  Further we will try to load the editor files correctly but we'll probably fail.");
-_editor_url = '';
-}
-
-// make sure we have a language
-if ( typeof _editor_lang == "string" )
-{
-_editor_lang = _editor_lang.toLowerCase();
-}
-else
-{
-_editor_lang = "en";
-}
-
-// skin stylesheet to load
-if ( typeof _editor_skin !== "string" )
-{
-_editor_skin = "";
-}
-/**
-* The list of Xinha editors on the page. May be multiple editors.
-* You can access each editor object through this global variable.
-*
-* Example:<br />
-* <code>
-*	var html = __xinhas[0].getEditorContent(); // gives you the HTML of the first editor in the page
-* </code>
-*/
-var __xinhas = [];
-
-// browser identification
-/** Cache the user agent for the following checks
- * @private
- */
-Xinha.agt       = navigator.userAgent.toLowerCase();
-/** Browser is Microsoft Internet Explorer
-@type string 
-*/
-Xinha.is_ie    = ((Xinha.agt.indexOf("msie") != -1) && (Xinha.agt.indexOf("opera") == -1));
-/** Version Number, if browser is Microsoft Internet Explorer
-@type string 
-*/
-Xinha.ie_version= parseFloat(Xinha.agt.substring(Xinha.agt.indexOf("msie")+5));
-/** Browser is Opera
-@type string 
-*/
-Xinha.is_opera  = (Xinha.agt.indexOf("opera") != -1);
-/** Version Number, if browser is Opera 
-@type string 
-*/
-Xinha.opera_version = navigator.appVersion.substring(0, navigator.appVersion.indexOf(" "))*1;
-/** Browserengine is KHTML (Konqueror, Safari)
-@type string 
-*/
-Xinha.is_khtml  = (Xinha.agt.indexOf("khtml") != -1);
-/** Browser is Safari
-@type string 
-*/
-Xinha.is_safari  = (Xinha.agt.indexOf("safari") != -1);
-/** OS is MacOS
-@type string 
-*/
-Xinha.is_mac	   = (Xinha.agt.indexOf("mac") != -1);
-/** Browser is Microsoft Internet Explorer Mac
-@type string 
-*/
-Xinha.is_mac_ie = (Xinha.is_ie && Xinha.is_mac);
-/** Browser is Microsoft Internet Explorer Windows
-@type string 
-*/
-Xinha.is_win_ie = (Xinha.is_ie && !Xinha.is_mac);
-/** Browserengine is Gecko (Mozilla)
-@type string 
-*/
-Xinha.is_gecko  = (navigator.product == "Gecko" && !Xinha.is_safari); // Safari lies!
-/** File is opened locally opened ("file://" protocol)
- * @type string
- * @private
- */
-Xinha.isRunLocally = document.URL.toLowerCase().search(/^file:/) != -1;
-/** Editing is enabled by document.designMode (Gecko, Opera), as opposed to contenteditable (IE)
- * @type string
- * @private
- */
-Xinha.is_designMode = (typeof document.designMode != 'undefined' && !Xinha.is_ie); // IE has designMode, but we're not using it
-
-/** Check if Xinha can run in the used browser, otherwise the textarea will be remain unchanged
- * @type Boolean
- * @private
- */
-Xinha.checkSupportedBrowser = function()
-{
-if ( Xinha.is_gecko )
-{
-  if ( navigator.productSub < 20021201 )
-  {
-    alert("You need at least Mozilla-1.3 Alpha.\nSorry, your Gecko is not supported.");
-    return false;
-  }
-  if ( navigator.productSub < 20030210 )
-  {
-    alert("Mozilla < 1.3 Beta is not supported!\nI'll try, though, but it might not work.");
-  }
-}
-if ( Xinha.is_opera )
-{
-  alert("Sorry, Opera is not yet supported by Xinha.");
-}
-return Xinha.is_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5;
-};
-/** Cache result of checking for browser support
- * @type Boolean
- * @private
- */
-Xinha.isSupportedBrowser = Xinha.checkSupportedBrowser();
-
-if ( Xinha.isRunLocally && Xinha.isSupportedBrowser)
-{
-alert('Xinha *must* be installed on a web server. Locally opened files (those that use the "file://" protocol) cannot properly function. Xinha will try to initialize but may not be correctly loaded.');
-}
-
-/** Creates a new Xinha object
- * @version $Rev: 921 $ $LastChangedDate: 2007-11-19 08:42:42 +1300 (Mon, 19 Nov 2007) $
- * @constructor
- * @param {String|DomNode}   textarea the textarea to replace; can be either only the id or the DOM object as returned by document.getElementById()
- * @param {Xinha.Config} config optional if no Xinha.Config object is passed, the default config is used
- */
-function Xinha(textarea, config)
-{
-if ( !Xinha.isSupportedBrowser ) return;
-  
-if ( !textarea )
-{
-  throw new Error ("Tried to create Xinha without textarea specified.");
-}
-
-if ( typeof config == "undefined" )
-{
-	/** The configuration used in the editor
-	 * @type Xinha.Config
-	 */
-  this.config = new Xinha.Config();
-}
-else
-{
-  this.config = config;
-}
-
-if ( typeof textarea != 'object' )
-{
-  textarea = Xinha.getElementById('textarea', textarea);
-}
-/** This property references the original textarea, which is at the same time the editor in text mode
- * @type DomNode textarea
- */
-this._textArea = textarea;
-this._textArea.spellcheck = false;
-Xinha.freeLater(this, '_textArea');
-  
-// 
-/** Before we modify anything, get the initial textarea size
- * @private
- * @type Object w,h 
- */
-this._initial_ta_size =
-{
-  w: textarea.style.width  ? textarea.style.width  : ( textarea.offsetWidth  ? ( textarea.offsetWidth  + 'px' ) : ( textarea.cols + 'em') ),
-  h: textarea.style.height ? textarea.style.height : ( textarea.offsetHeight ? ( textarea.offsetHeight + 'px' ) : ( textarea.rows + 'em') )
-};
-
-if ( document.getElementById("loading_" + textarea.id) || this.config.showLoading )
-{
-  if (!document.getElementById("loading_" + textarea.id))
-  {
-    Xinha.createLoadingMessage(textarea);
-  }
-  this.setLoadingMessage(Xinha._lc("Constructing object"));
-}
-
-/** the current editing mode
-* @private 
-* @type string "wysiwyg"|"text"
-*/
-this._editMode = "wysiwyg";
-/** this object holds the plugins used in the editor
-* @private 
-* @type Object
-*/
-this.plugins = {};
-/** periodically updates the toolbar
-* @private 
-* @type timeout
-*/
-this._timerToolbar = null;
-/** periodically takes a snapshot of the current editor content
-* @private 
-* @type timeout
-*/
-this._timerUndo = null;
-/** holds the undo snapshots
-* @private 
-* @type Array
-*/
-this._undoQueue = [this.config.undoSteps];
-/** the current position in the undo queue 
-* @private 
-* @type integer
-*/
-this._undoPos = -1;
-/** use our own undo implementation (true) or the browser's (false) 
-* @private 
-* @type Boolean
-*/
-this._customUndo = true;
-/** the document object of the page Xinha is embedded in
-* @private 
-* @type document
-*/
-this._mdoc = document; // cache the document, we need it in plugins
-/** doctype of the edited document (fullpage mode)
-* @private 
-* @type string
-*/
-this.doctype = '';
-/** running number that identifies the current editor
-* @public 
-* @type integer
-*/
-this.__htmlarea_id_num = __xinhas.length;
-__xinhas[this.__htmlarea_id_num] = this;
-	
-/** holds the events for use with the notifyOn/notifyOf system
-* @private 
-* @type Object
-*/
-this._notifyListeners = {};
-
-// Panels
-var panels = 
-{
-  right:
-  {
-    on: true,
-    container: document.createElement('td'),
-    panels: []
-  },
-  left:
-  {
-    on: true,
-    container: document.createElement('td'),
-    panels: []
-  },
-  top:
-  {
-    on: true,
-    container: document.createElement('td'),
-    panels: []
-  },
-  bottom:
-  {
-    on: true,
-    container: document.createElement('td'),
-    panels: []
-  }
-};
-
-for ( var i in panels )
-{
-  if(!panels[i].container) { continue; } // prevent iterating over wrong type
-  panels[i].div = panels[i].container; // legacy
-  panels[i].container.className = 'panels ' + i;
-  Xinha.freeLater(panels[i], 'container');
-  Xinha.freeLater(panels[i], 'div');
-}
-/** holds the panels
-* @private 
-* @type Array
-*/
-// finally store the variable
-this._panels = panels;
-	
-// Init some properties that are defined later
-/** The statusbar container
- * @type DomNode statusbar div
- */
-this._statusBar = null;
-/** The DOM path that is shown in the statusbar in wysiwyg mode
- * @private
- * @type DomNode
- */
-this._statusBarTree = null;
-/** The message that is shown in the statusbar in text mode
- * @private
- * @type DomNode
- */
-this._statusBarTextMode = null;
-/** Holds the items of the DOM path that is shown in the statusbar in wysiwyg mode
- * @private
- * @type Array tag names
- */
-this._statusBarItems = [];
-/** Holds the parts (table cells) of the UI (toolbar, panels, statusbar)
-
- * @type Object framework parts
- */
-this._framework = {};
-/** Them whole thing (table)
- * @private
- * @type DomNode
- */
-this._htmlArea = null;
-/** This is the actual editable area.<br />
- *  Technically it's an iframe that's made editable using window.designMode = 'on', respectively document.body.contentEditable = true (IE).<br />
- *  Use this property to get a grip on the iframe's window features<br />
- *
- * @type window
- */
-this._iframe = null;
-/** The document object of the iframe.<br />
-*   Use this property to perform DOM operations on the edited document
-* @type document
-*/
-this._doc = null;
-/** The toolbar
- *  @private
- *  @type DomNode 
- */
-this._toolBar = this._toolbar = null; //._toolbar is for legacy, ._toolBar is better thanks.
-/** Holds the botton objects
- *  @private
- *  @type Object
- */
-this._toolbarObjects = {};
-  
-}
-
-Xinha.onload = function() { };
-Xinha.init = function() { Xinha.onload(); };
-
-// cache some regexps
-/** Identifies HTML tag names
-* @type RegExp
-*/
-Xinha.RE_tagName  = /(<\/|<)\s*([^ \t\n>]+)/ig;
-/** Exracts DOCTYPE string from HTML
-* @type RegExp
-*/
-Xinha.RE_doctype  = /(<!doctype((.|\n)*?)>)\n?/i;
-/** Finds head section in HTML
-* @type RegExp
-*/
-Xinha.RE_head     = /<head>((.|\n)*?)<\/head>/i;
-/** Finds body section in HTML
-* @type RegExp
-*/
-Xinha.RE_body     = /<body[^>]*>((.|\n|\r|\t)*?)<\/body>/i;
-/** Special characters that need to be escaped when dynamically creating a RegExp from an arbtrary string
-* @private
-* @type RegExp
-*/
-Xinha.RE_Specials = /([\/\^$*+?.()|{}[\]])/g;
-/** When dynamically creating a RegExp from an arbtrary string, some charactes that have special meanings in regular expressions have to be escaped.
-*   Run any string through this function to escape reserved characters.
-* @param {string} string the string to be escaped
-* @returns string
-*/
-Xinha.escapeStringForRegExp = function (string)
-{
-return string.replace(Xinha.RE_Specials, '\\$1');
-}
-/** Identifies email addresses
-* @type RegExp
-*/
-Xinha.RE_email    = /^[_a-z\d\-\.]{3,}@[_a-z\d\-]{2,}(\.[_a-z\d\-]{2,})+$/i;
-/** Identifies URLs
-* @type RegExp
-*/
-Xinha.RE_url      = /(https?:\/\/)?(([a-z0-9_]+:[a-z0-9_]+@)?[a-z0-9_-]{2,}(\.[a-z0-9_-]{2,}){2,}(:[0-9]+)?(\/\S+)*)/i;
-
-
-
-/**
- * This class creates an object that can be passed to the Xinha constructor as a parameter.
- * Set the object's properties as you need to configure the editor (toolbar etc.)
- * @version $Rev: 921 $ $LastChangedDate: 2007-11-19 08:42:42 +1300 (Mon, 19 Nov 2007) $
- * @constructor
- */
-Xinha.Config = function()
-{
-var cfg = this;
-this.version = Xinha.version.Revision;
-  
- /** This property controls the width of the editor.<br />
-*  Allowed values are 'auto', 'toolbar' or a numeric value followed by "px".<br />
-*  <code>auto</code>: let Xinha choose the width to use.<br />
-*  <code>toolbar</code>: compute the width size from the toolbar width.<br />
-*  <code>numeric value</code>: forced width in pixels ('600px').<br />
-* 
-*  Default: <code>"auto"</code>
-* @type String
-*/
-this.width  = "auto";
- /** This property controls the height of the editor.<br />
-*  Allowed values are 'auto' or a numeric value followed by px.<br />
-*  <code>"auto"</code>: let Xinha choose the height to use.<br />
-*  <code>numeric value</code>: forced height in pixels ('200px').<br />
-*  Default: <code>"auto"</code> 
-* @type String
-*/
-this.height = "auto";
-
- /** Specifies whether the toolbar should be included
-*  in the size, or are extra to it.  If false then it's recommended
-*  to have the size set as explicit pixel sizes (either in Xinha.Config or on your textarea)<br />
-*
-*  Default: <code>true</code>
-*
-*  @type Boolean
-*/
-this.sizeIncludesBars = true;
- /**
-* Specifies whether the panels should be included
-* in the size, or are extra to it.  If false then it's recommended
-* to have the size set as explicit pixel sizes (either in Xinha.Config or on your textarea)<br />
-*  
-*  Default: <code>true</code>
-*
-*  @type Boolean
-*/
-this.sizeIncludesPanels = true;
-
- /**
-* each of the panels has a dimension, for the left/right it's the width
-* for the top/bottom it's the height.
-*
-* WARNING: PANEL DIMENSIONS MUST BE SPECIFIED AS PIXEL WIDTHS<br />
-*Default values:  
-*<pre>
-*	  xinha_config.panel_dimensions =
-*   {
-*	    left:   '200px', // Width
-*	    right:  '200px',
-*	    top:    '100px', // Height
-*	    bottom: '100px'
-*	  }
-*</pre>
-*  @type Object
-*/
-this.panel_dimensions =
-{
-  left:   '200px', // Width
-  right:  '200px',
-  top:    '100px', // Height
-  bottom: '100px'
-};
-
- /**  To make the iframe width narrower than the toolbar width, e.g. to maintain
-*   the layout when editing a narrow column of text, set the next parameter (in pixels).<br />
-*
-*  Default: <code>true</code>
-*
-*  @type Integer|null
-*/
-this.iframeWidth = null;
- 
- /** Enable creation of the status bar?<br />
-*
-*  Default: <code>true</code>
-*
-*  @type Boolean 
-*/
-this.statusBar = true;
-
- /** Intercept ^V and use the Xinha paste command
-*  If false, then passes ^V through to browser editor widget, which is the only way it works without problems in Mozilla<br />
-*
-*  Default: <code>false</code>
-*
-*  @type Boolean
-*/
-this.htmlareaPaste = false;
-  
- /** <strong>Gecko only:</strong> Let the built-in routine for handling the <em>return</em> key decide if to enter <em>br</em> or <em>p</em> tags,
-*  or use a custom implementation.<br />
-*  For information about the rules applied by Gecko, <a href="http://www.mozilla.org/editor/rules.html">see Mozilla website</a> <br />
-*  Possible values are <em>built-in</em> or <em>best</em><br />
-*
-*  Default: <code>"best"</code>
-*
-*  @type String
-*/
-this.mozParaHandler = 'best'; 
-  
- /** This determines the method how the HTML output is generated.
-*  There are two choices:
-* 
-*<table border="1">
-*   <tr>
-*       <td><em>DOMwalk</em></td>
-*       <td>This is the classic and proven method. It recusively traverses the DOM tree 
-*           and builds the HTML string "from scratch". Tends to be a bit slow, especially in IE.</td>
-*   </tr>
-*   <tr>
-*       <td><em>TransformInnerHTML</em></td>
-*       <td>This method uses the JavaScript innerHTML property and relies on Regular Expressions to produce
-*            clean XHTML output. This method is much faster than the other one.</td>
-*     </tr>
-* </table>
-*
-*  Default: <code>"DOMwalk"</code>
-*
-* @type String
-*/
-this.getHtmlMethod = 'DOMwalk';
-  
-/** Maximum size of the undo queue<br />
- *  Default: <code>20</code>
- *  @type Integer
- */
-this.undoSteps = 20;
-
-/** The time interval at which undo samples are taken<br />
- *  Default: <code>500</code> (1/2 sec)
- *  @type Integer milliseconds
- */
-this.undoTimeout = 500;
-
-/** Set this to true if you want to explicitly right-justify when setting the text direction to right-to-left<br />
- *  Default: <code>false</code>
- *  @type Boolean
- */
-this.changeJustifyWithDirection = false;
-
-/** If true then Xinha will retrieve the full HTML, starting with the &lt;HTML&gt; tag.<br />
- *  Default: <code>false</code>
- *  @type Boolean
- */
-this.fullPage = false;
-
-/** Raw style definitions included in the edited document<br />
- *  When a lot of inline style is used, perhaps it is wiser to use one or more external stylesheets.<br />
- *  To set tags P in red, H1 in blue andn A not underlined, we may do the following
- *<pre>
- * xinha_config.pageStyle =
- *  'p { color:red; }\n' +
- *  'h1 { color:bleu; }\n' +
- *  'a {text-decoration:none; }';
- *</pre>
- *  Default: <code>""</code> (empty)
- *  @type String
- */
-this.pageStyle = "";
-
-/** Array of external stylesheets to load. (Reference these absolutely)<br />
- *  Example<br />
- *  <pre>xinha_config.pageStyleSheets = ["/css/myPagesStyleSheet.css","/css/anotherOne.css"];</pre>
- *  Default: <code>[]</code> (empty)
- *  @type Array
- */
-this.pageStyleSheets = [];
-
-// specify a base href for relative links
-/** Specify a base href for relative links<br />
- *  ATTENTION: this does not work as expected and needs t be changed, see Ticket #961 <br />
- *  Default: <code>null</code>
- *  @type String|null
- */
-this.baseHref = null;
-
-/** If true, relative URLs (../) will be made absolute. 
- *  When the editor is in different directory depth 
- *  as the edited page relative image sources will break the display of your images.
- *  this fixes an issue where Mozilla converts the urls of images and links that are on the same server 
- *  to relative ones (../) when dragging them around in the editor (Ticket #448)<br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.expandRelativeUrl = true;
-  
- /**  We can strip the server part out of URL to make/leave them semi-absolute, reason for this
- *  is that the browsers will prefix  the server to any relative links to make them absolute, 
- *  which isn't what you want most the time.<br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.stripBaseHref = true;
-
- /**  We can strip the url of the editor page from named links (eg &lt;a href="#top"&gt;...&lt;/a&gt;) and links 
- *  that consist only of URL parameters (eg &lt;a href="?parameter=value"&gt;...&lt;/a&gt;)
- *  reason for this is that browsers tend to prefixe location.href to any href that
- *  that don't have a full url<br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.stripSelfNamedAnchors = true;
-
-/** In URLs all characters above ASCII value 127 have to be encoded using % codes<br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.only7BitPrintablesInURLs = true;
-
- 
-/** If you are putting the HTML written in Xinha into an email you might want it to be 7-bit
- *  characters only.  This config option will convert all characters consuming
- *  more than 7bits into UNICODE decimal entity references (actually it will convert anything
- *  below <space> (chr 20) except cr, lf and tab and above <tilde> (~, chr 7E))<br />
- *  Default: <code>false</code>
- *  @type Boolean
- */
-this.sevenBitClean = false;
-
-
-/** Sometimes we want to be able to replace some string in the html comng in and going out
- *  so that in the editor we use the "internal" string, and outside and in the source view
- *  we use the "external" string  this is useful for say making special codes for
- *  your absolute links, your external string might be some special code, say "{server_url}"
- *  an you say that the internal represenattion of that should be http://your.server/<br />
- *  Example:  <code>{'external_string' : 'internal_string'}</code><br />
- *  Default: <code>{}</code> (empty)
- *  @type Object
- */
-this.specialReplacements = {}; // { 'external_string' : 'internal_string' }
-
- /** Set to true if you want Word code to be cleaned upon Paste. This only works if 
- * you use the toolbr button to paste, not ^V. This means that due to the restrictions
- * regarding pasting, this actually has no real effect in Mozilla <br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.killWordOnPaste = true;
-
-/** Enable the 'Target' field in the Make Link dialog. Note that the target attribute is invalid in (X)HTML strict<br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.makeLinkShowsTarget = true;
-
-/** CharSet of the iframe, default is the charset of the document
- *  @type String
- */
-this.charSet = (typeof document.characterSet != 'undefined') ? document.characterSet : document.charset;
-
- /** Whether the edited document should be rendered in Quirksmode or Standard Compliant (Strict) Mode.<br />
- * This is commonly known as the "doctype switch"<br />
- * for details read here http://www.quirksmode.org/css/quirksmode.html
- *
- * Possible values:<br />
- *    true     :  Quirksmode is used<br />
- *    false    :  Strict mode is used<br />
- *    null (default):  the mode of the document Xinha is in is used
- * @type Boolean|null
- */
-this.browserQuirksMode = null;
-
-// URL-s
-this.imgURL = "images/";
-this.popupURL = "popups/";
-
-/** Remove given tags when rendering the HTML (these have to be a regexp, or null if this functionality is not desired)<br />
- *  Default: <code>null</code>
- *  @type RegExp|null
- */
-this.htmlRemoveTags = null;
-
- /** Turning this on will turn all "linebreak" and "separator" items in your toolbar into soft-breaks,
- * this means that if the items between that item and the next linebreak/separator can
- * fit on the same line as that which came before then they will, otherwise they will
- * float down to the next line.
-
- * If you put a linebreak and separator next to each other, only the separator will
- * take effect, this allows you to have one toolbar that works for both flowToolbars = true and false
- * infact the toolbar below has been designed in this way, if flowToolbars is false then it will
- * create explictly two lines (plus any others made by plugins) breaking at justifyleft, however if
- * flowToolbars is false and your window is narrow enough then it will create more than one line
- * even neater, if you resize the window the toolbars will reflow.  <br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.flowToolbars = true;
-  
-/** Set to center or right to change button alignment in toolbar
- *  @type String
- */
-this.toolbarAlign = "left";
-  
-/** Set to true if you want the loading panel to show at startup<br />
- *  Default: <code>false</code>
- *  @type Boolean
- */
-this.showLoading = false;
-  
-/** Set to false if you want to allow JavaScript in the content, otherwise &lt;script&gt; tags are stripped out.<br />
- *  This currently only affects the "DOMwalk" getHtmlMethod.<br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
-this.stripScripts = true;
-
- /** See if the text just typed looks like a URL, or email address
- * and link it appropriatly
- * Note: Setting this option to false only affects Mozilla based browsers.
- * In InternetExplorer this is native behaviour and cannot be turned off.<br />
- *  Default: <code>true</code>
- *  @type Boolean
- */
- this.convertUrlsToLinks = true;
-
-
- /** Size of color picker cells<br />
- * Use number + "px"<br />
- *  Default: <code>"6px"</code>
- *  @type String
- */
-this.colorPickerCellSize = '6px';
- /** Granularity of color picker cells (number per column/row)<br />
- *  Default: <code>18</code>
- *  @type Integer
- */
-this.colorPickerGranularity = 18;
- /** Position of color picker from toolbar button<br />
- *  Default: <code>"bottom,right"</code>
- *  @type String
- */
-this.colorPickerPosition = 'bottom,right';
-/** Set to true to show only websafe checkbox in picker<br />
- *  Default: <code>false</code>
- *  @type Boolean
- */
-this.colorPickerWebSafe = false;
- /** Number of recent colors to remember<br />
- *  Default: <code>20</code>
- *  @type Integer
- */
-this.colorPickerSaveColors = 20;
-
-/** Start up the editor in fullscreen mode<br />
- *  Default: <code>false</code>
- *  @type Boolean
- */
-this.fullScreen = false;
-  
- /** You can tell the fullscreen mode to leave certain margins on each side.<br />
- *  The value is an array with the values for <code>[top,right,bottom,left]</code> in that order<br />
- *  Default: <code>[0,0,0,0]</code>
- *  @type Array
- */
-this.fullScreenMargins = [0,0,0,0];
-  
-/** This array orders all buttons except plugin buttons in the toolbar. Plugin buttons typically look for one 
- *  a certain button in the toolbar and place themselves next to it.
- * Default value:
- *<pre>
- *xinha_config.toolbar =
- * [
- *   ["popupeditor"],
- *   ["separator","formatblock","fontname","fontsize","bold","italic","underline","strikethrough"],
- *   ["separator","forecolor","hilitecolor","textindicator"],
- *   ["separator","subscript","superscript"],
- *   ["linebreak","separator","justifyleft","justifycenter","justifyright","justifyfull"],
- *   ["separator","insertorderedlist","insertunorderedlist","outdent","indent"],
- *   ["separator","inserthorizontalrule","createlink","insertimage","inserttable"],
- *   ["linebreak","separator","undo","redo","selectall","print"], (Xinha.is_gecko ? [] : ["cut","copy","paste","overwrite","saveas"]),
- *   ["separator","killword","clearfonts","removeformat","toggleborders","splitblock","lefttoright", "righttoleft"],
- *   ["separator","htmlmode","showhelp","about"]
- * ];
- *</pre>
- * @type Array
- */  
-this.toolbar =
-[
-  ["popupeditor"],
-  ["separator","formatblock","fontname","fontsize","bold","italic","underline","strikethrough"],
-  ["separator","forecolor","hilitecolor","textindicator"],
-  ["separator","subscript","superscript"],
-  ["linebreak","separator","justifyleft","justifycenter","justifyright","justifyfull"],
-  ["separator","insertorderedlist","insertunorderedlist","outdent","indent"],
-  ["separator","inserthorizontalrule","createlink","insertimage","inserttable"],
-  ["linebreak","separator","undo","redo","selectall","print"], (Xinha.is_gecko ? [] : ["cut","copy","paste","overwrite","saveas"]),
-  ["separator","killword","clearfonts","removeformat","toggleborders","splitblock","lefttoright", "righttoleft"],
-  ["separator","htmlmode","showhelp","about"]
-];
-
-/** The fontnames listed in the fontname dropdown
- * Default value:
- *<pre>
- *xinha_config.fontname =
- *{
- *  "&mdash; font &mdash;" : '',
- *  "Arial"                : 'arial,helvetica,sans-serif',
- *  "Courier New"          : 'courier new,courier,monospace',
- *  "Georgia"              : 'georgia,times new roman,times,serif',
- *  "Tahoma"               : 'tahoma,arial,helvetica,sans-serif',
- *  "Times New Roman"      : 'times new roman,times,serif',
- *  "Verdana"              : 'verdana,arial,helvetica,sans-serif',
- *  "impact"               : 'impact',
- *  "WingDings"            : 'wingdings'
- *};
- *</pre>
- * @type Object
- */
-this.fontname =
-{
-  "&mdash; font &mdash;": '',
-  "Arial"           :	'arial,helvetica,sans-serif',
-  "Courier New"     :	'courier new,courier,monospace',
-  "Georgia"         :	'georgia,times new roman,times,serif',
-  "Tahoma"          :	'tahoma,arial,helvetica,sans-serif',
-  "Times New Roman" : 'times new roman,times,serif',
-  "Verdana"         :	'verdana,arial,helvetica,sans-serif',
-  "impact"          :	'impact',
-  "WingDings"       : 'wingdings' 
-};
-
-/** The fontsizes listed in the fontsize dropdown
- * Default value:
- *<pre>
- *xinha_config.fontsize =
- *{
- *  "&mdash; size &mdash;": "",
- *  "1 (8 pt)" : "1",
- *  "2 (10 pt)": "2",
- *  "3 (12 pt)": "3",
- *  "4 (14 pt)": "4",
- *  "5 (18 pt)": "5",
- *  "6 (24 pt)": "6",
- *  "7 (36 pt)": "7"
- *};
- *</pre>
- * @type Object
- */
-this.fontsize =
-{
-  "&mdash; size &mdash;": "",
-  "1 (8 pt)" : "1",
-  "2 (10 pt)": "2",
-  "3 (12 pt)": "3",
-  "4 (14 pt)": "4",
-  "5 (18 pt)": "5",
-  "6 (24 pt)": "6",
-  "7 (36 pt)": "7"
-};
-/** The tags listed in the formatblock dropdown
- * Default value:
- *<pre>
- *xinha_config.formatblock =
- *{
- *  "&mdash; size &mdash;": "",
- *  "1 (8 pt)" : "1",
- *  "2 (10 pt)": "2",
- *  "3 (12 pt)": "3",
- *  "4 (14 pt)": "4",
- *  "5 (18 pt)": "5",
- *  "6 (24 pt)": "6",
- *  "7 (36 pt)": "7"
- *};
- *</pre>
- * @type Object
- */
-this.formatblock =
-{
-  "&mdash; format &mdash;": "",
-  "Heading 1": "h1",
-  "Heading 2": "h2",
-  "Heading 3": "h3",
-  "Heading 4": "h4",
-  "Heading 5": "h5",
-  "Heading 6": "h6",
-  "Normal"   : "p",
-  "Address"  : "address",
-  "Formatted": "pre"
-};
-/** ??
- * Default: <code>{}</code>
- * @type Object
- */
-this.customSelects = {};
-
-/** Switches on some debugging (only in execCommand() as far as I see at the moment)<br />
- *
- * Default: <code>true</code>
- * @type Boolean
- */
-this.debug = true;
-
-this.URIs =
-{
- "blank": _editor_url + "popups/blank.html",
- "link":  _editor_url + "modules/CreateLink/link.html",
- "insert_image": _editor_url + "modules/InsertImage/insert_image.html",
- "insert_table":  _editor_url + "modules/InsertTable/insert_table.html",
- "select_color": _editor_url + "popups/select_color.html",
- "about": _editor_url + "popups/about.html",
- "help": _editor_url + "popups/editor_help.html"
-};
-
-
- /** The button list conains the definitions of the toolbar button. Normally, there's nothing to change here :) 
- * <div style="white-space:pre">ADDING CUSTOM BUTTONS: please read below!
- * format of the btnList elements is "ID: [ ToolTip, Icon, Enabled in text mode?, ACTION ]"
- *    - ID: unique ID for the button.  If the button calls document.execCommand
- *	    it's wise to give it the same name as the called command.
- *    - ACTION: function that gets called when the button is clicked.
- *              it has the following prototype:
- *                 function(editor, buttonName)
- *              - editor is the Xinha object that triggered the call
- *              - buttonName is the ID of the clicked button
- *              These 2 parameters makes it possible for you to use the same
- *              handler for more Xinha objects or for more different buttons.
- *    - ToolTip: tooltip, will be translated below
- *    - Icon: path to an icon image file for the button
- *            OR; you can use an 18x18 block of a larger image by supllying an array
- *            that has three elemtents, the first is the larger image, the second is the column
- *            the third is the row.  The ros and columns numbering starts at 0 but there is
- *            a header row and header column which have numbering to make life easier.
- *            See images/buttons_main.gif to see how it's done.
- *    - Enabled in text mode: if false the button gets disabled for text-only mode; otherwise enabled all the time.</div>
- * @type Object
- */
-this.btnList =
-{
-  bold: [ "Bold", Xinha._lc({key: 'button_bold', string: ["ed_buttons_main.gif",3,2]}, 'Xinha'), false, function(e) { e.execCommand("bold"); } ],
-  italic: [ "Italic", Xinha._lc({key: 'button_italic', string: ["ed_buttons_main.gif",2,2]}, 'Xinha'), false, function(e) { e.execCommand("italic"); } ],
-  underline: [ "Underline", Xinha._lc({key: 'button_underline', string: ["ed_buttons_main.gif",2,0]}, 'Xinha'), false, function(e) { e.execCommand("underline"); } ],
-  strikethrough: [ "Strikethrough", Xinha._lc({key: 'button_strikethrough', string: ["ed_buttons_main.gif",3,0]}, 'Xinha'), false, function(e) { e.execCommand("strikethrough"); } ],
-  subscript: [ "Subscript", Xinha._lc({key: 'button_subscript', string: ["ed_buttons_main.gif",3,1]}, 'Xinha'), false, function(e) { e.execCommand("subscript"); } ],
-  superscript: [ "Superscript", Xinha._lc({key: 'button_superscript', string: ["ed_buttons_main.gif",2,1]}, 'Xinha'), false, function(e) { e.execCommand("superscript"); } ],
-
-  justifyleft: [ "Justify Left", ["ed_buttons_main.gif",0,0], false, function(e) { e.execCommand("justifyleft"); } ],
-  justifycenter: [ "Justify Center", ["ed_buttons_main.gif",1,1], false, function(e){ e.execCommand("justifycenter"); } ],
-  justifyright: [ "Justify Right", ["ed_buttons_main.gif",1,0], false, function(e) { e.execCommand("justifyright"); } ],
-  justifyfull: [ "Justify Full", ["ed_buttons_main.gif",0,1], false, function(e) { e.execCommand("justifyfull"); } ],
-
-  orderedlist: [ "Ordered List", ["ed_buttons_main.gif",0,3], false, function(e) { e.execCommand("insertorderedlist"); } ],
-  unorderedlist: [ "Bulleted List", ["ed_buttons_main.gif",1,3], false, function(e) { e.execCommand("insertunorderedlist"); } ],
-  insertorderedlist: [ "Ordered List", ["ed_buttons_main.gif",0,3], false, function(e) { e.execCommand("insertorderedlist"); } ],
-  insertunorderedlist: [ "Bulleted List", ["ed_buttons_main.gif",1,3], false, function(e) { e.execCommand("insertunorderedlist"); } ],
-
-  outdent: [ "Decrease Indent", ["ed_buttons_main.gif",1,2], false, function(e) { e.execCommand("outdent"); } ],
-  indent: [ "Increase Indent",["ed_buttons_main.gif",0,2], false, function(e) { e.execCommand("indent"); } ],
-  forecolor: [ "Font Color", ["ed_buttons_main.gif",3,3], false, function(e) { e.execCommand("forecolor"); } ],
-  hilitecolor: [ "Background Color", ["ed_buttons_main.gif",2,3], false, function(e) { e.execCommand("hilitecolor"); } ],
-
-  undo: [ "Undoes your last action", ["ed_buttons_main.gif",4,2], false, function(e) { e.execCommand("undo"); } ],
-  redo: [ "Redoes your last action", ["ed_buttons_main.gif",5,2], false, function(e) { e.execCommand("redo"); } ],
-  cut: [ "Cut selection", ["ed_buttons_main.gif",5,0], false,  function (e, cmd) { e.execCommand(cmd); } ],
-  copy: [ "Copy selection", ["ed_buttons_main.gif",4,0], false,  function (e, cmd) { e.execCommand(cmd); } ],
-  paste: [ "Paste from clipboard", ["ed_buttons_main.gif",4,1], false,  function (e, cmd) { e.execCommand(cmd); } ],
-  selectall: [ "Select all", "ed_selectall.gif", false, function(e) {e.execCommand("selectall");} ],
-
-  inserthorizontalrule: [ "Horizontal Rule", ["ed_buttons_main.gif",6,0], false, function(e) { e.execCommand("inserthorizontalrule"); } ],
-  createlink: [ "Insert Web Link", ["ed_buttons_main.gif",6,1], false, function(e) { e._createLink(); } ],
-  insertimage: [ "Insert/Modify Image", ["ed_buttons_main.gif",6,3], false, function(e) { e.execCommand("insertimage"); } ],
-  inserttable: [ "Insert Table", ["ed_buttons_main.gif",6,2], false, function(e) { e.execCommand("inserttable"); } ],
-
-  htmlmode: [ "Toggle HTML Source", ["ed_buttons_main.gif",7,0], true, function(e) { e.execCommand("htmlmode"); } ],
-  toggleborders: [ "Toggle Borders", ["ed_buttons_main.gif",7,2], false, function(e) { e._toggleBorders(); } ],
-  print: [ "Print document", ["ed_buttons_main.gif",8,1], false, function(e) { if(Xinha.is_gecko) {e._iframe.contentWindow.print(); } else { e.focusEditor(); print(); } } ],
-  saveas: [ "Save as", "ed_saveas.gif", false, function(e) { e.execCommand("saveas",false,"noname.htm"); } ],
-  about: [ "About this editor", ["ed_buttons_main.gif",8,2], true, function(e) { e.execCommand("about"); } ],
-  showhelp: [ "Help using editor", ["ed_buttons_main.gif",9,2], true, function(e) { e.execCommand("showhelp"); } ],
-
-  splitblock: [ "Split Block", "ed_splitblock.gif", false, function(e) { e._splitBlock(); } ],
-  lefttoright: [ "Direction left to right", ["ed_buttons_main.gif",0,4], false, function(e) { e.execCommand("lefttoright"); } ],
-  righttoleft: [ "Direction right to left", ["ed_buttons_main.gif",1,4], false, function(e) { e.execCommand("righttoleft"); } ],
-  overwrite: [ "Insert/Overwrite", "ed_overwrite.gif", false, function(e) { e.execCommand("overwrite"); } ],
-
-  wordclean: [ "MS Word Cleaner", ["ed_buttons_main.gif",5,3], false, function(e) { e._wordClean(); } ],
-  clearfonts: [ "Clear Inline Font Specifications", ["ed_buttons_main.gif",5,4], true, function(e) { e._clearFonts(); } ],
-  removeformat: [ "Remove formatting", ["ed_buttons_main.gif",4,4], false, function(e) { e.execCommand("removeformat"); } ],
-  killword: [ "Clear MSOffice tags", ["ed_buttons_main.gif",4,3], false, function(e) { e.execCommand("killword"); } ]
-};
-
-
-// initialize tooltips from the I18N module and generate correct image path
-for ( var i in this.btnList )
-{
-  var btn = this.btnList[i];
-  // prevent iterating over wrong type
-  if ( typeof btn != 'object' )
-  {
-    continue;
-  } 
-  if ( typeof btn[1] != 'string' )
-  {
-    btn[1][0] = _editor_url + this.imgURL + btn[1][0];
-  }
-  else
-  {
-    btn[1] = _editor_url + this.imgURL + btn[1];
-  }
-  btn[0] = Xinha._lc(btn[0]); //initialize tooltip
-}
-
-};
-/** ADDING CUSTOM BUTTONS
-*   ---------------------
-*
-*
-* Example on how to add a custom button when you construct the Xinha:
-*
-*   var editor = new Xinha("your_text_area_id");
-*   var cfg = editor.config; // this is the default configuration
-*   cfg.btnList["my-hilite"] =
-*	[ function(editor) { editor.surroundHTML('<span style="background:yellow">', '</span>'); }, // action
-*	  "Highlight selection", // tooltip
-*	  "my_hilite.gif", // image
-*	  false // disabled in text mode
-*	];
-*   cfg.toolbar.push(["linebreak", "my-hilite"]); // add the new button to the toolbar
-*
-* An alternate (also more convenient and recommended) way to
-* accomplish this is to use the registerButton function below.
-*/
-/** Helper function: register a new button with the configuration.  It can be
- * called with all 5 arguments, or with only one (first one).  When called with
- * only one argument it must be an object with the following properties: id,
- * tooltip, image, textMode, action.<br />  
- * 
- * Examples:<br />
- *<pre>
- * config.registerButton("my-hilite", "Hilite text", "my-hilite.gif", false, function(editor) {...});
- * config.registerButton({
- *      id       : "my-hilite",      // the ID of your button
- *      tooltip  : "Hilite text",    // the tooltip
- *      image    : "my-hilite.gif",  // image to be displayed in the toolbar
- *      textMode : false,            // disabled in text mode
- *      action   : function(editor) { // called when the button is clicked
- *                   editor.surroundHTML('<span class="hilite">', '</span>');
- *                 },
- *      context  : "p"               // will be disabled if outside a <p> element
- *    });</pre>
- */
-Xinha.Config.prototype.registerButton = function(id, tooltip, image, textMode, action, context)
-{
-var the_id;
-if ( typeof id == "string" )
-{
-  the_id = id;
-}
-else if ( typeof id == "object" )
-{
-  the_id = id.id;
-}
-else
-{
-  alert("ERROR [Xinha.Config::registerButton]:\ninvalid arguments");
-  return false;
-}
-// check for existing id
-//  if(typeof this.customSelects[the_id] != "undefined")
-//  {
-  // alert("WARNING [Xinha.Config::registerDropdown]:\nA dropdown with the same ID already exists.");
-//  }
-//  if(typeof this.btnList[the_id] != "undefined") {
-  // alert("WARNING [Xinha.Config::registerDropdown]:\nA button with the same ID already exists.");
-//  }
-switch ( typeof id )
-{
-  case "string":
-    this.btnList[id] = [ tooltip, image, textMode, action, context ];
-  break;
-  case "object":
-    this.btnList[id.id] = [ id.tooltip, id.image, id.textMode, id.action, id.context ];
-  break;
-}
-};
-
-Xinha.prototype.registerPanel = function(side, object)
-{
-if ( !side )
-{
-  side = 'right';
-}
-this.setLoadingMessage('Register ' + side + ' panel ');
-var panel = this.addPanel(side);
-if ( object )
-{
-  object.drawPanelIn(panel);
-}
-};
-
-/** The following helper function registers a dropdown box with the editor
- * configuration.  You still have to add it to the toolbar, same as with the
- * buttons.  Call it like this:
- *
- * FIXME: add example
- */
-Xinha.Config.prototype.registerDropdown = function(object)
-{
-// check for existing id
-//  if ( typeof this.customSelects[object.id] != "undefined" )
-//  {
-  // alert("WARNING [Xinha.Config::registerDropdown]:\nA dropdown with the same ID already exists.");
-//  }
-//  if ( typeof this.btnList[object.id] != "undefined" )
-//  {
-  // alert("WARNING [Xinha.Config::registerDropdown]:\nA button with the same ID already exists.");
-//  }
-this.customSelects[object.id] = object;
-};
-
-/** Call this function to remove some buttons/drop-down boxes from the toolbar.
- * Pass as the only parameter a string containing button/drop-down names
- * delimited by spaces.  Note that the string should also begin with a space
- * and end with a space.  Example:
- *
- *   config.hideSomeButtons(" fontname fontsize textindicator ");
- *
- * It's useful because it's easier to remove stuff from the defaul toolbar than
- * create a brand new toolbar ;-)
- */
-Xinha.Config.prototype.hideSomeButtons = function(remove)
-{
-var toolbar = this.toolbar;
-for ( var i = toolbar.length; --i >= 0; )
-{
-  var line = toolbar[i];
-  for ( var j = line.length; --j >= 0; )
-  {
-    if ( remove.indexOf(" " + line[j] + " ") >= 0 )
-    {
-      var len = 1;
-      if ( /separator|space/.test(line[j + 1]) )
-      {
-        len = 2;
-      }
-      line.splice(j, len);
-    }
-  }
-}
-};
-
-/** Helper Function: add buttons/drop-downs boxes with title or separator to the toolbar
- * if the buttons/drop-downs boxes doesn't allready exists.
- * id: button or selectbox (as array with separator or title)
- * where: button or selectbox (as array if the first is not found take the second and so on)
- * position:
- * -1 = insert button (id) one position before the button (where)
- * 0 = replace button (where) by button (id)
- * +1 = insert button (id) one position after button (where)
- *
- * cfg.addToolbarElement(["T[title]", "button_id", "separator"] , ["first_id","second_id"], -1);
-*/
-
-Xinha.Config.prototype.addToolbarElement = function(id, where, position)
-{
-var toolbar = this.toolbar;
-var a, i, j, o, sid;
-var idIsArray = false;
-var whereIsArray = false;
-var whereLength = 0;
-var whereJ = 0;
-var whereI = 0;
-var exists = false;
-var found = false;
-// check if id and where are arrys
-if ( ( id && typeof id == "object" ) && ( id.constructor == Array ) )
-{
-  idIsArray = true;
-}
-if ( ( where && typeof where == "object" ) && ( where.constructor == Array ) )
-{
-  whereIsArray = true;
-  whereLength = where.length;
-}
-
-if ( idIsArray ) //find the button/select box in input array
-{
-  for ( i = 0; i < id.length; ++i )
-  {
-    if ( ( id[i] != "separator" ) && ( id[i].indexOf("T[") !== 0) )
-    {
-      sid = id[i];
-    }
-  }
-}
-else
-{
-  sid = id;
-}
-  
-for ( i = 0; i < toolbar.length; ++i ) {
-  a = toolbar[i];
-  for ( j = 0; j < a.length; ++j ) {
-    // check if button/select box exists
-    if ( a[j] == sid ) {
-      return; // cancel to add elements if same button already exists
-    }
-  }
-}
-  
-
-for ( i = 0; !found && i < toolbar.length; ++i )
-{
-  a = toolbar[i];
-  for ( j = 0; !found && j < a.length; ++j )
-  {
-    if ( whereIsArray )
-    {
-      for ( o = 0; o < whereLength; ++o )
-      {
-        if ( a[j] == where[o] )
-        {
-          if ( o === 0 )
-          {
-            found = true;
-            j--;
-            break;
-          }
-          else
-          {
-            whereI = i;
-            whereJ = j;
-            whereLength = o;
-          }
-        }
-      }
-    }
-    else
-    {
-      // find the position to insert
-      if ( a[j] == where )
-      { 
-        found = true;
-        break;
-      }
-    }
-  }
-}
-
-//if check found any other as the first button
-if ( !found && whereIsArray )
-{ 
-  if ( where.length != whereLength )
-  {
-    j = whereJ;
-    a = toolbar[whereI];
-    found = true;
-  }
-}
-if ( found )
-{
-  // replace the found button
-  if ( position === 0 )
-  {
-    if ( idIsArray)
-    {
-      a[j] = id[id.length-1];
-      for ( i = id.length-1; --i >= 0; )
-      {
-        a.splice(j, 0, id[i]);
-      }
-    }
-    else
-    {
-      a[j] = id;
-    }
-  }
-  else
-  { 
-    // insert before/after the found button
-    if ( position < 0 )
-    {
-      j = j + position + 1; //correct position before
-    }
-    else if ( position > 0 )
-    {
-      j = j + position; //correct posion after
-    }
-    if ( idIsArray )
-    {
-      for ( i = id.length; --i >= 0; )
-      {
-        a.splice(j, 0, id[i]);
-      }
-    }
-    else
-    {
-      a.splice(j, 0, id);
-    }
-  }
-}
-else
-{
-  // no button found
-  toolbar[0].splice(0, 0, "separator");
-  if ( idIsArray)
-  {
-    for ( i = id.length; --i >= 0; )
-    {
-      toolbar[0].splice(0, 0, id[i]);
-    }
-  }
-  else
-  {
-    toolbar[0].splice(0, 0, id);
-  }
-}
-};
-/** Alias of Xinha.Config.prototype.hideSomeButtons()
-* @type Function
-*/
-Xinha.Config.prototype.removeToolbarElement = Xinha.Config.prototype.hideSomeButtons;
-
-/** Helper function: replace all TEXTAREA-s in the document with Xinha-s. 
-* @param {Xinha.Config} optional config 
-*/
-Xinha.replaceAll = function(config)
-{
-var tas = document.getElementsByTagName("textarea");
-// @todo: weird syntax, doesnt help to read the code, doesnt obfuscate it and doesnt make it quicker, better rewrite this part
-for ( var i = tas.length; i > 0; (new Xinha(tas[--i], config)).generate() )
-{
-  // NOP
-}
-};
-
-/** Helper function: replaces the TEXTAREA with the given ID with Xinha. 
-* @param {string} id id of the textarea to replace 
-* @param {Xinha.Config} optional config 
-*/
-Xinha.replace = function(id, config)
-{
-var ta = Xinha.getElementById("textarea", id);
-return ta ? (new Xinha(ta, config)).generate() : null;
-};
- 
-/** Creates the toolbar and appends it to the _htmlarea
-* @private
-* @returns {DomNode} toolbar
-*/
-Xinha.prototype._createToolbar = function ()
-{
-this.setLoadingMessage(Xinha._lc('Create Toolbar'));
-var editor = this;	// to access this in nested functions
-
-var toolbar = document.createElement("div");
-// ._toolbar is for legacy, ._toolBar is better thanks.
-this._toolBar = this._toolbar = toolbar;
-toolbar.className = "toolbar";
-toolbar.unselectable = "1";
-toolbar.align = this.config.toolbarAlign;
-  
-Xinha.freeLater(this, '_toolBar');
-Xinha.freeLater(this, '_toolbar');
-  
-var tb_row = null;
-var tb_objects = {};
-this._toolbarObjects = tb_objects;
-
-this._createToolbar1(editor, toolbar, tb_objects);
-this._htmlArea.appendChild(toolbar);      
-  
-return toolbar;
-};
-
-/** FIXME : function never used, can probably be removed from source
-* @private
-* @deprecated
-*/
-Xinha.prototype._setConfig = function(config)
-{
-this.config = config;
-};
-/** FIXME: How can this be used??
-* @private
-*/
-Xinha.prototype._addToolbar = function()
-{
-this._createToolbar1(this, this._toolbar, this._toolbarObjects);
-};
-
-/**
- * Create a break element to add in the toolbar
- *
- * @return {DomNode} HTML element to add
- * @private
- */
-Xinha._createToolbarBreakingElement = function()
-{
-var brk = document.createElement('div');
-brk.style.height = '1px';
-brk.style.width = '1px';
-brk.style.lineHeight = '1px';
-brk.style.fontSize = '1px';
-brk.style.clear = 'both';
-return brk;
-};
-
-
-/** separate from previous createToolBar to allow dynamic change of toolbar
- * @private
- * @return {DomNode} toolbar
- */
-Xinha.prototype._createToolbar1 = function (editor, toolbar, tb_objects)
-{
-var tb_row;
-// This shouldn't be necessary, but IE seems to float outside of the container
-// when we float toolbar sections, so we have to clear:both here as well
-// as at the end (which we do have to do).
-if ( editor.config.flowToolbars )
-{
-  toolbar.appendChild(Xinha._createToolbarBreakingElement());
-}
-
-// creates a new line in the toolbar
-function newLine()
-{
-  if ( typeof tb_row != 'undefined' && tb_row.childNodes.length === 0)
-  {
-    return;
-  }
-
-  var table = document.createElement("table");
-  table.border = "0px";
-  table.cellSpacing = "0px";
-  table.cellPadding = "0px";
-  if ( editor.config.flowToolbars )
-  {
-    if ( Xinha.is_ie )
-    {
-      table.style.styleFloat = "left";
-    }
-    else
-    {
-      table.style.cssFloat = "left";
-    }
-  }
-
-  toolbar.appendChild(table);
-  // TBODY is required for IE, otherwise you don't see anything
-  // in the TABLE.
-  var tb_body = document.createElement("tbody");
-  table.appendChild(tb_body);
-  tb_row = document.createElement("tr");
-  tb_body.appendChild(tb_row);
-
-  table.className = 'toolbarRow'; // meh, kinda.
-} // END of function: newLine
-
-// init first line
-newLine();
-
-// updates the state of a toolbar element.  This function is member of
-// a toolbar element object (unnamed objects created by createButton or
-// createSelect functions below).
-function setButtonStatus(id, newval)
-{
-  var oldval = this[id];
-  var el = this.element;
-  if ( oldval != newval )
-  {
-    switch (id)
-    {
-      case "enabled":
-        if ( newval )
-        {
-          Xinha._removeClass(el, "buttonDisabled");
-          el.disabled = false;
-        }
-        else
-        {
-          Xinha._addClass(el, "buttonDisabled");
-          el.disabled = true;
-        }
-      break;
-      case "active":
-        if ( newval )
-        {
-          Xinha._addClass(el, "buttonPressed");
-        }
-        else
-        {
-          Xinha._removeClass(el, "buttonPressed");
-        }
-      break;
-    }
-    this[id] = newval;
-  }
-} // END of function: setButtonStatus
-
-// this function will handle creation of combo boxes.  Receives as
-// parameter the name of a button as defined in the toolBar config.
-// This function is called from createButton, above, if the given "txt"
-// doesn't match a button.
-function createSelect(txt)
-{
-  var options = null;
-  var el = null;
-  var cmd = null;
-  var customSelects = editor.config.customSelects;
-  var context = null;
-  var tooltip = "";
-  switch (txt)
-  {
-    case "fontsize":
-    case "fontname":
-    case "formatblock":
-      // the following line retrieves the correct
-      // configuration option because the variable name
-      // inside the Config object is named the same as the
-      // button/select in the toolbar.  For instance, if txt
-      // == "formatblock" we retrieve config.formatblock (or
-      // a different way to write it in JS is
-      // config["formatblock"].
-      options = editor.config[txt];
-      cmd = txt;
-    break;
-    default:
-      // try to fetch it from the list of registered selects
-      cmd = txt;
-      var dropdown = customSelects[cmd];
-      if ( typeof dropdown != "undefined" )
-      {
-        options = dropdown.options;
-        context = dropdown.context;
-        if ( typeof dropdown.tooltip != "undefined" )
-        {
-          tooltip = dropdown.tooltip;
-        }
-      }
-      else
-      {
-        alert("ERROR [createSelect]:\nCan't find the requested dropdown definition");
-      }
-    break;
-  }
-  if ( options )
-  {
-    el = document.createElement("select");
-    el.title = tooltip;
-    var obj =
-    {
-      name	: txt, // field name
-      element : el,	// the UI element (SELECT)
-      enabled : true, // is it enabled?
-      text	: false, // enabled in text mode?
-      cmd	: cmd, // command ID
-      state	: setButtonStatus, // for changing state
-      context : context
-    };
-      
-    Xinha.freeLater(obj);
-      
-    tb_objects[txt] = obj;
-      
-    for ( var i in options )
-    {
-      // prevent iterating over wrong type
-      if ( typeof(options[i]) != 'string' )
-      {
-        continue;
-      }
-      var op = document.createElement("option");
-      op.innerHTML = Xinha._lc(i);
-      op.value = options[i];
-      el.appendChild(op);
-    }
-    Xinha._addEvent(el, "change", function () { editor._comboSelected(el, txt); } );
-  }
-  return el;
-} // END of function: createSelect
-
-// appends a new button to toolbar
-function createButton(txt)
-{
-  // the element that will be created
-  var el, btn, obj = null;
-  switch (txt)
-  {
-    case "separator":
-      if ( editor.config.flowToolbars )
-      {
-        newLine();
-      }
-      el = document.createElement("div");
-      el.className = "separator";
-    break;
-    case "space":
-      el = document.createElement("div");
-      el.className = "space";
-    break;
-    case "linebreak":
-      newLine();
-      return false;
-    case "textindicator":
-      el = document.createElement("div");
-      el.appendChild(document.createTextNode("A"));
-      el.className = "indicator";
-      el.title = Xinha._lc("Current style");
-      obj =
-      {
-        name	: txt, // the button name (i.e. 'bold')
-        element : el, // the UI element (DIV)
-        enabled : true, // is it enabled?
-        active	: false, // is it pressed?
-        text	: false, // enabled in text mode?
-        cmd	: "textindicator", // the command ID
-        state	: setButtonStatus // for changing state
-      };
-      
-      Xinha.freeLater(obj);
-      
-      tb_objects[txt] = obj;
-    break;
-    default:
-      btn = editor.config.btnList[txt];
-  }
-  if ( !el && btn )
-  {
-    el = document.createElement("a");
-    el.style.display = 'block';
-    el.href = 'javascript:void(0)';
-    el.style.textDecoration = 'none';
-    el.title = btn[0];
-    el.className = "button";
-    el.style.direction = "ltr";
-    // let's just pretend we have a button object, and
-    // assign all the needed information to it.
-    obj =
-    {
-      name : txt, // the button name (i.e. 'bold')
-      element : el, // the UI element (DIV)
-      enabled : true, // is it enabled?
-      active : false, // is it pressed?
-      text : btn[2], // enabled in text mode?
-      cmd	: btn[3], // the command ID
-      state	: setButtonStatus, // for changing state
-      context : btn[4] || null // enabled in a certain context?
-    };
-    Xinha.freeLater(el);
-    Xinha.freeLater(obj);
-
-    tb_objects[txt] = obj;
-
-    // prevent drag&drop of the icon to content area
-    el.ondrag = function() { return false; };
-
-    // handlers to emulate nice flat toolbar buttons
-    Xinha._addEvent(
-      el,
-      "mouseout",
-      function(ev)
-      {
-        if ( obj.enabled )
-        {
-          //Xinha._removeClass(el, "buttonHover");
-          Xinha._removeClass(el, "buttonActive");
-          if ( obj.active )
-          {
-            Xinha._addClass(el, "buttonPressed");
-          }
-        }
-      }
-    );
-
-    Xinha._addEvent(
-      el,
-      "mousedown",
-      function(ev)
-      {
-        if ( obj.enabled )
-        {
-          Xinha._addClass(el, "buttonActive");
-          Xinha._removeClass(el, "buttonPressed");
-          Xinha._stopEvent(Xinha.is_ie ? window.event : ev);
-        }
-      }
-    );
-
-    // when clicked, do the following:
-    Xinha._addEvent(
-      el,
-      "click",
-      function(ev)
-      {
-        ev = Xinha.is_ie ? window.event : ev;
-        editor.btnClickEvent = ev;
-        if ( obj.enabled )
-        {
-          Xinha._removeClass(el, "buttonActive");
-          //Xinha._removeClass(el, "buttonHover");
-          if ( Xinha.is_gecko )
-          {
-            editor.activateEditor();
-          }
-          obj.cmd(editor, obj.name, obj);
-          Xinha._stopEvent(ev);
-        }
-      }
-    );
-
-    var i_contain = Xinha.makeBtnImg(btn[1]);
-    var img = i_contain.firstChild;
-    Xinha.freeLater(i_contain);
-    Xinha.freeLater(img);
-      
-    el.appendChild(i_contain);
-
-    obj.imgel = img;      
-    obj.swapImage = function(newimg)
-    {
-      if ( typeof newimg != 'string' )
-      {
-        img.src = newimg[0];
-        img.style.position = 'relative';
-        img.style.top  = newimg[2] ? ('-' + (18 * (newimg[2] + 1)) + 'px') : '-18px';
-        img.style.left = newimg[1] ? ('-' + (18 * (newimg[1] + 1)) + 'px') : '-18px';
-      }
-      else
-      {
-        obj.imgel.src = newimg;
-        img.style.top = '0px';
-        img.style.left = '0px';
-      }
-    };
-      
-  }
-  else if( !el )
-  {
-    el = createSelect(txt);
-  }
-
-  return el;
-}
-
-var first = true;
-for ( var i = 0; i < this.config.toolbar.length; ++i )
-{
-  if ( !first )
-  {
-    // createButton("linebreak");
-  }
-  else
-  {
-    first = false;
-  }
-  if ( this.config.toolbar[i] === null )
-  {
-    this.config.toolbar[i] = ['separator'];
-  }
-  var group = this.config.toolbar[i];
-
-  for ( var j = 0; j < group.length; ++j )
-  {
-    var code = group[j];
-    var tb_cell;
-    if ( /^([IT])\[(.*?)\]/.test(code) )
-    {
-      // special case, create text label
-      var l7ed = RegExp.$1 == "I"; // localized?
-      var label = RegExp.$2;
-      if ( l7ed )
-      {
-        label = Xinha._lc(label);
-      }
-      tb_cell = document.createElement("td");
-      tb_row.appendChild(tb_cell);
-      tb_cell.className = "label";
-      tb_cell.innerHTML = label;
-    }
-    else if ( typeof code != 'function' )
-    {
-      var tb_element = createButton(code);
-      if ( tb_element )
-      {
-        tb_cell = document.createElement("td");
-        tb_cell.className = 'toolbarElement';
-        tb_row.appendChild(tb_cell);
-        tb_cell.appendChild(tb_element);
-      }
-      else if ( tb_element === null )
-      {
-        alert("FIXME: Unknown toolbar item: " + code);
-      }
-    }
-  }
-}
-
-if ( editor.config.flowToolbars )
-{
-  toolbar.appendChild(Xinha._createToolbarBreakingElement());
-}
-
-return toolbar;
-};
-
-// @todo : is this some kind of test not finished ?
-//         Why the hell this is not in the config object ?
-var use_clone_img = false;
-/** creates a button (i.e. container element + image)
- * @private
- * @return {DomNode} conteainer element
- */
-Xinha.makeBtnImg = function(imgDef, doc)
-{
-if ( !doc )
-{
-  doc = document;
-}
-
-if ( !doc._xinhaImgCache )
-{
-  doc._xinhaImgCache = {};
-  Xinha.freeLater(doc._xinhaImgCache);
-}
-
-var i_contain = null;
-if ( Xinha.is_ie && ( ( !doc.compatMode ) || ( doc.compatMode && doc.compatMode == "BackCompat" ) ) )
-{
-  i_contain = doc.createElement('span');
-}
-else
-{
-  i_contain = doc.createElement('div');
-  i_contain.style.position = 'relative';
-}
-
-i_contain.style.overflow = 'hidden';
-i_contain.style.width = "18px";
-i_contain.style.height = "18px";
-i_contain.className = 'buttonImageContainer';
-
-var img = null;
-if ( typeof imgDef == 'string' )
-{
-  if ( doc._xinhaImgCache[imgDef] )
-  {
-    img = doc._xinhaImgCache[imgDef].cloneNode();
-  }
-  else
-  {
-    img = doc.createElement("img");
-    img.src = imgDef;
-    img.style.width = "18px";
-    img.style.height = "18px";
-    if ( use_clone_img )
-    {
-      doc._xinhaImgCache[imgDef] = img.cloneNode();
-    }
-  }
-}
-else
-{
-  if ( doc._xinhaImgCache[imgDef[0]] )
-  {
-    img = doc._xinhaImgCache[imgDef[0]].cloneNode();
-  }
-  else
-  {
-    img = doc.createElement("img");
-    img.src = imgDef[0];
-    img.style.position = 'relative';
-    if ( use_clone_img )
-    {
-      doc._xinhaImgCache[imgDef[0]] = img.cloneNode();
-    }
-  }
-  // @todo: Using 18 dont let us use a theme with its own icon toolbar height
-  //        and width. Probably better to calculate this value 18
-  //        var sizeIcon = img.width / nb_elements_per_image;
-  img.style.top  = imgDef[2] ? ('-' + (18 * (imgDef[2] + 1)) + 'px') : '-18px';
-  img.style.left = imgDef[1] ? ('-' + (18 * (imgDef[1] + 1)) + 'px') : '-18px';
-}
-i_contain.appendChild(img);
-return i_contain;
-};
-/** creates the status bar 
- * @private
- * @return {DomNode} status bar
- */
-Xinha.prototype._createStatusBar = function()
-{
-this.setLoadingMessage(Xinha._lc('Create Statusbar'));
-var statusbar = document.createElement("div");
-statusbar.className = "statusBar";
-this._statusBar = statusbar;
-Xinha.freeLater(this, '_statusBar');
-  
-// statusbar.appendChild(document.createTextNode(Xinha._lc("Path") + ": "));
-// creates a holder for the path view
-var div = document.createElement("span");
-div.className = "statusBarTree";
-div.innerHTML = Xinha._lc("Path") + ": ";
-
-this._statusBarTree = div;
-Xinha.freeLater(this, '_statusBarTree');
-this._statusBar.appendChild(div);
-
-div = document.createElement("span");
-div.innerHTML = Xinha._lc("You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.");
-div.style.display = "none";
-
-this._statusBarTextMode = div;
-Xinha.freeLater(this, '_statusBarTextMode');
-this._statusBar.appendChild(div);
-
-if ( !this.config.statusBar )
-{
-  // disable it...
-  statusbar.style.display = "none";
-}
-return statusbar;
-};
-
-/** Creates the Xinha object and replaces the textarea with it. Loads required files.
- *  @returns {Boolean}
- */
-Xinha.prototype.generate = function ()
-{
-if ( !Xinha.isSupportedBrowser ) return;
-  
-var i;
-var editor = this;  // we'll need "this" in some nested functions
-var url;
-var found = false;
-var links = document.getElementsByTagName("link");
-
-if (!document.getElementById("XinhaCoreDesign"))
-{
-  _editor_css = (typeof _editor_css == "string") ? _editor_css : "Xinha.css";
-  for(i = 0; i<links.length; i++)
-  {
-    if ( ( links[i].rel == "stylesheet" ) && ( links[i].href == _editor_url + _editor_css ) )
-    {
-      found = true;
-    }
-  }
-  if ( !found )
-  {
-    Xinha.loadStyle(_editor_css,null,"XinhaCoreDesign",true);
-  }
-}
-  
-if ( _editor_skin !== "" && !document.getElementById("XinhaSkin"))
-{
-  found = false;
-  for(i = 0; i<links.length; i++)
-  {
-    if ( ( links[i].rel == "stylesheet" ) && ( links[i].href == _editor_url + 'skins/' + _editor_skin + '/skin.css' ) )
-    {
-      found = true;
-    }
-  }
-  if ( !found )
-  {
-    Xinha.loadStyle('skins/' + _editor_skin + '/skin.css',null,"XinhaSkin")
-  }
-}
-  
-// Now load a specific browser plugin which will implement the above for us.
-if (Xinha.is_ie)
-{
-  url = _editor_url + 'modules/InternetExplorer/InternetExplorer.js';
-  if ( !Xinha.loadPlugins(["InternetExplorer"], function() { editor.generate(); }, url ) )
-  {            
-    return false;
-  }
-  editor._browserSpecificPlugin = editor.registerPlugin('InternetExplorer');
-}
-else
-{
-  url = _editor_url + 'modules/Gecko/Gecko.js';
-  if ( !Xinha.loadPlugins(["Gecko"], function() { editor.generate(); }, url ) )
-  {            
-    return false;
-  }
-  editor._browserSpecificPlugin = editor.registerPlugin('Gecko');
-}
-
-if ( typeof Dialog == 'undefined' && !Xinha._loadback( _editor_url + 'modules/Dialogs/dialog.js', this.generate, this ) )
-{    
-  return false;
-}
-
-if ( typeof Xinha.Dialog == 'undefined' &&  !Xinha._loadback( _editor_url + 'modules/Dialogs/inline-dialog.js' , this.generate, this ) )
-{    
-  return false;
-}
-  
-url = _editor_url + 'modules/FullScreen/full-screen.js';
-if ( !Xinha.loadPlugins(["FullScreen"], function() { editor.generate(); }, url ))
-{
-  return false;
-}
-  
-url = _editor_url + 'modules/ColorPicker/ColorPicker.js';
-if ( !Xinha.loadPlugins(["ColorPicker"], function() { editor.generate(); } , url ) )
-{
-  return false;
-}
-else if ( typeof ColorPicker != 'undefined') editor.registerPlugin('ColorPicker');
-
-var toolbar = editor.config.toolbar;
-for ( i = toolbar.length; --i >= 0; )
-{
-  for ( var j = toolbar[i].length; --j >= 0; )
-  {
-    switch (toolbar[i][j])
-    {
-      case "popupeditor":
-        editor.registerPlugin('FullScreen');
-      break;
-      case "insertimage":
-        url = _editor_url + 'modules/InsertImage/insert_image.js';
-        if ( typeof Xinha.prototype._insertImage == 'undefined' && !Xinha.loadPlugins(["InsertImage"], function() { editor.generate(); } , url ) )
-        {
-          return false;
-        }
-        else if ( typeof InsertImage != 'undefined') editor.registerPlugin('InsertImage');
-      break;
-      case "createlink":
-        /*url = _editor_url + 'modules/CreateLink/link.js';
-        if ( typeof Linker == 'undefined' && !Xinha.loadPlugins(["CreateLink"], function() { editor.generate(); } , url ))
-        {
-          return false;
-        }
-        else if ( typeof CreateLink != 'undefined') editor.registerPlugin('CreateLink');*/
-      break;
-      case "inserttable":
-        url = _editor_url + 'modules/InsertTable/insert_table.js';
-        if ( !Xinha.loadPlugins(["InsertTable"], function() { editor.generate(); } , url ) )
-        {
-          return false;
-        }
-        else if ( typeof InsertTable != 'undefined') editor.registerPlugin('InsertTable');
-      break;
-    }
-  }
-}
-
-// If this is gecko, set up the paragraph handling now
-if ( Xinha.is_gecko && ( editor.config.mozParaHandler == 'best' || editor.config.mozParaHandler == 'dirty' ) )
-{
-  switch (this.config.mozParaHandler)
-  {
-    case 'dirty':
-      var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerDirty.js';
-    break;
-    default:
-      var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerBest.js';
-    break;
-  }
-  if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, ParaHandlerPlugin ) )
-  {
-    return false;
-  }
-  editor.registerPlugin('EnterParagraphs');
-}
-
-switch (this.config.getHtmlMethod)
-{
-  case 'TransformInnerHTML':
-    var getHtmlMethodPlugin = _editor_url + 'modules/GetHtml/TransformInnerHTML.js';
-  break;
-  default:
-    var getHtmlMethodPlugin = _editor_url + 'modules/GetHtml/DOMwalk.js';
-  break;
-}
-  
-if ( !Xinha.loadPlugins(["GetHtmlImplementation"], function() { editor.generate(); } , getHtmlMethodPlugin))
-{
-  return false;        
-}
-else editor.registerPlugin('GetHtmlImplementation');
-  
-// create the editor framework, yah, table layout I know, but much easier
-// to get it working correctly this way, sorry about that, patches welcome.
-  
-this.setLoadingMessage(Xinha._lc('Generate Xinha framework'));
-  
-this._framework =
-{
-  'table':   document.createElement('table'),
-  'tbody':   document.createElement('tbody'), // IE will not show the table if it doesn't have a tbody!
-  'tb_row':  document.createElement('tr'),
-  'tb_cell': document.createElement('td'), // Toolbar
-
-  'tp_row':  document.createElement('tr'),
-  'tp_cell': this._panels.top.container,   // top panel
-
-  'ler_row': document.createElement('tr'),
-  'lp_cell': this._panels.left.container,  // left panel
-  'ed_cell': document.createElement('td'), // editor
-  'rp_cell': this._panels.right.container, // right panel
-
-  'bp_row':  document.createElement('tr'),
-  'bp_cell': this._panels.bottom.container,// bottom panel
-
-  'sb_row':  document.createElement('tr'),
-  'sb_cell': document.createElement('td')  // status bar
-
-};
-Xinha.freeLater(this._framework);
-  
-var fw = this._framework;
-fw.table.border = "0";
-fw.table.cellPadding = "0";
-fw.table.cellSpacing = "0";
-
-fw.tb_row.style.verticalAlign = 'top';
-fw.tp_row.style.verticalAlign = 'top';
-fw.ler_row.style.verticalAlign= 'top';
-fw.bp_row.style.verticalAlign = 'top';
-fw.sb_row.style.verticalAlign = 'top';
-fw.ed_cell.style.position     = 'relative';
-
-// Put the cells in the rows        set col & rowspans
-// note that I've set all these so that all panels are showing
-// but they will be redone in sizeEditor() depending on which
-// panels are shown.  It's just here to clarify how the thing
-// is put togethor.
-fw.tb_row.appendChild(fw.tb_cell);
-fw.tb_cell.colSpan = 3;
-
-fw.tp_row.appendChild(fw.tp_cell);
-fw.tp_cell.colSpan = 3;
-
-fw.ler_row.appendChild(fw.lp_cell);
-fw.ler_row.appendChild(fw.ed_cell);
-fw.ler_row.appendChild(fw.rp_cell);
-
-fw.bp_row.appendChild(fw.bp_cell);
-fw.bp_cell.colSpan = 3;
-
-fw.sb_row.appendChild(fw.sb_cell);
-fw.sb_cell.colSpan = 3;
-
-// Put the rows in the table body
-fw.tbody.appendChild(fw.tb_row);  // Toolbar
-fw.tbody.appendChild(fw.tp_row); // Left, Top, Right panels
-fw.tbody.appendChild(fw.ler_row);  // Editor/Textarea
-fw.tbody.appendChild(fw.bp_row);  // Bottom panel
-fw.tbody.appendChild(fw.sb_row);  // Statusbar
-
-// and body in the table
-fw.table.appendChild(fw.tbody);
-
-var xinha = this._framework.table;
-this._htmlArea = xinha;
-Xinha.freeLater(this, '_htmlArea');
-xinha.className = "htmlarea";
-
-  // create the toolbar and put in the area
-this._framework.tb_cell.appendChild( this._createToolbar() );
-
-  // create the IFRAME & add to container
-var iframe = document.createElement("iframe");
-iframe.src = this.popupURL(editor.config.URIs.blank);
-iframe.id = "XinhaIFrame_" + this._textArea.id;
-this._framework.ed_cell.appendChild(iframe);
-this._iframe = iframe;
-this._iframe.className = 'xinha_iframe';
-Xinha.freeLater(this, '_iframe');
-  
-  // creates & appends the status bar
-var statusbar = this._createStatusBar();
-this._framework.sb_cell.appendChild(statusbar);
-
-// insert Xinha before the textarea.
-var textarea = this._textArea;
-textarea.parentNode.insertBefore(xinha, textarea);
-textarea.className = 'xinha_textarea';
-
-// extract the textarea and insert it into the xinha framework
-Xinha.removeFromParent(textarea);
-this._framework.ed_cell.appendChild(textarea);
-
-// if another editor is activated while this one is in text mode, toolbar is disabled   
-Xinha.addDom0Event(
-this._textArea,
-'click',
-function()
-{
-	if ( Xinha._currentlyActiveEditor != this)
-	{
-	  editor.updateToolbar();
-	}
-  return true;
-});
-  
-// Set up event listeners for saving the iframe content to the textarea
-if ( textarea.form )
-{
-  // onsubmit get the Xinha content and update original textarea.
-  Xinha.prependDom0Event(
-    this._textArea.form,
-    'submit',
-    function()
-    {
-      editor.firePluginEvent('onBeforeSubmit');
-      editor._textArea.value = editor.outwardHtml(editor.getHTML());
-      return true;
-    }
-  );
-
-  var initialTAContent = textarea.value;
-
-  // onreset revert the Xinha content to the textarea content
-  Xinha.prependDom0Event(
-    this._textArea.form,
-    'reset',
-    function()
-    {
-      editor.setHTML(editor.inwardHtml(initialTAContent));
-      editor.updateToolbar();
-      return true;
-    }
-  );
-
-  // attach onsubmit handler to form.submit()
-  // note: catch error in IE if any form element has id="submit"
-  if ( !textarea.form.xinha_submit )
-  {
-    try 
-    {
-      textarea.form.xinha_submit = textarea.form.submit;
-      textarea.form.submit = function() 
-      {
-        this.onsubmit();
-        this.xinha_submit();
-      }
-    } catch(ex) {}
-  }
-}
-
-// add a handler for the "back/forward" case -- on body.unload we save
-// the HTML content into the original textarea and restore it in its place.
-// apparently this does not work in IE?
-Xinha.prependDom0Event(
-  window,
-  'unload',
-  function()
-  {
-    editor.firePluginEvent('onBeforeUnload');
-    textarea.value = editor.outwardHtml(editor.getHTML());
-    if (!Xinha.is_ie)
-    {
-      xinha.parentNode.replaceChild(textarea,xinha);
-    }
-    return true;
-  }
-);
-
-// Hide textarea
-textarea.style.display = "none";
-
-// Initalize size
-editor.initSize();
-this.setLoadingMessage(Xinha._lc('Finishing'));
-// Add an event to initialize the iframe once loaded.
-editor._iframeLoadDone = false;
-if (Xinha.is_opera)
-  {
-    Xinha._addEvent(
-      this._iframe.contentWindow,
-      'load',
-      function(e)
-      {
-        if ( !editor._iframeLoadDone )
-        {
-           editor._iframeLoadDone = true;
-           editor.initIframe();
-        }
-        return true;
-      }
-    )
-  }
-else
-  Xinha._addEvent(
-    this._iframe,
-    'load',
-    function(e)
-    {
-      if ( !editor._iframeLoadDone )
-      {
-        editor._iframeLoadDone = true;
-        editor.initIframe();
-      }
-      return true;
-    }
-  );
-
-};
-
-/**
- * Size the editor according to the INITIAL sizing information.
- * config.width
- *    The width may be set via three ways
- *    auto    = the width is inherited from the original textarea
- *    toolbar = the width is set to be the same size as the toolbar
- *    <set size> = the width is an explicit size (any CSS measurement, eg 100em should be fine)
- *
- * config.height
- *    auto    = the height is inherited from the original textarea
- *    <set size> = an explicit size measurement (again, CSS measurements)
- *
- * config.sizeIncludesBars
- *    true    = the tool & status bars will appear inside the width & height confines
- *    false   = the tool & status bars will appear outside the width & height confines
- *
- * @private
- */
-
-Xinha.prototype.initSize = function()
-{
-this.setLoadingMessage(Xinha._lc('Init editor size'));
-var editor = this;
-var width = null;
-var height = null;
-
-switch ( this.config.width )
-{
-  case 'auto':
-    width = this._initial_ta_size.w;
-  break;
-
-  case 'toolbar':
-    width = this._toolBar.offsetWidth + 'px';
-  break;
-
-  default :
-    // @todo: check if this is better :
-    // width = (parseInt(this.config.width, 10) == this.config.width)? this.config.width + 'px' : this.config.width;
-    width = /[^0-9]/.test(this.config.width) ? this.config.width : this.config.width + 'px';
-  break;
-}
-
-switch ( this.config.height )
-{
-  case 'auto':
-    height = this._initial_ta_size.h;
-  break;
-
-  default :
-    // @todo: check if this is better :
-    // height = (parseInt(this.config.height, 10) == this.config.height)? this.config.height + 'px' : this.config.height;
-    height = /[^0-9]/.test(this.config.height) ? this.config.height : this.config.height + 'px';
-  break;
-}
-
-this.sizeEditor(width, height, this.config.sizeIncludesBars, this.config.sizeIncludesPanels);
-
-// why can't we use the following line instead ?
-//  this.notifyOn('panel_change',this.sizeEditor);
-this.notifyOn('panel_change',function() { editor.sizeEditor(); });
-};
-
-/**
- *  Size the editor to a specific size, or just refresh the size (when window resizes for example)
- *  @param {string} width optional width (CSS specification)
- *  @param {string} height optional height (CSS specification)
- *  @param {Boolean} includingBars optional to indicate if the size should include or exclude tool & status bars
- *  @param {Boolean} includingPanels optional to indicate if the size should include or exclude panels
- */
-Xinha.prototype.sizeEditor = function(width, height, includingBars, includingPanels)
-{
-if (this._risizing) return;
-this._risizing = true;
-  
-this.notifyOf('before_resize', {width:width, height:height});
-// We need to set the iframe & textarea to 100% height so that the htmlarea
-// isn't "pushed out" when we get it's height, so we can change them later.
-this._iframe.style.height   = '100%';
-this._textArea.style.height = '100%';
-this._iframe.style.width    = '';
-this._textArea.style.width  = '';
-
-if ( includingBars !== null )
-{
-  this._htmlArea.sizeIncludesToolbars = includingBars;
-}
-if ( includingPanels !== null )
-{
-  this._htmlArea.sizeIncludesPanels = includingPanels;
-}
-
-if ( width )
-{
-  this._htmlArea.style.width = width;
-  if ( !this._htmlArea.sizeIncludesPanels )
-  {
-    // Need to add some for l & r panels
-    var rPanel = this._panels.right;
-    if ( rPanel.on && rPanel.panels.length && Xinha.hasDisplayedChildren(rPanel.div) )
-    {
-      this._htmlArea.style.width = (this._htmlArea.offsetWidth + parseInt(this.config.panel_dimensions.right, 10)) + 'px';
-    }
-
-    var lPanel = this._panels.left;
-    if ( lPanel.on && lPanel.panels.length && Xinha.hasDisplayedChildren(lPanel.div) )
-    {
-      this._htmlArea.style.width = (this._htmlArea.offsetWidth + parseInt(this.config.panel_dimensions.left, 10)) + 'px';
-    }
-  }
-}
-
-if ( height )
-{
-  this._htmlArea.style.height = height;
-  if ( !this._htmlArea.sizeIncludesToolbars )
-  {
-    // Need to add some for toolbars
-    this._htmlArea.style.height = (this._htmlArea.offsetHeight + this._toolbar.offsetHeight + this._statusBar.offsetHeight) + 'px';
-  }
-
-  if ( !this._htmlArea.sizeIncludesPanels )
-  {
-    // Need to add some for t & b panels
-    var tPanel = this._panels.top;
-    if ( tPanel.on && tPanel.panels.length && Xinha.hasDisplayedChildren(tPanel.div) )
-    {
-      this._htmlArea.style.height = (this._htmlArea.offsetHeight + parseInt(this.config.panel_dimensions.top, 10)) + 'px';
-    }
-
-    var bPanel = this._panels.bottom;
-    if ( bPanel.on && bPanel.panels.length && Xinha.hasDisplayedChildren(bPanel.div) )
-    {
-      this._htmlArea.style.height = (this._htmlArea.offsetHeight + parseInt(this.config.panel_dimensions.bottom, 10)) + 'px';
-    }
-  }
-}
-
-// At this point we have this._htmlArea.style.width & this._htmlArea.style.height
-// which are the size for the OUTER editor area, including toolbars and panels
-// now we size the INNER area and position stuff in the right places.
-width  = this._htmlArea.offsetWidth;
-height = this._htmlArea.offsetHeight;
-
-// Set colspan for toolbar, and statusbar, rowspan for left & right panels, and insert panels to be displayed
-// into thier rows
-var panels = this._panels;
-var editor = this;
-var col_span = 1;
-
-function panel_is_alive(pan)
-{
-  if ( panels[pan].on && panels[pan].panels.length && Xinha.hasDisplayedChildren(panels[pan].container) )
-  {
-    panels[pan].container.style.display = '';
-    return true;
-  }
-  // Otherwise make sure it's been removed from the framework
-  else
-  {
-    panels[pan].container.style.display='none';
-    return false;
-  }
-}
-
-if ( panel_is_alive('left') )
-{
-  col_span += 1;      
-}
-
-//  if ( panel_is_alive('top') )
-//  {
-  // NOP
-//  }
-
-if ( panel_is_alive('right') )
-{
-  col_span += 1;
-}
-
-//  if ( panel_is_alive('bottom') )
-//  {
-  // NOP
-//  }
-
-this._framework.tb_cell.colSpan = col_span;
-this._framework.tp_cell.colSpan = col_span;
-this._framework.bp_cell.colSpan = col_span;
-this._framework.sb_cell.colSpan = col_span;
-
-// Put in the panel rows, top panel goes above editor row
-if ( !this._framework.tp_row.childNodes.length )
-{
-  Xinha.removeFromParent(this._framework.tp_row);
-}
-else
-{
-  if ( !Xinha.hasParentNode(this._framework.tp_row) )
-  {
-    this._framework.tbody.insertBefore(this._framework.tp_row, this._framework.ler_row);
-  }
-}
-
-// bp goes after the editor
-if ( !this._framework.bp_row.childNodes.length )
-{
-  Xinha.removeFromParent(this._framework.bp_row);
-}
-else
-{
-  if ( !Xinha.hasParentNode(this._framework.bp_row) )
-  {
-    this._framework.tbody.insertBefore(this._framework.bp_row, this._framework.ler_row.nextSibling);
-  }
-}
-
-// finally if the statusbar is on, insert it
-if ( !this.config.statusBar )
-{
-  Xinha.removeFromParent(this._framework.sb_row);
-}
-else
-{
-  if ( !Xinha.hasParentNode(this._framework.sb_row) )
-  {
-    this._framework.table.appendChild(this._framework.sb_row);
-  }
-}
-
-// Size and set colspans, link up the framework
-this._framework.lp_cell.style.width  = this.config.panel_dimensions.left;
-this._framework.rp_cell.style.width  = this.config.panel_dimensions.right;
-this._framework.tp_cell.style.height = this.config.panel_dimensions.top;
-this._framework.bp_cell.style.height = this.config.panel_dimensions.bottom;
-this._framework.tb_cell.style.height = this._toolBar.offsetHeight + 'px';
-this._framework.sb_cell.style.height = this._statusBar.offsetHeight + 'px';
-
-var edcellheight = height - this._toolBar.offsetHeight - this._statusBar.offsetHeight;
-if ( panel_is_alive('top') )
-{
-  edcellheight -= parseInt(this.config.panel_dimensions.top, 10);
-}
-if ( panel_is_alive('bottom') )
-{
-  edcellheight -= parseInt(this.config.panel_dimensions.bottom, 10);
-}
-this._iframe.style.height = edcellheight + 'px';  
-  
-var edcellwidth = width;
-if ( panel_is_alive('left') )
-{
-  edcellwidth -= parseInt(this.config.panel_dimensions.left, 10);
-}
-if ( panel_is_alive('right') )
-{
-  edcellwidth -= parseInt(this.config.panel_dimensions.right, 10);    
-}
-var iframeWidth = (this.config.iframeWidth)? parseInt(this.config.iframeWidth,10): null; 
-this._iframe.style.width = (iframeWidth && iframeWidth < edcellwidth)? iframeWidth + "px": edcellwidth + "px"; 
-
-this._textArea.style.height = this._iframe.style.height;
-this._textArea.style.width  = this._iframe.style.width;
-     
-this.notifyOf('resize', {width:this._htmlArea.offsetWidth, height:this._htmlArea.offsetHeight});
-this._risizing = false;
-};
-/** FIXME: Never used, what is this for? 
-* @param {string} side 
-* @param {Object}
-*/
-Xinha.prototype.registerPanel = function(side, object)
-{
-if ( !side )
-{
-  side = 'right';
-}
-this.setLoadingMessage('Register ' + side + ' panel ');
-var panel = this.addPanel(side);
-if ( object )
-{
-  object.drawPanelIn(panel);
-}
-};
-/** Creates a panel in the panel container on the specified side
-* @param {String} side the panel container to which the new panel will be added<br />
-*									Possible values are: "right","left","top","bottom"
-* @returns {DomNode} Panel div
-*/
-Xinha.prototype.addPanel = function(side)
-{
-var div = document.createElement('div');
-div.side = side;
-if ( side == 'left' || side == 'right' )
-{
-  div.style.width  = this.config.panel_dimensions[side];
-  if(this._iframe) div.style.height = this._iframe.style.height;     
-}
-Xinha.addClasses(div, 'panel');
-this._panels[side].panels.push(div);
-this._panels[side].div.appendChild(div);
-
-this.notifyOf('panel_change', {'action':'add','panel':div});
-
-return div;
-};
-/** Removes a panel
-* @param {DomNode} panel object as returned by Xinha.prototype.addPanel()
-*/
-Xinha.prototype.removePanel = function(panel)
-{
-this._panels[panel.side].div.removeChild(panel);
-var clean = [];
-for ( var i = 0; i < this._panels[panel.side].panels.length; i++ )
-{
-  if ( this._panels[panel.side].panels[i] != panel )
-  {
-    clean.push(this._panels[panel.side].panels[i]);
-  }
-}
-this._panels[panel.side].panels = clean;
-this.notifyOf('panel_change', {'action':'remove','panel':panel});
-};
-/** Hides a panel
-* @param {DomNode} panel object as returned by Xinha.prototype.addPanel()
-*/
-Xinha.prototype.hidePanel = function(panel)
-{
-if ( panel && panel.style.display != 'none' )
-{
-  try { var pos = this.scrollPos(this._iframe.contentWindow); } catch(e) { }
-  panel.style.display = 'none';
-  this.notifyOf('panel_change', {'action':'hide','panel':panel});
-  try { this._iframe.contentWindow.scrollTo(pos.x,pos.y)} catch(e) { }
-}
-};
-/** Shows a panel
-* @param {DomNode} panel object as returned by Xinha.prototype.addPanel()
-*/
-Xinha.prototype.showPanel = function(panel)
-{
-if ( panel && panel.style.display == 'none' )
-{
-  try { var pos = this.scrollPos(this._iframe.contentWindow); } catch(e) {}
-  panel.style.display = '';
-  this.notifyOf('panel_change', {'action':'show','panel':panel});
-  try { this._iframe.contentWindow.scrollTo(pos.x,pos.y)} catch(e) { }
-}
-};
-/** Hides the panel(s) on one or more sides
-* @param {Array} sides the sides on which the panels shall be hidden
-*/
-Xinha.prototype.hidePanels = function(sides)
-{
-if ( typeof sides == 'undefined' )
-{
-  sides = ['left','right','top','bottom'];
-}
-
-var reShow = [];
-for ( var i = 0; i < sides.length;i++ )
-{
-  if ( this._panels[sides[i]].on )
-  {
-    reShow.push(sides[i]);
-    this._panels[sides[i]].on = false;
-  }
-}
-this.notifyOf('panel_change', {'action':'multi_hide','sides':sides});
-};
-/** Shows the panel(s) on one or more sides
-* @param {Array} sides the sides on which the panels shall be hidden
-*/
-Xinha.prototype.showPanels = function(sides)
-{
-if ( typeof sides == 'undefined' )
-{
-  sides = ['left','right','top','bottom'];
-}
-
-var reHide = [];
-for ( var i = 0; i < sides.length; i++ )
-{
-  if ( !this._panels[sides[i]].on )
-  {
-    reHide.push(sides[i]);
-    this._panels[sides[i]].on = true;
-  }
-}
-this.notifyOf('panel_change', {'action':'multi_show','sides':sides});
-};
-/** Returns an array containig all properties that are set in an object
-* @param {Object} obj
-* @returns {Array}
-*/
-Xinha.objectProperties = function(obj)
-{
-var props = [];
-for ( var x in obj )
-{
-  props[props.length] = x;
-}
-return props;
-};
-
-/** Checks if editor is active
- *<br />
- * EDITOR ACTIVATION NOTES:<br />
- *  when a page has multiple Xinha editors, ONLY ONE should be activated at any time (this is mostly to
- *  work around a bug in Mozilla, but also makes some sense).  No editor should be activated or focused
- *  automatically until at least one editor has been activated through user action (by mouse-clicking in
- *  the editor).
- * @private
- * @returns {Boolean}
- */
-Xinha.prototype.editorIsActivated = function()
-{
-try
-{
-  return Xinha.is_designMode ? this._doc.designMode == 'on' : this._doc.body.contentEditable;
-}
-catch (ex)
-{
-  return false;
-}
-};
-/**  We need to know that at least one editor on the page has been activated
-*    this is because we will not focus any editor until an editor has been activated
-* @private
-* @type {Boolean}
-*/
-Xinha._someEditorHasBeenActivated = false;
-/**  Stores a reference to the currently active editor
-* @private
-* @type {Xinha}
-*/
-Xinha._currentlyActiveEditor      = null;
-/** Enables one editor for editing, e.g. by a click in the editing area or after it has been 
- *  deactivated programmatically before 
- * @private
- * @returns {Boolean}
- */
-Xinha.prototype.activateEditor = function()
-{
-// We only want ONE editor at a time to be active
-if ( Xinha._currentlyActiveEditor )
-{
-  if ( Xinha._currentlyActiveEditor == this )
-  {
-    return true;
-  }
-  Xinha._currentlyActiveEditor.deactivateEditor();
-}
-
-if ( Xinha.is_designMode && this._doc.designMode != 'on' )
-{
-  try
-  {
-    // cannot set design mode if no display
-    if ( this._iframe.style.display == 'none' )
-    {
-      this._iframe.style.display = '';
-      this._doc.designMode = 'on';
-      this._iframe.style.display = 'none';
-    }
-    else
-    {
-      this._doc.designMode = 'on';
-    }
-  } catch (ex) {}
-}
-else if ( Xinha.is_ie&& this._doc.body.contentEditable !== true )
-{
-  this._doc.body.contentEditable = true;
-}
-
-Xinha._someEditorHasBeenActivated = true;
-Xinha._currentlyActiveEditor      = this;
-
-var editor = this;
-this.enableToolbar();
-};
-/** Disables the editor 
- * @private
- */
-Xinha.prototype.deactivateEditor = function()
-{
-// If the editor isn't active then the user shouldn't use the toolbar
-this.disableToolbar();
-
-if ( Xinha.is_designMode && this._doc.designMode != 'off' )
-{
-  try
-  {
-    this._doc.designMode = 'off';
-  } catch (ex) {}
-}
-else if ( !Xinha.is_gecko && this._doc.body.contentEditable !== false )
-{
-  this._doc.body.contentEditable = false;
-}
-
-if ( Xinha._currentlyActiveEditor != this )
-{
-  // We just deactivated an editor that wasn't marked as the currentlyActiveEditor
-
-  return; // I think this should really be an error, there shouldn't be a situation where
-          // an editor is deactivated without first being activated.  but it probably won't
-          // hurt anything.
-}
-
-Xinha._currentlyActiveEditor = false;
-};
-/** Creates the iframe (editable area)
- * @private
- */
-Xinha.prototype.initIframe = function()
-{
-this.disableToolbar();
-var doc = null;
-var editor = this;
-try
-{
-  if ( editor._iframe.contentDocument )
-  {
-    this._doc = editor._iframe.contentDocument;        
-  }
-  else
-  {
-    this._doc = editor._iframe.contentWindow.document;
-  }
-  doc = this._doc;
-  // try later
-  if ( !doc )
-  {
-    if ( Xinha.is_gecko )
-    {
-      setTimeout(function() { editor.initIframe(); }, 50);
-      return false;
-    }
-    else
-    {
-      alert("ERROR: IFRAME can't be initialized.");
-    }
-  }
-}
-catch(ex)
-{ // try later
-  setTimeout(function() { editor.initIframe(); }, 50);
-}
-  
-Xinha.freeLater(this, '_doc');
-
-doc.open("text/html","replace");
-var html = '';
-if ( editor.config.browserQuirksMode === false )
-{
-  var doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-}
-else if ( editor.config.browserQuirksMode === true )
-{
-   var doctype = '';
-}
-else
-{
-   var doctype = Xinha.getDoctype(document);
-}
-if ( !editor.config.fullPage )
-{
-  html += doctype + "\n";
-  html += "<html>\n";
-  html += "<head>\n";
-  html += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" + editor.config.charSet + "\">\n";
-  if ( typeof editor.config.baseHref != 'undefined' && editor.config.baseHref !== null )
-  {
-    html += "<base href=\"" + editor.config.baseHref + "\"/>\n";
-  }
-    
-  html += Xinha.addCoreCSS();
-    
-  if ( editor.config.pageStyle )
-  {
-    html += "<style type=\"text/css\">\n" + editor.config.pageStyle + "\n</style>";
-  }
-
-  if ( typeof editor.config.pageStyleSheets !== 'undefined' )
-  {
-    for ( var i = 0; i < editor.config.pageStyleSheets.length; i++ )
-    {
-      if ( editor.config.pageStyleSheets[i].length > 0 )
-      {
-        html += "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + editor.config.pageStyleSheets[i] + "\">";
-        //html += "<style> @import url('" + editor.config.pageStyleSheets[i] + "'); </style>\n";
-      }
-    }
-  }
-  html += "</head>\n";
-  html += "<body>\n";
-  html +=   editor.inwardHtml(editor._textArea.value);
-  html += "</body>\n";
-  html += "</html>";
-}
-else
-{
-  html = editor.inwardHtml(editor._textArea.value);
-  if ( html.match(Xinha.RE_doctype) )
-  {
-    editor.setDoctype(RegExp.$1);
-    //html = html.replace(Xinha.RE_doctype, "");
-  }
-    
-  //Fix Firefox problem with link elements not in right place (just before head)
-  var match = html.match(/<link\s+[\s\S]*?["']\s*\/?>/gi);
-  html = html.replace(/<link\s+[\s\S]*?["']\s*\/?>\s*/gi, '');
-  match ? html = html.replace(/<\/head>/i, match.join('\n') + "\n</head>") : null;    
-}
-doc.write(html);
-doc.close();
-if ( this.config.fullScreen )
-{
-  this._fullScreen();
-}
-this.setEditorEvents();
-};
-  
-/**
- * Delay a function until the document is ready for operations.
- * See ticket:547
- * @public
- * @param {Function} f  The function to call once the document is ready
- */
-Xinha.prototype.whenDocReady = function(f)
-{
-var e = this;
-if ( this._doc && this._doc.body )
-{
-  f();
-}
-else
-{
-  setTimeout(function() { e.whenDocReady(f); }, 50);
-}
-};
-
-
-/** Switches editor mode between wysiwyg and text (HTML)
- * @param {String} mode optional "textmode" or "wysiwyg", if omitted, toggles between modes.
- */
-Xinha.prototype.setMode = function(mode)
-{
-var html;
-if ( typeof mode == "undefined" )
-{
-  mode = this._editMode == "textmode" ? "wysiwyg" : "textmode";
-}
-switch ( mode )
-{
-  case "textmode":
-    this.setCC("iframe");
-    html = this.outwardHtml(this.getHTML());
-    this.setHTML(html);
-
-    // Hide the iframe
-    this.deactivateEditor();
-    this._iframe.style.display   = 'none';
-    this._textArea.style.display = '';
-
-    if ( this.config.statusBar )
-    {
-      this._statusBarTree.style.display = "none";
-      this._statusBarTextMode.style.display = "";
-    }
-    this.notifyOf('modechange', {'mode':'text'});
-    this.findCC("textarea"); 
-  break;
-
-  case "wysiwyg":
-    this.setCC("textarea");
-    html = this.inwardHtml(this.getHTML());
-    this.deactivateEditor();
-    this.setHTML(html);
-    this._iframe.style.display   = '';
-    this._textArea.style.display = "none";
-    this.activateEditor();
-    if ( this.config.statusBar )
-    {
-      this._statusBarTree.style.display = "";
-      this._statusBarTextMode.style.display = "none";
-    }
-    this.notifyOf('modechange', {'mode':'wysiwyg'});
-    this.findCC("iframe");
-  break;
-
-  default:
-    alert("Mode <" + mode + "> not defined!");
-    return false;
-}
-this._editMode = mode;
-
-for ( var i in this.plugins )
-{
-  var plugin = this.plugins[i].instance;
-  if ( plugin && typeof plugin.onMode == "function" )
-  {
-    plugin.onMode(mode);
-  }
-}
-};
-/** Sets the HTML in fullpage mode. Actually the whole iframe document is rewritten.
- * @private
- * @param {String} html
- */
-Xinha.prototype.setFullHTML = function(html)
-{
-var save_multiline = RegExp.multiline;
-RegExp.multiline = true;
-if ( html.match(Xinha.RE_doctype) )
-{
-  this.setDoctype(RegExp.$1);
- // html = html.replace(Xinha.RE_doctype, "");
-}
-RegExp.multiline = save_multiline;
-// disabled to save body attributes see #459
-if ( 0 )
-{
-  if ( html.match(Xinha.RE_head) )
-  {
-    this._doc.getElementsByTagName("head")[0].innerHTML = RegExp.$1;
-  }
-  if ( html.match(Xinha.RE_body) )
-  {
-    this._doc.getElementsByTagName("body")[0].innerHTML = RegExp.$1;
-  }
-}
-else
-{
-  // FIXME - can we do this without rewriting the entire document
-  //  does the above not work for IE?
-  var reac = this.editorIsActivated();
-  if ( reac )
-  {
-    this.deactivateEditor();
-  }
-  var html_re = /<html>((.|\n)*?)<\/html>/i;
-  html = html.replace(html_re, "$1");
-  this._doc.open("text/html","replace");
-  this._doc.write(html);
-  this._doc.close();
-  if ( reac )
-  {
-    this.activateEditor();
-  }        
-  this.setEditorEvents();
-  return true;
-}
-};
-/** Initialize some event handlers
- * @private
- */
-Xinha.prototype.setEditorEvents = function()
-{
-var editor=this;
-var doc = this._doc;
-
-editor.whenDocReady(
-  function()
-  {
-    // if we have multiple editors some bug in Mozilla makes some lose editing ability
-    Xinha._addEvents(
-      doc,
-      ["mousedown"],
-      function()
-      {
-        editor.activateEditor();
-        return true;
-      }
-    );
-    if (Xinha.is_ie)
-    { // #1019 Cusor not jumping to editable part of window when clicked in IE, see also #1039
-      Xinha._addEvent(
-      editor._doc.getElementsByTagName("html")[0],
-      "click",
-        function()
-        {
-          if (editor._iframe.contentWindow.event.srcElement.tagName.toLowerCase() == 'html') // if  clicked below the text (=body), the text cursor does not appear, see #1019
-          {
-             var r = editor._doc.body.createTextRange();
-             r.collapse();  
-             r.select()
-             //setTimeout (function () { r.collapse();  r.select();},100); // won't do without timeout, dunno why
-           }
-           return true;
-        }
-      );
-    }
-
-    // intercept some events; for updating the toolbar & keyboard handlers
-    Xinha._addEvents(
-      doc,
-      ["keydown", "keypress", "mousedown", "mouseup", "drag"],
-      function (event)
-      {
-        return editor._editorEvent(Xinha.is_ie ? editor._iframe.contentWindow.event : event);
-      }
-    );
-
-    // FIXME - this needs to be cleaned up and use editor.firePluginEvent
-    //  I don't like both onGenerate and onGenerateOnce, we should only
-    //  have onGenerate and it should only be called when the editor is 
-    //  generated (once and only once)
-    // check if any plugins have registered refresh handlers
-    for ( var i in editor.plugins )
-    {
-      var plugin = editor.plugins[i].instance;
-      Xinha.refreshPlugin(plugin);
-    }
-
-    // specific editor initialization
-    if ( typeof editor._onGenerate == "function" )
-    {
-      editor._onGenerate();
-    }
-
-    Xinha.addDom0Event(window, 'resize', function(e) { editor.sizeEditor(); });
-    editor.removeLoadingMessage();
-  }
-);
-};
-  
-/***************************************************
- *  Category: PLUGINS
- ***************************************************/
-
-
-/** Create the specified plugin and register it with this Xinha
- *  return the plugin created to allow refresh when necessary.<br />
- *  <strong>This is only useful if Xinha is generated without using Xinha.makeEditors()</strong>
- */
-Xinha.prototype.registerPlugin = function()
-{
-if ( !Xinha.isSupportedBrowser ) return; 
-  
-var plugin = arguments[0];
-
-// @todo : try to avoid the use of eval()
-// We can only register plugins that have been succesfully loaded
-if ( plugin === null || typeof plugin == 'undefined' || (typeof plugin == 'string' && eval('typeof ' + plugin) == 'undefined') )
-{
-  return false;
-}
-
-var args = [];
-for ( var i = 1; i < arguments.length; ++i )
-{
-  args.push(arguments[i]);
-}
-return this.registerPlugin2(plugin, args);
-};
-/** This is the variant of the function above where the plugin arguments are
- * already packed in an array.  Externally, it should be only used in the
- * full-screen editor code, in order to initialize plugins with the same
- * parameters as in the opener window.
- * @private
- */
-Xinha.prototype.registerPlugin2 = function(plugin, args)
-{
-// @todo : try to avoid the use of eval()
-if ( typeof plugin == "string" )
-{
-  plugin = eval(plugin);
-}
-if ( typeof plugin == "undefined" )
-{
-  /* FIXME: This should never happen. But why does it do? */
-  return false;
-}
-var obj = new plugin(this, args);
-if ( obj )
-{
-  var clone = {};
-  var info = plugin._pluginInfo;
-  for ( var i in info )
-  {
-    clone[i] = info[i];
-  }
-  clone.instance = obj;
-  clone.args = args;
-  this.plugins[plugin._pluginInfo.name] = clone;
-  return obj;
-}
-else
-{
-  alert("Can't register plugin " + plugin.toString() + ".");
-}
-};
-
-
-/** Dynamically returns the directory from which the plugins are loaded<br />
- *  This could be overridden to change the dir<br />
- *  @TODO: Wouldn't this be better as a config option?
- * @private
- * @param {String} pluginName
- * @returns {String} path to plugin
- */
-Xinha.getPluginDir = function(pluginName)
-{
-return _editor_url + "plugins/" + pluginName;
-};
-/** Static function that loads the given plugin
- * @param {String} pluginName
- * @param {Function} callback function to be called when file is loaded
- * @param {String} plugin_file URL of the file to load
- * @returns {Boolean} true if plugin loaded, false otherwise
- */
-Xinha.loadPlugin = function(pluginName, callback, plugin_file)
-{
-if ( !Xinha.isSupportedBrowser ) return;
-  
-Xinha.setLoadingMessage (Xinha._lc("Loading plugin $plugin="+pluginName+"$"));
-// @todo : try to avoid the use of eval()
-// Might already be loaded
-//if ( eval('typeof ' + pluginName) != 'undefined' )
-// @todo: try if this works to avoid the use of eval, I've been never getting here when testing
-if ( typeof window['pluginName'] != 'undefined' )
-{
-  if ( callback )
-  {
-    callback(pluginName);
-  }
-  return true;
-}
-
-if(!plugin_file)
-{
-  var dir = this.getPluginDir(pluginName);
-  var plugin = pluginName.replace(/([a-z])([A-Z])([a-z])/g, function (str, l1, l2, l3) { return l1 + "-" + l2.toLowerCase() + l3; }).toLowerCase() + ".js";
-  plugin_file = dir + "/" + plugin;
-}
-  
-Xinha._loadback(plugin_file, callback ? function() { callback(pluginName); } : null);
-return false;
-};
-/** Stores a status for each loading plugin that may be one of "loading","ready", or "failed"
- * @private
- * @type {Object} 
- */
-Xinha._pluginLoadStatus = {};
-
-/** Static function that loads the plugins (see xinha_plugins in NewbieGuide)
- * @param {Array} plugins
- * @param {Function} callbackIfNotReady function that is called repeatedly until all files are
- * @param {String} optional url URL of the plugin file; obviously plugins should contain only one item if url is given
- * @returns {Boolean} true if all plugins are loaded, false otherwise
- */
-Xinha.loadPlugins = function(plugins, callbackIfNotReady,url)
-{
-if ( !Xinha.isSupportedBrowser ) return;
-Xinha.setLoadingMessage (Xinha._lc("Loading plugins"));
-// Rip the ones that are loaded and look for ones that have failed
-var retVal = true;
-var nuPlugins = Xinha.cloneObject(plugins);
-
-while ( nuPlugins.length )
-{
-  var p = nuPlugins.pop();
-  if ( typeof Xinha._pluginLoadStatus[p] == 'undefined' )
-  {
-    // Load it
-    Xinha._pluginLoadStatus[p] = 'loading';
-    Xinha.loadPlugin(p,
-      function(plugin)
-      {
-        if ( typeof window[plugin] != 'undefined' )
-        {
-          Xinha._pluginLoadStatus[plugin] = 'ready';
-        }
-        else
-        {
-          // Actually, this won't happen, because if the script fails
-          // it will throw an exception preventing the callback from
-          // running.  This will leave it always in the "loading" state
-          // unfortunatly that means we can't fail plugins gracefully
-          // by just skipping them.
-          Xinha._pluginLoadStatus[plugin] = 'failed';
-        }
-      },url
-    );
-    retVal = false;
-  }
-  else
-  {
-    // @todo: a simple (if) would not be better than this tortuous (switch) structure ?
-    // if ( Xinha._pluginLoadStatus[p] !== 'failed' && Xinha._pluginLoadStatus[p] !== 'ready' )
-    // {
-    //   retVal = false;
-    // }
-    switch ( Xinha._pluginLoadStatus[p] )
-    {
-      case 'failed':
-      case 'ready' :
-      break;
-
-      //case 'loading':
-      default       :
-       retVal = false;
-     break;
-    }
-  }
-}
-
-// All done, just return
-if ( retVal )
-{
-  return true;
-} 
-
-// Waiting on plugins to load, return false now and come back a bit later
-// if we have to callback
-if ( callbackIfNotReady )
-{
-  setTimeout(function() { if ( Xinha.loadPlugins(plugins, callbackIfNotReady) ) { callbackIfNotReady(); } }, 150);
-}
-return retVal;
-};
-
-// 
-/** Refresh plugin by calling onGenerate or onGenerateOnce method.
- * @private
- * @param {PluginInstance} plugin
- */
-Xinha.refreshPlugin = function(plugin)
-{
-if ( plugin && typeof plugin.onGenerate == "function" )
-{
-  plugin.onGenerate();
-}
-if ( plugin && typeof plugin.onGenerateOnce == "function" )
-{
-  plugin.onGenerateOnce();
-  plugin.onGenerateOnce = null;
-}
-};
-
-/** Call a method of all plugins which define the method using the supplied arguments.<br /><br />
- *
- *  Example: <code>editor.firePluginEvent('onExecCommand', 'paste')</code><br />
- *           The plugin would then define a method<br />
- *           <code>PluginName.prototype.onExecCommand = function (cmdID, UI, param) {do something...}</code><br /><br />
- *           The following methodNames are currently available:<br />
- *  <table border="1">
- *    <tr>
- *       <th>methodName</th><th>Parameters</th>
- *     </tr>
- *     <tr>
- *       <td>onExecCommand</td><td> cmdID, UI, param</td>
- *     </tr>
- *     <tr>
- *       <td>onKeyPress</td><td>ev</td>
- *     </tr> 
- *     <tr>
- *       <td>onMouseDown</td><td>ev</td>
- *     </tr>
- * </table><br /><br />
- *  
- *  The browser specific plugin (if any) is called last.  The result of each call is 
- *  treated as boolean.  A true return means that the event will stop, no further plugins
- *  will get the event, a false return means the event will continue to fire.
- *
- *  @param {String} methodName
- *  @param {mixed} arguments to pass to the method, optional [2..n] 
- *  @returns {Boolean}
- */
-
-Xinha.prototype.firePluginEvent = function(methodName)
-{
-// arguments is not a real array so we can't just .shift() it unfortunatly.
-var argsArray = [ ];
-for(var i = 1; i < arguments.length; i++)
-{
-  argsArray[i-1] = arguments[i];
-}
-  
-for ( var i in this.plugins )
-{
-  var plugin = this.plugins[i].instance;
-    
-  // Skip the browser specific plugin
-  if ( plugin == this._browserSpecificPlugin) continue;
-    
-  if ( plugin && typeof plugin[methodName] == "function" )
-  {
-    if ( plugin[methodName].apply(plugin, argsArray) )
-    {
-      return true;
-    }
-  }
-}
-  
-// Now the browser speific
-var plugin = this._browserSpecificPlugin;
-if ( plugin && typeof plugin[methodName] == "function" )
-{
-  if ( plugin[methodName].apply(plugin, argsArray) )
-  {
-    return true;
-  }
-}
-    
-return false;
-}
-/** Adds a stylesheet to the document
- * @param {String} style name of the stylesheet file
- * @param {String} plugin optional name of a plugin; if passed this function looks for the stylesheet file in the plugin directory 
- * @param {String} id optional a unique id for identifiing the created link element, e.g. for avoiding double loading 
- *                 or later removing it again
- */
-Xinha.loadStyle = function(style, plugin, id,prepend)
-{
-var url = _editor_url || '';
-if ( plugin )
-{
-  url = Xinha.getPluginDir( plugin ) + "/";
-}
-url += style;
-// @todo: would not it be better to check the first character instead of a regex ?
-// if ( typeof style == 'string' && style.charAt(0) == '/' )
-// {
-//   url = style;
-// }
-if ( /^\//.test(style) )
-{
-  url = style;
-}
-var head = document.getElementsByTagName("head")[0];
-var link = document.createElement("link");
-link.rel = "stylesheet";
-link.href = url;
-link.type = "text/css";
-if (id) link.id = id;
-if (prepend && head.getElementsByTagName('link')[0])
-{
-  head.insertBefore(link,head.getElementsByTagName('link')[0]);
-}
-else
-{
-  head.appendChild(link);
-}
-  
-};
-
-
-/***************************************************
- *  Category: EDITOR UTILITIES
- ***************************************************/
-/** Utility function: Outputs the structure of the edited document */
-Xinha.prototype.debugTree = function()
-{
-var ta = document.createElement("textarea");
-ta.style.width = "100%";
-ta.style.height = "20em";
-ta.value = "";
-function debug(indent, str)
-{
-  for ( ; --indent >= 0; )
-  {
-    ta.value += " ";
-  }
-  ta.value += str + "\n";
-}
-function _dt(root, level)
-{
-  var tag = root.tagName.toLowerCase(), i;
-  var ns = Xinha.is_ie ? root.scopeName : root.prefix;
-  debug(level, "- " + tag + " [" + ns + "]");
-  for ( i = root.firstChild; i; i = i.nextSibling )
-  {
-    if ( i.nodeType == 1 )
-    {
-      _dt(i, level + 2);
-    }
-  }
-}
-_dt(this._doc.body, 0);
-document.body.appendChild(ta);
-};
-/** Extracts the textual content of a given node
- * @param {DomNode} el
- */
-
-Xinha.getInnerText = function(el)
-{
-var txt = '', i;
-for ( i = el.firstChild; i; i = i.nextSibling )
-{
-  if ( i.nodeType == 3 )
-  {
-    txt += i.data;
-  }
-  else if ( i.nodeType == 1 )
-  {
-    txt += Xinha.getInnerText(i);
-  }
-}
-return txt;
-};
-/** Cleans dirty HTML from MS word; always cleans the whole editor content
- *  @TODO: move this in a separate file
- *  @TODO: turn this into a static function that cleans a given string
- */
-Xinha.prototype._wordClean = function()
-{
-var editor = this;
-var stats =
-{
-  empty_tags : 0,
-  mso_class  : 0,
-  mso_style  : 0,
-  mso_xmlel  : 0,
-  orig_len   : this._doc.body.innerHTML.length,
-  T          : (new Date()).getTime()
-};
-var stats_txt =
-{
-  empty_tags : "Empty tags removed: ",
-  mso_class  : "MSO class names removed: ",
-  mso_style  : "MSO inline style removed: ",
-  mso_xmlel  : "MSO XML elements stripped: "
-};
-
-function showStats()
-{
-  var txt = "Xinha word cleaner stats: \n\n";
-  for ( var i in stats )
-  {
-    if ( stats_txt[i] )
-    {
-      txt += stats_txt[i] + stats[i] + "\n";
-    }
-  }
-  txt += "\nInitial document length: " + stats.orig_len + "\n";
-  txt += "Final document length: " + editor._doc.body.innerHTML.length + "\n";
-  txt += "Clean-up took " + (((new Date()).getTime() - stats.T) / 1000) + " seconds";
-  alert(txt);
-}
-
-function clearClass(node)
-{
-  var newc = node.className.replace(/(^|\s)mso.*?(\s|$)/ig, ' ');
-  if ( newc != node.className )
-  {
-    node.className = newc;
-    if ( ! ( /\S/.test(node.className) ) )
-    {
-      node.removeAttribute("className");
-      ++stats.mso_class;
-    }
-  }
-}
-
-function clearStyle(node)
-{
-  var declarations = node.style.cssText.split(/\s*;\s*/);
-  for ( var i = declarations.length; --i >= 0; )
-  {
-    if ( ( /^mso|^tab-stops/i.test(declarations[i]) ) || ( /^margin\s*:\s*0..\s+0..\s+0../i.test(declarations[i]) ) )
-    {
-      ++stats.mso_style;
-      declarations.splice(i, 1);
-    }
-  }
-  node.style.cssText = declarations.join("; ");
-}
-
-var stripTag = null;
-if ( Xinha.is_ie )
-{
-  stripTag = function(el)
-  {
-    el.outerHTML = Xinha.htmlEncode(el.innerText);
-    ++stats.mso_xmlel;
-  };
-}
-else
-{
-  stripTag = function(el)
-  {
-    var txt = document.createTextNode(Xinha.getInnerText(el));
-    el.parentNode.insertBefore(txt, el);
-    Xinha.removeFromParent(el);
-    ++stats.mso_xmlel;
-  };
-}
-
-function checkEmpty(el)
-{
-  // @todo : check if this is quicker
-  //  if (!['A','SPAN','B','STRONG','I','EM','FONT'].contains(el.tagName) && !el.firstChild)
-  if ( /^(span|b|strong|i|em|font|div|p)$/i.test(el.tagName) && !el.firstChild)
-  {
-    Xinha.removeFromParent(el);
-    ++stats.empty_tags;
-  }
-}
-
-function parseTree(root)
-{
-  var tag = root.tagName.toLowerCase(), i, next;
-  // @todo : probably better to use String.indexOf() instead of this ugly regex
-  // if ((Xinha.is_ie && root.scopeName != 'HTML') || (!Xinha.is_ie && tag.indexOf(':') !== -1)) {
-  if ( ( Xinha.is_ie && root.scopeName != 'HTML' ) || ( !Xinha.is_ie && ( /:/.test(tag) ) ) )
-  {
-    stripTag(root);
-    return false;
-  }
-  else
-  {
-    clearClass(root);
-    clearStyle(root);
-    for ( i = root.firstChild; i; i = next )
-    {
-      next = i.nextSibling;
-      if ( i.nodeType == 1 && parseTree(i) )
-      {
-        checkEmpty(i);
-      }
-    }
-  }
-  return true;
-}
-parseTree(this._doc.body);
-// showStats();
-// this.debugTree();
-// this.setHTML(this.getHTML());
-// this.setHTML(this.getInnerHTML());
-// this.forceRedraw();
-this.updateToolbar();
-};
-
-/** Removes &lt;font&gt; tags; always cleans the whole editor content
- *  @TODO: move this in a separate file
- *  @TODO: turn this into a static function that cleans a given string
- */
-Xinha.prototype._clearFonts = function()
-{
-var D = this.getInnerHTML();
-
-if ( confirm(Xinha._lc("Would you like to clear font typefaces?")) )
-{
-  D = D.replace(/face="[^"]*"/gi, '');
-  D = D.replace(/font-family:[^;}"']+;?/gi, '');
-}
-
-if ( confirm(Xinha._lc("Would you like to clear font sizes?")) )
-{
-  D = D.replace(/size="[^"]*"/gi, '');
-  D = D.replace(/font-size:[^;}"']+;?/gi, '');
-}
-
-if ( confirm(Xinha._lc("Would you like to clear font colours?")) )
-{
-  D = D.replace(/color="[^"]*"/gi, '');
-  D = D.replace(/([^-])color:[^;}"']+;?/gi, '$1');
-}
-
-D = D.replace(/(style|class)="\s*"/gi, '');
-D = D.replace(/<(font|span)\s*>/gi, '');
-this.setHTML(D);
-this.updateToolbar();
-};
-
-Xinha.prototype._splitBlock = function()
-{
-this._doc.execCommand('formatblock', false, 'div');
-};
-
-/** Sometimes the display has to be refreshed to make DOM changes visible (?) (Gecko bug?)  */
-Xinha.prototype.forceRedraw = function()
-{
-this._doc.body.style.visibility = "hidden";
-this._doc.body.style.visibility = "";
-// this._doc.body.innerHTML = this.getInnerHTML();
-};
-
-/** Focuses the iframe window. 
- * @returns {document} a reference to the editor document
- */
-Xinha.prototype.focusEditor = function()
-{
-switch (this._editMode)
-{
-  // notice the try { ... } catch block to avoid some rare exceptions in FireFox
-  // (perhaps also in other Gecko browsers). Manual focus by user is required in
-  // case of an error. Somebody has an idea?
-  case "wysiwyg" :
-    try
-    {
-      // We don't want to focus the field unless at least one field has been activated.
-      if ( Xinha._someEditorHasBeenActivated )
-      {
-        this.activateEditor(); // Ensure *this* editor is activated
-        this._iframe.contentWindow.focus(); // and focus it
-      }
-    } catch (ex) {}
-  break;
-  case "textmode":
-    try
-    {
-      this._textArea.focus();
-    } catch (e) {}
-  break;
-  default:
-    alert("ERROR: mode " + this._editMode + " is not defined");
-}
-return this._doc;
-};
-
-/** Takes a snapshot of the current text (for undo)
- * @private
- */
-Xinha.prototype._undoTakeSnapshot = function()
-{
-++this._undoPos;
-if ( this._undoPos >= this.config.undoSteps )
-{
-  // remove the first element
-  this._undoQueue.shift();
-  --this._undoPos;
-}
-// use the fasted method (getInnerHTML);
-var take = true;
-var txt = this.getInnerHTML();
-if ( this._undoPos > 0 )
-{
-  take = (this._undoQueue[this._undoPos - 1] != txt);
-}
-if ( take )
-{
-  this._undoQueue[this._undoPos] = txt;
-}
-else
-{
-  this._undoPos--;
-}
-};
-/** Custom implementation of undo functionality
- * @private
- */
-Xinha.prototype.undo = function()
-{
-if ( this._undoPos > 0 )
-{
-  var txt = this._undoQueue[--this._undoPos];
-  if ( txt )
-  {
-    this.setHTML(txt);
-  }
-  else
-  {
-    ++this._undoPos;
-  }
-}
-};
-/** Custom implementation of redo functionality
- * @private
- */
-Xinha.prototype.redo = function()
-{
-if ( this._undoPos < this._undoQueue.length - 1 )
-{
-  var txt = this._undoQueue[++this._undoPos];
-  if ( txt )
-  {
-    this.setHTML(txt);
-  }
-  else
-  {
-    --this._undoPos;
-  }
-}
-};
-/** Disables (greys out) the buttons of the toolbar
- * @param {Array} except this array contains ids of toolbar objects that will not be disabled
- */
-Xinha.prototype.disableToolbar = function(except)
-{
-if ( this._timerToolbar )
-{
-  clearTimeout(this._timerToolbar);
-}
-if ( typeof except == 'undefined' )
-{
-  except = [ ];
-}
-else if ( typeof except != 'object' )
-{
-  except = [except];
-}
-
-for ( var i in this._toolbarObjects )
-{
-  var btn = this._toolbarObjects[i];
-  if ( except.contains(i) )
-  {
-    continue;
-  }
-  // prevent iterating over wrong type
-  if ( typeof(btn.state) != 'function' )
-  {
-    continue;
-  }
-  btn.state("enabled", false);
-}
-};
-/** Enables the toolbar again when disabled by disableToolbar() */
-Xinha.prototype.enableToolbar = function()
-{
-this.updateToolbar();
-};
-
-/** Updates enabled/disable/active state of the toolbar elements, the statusbar and other things
- *  This function is called on every key stroke as well as by a timer on a regular basis.<br />
- *  Plugins have the opportunity to implement a prototype.onUpdateToolbar() method, which will also
- *  be called by this function.
- * @param {Boolean} noStatus private use Exempt updating of statusbar
- */
-// FIXME : this function needs to be splitted in more functions.
-// It is actually to heavy to be understable and very scary to manipulate
-Xinha.prototype.updateToolbar = function(noStatus)
-{
-var doc = this._doc;
-var text = (this._editMode == "textmode");
-var ancestors = null;
-if ( !text )
-{
-  ancestors = this.getAllAncestors();
-  if ( this.config.statusBar && !noStatus )
-  {
-    while ( this._statusBarItems.length )
-    { 
-      var item = this._statusBarItems.pop();
-      item.el = null;
-      item.editor = null;
-      item.onclick = null;
-      item.oncontextmenu = null;
-      item._xinha_dom0Events['click'] = null;
-      item._xinha_dom0Events['contextmenu'] = null;
-      item = null;
-    }
-
-    this._statusBarTree.innerHTML = Xinha._lc("Path") + ": "; // clear
-    for ( var i = ancestors.length; --i >= 0; )
-    {
-      var el = ancestors[i];
-      if ( !el )
-      {
-        // hell knows why we get here; this
-        // could be a classic example of why
-        // it's good to check for conditions
-        // that are impossible to happen ;-)
-        continue;
-      }
-      var a = document.createElement("a");
-      a.href = "javascript:void(0)";
-      a.el = el;
-      a.editor = this;
-      this._statusBarItems.push(a);
-      Xinha.addDom0Event(
-        a,
-        'click',
-        function() {
-          this.blur();
-          this.editor.selectNodeContents(this.el);
-          this.editor.updateToolbar(true);
-          return false;
-        }
-      );
-      Xinha.addDom0Event(
-        a,
-        'contextmenu',
-        function()
-        {
-          // TODO: add context menu here
-          this.blur();
-          var info = "Inline style:\n\n";
-          info += this.el.style.cssText.split(/;\s*/).join(";\n");
-          alert(info);
-          return false;
-        }
-      );
-      var txt = el.tagName.toLowerCase();
-      if (typeof el.style != 'undefined') a.title = el.style.cssText;
-      if ( el.id )
-      {
-        txt += "#" + el.id;
-      }
-      if ( el.className )
-      {
-        txt += "." + el.className;
-      }
-      a.appendChild(document.createTextNode(txt));
-      this._statusBarTree.appendChild(a);
-      if ( i !== 0 )
-      {
-        this._statusBarTree.appendChild(document.createTextNode(String.fromCharCode(0xbb)));          
-      }
-      Xinha.freeLater(a);
-    }
-  }
-}
-
-for ( var cmd in this._toolbarObjects )
-{
-  var btn = this._toolbarObjects[cmd];
-  var inContext = true;
-  // prevent iterating over wrong type
-  if ( typeof(btn.state) != 'function' )
-  {
-    continue;
-  }
-  if ( btn.context && !text )
-  {
-    inContext = false;
-    var context = btn.context;
-    var attrs = [];
-    if ( /(.*)\[(.*?)\]/.test(context) )
-    {
-      context = RegExp.$1;
-      attrs = RegExp.$2.split(",");
-    }
-    context = context.toLowerCase();
-    var match = (context == "*");
-    for ( var k = 0; k < ancestors.length; ++k )
-    {
-      if ( !ancestors[k] )
-      {
-        // the impossible really happens.
-        continue;
-      }
-      if ( match || ( ancestors[k].tagName.toLowerCase() == context ) )
-      {
-        inContext = true;
-        var contextSplit = null;
-        var att = null;
-        var comp = null;
-        var attVal = null;
-        for ( var ka = 0; ka < attrs.length; ++ka )
-        {
-          contextSplit = attrs[ka].match(/(.*)(==|!=|===|!==|>|>=|<|<=)(.*)/);
-          att = contextSplit[1];
-          comp = contextSplit[2];
-          attVal = contextSplit[3];
-
-          if (!eval(ancestors[k][att] + comp + attVal))
-          {
-            inContext = false;
-            break;
-          }
-        }
-        if ( inContext )
-        {
-          break;
-        }
-      }
-    }
-  }
-  btn.state("enabled", (!text || btn.text) && inContext);
-  if ( typeof cmd == "function" )
-  {
-    continue;
-  }
-  // look-it-up in the custom dropdown boxes
-  var dropdown = this.config.customSelects[cmd];
-  if ( ( !text || btn.text ) && ( typeof dropdown != "undefined" ) )
-  {
-    dropdown.refresh(this);
-    continue;
-  }
-  switch (cmd)
-  {
-    case "fontname":
-    case "fontsize":
-      if ( !text )
-      {
-        try
-        {
-          var value = ("" + doc.queryCommandValue(cmd)).toLowerCase();
-          if ( !value )
-          {
-            btn.element.selectedIndex = 0;
-            break;
-          }
-
-          // HACK -- retrieve the config option for this
-          // combo box.  We rely on the fact that the
-          // variable in config has the same name as
-          // button name in the toolbar.
-          var options = this.config[cmd];
-          var sIndex = 0;
-          for ( var j in options )
-          {
-          // FIXME: the following line is scary.
-            if ( ( j.toLowerCase() == value ) || ( options[j].substr(0, value.length).toLowerCase() == value ) )
-            {
-              btn.element.selectedIndex = sIndex;
-              throw "ok";
-            }
-            ++sIndex;
-          }
-          btn.element.selectedIndex = 0;
-        } catch(ex) {}
-      }
-    break;
-
-    // It's better to search for the format block by tag name from the
-    //  current selection upwards, because IE has a tendancy to return
-    //  things like 'heading 1' for 'h1', which breaks things if you want
-    //  to call your heading blocks 'header 1'.  Stupid MS.
-    case "formatblock":
-      var blocks = [];
-      for ( var indexBlock in this.config.formatblock )
-      {
-        // prevent iterating over wrong type
-        if ( typeof this.config.formatblock[indexBlock] == 'string' )
-        {
-          blocks[blocks.length] = this.config.formatblock[indexBlock];
-        }
-      }
-
-      var deepestAncestor = this._getFirstAncestor(this.getSelection(), blocks);
-      if ( deepestAncestor )
-      {
-        for ( var x = 0; x < blocks.length; x++ )
-        {
-          if ( blocks[x].toLowerCase() == deepestAncestor.tagName.toLowerCase() )
-          {
-            btn.element.selectedIndex = x;
-          }
-        }
-      }
-      else
-      {
-        btn.element.selectedIndex = 0;
-      }
-    break;
-
-    case "textindicator":
-      if ( !text )
-      {
-        try
-        {
-          var style = btn.element.style;
-          style.backgroundColor = Xinha._makeColor(doc.queryCommandValue(Xinha.is_ie ? "backcolor" : "hilitecolor"));
-          if ( /transparent/i.test(style.backgroundColor) )
-          {
-            // Mozilla
-            style.backgroundColor = Xinha._makeColor(doc.queryCommandValue("backcolor"));
-          }
-          style.color = Xinha._makeColor(doc.queryCommandValue("forecolor"));
-          style.fontFamily = doc.queryCommandValue("fontname");
-          style.fontWeight = doc.queryCommandState("bold") ? "bold" : "normal";
-          style.fontStyle = doc.queryCommandState("italic") ? "italic" : "normal";
-        } catch (ex) {
-          // alert(e + "\n\n" + cmd);
-        }
-      }
-    break;
-
-    case "htmlmode":
-      btn.state("active", text);
-    break;
-
-    case "lefttoright":
-    case "righttoleft":
-      var eltBlock = this.getParentElement();
-      while ( eltBlock && !Xinha.isBlockElement(eltBlock) )
-      {
-        eltBlock = eltBlock.parentNode;
-      }
-      if ( eltBlock )
-      {
-        btn.state("active", (eltBlock.style.direction == ((cmd == "righttoleft") ? "rtl" : "ltr")));
-      }
-    break;
-
-    default:
-      cmd = cmd.replace(/(un)?orderedlist/i, "insert$1orderedlist");
-      try
-      {
-        btn.state("active", (!text && doc.queryCommandState(cmd)));
-      } catch (ex) {}
-    break;
-  }
-}
-// take undo snapshots
-if ( this._customUndo && !this._timerUndo )
-{
-  this._undoTakeSnapshot();
-  var editor = this;
-  this._timerUndo = setTimeout(function() { editor._timerUndo = null; }, this.config.undoTimeout);
-}
-
-// Insert a space in certain locations, this is just to make editing a little
-// easier (to "get out of" tags), it's not essential.
-// TODO: Make this work for IE?
-// TODO: Perhaps should use a plain space character, I'm not sure.
-//  OK, I've disabled this temporarily, to be honest, I can't rightly remember what the
-//  original problem was I was trying to solve with it.  I think perhaps that EnterParagraphs
-//  might solve the problem, whatever the hell it was.  I'm going senile, I'm sure.
-// @todo : since this part is disabled since a long time, does it still need to be in the source ?
-if( 0 && Xinha.is_gecko )
-{
-  var s = this.getSelection();
-  // If the last character in the last text node of the parent tag
-  // and the parent tag is not a block tag
-  if ( s && s.isCollapsed && s.anchorNode &&
-       s.anchorNode.parentNode.tagName.toLowerCase() != 'body' &&
-       s.anchorNode.nodeType == 3 && s.anchorOffset == s.anchorNode.length &&
-       !( s.anchorNode.parentNode.nextSibling && s.anchorNode.parentNode.nextSibling.nodeType == 3 ) &&
-       !Xinha.isBlockElement(s.anchorNode.parentNode) )
-  {
-    // Insert hair-width-space after the close tag if there isn't another text node on the other side
-    // It could also work with zero-width-space (\u200B) but I don't like it so much.
-    // Perhaps this won't work well in various character sets and we should use plain space (20)?
-    try
-    {
-      s.anchorNode.parentNode.parentNode.insertBefore(this._doc.createTextNode('\t'), s.anchorNode.parentNode.nextSibling);
-    }
-    catch(ex) {} // Disregard
-  }
-}
-
-// FIXME: this should be using this.firePluginEvent('onUpdateToolbar')
-//   but we have to make sure that the plugins using that event return false
-//   if they should let the event fire on other plugins, currently the below
-//   code doesn't take the return value into account
-  
-// check if any plugins have registered refresh handlers
-for ( var indexPlugin in this.plugins )
-{
-  var plugin = this.plugins[indexPlugin].instance;
-  if ( plugin && typeof plugin.onUpdateToolbar == "function" )
-  {
-    plugin.onUpdateToolbar();
-  }
-}
-
-};
-
-/** Returns an array with all the ancestor nodes of the selection or current cursor position.
-* @returns {Array}
-*/
-Xinha.prototype.getAllAncestors = function()
-{
-var p = this.getParentElement();
-var a = [];
-while ( p && (p.nodeType == 1) && ( p.tagName.toLowerCase() != 'body' ) )
-{
-  a.push(p);
-  p = p.parentNode;
-}
-a.push(this._doc.body);
-return a;
-};
-
-/** Traverses the DOM upwards and returns the first element that is of one of the specified types
- *  @param {Selection} sel  Selection object as returned by getSelection
- *  @param {Array} types Array of HTML tag names (lower case)
- *  @returns {DomNode|null} 
- */
-Xinha.prototype._getFirstAncestor = function(sel, types)
-{
-var prnt = this.activeElement(sel);
-if ( prnt === null )
-{
-  // Hmm, I think Xinha.getParentElement() would do the job better?? - James
-  try
-  {
-    prnt = (Xinha.is_ie ? this.createRange(sel).parentElement() : this.createRange(sel).commonAncestorContainer);
-  }
-  catch(ex)
-  {
-    return null;
-  }
-}
-
-if ( typeof types == 'string' )
-{
-  types = [types];
-}
-
-while ( prnt )
-{
-  if ( prnt.nodeType == 1 )
-  {
-    if ( types === null )
-    {
-      return prnt;
-    }
-    if ( types.contains(prnt.tagName.toLowerCase()) )
-    {
-      return prnt;
-    }
-    if ( prnt.tagName.toLowerCase() == 'body' )
-    {
-      break;
-    }
-    if ( prnt.tagName.toLowerCase() == 'table' )
-    {
-      break;
-    }
-  }
-  prnt = prnt.parentNode;
-}
-
-return null;
-};
-
-/** Traverses the DOM upwards and returns the first element that is a block level element
- *  @param {Selection} sel  Selection object as returned by getSelection
- *  @returns {DomNode|null} 
- */
-Xinha.prototype._getAncestorBlock = function(sel)
-{
-// Scan upwards to find a block level element that we can change or apply to
-var prnt = (Xinha.is_ie ? this.createRange(sel).parentElement : this.createRange(sel).commonAncestorContainer);
-
-while ( prnt && ( prnt.nodeType == 1 ) )
-{
-  switch ( prnt.tagName.toLowerCase() )
-  {
-    case 'div':
-    case 'p':
-    case 'address':
-    case 'blockquote':
-    case 'center':
-    case 'del':
-    case 'ins':
-    case 'pre':
-    case 'h1':
-    case 'h2':
-    case 'h3':
-    case 'h4':
-    case 'h5':
-    case 'h6':
-    case 'h7':
-      // Block Element
-      return prnt;
-
-    case 'body':
-    case 'noframes':
-    case 'dd':
-    case 'li':
-    case 'th':
-    case 'td':
-    case 'noscript' :
-      // Halting element (stop searching)
-      return null;
-
-    default:
-      // Keep lookin
-      break;
-  }
-}
-
-return null;
-};
-
-/** What's this? does nothing, has to be removed
- * 
- * @deprecated
- */
-Xinha.prototype._createImplicitBlock = function(type)
-{
-// expand it until we reach a block element in either direction
-// then wrap the selection in a block and return
-var sel = this.getSelection();
-if ( Xinha.is_ie )
-{
-  sel.empty();
-}
-else
-{
-  sel.collapseToStart();
-}
-
-var rng = this.createRange(sel);
-
-// Expand UP
-
-// Expand DN
-};
-
-
-
-/**
- *  Call this function to surround the existing HTML code in the selection with
- *  your tags.  FIXME: buggy! Don't use this 
- * @todo: when will it be deprecated ? Can it be removed already ?
- * @private (tagged private to not further promote use of this function)
- * @deprecated
- */
-Xinha.prototype.surroundHTML = function(startTag, endTag)
-{
-var html = this.getSelectedHTML();
-// the following also deletes the selection
-this.insertHTML(startTag + html + endTag);
-};
-
-/** Return true if we have some selection
- *  @returns {Boolean} 
- */
-Xinha.prototype.hasSelectedText = function()
-{
-// FIXME: come _on_ mishoo, you can do better than this ;-)
-return this.getSelectedHTML() !== '';
-};
-
-/***************************************************
- *  Category: EVENT HANDLERS
- ***************************************************/
-
-/** onChange handler for dropdowns in toolbar 
- *  @private
- *  @param {DomNode} el Reference to the SELECT object
- *  @param {String} txt  The name of the select field, as in config.toolbar
- *  @returns {DomNode|null} 
- */
-Xinha.prototype._comboSelected = function(el, txt)
-{
-this.focusEditor();
-var value = el.options[el.selectedIndex].value;
-switch (txt)
-{
-  case "fontname":
-  case "fontsize":
-    this.execCommand(txt, false, value);
-  break;
-  case "formatblock":
-    // Mozilla inserts an empty tag (<>) if no parameter is passed  
-    if ( !value )
-    {
-	    this.updateToolbar();
-	    break;
-    }
-    if( !Xinha.is_gecko || value !== 'blockquote' )
-    {
-      value = "<" + value + ">";
-    }
-    this.execCommand(txt, false, value);
-  break;
-  default:
-    // try to look it up in the registered dropdowns
-    var dropdown = this.config.customSelects[txt];
-    if ( typeof dropdown != "undefined" )
-    {
-      dropdown.action(this);
-    }
-    else
-    {
-      alert("FIXME: combo box " + txt + " not implemented");
-    }
-  break;
-}
-};
-
-/** Open a popup to select the hilitecolor or forecolor
- * @private
- * @param {String} cmdID The commande ID (hilitecolor or forecolor)
- */
-Xinha.prototype._colorSelector = function(cmdID)
-{
-var editor = this;	// for nested functions
-
-// backcolor only works with useCSS/styleWithCSS (see mozilla bug #279330 & Midas doc)
-// and its also nicer as <font>
-if ( Xinha.is_gecko )
-{
-  try
-  {
-   editor._doc.execCommand('useCSS', false, false); // useCSS deprecated & replaced by styleWithCSS 
-   editor._doc.execCommand('styleWithCSS', false, true); 
-     
-  } catch (ex) {}
-}
-  
-var btn = editor._toolbarObjects[cmdID].element;
-var initcolor;
-if ( cmdID == 'hilitecolor' )
-{
-  if ( Xinha.is_ie )
-  {
-    cmdID = 'backcolor';
-    initcolor = Xinha._colorToRgb(editor._doc.queryCommandValue("backcolor"));
-  }
-  else
-  {
-    initcolor = Xinha._colorToRgb(editor._doc.queryCommandValue("hilitecolor"));
-  }
-}
-else
-{
-	initcolor = Xinha._colorToRgb(editor._doc.queryCommandValue("forecolor"));
-}
-var cback = function(color) { editor._doc.execCommand(cmdID, false, color); };
-if ( Xinha.is_ie )
-{
-  var range = editor.createRange(editor.getSelection());
-  cback = function(color)
-  {
-    range.select();
-    editor._doc.execCommand(cmdID, false, color);
-  };
-}
-var picker = new Xinha.colorPicker(
-{
-	cellsize:editor.config.colorPickerCellSize,
-	callback:cback,
-	granularity:editor.config.colorPickerGranularity,
-	websafe:editor.config.colorPickerWebSafe,
-	savecolors:editor.config.colorPickerSaveColors
-});
-picker.open(editor.config.colorPickerPosition, btn, initcolor);
-};
-
-/** This is a wrapper for the browser's execCommand function that handles things like 
- *  formatting, inserting elements, etc.<br />
- *  It intercepts some commands and replaces them with our own implementation.<br />
- *  It provides a hook for the "firePluginEvent" system ("onExecCommand").<br /><br />
- *  For reference see:<br />
- *     <a href="http://www.mozilla.org/editor/midas-spec.html">Mozilla implementation</a><br />
- *     <a href="http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/execcommand.asp">MS implementation</a>
- *
- *  @see Xinha#firePluginEvent
- *  @param {String} cmdID command to be executed as defined in the browsers implemantations or Xinha custom
- *  @param {Boolean} UI for compatibility with the execCommand syntax; false in most (all) cases
- *  @param {Mixed} param Some commands require parameters
- *  @returns {Boolean} always false 
- */
-Xinha.prototype.execCommand = function(cmdID, UI, param)
-{
-var editor = this;	// for nested functions
-this.focusEditor();
-cmdID = cmdID.toLowerCase();
-  
-// See if any plugins want to do something special
-if(this.firePluginEvent('onExecCommand', cmdID, UI, param))
-{
-  this.updateToolbar();
-  return false;
-}
-
-switch (cmdID)
-{
-  case "htmlmode":
-    this.setMode();
-  break;
-
-  case "hilitecolor":
-  case "forecolor":
-    this._colorSelector(cmdID);
-  break;
-
-  case "createlink":
-    this._createLink();
-  break;
-
-  case "undo":
-  case "redo":
-    if (this._customUndo)
-    {
-      this[cmdID]();
-    }
-    else
-    {
-      this._doc.execCommand(cmdID, UI, param);
-    }
-  break;
-
-  case "inserttable":
-    this._insertTable();
-  break;
-
-  case "insertimage":
-    this._insertImage();
-  break;
-
-  case "about":
-    this._popupDialog(editor.config.URIs.about, null, this);
-  break;
-
-  case "showhelp":
-    this._popupDialog(editor.config.URIs.help, null, this);
-  break;
-
-  case "killword":
-    this._wordClean();
-  break;
-
-  case "cut":
-  case "copy":
-  case "paste":
-    this._doc.execCommand(cmdID, UI, param);
-    if ( this.config.killWordOnPaste )
-    {
-      this._wordClean();
-    }
-  break;
-  case "lefttoright":
-  case "righttoleft":
-    if (this.config.changeJustifyWithDirection) 
-    {
-      this._doc.execCommand((cmdID == "righttoleft") ? "justifyright" : "justifyleft", UI, param);
-    }
-    var dir = (cmdID == "righttoleft") ? "rtl" : "ltr";
-    var el = this.getParentElement();
-    while ( el && !Xinha.isBlockElement(el) )
-    {
-      el = el.parentNode;
-    }
-    if ( el )
-    {
-      if ( el.style.direction == dir )
-      {
-        el.style.direction = "";
-      }
-      else
-      {
-        el.style.direction = dir;
-      }
-    }
-  break;
-    
-  case 'justifyleft'  :
-  case 'justifyright' :
-  {
-    cmdID.match(/^justify(.*)$/);
-    var ae = this.activeElement(this.getSelection());      
-    if(ae && ae.tagName.toLowerCase() == 'img')
-    {
-      ae.align = ae.align == RegExp.$1 ? '' : RegExp.$1;
-    }
-    else
-    {
-      this._doc.execCommand(cmdID, UI, param);
-    }
-  }    
-  break;
-    
-  default:
-    try
-    {
-      this._doc.execCommand(cmdID, UI, param);
-    }
-    catch(ex)
-    {
-      if ( this.config.debug )
-      {
-        alert(ex + "\n\nby execCommand(" + cmdID + ");");
-      }
-    }
-  break;
-}
-
-this.updateToolbar();
-return false;
-};
-
-/** A generic event handler for things that happen in the IFRAME's document.<br />
- *  It provides two hooks for the "firePluginEvent" system:<br />
- *   "onKeyPress"<br />
- *   "onMouseDown"
- *  @see Xinha#firePluginEvent
- *  @param {Event} ev
- */
-Xinha.prototype._editorEvent = function(ev)
-{
-var editor = this;
-
-//call events of textarea
-if ( typeof editor._textArea['on'+ev.type] == "function" )
-{
-  editor._textArea['on'+ev.type]();
-}
-  
-if ( this.isKeyEvent(ev) )
-{
-  // Run the ordinary plugins first
-  if(editor.firePluginEvent('onKeyPress', ev))
-  {
-    return false;
-  }
-    
-  // Handle the core shortcuts
-  if ( this.isShortCut( ev ) )
-  {
-    this._shortCuts(ev);
-  }
-}
-
-if ( ev.type == 'mousedown' )
-{
-  if(editor.firePluginEvent('onMouseDown', ev))
-  {
-    return false;
-  }
-}
-// update the toolbar state after some time
-if ( editor._timerToolbar )
-{
-  clearTimeout(editor._timerToolbar);
-}
-editor._timerToolbar = setTimeout(
-  function()
-  {
-    editor.updateToolbar();
-    editor._timerToolbar = null;
-  },
-  250);
-};
-
-/** Handles ctrl + key shortcuts 
- *  @TODO: make this mor flexible
- *  @private
- *  @param {Event} ev
- */
-Xinha.prototype._shortCuts = function (ev)
-{
-var key = this.getKey(ev).toLowerCase();
-var cmd = null;
-var value = null;
-switch (key)
-{
-  // simple key commands follow
-
-  case 'b': cmd = "bold"; break;
-  case 'i': cmd = "italic"; break;
-  case 'u': cmd = "underline"; break;
-  case 's': cmd = "strikethrough"; break;
-  case 'l': cmd = "justifyleft"; break;
-  case 'e': cmd = "justifycenter"; break;
-  case 'r': cmd = "justifyright"; break;
-  case 'j': cmd = "justifyfull"; break;
-  case 'z': cmd = "undo"; break;
-  case 'y': cmd = "redo"; break;
-  case 'v': cmd = "paste"; break;
-  case 'n':
-  cmd = "formatblock";
-  value = "p";
-  break;
-
-  case '0': cmd = "killword"; break;
-
-  // headings
-  case '1':
-  case '2':
-  case '3':
-  case '4':
-  case '5':
-  case '6':
-  cmd = "formatblock";
-  value = "h" + key;
-  break;
-}
-if ( cmd )
-{
-  // execute simple command
-  this.execCommand(cmd, false, value);
-  Xinha._stopEvent(ev);
-}
-};
-/** Changes the type of a given node
- *  @param {DomNode} el The element to convert
- *  @param {String} newTagName The type the element will be converted to
- *  @returns {DomNode} A reference to the new element
- */
-Xinha.prototype.convertNode = function(el, newTagName)
-{
-var newel = this._doc.createElement(newTagName);
-while ( el.firstChild )
-{
-  newel.appendChild(el.firstChild);
-}
-return newel;
-};
-
-/** Scrolls the editor iframe to a given element or to the cursor
- *  @param {DomNode} e optional The element to scroll to; if ommitted, element the element the cursor is in
- */
-Xinha.prototype.scrollToElement = function(e)
-{
-if(!e)
-{
-  e = this.getParentElement();
-  if(!e) return;
-}
-  
-// This was at one time limited to Gecko only, but I see no reason for it to be. - James
-var position = Xinha.getElementTopLeft(e);  
-this._iframe.contentWindow.scrollTo(position.left, position.top);
-};
-
-/** Get the edited HTML
- *  
- *  @public
- *  @returns {String} HTML content
- */
-Xinha.prototype.getEditorContent = function()
-{
-return this.outwardHtml(this.getHTML());
-}
-
-/** Completely change the HTML inside the editor
- *
- *  @public
- *  @param {String} html new content
- */
-Xinha.prototype.setEditorContent = function(html)
-{
-this.setHTML(this.inwardHtml(html));
-}
-
-/** Get the raw edited HTML, should not be used without Xinha.prototype.outwardHtml()
- *  
- *  @private
- *  @returns {String} HTML content
- */
-Xinha.prototype.getHTML = function()
-{
-var html = '';
-switch ( this._editMode )
-{
-  case "wysiwyg":
-    if ( !this.config.fullPage )
-    {
-      html = Xinha.getHTML(this._doc.body, false, this).trim();
-    }
-    else
-    {
-      html = this.doctype + "\n" + Xinha.getHTML(this._doc.documentElement, true, this);
-    }
-  break;
-  case "textmode":
-    html = this._textArea.value;
-  break;
-  default:
-    alert("Mode <" + this._editMode + "> not defined!");
-    return false;
-}
-return html;
-};
-
-/** Performs various transformations of the HTML used internally, complement to Xinha.prototype.inwardHtml()  
- *  Plugins can provide their own, additional transformations by defining a plugin.prototype.outwardHtml() implematation,
- *  which is called by this function
- *
- *  @private
- *  @see Xinha#inwardHtml
- *  @param {String} html
- *  @returns {String} HTML content
- */
-Xinha.prototype.outwardHtml = function(html)
-{
-for ( var i in this.plugins )
-{
-  var plugin = this.plugins[i].instance;    
-  if ( plugin && typeof plugin.outwardHtml == "function" )
-  {
-    html = plugin.outwardHtml(html);
-  }
-}
-  
-html = html.replace(/<(\/?)b(\s|>|\/)/ig, "<$1strong$2");
-html = html.replace(/<(\/?)i(\s|>|\/)/ig, "<$1em$2");
-html = html.replace(/<(\/?)strike(\s|>|\/)/ig, "<$1del$2");
-  
-// remove disabling of inline event handle inside Xinha iframe
-html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
-
-// Figure out what our server name is, and how it's referenced
-var serverBase = location.href.replace(/(https?:\/\/[^\/]*)\/.*/, '$1') + '/';
-
-// IE puts this in can't figure out why
-//  leaving this in the core instead of InternetExplorer 
-//  because it might be something we are doing so could present itself
-//  in other browsers - James 
-html = html.replace(/https?:\/\/null\//g, serverBase);
-
-// Make semi-absolute links to be truely absolute
-//  we do this just to standardize so that special replacements knows what
-//  to expect
-html = html.replace(/((href|src|background)=[\'\"])\/+/ig, '$1' + serverBase);
-
-html = this.outwardSpecialReplacements(html);
-
-html = this.fixRelativeLinks(html);
-
-if ( this.config.sevenBitClean )
-{
-  html = html.replace(/[^ -~\r\n\t]/g, function(c) { return '&#'+c.charCodeAt(0)+';'; });
-}
-  
-//prevent execution of JavaScript (Ticket #685)
-html = html.replace(/(<script[^>]*((type=[\"\']text\/)|(language=[\"\'])))(freezescript)/gi,"$1javascript");
-
-// If in fullPage mode, strip the coreCSS
-if(this.config.fullPage)
-{
-  html = Xinha.stripCoreCSS(html);
-}
-    
-return html;
-};
-
-/** Performs various transformations of the HTML to be edited 
- *  Plugins can provide their own, additional transformations by defining a plugin.prototype.inwardHtml() implematation,
- *  which is called by this function
- *  
- *  @private
- *  @see Xinha#outwardHtml
- *  @param {String} html  
- *  @returns {String} transformed HTML
- */
-Xinha.prototype.inwardHtml = function(html)
-{  
-for ( var i in this.plugins )
-{
-  var plugin = this.plugins[i].instance;    
-  if ( plugin && typeof plugin.inwardHtml == "function" )
-  {
-    html = plugin.inwardHtml(html);
-  }    
-}
-    
-// Both IE and Gecko use strike instead of del (#523)
-html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
-
-// disable inline event handle inside Xinha iframe
-html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
-  
-html = this.inwardSpecialReplacements(html);
-
-html = html.replace(/(<script[^>]*((type=[\"\']text\/)|(language=[\"\'])))(javascript)/gi,"$1freezescript");
-
-// For IE's sake, make any URLs that are semi-absolute (="/....") to be
-// truely absolute
-var nullRE = new RegExp('((href|src|background)=[\'"])/+', 'gi');
-html = html.replace(nullRE, '$1' + location.href.replace(/(https?:\/\/[^\/]*)\/.*/, '$1') + '/');
-
-html = this.fixRelativeLinks(html);
-  
-// If in fullPage mode, add the coreCSS
-if(this.config.fullPage)
-{
-  html = Xinha.addCoreCSS(html);
-}
-  
-return html;
-};
-/** Apply the replacements defined in Xinha.Config.specialReplacements
- *  
- *  @private
- *  @see Xinha#inwardSpecialReplacements
- *  @param {String} html
- *  @returns {String}  transformed HTML
- */
-Xinha.prototype.outwardSpecialReplacements = function(html)
-{
-for ( var i in this.config.specialReplacements )
-{
-  var from = this.config.specialReplacements[i];
-  var to   = i; // why are declaring a new variable here ? Seems to be better to just do : for (var to in config)
-  // prevent iterating over wrong type
-  if ( typeof from.replace != 'function' || typeof to.replace != 'function' )
-  {
-    continue;
-  } 
-  // alert('out : ' + from + '=>' + to);
-  var reg = new RegExp(Xinha.escapeStringForRegExp(from), 'g');
-  html = html.replace(reg, to.replace(/\$/g, '$$$$'));
-  //html = html.replace(from, to);
-}
-return html;
-};
-/** Apply the replacements defined in Xinha.Config.specialReplacements
- *  
- *  @private
- *  @see Xinha#outwardSpecialReplacements
- *  @param {String} html
- *  @returns {String}  transformed HTML
- */
-Xinha.prototype.inwardSpecialReplacements = function(html)
-{
-// alert("inward");
-for ( var i in this.config.specialReplacements )
-{
-  var from = i; // why are declaring a new variable here ? Seems to be better to just do : for (var from in config)
-  var to   = this.config.specialReplacements[i];
-  // prevent iterating over wrong type
-  if ( typeof from.replace != 'function' || typeof to.replace != 'function' )
-  {
-    continue;
-  }
-  // alert('in : ' + from + '=>' + to);
-  //
-  // html = html.replace(reg, to);
-  // html = html.replace(from, to);
-  var reg = new RegExp(Xinha.escapeStringForRegExp(from), 'g');
-  html = html.replace(reg, to.replace(/\$/g, '$$$$')); // IE uses doubled dollar signs to escape backrefs, also beware that IE also implements $& $_ and $' like perl.
-}
-return html;
-};
-/** Transforms the paths in src & href attributes
- *  
- *  @private
- *  @see Xinha.Config#expandRelativeUrl
- *  @see Xinha.Config#stripSelfNamedAnchors
- *  @see Xinha.Config#stripBaseHref
- *  @see Xinha.Config#baseHref
- *  @param {String} html 
- *  @returns {String} transformed HTML
- */
-Xinha.prototype.fixRelativeLinks = function(html)
-{
-if ( typeof this.config.expandRelativeUrl != 'undefined' && this.config.expandRelativeUrl ) 
-var src = html.match(/(src|href)="([^"]*)"/gi);
-var b = document.location.href;
-if ( src )
-{
-  var url,url_m,relPath,base_m,absPath
-  for ( var i=0;i<src.length;++i )
-  {
-    url = src[i].match(/(src|href)="([^"]*)"/i);
-    url_m = url[2].match( /\.\.\//g );
-    if ( url_m )
-    {
-      relPath = new RegExp( "(.*?)(([^\/]*\/){"+ url_m.length+"})[^\/]*$" );
-      base_m = b.match( relPath );
-      absPath = url[2].replace(/(\.\.\/)*/,base_m[1]);
-      html = html.replace( new RegExp(Xinha.escapeStringForRegExp(url[2])),absPath );
-    }
-  }
-}
-  
-if ( typeof this.config.stripSelfNamedAnchors != 'undefined' && this.config.stripSelfNamedAnchors )
-{
-  var stripRe = new RegExp("((href|src|background)=\")("+Xinha.escapeStringForRegExp(document.location.href.replace(/&/g,'&amp;')) + ')([#?][^\'" ]*)', 'g');
-  html = html.replace(stripRe, '$1$4');
-}
-
-if ( typeof this.config.stripBaseHref != 'undefined' && this.config.stripBaseHref )
-{
-  var baseRe = null;
-  if ( typeof this.config.baseHref != 'undefined' && this.config.baseHref !== null )
-  {
-    baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref) + ")", 'g' );
-  }
-  else
-  {
-    baseRe = new RegExp( "((href|src|background)=\")(" +  Xinha.escapeStringForRegExp(document.location.href.replace( /^(https?:\/\/[^\/]*)(.*)/, '$1' )) + ")", 'g' );
-  }
-
-  html = html.replace(baseRe, '$1');
-}
-
-return html;
-};
-
-/** retrieve the HTML (fastest version, but uses innerHTML)
- *  
- *  @private
- *  @returns {String} HTML content
- */
-Xinha.prototype.getInnerHTML = function()
-{
-if ( !this._doc.body )
-{
-  return '';
-}
-var html = "";
-switch ( this._editMode )
-{
-  case "wysiwyg":
-    if ( !this.config.fullPage )
-    {
-      // return this._doc.body.innerHTML;
-      html = this._doc.body.innerHTML;
-    }
-    else
-    {
-      html = this.doctype + "\n" + this._doc.documentElement.innerHTML;
-    }
-  break;
-  case "textmode" :
-    html = this._textArea.value;
-  break;
-  default:
-    alert("Mode <" + this._editMode + "> not defined!");
-    return false;
-}
-
-return html;
-};
-
-/** Completely change the HTML inside
- *
- *  @private
- *  @param {String} html new content, should have been run through inwardHtml() first
- */
-Xinha.prototype.setHTML = function(html)
-{
-if ( !this.config.fullPage )
-{
-  this._doc.body.innerHTML = html;
-}
-else
-{
-  this.setFullHTML(html);
-}
-this._textArea.value = html;
-};
-
-/** sets the given doctype (useful only when config.fullPage is true)
- *  
- *  @private
- *  @param {String} doctype
- */
-Xinha.prototype.setDoctype = function(doctype)
-{
-this.doctype = doctype;
-};
-
-/***************************************************
- *  Category: UTILITY FUNCTIONS
- ***************************************************/
-
-/** Variable used to pass the object to the popup editor window.
- *  @FIXME: Is this in use?
- *  @deprecated 
- *  @private
- *  @type {Object}
- */
-Xinha._object = null;
-
-/** function that returns a clone of the given object
- *  
- *  @private
- *  @param {Object} obj
- *  @returns {Object} cloned object
- */
-Xinha.cloneObject = function(obj)
-{
-if ( !obj )
-{
-  return null;
-}
-
-var newObj = {};
-
-// check for array objects
-if ( obj.constructor.toString().match( /\s*function Array\(/ ) )
-{
-  newObj = obj.constructor();
-}
-
-// check for function objects (as usual, IE is fucked up)
-if ( obj.constructor.toString().match( /\s*function Function\(/ ) )
-{
-  newObj = obj; // just copy reference to it
-}
-else
-{
-  for ( var n in obj )
-  {
-    var node = obj[n];
-    if ( typeof node == 'object' )
-    {
-      newObj[n] = Xinha.cloneObject(node);
-    }
-    else
-    {
-      newObj[n] = node;
-    }
-  }
-}
-
-return newObj;
-};
-
-/** Event Flushing
- *  To try and work around memory leaks in the rather broken
- *  garbage collector in IE, Xinha.flushEvents can be called
- *  onunload, it will remove any event listeners (that were added
- *  through _addEvent(s)) and clear any DOM-0 events.
- *  @private
- *
- */
-Xinha.flushEvents = function()
-{
-var x = 0;
-// @todo : check if Array.prototype.pop exists for every supported browsers
-var e = Xinha._eventFlushers.pop();
-while ( e )
-{
-  try
-  {
-    if ( e.length == 3 )
-    {
-      Xinha._removeEvent(e[0], e[1], e[2]);
-      x++;
-    }
-    else if ( e.length == 2 )
-    {
-      e[0]['on' + e[1]] = null;
-      e[0]._xinha_dom0Events[e[1]] = null;
-      x++;
-    }
-  }
-  catch(ex)
-  {
-    // Do Nothing
-  }
-  e = Xinha._eventFlushers.pop();
-}
-  
-/* 
-  // This code is very agressive, and incredibly slow in IE, so I've disabled it.
-    
-  if(document.all)
-  {
-    for(var i = 0; i < document.all.length; i++)
-    {
-      for(var j in document.all[i])
-      {
-        if(/^on/.test(j) && typeof document.all[i][j] == 'function')
-        {
-          document.all[i][j] = null;
-          x++;
-        }
-      }
-    }
-  }
-*/
-  
-// alert('Flushed ' + x + ' events.');
-};
- /** Holds the events to be flushed
-* @type Array
-*/
-Xinha._eventFlushers = [];
-
-if ( document.addEventListener )
-{
- /** adds an event listener for the specified element and event type
- *  
- *  @public
- *  @see   Xinha#_addEvents
- *  @see   Xinha#addDom0Event
- *  @see   Xinha#prependDom0Event
- *  @param {DomNode}  el the DOM element the event should be attached to 
- *  @param {String}   evname the name of the event to listen for (without leading "on")
- *  @param {function} func the function to be called when the event is fired
- */
-Xinha._addEvent = function(el, evname, func)
-{
-  el.addEventListener(evname, func, true);
-  Xinha._eventFlushers.push([el, evname, func]);
-};
- 
- /** removes an event listener previously added
- *  
- *  @public
- *  @see   Xinha#_removeEvents
- *  @param {DomNode}  el the DOM element the event should be removed from 
- *  @param {String}   evname the name of the event the listener should be removed from (without leading "on")
- *  @param {function} func the function to be removed
- */
-Xinha._removeEvent = function(el, evname, func)
-{
-  el.removeEventListener(evname, func, true);
-};
- 
- /** stops bubbling of the event, if no further listeners should be triggered
- *  
- *  @public
- *  @param {event} ev the event to be stopped
- */
-Xinha._stopEvent = function(ev)
-{
-  ev.preventDefault();
-  ev.stopPropagation();
-};
-}
- /** same as above, for IE
- *  
- */
-else if ( document.attachEvent )
-{
-Xinha._addEvent = function(el, evname, func)
-{
-  el.attachEvent("on" + evname, func);
-  Xinha._eventFlushers.push([el, evname, func]);
-};
-Xinha._removeEvent = function(el, evname, func)
-{
-  el.detachEvent("on" + evname, func);
-};
-Xinha._stopEvent = function(ev)
-{
-  try
-  {
-    ev.cancelBubble = true;
-    ev.returnValue = false;
-  }
-  catch (ex)
-  {
-    // Perhaps we could try here to stop the window.event
-    // window.event.cancelBubble = true;
-    // window.event.returnValue = false;
-  }
-};
-}
-else
-{
-Xinha._addEvent = function(el, evname, func)
-{
-  alert('_addEvent is not supported');
-};
-Xinha._removeEvent = function(el, evname, func)
-{
-  alert('_removeEvent is not supported');
-};
-Xinha._stopEvent = function(ev)
-{
-  alert('_stopEvent is not supported');
-};
-}
- /** add several events at once to one element
- *  
- *  @public
- *  @see Xinha#_addEvent
- *  @param {DomNode}  el the DOM element the event should be attached to 
- *  @param {Array}    evs the names of the event to listen for (without leading "on")
- *  @param {function} func the function to be called when the event is fired
- */
-Xinha._addEvents = function(el, evs, func)
-{
-for ( var i = evs.length; --i >= 0; )
-{
-  Xinha._addEvent(el, evs[i], func);
-}
-};
- /** remove several events at once to from element
- *  
- *  @public
- *  @see Xinha#_removeEvent
- *  @param {DomNode}  el the DOM element the events should be remove from
- *  @param {Array}    evs the names of the events the listener should be removed from (without leading "on")
- *  @param {function} func the function to be removed
- */
-Xinha._removeEvents = function(el, evs, func)
-{
-for ( var i = evs.length; --i >= 0; )
-{
-  Xinha._removeEvent(el, evs[i], func);
-}
-};
-
-/**
- * Adds a standard "DOM-0" event listener to an element.
- * The DOM-0 events are those applied directly as attributes to
- * an element - eg element.onclick = stuff;
- *
- * By using this function instead of simply overwriting any existing
- * DOM-0 event by the same name on the element it will trigger as well
- * as the existing ones.  Handlers are triggered one after the other
- * in the order they are added.
- *
- * Remember to return true/false from your handler, this will determine
- * whether subsequent handlers will be triggered (ie that the event will
- * continue or be canceled).
- *  
- *  @public
- *  @see Xinha#_addEvent
- *  @see Xinha#prependDom0Event
- *  @param {DomNode}  el the DOM element the event should be attached to 
- *  @param {String}   ev the name of the event to listen for (without leading "on")
- *  @param {function} fn the function to be called when the event is fired
- */
-
-Xinha.addDom0Event = function(el, ev, fn)
-{
-Xinha._prepareForDom0Events(el, ev);
-el._xinha_dom0Events[ev].unshift(fn);
-};
-
-
-/** See addDom0Event, the difference is that handlers registered using
- *  prependDom0Event will be triggered before existing DOM-0 events of the
- *  same name on the same element.
- *  
- *  @public
- *  @see Xinha#_addEvent
- *  @see Xinha#addDom0Event
- *  @param {DomNode}  the DOM element the event should be attached to 
- *  @param {String}   the name of the event to listen for (without leading "on")
- *  @param {function} the function to be called when the event is fired
- */
-
-Xinha.prependDom0Event = function(el, ev, fn)
-{
-Xinha._prepareForDom0Events(el, ev);
-el._xinha_dom0Events[ev].push(fn);
-};
-
-/**
- * Prepares an element to receive more than one DOM-0 event handler
- * when handlers are added via addDom0Event and prependDom0Event.
- *
- * @private
- */
-Xinha._prepareForDom0Events = function(el, ev)
-{
-// Create a structure to hold our lists of event handlers
-if ( typeof el._xinha_dom0Events == 'undefined' )
-{
-  el._xinha_dom0Events = {};
-  Xinha.freeLater(el, '_xinha_dom0Events');
-}
-
-// Create a list of handlers for this event type
-if ( typeof el._xinha_dom0Events[ev] == 'undefined' )
-{
-  el._xinha_dom0Events[ev] = [ ];
-  if ( typeof el['on'+ev] == 'function' )
-  {
-    el._xinha_dom0Events[ev].push(el['on'+ev]);
-  }
-
-  // Make the actual event handler, which runs through
-  // each of the handlers in the list and executes them
-  // in the correct context.
-  el['on'+ev] = function(event)
-  {
-    var a = el._xinha_dom0Events[ev];
-    // call previous submit methods if they were there.
-    var allOK = true;
-    for ( var i = a.length; --i >= 0; )
-    {
-      // We want the handler to be a member of the form, not the array, so that "this" will work correctly
-      el._xinha_tempEventHandler = a[i];
-      if ( el._xinha_tempEventHandler(event) === false )
-      {
-        el._xinha_tempEventHandler = null;
-        allOK = false;
-        break;
-      }
-      el._xinha_tempEventHandler = null;
-    }
-    return allOK;
-  };
-
-  Xinha._eventFlushers.push([el, ev]);
-}
-};
-
-Xinha.prototype.notifyOn = function(ev, fn)
-{
-if ( typeof this._notifyListeners[ev] == 'undefined' )
-{
-  this._notifyListeners[ev] = [];
-  Xinha.freeLater(this, '_notifyListeners');
-}
-this._notifyListeners[ev].push(fn);
-};
-
-Xinha.prototype.notifyOf = function(ev, args)
-{
-if ( this._notifyListeners[ev] )
-{
-  for ( var i = 0; i < this._notifyListeners[ev].length; i++ )
-  {
-    this._notifyListeners[ev][i](ev, args);
-  }
-}
-};
-
-/** List of tag names that are defined as block level elements in HTML
- *  
- *  @private
- *  @see Xinha#isBlockElement
- *  @type {String}
- */
-Xinha._blockTags = " body form textarea fieldset ul ol dl li div " +
-"p h1 h2 h3 h4 h5 h6 quote pre table thead " +
-"tbody tfoot tr td th iframe address blockquote ";
-
-/** Checks if one element is in the list of elements that are defined as block level elements in HTML
- *  
- *  @param {DomNode}  el The DOM element to check
- *  @returns {Boolean}
- */
-Xinha.isBlockElement = function(el)
-{
-return el && el.nodeType == 1 && (Xinha._blockTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
-};
-/** List of tag names that are allowed to contain a paragraph
- *  
- *  @private
- *  @see Xinha#isParaContainer
- *  @type {String}
- */
-Xinha._paraContainerTags = " body td th caption fieldset div";
-/** Checks if one element is in the list of elements that are allowed to contain a paragraph in HTML
- *  
- *  @param {DomNode}  el The DOM element to check
- *  @returns {Boolean}
- */
-Xinha.isParaContainer = function(el)
-{
-return el && el.nodeType == 1 && (Xinha._paraContainerTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
-};
-
-
-/* * These are all the tags for which the end tag is not optional or  forbidden, taken from the list at:
- *   http: www.w3.org/TR/REC-html40/index/elements.html
- *  
- *  @private
- *  @see Xinha#needsClosingTag
- *  @type {String}
- */
-Xinha._closingTags = " a abbr acronym address applet b bdo big blockquote button caption center cite code del dfn dir div dl em fieldset font form frameset h1 h2 h3 h4 h5 h6 i iframe ins kbd label legend map menu noframes noscript object ol optgroup pre q s samp script select small span strike strong style sub sup table textarea title tt u ul var ";
-
-/** Checks if one element is in the list of elements for which the end tag is not optional or  forbidden in HTML
- *  
- *  @param {DomNode}  el The DOM element to check
- *  @returns {Boolean}
- */
-Xinha.needsClosingTag = function(el)
-{
-return el && el.nodeType == 1 && (Xinha._closingTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
-};
-
-/** Performs HTML encoding of some given string (converts HTML special characters to entities)
- *  
- *  @param {String}  str The unencoded input
- *  @returns {String} The encoded output
- */
-Xinha.htmlEncode = function(str)
-{
-if ( typeof str.replace == 'undefined' )
-{
-  str = str.toString();
-}
-// we don't need regexp for that, but.. so be it for now.
-str = str.replace(/&/ig, "&amp;");
-str = str.replace(/</ig, "&lt;");
-str = str.replace(/>/ig, "&gt;");
-str = str.replace(/\xA0/g, "&nbsp;"); // Decimal 160, non-breaking-space
-str = str.replace(/\x22/g, "&quot;");
-// \x22 means '"' -- we use hex reprezentation so that we don't disturb
-// JS compressors (well, at least mine fails.. ;)
-return str;
-};
-
-/** Strips host-part of URL which is added by browsers to links relative to server root
- *  
- *  @param {String}  string 
- *  @returns {String} 
- */
-Xinha.prototype.stripBaseURL = function(string)
-{
-if ( this.config.baseHref === null || !this.config.stripBaseHref )
-{
-  return string;
-}
-var baseurl = this.config.baseHref.replace(/^(https?:\/\/[^\/]+)(.*)$/, '$1');
-var basere = new RegExp(baseurl);
-return string.replace(basere, "");
-};
-/** Removes whitespace from beginning and end of a string
- *  
- *  @returns {String} 
- */
-String.prototype.trim = function()
-{
-return this.replace(/^\s+/, '').replace(/\s+$/, '');
-};
-
-/** Creates a rgb-style rgb(r,g,b) color from a (24bit) number
- *  
- *  @param {Integer}
- *  @returns {String} rgb(r,g,b) color definition
- */
-Xinha._makeColor = function(v)
-{
-if ( typeof v != "number" )
-{
-  // already in rgb (hopefully); IE doesn't get here.
-  return v;
-}
-// IE sends number; convert to rgb.
-var r = v & 0xFF;
-var g = (v >> 8) & 0xFF;
-var b = (v >> 16) & 0xFF;
-return "rgb(" + r + "," + g + "," + b + ")";
-};
-
-/** Returns hexadecimal color representation from a number or a rgb-style color.
- *  
- *  @param {String|Integer} v rgb(r,g,b) or 24bit color definition
- *  @returns {String} #RRGGBB color definition
- */
-Xinha._colorToRgb = function(v)
-{
-if ( !v )
-{
-  return '';
-}
-var r,g,b;
-// @todo: why declaring this function here ? This needs to be a public methode of the object Xinha._colorToRgb
-// returns the hex representation of one byte (2 digits)
-function hex(d)
-{
-  return (d < 16) ? ("0" + d.toString(16)) : d.toString(16);
-}
-
-if ( typeof v == "number" )
-{
-  // we're talking to IE here
-  r = v & 0xFF;
-  g = (v >> 8) & 0xFF;
-  b = (v >> 16) & 0xFF;
-  return "#" + hex(r) + hex(g) + hex(b);
-}
-
-if ( v.substr(0, 3) == "rgb" )
-{
-  // in rgb(...) form -- Mozilla
-  var re = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/;
-  if ( v.match(re) )
-  {
-    r = parseInt(RegExp.$1, 10);
-    g = parseInt(RegExp.$2, 10);
-    b = parseInt(RegExp.$3, 10);
-    return "#" + hex(r) + hex(g) + hex(b);
-  }
-  // doesn't match RE?!  maybe uses percentages or float numbers
-  // -- FIXME: not yet implemented.
-  return null;
-}
-
-if ( v.substr(0, 1) == "#" )
-{
-  // already hex rgb (hopefully :D )
-  return v;
-}
-
-// if everything else fails ;)
-return null;
-};
-
-/** Modal popup dialogs
- *  
- *  @param {String} url URL to the popup dialog
- *  @param {Function} action A function that receives one value; this function will get called 
- *                    after the dialog is closed, with the return value of the dialog.
- *  @param {Mixed} init A variable that is passed to the popup window to pass arbitrary data
- */
-Xinha.prototype._popupDialog = function(url, action, init)
-{
-Dialog(this.popupURL(url), action, init);
-};
-
-/** Creates a path in the form _editor_url + "plugins/" + plugin + "/img/" + file
- *  
- *  @deprecated
- *  @param {String} file Name of the image
- *  @param {String} plugin optional If omitted, simply _editor_url + file is returned 
- *  @returns {String}
- */
-Xinha.prototype.imgURL = function(file, plugin)
-{
-if ( typeof plugin == "undefined" )
-{
-  return _editor_url + file;
-}
-else
-{
-  return _editor_url + "plugins/" + plugin + "/img/" + file;
-}
-};
-/** Creates a path
- *  
- *  @deprecated
- *  @param {String} file Name of the popup
- *  @returns {String}
- */
-Xinha.prototype.popupURL = function(file)
-{
-var url = "";
-if ( file.match(/^plugin:\/\/(.*?)\/(.*)/) )
-{
-  var plugin = RegExp.$1;
-  var popup = RegExp.$2;
-  if ( ! ( /\.html$/.test(popup) ) )
-  {
-    popup += ".html";
-  }
-  url = _editor_url + "plugins/" + plugin + "/popups/" + popup;
-}
-else if ( file.match(/^\/.*?/) || file.match(/^https?:\/\//))
-{
-  url = file;
-}
-else
-{
-  url = _editor_url + this.config.popupURL + file;
-}
-return url;
-};
-
-/** FIX: Internet Explorer returns an item having the _name_ equal to the given
- * id, even if it's not having any id.  This way it can return a different form
- * field, even if it's not a textarea.  This workarounds the problem by
- * specifically looking to search only elements having a certain tag name.
- * @param {String} tag The tag name to limit the return to
- * @param {String} id
- * @returns {DomNode}
- */
-Xinha.getElementById = function(tag, id)
-{
-var el, i, objs = document.getElementsByTagName(tag);
-for ( i = objs.length; --i >= 0 && (el = objs[i]); )
-{
-  if ( el.id == id )
-  {
-    return el;
-  }
-}
-return null;
-};
-
-
-/** Use some CSS trickery to toggle borders on tables 
- *	@returns {Boolean} always true
- */
-
-Xinha.prototype._toggleBorders = function()
-{
-var tables = this._doc.getElementsByTagName('TABLE');
-if ( tables.length !== 0 )
-{
- if ( !this.borders )
- {    
-  this.borders = true;
- }
- else
- {
-   this.borders = false;
- }
-
- for ( var i=0; i < tables.length; i++ )
- {
-   if ( this.borders )
-   {
-      Xinha._addClass(tables[i], 'htmtableborders');
-   }
-   else
-   {
-     Xinha._removeClass(tables[i], 'htmtableborders');
-   }
- }
-}
-return true;
-};
-/** Adds the styles for table borders to the iframe during generation
- *  
- *  @private
- *  @see Xinha#stripCoreCSS
- *  @param {String} html optional  
- *  @returns {String} html HTML with added styles or only styles if html omitted
- */
-Xinha.addCoreCSS = function(html)
-{
-  var coreCSS = 
-  "<style title=\"XinhaInternalCSS\" type=\"text/css\">"
-  + ".htmtableborders, .htmtableborders td, .htmtableborders th {border : 1px dashed lightgrey ! important;}\n"
-  + "html, body { border: 0px; } \n"
-  + "body { background-color: #ffffff; } \n" 
-  +"</style>\n";
-    
-  if( html && /<head>/i.test(html))
-  {
-    return html.replace(/<head>/i, '<head>' + coreCSS);      
-  }
-  else if ( html)
-  {
-    return coreCSS + html;
-  }
-  else
-  {
-    return coreCSS;
-  }
-}
-/** Allows plugins to add a stylesheet for internal use to the edited document that won't appear in the HTML output
- *  
- *  @see Xinha#stripCoreCSS
- *  @param {String} stylesheet URL of the styleshett to be added
- */
-Xinha.prototype.addEditorStylesheet = function (stylesheet)
-{
-  var style = this._doc.createElement("link");
-  style.rel = 'stylesheet';
-  style.type = 'text/css';
-  style.title = 'XinhaInternalCSS';
-style.href = stylesheet;
-  this._doc.getElementsByTagName("HEAD")[0].appendChild(style);
-}
-/** Remove internal styles
- *  
- *  @private
- *  @see Xinha#addCoreCSS
- *  @param {String} html 
- *  @returns {String} 
- */
-Xinha.stripCoreCSS = function(html)
-{
-return html.replace(/<style[^>]+title="XinhaInternalCSS"(.|\n)*?<\/style>/ig, '').replace(/<link[^>]+title="XinhaInternalCSS"(.|\n)*?>/ig, ''); 
-}
-/** Removes one CSS class (that is one of possible more parts 
- *   separated by spaces) from a given element
- *  
- *  @see Xinha#_removeClasses
- *  @param {DomNode}  el The DOM element the class will be removed from
- *  @param {String}   className The class to be removed
- */
-Xinha._removeClass = function(el, className)
-{
-if ( ! ( el && el.className ) )
-{
-  return;
-}
-var cls = el.className.split(" ");
-var ar = [];
-for ( var i = cls.length; i > 0; )
-{
-  if ( cls[--i] != className )
-  {
-    ar[ar.length] = cls[i];
-  }
-}
-el.className = ar.join(" ");
-};
-/** Adds one CSS class  to a given element (that is, it expands its className property by the given string,
- *  separated by a space)
- *  
- *  @see Xinha#addClasses
- *  @param {DomNode}  el The DOM element the class will be added to
- *  @param {String}   className The class to be added
- */
-Xinha._addClass = function(el, className)
-{
-// remove the class first, if already there
-Xinha._removeClass(el, className);
-el.className += " " + className;
-};
-
-/** Adds CSS classes  to a given element (that is, it expands its className property by the given string,
- *  separated by a space, thereby checking that no class is doubly added)
- *  
- *  @see Xinha#addClass
- *  @param {DomNode}  el The DOM element the classes will be added to
- *  @param {String}   classes The classes to be added
- */
-Xinha.addClasses = function(el, classes)
-{
-if ( el !== null )
-{
-  var thiers = el.className.trim().split(' ');
-  var ours   = classes.split(' ');
-  for ( var x = 0; x < ours.length; x++ )
-  {
-    var exists = false;
-    for ( var i = 0; exists === false && i < thiers.length; i++ )
-    {
-      if ( thiers[i] == ours[x] )
-      {
-        exists = true;
-      }
-    }
-    if ( exists === false )
-    {
-      thiers[thiers.length] = ours[x];
-    }
-  }
-  el.className = thiers.join(' ').trim();
-}
-};
-
-/** Removes CSS classes (that is one or more of possibly several parts 
- *   separated by spaces) from a given element
- *  
- *  @see Xinha#_removeClasses
- *  @param {DomNode}  el The DOM element the class will be removed from
- *  @param {String}   className The class to be removed
- */
-Xinha.removeClasses = function(el, classes)
-{
-var existing    = el.className.trim().split();
-var new_classes = [];
-var remove      = classes.trim().split();
-
-for ( var i = 0; i < existing.length; i++ )
-{
-  var found = false;
-  for ( var x = 0; x < remove.length && !found; x++ )
-  {
-    if ( existing[i] == remove[x] )
-    {
-      found = true;
-    }
-  }
-  if ( !found )
-  {
-    new_classes[new_classes.length] = existing[i];
-  }
-}
-return new_classes.join(' ');
-};
-
-/** Alias of Xinha._addClass()
- *  @see Xinha#_addClass
- */
-Xinha.addClass       = Xinha._addClass;
-/** Alias of Xinha.Xinha._removeClass()
- *  @see Xinha#_removeClass
- */
-Xinha.removeClass    = Xinha._removeClass;
-/** Alias of Xinha.addClasses()
- *  @see Xinha#addClasses
- */
-Xinha._addClasses    = Xinha.addClasses;
-/** Alias of Xinha.removeClasses()
- *  @see Xinha#removeClasses
- */
-Xinha._removeClasses = Xinha.removeClasses;
-
-/** Checks if one element has set the given className
- *  
- *  @param {DomNode}  el The DOM element to check
- *  @param {String}   className The class to be looked for
- *  @returns {Boolean}
- */
-Xinha._hasClass = function(el, className)
-{
-if ( ! ( el && el.className ) )
-{
-  return false;
-}
-var cls = el.className.split(" ");
-for ( var i = cls.length; i > 0; )
-{
-  if ( cls[--i] == className )
-  {
-    return true;
-  }
-}
-return false;
-};
-
-/** Use XMLHTTPRequest to post some data back to the server and do something
- *  with the response (asyncronously!), this is used by such things as the tidy functions
- *  @param {String} url The address for the HTTPRequest
- *  @param {Object} data The data to be passed to the server like {name:"value"}
- *  @param {Function} handler A function that is called when an answer is received from the server with the responseText 
- *                             as argument                             
- */
- 
-// mod_security (an apache module which scans incoming requests for potential hack attempts)
-// has a rule which triggers when it gets an incoming Content-Type with a charset
-// see ticket:1028 to try and work around this, if we get a failure in a postback
-// then Xinha._postback_send_charset will be set to false and the request tried again (once)
-Xinha._postback_send_charset = true;
-Xinha._postback = function(url, data, handler)
-{
-var req = null;
-req = Xinha.getXMLHTTPRequestObject();
-
-var content = '';
-if (typeof data == 'string')
-{
-  content = data;
-}
-else if(typeof data == "object")
-{
-  for ( var i in data )
-  {
-    content += (content.length ? '&' : '') + i + '=' + encodeURIComponent(data[i]);
-  }
-}
-
-function callBack()
-{
-  if ( req.readyState == 4 )
-  {
-    if ( req.status == 200 || Xinha.isRunLocally && req.status == 0 )
-    {
-      if ( typeof handler == 'function' )
-      {
-        handler(req.responseText, req);
-      }
-    }
-    else if(Xinha._postback_send_charset)
-    {        
-      Xinha._postback_send_charset = false;
-      Xinha._postback(url,data,handler);
-    }
-    else
-    {
-      alert('An error has occurred: ' + req.statusText + '\nURL: ' + url);
-    }
-  }
-}
-
-req.onreadystatechange = callBack;
-
-req.open('POST', url, true);
-req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'+(Xinha._postback_send_charset ? '; charset=UTF-8' : ''));
-//alert(content);
-req.send(content);
-};
-
-/** Use XMLHTTPRequest to receive some data from the server and do something
- *  with the it (asyncronously!)
- *  @param {String} url The address for the HTTPRequest
- *  @param {Function} handler A function that is called when an answer is received from the server with the responseText 
- *                             as argument                             
- */
-Xinha._getback = function(url, handler)
-{
-var req = null;
-req = Xinha.getXMLHTTPRequestObject();
-
-function callBack()
-{
-  if ( req.readyState == 4 )
-  {
-    if ( req.status == 200 || Xinha.isRunLocally && req.status == 0 )
-    {
-      handler(req.responseText, req);
-    }
-    else
-    {
-      alert('An error has occurred: ' + req.statusText + '\nURL: ' + url);
-    }
-  }
-}
-
-req.onreadystatechange = callBack;
-req.open('GET', url, true);
-req.send(null);
-};
-/** Use XMLHTTPRequest to receive some data from the server syncronously
- *  @param {String} url The address for the HTTPRequest
- */
-Xinha._geturlcontent = function(url)
-{
-var req = null;
-req = Xinha.getXMLHTTPRequestObject();
-
-// Synchronous!
-req.open('GET', url, false);
-req.send(null);
-if ( req.status == 200 || Xinha.isRunLocally && req.status == 0 )
-{
-  return req.responseText;
-}
-else
-{
-  return '';
-}
-
-};
-
-// Unless somebody already has, make a little function to debug things
-
-if ( typeof dump == 'undefined' )
-{
-function dump(o)
-{
-  var s = '';
-  for ( var prop in o )
-  {
-    s += prop + ' = ' + o[prop] + '\n';
-  }
-  var x = window.open("", "debugger");
-  x.document.write('<pre>' + s + '</pre>');
-}
-}
-if ( !Array.prototype.contains )
-{
-/** Walks through an array and checks if the specified item exists in it
-* @param {String} needle The string to search for
-* @returns {Boolean} True if item found, false otherwise 
-*/
-Array.prototype.contains = function(needle)
-{
-  var haystack = this;
-  for ( var i = 0; i < haystack.length; i++ )
-  {
-    if ( needle == haystack[i] )
-    {
-      return true;
-    }
-  }
-  return false;
-};
-}
-
-if ( !Array.prototype.indexOf )
-{
-/** Walks through an array and, if the specified item exists in it, returns the position
-* @param {String} needle The string to search for
-* @returns {Integer|null} Index position if item found, null otherwise 
-*/
-Array.prototype.indexOf = function(needle)
-{
-  var haystack = this;
-  for ( var i = 0; i < haystack.length; i++ )
-  {
-    if ( needle == haystack[i] )
-    {
-      return i;
-    }
-  }
-  return null;
-};
-}
-if ( !Array.prototype.append )
-{
-/** Adds an item to an array
- * @param {Mixed} a Item to add
- * @returns {Array} The array including the newly added item
- */
-Array.prototype.append  = function(a)
-{
-  for ( var i = 0; i < a.length; i++ )
-  {
-    this.push(a[i]);
-  }
-  return this;
-};
-}
-/** Returns true if all elements of <em>a2</em> are also contained in <em>a1</em> (at least I think this is what it does)
-* @param {Array} a1
-* @param {Array} a2
-* @returns {Boolean}
-*/
-Xinha.arrayContainsArray = function(a1, a2)
-{
-var all_found = true;
-for ( var x = 0; x < a2.length; x++ )
-{
-  var found = false;
-  for ( var i = 0; i < a1.length; i++ )
-  {
-    if ( a1[i] == a2[x] )
-    {
-      found = true;
-      break;
-    }
-  }
-  if ( !found )
-  {
-    all_found = false;
-    break;
-  }
-}
-return all_found;
-};
-/** Walks through an array and applies a filter function to each item
-* @param {Array} a1 The array to filter
-* @param {Function} filterfn If this function returns true, the item is added to the new array
-* @returns {Array} Filtered array
-*/
-Xinha.arrayFilter = function(a1, filterfn)
-{
-var new_a = [ ];
-for ( var x = 0; x < a1.length; x++ )
-{
-  if ( filterfn(a1[x]) )
-  {
-    new_a[new_a.length] = a1[x];
-  }
-}
-return new_a;
-};
-/** Converts a Collection object to an array 
-* @param {Collection} collection The array to filter
-* @returns {Array} Array containing the item of collection
-*/
-Xinha.collectionToArray = function(collection)
-{
-var array = [ ];
-for ( var i = 0; i < collection.length; i++ )
-{
-  array.push(collection.item(i));
-}
-return array;
-};
-
-/** Index for Xinha.uniq function 
-*	@private
-*/
-Xinha.uniq_count = 0;
-/** Returns a string that is unique on the page
-*	@param {String} prefix This string is prefixed to a running number
-*   @returns {String}
-*/
-Xinha.uniq = function(prefix)
-{
-return prefix + Xinha.uniq_count++;
-};
-
-// New language handling functions
-
-/** Load a language file.
- *  This function should not be used directly, Xinha._lc will use it when necessary.
- *  @private
- *  @param {String} context Case sensitive context name, eg 'Xinha', 'TableOperations', ...
- *  @returns {Object}
- */
-Xinha._loadlang = function(context,url)
-{
-var lang;
-  
-if ( typeof _editor_lcbackend == "string" )
-{
-  //use backend
-  url = _editor_lcbackend;
-  url = url.replace(/%lang%/, _editor_lang);
-  url = url.replace(/%context%/, context);
-}
-else if (!url)
-{
-  //use internal files
-  if ( context != 'Xinha')
-  {
-    url = _editor_url+"plugins/"+context+"/lang/"+_editor_lang+".js";
-  }
-  else
-  {
-    Xinha.setLoadingMessage("Loading language");
-    url = _editor_url+"lang/"+_editor_lang+".js";
-  }
-}
-
-var langData = Xinha._geturlcontent(url);
-if ( langData !== "" )
-{
-  try
-  {
-    eval('lang = ' + langData);
-  }
-  catch(ex)
-  {
-    alert('Error reading Language-File ('+url+'):\n'+Error.toString());
-    lang = {};
-  }
-}
-else
-{
-  lang = {};
-}
-
-return lang;
-};
-
-/** Return a localised string.
- * @param {String} string English language string. It can also contain variables in the form "Some text with $variable=replaced text$". 
- *                  This replaces $variable in "Some text with $variable" with "replaced text"
- * @param {String} context   Case sensitive context name, eg 'Xinha' (default), 'TableOperations'...
- * @param {Object} replace   Replace $variables in String, eg {foo: 'replaceText'} ($foo in string will be replaced by replaceText)
- */
-Xinha._lc = function(string, context, replace)
-{
-var url,ret;
-if (typeof context == 'object' && context.url && context.context)
-{
-  url = context.url + _editor_lang + ".js";
-  context = context.context;
-}
-
-var m = null;
-if (typeof string == 'string') m = string.match(/\$(.*?)=(.*?)\$/g);
-if (m) 
-{
-  if (!replace) replace = {};
-  for (var i = 0;i<m.length;i++)
-  {
-    var n = m[i].match(/\$(.*?)=(.*?)\$/);
-    replace[n[1]] = n[2];
-    string = string.replace(n[0],'$'+n[1]);
-  }
-}
-if ( _editor_lang == "en" )
-{
-  if ( typeof string == 'object' && string.string )
-  {
-    ret = string.string;
-  }
-  else
-  {
-    ret = string;
-  }
-}
-else
-{
-  if ( typeof Xinha._lc_catalog == 'undefined' )
-  {
-    Xinha._lc_catalog = [ ];
-  }
-
-  if ( typeof context == 'undefined' )
-  {
-    context = 'Xinha';
-  }
-
-  if ( typeof Xinha._lc_catalog[context] == 'undefined' )
-  {
-    Xinha._lc_catalog[context] = Xinha._loadlang(context,url);
-  }
-
-  var key;
-  if ( typeof string == 'object' && string.key )
-  {
-    key = string.key;
-  }
-  else if ( typeof string == 'object' && string.string )
-  {
-    key = string.string;
-  }
-  else
-  {
-    key = string;
-  }
-
-  if ( typeof Xinha._lc_catalog[context][key] == 'undefined' )
-  {
-    if ( context=='Xinha' )
-    {
-      // Indicate it's untranslated
-      if ( typeof string == 'object' && string.string )
-      {
-        ret = string.string;
-      }
-      else
-      {
-        ret = string;
-      }
-    }
-    else
-    {
-      //if string is not found and context is not Xinha try if it is in Xinha
-      return Xinha._lc(string, 'Xinha', replace);
-    }
-  }
-  else
-  {
-    ret = Xinha._lc_catalog[context][key];
-  }
-}
-
-if ( typeof string == 'object' && string.replace )
-{
-  replace = string.replace;
-}
-if ( typeof replace != "undefined" )
-{
-  for ( var i in replace )
-  {
-    ret = ret.replace('$'+i, replace[i]);
-  }
-}
-
-return ret;
-};
-/** Walks through the children of a given element and checks if any of the are visible (= not display:none)
- * @param {DomNode} el 
- * @returns {Boolean} 
- */
-Xinha.hasDisplayedChildren = function(el)
-{
-var children = el.childNodes;
-for ( var i = 0; i < children.length; i++ )
-{
-  if ( children[i].tagName )
-  {
-    if ( children[i].style.display != 'none' )
-    {
-      return true;
-    }
-  }
-}
-return false;
-};
-
-/** Load a javascript file by inserting it in the HEAD tag and eventually call a function when loaded
- *
- *  Note that this method cannot be abstracted into browser specific files
- *  because this method LOADS the browser specific files.  Hopefully it should work for most
- *  browsers as it is.
- *
- * @param {String} url               Source url of the file to load
- * @param {Object} callback optional Callback function to launch once ready 
- * @param {Object} scope    optional Application scope for the callback function
- * @param {Object} bonus    optional Arbitrary object send as a param to the callback function
- */
-Xinha._loadback = function(url, callback, scope, bonus)
-{  
-if ( document.getElementById(url) )
-{
-  return true;
-}
-var t = !Xinha.is_ie ? "onload" : 'onreadystatechange';
-var s = document.createElement("script");
-s.type = "text/javascript";
-s.src = url;
-s.id = url;
-if ( callback )
-{
-  s[t] = function()
-  {      
-    if ( Xinha.is_ie && ( ! ( /loaded|complete/.test(window.event.srcElement.readyState) ) ) )
-    {
-      return;
-    }
-      
-    callback.call(scope ? scope : this, bonus);
-    s[t] = null;
-  };
-}
-document.getElementsByTagName("head")[0].appendChild(s);
-return false;
-};
-
-/** Xinha's main loading function (see NewbieGuide)
- * @param {Array} editor_names
- * @param {Xinha.Config} default_config
- * @param {Array} plugin_names
- * @returns {Object} An object that contains references to all created editors indexed by the IDs of the textareas 
- */
-Xinha.makeEditors = function(editor_names, default_config, plugin_names)
-{
-if ( !Xinha.isSupportedBrowser ) return;
-  
-if ( typeof default_config == 'function' )
-{
-  default_config = default_config();
-}
-
-var editors = {};
-var textarea;
-for ( var x = 0; x < editor_names.length; x++ )
-{
-  if ( typeof editor_names[x] == 'string' ) // the regular case, an id of a textarea
-  {
-    textarea = Xinha.getElementById('textarea', editor_names[x] );
-    if (!textarea) // the id may be specified for a textarea that is maybe on another page; we simply skip it and go on
-    {
-      editor_names[x] = null;
-      continue;
-    }
-  }
- // make it possible to pass a reference instead of an id, for example from  document.getElementsByTagName('textarea')
-  else if ( typeof editor_names[x] == 'object' && editor_names[x].tagName && editor_names[x].tagName.toLowerCase() == 'textarea' )
-  {
-    textarea =  editor_names[x];
-    if ( !textarea.id ) // we'd like to have the textarea have an id
-    {
-      textarea.id = 'xinha_id_' + x;
-    } 
-  }
-  var editor = new Xinha(textarea, Xinha.cloneObject(default_config));
-  editor.registerPlugins(plugin_names);
-  editors[textarea.id] = editor;
-}
-return editors;
-};
-/** Another main loading function (see NewbieGuide)
- * @param {Object} editors As returned by Xinha.makeEditors()
- */
-Xinha.startEditors = function(editors)
-{
-if ( !Xinha.isSupportedBrowser ) return;
-  
-for ( var i in editors )
-{
-  if ( editors[i].generate )
-  {
-    editors[i].generate();
-  }
-}
-};
-/** Registers the loaded plugins with the editor
- * @private
- * @param {Array} plugin_names
- */
-Xinha.prototype.registerPlugins = function(plugin_names)
-{
-if ( !Xinha.isSupportedBrowser ) return;
-  
-if ( plugin_names )
-{
-  for ( var i = 0; i < plugin_names.length; i++ )
-  {
-    this.setLoadingMessage(Xinha._lc('Register plugin $plugin', 'Xinha', {'plugin': plugin_names[i]}));
-    this.registerPlugin(plugin_names[i]);
-  }
-}
-};
-
-/** Utility function to base64_encode some arbitrary data, uses the builtin btoa() if it exists (Moz) 
-*  @param {String} input
-*  @returns {String}
-*/
-Xinha.base64_encode = function(input)
-{
-var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-var output = "";
-var chr1, chr2, chr3;
-var enc1, enc2, enc3, enc4;
-var i = 0;
-
-do
-{
-  chr1 = input.charCodeAt(i++);
-  chr2 = input.charCodeAt(i++);
-  chr3 = input.charCodeAt(i++);
-
-  enc1 = chr1 >> 2;
-  enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-  enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-  enc4 = chr3 & 63;
-
-  if ( isNaN(chr2) )
-  {
-    enc3 = enc4 = 64;
-  }
-  else if ( isNaN(chr3) )
-  {
-    enc4 = 64;
-  }
-
-  output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4);
-} while ( i < input.length );
-
-return output;
-};
-
-/** Utility function to base64_decode some arbitrary data, uses the builtin atob() if it exists (Moz)
- *  @param {String} input
- *  @returns {String}
- */
-Xinha.base64_decode = function(input)
-{
-var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-var output = "";
-var chr1, chr2, chr3;
-var enc1, enc2, enc3, enc4;
-var i = 0;
-
-// remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
-do
-{
-  enc1 = keyStr.indexOf(input.charAt(i++));
-  enc2 = keyStr.indexOf(input.charAt(i++));
-  enc3 = keyStr.indexOf(input.charAt(i++));
-  enc4 = keyStr.indexOf(input.charAt(i++));
-
-  chr1 = (enc1 << 2) | (enc2 >> 4);
-  chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-  chr3 = ((enc3 & 3) << 6) | enc4;
-
-  output = output + String.fromCharCode(chr1);
-
-  if ( enc3 != 64 )
-  {
-    output = output + String.fromCharCode(chr2);
-  }
-  if ( enc4 != 64 )
-  {
-    output = output + String.fromCharCode(chr3);
-  }
-} while ( i < input.length );
-
-return output;
-};
-/** Removes a node from the DOM
- *  @param {DomNode} el The element to be removed
- *  @returns {DomNode} The removed element
- */
-Xinha.removeFromParent = function(el)
-{
-if ( !el.parentNode )
-{
-  return;
-}
-var pN = el.parentNode;
-pN.removeChild(el);
-return el;
-};
-/** Checks if some element has a parent node
- *  @param {DomNode} el 
- *  @returns {Boolean}
- */
-Xinha.hasParentNode = function(el)
-{
-if ( el.parentNode )
-{
-  // When you remove an element from the parent in IE it makes the parent
-  // of the element a document fragment.  Moz doesn't.
-  if ( el.parentNode.nodeType == 11 )
-  {
-    return false;
-  }
-  return true;
-}
-
-return false;
-};
-
-/** Detect the size of visible area
- *  @param {Window} scope optional When calling from a popup window, pass its window object to get the values of the popup
- *  @returns {Object} Object with Integer properties x and y
- */
-Xinha.viewportSize = function(scope)
-{
-scope = (scope) ? scope : window;
-var x,y;
-if (scope.innerHeight) // all except Explorer
-{
-  x = scope.innerWidth;
-  y = scope.innerHeight;
-}
-else if (scope.document.documentElement && scope.document.documentElement.clientHeight)
-// Explorer 6 Strict Mode
-{
-  x = scope.document.documentElement.clientWidth;
-  y = scope.document.documentElement.clientHeight;
-}
-else if (scope.document.body) // other Explorers
-{
-  x = scope.document.body.clientWidth;
-  y = scope.document.body.clientHeight;
-}
-return {'x':x,'y':y};
-};
-/** Detect the size of the whole document
- *  @param {Window} scope optional When calling from a popup window, pass its window object to get the values of the popup
- *  @returns {Object} Object with Integer properties x and y
- */
-Xinha.pageSize = function(scope)
-{
-scope = (scope) ? scope : window;
-var x,y;
- 
-var test1 = scope.document.body.scrollHeight; //IE Quirks
-var test2 = scope.document.documentElement.scrollHeight; // IE Standard + Moz Here quirksmode.org errs! 
-
-if (test1 > test2) 
-{
-  x = scope.document.body.scrollWidth;
-  y = scope.document.body.scrollHeight;
-}
-else
-{
-  x = scope.document.documentElement.scrollWidth;
-  y = scope.document.documentElement.scrollHeight;
-}  
-return {'x':x,'y':y};
-};
-/** Detect the current scroll position
- *  @param {Window} scope optional When calling from a popup window, pass its window object to get the values of the popup
- *  @returns {Object} Object with Integer properties x and y
- */
-Xinha.prototype.scrollPos = function(scope)
-{
-scope = (scope) ? scope : window;
-var x,y;
-if (scope.pageYOffset) // all except Explorer
-{
-  x = scope.pageXOffset;
-  y = scope.pageYOffset;
-}
-else if (scope.document.documentElement && document.documentElement.scrollTop)
-  // Explorer 6 Strict
-{
-  x = scope.document.documentElement.scrollLeft;
-  y = scope.document.documentElement.scrollTop;
-}
-else if (scope.document.body) // all other Explorers
-{
-  x = scope.document.body.scrollLeft;
-  y = scope.document.body.scrollTop;
-}
-return {'x':x,'y':y};
-};
-
-/** Calculate the top and left pixel position of an element in the DOM.
- *  @param  {DomNode} element HTML Element
- *  @returns {Object} Object with Integer properties top and left
- */
- 
-Xinha.getElementTopLeft = function(element) 
-{
-var curleft = curtop = 0;
-if (element.offsetParent) 
-{
-  curleft = element.offsetLeft
-  curtop = element.offsetTop
-  while (element = element.offsetParent) 
-  {
-    curleft += element.offsetLeft
-    curtop += element.offsetTop
-  }
-}
-return { top:curtop, left:curleft };
-}
-/** Find left pixel position of an element in the DOM.
- *  @param  {DomNode} element HTML Element
- *  @returns {Integer} 
- */
-Xinha.findPosX = function(obj)
-{
-var curleft = 0;
-if ( obj.offsetParent )
-{
-  return Xinha.getElementTopLeft(obj).left;    
-}
-else if ( obj.x )
-{
-  curleft += obj.x;
-}
-return curleft;
-};
-/** Find top pixel position of an element in the DOM.
- *  @param  {DomNode} element HTML Element
- *  @returns {Integer} 
- */
-Xinha.findPosY = function(obj)
-{
-var curtop = 0;
-if ( obj.offsetParent )
-{
-  return Xinha.getElementTopLeft(obj).top;    
-}
-else if ( obj.y )
-{
-  curtop += obj.y;
-}
-return curtop;
-};
-
-Xinha.createLoadingMessages = function(xinha_editors)
-{
-if ( Xinha.loadingMessages || !Xinha.isSupportedBrowser ) 
-{
-  return;
-}
-Xinha.loadingMessages = [];
-  
-for (var i=0;i<xinha_editors.length;i++)
-{
-   if (!document.getElementById(xinha_editors[i])) continue;
- Xinha.loadingMessages.push(Xinha.createLoadingMessage(Xinha.getElementById('textarea', xinha_editors[i])));
-}
-};
-
-Xinha.createLoadingMessage = function(textarea,text)
-{ 
-if ( document.getElementById("loading_" + textarea.id) || !Xinha.isSupportedBrowser)
-{
-  return;
-}
-// Create and show the main loading message and the sub loading message for details of loading actions
-// global element
-var loading_message = document.createElement("div");
-loading_message.id = "loading_" + textarea.id;
-loading_message.className = "loading";
-  
-loading_message.style.left = (Xinha.findPosX(textarea) + textarea.offsetWidth / 2) - 106 +  'px';
-loading_message.style.top = (Xinha.findPosY(textarea) + textarea.offsetHeight / 2) - 50 +  'px';
-// main static message
-var loading_main = document.createElement("div");
-loading_main.className = "loading_main";
-loading_main.id = "loading_main_" + textarea.id;
-loading_main.appendChild(document.createTextNode(Xinha._lc("Loading in progress. Please wait!")));
-// sub dynamic message
-var loading_sub = document.createElement("div");
-loading_sub.className = "loading_sub";
-loading_sub.id = "loading_sub_" + textarea.id;
-text = text ? text : Xinha._lc("Loading Core");
-loading_sub.appendChild(document.createTextNode(text));
-loading_message.appendChild(loading_main);
-loading_message.appendChild(loading_sub);
-document.body.appendChild(loading_message);
-  
-Xinha.freeLater(loading_message);
-Xinha.freeLater(loading_main);
-Xinha.freeLater(loading_sub);
-  
-return loading_sub;
-};
-
-Xinha.prototype.setLoadingMessage = function(subMessage, mainMessage)
-{
-if ( !document.getElementById("loading_sub_" + this._textArea.id) )
-{
-  return;
-}
-document.getElementById("loading_main_" + this._textArea.id).innerHTML = mainMessage ? mainMessage : Xinha._lc("Loading in progress. Please wait!");
-document.getElementById("loading_sub_" + this._textArea.id).innerHTML = subMessage;
-};
-
-Xinha.setLoadingMessage = function(string)
-{
-if (!Xinha.loadingMessages) return;  
-for ( var i = 0; i < Xinha.loadingMessages.length; i++ )
-{
-  Xinha.loadingMessages[i].innerHTML = string;
-}
-};
-
-Xinha.prototype.removeLoadingMessage = function()
-{
-if (document.getElementById("loading_" + this._textArea.id) )
-{
- document.body.removeChild(document.getElementById("loading_" + this._textArea.id));
-}
-};
-
-Xinha.removeLoadingMessages = function(xinha_editors)
-{
-for (var i=0;i< xinha_editors.length;i++)
-{
-   if (!document.getElementById(xinha_editors[i])) continue;
-   var main = document.getElementById("loading_" + document.getElementById(xinha_editors[i]).id);
-   main.parentNode.removeChild(main);
-}
-Xinha.loadingMessages = null;
-};
-
-/** List of objects that have to be trated on page unload in order to work around the broken 
- * Garbage Collector in IE
- * @private
- * @see Xinha#freeLater
- * @see Xinha#free
- * @see Xinha#collectGarbageForIE
- */
-Xinha.toFree = [];
-/** Adds objects to Xinha.toFree 
- * @param {Object} object The object to free memory
- * @param (String} prop optional  The property to release
- * @private
- * @see Xinha#toFree
- * @see Xinha#free
- * @see Xinha#collectGarbageForIE
- */
-Xinha.freeLater = function(obj,prop)
-{
-Xinha.toFree.push({o:obj,p:prop});
-};
-
-/** Release memory properties from object
- * @param {Object} object The object to free memory
- * @param (String} prop optional The property to release
- * @private
- * @see Xinha#collectGarbageForIE
- * @see Xinha#free
- */
-Xinha.free = function(obj, prop)
-{
-if ( obj && !prop )
-{
-  for ( var p in obj )
-  {
-    Xinha.free(obj, p);
-  }
-}
-else if ( obj )
-{
-  if ( prop.indexOf('src') == -1 ) // if src (also lowsrc, and maybe dynsrc ) is set to null, a file named "null" is requested from the server (see #1001)
-  {
-    try { obj[prop] = null; } catch(x) {}
-  }
-}
-};
-
-/** IE's Garbage Collector is broken very badly.  We will do our best to 
- *   do it's job for it, but we can't be perfect. Takes all objects from Xinha.free and releases sets the null
- * @private
- * @see Xinha#toFree
- * @see Xinha#free
- */
-
-Xinha.collectGarbageForIE = function() 
-{  
-Xinha.flushEvents();   
-for ( var x = 0; x < Xinha.toFree.length; x++ )
-{
-  Xinha.free(Xinha.toFree[x].o, Xinha.toFree[x].p);
-  Xinha.toFree[x].o = null;
-}
-};
-
-
-// The following methods may be over-ridden or extended by the browser specific
-// javascript files.
-
-
-/** Insert a node at the current selection point. 
- * @param {DomNode} toBeInserted
- */
-
-Xinha.prototype.insertNodeAtSelection = function(toBeInserted) { Xinha.notImplemented("insertNodeAtSelection"); }
-
-/** Get the parent element of the supplied or current selection. 
- *  @param {Selection} sel optional selection as returned by getSelection
- *  @returns {DomNode}
- */
-  
-Xinha.prototype.getParentElement      = function(sel) { Xinha.notImplemented("getParentElement"); }
-
-/**
- * Returns the selected element, if any.  That is,
- * the element that you have last selected in the "path"
- * at the bottom of the editor, or a "control" (eg image)
- *
- * @returns {DomNode|null}
- */
- 
-Xinha.prototype.activeElement         = function(sel) { Xinha.notImplemented("activeElement"); }
-
-/** 
- * Determines if the given selection is empty (collapsed).
- * @param {Selection} sel Selection object as returned by getSelection
- * @returns {Boolean}
- */
- 
-Xinha.prototype.selectionEmpty        = function(sel) { Xinha.notImplemented("selectionEmpty"); }
-/** 
- * Returns a range object to be stored 
- * and later restored with Xinha.prototype.restoreSelection()
- * @returns {Range}
- */
-
-Xinha.prototype.saveSelection = function() { Xinha.notImplemented("saveSelection"); }
-
-/** Restores a selection previously stored
- * @param {Range} savedSelection Range object as returned by Xinha.prototype.restoreSelection()
- */
-Xinha.prototype.restoreSelection = function(savedSelection)  { Xinha.notImplemented("restoreSelection"); }
-
-/**
- * Selects the contents of the given node.  If the node is a "control" type element, (image, form input, table)
- * the node itself is selected for manipulation.
- *
- * @param {DomNode} node 
- * @param {Integer} pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
-Xinha.prototype.selectNodeContents    = function(node,pos) { Xinha.notImplemented("selectNodeContents"); }
-
-/** Insert HTML at the current position, deleting the selection if any. 
- *  
- *  @param {String} html
- */
- 
-Xinha.prototype.insertHTML            = function(html) { Xinha.notImplemented("insertHTML"); }
-
-/** Get the HTML of the current selection.  HTML returned has not been passed through outwardHTML.
- *
- * @returns {String}
- */
-Xinha.prototype.getSelectedHTML       = function() { Xinha.notImplemented("getSelectedHTML"); }
-
-/** Get a Selection object of the current selection.  Note that selection objects are browser specific.
- *
- * @returns {Selection}
- */
- 
-Xinha.prototype.getSelection          = function() { Xinha.notImplemented("getSelection"); }
-
-/** Create a Range object from the given selection.  Note that range objects are browser specific.
- *  @see Xinha#getSelection
- *  @param {Selection} sel Selection object 
- *  @returns {Range}
- */
-Xinha.prototype.createRange           = function(sel) { Xinha.notImplemented("createRange"); }
-
-/** Determine if the given event object is a keydown/press event.
- *
- *  @param {Event} event 
- *  @returns {Boolean}
- */
- 
-Xinha.prototype.isKeyEvent            = function(event) { Xinha.notImplemented("isKeyEvent"); }
-
-/** Determines if the given key event object represents a combination of CTRL-<key>,
- *  which for Xinha is a shortcut.  Note that CTRL-ALT-<key> is not a shortcut.
- *
- *  @param    {Event} keyEvent
- *  @returns  {Boolean}
- */
- 
-Xinha.prototype.isShortCut = function(keyEvent)
-{
-if(keyEvent.ctrlKey && !keyEvent.altKey)
-{
-  return true;
-}
-  
-return false;
-}
-
-/** Return the character (as a string) of a keyEvent  - ie, press the 'a' key and
- *  this method will return 'a', press SHIFT-a and it will return 'A'.
- * 
- *  @param   {Event} keyEvent
- *  @returns {String}
- */
-                                   
-Xinha.prototype.getKey = function(keyEvent) { Xinha.notImplemented("getKey"); }
-
-/** Return the HTML string of the given Element, including the Element.
- * 
- * @param {DomNode} element HTML Element
- * @returns {String}
- */
- 
-Xinha.getOuterHTML = function(element) { Xinha.notImplemented("getOuterHTML"); }
-
-/** Get a new XMLHTTPRequest Object ready to be used. 
- *
- * @returns {XMLHTTPRequest}
- */
-
-Xinha.getXMLHTTPRequestObject = function() 
-{
-try
-{    
-  if (typeof XMLHttpRequest == "function")
-  {
-	  return new XMLHttpRequest();
-  }
-	else if (typeof ActiveXObject == "function")
-	{
-	  return new ActiveXObject("Microsoft.XMLHTTP");
-	}
-}
-catch(e)
-{
-  Xinha.notImplemented('getXMLHTTPRequestObject');
-}
-}
- 
-// Compatability - all these names are deprecated and will be removed in a future version
-/** Alias of activeElement()
- * @see Xinha#activeElement
- * @deprecated
- * @returns {DomNode|null}
- */
-Xinha.prototype._activeElement  = function(sel) { return this.activeElement(sel); }
-/** Alias of selectionEmpty()
- * @see Xinha#selectionEmpty
- * @deprecated
- * @param {Selection} sel Selection object as returned by getSelection
- * @returns {Boolean}
- */
-Xinha.prototype._selectionEmpty = function(sel) { return this.selectionEmpty(sel); }
-/** Alias of getSelection()
- * @see Xinha#getSelection
- * @deprecated
- * @returns {Selection}
- */
-Xinha.prototype._getSelection   = function() { return this.getSelection(); }
-/** Alias of createRange()
- * @see Xinha#createRange
- * @deprecated
- * @param {Selection} sel Selection object
- * @returns {Range}
- */
-Xinha.prototype._createRange    = function(sel) { return this.createRange(sel); }
-HTMLArea = Xinha;
-
-Xinha.init();
-
-if (Xinha.is_ie)
-{
-Xinha.addDom0Event(window,'unload',Xinha.collectGarbageForIE);
-}
-Xinha.notImplemented = function(methodName) 
-{
-throw new Error("Method Not Implemented", "Part of Xinha has tried to call the " + methodName + " method which has not been implemented.");
-}
diff --git a/web/imcms/xinha/compression_readme.txt b/web/imcms/xinha/compression_readme.txt
deleted file mode 100644
index dacb04b0ca..0000000000
--- a/web/imcms/xinha/compression_readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-You can use the contrib/compress.php to batch-convert the current Xinha snapshot. To use this script, open it in a text editor, comment out the die() command at the top and open it in your browser.
- 
-You can use the contrib/compress.bat to compress JavaScript files by drag&drop in Windows.
-
-Please be aware that the language files cannot be compressed.
-
-If you want the original files to be kept, open compress.bat and remvove the # in the line
-# FOR %%V IN (%*) DO del %%V_uncompressed.js
\ No newline at end of file
diff --git a/web/imcms/xinha/htmlarea.js b/web/imcms/xinha/htmlarea.js
deleted file mode 100644
index 947812e9f2..0000000000
--- a/web/imcms/xinha/htmlarea.js
+++ /dev/null
@@ -1,23 +0,0 @@
- 
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  COMPATABILITY FILE
-    --  htmlarea.js is now XinhaCore.js  
-    --
-    --  $HeadURL: http://svn.xinha.python-hosting.com/trunk/htmlarea.js $
-    --  $LastChangedDate: 2007-01-15 15:28:57 +0100 (mån, 15 jan 2007) $
-    --  $LastChangedRevision: 659 $
-    --  $LastChangedBy: gogo $
-    --------------------------------------------------------------------------*/
-    
-if ( typeof _editor_url == "string" )
-{
-  // Leave exactly one backslash at the end of _editor_url
-  _editor_url = _editor_url.replace(/\x2f*$/, '/');
-}
-else
-{
-  alert("WARNING: _editor_url is not set!  You should set this variable to the editor files path; it should preferably be an absolute path, like in '/htmlarea/', but it can be relative if you prefer.  Further we will try to load the editor files correctly but we'll probably fail.");
-  _editor_url = '';
-}
-
-document.write('<script type="text/javascript" src="'+_editor_url+'XinhaCore.js"></script>');
\ No newline at end of file
diff --git a/web/imcms/xinha/images/de/bold.gif b/web/imcms/xinha/images/de/bold.gif
deleted file mode 100644
index 21d286fc43..0000000000
Binary files a/web/imcms/xinha/images/de/bold.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/de/italic.gif b/web/imcms/xinha/images/de/italic.gif
deleted file mode 100644
index 0bf794722e..0000000000
Binary files a/web/imcms/xinha/images/de/italic.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/de/underline.gif b/web/imcms/xinha/images/de/underline.gif
deleted file mode 100644
index 05454894af..0000000000
Binary files a/web/imcms/xinha/images/de/underline.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_about.gif b/web/imcms/xinha/images/ed_about.gif
deleted file mode 100644
index 0f28d405d5..0000000000
Binary files a/web/imcms/xinha/images/ed_about.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_align.gif b/web/imcms/xinha/images/ed_align.gif
deleted file mode 100644
index 6c60d50ffe..0000000000
Binary files a/web/imcms/xinha/images/ed_align.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_align_center.gif b/web/imcms/xinha/images/ed_align_center.gif
deleted file mode 100644
index 75845b7a3d..0000000000
Binary files a/web/imcms/xinha/images/ed_align_center.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_align_justify.gif b/web/imcms/xinha/images/ed_align_justify.gif
deleted file mode 100644
index 568c595305..0000000000
Binary files a/web/imcms/xinha/images/ed_align_justify.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_align_left.gif b/web/imcms/xinha/images/ed_align_left.gif
deleted file mode 100644
index 8320a2af4b..0000000000
Binary files a/web/imcms/xinha/images/ed_align_left.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_align_right.gif b/web/imcms/xinha/images/ed_align_right.gif
deleted file mode 100644
index bc6f651f71..0000000000
Binary files a/web/imcms/xinha/images/ed_align_right.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_blank.gif b/web/imcms/xinha/images/ed_blank.gif
deleted file mode 100644
index 1ea396b81d..0000000000
Binary files a/web/imcms/xinha/images/ed_blank.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_buttons_main.gif b/web/imcms/xinha/images/ed_buttons_main.gif
deleted file mode 100644
index bc1962ba1f..0000000000
Binary files a/web/imcms/xinha/images/ed_buttons_main.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_charmap.gif b/web/imcms/xinha/images/ed_charmap.gif
deleted file mode 100644
index 289aa7cda5..0000000000
Binary files a/web/imcms/xinha/images/ed_charmap.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_clearfonts.gif b/web/imcms/xinha/images/ed_clearfonts.gif
deleted file mode 100644
index 38c52a875c..0000000000
Binary files a/web/imcms/xinha/images/ed_clearfonts.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_color_bg.gif b/web/imcms/xinha/images/ed_color_bg.gif
deleted file mode 100644
index 899f133fcf..0000000000
Binary files a/web/imcms/xinha/images/ed_color_bg.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_color_fg.gif b/web/imcms/xinha/images/ed_color_fg.gif
deleted file mode 100644
index 292ab8775f..0000000000
Binary files a/web/imcms/xinha/images/ed_color_fg.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_copy.gif b/web/imcms/xinha/images/ed_copy.gif
deleted file mode 100644
index 0e440eb43e..0000000000
Binary files a/web/imcms/xinha/images/ed_copy.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_custom.gif b/web/imcms/xinha/images/ed_custom.gif
deleted file mode 100644
index 1444030ff7..0000000000
Binary files a/web/imcms/xinha/images/ed_custom.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_cut.gif b/web/imcms/xinha/images/ed_cut.gif
deleted file mode 100644
index 23fbf80119..0000000000
Binary files a/web/imcms/xinha/images/ed_cut.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_delete.gif b/web/imcms/xinha/images/ed_delete.gif
deleted file mode 100644
index aff568e322..0000000000
Binary files a/web/imcms/xinha/images/ed_delete.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_format_bold.gif b/web/imcms/xinha/images/ed_format_bold.gif
deleted file mode 100644
index 78686d1f2d..0000000000
Binary files a/web/imcms/xinha/images/ed_format_bold.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_format_italic.gif b/web/imcms/xinha/images/ed_format_italic.gif
deleted file mode 100644
index 2d3baf2044..0000000000
Binary files a/web/imcms/xinha/images/ed_format_italic.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_format_strike.gif b/web/imcms/xinha/images/ed_format_strike.gif
deleted file mode 100644
index a5b1429502..0000000000
Binary files a/web/imcms/xinha/images/ed_format_strike.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_format_sub.gif b/web/imcms/xinha/images/ed_format_sub.gif
deleted file mode 100644
index 6c77d7438d..0000000000
Binary files a/web/imcms/xinha/images/ed_format_sub.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_format_sup.gif b/web/imcms/xinha/images/ed_format_sup.gif
deleted file mode 100644
index 4ecb9a16c9..0000000000
Binary files a/web/imcms/xinha/images/ed_format_sup.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_format_underline.gif b/web/imcms/xinha/images/ed_format_underline.gif
deleted file mode 100644
index 4bc47a1725..0000000000
Binary files a/web/imcms/xinha/images/ed_format_underline.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_help.gif b/web/imcms/xinha/images/ed_help.gif
deleted file mode 100644
index d5f7d63f34..0000000000
Binary files a/web/imcms/xinha/images/ed_help.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_hr.gif b/web/imcms/xinha/images/ed_hr.gif
deleted file mode 100644
index ec5c7786a7..0000000000
Binary files a/web/imcms/xinha/images/ed_hr.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_html.gif b/web/imcms/xinha/images/ed_html.gif
deleted file mode 100644
index 026da4eda4..0000000000
Binary files a/web/imcms/xinha/images/ed_html.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_image.gif b/web/imcms/xinha/images/ed_image.gif
deleted file mode 100644
index 1af79c3306..0000000000
Binary files a/web/imcms/xinha/images/ed_image.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_indent_less.gif b/web/imcms/xinha/images/ed_indent_less.gif
deleted file mode 100644
index 7dda02a9fa..0000000000
Binary files a/web/imcms/xinha/images/ed_indent_less.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_indent_more.gif b/web/imcms/xinha/images/ed_indent_more.gif
deleted file mode 100644
index c34b47e3d5..0000000000
Binary files a/web/imcms/xinha/images/ed_indent_more.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_killword.gif b/web/imcms/xinha/images/ed_killword.gif
deleted file mode 100644
index fd934a784d..0000000000
Binary files a/web/imcms/xinha/images/ed_killword.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_left_to_right.gif b/web/imcms/xinha/images/ed_left_to_right.gif
deleted file mode 100644
index 5e95ea5ca8..0000000000
Binary files a/web/imcms/xinha/images/ed_left_to_right.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_link.gif b/web/imcms/xinha/images/ed_link.gif
deleted file mode 100644
index 76fd537dad..0000000000
Binary files a/web/imcms/xinha/images/ed_link.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_list_bullet.gif b/web/imcms/xinha/images/ed_list_bullet.gif
deleted file mode 100644
index e37e84b52c..0000000000
Binary files a/web/imcms/xinha/images/ed_list_bullet.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_list_num.gif b/web/imcms/xinha/images/ed_list_num.gif
deleted file mode 100644
index 630cbfd63b..0000000000
Binary files a/web/imcms/xinha/images/ed_list_num.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_overwrite.gif b/web/imcms/xinha/images/ed_overwrite.gif
deleted file mode 100644
index e7a8914d8d..0000000000
Binary files a/web/imcms/xinha/images/ed_overwrite.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_paste.gif b/web/imcms/xinha/images/ed_paste.gif
deleted file mode 100644
index 81b53a033c..0000000000
Binary files a/web/imcms/xinha/images/ed_paste.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_print.gif b/web/imcms/xinha/images/ed_print.gif
deleted file mode 100644
index fb2bf802ef..0000000000
Binary files a/web/imcms/xinha/images/ed_print.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_redo.gif b/web/imcms/xinha/images/ed_redo.gif
deleted file mode 100644
index 3d73dfc164..0000000000
Binary files a/web/imcms/xinha/images/ed_redo.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_right_to_left.gif b/web/imcms/xinha/images/ed_right_to_left.gif
deleted file mode 100644
index 9b255bd2ca..0000000000
Binary files a/web/imcms/xinha/images/ed_right_to_left.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_rmformat.gif b/web/imcms/xinha/images/ed_rmformat.gif
deleted file mode 100644
index 09f102aa9a..0000000000
Binary files a/web/imcms/xinha/images/ed_rmformat.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_save.gif b/web/imcms/xinha/images/ed_save.gif
deleted file mode 100644
index 82262d03b6..0000000000
Binary files a/web/imcms/xinha/images/ed_save.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_save.png b/web/imcms/xinha/images/ed_save.png
deleted file mode 100644
index 881fe5d509..0000000000
Binary files a/web/imcms/xinha/images/ed_save.png and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_saveas.gif b/web/imcms/xinha/images/ed_saveas.gif
deleted file mode 100644
index 4edd988285..0000000000
Binary files a/web/imcms/xinha/images/ed_saveas.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_selectall.gif b/web/imcms/xinha/images/ed_selectall.gif
deleted file mode 100644
index 9acf0a0389..0000000000
Binary files a/web/imcms/xinha/images/ed_selectall.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_show_border.gif b/web/imcms/xinha/images/ed_show_border.gif
deleted file mode 100644
index 42849b71c4..0000000000
Binary files a/web/imcms/xinha/images/ed_show_border.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_splitblock.gif b/web/imcms/xinha/images/ed_splitblock.gif
deleted file mode 100644
index 1f1582b9fc..0000000000
Binary files a/web/imcms/xinha/images/ed_splitblock.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_splitcel.gif b/web/imcms/xinha/images/ed_splitcel.gif
deleted file mode 100644
index a6e5ab582b..0000000000
Binary files a/web/imcms/xinha/images/ed_splitcel.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_undo.gif b/web/imcms/xinha/images/ed_undo.gif
deleted file mode 100644
index 319242fde2..0000000000
Binary files a/web/imcms/xinha/images/ed_undo.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/ed_word_cleaner.gif b/web/imcms/xinha/images/ed_word_cleaner.gif
deleted file mode 100644
index d9b0759c30..0000000000
Binary files a/web/imcms/xinha/images/ed_word_cleaner.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/fr/bold.gif b/web/imcms/xinha/images/fr/bold.gif
deleted file mode 100644
index 8a0f6574f9..0000000000
Binary files a/web/imcms/xinha/images/fr/bold.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/fr/strikethrough.gif b/web/imcms/xinha/images/fr/strikethrough.gif
deleted file mode 100644
index 5707aefca4..0000000000
Binary files a/web/imcms/xinha/images/fr/strikethrough.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/fr/underline.gif b/web/imcms/xinha/images/fr/underline.gif
deleted file mode 100644
index 4ecaf22126..0000000000
Binary files a/web/imcms/xinha/images/fr/underline.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/fullscreen_maximize.gif b/web/imcms/xinha/images/fullscreen_maximize.gif
deleted file mode 100644
index 211c1c56ef..0000000000
Binary files a/web/imcms/xinha/images/fullscreen_maximize.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/fullscreen_minimize.gif b/web/imcms/xinha/images/fullscreen_minimize.gif
deleted file mode 100644
index f679e5a937..0000000000
Binary files a/web/imcms/xinha/images/fullscreen_minimize.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/insert_table.gif b/web/imcms/xinha/images/insert_table.gif
deleted file mode 100644
index a8f4253bc6..0000000000
Binary files a/web/imcms/xinha/images/insert_table.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/insertfilelink.gif b/web/imcms/xinha/images/insertfilelink.gif
deleted file mode 100644
index 099f04d9cc..0000000000
Binary files a/web/imcms/xinha/images/insertfilelink.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/insertmacro.png b/web/imcms/xinha/images/insertmacro.png
deleted file mode 100644
index 3c874be540..0000000000
Binary files a/web/imcms/xinha/images/insertmacro.png and /dev/null differ
diff --git a/web/imcms/xinha/images/tidy.gif b/web/imcms/xinha/images/tidy.gif
deleted file mode 100644
index a881c640a6..0000000000
Binary files a/web/imcms/xinha/images/tidy.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/toggle_borders.gif b/web/imcms/xinha/images/toggle_borders.gif
deleted file mode 100644
index 95bc5be812..0000000000
Binary files a/web/imcms/xinha/images/toggle_borders.gif and /dev/null differ
diff --git a/web/imcms/xinha/images/xinha_logo.gif b/web/imcms/xinha/images/xinha_logo.gif
deleted file mode 100644
index 346e313a44..0000000000
Binary files a/web/imcms/xinha/images/xinha_logo.gif and /dev/null differ
diff --git a/web/imcms/xinha/lang/b5.js b/web/imcms/xinha/lang/b5.js
deleted file mode 100644
index 3550f6e008..0000000000
--- a/web/imcms/xinha/lang/b5.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// I18N constants -- UTF-8
-// by Dave Lo -- dlo@interactivetools.com
-{
-  "Bold": "ç²—é«”",
-  "Italic": "斜體",
-  "Underline": "底線",
-  "Strikethrough": "刪除線",
-  "Subscript": "下標",
-  "Superscript": "上標",
-  "Justify Left": "�置�左",
-  "Justify Center": "�置居中",
-  "Justify Right": "�置��",
-  "Justify Full": "�置左�平等",
-  "Ordered List": "順�清單",
-  "Bulleted List": "無�清單",
-  "Decrease Indent": "減�行�空白",
-  "Increase Indent": "加寬行�空白",
-  "Font Color": "文字�色",
-  "Background Color": "背景�色",
-  "Horizontal Rule": "水平線",
-  "Insert Web Link": "�入連�",
-  "Insert/Modify Image": "�入圖形",
-  "Insert Table": "�入表格",
-  "Toggle HTML Source": "切�HTML原始碼",
-  "Enlarge Editor": "放大",
-  "About this editor": "關於 Xinha",
-  "Help using editor": "說明",
-  "Current style": "字體例�"
-}
diff --git a/web/imcms/xinha/lang/ch.js b/web/imcms/xinha/lang/ch.js
deleted file mode 100644
index 25ac840aeb..0000000000
--- a/web/imcms/xinha/lang/ch.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// I18N constants
-
-// LANG: "ch", ENCODING: UTF-8
-// Samuel Stone, http://stonemicro.com/
-
-{
-  "Bold": "ç²—é«”",
-  "Italic": "斜體",
-  "Underline": "底線",
-  "Strikethrough": "刪線",
-  "Subscript": "下標",
-  "Superscript": "上標",
-  "Justify Left": "�左",
-  "Justify Center": "居中",
-  "Justify Right": "��",
-  "Justify Full": "整齊",
-  "Ordered List": "順�清單",
-  "Bulleted List": "無�清單",
-  "Decrease Indent": "伸排",
-  "Increase Indent": "縮排",
-  "Font Color": "文字�色",
-  "Background Color": "背景�色",
-  "Horizontal Rule": "水平線",
-  "Insert Web Link": "�入連�",
-  "Insert/Modify Image": "�入圖�",
-  "Insert Table": "�入表格",
-  "Toggle HTML Source": "切�HTML原始碼",
-  "Enlarge Editor": "伸出編輯系統",
-  "About this editor": "關於 Xinha",
-  "Help using editor": "說明",
-  "Current style": "字體例�",
-  "Undoes your last action": "回原",
-  "Redoes your last action": "��",
-  "Cut selection": "剪制选项",
-  "Copy selection": "�制选项",
-  "Paste from clipboard": "贴上",
-  "Direction left to right": "从左到�",
-  "Direction right to left": "从�到左",
-  "OK": "好",
-  "Cancel": "�消",
-  "Path": "途徑",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "你在用純字編輯方�.  用 [<>] 按鈕轉回 所見�所得 編輯方�.",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "整��在Internet Explorer 上常出�題, 因為這是 Internet Explorer 的無��題，我們無法解決。你�能看見一些垃圾，或�到其他�題。我們已警告了你. 如果�轉到 正�� 請按 好.",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.",
-  "Cancel": "�消",
-  "Insert/Modify Link": "�入/改寫連�",
-  "New window (_blank)": "新窗户(_blank)",
-  "None (use implicit)": "ç„¡(use implicit)",
-  "Other": "其他",
-  "Same frame (_self)": "本匡 (_self)",
-  "Target:": "目標匡:",
-  "Title (tooltip):": "主題 (tooltip):",
-  "Top frame (_top)": "上匡 (_top)",
-  "URL:": "網�:",
-  "You must enter the URL where this link points to": "你必須輸入你�连结的網�"
-}
diff --git a/web/imcms/xinha/lang/cz.js b/web/imcms/xinha/lang/cz.js
deleted file mode 100644
index 8cc74241f8..0000000000
--- a/web/imcms/xinha/lang/cz.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// I18N constants
-
-// LANG: "cz", ENCODING: UTF-8
-// Author: Jiri Löw, <jirilow@jirilow.com>
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "Tu�ně",
-  "Italic": "Kurzíva",
-  "Underline": "Podtržení",
-  "Strikethrough": "Přeškrtnutí",
-  "Subscript": "Dolní index",
-  "Superscript": "Horní index",
-  "Justify Left": "Zarovnat doleva",
-  "Justify Center": "Na střed",
-  "Justify Right": "Zarovnat doprava",
-  "Justify Full": "Zarovnat do stran",
-  "Ordered List": "Seznam",
-  "Bulleted List": "Odrážky",
-  "Decrease Indent": "Předsadit",
-  "Increase Indent": "Odsadit",
-  "Font Color": "Barva písma",
-  "Background Color": "Barva pozadí",
-  "Horizontal Rule": "Vodorovná �ára",
-  "Insert Web Link": "Vložit odkaz",
-  "Insert/Modify Image": "Vložit obrázek",
-  "Insert Table": "Vložit tabulku",
-  "Toggle HTML Source": "Přepnout HTML",
-  "Enlarge Editor": "Nové okno editoru",
-  "About this editor": "O této aplikaci",
-  "Help using editor": "Nápověda aplikace",
-  "Current style": "Zvolený styl",
-  "Undoes your last action": "Vrátí poslední akci",
-  "Redoes your last action": "Opakuje poslední akci",
-  "Cut selection": "Vyjmout",
-  "Copy selection": "Kopírovat",
-  "Paste from clipboard": "Vložit",
-  "OK": "OK",
-  "Cancel": "Zrušit",
-  "Path": "Cesta",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Jste v TEXTOVÉM REŽIMU.  Použijte tla�ítko [<>] pro přepnutí do WYSIWIG."
-}
diff --git a/web/imcms/xinha/lang/da.js b/web/imcms/xinha/lang/da.js
deleted file mode 100644
index 7d3d2fc56a..0000000000
--- a/web/imcms/xinha/lang/da.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// LANG: "da", ENCODING: UTF-8
-// Author: rene, <rene@laerke.net>
-
-{
-  "Bold": "Fed",
-  "Italic": "Kursiv",
-  "Underline": "Understregning",
-  "Strikethrough": "Overstregning ",
-  "Subscript": "Sænket skrift",
-  "Superscript": "Hævet skrift",
-  "Justify Left": "Venstrejuster",
-  "Justify Center": "Centrer",
-  "Justify Right": "Højrejuster",
-  "Justify Full": "Lige margener",
-  "Ordered List": "Opstilling med tal",
-  "Bulleted List": "Opstilling med punkttegn",
-  "Decrease Indent": "Formindsk indrykning",
-  "Increase Indent": "Forøg indrykning",
-  "Font Color": "Skriftfarve",
-  "Background Color": "Baggrundsfarve",
-  "Horizontal Rule": "Horisontal linie",
-  "Insert Web Link": "Indsæt hyperlink",
-  "Insert/Modify Image": "Indsæt billede",
-  "Insert Table": "Indsæt tabel",
-  "Toggle HTML Source": "HTML visning",
-  "Enlarge Editor": "Vis editor i popup",
-  "About this editor": "Om htmlarea",
-  "Help using editor": "Hjælp",
-  "Current style": "Anvendt stil"
-}
diff --git a/web/imcms/xinha/lang/de.js b/web/imcms/xinha/lang/de.js
deleted file mode 100644
index fbaeb160ea..0000000000
--- a/web/imcms/xinha/lang/de.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-{
-  "Bold": "Fett",
-  "Italic": "Kursiv",
-  "Underline": "Unterstrichen",
-  "Strikethrough": "Durchgestrichen",
-  "Subscript": "Tiefgestellt",
-  "Superscript": "Hochgestellt",
-  "Justify Left": "Linksbündig",
-  "Justify Center": "Zentriert",
-  "Justify Right": "Rechtsbündig",
-  "Justify Full": "Blocksatz",
-  "Ordered List": "Nummerierte Liste",
-  "Bulleted List": "Aufzählungsliste",
-  "Decrease Indent": "Einzug verkleinern",
-  "Increase Indent": "Einzug vergrößern",
-  "Font Color": "Schriftfarbe",
-  "Background Color": "Hindergrundfarbe",
-  "Horizontal Rule": "Horizontale Linie",
-  "Insert Web Link": "Hyperlink einfügen",
-  "Insert/Modify Image": "Bild einfügen/verändern",
-  "Insert Table": "Tabelle einfügen",
-  "Toggle HTML Source": "HTML Quelltext ein/ausschalten",
-  "Enlarge Editor": "Editor vergrößern",
-  "About this editor": "Ãœber diesen Editor",
-  "Help using editor": "Hilfe",
-  "Current style": "Derzeitiger Stil",
-  "Undoes your last action": "Rückgängig",
-  "Redoes your last action": "Wiederholen",
-  "Cut selection": "Ausschneiden",
-  "Copy selection": "Kopieren",
-  "Paste from clipboard": "Einfügen aus der Zwischenablage",
-  "Direction left to right": "Textrichtung von Links nach Rechts",
-  "Direction right to left": "Textrichtung von Rechts nach Links",
-  "Remove formatting": "Formatierung entfernen",
-  "Select all": "Alles markieren",
-  "Print document": "Dokument ausdrucken",
-  "Clear MSOffice tags": "MSOffice filter",
-  "Clear Inline Font Specifications": "Zeichensatz Formatierungen entfernen",
-  "Would you like to clear font typefaces?": "Wollen Sie Zeichensatztypen entfernen",
-  "Would you like to clear font sizes?": "Wollen Sie Zeichensatzgrößen entfernen",
-  "Would you like to clear font colours?": "Wollen sie Zeichensatzfarben entfernen",
-  "Split Block": "Block teilen",
-  "Toggle Borders": "Tabellenränder ein/ausblenden",
-  "Save as": "speichern unter",
-  "Insert/Overwrite": "Einfügen/Überschreiben",
-  "&mdash; format &mdash;": "&mdash; Format &mdash;",
-  "Heading 1": "Ãœberschrift 1",
-  "Heading 2": "Ãœberschrift 2",
-  "Heading 3": "Ãœberschrift 3",
-  "Heading 4": "Ãœberschrift 4",
-  "Heading 5": "Ãœberschrift 5",
-  "Heading 6": "Ãœberschrift 6",
-  "Normal": "Normal (Absatz)",
-  "Address": "Adresse",
-  "Formatted": "Formatiert",
-
-  //dialogs
-  "OK": "OK",
-  "Cancel": "Abbrechen",
-  "Path": "Pfad",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Sie sind im Text-Modus. Benutzen Sie den [<>] Button, um in den visuellen Modus (WYSIWIG) zu gelangen.",
-   "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Aus Sicherheitsgründen dürfen Skripte normalerweise nicht auf Ausschneiden/Kopieren/Einfügen zugreifen. Benutzen Sie bitte die entsprechenden Tastatur-Kommandos (Strg + x/c/v).",
-
-  "You need to select some text before create a link": "Sie müssen einen Text markieren, um einen Link zu erstellen",
-  "Your Document is not well formed. Check JavaScript console for details.": "Ihr Dokument ist in keinem sauberen Format. Benutzen Sie die Javascript Console für weitere Informationen.",
-
-  "Alignment:": "Ausrichtung:",
-  "Not set": "nicht eingestellt",
-  "Left": "links",
-  "Right": "rechts",
-  "Texttop": "oben bündig",
-  "Absmiddle": "mittig",
-  "Baseline": "Grundlinie",
-  "Absbottom": "unten bündig",
-  "Bottom": "unten",
-  "Middle": "zentriert",
-  "Top": "oben",
-
-  "Layout": "Layout",
-  "Spacing": "Abstand",
-  "Horizontal:": "horizontal:",
-  "Horizontal padding": "horizontaler Inhaltsabstand",
-  "Vertical:": "vertikal:",
-  "Vertical padding": "vertikaler Inhaltsabstand",
-  "Border thickness:": "Randstärke:",
-  "Leave empty for no border": "leer lassen für keinen Rand",
-
-  //Insert Link
-  "Insert/Modify Link": "Verknüpfung hinzufügen/ändern",
-  "None (use implicit)": "k.A. (implizit)",
-  "New window (_blank)": "Neues Fenster (_blank)",
-  "Same frame (_self)": "Selber Rahmen (_self)",
-  "Top frame (_top)": "Oberster Rahmen (_top)",
-  "Other": "Anderes",
-  "Target:": "Ziel:",
-  "Title (tooltip):": "Titel (Tooltip):",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Sie müssen eine Ziel-URL angeben für die Verknüpfung angeben",
-
-  // Insert Table
-  "Insert Table": "Tabelle einfügen",
-  "Rows:": "Zeilen:",
-  "Number of rows": "Zeilenanzahl",
-  "Cols:": "Spalten:",
-  "Number of columns": "Spaltenanzahl",
-  "Width:": "Breite:",
-  "Width of the table": "Tabellenbreite",
-  "Percent": "Prozent",
-  "Pixels": "Pixel",
-  "Em": "Geviert",
-  "Width unit": "Größeneinheit",
-  "Fixed width columns": "Spalten mit fester Breite",
-  "Positioning of this table": "Positionierung der Tabelle",
-  "Cell spacing:": "Zellenabstand:",
-  "Space between adjacent cells": "Raum zwischen angrenzenden Zellen",
-  "Cell padding:": "Innenabstand:",
-  "Space between content and border in cell": "Raum zwischen Inhalt und Rand der Zelle",
-  "You must enter a number of rows": "Bitte geben Sie die Anzahl der Zeilen an",
-  "You must enter a number of columns": "Bitte geben Sie die Anzahl der Spalten an",
-
-  // Insert Image
-  "Insert Image": "Bild einfügen",
-  "Image URL:": "Bild URL:",
-  "Enter the image URL here": "Bitte geben sie hier die Bild URL ein",
-  "Preview": "Voransicht",
-  "Preview the image in a new window": "Voransicht des Bildes in einem neuen Fenster",
-  "Alternate text:": "Alternativer Text:",
-  "For browsers that don't support images": "für Browser, die keine Bilder unterstützen",
-  "Positioning of this image": "Positionierung dieses Bildes",
-  "Image Preview:": "Bild Voransicht:",
-  "You must enter the URL": "Bitte geben Sie die URL ein",
-
-  "button_bold": "de/bold.gif",
-  "button_italic": "de/italic.gif",
-  "button_underline": "de/underline.gif",
-
-  // Editor Help
-  "Keyboard shortcuts": "Tastaturkürzel",
-  "The editor provides the following key combinations:": "Der Editor unterstützt die folgenden kombinationen:",
-  "new paragraph": "Neuer Absatz(Paragraph)",
-  "insert linebreak": "Harter Umbruch einfügen",
-  "Set format to paragraph": "Setze Formatierung auf Absatz",
-  "Clean content pasted from Word": "Von Word eingefügter Text bereinigen",
-  "Headings": "Ãœberschrift Typ 1 bis 6",
-  "Close": "Schließen",
-
-  // Loading messages
-  "Loading in progress. Please wait!": "Editor wird geladen. Bitte warten !",
-  "Loading plugin $plugin" : "Plugin $plugin wird geladen",
-  "Register plugin $plugin" : "Plugin $plugin wird registriert", 
-  "Constructing object": "Objekt wird generiert",
-  "Generate Xinha framework": "Xinha Framework wird generiert",
-  "Init editor size":"Größe wird berechnet", 
-  "Create Toolbar": "Werkzeugleiste wird generiert",
-  "Create Statusbar" : "Statusleiste wird generiert",
-  "Register right panel" : "Rechtes Panel wird generiert", 
-  "Register left panel" : "Linkes Panel wird generiert", 
-  "Register bottom panel" : "Unteres Panel wird generiert", 
-  "Register top panel" : "Oberes Panel wird generiert", 
-  "Finishing" : "Laden wird abgeschlossen", 
-  
-  // ColorPicker
-  "Click a color..." : "Farbe wählen",
-  "Sample" : "Beispiel",
-  "Web Safe: " : "Web Safe: ",
-  "Color: " : "Farbe: "
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/lang/ee.js b/web/imcms/xinha/lang/ee.js
deleted file mode 100644
index 2534271e29..0000000000
--- a/web/imcms/xinha/lang/ee.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// I18N constants
-
-// LANG: "ee", ENCODING: UTF-8
-// Author: Martin Raie, <albertvill@hot.ee>
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "Paks",
-  "Italic": "Kursiiv",
-  "Underline": "Allakriipsutatud",
-  "Strikethrough": "Läbikriipsutatud",
-  "Subscript": "Allindeks",
-  "Superscript": "Ãœlaindeks",
-  "Justify Left": "Joonda vasakule",
-  "Justify Center": "Joonda keskele",
-  "Justify Right": "Joonda paremale",
-  "Justify Full": "Rööpjoonda",
-  "Ordered List": "Nummerdus",
-  "Bulleted List": "Täpploend",
-  "Decrease Indent": "Vähenda taanet",
-  "Increase Indent": "Suurenda taanet",
-  "Font Color": "Fondi värv",
-  "Background Color": "Tausta värv",
-  "Horizontal Rule": "Horisontaaljoon",
-  "Insert Web Link": "Lisa viit",
-  "Insert/Modify Image": "Lisa pilt",
-  "Insert Table": "Lisa tabel",
-  "Toggle HTML Source": "HTML/tavaline vaade",
-  "Enlarge Editor": "Suurenda toimeti aken",
-  "About this editor": "Teave toimeti kohta",
-  "Help using editor": "Spikker",
-  "Current style": "Kirjastiil",
-  "Undoes your last action": "Võta tagasi",
-  "Redoes your last action": "Tee uuesti",
-  "Cut selection": "Lõika",
-  "Copy selection": "Kopeeri",
-  "Paste from clipboard": "Kleebi",
-  "OK": "OK",
-  "Cancel": "Loobu",
-  "Path": "Path",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Sa oled tekstireziimis.  Kasuta nuppu [<>] lülitamaks tagasi WYSIWIG reziimi."
-}
diff --git a/web/imcms/xinha/lang/el.js b/web/imcms/xinha/lang/el.js
deleted file mode 100644
index bc3df96f8a..0000000000
--- a/web/imcms/xinha/lang/el.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// I18N constants
-
-// LANG: "el", ENCODING: UTF-8
-// Author: Dimitris Glezos, dimitris@glezos.com
-
-{
-  "Bold": "ΞˆΞ½Ο„Ξ�Ξ½Ξ±",
-  "Italic": "Πλάγια",
-  "Underline": "Ξ�Ο€Ξ�Ξ³Ο�αμμισμένα",
-  "Strikethrough": "ΔιαγΟ�Ξ±ΞΌΞΌΞ­Ξ½Ξ±",
-  "Subscript": "ΔΡίκτης",
-  "Superscript": "ΔΡίκτης",
-  "Justify Left": "ΣτΞ�ίχιση Ξ‘Ο�ιστΡΟ�Ξ¬",
-  "Justify Center": "ΣτΞ�ίχιση ΞšΞ­Ξ½Ο„Ο�Ξ�",
-  "Justify Right": "ΣτΞ�ίχιση ΔΡξιά",
-  "Justify Full": "Ξ Ξ»Ξ�Ο�Ξ·Ο‚ ΣτΞ�ίχιση",
-  "Ordered List": "Ξ‘Ο�ίθμηση",
-  "Bulleted List": "ΚΞ�υκκίδΡς",
-  "Decrease Indent": "ΞœΞ΅Ξ―Ο‰ΟƒΞ· ΕσΞ�Ο‡Ξ�Ο‚",
-  "Increase Indent": "Ξ‘Ο�ξηση ΕσΞ�Ο‡Ξ�Ο‚",
-  "Font Color": "Ξ§Ο�ώμα Ξ“Ο�Ξ±ΞΌΞΌΞ±Ο„Ξ�σΡιΟ�άς",
-  "Background Color": "Ξ§Ο�ώμα Ξ¦ΟŒΞ½Ο„Ξ�Ο…",
-  "Horizontal Rule": "ΟΟ�ΞΉΞΆΟŒΞ½Ο„ΞΉΞ± Ξ“Ο�Ξ±ΞΌΞΌΞ�",
-  "Insert Web Link": "ΕισαγωγΞ� ΣυνδέσμΞ�Ο…",
-  "Insert/Modify Image": "ΕισαγωγΞ�/Ξ�Ο�Ξ�Ο€Ξ�Ο€Ξ�ίηση Ξ•ΞΉΞΊΟŒΞ½Ξ±Ο‚",
-  "Insert Table": "ΕισαγωγΞ� Ξ Ξ―Ξ½Ξ±ΞΊΞ±",
-  "Toggle HTML Source": "ΕναλλαγΞ� σΡ/Ξ±Ο€ΟŒ HTML",
-  "Enlarge Editor": "ΞœΞ΅Ξ³Ξ­Ξ½ΞΈΟ…Ξ½ΟƒΞ· ΡπΡξΡΟ�γαστΞ�",
-  "About this editor": "ΠληΟ�Ξ�Ο†Ξ�Ο�ίΡς",
-  "Help using editor": "Ξ’Ξ�Ξ�θΡια",
-  "Current style": "Ξ Ξ±Ο�ών στυλ",
-  "Undoes your last action": "ΑναίΟ�Ρση τΡλΡυταίας ΡνέΟ�γΡιας",
-  "Redoes your last action": "ΕπαναφΞ�Ο�Ξ¬ Ξ±Ο€ΟŒ Ξ±Ξ½Ξ±Ξ―Ο�Ρση",
-  "Cut selection": "ΑπΞ�ΞΊΞ�Ο€Ξ�",
-  "Copy selection": "ΑντιγΟ�Ξ±Ο†Ξ�",
-  "Paste from clipboard": "Ξ•Ο€ΞΉΞΊΟŒΞ»Ξ»Ξ·ΟƒΞ·",
-  "Direction left to right": "ΞšΞ±Ο„Ξ΅Ο�θυνση Ξ±Ο�ιστΡΟ�Ξ¬ Ο€Ο�Ξ�Ο‚ δΡξιά",
-  "Direction right to left": "ΞšΞ±Ο„Ξ΅Ο�θυνση Ξ±Ο€ΟŒ δΡξιά Ο€Ο�Ξ�Ο‚ τα Ξ±Ο�ιστΡΟ�Ξ¬",
-  "OK": "OK",
-  "Cancel": "ΑκΟ�Ο�ωση",
-  "Path": "ΔιαδΟ�Ξ�ΞΌΞ�",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "ΕίστΡ σΡ TEXT MODE.  Ξ§Ο�ησιμΞ�Ο€Ξ�ΞΉΞ�στΡ Ο„Ξ� ΞΊΞ�υμπί [<>] Ξ³ΞΉΞ± Ξ½Ξ± ΡπανέΟ�θΡτΡ στΞ� WYSIWIG.",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "Ξ— κατάσταση πλΞ�Ο�Ξ·Ο‚ Ξ�ΞΈΟŒΞ½Ξ·Ο‚ έχΡι Ο€Ο�Ξ�Ξ²Ξ»Ξ�ματα ΞΌΞ΅ Ο„Ξ�Ξ½ Internet Explorer, Ξ»ΟŒΞ³Ο‰ σφαλμάτων στΞ�Ξ½ ίδιΞ� Ο„Ξ�Ξ½ browser.  Αν Ο„Ξ� ΟƒΟ�στημα σας Ρίναι Windows 9x ΞΌΟ€Ξ�Ο�Ρί ΞΊΞ±ΞΉ Ξ½Ξ± Ο‡Ο�ΡιαστΡίτΡ reboot. Αν ΡίστΡ σίγΞ�Ο…Ο�Ξ�ΞΉ, πατΞ�στΡ ΟΚ.",
-  "Cancel": "ΑκΟ�Ο�ωση",
-  "Insert/Modify Link": "ΕισαγωγΞ�/Ξ�Ο�Ξ�Ο€Ξ�Ο€Ξ�ίηση ΟƒΟ�νδΡσμΞ�Ο…",
-  "New window (_blank)": "Ξ�Ξ­Ξ� παΟ�άθυΟ�Ξ� (_blank)",
-  "None (use implicit)": "Κανένα (Ο‡Ο�Ξ�ση Ξ±Ο€ΟŒΞ»Ο…Ο„Ξ�Ο…)",
-  "Other": "ΑλλΞ�",
-  "Same frame (_self)": "Ίδι� frame (_self)",
-  "Target:": "Target:",
-  "Title (tooltip):": "Ξ�ίτλΞ�Ο‚ (tooltip):",
-  "Top frame (_top)": "Πάνω frame (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Ξ Ο�έπΡι Ξ½Ξ± ΡισάγΡτΡ Ο„Ξ� URL Ο€Ξ�Ο… Ξ�δηγΡί Ξ±Ο…Ο„ΟŒΟ‚ Ξ� ΟƒΟ�νδΡσμΞ�Ο‚"
-}
diff --git a/web/imcms/xinha/lang/es.js b/web/imcms/xinha/lang/es.js
deleted file mode 100644
index 885f0e0846..0000000000
--- a/web/imcms/xinha/lang/es.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// I18N constants
-
-// LANG: "es", ENCODING: UTF-8
-
-{
-  "Bold": "Negrita",
-  "Italic": "Cursiva",
-  "Underline": "Subrayado",
-  "Strikethrough": "Tachado",
-  "Subscript": "Sub?ndice",
-  "Superscript": "Super?ndice",
-  "Justify Left": "Alinear a la Izquierda",
-  "Justify Center": "Centrar",
-  "Justify Right": "Alinear a la Derecha",
-  "Justify Full": "Justificar",
-  "Ordered List": "Lista Ordenada",
-  "Bulleted List": "Lista No Ordenada",
-  "Decrease Indent": "Aumentar Sangr?a",
-  "Increase Indent": "Disminuir Sangr?a",
-  "Font Color": "Color del Texto",
-  "Background Color": "Color del Fondo",
-  "Horizontal Rule": "L?nea Horizontal",
-  "Insert Web Link": "Insertar Enlace",
-  "Insert/Modify Image": "Insertar Imagen",
-  "Insert Table": "Insertar Tabla",
-  "Toggle HTML Source": "Ver Documento en HTML",
-  "Enlarge Editor": "Ampliar Editor",
-  "About this editor": "Acerca del Editor",
-  "Help using editor": "Ayuda",
-  "Current style": "Estilo Actual",
-  "Undoes your last action": "Deshacer",
-  "Redoes your last action": "Rehacer",
-  "Cut selection": "Cortar selecci?n",
-  "Copy selection": "Copiar selecci?n",
-  "Paste from clipboard": "Pegar desde el portapapeles",
-  "OK": "Aceptar",
-  "Cancel": "Cancelar",
-  "Path": "Ruta",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Esta en modo TEXTO. Use el boton [<>] para cambiar a WYSIWIG"
-}
diff --git a/web/imcms/xinha/lang/eu.js b/web/imcms/xinha/lang/eu.js
deleted file mode 100644
index ec06ed5ea0..0000000000
--- a/web/imcms/xinha/lang/eu.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// I18N constants
-// LANG: "eu", ENCODING: UTF-8
-{
-  "Bold": "Lodia",
-  "Italic": "Etzana",
-  "Underline": "Azpimarratua",
-  "Strikethrough": "Marratua",
-  "Subscript": "Azpindizea",
-  "Superscript": "Goi-indizea",
-  "Justify Left": "Ezkerretara lerrokatu",
-  "Justify Center": "Zentratu",
-  "Justify Right": "Eskuinetara lerrokatu",
-  "Justify Full": "Justifikatu",
-  "Ordered List": "Zerrenda ordenatua",
-  "Bulleted List": "Zerrenda ez ordenatua",
-  "Decrease Indent": "Koska handitu",
-  "Increase Indent": "Koska txikitu",
-  "Font Color": "Testu-kolorea",
-  "Background Color": "Atzeko kolorea",
-  "Horizontal Rule": "Marra horizontala",
-  "Insert Web Link": "Lotura txertatu",
-  "Insert/Modify Image": "Irudia txertatu",
-  "Insert Table": "Taula txertatu",
-  "Toggle HTML Source": "Ikusi dokumentua HTML-n",
-  "Enlarge Editor": "Editorea handitu",
-  "About this editor": "Editoreari buruz...",
-  "Help using editor": "Laguntza",
-  "Current style": "Uneko estiloa",
-  "Undoes your last action": "Desegin",
-  "Redoes your last action": "Berregin",
-  "Cut selection": "Ebaki hautaketa",
-  "Copy selection": "Kopiatu hautaketa",
-  "Paste from clipboard": "Itsatsi arbelean dagoena",
-  "Direction left to right": "Ezkerretik eskuinetarako norabidea",
-  "Direction right to left": "Eskuinetik ezkerretarako norabidea",
-  "Remove formatting": "Formatoa kendu",
-  "Select all": "Dena aukeratu",
-  "Print document": "Dokumentua inprimatu",
-  "Clear MSOffice tags": "MSOffice etiketak ezabatu",
-  "Clear Inline Font Specifications": "Ezabatu testuaren ezaugarriak",
-  "Would you like to clear font typefaces?": "Letra-tipoak ezabatu nahi al dituzu?",
-  "Would you like to clear font sizes?": "Letra-tipoen neurriak ezabatu nahi al dituzu?",
-  "Would you like to clear font colours?": "Letra-tipoen koloreak ezabatu nahi al dituzu?",
-  "Split Block": "Blokea zatitu",
-  "Toggle Borders": "Ertzak trukatu",
-  "Save as": "Gorde honela:",
-  "Insert/Overwrite": "Txertatu/Gainidatzi",
-  "&mdash; format &mdash;": "&mdash; Formatua &mdash;",
-  "Heading 1": "Goiburua 1",
-  "Heading 2": "Goiburua 2",
-  "Heading 3": "Goiburua 3",
-  "Heading 4": "Goiburua 4",
-  "Heading 5": "Goiburua 5",
-  "Heading 6": "Goiburua 6",
-  "Normal": "Normala",
-  "Address": "Helbidea",
-  "Formatted": "Formateatua",
-
-  //dialogs
-  "OK": "Ados",
-  "Cancel": "Utzi",
-  "Path": "Bidea",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "TESTU eran ari zara. Erabil ezazu [<>] botoia WYSIWIG erara itzultzeko.",
-   "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Itsatsi botoia ez dabil Mozillan oinarritutako nabigatzaileetan (arrazoi teknikoengatik). Sacatu CTRL-V zure teklatuan, zuzenean itsasteko.",
-
-  "You need to select some text before create a link": "Testu-atal bat aukeratu behar duzu lehendabizi, lotura bat sortzeko",
-  "Your Document is not well formed. Check JavaScript console for details.": "Zure dokumentuak ez du formatu zuzena. Begira ezazu JavaScript kontsola xehetasunetarako.",
-
-  "Alignment:": "Lerrokatzea:",
-  "Not set": "Ez gaitua",
-  "Left": "Ezkerretara",
-  "Right": "Eskuinetara",
-  "Texttop": "Irudiaren goialdean",
-  "Absmiddle": "Irudiaren erdian",
-  "Baseline": "Irudiaren oinean",
-  "Absbottom": "Irudiaren behekaldean",
-  "Bottom": "Behean",
-  "Middle": "Erdian",
-  "Top": "Goian",
-
-  "Layout": "Diseinua",
-  "Spacing": "Tartea",
-  "Horizontal:": "Horizontala:",
-  "Horizontal padding": "Betegarri horizontala",
-  "Vertical:": "Bertikala:",
-  "Vertical padding": "Betegarri bertikala",
-  "Border thickness:": "Ertzaren lodiera:",
-  "Leave empty for no border": "Uztazu hutsik ertzik ez sortzeko",
-
-  //Insert Link
-  "Insert/Modify Link": "Lotura txertatu/aldatu",
-  "None (use implicit)": "Bat ere ez (implizituki erabili)",
-  "New window (_blank)": "Lehio berrian (_blank)",
-  "Same frame (_self)": "Frame berean (_self)",
-  "Top frame (_top)": "Goiko frame-an (_top)",
-  "Other": "Beste bat",
-  "Target:": "Helburua:",
-  "Title (tooltip):": "Izenburua (argibidea):",
-  "URL:": "URL-a:",
-  "You must enter the URL where this link points to": "Loturaren helburu den URL-a idatzi behar duzu",
-
-  // Insert Table
-  "Insert Table": "Taula txertatu",
-  "Rows:": "Lerroak:",
-  "Number of rows": "Lerro-kopurua",
-  "Cols:": "Zutabeak:",
-  "Number of columns": "Zutabe-kopurua",
-  "Width:": "Zabalera:",
-  "Width of the table": "Taularen zabalera",
-  "Percent": "Portzentaia",
-  "Pixels": "Pixelak",
-  "Em": "Em",
-  "Width unit": "Zabalera-unitatea",
-  "Fixed width columns": "Zabalera finkodun zutabeak",
-  "Positioning of this table": "Taula honen kokapena",
-  "Cell spacing:": "Gelaxka-tartea:",
-  "Space between adjacent cells": "Gelaxka auzokideen arteko tartea",
-  "Cell padding:": "Gelaxkaren betegarria:",
-  "Space between content and border in cell": "Gelaxkaren edukia eta ertzaren arteko tartea",
-  "You must enter a number of rows": "Lerro-kopurua idatzi behar duzu",
-  "You must enter a number of columns": "Zutabe-kopurua idatzi behar duzu",
-
-  // Insert Image
-  "Insert Image": "Irudia txertatu",
-  "Image URL:": "Irudiaren URL-a:",
-  "Enter the image URL here": "Idatz ezazu irudiaren URL-a hemen",
-  "Preview": "Aurrebista",
-  "Preview the image in a new window": "Aurreikusi irudia beste lehio batean",
-  "Alternate text:": "Testu alternatiboa:",
-  "For browsers that don't support images": "Irudirik onartzen ez duten nabigatzaileentzat",
-  "Positioning of this image": "Irudiaren kokapena",
-  "Image Preview:": "Irudiaren aurrebista:",
-  "You must enter the URL": "URL-a idatzi behar duzu",
-
-  "button_bold": "de/bold.gif",
-  "button_italic": "de/italic.gif",
-  "button_underline": "de/underline.gif",
-
-  // Editor Help
-  "Keyboard shortcuts": "Laster-teklak",
-  "The editor provides the following key combinations:": "Editoreak ondorengo tekla-konbinazioak eskaintzen ditu:",
-  "new paragraph": "Paragrafo berria",
-  "insert linebreak": "Lerro-jauzia txertatu",
-  "Set format to paragraph": "Formatua ezarri paragrafoari",
-  "Clean content pasted from Word": "Word-etik itsatsitako edukia ezabatu",
-  "Headings": "Goiburuak",
-  "Close": "Itxi",
-
-  // Loading messages
-  "Loading in progress. Please wait!": "Kargatzen. Itxaron mesedez",
-  "Loading plugin $plugin" : "$plugin plugina kargatzen",
-  "Register plugin $plugin" : "$plugin plugina erregistratu", 
-  "Constructing object": "Objektua eraikitzen",
-  "Generate Xinha framework": "Xinha Framework sortzen",
-  "Init editor size":"Editorearen hasierako neurria", 
-  "Create Toolbar": "Tresna-barra sortu",
-  "Create Statusbar" : "Egoera-barra sortu",
-  "Register right panel" : "Eskuin-panela erregistratu", 
-  "Register left panel" : "Ezker-panela erregistratu", 
-  "Register bottom panel" : "Beheko panela erregistratu", 
-  "Register top panel" : "Goiko panela erregistratu", 
-  "Finishing" : "Bukatzen", 
-  
-  // ColorPicker
-  "Click a color..." : "Kolore bat aukeratu...",
-  "Sample" : "Lagina",
-  "Web Safe: " : "Web Safe: ",
-  "Color: " : "Kolorea: "
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/lang/fa.js b/web/imcms/xinha/lang/fa.js
deleted file mode 100644
index 106e831276..0000000000
--- a/web/imcms/xinha/lang/fa.js
+++ /dev/null
@@ -1,167 +0,0 @@
-// I18N constants
-// LANG: "fa", ENCODING: UTF-8
-{
-  "Bold": "ضخیم",
-  "Italic": "مورب",
-  "Underline": "زیر خط",
-  "Strikethrough": "رو خط",
-  "Subscript": "زیروند",
-  "Superscript": "بالاوند",
-  "Justify Left": "تراز از چپ",
-  "Justify Center": "تراز در وسط",
-  "Justify Right": "تراز در راست",
-  "Justify Full": "تراز از چپ و راست",
-  "Ordered List": "�هرست مرتب",
-  "Bulleted List": "�هرست گلوله ای",
-  "Decrease Indent": "کاهش سر خط",
-  "Increase Indent": "ا�زایش سر خط",
-  "Font Color": "رنگ �لم",
-  "Background Color": "رنگ پس زمینه",
-  "Horizontal Rule": "خط ا�قی",
-  "Insert Web Link": "ا�زودن لینک وب",
-  "Insert/Modify Image": "ا�زودن یا ویرایش تصویر",
-  "Insert Table": "ا�زودن جدول",
-  "Toggle HTML Source": "مشاهده یا عدم مشاهده متن در قالب HTML",
-  "Enlarge Editor": "بزرگ کردن ویرایش گر",
-  "About this editor": "درباره این ویرایش گر",
-  "Help using editor": "راهنمای است�اده ویرایش گر",
-  "Current style": "شیوه کنونی",
-  "Undoes your last action": "برگرداندن آخرین عمل",
-  "Redoes your last action": "انجام مجدد آخرین عمل",
-  "Cut selection": "بریدن انتخاب شده",
-  "Copy selection": "کپی انتخاب شده",
-  "Paste from clipboard": "چسباندن از تخته کار",
-  "Direction left to right": "جهت از چپ به راست",
-  "Direction right to left": "جهت از راست به چپ",
-  "Remove formatting": "حذ� �رمت بندی",
-  "Select all": "انتخاب همه",
-  "Print document": "چاپ سند",
-  "Clear MSOffice tags": "پاک کردن متن از برچسب های MSOffice",
-  "Clear Inline Font Specifications": "پاک کردن متن از مشخصات �ونت",
-  "Would you like to clear font typefaces?": "آیا تمایل دارید ظاهر �لم را پاک کنید؟",
-  "Would you like to clear font sizes?": "آیا تمایل دارید اندازه قلم را پاک کنید",
-  "Would you like to clear font colours?": "آیا تمایل دارید رنگ قلم را پاک کنید؟",
-  "Split Block": "بلاک جداسازی",
-  "Toggle Borders": "�عال/غیر �عال کردن لبه ها",
-  "Save as": "ذخیره مانند...",
-  "Insert/Overwrite": "ا�زودن/جانویسی",
-  "&mdash; format &mdash;": "&mdash; قالب &mdash;",
-  "Heading 1": "تیتر 1",
-  "Heading 2": "تیتر 2",
-  "Heading 3": "تیتر 3",
-  "Heading 4": "تیتر 4",
-  "Heading 5": "تیتر 5",
-  "Heading 6": "تیتر 6",
-  "Normal": "معمولی",
-  "Address": "آدرس",
-  "Formatted": "قالب بندی شده",
-
-  //dialogs
-  "OK": "بله",
-  "Cancel": "انصرا�",
-  "Path": "مسیر",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "در مد متنی هستید.  از دکمه [<>] است�اده نمایید تا به مد WYSIWYG برگردید.",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "دکمه چسباندن در مرورگرهای سری Mozilla کار نمی کند (به دلایل �نی امنیتی).برای چسباندن مستقیم ، دکمه CTRL-V را در ص�حه کلید بزنید.",
-  "Your Document is not well formed. Check JavaScript console for details.": "سند شما بدرستی قالب بندی نشده است. برای اطلاعات بیشتر پایانه نمایش جاوااسکریپت را بررسی کنید.",
-
-  "Alignment:": "تراز بندی",
-  "Not set": "تنظیم نشده",
-  "Left": "Ú†Ù¾",
-  "Right": "راست",
-  "Texttop": "بالای متن",
-  "Absmiddle": "دقیقا وسط",
-  "Baseline": "ابتدای خط",
-  "Absbottom": "دقیقا پایین",
-  "Bottom": "پایین",
-  "Middle": "وسط",
-  "Top": "بالا",
-
-  "Layout": "لایه",
-  "Spacing": "�اصله گذاری",
-  "Horizontal:": "ا�قی",
-  "Horizontal padding": "پرکننده ا�قی",
-  "Vertical:": "عمودی",
-  "Vertical padding": "پرکننده عمودی",
-  "Border thickness:": "ضخامت لبه",
-  "Leave empty for no border": "برای بدون لبه خالی رها کن",
-
-  //Insert Link
-  "Insert/Modify Link": "ا�زودن / ویرایش لینک",
-  "None (use implicit)": "هیچکدام (است�اده از بدون شرط)",
-  "New window (_blank)": "پنجره جدید (_blank)",
-  "Same frame (_self)": "�ریم یکسان (_self)",
-  "Top frame (_top)": "�ریم بالایی (_top)",
-  "Other": "سایر",
-  "Target:": "هد�",
-  "Title (tooltip):": "عنوان (راهنمای یک خطی)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "باید URLی که این لینک به آن اشاره دارد را وارد کنید",
-  "You need to select some text before creating a link": "باید قبل از ساخت لینک ، متنی را انتخاب نمایید",
-
-  // Insert Table
-  "Insert Table": "ا�زودن جدول",
-  "Rows:": "ردی� ها",
-  "Number of rows": "تعداد ردی� ها",
-  "Cols:": "ستون ها",
-  "Number of columns": "تعداد ستون ها",
-  "Width:": "طول",
-  "Width of the table": "طول جدول",
-  "Percent": "درصد",
-  "Pixels": "پیکسل ها",
-  "Em": "Em",
-  "Width unit": "واحد طول",
-  "Fixed width columns": "ستون های طول ثابت",
-  "Positioning of this table": "موقعیت یابی این جدول",
-  "Cell spacing:": "�اصله سلول ها",
-  "Space between adjacent cells": "�اصله بین سلول های همجوار",
-  "Cell padding:": "پر کننده سلول",
-  "Space between content and border in cell": "�اصله بین محتوا و لبه در سلول",
-  "You must enter a number of rows": "باید تعداد ردی� ها را وارد کنید",
-  "You must enter a number of columns": "باید تعداد ستون ها را وارد کنید",
-
-  // Insert Image
-  "Insert Image": "ا�زودن تصویر",
-  "Image URL:": "URL تصویر",
-  "Enter the image URL here": "URL تصویر را اینجا وارد کنید",
-  "Preview": "پیش نمایش",
-  "Preview the image in a new window": "پیش نمایش تصویر در پنجره ای جدید",
-  "Alternate text:": "متن جایگزین",
-  "For browsers that don't support images": "برای مرورگرهایی که از تصاویر پشتیبانی نمی کنند",
-  "Positioning of this image": "موقعیت یابی تصویر",
-  "Image Preview:": "پیش نمایش تصویر",
-  "You must enter the URL": "شما باید URL را وارد کنید",
-
-  // toolbar
-  "button_bold": "fr/bold.gif",
-  "button_underline": "fr/underline.gif",
-  "button_strikethrough": "fr/strikethrough.gif",
-
-  // Editor Help
-  "Xinha Help": "راهنمای Xinha",
-  "Editor Help": "راهنمای ویرایشگر",
-  "Keyboard shortcuts": "میانبرهای ص�حه کلید",
-  "The editor provides the following key combinations:": "ویرایشگر است�اده از کلید های گروهی زیر را مسیر می سازد :",
-  "ENTER": "ENTREE",
-  "new paragraph": "پاراگرا� جدید",
-  "SHIFT-ENTER": "SHIFT+ENTREE",
-  "insert linebreak": "ا�زودن جدا کننده خط",
-  "Set format to paragraph": "تغییر قالب به پاراگرا�",
-  "Clean content pasted from Word": "تمیز کردن محتوای چسبانده شده از Word",
-  "Headings": "عنوان گذاری",
-  "Close": "بستن",
-
-  // Loading messages
-  "Loading in progress. Please wait !": "بارگذاری در حال انجام است. لط�ا صبر کنید !",
-  "Constructing main object": "ساختن شیء اصلی",
-  "Constructing object": "ساختن شیء",
-  "Register panel right": "ثبت قاب راست",
-  "Register panel left": "ثبت قاب چپ",
-  "Register panel top": "ثبت قاب بالا",
-  "Register panel bottom": "ثبت قاب پایین",
-  "Create Toolbar": "ساخت نوار ابزار",
-  "Create StatusBar": "ساخت نوار وضعیت",
-  "Generate Xinha object": "تولید شیء Xinha",
-  "Init editor size": "مقدار دهی اندازه ویرایشگر",
-  "Init IFrame": "مقدار دهی IFrame",
-  "Register plugin $plugin": "ثبت پلاگین $plugin"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/lang/fi.js b/web/imcms/xinha/lang/fi.js
deleted file mode 100644
index e057b9af19..0000000000
--- a/web/imcms/xinha/lang/fi.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// I18N constants
-
-// LANG: "en", ENCODING: UTF-8
-
-{
-  "Bold": "Lihavoitu",
-  "Italic": "Kursivoitu",
-  "Underline": "Alleviivattu",
-  "Strikethrough": "Yliviivattu",
-  "Subscript": "Alaindeksi",
-  "Superscript": "Yläindeksi",
-  "Justify Left": "Tasaa vasemmat reunat",
-  "Justify Center": "Keskitä",
-  "Justify Right": "Tasaa oikeat reunat",
-  "Justify Full": "Tasaa molemmat reunat",
-  "Ordered List": "Numerointi",
-  "Bulleted List": "Luettelomerkit",
-  "Decrease Indent": "Pienennä sisennystä",
-  "Increase Indent": "Lisää sisennystä",
-  "Font Color": "Fontin väri",
-  "Background Color": "Taustaväri",
-  "Horizontal Rule": "Vaakaviiva",
-  "Insert Web Link": "Lisää linkki",
-  "Insert/Modify Image": "Lisää kuva",
-  "Insert Table": "Lisää taulukko",
-  "Toggle HTML Source": "HTML-lähdekoodi vs WYSIWYG",
-  "Enlarge Editor": "Suurenna editori",
-  "About this editor": "Tietoja editorista",
-  "Help using editor": "Näytä ohje",
-  "Current style": "Nykyinen tyyli",
-  "Undoes your last action": "Peruuta viimeinen toiminto",
-  "Redoes your last action": "Palauta viimeinen toiminto",
-  "Cut selection": "Leikkaa maalattu",
-  "Copy selection": "Kopioi maalattu",
-  "Paste from clipboard": "Liitä leikepyödältä",
-  "OK": "Hyväksy",
-  "Cancel": "Peruuta"
-}
diff --git a/web/imcms/xinha/lang/fr.js b/web/imcms/xinha/lang/fr.js
deleted file mode 100644
index 6110cef55b..0000000000
--- a/web/imcms/xinha/lang/fr.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Bold": "Gras",
-  "Italic": "Italique",
-  "Underline": "Souligné",
-  "Strikethrough": "Barré",
-  "Subscript": "Indice",
-  "Superscript": "Exposant",
-  "Justify Left": "Aligner à gauche",
-  "Justify Center": "Centrer",
-  "Justify Right": "Aligner à droite",
-  "Justify Full": "Justifier",
-  "Ordered List": "Liste numérotée",
-  "Bulleted List": "Liste à puces",
-  "Decrease Indent": "Diminuer le retrait",
-  "Increase Indent": "Augmenter le retrait",
-  "Font Color": "Couleur de police",
-  "Background Color": "Surlignage",
-  "Horizontal Rule": "Ligne horizontale",
-  "Insert Web Link": "Insérer un lien",
-  "Insert/Modify Image": "Insérer / Modifier une image",
-  "Insert Table": "Insérer un tableau",
-  "Toggle HTML Source": "Afficher / Masquer code source",
-  "Enlarge Editor": "Agrandir l'éditeur",
-  "About this editor": "A propos",
-  "Help using editor": "Aide",
-  "Current style": "Style courant",
-  "Undoes your last action": "Annuler la dernière action",
-  "Redoes your last action": "Répéter la dernière action",
-  "Cut selection": "Couper la sélection",
-  "Copy selection": "Copier la sélection",
-  "Paste from clipboard": "Coller depuis le presse-papier",
-  "Direction left to right": "Direction de gauche à droite",
-  "Direction right to left": "Direction de droite à gauche",
-  "Remove formatting": "Supprimer mise en forme",
-  "Select all": "Tout sélectionner",
-  "Print document": "Imprimer document",
-  "Clear MSOffice tags": "Supprimer tags MSOffice",
-  "Clear Inline Font Specifications": "Supprimer paramètres inline de la police",
-  "Would you like to clear font typefaces?": "Voulez-vous supprimer les types ?",
-  "Would you like to clear font sizes?": "Voulez-vous supprimer les tailles ?",
-  "Would you like to clear font colours?": "Voulez-vous supprimer les couleurs ?",
-  "Split Block": "Séparer les blocs",
-  "Toggle Borders": "Afficher / Masquer les bordures",
-  "Save as": "Enregistrer sous",
-  "Insert/Overwrite": "Insertion / Remplacement",
-  "&mdash; format &mdash;": "&mdash; Format &mdash;",
-  "Heading 1": "Titre 1",
-  "Heading 2": "Titre 2",
-  "Heading 3": "Titre 3",
-  "Heading 4": "Titre 4",
-  "Heading 5": "Titre 5",
-  "Heading 6": "Titre 6",
-  "Normal": "Normal",
-  "Address": "Adresse",
-  "Formatted": "Formaté",
-
-  //dialogs
-  "OK": "OK",
-  "Cancel": "Annuler",
-  "Path": "Chemin",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Vous êtes en MODE TEXTE.  Appuyez sur le bouton [<>] pour retourner au mode WYSIWYG.",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Le bouton Coller ne fonctionne pas sur les navigateurs basés sur Mozilla (pour des raisons de sécurité). Pressez CTRL-V au clavier pour coller directement.",
-  "Your Document is not well formed. Check JavaScript console for details.": "Le document est mal formé. Vérifiez la console JavaScript pour plus de détails.",
-
-  "Alignment:": "Alignement",
-  "Not set": "Indéfini",
-  "Left": "Gauche",
-  "Right": "Droite",
-  "Texttop": "Texttop",
-  "Absmiddle": "Absmiddle",
-  "Baseline": "Baseline",
-  "Absbottom": "Absbottom",
-  "Bottom": "Bas",
-  "Middle": "Milieu",
-  "Top": "Haut",
-
-  "Layout": "Mise en page",
-  "Spacing": "Espacement",
-  "Horizontal:": "Horizontal",
-  "Horizontal padding": "Marge horizontale interne",
-  "Vertical:": "Vertical",
-  "Vertical padding": "Marge verticale interne",
-  "Border thickness:": "Epaisseur de bordure",
-  "Leave empty for no border": "Laisser vide pour pas de bordure",
-
-  //Insert Link
-  "Insert/Modify Link": "Insérer / Modifier un lien",
-  "None (use implicit)": "Aucune (implicite)",
-  "New window (_blank)": "Nouvelle fenêtre (_blank)",
-  "Same frame (_self)": "Même frame (_self)",
-  "Top frame (_top)": "Frame principale (_top)",
-  "Other": "Autre",
-  "Target:": "Cible",
-  "Title (tooltip):": "Texte alternatif",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Vous devez entrer l'URL de ce lien",
-  "You need to select some text before creating a link": "Vous devez sélectionner du texte avant de créer un lien",
-
-  // Insert Table
-  "Insert Table": "Insérer un tableau",
-  "Rows:": "Lignes",
-  "Number of rows": "Nombre de lignes",
-  "Cols:": "Colonnes",
-  "Number of columns": "Nombre de colonnes",
-  "Width:": "Largeur",
-  "Width of the table": "Largeur du tableau",
-  "Percent": "Pourcent",
-  "Pixels": "Pixels",
-  "Em": "Em",
-  "Width unit": "Unités de largeur",
-  "Fixed width columns": "Colonnes à taille fixe",
-  "Positioning of this table": "Position du tableau",
-  "Cell spacing:": "Espacement",
-  "Space between adjacent cells": "Espace entre les cellules adjacentes",
-  "Cell padding:": "Marge interne",
-  "Space between content and border in cell": "Espace entre le contenu et la bordure d'une cellule",
-  "You must enter a number of rows": "Vous devez entrer le nombre de lignes",
-  "You must enter a number of columns": "Vous devez entrer le nombre de colonnes",
-
-  // Insert Image
-  "Insert Image": "Insérer une image",
-  "Image URL:": "URL image",
-  "Enter the image URL here": "Entrer l'URL de l'image ici",
-  "Preview": "Prévisualiser",
-  "Preview the image in a new window": "Prévisualiser l'image dans une nouvelle fenêtre",
-  "Alternate text:": "Texte alternatif",
-  "For browsers that don't support images": "Pour les navigateurs qui ne supportent pas les images",
-  "Positioning of this image": "Position de l'image",
-  "Image Preview:": "Prévisualisation",
-  "You must enter the URL": "Vous devez entrer l'URL",
-
-  // toolbar
-  "button_bold": "fr/bold.gif",
-  "button_underline": "fr/underline.gif",
-  "button_strikethrough": "fr/strikethrough.gif",
-
-  // Editor Help
-  "Xinha Help": "Aide Xinha",
-  "Editor Help": "Aide de l'éditeur",
-  "Keyboard shortcuts": "Raccourcis clavier",
-  "The editor provides the following key combinations:": "L'éditeur fournit les combinaisons de touches suivantes :",
-  "ENTER": "ENTREE",
-  "new paragraph": "Nouveau paragraphe",
-  "SHIFT-ENTER": "SHIFT+ENTREE",
-  "insert linebreak": "Insère un saut de ligne",
-  "Set format to paragraph": "Applique le format paragraphe",
-  "Clean content pasted from Word": "Nettoyage du contenu copié depuis Word",
-  "Headings": "Titres",
-  "Close": "Fermer",
-
-  // Loading messages
-  "Loading in progress. Please wait!": "Chargement en cours. Veuillez patienter!",
-  "Finishing" : "Chargement bientôt terminé", 
-  "Constructing object": "Construction de l'objet",
-  "Create Toolbar": "Construction de la barre d'icones",
-  "Create Statusbar": "Construction de la barre de status",
-  "Register right panel" : "Enregistrement du panneau droit", 
-  "Register left panel" : "Enregistrement du panneau gauche", 
-  "Register bottom panel" : "Enregistrement du panneau supérieur", 
-  "Register top panel" : "Enregistrement du panneau inférieur", 
-  "Generate Xinha framework": "Génération de Xinha",
-  "Init editor size": "Initialisation de la taille d'édition",
-  "Init IFrame": "Initialisation de l'iframe",
-  "Register plugin $plugin": "Enregistrement du plugin $plugin",
-  "Loading plugin $plugin" : "Chargement du plugin $plugin"
-
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/lang/gb.js b/web/imcms/xinha/lang/gb.js
deleted file mode 100644
index b4fb5b642f..0000000000
--- a/web/imcms/xinha/lang/gb.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// I18N constants -- Chinese GB
-// by Dave Lo -- dlo@interactivetools.com
-{
-  "Bold": "粗体",
-  "Italic": "斜体",
-  "Underline": "底线",
-  "Strikethrough": "删除线",
-  "Subscript": "下标",
-  "Superscript": "上标",
-  "Justify Left": "�置�左",
-  "Justify Center": "�置居中",
-  "Justify Right": "�置��",
-  "Justify Full": "�置左�平等",
-  "Ordered List": "顺�清�",
-  "Bulleted List": "无�清�",
-  "Decrease Indent": "��行�空白",
-  "Increase Indent": "加宽行�空白",
-  "Font Color": "文字颜色",
-  "Background Color": "背景颜色",
-  "Horizontal Rule": "水平线",
-  "Insert Web Link": "�入连结",
-  "Insert/Modify Image": "�入图形",
-  "Insert Table": "�入表格",
-  "Toggle HTML Source": "切�HTML原始�",
-  "Enlarge Editor": "放大",
-  "About this editor": "关於 Xinha",
-  "Help using editor": "说明",
-  "Current style": "字体例�"
-}
diff --git a/web/imcms/xinha/lang/he.js b/web/imcms/xinha/lang/he.js
deleted file mode 100644
index e39d3fc02a..0000000000
--- a/web/imcms/xinha/lang/he.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// I18N constants
-
-// LANG: "he", ENCODING: UTF-8
-// Author: Liron Newman, http://www.eesh.net, <plastish at ultinet dot org>
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "מודגש",
-  "Italic": "נטוי",
-  "Underline": "קו תחתי",
-  "Strikethrough": "קו �מצע",
-  "Subscript": "כתב עילי",
-  "Superscript": "כתב תחתי",
-  "Justify Left": " ישור לשמ�ל",
-  "Justify Center": "ישור למרכז",
-  "Justify Right": "ישור לימין",
-  "Justify Full": "ישור לשורה מל�ה",
-  "Ordered List": "רשימה ממוספרת",
-  "Bulleted List": "רשימה ל� ממוספרת",
-  "Decrease Indent": "הקטן כניסה",
-  "Increase Indent": "הגדל כניסה",
-  "Font Color": "צבע גופן",
-  "Background Color": "צבע רקע",
-  "Horizontal Rule": "קו �נכי",
-  "Insert Web Link": "הכנס היפר-קישור",
-  "Insert/Modify Image": "הכנס/שנה תמונה",
-  "Insert Table": "הכנס טבלה",
-  "Toggle HTML Source": "שנה מצב קוד HTML",
-  "Enlarge Editor": "הגדל �ת העורך",
-  "About this editor": "�ודות עורך זה",
-  "Help using editor": "עזרה לשימוש בעורך",
-  "Current style": "סגנון נוכחי",
-  "Undoes your last action": "מבטל �ת פעולתך ה�חרונה",
-  "Redoes your last action": "מבצע מחדש �ת הפעולה ה�חרונה שביטלת",
-  "Cut selection": "גזור בחירה",
-  "Copy selection": "העתק בחירה",
-  "Paste from clipboard": "הדבק מהלוח",
-  "Direction left to right": "כיוון משמ�ל לימין",
-  "Direction right to left": "כיוון מימין לשמ�ל",
-  "OK": "�ישור",
-  "Cancel": "ביטול",
-  "Path": "נתיב עיצוב",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "�תה במצב טקסט נקי (קוד). השתמש בכפתור [<>] כדי לחזור למצב WYSIWYG (תצוגת עיצוב).",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "מצב מסך מל� יוצר בעיות בדפדפן Internet Explorer, עקב ב�גי� בדפדפן ל� יכולנו לפתור �ת זה.  �ת/ה עלול/ה לחוות תצוגת זבל,  בעיות בתפקוד העורך ו/�ו קריסה של הדפדפן.  �� המערכת שלך הי� Windows 9x סביר להניח שתקבל/י ",
-  "Cancel": "ביטול",
-  "Insert/Modify Link": "הוסף/שנה קישור",
-  "New window (_blank)": "חלון חדש (_blank)",
-  "None (use implicit)": "לל� (השתמש ב-frame הקיי�)",
-  "Other": "�חר",
-  "Same frame (_self)": "�ותו frame (_self)",
-  "Target:": "יעד:",
-  "Title (tooltip):": "כותרת (tooltip):",
-  "Top frame (_top)": "Frame עליון (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "חובה לכתוב URL ש�ליו קישור זה מצביע"
-}
diff --git a/web/imcms/xinha/lang/hu.js b/web/imcms/xinha/lang/hu.js
deleted file mode 100644
index a4b1fa4eba..0000000000
--- a/web/imcms/xinha/lang/hu.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// I18N constants
-
-// LANG: "hu", ENCODING: UTF-8
-// Author: Miklós Somogyi, <somogyine@vnet.hu>
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "Félkövér",
-  "Italic": "DÅ‘lt",
-  "Underline": "Aláhúzott",
-  "Strikethrough": "�thúzott",
-  "Subscript": "Alsó index",
-  "Superscript": "Felső index",
-  "Justify Left": "Balra zárt",
-  "Justify Center": "Középre zárt",
-  "Justify Right": "Jobbra zárt",
-  "Justify Full": "Sorkizárt",
-  "Ordered List": "Számozott lista",
-  "Bulleted List": "Számozatlan lista",
-  "Decrease Indent": "Behúzás csökkentése",
-  "Increase Indent": "Behúzás növelése",
-  "Font Color": "Karakterszín",
-  "Background Color": "Háttérszín",
-  "Horizontal Rule": "Elválasztó vonal",
-  "Insert Web Link": "Hiperhivatkozás beszúrása",
-  "Insert/Modify Image": "Kép beszúrása",
-  "Insert Table": "Táblázat beszúrása",
-  "Toggle HTML Source": "HTML forrás be/ki",
-  "Enlarge Editor": "Szerkesztő külön ablakban",
-  "About this editor": "Névjegy",
-  "Help using editor": "Súgó",
-  "Current style": "Aktuális stílus",
-  "Undoes your last action": "Visszavonás",
-  "Redoes your last action": "Újra végrehajtás",
-  "Cut selection": "Kivágás",
-  "Copy selection": "Másolás",
-  "Paste from clipboard": "Beillesztés",
-  "Direction left to right": "Irány balról jobbra",
-  "Direction right to left": "Irány jobbról balra",
-  "OK": "Rendben",
-  "Cancel": "Mégsem",
-  "Path": "Hierarchia",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Forrás mód. Visszaváltás [<>] gomb",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "A teljesképrenyős szerkesztés hibát okozhat Internet Explorer használata esetén, ez a böngésző a hibája, amit nem tudunk kikerülni. Szemetet észlelhet a képrenyőn, illetve néhány funkció hiányozhat és/vagy véletlenszerűen lefagyhat a böngésző. Windows 9x operaciós futtatása esetén elég valószínű, hogy ",
-  "Cancel": "Mégsem",
-  "Insert/Modify Link": "Hivatkozás Beszúrása/Módosítása",
-  "New window (_blank)": "Új ablak (_blank)",
-  "None (use implicit)": "Nincs (use implicit)",
-  "Other": "Más",
-  "Same frame (_self)": "Ugyanabba a keretbe (_self)",
-  "Target:": "Cél:",
-  "Title (tooltip):": "Cím (tooltip):",
-  "Top frame (_top)": "Felső keret (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Be kell írnia az URL-t, ahova a hivatkozás mutasson"
-}
diff --git a/web/imcms/xinha/lang/it.js b/web/imcms/xinha/lang/it.js
deleted file mode 100644
index 1c92f23db2..0000000000
--- a/web/imcms/xinha/lang/it.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// I18N constants
-
-// LANG: "it", ENCODING: UTF-8
-// Author: Mattia Landoni, http://www.webpresident.org/
-
-{
-  "Bold": "Grassetto",
-  "Italic": "Corsivo",
-  "Underline": "Sottolineato",
-  "Strikethrough": "Barrato",
-  "Subscript": "Pedice",
-  "Superscript": "Apice",
-  "Justify Left": "Sinistra",
-  "Justify Center": "Centrato",
-  "Justify Right": "Destra",
-  "Justify Full": "Giustificato",
-  "Ordered List": "Lista numerata",
-  "Bulleted List": "Lista non numerata",
-  "Decrease Indent": "Diminuisci indentazione",
-  "Increase Indent": "Aumenta indentazione",
-  "Font Color": "Colore font",
-  "Background Color": "Colore sfondo",
-  "Horizontal Rule": "Righello orizzontale",
-  "Insert Web Link": "Inserisci link",
-  "Insert/Modify Image": "Inserisci/modifica Immagine",
-  "Insert Table": "Inserisci tabella",
-  "Toggle HTML Source": "Visualizza/nascondi sorgente HTML",
-  "Enlarge Editor": "Allarga editor",
-  "About this editor": "Informazioni su Xinha",
-  "Help using editor": "Aiuto",
-  "Current style": "Stile corrente",
-  "Undoes your last action": "Annulla ultima azione",
-  "Redoes your last action": "Ripeti ultima azione",
-  "Cut selection": "Taglia",
-  "Copy selection": "Copia",
-  "Paste from clipboard": "Incolla",
-  "Direction left to right": "Testo da sx a dx",
-  "Direction right to left": "Testo da dx a sx",
-  "OK": "OK",
-  "Cancel": "Annulla",
-  "Path": "Percorso",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Sei in MODALITA",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "E",
-  "Cancel": "Annulla",
-  "Insert/Modify Link": "Inserisci/modifica link",
-  "New window (_blank)": "Nuova finestra (_blank)",
-  "None (use implicit)": "Niente (usa implicito)",
-  "Other": "Altro",
-  "Same frame (_self)": "Stessa frame (_self)",
-  "Target:": "Target:",
-  "Title (tooltip):": "Title (suggerimento):",
-  "Top frame (_top)": "Pagina intera (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Devi inserire l'indirizzo a cui punta il link"
-}
diff --git a/web/imcms/xinha/lang/ja.js b/web/imcms/xinha/lang/ja.js
deleted file mode 100644
index dd8adf029c..0000000000
--- a/web/imcms/xinha/lang/ja.js
+++ /dev/null
@@ -1,175 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8N
-
-{
-  "Bold": "太字",
-  "Italic": "斜体",
-  "Underline": "下線",
-  "Strikethrough": "打�消�線",
-  "Subscript": "下付�添�字",
-  "Superscript": "上付�添�字",
-  "Justify Left": "左寄�",
-  "Justify Center": "中央寄�",
-  "Justify Right": "�寄�",
-  "Justify Full": "�等割付",
-  "Ordered List": "番�付�箇�書�",
-  "Bulleted List": "記�付�箇�書�",
-  "Decrease Indent": "インデント解除",
-  "Increase Indent": "インデント設定",
-  "Font Color": "文字色",
-  "Background Color": "背景色",
-  "Horizontal Rule": "水平線",
-  "Insert Web Link": "リンク�挿入",
-  "Insert/Modify Image": "画��挿入/修正",
-  "Insert Table": "テーブルを挿入",
-  "Toggle HTML Source": "HTML編集モードを切替",
-  "Enlarge Editor": "エディタを最大化",
-  "About this editor": "�ージョン情報",
-  "Help using editor": "ヘルプ",
-  "Current style": "�在�スタイル",
-  "Undoes your last action": "元�戻�",
-  "Redoes your last action": "やり直�",
-  "Cut selection": "切り�り",
-  "Copy selection": "コピー",
-  "Paste from clipboard": "貼り付�",
-  "Direction left to right": "左�ら��",
-  "Direction right to left": "��ら左�",
-  "Remove formatting": "書�削除",
-  "Select all": "����択",
-  "Print document": "�刷",
-  "Clear MSOffice tags": "MSOfficeタグをクリア",
-  "Clear Inline Font Specifications": "インラインフォント指定をクリア",
-  "Would you like to clear font typefaces?": "フォント�をクリア����?",
-  "Would you like to clear font sizes?": "サイズをクリア����?",
-  "Would you like to clear font colours?": "色をクリア����?",
-  "Split Block": "領域分割",
-  "Toggle Borders": "境界線�切替",
-  "Save as": "��を����存",
-  "Insert/Overwrite": "挿入/上書�",
-  "&mdash; format &mdash;": "&mdash; 書� &mdash;",
-  "Heading 1": "見出�1",
-  "Heading 2": "見出�2",
-  "Heading 3": "見出�3",
-  "Heading 4": "見出�4",
-  "Heading 5": "見出�5",
-  "Heading 6": "見出�6",
-  "Normal": "標準",
-  "Address": "アドレス",
-  "Formatted": "整形済�",
-  "&mdash; font &mdash;": "&mdash; フォント &mdash;",
-  "&mdash; size &mdash;": "&mdash; サイズ &mdash;",
-  
-  //dialogs
-  "OK": "OK",
-  "Cancel": "中止",
-  "Path": "パス",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "テキストモード��作�����。WYSIWYG編集�戻る��[<>]ボタンを使������。",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Mozillaベース�Webブラウザ���貼り付�ボタン�機能���ん（技術的�セキュリティ上��由�）。Ctrl+Vキーを押��直接貼り付������。",
-  "Your Document is not well formed. Check JavaScript console for details.": "��文書��構文的��題��り��。詳細�JavaScriptコンソールを�照������。",
-  "You need to select some text before creating a link": "リンクを作��る��テキストを�択�る必���り��",
-
-  "Alignment:": "行��:",
-  "Not set": "��",
-  "Left": "å·¦",
-  "Right": "�",
-  "Texttop": "テキスト上部",
-  "Absmiddle": "中央(絶対的)",
-  "Baseline": "ベースライン",
-  "Absbottom": "下(絶対的)",
-  "Bottom": "下",
-  "Middle": "中央",
-  "Top": "上",
-
-  "Layout": "レイアウト",
-  "Spacing": "é–“éš”",
-  "Horizontal:": "æ°´å¹³:",
-  "Horizontal padding": "水平余白",
-  "Vertical:": "åž‚ç›´:",
-  "Vertical padding": "垂直余白",
-  "Border thickness:": "境界線�太�:",
-  "Leave empty for no border": "境界線���場��空�����る",
-
-  //Insert Link
-  "Insert/Modify Link": "リンク�挿入/修正",
-  "None (use implicit)": "�� (デフォルト�任�る)",
-  "New window (_blank)": "新��ウィンドウ (_blank)",
-  "Same frame (_self)": "自己フレーム内 (_self)",
-  "Top frame (_top)": "最上�フレーム (_top)",
-  "Other": "��他",
-  "Target:": "ターゲット:",
-  "Title (tooltip):": "タイトル:",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "��リンク�指�示�URLを入力������",
-
-  // Insert Table
-  "Insert Table": "テーブル�挿入",
-  "Rows:": "行:",
-  "Number of rows": "行数",
-  "Cols:": "列:",
-  "Number of columns": "列数",
-  "Width:": "å¹…:",
-  "Width of the table": "テーブル�幅",
-  "Percent": "パーセント(%)",
-  "Pixels": "ピクセル(px)",
-  "Em": "相対値(em)",
-  "Width unit": "幅���",
-  "Fixed width columns": "列�幅を固定",
-  "Positioning of this table": "��テーブル��置",
-  "Cell spacing:": "セル間隔:",
-  "Space between adjacent cells": "隣接�るセル間��離",
-  "Cell padding:": "セル余白:",
-  "Space between content and border in cell": "セル内���る内容�境界線���離",
-  "You must enter a number of rows": "行数を入力������",
-  "You must enter a number of columns": "列数を入力������",
-
-  // Insert Image
-  "Insert Image": "画��挿入",
-  "Image URL:": "画�URL:",
-  "Enter the image URL here": "画��URLを���入力���",
-  "Preview": "表示",
-  "Preview the image in a new window": "ウィンドウ�画�を表示",
-  "Alternate text:": "代替テキスト:",
-  "For browsers that don't support images": "画�表示をサ�ート���ブラウザ�必���",
-  "Positioning of this image": "画���置",
-  "Image Preview:": "画�表示:",
-  "You must enter the URL": "URLを入力�る必���り��",
-
-  //"button_bold": "fr/bold.gif",
-  //"button_underline": "fr/underline.gif",
-  //"button_strikethrough": "fr/strikethrough.gif",
-
-  // Editor Help
-  "Xinha Help": "ヘルプ",
-  "Editor Help": "エディタ�ヘルプ",
-  "Keyboard shortcuts": "キーボードショートカット",
-  "The editor provides the following key combinations:": "エディタ�以下�キー�作を�供�����:",
-  "ENTER": "ENTER",
-  "new paragraph": "新�段�",
-  "SHIFT-ENTER": "SHIFT+ENTER",
-  "insert linebreak": "段�内改行�挿入",
-  "Set format to paragraph": "段�書��設定",
-  "Clean content pasted from Word": "Word�ら貼り付�られ�内容�清書",
-  "Headings": "見出�",
-  "Close": "閉�る",
-
-  // Loading messages
-  "Loading in progress. Please wait!": "ロード中��。��ら��待�����",
-  "Loading plugin $plugin" : "ロード中プラグイン $plugin",
-  "Register plugin $plugin" : "登録中プラグイン $plugin", 
-  "Constructing object": "オブジェクト構築中",
-  "Generate Xinha framework": "Xinhaフレームワーク生�中",
-  "Init editor size":"エディタサイズ��期化", 
-  "Create Toolbar": "ツール�ー�作�",
-  "Create Statusbar" : "ステータス�ー�作�",
-  "Register right panel" : "登録 �パ�ル", 
-  "Register left panel" : "登録 左パ�ル", 
-  "Register bottom panel" : "登録 下パ�ル", 
-  "Register top panel" : "登録 上パ�ル", 
-  "Finishing" : "完了",
-  
-  // ColorPicker
-  "Click a color..." : "色をクリック...",
-  "Sample" : "サンプル",
-  "Web Safe: " : "Webセーフ: ",
-  "Color: " : "色: "  
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/lang/lt.js b/web/imcms/xinha/lang/lt.js
deleted file mode 100644
index ea34009554..0000000000
--- a/web/imcms/xinha/lang/lt.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// I18N constants
-
-// LANG: "lt", ENCODING: UTF-8
-// Author: Jaroslav Šatkevi�, <jaro@akl.lt>
-
-{
-  "Bold": "Paryškinti",
-  "Italic": "Kursyvas",
-  "Underline": "Pabraukti",
-  "Strikethrough": "Perbraukti",
-  "Subscript": "Apatinis indeksas",
-  "Superscript": "Viršutinis indeksas",
-  "Justify Left": "Lygiavimas pagal kairÄ™",
-  "Justify Center": "Lygiavimas pagal centrÄ…",
-  "Justify Right": "Lygiavimas pagal dešinę",
-  "Justify Full": "Lygiuoti pastraipÄ…",
-  "Ordered List": "Numeruotas sąrašas",
-  "Bulleted List": "Suženklintas sąrašas",
-  "Decrease Indent": "Sumažinti paraštę",
-  "Increase Indent": "Padidinti paraštę",
-  "Font Color": "Å rifto spalva",
-  "Background Color": "Fono spalva",
-  "Horizontal Rule": "Horizontali linija",
-  "Insert Web Link": "Įterpti nuorodą",
-  "Insert/Modify Image": "Įterpti paveiksliuką",
-  "Insert Table": "Įterpti lentelę",
-  "Toggle HTML Source": "Perjungti į HTML/WYSIWYG",
-  "Enlarge Editor": "IÅ¡plÄ—stas redagavimo ekranas/Enlarge Editor",
-  "About this editor": "Apie redaktorių",
-  "Help using editor": "Pagalba naudojant redaktorių",
-  "Current style": "Dabartinis stilius",
-  "Undoes your last action": "Atšaukia paskutini jūsų veiksmą",
-  "Redoes your last action": "Pakartoja paskutinį atšauktą jūsų veiksmą",
-  "Cut selection": "IÅ¡kirpti",
-  "Copy selection": "Kopijuoti",
-  "Paste from clipboard": "Įterpti",
-  "OK": "OK",
-  "Cancel": "Atšaukti",
-  "Path": "Kelias",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Jūs esete teksto režime.  Naudokite [<>] mygtuką grįžimui į WYSIWYG.",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren",
-  "Cancel": "Atšaukti",
-  "Insert/Modify Link": "IdÄ—ti/Modifikuoti",
-  "New window (_blank)": "Naujas langas (_blank)",
-  "None (use implicit)": "None (use implicit)",
-  "Other": "Kitas",
-  "Same frame (_self)": "Same frame (_self)",
-  "Target:": "Target:",
-  "Title (tooltip):": "Pavadinimas (tooltip):",
-  "Top frame (_top)": "Top frame (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Jus privalote nurodyti URL į kuri rodo šitą nuoroda"
-}
diff --git a/web/imcms/xinha/lang/lv.js b/web/imcms/xinha/lang/lv.js
deleted file mode 100644
index 840b4e7933..0000000000
--- a/web/imcms/xinha/lang/lv.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// I18N constants
-
-// LANG: "lv", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-// Translated by: Janis Klavins, <janis.klavins@devia.lv>
-
-{
-  "Bold": "Trekniem burtiem",
-  "Italic": "Kursîvâ",
-  "Underline": "Pasvîtrots",
-  "Strikethrough": "Pârsvîtrots",
-  "Subscript": "Novietot zem rindas",
-  "Superscript": "Novietot virs rindas",
-  "Justify Left": "Izlîdzinât pa kreisi",
-  "Justify Center": "Izlîdzinât centrâ",
-  "Justify Right": "Izlîdzinât pa labi",
-  "Justify Full": "Izlîdzinât pa visu lapu",
-  "Ordered List": "Numurçts saraksts",
-  "Bulleted List": "Saraksts",
-  "Decrease Indent": "Samazinât atkâpi",
-  "Increase Indent": "Palielinât atkâpi",
-  "Font Color": "Burtu krâsa",
-  "Background Color": "Fona krâsa",
-  "Horizontal Rule": "Horizontâla atdalîtâjsvîtra",
-  "Insert Web Link": "Ievietot hipersaiti",
-  "Insert/Modify Image": "Ievietot attçlu",
-  "Insert Table": "Ievietot tabulu",
-  "Toggle HTML Source": "Skatît HTML kodu",
-  "Enlarge Editor": "Palielinât Rediìçtâju",
-  "About this editor": "Par ðo rediìçtâju",
-  "Help using editor": "Rediìçtâja palîgs",
-  "Current style": "Patreizçjais stils",
-  "Undoes your last action": "Atcelt pçdçjo darbîbu",
-  "Redoes your last action": "Atkârtot pçdçjo darbîbu",
-  "Cut selection": "Izgriezt iezîmçto",
-  "Copy selection": "Kopçt iezîmçto",
-  "Paste from clipboard": "Ievietot iezîmçto",
-  "OK": "Labi",
-  "Cancel": "Atcelt",
-  "Path": "Ceïð",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Jûs patlaban darbojaties TEKSTA REÞÎMÂ. Lai pârietu atpakaï uz GRAFISKO REÞÎMU (WYSIWIG), lietojiet [<>] pogu."
-}
diff --git a/web/imcms/xinha/lang/nb.js b/web/imcms/xinha/lang/nb.js
deleted file mode 100644
index 06943790f6..0000000000
--- a/web/imcms/xinha/lang/nb.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// I18N constants
-
-// LANG: "nb", ENCODING: UTF-8
-
-// - translated by ses<ses@online.no>
-// Additional translations by HÃ¥vard Wigtil <havardw@extend.no>
-// Additional translations by Kim Steinhaug <kim@steinhaug.com>
-
-{
-  "Bold": "Fet",
-  "Italic": "Kursiv",
-  "Underline": "Understreket",
-  "Strikethrough": "Gjennomstreket",
-  "Subscript": "Nedsenket",
-  "Superscript": "Opphøyet",
-  "Justify Left": "Venstrejuster",
-  "Justify Center": "Midtjuster",
-  "Justify Right": "Høyrejuster",
-  "Justify Full": "Blokkjuster",
-  "Ordered List": "Nummerert liste",
-  "Bulleted List": "Punktliste",
-  "Decrease Indent": "Reduser innrykk",
-  "Increase Indent": "Øke innrykk",
-  "Font Color": "Tekstfarge",
-  "Background Color": "Bakgrundsfarge",
-  "Horizontal Rule": "Vannrett linje",
-  "Insert Web Link": "Lag lenke",
-  "Insert/Modify Image": "Sett inn bilde",
-  "Insert Table": "Sett inn tabell",
-  "Toggle HTML Source": "Vis kildekode",
-  "Enlarge Editor": "Vis i eget vindu",
-  "About this editor": "Om denne editor",
-  "Help using editor": "Hjelp",
-  "Current style": "Nåværende stil",
-  "Undoes your last action": "Angrer siste redigering",
-  "Redoes your last action": "Gjør om siste angring",
-  "Cut selection": "Klipp ut område",
-  "Copy selection": "Kopier område",
-  "Save as": "Lagre som",
-  "Paste from clipboard": "Lim inn",
-  "Remove formatting": "Fjern formattering",
-  "Direction left to right": "Fra venstre mot høyre",
-  "Direction right to left": "Fra høyre mot venstre",
-  "Insert/Overwrite": "Sett inn/Overskriv",
-  "OK": "OK",
-  "Cancel": "Avbryt",
-  "Path": "Tekstvelger",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Du er i tekstmodus  Klikk på [<>] for å gå tilbake til WYSIWIG.",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "Visning i eget vindu har kjente problemer med Internet Explorer, på grunn av problemer med denne nettleseren. Mulige problemer er et uryddig skjermbilde, manglende editorfunksjoner og/eller at nettleseren crasher. Hvis du bruker Windows 95 eller Windows 98 er det også muligheter for at Windows will crashe.\n\nTrykk ",
-  "Cancel": "Avbryt",
-  "Insert/Modify Link": "Rediger lenke",
-  "New window (_blank)": "Eget vindu (_blank)",
-  "None (use implicit)": "Ingen (bruk standardinnstilling)",
-  "Other": "Annen",
-  "Same frame (_self)": "Samme ramme (_self)",
-  "Target:": "MÃ¥l:",
-  "Title (tooltip):": "Tittel (tooltip):",
-  "Top frame (_top)": "Toppramme (_top)",
-  "URL:": "Adresse:",
-  "You must enter the URL where this link points to": "Du må skrive inn en adresse som denne lenken skal peke til",
-  "Clear Inline Font Specifications": "Fjerne inline font spesifikasjoner",
-  "Would you like to clear font typefaces?": "Ønsker du å fjerne skrifttyper",
-  "Would you like to clear font sizes?": "Ønsker du å fjerne skrift størrelser",
-  "Would you like to clear font colours?": "Ønsker du å fjerne farger på skriften",
-  "Print document": "Skriv ut dokumentet",
-  "Split Block": "Seperasjonsblokk",
-  "Toggle Borders": "Skru av/på hjelpelinjer på tabeller",
-  "Select all": "Merk alt",
-  // Loading messages
-  "Loading in progress. Please wait !": "WYSIWYG laster, vennligst vent!",
-  "Constructing main object": "Vennligst vent",
-  "Create Toolbar": "Lag verktøylinje",
-  "Register panel right": "Registrer høyrepanel",
-  "Register panel left": "Registrer venstrepanel",
-  "Register panel top": "Registrer toppanel",
-  "Register panel bottom": "Registrer bunnpanel"
-
-};
diff --git a/web/imcms/xinha/lang/nl.js b/web/imcms/xinha/lang/nl.js
deleted file mode 100644
index 13042cab0c..0000000000
--- a/web/imcms/xinha/lang/nl.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// I18N constants
-
-// LANG: "nl", ENCODING: UTF-8
-// Author: Michel Weegeerink (info@mmc-shop.nl), http://mmc-shop.nl
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "Vet",
-  "Italic": "Cursief",
-  "Underline": "Onderstrepen",
-  "Strikethrough": "Doorhalen",
-  "Subscript": "Subscript",
-  "Superscript": "Superscript",
-  "Justify Left": "Links uitlijnen",
-  "Justify Center": "Centreren",
-  "Justify Right": "Rechts uitlijnen",
-  "Justify Full": "Uitvullen",
-  "Ordered List": "Nummering",
-  "Bulleted List": "Opsommingstekens",
-  "Decrease Indent": "Inspringing verkleinen",
-  "Increase Indent": "Inspringing vergroten",
-  "Font Color": "Tekstkleur",
-  "Background Color": "Achtergrondkleur",
-  "Horizontal Rule": "Horizontale lijn",
-  "Insert Web Link": "Hyperlink invoegen/aanpassen",
-  "Insert/Modify Image": "Afbeelding invoegen/aanpassen",
-  "Insert Table": "Tabel invoegen",
-  "Toggle HTML Source": "HTML broncode",
-  "Enlarge Editor": "Vergroot Editor",
-  "About this editor": "Over deze editor",
-  "Help using editor": "Xinha help",
-  "Current style": "Huidige stijl",
-  "Undoes your last action": "Ongedaan maken",
-  "Redoes your last action": "Herhalen",
-  "Cut selection": "Knippen",
-  "Copy selection": "Kopi?ren",
-  "Paste from clipboard": "Plakken",
-  "Direction left to right": "Tekstrichting links naar rechts",
-  "Direction right to left": "Tekstrichting rechts naar links",
-  "OK": "OK",
-  "Cancel": "Annuleren",
-  "Path": "Pad",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Je bent in TEKST-mode. Gebruik de [<>] knop om terug te keren naar WYSIWYG-mode.",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "Fullscreen-mode veroorzaakt problemen met Internet Explorer door bugs in de webbrowser die we niet kunnen omzeilen. Hierdoor kunnen de volgende effecten optreden: verknoeide teksten, een verlies aan editor-functionaliteit en/of willekeurig vastlopen van de webbrowser. Als u Windows 95 of 98 gebruikt, is het zeer waarschijnlijk dat u een algemene beschermingsfout (",
-  "Cancel": "Annuleren",
-  "Insert/Modify Link": "Hyperlink invoegen/aanpassen",
-  "New window (_blank)": "Nieuw venster (_blank)",
-  "None (use implicit)": "Geen",
-  "Other": "Ander",
-  "Same frame (_self)": "Zelfde frame (_self)",
-  "Target:": "Doel:",
-  "Title (tooltip):": "Titel (tooltip):",
-  "Top frame (_top)": "Bovenste frame (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Geef de URL in waar de link naar verwijst"
-}
diff --git a/web/imcms/xinha/lang/no.js b/web/imcms/xinha/lang/no.js
deleted file mode 100644
index 1cdbdedcb4..0000000000
--- a/web/imcms/xinha/lang/no.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// I18N constants
-
-// LANG: "no", ENCODING: UTF-8
-
-// - translated by ses<ses@online.no>
-// Additional translations by HÃ¥vard Wigtil <havardw@extend.no>
-// Additional translations by Kim Steinhaug <kim@steinhaug.com>
-
-{
-  "Bold": "Fet",
-  "Italic": "Kursiv",
-  "Underline": "Understreket",
-  "Strikethrough": "Gjennomstreket",
-  "Subscript": "Nedsenket",
-  "Superscript": "Opphøyet",
-  "Justify Left": "Venstrejuster",
-  "Justify Center": "Midtjuster",
-  "Justify Right": "Høyrejuster",
-  "Justify Full": "Blokkjuster",
-  "Ordered List": "Nummerert liste",
-  "Bulleted List": "Punktliste",
-  "Decrease Indent": "Reduser innrykk",
-  "Increase Indent": "Øke innrykk",
-  "Font Color": "Tekstfarge",
-  "Background Color": "Bakgrundsfarge",
-  "Horizontal Rule": "Vannrett linje",
-  "Insert Web Link": "Lag lenke",
-  "Insert/Modify Image": "Sett inn bilde",
-  "Insert Table": "Sett inn tabell",
-  "Toggle HTML Source": "Vis kildekode",
-  "Enlarge Editor": "Vis i eget vindu",
-  "About this editor": "Om denne editor",
-  "Help using editor": "Hjelp",
-  "Current style": "Nåværende stil",
-  "Undoes your last action": "Angrer siste redigering",
-  "Redoes your last action": "Gjør om siste angring",
-  "Cut selection": "Klipp ut område",
-  "Copy selection": "Kopier område",
-  "Save as": "Lagre som",
-  "Paste from clipboard": "Lim inn",
-  "Remove formatting": "Fjern formattering",
-  "Direction left to right": "Fra venstre mot høyre",
-  "Direction right to left": "Fra høyre mot venstre",
-  "Insert/Overwrite": "Sett inn/Overskriv",
-  "OK": "OK",
-  "Cancel": "Avbryt",
-  "Path": "Tekstvelger",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Du er i tekstmodus  Klikk på [<>] for å gå tilbake til WYSIWIG.",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "Visning i eget vindu har kjente problemer med Internet Explorer, på grunn av problemer med denne nettleseren. Mulige problemer er et uryddig skjermbilde, manglende editorfunksjoner og/eller at nettleseren crasher. Hvis du bruker Windows 95 eller Windows 98 er det også muligheter for at Windows will crashe.\n\nTrykk ",
-  "Cancel": "Avbryt",
-  "Insert/Modify Link": "Rediger lenke",
-  "New window (_blank)": "Eget vindu (_blank)",
-  "None (use implicit)": "Ingen (bruk standardinnstilling)",
-  "Other": "Annen",
-  "Same frame (_self)": "Samme ramme (_self)",
-  "Target:": "MÃ¥l:",
-  "Title (tooltip):": "Tittel (tooltip):",
-  "Top frame (_top)": "Toppramme (_top)",
-  "URL:": "Adresse:",
-  "You must enter the URL where this link points to": "Du må skrive inn en adresse som denne lenken skal peke til",
-  "Clear Inline Font Specifications": "Fjerne inline font spesifikasjoner",
-  "Would you like to clear font typefaces?": "Ønsker du å fjerne skrifttyper",
-  "Would you like to clear font sizes?": "Ønsker du å fjerne skrift størrelser",
-  "Would you like to clear font colours?": "Ønsker du å fjerne farger på skriften",
-  "Print document": "Skriv ut dokumentet",
-  "Split Block": "Seperasjonsblokk",
-  "Toggle Borders": "Skru av/på hjelpelinjer på tabeller",
-  "Select all": "Merk alt"
-  // Loading messages
-  "Loading in progress. Please wait !": "WYSIWYG laster, vennligst vent!",
-  "Constructing main object": "Vennligst vent",
-  "Create Toolbar": "Lag verktøylinje",
-  "Register panel right": "Registrer høyrepanel",
-  "Register panel left": "Registrer venstrepanel",
-  "Register panel top": "Registrer toppanel",
-  "Register panel bottom": "Registrer bunnpanel"
-
-};
diff --git a/web/imcms/xinha/lang/pl.js b/web/imcms/xinha/lang/pl.js
deleted file mode 100644
index b5bd5ce1da..0000000000
--- a/web/imcms/xinha/lang/pl.js
+++ /dev/null
@@ -1,125 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, http://www.eskot.krakow.pl/portfolio/, koto@webworkers.pl
-{
-  "Bold": "Pogrubienie",
-  "Italic": "Pochylenie",
-  "Underline": "Podkreślenie",
-  "Strikethrough": "Przekreślenie",
-  "Subscript": "Indeks dolny",
-  "Superscript": "Indeks górny",
-  "Justify Left": "Wyrównaj do lewej",
-  "Justify Center": "Wyśrodkuj",
-  "Justify Right": "Wyrównaj do prawej",
-  "Justify Full": "Wyjustuj",
-  "Ordered List": "Numerowanie",
-  "Bulleted List": "Wypunktowanie",
-  "Decrease Indent": "Zmniejsz wcięcie",
-  "Increase Indent": "Zwiększ wcięcie",
-  "Font Color": "Kolor czcionki",
-  "Background Color": "Kolor tła",
-  "Horizontal Rule": "Linia pozioma",
-  "Insert Web Link": "Wstaw adres sieci Web",
-  "Insert/Modify Image": "Wstaw obraz",
-  "Insert Table": "Wstaw tabelÄ™",
-  "Toggle HTML Source": "Edycja WYSIWYG/w źródle strony",
-  "Enlarge Editor": "Pełny ekran",
-  "About this editor": "Informacje o tym edytorze",
-  "Help using editor": "Pomoc",
-  "Current style": "Obecny styl",
-  "Undoes your last action": "Cofa ostatnio wykonane polecenie",
-  "Redoes your last action": "Ponawia ostatnio wykonane polecenie",
-  "Cut selection": "Wycina zaznaczenie do schowka",
-  "Copy selection": "Kopiuje zaznaczenie do schowka",
-  "Paste from clipboard": "Wkleja zawartość schowka",
-  "Direction left to right": "Kierunek tekstu lewo-prawo",
-  "Direction right to left": "Kierunek tekstu prawo-lewo",
-  "Remove formatting": "Usuń formatowanie",
-  "Select all": "Zaznacz wszystko",
-  "Print document": "Drukuj dokument",
-  "Clear MSOffice tags": "Wyczyść tagi MSOffice",
-  "Clear Inline Font Specifications": "Wycisz bezpośrednie przypisania czcionek",
-  "Split Block": "Podziel blok",
-  "Toggle Borders": "Włącz / wyłącz ramki",
-
-  "&mdash; format &mdash;": "&mdash; Format &mdash;",
-  "Heading 1": "Nagłówek 1",
-  "Heading 2": "Nagłówek 2",
-  "Heading 3": "Nagłówek 3",
-  "Heading 4": "Nagłówek 4",
-  "Heading 5": "Nagłówek 5",
-  "Heading 6": "Nagłówek 6",
-  "Normal": "Normalny",
-  "Address": "Adres",
-  "Formatted": "Preformatowany",
-
-  //dialogs
-  "OK": "OK",
-  "Cancel": "Anuluj",
-  "Path": "Ścieżka",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Jesteś w TRYBIE TEKSTOWYM. Użyj przycisku [<>], aby przełączyć się na tryb WYSIWYG.",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Przycisk Wklej nie działa w przeglądarkach Mozilla z uwagi na ustawienia bezpieczeństwa. Naciśnij CRTL-V, aby wkleić zawartość schowka.",
-
-  "Alignment:": "Wyrównanie:",
-  "Not set": "Nie ustawione",
-  "Left": "Do lewej",
-  "Right": "Do prawej",
-  "Texttop": "Góra tekstu",
-  "Absmiddle": "Abs. środek",
-  "Baseline": "Linia bazowa",
-  "Absbottom": "Abs. dół",
-  "Bottom": "Dół",
-  "Middle": "Åšrodek",
-  "Top": "Góra",
-
-  "Layout": "Layout",
-  "Spacing": "Spacjowanie",
-  "Horizontal:": "Poziome:",
-  "Horizontal padding": "Wcięcie poziome",
-  "Vertical:": "Pionowe:",
-  "Vertical padding": "Wcięcie pionowe",
-  "Border thickness:": "Grubość obramowania:",
-  "Leave empty for no border": "Bez ramek - zostaw puste",
-
-  //Insert Link
-  "Insert/Modify Link": "Wstaw/edytuj odnośnik",
-  "None (use implicit)": "Brak",
-  "New window (_blank)": "Nowe okno (_blank)",
-  "Same frame (_self)": "Ta sama ramka (_self)",
-  "Top frame (_top)": "Główna ramka (_top)",
-  "Other": "Inne",
-  "Target:": "Okno docelowe:",
-  "Title (tooltip):": "Tytuł (tooltip):",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Musisz podać URL, na jaki będzie wskazywał odnośnik",
-
-  // Insert Table
-  "Insert Table": "Wstaw tabelÄ™",
-  "Rows:": "Wierszy:",
-  "Number of rows": "Liczba wierszy",
-  "Cols:": "Kolumn:",
-  "Number of columns": "Liczba kolumn",
-  "Width:": "Szerokość:",
-  "Width of the table": "Szerokość tabeli",
-  "Percent": "Procent",
-  "Pixels": "Pikseli",
-  "Em": "Em",
-  "Width unit": "Jednostka",
-  "Fixed width columns": "Kolumny o stałej szerokości",
-  "Positioning of this table": "Pozycjonowanie tabeli",
-  "Cell spacing:": "Odstęp komórek:",
-  "Space between adjacent cells": "Przestrzeń pomiędzy komórkami",
-  "Cell padding:": "Wcięcie komórek:",
-  "Space between content and border in cell": "Przestrzeń między krawędzią a zawartością komórki",
-
-  // Insert Image
-  "Insert Image": "Wstaw obrazek",
-  "Image URL:": "URL obrazka:",
-  "Enter the image URL here": "Podaj URL obrazka",
-  "Preview": "PodglÄ…d",
-  "Preview the image in a new window": "PodglÄ…d obrazka w nowym oknie",
-  "Alternate text:": "Tekst alternatywny:",
-  "For browsers that don't support images": "Dla przeglądarek, które nie obsługują obrazków",
-  "Positioning of this image": "Pozycjonowanie obrazka",
-  "Image Preview:": "PodglÄ…d obrazka:"
-}
diff --git a/web/imcms/xinha/lang/pt_br.js b/web/imcms/xinha/lang/pt_br.js
deleted file mode 100644
index 501396b2bf..0000000000
--- a/web/imcms/xinha/lang/pt_br.js
+++ /dev/null
@@ -1,184 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Initial basic work by Alex Piaz <webmaster@globalmap.com>
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt)
-{
-  "About": "Sobre",
-  "About Xinha": "Sobre o Xinha",
-  "Absbottom": "Inferior absoluto",
-  "Absmiddle": "Meio absoluto",
-  "Alignment:": "Alinhamento",
-  "Alternate text:": "Texto alternativo",
-  "Baseline": "Linha base",
-  "Bold": "Negrito",
-  "Border thickness:": "Espessura da borda",
-  "Bottom": "Botão",
-  "CTRL-0 (zero)": "CTRL-0 (zero)",
-  "CTRL-1 .. CTRL-6": "CTRL-1 .. CTRL-6",
-  "CTRL-A": "CTRL-A",
-  "CTRL-B": "CTRL-B",
-  "CTRL-C": "CTRL-C",
-  "CTRL-E": "CTRL-E",
-  "CTRL-I": "CTRL-I",
-  "CTRL-J": "CTRL-J",
-  "CTRL-L": "CTRL-L",
-  "CTRL-N": "CTRL-N",
-  "CTRL-R": "CTRL-R",
-  "CTRL-S": "CTRL-S",
-  "CTRL-U": "CTRL-U",
-  "CTRL-V": "CTRL-V",
-  "CTRL-X": "CTRL-X",
-  "CTRL-Y": "CTRL-Y",
-  "CTRL-Z": "CTRL-Z",
-  "Cancel": "Cancelar",
-  "Cell padding:": "Espaçamento interno da célula:",
-  "Cell spacing:": "Espaçamento da célula:",
-  "Clean content pasted from Word": "Limpar conteúdo copiado do Word",
-  "Close": "Fechar",
-  "Collapse borders:": "Bordas fechadas:",
-  "Cols:": "Colunas:",
-  "Constructing object": "Construindo objeto",
-  "Copy selection": "Copiar seleção",
-  "Create Statusbar": "Criar barra de informação (statusbar)",
-  "Create Toolbar": "Criar Barra de Ferramentas",
-  "Current style": "Estilo Atual",
-  "Cut selection": "Recortar seleção",
-  "Developer": "Desenvolvedor",
-  "ENTER": "ENTRAR",
-  "Editor Help": "Ajuda do Editor",
-  "Em": "Em",
-  "Enter the image URL here": "Entre aqui com a URL da imagem",
-  "Finishing": "Terminando",
-  "Fixed width columns": "Colunas com largura fixa",
-  "For browsers that don't support images": "Para navegadores que não suportam imagens",
-  "Generate Xinha framework": "Gerar �rea de Trabalho do Xinha",
-  "Headings": "Títulos",
-  "Horizontal padding": "Espaçamento interno horizontal",
-  "Horizontal:": "Horizontal:",
-  "Image Preview:": "Visualização da Imagem:",
-  "Image URL:": "URL da imagem:",
-  "Init editor size": "Iniciar tamanho do editor",
-  "Insert Image": "Inserir Imagem",
-  "Insert Table": "Inserir Tabela",
-  "Insert/Modify Link": "Inserir/Modificar Link",
-  "Italic": "Itálico",
-  "Justify Center": "Justificar Centralizado",
-  "Justify Full": "Justificar Completamente",
-  "Justify Left": "Justificar à Esquerda",
-  "Justify Right": "Justificar à Direita",
-  "Keyboard shortcuts": "Atalhos de Teclado",
-  "Layout": "Esquema",
-  "Leave empty for no border": "Deixe em branco para não ter bordas",
-  "Left": "Esquerda",
-  "License": "Licença",
-  "Loading in progress. Please wait!": "Carregamento em processo. Por favor, aguarde!",
-  "Middle": "Meio",
-  "Name": "Nome",
-  "New window (_blank)": "Nova janela (_blank)",
-  "None (use implicit)": "Nenhum (uso implicito)",
-  "Not set": "Não definido",
-  "Number of columns": "Número de colunas",
-  "Number of rows": "Número de linhas",
-  "OK": "OK",
-  "Paste from clipboard": "Colar da �rea de Transferência",
-  "Path": "Caminho",
-  "Percent": "Porcentagem",
-  "Pixels": "Pixels",
-  "Plugins": "Plugins",
-  "Positioning of this image": "Posicionamento desta imagem",
-  "Positioning of this table": "Posicionamento desta tabela",
-  "Preview": "Visualização",
-  "Preview the image in a new window": "Visualizar a imagem em uma nova janela",
-  "Redoes your last action": "Refazer sua última ação",
-  "Right": "Direita",
-  "Rows:": "Linhas:",
-  "SHIFT-ENTER": "SHIFT-ENTER",
-  "Same frame (_self)": "Mesmo frame (_self)",
-  "Select Color": "Selecionar côr",
-  "Select all": "Selecionar tudo",
-  "Set format to paragraph": "Definir formato para o parágrafo",
-  "Space between adjacent cells": "Espaço entre células adjacentes",
-  "Space between content and border in cell": "Espaço entre conteúdo e borda na célula",
-  "Spacing": "Espaçamento",
-  "Sponsored by": "Patrocinado por",
-  "Strikethrough": "Tachado",
-  "Target:": "Destino:",
-  "Texttop": "Texto no topo",
-  "Thanks": "Agradecimentos",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "O botão Colar não funciona em navegadores baseado no Mozilla (por razões técnicas de segurança). Pressione CTRL-V no seu teclado para colar diretamente.",
-  "The editor provides the following key combinations:": "Este editor fornece a seguinte combinação de teclas:",
-  "Title (tooltip):": "Título (tooltip)",
-  "Top": "Topo",
-  "Top frame (_top)": "Frame no topo (_top)",
-  "URL:": "URL:",
-  "Underline": "Sublinhado",
-  "Undoes your last action": "Desfazer sua última ação",
-  "Version": "Versão",
-  "Vertical padding": "Espaçamento interno vertical",
-  "Vertical:": "Vertical:",
-  "Width of the table": "Larguran da tabela",
-  "Width unit": "Unidade de largura",
-  "Width:": "Largura:",
-  "Would you like to clear font colours?": "Deseja limpar as cores de fonte",
-  "Would you like to clear font sizes?": "Deseja limpar os tamanhos de fonte",
-  "Would you like to clear font typefaces?": "Deseja limpar os tipos de fonte",
-  "Xinha Help": "Ajuda do Xinha",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Você está no MODO TEXTO.  Use o botão [<>] para mudar para o modo de Visualização (WYSIWYG)",
-  "Your Document is not well formed. Check JavaScript console for details.": "Seu Documento não está formatado corretamente. Verifique o console do JavaScript para maiores detalhes.",
-  "insert linebreak": "inserir quebra de linha",
-  "new paragraph": "novo parágrafo",
-  
-  // not find with lc_parse_strings.php
-  "Subscript": "Subescrito",
-  "Superscript": "Sobrescrito",
-  "Direction left to right": "Da esquerda para direita",
-  "Direction right to left": "Da direita para esquerda",
-  "Remove formatting": "Remover formatação",
-  "Select all": "Selecionar tudo",
-  "Print document": "Imprimir documento",
-  "Clear MSOffice tags": "Limpar tags do MS Office",
-  "Clear Inline Font Specifications": "Limpar especificações de fontes inline",
-  "Split Block": "Dividir Bloco",
-  "Toggle Borders": "Mudar Bordas",
-  "Save as": "Salvar como",
-  "Insert/Overwrite": "Inserir/Sobrescrever",
-  "&mdash; format &mdash;": "&mdash; formato &mdash;",
-  "Heading 1": "Título 1",
-  "Heading 2": "Título 2",
-  "Heading 3": "Título 3",
-  "Heading 4": "Título 4",
-  "Heading 5": "Título 5",
-  "Heading 6": "Título 6",
-  "Normal": "Normal",
-  "Address": "Endereço",
-  "Formatted": "Formatado",
-  "&mdash; font &mdash;": "&mdash; fonte &mdash;",
-  "&mdash; size &mdash;": "&mdash; tamanho &mdash;",
-  "Ordered List": "Lista Numerada",
-  "Bulleted List": "Lista Marcadores",
-  "Decrease Indent": "Diminuir Indentação",
-  "Increase Indent": "Aumentar Indentação",
-  "Font Color": "Cor da Fonte",
-  "Background Color": "Cor do Fundo",
-  "Horizontal Rule": "Linha Horizontal",
-  "Insert Web Link": "Inserir Link",
-  "Insert/Modify Image": "Inserir/Modificar Imagem",
-  "Insert Table": "Inserir Tabela",
-  "Toggle HTML Source": "Ver Código-Fonte",
-  "Enlarge Editor": "Expandir Editor",
-  "About this editor": "Sobre este editor",
-  "Help using editor": "Ajuda - Usando o editor"
-}
diff --git a/web/imcms/xinha/lang/ro.js b/web/imcms/xinha/lang/ro.js
deleted file mode 100644
index e622932ff8..0000000000
--- a/web/imcms/xinha/lang/ro.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// I18N constants
-
-// LANG: "ro", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "ÃŽngroÅŸat",
-  "Italic": "Italic",
-  "Underline": "Subliniat",
-  "Strikethrough": "Tăiat",
-  "Subscript": "Indice jos",
-  "Superscript": "Indice sus",
-  "Justify Left": "Aliniere la stânga",
-  "Justify Center": "Aliniere pe centru",
-  "Justify Right": "Aliniere la dreapta",
-  "Justify Full": "Aliniere în ambele părţi",
-  "Ordered List": "Listă ordonată",
-  "Bulleted List": "Listă marcată",
-  "Decrease Indent": "Micşorează alineatul",
-  "Increase Indent": "Măreşte alineatul",
-  "Font Color": "Culoarea textului",
-  "Background Color": "Culoare de fundal",
-  "Horizontal Rule": "Linie orizontală",
-  "Insert Web Link": "Inserează/modifică link",
-  "Insert/Modify Image": "Inserează/modifică imagine",
-  "Insert Table": "Inserează un tabel",
-  "Toggle HTML Source": "Sursa HTML / WYSIWYG",
-  "Enlarge Editor": "Maximizează editorul",
-  "About this editor": "Despre editor",
-  "Help using editor": "Documentaţie (devel)",
-  "Current style": "Stilul curent",
-  "Undoes your last action": "Anulează ultima acţiune",
-  "Redoes your last action": "Reface ultima acţiune anulată",
-  "Cut selection": "Taie în clipboard",
-  "Copy selection": "Copie în clipboard",
-  "Paste from clipboard": "Aduce din clipboard",
-  "Direction left to right": "Direcţia de scriere: stânga - dreapta",
-  "Direction right to left": "Direcţia de scriere: dreapta - stânga",
-  "OK": "OK",
-  "Cancel": "Anulează",
-  "Path": "Calea",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Eşti în modul TEXT.  Apasă butonul [<>] pentru a te întoarce în modul WYSIWYG.",
-  "Cancel": "Renunţă",
-  "Insert/Modify Link": "Inserează/modifcă link",
-  "New window (_blank)": "Fereastră nouă (_blank)",
-  "None (use implicit)": "Nimic (foloseÅŸte ce-i implicit)",
-  "Other": "Alt target",
-  "Same frame (_self)": "Aceeaşi fereastră (_self)",
-  "Target:": "Å¢inta:",
-  "Title (tooltip):": "Titlul (tooltip):",
-  "Top frame (_top)": "Fereastra principală (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Trebuie să introduceţi un URL"
-}
diff --git a/web/imcms/xinha/lang/ru.js b/web/imcms/xinha/lang/ru.js
deleted file mode 100644
index d7e201bfa9..0000000000
--- a/web/imcms/xinha/lang/ru.js
+++ /dev/null
@@ -1,185 +0,0 @@
-// I18N constants
-
-// LANG: "ru", ENCODING: UTF-8
-// Author: Yulya Shtyryakova, <yulya@vdcom.ru>
-
-// Some additions by: Alexey Kirpichnikov, <alexkir@kiwistudio.ru>
-// I took French version as a source of English phrases because French version was the most comprehensive
-// (fr.js was the largest file, actually) %)
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "Полужирный",
-  "Italic": "�аклонный",
-  "Underline": "Подчеркнутый",
-  "Strikethrough": "Перечеркнутый",
-  "Subscript": "�ижний индек�",
-  "Superscript": "Верхний индек�",
-  "Justify Left": "По левому краю",
-  "Justify Center": "По центру",
-  "Justify Right": "По правому краю",
-  "Justify Full": "По ширине",
-  "Ordered List": "�умерованный �пи�ок",
-  "Bulleted List": "Маркированный �пи�ок",
-  "Decrease Indent": "Уменьшить от�туп",
-  "Increase Indent": "Увеличить от�туп",
-  "Font Color": "Цвет шрифта",
-  "Background Color": "Цвет фона",
-  "Horizontal Rule": "Горизонтальный разделитель",
-  "Insert Web Link": "В�тавить гипер��ылку",
-  "Insert/Modify Image": "В�тавить изображение",
-  "Insert Table": "В�тавить таблицу",
-  "Toggle HTML Source": "Показать Html-код",
-  "Enlarge Editor": "Увеличить редактор",
-  "About this editor": "О редакторе",
-  "Help using editor": "Помощь",
-  "Current style": "Текущий �тиль",
-  "Undoes your last action": "Отменить",
-  "Redoes your last action": "Повторить",
-  "Cut selection": "Вырезать",
-  "Copy selection": "Копировать",
-  "Paste from clipboard": "В�тавить",
-  "Direction left to right": "�аправление �лева направо",
-  "Direction right to left": "�аправление �права налево",
-  "Remove formatting": "Убрать форматирование",
-  "Select all": "Выделить в�е",
-  "Print document": "Печать",
-  "Clear MSOffice tags": "Удалить разметку MSOffice",
-  "Clear Inline Font Specifications": "Удалить непо�ред�твенное задание шрифтов",
-  "Would you like to clear font typefaces?": "Удалить типы шрифтов?",
-  "Would you like to clear font sizes?": "Удалить размеры шрифтов ?",
-  "Would you like to clear font colours?": "Удалить цвета шрифтов ?",
-  "Split Block": "Разделить блок",
-  "Toggle Borders": "Включить/выключить отображение границ",
-  "Save as": "Сохранить как",
-  "Insert/Overwrite": "В�тавка/замена",
-  "&mdash; format &mdash;": "&mdash; форматирование &mdash;",
-  "Heading 1": "Заголовок 1",
-  "Heading 2": "Заголовок 2",
-  "Heading 3": "Заголовок 3",
-  "Heading 4": "Заголовок 4",
-  "Heading 5": "Заголовок 5",
-  "Heading 6": "Заголовок 6",
-  "Normal": "Обычный тек�т",
-  "Address": "�дре�",
-  "Formatted": "Отформатированный тек�т",
-
-  "&mdash; font &mdash;": "&mdash; шрифт &mdash;",
-  "&mdash; size &mdash;": "&mdash; размер &mdash;",
-
-
-// Диалоги
-
-  "OK": "OK",
-  "Cancel": "Отмена",
-  "Path": "Путь",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Вы в режиме отображени� Html-кода. нажмите кнопку [<>], чтобы переключить�� в визуальный режим.",
-
-"The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Кнопка В�тавить не работает в браузерах на о�нове Mozilla (по техниче�ким причинам, �в�занным � безопа�но�тью). �ажмите Ctrl-V на клавиатуре, чтобы в�тавить.",
-
-  "Your Document is not well formed. Check JavaScript console for details.": "Ваш документ неправильно �формирован. По�мотрите Кон�оль JavaScript, чтобы узнать подробно�ти.",
-
-  "Alignment:": "Выравнивание",
-  "Not set": "�е у�тановлено",
-  "Left": "По левому краю",
-  "Right": "По правому краю",
-  "Texttop": "По верхней границе тек�та",
-  "Absmiddle": "По �ередине тек�та",
-  "Baseline": "По нижней границе тек�та",
-  "Absbottom": "По нижней границе",
-  "Bottom": "По нижнему краю",
-  "Middle": "По�редине",
-  "Top": "По верхнему краю",
-
-  "Layout": "Ра�положение",
-  "Spacing": "Пол�",
-  "Horizontal:": "По горизонтали",
-  "Horizontal padding": "Горизонтальные пол�",
-  "Vertical:": "По вертикали",
-  "Vertical padding": "Вертикальные пол�",
-  "Border thickness:": "Толщина рамки",
-  "Leave empty for no border": "О�тавьте пу�тым, чтобы убрать рамку",
-
-  //Insert Link
-  "Insert/Modify Link": "В�тавка/изменение ��ылки",
-  "None (use implicit)": "По умолчанию",
-  "New window (_blank)": "�овое окно (_blank)",
-  "Same frame (_self)": "То же окно (_self)",
-  "Top frame (_top)": "Родитель�кое окно (_top)",
-  "Other": "Другое",
-  "Target:": "Открывать в окне:",
-  "Title (tooltip):": "В�плывающа� под�казка",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Вы должны указать URL, на который будет указывать ��ылка",
-  "You need to select some text before creating a link": "Вы должны выделить тек�т, который будет преобразован в ��ылку",
-
-  // Insert Table
-  "Insert Table": "В�тавка таблицы",
-  "Rows:": "Строки",
-  "Number of rows": "Количе�тво �трок",
-  "Cols:": "Столбцы",
-  "Number of columns": "Количе�тво �толбцов",
-  "Width:": "Ширина",
-  "Width of the table": "Ширина таблицы",
-  "Percent": "проценты",
-  "Pixels": "пик�елы",
-  "Em": "em",
-  "Width unit": "Единицы измерени�",
-  "Fixed width columns": "Столбцы фик�ированной ширины",
-  "Positioning of this table": "Ра�положение таблицы",
-  "Cell spacing:": "Ра��то�ние между �чейками",
-  "Space between adjacent cells": "Ра��то�ние между �о�едними �чейками",
-  "Cell padding:": "Пол� в �чейках",
-  "Space between content and border in cell": "Ра��то�ние между границей �чейки и тек�том",
-  "You must enter a number of rows": "Вы должны вве�ти количе�тво �трок",
-  "You must enter a number of columns": "Вы должны вве�ти количе�тво �толбцов",
-
-  // Insert Image
-  "Insert Image": "В�тавка изображени�",
-  "Image URL:": "URL изображени�",
-  "Enter the image URL here": "В�тавьте адре� изображени�",
-  "Preview": "Предварительный про�мотр",
-  "Preview the image in a new window": "Предварительный про�мотр в отдельном окне",
-  "Alternate text:": "�льтернативный тек�т",
-  "For browsers that don't support images": "Дл� браузеров, которые не отображают картинки",
-  "Positioning of this image": "Ра�положение изображени�",
-  "Image Preview:": "Предварительный про�мотр",
-  "You must enter the URL": "Вы должны вве�ти URL",
-
-  // Editor Help
-  "Xinha Help": "Помощь",
-  "Editor Help": "Помощь",
-  "Keyboard shortcuts": "Гор�чие клавиши",
-  "The editor provides the following key combinations:": "Редактор поддерживает �ледующие комбинации клавиш:",
-  "ENTER": "ENTER",
-  "new paragraph": "новый абзац",
-  "SHIFT-ENTER": "SHIFT+ENTER",
-  "insert linebreak": "перено� �троки",
-  "Set format to paragraph": "Отформатировать абзац",
-  "Clean content pasted from Word": "Очи�тить тек�т, в�тавленный из Word",
-  "Headings": "Заголовки",
-  "Close": "Закрыть",
-
-  // Loading messages
-  "Loading in progress. Please wait !": "Загрузка... Пожалуй�та, подождите.",
-  "Constructing main object": "Создание главного объекта",
-  "Constructing object": "Создание объекта",
-  "Register panel right": "Реги�траци� правой панели",
-  "Register panel left": "Реги�траци� левой панели",
-  "Register panel top": "Реги�траци� верхней панели",
-  "Register panel bottom": "Реги�траци� нижней панели",
-  "Create Toolbar": "Создание панели ин�трументов",
-  "Create StatusBar": "Создание панели �о�то�ни�",
-  "Generate Xinha object": "Создание объекта Xinha",
-  "Init editor size": "Инициализаци� размера редактора",
-  "Init IFrame": "инициализаци� iframe",
-  "Register plugin $plugin": "Реги�траци� $plugin"
-};
diff --git a/web/imcms/xinha/lang/se.js b/web/imcms/xinha/lang/se.js
deleted file mode 100644
index 88087eef6a..0000000000
--- a/web/imcms/xinha/lang/se.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// LANG: "se", ENCODING: UTF-8
-
-// Swedish version for htmlArea v3.0 - Alpha Release
-// - translated by pat<pat@engvall.nu>
-
-{
-  "Bold": "Fet",
-  "Italic": "Kursiv",
-  "Underline": "Understruken",
-  "Strikethrough": "Genomstruken",
-  "Subscript": "Nedsänkt",
-  "Superscript": "Upphöjd",
-  "Justify Left": "Vänsterjustera",
-  "Justify Center": "Centrera",
-  "Justify Right": "Högerjustera",
-  "Justify Full": "Marginaljustera",
-  "Ordered List": "Numrerad lista",
-  "Bulleted List": "Punktlista",
-  "Decrease Indent": "Minska indrag",
-  "Increase Indent": "Öka indrag",
-  "Font Color": "Textfärg",
-  "Background Color": "Bakgrundsfärg",
-  "Horizontal Rule": "Vågrät linje",
-  "Insert Web Link": "Infoga länk",
-  "Insert/Modify Image": "Infoga bild",
-  "Insert Table": "Infoga tabell",
-  "Toggle HTML Source": "Visa källkod",
-  "Enlarge Editor": "Visa i eget fönster",
-  "About this editor": "Om denna editor",
-  "Help using editor": "Hjälp",
-  "Current style": "Nuvarande stil"
-}
diff --git a/web/imcms/xinha/lang/sh.js b/web/imcms/xinha/lang/sh.js
deleted file mode 100644
index 270630464b..0000000000
--- a/web/imcms/xinha/lang/sh.js
+++ /dev/null
@@ -1,140 +0,0 @@
-// I18N constants
-
-// LANG: "sh", ENCODING: UTF-8 | ISO-8859-2
-// Author: Ljuba Ranković, http://www.rankovic.net/ljubar
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-		"Bold": "Masno",
-		"Italic": "Kurziv",
-		"Underline": "Podvu�eno",
-		"Strikethrough": "Precrtano",
-		"Subscript": "Indeks-tekst",
-		"Superscript": "Eksponent-tekst",
-		"Justify Left":"Ravnanje ulevo",
-		"Justify Center": "Ravnanje po simetrali",
-		"Justify Right": "Ravnanje udesno",
-		"Justify Full": "Puno ravnanje",
-		"Ordered List": "Lista sa rednim brojevima",
-		"Bulleted List": "Lista sa simbolima",
-		"Decrease Indent": "smanji uvla�enje",
-		"Increase Indent": "Povećaj uvla�enje",
-		"Font Color": "Boja slova",
-		"Background Color": "Boja pozadine",
-		"Horizontal Rule": "Horizontalna linija",
-		"Insert Web Link": "Dodaj web link",
-		"Insert/Modify Image": "Dodaj/promeni sliku",
-		"Insert Table": "Ubaci tabelu",
-		"Toggle HTML Source": "Prebaci na HTML kod",
-		"Enlarge Editor": "Povećaj editor",
-		"About this editor": "O ovom editoru",
-		"Help using editor": "Pomoć pri korišćenju editora",
-		"Current style": "Važeći stil",
-		"Undoes your last action": "Poništava poslednju radnju",
-		"Redoes your last action": "Vraća poslednju radnju",
-		"Cut selection": "Iseci izabrano",
-		"Copy selection": "Kopiraj izabrano",
-		"Paste from clipboard": "Zalepi iz klipborda",
-		"Direction left to right": "Pravac s leva na desno",
-		"Direction right to left": "Pravac s desna na levo",
-        "Remove formatting": "Ukoni formatiranje",
-        "Select all": "Izaberi sve",
-        "Print document": "Å tampaj dokument",
-        "Clear MSOffice tags": "Obriši MSOffice tagove",
-        "Clear Inline Font Specifications": "Obriši dodeljene osobine fonta",
-        "Split Block": "Podeli blok",
-        "Toggle Borders": "Izmeni okvire",
-
-        "&mdash; format &mdash;": "&mdash; Format &mdash;",
-        "Heading 1": "Zaglavlje 1",
-        "Heading 2": "Zaglavlje 2",
-        "Heading 3": "Zaglavlje 3",
-        "Heading 4": "Zaglavlje 4",
-        "Heading 5": "Zaglavlje 5",
-        "Heading 6": "Zaglavlje 6",
-        "Normal": "Obi�an",
-        "Address": "Adresa",
-        "Formatted": "Formatiran",
-        
-        // dialogs
-		"OK": "OK",
-		"Cancel": "Poništi",
-		"Path": "Putanja",
-		"You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Nalazite se u TEXT režimu.  Koristite [<>] dugme za povratak na WYSIWYG.",
-
-		"The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "",
-
-        "Alignment:": "Ravnanje",
-        "Not set": "Nije postavljeno",
-        "Left": "Levo",
-        "Right": "Desno",
-        "Texttop": "Vrh teksta",
-        "Absmiddle": "Apsolutna sredina",
-        "Baseline": "Donja linija",
-        "Absbottom": "Apsolutno dno",
-        "Bottom": "Dno",
-        "Middle": "Sredina",
-        "Top": "Vrh",
-
-        "Layout": "Prelom",
-        "Spacing": "Razmak",
-        "Horizontal:": "Po horizontali",
-        "Horizontal padding": "Horizontalno odstojanje",
-        "Vertical:": "Po vertikali",
-        "Vertical padding": "Vertikalno odstojanje",
-        "Border thickness:": "Debljina okvira",
-        "Leave empty for no border": "Ostavi prazno kad nema okvira",
-		
-        // Insert Link
-		"Insert/Modify Link": "Dodaj/promeni Link",
-		"None (use implicit)": "koristi podrazumevano",
-		"New window (_blank)": "Novom prozoru (_blank)",
-		"Same frame (_self)": "Isti frejm (_self)",
-		"Top frame (_top)": "Glavni frejm (_top)",
-		"Other": "Drugo",
-		"Target:": "Otvori u:",
-		"Title (tooltip):": "Naziv (tooltip):",
-		"URL:": "URL:",
-		"You must enter the URL where this link points to": "Morate uneti URL na koji vodi ovaj link",
-		
-        // Insert Table
-        "Insert Table": "Ubaci tabelu",
-        "Rows:": "Redovi",
-        "Number of rows": "Broj redova",
-        "Cols:": "Kolone",
-        "Number of columns": "Broj kolona",
-        "Width:": "Å irina",
-        "Width of the table": "Å irina tabele",
-        "Percent": "Procenat",
-        "Pixels": "Pikseli",
-        "Em": "Em",
-        "Width unit": "Jedinica Å¡irine",
-        "Fixed width columns": "Fiksirana Å¡irina kolona",
-        "Positioning of this table": "Postavljanje ove tabele",
-        "Cell spacing:": "Rastojanje ćelija",
-        "Space between adjacent cells": "Rastojanje naspramnih ćelija",
-        "Cell padding:": "Unutrašnja odstojanja u ćeliji",
-        "Space between content and border in cell": "Rastojanje između sadržaja i okvira ćelije",
-
-        // Insert Image
-        "Insert Image": "Ubaci sliku",
-        "Image URL:": "URL slike",
-        "Enter the image URL here": "Unesite URL slike ovde",
-        "Preview": "Pregled",
-        "Preview the image in a new window": "Pregledaj sliku u novom prozoru",
-        "Alternate text:": "Alternativni tekst",
-        "For browsers that don't support images": "Za pretraživa�e koji ne podržavaju slike",
-        "Positioning of this image": "Postavljanje ove slike",
-        "Image Preview:": "Pregled slike",
-        
-        // Select Color popup
-		"Select Color": "Izaberite boju"
-};
diff --git a/web/imcms/xinha/lang/si.js b/web/imcms/xinha/lang/si.js
deleted file mode 100644
index c34abbe576..0000000000
--- a/web/imcms/xinha/lang/si.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// I18N constants
-
-// LANG: "si", ENCODING: UTF-8
-// Author: Tomaz Kregar, x_tomo_x@email.si
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "Krepko",
-  "Italic": "Leže�e",
-  "Underline": "Pod�rtano",
-  "Strikethrough": "Pre�rtano",
-  "Subscript": "Podpisano",
-  "Superscript": "Nadpisano",
-  "Justify Left": "Poravnaj levo",
-  "Justify Center": "Na sredino",
-  "Justify Right": "Poravnaj desno",
-  "Justify Full": "Porazdeli vsebino",
-  "Ordered List": "Oštevil�evanje",
-  "Bulleted List": "Ozna�evanje",
-  "Decrease Indent": "Zmanjšaj zamik",
-  "Increase Indent": "Pove�aj zamik",
-  "Font Color": "Barva pisave",
-  "Background Color": "Barva ozadja",
-  "Horizontal Rule": "Vodoravna �rta",
-  "Insert Web Link": "Vstavi hiperpovezavo",
-  "Insert/Modify Image": "Vstavi sliko",
-  "Insert Table": "Vstavi tabelo",
-  "Toggle HTML Source": "Preklopi na HTML kodo",
-  "Enlarge Editor": "Pove�aj urejevalnik",
-  "About this editor": "Vizitka za urejevalnik",
-  "Help using editor": "Pomo� za urejevalnik",
-  "Current style": "Trenutni slog",
-  "Undoes your last action": "Razveljavi zadnjo akcijo",
-  "Redoes your last action": "Uveljavi zadnjo akcijo",
-  "Cut selection": "Izreži",
-  "Copy selection": "Kopiraj",
-  "Paste from clipboard": "Prilepi",
-  "OK": "V redu",
-  "Cancel": "Prekli�i",
-  "Path": "Pot",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Si v tekstovnem na�inu.  Uporabi [<>] gumb za prklop nazaj na WYSIWYG."
-}
diff --git a/web/imcms/xinha/lang/sr.js b/web/imcms/xinha/lang/sr.js
deleted file mode 100644
index 06f78c4699..0000000000
--- a/web/imcms/xinha/lang/sr.js
+++ /dev/null
@@ -1,140 +0,0 @@
-// I18N constants
-
-// LANG: "sh", ENCODING: UTF-8 | ISO-8859-5
-// Author: Ljuba Ranković, http://www.rankovic.net/ljubar
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-		"Bold": "Ма�но",
-		"Italic": "Курзив",
-		"Underline": "Подвучено",
-		"Strikethrough": "Прецртано",
-		"Subscript": "Индек�-тек�т",
-		"Superscript": "Ек�понент-тек�т",
-		"Justify Left": "Равнање улево",
-		"Justify Center": "Равнање по �иметрали",
-		"Justify Right": "Равнање уде�но",
-		"Justify Full": "Пуно равнање",
-		"Ordered List": "Ли�та �а редним бројевима",
-		"Bulleted List": "Ли�та �а �имболима",
-		"Decrease Indent": "Смањи увлачење",
-		"Increase Indent": "Повећај увлачење",
-		"Font Color": "Боја �лова",
-		"Background Color": "Боја позадине",
-		"Horizontal Rule": "Хоризонтална линија",
-		"Insert Web Link": "додај веб линк",
-		"Insert/Modify Image": "додај/промени �лику",
-		"Insert Table": "Убаци табелу",
-		"Toggle HTML Source": "Пребаци на приказ ХТМЛ кода",
-		"Enlarge Editor": "Повећај едитор",
-		"About this editor": "О овом едитору",
-		"Help using editor": "Помоћ при коришћењу едитора",
-		"Current style": "Важећи �тил",
-		"Undoes your last action": "Поништава по�ледњу радњу",
-		"Redoes your last action": "Враћа по�ледњу радњу",
-		"Cut selection": "И�еци изабрано",
-		"Copy selection": "Копирај изабрано",
-		"Paste from clipboard": "Залепи из клипборда",
-		"Direction left to right": "Правац � лева на де�но",
-		"Direction right to left": "Правац � де�на на лево",
-        "Remove formatting": "Уклони форматирање",
-        "Select all": "Изабери �ве",
-        "Print document": "Штампај документ",
-        "Clear MSOffice tags": "Обриши MSOffice тагове",
-        "Clear Inline Font Specifications": "Обриши примењене о�обине фонта",
-        "Split Block": "Подели блок",
-        "Toggle Borders": "Пребаци оквирне линије",
-
-        "&mdash; format &mdash;": "&mdash; Format &mdash;",
-        "Heading 1": "Заглавље 1",
-        "Heading 2": "Заглавље 2",
-        "Heading 3": "Заглавље 3",
-        "Heading 4": "Заглавље 4",
-        "Heading 5": "Заглавље 5",
-        "Heading 6": "Заглавље 6",
-        "Normal": "обичан",
-        "Address": "адре�а",
-        "Formatted": "форматиран",		
-		
-        // dialogs
-		"OK": "OK",
-		"Cancel": "Поништи",
-		"Path": "Путања",
-		"You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.":    "�алазите �е у ТЕКСТ режиму.  Кори�тите [<>] дугме за повратак на ШВТИД (WYSIWYG).",
-
-		"The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Дугме 'залепи' не ради у претраживачима породице Mozilla (из разлога �игурно�ти). Прити�ните CTRL-V на та�татури да директно залепите.",
-		
-        "Alignment:": "Равнање",
-        "Not set": "�ије по�тављено",
-        "Left": "Лево",
-        "Right": "Де�но",
-        "Texttop": "Врх тек�та",
-        "Absmiddle": "�п�олутна �редина",
-        "Baseline": "Доња линија",
-        "Absbottom": "�п�олутно дно",
-        "Bottom": "Дно",
-        "Middle": "Средина",
-        "Top": "Врх",
-
-        "Layout": "Прелом",
-        "Spacing": "Размак",
-        "Horizontal:": "По хоризонтали",
-        "Horizontal padding": "Хортизонтално од�тојање",
-        "Vertical:": "По вертикали",
-        "Vertical padding": "Вертикално од�тојање",
-        "Border thickness:": "Дебљина оквира",
-        "Leave empty for no border": "О�тави празно кад нема оквира",
-
-        // Insert Link
-		"Insert/Modify Link": "додај/промени линк",
-		"None (use implicit)": "кори�ти подразумевано",
-		"New window (_blank)": "�овом прозору (_blank)",
-		"Same frame (_self)": "И�ти фрејм (_self)",
-		"Top frame (_top)": "Главни фрејм (_top)",
-		"Other": "Друго",
-		"Target:": "Отвори у:",
-		"Title (tooltip):": "�азив (tooltip):",
-		"URL:": "УРЛ:",
-		"You must enter the URL where this link points to": "Морате унети УРЛ на који води овај линк",
-
-        // Insert Table
-        "Insert Table": "Убаци табелу",
-        "Rows:": "Редови",
-        "Number of rows": "Број редова",
-        "Cols:": "Колоне",
-        "Number of columns": "Број колона",
-        "Width:": "Ширина",
-        "Width of the table": "Ширина табеле",
-        "Percent": "Процената",
-        "Pixels": "Пик�ела",
-        "Em": "Ем",
-        "Width unit": "Јединица ширине",
-        "Fixed width columns": "Фик�ирана ширина колоне",
-        "Positioning of this table": "По�тављање ове табеле",
-        "Cell spacing:": "Размак између ћелија",
-        "Space between adjacent cells": "Размак између на�прамних ћелија",
-        "Cell padding:": "Унутрашња од�тојања од ивица ћелије",
-        "Space between content and border in cell": "Ра�тојање између �адржаја у ћелији и њеног оквира",
-
-        // Insert Image
-        "Insert Image": "Убаци �лику",
-        "Image URL:": "УРЛ �лике",
-        "Enter the image URL here": "Уне�ите УРЛ �лике овде",
-        "Preview": "Преглед",
-        "Preview the image in a new window": "Прегледај �лику у новом прозору",
-        "Alternate text:": "алтернативни тек�т",
-        "For browsers that don't support images": "За претраживаче који не подржавају �лике",
-        "Positioning of this image": "По�тављање ове �лике",
-        "Image Preview:": "Преглед �лике",
-
-        // Select Color popup
-		"Select Color": "Изабери боју"
-};
diff --git a/web/imcms/xinha/lang/sv.js b/web/imcms/xinha/lang/sv.js
deleted file mode 100644
index 61af49e3ef..0000000000
--- a/web/imcms/xinha/lang/sv.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// I18N constants
-// LANG: "sv", ENCODING: UTF-8
-
-// Swedish version for htmlArea v3.0
-// Initital translation by pat <pat@engvall.nu>
-// Synced with additional contants in rev. 477 (Mar 2006) by Thomas Loo <tloo@saltstorm.net>
-
-{
-  "Bold": "Fet",
-  "Italic": "Kursiv",
-  "Underline": "Understruken",
-  "Strikethrough": "Genomstruken",
-  "Subscript": "Nedsänkt",
-  "Superscript": "Upphöjd",
-  "Justify Left": "Vänsterjustera",
-  "Justify Center": "Centrera",
-  "Justify Right": "Högerjustera",
-  "Justify Full": "Marginaljustera",
-  "Ordered List": "Numrerad lista",
-  "Bulleted List": "Punktlista",
-  "Decrease Indent": "Minska indrag",
-  "Increase Indent": "Öka indrag",
-  "Font Color": "Textfärg",
-  "Background Color": "Bakgrundsfärg",
-  "Horizontal Rule": "Vågrät linje",
-  "Insert Web Link": "Infoga länk",
-  "Insert/Modify Image": "Infoga bild",
-  "Toggle HTML Source": "Visa källkod",
-  "Enlarge Editor": "Visa i eget fönster",
-  "About this editor": "Om denna editor",
-  "Help using editor": "Hjälp",
-  "Current style": "Nuvarande stil",
-
-  "Undoes your last action": "Ã…ngra kommando",
-  "Redoes your last action": "Upprepa kommando",
-  "Select all": "Markera allt",
-  "Print document": "Skriv ut",
-  "Clear MSOffice tags": "Städa bort MS Office taggar",
-  "Clear Inline Font Specifications": "Rensa inbäddad typsnittsinformation",
-  "Remove formatting": "Rensa formattering",
-  "Toggle Borders": "Objektramar",
-  "Split Block": "Dela block",
-  "Direction left to right": "Vänster till höger",
-  "Direction right to left": "Höger till vänster",
-
-  "Insert/Overwrite": "Infoga/Skriv över",
-  "OK": "OK",
-  "Cancel": "Avbryt",
-  "Path": "Objekt",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Du befinner dig i texläge. Klicka på ikonen [<>] ovan för att växla tillbaka till WYSIWIG läge",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "Visning i fullskärmsläga fungerar dåligt i din webläsare. Möjliga problem resulterar i en ryckig editor, saknade editorfunktioner och/eller att webläsaren kraschar. Om du använder Windows 95/98 finns också möjligheten att Windows kraschar.\n\nTryck ",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "Denna knapp fungerar ej i Mozillabaserad webläsare, använd istället snabbtangenterna CTRL-V på tangentbordet för att klistra in.",
-
-  "Insert/Modify Link": "Redigera länk",
-  "New window (_blank)": "Nytt fönster (_blank)",
-  "None (use implicit)": "Ingen (använd standardinställing)",
-  "Other": "Annan",
-  "Same frame (_self)": "Samma ram (_self)",
-  "Target:": "MÃ¥l:",
-  "Title (tooltip):": "Titel (tooltip):",
-  "Top frame (_top)": "Toppram (_top)",
-  "URL:": "Sökväg:",
-  "You must enter the URL where this link points to": "Du måsta ange en adress till vilken länken skall peka på",
-  "Would you like to clear font typefaces?": "Radera alla typsnittsinformation ?",
-  "Would you like to clear font sizes?": "Radera alla fontstorlekar ?",
-  "Would you like to clear font colours?": "Ta bort all textfärger ?",
-
-  "You need to select some text before creating a link": "Du måsta markera ett objekt att applicera länken på!",
-
-  // Insert Table
-  "Insert Table": "Infoga tabell",
-  "Rows:": "Rader:",
-  "Number of rows": "Antal rader",
-  "Cols:": "Kolumner:",
-  "Number of columns": "Antal kolumner",
-  "Width:": "Bredd:",
-  "Width of the table": "Tabellbredd",
-  "Percent": "Procent",
-  "Pixels": "Pixlar",
-  "Em": "",
-  "Width unit": "Breddenheter",
-  "Fixed width columns": "Fixerad bredd",
-  "Alignment:": "Marginaljustering",
-  "Positioning of this table": "Tabellposition",
-  "Border thickness:": "Ramtjocklek",
-  "Leave empty for no border": "Lämna fältet tomt för att undvika ramar",
-  "Spacing": "Cellegenskaper",
-  "Cell spacing:": "Cellmarginaler:",
-  "Space between adjacent cells": "Utrymme mellan celler",
-  "Cell padding:": "Cellindrag:",
-  "Space between content and border in cell": "Utrymme mellan ram och cellinnehåll",
-  "You must enter a number of rows": "Ange ental rader",
-  "You must enter a number of columns": "Ange antal kolumner",
-
-  // Editor Help
-  "Keyboard shortcuts": "Snabbtangenter",
-  "The editor provides the following key combinations:": "Editorn nyttjar följande kombinationer:",
-  "new paragraph": "Ny paragraf ",
-  "insert linebreak": "Infoga radbrytning ",
-  "Set format to paragraph": "Aktivera paragrafläge",
-  "Clean content pasted from Word": "Rensa innehåll inklistrat från MS Word",
-  "Headings": "Skapa standardrubrik",
-  "Cut selection": "Klipp ut markering",
-  "Copy selection": "Kopiera  markering",
-  "Paste from clipboard": "Klistra in",
-  "Close": "Stäng",
-
-  // Loading messages
-  "Loading in progress. Please wait !": "Editorn laddas. Vänta...",
-  "Constructing main object": "Skapar huvudobjekt",
-  "Create Toolbar": "Skapar verktygspanel",
-  "Register panel right": "Registerar panel höger",
-  "Register panel left": "Registerar panel vänster",
-  "Register panel top": "Registerar toppanel",
-  "Register panel bottom": "Registerar fotpanel"
-}
diff --git a/web/imcms/xinha/lang/th.js b/web/imcms/xinha/lang/th.js
deleted file mode 100644
index 8a116af72c..0000000000
--- a/web/imcms/xinha/lang/th.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// I18N constants
-
-// LANG: "th", ENCODING: UTF-8
-// Author: Suchin Prasongbundit, <suchin@joolsoft.com>
-
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "Bold": "ตัวหนา",
-  "Italic": "ตัวเอียง",
-  "Underline": "ขีดเส้นใต้",
-  "Strikethrough": "ขีดทับ",
-  "Subscript": "ตัวห้อย",
-  "Superscript": "ตัวย�",
-  "Justify Left": "จัดชิดซ้าย",
-  "Justify Center": "จัด�ึ่ง�ลาง",
-  "Justify Right": "จัดชิดขวา",
-  "Justify Full": "จัดเต็มขอบ",
-  "Ordered List": "เลขลำดับ",
-  "Bulleted List": "ลำดับ",
-  "Decrease Indent": "ลดย่อหน้า",
-  "Increase Indent": "เพิ่มย่อหน้า",
-  "Font Color": "สีขอบ�บบอั�ษร",
-  "Background Color": "สีพื้นหลัง",
-  "Horizontal Rule": "เส้น�ึ่ง�ลาง",
-  "Insert Web Link": "ิเพิ่มลิ้งค์",
-  "Insert/Modify Image": "เพิ่ม/��้ไขภาพ",
-  "Insert Table": "เพิ่มตาราง",
-  "Toggle HTML Source": "สลับ�าร�สดงโค้ด HTML",
-  "Enlarge Editor": "ขยายให้เต็มจอ",
-  "About this editor": "เ�ี่ยว�ับโปร��รมนี้",
-  "Help using editor": "�ารใช้งานโปร��รม",
-  "Current style": "รูป�บบปัจจุบัน",
-  "Undoes your last action": "ย้อน�ลับ",
-  "Redoes your last action": "ทำซ้ำ",
-  "Cut selection": "ตัดส่วนที่เลือ�",
-  "Copy selection": "สำเนาส่วนที่เลือ�",
-  "Paste from clipboard": "วางจา�คลิปบอร์ด",
-  "OK": "ต�ลง",
-  "Cancel": "ย�เลิ�",
-  "Path": "เส้นทาง",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "คุณอยู่ในโหมดธรรมดา �ดที่ปุ่ม [<>] เพื่อสลับ�ลับไปยังโหมดพิมพ์งาน�บบเวิร์ด"
-}
diff --git a/web/imcms/xinha/lang/vn.js b/web/imcms/xinha/lang/vn.js
deleted file mode 100644
index 0aa641661e..0000000000
--- a/web/imcms/xinha/lang/vn.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// I18N constants : Vietnamese
-// LANG: "en", ENCODING: UTF-8
-// Author: Nguyễn �ình Nam, <hncryptologist@yahoo.com>
-// Modified 21/07/2004 by Phạm Mai Quân <pmquan@4vn.org>
-
-{
-  "Bold": "�ậm",
-  "Italic": "Nghiêng",
-  "Underline": "Gạch Chân",
-  "Strikethrough": "Gạch Xóa",
-  "Subscript": "Viết Xuống Dưới",
-  "Superscript": "Viết Lên Trên",
-  "Justify Left": "Căn Trái",
-  "Justify Center": "Căn Giữa",
-  "Justify Right": "Căn Phải",
-  "Justify Full": "Căn ��u",
-  "Ordered List": "Danh Sách Có Thứ Tự (1, 2, 3)",
-  "Bulleted List": "Danh Sách Phi Thứ Tự (Chấm đầu dòng)",
-  "Decrease Indent": "Lùi Ra Ngoài",
-  "Increase Indent": "Thụt Vào Trong",
-  "Font Color": "Màu Chữ",
-  "Background Color": "Màu N�n",
-  "Horizontal Rule": "Dòng Kẻ Ngang",
-  "Insert Web Link": "Tạo Liên Kết",
-  "Insert/Modify Image": "Chèn Ảnh",
-  "Insert Table": "Chèn Bảng",
-  "Toggle HTML Source": "Chế �ộ Mã HTML",
-  "Enlarge Editor": "Phóng To Ô Soạn Thảo",
-  "About this editor": "Tự Giới Thiệu",
-  "Help using editor": "Giúp �ỡ",
-  "Current style": "�ịnh Dạng Hiện Th�i",
-  "Undoes your last action": "Hủy thao tác trước",
-  "Redoes your last action": "Lấy lại thao tác vừa b�",
-  "Cut selection": "Cắt",
-  "Copy selection": "Sao chép",
-  "Paste from clipboard": "Dán",
-  "Direction left to right": "Viết từ trái sang phải",
-  "Direction right to left": "Viết từ phải sang trái",
-  "OK": "�ồng ý",
-  "Cancel": "Hủy",
-  "The full screen mode is known to cause problems with Internet Explorer, due to browser bugs that we weren": "Chế độ phóng to ô soạn thảo có thể gây lỗi với Internet Explorer vì một số lỗi của trình duyệt này, vì thế chế độ này có thể sẽ không chạy. Hiển thị không đúng, lộn xộn, không có đầy đủ chức năng, và cũng có thể làm trình duyệt của bạn bị tắt ngang. Nếu bạn đang sử dụng Windows 9x bạn có thể bị báo lỗi ",
-  "Path": "�ư�ng Dẫn",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Bạn đang ở chế độ text.  Sử dụng nút [<>] để chuyển lại chế độ WYSIWIG.",
-  "Cancel": "Hủy",
-  "Insert/Modify Link": "Thêm/Chỉnh sửa đư�ng dẫn",
-  "New window (_blank)": "Cửa sổ mới (_blank)",
-  "None (use implicit)": "Không (sử dụng implicit)",
-  "OK": "�ồng ý",
-  "Other": "Khác",
-  "Same frame (_self)": "Trên cùng khung (_self)",
-  "Target:": "Nơi hiện thị:",
-  "Title (tooltip):": "Tiêu đ� (của hướng dẫn):",
-  "Top frame (_top)": "Khung trên cùng (_top)",
-  "URL:": "URL:",
-  "You must enter the URL where this link points to": "Bạn phải đi�n địa chỉ (URL) mà đư�ng dẫn sẽ liên kết tới"
-}
diff --git a/web/imcms/xinha/license.txt b/web/imcms/xinha/license.txt
deleted file mode 100644
index e7798cf0b8..0000000000
--- a/web/imcms/xinha/license.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-htmlArea License (based on BSD license)
-Copyright (c) 2002-2004, interactivetools.com, inc.
-Copyright (c) 2003-2004 dynarch.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1) Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2) 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.
-
-3) Neither the name of interactivetools.com, inc. nor the names of its
-   contributors may be used to endorse or promote products derived from this
-   software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR 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.
diff --git a/web/imcms/xinha/modules/ColorPicker/ColorPicker.js b/web/imcms/xinha/modules/ColorPicker/ColorPicker.js
deleted file mode 100644
index 0eea3c67ab..0000000000
--- a/web/imcms/xinha/modules/ColorPicker/ColorPicker.js
+++ /dev/null
@@ -1,896 +0,0 @@
-
-  /**
-   * Gogo Internet Services Color Picker Javascript Widget
-   * colorPicker for short.
-   *
-   * @author James Sleeman <james@gogo.co.nz>
-   * @date June, 2005
-   *
-   * The colorPicker class provides access to a color map for selecting
-   * colors which will be passed back to a callback (usually such a callback would
-   * write the RGB hex value returned into a field, but that's up to you).
-   *
-   * The color map presented is a standard rectangular pallate with 0->360 degrees of
-   * hue on the Y axis and 0->100% saturation on the X axis, the value (brightness) is
-   * selectable as a vertical column of grey values.  Also present is a one row of
-   * white->grey->black for easy selection of these colors.
-   *
-   * A checkbox is presented, which when checked will force the palatte into "web safe"
-   * mode, only colours in the "web safe palatte" of 216 colors will be shown, the palatte
-   * is adjusted so that the normal blend of colours are "rounded" to the nearest web safe
-   * one.  It should be noted that "web safe" colours really are a thing of the past,
-   * not only can pretty much every body display several million colours, but it's actually
-   * been found that of those 216 web safe colours only 20 to 30 are actually going to be
-   * displayed equally on the majority of monitors, and those are mostly yellows!
-   *
-   * =Usage Example=
-   * {{{
-   *  <!-- Here is the field -->         <!-- And we will use this button to open the picker"
-   *  <input type="text" id="myField" /> <input type="button" value="..." id="myButton" />
-   *  <script>
-   *    // now when the window loads link everything up
-   *    window.onload = function()
-   *    {
-   *
-   *      var myField  = document.getElementById('myField');  // Get our field
-   *      var myButton = document.getElementById('myButton'); // And the button
-   *      var myPicker = new colorPicker                      // Make a picker
-   *        (
-   *          {
-   *              // Cellsize is the width and height of each colour cell
-   *            cellsize: '5px',
-   *              // Callback is the function to execute when we are done,
-   *              // this one puts the color value into the field
-   *            callback: function(color){myField.value=color},
-   *              // Granularity defines the maximum number of colors per row/column
-   *              // more colors (high number) gives a smooth gradient of colors
-   *              // but it will take (much) longer to display, while a small number
-   *              // displays quickly, but doesn't show as many different colors.
-   *              // Experiement with it, 18 seems like a good number.
-   *            granularity: 18,
-   *              // Websafe specifies whether or not to include the Web Safe checkbox
-   *            websafe: false,
-   *              // Savecolors specifies the number of recently-selected colors to remember
-   *            savecolors: 20
-   *           }
-   *        );
-   *
-   *      // And now hookup the button to open the picker,
-   *      //  the function to do that is myPicker.open()
-   *      //  it accepts two parameters, the "anchorage" and the element to anchor to,
-   *      //  and an optional third parameter, an initial color code to show in 
-   *      //  the text box and sample.
-   *      //
-   *      //  anchorage is made up of two of the keywords bottom,top,left and right
-   *      //    left:   the left edge of the picker will align to the left edge of the element
-   *      // or right:  the right edgeof the picker aligns to the right edge of the element
-   *      //    top:    the picker will appear above the element
-   *      // or bottom: the picker will appear below the element
-   *
-   *      myButton.onclick =
-   *        function()
-   *        {              // anchorage   , element to anchor to
-   *          myPicker.open('bottom,right', myButton, initcolor)
-   *        };
-   *    }
-   *  </script>
-   * }}}
-   */
-  ColorPicker._pluginInfo =
-  {
-    name     : "colorPicker",
-    version  : "1.0",
-    developer: "James Sleeman",
-    developer_url: "http://www.gogo.co.nz/",
-    c_owner      : "Gogo Internet Services",
-    license      : "htmlArea",
-    sponsor      : "Gogo Internet Services",
-    sponsor_url  : "http://www.gogo.co.nz/"
-  };
-  function ColorPicker() 
-  {
-	// dummy function for Xinha plugin api, note the different names
-  }
-  if (window.opener && window.opener.Xinha)
-  { // this prevents that the Xinha.colorPicker object of the opening window is replaced by the one loaded in the popup
-  	var openerColorPicker = window.opener.Xinha.colorPicker;
-  	Xinha._addEvent(window,'unload', function() {Xinha.colorPicker = openerColorPicker;});
-  }
-  //the actual function is below
-  Xinha.colorPicker = function (params)
-  {
-    // if the savedColors is empty, try to read the savedColors from cookie
-    if ( Xinha.colorPicker.savedColors.length === 0 )
-    {
-      Xinha.colorPicker.loadColors();
-    }
-    var picker = this;
-    var enablepick = false;
-    var enablevalue = false;
-    var pickrow = 0;
-    var pickcol = 0;
-    this.callback = params.callback?params.callback:function(color){alert('You picked ' + color );};
-    this.websafe  = params.websafe?params.websafe:false;
-    this.savecolors = params.savecolors? params.savecolors: 20;
-
-    this.cellsize = parseInt(params.cellsize?params.cellsize:'10px', 10);
-    this.side     = params.granularity?params.granularity:18;
-    var valuecol = this.side + 1;
-    var valuerow = this.side - 1;
-
-    this.value = 1;
-    this.saved_cells = null;
-    this.table = document.createElement('table');
-    this.table.className = "dialog";
-    this.table.cellSpacing = this.table.cellPadding = 0;
-    this.table.onmouseup = function()
-    {
-    	 enablepick = false;
-    	 enablevalue = false;
-    };
-    this.tbody = document.createElement('tbody');
-    this.table.appendChild(this.tbody);
-    this.table.style.border = '1px solid WindowFrame';
-    this.table.style.zIndex = '1050';
-    // Add a title bar and close button
-    var tr = document.createElement('tr');
-    
-    var td = document.createElement('td');
-    td.colSpan = this.side;
-    td.className= "title";
-    td.style.fontFamily = 'small-caption,caption,sans-serif';
-    td.style.fontSize = 'x-small';
-    td.unselectable = "on";
-    td.style.MozUserSelect = "none";
-    td.style.cursor = "default";
-    td.appendChild(document.createTextNode(Xinha._lc('Click a color...')));
-    td.style.borderBottom = '1px solid WindowFrame';
-    tr.appendChild(td);
-    td = null;
-
-    var td = document.createElement('td');
-    td.className= "title";
-    td.colSpan = 2;
-    td.style.fontFamily = 'Tahoma,Verdana,sans-serif';
-    td.style.borderBottom = '1px solid WindowFrame';
-    td.style.paddingRight = '0';
-    tr.appendChild(td);
-    
-
-    var but = document.createElement('div');
-    but.title = Xinha._lc("Close");
-    but.className= 'buttonColor';
-    but.style.height = '11px';
-    but.style.width = '11px';
-    but.style.cursor = 'pointer';
-    but.onclick = function() { picker.close(); };
-    but.appendChild(document.createTextNode('\u00D7'));
-    but.align = 'center';
-    but.style.verticalAlign = 'top';
-    but.style.position = 'relative';
-    but.style.cssFloat = 'right';
-    but.style.styleFloat = 'right';
-    but.style.padding = '0';
-    but.style.margin = '2px';
-    but.style.backgroundColor = 'transparent';
-    but.style.fontSize= '11px';
-    if ( !Xinha.is_ie) but.style.lineHeight= '9px'; // line-height:9px is better for centering the x, but IE cuts it off at the bottom :(
-    but.style.letterSpacing= '0';
-    
-        
-    td.appendChild(but);
-
-    this.tbody.appendChild(tr);
-    but = tr = td = null;
-
-    this.constrain_cb = document.createElement('input');
-    this.constrain_cb.type = 'checkbox';
-
-    this.chosenColor = document.createElement('input');
-    this.chosenColor.type = 'text';
-    this.chosenColor.maxLength = 7;
-    this.chosenColor.style.width = '50px';
-    this.chosenColor.style.fontSize = '11px';
-    
-    this.chosenColor.onchange = function()
-      {
-      	if(/#[0-9a-f]{6,6}/i.test(this.value))
-      	{
-    	      picker.backSample.style.backgroundColor = this.value;
-          picker.foreSample.style.color = this.value;
-      	}
-      };
-
-    this.backSample = document.createElement('div');
-    this.backSample.appendChild(document.createTextNode('\u00A0'));
-    this.backSample.style.fontWeight = 'bold';
-    this.backSample.style.fontFamily = 'small-caption,caption,sans-serif';
-    this.backSample.fontSize = 'x-small';
-
-    this.foreSample = document.createElement('div');
-    this.foreSample.appendChild(document.createTextNode(Xinha._lc('Sample')));
-    this.foreSample.style.fontWeight = 'bold';
-    this.foreSample.style.fontFamily = 'small-caption,caption,sans-serif';
-    this.foreSample.fontSize = 'x-small';
-
-    /** Convert a decimal number to a two byte hexadecimal representation.
-      * Zero-pads if necessary.
-      *
-      * @param integer dec Integer from 0 -> 255
-      * @returns string 2 character hexadecimal (zero padded)
-      */
-    function toHex(dec)
-    {
-      var h = dec.toString(16);
-      if(h.length < 2) { h = '0' + h; }
-      return h;
-    }
-
-    /** Convert a color object {red:x, green:x, blue:x} to an RGB hex triplet
-     * @param object tuple {red:0->255, green:0->255, blue:0->255}
-     * @returns string hex triplet (#rrggbb)
-     */
-
-    function tupleToColor(tuple)
-    {
-      return '#' + toHex(tuple.red) + toHex(tuple.green) + toHex(tuple.blue);
-    }
-
-    /** Determine the nearest power of a number to another number
-     * (eg nearest power of 4 to 5 => 4, of 4 to 7 => 8)
-     *
-     * @usedby rgbToWebsafe
-     * @param number num number to round to nearest power of <power>
-     * @param number power number to find the nearest power of
-     * @returns number Nearest power of <power> to num.
-     */
-
-    function nearestPowerOf(num,power)
-    {
-      return Math.round(Math.round(num / power) * power);
-    }
-
-    /** Concatenate the hex representation of dec to itself and return as an integer.
-     *  eg dec = 10 -> A -> AA -> 170
-     *
-     * @usedby rgbToWebsafe
-     * @param dec integer
-     * @returns integer
-     */
-
-    function doubleHexDec(dec)
-    {
-      return parseInt(dec.toString(16) + dec.toString(16), 16);
-    }
-
-    /** Convert a given RGB color to the nearest "Web-Safe" color.  A websafe color only has the values
-     *  00, 33, 66, 99, CC and FF for each of the red, green and blue components (thus 6 shades of each
-     *  in combination to produce 6 * 6 * 6 = 216 colors).
-     *
-     * @param    color object {red:0->255, green:0->255, blue:0->255}
-     * @returns  object {red:51|102|153|204|255, green:51|102|153|204|255, blue:51|102|153|204|255}
-     */
-    function rgbToWebsafe(color)
-    {
-      // For each take the high byte, divide by three, round and multiply by three before rounding again
-      color.red   = doubleHexDec(nearestPowerOf(parseInt(toHex(color.red).charAt(0), 16), 3));
-      color.blue  = doubleHexDec(nearestPowerOf(parseInt(toHex(color.blue).charAt(0), 16), 3));
-      color.green = doubleHexDec(nearestPowerOf(parseInt(toHex(color.green).charAt(0), 16), 3));
-      return color;
-    }
-
-    /** Convert a combination of hue, saturation and value into an RGB color.
-     *  Hue is defined in degrees, saturation and value as a floats between 0 and 1 (0% -> 100%)
-     *
-     * @param h float angle of hue around color wheel 0->360
-     * @param s float saturation of color (no color (grey)) 0->1 (vibrant)
-     * @param v float value (brightness) of color (black) 0->1 (bright)
-     * @returns object {red:0->255, green:0->255, blue:0->255}
-     * @seealso http://en.wikipedia.org/wiki/HSV_color_space
-     */
-    function hsvToRGB(h,s,v)
-    {
-      var colors;
-      if(s === 0)
-      {
-        // GREY
-        colors = {red:v,green:v,blue:v};
-      }
-      else
-      {
-        h /= 60;
-        var i = Math.floor(h);
-        var f = h - i;
-        var p = v * (1 - s);
-        var q = v * (1 - s * f);
-        var t = v * (1 - s * (1 - f) );
-        switch(i)
-        {
-          case 0: colors =  {red:v, green:t, blue:p}; break;
-          case 1: colors =  {red:q, green:v, blue:p}; break;
-          case 2: colors =  {red:p, green:v, blue:t}; break;
-          case 3: colors =  {red:p, green:q, blue:v}; break;
-          case 4: colors =  {red:t, green:p, blue:v}; break;
-          default:colors =  {red:v, green:p, blue:q}; break;
-        }
-      }
-      colors.red = Math.ceil(colors.red * 255);
-      colors.green = Math.ceil(colors.green * 255);
-      colors.blue = Math.ceil(colors.blue * 255);
-      return colors;
-    }
-    var self = this;
-    function closeOnBodyClick (ev)
-    {
-      ev = ev ? ev : window.event;
-      el = ev.target ? ev.target : ev.srcElement;
-      do
-      {
-        if (el == self.table) return;
-      }
-      while (el = el.parentNode);
-      self.close();
-    }
-    /** Open the color picker
-     *
-     * @param string anchorage pair of sides of element to anchor the picker to
-     *   "top,left" "top,right" "bottom,left" or "bottom,right"
-     * @param HTML_ELEMENT element the element to anchor the picker to sides of
-     *
-     * @note The element is just referenced here for positioning (anchoring), it
-     * does not automatically get the color copied into it.  See the usage instructions
-     * for the class.
-     */
-
-    this.open = function(anchorage,element,initcolor)
-    {
-      this.table.style.display = '';
-
-      this.pick_color();
-      if(initcolor && /#[0-9a-f]{6,6}/i.test(initcolor))
-      {
-        this.chosenColor.value = initcolor;
-    	    this.backSample.style.backgroundColor = initcolor;
-        this.foreSample.style.color = initcolor;
-      }
-
-      Xinha._addEvent(document.body,'mousedown',closeOnBodyClick);
-      
-      // Find position of the element
-      this.table.style.position = 'absolute';
-      var e = element;
-      var top  = 0;
-      var left = 0;
-      do
-      {
-        if (e.style.position == 'fixed') 
-        {
-          this.table.style.position = 'fixed';
-        }
-        top += e.offsetTop;
-        left += e.offsetLeft;
-        e = e.offsetParent;
-      }
-      while(e);
-
-      var x, y;
-      if(/top/.test(anchorage) || (top + this.table.offsetHeight > document.body.offsetHeight))
-      {
-        if(top - this.table.offsetHeight > 0)
-        {
-          this.table.style.top = (top - this.table.offsetHeight) + 'px';
-        } 
-        else
-        {
-        	  this.table.style.top = 0;
-        }
-      }
-      else
-      {
-        this.table.style.top = (top + element.offsetHeight) + 'px';
-      }
-
-      if(/left/.test(anchorage) || (left + this.table.offsetWidth > document.body.offsetWidth))
-      {
-        if(left - (this.table.offsetWidth - element.offsetWidth) > 0 )
-        {
-          this.table.style.left = (left - (this.table.offsetWidth - element.offsetWidth)) + 'px';
-        }
-        else
-        {
-        	  this.table.style.left = 0;
-        }
-      }
-      else
-      {
-        this.table.style.left = left + 'px';
-      }
-     // IE ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
-      /*@cc_on
-      this.iframe.style.top = this.table.style.top;
-      this.iframe.style.left = this.table.style.left;
-      @*/
-    };
-
-    function pickCell(cell)
-    {
-        picker.chosenColor.value = cell.colorCode;
-        picker.backSample.style.backgroundColor = cell.colorCode;
-        picker.foreSample.style.color = cell.colorCode;
-        if((cell.hue >= 195  && cell.saturation > 0.5) || 
-        		(cell.hue === 0 && cell.saturation === 0 && cell.value < 0.5) || 
-        		(cell.hue !== 0 && picker.value < 0.75))
-        {
-          cell.style.borderColor = '#fff';
-        }
-        else
-        {
-          cell.style.borderColor = '#000';
-        }
-        pickrow = cell.thisrow;
-        pickcol = cell.thiscol;
-     }
-    
-    function pickValue(cell)
-    {
-   //     cell.style.borderWidth = '1px';
-   //     cell.style.borderStyle = 'solid';
-        if(picker.value < 0.5)
-        {
-           cell.style.borderColor = '#fff';
-        }
-        else
-        {
-        	  cell.style.borderColor = '#000';
-        }
-        valuerow = cell.thisrow;
-        valuecol = cell.thiscol;
-        picker.chosenColor.value = picker.saved_cells[pickrow][pickcol].colorCode;
-        picker.backSample.style.backgroundColor = picker.saved_cells[pickrow][pickcol].colorCode;
-        picker.foreSample.style.color = picker.saved_cells[pickrow][pickcol].colorCode;
-    }
-    
-    function unpickCell(row,col)
-    {
-    	  picker.saved_cells[row][col].style.borderColor = picker.saved_cells[row][col].colorCode;
-    }
-    
-    /** Draw the color picker. */
-    this.pick_color = function()
-    {
-      var rows, cols;
-      var picker = this;
-      var huestep = 359/(this.side);
-      var saturstep = 1/(this.side - 1);
-      var valustep  = 1/(this.side - 1);
-      var constrain = this.constrain_cb.checked;
-      
-
-      if(this.saved_cells === null)
-      {
-        this.saved_cells = [];
-
-        for(var row = 0; row < this.side; row++)
-        {
-          var tr = document.createElement('tr');
-          this.saved_cells[row] = [];
-          for(var col = 0; col < this.side; col++)
-          {
-            var td = document.createElement('td');
-            if(constrain)
-            {
-              td.colorCode = tupleToColor(rgbToWebsafe(hsvToRGB(huestep*row, saturstep*col, this.value)));
-            }
-            else
-            {
-              td.colorCode = tupleToColor(hsvToRGB(huestep*row, saturstep*col, this.value));
-            }
-            this.saved_cells[row][col] = td;
-            td.style.height = this.cellsize + 'px';
-            td.style.width = this.cellsize -2 +'px';
-            td.style.borderWidth = '1px';
-            td.style.borderStyle = 'solid';
-            td.style.borderColor = td.colorCode;
-            td.style.backgroundColor = td.colorCode;
-            if(row == pickrow && col == pickcol)
-            {
-              td.style.borderColor = '#000';
-              this.chosenColor.value = td.colorCode;
-              this.backSample.style.backgroundColor = td.colorCode;
-              this.foreSample.style.color = td.colorCode;
-            }
-            td.hue = huestep * row;
-            td.saturation = saturstep*col;
-            td.thisrow = row;
-            td.thiscol = col;
-            td.onmousedown = function()
-            {
-              enablepick = true;
-//            	 unpickCell(pickrow,pickcol);
-              picker.saved_cells[pickrow][pickcol].style.borderColor = picker.saved_cells[pickrow][pickcol].colorCode;
-              pickCell(this);
-            };
-            td.onmouseover = function()
-            {
-            	 if(enablepick)
-            	 {
-            	 	pickCell(this);
-            	 }
-            };
-            td.onmouseout = function()
-            {
-            	 if(enablepick)
-            	 {
-    //            this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
-                this.style.borderColor = this.colorCode;
-            	 }
-            };
-            td.ondblclick = function() { Xinha.colorPicker.remember(this.colorCode, picker.savecolors); picker.callback(this.colorCode); picker.close(); };
-            td.appendChild(document.createTextNode(' '));
-            td.style.cursor = 'pointer';
-            tr.appendChild(td);
-            td = null;
-          }
-
-          // Add a blank and then a value column
-          var td = document.createElement('td');
-          td.appendChild(document.createTextNode(' '));
-          td.style.width = this.cellsize + 'px';
-          tr.appendChild(td);
-          td = null;
-
-          var td = document.createElement('td');
-          this.saved_cells[row][col+1] = td;
-          td.appendChild(document.createTextNode(' '));
-          td.style.width  = this.cellsize -2 + 'px';
-          td.style.height = this.cellsize + 'px';
-          td.constrainedColorCode  = tupleToColor(rgbToWebsafe(hsvToRGB(0,0,valustep*row)));
-          td.style.backgroundColor = td.colorCode = tupleToColor(hsvToRGB(0,0,valustep*row));
-          td.style.borderWidth = '1px';
-          td.style.borderStyle = 'solid';
-//          td.style.borderColor = td.style.backgroundColor;
-          td.style.borderColor = td.colorCode;
-          if(row == valuerow)
-          {
-            td.style.borderColor = 'black';
-          }
-          td.hue = huestep * row;
-          td.saturation = saturstep*col;
-          td.hsv_value = valustep*row;
-          td.thisrow = row;
-          td.thiscol = col + 1;
-          td.onmousedown = function()
-          {
-            enablevalue = true;
-//            unpickCell(valuerow,valuecol);
-            picker.saved_cells[valuerow][valuecol].style.borderColor = picker.saved_cells[valuerow][valuecol].colorCode;
-            picker.value = this.hsv_value; 
-            picker.pick_color();
-            pickValue(this);
-          };
-          td.onmouseover = function() {
-            if(enablevalue)
-            {
-              picker.value = this.hsv_value; 
-              picker.pick_color();
-              pickValue(this);
-            }
-          };
-          td.onmouseout = function()
-          {
-            if(enablevalue)
-            {
-       //       this.style.borderWidth = 0;
-       //       this.style.borderStyle = 'none';
-              this.style.borderColor = this.colorCode;//'';
-            }
-          };
-          td.style.cursor = 'pointer';
-          tr.appendChild(td);
-          td = null;
-
-          this.tbody.appendChild(tr);
-          tr = null;
-        }
-
-        // Add one row of greys
-        var tr = document.createElement('tr');
-        this.saved_cells[row] = [];
-        for(var col = 0; col < this.side; col++)
-        {
-          var td = document.createElement('td');
-          if(constrain)
-          {
-            td.colorCode = tupleToColor(rgbToWebsafe(hsvToRGB(0, 0, valustep*(this.side-col-1))));
-          }
-          else
-          {
-            td.colorCode = tupleToColor(hsvToRGB(0, 0, valustep*(this.side-col-1)));
-          }
-          this.saved_cells[row][col] = td;
-          td.style.height = this.cellsize + 'px';
-          td.style.width = this.cellsize -2 +'px';
-          td.style.borderWidth = '1px';
-          td.style.borderStyle = 'solid';
-          td.style.borderColor = td.colorCode;
-          td.style.backgroundColor = td.colorCode;
-          td.hue = 0;
-          td.saturation = 0;
-          td.value = valustep*(this.side-col-1);
-          td.thisrow = row;
-          td.thiscol = col;
-          td.onmousedown = function()
-          {
-            enablepick = true;
-  //          unpickCell(pickrow,pickcol);
-            picker.saved_cells[pickrow][pickcol].style.borderColor = picker.saved_cells[pickrow][pickcol].colorCode;
-            pickCell(this);
-          };
-          td.onmouseover = function()
-          {
-            if(enablepick)
-            {
-              pickCell(this);
-            }
-          };
-          td.onmouseout = function()
-          {
-            if(enablepick)
-            {
-   //           this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
-              this.style.borderColor = this.colorCode;
-        	   }
-          };
-          td.ondblclick = function() { Xinha.colorPicker.remember(this.colorCode, picker.savecolors); picker.callback(this.colorCode); picker.close(); };
-          td.appendChild(document.createTextNode(' '));
-          td.style.cursor = 'pointer';
-          tr.appendChild(td);
-          td = null;
-        }
-        this.tbody.appendChild(tr);
-        tr = null;
-
-        var tr = document.createElement('tr');
-        var td = document.createElement('td');
-        tr.appendChild(td);
-        td.colSpan = this.side + 2;
-        td.style.padding = '3px';
-
-        if ( this.websafe )
-        {
-        var div = document.createElement('div');
-        var label = document.createElement('label');
-        label.appendChild(document.createTextNode(Xinha._lc('Web Safe: ')));
-
-        this.constrain_cb.onclick = function() { picker.pick_color(); };
-        label.appendChild(this.constrain_cb);
-        label.style.fontFamily = 'small-caption,caption,sans-serif';
-        label.style.fontSize = 'x-small';
-        div.appendChild(label);
-        td.appendChild(div);
-        div = null;
-        }
-
-        var div = document.createElement('div');
-        var label = document.createElement('label');
-        label.style.fontFamily = 'small-caption,caption,sans-serif';
-        label.style.fontSize = 'x-small';
-        label.appendChild(document.createTextNode(Xinha._lc('Color: ')));
-        label.appendChild(this.chosenColor);
-        div.appendChild(label);
-        var but = document.createElement('span');
-        but.className = "buttonColor ";
-        but.style.fontSize = '13px';
-        but.style.width = '24px';
-        but.style.marginLeft = '2px';
-        but.style.padding = '0px 4px';
-        but.style.cursor = 'pointer';
-        but.onclick = function() { Xinha.colorPicker.remember(picker.chosenColor.value, picker.savecolors); picker.callback(picker.chosenColor.value); picker.close(); };
-        but.appendChild(document.createTextNode(Xinha._lc('OK')));
-        but.align = 'center';
-        div.appendChild(but);
-        td.appendChild(div);
-
-        var sampleTable = document.createElement('table');
-        sampleTable.style.width = '100%';
-        var sampleBody = document.createElement('tbody');
-        sampleTable.appendChild(sampleBody);
-        var sampleRow = document.createElement('tr');
-        sampleBody.appendChild(sampleRow);
-        var leftSampleCell = document.createElement('td');
-        sampleRow.appendChild(leftSampleCell);
-        leftSampleCell.appendChild(this.backSample);
-        leftSampleCell.style.width = '50%';
-        var rightSampleCell = document.createElement('td');
-        sampleRow.appendChild(rightSampleCell);
-        rightSampleCell.appendChild(this.foreSample);
-        rightSampleCell.style.width = '50%';
-
-        td.appendChild(sampleTable);
-        var savedColors = document.createElement('div');
-        savedColors.style.clear = 'both';
-
-        function createSavedColors(color)
-        {
-          var is_ie = false;
-          /*@cc_on is_ie = true; @*/
-          var div = document.createElement('div');
-          div.style.width = picker.cellsize + 'px';//13px';
-          div.style.height = picker.cellsize + 'px';//13px';
-          div.style.margin = '1px';
-          div.style.border = '1px solid black';
-          div.style.cursor = 'pointer';
-          div.style.backgroundColor = color;
-          div.style[ is_ie ? 'styleFloat' : 'cssFloat'] = 'left';
-     //     div.onclick = function() { picker.callback(color); picker.close(); };
-          div.ondblclick = function() { picker.callback(color); picker.close(); };
-   //       div.onmouseover = function()
-          div.onclick = function()
-          {
-            picker.chosenColor.value = color;
-            picker.backSample.style.backgroundColor = color;
-            picker.foreSample.style.color = color;
-          };
-          savedColors.appendChild(div);
-        }
-        for ( var savedCols = 0; savedCols < Xinha.colorPicker.savedColors.length; savedCols++ )
-        {
-          createSavedColors(Xinha.colorPicker.savedColors[savedCols]);
-        }
-        td.appendChild(savedColors);
-
-        this.tbody.appendChild(tr);
-        document.body.appendChild(this.table);
-        
-        //put an iframe behind the table to mask select lists in ie
-        // IE ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
-        /*@cc_on
-        if ( !this.iframe )
-        {
-        this.iframe = document.createElement('iframe');
-        this.iframe.frameBorder = 0;
-        this.iframe.src = "javascript:;";
-        this.iframe.style.position = "absolute";
-        this.iframe.style.width = this.table.offsetWidth;
-        this.iframe.style.height = this.table.offsetHeight;
-        document.body.insertBefore(this.iframe, this.table);
-        }
-        this.iframe.style.display = '';
-        @*/
-      }
-      else
-      {
-        for(var row = 0; row < this.side; row++)
-        {
-          for(var col = 0; col < this.side; col++)
-          {
-            if(constrain)
-            {
-              this.saved_cells[row][col].colorCode = tupleToColor(rgbToWebsafe(hsvToRGB(huestep*row, saturstep*col, this.value)));
-            }
-            else
-            {
-              this.saved_cells[row][col].colorCode = tupleToColor(hsvToRGB(huestep*row, saturstep*col, this.value));
-            }
-            this.saved_cells[row][col].style.backgroundColor = this.saved_cells[row][col].colorCode;
-            this.saved_cells[row][col].style.borderColor = this.saved_cells[row][col].colorCode;
-          }
-        }
-        var pickcell = this.saved_cells[pickrow][pickcol];
-        this.chosenColor.value = pickcell.colorCode;
-        this.backSample.style.backgroundColor = pickcell.colorCode;
-        this.foreSample.style.color = pickcell.colorCode;
-        if((pickcell.hue >= 195  && pickcell.saturation > 0.5) || 
-        		(pickcell.hue === 0 && pickcell.saturation === 0 && pickcell.value < 0.5) || 
-        		(pickcell.hue !== 0 && picker.value < 0.75))
-        {
-           pickcell.style.borderColor = '#fff';
-        }
-        else
-        {
-        	  pickcell.style.borderColor = '#000';
-        }
-      }
-    };
-
-    /** Close the color picker */
-    this.close = function()
-    {
-      Xinha._removeEvent(document.body,'mousedown',closeOnBodyClick);
-      this.table.style.display = 'none';
-      // IE ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
-      /*@cc_on
-      if ( this.iframe ) { this.iframe.style.display = 'none'; }
-      @*/
-    };
-} // end Xinha.colorPicker
-
-// array of the saved colors
-Xinha.colorPicker.savedColors = [];
-
-// add the color to the savedColors
-Xinha.colorPicker.remember = function(color, savecolors)
-{
-  // check if this color is known
-  for ( var i = Xinha.colorPicker.savedColors.length; i--; )
-  {
-    if ( Xinha.colorPicker.savedColors[i] == color )
-    {
-      return false;
-    }
-  }
-  // insert the new color
-  Xinha.colorPicker.savedColors.splice(0, 0, color);
-  // limit elements
-  Xinha.colorPicker.savedColors = Xinha.colorPicker.savedColors.slice(0, savecolors);
-  //[mokhet] probably some more parameters to send to the cookie definition
-  // like domain, secure and such, especially with https connection i presume
-  // save the cookie
-  var expdate = new Date();
-  expdate.setMonth(expdate.getMonth() + 1);
-
-  document.cookie = 'XinhaColorPicker=' + escape (Xinha.colorPicker.savedColors.join('-')) + ';expires=' + expdate.toGMTString();
-  return true;
-};
-
-// try to read the colors from the cookie
-Xinha.colorPicker.loadColors = function()
-{
-  var index = document.cookie.indexOf('XinhaColorPicker');
-  if ( index != -1 )
-  {
-    var begin = (document.cookie.indexOf('=', index) + 1);
-    var end = document.cookie.indexOf(';', index);
-    if ( end == -1 ) { end = document.cookie.length; }
-    Xinha.colorPicker.savedColors = unescape(document.cookie.substring(begin, end)).split('-');
-  }
-};
-
-
-
-/** Create a neat little box next to an input field
- *    * shows actual color
- *    * opens colorPicker on click
- *    * has a button to clear the color with a click
- *
- *  @param input (DOM element) 
- *  @param optional pickerConfig configuration object for Xinha.colorPicker()
- */
-Xinha.colorPicker.InputBinding = function(input,pickerConfig)
-{
-  var main = document.createElement('span');
-  main.className = "buttonColor";
-  
-  var chooser = this.chooser = document.createElement('span');
-  chooser.className = "chooser";
-  if (input.value) chooser.style.backgroundColor = input.value;
-  chooser.onmouseover = function() {chooser.className = "chooser buttonColor-hilite";};
-  chooser.onmouseout = function() {chooser.className = "chooser";};
-  chooser.appendChild(document.createTextNode('\u00a0'));
-  main.appendChild(chooser);
-  var clearColor = document.createElement('span');
-  clearColor.className = "nocolor";
-  clearColor.onmouseover = function() {clearColor.className = "nocolor buttonColor-hilite"; clearColor.style.color='#f00'};
-  clearColor.onmouseout = function() {clearColor.className = "nocolor"; clearColor.style.color='#000'};
-  clearColor.onclick = function() {input.value ='';chooser.style.backgroundColor = ''};
-  clearColor.appendChild(document.createTextNode('\u00d7'));
-  main.appendChild(clearColor);
-  
-  input.parentNode.insertBefore(main,input.nextSibling);
-  
-  Xinha._addEvent(input,'change',function() {chooser.style.backgroundColor = this.value;})
-
-  pickerConfig = (pickerConfig) ? Xinha.cloneObject(pickerConfig) : { cellsize:'5px' };
-  pickerConfig.callback = (pickerConfig.callback) ? pickerConfig.callback : function(color) {chooser.style.backgroundColor = color;input.value=color};
-
-  chooser.onclick = function() 
-  { 
-    var colPicker = new Xinha.colorPicker(pickerConfig);
-	  colPicker.open("",chooser, input.value ); 
-  }
-  Xinha.freeLater(this,"chooser");
-}
-Xinha.colorPicker.InputBinding.prototype.setColor = function (color)
-{
-  this.chooser.style.backgroundColor = color;
-}
diff --git a/web/imcms/xinha/modules/ColorPicker/lang/pt_br.js b/web/imcms/xinha/modules/ColorPicker/lang/pt_br.js
deleted file mode 100644
index 4b1ea7e480..0000000000
--- a/web/imcms/xinha/modules/ColorPicker/lang/pt_br.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Click a color...": "Selecione uma côr...",
-  "Close": "Fechar",
-  "Color: ": "Côr:",
-  "Sample": "Exemplo",
-  "Web Safe: ": "Web Segura:"
-}
diff --git a/web/imcms/xinha/modules/CreateLink/lang/pt_br.js b/web/imcms/xinha/modules/CreateLink/lang/pt_br.js
deleted file mode 100644
index f75cd02c8e..0000000000
--- a/web/imcms/xinha/modules/CreateLink/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "You need to select some text before creating a link": "Você precisa selecionar um texto antes de criar um link"
-}
diff --git a/web/imcms/xinha/modules/CreateLink/link.html b/web/imcms/xinha/modules/CreateLink/link.html
deleted file mode 100644
index adad400588..0000000000
--- a/web/imcms/xinha/modules/CreateLink/link.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<html>
-
-<head>
-  <title>Insert/Modify Link</title>
-  <script type="text/javascript" src="../../popups/popup.js"></script>
-  <link rel="stylesheet" type="text/css" href="../../popups/popup.css" />
-
-  <script type="text/javascript">
-    window.resizeTo(400, 200);
-
-Xinha = window.opener.Xinha;
-
-function i18n(str) {
-  return (Xinha._lc(str, 'Xinha'));
-}
-
-function onTargetChanged() {
-  var f = document.getElementById("f_other_target");
-  if (this.value == "_other") {
-    f.style.visibility = "visible";
-    f.select();
-    f.focus();
-  } else f.style.visibility = "hidden";
-}
-
-function Init() {
-  __dlg_translate('Xinha');
-  __dlg_init();
-
-  // Make sure the translated string appears in the drop down. (for gecko)
-  document.getElementById("f_target").selectedIndex = 1;
-  document.getElementById("f_target").selectedIndex = 0;
-
-  var param = window.dialogArguments;
-  var target_select = document.getElementById("f_target");
-  var use_target = true;
-  if (param) {
-    if ( typeof param["f_usetarget"] != "undefined" ) {
-      use_target = param["f_usetarget"];
-    }
-    if ( typeof param["f_href"] != "undefined" ) {
-      document.getElementById("f_href").value = param["f_href"];
-      document.getElementById("f_title").value = param["f_title"];
-      comboSelectValue(target_select, param["f_target"]);
-      if (target_select.value != param.f_target) {
-        var opt = document.createElement("option");
-        opt.value = param.f_target;
-        opt.innerHTML = opt.value;
-        target_select.appendChild(opt);
-        opt.selected = true;
-      }
-    }
-  }
-  if (! use_target) {
-    document.getElementById("f_target_label").style.visibility = "hidden";
-    document.getElementById("f_target").style.visibility = "hidden";
-    document.getElementById("f_other_target").style.visibility = "hidden";
-  }
-  var opt = document.createElement("option");
-  opt.value = "_other";
-  opt.innerHTML = i18n("Other");
-  target_select.appendChild(opt);
-  target_select.onchange = onTargetChanged;
-  document.getElementById("f_href").focus();
-  document.getElementById("f_href").select();
-}
-
-function onOK() {
-  var required = {
-    // f_href shouldn't be required or otherwise removing the link by entering an empty
-    // url isn't possible anymore.
-    // "f_href": i18n("You must enter the URL where this link points to")
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(required[i]);
-      el.focus();
-      return false;
-    }
-  }
-  // pass data back to the calling window
-  var fields = ["f_href", "f_title", "f_target" ];
-  var param = new Object();
-  for (var i in fields) {
-    var id = fields[i];
-    var el = document.getElementById(id);
-    param[id] = el.value;
-  }
-  if (param.f_target == "_other")
-    param.f_target = document.getElementById("f_other_target").value;
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">Insert/Modify Link</div>
-<form>
-<table border="0" style="width: 100%;">
-  <tr>
-    <td class="label">URL:</td>
-    <td><input type="text" id="f_href" style="width: 100%" /></td>
-  </tr>
-  <tr>
-    <td class="label">Title (tooltip):</td>
-    <td><input type="text" id="f_title" style="width: 100%" /></td>
-  </tr>
-  <tr>
-    <td class="label"><span id="f_target_label">Target:</span></td>
-    <td><select id="f_target">
-      <option value="">None (use implicit)</option>
-      <option value="_blank">New window (_blank)</option>
-      <option value="_self">Same frame (_self)</option>
-      <option value="_top">Top frame (_top)</option>
-    </select>
-    <input type="text" name="f_other_target" id="f_other_target" size="10" style="visibility: hidden" />
-    </td>
-  </tr>
-</table>
-
-<div id="buttons">
-  <button type="submit" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/CreateLink/link.js b/web/imcms/xinha/modules/CreateLink/link.js
deleted file mode 100644
index 0d8ce662fb..0000000000
--- a/web/imcms/xinha/modules/CreateLink/link.js
+++ /dev/null
@@ -1,153 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    --  This is the standard implementation of the Xinha.prototype._createLink method,
-    --  which provides the functionality to insert a hyperlink in the editor.
-    --
-    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
-    --
-    --
-    --  $HeadURL: http://svn.xinha.webfactional.com/trunk/modules/CreateLink/link.js $
-    --  $LastChangedDate: 2007-01-24 03:26:04 +1300 (Wed, 24 Jan 2007) $
-    --  $LastChangedRevision: 694 $
-    --  $LastChangedBy: gogo $
-    --------------------------------------------------------------------------*/
-CreateLink._pluginInfo = {
-  name          : "CreateLink",
-  origin        : "Xinha Core",
-  version       : "$LastChangedRevision: 694 $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL: http://svn.xinha.webfactional.com/trunk/modules/CreateLink/link.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-function CreateLink(editor) {
-}                                                       
-
-Xinha.prototype._createLink = function(link)
-{
-  var editor = this;
-  var outparam = null;
-  if ( typeof link == "undefined" )
-  {
-    link = this.getParentElement();
-    if ( link )
-    {
-      while (link && !/^a$/i.test(link.tagName))
-      {
-        link = link.parentNode;
-      }
-    }
-  }
-  if ( !link )
-  {
-    var sel = editor.getSelection();
-    var range = editor.createRange(sel);
-    var compare = 0;
-    if ( Xinha.is_ie )
-    {
-      if ( sel.type == "Control" )
-      {
-        compare = range.length;
-      }
-      else
-      {
-        compare = range.compareEndPoints("StartToEnd", range);
-      }
-    }
-    else
-    {
-      compare = range.compareBoundaryPoints(range.START_TO_END, range);
-    }
-    if ( compare === 0 )
-    {
-      alert(Xinha._lc("You need to select some text before creating a link"));
-      return;
-    }
-    outparam =
-    {
-      f_href : '',
-      f_title : '',
-      f_target : '',
-      f_usetarget : editor.config.makeLinkShowsTarget
-    };
-  }
-  else
-  {
-    outparam =
-    {
-      f_href   : Xinha.is_ie ? editor.stripBaseURL(link.href) : link.getAttribute("href"),
-      f_title  : link.title,
-      f_target : link.target,
-      f_usetarget : editor.config.makeLinkShowsTarget
-    };
-  }
-  Dialog(
-    editor.config.URIs.link,
-    function(param)
-    {
-      if ( !param )
-      {
-        return false;
-      }
-      var a = link;
-      if ( !a )
-      {
-        try
-        {
-          var tmp = Xinha.uniq('http://www.example.com/Link');
-          editor._doc.execCommand('createlink', false, tmp);
-
-          // Fix them up
-          var anchors = editor._doc.getElementsByTagName('a');
-          for(var i = 0; i < anchors.length; i++)
-          {
-            var anchor = anchors[i];
-            if(anchor.href == tmp)
-            {
-              // Found one.
-              if (!a) a = anchor;
-              anchor.href =  param.f_href;
-              if (param.f_target) anchor.target =  param.f_target;
-              if (param.f_title)  anchor.title =  param.f_title;
-            }
-          }
-        } catch(ex) {}
-      }
-      else
-      {
-        var href = param.f_href.trim();
-        editor.selectNodeContents(a);
-        if ( href === '' )
-        {
-          editor._doc.execCommand("unlink", false, null);
-          editor.updateToolbar();
-          return false;
-        }
-        else
-        {
-          a.href = href;
-        }
-      }
-      if ( ! ( a && a.tagName.toLowerCase() == 'a' ) )
-      {
-        return false;
-      }
-      a.target = param.f_target.trim();
-      a.title = param.f_title.trim();
-      editor.selectNodeContents(a);
-      editor.updateToolbar();
-    },
-    outparam);
-};
diff --git a/web/imcms/xinha/modules/Dialogs/dialog.js b/web/imcms/xinha/modules/Dialogs/dialog.js
deleted file mode 100644
index 28990c245a..0000000000
--- a/web/imcms/xinha/modules/Dialogs/dialog.js
+++ /dev/null
@@ -1,89 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    --  This is the implementation of the standard popup dialog
-    --
-    --   Though "Dialog" looks like an object, it isn't really an object.  Instead
-    --   it's just namespace for protecting global symbols.
-    --
-    --
-    --  $HeadURL: http://svn.xinha.python-hosting.com/trunk/modules/Dialogs/dialog.js $
-    --  $LastChangedDate: 2007-01-23 15:26:04 +0100 (tis, 23 jan 2007) $
-    --  $LastChangedRevision: 694 $
-    --  $LastChangedBy: gogo $
-    --------------------------------------------------------------------------*/
-
-
-function Dialog(url, action, init) {
-	if (typeof init == "undefined") {
-		init = window;	// pass this window object by default
-	}
-	Dialog._geckoOpenModal(url, action, init);
-}
-
-Dialog._parentEvent = function(ev) {
-	setTimeout( function() { if (Dialog._modal && !Dialog._modal.closed) { Dialog._modal.focus() } }, 50);
-	try {
-		if (Dialog._modal && !Dialog._modal.closed) {
-			Xinha._stopEvent(ev);
-		} 
-	} catch (e) {
-		//after closing the popup in IE the events are not released and trying to access Dialog._modal.closed causes an error
-	}
-};
-
-
-// should be a function, the return handler of the currently opened dialog.
-Dialog._return = null;
-
-// constant, the currently opened dialog
-Dialog._modal = null;
-
-// the dialog will read it's args from this variable
-Dialog._arguments = null;
-
-Dialog._geckoOpenModal = function(url, action, init) {
-	var dlg = window.open(url, "hadialog",
-			      "toolbar=no,menubar=no,personalbar=no,width=10,height=10," +
-			      "scrollbars=no,resizable=yes,modal=yes,dependable=yes");
-	Dialog._modal = dlg;
-	Dialog._arguments = init;
-
-	// capture some window's events
-	function capwin(w) {
-		Xinha._addEvent(w, "click", Dialog._parentEvent);
-		Xinha._addEvent(w, "mousedown", Dialog._parentEvent);
-		Xinha._addEvent(w, "focus", Dialog._parentEvent);
-	}
-	// release the captured events
-	function relwin(w) {
-		Xinha._removeEvent(w, "click", Dialog._parentEvent);
-		Xinha._removeEvent(w, "mousedown", Dialog._parentEvent);
-		Xinha._removeEvent(w, "focus", Dialog._parentEvent);
-	}
-	capwin(window);
-	// capture other frames, note the exception trapping, this is because
-  // we are not permitted to add events to frames outside of the current
-  // window's domain.
-	for (var i = 0; i < window.frames.length; i++) {try { capwin(window.frames[i]); } catch(e) { } };
-	// make up a function to be called when the Dialog ends.
-	Dialog._return = function (val) {
-		if (val && action) {
-			action(val);
-		}
-		relwin(window);
-		// capture other frames
-		for (var i = 0; i < window.frames.length; i++) { try { relwin(window.frames[i]); } catch(e) { } };
-		Dialog._modal = null;
-	};
-  Dialog._modal.focus();
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/Dialogs/inline-dialog.js b/web/imcms/xinha/modules/Dialogs/inline-dialog.js
deleted file mode 100644
index 1a29764c08..0000000000
--- a/web/imcms/xinha/modules/Dialogs/inline-dialog.js
+++ /dev/null
@@ -1,348 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    --  This is the implementation of the inline dialog (as use by the Linker plugin)
-    --
-    --  
-    --
-    --
-    --  $HeadURL: http://svn.xinha.webfactional.com/trunk/modules/Dialogs/inline-dialog.js $
-    --  $LastChangedDate: 2007-01-24 03:26:04 +1300 (Wed, 24 Jan 2007) $
-    --  $LastChangedRevision: 694 $
-    --  $LastChangedBy: gogo $
-    --------------------------------------------------------------------------*/
-Xinha.Dialog = function(editor, html, localizer)
-{
-  this.id    = { };
-  this.r_id  = { }; // reverse lookup id
-  this.editor   = editor;
-  this.document = document;
-
-  this.rootElem = document.createElement('div');
-  this.rootElem.className = 'dialog';
-  this.rootElem.style.position = 'absolute';
-  this.rootElem.style.display  = 'none';
-  this.editor._framework.ed_cell.insertBefore(this.rootElem, this.editor._framework.ed_cell.firstChild);
-  this.rootElem.style.width  = this.width  =  this.editor._framework.ed_cell.offsetWidth + 'px';
-  this.rootElem.style.height = this.height =  this.editor._framework.ed_cell.offsetHeight + 'px';
-
-  var dialog = this;
-  if(typeof localizer == 'function')
-  {
-    this._lc = localizer;
-  }
-  else if(localizer)
-  {
-    this._lc = function(string)
-    {
-      return Xinha._lc(string,localizer);
-    };
-  }
-  else
-  {
-    this._lc = function(string)
-    {
-      return string;
-    };
-  }
-
-  html = html.replace(/\[([a-z0-9_]+)\]/ig,
-                      function(fullString, id)
-                      {
-                        if(typeof dialog.id[id] == 'undefined')
-                        {
-                          dialog.id[id] = Xinha.uniq('Dialog');
-                          dialog.r_id[dialog.id[id]] = id;
-                        }
-                        return dialog.id[id];
-                      }
-             ).replace(/<l10n>(.*?)<\/l10n>/ig,
-                       function(fullString,translate)
-                       {
-                         return dialog._lc(translate) ;
-                       }
-             ).replace(/="_\((.*?)\)"/g,
-                       function(fullString, translate)
-                       {
-                         return '="' + dialog._lc(translate) + '"';
-                       }
-             );
-
-  this.rootElem.innerHTML = html;
-
-
-
-
-  this.editor.notifyOn
-   ('resize',
-      function(e, args)
-      {
-        dialog.rootElem.style.width  = dialog.width  =  dialog.editor._framework.ed_cell.offsetWidth + 'px';
-        dialog.rootElem.style.height = dialog.height =  dialog.editor._framework.ed_cell.offsetHeight + 'px';
-        dialog.onresize();
-      }
-    );
-};
-
-Xinha.Dialog.prototype.onresize = function()
-{
-  return true;
-};
-
-Xinha.Dialog.prototype.show = function(values)
-{
-  // We need to preserve the selection for IE
-  if(Xinha.is_ie)
-  {
-    this._lastRange = this.editor._createRange(this.editor._getSelection());
-  }
-
-  if(typeof values != 'undefined')
-  {
-    this.setValues(values);
-  }
-  this._restoreTo = [this.editor._textArea.style.display, this.editor._iframe.style.visibility, this.editor.hidePanels()];
-
-  this.editor._textArea.style.display = 'none';
-  this.editor._iframe.style.visibility   = 'hidden';
-  this.rootElem.style.display   = '';
-};
-
-Xinha.Dialog.prototype.hide = function()
-{
-  this.rootElem.style.display         = 'none';
-  this.editor._textArea.style.display = this._restoreTo[0];
-  this.editor._iframe.style.visibility   = this._restoreTo[1];
-  this.editor.showPanels(this._restoreTo[2]);
-
-  // Restore the selection
-  if(Xinha.is_ie)
-  {
-    this._lastRange.select();
-  }
-  this.editor.updateToolbar();
-  return this.getValues();
-};
-
-Xinha.Dialog.prototype.toggle = function()
-{
-  if(this.rootElem.style.display == 'none')
-  {
-    this.show();
-  }
-  else
-  {
-    this.hide();
-  }
-};
-
-Xinha.Dialog.prototype.setValues = function(values)
-{
-  for(var i in values)
-  {
-    var elems = this.getElementsByName(i);
-    if(!elems) continue;
-    for(var x = 0; x < elems.length; x++)
-    {
-      var e = elems[x];
-      switch(e.tagName.toLowerCase())
-      {
-        case 'select'  :
-        {
-          for(var j = 0; j < e.options.length; j++)
-          {
-            if(typeof values[i] == 'object')
-            {
-              for(var k = 0; k < values[i].length; k++)
-              {
-                if(values[i][k] == e.options[j].value)
-                {
-                  e.options[j].selected = true;
-                }
-              }
-            }
-            else if(values[i] == e.options[j].value)
-            {
-              e.options[j].selected = true;
-            }
-          }
-          break;
-        }
-
-
-        case 'textarea':
-        case 'input'   :
-        {
-          switch(e.getAttribute('type'))
-          {
-            case 'radio'   :
-            {
-              if(e.value == values[i])
-              {
-                e.checked = true;
-              }
-              break;
-            }
-
-            case 'checkbox':
-            {
-              if(typeof values[i] == 'object')
-              {
-                for(var j in values[i])
-                {
-                  if(values[i][j] == e.value)
-                  {
-                    e.checked = true;
-                  }
-                }
-              }
-              else
-              {
-                if(values[i] == e.value)
-                {
-                  e.checked = true;
-                }
-              }
-              break;
-            }
-
-            default    :
-            {
-              e.value = values[i];
-            }
-          }
-          break;
-        }
-
-        default        :
-        break;
-      }
-    }
-  }
-};
-
-Xinha.Dialog.prototype.getValues = function()
-{
-  var values = [ ];
-  var inputs = Xinha.collectionToArray(this.rootElem.getElementsByTagName('input'))
-              .append(Xinha.collectionToArray(this.rootElem.getElementsByTagName('textarea')))
-              .append(Xinha.collectionToArray(this.rootElem.getElementsByTagName('select')));
-
-  for(var x = 0; x < inputs.length; x++)
-  {
-    var i = inputs[x];
-    if(!(i.name && this.r_id[i.name])) continue;
-
-    if(typeof values[this.r_id[i.name]] == 'undefined')
-    {
-      values[this.r_id[i.name]] = null;
-    }
-    var v = values[this.r_id[i.name]];
-
-    switch(i.tagName.toLowerCase())
-    {
-      case 'select':
-      {
-        if(i.multiple)
-        {
-          if(!v.push)
-          {
-            if(v != null)
-            {
-              v = [v];
-            }
-            else
-            {
-              v = new Array();
-            }
-          }
-          for(var j = 0; j < i.options.length; j++)
-          {
-            if(i.options[j].selected)
-            {
-              v.push(i.options[j].value);
-            }
-          }
-        }
-        else
-        {
-          if(i.selectedIndex >= 0)
-          {
-            v = i.options[i.selectedIndex];
-          }
-        }
-        break;
-      }
-
-      case 'textarea':
-      case 'input'   :
-      default        :
-      {
-        switch(i.type.toLowerCase())
-        {
-          case  'radio':
-          {
-            if(i.checked)
-            {
-              v = i.value;
-              break;
-            }
-          }
-
-          case 'checkbox':
-          {
-            if(v == null)
-            {
-              if(this.getElementsByName(this.r_id[i.name]).length > 1)
-              {
-                v = new Array();
-              }
-            }
-
-            if(i.checked)
-            {
-              if(v != null && typeof v == 'object' && v.push)
-              {
-                v.push(i.value);
-              }
-              else
-              {
-                v = i.value;
-              }
-            }
-            break;
-          }
-
-          default   :
-          {
-            v = i.value;
-            break;
-          }
-        }
-      }
-
-    }
-
-    values[this.r_id[i.name]] = v;
-  }
-  return values;
-};
-
-Xinha.Dialog.prototype.getElementById = function(id)
-{
-  return this.document.getElementById(this.id[id] ? this.id[id] : id);
-};
-
-Xinha.Dialog.prototype.getElementsByName = function(name)
-{
-  return this.document.getElementsByName(this.id[name] ? this.id[name] : name);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/Dialogs/panel-dialog.js b/web/imcms/xinha/modules/Dialogs/panel-dialog.js
deleted file mode 100644
index 9d2bbd4166..0000000000
--- a/web/imcms/xinha/modules/Dialogs/panel-dialog.js
+++ /dev/null
@@ -1,77 +0,0 @@
-
-Xinha.PanelDialog = function(editor, side, html, localizer)
-{
-  this.id    = { };
-  this.r_id  = { }; // reverse lookup id
-  this.editor   = editor;
-  this.document = document;
-  this.rootElem = editor.addPanel(side);
-
-  var dialog = this;
-  if(typeof localizer == 'function')
-  {
-    this._lc = localizer;
-  }
-  else if(localizer)
-  {
-    this._lc = function(string)
-    {
-      return Xinha._lc(string,localizer);
-    };
-  }
-  else
-  {
-    this._lc = function(string)
-    {
-      return string;
-    };
-  }
-
-  html = html.replace(/\[([a-z0-9_]+)\]/ig,
-                      function(fullString, id)
-                      {
-                        if(typeof dialog.id[id] == 'undefined')
-                        {
-                          dialog.id[id] = Xinha.uniq('Dialog');
-                          dialog.r_id[dialog.id[id]] = id;
-                        }
-                        return dialog.id[id];
-                      }
-             ).replace(/<l10n>(.*?)<\/l10n>/ig,
-                       function(fullString,translate)
-                       {
-                         return dialog._lc(translate) ;
-                       }
-             ).replace(/="_\((.*?)\)"/g,
-                       function(fullString, translate)
-                       {
-                         return '="' + dialog._lc(translate) + '"';
-                       }
-             );
-
-  this.rootElem.innerHTML = html;
-};
-
-Xinha.PanelDialog.prototype.show = function(values)
-{
-  this.setValues(values);
-  this.editor.showPanel(this.rootElem);
-};
-
-Xinha.PanelDialog.prototype.hide = function()
-{
-  this.editor.hidePanel(this.rootElem);
-  return this.getValues();
-};
-
-Xinha.PanelDialog.prototype.onresize   = Xinha.Dialog.prototype.onresize;
-
-Xinha.PanelDialog.prototype.toggle     = Xinha.Dialog.prototype.toggle;
-
-Xinha.PanelDialog.prototype.setValues  = Xinha.Dialog.prototype.setValues;
-
-Xinha.PanelDialog.prototype.getValues  = Xinha.Dialog.prototype.getValues;
-
-Xinha.PanelDialog.prototype.getElementById    = Xinha.Dialog.prototype.getElementById;
-
-Xinha.PanelDialog.prototype.getElementsByName = Xinha.Dialog.prototype.getElementsByName;
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/Dialogs/popupwin.js b/web/imcms/xinha/modules/Dialogs/popupwin.js
deleted file mode 100644
index c85266847d..0000000000
--- a/web/imcms/xinha/modules/Dialogs/popupwin.js
+++ /dev/null
@@ -1,179 +0,0 @@
-// (c) dynarch.com 2003-2004
-// Distributed under the same terms as HTMLArea itself.
-
-function PopupWin(editor, title, handler, initFunction)
-{
-  this.editor = editor;
-  this.handler = handler;
-  var dlg = window.open("", "__ha_dialog", "toolbar=no,menubar=no,personalbar=no,width=600,height=600,left=20,top=40,scrollbars=no,resizable=yes");
-  this.window = dlg;
-  var doc = dlg.document;
-  this.doc = doc;
-  var self = this;
-
-  var base = document.baseURI || document.URL;
-  if ( base && base.match(/(.*)\/([^\/]+)/) )
-  {
-    base = RegExp.$1 + "/";
-  }
-  // @fixme: why using a regex here and not a simple string test ?
-  if ( typeof _editor_url != "undefined" && ! ( /^\//.test(_editor_url) ) && ! ( /http:\/\//.test(_editor_url) ) )
-  {
-    // _editor_url doesn't start with '/' which means it's relative
-    // FIXME: there's a problem here, it could be http:// which
-    // doesn't start with slash but it's not relative either.
-    base += _editor_url;
-  }
-  else
-  {
-    base = _editor_url;
-  }
- 
-  // @fixme: why using a regex here and not a simple string test ?
-  if ( ! ( /\/$/.test(base) ) )
-  {
-    // base does not end in slash, add it now
-    base += '/';
-  }
-  this.baseURL = base;
-
-  doc.open();
-  var html = "<html><head><title>" + title + "</title>\n";
-  // html += "<base href='" + base + "htmlarea.js' />\n";
-  html += '<style type="text/css">@import url(' + _editor_url + 'Xinha.css);</style>\n';
-  if ( _editor_skin != "" )
-  {
-    html += '<style type="text/css">@import url(' + _editor_url + 'skins/' + _editor_skin + '/skin.css);</style>\n';
-  }
-  html += "</head>\n";
-  html += '<body class="dialog popupwin" id="--HA-body"></body></html>';
-  doc.write(html);
-  doc.close();
-
-  // sometimes I Hate Mozilla... ;-(
-  function init2()
-  {
-    var body = doc.body;
-    if ( !body )
-    {
-      setTimeout(init2, 25);
-      return false;
-    }
-    dlg.title = title;
-    doc.documentElement.style.padding = "0px";
-    doc.documentElement.style.margin = "0px";
-    var content = doc.createElement("div");
-    content.className = "content";
-    self.content = content;
-    body.appendChild(content);
-    self.element = body;
-    initFunction(self);
-    dlg.focus();
-  }
-  init2();
-}
-
-PopupWin.prototype.callHandler = function()
-{
-  var tags = ["input", "textarea", "select"];
-  var params = {};
-  for ( var ti = tags.length; --ti >= 0; )
-  {
-    var tag = tags[ti];
-    var els = this.content.getElementsByTagName(tag);
-    for ( var j = 0; j < els.length; ++j )
-    {
-      var el = els[j];
-      var val = el.value;
-      if ( el.tagName.toLowerCase() == "input" )
-      {
-        if ( el.type == "checkbox" )
-        {
-          val = el.checked;
-        }
-      }
-      params[el.name] = val;
-    }
-  }
-  this.handler(this, params);
-  return false;
-};
-
-PopupWin.prototype.close = function()
-{
-  this.window.close();
-};
-
-PopupWin.prototype.addButtons = function()
-{
-  // @fixme: isn't self a predefined variable used to access self frame in most browsers ?
-  //         if yes, then we break it here
-  var self = this;
-  var div = this.doc.createElement("div");
-  this.content.appendChild(div);
-  div.id = "buttons";
-  div.className = "buttons";
-  for ( var i = 0; i < arguments.length; ++i )
-  {
-    var btn = arguments[i];
-    var button = this.doc.createElement("button");
-    div.appendChild(button);
-    button.innerHTML = Xinha._lc(btn, 'Xinha');
-    switch (btn.toLowerCase())
-    {
-      case "ok":
-        Xinha.addDom0Event(button, 'click',
-          function()
-          {
-            self.callHandler();
-            self.close();
-            return false;
-          }
-        );
-      break;
-      case "cancel":
-        Xinha.addDom0Event(button, 'click',
-          function()
-          {
-            self.close();
-            return false;
-          }
-        );
-      break;
-    }
-  }
-};
-
-PopupWin.prototype.showAtElement = function()
-{
-  var self = this;
-  // Mozilla needs some time to realize what's goin' on..
-  setTimeout(function()
-    {
-      var w = self.content.offsetWidth + 4;
-      var h = self.content.offsetHeight + 4;
-      // size to content -- that's fuckin' buggy in all fuckin' browsers!!!
-      // so that we set a larger size for the dialog window and then center
-      // the element inside... phuck!
-
-      // center...
-      var el = self.content;
-      var s = el.style;
-      // s.width = el.offsetWidth + "px";
-      // s.height = el.offsetHeight + "px";
-      s.position = "absolute";
-      s.left = parseInt((w - el.offsetWidth) / 2, 10) + "px";
-      s.top = parseInt((h - el.offsetHeight) / 2, 10) + "px";
-      if (Xinha.is_gecko)
-      {
-        self.window.innerWidth = w;
-        self.window.innerHeight = h;
-      }
-      else
-      {
-        self.window.resizeTo(w + 8, h + 70);
-      }
-      
-    },
-    25);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/FullScreen/full-screen.js b/web/imcms/xinha/modules/FullScreen/full-screen.js
deleted file mode 100644
index c89136de76..0000000000
--- a/web/imcms/xinha/modules/FullScreen/full-screen.js
+++ /dev/null
@@ -1,217 +0,0 @@
-function FullScreen(editor, args)
-{
-  this.editor = editor;
-  editor._superclean_on = false;
-  cfg = editor.config;
-
-  cfg.registerButton
-  ( 'fullscreen',
-    this._lc("Maximize/Minimize Editor"),
-    [_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0], true,
-      function(e, objname, obj)
-      {
-        e._fullScreen();
-      }
-  );
-
-  // See if we can find 'popupeditor' and replace it with fullscreen
-  cfg.addToolbarElement("fullscreen", "popupeditor", 0);
-}
-
-FullScreen._pluginInfo =
-{
-  name     : "FullScreen",
-  version  : "1.0",
-  developer: "James Sleeman",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "htmlArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-FullScreen.prototype._lc = function(string) {
-    return Xinha._lc(string, {url : _editor_url + 'modules/FullScreen/lang/',context:"FullScreen"});
-};
-
-/** fullScreen makes an editor take up the full window space (and resizes when the browser is resized)
- *  the principle is the same as the "popupwindow" functionality in the original htmlArea, except
- *  this one doesn't popup a window (it just uses to positioning hackery) so it's much more reliable
- *  and much faster to switch between
- */
-
-Xinha.prototype._fullScreen = function()
-{
-  var e = this;
-  function sizeItUp()
-  {
-    if(!e._isFullScreen || e._sizing) return false;
-    e._sizing = true;
-    // Width & Height of window
-    var dim = Xinha.viewportSize();
-
-    var h = dim.y - e.config.fullScreenMargins[0] -  e.config.fullScreenMargins[2];
-    var w = dim.x - e.config.fullScreenMargins[1] -  e.config.fullScreenMargins[3];
-
-    e.sizeEditor(w + 'px', h + 'px',true,true);
-    e._sizing = false;
-    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',9,0]); 
-  }
-
-  function sizeItDown()
-  {
-    if(e._isFullScreen || e._sizing) return false;
-    e._sizing = true;
-    e.initSize();
-    e._sizing = false;
-    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0]); 
-  }
-
-  /** It's not possible to reliably get scroll events, particularly when we are hiding the scrollbars
-   *   so we just reset the scroll ever so often while in fullscreen mode
-   */
-  function resetScroll()
-  {
-    if(e._isFullScreen)
-    {
-      window.scroll(0,0);
-      window.setTimeout(resetScroll,150);
-    }
-  }
-
-  if(typeof this._isFullScreen == 'undefined')
-  {
-    this._isFullScreen = false;
-    if(e.target != e._iframe)
-    {
-      Xinha._addEvent(window, 'resize', sizeItUp);
-    }
-  }
-
-  // Gecko has a bug where if you change position/display on a
-  // designMode iframe that designMode dies.
-  if(Xinha.is_gecko)
-  {
-    this.deactivateEditor();
-  }
-
-  if(this._isFullScreen)
-  {
-    // Unmaximize
-    this._htmlArea.style.position = '';
-    if (!Xinha.is_ie ) this._htmlArea.style.border   = '';
-
-    try
-    {
-      if(Xinha.is_ie && document.compatMode == 'CSS1Compat')
-      {
-        var bod = document.getElementsByTagName('html');
-      }
-      else
-      {
-        var bod = document.getElementsByTagName('body');
-      }
-      bod[0].style.overflow='';
-    }
-    catch(e)
-    {
-      // Nutthin
-    }
-    this._isFullScreen = false;
-    sizeItDown();
-
-    // Restore all ancestor positions
-    var ancestor = this._htmlArea;
-    while((ancestor = ancestor.parentNode) && ancestor.style)
-    {
-      ancestor.style.position = ancestor._xinha_fullScreenOldPosition;
-      ancestor._xinha_fullScreenOldPosition = null;
-    }
-    
-    if ( Xinha.ie_version < 7 )
-    {
-      var selects = document.getElementsByTagName("select");
-      for ( var i=0;i<selects.length;++i )
-      {
-        selects[i].style.visibility = 'visible';
-      }
-    }
-    window.scroll(this._unScroll.x, this._unScroll.y);
-  }
-  else
-  {
-
-    // Get the current Scroll Positions
-    this._unScroll =
-    {
-     x:(window.pageXOffset)?(window.pageXOffset):(document.documentElement)?document.documentElement.scrollLeft:document.body.scrollLeft,
-     y:(window.pageYOffset)?(window.pageYOffset):(document.documentElement)?document.documentElement.scrollTop:document.body.scrollTop
-    };
-
-
-    // Make all ancestors position = static
-    var ancestor = this._htmlArea;
-    while((ancestor = ancestor.parentNode) && ancestor.style)
-    {
-      ancestor._xinha_fullScreenOldPosition = ancestor.style.position;
-      ancestor.style.position = 'static';
-    }
-    // very ugly bug in IE < 7 shows select boxes through elements that are positioned over them
-    if ( Xinha.ie_version < 7 )
-    {
-      var selects = document.getElementsByTagName("select");
-      var s, currentEditor;
-      for ( var i=0;i<selects.length;++i )
-      {
-        s = selects[i];
-        currentEditor = false;
-        while ( s = s.parentNode )
-        {
-          if ( s == this._htmlArea )
-          {
-            currentEditor = true;
-            break;
-          }
-        }
-        if ( !currentEditor && selects[i].style.visibility != 'hidden')
-        {
-          selects[i].style.visibility = 'hidden';
-        }
-      }
-    }
-    // Maximize
-    window.scroll(0,0);
-    this._htmlArea.style.position = 'absolute';
-    this._htmlArea.style.zIndex   = 999;
-    this._htmlArea.style.left     = e.config.fullScreenMargins[3] + 'px';
-    this._htmlArea.style.top      = e.config.fullScreenMargins[0] + 'px';
-    if ( !Xinha.is_ie ) this._htmlArea.style.border   = 'none';
-    this._isFullScreen = true;
-    resetScroll();
-
-    try
-    {
-      if(Xinha.is_ie && document.compatMode == 'CSS1Compat')
-      {
-        var bod = document.getElementsByTagName('html');
-      }
-      else
-      {
-        var bod = document.getElementsByTagName('body');
-      }
-      bod[0].style.overflow='hidden';
-    }
-    catch(e)
-    {
-      // Nutthin
-    }
-
-    sizeItUp();
-  }
-
-  if(Xinha.is_gecko)
-  {
-    this.activateEditor();
-  }
-  this.focusEditor();
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/FullScreen/lang/de.js b/web/imcms/xinha/modules/FullScreen/lang/de.js
deleted file mode 100644
index 72ff5a3a62..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/de.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Maximize/Minimize Editor": "Editor maximieren/verkleinern"
-};
diff --git a/web/imcms/xinha/modules/FullScreen/lang/fr.js b/web/imcms/xinha/modules/FullScreen/lang/fr.js
deleted file mode 100644
index af4b014f94..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/fr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Maximize/Minimize Editor": "Agrandir/Réduire l'éditeur"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/FullScreen/lang/ja.js b/web/imcms/xinha/modules/FullScreen/lang/ja.js
deleted file mode 100644
index f10c4da110..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/ja.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Maximize/Minimize Editor": "エディタ�最大化/最�化"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/FullScreen/lang/nb.js b/web/imcms/xinha/modules/FullScreen/lang/nb.js
deleted file mode 100644
index aba7c2b69e..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/nb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Maximize/Minimize Editor": "Maksimer/Minimer WYSIWYG vindu"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/FullScreen/lang/pl.js b/web/imcms/xinha/modules/FullScreen/lang/pl.js
deleted file mode 100644
index 0c639bb495..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/pl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, koto1sa@o2.pl, http://www.eskot.krakow.pl/portfolio
-{
-  "Maximize/Minimize Editor": "Maksymalizuj/minimalizuj edytor"
-};
diff --git a/web/imcms/xinha/modules/FullScreen/lang/pt_br.js b/web/imcms/xinha/modules/FullScreen/lang/pt_br.js
deleted file mode 100644
index 06e4812dcb..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Maximize/Minimize Editor": "Maximizar/Minimizar Editor"
-};
diff --git a/web/imcms/xinha/modules/FullScreen/lang/ru.js b/web/imcms/xinha/modules/FullScreen/lang/ru.js
deleted file mode 100644
index b2248ef880..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/ru.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Author: Andrei Blagorazumov, a@fnr.ru
-{
-  "Maximize/Minimize Editor": "Развернуть/Свернуть редактор"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/FullScreen/lang/sv.js b/web/imcms/xinha/modules/FullScreen/lang/sv.js
deleted file mode 100755
index c27fee57a2..0000000000
--- a/web/imcms/xinha/modules/FullScreen/lang/sv.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "sv" (Swedish), ENCODING: UTF-8
-// translated: Erik Dalén, <dalen@jpl.se>
-{
-  "Maximize/Minimize Editor": "Maximera/Minimera WYSIWYG fönster"
-};
diff --git a/web/imcms/xinha/modules/Gecko/Gecko.js b/web/imcms/xinha/modules/Gecko/Gecko.js
deleted file mode 100644
index fd70ab7eae..0000000000
--- a/web/imcms/xinha/modules/Gecko/Gecko.js
+++ /dev/null
@@ -1,785 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    -- This is the Gecko compatability plugin, part of the Xinha core.
-    --
-    --  The file is loaded as a special plugin by the Xinha Core when
-    --  Xinha is being run under a Gecko based browser with the Midas
-    --  editing API.
-    --
-    --  It provides implementation and specialisation for various methods
-    --  in the core where different approaches per browser are required.
-    --
-    --  Design Notes::
-    --   Most methods here will simply be overriding Xinha.prototype.<method>
-    --   and should be called that, but methods specific to Gecko should 
-    --   be a part of the Gecko.prototype, we won't trample on namespace
-    --   that way.
-    --
-    --  $HeadURL: http://svn.xinha.webfactional.com/trunk/modules/Gecko/Gecko.js $
-    --  $LastChangedDate: 2007-10-12 23:00:47 +1300 (Fri, 12 Oct 2007) $
-    --  $LastChangedRevision: 901 $
-    --  $LastChangedBy: ray $
-    --------------------------------------------------------------------------*/
-                                                    
-Gecko._pluginInfo = {
-  name          : "Gecko",
-  origin        : "Xinha Core",
-  version       : "$LastChangedRevision: 901 $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL: http://svn.xinha.webfactional.com/trunk/modules/Gecko/Gecko.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-function Gecko(editor) {
-  this.editor = editor;  
-  editor.Gecko = this;
-}
-
-/** Allow Gecko to handle some key events in a special way.
- */
-  
-Gecko.prototype.onKeyPress = function(ev)
-{
-  var editor = this.editor;
-  var s = editor.getSelection();
-  
-  // Handle shortcuts
-  if(editor.isShortCut(ev))
-  {
-    switch(editor.getKey(ev).toLowerCase())
-    {
-      case 'z':
-      {
-        if(editor._unLink && editor._unlinkOnUndo)
-        {
-          Xinha._stopEvent(ev);
-          editor._unLink();
-          editor.updateToolbar();
-          return true;
-        }
-      }
-      break;
-      
-      case 'a':
-      {
-        // KEY select all
-        sel = editor.getSelection();
-        sel.removeAllRanges();
-        range = editor.createRange();
-        range.selectNodeContents(editor._doc.body);
-        sel.addRange(range);
-        Xinha._stopEvent(ev);
-        return true;
-      }
-      break;
-      
-      case 'v':
-      {
-        // If we are not using htmlareaPaste, don't let Xinha try and be fancy but let the 
-        // event be handled normally by the browser (don't stopEvent it)
-        if(!editor.config.htmlareaPaste)
-        {          
-          return true;
-        }
-      }
-      break;
-    }
-  }
-  
-  // Handle normal characters
-  switch(editor.getKey(ev))
-  {
-    // Space, see if the text just typed looks like a URL, or email address
-    // and link it appropriatly
-    case ' ':
-    {      
-      var autoWrap = function (textNode, tag)
-      {
-        var rightText = textNode.nextSibling;
-        if ( typeof tag == 'string')
-        {
-          tag = editor._doc.createElement(tag);
-        }
-        var a = textNode.parentNode.insertBefore(tag, rightText);
-        Xinha.removeFromParent(textNode);
-        a.appendChild(textNode);
-        rightText.data = ' ' + rightText.data;
-    
-        s.collapse(rightText, 1);
-    
-        editor._unLink = function()
-        {
-          var t = a.firstChild;
-          a.removeChild(t);
-          a.parentNode.insertBefore(t, a);
-          Xinha.removeFromParent(a);
-          editor._unLink = null;
-          editor._unlinkOnUndo = false;
-        };
-        editor._unlinkOnUndo = true;
-    
-        return a;
-      };
-  
-      if ( editor.config.convertUrlsToLinks && s && s.isCollapsed && s.anchorNode.nodeType == 3 && s.anchorNode.data.length > 3 && s.anchorNode.data.indexOf('.') >= 0 )
-      {
-        var midStart = s.anchorNode.data.substring(0,s.anchorOffset).search(/\S{4,}$/);
-        if ( midStart == -1 )
-        {
-          break;
-        }
-
-        if ( editor._getFirstAncestor(s, 'a') )
-        {
-          break; // already in an anchor
-        }
-
-        var matchData = s.anchorNode.data.substring(0,s.anchorOffset).replace(/^.*?(\S*)$/, '$1');
-
-        var mEmail = matchData.match(Xinha.RE_email);
-        if ( mEmail )
-        {
-          var leftTextEmail  = s.anchorNode;
-          var rightTextEmail = leftTextEmail.splitText(s.anchorOffset);
-          var midTextEmail   = leftTextEmail.splitText(midStart);
-
-          autoWrap(midTextEmail, 'a').href = 'mailto:' + mEmail[0];
-          break;
-        }
-
-        RE_date = /([0-9]+\.)+/; //could be date or ip or something else ...
-        RE_ip = /(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/;
-        var mUrl = matchData.match(Xinha.RE_url);
-        if ( mUrl )
-        {
-          if (RE_date.test(matchData))
-          {
-            break; //ray: disabling linking of IP numbers because of general bugginess (see Ticket #1085)
-            /*if (!RE_ip.test(matchData)) 
-            {
-              break;
-            }*/
-          } 
-          var leftTextUrl  = s.anchorNode;
-          var rightTextUrl = leftTextUrl.splitText(s.anchorOffset);
-          var midTextUrl   = leftTextUrl.splitText(midStart);
-          autoWrap(midTextUrl, 'a').href = (mUrl[1] ? mUrl[1] : 'http://') + mUrl[2];
-          break;
-        }
-      }
-    }
-    break;    
-  }
-  
-  // Handle special keys
-  switch ( ev.keyCode )
-  {    
-/*  This is now handled by a plugin  
-    case 13: // ENTER
-      if( !ev.shiftKey && editor.config.mozParaHandler == 'dirty' )
-      {
-        this.dom_checkInsertP();
-        Xinha._stopEvent(ev);
-      }
-    break;*/
-
-    case 27: // ESCAPE
-    {
-      if ( editor._unLink )
-      {
-        editor._unLink();
-        Xinha._stopEvent(ev);
-      }
-      break;
-    }
-    break;
-    
-    case 8: // KEY backspace
-    case 46: // KEY delete
-    {
-      // We handle the mozilla backspace directly??
-      if ( !ev.shiftKey && this.handleBackspace() )
-      {
-        Xinha._stopEvent(ev);
-      }
-    }
-    
-    default:
-    {
-        editor._unlinkOnUndo = false;
-
-        // Handle the "auto-linking", specifically this bit of code sets up a handler on
-        // an self-titled anchor (eg <a href="http://www.gogo.co.nz/">www.gogo.co.nz</a>)
-        // when the text content is edited, such that it will update the href on the anchor
-        
-        if ( s.anchorNode && s.anchorNode.nodeType == 3 )
-        {
-          // See if we might be changing a link
-          var a = editor._getFirstAncestor(s, 'a');
-          // @todo: we probably need here to inform the setTimeout below that we not changing a link and not start another setTimeout
-          if ( !a )
-          {
-            break; // not an anchor
-          } 
-          
-          if ( !a._updateAnchTimeout )
-          {
-            if ( s.anchorNode.data.match(Xinha.RE_email) && a.href.match('mailto:' + s.anchorNode.data.trim()) )
-            {
-              var textNode = s.anchorNode;
-              var fnAnchor = function()
-              {
-                a.href = 'mailto:' + textNode.data.trim();
-                // @fixme: why the hell do another timeout is started ?
-                //         This lead to never ending timer if we dont remove this line
-                //         But when removed, the email is not correctly updated
-                //
-                // - to fix this we should make fnAnchor check to see if textNode.data has
-                //   stopped changing for say 5 seconds and if so we do not make this setTimeout 
-                a._updateAnchTimeout = setTimeout(fnAnchor, 250);
-              };
-              a._updateAnchTimeout = setTimeout(fnAnchor, 1000);
-              break;
-            }
-
-            var m = s.anchorNode.data.match(Xinha.RE_url);
-
-            if ( m && a.href.match(new RegExp( 'http(s)?://' + Xinha.escapeStringForRegExp( s.anchorNode.data.trim() ) ) ) )
-            {
-              var txtNode = s.anchorNode;
-              var fnUrl = function()
-              {
-                // Sometimes m is undefined becase the url is not an url anymore (was www.url.com and become for example www.url)
-                // ray: shouldn't the link be un-linked then?
-                m = txtNode.data.match(Xinha.RE_url);
-                if(m)
-                {
-                  a.href = (m[1] ? m[1] : 'http://') + m[2];
-                }
-                
-                // @fixme: why the hell do another timeout is started ?
-                //         This lead to never ending timer if we dont remove this line
-                //         But when removed, the url is not correctly updated
-                //
-                // - to fix this we should make fnUrl check to see if textNode.data has
-                //   stopped changing for say 5 seconds and if so we do not make this setTimeout
-                a._updateAnchTimeout = setTimeout(fnUrl, 250);
-              };
-              a._updateAnchTimeout = setTimeout(fnUrl, 1000);
-            }
-          }        
-        }                
-    }
-    break;
-  }
-
-  return false; // Let other plugins etc continue from here.
-}
-
-/** When backspace is hit, the Gecko onKeyPress will execute this method.
- *  I don't remember what the exact purpose of this is though :-(
- */
- 
-Gecko.prototype.handleBackspace = function()
-{
-  var editor = this.editor;
-  setTimeout(
-    function()
-    {
-      var sel   = editor.getSelection();
-      var range = editor.createRange(sel);
-      var SC = range.startContainer;
-      var SO = range.startOffset;
-      var EC = range.endContainer;
-      var EO = range.endOffset;
-      var newr = SC.nextSibling;
-      if ( SC.nodeType == 3 )
-      {
-        SC = SC.parentNode;
-      }
-      if ( ! ( /\S/.test(SC.tagName) ) )
-      {
-        var p = document.createElement("p");
-        while ( SC.firstChild )
-        {
-          p.appendChild(SC.firstChild);
-        }
-        SC.parentNode.insertBefore(p, SC);
-        Xinha.removeFromParent(SC);
-        var r = range.cloneRange();
-        r.setStartBefore(newr);
-        r.setEndAfter(newr);
-        r.extractContents();
-        sel.removeAllRanges();
-        sel.addRange(r);
-      }
-    },
-    10);
-};
-
-Gecko.prototype.inwardHtml = function(html)
-{
-   // Midas uses b and i internally instead of strong and em
-   // Xinha will use strong and em externally (see Xinha.prototype.outwardHtml)   
-   html = html.replace(/<(\/?)strong(\s|>|\/)/ig, "<$1b$2");
-   html = html.replace(/<(\/?)em(\s|>|\/)/ig, "<$1i$2");    
-   
-   // Both IE and Gecko use strike internally instead of del (#523)
-   // Xinha will present del externally (see Xinha.prototype.outwardHtml
-   html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
-   
-   return html;
-}
-
-Gecko.prototype.outwardHtml = function(html)
-{
-  // ticket:56, the "greesemonkey" plugin for Firefox adds this junk,
-  // so we strip it out.  Original submitter gave a plugin, but that's
-  // a bit much just for this IMHO - james
-  html = html.replace(/<script[\s]*src[\s]*=[\s]*['"]chrome:\/\/.*?["']>[\s]*<\/script>/ig, '');
-
-  return html;
-}
-
-Gecko.prototype.onExecCommand = function(cmdID, UI, param)
-{   
-  try
-  {
-    // useCSS deprecated & replaced by styleWithCSS
-    this.editor._doc.execCommand('useCSS', false, true); //switch useCSS off (true=off)
-    this.editor._doc.execCommand('styleWithCSS', false, false); //switch styleWithCSS off     
-  } catch (ex) {}
-    
-  switch(cmdID)
-  {
-    case 'paste':
-    {
-      alert(Xinha._lc("The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly."));
-      return true; // Indicate paste is done, stop command being issued to browser by Xinha.prototype.execCommand
-    }
-  }
-  
-  return false;
-}
-Gecko.prototype.onMouseDown = function(ev)
-{   
-  // Gecko doesn't select hr's on single click
-  if (ev.target.tagName.toLowerCase() == "hr")
-  {
-    var sel = this.editor.getSelection();
-    var range = this.editor.createRange(sel);
-    range.selectNode(ev.target);
-  }
-}
-
-
-/*--------------------------------------------------------------------------*/
-/*------- IMPLEMENTATION OF THE ABSTRACT "Xinha.prototype" METHODS ---------*/
-/*--------------------------------------------------------------------------*/
-
-/** Insert a node at the current selection point. 
- * @param toBeInserted DomNode
- */
-
-Xinha.prototype.insertNodeAtSelection = function(toBeInserted)
-{
-  var sel = this.getSelection();
-  var range = this.createRange(sel);
-  // remove the current selection
-  sel.removeAllRanges();
-  range.deleteContents();
-  var node = range.startContainer;
-  var pos = range.startOffset;
-  var selnode = toBeInserted;
-  switch ( node.nodeType )
-  {
-    case 3: // Node.TEXT_NODE
-      // we have to split it at the caret position.
-      if ( toBeInserted.nodeType == 3 )
-      {
-        // do optimized insertion
-        node.insertData(pos, toBeInserted.data);
-        range = this.createRange();
-        range.setEnd(node, pos + toBeInserted.length);
-        range.setStart(node, pos + toBeInserted.length);
-        sel.addRange(range);
-      }
-      else
-      {
-        node = node.splitText(pos);
-        if ( toBeInserted.nodeType == 11 /* Node.DOCUMENT_FRAGMENT_NODE */ )
-        {
-          selnode = selnode.firstChild;
-        }
-        node.parentNode.insertBefore(toBeInserted, node);
-        this.selectNodeContents(selnode);
-        this.updateToolbar();
-      }
-    break;
-    case 1: // Node.ELEMENT_NODE
-      if ( toBeInserted.nodeType == 11 /* Node.DOCUMENT_FRAGMENT_NODE */ )
-      {
-        selnode = selnode.firstChild;
-      }
-      node.insertBefore(toBeInserted, node.childNodes[pos]);
-      this.selectNodeContents(selnode);
-      this.updateToolbar();
-    break;
-  }
-};
-  
-/** Get the parent element of the supplied or current selection. 
- *  @param   sel optional selection as returned by getSelection
- *  @returns DomNode
- */
- 
-Xinha.prototype.getParentElement = function(sel)
-{
-  if ( typeof sel == 'undefined' )
-  {
-    sel = this.getSelection();
-  }
-  var range = this.createRange(sel);
-  try
-  {
-    var p = range.commonAncestorContainer;
-    if ( !range.collapsed && range.startContainer == range.endContainer &&
-        range.startOffset - range.endOffset <= 1 && range.startContainer.hasChildNodes() )
-    {
-      p = range.startContainer.childNodes[range.startOffset];
-    }
-
-    while ( p.nodeType == 3 )
-    {
-      p = p.parentNode;
-    }
-    return p;
-  }
-  catch (ex)
-  {
-    return null;
-  }
-};
-
-/**
- * Returns the selected element, if any.  That is,
- * the element that you have last selected in the "path"
- * at the bottom of the editor, or a "control" (eg image)
- *
- * @returns null | DomNode
- */
-
-Xinha.prototype.activeElement = function(sel)
-{
-  if ( ( sel === null ) || this.selectionEmpty(sel) )
-  {
-    return null;
-  }
-
-  // For Mozilla we just see if the selection is not collapsed (something is selected)
-  // and that the anchor (start of selection) is an element.  This might not be totally
-  // correct, we possibly should do a simlar check to IE?
-  if ( !sel.isCollapsed )
-  {      
-    if ( sel.anchorNode.childNodes.length > sel.anchorOffset && sel.anchorNode.childNodes[sel.anchorOffset].nodeType == 1 )
-    {
-      return sel.anchorNode.childNodes[sel.anchorOffset];
-    }
-    else if ( sel.anchorNode.nodeType == 1 )
-    {
-      return sel.anchorNode;
-    }
-    else
-    {
-      return null; // return sel.anchorNode.parentNode;
-    }
-  }
-  return null;
-};
-
-/** 
- * Determines if the given selection is empty (collapsed).
- * @param selection Selection object as returned by getSelection
- * @returns true|false
- */
- 
-Xinha.prototype.selectionEmpty = function(sel)
-{
-  if ( !sel )
-  {
-    return true;
-  }
-
-  if ( typeof sel.isCollapsed != 'undefined' )
-  {      
-    return sel.isCollapsed;
-  }
-
-  return true;
-};
-
-/** 
- * Returns a range object to be stored 
- * and later restored with Xinha.prototype.restoreSelection()
- * 
- * @returns Range
- */
-Xinha.prototype.saveSelection = function()
-{
-  return this.createRange(this.getSelection()).cloneRange();
-}
-/** 
- * Restores a selection previously stored
- * @param savedSelection Range object as returned by Xinha.prototype.restoreSelection()
- */
-Xinha.prototype.restoreSelection = function(savedSelection)
-{
-  var sel = this.getSelection();
-  sel.removeAllRanges();
-  sel.addRange(savedSelection);
-}
-/**
- * Selects the contents of the given node.  If the node is a "control" type element, (image, form input, table)
- * the node itself is selected for manipulation.
- *
- * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
-{
-  this.focusEditor();
-  this.forceRedraw();
-  var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
-  var sel = this.getSelection();
-  range = this._doc.createRange();
-  // Tables and Images get selected as "objects" rather than the text contents
-  if ( collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img|input|textarea|select/) )
-  {
-    range.selectNode(node);
-  }
-  else
-  {
-    range.selectNodeContents(node);
-    //(collapsed) && range.collapse(pos);
-  }
-  sel.removeAllRanges();
-  sel.addRange(range);
-};
-  
-/** Insert HTML at the current position, deleting the selection if any. 
- *  
- *  @param html string
- */
- 
-Xinha.prototype.insertHTML = function(html)
-{
-  var sel = this.getSelection();
-  var range = this.createRange(sel);
-  this.focusEditor();
-  // construct a new document fragment with the given HTML
-  var fragment = this._doc.createDocumentFragment();
-  var div = this._doc.createElement("div");
-  div.innerHTML = html;
-  while ( div.firstChild )
-  {
-    // the following call also removes the node from div
-    fragment.appendChild(div.firstChild);
-  }
-  // this also removes the selection
-  var node = this.insertNodeAtSelection(fragment);
-};
-
-/** Get the HTML of the current selection.  HTML returned has not been passed through outwardHTML.
- *
- * @returns string
- */
- 
-Xinha.prototype.getSelectedHTML = function()
-{
-  var sel = this.getSelection();
-  var range = this.createRange(sel);
-  return Xinha.getHTML(range.cloneContents(), false, this);
-};
-  
-
-/** Get a Selection object of the current selection.  Note that selection objects are browser specific.
- *
- * @returns Selection
- */
- 
-Xinha.prototype.getSelection = function()
-{
-  return this._iframe.contentWindow.getSelection();
-};
-  
-/** Create a Range object from the given selection.  Note that range objects are browser specific.
- *
- *  @param sel Selection object (see getSelection)
- *  @returns Range
- */
- 
-Xinha.prototype.createRange = function(sel)
-{
-  this.activateEditor();
-  if ( typeof sel != "undefined" )
-  {
-    try
-    {
-      return sel.getRangeAt(0);
-    }
-    catch(ex)
-    {
-      return this._doc.createRange();
-    }
-  }
-  else
-  {
-    return this._doc.createRange();
-  }
-};
-
-/** Determine if the given event object is a keydown/press event.
- *
- *  @param event Event 
- *  @returns true|false
- */
- 
-Xinha.prototype.isKeyEvent = function(event)
-{
-  return event.type == "keypress";
-}
-
-/** Return the character (as a string) of a keyEvent  - ie, press the 'a' key and
- *  this method will return 'a', press SHIFT-a and it will return 'A'.
- * 
- *  @param   keyEvent
- *  @returns string
- */
-                                   
-Xinha.prototype.getKey = function(keyEvent)
-{
-  return String.fromCharCode(keyEvent.charCode);
-}
-
-/** Return the HTML string of the given Element, including the Element.
- * 
- * @param element HTML Element DomNode
- * @returns string
- */
- 
-Xinha.getOuterHTML = function(element)
-{
-  return (new XMLSerializer()).serializeToString(element);
-};
-
-//Control character for retaining edit location when switching modes
-Xinha.prototype.cc = String.fromCharCode(173); 
-
-Xinha.prototype.setCC = function ( target )
-{
-  var cc = this.cc;
-  try
-  {
-    if ( target == "textarea" )
-    {
-      var ta = this._textArea;
-      var index = ta.selectionStart;
-      var before = ta.value.substring( 0, index )
-      var after = ta.value.substring( index, ta.value.length );
-
-      if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
-      {
-        var tagEnd = after.indexOf(">") + 1;
-        ta.value = before + after.substring( 0, tagEnd ) + cc + after.substring( tagEnd, after.length );
-      }
-      else ta.value = before + cc + after;
-      ta.value = ta.value.replace(new RegExp ('(<script[^>]*>[^'+cc+']*?)('+cc+')([^'+cc+']*?<\/script>)'), "$1$3$2");
-      ta.value = ta.value.replace(new RegExp ('^([^'+cc+']*)('+cc+')([^'+cc+']*<body[^>]*>)(.*?)'), "$1$3$2$4");
-    }
-    else
-    {
-      var sel = this.getSelection();
-      sel.getRangeAt(0).insertNode( document.createTextNode( cc ) );
-    }
-  } catch (e) {}
-};
-
-Xinha.prototype.findCC = function ( target )
-{
-  try 
-  {
-    var findIn = ( target == 'textarea' ) ? window : this._iframe.contentWindow;
-    if( findIn.find( this.cc ) )
-    {
-      if (target == "textarea")
-      {
-        var ta = this._textArea;
-        var start = pos = ta.selectionStart;
-        var end = ta.selectionEnd;
-        var scrollTop = ta.scrollTop;
-        ta.value = ta.value.substring( 0, start ) + ta.value.substring( end, ta.value.length );
-        ta.selectionStart = pos;
-        ta.selectionEnd = pos;
-        ta.scrollTop = scrollTop
-        ta.focus();
-      }
-      else
-      {
-        var sel = this.getSelection();
-        sel.getRangeAt(0).deleteContents();
-        this._iframe.contentWindow.focus();
-      }
-    }
-  } catch (e) {}
-};
-/*--------------------------------------------------------------------------*/
-/*------------ EXTEND SOME STANDARD "Xinha.prototype" METHODS --------------*/
-/*--------------------------------------------------------------------------*/
-
-Xinha.prototype._standardToggleBorders = Xinha.prototype._toggleBorders;
-Xinha.prototype._toggleBorders = function()
-{
-  var result = this._standardToggleBorders();
-  
-  // flashing the display forces moz to listen (JB:18-04-2005) - #102
-  var tables = this._doc.getElementsByTagName('TABLE');
-  for(var i = 0; i < tables.length; i++)
-  {
-    tables[i].style.display="none";
-    tables[i].style.display="table";
-  }
-  
-  return result;
-};
-
-/** Return the doctype of a document, if set
- * 
- * @param doc DOM element document
- * @returns string the actual doctype
- */
-Xinha.getDoctype = function (doc)
-{
-  var d = '';
-  if (doc.doctype)
-  {
-    d += '<!DOCTYPE ' + doc.doctype.name + " PUBLIC ";
-    d +=  doc.doctype.publicId ? '"' + doc.doctype.publicId + '"' : '';  
-    d +=  doc.doctype.systemId ? ' "'+ doc.doctype.systemId + '"' : ''; 
-    d += ">";
-  }
-  return d;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/Gecko/lang/pt_br.js b/web/imcms/xinha/modules/Gecko/lang/pt_br.js
deleted file mode 100644
index dec0a00d4d..0000000000
--- a/web/imcms/xinha/modules/Gecko/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "O botão Colar não funciona em navegadores baseados no Mozilla (por razões técnicas de segurança). Pressione CTRL-V no seu teclado para colar diretamente."
-}
diff --git a/web/imcms/xinha/modules/Gecko/paraHandlerBest.js b/web/imcms/xinha/modules/Gecko/paraHandlerBest.js
deleted file mode 100644
index 4af0ab6d55..0000000000
--- a/web/imcms/xinha/modules/Gecko/paraHandlerBest.js
+++ /dev/null
@@ -1,907 +0,0 @@
-// tabs 2
-
-/**
-* @fileoverview By Adam Wright, for The University of Western Australia
-*
-* Distributed under the same terms as Xinha itself.
-* This notice MUST stay intact for use (see license.txt).
-*
-* Heavily modified by Yermo Lamers of DTLink, LLC, College Park, Md., USA.
-* For more info see http://www.areaedit.com
-*/
-
-/**
-* plugin Info
-*/
-
-EnterParagraphs._pluginInfo =
-{
-  name          : "EnterParagraphs",
-  version       : "1.0",
-  developer     : "Adam Wright",
-  developer_url : "http://www.hipikat.org/",
-  sponsor       : "The University of Western Australia",
-  sponsor_url   : "http://www.uwa.edu.au/",
-  license       : "htmlArea"
-};
-
-// ------------------------------------------------------------------
-
-// "constants"
-
-/**
-* Whitespace Regex
-*/
-
-EnterParagraphs.prototype._whiteSpace = /^\s*$/;
-
-/**
-* The pragmatic list of which elements a paragraph may not contain
-*/
-
-EnterParagraphs.prototype._pExclusions = /^(address|blockquote|body|dd|div|dl|dt|fieldset|form|h1|h2|h3|h4|h5|h6|hr|li|noscript|ol|p|pre|table|ul)$/i;
-
-/**
-* elements which may contain a paragraph
-*/
-
-EnterParagraphs.prototype._pContainers = /^(body|del|div|fieldset|form|ins|map|noscript|object|td|th)$/i;
-
-/**
-* Elements which may not contain paragraphs, and would prefer a break to being split
-*/
-
-EnterParagraphs.prototype._pBreak = /^(address|pre|blockquote)$/i;
-
-/**
-* Elements which may not contain children
-*/
-
-EnterParagraphs.prototype._permEmpty = /^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i;
-
-/**
-* Elements which count as content, as distinct from whitespace or containers
-*/
-
-EnterParagraphs.prototype._elemSolid = /^(applet|br|button|hr|img|input|table)$/i;
-
-/**
-* Elements which should get a new P, before or after, when enter is pressed at either end
-*/
-
-EnterParagraphs.prototype._pifySibling = /^(address|blockquote|del|div|dl|fieldset|form|h1|h2|h3|h4|h5|h6|hr|ins|map|noscript|object|ol|p|pre|table|ul|)$/i;
-EnterParagraphs.prototype._pifyForced = /^(ul|ol|dl|table)$/i;
-
-/**
-* Elements which should get a new P, before or after a close parent, when enter is pressed at either end
-*/
-
-EnterParagraphs.prototype._pifyParent = /^(dd|dt|li|td|th|tr)$/i;
-
-// ---------------------------------------------------------------------
-
-/**
-* EnterParagraphs Constructor
-*/
-
-function EnterParagraphs(editor)
-{
-  
-  this.editor = editor;
-  
-  // hook into the event handler to intercept key presses if we are using
-  // gecko (Mozilla/FireFox)
-  if (Xinha.is_gecko)
-  {
-    this.onKeyPress = this.__onKeyPress;
-  }
-  
-}	// end of constructor.
-
-// ------------------------------------------------------------------
-
-/**
-* name member for debugging
-*
-* This member is used to identify objects of this class in debugging
-* messages.
-*/
-EnterParagraphs.prototype.name = "EnterParagraphs";
-
-/**
-* Gecko's a bit lacking in some odd ways...
-*/
-EnterParagraphs.prototype.insertAdjacentElement = function(ref,pos,el)
-{
-  if ( pos == 'BeforeBegin' )
-  {
-    ref.parentNode.insertBefore(el,ref);
-  }
-  else if ( pos == 'AfterEnd' )
-  {
-    ref.nextSibling ? ref.parentNode.insertBefore(el,ref.nextSibling) : ref.parentNode.appendChild(el);
-  }
-  else if ( pos == 'AfterBegin' && ref.firstChild )
-  {
-    ref.insertBefore(el,ref.firstChild);
-  }
-  else if ( pos == 'BeforeEnd' || pos == 'AfterBegin' )
-  {
-    ref.appendChild(el);
-  }
-  
-};	// end of insertAdjacentElement()
-
-// ----------------------------------------------------------------
-
-/**
-* Passes a global parent node or document fragment to forEachNode
-*
-* @param root node root node to start search from.
-* @param mode string function to apply to each node.
-* @param direction string traversal direction "ltr" (left to right) or "rtl" (right_to_left)
-* @param init boolean
-*/
-
-EnterParagraphs.prototype.forEachNodeUnder = function ( root, mode, direction, init )
-{
-  
-  // Identify the first and last nodes to deal with
-  var start, end;
-  
-  // nodeType 11 is DOCUMENT_FRAGMENT_NODE which is a container.
-  if ( root.nodeType == 11 && root.firstChild )
-  {
-    start = root.firstChild;
-    end = root.lastChild;
-  }
-  else
-  {
-    start = end = root;
-  }
-  // traverse down the right hand side of the tree getting the last child of the last
-  // child in each level until we reach bottom.
-  while ( end.lastChild )
-  {
-    end = end.lastChild;
-  }
-  
-  return this.forEachNode( start, end, mode, direction, init);
-  
-};	// end of forEachNodeUnder()
-
-// -----------------------------------------------------------------------
-
-/**
-* perform a depth first descent in the direction requested.
-*
-* @param left_node node "start node"
-* @param right_node node "end node"
-* @param mode string function to apply to each node. cullids or emptyset.
-* @param direction string traversal direction "ltr" (left to right) or "rtl" (right_to_left)
-* @param init boolean or object.
-*/
-
-EnterParagraphs.prototype.forEachNode = function (left_node, right_node, mode, direction, init)
-{
-  
-  // returns "Brother" node either left or right.
-  var getSibling = function(elem, direction)
-	{
-    return ( direction == "ltr" ? elem.nextSibling : elem.previousSibling );
-	};
-  
-  var getChild = function(elem, direction)
-	{
-    return ( direction == "ltr" ? elem.firstChild : elem.lastChild );
-	};
-  
-  var walk, lookup, fnReturnVal;
-  
-  // FIXME: init is a boolean in the emptyset case and an object in
-  // the cullids case. Used inconsistently.
-  
-  var next_node = init;
-  
-  // used to flag having reached the last node.
-  
-  var done_flag = false;
-  
-  // loop ntil we've hit the last node in the given direction.
-  // if we're going left to right that's the right_node and visa-versa.
-  
-  while ( walk != direction == "ltr" ? right_node : left_node )
-  {
-    
-    // on first entry, walk here is null. So this is how
-    // we prime the loop with the first node.
-    
-    if ( !walk )
-    {
-      walk = direction == "ltr" ? left_node : right_node;
-    }
-    else
-    {
-      
-      // is there a child node?
-      
-      if ( getChild(walk,direction) )
-      {
-        
-        // descend down into the child.
-        
-        walk = getChild(walk,direction);
-        
-      }
-      else
-      {
-        
-        // is there a sibling node on this level?
-        
-        if ( getSibling(walk,direction) )
-        {
-          // move to the sibling.
-          walk = getSibling(walk,direction); 
-        }
-        else
-        {
-          lookup = walk;
-          
-          // climb back up the tree until we find a level where we are not the end
-          // node on the level (i.e. that we have a sibling in the direction
-            // we are searching) or until we reach the end.
-          
-          while ( !getSibling(lookup,direction) && lookup != (direction == "ltr" ? right_node : left_node) )
-          {
-            lookup = lookup.parentNode;
-          }
-          
-          // did we find a level with a sibling?
-          
-          // walk = ( lookup.nextSibling ? lookup.nextSibling : lookup ) ;
-          
-          walk = ( getSibling(lookup,direction) ? getSibling(lookup,direction) : lookup ) ;
-          
-        }
-      }
-      
-    }	// end of else walk.
-    
-    // have we reached the end? either as a result of the top while loop or climbing
-    // back out above.
-    
-    done_flag = (walk==( direction == "ltr" ? right_node : left_node));
-    
-    // call the requested function on the current node. Functions
-    // return an array.
-    //
-    // Possible functions are _fenCullIds, _fenEmptySet
-    //
-    // The situation is complicated by the fact that sometimes we want to
-    // return the base node and sometimes we do not.
-    //
-    // next_node can be an object (this.takenIds), a node (text, el, etc) or false.
-    
-    switch( mode )
-    {
-      
-    case "cullids":
-      
-      fnReturnVal = this._fenCullIds(walk, next_node );
-      break;
-      
-    case "find_fill":
-      
-      fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);
-      break;
-      
-    case "find_cursorpoint":
-      
-      fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);
-      break;
-      
-    }
-    
-    // If this node wants us to return, return next_node
-    
-    if ( fnReturnVal[0] )
-    {
-      return fnReturnVal[1];
-    }
-    
-    // are we done with the loop?
-    
-    if ( done_flag )
-    {
-      break;
-    }
-    
-    // Otherwise, pass to the next node
-    
-    if ( fnReturnVal[1] )
-    {
-      next_node = fnReturnVal[1];
-    }
-    
-  }	// end of while loop
-  
-  return false;
-  
-};	// end of forEachNode()
-
-// -------------------------------------------------------------------
-
-/**
-* Find a post-insertion node, only if all nodes are empty, or the first content
-*
-* @param node node current node beinge examined.
-* @param next_node node next node to be examined.
-* @param node string "find_fill" or "find_cursorpoint"
-* @param last_flag boolean is this the last node?
-*/
-
-EnterParagraphs.prototype._fenEmptySet = function( node, next_node, mode, last_flag)
-{
-  
-  // Mark this if it's the first base
-  
-  if ( !next_node && !node.firstChild )
-  {
-    next_node = node;
-  }
-  
-  // Is it an element node and is it considered content? (br, hr, etc)
-  // or is it a text node that is not just whitespace?
-  // or is it not an element node and not a text node?
-  
-  if ( (node.nodeType == 1 && this._elemSolid.test(node.nodeName)) ||
-    (node.nodeType == 3 && !this._whiteSpace.test(node.nodeValue)) ||
-  (node.nodeType != 1 && node.nodeType != 3) )
-  {
-    
-    switch( mode )
-    {
-      
-    case "find_fill":
-      
-      // does not return content.
-      
-      return new Array(true, false );
-      break;
-      
-    case "find_cursorpoint":
-      
-      // returns content
-      
-      return new Array(true, node );
-      break;
-      
-    }
-    
-  }
-  
-  // In either case (fill or findcursor) we return the base node. The avoids
-  // problems in terminal cases (beginning or end of document or container tags)
-  
-  if ( last_flag )
-  {
-    return new Array( true, next_node );
-  }
-  
-  return new Array( false, next_node );
-  
-};	// end of _fenEmptySet()
-
-// ------------------------------------------------------------------------------
-
-/**
-* remove duplicate Id's.
-*
-* @param ep_ref enterparagraphs reference to enterparagraphs object
-*/
-
-EnterParagraphs.prototype._fenCullIds = function ( ep_ref, node, pong )
-{
-  
-  // Check for an id, blast it if it's in the store, otherwise add it
-  
-  if ( node.id )
-  {
-    
-    pong[node.id] ? node.id = '' : pong[node.id] = true;
-  }
-  
-  return new Array(false,pong);
-  
-};
-
-// ---------------------------------------------------------------------------------
-
-/**
-* Grabs a range suitable for paragraph stuffing
-*
-* @param rng Range
-* @param search_direction string "left" or "right"
-*
-* @todo check blank node issue in roaming loop.
-*/
-
-EnterParagraphs.prototype.processSide = function( rng, search_direction)
-{
-  
-  var next = function(element, search_direction)
-	{
-    return ( search_direction == "left" ? element.previousSibling : element.nextSibling );
-	};
-  
-  var node = search_direction == "left" ? rng.startContainer : rng.endContainer;
-  var offset = search_direction == "left" ? rng.startOffset : rng.endOffset;
-  var roam, start = node;
-  
-  // Never start with an element, because then the first roaming node might
-  // be on the exclusion list and we wouldn't know until it was too late
-  
-  while ( start.nodeType == 1 && !this._permEmpty.test(start.nodeName) )
-  {
-    start = ( offset ? start.lastChild : start.firstChild );
-  }
-  
-  // Climb the tree, left or right, until our course of action presents itself
-  //
-  // if roam is NULL try start.
-  // if roam is NOT NULL, try next node in our search_direction
-  // If that node is NULL, get our parent node.
-  //
-  // If all the above turns out NULL end the loop.
-  //
-  // FIXME: gecko (firefox 1.0.3) - enter "test" into an empty document and press enter.
-  // sometimes this loop finds a blank text node, sometimes it doesn't.
-  
-  while ( roam = roam ? ( next(roam,search_direction) ? next(roam,search_direction) : roam.parentNode ) : start )
-  {
-    
-    // next() is an inline function defined above that returns the next node depending
-    // on the direction we're searching.
-    
-    if ( next(roam,search_direction) )
-    {
-      
-      // If the next sibling's on the exclusion list, stop before it
-      
-      if ( this._pExclusions.test(next(roam,search_direction).nodeName) )
-      {
-        
-        return this.processRng(rng, search_direction, roam, next(roam,search_direction), (search_direction == "left"?'AfterEnd':'BeforeBegin'), true, false);
-      }
-    }
-    else
-    {
-      
-      // If our parent's on the container list, stop inside it
-      
-      if (this._pContainers.test(roam.parentNode.nodeName))
-      {
-        
-        return this.processRng(rng, search_direction, roam, roam.parentNode, (search_direction == "left"?'AfterBegin':'BeforeEnd'), true, false);
-      }
-      else if (this._pExclusions.test(roam.parentNode.nodeName))
-      {
-        
-        // chop without wrapping
-        
-        if (this._pBreak.test(roam.parentNode.nodeName))
-        {
-          
-          return this.processRng(rng, search_direction, roam, roam.parentNode,
-            (search_direction == "left"?'AfterBegin':'BeforeEnd'), false, (search_direction == "left" ?true:false));
-        }
-        else
-        {
-          
-          // the next(roam,search_direction) in this call is redundant since we know it's false
-          // because of the "if next(roam,search_direction)" above.
-          //
-          // the final false prevents this range from being wrapped in <p>'s most likely
-          // because it's already wrapped.
-          
-          return this.processRng(rng,
-            search_direction,
-            (roam = roam.parentNode),
-            (next(roam,search_direction) ? next(roam,search_direction) : roam.parentNode),
-            (next(roam,search_direction) ? (search_direction == "left"?'AfterEnd':'BeforeBegin') : (search_direction == "left"?'AfterBegin':'BeforeEnd')),
-            false,
-            false);
-        }
-      }
-    }
-  }
-  
-};	// end of processSide()
-
-// ------------------------------------------------------------------------------
-
-/**
-* processRng - process Range.
-*
-* Neighbour and insertion identify where the new node, roam, needs to enter
-* the document; landmarks in our selection will be deleted before insertion
-*
-* @param rn Range original selected range
-* @param search_direction string Direction to search in.
-* @param roam node
-* @param insertion string may be AfterBegin of BeforeEnd
-* @return array
-*/
-
-EnterParagraphs.prototype.processRng = function(rng, search_direction, roam, neighbour, insertion, pWrap, preBr)
-{
-  var node = search_direction == "left" ? rng.startContainer : rng.endContainer;
-  var offset = search_direction == "left" ? rng.startOffset : rng.endOffset;
-  
-  // Define the range to cut, and extend the selection range to the same boundary
-  
-  var editor = this.editor;
-  var newRng = editor._doc.createRange();
-  
-  newRng.selectNode(roam);
-  // extend the range in the given direction.
-  
-  if ( search_direction == "left")
-  {
-    newRng.setEnd(node, offset);
-    rng.setStart(newRng.startContainer, newRng.startOffset);
-  }
-  else if ( search_direction == "right" )
-  {
-    
-    newRng.setStart(node, offset);
-    rng.setEnd(newRng.endContainer, newRng.endOffset);
-  }
-  // Clone the range and remove duplicate ids it would otherwise produce
-  
-  var cnt = newRng.cloneContents();
-  
-  // in this case "init" is an object not a boolen.
-  
-  this.forEachNodeUnder( cnt, "cullids", "ltr", this.takenIds, false, false);
-  
-  // Special case, for inserting paragraphs before some blocks when caret is at
-  // their zero offset.
-  //
-  // Used to "open up space" in front of a list, table. Usefull if the list is at
-  // the top of the document. (otherwise you'd have no way of "moving it down").
-  
-  var pify, pifyOffset, fill;
-  pify = search_direction == "left" ? (newRng.endContainer.nodeType == 3 ? true:false) : (newRng.startContainer.nodeType == 3 ? false:true);
-  pifyOffset = pify ? newRng.startOffset : newRng.endOffset;
-  pify = pify ? newRng.startContainer : newRng.endContainer;
-  
-  if ( this._pifyParent.test(pify.nodeName) && pify.parentNode.childNodes.item(0) == pify )
-  {
-    while ( !this._pifySibling.test(pify.nodeName) )
-    {
-      pify = pify.parentNode;
-    }
-  }
-  
-  // NODE TYPE 11 is DOCUMENT_FRAGMENT NODE
-  // I do not profess to understand any of this, simply applying a patch that others say is good - ticket:446
-  if ( cnt.nodeType == 11 && !cnt.firstChild)
-  {	
-    if (pify.nodeName != "BODY" || (pify.nodeName == "BODY" && pifyOffset != 0)) 
-    { //WKR: prevent body tag in empty doc
-      cnt.appendChild(editor._doc.createElement(pify.nodeName));
-    }
-  }
-  
-  // YmL: Added additional last parameter for fill case to work around logic
-  // error in forEachNode()
-  
-  fill = this.forEachNodeUnder(cnt, "find_fill", "ltr", false );
-  
-  if ( fill &&
-    this._pifySibling.test(pify.nodeName) &&
-  ( (pifyOffset == 0) || ( pifyOffset == 1 && this._pifyForced.test(pify.nodeName) ) ) )
-  {
-    
-    roam = editor._doc.createElement( 'p' );
-    roam.innerHTML = "&nbsp;";
-    
-    // roam = editor._doc.createElement('p');
-    // roam.appendChild(editor._doc.createElement('br'));
-    
-    // for these cases, if we are processing the left hand side we want it to halt
-    // processing instead of doing the right hand side. (Avoids adding another <p>&nbsp</p>
-      // after the list etc.
-      
-      if ((search_direction == "left" ) && pify.previousSibling)
-      {
-        
-        return new Array(pify.previousSibling, 'AfterEnd', roam);
-      }
-      else if (( search_direction == "right") && pify.nextSibling)
-      {
-        
-        return new Array(pify.nextSibling, 'BeforeBegin', roam);
-      }
-      else
-      {
-        
-        return new Array(pify.parentNode, (search_direction == "left"?'AfterBegin':'BeforeEnd'), roam);
-      }
-      
-  }
-  
-  // If our cloned contents are 'content'-less, shove a break in them
-  
-  if ( fill )
-  {
-    
-    // Ill-concieved?
-    //
-    // 3 is a TEXT node and it should be empty.
-    //
-    
-    if ( fill.nodeType == 3 )
-    {
-      // fill = fill.parentNode;
-      
-      fill = editor._doc.createDocumentFragment();
-    }
-    
-    if ( (fill.nodeType == 1 && !this._elemSolid.test()) || fill.nodeType == 11 )
-    {
-      
-      // FIXME:/CHECKME: When Xinha is switched from WYSIWYG to text mode
-      // Xinha.getHTMLWrapper() will strip out the trailing br. Not sure why.
-      
-      // fill.appendChild(editor._doc.createElement('br'));
-      
-      var pterminator = editor._doc.createElement( 'p' );
-      pterminator.innerHTML = "&nbsp;";
-      
-      fill.appendChild( pterminator );
-      
-    }
-    else
-    {
-      
-      // fill.parentNode.insertBefore(editor._doc.createElement('br'),fill);
-      
-      var pterminator = editor._doc.createElement( 'p' );
-      pterminator.innerHTML = "&nbsp;";
-      
-      fill.parentNode.insertBefore(parentNode,fill);
-      
-    }
-  }
-  
-  // YmL: If there was no content replace with fill
-  // (previous code did not use fill and we ended up with the
-    // <p>test</p><p></p> because Gecko was finding two empty text nodes
-    // when traversing on the right hand side of an empty document.
-    
-    if ( fill )
-    {
-      
-      roam = fill;
-    }
-    else
-    {
-      // And stuff a shiny new object with whatever contents we have
-      
-      roam = (pWrap || (cnt.nodeType == 11 && !cnt.firstChild)) ? editor._doc.createElement('p') : editor._doc.createDocumentFragment();
-      roam.appendChild(cnt);
-    }
-    
-    if (preBr)
-    {
-      roam.appendChild(editor._doc.createElement('br'));
-    }
-    // Return the nearest relative, relative insertion point and fragment to insert
-    
-    return new Array(neighbour, insertion, roam);
-    
-};	// end of processRng()
-
-// ----------------------------------------------------------------------------------
-
-/**
-* are we an <li> that should be handled by the browser?
-*
-* there is no good way to "get out of" ordered or unordered lists from Javascript.
-* We have to pass the onKeyPress 13 event to the browser so it can take care of
-* getting us "out of" the list.
-*
-* The Gecko engine does a good job of handling all the normal <li> cases except the "press
-* enter at the first position" where we want a <p>&nbsp</p> inserted before the list. The
-* built-in behavior is to open up a <li> before the current entry (not good).
-*
-* @param rng Range range.
-*/
-
-EnterParagraphs.prototype.isNormalListItem = function(rng)
-{
-  
-  var node, listNode;
-  
-  node = rng.startContainer;
-  
-  if (( typeof node.nodeName != 'undefined') &&
-    ( node.nodeName.toLowerCase() == 'li' ))
-  {
-    
-    // are we a list item?
-    
-    listNode = node;
-  }
-  else if (( typeof node.parentNode != 'undefined' ) &&
-    ( typeof node.parentNode.nodeName != 'undefined' ) &&
-  ( node.parentNode.nodeName.toLowerCase() == 'li' ))
-  {
-    
-    // our parent is a list item.
-    
-    listNode = node.parentNode;
-    
-  }
-  else
-  {
-    // neither we nor our parent are a list item. this is not a normal
-    // li case.
-    
-    return false;
-  }
-  
-  // at this point we have a listNode. Is it the first list item?
-  
-  if ( ! listNode.previousSibling )
-  {
-    // are we on the first character of the first li?
-    
-    if ( rng.startOffset == 0 )
-    {
-      return false;
-    }
-  }
-  return true;
-  
-};	// end of isNormalListItem()
-
-// ----------------------------------------------------------------------------------
-/**
-* Called when a key is pressed in the editor
-*/
-
-EnterParagraphs.prototype.__onKeyPress = function(ev)
-{
-  
-  // If they've hit enter and shift is not pressed, handle it
-  
-  if (ev.keyCode == 13 && !ev.shiftKey && this.editor._iframe.contentWindow.getSelection)
-  {
-    return this.handleEnter(ev);
-  }
-  
-};	// end of _onKeyPress()
-
-// -----------------------------------------------------------------------------------
-
-/**
-* Handles the pressing of an unshifted enter for Gecko
-*/
-
-EnterParagraphs.prototype.handleEnter = function(ev)
-{
-  
-  var cursorNode;
-  
-  // Grab the selection and associated range
-  
-  var sel = this.editor.getSelection();
-  var rng = this.editor.createRange(sel);
-  
-  // if we are at the end of a list and the node is empty let the browser handle
-  // it to get us out of the list.
-  
-  if ( this.isNormalListItem(rng) )
-  {
-    
-    return true;
-  }
-  
-  // as far as I can tell this isn't actually used.
-  
-  this.takenIds = new Object();
-  
-  // Grab ranges for document re-stuffing, if appropriate
-  //
-  // pStart and pEnd are arrays consisting of
-  // [0] neighbor node
-  // [1] insertion type
-  // [2] roam
-  
-  var pStart = this.processSide(rng, "left");
-  
-  var pEnd = this.processSide(rng, "right");
-  
-  // used to position the cursor after insertion.
-  
-  cursorNode = pEnd[2];
-  
-  // Get rid of everything local to the selection
-  
-  sel.removeAllRanges();
-  rng.deleteContents();
-  
-  // Grab a node we'll have after insertion, since fragments will be lost
-  //
-  // we'll use this to position the cursor.
-  
-  var holdEnd = this.forEachNodeUnder( cursorNode, "find_cursorpoint", "ltr", false, true);
-  
-  if ( ! holdEnd )
-  {
-    alert( "INTERNAL ERROR - could not find place to put cursor after ENTER" );
-  }
-  
-  // Insert our carefully chosen document fragments
-  
-  if ( pStart )
-  {
-    
-    this.insertAdjacentElement(pStart[0], pStart[1], pStart[2]);
-  }
-  
-  if ( pEnd && pEnd.nodeType != 1)
-  {
-    
-    this.insertAdjacentElement(pEnd[0], pEnd[1], pEnd[2]);
-  }
-  
-  // Move the caret in front of the first good text element
-  
-  if ((holdEnd) && (this._permEmpty.test(holdEnd.nodeName) ))
-  {
-    
-    var prodigal = 0;
-    while ( holdEnd.parentNode.childNodes.item(prodigal) != holdEnd )
-    {
-      prodigal++;
-    }
-    
-    sel.collapse( holdEnd.parentNode, prodigal);
-  }
-  else
-  {
-    
-    // holdEnd might be false.
-    
-    try
-    {
-      sel.collapse(holdEnd, 0);
-      
-      // interestingly, scrollToElement() scroll so the top if holdEnd is a text node.
-      
-      if ( holdEnd.nodeType == 3 )
-      {
-        holdEnd = holdEnd.parentNode;
-      }
-      
-      this.editor.scrollToElement(holdEnd);
-    }
-    catch (e)
-    {
-      // we could try to place the cursor at the end of the document.
-    }
-  }
-  
-  this.editor.updateToolbar();
-  
-  Xinha._stopEvent(ev);
-  
-  return true;
-  
-};	// end of handleEnter()
-
-// END
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/Gecko/paraHandlerDirty.js b/web/imcms/xinha/modules/Gecko/paraHandlerDirty.js
deleted file mode 100644
index 8c76209555..0000000000
--- a/web/imcms/xinha/modules/Gecko/paraHandlerDirty.js
+++ /dev/null
@@ -1,257 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    --  This is the standard implementation of the Xinha.prototype._insertImage method,
-    --  which provides the functionality to insert an image in the editor.
-    --
-    --  The file is loaded by the Xinha Core when no alternative method (plugin) is loaded.
-    --
-    --
-    --  $HeadURL: http://svn.xinha.python-hosting.com/trunk/modules/Gecko/paraHandlerDirty.js $
-    --  $LastChangedDate: 2007-01-23 09:22:22 +1300 (Tue, 23 Jan 2007) $
-    --  $LastChangedRevision: 688 $
-    --  $LastChangedBy: ray $
-    --------------------------------------------------------------------------*/
-EnterParagraphs._pluginInfo = {
-  name          : "EnterParagraphs",
-  origin        : "Xinha Core",
-  version       : "$LastChangedRevision: 688 $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL: http://svn.xinha.python-hosting.com/trunk/modules/Gecko/paraHandlerDirty.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-function EnterParagraphs(editor) {
-	this.editor = editor;
-}                                      
-
-EnterParagraphs.prototype.onKeyPress = function (ev)
-{
-  if( ev.keyCode == 13 && !ev.shiftKey )
-  {
-    this.dom_checkInsertP();
-    Xinha._stopEvent(ev);
-  } 
-}
-/** The idea here is
- * 1. See if we are in a block element
- * 2. If we are not, then wrap the current "block" of text into a paragraph
- * 3. Now that we have a block element, select all the text between the insertion point
- *    and just AFTER the end of the block
- *    eg <p>The quick |brown fox jumped over the lazy dog.</p>|
- *                     ---------------------------------------
- * 4. Extract that from the document, making
- *       <p>The quick </p>
- *    and a document fragment with
- *       <p>brown fox jumped over the lazy dog.</p>
- * 5. Reinsert it just after the block element
- *       <p>The quick </p><p>brown fox jumped over the lazy dog.</p>
- *
- * Along the way, allow inserting blank paragraphs, which will look like <p><br/></p>
- */
-
-EnterParagraphs.prototype.dom_checkInsertP = function()
-{
-  var editor = this.editor;
-  var p, body;
-  // Get the insertion point, we'll scrub any highlighted text the user wants rid of while we are there.
-  var sel = editor.getSelection();
-  var range = editor.createRange(sel);
-  if ( !range.collapsed )
-  {
-    range.deleteContents();
-  }
-  editor.deactivateEditor();
-  //sel.removeAllRanges();
-  //sel.addRange(range);
-
-  var SC = range.startContainer;
-  var SO = range.startOffset;
-  var EC = range.endContainer;
-  var EO = range.endOffset;
-
-  // If the insertion point is character 0 of the
-  // document, then insert a space character that we will wrap into a paragraph
-  // in a bit.
-  if ( SC == EC && SC == body && !SO && !EO )
-  {
-    p = editor._doc.createTextNode(" ");
-    body.insertBefore(p, body.firstChild);
-    range.selectNodeContents(p);
-    SC = range.startContainer;
-    SO = range.startOffset;
-    EC = range.endContainer;
-    EO = range.endOffset;
-  }
-
-  // See if we are in a block element, if so, great.
-  p = editor.getAllAncestors();
-
-  var block = null;
-  body = editor._doc.body;
-  for ( var i = 0; i < p.length; ++i )
-  {
-    if ( Xinha.isParaContainer(p[i]) )
-    {
-      break;
-    }
-    else if ( Xinha.isBlockElement(p[i]) && ! ( /body|html/i.test(p[i].tagName) ) )
-    {
-      block = p[i];
-      break;
-    }
-  }
-
-  // If not in a block element, we'll have to turn some stuff into a paragraph
-  if ( !block )
-  {
-    // We want to wrap as much stuff as possible into the paragraph in both directions
-    // from the insertion point.  We start with the start container and walk back up to the
-    // node just before any of the paragraph containers.
-    var wrap = range.startContainer;
-    while ( wrap.parentNode && !Xinha.isParaContainer(wrap.parentNode) )
-    {
-      wrap = wrap.parentNode;
-    }
-    var start = wrap;
-    var end   = wrap;
-
-    // Now we walk up the sibling list until we hit the top of the document
-    // or an element that we shouldn't put in a p (eg other p, div, ul, ol, table)
-    while ( start.previousSibling )
-    {
-      if ( start.previousSibling.tagName )
-      {
-        if ( !Xinha.isBlockElement(start.previousSibling) )
-        {
-          start = start.previousSibling;
-        }
-        else
-        {
-          break;
-        }
-      }
-      else
-      {
-        start = start.previousSibling;
-      }
-    }
-
-    // Same down the list
-    while ( end.nextSibling )
-    {
-      if ( end.nextSibling.tagName )
-      {
-        if ( !Xinha.isBlockElement(end.nextSibling) )
-        {
-          end = end.nextSibling;
-        }
-        else
-        {
-          break;
-        }
-      }
-      else
-      {
-        end = end.nextSibling;
-      }
-    }
-
-    // Select the entire block
-    range.setStartBefore(start);
-    range.setEndAfter(end);
-
-    // Make it a paragraph
-    range.surroundContents(editor._doc.createElement('p'));
-
-    // Which becomes the block element
-    block = range.startContainer.firstChild;
-
-    // And finally reset the insertion point to where it was originally
-    range.setStart(SC, SO);
-  }
-
-  // The start point is the insertion point, so just move the end point to immediatly
-  // after the block
-  range.setEndAfter(block);
-
-  // Extract the range, to split the block
-  // If we just did range.extractContents() then Mozilla does wierd stuff
-  // with selections, but if we clone, then remove the original range and extract
-  // the clone, it's quite happy.
-  var r2 = range.cloneRange();
-  sel.removeRange(range);
-  var df = r2.extractContents();
-
-  if ( df.childNodes.length === 0 )
-  {
-    df.appendChild(editor._doc.createElement('p'));
-    df.firstChild.appendChild(editor._doc.createElement('br'));
-  }
-
-  if ( df.childNodes.length > 1 )
-  {
-    var nb = editor._doc.createElement('p');
-    while ( df.firstChild )
-    {
-      var s = df.firstChild;
-      df.removeChild(s);
-      nb.appendChild(s);
-    }
-    df.appendChild(nb);
-  }
-
-  // If the original block is empty, put a &nsbp; in it.
-  // @fixme: why using a regex instead of : if (block.innerHTML.trim() == '') ?
-  if ( ! ( /\S/.test(block.innerHTML) ) )
-  {
-    block.innerHTML = "&nbsp;";
-  }
-
-  p = df.firstChild;
-  // @fixme: why using a regex instead of : if (p.innerHTML.trim() == '') ?
-  if ( ! ( /\S/.test(p.innerHTML) ) )
-  {
-    p.innerHTML = "<br />";
-  }
-
-  // If the new block is empty and it's a heading, make it a paragraph
-  // note, the new block is empty when you are hitting enter at the end of the existing block
-  if ( ( /^\s*<br\s*\/?>\s*$/.test(p.innerHTML) ) && ( /^h[1-6]$/i.test(p.tagName) ) )
-  {
-    df.appendChild(editor.convertNode(p, "p"));
-    df.removeChild(p);
-  }
-
-  var newblock = block.parentNode.insertBefore(df.firstChild, block.nextSibling);
-
-  // Select the range (to set the insertion)
-  // collapse to the start of the new block
-  //  (remember the block might be <p><br/></p>, so if we collapsed to the end the <br/> would be noticable)
-
-  //range.selectNode(newblock.firstChild);
-  //range.collapse(true);
-
-  editor.activateEditor();
-
-  sel = editor.getSelection();
-  sel.removeAllRanges();
-  sel.collapse(newblock,0);
-
-  // scroll into view
-  editor.scrollToElement(newblock);
-
-  //editor.forceRedraw();
-
-};
diff --git a/web/imcms/xinha/modules/GetHtml/DOMwalk.js b/web/imcms/xinha/modules/GetHtml/DOMwalk.js
deleted file mode 100644
index 97b6a4a449..0000000000
--- a/web/imcms/xinha/modules/GetHtml/DOMwalk.js
+++ /dev/null
@@ -1,324 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    --  This is the standard implementation of the method for rendering HTML code from the DOM
-    --
-    --  The file is loaded by the Xinha Core when no alternative method (plugin) is loaded.
-    --
-    --
-    --  $HeadURL: http://svn.xinha.webfactional.com/trunk/modules/GetHtml/DOMwalk.js $
-    --  $LastChangedDate: 2007-08-07 01:58:56 +1200 (Tue, 07 Aug 2007) $
-    --  $LastChangedRevision: 871 $
-    --  $LastChangedBy: ray $
-    --------------------------------------------------------------------------*/
-function GetHtmlImplementation(editor) {
-    this.editor = editor;
-}
-
-GetHtmlImplementation._pluginInfo = {
-  name          : "GetHtmlImplementation DOMwalk",
-  origin        : "Xinha Core",
-  version       : "$LastChangedRevision: 871 $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL: http://svn.xinha.webfactional.com/trunk/modules/GetHtml/DOMwalk.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-// Retrieves the HTML code from the given node.	 This is a replacement for
-// getting innerHTML, using standard DOM calls.
-// Wrapper catch a Mozilla-Exception with non well formed html source code
-Xinha.getHTML = function(root, outputRoot, editor)
-{
-  try
-  {
-    return Xinha.getHTMLWrapper(root,outputRoot,editor);
-  }
-  catch(ex)
-  {   
-    alert(Xinha._lc('Your Document is not well formed. Check JavaScript console for details.'));
-    return editor._iframe.contentWindow.document.body.innerHTML;
-  }
-};
-
-Xinha.emptyAttributes = " checked disabled ismap readonly nowrap compact declare selected defer multiple noresize noshade "
-
-Xinha.getHTMLWrapper = function(root, outputRoot, editor, indent)
-{
-  var html = "";
-  if ( !indent )
-  {
-    indent = '';
-  }
-
-  switch ( root.nodeType )
-  {
-    case 10:// Node.DOCUMENT_TYPE_NODE
-    case 6: // Node.ENTITY_NODE
-    case 12:// Node.NOTATION_NODE
-      // this all are for the document type, probably not necessary
-    break;
-
-    case 2: // Node.ATTRIBUTE_NODE
-      // Never get here, this has to be handled in the ELEMENT case because
-      // of IE crapness requring that some attributes are grabbed directly from
-      // the attribute (nodeValue doesn't return correct values), see
-      //http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=3porgu4mc4ofcoa1uqkf7u8kvv064kjjb4%404ax.com
-      // for information
-    break;
-
-    case 4: // Node.CDATA_SECTION_NODE
-      // Mozilla seems to convert CDATA into a comment when going into wysiwyg mode,
-      //  don't know about IE
-      html += (Xinha.is_ie ? ('\n' + indent) : '') + '<![CDATA[' + root.data + ']]>' ;
-    break;
-
-    case 5: // Node.ENTITY_REFERENCE_NODE
-      html += '&' + root.nodeValue + ';';
-    break;
-
-    case 7: // Node.PROCESSING_INSTRUCTION_NODE
-      // PI's don't seem to survive going into the wysiwyg mode, (at least in moz)
-      // so this is purely academic
-      html += (Xinha.is_ie ? ('\n' + indent) : '') + '<'+'?' + root.target + ' ' + root.data + ' ?>';
-    break;
-
-    case 1: // Node.ELEMENT_NODE
-    case 11: // Node.DOCUMENT_FRAGMENT_NODE
-    case 9: // Node.DOCUMENT_NODE
-      var closed;
-      var i;
-      var root_tag = (root.nodeType == 1) ? root.tagName.toLowerCase() : '';
-      if ( ( root_tag == "script" || root_tag == "noscript" ) && editor.config.stripScripts )
-      {
-        break;
-      }
-      if ( outputRoot )
-      {
-        outputRoot = !(editor.config.htmlRemoveTags && editor.config.htmlRemoveTags.test(root_tag));
-      }
-      if ( Xinha.is_ie && root_tag == "head" )
-      {
-        if ( outputRoot )
-        {
-          html += (Xinha.is_ie ? ('\n' + indent) : '') + "<head>";
-        }
-        
-        var save_multiline = RegExp.multiline;
-        RegExp.multiline = true;
-        var txt = 
-        root.innerHTML.replace(Xinha.RE_tagName, function(str, p1, p2) { return p1 + p2.toLowerCase(); }) // lowercasize
-        .replace(/\s*=\s*(([^'"][^>\s]*)([>\s])|"([^"]+)"|'([^']+)')/g, '="$2$4$5"$3') //add attribute quotes
-        .replace(/<(link|meta)((\s*\S*="[^"]*")*)>/g, '<$1$2 />'); //terminate singlet tags
-        RegExp.multiline = save_multiline;
-        html += txt + '\n';
-        if ( outputRoot )
-        {
-          html += (Xinha.is_ie ? ('\n' + indent) : '') + "</head>";
-        }
-        break;
-      }
-      else if ( outputRoot )
-      {
-        closed = (!(root.hasChildNodes() || Xinha.needsClosingTag(root)));
-        html += ((Xinha.isBlockElement(root)) ? ('\n' + indent) : '') + "<" + root.tagName.toLowerCase();
-        var attrs = root.attributes;
-        
-        for ( i = 0; i < attrs.length; ++i )
-        {
-          var a = attrs.item(i);
-          if (typeof a.nodeValue == 'object' ) continue; // see #684
-          if (root.tagName.toLowerCase() == "input" 
-              && root.type.toLowerCase() == "checkbox" 
-              && a.nodeName.toLowerCase() == "value"
-              && a.nodeValue.toLowerCase() == "on") 
-          {
-            continue;
-          }
-          if ( !a.specified 
-            // IE claims these are !a.specified even though they are.  Perhaps others too?
-            && !(root.tagName.toLowerCase().match(/input|option/) && a.nodeName == 'value')
-            && !(root.tagName.toLowerCase().match(/area/) && a.nodeName.match(/shape|coords/i)) 
-          )
-          {
-            continue;
-          }
-          var name = a.nodeName.toLowerCase();
-          if ( /_moz_editor_bogus_node/.test(name) )
-          {
-            html = "";
-            break;
-          }
-          if ( /(_moz)|(contenteditable)|(_msh)/.test(name) )
-          {
-            // avoid certain attributes
-            continue;
-          }
-          var value;
-          if ( Xinha.emptyAttributes.indexOf(" "+name+" ") != -1)
-          {
-            value = name;
-          }
-          else if ( name != "style" )
-          {
-            // IE5.5 reports 25 when cellSpacing is
-            // 1; other values might be doomed too.
-            // For this reason we extract the
-            // values directly from the root node.
-            // I'm starting to HATE JavaScript
-            // development.  Browser differences
-            // suck.
-            //
-            // Using Gecko the values of href and src are converted to absolute links
-            // unless we get them using nodeValue()
-            if ( typeof root[a.nodeName] != "undefined" && name != "href" && name != "src" && !(/^on/.test(name)) )
-            {
-              value = root[a.nodeName];
-            }
-            else
-            {
-              value = a.nodeValue;
-              // IE seems not willing to return the original values - it converts to absolute
-              // links using a.nodeValue, a.value, a.stringValue, root.getAttribute("href")
-              // So we have to strip the baseurl manually :-/
-              if ( Xinha.is_ie && (name == "href" || name == "src") )
-              {
-                value = editor.stripBaseURL(value);
-              }
-
-              // High-ascii (8bit) characters in links seem to cause problems for some sites,
-              // while this seems to be consistent with RFC 3986 Section 2.4
-              // because these are not "reserved" characters, it does seem to
-              // cause links to international resources not to work.  See ticket:167
-
-              // IE always returns high-ascii characters un-encoded in links even if they
-              // were supplied as % codes (it unescapes them when we pul the value from the link).
-
-              // Hmmm, very strange if we use encodeURI here, or encodeURIComponent in place
-              // of escape below, then the encoding is wrong.  I mean, completely.
-              // Nothing like it should be at all.  Using escape seems to work though.
-              // It's in both browsers too, so either I'm doing something wrong, or
-              // something else is going on?
-
-              if ( editor.config.only7BitPrintablesInURLs && ( name == "href" || name == "src" ) )
-              {
-                value = value.replace(/([^!-~]+)/g, function(match) { return escape(match); });
-              }
-            }
-          }
-          else if ( !Xinha.is_ie )
-          {
-            value = root.style.cssText.replace(/rgb\(.*?\)/ig,function(rgb){ return Xinha._colorToRgb(rgb) });
-          }
-          if ( /^(_moz)?$/.test(value) )
-          {
-            // Mozilla reports some special tags
-            // here; we don't need them.
-            continue;
-          }
-          html += " " + name + '="' + Xinha.htmlEncode(value) + '"';
-        }
-        //IE fails to put style in attributes list & cssText is UPPERCASE
-        if ( Xinha.is_ie && root.style.cssText )
-        {
-          html += ' style="' + root.style.cssText.toLowerCase() + '"';
-        }
-        if ( Xinha.is_ie && root.tagName.toLowerCase() == "option" && root.selected )
-        {
-          html += ' selected="selected"';
-        }
-        if ( html !== "" )
-        {
-          if ( closed && root_tag=="p" )
-          {
-            //never use <p /> as empty paragraphs won't be visible
-            html += ">&nbsp;</p>";
-          }
-          else if ( closed )
-          {
-            html += " />";
-          }
-          else
-          {
-            html += ">";
-          }
-        }
-      }
-      var containsBlock = false;
-      if ( root_tag == "script" || root_tag == "noscript" )
-      {
-        if ( !editor.config.stripScripts )
-        {
-          if (Xinha.is_ie)
-          {
-            var innerText = "\n" + root.innerHTML.replace(/^[\n\r]*/,'').replace(/\s+$/,'') + '\n' + indent;
-          }
-          else
-          {
-            var innerText = (root.hasChildNodes()) ? root.firstChild.nodeValue : '';
-          }
-          html += innerText + '</'+root_tag+'>' + ((Xinha.is_ie) ? '\n' : '');
-        }
-      }
-      else if (root_tag == "pre")
-      {
-        html += ((Xinha.is_ie) ? '\n' : '') + root.innerHTML.replace(/<br>/g,'\n') + '</'+root_tag+'>';
-      }
-      else
-      {
-        for ( i = root.firstChild; i; i = i.nextSibling )
-        {
-          if ( !containsBlock && i.nodeType == 1 && Xinha.isBlockElement(i) )
-          {
-            containsBlock = true;
-          }
-          html += Xinha.getHTMLWrapper(i, true, editor, indent + '  ');
-        }
-        if ( outputRoot && !closed )
-        {
-          html += (((Xinha.isBlockElement(root) && containsBlock) || root_tag == 'head' || root_tag == 'html') ? ('\n' + indent) : '') + "</" + root.tagName.toLowerCase() + ">";
-        }
-      }
-    break;
-
-    case 3: // Node.TEXT_NODE
-      if ( /^script|noscript|style$/i.test(root.parentNode.tagName) )
-      {
-        html = root.data;
-      }
-      else if(root.data.trim() == '')
-      {
-        if(root.data)
-        {
-          html = ' ';
-        }
-        else
-        {
-          html = '';
-        }
-      }
-      else
-      {
-        html = Xinha.htmlEncode(root.data);
-      }
-    break;
-
-    case 8: // Node.COMMENT_NODE
-      html = "<!--" + root.data + "-->";
-    break;
-  }
-  return html;
-};
-
-
-
diff --git a/web/imcms/xinha/modules/GetHtml/TransformInnerHTML.js b/web/imcms/xinha/modules/GetHtml/TransformInnerHTML.js
deleted file mode 100644
index 8a6650c629..0000000000
--- a/web/imcms/xinha/modules/GetHtml/TransformInnerHTML.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
-  * Based on XML_Utility functions submitted by troels_kn.
-  * credit also to adios, who helped with reg exps:
-  * http://www.sitepoint.com/forums/showthread.php?t=201052
-  * 
-  * A replacement for Xinha.getHTML
-  *
-  * Features:
-  *   - Generates XHTML code
-  *   - Much faster than Xinha.getHTML
-  *   - Eliminates the hacks to accomodate browser quirks
-  *   - Returns correct code for Flash objects and scripts
-  *   - Formats html in an indented, readable format in html mode
-  *   - Preserves script and pre formatting
-  *   - Preserves formatting in comments
-  *   - Removes contenteditable from body tag in full-page mode
-  *   - Supports only7BitPrintablesInURLs config option
-  *   - Supports htmlRemoveTags config option
-  */
-  
-function GetHtmlImplementation(editor) {
-    this.editor = editor;
-}
-
-GetHtmlImplementation._pluginInfo = {
-	name          : "GetHtmlImplementation TransformInnerHTML",
-	version       : "1.0",
-	developer     : "Nelson Bright",
-	developer_url : "http://www.brightworkweb.com/",
-	sponsor       : "",
-    sponsor_url   : "",
-	license       : "htmlArea"
-};
-
-Xinha.RegExpCache = [
-/*00*/  new RegExp().compile(/<\s*\/?([^\s\/>]+)[\s*\/>]/gi),//lowercase tags
-/*01*/  new RegExp().compile(/(\s+)_moz[^=>]*=[^\s>]*/gi),//strip _moz attributes
-/*02*/  new RegExp().compile(/\s*=\s*(([^'"][^>\s]*)([>\s])|"([^"]+)"|'([^']+)')/g),// find attributes
-/*03*/  new RegExp().compile(/\/>/g),//strip singlet terminators
-/*04*/  new RegExp().compile(/<(br|hr|img|input|link|meta|param|embed|area)((\s*\S*="[^"]*")*)>/g),//terminate singlet tags
-/*05*/  new RegExp().compile(/(<\w+\s+(\w*="[^"]*"\s+)*)(checked|compact|declare|defer|disabled|ismap|multiple|no(href|resize|shade|wrap)|readonly|selected)([\s>])/gi),//expand singlet attributes
-/*06*/  new RegExp().compile(/(="[^']*)'([^'"]*")/),//check quote nesting
-/*07*/  new RegExp().compile(/&(?=(?!(#[0-9]{2,5};|[a-zA-Z0-9]{2,6};|#x[0-9a-fA-F]{2,4};))[^<]*>)/g),//expand query ampersands not in html entities
-/*08*/  new RegExp().compile(/<\s+/g),//strip tagstart whitespace
-/*09*/  new RegExp().compile(/\s+(\/)?>/g),//trim whitespace
-/*10*/  new RegExp().compile(/\s{2,}/g),//trim extra whitespace
-/*11*/  new RegExp().compile(/\s+([^=\s]+)((="[^"]+")|([\s>]))/g),// lowercase attribute names
-/*12*/  new RegExp().compile(/\s+contenteditable(=[^>\s\/]*)?/gi),//strip contenteditable
-/*13*/  new RegExp().compile(/((href|src)=")([^\s]*)"/g), //find href and src for stripBaseHref()
-/*14*/  new RegExp().compile(/<\/?(div|p|h[1-6]|table|tr|td|th|ul|ol|li|blockquote|object|br|hr|img|embed|param|pre|script|html|head|body|meta|link|title|area|input|form|textarea|select|option)[^>]*>/g),
-/*15*/  new RegExp().compile(/<\/(div|p|h[1-6]|table|tr|ul|ol|blockquote|object|html|head|body|script|form|select)( [^>]*)?>/g),//blocklevel closing tag
-/*16*/  new RegExp().compile(/<(div|p|h[1-6]|table|tr|ul|ol|blockquote|object|html|head|body|script|form|select)( [^>]*)?>/g),//blocklevel opening tag
-/*17*/  new RegExp().compile(/<(td|th|li|option|br|hr|embed|param|pre|meta|link|title|area|input|textarea)[^>]*>/g),//singlet tag or output on 1 line
-/*18*/  new RegExp().compile(/(^|<\/(pre|script)>)(\s|[^\s])*?(<(pre|script)[^>]*>|$)/g),//find content NOT inside pre and script tags
-/*19*/  new RegExp().compile(/(<pre[^>]*>)([\s\S])*?(<\/pre>)/g),//find content inside pre tags
-/*20*/  new RegExp().compile(/(^|<!--[\s\S]*?-->)([\s\S]*?)(?=<!--[\s\S]*?-->|$)/g),//find content NOT inside comments
-/*21*/  new RegExp().compile(/\S*=""/g), //find empty attributes
-/*22*/  new RegExp().compile(/<!--[\s\S]*?-->|<\?[\s\S]*?\?>|<\/?\w[^>]*>/g), //find all tags, including comments and php
-/*23*/  new RegExp().compile(/(^|<\/script>)[\s\S]*?(<script[^>]*>|$)/g) //find content NOT inside script tags
-];
-
-/** 
-  * Cleans HTML into wellformed xhtml
-  */
-Xinha.prototype.cleanHTML = function(sHtml) {
-	var c = Xinha.RegExpCache;
-	sHtml = sHtml.
-		replace(c[0], function(str) { return str.toLowerCase(); } ).//lowercase tags/attribute names
-		replace(c[1], ' ').//strip _moz attributes
-		replace(c[12], ' ').//strip contenteditable
-		replace(c[2], '="$2$4$5"$3').//add attribute quotes
-		replace(c[21], ' ').//strip empty attributes
-		replace(c[11], function(str, p1, p2) { return ' '+p1.toLowerCase()+p2; }).//lowercase attribute names
-		replace(c[3], '>').//strip singlet terminators
-		replace(c[9], '$1>').//trim whitespace
-		replace(c[5], '$1$3="$3"$5').//expand singlet attributes
-		replace(c[4], '<$1$2 />').//terminate singlet tags
-		replace(c[6], '$1$2').//check quote nesting
-		replace(c[7], '&amp;').//expand query ampersands
-		replace(c[8], '<').//strip tagstart whitespace
-		replace(c[10], ' ');//trim extra whitespace
-	if(Xinha.is_ie && c[13].test(sHtml)) {
-		sHtml = sHtml.replace(c[13],'$1'+this.stripBaseURL(RegExp.$3)+'"');
-	}
-	if(this.config.only7BitPrintablesInURLs) {
-		if (Xinha.is_ie) c[13].test(sHtml); // oddly the test below only triggers when we call this once before (IE6), in Moz it fails if tested twice
-		if ( c[13].test(sHtml)) {
-			try { //Mozilla returns an incorrectly encoded value with innerHTML
-				sHtml = sHtml.replace(c[13], '$1'+decodeURIComponent(RegExp.$3).replace(/([^!-~]+)/g,function(chr){return escape(chr);})+'"');
-			} catch (e) { // once the URL is escape()ed, you can't decodeURIComponent() it anymore
-				sHtml = sHtml.replace(c[13], '$1'+RegExp.$3.replace(/([^!-~]+)/g,function(chr){return escape(chr);})+'"');
-			}
-		}
-	}
-	return sHtml;
-};
-
-/**
-  * Prettyfies html by inserting linebreaks before tags, and indenting blocklevel tags
-  */
-Xinha.indent = function(s, sindentChar) {
-	Xinha.__nindent = 0;
-	Xinha.__sindent = "";
-	Xinha.__sindentChar = (typeof sindentChar == "undefined") ? "  " : sindentChar;
-	var c = Xinha.RegExpCache;
-	if(Xinha.is_gecko) { //moz changes returns into <br> inside <pre> tags
-		s = s.replace(c[19], function(str){return str.replace(/<br \/>/g,"\n")});
-	}
-	s = s.replace(c[18], function(strn) { //skip pre and script tags
-	  strn = strn.replace(c[20], function(st,$1,$2) { //exclude comments
-		string = $2.replace(/[\n\r]/gi, " ").replace(/\s+/gi," ").replace(c[14], function(str) {
-			if (str.match(c[16])) {
-				var s = "\n" + Xinha.__sindent + str;
-				// blocklevel openingtag - increase indent
-				Xinha.__sindent += Xinha.__sindentChar;
-				++Xinha.__nindent;
-				return s;
-			} else if (str.match(c[15])) {
-				// blocklevel closingtag - decrease indent
-				--Xinha.__nindent;
-				Xinha.__sindent = "";
-				for (var i=Xinha.__nindent;i>0;--i) {
-					Xinha.__sindent += Xinha.__sindentChar;
-				}
-				return "\n" + Xinha.__sindent + str;
-			} else if (str.match(c[17])) {
-				// singlet tag
-				return "\n" + Xinha.__sindent + str;
-			}
-			return str; // this won't actually happen
-		});
-		return $1 + string;
-	  });return strn;
-    });
-    //final cleanup
-    s = s.replace(/^\s*/,'').//strip leading whitespace
-        replace(/ +\n/g,'\n').//strip spaces at end of lines
-        replace(/[\r\n]+(\s+)<\/script>/g,'\n$1</script>');//strip returns added into scripts
-    return s;
-};
-
-Xinha.getHTML = function(root, outputRoot, editor) {
-	var html = "";
-	var c = Xinha.RegExpCache;
-
-	if(root.nodeType == 11) {//document fragment
-	    //we can't get innerHTML from the root (type 11) node, so we 
-	    //copy all the child nodes into a new div and get innerHTML from the div
-	    var div = document.createElement("div");
-	    var temp = root.insertBefore(div,root.firstChild);
-	    for (j = temp.nextSibling; j; j = j.nextSibling) { 
-	    		temp.appendChild(j.cloneNode(true));
-	    }
-		html += temp.innerHTML.replace(c[23], function(strn) { //skip content inside script tags
-			strn = strn.replace(c[22], function(tag){
-				if(/^<[!\?]/.test(tag)) return tag; //skip comments and php tags
-				else return editor.cleanHTML(tag)});
-			return strn;
-		});
-
-	} else {
-
-		var root_tag = (root.nodeType == 1) ? root.tagName.toLowerCase() : ''; 
-		if (outputRoot) { //only happens with <html> tag in fullpage mode
-			html += "<" + root_tag;
-			var attrs = root.attributes; // strangely, this doesn't work in moz
-			for (i = 0; i < attrs.length; ++i) {
-				var a = attrs.item(i);
-				if (!a.specified) {
-				  continue;
-				}
-				var name = a.nodeName.toLowerCase();
-				var value = a.nodeValue;
-				html += " " + name + '="' + value + '"';
-			}
-			html += ">";
-		}
-		if(root_tag == "html") {
-			innerhtml = editor._doc.documentElement.innerHTML;
-		} else {
-			innerhtml = root.innerHTML;
-		}
-		//pass tags to cleanHTML() one at a time
-		//includes support for htmlRemoveTags config option
-		html += innerhtml.replace(c[23], function(strn) { //skip content inside script tags
-			strn = strn.replace(c[22], function(tag){
-				if(/^<[!\?]/.test(tag)) return tag; //skip comments and php tags
-				else if(!(editor.config.htmlRemoveTags && editor.config.htmlRemoveTags.test(tag.replace(/<([^\s>\/]+)/,'$1'))))
-					return editor.cleanHTML(tag);
-				else return ''});
-			return strn;
-		});
-		//IE drops  all </li> tags in a list except the last one
-		if(Xinha.is_ie) {
-			html = html.replace(/<li( [^>]*)?>/g,'</li><li$1>').
-				replace(/(<(ul|ol)[^>]*>)[\s\n]*<\/li>/g, '$1').
-				replace(/<\/li>([\s\n]*<\/li>)+/g, '<\/li>');
-		}
-		if(Xinha.is_gecko)
-			html = html.replace(/<br \/>\n$/, ''); //strip trailing <br> added by moz
-		if (outputRoot) {
-			html += "</" + root_tag + ">";
-		}
-		html = Xinha.indent(html);
-	};
-//	html = Xinha.htmlEncode(html);
-
-	return html;
-};
diff --git a/web/imcms/xinha/modules/GetHtml/lang/pt_br.js b/web/imcms/xinha/modules/GetHtml/lang/pt_br.js
deleted file mode 100644
index 4568329173..0000000000
--- a/web/imcms/xinha/modules/GetHtml/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Your Document is not well formed. Check JavaScript console for details.": "Seu documento não está formatado corretamente. Verifique os detalhes no console do Javascript."
-}
diff --git a/web/imcms/xinha/modules/InsertImage/insert_image.html b/web/imcms/xinha/modules/InsertImage/insert_image.html
deleted file mode 100644
index 48b6b8e971..0000000000
--- a/web/imcms/xinha/modules/InsertImage/insert_image.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Insert Image</title>
-
-<script type="text/javascript" src="../../popups/popup.js"></script>
-<link rel="stylesheet" type="text/css" href="../../popups/popup.css" />
-
-<script type="text/javascript">
-
-
-Xinha = window.opener.Xinha;
-function i18n(str) {
-  return (Xinha._lc(str, 'Xinha'));
-}
-
-function Init() {
-  __dlg_translate('Xinha');
-  __dlg_init(null,{width:410,height:400});
-  // Make sure the translated string appears in the drop down. (for gecko)
-  document.getElementById("f_align").selectedIndex = 1;
-  document.getElementById("f_align").selectedIndex = 5;
-  var param = window.dialogArguments;
-  if (param["f_base"]) {
-      document.getElementById("f_base").value = param["f_base"];
-  }
-  document.getElementById("f_url").value    = param["f_url"] ? param["f_url"] : "";
-  document.getElementById("f_alt").value    = param["f_alt"] ? param["f_alt"] : "";
-  document.getElementById("f_border").value = (typeof param["f_border"]!="undefined") ? param["f_border"] : "";
-  document.getElementById("f_align").value  = param["f_align"] ? param["f_align"] : "";
-  document.getElementById("f_vert").value   = (typeof param["f_vert"]!="undefined") ? param["f_vert"] : "";
-  document.getElementById("f_horiz").value  = (typeof param["f_horiz"]!="undefined") ? param["f_horiz"] : "";
-  if (param["f_url"]) {
-      window.ipreview.location.replace(Xinha._resolveRelativeUrl(param.f_base, param.f_url));
-  }
-  document.getElementById("f_url").focus();
-}
-
-function onOK() {
-  var required = {
-    "f_url": i18n("You must enter the URL")
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(required[i]);
-      el.focus();
-      return false;
-    }
-  }
-  // pass data back to the calling window
-  var fields = ["f_url", "f_alt", "f_align", "f_border",
-                "f_horiz", "f_vert"];
-  var param = new Object();
-  for (var i in fields) {
-    var id = fields[i];
-    var el = document.getElementById(id);
-    param[id] = el.value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-function onPreview() {
-  var f_url = document.getElementById("f_url");
-  var url = f_url.value;
-  var base = document.getElementById("f_base").value;
-  if (!url) {
-    alert(i18n("You must enter the URL"));
-    f_url.focus();
-    return false;
-  }
-  window.ipreview.location.replace(Xinha._resolveRelativeUrl(base, url));
-  return false;
-}
-</script>
-
-</head>
-
-<body class="dialog" onload="Init()">
-
-<div class="title">Insert Image</div>
-<!--- new stuff --->
-<form action="" method="get">
-<input type="hidden" name="base" id="f_base"/>
-<table border="0" width="100%" style="padding: 0px; margin: 0px">
-  <tbody>
-
-  <tr>
-    <td style="width: 7em; text-align: right">Image URL:</td>
-    <td><input type="text" name="url" id="f_url" style="width:75%"
-      title="Enter the image URL here" />
-      <button name="preview" onclick="return onPreview();"
-      title="Preview the image in a new window">Preview</button>
-    </td>
-  </tr>
-  <tr>
-    <td style="width: 7em; text-align: right">Alternate text:</td>
-    <td><input type="text" name="alt" id="f_alt" style="width:100%"
-      title="For browsers that don't support images" /></td>
-  </tr>
-
-  </tbody>
-</table>
-
-<fieldset style="float: left; margin-left: 5px;">
-<legend>Layout</legend>
-
-<div class="space"></div>
-
-<div class="fl">Alignment:</div>
-<select size="1" name="align" id="f_align"
-  title="Positioning of this image">
-  <option value=""                             >Not set</option>
-  <option value="left"                         >Left</option>
-  <option value="right"                        >Right</option>
-  <option value="texttop"                      >Texttop</option>
-  <option value="absmiddle"                    >Absmiddle</option>
-  <option value="baseline" selected="selected" >Baseline</option>
-  <option value="absbottom"                    >Absbottom</option>
-  <option value="bottom"                       >Bottom</option>
-  <option value="middle"                       >Middle</option>
-  <option value="top"                          >Top</option>
-</select>
-
-<br />
-
-<div class="fl">Border thickness:</div>
-<input type="text" name="border" id="f_border" size="5"
-title="Leave empty for no border" />
-
-<div class="space"></div>
-
-</fieldset>
-
-<fieldset>
-<legend>Spacing</legend>
-
-<div class="space"></div>
-
-<div class="fr">Horizontal:</div>
-<input type="text" name="horiz" id="f_horiz" size="5"
-title="Horizontal padding" />
-
-<br />
-
-<div class="fr">Vertical:</div>
-<input type="text" name="vert" id="f_vert" size="5"
-title="Vertical padding" />
-
-<div class="space"></div>
-
-</fieldset>
-<div class="space" style="clear:all"></div>
-<div>
-Image Preview:<br />
-    <iframe name="ipreview" id="ipreview" frameborder="0" style="border : 1px solid gray;" 
-	height="200" width="100%" src="../../popups/blank.html"></iframe>
-</div>
-<div id="buttons">
-<button type="button" name="ok" onclick="return onOK();">OK</button>
-<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/InsertImage/insert_image.js b/web/imcms/xinha/modules/InsertImage/insert_image.js
deleted file mode 100644
index 51db632750..0000000000
--- a/web/imcms/xinha/modules/InsertImage/insert_image.js
+++ /dev/null
@@ -1,194 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    --  This is the standard implementation of the Xinha.prototype._insertImage method,
-    --  which provides the functionality to insert an image in the editor.
-    --
-    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
-    --
-    --
-    --  $HeadURL: http://svn.xinha.webfactional.com/trunk/modules/InsertImage/insert_image.js $
-    --  $LastChangedDate: 2007-10-11 10:08:24 +1300 (Thu, 11 Oct 2007) $
-    --  $LastChangedRevision: 900 $
-    --  $LastChangedBy: ray $
-    --------------------------------------------------------------------------*/
-InsertImage._pluginInfo = {
-  name          : "InsertImage",
-  origin        : "Xinha Core",
-  version       : "$LastChangedRevision: 900 $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL: http://svn.xinha.webfactional.com/trunk/modules/InsertImage/insert_image.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-function InsertImage(editor) {
-}                                      
-
-// Called when the user clicks on "InsertImage" button.  If an image is already
-// there, it will just modify it's properties.
-Xinha.prototype._insertImage = function(image)
-{
-  var editor = this;  // for nested functions
-  var outparam;
-  if ( typeof image == "undefined" )
-  {
-    image = this.getParentElement();
-    if ( image && image.tagName.toLowerCase() != 'img' )
-    {
-      image = null;
-    }
-  }
-  
-  var base;
-  if ( typeof editor.config.baseHref != 'undefined' && editor.config.baseHref !== null ) {
-    base = editor.config.baseHref;
-  }
-  else {
-    var bdir = window.location.toString().split("/");
-    bdir.pop();
-    base = bdir.join("/");
-  }
-  
-  if ( image )
-  {
-    function getSpecifiedAttribute(element,attribute)
-    {
-      var a = element.attributes;
-      for (var i=0;i<a.length;i++)
-      {
-        if (a[i].nodeName == attribute && a[i].specified)
-        {
-          return a[i].value;
-        }
-      }
-      return '';
-  }
-  /* if you want to understand why the above function is required, uncomment the two lines below and launch InsertImage in both Mozilla & IE with an image selected that hath neither value set and compare the results
-  alert(image.vspace +' '+ image.getAttribute('vspace') + ' ' + image.getAttribute('vspace',2) + ' ' + getSpecifiedAttribute(image,'vspace') );
-    alert(image.hspace +' '+ image.getAttribute('hspace') + ' ' + image.getAttribute('hspace',2) + ' ' + getSpecifiedAttribute(image,'hspace') );
-  */
-  outparam =
-    {
-      f_base   : base,
-      f_url    : image.getAttribute('src',2), // the second parameter makes IE return the value as it is set, as opposed to an "interpolated" (as MSDN calls it) value
-      f_alt    : image.alt,
-      f_border : image.border,
-      f_align  : image.align,
-      f_vert   : getSpecifiedAttribute(image,'vspace'),
-      f_horiz  : getSpecifiedAttribute(image,'hspace'),
-      f_width  : image.width,
-      f_height : image.height
-    };
-  }
-  else{
-    outparam =
-    {
-      f_base   : base,
-      f_url    : ""      
-    };
-  }
-  
-  Dialog(
-    editor.config.URIs.insert_image,
-    function(param)
-    {
-      // user must have pressed Cancel
-      if ( !param )
-      {
-        return false;
-      }
-      var img = image;
-      if ( !img )
-      {
-        if ( Xinha.is_ie )
-        {
-          var sel = editor.getSelection();
-          var range = editor.createRange(sel);
-          editor._doc.execCommand("insertimage", false, param.f_url);
-          img = range.parentElement();
-          // wonder if this works...
-          if ( img.tagName.toLowerCase() != "img" )
-          {
-            img = img.previousSibling;
-          }
-        }
-        else
-        {
-          img = document.createElement('img');
-          img.src = param.f_url;
-          editor.insertNodeAtSelection(img);
-          if ( !img.tagName )
-          {
-            // if the cursor is at the beginning of the document
-            img = range.startContainer.firstChild;
-          }
-        }
-      }
-      else
-      {
-        img.src = param.f_url;
-      }
-
-      for ( var field in param )
-      {
-        var value = param[field];
-        switch (field)
-        {
-          case "f_alt":
-            if (value)
-              img.alt = value;
-            else
-              img.removeAttribute("alt");
-            break;
-          case "f_border":
-            if (value)
-              img.border = parseInt(value || "0");
-            else
-              img.removeAttribute("border");
-            break;
-          case "f_align":
-            if (value)
-              img.align = value;
-            else
-              img.removeAttribute("align");
-            break;
-          case "f_vert":
-            if (value != "")
-              img.vspace = parseInt(value || "0");
-            else
-              img.removeAttribute("vspace");
-            break;
-          case "f_horiz":
-            if (value != "")
-              img.hspace = parseInt(value || "0");
-            else
-              img.removeAttribute("hspace");
-            break;
-          case "f_width":
-            if (value)
-              img.width = parseInt(value || "0");
-            else
-              img.removeAttribute("width");
-            break;
-          case "f_height":
-            if (value)
-              img.height = parseInt(value || "0");
-            else
-              img.removeAttribute("height");
-            break;
-        }
-      }
-    },
-    outparam);
-};
diff --git a/web/imcms/xinha/modules/InsertTable/insert_table.html b/web/imcms/xinha/modules/InsertTable/insert_table.html
deleted file mode 100644
index e86d4ed4a9..0000000000
--- a/web/imcms/xinha/modules/InsertTable/insert_table.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<html>
-
-<head>
-  <title>Insert Table</title>
-
-<script type="text/javascript" src="../../popups/popup.js"></script>
-<link rel="stylesheet" type="text/css" href="../../popups/popup.css" />
-
-<script type="text/javascript">
-
-window.resizeTo(425, 250);
-
-Xinha = window.opener.Xinha;
-function i18n(str) {
-  return (Xinha._lc(str, 'Xinha'));
-}
-
-function Init() {
-  Xinha = window.opener.Xinha; // load the Xinha plugin and lang file
-  __dlg_translate('Xinha');
-  __dlg_init(null, Xinha.is_ie ? null : {width:425,height:250});
-  // Make sure the translated string appears in the drop down. (for gecko)
-  document.getElementById("f_unit").selectedIndex = 1;
-  document.getElementById("f_unit").selectedIndex = 0;
-  document.getElementById("f_align").selectedIndex = 1;
-  document.getElementById("f_align").selectedIndex = 0;
-  document.getElementById("f_rows").focus();
-}
-
-function onOK() {
-  var required = {
-    "f_rows": i18n("You must enter a number of rows"),
-    "f_cols": i18n("You must enter a number of columns")
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(required[i]);
-      el.focus();
-      return false;
-    }
-  }
-  var fields = ["f_rows", "f_cols", "f_width", "f_unit", "f_fixed",
-                "f_align", "f_border", "f_spacing", "f_padding"];
-  var param = new Object();
-  for (var i in fields) {
-    var id = fields[i];
-    var el = document.getElementById(id);
-    param[id] = (el.type == "checkbox") ? el.checked : el.value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-
-</head>
-
-<body class="dialog" onload="Init()">
-
-<div class="title">Insert Table</div>
-
-<form action="" method="get">
-<table border="0" style="padding: 0px; margin: 0px">
-  <tbody>
-
-  <tr>
-    <td style="width: 4em; text-align: right">Rows:</td>
-    <td><input type="text" name="rows" id="f_rows" size="5" title="Number of rows" value="2" /></td>
-    <td style="width: 4em; text-align: right">Width:</td>
-    <td><input type="text" name="width" id="f_width" size="5" title="Width of the table" value="100" /></td>
-    <td><select size="1" name="unit" id="f_unit" title="Width unit">
-      <option value="%" selected="selected"  >Percent</option>
-      <option value="px"              >Pixels</option>
-      <option value="em"              >Em</option>
-    </select></td>
-  </tr>
-  <tr>
-    <td style="width: 4em; text-align: right">Cols:</td>
-    <td><input type="text" name="cols" id="f_cols" size="5" title="Number of columns" value="4" /></td>
-    <td style="text-align: right"><input type="checkbox" checked="checked" name="fixed" id="f_fixed" /></td>
-    <td colspan="2"><label for="f_fixed"
-    >Fixed width columns</label></td>
-  </tr>
-  </tbody>
-</table>
-
-<p />
-
-<fieldset style="float: left; margin-left: 5px;">
-<legend>Layout</legend>
-
-<div class="space"></div>
-
-<div class="fl">Alignment:</div>
-<select size="1" name="align" id="f_align"
-  title="Positioning of this table">
-  <option value="" selected="selected"         >Not set</option>
-  <option value="left"                         >Left</option>
-  <option value="right"                        >Right</option>
-  <option value="texttop"                      >Texttop</option>
-  <option value="absmiddle"                    >Absmiddle</option>
-  <option value="baseline"                     >Baseline</option>
-  <option value="absbottom"                    >Absbottom</option>
-  <option value="bottom"                       >Bottom</option>
-  <option value="middle"                       >Middle</option>
-  <option value="top"                          >Top</option>
-</select>
-
-<p />
-
-<div class="fl">Border thickness:</div>
-<input type="text" name="border" id="f_border" size="5" value="1"
-title="Leave empty for no border" />
-<!--
-<p />
-
-<div class="fl">Collapse borders:</div>
-<input type="checkbox" name="collapse" id="f_collapse" />
--->
-<div class="space"></div>
-
-</fieldset>
-
-<fieldset style="float:right; margin-right: 5px;">
-<legend>Spacing</legend>
-
-<div class="space"></div>
-
-<div class="fr">Cell spacing:</div>
-<input type="text" name="spacing" id="f_spacing" size="5" value="1"
-title="Space between adjacent cells" />
-
-<p />
-
-<div class="fr">Cell padding:</div>
-<input type="text" name="padding" id="f_padding" size="5" value="1"
-title="Space between content and border in cell" />
-
-<div class="space"></div>
-
-</fieldset>
-
-<div style="margin-top: 85px; border-top: 1px solid #999; padding: 2px; text-align: right;">
-<button type="button" name="ok" onclick="return onOK();">OK</button>
-<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/InsertTable/insert_table.js b/web/imcms/xinha/modules/InsertTable/insert_table.js
deleted file mode 100644
index 260a80ab41..0000000000
--- a/web/imcms/xinha/modules/InsertTable/insert_table.js
+++ /dev/null
@@ -1,120 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    --  This is the standard implementation of the Xinha.prototype._insertTable method,
-    --  which provides the functionality to insert an image in the editor.
-    --
-    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
-    --
-    --
-    --  $HeadURL: http://svn.xinha.python-hosting.com/trunk/modules/InsertTable/insert_table.js $
-    --  $LastChangedDate: 2007-01-23 09:22:22 +1300 (Tue, 23 Jan 2007) $
-    --  $LastChangedRevision: 688 $
-    --  $LastChangedBy: ray $
-    --------------------------------------------------------------------------*/
-InsertTable._pluginInfo = {
-  name          : "InsertTable",
-  origin        : "Xinha Core",
-  version       : "$LastChangedRevision: 688 $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL: http://svn.xinha.python-hosting.com/trunk/modules/InsertTable/insert_table.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-function InsertTable(editor) {
-}                                      
-
-Xinha.prototype._insertTable = function()
-{
-  var sel = this.getSelection();
-  var range = this.createRange(sel);
-  var editor = this;	// for nested functions
-  Dialog(
-    editor.config.URIs.insert_table,
-    function(param)
-    {
-      // user must have pressed Cancel
-      if ( !param )
-      {
-        return false;
-      }
-      var doc = editor._doc;
-      // create the table element
-      var table = doc.createElement("table");
-      // assign the given arguments
-
-      for ( var field in param )
-      {
-        var value = param[field];
-        if ( !value )
-        {
-          continue;
-        }
-        switch (field)
-        {
-          case "f_width":
-            table.style.width = value + param.f_unit;
-          break;
-          case "f_align":
-            table.align = value;
-          break;
-          case "f_border":
-            table.border = parseInt(value, 10);
-          break;
-          case "f_spacing":
-            table.cellSpacing = parseInt(value, 10);
-          break;
-          case "f_padding":
-            table.cellPadding = parseInt(value, 10);
-          break;
-        }
-      }
-      var cellwidth = 0;
-      if ( param.f_fixed )
-      {
-        cellwidth = Math.floor(100 / parseInt(param.f_cols, 10));
-      }
-      var tbody = doc.createElement("tbody");
-      table.appendChild(tbody);
-      for ( var i = 0; i < param.f_rows; ++i )
-      {
-        var tr = doc.createElement("tr");
-        tbody.appendChild(tr);
-        for ( var j = 0; j < param.f_cols; ++j )
-        {
-          var td = doc.createElement("td");
-          // @todo : check if this line doesnt stop us to use pixel width in cells
-          if (cellwidth)
-          {
-            td.style.width = cellwidth + "%";
-          }
-          tr.appendChild(td);
-          // Browsers like to see something inside the cell (&nbsp;).
-          td.appendChild(doc.createTextNode('\u00a0'));
-        }
-      }
-      if ( Xinha.is_ie )
-      {
-        range.pasteHTML(table.outerHTML);
-      }
-      else
-      {
-        // insert the table
-        editor.insertNodeAtSelection(table);
-      }
-      return true;
-    },
-    null
-  );
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/modules/InternetExplorer/InternetExplorer.js b/web/imcms/xinha/modules/InternetExplorer/InternetExplorer.js
deleted file mode 100644
index c8be9805ff..0000000000
--- a/web/imcms/xinha/modules/InternetExplorer/InternetExplorer.js
+++ /dev/null
@@ -1,503 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
-    --
-    --  Use of Xinha is granted by the terms of the htmlArea License (based on
-    --  BSD license)  please read license.txt in this package for details.
-    --
-    --  Xinha was originally based on work by Mihai Bazon which is:
-    --      Copyright (c) 2003-2004 dynarch.com.
-    --      Copyright (c) 2002-2003 interactivetools.com, inc.
-    --      This copyright notice MUST stay intact for use.
-    --
-    -- This is the Internet Explorer compatability plugin, part of the 
-    -- Xinha core.
-    --
-    --  The file is loaded as a special plugin by the Xinha Core when
-    --  Xinha is being run under an Internet Explorer based browser.
-    --
-    --  It provides implementation and specialisation for various methods
-    --  in the core where different approaches per browser are required.
-    --
-    --  Design Notes::
-    --   Most methods here will simply be overriding Xinha.prototype.<method>
-    --   and should be called that, but methods specific to IE should 
-    --   be a part of the InternetExplorer.prototype, we won't trample on 
-    --   namespace that way.
-    --
-    --  $HeadURL: http://svn.xinha.webfactional.com/trunk/modules/InternetExplorer/InternetExplorer.js $
-    --  $LastChangedDate: 2007-10-12 23:00:47 +1300 (Fri, 12 Oct 2007) $
-    --  $LastChangedRevision: 901 $
-    --  $LastChangedBy: ray $
-    --------------------------------------------------------------------------*/
-                                                    
-InternetExplorer._pluginInfo = {
-  name          : "Internet Explorer",
-  origin        : "Xinha Core",
-  version       : "$LastChangedRevision: 901 $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL: http://svn.xinha.webfactional.com/trunk/modules/InternetExplorer/InternetExplorer.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-function InternetExplorer(editor) {
-  this.editor = editor;  
-  editor.InternetExplorer = this; // So we can do my_editor.InternetExplorer.doSomethingIESpecific();
-}
-
-/** Allow Internet Explorer to handle some key events in a special way.
- */
-  
-InternetExplorer.prototype.onKeyPress = function(ev)
-{
-  // Shortcuts
-  if(this.editor.isShortCut(ev))
-  {
-    switch(this.editor.getKey(ev).toLowerCase())
-    {
-      case 'n':
-      {
-        this.editor.execCommand('formatblock', false, '<p>');        
-        Xinha._stopEvent(ev);
-        return true;
-      }
-      break;
-      
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      {
-        this.editor.execCommand('formatblock', false, '<h'+this.editor.getKey(ev).toLowerCase()+'>');
-        Xinha._stopEvent(ev);
-        return true;
-      }
-      break;
-    }
-  }
-  
-  switch(ev.keyCode) 
-  {
-    case 8: // KEY backspace
-    case 46: // KEY delete
-    {
-      if(this.handleBackspace())
-      {
-        Xinha._stopEvent(ev);
-        return true;
-      }
-    }
-    break;
-  }
-  
-  return false;
-}
-
-/** When backspace is hit, the IE onKeyPress will execute this method.
- *  It preserves links when you backspace over them and apparently 
- *  deletes control elements (tables, images, form fields) in a better
- *  way.
- *
- *  @returns true|false True when backspace has been handled specially
- *   false otherwise (should pass through). 
- */
-
-InternetExplorer.prototype.handleBackspace = function()
-{
-  var editor = this.editor;
-  var sel = editor.getSelection();
-  if ( sel.type == 'Control' )
-  {
-    var elm = editor.activeElement(sel);
-    Xinha.removeFromParent(elm);
-    return true;
-  }
-
-  // This bit of code preseves links when you backspace over the
-  // endpoint of the link in IE.  Without it, if you have something like
-  //    link_here |
-  // where | is the cursor, and backspace over the last e, then the link
-  // will de-link, which is a bit tedious
-  var range = editor.createRange(sel);
-  var r2 = range.duplicate();
-  r2.moveStart("character", -1);
-  var a = r2.parentElement();
-  // @fixme: why using again a regex to test a single string ???
-  if ( a != range.parentElement() && ( /^a$/i.test(a.tagName) ) )
-  {
-    r2.collapse(true);
-    r2.moveEnd("character", 1);
-    r2.pasteHTML('');
-    r2.select();
-    return true;
-  }
-};
-
-InternetExplorer.prototype.inwardHtml = function(html)
-{
-   // Both IE and Gecko use strike internally instead of del (#523)
-   // Xinha will present del externally (see Xinha.prototype.outwardHtml
-   html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
-   // ie eats scripts and comments at beginning of page, so
-   // make sure there is something before the first script on the page
-   html = html.replace(/(<script|<!--)/i,"&nbsp;$1");
-   
-   return html;
-}
-
-InternetExplorer.prototype.outwardHtml = function(html)
-{
-   // remove space added before first script on the page
-   html = html.replace(/&nbsp;(\s*)(<script|<!--)/i,"$1$2");
-   
-   return html;
-}
-
-/*--------------------------------------------------------------------------*/
-/*------- IMPLEMENTATION OF THE ABSTRACT "Xinha.prototype" METHODS ---------*/
-/*--------------------------------------------------------------------------*/
-
-/** Insert a node at the current selection point. 
- * @param toBeInserted DomNode
- */
-
-Xinha.prototype.insertNodeAtSelection = function(toBeInserted)
-{
-  this.insertHTML(toBeInserted.outerHTML);
-};
-
-  
-/** Get the parent element of the supplied or current selection. 
- *  @param   sel optional selection as returned by getSelection
- *  @returns DomNode
- */
- 
-Xinha.prototype.getParentElement = function(sel)
-{
-  if ( typeof sel == 'undefined' )
-  {
-    sel = this.getSelection();
-  }
-  var range = this.createRange(sel);
-  switch ( sel.type )
-  {
-    case "Text":
-      // try to circumvent a bug in IE:
-      // the parent returned is not always the real parent element
-      var parent = range.parentElement();
-      while ( true )
-      {
-        var TestRange = range.duplicate();
-        TestRange.moveToElementText(parent);
-        if ( TestRange.inRange(range) )
-        {
-          break;
-        }
-        if ( ( parent.nodeType != 1 ) || ( parent.tagName.toLowerCase() == 'body' ) )
-        {
-          break;
-        }
-        parent = parent.parentElement;
-      }
-      return parent;
-    case "None":
-      // It seems that even for selection of type "None",
-      // there _is_ a parent element and it's value is not
-      // only correct, but very important to us.  MSIE is
-      // certainly the buggiest browser in the world and I
-      // wonder, God, how can Earth stand it?
-      return range.parentElement();
-    case "Control":
-      return range.item(0);
-    default:
-      return this._doc.body;
-  }
-};
-  
-/**
- * Returns the selected element, if any.  That is,
- * the element that you have last selected in the "path"
- * at the bottom of the editor, or a "control" (eg image)
- *
- * @returns null | DomNode
- */
- 
-Xinha.prototype.activeElement = function(sel)
-{
-  if ( ( sel === null ) || this.selectionEmpty(sel) )
-  {
-    return null;
-  }
-
-  if ( sel.type.toLowerCase() == "control" )
-  {
-    return sel.createRange().item(0);
-  }
-  else
-  {
-    // If it's not a control, then we need to see if
-    // the selection is the _entire_ text of a parent node
-    // (this happens when a node is clicked in the tree)
-    var range = sel.createRange();
-    var p_elm = this.getParentElement(sel);
-    if ( p_elm.innerHTML == range.htmlText )
-    {
-      return p_elm;
-    }
-    /*
-    if ( p_elm )
-    {
-      var p_rng = this._doc.body.createTextRange();
-      p_rng.moveToElementText(p_elm);
-      if ( p_rng.isEqual(range) )
-      {
-        return p_elm;
-      }
-    }
-
-    if ( range.parentElement() )
-    {
-      var prnt_range = this._doc.body.createTextRange();
-      prnt_range.moveToElementText(range.parentElement());
-      if ( prnt_range.isEqual(range) )
-      {
-        return range.parentElement();
-      }
-    }
-    */
-    return null;
-  }
-};
-
-/** 
- * Determines if the given selection is empty (collapsed).
- * @param selection Selection object as returned by getSelection
- * @returns true|false
- */
- 
-Xinha.prototype.selectionEmpty = function(sel)
-{
-  if ( !sel )
-  {
-    return true;
-  }
-
-  return this.createRange(sel).htmlText === '';
-};
-
-/** 
- * Returns a range object to be stored 
- * and later restored with Xinha.prototype.restoreSelection()
- * 
- * @returns Range
- */
-Xinha.prototype.saveSelection = function()
-{
-  return this.createRange(this._getSelection())
-}
-/** 
- * Restores a selection previously stored
- * @param savedSelection Range object as returned by Xinha.prototype.restoreSelection()
- */
-Xinha.prototype.restoreSelection = function(savedSelection)
-{
-  try { savedSelection.select() } catch (e) {};
-}
-
-/**
- * Selects the contents of the given node.  If the node is a "control" type element, (image, form input, table)
- * the node itself is selected for manipulation.
- *
- * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
-{
-  this.focusEditor();
-  this.forceRedraw();
-  var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
-  // Tables and Images get selected as "objects" rather than the text contents
-  if ( collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img|input|select|textarea/) )
-  {
-    range = this._doc.body.createControlRange();
-    range.add(node);
-  }
-  else
-  {
-    range = this._doc.body.createTextRange();
-    range.moveToElementText(node);
-    //(collapsed) && range.collapse(pos);
-  }
-  range.select();
-};
-  
-/** Insert HTML at the current position, deleting the selection if any. 
- *  
- *  @param html string
- */
- 
-Xinha.prototype.insertHTML = function(html)
-{
-  this.focusEditor();
-  var sel = this.getSelection();
-  var range = this.createRange(sel);
-  range.pasteHTML(html);
-};
-
-
-/** Get the HTML of the current selection.  HTML returned has not been passed through outwardHTML.
- *
- * @returns string
- */
- 
-Xinha.prototype.getSelectedHTML = function()
-{
-  var sel = this.getSelection();
-  var range = this.createRange(sel);
-  
-  // Need to be careful of control ranges which won't have htmlText
-  if( range.htmlText )
-  {
-    return range.htmlText;
-  }
-  else if(range.length >= 1)
-  {
-    return range.item(0).outerHTML;
-  }
-  
-  return '';
-};
-  
-/** Get a Selection object of the current selection.  Note that selection objects are browser specific.
- *
- * @returns Selection
- */
- 
-Xinha.prototype.getSelection = function()
-{
-  return this._doc.selection;
-};
-
-/** Create a Range object from the given selection.  Note that range objects are browser specific.
- *
- *  @param sel Selection object (see getSelection)
- *  @returns Range
- */
- 
-Xinha.prototype.createRange = function(sel)
-{
-  return sel.createRange();
-};
-
-/** Determine if the given event object is a keydown/press event.
- *
- *  @param event Event 
- *  @returns true|false
- */
- 
-Xinha.prototype.isKeyEvent = function(event)
-{
-  return event.type == "keydown";
-}
-
-/** Return the character (as a string) of a keyEvent  - ie, press the 'a' key and
- *  this method will return 'a', press SHIFT-a and it will return 'A'.
- * 
- *  @param   keyEvent
- *  @returns string
- */
-                                   
-Xinha.prototype.getKey = function(keyEvent)
-{
-  return String.fromCharCode(keyEvent.keyCode);
-}
-
-
-/** Return the HTML string of the given Element, including the Element.
- * 
- * @param element HTML Element DomNode
- * @returns string
- */
- 
-Xinha.getOuterHTML = function(element)
-{
-  return element.outerHTML;
-};
-
-// Control character for retaining edit location when switching modes
-Xinha.prototype.cc = String.fromCharCode(0x2009);
-
-Xinha.prototype.setCC = function ( target )
-{
-  var cc = this.cc;
-  if ( target == "textarea" )
-  {
-    var ta = this._textArea;
-    var pos = document.selection.createRange();
-    pos.collapse();
-    pos.text = cc;
-    var index = ta.value.indexOf( cc );
-    var before = ta.value.substring( 0, index );
-    var after  = ta.value.substring( index + cc.length , ta.value.length );
-    
-    if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
-    {
-      var tagEnd = after.indexOf(">") + 1;
-      ta.value = before + after.substring( 0, tagEnd ) + cc + after.substring( tagEnd, after.length );
-    }
-    else ta.value = before + cc + after;
-    ta.value = ta.value.replace(new RegExp ('(<script[^>]*>[^'+cc+']*?)('+cc+')([^'+cc+']*?<\/script>)'), "$1$3$2");
-    ta.value = ta.value.replace(new RegExp ('^([^'+cc+']*)('+cc+')([^'+cc+']*<body[^>]*>)(.*?)'), "$1$3$2$4");
-  }
-  else
-  {
-    var sel = this.getSelection();
-    var r = sel.createRange(); 
-    if ( sel.type == 'Control' )
-    {
-      var control = r.item(0);
-      control.outerHTML += cc;
-    }
-    else
-    {
-      r.collapse();
-      r.text = cc;
-    }
-  }
-};
-
-Xinha.prototype.findCC = function ( target )
-{
-  var findIn = ( target == 'textarea' ) ? this._textArea : this._doc.body;
-  range = findIn.createTextRange();
-  // in case the cursor is inside a link automatically created from a url
-  // the cc also appears in the url and we have to strip it out additionally 
-  if( range.findText( escape(this.cc) ) )
-  {
-    range.select();
-    range.text = '';
-  }
-  if( range.findText( this.cc ) )
-  {
-    range.select();
-    range.text = '';
-  }
-  if ( target == 'textarea' ) this._textArea.focus();
-};
-
-/** Return a doctype or empty string depending on whether the document is in Qirksmode or Standards Compliant Mode
- *  It's hardly possible to detect the actual doctype without unreasonable effort, so we set HTML 4.01 just to trigger the rendering mode
- * 
- * @param doc DOM element document
- * @returns string doctype || empty
- */
-Xinha.getDoctype = function (doc)
-{
-  return (doc.compatMode == "CSS1Compat") ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' : '';
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Abbreviation/abbr/de.js b/web/imcms/xinha/plugins/Abbreviation/abbr/de.js
deleted file mode 100644
index b2b54629b1..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/abbr/de.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Author: Udo Schmal, <schmal@schaffrath-neuemedien.de>
-//
-// (c) Udo Schmal & Schaffrath NeueMedien 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-{
-  "Abs.": "Absatz",
-  "bspw.": "Beispielsweise",
-  "bzw.": "beziehungsweise",
-  "c/o": "care of / bei, zu Händen von",
-  "ca.": "circa",
-  "d.h.": "das heißt",
-  "d.J.": "des Jahres",
-  "Dr.": "Doktor",
-  "e.V.": "Eingetragener Verein",
-  "eG.": "Eingetragene Genossenschaft",
-  "ehem.": "ehemals",
-  "einschl.": "einschließlich",
-  "etc.": "et cetera / und so weiter",
-  "evtl.": "eventuell",
-  "ff.": "(fort) folgende",
-  "gem.": "gemäß",
-  "inkl.": "inklusive",
-  "max.": "maximal / maximum",
-  "min.": "mindestens / minimum / minimal",
-  "o.g.": "oben genannt",
-  "rd.": "rund",
-  "S.": "Seite",
-  "u.a.": "unter anderem",
-  "u.ä.": "und ähnlich",
-  "usw.": "und so weiter",
-  "vgl.": "vergleiche",
-  "z.B.": "zum Beispiel",
-  "z.T.": "zum Teil",
-  "z.Z.": "zur Zeit",
-  "zzgl.": "zuzüglich"
-};
diff --git a/web/imcms/xinha/plugins/Abbreviation/abbr/en.js b/web/imcms/xinha/plugins/Abbreviation/abbr/en.js
deleted file mode 100644
index 31974c81fd..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/abbr/en.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// I18N constants
-// LANG: "en", ENCODING: UTF-8
-// Author: Udo Schmal, <schmal@schaffrath-neuemedien.de>
-//
-// (c) Udo Schmal & Schaffrath NeueMedien 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-{
-  "ANSI": "American National Standards Institute",  
-  "ASA": "American Standards Association",
-  "ISO": "International Organisation for Standardization",
-  "mime": "Multipurpose Internet Mail Extensions",
-  "UTF": "Unicode Transformation Format",
-  "W3C": "World Wide Web Consortium"
-};
diff --git a/web/imcms/xinha/plugins/Abbreviation/abbreviation.css b/web/imcms/xinha/plugins/Abbreviation/abbreviation.css
deleted file mode 100644
index 2f999c9200..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/abbreviation.css
+++ /dev/null
@@ -1,11 +0,0 @@
-abbr, acronym, span.abbr {
-  width: 18px;
-  height: 18px;
-	background-image: url(img/ed_abbreviation.gif);	
-	background-repeat: no-repeat;
-	background-position: left top;
-	white-space : nowrap;	
-	cursor: help;
-	border-bottom: 1px dashed #000;
-	padding-left: 19px;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Abbreviation/abbreviation.js b/web/imcms/xinha/plugins/Abbreviation/abbreviation.js
deleted file mode 100644
index 40e2e592ba..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/abbreviation.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Abbreviation plugin for Xinha
-// Implementation by Udo Schmal & Schaffrath NeueMedien
-// Original Author - Udo Schmal
-//
-// (c) Udo Schmal & Schaffrath NeueMedien 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function Abbreviation(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  // register the toolbar buttons provided by this plugin
-  cfg.registerButton({
-    id       : "abbreviation",
-    tooltip  : this._lc("Abbreviation"),
-    image    : editor.imgURL("ed_abbreviation.gif", "Abbreviation"),
-    textMode : false,
-    action   : function(editor) {
-                 self.buttonPress(editor);
-               }
-  })
-  cfg.addToolbarElement("abbreviation", "inserthorizontalrule", 1);
-}
-
-Abbreviation._pluginInfo = {
-  name          : "Abbreviation",
-  version       : "1.0",
-  developer     : "Udo Schmal",
-  developer_url : "",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de/",
-  c_owner       : "Udo Schmal & Schaffrath-NeueMedien",
-  license       : "htmlArea"
-};
-
-Abbreviation.prototype._lc = function(string) {
-    return Xinha._lc(string, 'Abbreviation');
-};
-
-Abbreviation.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(_editor_url + 'plugins/Abbreviation/abbreviation.css');
-};
-
-Abbreviation.prototype.buttonPress = function(editor, context, updatecontextclass) {
-  var outparam = null;
-  var html = editor.getSelectedHTML();
-  var sel  = editor._getSelection();
-  var range  = editor._createRange(sel);
-  var abbr = editor._activeElement(sel);
-  if(!(abbr != null && abbr.tagName.toLowerCase() == "abbr")) {
-    abbr = editor._getFirstAncestor(sel, 'abbr');
-  }
-  if (abbr != null && abbr.tagName.toLowerCase() == "abbr")
-    outparam = { title : abbr.title,
-                 text : abbr.innerHTML};
-  else
-    outparam = { title : '',
-                 text : html};
-
-  editor._popupDialog( "plugin://Abbreviation/abbreviation", function( param ) {
-    if ( param ) {
-      var title = param["title"];
-      if (title == "" || title == null) {
-        if (abbr) {
-          var child = abbr.innerHTML;
-          abbr.parentNode.removeChild(abbr);
-          editor.insertHTML(child);
-        }
-        return;
-      }
-      try {
-        var doc = editor._doc;
-        if (!abbr) {
-          abbr = doc.createElement("abbr");
-          abbr.title = title;
-          abbr.innerHTML = html;
-          if (Xinha.is_ie) {
-            range.pasteHTML(abbr.outerHTML);
-          } else {
-            editor.insertNodeAtSelection(abbr);
-          }
-        } else {
-          abbr.title = title;
-        }
-      }
-      catch (e) { }
-    }
-  }, outparam);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Abbreviation/img/ed_abbreviation.gif b/web/imcms/xinha/plugins/Abbreviation/img/ed_abbreviation.gif
deleted file mode 100644
index 50fba3d649..0000000000
Binary files a/web/imcms/xinha/plugins/Abbreviation/img/ed_abbreviation.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Abbreviation/lang/de.js b/web/imcms/xinha/plugins/Abbreviation/lang/de.js
deleted file mode 100644
index f72980c77e..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/lang/de.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Abbreviation": "Abkürzung",
-  "Expansion:": "Erklärung:",
-  "Delete": "Löschen"
-};
diff --git a/web/imcms/xinha/plugins/Abbreviation/lang/fr.js b/web/imcms/xinha/plugins/Abbreviation/lang/fr.js
deleted file mode 100644
index e53cffa76e..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/lang/fr.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Abbreviation": "Abréviation",
-  "Expansion:": "Explication",
-  "Delete": "Supprimer"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Abbreviation/lang/ja.js b/web/imcms/xinha/plugins/Abbreviation/lang/ja.js
deleted file mode 100644
index 6b29f7dad4..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/lang/ja.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Abbreviation": "略語",
-  "Expansion:": "展開�れる語:",
-  "Delete": "削除"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Abbreviation/lang/nb.js b/web/imcms/xinha/plugins/Abbreviation/lang/nb.js
deleted file mode 100644
index dc45a5abde..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/lang/nb.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Abbreviation": "Beskrive forkortelse",
-  "Expansion:": "Betydning:",
-  "Delete": "Fjerne"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Abbreviation/lang/nl.js b/web/imcms/xinha/plugins/Abbreviation/lang/nl.js
deleted file mode 100644
index 9e08217ee0..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/lang/nl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Abbreviation": "Afkorting",
-  "Expansion:": "Uitbreiding:",
-  "Delete": "Verwijderen"
-};
diff --git a/web/imcms/xinha/plugins/Abbreviation/lang/no.js b/web/imcms/xinha/plugins/Abbreviation/lang/no.js
deleted file mode 100644
index 51bd4e6b54..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/lang/no.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Abbreviation": "Beskrive forkortelse",
-  "Expansion:": "Betydning:",
-  "Delete": "Fjerne"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Abbreviation/lang/pt_br.js b/web/imcms/xinha/plugins/Abbreviation/lang/pt_br.js
deleted file mode 100644
index cf7e47bd12..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/lang/pt_br.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Abbreviation": "Abreviação",
-  "Cancel": "Cancelar",
-  "Delete": "Apagar",
-  "Expansion:": "Expandir:",
-  "OK": "OK"
-}
diff --git a/web/imcms/xinha/plugins/Abbreviation/popups/abbreviation.html b/web/imcms/xinha/plugins/Abbreviation/popups/abbreviation.html
deleted file mode 100644
index c4c2605401..0000000000
--- a/web/imcms/xinha/plugins/Abbreviation/popups/abbreviation.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<head>
-  <title>Abbreviation</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-var Abbreviation = window.opener.Abbreviation; // load the Abbreviation plugin and lang file ;-)
-
-function fillSelect(text) {
-  var abbr = window.location.href;
-  abbr = abbr.replace(/popups\/abbreviation.html/g, "abbr\/" + window.opener._editor_lang + ".js");
-  var abbrData = Xinha._geturlcontent(abbr);
-  if (abbrData) {
-    eval('abbrObj = ' + abbrData);
-    if (abbrObj != "") {
-      dest = document.getElementById("select");
-      for (var i in abbrObj) {
-        same = (i==text);
-        dest.options[dest.options.length] = new Option(i + "=" + abbrObj[i], abbrObj[i], false, same);
-        if (same)
-        document.getElementById("title").value = abbrObj[i];
-      }
-    }
-  }
-}
-
-function Init() {
-  __dlg_translate("Abbreviation");
-  __dlg_init(null,{width: 260, height: 160});
-  var param = window.dialogArguments;
-  var text = null;
-  if (param) {
-    text = param["text"];
-    document.getElementById("title").value = param["title"];
-  }
-  fillSelect(text);
-  document.getElementById("title").focus();
-};
-
-function onOK() {
-  var param = new Object();
-  param["title"] = document.getElementById("title").value;
-  __dlg_close(param);
-  return false;
-}
-
-
-function onDelete() {
-  // pass data back to the calling window
-  var param = new Object();
-  param["title"] = "";
-  __dlg_close(param);
-  return false;
-};
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-};
-</script>
-
-</head>
-<body class="dialog" onload="Init()">
-<div class="title">Abbreviation</div>
-<form name="form" action="">
-<table border="0" style="width: 100%;">
-  <tr>
-    <td class="lable">Expansion:</td>
-    <td>
-    <select id="select" name="select"
-            onChange="document.form.title.value=document.form.select.options[document.form.select.selectedIndex].value"
-            style="position:absolute; top:35px; left:100px; width:118px; clip:rect(0 120 22 100)">
-      <option value=""></option>
-
-    </select>
-    <input type="text" id="title" name="title"
-           onChange="document.form.select.selectedIndex=-1"
-           style="position:absolute; top:35px; left:100px; width:100px; border-right:0">
-    <!--<input type="text" id="title" name="title" value="" size="30">-->
-    </td>
-  </tr>
-</table>
-
-<div id="buttons">
-   <button type="submit" name="ok" onclick="return onOK();">OK</button>
-   <button type="button" name="delete" onclick="return onDelete();">Delete</button>
-   <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/BackgroundImage/background-image.js b/web/imcms/xinha/plugins/BackgroundImage/background-image.js
deleted file mode 100644
index 4bd9737fba..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/background-image.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// BackgroundImage plugin for Xinha
-// Sponsored by http://www.schaffrath-neuemedien.de
-// Implementation by Udo Schmal
-// based on TinyMCE (http://tinymce.moxiecode.com/) Distributed under LGPL by Moxiecode Systems AB
-//
-// Distributed under the same terms as Xinha itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function BackgroundImage(editor) {
-  this.editor = editor;
-	var cfg = editor.config;
-	var self = this;
-  cfg.registerButton({
-                id       : "bgImage",
-                tooltip  : this._lc("Set page background image"),
-                image    : editor.imgURL("ed_bgimage.gif", "BackgroundImage"),
-                textMode : false,
-                action   : function(editor) {
-                                self.buttonPress(editor);
-                           }
-            })
-	cfg.addToolbarElement("bgImage", "inserthorizontalrule", 1);
-}
-
-BackgroundImage._pluginInfo = {
-	name          : "BackgroundImage",
-	version       : "1.0",
-	developer     : "Udo Schmal",
-	developer_url : "http://www.schaffrath-neuemedien.de/",
-	c_owner       : "Udo Schmal & Schaffrath NeueMedien",
-	sponsor       : "L.N.Schaffrath NeueMedien",
-	sponsor_url   : "http://www.schaffrath-neuemedien.de.de/",
-	license       : "htmlArea"
-};
-
-BackgroundImage.prototype._lc = function(string) {
-    return Xinha._lc(string, 'BackgroundImage');
-};
-
-BackgroundImage.prototype.buttonPress = function(editor) {
-		//var doc = this.editor._doc;
-    editor._popupDialog( "plugin://BackgroundImage/bgimage", function( bgImage ) {
-        if(bgImage) {
-					if(Xinha.is_ie) editor.focusEditor();
-					if(bgImage=="*") {
-						editor._doc.body.background = "";
-					} else {
-					  editor._doc.body.background = bgImage;
-					}
-				}	
-    }, null);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/blufur.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/blufur.jpg
deleted file mode 100644
index 27df6c6a86..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/blufur.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/palecnvs.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/palecnvs.jpg
deleted file mode 100644
index 52a88ab81f..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/palecnvs.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/ppplcnvs.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/ppplcnvs.jpg
deleted file mode 100644
index d8dfc0ecfb..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/ppplcnvs.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/blufur.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/blufur.jpg
deleted file mode 100644
index f4ac4841fe..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/blufur.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/palecnvs.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/palecnvs.jpg
deleted file mode 100644
index 4867a36ee5..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/palecnvs.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ppplcnvs.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ppplcnvs.jpg
deleted file mode 100644
index d8dfc0ecfb..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ppplcnvs.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ylwsand.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ylwsand.jpg
deleted file mode 100644
index 1e11aa9061..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ylwsand.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/ylwsand.jpg b/web/imcms/xinha/plugins/BackgroundImage/backgrounds/ylwsand.jpg
deleted file mode 100644
index 1e11aa9061..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/backgrounds/ylwsand.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/img/ed_bgimage.gif b/web/imcms/xinha/plugins/BackgroundImage/img/ed_bgimage.gif
deleted file mode 100644
index fc57d38382..0000000000
Binary files a/web/imcms/xinha/plugins/BackgroundImage/img/ed_bgimage.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/BackgroundImage/lang/de.js b/web/imcms/xinha/plugins/BackgroundImage/lang/de.js
deleted file mode 100644
index 285a26c34c..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/lang/de.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Set page background image": "Seiten-Hintergrundbild setzen",
-  "Set Page Background Image": "Seiten-Hintergrundbild setzen",
-  "Remove Current Background": "Aktuellen Hintergrund entfernen",
-  "Cancel": "Abbrechen"
-};
diff --git a/web/imcms/xinha/plugins/BackgroundImage/lang/fr.js b/web/imcms/xinha/plugins/BackgroundImage/lang/fr.js
deleted file mode 100644
index 1ca5497b3d..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/lang/fr.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Set page background image": "Définir l'image de fond",
-  "Set Page Background Image": "Définir l'Image de Fond",
-  "Remove Current Background": "Supprimer le fond actuel",
-  "Cancel": "Annuler"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/BackgroundImage/lang/ja.js b/web/imcms/xinha/plugins/BackgroundImage/lang/ja.js
deleted file mode 100644
index 2b1ee90ffa..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/lang/ja.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Set page background image": "ページ�背景画�を設定",
-  "Set Page Background Image": "ページ�背景画�を設定",
-  "Remove Current Background": "�在�背景画�を除去",
-  "Cancel": "中止"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/BackgroundImage/lang/nb.js b/web/imcms/xinha/plugins/BackgroundImage/lang/nb.js
deleted file mode 100644
index 53cf39f378..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/lang/nb.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Set page background image": "Velg bakgrunnsbilde på siden",
-  "Set Page Background Image": "Velg bakgrunnsbilde på Siden",
-  "Remove Current Background": "Fjern gjeldende bakgrunn",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/BackgroundImage/lang/nl.js b/web/imcms/xinha/plugins/BackgroundImage/lang/nl.js
deleted file mode 100644
index 435dadccf2..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/lang/nl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Set page background image": "Pagina achtergrond afbeelding instellen",
-  "Set Page Background Image": "Pagina Achtergrond Afbeelding Instellen",
-  "Remove Current Background": "Huidige Achtergrond Afbeelding Verwijderen",
-  "Cancel": "Annuleren"
-};
diff --git a/web/imcms/xinha/plugins/BackgroundImage/lang/no.js b/web/imcms/xinha/plugins/BackgroundImage/lang/no.js
deleted file mode 100644
index 55e9e6cb4c..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/lang/no.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Set page background image": "Velg bakgrunnsbilde på siden",
-  "Set Page Background Image": "Velg Bakgrunnsbilde PÃ¥ Siden",
-  "Remove Current Background": "Fjern gjeldende bakgrunn",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/BackgroundImage/lang/pt_br.js b/web/imcms/xinha/plugins/BackgroundImage/lang/pt_br.js
deleted file mode 100644
index f8be3fd9d1..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/lang/pt_br.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Cancel": "Cancelar",
-  "Remove Current Background": "Remover fundo atual",
-  "Set Page Background Image": "Definir Imagem de Fundo",
-  "Set page background image": "Definir imagem de fundo"
-}
diff --git a/web/imcms/xinha/plugins/BackgroundImage/popups/bgimage.html b/web/imcms/xinha/plugins/BackgroundImage/popups/bgimage.html
deleted file mode 100644
index bdfd61dfed..0000000000
--- a/web/imcms/xinha/plugins/BackgroundImage/popups/bgimage.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Set Page Background Image</title>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<script language='JavaScript' type='text/javascript'>
-window.resizeTo(350, 195);
-function Init() {
-	
-  __dlg_translate("BackgroundImage");
-  __dlg_init();
-
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-function insertbg(image) {
-	__dlg_close(window.opener._editor_url + "/plugins/BackgroundImage/backgrounds/" + image);
-	return false;
-}
-
-function onDelete() {
-  __dlg_close("*");
-  return false;
-}
-</script>
-</head>
-<body class="dialog" onload="Init()">
-<form action="" method="get">
-  <div class="title">Set Page Background Image</div>
-<table align="center" border="0" cellspacing="0" cellpadding="6">
-<tr align="center" valign="top">
-<td><img onclick="insertbg('blufur.jpg')" border="1" src="../backgrounds/thumbnails/blufur.jpg" width="50" height="50"></td>
-<td><img onclick="insertbg('palecnvs.jpg')" border="1" src="../backgrounds/thumbnails/palecnvs.jpg" width="50" height="50"></td>
-<td><img onclick="insertbg('ppplcnvs.jpg')" border="1" src="../backgrounds/thumbnails/ppplcnvs.jpg" width="50" height="50"></td>
-<td><img onclick="insertbg('ylwsand.jpg')" border="1" src="../backgrounds/thumbnails/ylwsand.jpg" width="50" height="50"></td>
-</tr>
-</table>
-<div class="space"></div>
-<div id="buttons">
-<button type="button" name="delete" onclick="return onDelete()" style="width:auto">Remove Current Background</button>
-<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CSS/css.js b/web/imcms/xinha/plugins/CSS/css.js
deleted file mode 100644
index 2cb423ff5e..0000000000
--- a/web/imcms/xinha/plugins/CSS/css.js
+++ /dev/null
@@ -1,149 +0,0 @@
-// Simple CSS (className) plugin for the editor
-// Sponsored by http://www.miro.com.au
-// Implementation by Mihai Bazon, http://dynarch.com/mishoo.
-//
-// (c) dynarch.com 2003
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-//
-// $Id: css.js 856 2007-06-13 18:34:34Z wymsy $
-// @TODO This is the default and won't be very useful to others.
-// We should make this better.
-Xinha.Config.prototype.cssPluginConfig =
-  {
-    combos : [
-      { label: "Syntax",
-                   // menu text       // CSS class
-        options: { "None"           : "",
-                   "Code" : "code",
-                   "String" : "string",
-                   "Comment" : "comment",
-                   "Variable name" : "variable-name",
-                   "Type" : "type",
-                   "Reference" : "reference",
-                   "Preprocessor" : "preprocessor",
-                   "Keyword" : "keyword",
-                   "Function name" : "function-name",
-                   "Html tag" : "html-tag",
-                   "Html italic" : "html-helper-italic",
-                   "Warning" : "warning",
-                   "Html bold" : "html-helper-bold"
-                 },
-        context: "pre"
-      },
-      { label: "Info",
-        options: { "None"           : "",
-                   "Quote"          : "quote",
-                   "Highlight"      : "highlight",
-                   "Deprecated"     : "deprecated"
-                 }
-      }
-    ]
-  };
-
-function CSS(editor, params) {
-	this.editor = editor;
-	var cfg = editor.config;
-	var self = this;
-	var plugin_config;
-  if(params && params.length)
-  {
-    plugin_config = params[0];
-  }
-  else
-  {
-    plugin_config = editor.config.cssPluginConfig;
-  }
-
-  var combos = plugin_config.combos;
-
-	for (var i = 0; i < combos.length; i++) {
-		var combo = combos[i];
-		var id = "CSS-class" + i;
-		var css_class = {
-			id         : id,
-			options    : combo.options,
-			action     : function(editor) { self.onSelect(editor, this, combo.context, combo.updatecontextclass); },
-			refresh    : function(editor) { self.updateValue(editor, this); },
-			context    : combo.context
-		};
-		cfg.registerDropdown(css_class);
-    cfg.addToolbarElement(["T[" + combo.label + "]", id, "separator"] , "formatblock", -1);
- 	}
-}
-
-CSS._pluginInfo = {
-	name          : "CSS",
-	version       : "1.0",
-	developer     : "Mihai Bazon",
-	developer_url : "http://dynarch.com/mishoo/",
-	c_owner       : "Mihai Bazon",
-	sponsor       : "Miro International",
-	sponsor_url   : "http://www.miro.com.au",
-	license       : "htmlArea"
-};
-
-CSS.prototype.onSelect = function(editor, obj, context, updatecontextclass) {
-	var tbobj = editor._toolbarObjects[obj.id];
-	var index = tbobj.element.selectedIndex;
-	var className = tbobj.element.value;
-
-	// retrieve parent element of the selection
-	var parent = editor.getParentElement();
-	var surround = true;
-
-	var is_span = (parent && parent.tagName.toLowerCase() == "span");
-	var update_parent = (context && updatecontextclass && parent && parent.tagName.toLowerCase() == context);
-
-	if (update_parent) {
-		parent.className = className;
-		editor.updateToolbar();
-		return;
-	}
-
-	if (is_span && index == 0 && !/\S/.test(parent.style.cssText)) {
-		while (parent.firstChild) {
-			parent.parentNode.insertBefore(parent.firstChild, parent);
-		}
-		parent.parentNode.removeChild(parent);
-		editor.updateToolbar();
-		return;
-	}
-
-	if (is_span) {
-		// maybe we could simply change the class of the parent node?
-		if (parent.childNodes.length == 1) {
-			parent.className = className;
-			surround = false;
-			// in this case we should handle the toolbar updation
-			// ourselves.
-			editor.updateToolbar();
-		}
-	}
-
-	// Other possibilities could be checked but require a lot of code.  We
-	// can't afford to do that now.
-	if (surround) {
-		// shit happens ;-) most of the time.  this method works, but
-		// it's dangerous when selection spans multiple block-level
-		// elements.
-		editor.surroundHTML("<span class='" + className + "'>", "</span>");
-	}
-};
-
-CSS.prototype.updateValue = function(editor, obj) {
-	var select = editor._toolbarObjects[obj.id].element;
-	var parent = editor.getParentElement();
-	if (typeof parent.className != "undefined" && /\S/.test(parent.className)) {
-		var options = select.options;
-		var value = parent.className;
-		for (var i = options.length; --i >= 0;) {
-			var option = options[i];
-			if (value == option.value) {
-				select.selectedIndex = i;
-				return;
-			}
-		}
-	}
-	select.selectedIndex = 0;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharCounter/char-counter.js b/web/imcms/xinha/plugins/CharCounter/char-counter.js
deleted file mode 100644
index 1f99a5e656..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/char-counter.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Charcounter for Xinha
-// (c) Udo Schmal & L.N.Schaffrath NeueMedien
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function CharCounter(editor) {
-  this.editor = editor;
-  this._Chars = 0;
-  this._Words = 0;
-  this._HTML = 0;
-  this.onKeyPress = this.__onKeyPress;
-}
-
-Xinha.Config.prototype.CharCounter =
-{
-  'showChar': true, // show the characters count,
-  'showWord': true, // show the words count,
-  'showHtml': true, // show the exact html count
-  'separator': ' | ', // separator used to join informations
-  'maxHTML' : -1 // -1 for unlimited length, other number for limiting the length of the edited HTML
-};
-
-CharCounter._pluginInfo = {
-  name          : "CharCounter",
-  version       : "1.31",
-  developer     : "Udo Schmal",
-  developer_url : "http://www.schaffrath-neuemedien.de",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de",
-  c_owner       : "Udo Schmal & L.N.Schaffrath NeueMedien",
-  license       : "htmlArea"
-};
-
-CharCounter.prototype._lc = function(string) {
-  return Xinha._lc(string, "CharCounter");
-};
-
-
-CharCounter.prototype.onGenerateOnce = function() {
-  var self = this;
-  if (this.charCount==null) {
-    var charCount = document.createElement("span");
-    charCount.style.padding = "2px 5px";
-    if(Xinha.is_ie) {
-      charCount.style.styleFloat = "right";
-    } else {
-      charCount.style.cssFloat = "right";
-    }
-    var brk = document.createElement('div');
-    brk.style.height =
-    brk.style.width =
-    brk.style.lineHeight =
-    brk.style.fontSize = '1px';
-    brk.style.clear = 'both';
-    if(Xinha.is_ie) {
-      this.editor._statusBarTree.style.styleFloat = "left";
-    } else {
-      this.editor._statusBarTree.style.cssFloat = "left";
-    }
-    this.editor._statusBar.appendChild(charCount);
-    this.editor._statusBar.appendChild(brk);
-    this.charCount = charCount;
-  }
-};
-
-CharCounter.prototype.__onKeyPress= function(ev) {
-  if ((ev.keyCode != 8) && (ev.keyCode !=46)) { // not backspace & delete
-    if (this.editor.config.CharCounter.maxHTML!=-1) {
-      var contents = this.editor.getHTML();
-      if (contents.length >= this.editor.config.CharCounter.maxHTML) {
-        Xinha._stopEvent(ev);
-        return true;
-      }
-    }
-  }
-}
-
-CharCounter.prototype._updateCharCount= function() {
-  var editor = this.editor;
-  var cfg = editor.config;
-  var contents = editor.getHTML();
-  var string = new Array();
-  if (cfg.CharCounter.showHtml) {
-    string[string.length] = this._lc("HTML") + ": " + contents.length;
-  }
-  this._HTML = contents.length;
-  if (cfg.CharCounter.showWord || cfg.CharCounter.showChar) {
-    contents = contents.replace(/<\/?\s*!--[^-->]*-->/gi, "" );
-    contents = contents.replace(/<(.+?)>/g, '');//Don't count HTML tags
-    contents = contents.replace(/&nbsp;/gi, ' ');
-    contents = contents.replace(/([\n\r\t])/g, ' ');//convert newlines and tabs into space
-    contents = contents.replace(/(  +)/g, ' ');//count spaces only once
-    contents = contents.replace(/&(.*);/g, ' ');//Count htmlentities as one keystroke
-    contents = contents.replace(/^\s*|\s*$/g, '');//trim
-  }
-  if (cfg.CharCounter.showWord) {
-    this._Words = 0;
-    for (var x=0;x<contents.length;x++)
-    {
-      if (contents.charAt(x) == " " ) {this._Words++;}
-    }
-    if (this._Words >=1) { this._Words++; }
-    string[string.length] = this._lc("Words") + ": " + this._Words ;
-  }
-  if (cfg.CharCounter.showChar) {
-    string[string.length] = this._lc("Chars") + ": " + contents.length;
-    this._Chars = contents.length;
-  }
-  this.charCount.innerHTML = string.join(cfg.CharCounter.separator);
-};
-
-CharCounter.prototype.onUpdateToolbar = function() {
-  this.charCount.innerHTML = this._lc("... in progress");
-  if(this._timeoutID) {
-    window.clearTimeout(this._timeoutID);
-  }
-  var e = this;
-  this._timeoutID = window.setTimeout(function() {e._updateCharCount();}, 1000);
-};
-
-CharCounter.prototype.onMode = function (mode)
-{
-  //Hide Chars in statusbar when switching into textmode
-  switch (mode)
-  {
-    case "textmode":
-      this.charCount.style.display = "none";
-      break;
-    case "wysiwyg":
-      this.charCount.style.display = "";
-      break;
-    default:
-      alert("Mode <" + mode + "> not defined!");
-      return false;
-  }
-};
diff --git a/web/imcms/xinha/plugins/CharCounter/lang/de.js b/web/imcms/xinha/plugins/CharCounter/lang/de.js
deleted file mode 100644
index 74b6d22c5c..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/lang/de.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Chars": "Zeichen",
-  "Words": "Worte",
-  "... in progress": "... in Bearbeitung"
-};
diff --git a/web/imcms/xinha/plugins/CharCounter/lang/fr.js b/web/imcms/xinha/plugins/CharCounter/lang/fr.js
deleted file mode 100644
index 0a4d9df6a4..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/lang/fr.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Chars": "Caractères",
-  "Words": "Mots"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharCounter/lang/ja.js b/web/imcms/xinha/plugins/CharCounter/lang/ja.js
deleted file mode 100644
index 77aace2048..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/lang/ja.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Chars": "文字数",
-  "Words": "�語数",
-  "... in progress": "... 処�中"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharCounter/lang/nb.js b/web/imcms/xinha/plugins/CharCounter/lang/nb.js
deleted file mode 100644
index 1aa701b9e2..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/lang/nb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Chars": "Tegn"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharCounter/lang/nl.js b/web/imcms/xinha/plugins/CharCounter/lang/nl.js
deleted file mode 100644
index d00e8e6c17..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/lang/nl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Chars": "Tekens",
-  "Words": "Woorden",
-  "... in progress": "... wordt verwerkt"
-};
diff --git a/web/imcms/xinha/plugins/CharCounter/lang/no.js b/web/imcms/xinha/plugins/CharCounter/lang/no.js
deleted file mode 100644
index 5234e083af..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/lang/no.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Chars": "Tegn"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharCounter/lang/pt_br.js b/web/imcms/xinha/plugins/CharCounter/lang/pt_br.js
deleted file mode 100644
index 4bc0b01752..0000000000
--- a/web/imcms/xinha/plugins/CharCounter/lang/pt_br.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "... in progress": "... em processo",
-  "Chars": "Caracteres",
-  "HTML": "HTML",
-  "Words": "Palavras"
-}
diff --git a/web/imcms/xinha/plugins/CharacterMap/CharacterMap.css b/web/imcms/xinha/plugins/CharacterMap/CharacterMap.css
deleted file mode 100644
index faea58b6b1..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/CharacterMap.css
+++ /dev/null
@@ -1,41 +0,0 @@
-.CharacterMap { }
-.CharacterMap a.entity {
-  font-size:12px;
-  width:18px;
-  display:block;
-  float:left;
-  padding:2px;
-  text-decoration:none;
-  color:#000;
-  text-align:center;
-  
-}
-.CharacterMap a.light {
-  background-color:#ffffff;
-}
-.CharacterMap a.dark {
-  background-color:#f7f8fd;
-}
-.CharacterMap a.entity:hover {
-  background-color:#ffd760;
-  color:#000;
-}
-.popup td.character {
-  font-family:Verdana,Arial,Helvetica,sans-serif;
-  font-size:14px;
-  font-weight:bold;
-  text-align:center;
-  background:#fff;
-  padding:4px;
-}
-.popup td.character-hilite {
-  background:#ffd760;
-}
-.popup form {
-  text-align:center;
-}
-.popup table {
-  cursor:pointer;
-  background-color:#ADAD9C;
-  border:1px inset;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharacterMap/character-map.js b/web/imcms/xinha/plugins/CharacterMap/character-map.js
deleted file mode 100644
index 64e8e12aa4..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/character-map.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// Character Map plugin for Xinha
-// Original Author - Bernhard Pfeifer novocaine@gmx.net
-Xinha.loadStyle( 'CharacterMap.css', 'CharacterMap' );
-
-function CharacterMap( editor )
-{
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-  cfg.registerButton(
-    {
-      id       : 'insertcharacter',
-      tooltip  : Xinha._lc( 'Insert special character', 'CharacterMap' ),
-      image    : editor.imgURL( 'ed_charmap.gif', 'CharacterMap' ),
-      textMode : false,
-      action   : function( editor ) { self.buttonPress( editor ); }
-    }
-  );
-  cfg.addToolbarElement('insertcharacter', 'createlink', -1);
-
-  if ( cfg.CharacterMap.mode == 'panel' )
-  {
-    editor._CharacterMap = editor.addPanel( 'right' );
-    Xinha._addClass( editor._CharacterMap, 'CharacterMap' );
-
-    editor.notifyOn( 'modechange',
-      function( e, args )
-      {
-        if ( args.mode == 'text' ) editor.hidePanel( editor._CharacterMap );
-      }
-    );
-
-    var entites =
-    [
-      '&Yuml;', '&scaron;', '&#064;', '&quot;', '&iexcl;', '&cent;', '&pound;', '&curren;', '&yen;', '&brvbar;',
-      '&sect;', '&uml;', '&copy;', '&ordf;', '&laquo;', '&not;', '&macr;', '&deg;', '&plusmn;', '&sup2;',
-      '&sup3;', '&acute;', '&micro;', '&para;', '&middot;', '&cedil;', '&sup1;', '&ordm;', '&raquo;', '&frac14;',
-      '&frac12;', '&frac34;', '&iquest;', '&times;', '&Oslash;', '&divide;', '&oslash;', '&fnof;', '&circ;',
-      '&tilde;', '&ndash;', '&mdash;', '&lsquo;', '&rsquo;', '&sbquo;', '&ldquo;', '&rdquo;', '&bdquo;',
-      '&dagger;', '&Dagger;', '&bull;', '&hellip;', '&permil;', '&lsaquo;', '&rsaquo;', '&euro;', '&trade;',
-      '&Agrave;', '&Aacute;', '&Acirc;', '&Atilde;', '&Auml;', '&Aring;', '&AElig;', '&Ccedil;', '&Egrave;',
-      '&Eacute;', '&Ecirc;', '&Euml;', '&Igrave;', '&Iacute;', '&Icirc;', '&Iuml;', '&ETH;', '&Ntilde;',
-      '&Ograve;', '&Oacute;', '&Ocirc;', '&Otilde;', '&Ouml;', '&reg;', '&times;', '&Ugrave;', '&Uacute;',
-      '&Ucirc;', '&Uuml;', '&Yacute;', '&THORN;', '&szlig;', '&agrave;', '&aacute;', '&acirc;', '&atilde;',
-      '&auml;', '&aring;', '&aelig;', '&ccedil;', '&egrave;', '&eacute;', '&ecirc;', '&euml;', '&igrave;',
-      '&iacute;', '&icirc;', '&iuml;', '&eth;', '&ntilde;', '&ograve;', '&oacute;', '&ocirc;', '&otilde;',
-      '&ouml;', '&divide;', '&oslash;', '&ugrave;', '&uacute;', '&ucirc;', '&uuml;', '&yacute;', '&thorn;',
-      '&yuml;', '&OElig;', '&oelig;', '&Scaron;'
-    ];
-
-    for ( var i=0; i<entites.length; i++ )
-      this.addEntity( entites[i], i );
-
-    editor.hidePanel( editor._CharacterMap );
-  }
-}
-
-// configuration mode : panel or popup
-Xinha.Config.prototype.CharacterMap =
-{
-  'mode': 'popup' // configuration mode : panel or popup
-};
-
-CharacterMap._pluginInfo =
-{
-  name          : "CharacterMap",
-  version       : "2.0",
-  developer     : "Laurent Vilday",
-  developer_url : "http://www.mokhet.com/",
-  c_owner       : "Xinha community",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "Creative Commons Attribution-ShareAlike License"
-};
-
-CharacterMap._isActive = false;
-
-CharacterMap.prototype.buttonPress = function( editor )
-{
-  var cfg = editor.config;
-  if ( cfg.CharacterMap.mode == 'panel' )
-  {
-    if ( this._isActive )
-    {
-      this._isActive = false;
-      editor.hidePanel( editor._CharacterMap );
-    }
-    else
-    {
-      this._isActive = true;
-      editor.showPanel( editor._CharacterMap );
-    }
-  }
-  else
-  {
-    editor._popupDialog( "plugin://CharacterMap/select_character", function( entity )
-    {
-      if ( !entity ) return false;
-      if ( Xinha.is_ie ) editor.focusEditor();
-      editor.insertHTML( entity );
-    }, null);
-  }
-};
-
-CharacterMap.prototype.addEntity = function ( entite, pos )
-{
-  var editor = this.editor;
-  var self = this;
-  var a = document.createElement( 'a' );
-  Xinha._addClass( a, 'entity' );
-  a.innerHTML = entite;
-  a.href = 'javascript:void(0)';
-  Xinha._addClass(a, (pos%2)? 'light':'dark');
-  a.onclick = function()
-  {
-    if (Xinha.is_ie) editor.focusEditor();
-    editor.insertHTML( entite );
-    //self._isActive = false;
-    //editor.hidePanel( editor._CharacterMap );
-    return false;
-  };
-  editor._CharacterMap.appendChild( a );
-  a = null;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharacterMap/img/ed_charmap.gif b/web/imcms/xinha/plugins/CharacterMap/img/ed_charmap.gif
deleted file mode 100644
index dc6d706ebc..0000000000
Binary files a/web/imcms/xinha/plugins/CharacterMap/img/ed_charmap.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/de.js b/web/imcms/xinha/plugins/CharacterMap/lang/de.js
deleted file mode 100644
index 0624817e39..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/de.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Sponsored by http://www.systemconcept.de
-// Author: Holger Hees, <hhees@systemconcept.de>
-// (c) systemconcept.de 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Insert special character": "Sonderzeichen einfügen",
-  "Cancel": "Abbrechen"
-}
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/fr.js b/web/imcms/xinha/plugins/CharacterMap/lang/fr.js
deleted file mode 100644
index 24851be024..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/fr.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Insert special character": "Insérer un caractère spécial",
-  "Cancel": "Annuler"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/it.js b/web/imcms/xinha/plugins/CharacterMap/lang/it.js
deleted file mode 100644
index 2b3e1a0834..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/it.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "it", ENCODING: UTF-8
-{
-  "Insert special character": "Inserisca il carattere speciale",
-  "Cancel": "Annullamento"
-};
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/ja.js b/web/imcms/xinha/plugins/CharacterMap/lang/ja.js
deleted file mode 100644
index 68ec5fd102..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/ja.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Insert special character": "特殊文字を挿入",
-  "Cancel": "中止"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/nb.js b/web/imcms/xinha/plugins/CharacterMap/lang/nb.js
deleted file mode 100644
index 744e6fc023..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/nb.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert special character": "Sett inn tegn",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/nl.js b/web/imcms/xinha/plugins/CharacterMap/lang/nl.js
deleted file mode 100644
index 477446d2ba..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/nl.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Sponsored by http://www.systemconcept.de
-// Author: Holger Hees, <hhees@systemconcept.de>
-// (c) systemconcept.de 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Insert special character": "Speciaal character invoegen",
-  "Cancel": "Annuleer"
-};
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/no.js b/web/imcms/xinha/plugins/CharacterMap/lang/no.js
deleted file mode 100644
index dd5da1f9b4..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/no.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert special character": "Sett inn tegn",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/pt_br.js b/web/imcms/xinha/plugins/CharacterMap/lang/pt_br.js
deleted file mode 100644
index a8c1891563..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/pt_br.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Cancel": "Cancelar",
-  "Insert special character": "Inserir caracter especial"
-}
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/ru.js b/web/imcms/xinha/plugins/CharacterMap/lang/ru.js
deleted file mode 100644
index 9111dd513c..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/ru.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Author: Andrei Blagorazumov, a@fnr.ru
-{
-  "Insert special character": "В�тавить �пециальный �имвол",
-  "Cancel": "Отменить"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/CharacterMap/lang/sv.js b/web/imcms/xinha/plugins/CharacterMap/lang/sv.js
deleted file mode 100755
index 4e2980429f..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/lang/sv.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "sv" (Swedish), ENCODING: UTF-8
-// translated: Erik Dalén <dalen@jpl.se>
-{
-  "Insert special character": "Infoga tecken",
-  "Cancel": "Avbryt"
-};
diff --git a/web/imcms/xinha/plugins/CharacterMap/popups/select_character.html b/web/imcms/xinha/plugins/CharacterMap/popups/select_character.html
deleted file mode 100644
index 1494b51ef9..0000000000
--- a/web/imcms/xinha/plugins/CharacterMap/popups/select_character.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-<title>Insert special character</title>
-<link rel="stylesheet" type="text/css" href="../CharacterMap.css" />
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<script type="text/javascript">
-  window.resizeTo(480, 300);
-// HTMLSource based on HTMLArea XTD 1.5 modified by Holger Hees
-// Original Author - Bernhard Pfeifer novocaine@gmx.net
-HTMLArea = window.opener.HTMLArea;
-function Init() // run on page load
-{
-  __dlg_translate('CharacterMap');
-  __dlg_init();
-
-  var character = ''; // set default input to empty
-  View( null, character );
-  document.getElementById("cancel").focus();
-}
-var oldView = null;
-function View( td, character ) // preview character
-{
-  if (oldView)
-    HTMLArea._removeClass(oldView, 'character-hilite');
-  if (td) {
-    oldView = td;
-    HTMLArea._addClass(oldView, 'character-hilite');
-  }
-}
-function Set( string ) // return character
-{
-  var character = string;
-  __dlg_close( character );
-}
-function onCancel() // cancel selection
-{
-  __dlg_close( null );
-  return false;
-}
-
-</script>
-</head>
-<body class="dialog popup" onload="Init();">
-<table border="0" cellspacing="1" cellpadding="0" width="100%">
-<tr>
-<td class="character" onmouseover="View(this,'&amp;Yuml;')" onclick="Set('&Yuml;')">&Yuml;</td>
-<td class="character" onmouseover="View(this,'&amp;scaron;')" onclick="Set('&scaron;')">&scaron;</td>
-<td class="character" onmouseover="View(this,'&amp;#064;')" onclick="Set('&#064;')">@</td>
-<td class="character" onmouseover="View(this,'&amp;quot;')" onclick="Set('&quot;')">&quot;</td>
-<td class="character" onmouseover="View(this,'&amp;iexcl;')" onclick="Set('&iexcl;')">&iexcl;</td>
-<td class="character" onmouseover="View(this,'&amp;cent;')" onclick="Set('&cent;')">&cent;</td>
-<td class="character" onmouseover="View(this,'&amp;pound;')" onclick="Set('&pound;')">&pound;</td>
-<td class="character" onmouseover="View(this,'&amp;curren;')" onclick="Set('&curren;')">&curren;</td>
-<td class="character" onmouseover="View(this,'&amp;yen;')" onclick="Set('&yen;')">&yen;</td>
-<td class="character" onmouseover="View(this,'&amp;brvbar;')" onclick="Set('&brvbar;')">&brvbar;</td>
-<td class="character" onmouseover="View(this,'&amp;sect;')" onclick="Set('&sect;')">&sect;</td>
-<td class="character" onmouseover="View(this,'&amp;uml;')" onclick="Set('&uml;')">&uml;</td>
-<td class="character" onmouseover="View(this,'&amp;copy;')" onclick="Set('&copy;')">&copy;</td>
-<td class="character" onmouseover="View(this,'&amp;ordf;')" onclick="Set('&ordf;')">&ordf;</td>
-<td class="character" onmouseover="View(this,'&amp;laquo;')" onclick="Set('&laquo;')">&laquo;</td>
-<td class="character" onmouseover="View(this,'&amp;not;')" onclick="Set('&not;')">&not;</td>
-</tr><tr>
-<td class="character" onmouseover="View(this,'&amp;macr;')" onclick="Set('&macr;')">&macr;</td>
-<td class="character" onmouseover="View(this,'&amp;deg;')" onclick="Set('&deg;')">&deg;</td>
-<td class="character" onmouseover="View(this,'&amp;plusmn;')" onclick="Set('&plusmn;')">&plusmn;</td>
-<td class="character" onmouseover="View(this,'&amp;sup2;')" onclick="Set('&sup2;')">&sup2;</td>
-<td class="character" onmouseover="View(this,'&amp;sup3;')" onclick="Set('&sup3;')">&sup3;</td>
-<td class="character" onmouseover="View(this,'&amp;acute;')" onclick="Set('&acute;')">&acute;</td>
-<td class="character" onmouseover="View(this,'&amp;micro;')" onclick="Set('&micro;')">&micro;</td>
-<td class="character" onmouseover="View(this,'&amp;para;')" onclick="Set('&para;')">&para;</td>
-<td class="character" onmouseover="View(this,'&amp;middot;')" onclick="Set('&middot;')">&middot;</td>
-<td class="character" onmouseover="View(this,'&amp;cedil;')" onclick="Set('&cedil;')">&cedil;</td>
-<td class="character" onmouseover="View(this,'&amp;sup1;')" onclick="Set('&sup1;')">&sup1;</td>
-<td class="character" onmouseover="View(this,'&amp;ordm;')" onclick="Set('&ordm;')">&ordm;</td>
-<td class="character" onmouseover="View(this,'&amp;raquo;')" onclick="Set('&raquo;')">&raquo;</td>
-<td class="character" onmouseover="View(this,'&amp;frac14;')" onclick="Set('&frac14;')">&frac14;</td>
-<td class="character" onmouseover="View(this,'&amp;frac12;')" onclick="Set('&frac12;')">&frac12;</td>
-<td class="character" onmouseover="View(this,'&amp;frac34;')" onclick="Set('&frac34;')">&frac34;</td>
-</tr><tr>
-<td class="character" onmouseover="View(this,'&amp;iquest;')" onclick="Set('&iquest;')">&iquest;</td>
-<td class="character" onmouseover="View(this,'&amp;times;')" onclick="Set('&times;')">&times;</td>
-<td class="character" onmouseover="View(this,'&amp;Oslash;')" onclick="Set('&Oslash;')">&Oslash;</td>
-<td class="character" onmouseover="View(this,'&amp;divide;')" onclick="Set('&divide;')">&divide;</td>
-<td class="character" onmouseover="View(this,'&amp;oslash;')" onclick="Set('&oslash;')">&oslash;</td>
-<td class="character" onmouseover="View(this,'&amp;fnof;')" onclick="Set('&fnof;')">&fnof;</td>
-<td class="character" onmouseover="View(this,'&amp;circ;')" onclick="Set('&circ;')">&circ;</td>
-<td class="character" onmouseover="View(this,'&amp;tilde;')" onclick="Set('&tilde;')">&tilde;</td>
-<td class="character" onmouseover="View(this,'&amp;ndash;')" onclick="Set('&ndash;')">&ndash;</td>
-<td class="character" onmouseover="View(this,'&amp;mdash;')" onclick="Set('&mdash;')">&mdash;</td>
-<td class="character" onmouseover="View(this,'&amp;lsquo;')" onclick="Set('&lsquo;')">&lsquo;</td>
-<td class="character" onmouseover="View(this,'&amp;rsquo;')" onclick="Set('&rsquo;')">&rsquo;</td>
-<td class="character" onmouseover="View(this,'&amp;sbquo;')" onclick="Set('&sbquo;')">&sbquo;</td>
-<td class="character" onmouseover="View(this,'&amp;ldquo;')" onclick="Set('&ldquo;')">&ldquo;</td>
-<td class="character" onmouseover="View(this,'&amp;rdquo;')" onclick="Set('&rdquo;')">&rdquo;</td>
-<td class="character" onmouseover="View(this,'&amp;bdquo;')" onclick="Set('&bdquo;')">&bdquo;</td>
-</tr><tr>
-<td class="character" onmouseover="View(this,'&amp;dagger;')" onclick="Set('&dagger;')">&dagger;</td>
-<td class="character" onmouseover="View(this,'&amp;Dagger;')" onclick="Set('&Dagger;')">&Dagger;</td>
-<td class="character" onmouseover="View(this,'&amp;bull;')" onclick="Set('&bull;')">&bull;</td>
-<td class="character" onmouseover="View(this,'&amp;hellip;')" onclick="Set('&hellip;')">&hellip;</td>
-<td class="character" onmouseover="View(this,'&amp;permil;')" onclick="Set('&permil;')">&permil;</td>
-<td class="character" onmouseover="View(this,'&amp;lsaquo;')" onclick="Set('&lsaquo;')">&lsaquo;</td>
-<td class="character" onmouseover="View(this,'&amp;rsaquo;')" onclick="Set('&rsaquo;')">&rsaquo;</td>
-<td class="character" onmouseover="View(this,'&amp;euro;')" onclick="Set('&euro;')">&euro;</td>
-<td class="character" onmouseover="View(this,'&amp;trade;')" onclick="Set('&trade;')">&trade;</td>
-<td class="character" onmouseover="View(this,'&amp;Agrave;')" onclick="Set('&Agrave;')">&Agrave;</td>
-<td class="character" onmouseover="View(this,'&amp;Aacute;')" onclick="Set('&Aacute;')">&Aacute;</td>
-<td class="character" onmouseover="View(this,'&amp;Acirc;')" onclick="Set('&Acirc;')">&Acirc;</td>
-<td class="character" onmouseover="View(this,'&amp;Atilde;')" onclick="Set('&Atilde;')">&Atilde;</td>
-<td class="character" onmouseover="View(this,'&amp;Auml;')" onclick="Set('&Auml;')">&Auml;</td>
-<td class="character" onmouseover="View(this,'&amp;Aring;')" onclick="Set('&Aring;')">&Aring;</td>
-<td class="character" onmouseover="View(this,'&amp;AElig;')" onclick="Set('&AElig;')">&AElig;</td>
-</tr><tr>
-<td class="character" onmouseover="View(this,'&amp;Ccedil;')" onclick="Set('&Ccedil;')">&Ccedil;</td>
-<td class="character" onmouseover="View(this,'&amp;Egrave;')" onclick="Set('&Egrave;')">&Egrave;</td>
-<td class="character" onmouseover="View(this,'&amp;Eacute;')" onclick="Set('&Eacute;')">&Eacute;</td>
-<td class="character" onmouseover="View(this,'&amp;Ecirc;')" onclick="Set('&Ecirc;')">&Ecirc;</td>
-<td class="character" onmouseover="View(this,'&amp;Euml;')" onclick="Set('&Euml;')">&Euml;</td>
-<td class="character" onmouseover="View(this,'&amp;Igrave;')" onclick="Set('&Igrave;')">&Igrave;</td>
-<td class="character" onmouseover="View(this,'&amp;Iacute;')" onclick="Set('&Iacute;')">&Iacute;</td>
-<td class="character" onmouseover="View(this,'&amp;Icirc;')" onclick="Set('&Icirc;')">&Icirc;</td>
-<td class="character" onmouseover="View(this,'&amp;Iuml;')" onclick="Set('&Iuml;')">&Iuml;</td>
-<td class="character" onmouseover="View(this,'&amp;ETH;')" onclick="Set('&ETH;')">&ETH;</td>
-<td class="character" onmouseover="View(this,'&amp;Ntilde;')" onclick="Set('&Ntilde;')">&Ntilde;</td>
-<td class="character" onmouseover="View(this,'&amp;Ograve;')" onclick="Set('&Ograve;')">&Ograve;</td>
-<td class="character" onmouseover="View(this,'&amp;Oacute;')" onclick="Set('&Oacute;')">&Oacute;</td>
-<td class="character" onmouseover="View(this,'&amp;Ocirc;')" onclick="Set('&Ocirc;')">&Ocirc;</td>
-<td class="character" onmouseover="View(this,'&amp;Otilde;')" onclick="Set('&Otilde;')">&Otilde;</td>
-<td class="character" onmouseover="View(this,'&amp;Ouml;')" onclick="Set('&Ouml;')">&Ouml;</td>
-</tr><tr>
-<td class="character" onmouseover="View(this,'&amp;reg;')" onclick="Set('&reg;')">&reg;</td>
-<td class="character" onmouseover="View(this,'&amp;times;')" onclick="Set('&times;')">&times;</td>
-<td class="character" onmouseover="View(this,'&amp;Ugrave;')" onclick="Set('&Ugrave;')">&Ugrave;</td>
-<td class="character" onmouseover="View(this,'&amp;Uacute;')" onclick="Set('&Uacute;')">&Uacute;</td>
-<td class="character" onmouseover="View(this,'&amp;Ucirc;')" onclick="Set('&Ucirc;')">&Ucirc;</td>
-<td class="character" onmouseover="View(this,'&amp;Uuml;')" onclick="Set('&Uuml;')">&Uuml;</td>
-<td class="character" onmouseover="View(this,'&amp;Yacute;')" onclick="Set('&Yacute;')">&Yacute;</td>
-<td class="character" onmouseover="View(this,'&amp;THORN;')" onclick="Set('&THORN;')">&THORN;</td>
-<td class="character" onmouseover="View(this,'&amp;szlig;')" onclick="Set('&szlig;')">&szlig;</td>
-<td class="character" onmouseover="View(this,'&amp;agrave;')" onclick="Set('&agrave;')">&agrave;</td>
-<td class="character" onmouseover="View(this,'&amp;aacute;')" onclick="Set('&aacute;')">&aacute;</td>
-<td class="character" onmouseover="View(this,'&amp;acirc;')" onclick="Set('&acirc;')">&acirc;</td>
-<td class="character" onmouseover="View(this,'&amp;atilde;')" onclick="Set('&atilde;')">&atilde;</td>
-<td class="character" onmouseover="View(this,'&amp;auml;')" onclick="Set('&auml;')">&auml;</td>
-<td class="character" onmouseover="View(this,'&amp;aring;')" onclick="Set('&aring;')">&aring;</td>
-<td class="character" onmouseover="View(this,'&amp;aelig;')" onclick="Set('&aelig;')">&aelig;</td>
-</tr><tr>
-<td class="character" onmouseover="View(this,'&amp;ccedil;')" onclick="Set('&ccedil;')">&ccedil;</td>
-<td class="character" onmouseover="View(this,'&amp;egrave;')" onclick="Set('&egrave;')">&egrave;</td>
-<td class="character" onmouseover="View(this,'&amp;eacute;')" onclick="Set('&eacute;')">&eacute;</td>
-<td class="character" onmouseover="View(this,'&amp;ecirc;')" onclick="Set('&ecirc;')">&ecirc;</td>
-<td class="character" onmouseover="View(this,'&amp;euml;')" onclick="Set('&euml;')">&euml;</td>
-<td class="character" onmouseover="View(this,'&amp;igrave;')" onclick="Set('&igrave;')">&igrave;</td>
-<td class="character" onmouseover="View(this,'&amp;iacute;')" onclick="Set('&iacute;')">&iacute;</td>
-<td class="character" onmouseover="View(this,'&amp;icirc;')" onclick="Set('&icirc;')">&icirc;</td>
-<td class="character" onmouseover="View(this,'&amp;iuml;')" onclick="Set('&iuml;')">&iuml;</td>
-<td class="character" onmouseover="View(this,'&amp;eth;')" onclick="Set('&eth;')">&eth;</td>
-<td class="character" onmouseover="View(this,'&amp;ntilde;')" onclick="Set('&ntilde;')">&ntilde;</td>
-<td class="character" onmouseover="View(this,'&amp;ograve;')" onclick="Set('&ograve;')">&ograve;</td>
-<td class="character" onmouseover="View(this,'&amp;oacute;')" onclick="Set('&oacute;')">&oacute;</td>
-<td class="character" onmouseover="View(this,'&amp;ocirc;')" onclick="Set('&ocirc;')">&ocirc;</td>
-<td class="character" onmouseover="View(this,'&amp;otilde;')" onclick="Set('&otilde;')">&otilde;</td>
-<td class="character" onmouseover="View(this,'&amp;ouml;')" onclick="Set('&ouml;')">&ouml;</td>
-</tr><tr>
-<td class="character" onmouseover="View(this,'&amp;divide;')" onclick="Set('&divide;')">&divide;</td>
-<td class="character" onmouseover="View(this,'&amp;oslash;')" onclick="Set('&oslash;')">&oslash;</td>
-<td class="character" onmouseover="View(this,'&amp;ugrave;')" onclick="Set('&ugrave;')">&ugrave;</td>
-<td class="character" onmouseover="View(this,'&amp;uacute;')" onclick="Set('&uacute;')">&uacute;</td>
-<td class="character" onmouseover="View(this,'&amp;ucirc;')" onclick="Set('&ucirc;')">&ucirc;</td>
-<td class="character" onmouseover="View(this,'&amp;uuml;')" onclick="Set('&uuml;')">&uuml;</td>
-<td class="character" onmouseover="View(this,'&amp;yacute;')" onclick="Set('&yacute;')">&yacute;</td>
-<td class="character" onmouseover="View(this,'&amp;thorn;')" onclick="Set('&thorn;')">&thorn;</td>
-<td class="character" onmouseover="View(this,'&amp;yuml;')" onclick="Set('&yuml;')">&yuml;</td>
-<td class="character" onmouseover="View(this,'&amp;OElig;')" onclick="Set('&OElig;')">&OElig;</td>
-<td class="character" onmouseover="View(this,'&amp;oelig;')" onclick="Set('&oelig;')">&oelig;</td>
-<td class="character" onmouseover="View(this,'&amp;Scaron;')" onclick="Set('&Scaron;')">&Scaron;</td>
-<td class="character" colspan="4">&nbsp;</td>
-</tr>
-</table><br>
-<form action="#"><button type="button" id="cancel" name="cancel" onclick="return onCancel();">Cancel</button></form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/clientside-spellcheck.js b/web/imcms/xinha/plugins/ClientsideSpellcheck/clientside-spellcheck.js
deleted file mode 100644
index 8742bb46f6..0000000000
--- a/web/imcms/xinha/plugins/ClientsideSpellcheck/clientside-spellcheck.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// IE Spell Implementation for XINHA
-//Client-side spell check plugin
-//This implements the API for ieSpell, which is owned by Red Egg Software 
-//For more info about ieSpell, go to http://www.iespell.com/index.htm
-// Distributed under the same terms as Xinha itself.
-// This notice MUST stay intact for use (see license.txt).
-
-
-function ClientsideSpellcheck(editor) {
-  this.editor = editor;
-
-  var cfg = editor.config;
-  var bl = ClientsideSpellcheck.btnList;
-  var self = this;
-
-  // see if we can find the mode switch button, insert this before that
-  var id = "clientsidespellcheck";
-  
-  
-  cfg.registerButton(id, this._lc("Spell Check using ieSpell"), editor.imgURL("clientside-spellcheck.gif", "ClientsideSpellcheck"), false,
-             function(editor, id) {
-               // dispatch button press event
-               self.buttonPress(editor, id);
-             });
-
-  if(Xinha.is_ie) {
-    cfg.addToolbarElement("clientsidespellcheck", "print", 1);
-}
-
-}
-
-ClientsideSpellcheck._pluginInfo = {
-  name          : "ClientsideSpellcheck",
-  version       : "1.0",
-  developer     : "Michael Harris",
-  developer_url : "http://www.jonesinternational.edu",
-  c_owner       : "Red Egg Software",
-  sponsor       : "Jones International University",
-  sponsor_url   : "http://www.jonesinternational.edu",
-  license       : "htmlArea"
-};
-
-
-ClientsideSpellcheck.prototype._lc = function(string) {
-  return Xinha._lc(string, 'ClientsideSpellcheck');
-};
-
-ClientsideSpellcheck.prototype.buttonPress = function(editor) {
-
-	try {
-		var tmpis = new ActiveXObject("ieSpell.ieSpellExtension");
-		tmpis.CheckAllLinkedDocuments(document);
-	}
-	catch(exception) {
- 		if(exception.number==-2146827859) {
-			if (confirm(this.lc("ieSpell not detected.  Click Ok to go to download page.")))
-				window.open("http://www.iespell.com/download.php","DownLoad");
-		} else {
-			alert(this.lc("ieSpell can only be used in Internet Explorer"));
-		}
-	}
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/img/clientside-spellcheck.gif b/web/imcms/xinha/plugins/ClientsideSpellcheck/img/clientside-spellcheck.gif
deleted file mode 100644
index dc8435c367..0000000000
Binary files a/web/imcms/xinha/plugins/ClientsideSpellcheck/img/clientside-spellcheck.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/img/he-spell-check.gif b/web/imcms/xinha/plugins/ClientsideSpellcheck/img/he-spell-check.gif
deleted file mode 100644
index 8015d2ff22..0000000000
Binary files a/web/imcms/xinha/plugins/ClientsideSpellcheck/img/he-spell-check.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/de.js b/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/de.js
deleted file mode 100644
index 5fed4c82b5..0000000000
--- a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/de.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Spell Check using ieSpell": "Englische Rechtschreibkontrolle mit ieSpell",
-  "ieSpell can only be used in Internet Explorer": "ieSpell kann nur mit dem Internet Explorer benutzt werden",
-  "ieSpell not detected.  Click Ok to go to download page.": "ieSpell wurde nicht gefunden. Drücken sie Ok um ieSpeck herunter zu laden."
-};
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/ja.js b/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/ja.js
deleted file mode 100644
index 22ae660e85..0000000000
--- a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/ja.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Spell Check using ieSpell": "スペル�ェック� ieSpell を使�",
-  "ieSpell can only be used in Internet Explorer": "ieSpell � Internet Explorer ���使用����",
-  "ieSpell not detected.  Click Ok to go to download page.": "ieSpell �検知�れ��ん���。OK をクリック��ダウンロードページを開������。"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/nb.js b/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/nb.js
deleted file mode 100644
index 4b985c2ee9..0000000000
--- a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/nb.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// Dummy file
-
-{};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/nl.js b/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/nl.js
deleted file mode 100644
index d5c836770a..0000000000
--- a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/nl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Spell Check using ieSpell": "Engelse spellingscontrole met ieSpell",
-  "ieSpell can only be used in Internet Explorer": "ieSpell kan alleen worden gebruikt in Internet Explorer",
-  "ieSpell not detected.  Click Ok to go to download page.": "ieSpell werd niet gevonden. Klik op Ok om ieSpell te downloaden"
-};
diff --git a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/pt_br.js b/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/pt_br.js
deleted file mode 100644
index 62b351d252..0000000000
--- a/web/imcms/xinha/plugins/ClientsideSpellcheck/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Spell Check using ieSpell": "Verificação Ortográfica utilizando ieSpell"
-}
diff --git a/web/imcms/xinha/plugins/ContextMenu/1.pl b/web/imcms/xinha/plugins/ContextMenu/1.pl
deleted file mode 100755
index fdf66790ef..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/1.pl
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/perl -w
-
-use strict;
-
-my $file = 'context-menu.js';
-my $outfile = $file.'-i18n';
-my $langfile = 'en.js';
-
-open FILE, "<$file";
-#open OUTFILE, ">$outfile";
-#open LANGFILE, ">$langfile";
-my %texts = ();
-while (<FILE>) {
-    if (/"(.*?)"/) {
-        my $inline = $_;
-        chomp $inline;
-        my $key = $1;
-        my $val = $1;
-        print "Key: [$key]: ";
-        my $line = <STDIN>;
-        if (defined $line) {
-            chomp $line;
-            if ($line =~ /(\S+)/) {
-                $key = $1;
-                print "-- using $key\n";
-            }
-            $texts{$val} = $key;
-        } else {
-            print " -- skipped...\n";
-        }
-    }
-}
-#close LANGFILE;
-#close OUTFILE;
-close FILE;
-
-print "\n\n\n";
-print '"', join("\"\n\"", sort keys %texts), '"', "\n";
diff --git a/web/imcms/xinha/plugins/ContextMenu/context-menu.js b/web/imcms/xinha/plugins/ContextMenu/context-menu.js
deleted file mode 100644
index 81dc3d5685..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/context-menu.js
+++ /dev/null
@@ -1,473 +0,0 @@
-// Context Menu Plugin for HTMLArea-3.0
-// Sponsored by www.americanbible.org
-// Implementation by Mihai Bazon, http://dynarch.com/mishoo/
-//
-// (c) dynarch.com 2003.
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-//
-// $Id: context-menu.js 856 2007-06-13 18:34:34Z wymsy $
-
-Xinha.loadStyle("menu.css", "ContextMenu");
-
-function ContextMenu(editor) {
-	this.editor = editor;
-}
-
-ContextMenu._pluginInfo = {
-	name          : "ContextMenu",
-	version       : "1.0",
-	developer     : "Mihai Bazon",
-	developer_url : "http://dynarch.com/mishoo/",
-	c_owner       : "dynarch.com",
-	sponsor       : "American Bible Society",
-	sponsor_url   : "http://www.americanbible.org",
-	license       : "htmlArea"
-};
-
-ContextMenu.prototype.onGenerate = function() {
-	var self = this;
-	var doc = this.editordoc = this.editor._iframe.contentWindow.document;
-	Xinha._addEvents(doc, ["contextmenu"],
-			    function (event) {
-				    return self.popupMenu(Xinha.is_ie ? self.editor._iframe.contentWindow.event : event);
-			    });
-	this.currentMenu = null;
-};
-
-ContextMenu.prototype.getContextMenu = function(target) {
-	var self = this;
-	var editor = this.editor;
-	var config = editor.config;
-	var menu = [];
-	var tbo = this.editor.plugins.TableOperations;
-	if (tbo) tbo = tbo.instance;
-
-	var selection = editor.hasSelectedText();
-	if (!Xinha.is_gecko) {
-		if (selection) {
-			menu.push([ Xinha._lc("Cut", "ContextMenu"), function() { editor.execCommand("cut"); }, null, config.btnList["cut"][1] ],
-				  [ Xinha._lc("Copy", "ContextMenu"), function() { editor.execCommand("copy"); }, null, config.btnList["copy"][1] ]);
-			menu.push([ Xinha._lc("Paste", "ContextMenu"), function() { editor.execCommand("paste"); }, null, config.btnList["paste"][1] ]);
-		}
-	}
-	var currentTarget = target;
-	var elmenus = [];
-
-	var link = null;
-	var table = null;
-	var tr = null;
-	var td = null;
-	var img = null;
-
-	function tableOperation(opcode) {
-		tbo.buttonPress(editor, opcode);
-	}
-
-	function insertPara(after) {
-		var el = currentTarget;
-		var par = el.parentNode;
-		var p = editor._doc.createElement("p");
-		p.appendChild(editor._doc.createElement("br"));
-		par.insertBefore(p, after ? el.nextSibling : el);
-		var sel = editor._getSelection();
-		var range = editor._createRange(sel);
-		if (!Xinha.is_ie) {
-			sel.removeAllRanges();
-			range.selectNodeContents(p);
-			range.collapse(true);
-			sel.addRange(range);
-		} else {
-			range.moveToElementText(p);
-			range.collapse(true);
-			range.select();
-		}
-	}
-
-	for (; target; target = target.parentNode) {
-		var tag = target.tagName;
-		if (!tag)
-			continue;
-		tag = tag.toLowerCase();
-		switch (tag) {
-		    case "img":
-			img = target;
-			elmenus.push(null,
-				     [ Xinha._lc("_Image Properties...", "ContextMenu"),
-				       function() {
-					       editor._insertImage(img);
-				       },
-				       Xinha._lc("Show the image properties dialog", "ContextMenu"),
-				       config.btnList["insertimage"][1] ]
-				);
-			break;
-		    case "a":
-			link = target;
-			elmenus.push(null,
-				     [ Xinha._lc("_Modify Link...", "ContextMenu"),
-               function() { editor.config.btnList['createlink'][3](editor); },
-				       Xinha._lc("Current URL is", "ContextMenu") + ': ' + link.href,
-				       config.btnList["createlink"][1] ],
-
-				     [ Xinha._lc("Chec_k Link...", "ContextMenu"),
-				       function() { window.open(link.href); },
-				       Xinha._lc("Opens this link in a new window", "ContextMenu") ],
-
-				     [ Xinha._lc("_Remove Link...", "ContextMenu"),
-				       function() {
-					       if (confirm(Xinha._lc("Please confirm that you want to unlink this element.", "ContextMenu") + "\n" +
-							   Xinha._lc("Link points to:", "ContextMenu") + " " + link.href)) {
-						       while (link.firstChild)
-							       link.parentNode.insertBefore(link.firstChild, link);
-						       link.parentNode.removeChild(link);
-					       }
-				       },
-				       Xinha._lc("Unlink the current element", "ContextMenu") ]
-				);
-			break;
-		    case "td":
-			td = target;
-			if (!tbo) break;
-			elmenus.push(null,
-				     [ Xinha._lc("C_ell Properties...", "ContextMenu"),
-				       function() { tableOperation("TO-cell-prop"); },
-				       Xinha._lc("Show the Table Cell Properties dialog", "ContextMenu"),
-				       config.btnList["TO-cell-prop"][1] ],
-
-             [ Xinha._lc("Insert Cell After", "ContextMenu"),
-				       function() { tableOperation("TO-cell-insert-after"); },
-				       Xinha._lc("Insert Cell After", "ContextMenu"),
-				       config.btnList["TO-cell-insert-after"][1] ],
-
-             [ Xinha._lc("Insert Cell Before", "ContextMenu"),
-				       function() { tableOperation("TO-cell-insert-before"); },
-				       Xinha._lc("Insert Cell After", "ContextMenu"),
-				       config.btnList["TO-cell-insert-before"][1] ],
-
-             [ Xinha._lc("Delete Cell", "ContextMenu"),
-				       function() { tableOperation("TO-cell-delete"); },
-				       Xinha._lc("Delete Cell", "ContextMenu"),
-				       config.btnList["TO-cell-delete"][1] ],
-
-             [ Xinha._lc("Merge Cells", "ContextMenu"),
-				       function() { tableOperation("TO-cell-merge"); },
-				       Xinha._lc("Merge Cells", "ContextMenu"),
-				       config.btnList["TO-cell-merge"][1] ]
-				);
-			break;
-		    case "tr":
-			tr = target;
-			if (!tbo) break;
-			elmenus.push(null,
-				     [ Xinha._lc("Ro_w Properties...", "ContextMenu"),
-				       function() { tableOperation("TO-row-prop"); },
-				       Xinha._lc("Show the Table Row Properties dialog", "ContextMenu"),
-				       config.btnList["TO-row-prop"][1] ],
-
-				     [ Xinha._lc("I_nsert Row Before", "ContextMenu"),
-				       function() { tableOperation("TO-row-insert-above"); },
-				       Xinha._lc("Insert a new row before the current one", "ContextMenu"),
-				       config.btnList["TO-row-insert-above"][1] ],
-
-				     [ Xinha._lc("In_sert Row After", "ContextMenu"),
-				       function() { tableOperation("TO-row-insert-under"); },
-				       Xinha._lc("Insert a new row after the current one", "ContextMenu"),
-				       config.btnList["TO-row-insert-under"][1] ],
-
-				     [ Xinha._lc("_Delete Row", "ContextMenu"),
-				       function() { tableOperation("TO-row-delete"); },
-				       Xinha._lc("Delete the current row", "ContextMenu"),
-				       config.btnList["TO-row-delete"][1] ]
-				);
-			break;
-		    case "table":
-			table = target;
-			if (!tbo) break;
-			elmenus.push(null,
-				     [ Xinha._lc("_Table Properties...", "ContextMenu"),
-				       function() { tableOperation("TO-table-prop"); },
-				       Xinha._lc("Show the Table Properties dialog", "ContextMenu"),
-				       config.btnList["TO-table-prop"][1] ],
-
-				     [ Xinha._lc("Insert _Column Before", "ContextMenu"),
-				       function() { tableOperation("TO-col-insert-before"); },
-				       Xinha._lc("Insert a new column before the current one", "ContextMenu"),
-				       config.btnList["TO-col-insert-before"][1] ],
-
-				     [ Xinha._lc("Insert C_olumn After", "ContextMenu"),
-				       function() { tableOperation("TO-col-insert-after"); },
-				       Xinha._lc("Insert a new column after the current one", "ContextMenu"),
-				       config.btnList["TO-col-insert-after"][1] ],
-
-				     [ Xinha._lc("De_lete Column", "ContextMenu"),
-				       function() { tableOperation("TO-col-delete"); },
-				       Xinha._lc("Delete the current column", "ContextMenu"),
-				       config.btnList["TO-col-delete"][1] ]
-				);
-			break;
-		    case "body":
-			elmenus.push(null,
-				     [ Xinha._lc("Justify Left", "ContextMenu"),
-				       function() { editor.execCommand("justifyleft"); }, null,
-				       config.btnList["justifyleft"][1] ],
-				     [ Xinha._lc("Justify Center", "ContextMenu"),
-				       function() { editor.execCommand("justifycenter"); }, null,
-				       config.btnList["justifycenter"][1] ],
-				     [ Xinha._lc("Justify Right", "ContextMenu"),
-				       function() { editor.execCommand("justifyright"); }, null,
-				       config.btnList["justifyright"][1] ],
-				     [ Xinha._lc("Justify Full", "ContextMenu"),
-				       function() { editor.execCommand("justifyfull"); }, null,
-				       config.btnList["justifyfull"][1] ]
-				);
-			break;
-		}
-	}
-
-	if (selection && !link)
-		menu.push(null, [ Xinha._lc("Make lin_k...", "ContextMenu"),
-           function() { editor.config.btnList['createlink'][3](editor); },
-				  Xinha._lc("Create a link", "ContextMenu"),
-				  config.btnList["createlink"][1] ]);
-
-	for (var i = 0; i < elmenus.length; ++i)
-		menu.push(elmenus[i]);
-
-	if (!/html|body/i.test(currentTarget.tagName))
-		menu.push(null,
-			  [ Xinha._lc({string: "Remove the $elem Element...", replace: {elem: "&lt;" + currentTarget.tagName + "&gt;"}}, "ContextMenu"),
-			    function() {
-				    if (confirm(Xinha._lc("Please confirm that you want to remove this element:", "ContextMenu") + " " +
-						currentTarget.tagName)) {
-					    var el = currentTarget;
-					    var p = el.parentNode;
-					    p.removeChild(el);
-					    if (Xinha.is_gecko) {
-						    if (p.tagName.toLowerCase() == "td" && !p.hasChildNodes())
-							    p.appendChild(editor._doc.createElement("br"));
-						    editor.forceRedraw();
-						    editor.focusEditor();
-						    editor.updateToolbar();
-						    if (table) {
-							    var save_collapse = table.style.borderCollapse;
-							    table.style.borderCollapse = "collapse";
-							    table.style.borderCollapse = "separate";
-							    table.style.borderCollapse = save_collapse;
-						    }
-					    }
-				    }
-			    },
-			    Xinha._lc("Remove this node from the document", "ContextMenu") ],
-			  [ Xinha._lc("Insert paragraph before", "ContextMenu"),
-			    function() { insertPara(false); },
-			    Xinha._lc("Insert a paragraph before the current node", "ContextMenu") ],
-			  [ Xinha._lc("Insert paragraph after", "ContextMenu"),
-			    function() { insertPara(true); },
-			    Xinha._lc("Insert a paragraph after the current node", "ContextMenu") ]
-			  );
-	if (!menu[0]) menu.shift(); //If the menu begins with a separator, remove it for cosmetical reasons
-	return menu;
-};
-
-ContextMenu.prototype.popupMenu = function(ev) {
-	var self = this;
-	if (this.currentMenu)
-	{
-		this.closeMenu();
-	}
-	function getPos(el) {
-		var r = { x: el.offsetLeft, y: el.offsetTop };
-		if (el.offsetParent) {
-			var tmp = getPos(el.offsetParent);
-			r.x += tmp.x;
-			r.y += tmp.y;
-		}
-		return r;
-	}
-	function documentClick(ev) {
-		ev || (ev = window.event);
-		if (!self.currentMenu) {
-			alert(Xinha._lc("How did you get here? (Please report!)", "ContextMenu"));
-			return false;
-		}
-		var el = Xinha.is_ie ? ev.srcElement : ev.target;
-		for (; el != null && el != self.currentMenu; el = el.parentNode);
-		if (el == null)
-			self.closeMenu();
-		//Xinha._stopEvent(ev);
-		//return false;
-	}
-	var keys = [];
-	function keyPress(ev) {
-		ev || (ev = window.event);
-		Xinha._stopEvent(ev);
-		if (ev.keyCode == 27) {
-			self.closeMenu();
-			return false;
-		}
-		var key = String.fromCharCode(Xinha.is_ie ? ev.keyCode : ev.charCode).toLowerCase();
-		for (var i = keys.length; --i >= 0;) {
-			var k = keys[i];
-			if (k[0].toLowerCase() == key)
-				k[1].__msh.activate();
-		}
-	}
-	self.closeMenu = function() {
-		self.currentMenu.parentNode.removeChild(self.currentMenu);
-		self.currentMenu = null;
-		Xinha._removeEvent(document, "mousedown", documentClick);
-		Xinha._removeEvent(self.editordoc, "mousedown", documentClick);
-		if (keys.length > 0)
-			Xinha._removeEvent(self.editordoc, "keypress", keyPress);
-		if (Xinha.is_ie)
-			self.iePopup.hide();
-	}
-	var target = Xinha.is_ie ? ev.srcElement : ev.target;
-     var ifpos = getPos(self.editor._htmlArea);//_iframe);
-	var x = ev.clientX + ifpos.x;
-	var y = ev.clientY + ifpos.y;
-
-	var div;
-	var doc;
-	if (!Xinha.is_ie) {
-		doc = document;
-	} else {
-		// IE stinks
-		var popup = this.iePopup = window.createPopup();
-		doc = popup.document;
-		doc.open();
-		doc.write("<html><head><style type='text/css'>@import url(" + _editor_url + "plugins/ContextMenu/menu.css); html, body { padding: 0px; margin: 0px; overflow: hidden; border: 0px; }</style></head><body unselectable='yes'></body></html>");
-		doc.close();
-	}
-	div = doc.createElement("div");
-	if (Xinha.is_ie)
-		div.unselectable = "on";
-	div.oncontextmenu = function() { return false; };
-	div.className = "htmlarea-context-menu";
-	if (!Xinha.is_ie)
-		div.style.left = div.style.top = "0px";
-	doc.body.appendChild(div);
-
-	var table = doc.createElement("table");
-	div.appendChild(table);
-	table.cellSpacing = 0;
-	table.cellPadding = 0;
-	var parent = doc.createElement("tbody");
-	table.appendChild(parent);
-
-	var options = this.getContextMenu(target);
-	for (var i = 0; i < options.length; ++i) {
-		var option = options[i];
-		var item = doc.createElement("tr");
-		parent.appendChild(item);
-		if (Xinha.is_ie)
-			item.unselectable = "on";
-		else item.onmousedown = function(ev) {
-			Xinha._stopEvent(ev);
-			return false;
-		};
-		if (!option) {
-			item.className = "separator";
-			var td = doc.createElement("td");
-			td.className = "icon";
-			var IE_IS_A_FUCKING_SHIT = '>';
-			if (Xinha.is_ie) {
-				td.unselectable = "on";
-				IE_IS_A_FUCKING_SHIT = " unselectable='on' style='height=1px'>&nbsp;";
-			}
-			td.innerHTML = "<div" + IE_IS_A_FUCKING_SHIT + "</div>";
-			var td1 = td.cloneNode(true);
-			td1.className = "label";
-			item.appendChild(td);
-			item.appendChild(td1);
-		} else {
-			var label = option[0];
-			item.className = "item";
-			item.__msh = {
-				item: item,
-				label: label,
-				action: option[1],
-				tooltip: option[2] || null,
-				icon: option[3] || null,
-				activate: function() {
-					self.closeMenu();
-					self.editor.focusEditor();
-					this.action();
-				}
-			};
-			label = label.replace(/_([a-zA-Z0-9])/, "<u>$1</u>");
-			if (label != option[0])
-				keys.push([ RegExp.$1, item ]);
-			label = label.replace(/__/, "_");
-			var td1 = doc.createElement("td");
-			if (Xinha.is_ie)
-				td1.unselectable = "on";
-			item.appendChild(td1);
-			td1.className = "icon";
-			if (item.__msh.icon)
-      {
-        var t = Xinha.makeBtnImg(item.__msh.icon, doc);
-        td1.appendChild(t);
-        // td1.innerHTML = "<img align='middle' src='" + item.__msh.icon + "' />";
-      }
-      var td2 = doc.createElement("td");
-			if (Xinha.is_ie)
-				td2.unselectable = "on";
-			item.appendChild(td2);
-			td2.className = "label";
-			td2.innerHTML = label;
-			item.onmouseover = function() {
-				this.className += " hover";
-				self.editor._statusBarTree.innerHTML = this.__msh.tooltip || '&nbsp;';
-			};
-			item.onmouseout = function() { this.className = "item"; };
-			item.oncontextmenu = function(ev) {
-				this.__msh.activate();
-				if (!Xinha.is_ie)
-					Xinha._stopEvent(ev);
-				return false;
-			};
-			item.onmouseup = function(ev) {
-				var timeStamp = (new Date()).getTime();
-				if (timeStamp - self.timeStamp > 500)
-					this.__msh.activate();
-				if (!Xinha.is_ie)
-					Xinha._stopEvent(ev);
-				return false;
-			};
-			//if (typeof option[2] == "string")
-			//item.title = option[2];
-		}
-	}
-
-	if (!Xinha.is_ie) {
-    /* FIXME: I think this is to stop the popup from running off the bottom of the screen?
-		var dx = x + div.offsetWidth - window.innerWidth + 4;
-		var dy = y + div.offsetHeight - window.innerHeight + 4;
-    // alert('dy= (' + y + '+' + div.offsetHeight + '-' + window.innerHeight + ' + 4 ) = ' + dy);
-		if (dx > 0) x -= dx;
-		if (dy > 0) y -= dy;
-    */
-		div.style.left = x + "px";
-		div.style.top = y + "px";
-	} else {
-    // To get the size we need to display the popup with some width/height
-    // then we can get the actual size of the div and redisplay the popup at the
-    // correct dimensions.
-    this.iePopup.show(ev.screenX, ev.screenY, 300,50);
-		var w = div.offsetWidth;
-		var h = div.offsetHeight;
-		this.iePopup.show(ev.screenX, ev.screenY, w, h);
-	}
-
-	this.currentMenu = div;
-	this.timeStamp = (new Date()).getTime();
-
-	Xinha._addEvent(document, "mousedown", documentClick);
-	Xinha._addEvent(this.editordoc, "mousedown", documentClick);
-	if (keys.length > 0)
-		Xinha._addEvent(this.editordoc, "keypress", keyPress);
-
-	Xinha._stopEvent(ev);
-	return false;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/de.js b/web/imcms/xinha/plugins/ContextMenu/lang/de.js
deleted file mode 100644
index 065d1d4d60..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/de.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Cut": "Ausschneiden",
-  "Copy": "Kopieren",
-  "Paste": "Einfügen",
-  "_Image Properties...": "Eigenschaften",
-  "Show the image properties dialog": "Fenster für die Bildoptionen anzeigen",
-  "_Modify Link...": "Link ändern",
-  "Current URL is": "Aktuelle URL ist",
-  "Chec_k Link...": "Link testen",
-  "Opens this link in a new window": "Diesen Link in neuem Fenster öffnen",
-  "_Remove Link...": "Link entfernen",
-  "Please confirm that you want to unlink this element.": "Wollen sie diesen Link wirklich entfernen?",
-  "Link points to:": "Link zeigt auf:",
-  "Unlink the current element": "Link auf Element entfernen",
-  "C_ell Properties...": "Zellenoptionen",
-  "Show the Table Cell Properties dialog": "Zellenoptionen anzeigen",
-  "Ro_w Properties...": "Zeilenoptionen",
-  "Show the Table Row Properties dialog": "Zeilenoptionen anzeigen",
-  "I_nsert Row Before": "Zeile einfügen vor Position",
-  "Insert a new row before the current one": "Zeile einfügen vor der aktuellen Position",
-  "In_sert Row After": "Zeile einügen nach Position",
-  "Insert a new row after the current one": "Zeile einfügen nach der aktuellen Position",
-  "_Delete Row": "Zeile löschen",
-  "Delete the current row": "Zeile löschen",
-  "_Table Properties...": "Tabellenoptionen",
-  "Show the Table Properties dialog": "Tabellenoptionen anzeigen",
-  "Insert _Column Before": "Spalte einfügen vor Position",
-  "Insert a new column before the current one": "Spalte einfügen vor der aktuellen Position",
-  "Insert C_olumn After": "Spalte einfügen nach Position",
-  "Insert a new column after the current one": "Spalte einfügen nach der aktuellen Position",
-  "De_lete Column": "Spalte löschen",
-  "Delete the current column": "Spalte löschen",
-  "Justify Left": "Linksbündig",
-  "Justify Center": "Zentriert",
-  "Justify Right": "Rechtsbündig",
-  "Justify Full": "Blocksatz",
-  "Make lin_k...": "Link erstellen",
-  "Create a link": "Link erstellen",
-  "Remove the $elem Element...": "Element $elem entfernen...",
-  "Please confirm that you want to remove this element:": "Wollen sie dieses Element wirklich entfernen?",
-  "Remove this node from the document": "Dieses Element aus dem Dokument entfernen",
-  "Insert paragraph before": "Absatz einfügen vor Position",
-  "Insert a paragraph before the current node": "Absatz einfügen vor der aktuellen Position",
-  "Insert paragraph after": "Absatz einfügen hinter Position",
-  "Insert a paragraph after the current node": "Absatz einfügen hinter der aktuellen Position",
-  "How did you get here? (Please report!)": "Wie sind Sie denn hier hin gekommen? (Please report!)"
-};
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/el.js b/web/imcms/xinha/plugins/ContextMenu/lang/el.js
deleted file mode 100644
index 905b3a60a7..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/el.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// I18N constants
-// LANG: "el", ENCODING: UTF-8
-// Author: Dimitris Glezos, dimitris@glezos.com
-{
-  "Cut": "ΑπΞ�ΞΊΞ�Ο€Ξ�",
-  "Copy": "ΑντιγΟ�Ξ±Ο†Ξ�",
-  "Paste": "Ξ•Ο€ΞΉΞΊΟŒΞ»Ξ»Ξ·ΟƒΞ·",
-  "_Image Properties...": "Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ Ξ•ΞΉΞΊΟŒΞ½Ξ±Ο‚...",
-  "_Modify Link...": "Ξ�Ο�Ξ�Ο€Ξ�Ο€Ξ�ίηση συνδέσμΞ�Ο…...",
-  "Chec_k Link...": "ΞˆΞ»Ξ΅Ξ³Ο‡Ξ�Ο‚ συνδέσμων...",
-  "_Remove Link...": "ΔιαγΟ�Ξ±Ο†Ξ� συνδέσμΞ�Ο…...",
-  "C_ell Properties...": "Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ κΡλιΞ�Ο�...",
-  "Ro_w Properties...": "Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚...",
-  "I_nsert Row Before": "ΕισαγωγΞ� Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚ Ο€Ο�ΞΉΞ½",
-  "In_sert Row After": "ΕισαγωγΞ� Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚ μΡτά",
-  "_Delete Row": "ΔιαγΟ�Ξ±Ο†Ξ� Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚",
-  "_Table Properties...": "Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ πίνακα...",
-  "Insert _Column Before": "ΕισαγωγΞ� στΞ�λης Ο€Ο�ΞΉΞ½",
-  "Insert C_olumn After": "ΕισαγωγΞ� στΞ�λης μΡτά",
-  "De_lete Column": "ΔιαγΟ�Ξ±Ο†Ξ� στΞ�λης",
-  "Justify Left": "ΣτΞ�ίχηση Ξ‘Ο�ιστΡΟ�Ξ¬",
-  "Justify Center": "ΣτΞ�ίχηση ΞšΞ­Ξ½Ο„Ο�Ξ�",
-  "Justify Right": "ΣτΞ�ίχηση ΔΡξιά",
-  "Justify Full": "Ξ Ξ»Ξ�Ο�Ξ·Ο‚ ΣτΞ�ίχηση",
-  "Make lin_k...": "ΔημιΞ�Ο…Ο�Ξ³Ξ―Ξ± συνδέσμΞ�Ο…...",
-  "Remove the $elem Element...": "ΑφαίΟ�Ρση $elem στΞ�ιχΡίΞ�Ο…...",
-  "Please confirm that you want to remove this element:": "ΕίστΡ Ξ²Ξ­Ξ²Ξ±ΞΉΞ�Ο‚ πως θέλΡτΡ Ξ½Ξ± αφαιΟ�έσΡτΡ Ο„Ξ� στΞ�ιχΡίΞ� ",
-  "Remove this node from the document": "ΑφαίΟ�Ρση Ξ±Ο…Ο„Ξ�Ο� Ο„Ξ�Ο… κόμβΞ�Ο… Ξ±Ο€ΟŒ Ο„Ξ� Ξ­Ξ³Ξ³Ο�Ξ±Ο†Ξ�",
-  "How did you get here? (Please report!)": "Ξ ΟŽΟ‚ Ξ�Ο�θατΡ ΞΌΞ­Ο‡Ο�ΞΉ Ρδώ; (Ξ Ξ±Ο�Ξ±ΞΊΞ±Ξ»Ξ�Ο�ΞΌΞ΅ αναφέΟ�ΡτΡ Ο„Ξ�!)",
-  "Show the image properties dialog": "Εμφάνιση διαλόγΞ�Ο… ΞΌΞ΅ τις Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ Ξ΅ΞΉΞΊΟŒΞ½Ξ±Ο‚",
-  "Modify URL": "Ξ�Ο�Ξ�Ο€Ξ�Ο€Ξ�ίηση URL",
-  "Current URL is": "Ξ�Ξ� Ο„Ο�έχων URL Ρίναι",
-  "Opens this link in a new window": "ΑνΞ�ίγΡι Ξ±Ο…Ο„ΟŒ Ο„Ξ�Ξ½ ΟƒΟ�νδΡσμΞ� σΡ Ξ­Ξ½Ξ± Ξ½Ξ­Ξ� παΟ�άθυΟ�Ξ�",
-  "Please confirm that you want to unlink this element.": "ΕίστΡ Ξ²Ξ­Ξ²Ξ±ΞΉΞ�Ο‚ πως θέλΡτΡ Ξ½Ξ± αφαιΟ�έσΡτΡ Ο„Ξ�Ξ½ ΟƒΟ�νδΡσμΞ� Ξ±Ο€ΟŒ Ξ±Ο…Ο„ΟŒ Ο„Ξ� στΞ�ιχΡίΞ�:",
-  "Link points to:": "Ο ΟƒΟ�νδΡμΞ�Ο‚ Ξ�δηγΡί Ρδώ:",
-  "Unlink the current element": "ΑφαίΟ�Ρση συνδέσμΞ�Ο… Ξ±Ο€ΟŒ Ο„Ξ� παΟ�ών στΞ�ιχΡίΞ�",
-  "Show the Table Cell Properties dialog": "Εμφάνιση διαλόγΞ�Ο… ΞΌΞ΅ τις Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ κΡλιΞ�Ο� Ξ Ξ―Ξ½Ξ±ΞΊΞ±",
-  "Show the Table Row Properties dialog": "Εμφάνιση διαλόγΞ�Ο… ΞΌΞ΅ τις Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚ Ξ Ξ―Ξ½Ξ±ΞΊΞ±",
-  "Insert a new row before the current one": "ΕισαγωγΞ� ΞΌΞΉΞ±Ο‚ Ξ½Ξ­Ξ±Ο‚ Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚ Ο€Ο�ΞΉΞ½ την ΡπιλΡγμένη",
-  "Insert a new row after the current one": "ΕισαγωγΞ� ΞΌΞΉΞ±Ο‚ Ξ½Ξ­Ξ±Ο‚ Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚ μΡτά την ΡπιλΡγμένη",
-  "Delete the current row": "ΔιαγΟ�Ξ±Ο†Ξ� ΡπιλΡγμένης Ξ³Ο�Ξ±ΞΌΞΌΞ�Ο‚",
-  "Show the Table Properties dialog": "Εμφάνιση διαλόγΞ�Ο… ΞΌΞ΅ τις Ξ™Ξ΄ΞΉΟŒΟ„Ξ·Ο„Ξ΅Ο‚ Ξ Ξ―Ξ½Ξ±ΞΊΞ±",
-  "Insert a new column before the current one": "ΕισαγωγΞ� Ξ½Ξ­Ξ±Ο‚ στΞ�λης Ο€Ο�ΞΉΞ½ την ΡπιλΡγμένη",
-  "Insert a new column after the current one": "ΕισαγωγΞ� Ξ½Ξ­Ξ±Ο‚ στΞ�λης μΡτά την ΡπιλΡγμένη",
-  "Delete the current column": "ΔιαγΟ�Ξ±Ο†Ξ� ΡπιλΡγμένης στΞ�λης",
-  "Create a link": "ΔημιΞ�Ο…Ο�Ξ³Ξ―Ξ± συνδέσμΞ�Ο…"
-};
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/fr.js b/web/imcms/xinha/plugins/ContextMenu/lang/fr.js
deleted file mode 100644
index 10b4fc2e02..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/fr.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Cut": "Couper",
-  "Copy": "Copier",
-  "Paste": "Coller",
-  "_Image Properties...": "_Propriétés de l'image...",
-  "_Modify Link...": "_Modifier le lien...",
-  "Chec_k Link...": "_Vérifier le lien...",
-  "_Remove Link...": "_Supprimer le lien...",
-  "C_ell Properties...": "P_ropriétés de la cellule...",
-  "Ro_w Properties...": "Pr_opriétés de la rangée...",
-  "I_nsert Row Before": "Insérer une rangée a_vant",
-  "In_sert Row After": "Insér_er une rangée après",
-  "_Delete Row": "Suppr_imer une rangée",
-  "_Table Properties...": "Proprié_tés de la table...",
-  "Insert _Column Before": "I_nsérer une colonne avant",
-  "Insert C_olumn After": "Insérer une colonne après",
-  "De_lete Column": "_Supprimer la colonne",
-  "Justify Left": "Aligner à gauche",
-  "Justify Center": "Aligner au centre",
-  "Justify Right": "Aligner à droite",
-  "Justify Full": "Justifier",
-  "Make lin_k...": "Convertir en lien...",
-  "Remove the $elem Element...": "Supprimer Élément $elem...",
-  "Insert paragraph before": "Insérer un paragraphe avant",
-  "Insert paragraph after": "Insérer un paragraphe après",
-  "Please confirm that you want to remove this element:": "Confirmer la suppression de cet élément:",
-  "Remove this node from the document": "Supprimer ce noeud du document",
-  "How did you get here? (Please report!)": "Comment êtes-vous arrivé ici ? (Reportez le bug SVP !)",
-  "Show the image properties dialog": "Afficher le dialogue des propriétés d'image",
-  "Modify URL": "Modifier l'URL",
-  "Current URL is": "L'URL courante est",
-  "Opens this link in a new window": "Ouvrir ce lien dans une nouvelle fenêtre",
-  "Please confirm that you want to unlink this element.": "Voulez-vous vraiment enlever le lien présent sur cet élément.",
-  "Link points to:": "Le lien pointe sur:",
-  "Unlink the current element": "Enlever le lien sur cet élément",
-  "Show the Table Cell Properties dialog": "Afficher la boite de propriété des cellules",
-  "Show the Table Row Properties dialog": "Afficher la boite de propriété des rangées",
-  "Insert a new row before the current one": "Insérer une nouvelle rangée avant celle-ci",
-  "Insert a new row after the current one": "Insérer une nouvelle rangée après celle-ci",
-  "Delete the current row": "Supprimer la rangée courante",
-  "Show the Table Properties dialog": "Afficher la boite de propriété de tableau",
-  "Insert a new column before the current one": "Insérer une nouvelle rangée avant celle-ci",
-  "Insert a new column after the current one": "Insérer une nouvelle colonne après celle-ci",
-  "Delete the current column": "Supprimer cette colonne",
-  "Create a link": "Créer un lien",
-  "Insert a paragraph before the current node": "Insérer un paragraphe avant le noeud courant",
-  "Insert a paragraph after the current node": "Insérer un paragraphe après le noeud courant"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/he.js b/web/imcms/xinha/plugins/ContextMenu/lang/he.js
deleted file mode 100644
index 4e3b05a6de..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/he.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// I18N constants
-// LANG: "he", ENCODING: UTF-8
-// Author: Liron Newman, http://www.eesh.net, <plastish at ultinet dot org>
-{
-  "Cut": "גזור",
-  "Copy": "העתק",
-  "Paste": "הדבק",
-  "_Image Properties...": "_מ�פייני תמונה...",
-  "_Modify Link...": "_שנה קישור...",
-  "Chec_k Link...": "בדו_ק קישור...",
-  "_Remove Link...": "_הסר קישור...",
-  "C_ell Properties...": "מ�פייני ת_�...",
-  "Ro_w Properties...": "מ�פייני _טור...",
-  "I_nsert Row Before": "ה_כנס שורה לפני",
-  "In_sert Row After": "הכנ_ס שורה �חרי",
-  "_Delete Row": "_מחק שורה",
-  "_Table Properties...": "מ�פייני ט_בלה...",
-  "Insert _Column Before": "הכנס _טור לפני",
-  "Insert C_olumn After": "הכנס ט_ור �חרי",
-  "De_lete Column": "מח_ק טור",
-  "Justify Left": "ישור לשמ�ל",
-  "Justify Center": "ישור למרכז",
-  "Justify Right": "ישור לימין",
-  "Justify Full": "ישור לשורה מל�ה",
-  "Make lin_k...": "צור קי_שור...",
-  "Remove the $elem Element...": "הסר �ת �למנט ה- $elem...",
-  "Please confirm that you want to remove this element:": "�נ� �שר שברצונך להסיר �ת ה�למנט הזה:",
-  "Remove this node from the document": "הסרה של node זה מהמסמך",
-  "How did you get here? (Please report!)": "�יך הגעת הנה? (�נ� דווח!)",
-  "Show the image properties dialog": "מציג �ת חלון הדו-שיח של מ�פייני תמונה",
-  "Modify URL": "שינוי URL",
-  "Current URL is": "URL נוכחי הו�",
-  "Opens this link in a new window": "פתיחת קישור זה בחלון חדש",
-  "Please confirm that you want to unlink this element.": "�נ� �שר ש�תה רוצה לנתק �ת �למנט זה.",
-  "Link points to:": "הקישור מצביע �ל:",
-  "Unlink the current element": "ניתוק �ת ה�למנט הנוכחי",
-  "Show the Table Cell Properties dialog": "מציג �ת חלון הדו-שיח של מ�פייני ת� בטבלה",
-  "Show the Table Row Properties dialog": "מציג �ת חלון הדו-שיח של מ�פייני שורה בטבלה",
-  "Insert a new row before the current one": "הוספת שורה חדשה לפני הנוכחית",
-  "Insert a new row after the current one": "הוספת שורה חדשה �חרי הנוכחית",
-  "Delete the current row": "מחיקת �ת השורה הנוכחית",
-  "Show the Table Properties dialog": "מציג �ת חלון הדו-שיח של מ�פייני טבלה",
-  "Insert a new column before the current one": "הוספת טור חדש לפני הנוכחי",
-  "Insert a new column after the current one": "הוספת טור חדש �חרי הנוכחי",
-  "Delete the current column": "מחיקת �ת הטור הנוכחי",
-  "Create a link": "יצירת קישור"
-};
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/ja.js b/web/imcms/xinha/plugins/ContextMenu/lang/ja.js
deleted file mode 100644
index be591f39a1..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/ja.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Cut": "切り�り",
-  "Copy": "コピー",
-  "Paste": "貼り付�",
-  "_Image Properties...": "画��プロパティ(_I)...",
-  "Show the image properties dialog": "��画��プロパティダイアログを表示���",
-  "_Modify Link...": "リンク�修正(_M)...",
-  "Current URL is": "�在�URL",
-  "Chec_k Link...": "リンクを確�(_K)...",
-  "Opens this link in a new window": "��リンクを新��ウィンドウ�開���",
-  "_Remove Link...": "リンク�削除(_R)",
-  "Please confirm that you want to unlink this element.": "���素�リンクを削除���。よ������。",
-  "Link points to:": "リンク先:",
-  "Unlink the current element": "���素�リンクを解除",
-  "C_ell Properties...": "セル�プロパティ(_E)...",
-  "Ro_w Properties...": "行�プロパティ(_W)...",
-  "Show the Table Row Properties dialog": "テーブル行�プロパティダイアログを表示���",
-  "I_nsert Row Before": "上�行を挿入(_N)",
-  "Insert a new row before the current one": "�択中�行�上�一行挿入���",
-  "In_sert Row After": "下�行を挿入(_S)",
-  "Insert a new row after the current one": "�択中�行�下�一行挿入���",
-  "_Delete Row": "行�削除(_D)",
-  "Delete the current row": "�択中�行を削除���",
-  "_Table Properties...": "テーブル�プロパティ(_T)...",
-  "Show the Table Properties dialog": "テーブル�プロパティダイアログを表示���",
-  "Insert _Column Before": "左�列を挿入(_C)",
-  "Insert a new column before the current one": "�択中�列�左�一列挿入���",
-  "Insert C_olumn After": "��列を挿入(_O)",
-  "Insert a new column after the current one": "�択中�列���一列挿入���",
-  "De_lete Column": "列�削除(_L)",
-  "Delete the current column": "�択中�列を削除���",
-  "Justify Left": "左寄�",
-  "Justify Center": "中央寄�",
-  "Justify Right": "�寄�",
-  "Justify Full": "�等割付",
-  "Make lin_k...": "リンク�作�(_K)...",
-  "Create a link": "新��リンクを作����",
-  "Remove the $elem Element...": "$elem �素を削除 ...",
-  "Please confirm that you want to remove this element:": "���素を削除���。よ������。:",
-  "Remove this node from the document": "ドキュメント�ら��ノードを削除���",
-  "Insert paragraph before": "��段�を挿入",
-  "Insert a paragraph before the current node": "�択中�ノード�手��段�を挿入���",
-  "Insert paragraph after": "後�段�を挿入",
-  "Insert a paragraph after the current node": "�択中�ノード�後�段�を挿入���",
-  "How did you get here? (Please report!)": "��や����������?(���報告を!)",
-  "Show the Table Cell Properties dialog": "テーブルセル�プロパティダイアログを表示���",
-  "Insert Cell Before": "��セルを挿入",
-  "Insert Cell After": "後�セルを挿入",
-  "Delete Cell": "セル�削除",
-  "Merge Cells": "セル���"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/nb.js b/web/imcms/xinha/plugins/ContextMenu/lang/nb.js
deleted file mode 100644
index cbe445146f..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/nb.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-// Used key commands
-// C,D,e, ,I, ,k,k,l,M, ,n,o,R, ,s,T, ,w   : English
-//       H B j      R m    F       v       : Norwegian
-{
-  "Cut": "Klipp ut",
-  "Copy": "Kopier",
-  "Paste": "Lim inn",
-  "_Image Properties...": "_Bildeegenskaper...",
-  "Show the image properties dialog": "Vis bildeegenskaper",
-  "_Modify Link...": "_Rediger Link...",
-  "Current URL is": "Gjeldende URL er",
-  "Chec_k Link...": "Sje_kk Link...",
-  "Opens this link in a new window": "Ã…pner denne link i nytt vindu",
-  "_Remove Link...": "_Fjerne Link...",
-  "Please confirm that you want to unlink this element.": "Vennligst bekreft at du ønsker å fjerne link på elementet",
-  "Link points to:": "Link peker til:",
-  "Unlink the current element": "Fjerne link på gjeldende element",
-  "C_ell Properties...": "C_elleegenskaper...",
-  "Show the Table Cell Properties dialog": "Vis egenskaper for celle",
-  "Ro_w Properties...": "Rad Egenskaper... (_w)",
-  "Show the Table Row Properties dialog": "Vis egenskaper for rad",
-  "I_nsert Row Before": "Sett I_nn rad før",
-  "Insert a new row before the current one": "Sett inn ny rad før gjeldende",
-  "In_sert Row After": "_Sett inn rad etter",
-  "Insert a new row after the current one": "Sett inn ny rad etter gjeldende",
-  "_Delete Row": "Slett rad (_d)",
-  "Delete the current row": "Slett gjeldende rad",
-  "_Table Properties...": "_Tabellegenskaper...",
-  "Show the Table Properties dialog": "Vis egenskaper for tabellen",
-  "Insert _Column Before": "Sett inn kolonne etter (_c)",
-  "Insert a new column before the current one": "Sett inn kolonne før gjeldende",
-  "Insert C_olumn After": "Sett inn k_olonne etter",
-  "Insert a new column after the current one": "Sett inn kolonne etter gjeldende",
-  "De_lete Column": "S_lett kolonne",
-  "Delete the current column": "Slett gjeldende kolonne",
-  "Justify Left": "_Venstrejuster",
-  "Justify Center": "_Midtjuster",
-  "Justify Right": "_Høyrejuster",
-  "Justify Full": "Blokk_juster",
-  "Make lin_k...": "Lag len_ke...",
-  "Create a link": "Lag ny link",
-  "Remove the $elem Element...": "Fjerne $elem elementet...",
-  "Please confirm that you want to remove this element:": "Vennligst bekreft at du ønsker å fjerne elementet:",
-  "Remove this node from the document": "Fjerne denne node fra dokumentet",
-  "Insert paragraph before": "Sett inn paragraf før",
-  "Insert a paragraph before the current node": "Sett inn paragraf før gjeldende node",
-  "Insert paragraph after": "Sett inn paragraf etter",
-  "Insert a paragraph after the current node": "Sett inn paragraf etter gjeldende node",
-  "How did you get here? (Please report!)": "Hva skjedde? (Vennligst beskriv)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/nl.js b/web/imcms/xinha/plugins/ContextMenu/lang/nl.js
deleted file mode 100644
index 78ebf9749b..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/nl.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Michel Weegeerink (info@mmc-shop.nl), http://mmc-shop.nl
-{
-  "Cut": "Knippen",
-  "Copy": "Kopiëren",
-  "Paste": "Plakken",
-  "_Image Properties...": "Eigenschappen afbeelding...",
-  "_Modify Link...": "Hyperlin_k aanpassen...",
-  "Chec_k Link...": "Controleer hyperlin_k...",
-  "_Remove Link...": "Ve_rwijder hyperlink...",
-  "C_ell Properties...": "C_eleigenschappen...",
-  "Ro_w Properties...": "Rijeigenscha_ppen...",
-  "I_nsert Row Before": "Rij invoegen boven",
-  "In_sert Row After": "Rij invoegen onder",
-  "_Delete Row": "Rij _verwijderen",
-  "_Table Properties...": "_Tabeleigenschappen...",
-  "Insert _Column Before": "Kolom invoegen voor",
-  "Insert C_olumn After": "Kolom invoegen na",
-  "De_lete Column": "Kolom verwijderen",
-  "Justify Left": "Links uitlijnen",
-  "Justify Center": "Centreren",
-  "Justify Right": "Rechts uitlijnen",
-  "Justify Full": "Uitvullen",
-  "Make lin_k...": "Maak hyperlin_k...",
-  "Remove the $elem Element...": "Verwijder het $elem element...",
-  "Please confirm that you want to remove this element:": "Is het werkelijk de bedoeling dit element te verwijderen:",
-  "Remove this node from the document": "Verwijder dit punt van het document",
-  "How did you get here? (Please report!)": "Hoe kwam je hier? (A.U.B. doorgeven!)",
-  "Show the image properties dialog": "Laat het afbeeldingseigenschappen dialog zien",
-  "Modify URL": "Aanpassen URL",
-  "Current URL is": "Huidig URL is",
-  "Opens this link in a new window": "Opend deze hyperlink in een nieuw venster",
-  "Please confirm that you want to unlink this element.": "Is het werkelijk de bedoeling dit element te unlinken.",
-  "Link points to:": "Hyperlink verwijst naar:",
-  "Unlink the current element": "Unlink het huidige element",
-  "Show the Table Cell Properties dialog": "Laat de tabel celeigenschappen dialog zien",
-  "Show the Table Row Properties dialog": "Laat de tabel rijeigenschappen dialog zien",
-  "Insert a new row before the current one": "Voeg een nieuwe rij in boven de huidige",
-  "Insert a new row after the current one": "Voeg een nieuwe rij in onder de huidige",
-  "Delete the current row": "Verwijder de huidige rij",
-  "Show the Table Properties dialog": "Laat de tabel eigenschappen dialog zien",
-  "Insert a new column before the current one": "Voeg een nieuwe kolom in voor de huidige",
-  "Insert a new column after the current one": "Voeg een nieuwe kolom in na de huidige",
-  "Delete the current column": "Verwijder de huidige kolom",
-  "Create a link": "Maak een hyperlink"
-};
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/no.js b/web/imcms/xinha/plugins/ContextMenu/lang/no.js
deleted file mode 100644
index cbe445146f..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/no.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-// Used key commands
-// C,D,e, ,I, ,k,k,l,M, ,n,o,R, ,s,T, ,w   : English
-//       H B j      R m    F       v       : Norwegian
-{
-  "Cut": "Klipp ut",
-  "Copy": "Kopier",
-  "Paste": "Lim inn",
-  "_Image Properties...": "_Bildeegenskaper...",
-  "Show the image properties dialog": "Vis bildeegenskaper",
-  "_Modify Link...": "_Rediger Link...",
-  "Current URL is": "Gjeldende URL er",
-  "Chec_k Link...": "Sje_kk Link...",
-  "Opens this link in a new window": "Ã…pner denne link i nytt vindu",
-  "_Remove Link...": "_Fjerne Link...",
-  "Please confirm that you want to unlink this element.": "Vennligst bekreft at du ønsker å fjerne link på elementet",
-  "Link points to:": "Link peker til:",
-  "Unlink the current element": "Fjerne link på gjeldende element",
-  "C_ell Properties...": "C_elleegenskaper...",
-  "Show the Table Cell Properties dialog": "Vis egenskaper for celle",
-  "Ro_w Properties...": "Rad Egenskaper... (_w)",
-  "Show the Table Row Properties dialog": "Vis egenskaper for rad",
-  "I_nsert Row Before": "Sett I_nn rad før",
-  "Insert a new row before the current one": "Sett inn ny rad før gjeldende",
-  "In_sert Row After": "_Sett inn rad etter",
-  "Insert a new row after the current one": "Sett inn ny rad etter gjeldende",
-  "_Delete Row": "Slett rad (_d)",
-  "Delete the current row": "Slett gjeldende rad",
-  "_Table Properties...": "_Tabellegenskaper...",
-  "Show the Table Properties dialog": "Vis egenskaper for tabellen",
-  "Insert _Column Before": "Sett inn kolonne etter (_c)",
-  "Insert a new column before the current one": "Sett inn kolonne før gjeldende",
-  "Insert C_olumn After": "Sett inn k_olonne etter",
-  "Insert a new column after the current one": "Sett inn kolonne etter gjeldende",
-  "De_lete Column": "S_lett kolonne",
-  "Delete the current column": "Slett gjeldende kolonne",
-  "Justify Left": "_Venstrejuster",
-  "Justify Center": "_Midtjuster",
-  "Justify Right": "_Høyrejuster",
-  "Justify Full": "Blokk_juster",
-  "Make lin_k...": "Lag len_ke...",
-  "Create a link": "Lag ny link",
-  "Remove the $elem Element...": "Fjerne $elem elementet...",
-  "Please confirm that you want to remove this element:": "Vennligst bekreft at du ønsker å fjerne elementet:",
-  "Remove this node from the document": "Fjerne denne node fra dokumentet",
-  "Insert paragraph before": "Sett inn paragraf før",
-  "Insert a paragraph before the current node": "Sett inn paragraf før gjeldende node",
-  "Insert paragraph after": "Sett inn paragraf etter",
-  "Insert a paragraph after the current node": "Sett inn paragraf etter gjeldende node",
-  "How did you get here? (Please report!)": "Hva skjedde? (Vennligst beskriv)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/pl.js b/web/imcms/xinha/plugins/ContextMenu/lang/pl.js
deleted file mode 100644
index 42220a10e6..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/pl.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, http://www.eskot.krakow.pl/portfolio/, koto@webworkers.pl
-{
-  "Cut": "Wytnij",
-  "Copy": "Kopiuj",
-  "Paste": "Wklej",
-  "_Image Properties...": "Właściwości obrazka",
-  "Show the image properties dialog": "Pokaż okienko właściwości obrazka",  
-  "_Modify Link...": "Zmień odnośnik",
-  "Current URL is": "Bieżący URL odnośnika",
-  "Chec_k Link...": "Sprawdź odnośnik",
-  "Opens this link in a new window": "Otwiera ten odnośnik w nowym oknie",
-  "_Remove Link...": "Usuń odnośnik",
-  "Please confirm that you want to unlink this element.": "Na pewno chcesz usunąć odnośnik?",
-  "Link points to:": "Odnośnik wskazuje na:",
-  "Unlink the current element": "Usuń odnośnik z zaznaczonego elementu",
-  "C_ell Properties...": "Właściwości komórki",
-  "Show the Table Cell Properties dialog": "Pokaż okno właściwości komórki",
-  "Ro_w Properties...": "Właściwości wiersza",
-  "Show the Table Row Properties dialog": "Pokaż okno właściwości wiersza",
-  "I_nsert Row Before": "Wstaw wiersz przed",
-  "Insert a new row before the current one": "Wstaw nowy wiersz przed bieżącym",
-  "In_sert Row After": "Wstaw wiersz po",
-  "Insert a new row after the current one": "Wstaw nowy wiersz po bieżącym",
-  "_Delete Row": "Usuń wiersz",
-  "Delete the current row": "Usuń bieżący wiersz",
-  "_Table Properties...": "Właściwości tabeli",
-  "Show the Table Properties dialog": "Pokaż okienko właściwości tabeli",
-  "Insert _Column Before": "Wstaw kolumnÄ™ przed",
-  "Insert a new column before the current one": "Wstaw nową kolumnę przed bieżącą",
-  "Insert C_olumn After": "Wstaw kolumnÄ™ po",
-  "Insert a new column after the current one": "Wstaw nową kolumnę po bieżącej",
-  "De_lete Column": "Usuń kolumnę",
-  "Delete the current column": "Usuwa bieżącą kolumnę",
-  "Justify Left": "Wyrównaj do lewej",
-  "Justify Center": "Wycentruj",
-  "Justify Right": "Wyrównaj do prawej",
-  "Justify Full": "Wyjustuj",
-  "Make lin_k...": "Utwórz odnośnik",
-  "Create a link": "Utwórz odnośnik",
-  "Remove the $elem Element...": "Usuń $elem...",
-  "Please confirm that you want to remove this element:": "Na pewno chcesz usunąć ten element?",
-  "Remove this node from the document": "Usuń ten element z dokumentu",
-  "Insert paragraph before": "Wstaw akapit przed",
-  "Insert a paragraph before the current node": "Wstaw akapit przed bieżącym elementem",
-  "Insert paragraph after": "Wstaw akapit po",
-  "Insert a paragraph after the current node": "Wstaw akapit po bieżącym elemencie",
-  "How did you get here? (Please report!)": "Jak tu trafiłeś (Proszę, podaj okoliczności!)"
-}
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/pt_br.js b/web/imcms/xinha/plugins/ContextMenu/lang/pt_br.js
deleted file mode 100644
index 6d2bd4bc5e..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/pt_br.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Brazilian Portuguese Translation
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// Site: www.mpg.com.br
-// Please don´t remove this information - Por favor, não remova esta informação
-// If you modify this source, please insert a comment with your name and e-mail
-// Se modificar esta fonte, insira um comentário com seu nome e e-mail
-
-// Last revision: September 2007
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Cut": "Recortar",
-  "Copy": "Copiar",
-  "Paste": "Colar",
-  "_Image Properties...": "Propriedades da imagem...",
-  "Show the image properties dialog": "Mostrar a caixa de diálogo das Propriedades da imagem",
-  "_Modify Link...": "Modificar link",
-  "Current URL is": "A URL corrente é",
-  "Chec_k Link...": "Verificar Link...",
-  "Opens this link in a new window": "Abrir este link em uma nova janela",
-  "_Remove Link...": "Remover Link",
-  "Please confirm that you want to unlink this element.": "Por favor, confirme que deseja retirar o link do elemento.",
-  "Link points to:": "Link para:",
-  "Unlink the current element": "Remover link do elemento atual",
-  "C_ell Properties...": "Propriedades da célula",
-  "Show the Table Cell Properties dialog": "Mostrar caixa de diálogo de Propriedades da Célula",
-  "Ro_w Properties...": "Propriedades da Linha",
-  "Show the Table Row Properties dialog": "Mostrar caixa de diálogo de Propriedades da Linha",
-  "I_nsert Row Before": "Inserir linha antes deste ponto",
-  "Insert a new row before the current one": "Inserir uma nova linha antes desta",
-  "In_sert Row After": "Inserir linha depois deste ponto",
-  "Insert a new row after the current one": "Inserir uma linha após esta",
-  "_Delete Row": "Apagar linha",
-  "Delete the current row": "Apagar a linha atual",
-  "_Table Properties...": "Propriedades da Tabela",
-  "Show the Table Properties dialog": "Mostrar caixa de diálogo de Propriedades da Tabela",
-  "Insert _Column Before": "Inserir coluna antes deste ponto",
-  "Insert a new column before the current one": "Inserir uma nova coluna antes desta",
-  "Insert C_olumn After": "Inserir coluna após este ponto",
-  "Insert a new column after the current one": "Inserir uma nova coluna após esta",
-  "De_lete Column": "Apagar Coluna",
-  "Delete the current column": "Apagar a coluna atual",
-  "Justify Left": "Justificar à esquerda",
-  "Justify Center": "Justificar centralizado",
-  "Justify Right": "Justificar à direita",
-  "Justify Full": "Justificação completa",
-  "Make lin_k...": "Criar link...",
-  "Create a link": "Criar um novo link",
-  "Remove the $elem Element...": "Remover o elemento $elem...",
-  "Please confirm that you want to remove this element:": "Por favor, confirme que deseja remover este elemento:",
-  "Remove this node from the document": "Remover este nó do documento",
-  "Insert paragraph before": "Inserir um parágrafo antes",
-  "Insert a paragraph before the current node": "Inserir um parágrafo antes do nó atual",
-  "Insert paragraph after": "Inserir um parágrafo após",
-  "Insert a paragraph after the current node": "Inserir um parágrafo após o nó atual",
-  "How did you get here? (Please report!)": "Como você começou aqui? (Por favor, informe!)",
-  "Show the Table Cell Properties dialog": "Mostrar Propriedades da Tabelas",
-  "Insert Cell Before": "Inserir Célula Antes",
-  "Insert Cell After": "Inserir Célula Depois",
-  "Delete Cell": "Apagar Célula",
-  "Merge Cells": "Mesclar Células"
-};
diff --git a/web/imcms/xinha/plugins/ContextMenu/lang/sv.js b/web/imcms/xinha/plugins/ContextMenu/lang/sv.js
deleted file mode 100644
index 139c26265c..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/lang/sv.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// I18N constants
-// LANG: "sv", ENCODING: UTF-8
-// Swedish version for rev. 477 (Mar 2006) by Thomas Loo <tloo@saltstorm.net>
-
-// TODO: Proper keybindings
-// C,D,e, ,I, ,k,k,l,M, ,n,o,R, ,s,T, ,w   : English
-//       H B j      R m    F       v       : Swedish
-{
-  "Cut": "Klipp ut",
-  "Copy": "Kopiera",
-  "Paste": "Klistra in",
-  "_Image Properties...": "_Bildegenskaper...",
-  "Show the image properties dialog": "Visa bildegenskaper",
-  "_Modify Link...": "_Redigera Länk...",
-  "Current URL is": "Aktuellt URL är",
-  "Chec_k Link...": "Kontrollera länk...",
-  "Opens this link in a new window": "Öppna länk i nytt fönster",
-  "_Remove Link...": "_Ta bort länk...",
-  "Please confirm that you want to unlink this element.": "Bekräfta borttagning av länk",
-  "Link points to:": "Länken pekar mot:",
-  "Unlink the current element": "Ta bort länk kopplad till elementet",
-  "C_ell Properties...": "C_ellegenskaper...",
-  "Show the Table Cell Properties dialog": "Visa egenskaper for cellen",
-  "Ro_w Properties...": "Radegenskaper... (_w)",
-  "Show the Table Row Properties dialog": "Visa egenskaper för rad",
-  "I_nsert Row Before": "I_nfoga rad före",
-  "Insert a new row before the current one": "Infoga ny rad före aktuell",
-  "In_sert Row After": "Infoga rad efter aktuell rad",
-  "Insert a new row after the current one": "Infoga ny rad efter aktuell",
-  "_Delete Row": "Radera rad (_d)",
-  "Delete the current row": "T bort aktuell rad",
-  "_Table Properties...": "_Tabellegenskaper...",
-  "Show the Table Properties dialog": "Visa tabellegenskaper",
-  "Insert _Column Before": "Infoga kolumn efter (_c)",
-  "Insert a new column before the current one": "Infoga kolumn före aktuell",
-  "Insert C_olumn After": "Infoga k_olumn efter",
-  "Insert a new column after the current one": "Infoga kolumn efter aktuell",
-  "De_lete Column": "_Radera kolumn",
-  "Delete the current column": "Radera aktuell kolumn",
-  "Justify Left": "_Vänsterjustera",
-  "Justify Center": "_Centerjustera",
-  "Justify Right": "_Högerjustera",
-  "Justify Full": "Block_justera",
-  "Make lin_k...": "Skapa län_k...",
-  "Create a link": "SKapa ny länk",
-  "Remove the $elem Element...": "Radera elementet $elem...",
-  "Please confirm that you want to remove this element:": "Bekräfta borttagning av element:",
-  "Remove this node from the document": "Radera nod från dokumentet",
-  "Insert paragraph before": "Infoga paragraf före",
-  "Insert a paragraph before the current node": "Infoga paragraf före aktuell nod",
-  "Insert paragraph after": "Infoga paragraf efter",
-  "Insert a paragraph after the current node": "Infoga paragraf efter aktuell nod",
-  "How did you get here? (Please report!)": "Hur hamnade du här? (Beskriv förloppet)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ContextMenu/menu.css b/web/imcms/xinha/plugins/ContextMenu/menu.css
deleted file mode 100644
index 34c64b5ccc..0000000000
--- a/web/imcms/xinha/plugins/ContextMenu/menu.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/* styles for the ContextMenu /HTMLArea */
-/* The ContextMenu plugin is (c) dynarch.com 2003. */
-/* Distributed under the same terms as HTMLArea itself */
-
-div.htmlarea-context-menu {
-  position: absolute;
-  border: 1px solid #aca899;
-  padding: 2px;
-  background-color: #fff;
-  color: #000;
-  cursor: default;
-  z-index: 1000;
-}
-
-div.htmlarea-context-menu table {
-  font: 11px tahoma,verdana,sans-serif;
-  border-collapse: collapse;
-}
-
-div.htmlarea-context-menu tr.item td.icon img {
-/* taken care of by xinha.makeBtnImg() */
-/* width: 18px; */
-/* height: 18px; */
-}
-
-div.htmlarea-context-menu tr.item td.icon {
-  padding: 0px 3px;
-  width: 18px;
-  height: 18px;
-  background-color: #cdf;
-}
-
-div.htmlarea-context-menu tr.item td.label {
-  padding: 1px 10px 1px 3px;
-}
-
-div.htmlarea-context-menu tr.separator td {
-  padding: 2px 0px;
-}
-
-div.htmlarea-context-menu tr.separator td div {
-  border-top: 1px solid #aca899;
-  overflow: hidden;
-  position: relative;
-}
-
-div.htmlarea-context-menu tr.separator td.icon {
-  background-color: #cdf;
-}
-
-div.htmlarea-context-menu tr.separator td.icon div {
-/*  margin-left: 3px; */
-  border-color: #fff;
-}
-
-div.htmlarea-context-menu tr.separator td.label div {
-  margin-right: 3px;
-}
-
-div.htmlarea-context-menu tr.item.hover {
-  background-color: #316ac5;
-  color: #fff;
-}
-
-div.htmlarea-context-menu tr.item.hover td.icon {
-  background-color: #619af5;
-}
diff --git a/web/imcms/xinha/plugins/DefinitionList/definition-list.css b/web/imcms/xinha/plugins/DefinitionList/definition-list.css
deleted file mode 100644
index d014001ff4..0000000000
--- a/web/imcms/xinha/plugins/DefinitionList/definition-list.css
+++ /dev/null
@@ -1,21 +0,0 @@
-dl { border: 1px dotted #800000; }
-dt {
-  width: 18px;
-  height: 18px;
-  background-image: url(img/ed_dt.gif);
-  background-repeat: no-repeat;
-  background-position: left top;
-  padding-left: 19px;
-  display: block;
-  color: #800000;
-}
-dd {
-  width: 18px;
-  height: 18px;
-  background-image: url(img/ed_dd.gif);
-  background-repeat: no-repeat;
-  background-position: left top;
-  padding-left: 19px;
-  display: block;
-  color: #800000;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DefinitionList/definition-list.js b/web/imcms/xinha/plugins/DefinitionList/definition-list.js
deleted file mode 100644
index 0e836de557..0000000000
--- a/web/imcms/xinha/plugins/DefinitionList/definition-list.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// DefinitionList plugin for Xinha
-// Distributed under the same terms as Xinha itself.
-// This notice MUST stay intact for use (see license.txt).
-
-
-function DefinitionList(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var bl = DefinitionList.btnList;
-  var self = this;
-  // register the toolbar buttons provided by this plugin
-  var toolbar = ["linebreak"];
-  for (var i = 0; i < bl.length; ++i) {
-    var btn = bl[i];
-    if (!btn) {
-      toolbar.push("separator");
-    } else {
-      var id = btn[0];
-      cfg.registerButton(id, this._lc(btn[1]), editor.imgURL("ed_" + btn[0] + ".gif", "DefinitionList"), false,
-             function(editor, id) {
-               // dispatch button press event
-               self.buttonPress(editor, id);
-             });
-      toolbar.push(id);
-    }
-  }
-  // add a new line in the toolbar
-  cfg.toolbar.push(toolbar);
-}
-
-DefinitionList._pluginInfo = {
-  name          : "DefinitionList",
-  version       : "1.0",
-  developer     : "Udo Schmal",
-  developer_url : "",
-  c_owner       : "Udo Schmal",
-  license       : "htmlArea"
-};
-
-// the list of buttons added by this plugin
-DefinitionList.btnList = [
-  ["dl", "definition list"],
-  ["dt", "definition term"],
-  ["dd", "definition description"]
-  ];
-
-DefinitionList.prototype._lc = function(string) {
-  return Xinha._lc(string, 'DefinitionList');
-};
-
-DefinitionList.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(_editor_url + 'plugins/DefinitionList/definition-list.css');
-};
-
-DefinitionList.prototype.buttonPress = function(editor,button_id) {
-  if (button_id=='dl') { //definition list
-    var pe = editor.getParentElement();
-    while (pe.parentNode.tagName.toLowerCase() != 'body') {
-      pe = pe.parentNode;
-    }
-    var dx = editor._doc.createElement(button_id);
-    dx.innerHTML = '&nbsp;';
-    if(pe.parentNode.lastChild==pe) {
-      pe.parentNode.appendChild(dx);
-    }else{
-      pe.parentNode.insertBefore(dx,pe.nextSibling);
-    }
-  } else if ((button_id=='dt')||(button_id=='dd')) { //definition term or description
-    var pe = editor.getParentElement();
-    while (pe && (pe.nodeType == 1) && (pe.tagName.toLowerCase() != 'body')) {
-      if(pe.tagName.toLowerCase() == 'dl') {
-        var dx = editor._doc.createElement(button_id);
-        dx.innerHTML = '&nbsp;';
-        pe.appendChild(dx);
-        break;
-      }else if((pe.tagName.toLowerCase() == 'dt')||(pe.tagName.toLowerCase() == 'dd')){
-        var dx = editor._doc.createElement(button_id)
-        dx.innerHTML = '&nbsp;';
-        if(pe.parentNode.lastChild==pe) {
-        pe.parentNode.appendChild(dx);
-        }else{
-          pe.parentNode.insertBefore(dx,pe.nextSibling);
-        }
-        break;
-      }
-      pe = pe.parentNode;
-    }
-    if(pe.tagName.toLowerCase() == 'body')
-  alert('You can insert a definition term or description only in a definition list!');
-  }
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DefinitionList/img/ed_dd.gif b/web/imcms/xinha/plugins/DefinitionList/img/ed_dd.gif
deleted file mode 100644
index 98b25dead7..0000000000
Binary files a/web/imcms/xinha/plugins/DefinitionList/img/ed_dd.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/DefinitionList/img/ed_dl.gif b/web/imcms/xinha/plugins/DefinitionList/img/ed_dl.gif
deleted file mode 100644
index ae9b371615..0000000000
Binary files a/web/imcms/xinha/plugins/DefinitionList/img/ed_dl.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/DefinitionList/img/ed_dt.gif b/web/imcms/xinha/plugins/DefinitionList/img/ed_dt.gif
deleted file mode 100644
index b77770c560..0000000000
Binary files a/web/imcms/xinha/plugins/DefinitionList/img/ed_dt.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/DefinitionList/lang/ja.js b/web/imcms/xinha/plugins/DefinitionList/lang/ja.js
deleted file mode 100644
index 7f2041070a..0000000000
--- a/web/imcms/xinha/plugins/DefinitionList/lang/ja.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "definition list": "定義リスト",
-  "definition term": "定義語",
-  "definition description": "定義�説明"
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DefinitionList/lang/nl.js b/web/imcms/xinha/plugins/DefinitionList/lang/nl.js
deleted file mode 100644
index 8a8d0c8899..0000000000
--- a/web/imcms/xinha/plugins/DefinitionList/lang/nl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "definition list": "definitie lijst",
-  "definition term": "definitie term",
-  "definition description": "definitie omschrijving
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DefinitionList/lang/pt_br.js b/web/imcms/xinha/plugins/DefinitionList/lang/pt_br.js
deleted file mode 100644
index 6a93709a2a..0000000000
--- a/web/imcms/xinha/plugins/DefinitionList/lang/pt_br.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "definition list": "Lista de definição",
-  "definition term": "Termo de definição",
-  "definition description": "Descrição de definição"
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DoubleClick/double-click.js b/web/imcms/xinha/plugins/DoubleClick/double-click.js
deleted file mode 100644
index 0b75af4c81..0000000000
--- a/web/imcms/xinha/plugins/DoubleClick/double-click.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Double Click Plugin for Xinha
-// Implementation by Marijn Kampf http://www.marijn.org
-// Sponsored by http://www.smiling-faces.com
-//
-// (c) Marijn Kampf 2004.
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-//
-// Cut-n-paste version of double click plugin.
-// Almost no original code used. Based on
-// Luis HTMLarea and Mihai Bazon Context Menu
-//
-//
-//
-
-DoubleClick._pluginInfo = {
-  name          : "DoubleClick",
-  version       : "1.0",
-  developer     : "Marijn Kampf",
-  developer_url : "http://www.marijn.org",
-  c_owner       : "Marijn Kampf",
-  sponsor       : "smiling-faces.com",
-  sponsor_url   : "http://www.smiling-faces.com",
-  license       : "htmlArea"
-};
-
-function DoubleClick(editor) {
-  this.editor = editor;
-
-  // ADDING CUSTOM DOUBLE CLICK ACTIONS
-  // format of the dblClickList elements is "TAGNAME: [ ACTION ]"
-  //    - TAGNAME: tagname of the tag that is double clicked
-  //    - ACTION: function that gets called when the button is clicked.
-  //              it has the following prototype:
-  //                 function(editor, event)
-  //              - editor is the Xinha object that triggered the call
-  //              - target is the selected object
-  this.editor.dblClickList = {
-    // Edit Link dialog
-    a: [ function(e) {e.config.btnList['createlink'][3](e); } ],
-    // Follow link
-    //a: [ function(editor, target) { window.location = target.href; properties(target); } ],
-
-    img: [ function(e) {e.execCommand("insertimage");} ],
-    td: [ function(e) {e.execCommand("inserttable");} ]
-  };
-}
-
-DoubleClick.prototype.onGenerate = function() {
-  var self = this;
-  var doc = this.editordoc = this.editor._iframe.contentWindow.document;
-  Xinha._addEvents(doc, ["dblclick"],
-          function (event) {
-          return self.onDoubleClick(Xinha.is_ie ? self.editor._iframe.contentWindow.event : event);
-          });
-  this.currentClick = null;
-};
-
-DoubleClick.prototype.onDoubleClick = function(ev) {
-  var target = Xinha.is_ie ? ev.srcElement : ev.target;
-  var tagName = target.tagName.toLowerCase();
-
-  if (this.editor.dblClickList[tagName] != undefined) {
-    this.editor.dblClickList[tagName][0](this.editor, target);
-  }
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DynamicCSS/dynamiccss.js b/web/imcms/xinha/plugins/DynamicCSS/dynamiccss.js
deleted file mode 100644
index be1a0f1ce6..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/dynamiccss.js
+++ /dev/null
@@ -1,237 +0,0 @@
-// Dynamic CSS (className) plugin for HTMLArea
-// Sponsored by http://www.systemconcept.de
-// Implementation by Holger Hees
-//
-// (c) systemconcept.de 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function DynamicCSS(editor, args) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-/*var cssArray=null;
-  var cssLength=0;*/
-  var lastTag=null;
-  var lastClass=null;
-
-  var css_class = {
-    id         : "DynamicCSS-class",
-    tooltip       : this._lc("Choose stylesheet"),
-    options    : {"":""},
-    action     : function(editor) { self.onSelect(editor, this); },
-    refresh    : function(editor) { self.updateValue(editor, this); }
-  };
-  cfg.registerDropdown(css_class);
-  cfg.addToolbarElement(["T[CSS]", "DynamicCSS-class", "separator"] , "formatblock", -1);
-}
-
-DynamicCSS.parseStyleSheet=function(editor){
-        iframe = editor._iframe.contentWindow.document;
-
-        cssArray=DynamicCSS.cssArray;
-        if(!cssArray) cssArray=new Array();
-
-        for(i=0;i<iframe.styleSheets.length;i++)
-        {
-            if(iframe.styleSheets[i].title == "XinhaInternalCSS") continue;
-            
-            // Mozilla
-            if(Xinha.is_gecko){
-                try{
-                    cssArray=DynamicCSS.applyCSSRule(iframe.styleSheets[i].cssRules,cssArray);
-                }
-                catch(e){
-                    //alert(e);
-                }
-            }
-            // IE
-            else {
-                try{
-                    if(iframe.styleSheets[i].rules){
-                        cssArray=DynamicCSS.applyCSSRule(iframe.styleSheets[i].rules,cssArray);
-                    }
-                    // @import StyleSheets (IE)
-                    if(iframe.styleSheets[i].imports){
-                        for(j=0;j<iframe.styleSheets[i].imports.length;j++){
-                            cssArray=DynamicCSS.applyCSSRule(iframe.styleSheets[i].imports[j].rules,cssArray);
-                        }
-                    }
-                }
-                catch(e){
-                    //alert(e);
-                }
-            }
-        }
-        DynamicCSS.cssArray=cssArray;
-};
-
-DynamicCSS.applyCSSRule=function(cssRules,cssArray){
-    for(rule in cssRules){
-        if(typeof cssRules[rule] == 'function') continue;
-        // StyleRule
-        if(cssRules[rule].selectorText){
-            if(cssRules[rule].selectorText.search(/:+/)==-1){
-
-                // split equal Styles (Mozilla-specific) e.q. head, body {border:0px}
-                // for ie not relevant. returns allways one element
-                cssElements = cssRules[rule].selectorText.split(",");
-                for(k=0;k<cssElements.length;k++){
-                    cssElement = cssElements[k].split(".");
-
-                    tagName=cssElement[0].toLowerCase().trim();
-                    className=cssElement[1];
-
-                    if(!tagName) tagName='all';
-                    if(!cssArray[tagName]) cssArray[tagName]=new Array();
-
-                    if(className){
-                        if(tagName=='all') cssName=className;
-                        else cssName='<'+className+'>';
-                    }
-                    else{
-                        className='none';
-                        if(tagName=='all') cssName=Xinha._lc("Default", 'DynamicCSS');
-                        else cssName='<'+Xinha._lc("Default", 'DynamicCSS')+'>';
-                    }
-                    cssArray[tagName][className]=cssName;
-                    DynamicCSS.cssLength++;
-                }
-            }
-        }
-        // ImportRule (Mozilla)
-        else if(cssRules[rule].styleSheet){
-            cssArray=DynamicCSS.applyCSSRule(cssRules[rule].styleSheet.cssRules,cssArray);
-        }
-    }
-    return cssArray;
-};
-
-DynamicCSS._pluginInfo = {
-  name          : "DynamicCSS",
-  version       : "1.5.2",
-  developer     : "Holger Hees",
-  developer_url : "http://www.systemconcept.de/",
-  c_owner       : "Holger Hees",
-  sponsor       : "System Concept GmbH",
-  sponsor_url   : "http://www.systemconcept.de/",
-  license       : "htmlArea"
-};
-
-DynamicCSS.prototype._lc = function(string) {
-    return Xinha._lc(string, 'DynamicCSS');
-};
-
-DynamicCSS.prototype.onSelect = function(editor, obj) {
-    var tbobj = editor._toolbarObjects[obj.id];
-    var index = tbobj.element.selectedIndex;
-    var className = tbobj.element.value;
-
-    var parent = editor.getParentElement();
-
-    if(className!='none'){
-        parent.className=className;
-        DynamicCSS.lastClass=className;
-    }
-    else{
-        if(Xinha.is_gecko) parent.removeAttribute('class');
-        else parent.removeAttribute('className');
-    }
-    editor.updateToolbar();
-};
-
-/*DynamicCSS.prototype.onMode = function(mode) {
-    if(mode=='wysiwyg'){
-        // reparse possible changed css files
-        DynamicCSS.cssArray=null;
-        this.updateValue(this.editor,this.editor.config.customSelects["DynamicCSS-class"]);
-    }
-}*/
-
-DynamicCSS.prototype.reparseTimer = function(editor, obj, instance) {
-    // new attempt of rescan stylesheets in 1,2,4 and 8 second (e.g. for external css-files with longer initialisation)
-    if(DynamicCSS.parseCount<9){
-        setTimeout(function () {
-            DynamicCSS.cssLength=0;
-            DynamicCSS.parseStyleSheet(editor);
-            if(DynamicCSS.cssOldLength!=DynamicCSS.cssLength){
-                DynamicCSS.cssOldLength=DynamicCSS.cssLength;
-                DynamicCSS.lastClass=null;
-                instance.updateValue(editor, obj);
-            }
-            instance.reparseTimer(editor, obj, instance);
-        },DynamicCSS.parseCount*1000);
-        DynamicCSS.parseCount=DynamicCSS.parseCount*2;
-    }
-};
-
-DynamicCSS.prototype.updateValue = function(editor, obj) {
-        cssArray=DynamicCSS.cssArray;
-        // initial style init
-        if(!cssArray){
-            DynamicCSS.cssLength=0;
-            DynamicCSS.parseStyleSheet(editor);
-            cssArray=DynamicCSS.cssArray;
-            DynamicCSS.cssOldLength=DynamicCSS.cssLength;
-            DynamicCSS.parseCount=1;
-            this.reparseTimer(editor,obj,this);
-        }
-
-        var parent = editor.getParentElement();
-        var tagName = parent.tagName.toLowerCase();
-        var className = parent.className;
-
-        if(this.lastTag!=tagName || this.lastClass!=className){
-            this.lastTag=tagName;
-            this.lastClass=className;
-
-            var select = editor._toolbarObjects[obj.id].element;
-
-            while(select.length>0){
-                select.options[select.length-1] = null;
-            }
-
-            select.options[0]=new Option(this._lc("Default"),'none');
-            if(cssArray){
-                // style class only allowed if parent tag is not body or editor is in fullpage mode
-                if(tagName!='body' || editor.config.fullPage){
-                    if(cssArray[tagName]){
-                        for(cssClass in cssArray[tagName]){
-                            if(typeof cssArray[tagName][cssClass] != 'string') continue;
-                            if(cssClass=='none') select.options[0]=new Option(cssArray[tagName][cssClass],cssClass);
-                            else select.options[select.length]=new Option(cssArray[tagName][cssClass],cssClass);
-                        }
-                    }
-
-                    if(cssArray['all']){
-                        for(cssClass in cssArray['all']){
-                            if(typeof cssArray['all'][cssClass] != 'string') continue;
-                            select.options[select.length]=new Option(cssArray['all'][cssClass],cssClass);
-                        }
-                    }
-                }
-                else if(cssArray[tagName] && cssArray[tagName]['none']) select.options[0]=new Option(cssArray[tagName]['none'],'none');
-            }
-
-            select.selectedIndex = 0;
-
-            if (typeof className != "undefined" && /\S/.test(className)) {
-                var options = select.options;
-                for (var i = options.length; --i >= 0;) {
-                    var option = options[i];
-                    if (className == option.value) {
-                            select.selectedIndex = i;
-                            break;
-                    }
-                }
-                if(select.selectedIndex == 0){
-                    select.options[select.length]=new Option(this._lc("Undefined"),className);
-                    select.selectedIndex=select.length-1;
-                }
-            }
-
-            if(select.length>1) select.disabled=false;
-            else select.disabled=true;
-        }
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DynamicCSS/lang/de.js b/web/imcms/xinha/plugins/DynamicCSS/lang/de.js
deleted file mode 100644
index 5419e8dd43..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/lang/de.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Sponsored by http://www.systemconcept.de
-// Author: Holger Hees, <hhees@systemconcept.de>
-// (c) systemconcept.de 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Default": "Standard",
-  "Undefined": "Nicht definiert",
-  "Choose stylesheet": "Wählen Sie einen StyleSheet aus"
-};
diff --git a/web/imcms/xinha/plugins/DynamicCSS/lang/fr.js b/web/imcms/xinha/plugins/DynamicCSS/lang/fr.js
deleted file mode 100644
index a82ca2a4d3..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/lang/fr.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Default": "Défaut",
-  "Undefined": "Non défini",
-  "Choose stylesheet": "Choisir feuille de style"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DynamicCSS/lang/ja.js b/web/imcms/xinha/plugins/DynamicCSS/lang/ja.js
deleted file mode 100644
index 005d204fdc..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/lang/ja.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Default": "��",
-  "Undefined": "未定義",
-  "Choose stylesheet": "スタイルシート��択"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DynamicCSS/lang/nb.js b/web/imcms/xinha/plugins/DynamicCSS/lang/nb.js
deleted file mode 100644
index 24e8e8ab54..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/lang/nb.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Default": "Standard",
-  "Undefined": "Udefinert",
-  "Choose stylesheet": "Velg stilsett"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DynamicCSS/lang/nl.js b/web/imcms/xinha/plugins/DynamicCSS/lang/nl.js
deleted file mode 100644
index ead62eb65a..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/lang/nl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Sponsored by http://www.systemconcept.de
-// Author: Holger Hees, <hhees@systemconcept.de>
-// (c) systemconcept.de 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Default": "Default",
-  "Undefined": "Ungedefinieerd",
-  "Choose stylesheet": "Kies stylesheet"
-};
diff --git a/web/imcms/xinha/plugins/DynamicCSS/lang/no.js b/web/imcms/xinha/plugins/DynamicCSS/lang/no.js
deleted file mode 100644
index 3ea3665413..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/lang/no.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Default": "Standard",
-  "Undefined": "Udefinert",
-  "Choose stylesheet": "Velg stilsett"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/DynamicCSS/lang/pt_br.js b/web/imcms/xinha/plugins/DynamicCSS/lang/pt_br.js
deleted file mode 100644
index a9eb57c33f..0000000000
--- a/web/imcms/xinha/plugins/DynamicCSS/lang/pt_br.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-{
-  "Choose stylesheet": "Escolher estilo",
-  "Default": "Padrão",
-  "Undefined": "Indefinido"
-}
diff --git a/web/imcms/xinha/plugins/EditTag/edit-tag.js b/web/imcms/xinha/plugins/EditTag/edit-tag.js
deleted file mode 100644
index fb70de71c2..0000000000
--- a/web/imcms/xinha/plugins/EditTag/edit-tag.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Character Map plugin for Xinha
-// Sponsored by http://www.systemconcept.de
-// Implementation by Holger Hees based on HTMLArea XTD 1.5 (http://mosforge.net/projects/htmlarea3xtd/)
-// Original Author - Bernhard Pfeifer novocaine@gmx.net 
-//
-// (c) systemconcept.de 2004
-// Distributed under the same terms as Xinha itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function EditTag(editor) {
-  this.editor = editor;
-	var cfg = editor.config;
-	var self = this;
-        
-	cfg.registerButton({
-                id       : "edittag",
-                tooltip  : this._lc("Edit HTML for selected text"),
-                image    : editor.imgURL("ed_edit_tag.gif", "EditTag"),
-                textMode : false,
-                action   : function(editor) {
-                             self.buttonPress(editor);
-                           }
-            });
-
-	cfg.addToolbarElement("edittag", "htmlmode",1);
-
-}
-
-EditTag._pluginInfo = {
-	name          : "EditTag",
-	version       : "1.0",
-	developer     : "Pegoraro Marco",
-	developer_url : "http://www.sin-italia.com/",
-	c_owner       : "Marco Pegoraro",
-	sponsor       : "Sin Italia",
-	sponsor_url   : "http://www.sin-italia.com/",
-	license       : "htmlArea"
-};
-
-EditTag.prototype._lc = function(string) {
-    return Xinha._lc(string, 'EditTag');
-};
-
-EditTag.prototype.buttonPress = function(editor) {
-	// Costruzione dell'oggetto parametri da passare alla dialog.
-	outparam = {
-		content : editor.getSelectedHTML()
-	}; // Fine costruzione parametri per il passaggio alla dialog.
-	editor._popupDialog( "plugin://EditTag/edit_tag", function( html ) {
-		if ( !html ) {  
-			//user must have pressed Cancel
-			return false;
-		}
-		editor.insertHTML( html );
-	}, outparam);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/EditTag/img/ed_edit_tag.gif b/web/imcms/xinha/plugins/EditTag/img/ed_edit_tag.gif
deleted file mode 100644
index 79671fbe66..0000000000
Binary files a/web/imcms/xinha/plugins/EditTag/img/ed_edit_tag.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/EditTag/lang/de.js b/web/imcms/xinha/plugins/EditTag/lang/de.js
deleted file mode 100644
index 7e3fa28d2c..0000000000
--- a/web/imcms/xinha/plugins/EditTag/lang/de.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Edit HTML for selected text": "HTML im ausgewählten Bereich bearbeiten",
-  "Tag Editor": "HTML tag Editor"
-};
diff --git a/web/imcms/xinha/plugins/EditTag/lang/fr.js b/web/imcms/xinha/plugins/EditTag/lang/fr.js
deleted file mode 100644
index 88e4dbcb28..0000000000
--- a/web/imcms/xinha/plugins/EditTag/lang/fr.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Edit HTML for selected text": "Editer le code HTML du texte sélectionné",
-  "Tag Editor": "Editeur de tag HTML"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/EditTag/lang/ja.js b/web/imcms/xinha/plugins/EditTag/lang/ja.js
deleted file mode 100644
index 4a88241aab..0000000000
--- a/web/imcms/xinha/plugins/EditTag/lang/ja.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Edit HTML for selected text": "�択中テキスト�HTMLを編集���",
-  "Tag Editor": "タグエディタ"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/EditTag/lang/nb.js b/web/imcms/xinha/plugins/EditTag/lang/nb.js
deleted file mode 100644
index c171e11387..0000000000
--- a/web/imcms/xinha/plugins/EditTag/lang/nb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Edit HTML for selected text": "Rediger HTML for den valgte teksten"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/EditTag/lang/nl.js b/web/imcms/xinha/plugins/EditTag/lang/nl.js
deleted file mode 100644
index 548cfed0fc..0000000000
--- a/web/imcms/xinha/plugins/EditTag/lang/nl.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Edit HTML for selected text": "HTML bewerken voor geselecteerde tekst",
-  "Tag Editor": "HTML tag Editor"
-};
diff --git a/web/imcms/xinha/plugins/EditTag/lang/no.js b/web/imcms/xinha/plugins/EditTag/lang/no.js
deleted file mode 100644
index 979d6871e4..0000000000
--- a/web/imcms/xinha/plugins/EditTag/lang/no.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Edit HTML for selected text": "Rediger HTML for den valgte teksten"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/EditTag/lang/pt_br.js b/web/imcms/xinha/plugins/EditTag/lang/pt_br.js
deleted file mode 100644
index 0bd66be8e2..0000000000
--- a/web/imcms/xinha/plugins/EditTag/lang/pt_br.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Cancel": "Cancelar",
-  "Edit HTML for selected text": "Editar HTML para texto selecionado",
-  "Edit Tag By Peg": "Editar Tag por Peg",
-  "OK": "OK",
-  "Tag Editor": "Editor de Tag"
-}
diff --git a/web/imcms/xinha/plugins/EditTag/popups/edit_tag.html b/web/imcms/xinha/plugins/EditTag/popups/edit_tag.html
deleted file mode 100644
index 2eeb541593..0000000000
--- a/web/imcms/xinha/plugins/EditTag/popups/edit_tag.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Edit Tag By Peg</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-<script language="javascript">
-  window.resizeTo(600, 450);
-function Init() {
-  __dlg_translate("EditTag");
-  __dlg_init();
-
-  var param = window.dialogArguments;
-  document.getElementById("TAG").value = param["content"];
-  document.getElementById("TAG").focus();
-}
-
-function onCancel() {
-  __dlg_close( null );
-  return false;
-}
-
-function onOK() {
-  var ret = document.getElementById("TAG").value;
-  __dlg_close( ret );
-}
-</script>
-</head>
-
-<body class="dialog" onLoad="Init();">
-<div class="title">Tag Editor</div>
-<textarea name="TAG" id="TAG" cols=22 rows=5 style="width: 100%; height: 315px; margin-top: 8px; margin-bottom: 4px; font-family: monospace; font-size: 11px;"></textarea>
-<div id="buttons">
-    <button type="submit" name="ok" onclick="return onOK();">OK</button>
-    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/EnterParagraphs/enter-paragraphs.js b/web/imcms/xinha/plugins/EnterParagraphs/enter-paragraphs.js
deleted file mode 100644
index 23e07f249a..0000000000
--- a/web/imcms/xinha/plugins/EnterParagraphs/enter-paragraphs.js
+++ /dev/null
@@ -1,1090 +0,0 @@
-// tabs 2
-
-/**
-* @fileoverview By Adam Wright, for The University of Western Australia
-*
-* Distributed under the same terms as Xinha itself.
-* This notice MUST stay intact for use (see license.txt).
-*
-* Heavily modified by Yermo Lamers of DTLink, LLC, College Park, Md., USA.
-* For more info see http://www.areaedit.com
-*/
-
-/**
-* plugin Info
-*/
-
-EnterParagraphs._pluginInfo =
-	{
-  name          : "EnterParagraphs",
-  version       : "1.0",
-  developer     : "Adam Wright",
-  developer_url : "http://www.hipikat.org/",
-  sponsor       : "The University of Western Australia",
-  sponsor_url   : "http://www.uwa.edu.au/",
-  license       : "htmlArea"
-	};
-
-// ------------------------------------------------------------------
-
-// "constants"
-
-/**
-* Whitespace Regex
-*/
-
-EnterParagraphs.prototype._whiteSpace = /^\s*$/;
-
-/**
-* The pragmatic list of which elements a paragraph may not contain
-*/
-
-EnterParagraphs.prototype._pExclusions = /^(address|blockquote|body|dd|div|dl|dt|fieldset|form|h1|h2|h3|h4|h5|h6|hr|li|noscript|ol|p|pre|table|ul)$/i;
-
-/**
-* elements which may contain a paragraph
-*/
-
-EnterParagraphs.prototype._pContainers = /^(body|del|div|fieldset|form|ins|map|noscript|object|td|th)$/i;
-
-/**
-* Elements which may not contain paragraphs, and would prefer a break to being split
-*/
-
-EnterParagraphs.prototype._pBreak = /^(address|pre|blockquote)$/i;
-
-/**
-* Elements which may not contain children
-*/
-
-EnterParagraphs.prototype._permEmpty = /^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i;
-
-/**
-* Elements which count as content, as distinct from whitespace or containers
-*/
-
-EnterParagraphs.prototype._elemSolid = /^(applet|br|button|hr|img|input|table)$/i;
-
-/**
-* Elements which should get a new P, before or after, when enter is pressed at either end
-*/
-
-EnterParagraphs.prototype._pifySibling = /^(address|blockquote|del|div|dl|fieldset|form|h1|h2|h3|h4|h5|h6|hr|ins|map|noscript|object|ol|p|pre|table|ul|)$/i;
-EnterParagraphs.prototype._pifyForced = /^(ul|ol|dl|table)$/i;
-
-/**
-* Elements which should get a new P, before or after a close parent, when enter is pressed at either end
-*/
-
-EnterParagraphs.prototype._pifyParent = /^(dd|dt|li|td|th|tr)$/i;
-
-// ---------------------------------------------------------------------
-
-/**
-* EnterParagraphs Constructor
-*/
-
-function EnterParagraphs(editor)
-	{
-
-  this.editor = editor;
-
-	// [STRIP
-	// create a ddt debug trace object. There may be multiple editors on
-	// the page each EnterParagraphs .. to distinguish which instance
-	// is generating the message we tack on the name of the textarea.
-
-	//this.ddt = new DDT( editor._textArea + ":EnterParagraphs Plugin" );
-
-	// uncomment to turn on debugging messages.
-
-	//this.ddt._ddtOn();
-
-	//this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): constructor" );
-
-	// STRIP]
-
-  // hook into the event handler to intercept key presses if we are using
-	// gecko (Mozilla/FireFox)
-
-  if (Xinha.is_gecko)
-		{
-		//this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): we are gecko. Setting event handler." );
-    this.onKeyPress = this.__onKeyPress;
-		}
-
-	}	// end of constructor.
-
-// ------------------------------------------------------------------
-
-/**
-* name member for debugging
-*
-* This member is used to identify objects of this class in debugging
-* messages.
-*/
-
-EnterParagraphs.prototype.name = "EnterParagraphs";
-
-/**
-* Gecko's a bit lacking in some odd ways...
-*/
-
-EnterParagraphs.prototype.insertAdjacentElement = function(ref,pos,el)
-	{
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): top with pos '" + pos + "' ref:", ref );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): top with el:", el );
-
-  if ( pos == 'BeforeBegin' )
-		{
-		ref.parentNode.insertBefore(el,ref);
-		}
-  else if ( pos == 'AfterEnd' )
-		{
-		ref.nextSibling ? ref.parentNode.insertBefore(el,ref.nextSibling) : ref.parentNode.appendChild(el);
-		}
-  else if ( pos == 'AfterBegin' && ref.firstChild )
-		{
-		ref.insertBefore(el,ref.firstChild);
-		}
-  else if ( pos == 'BeforeEnd' || pos == 'AfterBegin' )
-		{
-		ref.appendChild(el);
-		}
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): bottom with ref:", ref );
-
-	};	// end of insertAdjacentElement()
-
-// ----------------------------------------------------------------
-
-/**
-* Passes a global parent node or document fragment to forEachNode
-*
-* @param root node root node to start search from.
-* @param mode string function to apply to each node.
-* @param direction string traversal direction "ltr" (left to right) or "rtl" (right_to_left)
-* @param init boolean
-*/
-
-EnterParagraphs.prototype.forEachNodeUnder = function ( root, mode, direction, init )
-	{
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): top mode is '" + mode + "' direction is '" + direction + "' starting with root node:", root );
-
-  // Identify the first and last nodes to deal with
-
-  var start, end;
-
-	// nodeType 11 is DOCUMENT_FRAGMENT_NODE which is a container.
-
-  if ( root.nodeType == 11 && root.firstChild )
-		{
-    start = root.firstChild;
-    end = root.lastChild;
-	  }
-	else
-		{
-		start = end = root;
-		}
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): start node is:", start );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): initial end node is:", end );
-
-	// traverse down the right hand side of the tree getting the last child of the last
-	// child in each level until we reach bottom.
-  while ( end.lastChild )
-		end = end.lastChild;
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): end node after descent is:", end );
-
-  return this.forEachNode( start, end, mode, direction, init);
-
-	};	// end of forEachNodeUnder()
-
-// -----------------------------------------------------------------------
-
-/**
-* perform a depth first descent in the direction requested.
-*
-* @param left_node node "start node"
-* @param right_node node "end node"
-* @param mode string function to apply to each node. cullids or emptyset.
-* @param direction string traversal direction "ltr" (left to right) or "rtl" (right_to_left)
-* @param init boolean or object.
-*/
-
-EnterParagraphs.prototype.forEachNode = function (left_node, right_node, mode, direction, init)
-	{
-
-	//this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): top - mode is:" + mode + "' direction '" + direction + "'" );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): top - left node is:", left_node );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): top - right node is:", right_node );
-
-	// returns "Brother" node either left or right.
-
-  var getSibling = function(elem, direction)
-							{
-							return ( direction == "ltr" ? elem.nextSibling : elem.previousSibling );
-							};
-
-  var getChild = function(elem, direction)
-							{
-							return ( direction == "ltr" ? elem.firstChild : elem.lastChild );
-							};
-
-  var walk, lookup, fnReturnVal;
-
-	// FIXME: init is a boolean in the emptyset case and an object in
-	// the cullids case. Used inconsistently.
-
-	var next_node = init;
-
-	// used to flag having reached the last node.
-
-	var done_flag = false;
-
-  // loop ntil we've hit the last node in the given direction.
-	// if we're going left to right that's the right_node and visa-versa.
-
-  while ( walk != direction == "ltr" ? right_node : left_node )
-		{
-
-    // on first entry, walk here is null. So this is how
-		// we prime the loop with the first node.
-
-    if ( !walk )
-			{
-			walk = direction == "ltr" ? left_node : right_node;
-
-			//this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): !walk - current node is:", walk );
-			}
-    else
-			{
-
-			// is there a child node?
-
-      if ( getChild(walk,direction) )
-				{
-
-				// descend down into the child.
-
-				walk = getChild(walk,direction);
-
-				//this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode():descending to child node:", walk );
-
-				}
-      else
-				{
-
-				// is there a sibling node on this level?
-
-        if ( getSibling(walk,direction) )
-					{
-
-					// move to the sibling.
-
-					walk = getSibling(walk,direction);
-
-					//this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): moving to sibling node:", walk );
-
-					}
-        else
-					{
-          lookup = walk;
-
-					// climb back up the tree until we find a level where we are not the end
-					// node on the level (i.e. that we have a sibling in the direction
-					// we are searching) or until we reach the end.
-
-          while ( !getSibling(lookup,direction) && lookup != (direction == "ltr" ? right_node : left_node) )
-						{
-						lookup = lookup.parentNode;
-						}
-
-					// did we find a level with a sibling?
-
-          // walk = ( lookup.nextSibling ? lookup.nextSibling : lookup ) ;
-
-          walk = ( getSibling(lookup,direction) ? getSibling(lookup,direction) : lookup ) ;
-
-					//this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): climbed back up (or found right node):", walk );
-
-			    }
-				}
-
-			}	// end of else walk.
-
-		// have we reached the end? either as a result of the top while loop or climbing
-		// back out above.
-
-		done_flag = (walk==( direction == "ltr" ? right_node : left_node));
-
-		// call the requested function on the current node. Functions
-		// return an array.
-		//
-		// Possible functions are _fenCullIds, _fenEmptySet
-		//
-		// The situation is complicated by the fact that sometimes we want to
-		// return the base node and sometimes we do not.
-		//
-		// next_node can be an object (this.takenIds), a node (text, el, etc) or false.
-
-		//this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): calling function" );
-
-		switch( mode )
-			{
-
-			case "cullids":
-
-    		fnReturnVal = this._fenCullIds(walk, next_node );
-				break;
-
-			case "find_fill":
-
-    		fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);
-				break;
-
-			case "find_cursorpoint":
-
-    		fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);
-				break;
-
-			}
-
-		// If this node wants us to return, return next_node
-
-    if ( fnReturnVal[0] )
-			{
-			//this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): returning node:", fnReturnVal[1] );
-
-			return fnReturnVal[1];
-			}
-
-		// are we done with the loop?
-
-		if ( done_flag )
-			{
-			break;
-			}
-
-		// Otherwise, pass to the next node
-
-    if ( fnReturnVal[1] )
-			{
-			next_node = fnReturnVal[1];
-			}
-
-	  }	// end of while loop
-
-	//this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): returning false." );
-
-  return false;
-
-	};	// end of forEachNode()
-
-// -------------------------------------------------------------------
-
-/**
-* Find a post-insertion node, only if all nodes are empty, or the first content
-*
-* @param node node current node beinge examined.
-* @param next_node node next node to be examined.
-* @param node string "find_fill" or "find_cursorpoint"
-* @param last_flag boolean is this the last node?
-*/
-
-EnterParagraphs.prototype._fenEmptySet = function( node, next_node, mode, last_flag)
-	{
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : top with mode '" + mode + "' and last_flag '" + last_flag + "' and node:", node );
-
-  // Mark this if it's the first base
-
-  if ( !next_node && !node.firstChild )
-		{
-		next_node = node;
-		}
-
-  // Is it an element node and is it considered content? (br, hr, etc)
-	// or is it a text node that is not just whitespace?
-	// or is it not an element node and not a text node?
-
-  if ( (node.nodeType == 1 && this._elemSolid.test(node.nodeName)) ||
-    (node.nodeType == 3 && !this._whiteSpace.test(node.nodeValue)) ||
-    (node.nodeType != 1 && node.nodeType != 3) )
-		{
-
-		//this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : found content in node:", node );
-
-		switch( mode )
-			{
-
-			case "find_fill":
-
-				// does not return content.
-
-		    return new Array(true, false );
-				break;
-
-			case "find_cursorpoint":
-
-				// returns content
-
-		    return new Array(true, node );
-				break;
-
-			}
-
-	  }
-
-  // In either case (fill or findcursor) we return the base node. The avoids
-	// problems in terminal cases (beginning or end of document or container tags)
-
-  if ( last_flag )
-		{
-		//this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : return 'base' node:", next_node );
-
-		return new Array( true, next_node );
-		}
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : bottom returning false and :", next_node );
-
-  return new Array( false, next_node );
-
-	};	// end of _fenEmptySet()
-
-// ------------------------------------------------------------------------------
-
-/**
-* remove duplicate Id's.
-*
-* @param ep_ref enterparagraphs reference to enterparagraphs object
-*/
-
-EnterParagraphs.prototype._fenCullIds = function ( ep_ref, node, pong )
-	{
-
-	//this.ddt._ddt( "enter-paragraphs.js", "299", "_fenCullIds(): top" );
-
-  // Check for an id, blast it if it's in the store, otherwise add it
-
-  if ( node.id )
-		{
-
-		//this.ddt._ddt( "enter-paragraphs.js", "299", "_fenCullIds(): node '" + node.nodeName + "' has an id '" + node.id + "'" );
-
-		pong[node.id] ? node.id = '' : pong[node.id] = true;
-		}
-
-  return new Array(false,pong);
-
-	};
-
-// ---------------------------------------------------------------------------------
-
-/**
-* Grabs a range suitable for paragraph stuffing
-*
-* @param rng Range
-* @param search_direction string "left" or "right"
-*
-* @todo check blank node issue in roaming loop.
-*/
-
-EnterParagraphs.prototype.processSide = function( rng, search_direction)
-	{
-
-	//this.ddt._ddt( "enter-paragraphs.js", "329", "processSide(): top search_direction == '" + search_direction + "'" );
-
-  var next = function(element, search_direction)
-							{
-							return ( search_direction == "left" ? element.previousSibling : element.nextSibling );
-							};
-
-  var node = search_direction == "left" ? rng.startContainer : rng.endContainer;
-  var offset = search_direction == "left" ? rng.startOffset : rng.endOffset;
-  var roam, start = node;
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "337", "processSide(): starting with node:", node );
-
-  // Never start with an element, because then the first roaming node might
-  // be on the exclusion list and we wouldn't know until it was too late
-
-  while ( start.nodeType == 1 && !this._permEmpty.test(start.nodeName) )
-		{
-		start = ( offset ? start.lastChild : start.firstChild );
-		}
-
-  // Climb the tree, left or right, until our course of action presents itself
-	//
-	// if roam is NULL try start.
-	// if roam is NOT NULL, try next node in our search_direction
-	// If that node is NULL, get our parent node.
-	//
-	// If all the above turns out NULL end the loop.
-	//
-	// FIXME: gecko (firefox 1.0.3) - enter "test" into an empty document and press enter.
-	// sometimes this loop finds a blank text node, sometimes it doesn't.
-
-  while ( roam = roam ? ( next(roam,search_direction) ? next(roam,search_direction) : roam.parentNode ) : start )
-		{
-
-		//this.ddt._ddtDumpNode( "enter-paragraphs.js", "357", "processSide(): roaming loop, search_direction is '" + search_direction + "' current node is: ", roam );
-
-		// next() is an inline function defined above that returns the next node depending
-		// on the direction we're searching.
-
-    if ( next(roam,search_direction) )
-			{
-
-			//this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Checking next node '" + next(roam,search_direction).NodeName + "' for _pExclusions list." );
-
-      // If the next sibling's on the exclusion list, stop before it
-
-      if ( this._pExclusions.test(next(roam,search_direction).nodeName) )
-				{
-
-				//this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Node '" + next(roam,search_direction).NodeName + "' is on the _pExclusions list. Stopping before it." );
-
-        return this.processRng(rng, search_direction, roam, next(roam,search_direction), (search_direction == "left"?'AfterEnd':'BeforeBegin'), true, false);
-		    }
-			}
-		else
-			{
-
-			//this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): No next node, examing parent node '" + roam.parentNode.nodeName + "' for containers or exclusions." );
-
-      // If our parent's on the container list, stop inside it
-
-      if (this._pContainers.test(roam.parentNode.nodeName))
-				{
-
-				//this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is on the _pContainer list. Stopping inside it." );
-
-        return this.processRng(rng, search_direction, roam, roam.parentNode, (search_direction == "left"?'AfterBegin':'BeforeEnd'), true, false);
-	      }
-      else if (this._pExclusions.test(roam.parentNode.nodeName))
-				{
-
-				//this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is on the _pExclusion list." );
-
-	      // chop without wrapping
-
-        if (this._pBreak.test(roam.parentNode.nodeName))
-					{
-
-					//this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is on the _pBreak list." );
-
-          return this.processRng(rng, search_direction, roam, roam.parentNode,
-                            (search_direction == "left"?'AfterBegin':'BeforeEnd'), false, (search_direction == "left" ?true:false));
-	        }
-				else
-					{
-
-					//this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is not on the _pBreak list." );
-
-					// the next(roam,search_direction) in this call is redundant since we know it's false
-					// because of the "if next(roam,search_direction)" above.
-					//
-					// the final false prevents this range from being wrapped in <p>'s most likely
-					// because it's already wrapped.
-
-          return this.processRng(rng,
-																search_direction,
-																(roam = roam.parentNode),
-		                            (next(roam,search_direction) ? next(roam,search_direction) : roam.parentNode),
-									              (next(roam,search_direction) ? (search_direction == "left"?'AfterEnd':'BeforeBegin') : (search_direction == "left"?'AfterBegin':'BeforeEnd')),
-																false,
-																false);
-					}
-				}
-			}
-		}
-
-	//this.ddt._ddt( "enter-paragraphs.js", "424", "processSide(): bottom" );
-
-	};	// end of processSide()
-
-// ------------------------------------------------------------------------------
-
-/**
-* processRng - process Range.
-*
-* Neighbour and insertion identify where the new node, roam, needs to enter
-* the document; landmarks in our selection will be deleted before insertion
-*
-* @param rn Range original selected range
-* @param search_direction string Direction to search in.
-* @param roam node
-* @param insertion string may be AfterBegin of BeforeEnd
-* @return array
-*/
-
-EnterParagraphs.prototype.processRng = function(rng, search_direction, roam, neighbour, insertion, pWrap, preBr)
-	{
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "398", "processRng(): top - roam arg is:", roam );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "398", "processRng(): top - neighbor arg is:", neighbour );
-
-	//this.ddt._ddt( "enter-paragraphs.js", "398", "processRng(): top - insertion arg is: '" + insertion + "'" );
-
-  var node = search_direction == "left" ? rng.startContainer : rng.endContainer;
-  var offset = search_direction == "left" ? rng.startOffset : rng.endOffset;
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "447", "processRng(): range start (or end) is at offset '" + offset + "' is node :", node );
-
-  // Define the range to cut, and extend the selection range to the same boundary
-
-  var editor = this.editor;
-  var newRng = editor._doc.createRange();
-
-  newRng.selectNode(roam);
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): selecting newRng is:", newRng );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): selecting original rng is:", rng );
-
-	// extend the range in the given direction.
-
-  if ( search_direction == "left")
-		{
-    newRng.setEnd(node, offset);
-    rng.setStart(newRng.startContainer, newRng.startOffset);
-
-		//this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): extending direction left - newRng is:", newRng );
-		//this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): extending direction left - rng is:", rng );
-
-	  }
-	else if ( search_direction == "right" )
-		{
-
-    newRng.setStart(node, offset);
-		rng.setEnd(newRng.endContainer, newRng.endOffset);
-
-		//this.ddt._ddt( "enter-paragraphs.js", "522", "processRng(): right - new range start is '" + offset + "' end offset is '" + newRng.endOffset + "'" );
-	  }
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): rng is:", rng );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): newRng is:", newRng );
-
-  // Clone the range and remove duplicate ids it would otherwise produce
-
-  var cnt = newRng.cloneContents();
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "509", "processRng(): culling duplicate ids from:", cnt );
-
-	// in this case "init" is an object not a boolen.
-
-  this.forEachNodeUnder( cnt, "cullids", "ltr", this.takenIds, false, false);
-
-  // Special case, for inserting paragraphs before some blocks when caret is at
-	// their zero offset.
-	//
-	// Used to "open up space" in front of a list, table. Usefull if the list is at
-	// the top of the document. (otherwise you'd have no way of "moving it down").
-
-  var pify, pifyOffset, fill;
-  pify = search_direction == "left" ? (newRng.endContainer.nodeType == 3 ? true:false) : (newRng.startContainer.nodeType == 3 ? false:true);
-  pifyOffset = pify ? newRng.startOffset : newRng.endOffset;
-  pify = pify ? newRng.startContainer : newRng.endContainer;
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "521", "processRng(): pify is '" + pify.nodeName + "' pifyOffset is '" + pifyOffset + "':", pify );
-
-  if ( this._pifyParent.test(pify.nodeName) && pify.parentNode.childNodes.item(0) == pify )
-		{
-    while ( !this._pifySibling.test(pify.nodeName) )
-			{
-			pify = pify.parentNode;
-			}
-	  }
-
-	// NODE TYPE 11 is DOCUMENT_FRAGMENT NODE
-  // I do not profess to understand any of this, simply applying a patch that others say is good - ticket:446
-  if ( cnt.nodeType == 11 && !cnt.firstChild)
-  {	
-    if (pify.nodeName != "BODY" || (pify.nodeName == "BODY" && pifyOffset != 0)) 
-    { //WKR: prevent body tag in empty doc
-      cnt.appendChild(editor._doc.createElement(pify.nodeName));
-    }
-  }
-  
-	// YmL: Added additional last parameter for fill case to work around logic
-	// error in forEachNode()
-
-	//this.ddt._ddt( "enter-paragraphs.js", "612", "processRng(): find_fill in cnt." );
-
-  fill = this.forEachNodeUnder(cnt, "find_fill", "ltr", false );
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "612", "processRng(): fill node:" , fill );
-
-  if ( fill &&
-				this._pifySibling.test(pify.nodeName) &&
-	    	( (pifyOffset == 0) || ( pifyOffset == 1 && this._pifyForced.test(pify.nodeName) ) ) )
-		{
-
-		//this.ddt._ddt( "enter-paragraphs.js", "544", "processRng(): pify handling. Creating p tag followed by nbsp tag" );
-
-		roam = editor._doc.createElement( 'p' );
-		roam.innerHTML = "&nbsp;";
-
-    // roam = editor._doc.createElement('p');
-    // roam.appendChild(editor._doc.createElement('br'));
-
-		// for these cases, if we are processing the left hand side we want it to halt
-		// processing instead of doing the right hand side. (Avoids adding another <p>&nbsp</p>
-		// after the list etc.
-
-    if ((search_direction == "left" ) && pify.previousSibling)
-			{
-
-			//this.ddt._ddt( "enter-paragraphs.js", "682", "processRng(): returning created roam AfterEnd" );
-
-			return new Array(pify.previousSibling, 'AfterEnd', roam);
-			}
-    else if (( search_direction == "right") && pify.nextSibling)
-			{
-
-			//this.ddt._ddt( "enter-paragraphs.js", "682", "processRng(): returning created roam BeforeBegin" );
-
-			return new Array(pify.nextSibling, 'BeforeBegin', roam);
-			}
-    else
-			{
-
-			//this.ddt._ddt( "enter-paragraphs.js", "682", "processRng(): returning created roam for direction '" + search_direction + "'" );
-
-			return new Array(pify.parentNode, (search_direction == "left"?'AfterBegin':'BeforeEnd'), roam);
-			}
-
-	  }
-
-  // If our cloned contents are 'content'-less, shove a break in them
-
-  if ( fill )
-		{
-
-		// Ill-concieved?
-		//
-		// 3 is a TEXT node and it should be empty.
-		//
-
-		if ( fill.nodeType == 3 )
-			{
-			// fill = fill.parentNode;
-
-			fill = editor._doc.createDocumentFragment();
-
-			//this.ddt._ddtDumpNode( "enter-paragraphs.js", "575", "processRng(): fill.nodeType is 3. Moving up to parent:", fill );
-			}
-
-    if ( (fill.nodeType == 1 && !this._elemSolid.test()) || fill.nodeType == 11 )
-			{
-
-			// FIXME:/CHECKME: When Xinha is switched from WYSIWYG to text mode
-			// Xinha.getHTMLWrapper() will strip out the trailing br. Not sure why.
-
-			// fill.appendChild(editor._doc.createElement('br'));
-
-			var pterminator = editor._doc.createElement( 'p' );
-			pterminator.innerHTML = "&nbsp;";
-
-			fill.appendChild( pterminator );
-
-			//this.ddt._ddtDumpNode( "enter-paragraphs.js", "583", "processRng(): fill type is 1 and !elemsolid or it's type 11. Appending an nbsp tag:", fill );
-
-			}
-    else
-			{
-
-			//this.ddt._ddt( "enter-paragraphs.js", "583", "processRng(): inserting a br tag before." );
-
-			// fill.parentNode.insertBefore(editor._doc.createElement('br'),fill);
-
-			var pterminator = editor._doc.createElement( 'p' );
-			pterminator.innerHTML = "&nbsp;";
-
-			fill.parentNode.insertBefore(parentNode,fill);
-
-			}
-	  }
-
-	// YmL: If there was no content replace with fill
-	// (previous code did not use fill and we ended up with the
-	// <p>test</p><p></p> because Gecko was finding two empty text nodes
-	// when traversing on the right hand side of an empty document.
-
-	if ( fill )
-		{
-
-		//this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): no content. Using fill.", fill );
-
-		roam = fill;
-		}
-	else
-		{
-	  // And stuff a shiny new object with whatever contents we have
-
-		//this.ddt._ddt( "enter-paragraphs.js", "606", "processRng(): creating p tag or document fragment - pWrap is '" + pWrap + "' " );
-
-	  roam = (pWrap || (cnt.nodeType == 11 && !cnt.firstChild)) ? editor._doc.createElement('p') : editor._doc.createDocumentFragment();
-	  roam.appendChild(cnt);
-		}
-
-  if (preBr)
-		{
-		//this.ddt._ddt( "enter-paragraphs.js", "767", "processRng(): appending a br based on preBr flag" );
-
-		roam.appendChild(editor._doc.createElement('br'));
-		}
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): bottom with roam:", roam );
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): bottom with neighbour:", neighbour );
-
-  // Return the nearest relative, relative insertion point and fragment to insert
-
-  return new Array(neighbour, insertion, roam);
-
-	};	// end of processRng()
-
-// ----------------------------------------------------------------------------------
-
-/**
-* are we an <li> that should be handled by the browser?
-*
-* there is no good way to "get out of" ordered or unordered lists from Javascript.
-* We have to pass the onKeyPress 13 event to the browser so it can take care of
-* getting us "out of" the list.
-*
-* The Gecko engine does a good job of handling all the normal <li> cases except the "press
-* enter at the first position" where we want a <p>&nbsp</p> inserted before the list. The
-* built-in behavior is to open up a <li> before the current entry (not good).
-*
-* @param rng Range range.
-*/
-
-EnterParagraphs.prototype.isNormalListItem = function(rng)
-	{
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "863", "isNormaListItem(): checking rng for list end:", rng );
-
-	var node, listNode;
-
-	node = rng.startContainer;
-
-	if (( typeof node.nodeName != 'undefined') &&
-		( node.nodeName.toLowerCase() == 'li' ))
-		{
-
-		//this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): node is a list item");
-
-		// are we a list item?
-
-		listNode = node;
-		}
-	else if (( typeof node.parentNode != 'undefined' ) &&
-				( typeof node.parentNode.nodeName != 'undefined' ) &&
-				( node.parentNode.nodeName.toLowerCase() == 'li' ))
-		{
-
-		//this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): parent is a list item");
-
-		// our parent is a list item.
-
-		listNode = node.parentNode;
-
-		}
-	else
-		{
-		//this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): not list item");
-
-		// neither we nor our parent are a list item. this is not a normal
-		// li case.
-
-		return false;
-		}
-
-	// at this point we have a listNode. Is it the first list item?
-
-	if ( ! listNode.previousSibling )
-		{
-		//this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): we are the first li." );
-
-		// are we on the first character of the first li?
-
-		if ( rng.startOffset == 0 )
-			{
-			//this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): we are on the first character." );
-
-			return false;
-			}
-		}
-
-	//this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): this is a normal list item case." );
-	return true;
-
-	};	// end of isNormalListItem()
-
-// ----------------------------------------------------------------------------------
-/**
-* Called when a key is pressed in the editor
-*/
-
-EnterParagraphs.prototype.__onKeyPress = function(ev)
-	{
-
-	//this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): top with keyCode '" + ev.keyCode + "'" );
-
-  // If they've hit enter and shift is not pressed, handle it
-
-  if (ev.keyCode == 13 && !ev.shiftKey && this.editor._iframe.contentWindow.getSelection)
-		{
-		//this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): calling handleEnter" );
-
-    return this.handleEnter(ev);
-		}
-
-	//this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): bottom" );
-
-	};	// end of _onKeyPress()
-
-// -----------------------------------------------------------------------------------
-
-/**
-* Handles the pressing of an unshifted enter for Gecko
-*/
-
-EnterParagraphs.prototype.handleEnter = function(ev)
-	{
-
-	//this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): top" );
-
-	var cursorNode;
-
-  // Grab the selection and associated range
-
-  var sel = this.editor.getSelection();
-  var rng = this.editor.createRange(sel);
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "757", "handleEnter(): initial range is: ", rng );
-
-	// if we are at the end of a list and the node is empty let the browser handle
-	// it to get us out of the list.
-
-	if ( this.isNormalListItem(rng) )
-		{
-		//this.ddt._ddt( "enter-paragraphs.js", "757", "handleEnter(): we are at the end of a list with a blank item. Letting the browser handle it." );
-		return true;
-		}
-
-	// as far as I can tell this isn't actually used.
-
-  this.takenIds = new Object();
-
-  // Grab ranges for document re-stuffing, if appropriate
-	//
-	// pStart and pEnd are arrays consisting of
-	// [0] neighbor node
-	// [1] insertion type
-	// [2] roam
-
-	//this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): calling processSide on left side." );
-
-  var pStart = this.processSide(rng, "left");
-
-	//this.ddt._ddtDumpNode( "enter-paragraphs.js", "757", "handleEnter(): after processing left side range is: ", rng );
-
-	//this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): calling processSide on right side." );
-
- 	var pEnd = this.processSide(rng, "right");
-
-	// used to position the cursor after insertion.
-
-	cursorNode = pEnd[2];
-
-  // Get rid of everything local to the selection
-
-  sel.removeAllRanges();
-  rng.deleteContents();
-
-	// Grab a node we'll have after insertion, since fragments will be lost
-	//
-	// we'll use this to position the cursor.
-
-	//this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): looking for cursor position" );
-
-  var holdEnd = this.forEachNodeUnder( cursorNode, "find_cursorpoint", "ltr", false, true);
-
-	if ( ! holdEnd )
-		{
-		alert( "INTERNAL ERROR - could not find place to put cursor after ENTER" );
-		}
-
-  // Insert our carefully chosen document fragments
-
-  if ( pStart )
-		{
-
-		//this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): inserting pEnd" );
-
-		this.insertAdjacentElement(pStart[0], pStart[1], pStart[2]);
-		}
-
-  if ( pEnd && pEnd.nodeType != 1)
-		{
-
-		//this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): inserting pEnd" );
-
-		this.insertAdjacentElement(pEnd[0], pEnd[1], pEnd[2]);
-		}
-
-  // Move the caret in front of the first good text element
-
-  if ((holdEnd) && (this._permEmpty.test(holdEnd.nodeName) ))
-		{
-
-		//this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): looping to find cursor element." );
-
-    var prodigal = 0;
-    while ( holdEnd.parentNode.childNodes.item(prodigal) != holdEnd )
-			{
-			prodigal++;
-			}
-
-    sel.collapse( holdEnd.parentNode, prodigal);
-	  }
-  else
-		{
-
-		// holdEnd might be false.
-
-		try
-			{
-			sel.collapse(holdEnd, 0);
-
-			//this.ddt._ddtDumpNode( "enter-paragraphs.js", "1057", "handleEnter(): scrolling to element:", holdEnd );
-
-			// interestingly, scrollToElement() scroll so the top if holdEnd is a text node.
-
-			if ( holdEnd.nodeType == 3 )
-				{
-				holdEnd = holdEnd.parentNode;
-				}
-
-		  this.editor.scrollToElement(holdEnd);
-			}
-		catch (e)
-			{
-			// we could try to place the cursor at the end of the document.
-			}
-		}
-
-  this.editor.updateToolbar();
-
-	Xinha._stopEvent(ev);
-
-	return true;
-
-	};	// end of handleEnter()
-
-// END
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/ASCIIMathML.js b/web/imcms/xinha/plugins/Equation/ASCIIMathML.js
deleted file mode 100644
index a9d8259e51..0000000000
--- a/web/imcms/xinha/plugins/Equation/ASCIIMathML.js
+++ /dev/null
@@ -1,949 +0,0 @@
-/*
-ASCIIMathML.js
-==============
-This file contains JavaScript functions to convert ASCII math notation
-to Presentation MathML. The conversion is done while the (X)HTML page 
-loads, and should work with Firefox/Mozilla/Netscape 7+ and Internet 
-Explorer 6+MathPlayer (http://www.dessci.com/en/products/mathplayer/).
-Just add the next line to your (X)HTML page with this file in the same folder:
-<script type="text/javascript" src="ASCIIMathML.js"></script>
-This is a convenient and inexpensive solution for authoring MathML.
-
-Version 1.4.7 Dec 15, 2005, (c) Peter Jipsen http://www.chapman.edu/~jipsen
-Latest version at http://www.chapman.edu/~jipsen/mathml/ASCIIMathML.js
-For changes see http://www.chapman.edu/~jipsen/mathml/asciimathchanges.txt
-If you use it on a webpage, please send the URL to jipsen@chapman.edu
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-This program 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
-General Public License (at http://www.gnu.org/copyleft/gpl.html) 
-for more details.
-*/
-
-var checkForMathML = true;   // check if browser can display MathML
-var notifyIfNoMathML = true; // put note at top of page if no MathML capability
-var alertIfNoMathML = false;  // show alert box if no MathML capability
-if ( typeof mathcolor == "undefined" )
-{
-	var mathcolor = "red";      // change it to "" (to inherit) or any other color
-}
-if ( typeof mathfontfamily == "undefined" ) 
-{
-	var mathfontfamily = "serif"; // change to "" to inherit (works in IE) or another family (e.g. "arial")
-}
-var displaystyle = true;      // puts limits above and below large operators
-
-if ( typeof showasciiformulaonhover == "undefined" ) 
-{
-	var showasciiformulaonhover = true; // helps students learn ASCIIMath
-}
-
-var decimalsign = ".";        // change to "," if you like, beware of `(1,2)`!
-var AMdelimiter1 = "`", AMescape1 = "\\\\`"; // can use other characters
-var AMdelimiter2 = "$", AMescape2 = "\\\\\\$", AMdelimiter2regexp = "\\$";
-var doubleblankmathdelimiter = false; // if true,  x+1  is equal to `x+1`
-                                      // for IE this works only in <!--   -->
-//var separatetokens;// has been removed (email me if this is a problem)
-var isIE = document.createElementNS==null;
-
-if (document.getElementById==null) 
-  alert("This webpage requires a recent browser such as\
-\nMozilla/Netscape 7+ or Internet Explorer 6+MathPlayer")
-
-// all further global variables start with "AM"
-
-function AMcreateElementXHTML(t) {
-  if (isIE) return document.createElement(t);
-  else return document.createElementNS("http://www.w3.org/1999/xhtml",t);
-}
-
-function AMnoMathMLNote() {
-  var nd = AMcreateElementXHTML("h3");
-  nd.setAttribute("align","center")
-  nd.appendChild(AMcreateElementXHTML("p"));
-  nd.appendChild(document.createTextNode("To view the "));
-  var an = AMcreateElementXHTML("a");
-  an.appendChild(document.createTextNode("ASCIIMathML"));
-  an.setAttribute("href","http://www.chapman.edu/~jipsen/asciimath.html");
-  nd.appendChild(an);
-  nd.appendChild(document.createTextNode(" notation use Internet Explorer 6+"));  
-  an = AMcreateElementXHTML("a");
-  an.appendChild(document.createTextNode("MathPlayer"));
-  an.setAttribute("href","http://www.dessci.com/en/products/mathplayer/download.htm");
-  nd.appendChild(an);
-  nd.appendChild(document.createTextNode(" or Netscape/Mozilla/Firefox"));
-  nd.appendChild(AMcreateElementXHTML("p"));
-  return nd;
-}
-
-function AMisMathMLavailable() {
-  if (navigator.appName.slice(0,8)=="Netscape") 
-    if (navigator.appVersion.slice(0,1)>="5") return null;
-    else return AMnoMathMLNote();
-  else if (navigator.appName.slice(0,9)=="Microsoft")
-    try {
-        var ActiveX = new ActiveXObject("MathPlayer.Factory.1");
-        return null;
-    } catch (e) {
-        return AMnoMathMLNote();
-    }
-  else return AMnoMathMLNote();
-}
-
-// character lists for Mozilla/Netscape fonts
-var AMcal = [0xEF35,0x212C,0xEF36,0xEF37,0x2130,0x2131,0xEF38,0x210B,0x2110,0xEF39,0xEF3A,0x2112,0x2133,0xEF3B,0xEF3C,0xEF3D,0xEF3E,0x211B,0xEF3F,0xEF40,0xEF41,0xEF42,0xEF43,0xEF44,0xEF45,0xEF46];
-var AMfrk = [0xEF5D,0xEF5E,0x212D,0xEF5F,0xEF60,0xEF61,0xEF62,0x210C,0x2111,0xEF63,0xEF64,0xEF65,0xEF66,0xEF67,0xEF68,0xEF69,0xEF6A,0x211C,0xEF6B,0xEF6C,0xEF6D,0xEF6E,0xEF6F,0xEF70,0xEF71,0x2128];
-var AMbbb = [0xEF8C,0xEF8D,0x2102,0xEF8E,0xEF8F,0xEF90,0xEF91,0x210D,0xEF92,0xEF93,0xEF94,0xEF95,0xEF96,0x2115,0xEF97,0x2119,0x211A,0x211D,0xEF98,0xEF99,0xEF9A,0xEF9B,0xEF9C,0xEF9D,0xEF9E,0x2124];
-
-var CONST = 0, UNARY = 1, BINARY = 2, INFIX = 3, LEFTBRACKET = 4, 
-    RIGHTBRACKET = 5, SPACE = 6, UNDEROVER = 7, DEFINITION = 8,
-    LEFTRIGHT = 9, TEXT = 10; // token types
-
-var AMsqrt = {input:"sqrt", tag:"msqrt", output:"sqrt", tex:null, ttype:UNARY},
-  AMroot  = {input:"root", tag:"mroot", output:"root", tex:null, ttype:BINARY},
-  AMfrac  = {input:"frac", tag:"mfrac", output:"/",    tex:null, ttype:BINARY},
-  AMdiv   = {input:"/",    tag:"mfrac", output:"/",    tex:null, ttype:INFIX},
-  AMover  = {input:"stackrel", tag:"mover", output:"stackrel", tex:null, ttype:BINARY},
-  AMsub   = {input:"_",    tag:"msub",  output:"_",    tex:null, ttype:INFIX},
-  AMsup   = {input:"^",    tag:"msup",  output:"^",    tex:null, ttype:INFIX},
-  AMtext  = {input:"text", tag:"mtext", output:"text", tex:null, ttype:TEXT},
-  AMmbox  = {input:"mbox", tag:"mtext", output:"mbox", tex:null, ttype:TEXT},
-  AMquote = {input:"\"",   tag:"mtext", output:"mbox", tex:null, ttype:TEXT};
-
-var AMsymbols = [
-//some greek symbols
-{input:"alpha",  tag:"mi", output:"\u03B1", tex:null, ttype:CONST},
-{input:"beta",   tag:"mi", output:"\u03B2", tex:null, ttype:CONST},
-{input:"chi",    tag:"mi", output:"\u03C7", tex:null, ttype:CONST},
-{input:"delta",  tag:"mi", output:"\u03B4", tex:null, ttype:CONST},
-{input:"Delta",  tag:"mo", output:"\u0394", tex:null, ttype:CONST},
-{input:"epsi",   tag:"mi", output:"\u03B5", tex:"epsilon", ttype:CONST},
-{input:"varepsilon", tag:"mi", output:"\u025B", tex:null, ttype:CONST},
-{input:"eta",    tag:"mi", output:"\u03B7", tex:null, ttype:CONST},
-{input:"gamma",  tag:"mi", output:"\u03B3", tex:null, ttype:CONST},
-{input:"Gamma",  tag:"mo", output:"\u0393", tex:null, ttype:CONST},
-{input:"iota",   tag:"mi", output:"\u03B9", tex:null, ttype:CONST},
-{input:"kappa",  tag:"mi", output:"\u03BA", tex:null, ttype:CONST},
-{input:"lambda", tag:"mi", output:"\u03BB", tex:null, ttype:CONST},
-{input:"Lambda", tag:"mo", output:"\u039B", tex:null, ttype:CONST},
-{input:"mu",     tag:"mi", output:"\u03BC", tex:null, ttype:CONST},
-{input:"nu",     tag:"mi", output:"\u03BD", tex:null, ttype:CONST},
-{input:"omega",  tag:"mi", output:"\u03C9", tex:null, ttype:CONST},
-{input:"Omega",  tag:"mo", output:"\u03A9", tex:null, ttype:CONST},
-{input:"phi",    tag:"mi", output:"\u03C6", tex:null, ttype:CONST},
-{input:"varphi", tag:"mi", output:"\u03D5", tex:null, ttype:CONST},
-{input:"Phi",    tag:"mo", output:"\u03A6", tex:null, ttype:CONST},
-{input:"pi",     tag:"mi", output:"\u03C0", tex:null, ttype:CONST},
-{input:"Pi",     tag:"mo", output:"\u03A0", tex:null, ttype:CONST},
-{input:"psi",    tag:"mi", output:"\u03C8", tex:null, ttype:CONST},
-{input:"Psi",    tag:"mi", output:"\u03A8", tex:null, ttype:CONST},
-{input:"rho",    tag:"mi", output:"\u03C1", tex:null, ttype:CONST},
-{input:"sigma",  tag:"mi", output:"\u03C3", tex:null, ttype:CONST},
-{input:"Sigma",  tag:"mo", output:"\u03A3", tex:null, ttype:CONST},
-{input:"tau",    tag:"mi", output:"\u03C4", tex:null, ttype:CONST},
-{input:"theta",  tag:"mi", output:"\u03B8", tex:null, ttype:CONST},
-{input:"vartheta", tag:"mi", output:"\u03D1", tex:null, ttype:CONST},
-{input:"Theta",  tag:"mo", output:"\u0398", tex:null, ttype:CONST},
-{input:"upsilon", tag:"mi", output:"\u03C5", tex:null, ttype:CONST},
-{input:"xi",     tag:"mi", output:"\u03BE", tex:null, ttype:CONST},
-{input:"Xi",     tag:"mo", output:"\u039E", tex:null, ttype:CONST},
-{input:"zeta",   tag:"mi", output:"\u03B6", tex:null, ttype:CONST},
-
-//binary operation symbols
-{input:"*",  tag:"mo", output:"\u22C5", tex:"cdot", ttype:CONST},
-{input:"**", tag:"mo", output:"\u22C6", tex:"star", ttype:CONST},
-{input:"//", tag:"mo", output:"/",      tex:null, ttype:CONST},
-{input:"\\\\", tag:"mo", output:"\\",   tex:"backslash", ttype:CONST},
-{input:"setminus", tag:"mo", output:"\\", tex:null, ttype:CONST},
-{input:"xx", tag:"mo", output:"\u00D7", tex:"times", ttype:CONST},
-{input:"-:", tag:"mo", output:"\u00F7", tex:"divide", ttype:CONST},
-{input:"@",  tag:"mo", output:"\u2218", tex:"circ", ttype:CONST},
-{input:"o+", tag:"mo", output:"\u2295", tex:"oplus", ttype:CONST},
-{input:"ox", tag:"mo", output:"\u2297", tex:"otimes", ttype:CONST},
-{input:"o.", tag:"mo", output:"\u2299", tex:"odot", ttype:CONST},
-{input:"sum", tag:"mo", output:"\u2211", tex:null, ttype:UNDEROVER},
-{input:"prod", tag:"mo", output:"\u220F", tex:null, ttype:UNDEROVER},
-{input:"^^",  tag:"mo", output:"\u2227", tex:"wedge", ttype:CONST},
-{input:"^^^", tag:"mo", output:"\u22C0", tex:"bigwedge", ttype:UNDEROVER},
-{input:"vv",  tag:"mo", output:"\u2228", tex:"vee", ttype:CONST},
-{input:"vvv", tag:"mo", output:"\u22C1", tex:"bigvee", ttype:UNDEROVER},
-{input:"nn",  tag:"mo", output:"\u2229", tex:"cap", ttype:CONST},
-{input:"nnn", tag:"mo", output:"\u22C2", tex:"bigcap", ttype:UNDEROVER},
-{input:"uu",  tag:"mo", output:"\u222A", tex:"cup", ttype:CONST},
-{input:"uuu", tag:"mo", output:"\u22C3", tex:"bigcup", ttype:UNDEROVER},
-
-//binary relation symbols
-{input:"!=",  tag:"mo", output:"\u2260", tex:"ne", ttype:CONST},
-{input:":=",  tag:"mo", output:":=",     tex:null, ttype:CONST},
-{input:"lt",  tag:"mo", output:"<",      tex:null, ttype:CONST},
-{input:"<=",  tag:"mo", output:"\u2264", tex:"le", ttype:CONST},
-{input:"lt=", tag:"mo", output:"\u2264", tex:"leq", ttype:CONST},
-{input:">=",  tag:"mo", output:"\u2265", tex:"ge", ttype:CONST},
-{input:"geq", tag:"mo", output:"\u2265", tex:null, ttype:CONST},
-{input:"-<",  tag:"mo", output:"\u227A", tex:"prec", ttype:CONST},
-{input:"-lt", tag:"mo", output:"\u227A", tex:null, ttype:CONST},
-{input:">-",  tag:"mo", output:"\u227B", tex:"succ", ttype:CONST},
-{input:"-<=", tag:"mo", output:"\u2AAF", tex:"preceq", ttype:CONST},
-{input:">-=", tag:"mo", output:"\u2AB0", tex:"succeq", ttype:CONST},
-{input:"in",  tag:"mo", output:"\u2208", tex:null, ttype:CONST},
-{input:"!in", tag:"mo", output:"\u2209", tex:"notin", ttype:CONST},
-{input:"sub", tag:"mo", output:"\u2282", tex:"subset", ttype:CONST},
-{input:"sup", tag:"mo", output:"\u2283", tex:"supset", ttype:CONST},
-{input:"sube", tag:"mo", output:"\u2286", tex:"subseteq", ttype:CONST},
-{input:"supe", tag:"mo", output:"\u2287", tex:"supseteq", ttype:CONST},
-{input:"-=",  tag:"mo", output:"\u2261", tex:"equiv", ttype:CONST},
-{input:"~=",  tag:"mo", output:"\u2245", tex:"cong", ttype:CONST},
-{input:"~~",  tag:"mo", output:"\u2248", tex:"approx", ttype:CONST},
-{input:"prop", tag:"mo", output:"\u221D", tex:"propto", ttype:CONST},
-
-//logical symbols
-{input:"and", tag:"mtext", output:"and", tex:null, ttype:SPACE},
-{input:"or",  tag:"mtext", output:"or",  tex:null, ttype:SPACE},
-{input:"not", tag:"mo", output:"\u00AC", tex:"neg", ttype:CONST},
-{input:"=>",  tag:"mo", output:"\u21D2", tex:"implies", ttype:CONST},
-{input:"if",  tag:"mo", output:"if",     tex:null, ttype:SPACE},
-{input:"<=>", tag:"mo", output:"\u21D4", tex:"iff", ttype:CONST},
-{input:"AA",  tag:"mo", output:"\u2200", tex:"forall", ttype:CONST},
-{input:"EE",  tag:"mo", output:"\u2203", tex:"exists", ttype:CONST},
-{input:"_|_", tag:"mo", output:"\u22A5", tex:"bot", ttype:CONST},
-{input:"TT",  tag:"mo", output:"\u22A4", tex:"top", ttype:CONST},
-{input:"|--",  tag:"mo", output:"\u22A2", tex:"vdash", ttype:CONST},
-{input:"|==",  tag:"mo", output:"\u22A8", tex:"models", ttype:CONST},
-
-//grouping brackets
-{input:"(", tag:"mo", output:"(", tex:null, ttype:LEFTBRACKET},
-{input:")", tag:"mo", output:")", tex:null, ttype:RIGHTBRACKET},
-{input:"[", tag:"mo", output:"[", tex:null, ttype:LEFTBRACKET},
-{input:"]", tag:"mo", output:"]", tex:null, ttype:RIGHTBRACKET},
-{input:"{", tag:"mo", output:"{", tex:null, ttype:LEFTBRACKET},
-{input:"}", tag:"mo", output:"}", tex:null, ttype:RIGHTBRACKET},
-{input:"|", tag:"mo", output:"|", tex:null, ttype:LEFTRIGHT},
-//{input:"||", tag:"mo", output:"||", tex:null, ttype:LEFTRIGHT},
-{input:"(:", tag:"mo", output:"\u2329", tex:"langle", ttype:LEFTBRACKET},
-{input:":)", tag:"mo", output:"\u232A", tex:"rangle", ttype:RIGHTBRACKET},
-{input:"<<", tag:"mo", output:"\u2329", tex:null, ttype:LEFTBRACKET},
-{input:">>", tag:"mo", output:"\u232A", tex:null, ttype:RIGHTBRACKET},
-{input:"{:", tag:"mo", output:"{:", tex:null, ttype:LEFTBRACKET, invisible:true},
-{input:":}", tag:"mo", output:":}", tex:null, ttype:RIGHTBRACKET, invisible:true},
-
-//miscellaneous symbols
-{input:"int",  tag:"mo", output:"\u222B", tex:null, ttype:CONST},
-{input:"dx",   tag:"mi", output:"{:d x:}", tex:null, ttype:DEFINITION},
-{input:"dy",   tag:"mi", output:"{:d y:}", tex:null, ttype:DEFINITION},
-{input:"dz",   tag:"mi", output:"{:d z:}", tex:null, ttype:DEFINITION},
-{input:"dt",   tag:"mi", output:"{:d t:}", tex:null, ttype:DEFINITION},
-{input:"oint", tag:"mo", output:"\u222E", tex:null, ttype:CONST},
-{input:"del",  tag:"mo", output:"\u2202", tex:"partial", ttype:CONST},
-{input:"grad", tag:"mo", output:"\u2207", tex:"nabla", ttype:CONST},
-{input:"+-",   tag:"mo", output:"\u00B1", tex:"pm", ttype:CONST},
-{input:"O/",   tag:"mo", output:"\u2205", tex:"emptyset", ttype:CONST},
-{input:"oo",   tag:"mo", output:"\u221E", tex:"infty", ttype:CONST},
-{input:"aleph", tag:"mo", output:"\u2135", tex:null, ttype:CONST},
-{input:"...",  tag:"mo", output:"...",    tex:"ldots", ttype:CONST},
-{input:":.",  tag:"mo", output:"\u2234",  tex:"therefore", ttype:CONST},
-{input:"/_",  tag:"mo", output:"\u2220",  tex:"angle", ttype:CONST},
-{input:"\\ ",  tag:"mo", output:"\u00A0", tex:null, ttype:CONST},
-{input:"quad", tag:"mo", output:"\u00A0\u00A0", tex:null, ttype:CONST},
-{input:"qquad", tag:"mo", output:"\u00A0\u00A0\u00A0\u00A0", tex:null, ttype:CONST},
-{input:"cdots", tag:"mo", output:"\u22EF", tex:null, ttype:CONST},
-{input:"vdots", tag:"mo", output:"\u22EE", tex:null, ttype:CONST},
-{input:"ddots", tag:"mo", output:"\u22F1", tex:null, ttype:CONST},
-{input:"diamond", tag:"mo", output:"\u22C4", tex:null, ttype:CONST},
-{input:"square", tag:"mo", output:"\u25A1", tex:null, ttype:CONST},
-{input:"|__", tag:"mo", output:"\u230A",  tex:"lfloor", ttype:CONST},
-{input:"__|", tag:"mo", output:"\u230B",  tex:"rfloor", ttype:CONST},
-{input:"|~", tag:"mo", output:"\u2308",  tex:"lceiling", ttype:CONST},
-{input:"~|", tag:"mo", output:"\u2309",  tex:"rceiling", ttype:CONST},
-{input:"CC",  tag:"mo", output:"\u2102", tex:null, ttype:CONST},
-{input:"NN",  tag:"mo", output:"\u2115", tex:null, ttype:CONST},
-{input:"QQ",  tag:"mo", output:"\u211A", tex:null, ttype:CONST},
-{input:"RR",  tag:"mo", output:"\u211D", tex:null, ttype:CONST},
-{input:"ZZ",  tag:"mo", output:"\u2124", tex:null, ttype:CONST},
-{input:"f",   tag:"mi", output:"f",      tex:null, ttype:UNARY, func:true},
-{input:"g",   tag:"mi", output:"g",      tex:null, ttype:UNARY, func:true},
-
-//standard functions
-{input:"lim",  tag:"mo", output:"lim", tex:null, ttype:UNDEROVER},
-{input:"Lim",  tag:"mo", output:"Lim", tex:null, ttype:UNDEROVER},
-{input:"sin",  tag:"mo", output:"sin", tex:null, ttype:UNARY, func:true},
-{input:"cos",  tag:"mo", output:"cos", tex:null, ttype:UNARY, func:true},
-{input:"tan",  tag:"mo", output:"tan", tex:null, ttype:UNARY, func:true},
-{input:"sinh", tag:"mo", output:"sinh", tex:null, ttype:UNARY, func:true},
-{input:"cosh", tag:"mo", output:"cosh", tex:null, ttype:UNARY, func:true},
-{input:"tanh", tag:"mo", output:"tanh", tex:null, ttype:UNARY, func:true},
-{input:"cot",  tag:"mo", output:"cot", tex:null, ttype:UNARY, func:true},
-{input:"sec",  tag:"mo", output:"sec", tex:null, ttype:UNARY, func:true},
-{input:"csc",  tag:"mo", output:"csc", tex:null, ttype:UNARY, func:true},
-{input:"log",  tag:"mo", output:"log", tex:null, ttype:UNARY, func:true},
-{input:"ln",   tag:"mo", output:"ln",  tex:null, ttype:UNARY, func:true},
-{input:"det",  tag:"mo", output:"det", tex:null, ttype:UNARY, func:true},
-{input:"dim",  tag:"mo", output:"dim", tex:null, ttype:CONST},
-{input:"mod",  tag:"mo", output:"mod", tex:null, ttype:CONST},
-{input:"gcd",  tag:"mo", output:"gcd", tex:null, ttype:UNARY, func:true},
-{input:"lcm",  tag:"mo", output:"lcm", tex:null, ttype:UNARY, func:true},
-{input:"lub",  tag:"mo", output:"lub", tex:null, ttype:CONST},
-{input:"glb",  tag:"mo", output:"glb", tex:null, ttype:CONST},
-{input:"min",  tag:"mo", output:"min", tex:null, ttype:UNDEROVER},
-{input:"max",  tag:"mo", output:"max", tex:null, ttype:UNDEROVER},
-
-//arrows
-{input:"uarr", tag:"mo", output:"\u2191", tex:"uparrow", ttype:CONST},
-{input:"darr", tag:"mo", output:"\u2193", tex:"downarrow", ttype:CONST},
-{input:"rarr", tag:"mo", output:"\u2192", tex:"rightarrow", ttype:CONST},
-{input:"->",   tag:"mo", output:"\u2192", tex:"to", ttype:CONST},
-{input:"|->",  tag:"mo", output:"\u21A6", tex:"mapsto", ttype:CONST},
-{input:"larr", tag:"mo", output:"\u2190", tex:"leftarrow", ttype:CONST},
-{input:"harr", tag:"mo", output:"\u2194", tex:"leftrightarrow", ttype:CONST},
-{input:"rArr", tag:"mo", output:"\u21D2", tex:"Rightarrow", ttype:CONST},
-{input:"lArr", tag:"mo", output:"\u21D0", tex:"Leftarrow", ttype:CONST},
-{input:"hArr", tag:"mo", output:"\u21D4", tex:"Leftrightarrow", ttype:CONST},
-
-//commands with argument
-AMsqrt, AMroot, AMfrac, AMdiv, AMover, AMsub, AMsup,
-{input:"hat", tag:"mover", output:"\u005E", tex:null, ttype:UNARY, acc:true},
-{input:"bar", tag:"mover", output:"\u00AF", tex:"overline", ttype:UNARY, acc:true},
-{input:"vec", tag:"mover", output:"\u2192", tex:null, ttype:UNARY, acc:true},
-{input:"dot", tag:"mover", output:".",      tex:null, ttype:UNARY, acc:true},
-{input:"ddot", tag:"mover", output:"..",    tex:null, ttype:UNARY, acc:true},
-{input:"ul", tag:"munder", output:"\u0332", tex:"underline", ttype:UNARY, acc:true},
-AMtext, AMmbox, AMquote,
-{input:"bb", tag:"mstyle", atname:"fontweight", atval:"bold", output:"bb", tex:null, ttype:UNARY},
-{input:"mathbf", tag:"mstyle", atname:"fontweight", atval:"bold", output:"mathbf", tex:null, ttype:UNARY},
-{input:"sf", tag:"mstyle", atname:"fontfamily", atval:"sans-serif", output:"sf", tex:null, ttype:UNARY},
-{input:"mathsf", tag:"mstyle", atname:"fontfamily", atval:"sans-serif", output:"mathsf", tex:null, ttype:UNARY},
-{input:"bbb", tag:"mstyle", atname:"mathvariant", atval:"double-struck", output:"bbb", tex:null, ttype:UNARY, codes:AMbbb},
-{input:"mathbb", tag:"mstyle", atname:"mathvariant", atval:"double-struck", output:"mathbb", tex:null, ttype:UNARY, codes:AMbbb},
-{input:"cc",  tag:"mstyle", atname:"mathvariant", atval:"script", output:"cc", tex:null, ttype:UNARY, codes:AMcal},
-{input:"mathcal", tag:"mstyle", atname:"mathvariant", atval:"script", output:"mathcal", tex:null, ttype:UNARY, codes:AMcal},
-{input:"tt",  tag:"mstyle", atname:"fontfamily", atval:"monospace", output:"tt", tex:null, ttype:UNARY},
-{input:"mathtt", tag:"mstyle", atname:"fontfamily", atval:"monospace", output:"mathtt", tex:null, ttype:UNARY},
-{input:"fr",  tag:"mstyle", atname:"mathvariant", atval:"fraktur", output:"fr", tex:null, ttype:UNARY, codes:AMfrk},
-{input:"mathfrak",  tag:"mstyle", atname:"mathvariant", atval:"fraktur", output:"mathfrak", tex:null, ttype:UNARY, codes:AMfrk}
-];
-
-function compareNames(s1,s2) {
-  if (s1.input > s2.input) return 1
-  else return -1;
-}
-
-var AMnames = []; //list of input symbols
-
-function AMinitSymbols() {
-  var texsymbols = [], i;
-  for (i=0; i<AMsymbols.length; i++)
-    if (AMsymbols[i].tex) 
-      texsymbols[texsymbols.length] = {input:AMsymbols[i].tex, 
-        tag:AMsymbols[i].tag, output:AMsymbols[i].output, ttype:AMsymbols[i].ttype};
-  AMsymbols = AMsymbols.concat(texsymbols);
-  AMsymbols.sort(compareNames);
-  for (i=0; i<AMsymbols.length; i++) AMnames[i] = AMsymbols[i].input;
-}
-
-var AMmathml = "http://www.w3.org/1998/Math/MathML";
-
-function AMcreateElementMathML(t) {
-  if (isIE) return document.createElement("m:"+t);
-  else return document.createElementNS(AMmathml,t);
-}
-
-function AMcreateMmlNode(t,frag) {
-//  var node = AMcreateElementMathML(name);
-  if (isIE) var node = document.createElement("m:"+t);
-  else var node = document.createElementNS(AMmathml,t);
-  node.appendChild(frag);
-  return node;
-}
-
-function newcommand(oldstr,newstr) {
-  AMsymbols = AMsymbols.concat([{input:oldstr, tag:"mo", output:newstr, 
-                                 tex:null, ttype:DEFINITION}]);
-}
-
-function AMremoveCharsAndBlanks(str,n) {
-//remove n characters and any following blanks
-  var st;
-  if (str.charAt(n)=="\\" && str.charAt(n+1)!="\\" && str.charAt(n+1)!=" ") 
-    st = str.slice(n+1);
-  else st = str.slice(n);
-  for (var i=0; i<st.length && st.charCodeAt(i)<=32; i=i+1);
-  return st.slice(i);
-}
-
-function AMposition(arr, str, n) { 
-// return position >=n where str appears or would be inserted
-// assumes arr is sorted
-  if (n==0) {
-    var h,m;
-    n = -1;
-    h = arr.length;
-    while (n+1<h) {
-      m = (n+h) >> 1;
-      if (arr[m]<str) n = m; else h = m;
-    }
-    return h;
-  } else
-    for (var i=n; i<arr.length && arr[i]<str; i++);
-  return i; // i=arr.length || arr[i]>=str
-}
-
-function AMgetSymbol(str) {
-//return maximal initial substring of str that appears in names
-//return null if there is none
-  var k = 0; //new pos
-  var j = 0; //old pos
-  var mk; //match pos
-  var st;
-  var tagst;
-  var match = "";
-  var more = true;
-  for (var i=1; i<=str.length && more; i++) {
-    st = str.slice(0,i); //initial substring of length i
-    j = k;
-    k = AMposition(AMnames, st, j);
-    if (k<AMnames.length && str.slice(0,AMnames[k].length)==AMnames[k]){
-      match = AMnames[k];
-      mk = k;
-      i = match.length;
-    }
-    more = k<AMnames.length && str.slice(0,AMnames[k].length)>=AMnames[k];
-  }
-  AMpreviousSymbol=AMcurrentSymbol;
-  if (match!=""){
-    AMcurrentSymbol=AMsymbols[mk].ttype;
-    return AMsymbols[mk]; 
-  }
-// if str[0] is a digit or - return maxsubstring of digits.digits
-  AMcurrentSymbol=CONST;
-  k = 1;
-  st = str.slice(0,1);
-  var integ = true;
-  while ("0"<=st && st<="9" && k<=str.length) {
-    st = str.slice(k,k+1);
-    k++;
-  }
-  if (st == decimalsign) {
-    st = str.slice(k,k+1);
-    if ("0"<=st && st<="9") {
-      integ = false;
-      k++;
-      while ("0"<=st && st<="9" && k<=str.length) {
-        st = str.slice(k,k+1);
-        k++;
-      }
-    }
-  }
-  if ((integ && k>1) || k>2) {
-    st = str.slice(0,k-1);
-    tagst = "mn";
-  } else {
-    k = 2;
-    st = str.slice(0,1); //take 1 character
-    tagst = (("A">st || st>"Z") && ("a">st || st>"z")?"mo":"mi");
-  }
-  if (st=="-" && AMpreviousSymbol==INFIX) {
-    AMcurrentSymbol = INFIX;  //trick "/" into recognizing "-" on second parse
-    return {input:st, tag:tagst, output:st, ttype:UNARY, func:true};
-  }
-  return {input:st, tag:tagst, output:st, ttype:CONST};
-}
-
-function AMremoveBrackets(node) {
-  var st;
-  if (node.nodeName=="mrow") {
-    st = node.firstChild.firstChild.nodeValue;
-    if (st=="(" || st=="[" || st=="{") node.removeChild(node.firstChild);
-  }
-  if (node.nodeName=="mrow") {
-    st = node.lastChild.firstChild.nodeValue;
-    if (st==")" || st=="]" || st=="}") node.removeChild(node.lastChild);
-  }
-}
-
-/*Parsing ASCII math expressions with the following grammar
-v ::= [A-Za-z] | greek letters | numbers | other constant symbols
-u ::= sqrt | text | bb | other unary symbols for font commands
-b ::= frac | root | stackrel         binary symbols
-l ::= ( | [ | { | (: | {:            left brackets
-r ::= ) | ] | } | :) | :}            right brackets
-S ::= v | lEr | uS | bSS             Simple expression
-I ::= S_S | S^S | S_S^S | S          Intermediate expression
-E ::= IE | I/I                       Expression
-Each terminal symbol is translated into a corresponding mathml node.*/
-
-var AMnestingDepth,AMpreviousSymbol,AMcurrentSymbol;
-
-function AMparseSexpr(str) { //parses str and returns [node,tailstr]
-  var symbol, node, result, i, st,// rightvert = false,
-    newFrag = document.createDocumentFragment();
-  str = AMremoveCharsAndBlanks(str,0);
-  symbol = AMgetSymbol(str);             //either a token or a bracket or empty
-  if (symbol == null || symbol.ttype == RIGHTBRACKET && AMnestingDepth > 0) {
-    return [null,str];
-  }
-  if (symbol.ttype == DEFINITION) {
-    str = symbol.output+AMremoveCharsAndBlanks(str,symbol.input.length); 
-    symbol = AMgetSymbol(str);
-  }
-  switch (symbol.ttype) {
-  case UNDEROVER:
-  case CONST:
-    str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-    return [AMcreateMmlNode(symbol.tag,        //its a constant
-                             document.createTextNode(symbol.output)),str];
-  case LEFTBRACKET:   //read (expr+)
-    AMnestingDepth++;
-    str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-    result = AMparseExpr(str,true);
-    AMnestingDepth--;
-    if (typeof symbol.invisible == "boolean" && symbol.invisible) 
-      node = AMcreateMmlNode("mrow",result[0]);
-    else {
-      node = AMcreateMmlNode("mo",document.createTextNode(symbol.output));
-      node = AMcreateMmlNode("mrow",node);
-      node.appendChild(result[0]);
-    }
-    return [node,result[1]];
-  case TEXT:
-      if (symbol!=AMquote) str = AMremoveCharsAndBlanks(str,symbol.input.length);
-      if (str.charAt(0)=="{") i=str.indexOf("}");
-      else if (str.charAt(0)=="(") i=str.indexOf(")");
-      else if (str.charAt(0)=="[") i=str.indexOf("]");
-      else if (symbol==AMquote) i=str.slice(1).indexOf("\"")+1;
-      else i = 0;
-      if (i==-1) i = str.length;
-      st = str.slice(1,i);
-      if (st.charAt(0) == " ") {
-        node = AMcreateElementMathML("mspace");
-        node.setAttribute("width","1ex");
-        newFrag.appendChild(node);
-      }
-      newFrag.appendChild(
-        AMcreateMmlNode(symbol.tag,document.createTextNode(st)));
-      if (st.charAt(st.length-1) == " ") {
-        node = AMcreateElementMathML("mspace");
-        node.setAttribute("width","1ex");
-        newFrag.appendChild(node);
-      }
-      str = AMremoveCharsAndBlanks(str,i+1);
-      return [AMcreateMmlNode("mrow",newFrag),str];
-  case UNARY:
-      str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-      result = AMparseSexpr(str);
-      if (result[0]==null) return [AMcreateMmlNode(symbol.tag,
-                             document.createTextNode(symbol.output)),str];
-      if (typeof symbol.func == "boolean" && symbol.func) { // functions hack
-        st = str.charAt(0);
-        if (st=="^" || st=="_" || st=="/" || st=="|" || st==",") {
-          return [AMcreateMmlNode(symbol.tag,
-                    document.createTextNode(symbol.output)),str];
-        } else {
-          node = AMcreateMmlNode("mrow",
-           AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)));
-          node.appendChild(result[0]);
-          return [node,result[1]];
-        }
-      }
-      AMremoveBrackets(result[0]);
-      if (symbol.input == "sqrt") {           // sqrt
-        return [AMcreateMmlNode(symbol.tag,result[0]),result[1]];
-      } else if (typeof symbol.acc == "boolean" && symbol.acc) {   // accent
-        node = AMcreateMmlNode(symbol.tag,result[0]);
-        node.appendChild(AMcreateMmlNode("mo",document.createTextNode(symbol.output)));
-        return [node,result[1]];
-      } else {                        // font change command
-        if (!isIE && typeof symbol.codes != "undefined") {
-          for (i=0; i<result[0].childNodes.length; i++)
-            if (result[0].childNodes[i].nodeName=="mi" || result[0].nodeName=="mi") {
-              st = (result[0].nodeName=="mi"?result[0].firstChild.nodeValue:
-                              result[0].childNodes[i].firstChild.nodeValue);
-              var newst = [];
-              for (var j=0; j<st.length; j++)
-                if (st.charCodeAt(j)>64 && st.charCodeAt(j)<91) newst = newst +
-                  String.fromCharCode(symbol.codes[st.charCodeAt(j)-65]);
-                else newst = newst + st.charAt(j);
-              if (result[0].nodeName=="mi")
-                result[0]=AMcreateElementMathML("mo").
-                          appendChild(document.createTextNode(newst));
-              else result[0].replaceChild(AMcreateElementMathML("mo").
-          appendChild(document.createTextNode(newst)),result[0].childNodes[i]);
-            }
-        }
-        node = AMcreateMmlNode(symbol.tag,result[0]);
-        node.setAttribute(symbol.atname,symbol.atval);
-        return [node,result[1]];
-      }
-  case BINARY:
-    str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-    result = AMparseSexpr(str);
-    if (result[0]==null) return [AMcreateMmlNode("mo",
-                           document.createTextNode(symbol.input)),str];
-    AMremoveBrackets(result[0]);
-    var result2 = AMparseSexpr(result[1]);
-    if (result2[0]==null) return [AMcreateMmlNode("mo",
-                           document.createTextNode(symbol.input)),str];
-    AMremoveBrackets(result2[0]);
-    if (symbol.input=="root" || symbol.input=="stackrel") 
-      newFrag.appendChild(result2[0]);
-    newFrag.appendChild(result[0]);
-    if (symbol.input=="frac") newFrag.appendChild(result2[0]);
-    return [AMcreateMmlNode(symbol.tag,newFrag),result2[1]];
-  case INFIX:
-    str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-    return [AMcreateMmlNode("mo",document.createTextNode(symbol.output)),str];
-  case SPACE:
-    str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-    node = AMcreateElementMathML("mspace");
-    node.setAttribute("width","1ex");
-    newFrag.appendChild(node);
-    newFrag.appendChild(
-      AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)));
-    node = AMcreateElementMathML("mspace");
-    node.setAttribute("width","1ex");
-    newFrag.appendChild(node);
-    return [AMcreateMmlNode("mrow",newFrag),str];
-  case LEFTRIGHT:
-//    if (rightvert) return [null,str]; else rightvert = true;
-    AMnestingDepth++;
-    str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-    result = AMparseExpr(str,false);
-    AMnestingDepth--;
-    var st = "";
-    if (result[0].lastChild!=null)
-      st = result[0].lastChild.firstChild.nodeValue;
-    if (st == "|") { // its an absolute value subterm
-      node = AMcreateMmlNode("mo",document.createTextNode(symbol.output));
-      node = AMcreateMmlNode("mrow",node);
-      node.appendChild(result[0]);
-      return [node,result[1]];
-    } else { // the "|" is a \mid
-      node = AMcreateMmlNode("mo",document.createTextNode(symbol.output));
-      node = AMcreateMmlNode("mrow",node);
-      return [node,str];
-    }
-  default:
-//alert("default");
-    str = AMremoveCharsAndBlanks(str,symbol.input.length); 
-    return [AMcreateMmlNode(symbol.tag,        //its a constant
-                             document.createTextNode(symbol.output)),str];
-  }
-}
-
-function AMparseIexpr(str) {
-  var symbol, sym1, sym2, node, result, underover;
-  str = AMremoveCharsAndBlanks(str,0);
-  sym1 = AMgetSymbol(str);
-  result = AMparseSexpr(str);
-  node = result[0];
-  str = result[1];
-  symbol = AMgetSymbol(str);
-  if (symbol.ttype == INFIX && symbol.input != "/") {
-    str = AMremoveCharsAndBlanks(str,symbol.input.length);
-//    if (symbol.input == "/") result = AMparseIexpr(str); else ...
-    result = AMparseSexpr(str);
-    if (result[0] == null) // show box in place of missing argument
-      result[0] = AMcreateMmlNode("mo",document.createTextNode("\u25A1"));
-    else AMremoveBrackets(result[0]);
-    str = result[1];
-//    if (symbol.input == "/") AMremoveBrackets(node);
-    if (symbol.input == "_") {
-      sym2 = AMgetSymbol(str);
-      underover = (sym1.ttype == UNDEROVER);
-      if (sym2.input == "^") {
-        str = AMremoveCharsAndBlanks(str,sym2.input.length);
-        var res2 = AMparseSexpr(str);
-        AMremoveBrackets(res2[0]);
-        str = res2[1];
-        node = AMcreateMmlNode((underover?"munderover":"msubsup"),node);
-        node.appendChild(result[0]);
-        node.appendChild(res2[0]);
-        node = AMcreateMmlNode("mrow",node); // so sum does not stretch
-      } else {
-        node = AMcreateMmlNode((underover?"munder":"msub"),node);
-        node.appendChild(result[0]);
-      }
-    } else {
-      node = AMcreateMmlNode(symbol.tag,node);
-      node.appendChild(result[0]);
-    }
-  }
-  return [node,str];
-}
-
-function AMparseExpr(str,rightbracket) {
-  var symbol, node, result, i, nodeList = [],
-  newFrag = document.createDocumentFragment();
-  do {
-    str = AMremoveCharsAndBlanks(str,0);
-    result = AMparseIexpr(str);
-    node = result[0];
-    str = result[1];
-    symbol = AMgetSymbol(str);
-    if (symbol.ttype == INFIX && symbol.input == "/") {
-      str = AMremoveCharsAndBlanks(str,symbol.input.length);
-      result = AMparseIexpr(str);
-      if (result[0] == null) // show box in place of missing argument
-        result[0] = AMcreateMmlNode("mo",document.createTextNode("\u25A1"));
-      else AMremoveBrackets(result[0]);
-      str = result[1];
-      AMremoveBrackets(node);
-      node = AMcreateMmlNode(symbol.tag,node);
-      node.appendChild(result[0]);
-      newFrag.appendChild(node);
-      symbol = AMgetSymbol(str);
-    } 
-    else if (node!=undefined) newFrag.appendChild(node);
-  } while ((symbol.ttype != RIGHTBRACKET && 
-           (symbol.ttype != LEFTRIGHT || rightbracket)
-           || AMnestingDepth == 0) && symbol!=null && symbol.output!="");
-  if (symbol.ttype == RIGHTBRACKET || symbol.ttype == LEFTRIGHT) {
-//    if (AMnestingDepth > 0) AMnestingDepth--;
-    var len = newFrag.childNodes.length;
-    if (len>0 && newFrag.childNodes[len-1].nodeName == "mrow" && len>1 &&
-      newFrag.childNodes[len-2].nodeName == "mo" &&
-      newFrag.childNodes[len-2].firstChild.nodeValue == ",") { //matrix
-      var right = newFrag.childNodes[len-1].lastChild.firstChild.nodeValue;
-      if (right==")" || right=="]") {
-        var left = newFrag.childNodes[len-1].firstChild.firstChild.nodeValue;
-        if (left=="(" && right==")" && symbol.output != "}" || 
-            left=="[" && right=="]") {
-        var pos = []; // positions of commas
-        var matrix = true;
-        var m = newFrag.childNodes.length;
-        for (i=0; matrix && i<m; i=i+2) {
-          pos[i] = [];
-          node = newFrag.childNodes[i];
-          if (matrix) matrix = node.nodeName=="mrow" && 
-            (i==m-1 || node.nextSibling.nodeName=="mo" && 
-            node.nextSibling.firstChild.nodeValue==",")&&
-            node.firstChild.firstChild.nodeValue==left &&
-            node.lastChild.firstChild.nodeValue==right;
-          if (matrix) 
-            for (var j=0; j<node.childNodes.length; j++)
-              if (node.childNodes[j].firstChild.nodeValue==",")
-                pos[i][pos[i].length]=j;
-          if (matrix && i>1) matrix = pos[i].length == pos[i-2].length;
-        }
-        if (matrix) {
-          var row, frag, n, k, table = document.createDocumentFragment();
-          for (i=0; i<m; i=i+2) {
-            row = document.createDocumentFragment();
-            frag = document.createDocumentFragment();
-            node = newFrag.firstChild; // <mrow>(-,-,...,-,-)</mrow>
-            n = node.childNodes.length;
-            k = 0;
-            node.removeChild(node.firstChild); //remove (
-            for (j=1; j<n-1; j++) {
-              if (typeof pos[i][k] != "undefined" && j==pos[i][k]){
-                node.removeChild(node.firstChild); //remove ,
-                row.appendChild(AMcreateMmlNode("mtd",frag));
-                k++;
-              } else frag.appendChild(node.firstChild);
-            }
-            row.appendChild(AMcreateMmlNode("mtd",frag));
-            if (newFrag.childNodes.length>2) {
-              newFrag.removeChild(newFrag.firstChild); //remove <mrow>)</mrow>
-              newFrag.removeChild(newFrag.firstChild); //remove <mo>,</mo>
-            }
-            table.appendChild(AMcreateMmlNode("mtr",row));
-          }
-          node = AMcreateMmlNode("mtable",table);
-          if (typeof symbol.invisible == "boolean" && symbol.invisible) node.setAttribute("columnalign","left");
-          newFrag.replaceChild(node,newFrag.firstChild);
-        }
-       }
-      }
-    }
-    str = AMremoveCharsAndBlanks(str,symbol.input.length);
-    if (typeof symbol.invisible != "boolean" || !symbol.invisible) {
-      node = AMcreateMmlNode("mo",document.createTextNode(symbol.output));
-      newFrag.appendChild(node);
-    }
-  }
-  return [newFrag,str];
-}
-
-function AMparseMath(str) {
-  var result, node = AMcreateElementMathML("mstyle");
-  if (mathcolor != "") node.setAttribute("mathcolor",mathcolor);
-  if (displaystyle) node.setAttribute("displaystyle","true");
-  if (mathfontfamily != "") node.setAttribute("fontfamily",mathfontfamily);
-  AMnestingDepth = 0;
-  node.appendChild(AMparseExpr(str.replace(/^\s+/g,""),false)[0]);
-  node = AMcreateMmlNode("math",node);
-  if (showasciiformulaonhover)                      //fixed by djhsu so newline
-    node.setAttribute("title",str.replace(/\s+/g," "));//does not show in Gecko
-  if (mathfontfamily != "" && (isIE || mathfontfamily != "serif")) {
-    var fnode = AMcreateElementXHTML("font");
-    fnode.setAttribute("face",mathfontfamily);
-    fnode.appendChild(node);
-    return fnode;
-  }
-  return node;
-}
-
-function AMstrarr2docFrag(arr, linebreaks) {
-  var newFrag=document.createDocumentFragment();
-  var expr = false;
-  for (var i=0; i<arr.length; i++) {
-    if (expr) newFrag.appendChild(AMparseMath(arr[i]));
-    else {
-      var arri = (linebreaks ? arr[i].split("\n\n") : [arr[i]]);
-      newFrag.appendChild(AMcreateElementXHTML("span").
-      appendChild(document.createTextNode(arri[0])));
-      for (var j=1; j<arri.length; j++) {
-        newFrag.appendChild(AMcreateElementXHTML("p"));
-        newFrag.appendChild(AMcreateElementXHTML("span").
-        appendChild(document.createTextNode(arri[j])));
-      }
-    }
-    expr = !expr;
-  }
-  return newFrag;
-}
-
-function AMprocessNodeR(n, linebreaks) {
-  var mtch, str, arr, frg, i;
-  if (n.childNodes.length == 0) {
-   if ((n.nodeType!=8 || linebreaks) &&
-    n.parentNode.nodeName!="form" && n.parentNode.nodeName!="FORM" &&
-    n.parentNode.nodeName!="textarea" && n.parentNode.nodeName!="TEXTAREA" &&
-    n.parentNode.nodeName!="pre" && n.parentNode.nodeName!="PRE") {
-    str = n.nodeValue;
-    if (!(str == null)) {
-      str = str.replace(/\r\n\r\n/g,"\n\n");
-      if (doubleblankmathdelimiter) {
-        str = str.replace(/\x20\x20\./g," "+AMdelimiter1+".");
-        str = str.replace(/\x20\x20,/g," "+AMdelimiter1+",");
-        str = str.replace(/\x20\x20/g," "+AMdelimiter1+" ");
-      }
-      str = str.replace(/\x20+/g," ");
-      str = str.replace(/\s*\r\n/g," ");
-      mtch = false;
-      str = str.replace(new RegExp(AMescape2, "g"),
-              function(st){mtch=true;return "AMescape2"});
-      str = str.replace(new RegExp(AMescape1, "g"),
-              function(st){mtch=true;return "AMescape1"});
-      str = str.replace(new RegExp(AMdelimiter2regexp, "g"),AMdelimiter1);
-      arr = str.split(AMdelimiter1);
-      for (i=0; i<arr.length; i++)
-        arr[i]=arr[i].replace(/AMescape2/g,AMdelimiter2).
-                      replace(/AMescape1/g,AMdelimiter1);
-      if (arr.length>1 || mtch) {
-        if (checkForMathML) {
-          checkForMathML = false;
-          var nd = AMisMathMLavailable();
-          AMnoMathML = nd != null;
-          if (AMnoMathML && notifyIfNoMathML) 
-            if (alertIfNoMathML)
-              alert("To view the ASCIIMathML notation use Internet Explorer 6 +\nMathPlayer (free from www.dessci.com)\n\
-                or Firefox/Mozilla/Netscape");
-            else AMbody.insertBefore(nd,AMbody.childNodes[0]);
-        }
-        if (!AMnoMathML) {
-          frg = AMstrarr2docFrag(arr,n.nodeType==8);
-          var len = frg.childNodes.length;
-          n.parentNode.replaceChild(frg,n);
-          return len-1;
-        } else return 0;
-      }
-    }
-   } else return 0;
-  } else if (n.nodeName!="math") {
-    for (i=0; i<n.childNodes.length; i++)
-      i += AMprocessNodeR(n.childNodes[i], linebreaks);
-  }
-  return 0;
-}
-
-function AMprocessNode(n, linebreaks, spanclassAM) {
-  var frag,st;
-  if (spanclassAM!=null) {
-    frag = document.getElementsByTagName("span")
-    for (var i=0;i<frag.length;i++)
-      if (frag[i].className == "AM")
-        AMprocessNodeR(frag[i],linebreaks);
-  } else {
-    try {
-      st = n.innerHTML;
-    } catch(err) {}
-    if (st==null || 
-        st.indexOf(AMdelimiter1)!=-1 || st.indexOf(AMdelimiter2)!=-1) 
-      AMprocessNodeR(n,linebreaks);
-  }
-  if (isIE) { //needed to match size and font of formula to surrounding text
-    frag = document.getElementsByTagName('math');
-    for (var i=0;i<frag.length;i++) frag[i].update()
-  }
-}
-
-var AMbody;
-var AMnoMathML = false, AMtranslated = false;
-
-function translate(spanclassAM) {
-  if (!AMtranslated) { // run this only once
-    AMtranslated = true;
-    AMinitSymbols();
-    AMbody = document.getElementsByTagName("body")[0];
-    AMprocessNode(AMbody, false, spanclassAM);
-  }
-}
-
-if (isIE) { // avoid adding MathPlayer info explicitly to each webpage
-  document.write("<object id=\"mathplayer\"\
-  classid=\"clsid:32F66A20-7614-11D4-BD11-00104BD3F987\"></object>");
-  document.write("<"+"?import namespace=\"m\" implementation=\"#mathplayer\"?>");
-}
-
-// GO1.1 Generic onload by Brothercake 
-// http://www.brothercake.com/
-//onload function (replaces the onload="translate()" in the <body> tag)
-function generic()
-{
-  translate();
-};
-//setup onload function
-if(typeof window.addEventListener != 'undefined')
-{
-  //.. gecko, safari, konqueror and standard
-  window.addEventListener('load', generic, false);
-}
-else if(typeof document.addEventListener != 'undefined')
-{
-  //.. opera 7
-  document.addEventListener('load', generic, false);
-}
-else if(typeof window.attachEvent != 'undefined')
-{
-  //.. win/ie
-  window.attachEvent('onload', generic);
-}
-//** remove this condition to degrade older browsers
-else
-{
-  //.. mac/ie5 and anything else that gets this far
-  //if there's an existing onload function
-  if(typeof window.onload == 'function')
-  {
-    //store it
-    var existing = onload;
-    //add new onload handler
-    window.onload = function()
-    {
-      //call existing onload function
-      existing();
-      //call generic onload function
-      generic();
-    };
-  }
-  else
-  {
-    //setup onload function
-    window.onload = generic;
-  }
-}
diff --git a/web/imcms/xinha/plugins/Equation/equation.js b/web/imcms/xinha/plugins/Equation/equation.js
deleted file mode 100644
index 8e4db360a2..0000000000
--- a/web/imcms/xinha/plugins/Equation/equation.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/*------------------------------------------*\
- AsciiMathML Formula Editor for Xinha
- _______________________
- 
- Based on AsciiMathML by Peter Jipsen http://www.chapman.edu/~jipsen
- 
- Including a table with math symbols for easy input modified from CharacterMap for ASCIIMathML by Peter Jipsen
- HTMLSource based on HTMLArea XTD 1.5 (http://mosforge.net/projects/htmlarea3xtd/) modified by Holger Hees
- Original Author - Bernhard Pfeifer novocaine@gmx.net
- 
- See readme.txt
- 
- This program 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 program 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 (at http://www.gnu.org/licenses/lgpl.html) 
- for more details.
-
- Raimund Meyer  11/23/2006
-     
-\*------------------------------------------*/
-function Equation(editor) {
-	this.editor = editor;
-
-	var cfg = editor.config;
-	var self = this;
-	
-
-	// register the toolbar buttons provided by this plugin
-	cfg.registerButton({
-	id       : "equation",
-	tooltip  : this._lc("Formula Editor"),
-	image    : editor.imgURL("equation.gif", "Equation"),
-	textMode : false,
-	action   : function(editor, id) {
-			self.buttonPress(editor, id);
-		}
-	});
-	cfg.addToolbarElement("equation", "inserthorizontalrule", -1);
-	
-	mathcolor = cfg.Equation.mathcolor;       // change it to "" (to inherit) or any other color
-	mathfontfamily = cfg.Equation.mathfontfamily;
-	
-	//if (Xinha.is_ie) return;
-	if (!Xinha.is_ie)
-	{	
-		editor.notifyOn( 'modechange',
-			function( e, args )
-				{
-					self.onModeChange( args );
-				}
-			);
-		this.onBeforeSubmit = this.onBeforeUnload = function () {self.unParse();};
-	}
-	
-	if (typeof  AMprocessNode != "function")
-	{
-		Xinha._loadback(_editor_url + "plugins/Equation/ASCIIMathML.js", function () { translate(); });
-	}
-}
-
-Xinha.Config.prototype.Equation =
-{
-	"mathcolor" : "black",       // change it to "" (to inherit) or any other color
-	"mathfontfamily" : "serif" // change to "" to inherit (works in IE) 
-                               // or another family (e.g. "arial")
-}
-
-Equation._pluginInfo = {
-	name          : "ASCIIMathML Formula Editor",
-	version       : "2.2 (2007-08-17)",
-	developer     : "Raimund Meyer",
-	developer_url : "http://rheinaufCMS.de",
-	c_owner       : "",
-	sponsor       : "Rheinauf",
-	sponsor_url   : "http://rheinaufCMS.de",
-	license       : "GNU/LGPL"
-};
-
-Equation.prototype._lc = function(string) 
-{
-    return Xinha._lc(string, 'Equation');
-};
-Equation.prototype.onGenerate = function() 
-{
-	this.parse();
-};
-Equation.prototype.onUpdateToolbar = function() 
-{
-	var e = this.editor;
-	if (!Xinha.is_ie && this.reParse)
-	{
-		AMprocessNode(e._doc.body, false);
-		this.reParse = false;
-	}
-	if (!Xinha.is_ie)
-	{
-		var span = e._getFirstAncestor(e.getSelection(),['span']);
-		if ( span && span.className == "AM" )
-		{
-			e.selectNodeContents(span);
-		}
-	}
-};
-
-Equation.prototype.onModeChange = function( args )
-{
-	var doc = this.editor._doc;
-	switch (args.mode)
-	{
-		case 'text':
-			this.unParse();
-		break;
-		case 'wysiwyg':
-			this.parse();
-		break;
-	}
-};
-
-Equation.prototype.parse = function ()
-{
-	if (!Xinha.is_ie)
-	{
-		var doc = this.editor._doc;
-		var spans = doc.getElementsByTagName("span");
-		for (var i = 0;i<spans.length;i++)
-		{
-			var node = spans[i];
-			if (node.className != 'AM') continue;
-			node.title = node.innerHTML;
-			AMprocessNode(node, false);
-		}
-	}
-}
-
-Equation.prototype.unParse = function ()
-{
-	var doc = this.editor._doc;
-	var spans = doc.getElementsByTagName("span");
-	for (var i = 0;i<spans.length;i++)
-	{
-		var node = spans[i];
-		if (node.className.indexOf ("AM") == -1 || node.getElementsByTagName("math").length == 0) continue;
-		var formula = node.getAttribute("title");
-		node.innerHTML = formula;
-		node.setAttribute("title", null);
-		this.editor.setHTML(this.editor.getHTML());
-	}
-}
-
-Equation.prototype.buttonPress = function() 
-{
-	var self = this;
-	var editor = this.editor;
-	var args = {};
-	
-	args['editor'] = editor;
-	
-	var parent = editor._getFirstAncestor(editor.getSelection(),['span']);
-	if (parent)
-	{
-		args["editedNode"] = parent;
-	}
-	editor._popupDialog("plugin://Equation/dialog", function(params) {
-				self.insert(params);
-			}, args);
-};
-
-Equation.prototype.insert = function (param)
-{
-	if (typeof param["formula"] != "undefined")
-	{
-		var formula = (param["formula"] != '') ? param["formula"].replace(/^`?(.*)`?$/m,"`$1`") : '';
-
-		if (param["editedNode"] && (param["editedNode"].tagName.toLowerCase() == 'span')) 
-		{
-			var span = param["editedNode"]; 
-			if (formula != '')
-			{
-				span.innerHTML = formula;
-				if (!Xinha.is_ie) span.title = formula;
-			}
-			else
-			{
-				span.parentNode.removeChild(span);
-			}
-			
-		}
-		else if (!param["editedNode"] && formula != '')
-		{
-			if (!Xinha.is_ie)
-			{			
-				var span = document.createElement('span');
-				span.className = 'AM';
-				this.editor.insertNodeAtSelection(span);
-				span.innerHTML = formula;
-				span.title = formula;
-			}
-			else
-			{
-				this.editor.insertHTML('<span class="AM">'+formula+'</span>');
-			}
-		}
-		if (!Xinha.is_ie) AMprocessNode(this.editor._doc.body, false);
-	}
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/example.html b/web/imcms/xinha/plugins/Equation/example.html
deleted file mode 100644
index eebb299048..0000000000
--- a/web/imcms/xinha/plugins/Equation/example.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>AsciiMathML Example</title>
-  <script type="text/javascript">
-    var mathcolor = "black"; 
-  </script>
-  <script type="text/javascript" src="ASCIIMathML.js"></script>
-<style type="text/css">
-  body { font-family: sans-serif }
-  pre {border: dotted grey thin; background-color:LightYellow; }
-  
-  </style>
-</head>
-
-<body >
-<h1>AsciiMathML Example</h1>
-<p>This shows how to set up your page to display MathML using AsciiMathML</p>
-<p>Add this to the head section of your document:</p>
-<pre>
-
-  &lt;!-- This block is optional configuration --&gt;
-  &lt;script type="text/javascript"&gt;
-    var mathcolor = "black"; // You may change the color of the formulae (default: red)
-    var showasciiformulaonhover = false; // helps students learn ASCIIMath, set to false if you like  (default:true)
-    var mathfontfamily = "Arial"; //and the font (default: serif, which is good I think)
-  &lt;/script&gt;
-  &lt;!-- THIS LOADS THE ACTUAL SCRIPT, PLEASE ADJUST THE URL --&lt;
-  &lt;script type="text/javascript" src="/xinha/plugins/Equation/ASCIIMathML.js"&gt;&lt;/script&gt;
-
-
-</pre>
-<p><span class="AM">`int_a^bf(x)dx`</span></p>
-<p><span class="AM">`[[a,b],[c,d]]`</span><br /></p>
-<p>
- ASCIIMathML by <a href="http://www.chapman.edu/~jipsen" target="_blank">Peter Jipsen</a>, 
-<a href="http://www.chapman.edu" target="_blank">Chapman University</a><br />
-  For more information on AsciiMathML visit this page: <a href="http://www1.chapman.edu/~jipsen/mathml/asciimath.html" onclick="window.open(this.href,'_blank','');return false;">http://www1.chapman.edu/~jipsen/mathml/asciimath.html</a>
-
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/img/abs_value.gif b/web/imcms/xinha/plugins/Equation/img/abs_value.gif
deleted file mode 100644
index 5c8798fc2d..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/abs_value.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/diag_fraction.gif b/web/imcms/xinha/plugins/Equation/img/diag_fraction.gif
deleted file mode 100644
index e38b80572b..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/diag_fraction.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/divide.gif b/web/imcms/xinha/plugins/Equation/img/divide.gif
deleted file mode 100644
index bb5a9f8149..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/divide.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/dsp_greater_equal.gif b/web/imcms/xinha/plugins/Equation/img/dsp_greater_equal.gif
deleted file mode 100644
index e3b2271b78..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/dsp_greater_equal.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/dsp_less_equal.gif b/web/imcms/xinha/plugins/Equation/img/dsp_less_equal.gif
deleted file mode 100644
index 737774767e..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/dsp_less_equal.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/dsp_notequal.gif b/web/imcms/xinha/plugins/Equation/img/dsp_notequal.gif
deleted file mode 100644
index c8165cb24a..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/dsp_notequal.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/equation.gif b/web/imcms/xinha/plugins/Equation/img/equation.gif
deleted file mode 100644
index 37bc27ad1f..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/equation.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/equation.old.gif b/web/imcms/xinha/plugins/Equation/img/equation.old.gif
deleted file mode 100644
index ffac77a049..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/equation.old.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/greater_equal_than.gif b/web/imcms/xinha/plugins/Equation/img/greater_equal_than.gif
deleted file mode 100644
index 01377126d1..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/greater_equal_than.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/hor_fraction.gif b/web/imcms/xinha/plugins/Equation/img/hor_fraction.gif
deleted file mode 100644
index 7ee0ac8f26..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/hor_fraction.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/less_equal_than.gif b/web/imcms/xinha/plugins/Equation/img/less_equal_than.gif
deleted file mode 100644
index 9e1be5f6ba..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/less_equal_than.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/mul.gif b/web/imcms/xinha/plugins/Equation/img/mul.gif
deleted file mode 100644
index f271c9118f..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/mul.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/notequal.gif b/web/imcms/xinha/plugins/Equation/img/notequal.gif
deleted file mode 100644
index da562024c2..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/notequal.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/parenthesis.gif b/web/imcms/xinha/plugins/Equation/img/parenthesis.gif
deleted file mode 100644
index 5e6f88be4d..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/parenthesis.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/root.gif b/web/imcms/xinha/plugins/Equation/img/root.gif
deleted file mode 100644
index b226e4563a..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/root.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/img/square_root.gif b/web/imcms/xinha/plugins/Equation/img/square_root.gif
deleted file mode 100644
index 03f3417365..0000000000
Binary files a/web/imcms/xinha/plugins/Equation/img/square_root.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Equation/lang/de.js b/web/imcms/xinha/plugins/Equation/lang/de.js
deleted file mode 100644
index bae43d1998..0000000000
--- a/web/imcms/xinha/plugins/Equation/lang/de.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// I18N constants
-//
-//LANG: "base", ENCODING: UTF-8
-//Author: Translator-Name, <email@example.com>
-// FOR TRANSLATORS:
-//
-//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
-//      (at least a valid email address)
-//
-//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
-//      (if this is not possible, please include a comment
-//       that states what encoding is necessary.)
-
-{
-  "AsciiMath Formula Input": "AsciiMath Formeleditor",
-  "Formula Editor": "Formeleditor",
-  "Input":"Eingabe",
-  "Preview":"Vorschau",
-  "Based on ASCIIMathML by ": "Basiert auf ASCIIMathML von ",
-  "For more information on AsciiMathML visit this page: ":"Für weitere Informationen besuchen Sie bitte diese Seite: ",
-  'Attention Internet Explorer users: Please note that there is no WYSIWYG representation of the formula in the editor!<br />You might wish to use <a href="http://www.mozilla.com" target="_blank">Mozilla Firefox</a> instead.' : 'Achtung Internet Explorer-Benutzer: Die Formel wird im Editor nicht als WYSIWYG dargestellt.<br />Benutzen Sie <a href="http://www.mozilla.com" target="_blank">Mozilla Firefox</a> als Alternative.',
-  "Show MathML" : "Zeige MathML"
-}
diff --git a/web/imcms/xinha/plugins/Equation/lang/fr.js b/web/imcms/xinha/plugins/Equation/lang/fr.js
deleted file mode 100644
index ac9cd14d6d..0000000000
--- a/web/imcms/xinha/plugins/Equation/lang/fr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N for the Equation plugin
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Equation Editor": "Editeur d'équation"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/lang/ja.js b/web/imcms/xinha/plugins/Equation/lang/ja.js
deleted file mode 100644
index 207575fd69..0000000000
--- a/web/imcms/xinha/plugins/Equation/lang/ja.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "AsciiMath Formula Input": "AsciiMath 数�入力",
-  "Formula Editor": "数�エディタ",
-  "Input":"入力",
-  "Preview":"表示",
-  "Based on ASCIIMathML by ": "Based on ASCIIMathML by ",
-  "For more information on AsciiMathML visit this page: ":"AsciiMath�詳細���ページ��り��: ",
-  "Attention: Editing the formula in the editor is not possible, please use this dialog!" : "注�: エディタ�数�を編集�る�������ん。必����ダイアログを使用������"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/lang/nb.js b/web/imcms/xinha/plugins/Equation/lang/nb.js
deleted file mode 100644
index 4c935a1c5f..0000000000
--- a/web/imcms/xinha/plugins/Equation/lang/nb.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N for the Equation plugin
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Equation Editor": "Formeleditor",
-  "Select operation": "Velg formel",
-  "Insert": "Sett inn",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/lang/nl.js b/web/imcms/xinha/plugins/Equation/lang/nl.js
deleted file mode 100644
index eeec72ebee..0000000000
--- a/web/imcms/xinha/plugins/Equation/lang/nl.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-
-{
-  "AsciiMath Formula Input": "AsciiMath Formule Invoeren",
-  "Formula Editor": "Formule Invoeren",
-  "Input":"Invoer",
-  "Preview":"Voorbeeld",
-  "Based on ASCIIMathML by ": "Gebasseerd op  ASCIIMathML van ",
-  "For more information on AsciiMathML visit this page: ":"Voor meer informatie over AsciiMathML ga je naar: ",
-  "Attention: Editing the formula in the editor is not possible, please use this dialog!" : "Let op! het bewerken van de formule in de editor is niet mogelijk, gebruik dit dialoog!"
-}
diff --git a/web/imcms/xinha/plugins/Equation/lang/no.js b/web/imcms/xinha/plugins/Equation/lang/no.js
deleted file mode 100644
index 81b075ae65..0000000000
--- a/web/imcms/xinha/plugins/Equation/lang/no.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N for the Equation plugin
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Equation Editor": "Formeleditor",
-  "Select operation": "Velg formel",
-  "Insert": "Sett inn",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/lang/pt_br.js b/web/imcms/xinha/plugins/Equation/lang/pt_br.js
deleted file mode 100644
index 3958dc1e6a..0000000000
--- a/web/imcms/xinha/plugins/Equation/lang/pt_br.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "&quot;text&quot;": "&quot;text&quot;",
-  "AsciiMath Formula Input": "Inserir Fórmula AsciiMath",
-  "AsciiMathML Example": "Exemplo AsciiMathML",
-  "Based on ASCIIMathML by": "Baseado no ASCIIMathML por",
-  "Cancel": "Cancelar",
-  "Equation": "Equação",
-  "For more information on AsciiMathML visit this page:": "Para maiores informações do AsciiMathML visite este site:",
-  "Formula Editor": "Editor de Fórmula",
-  "Input": "Entrada",
-  "Insert": "Inserir",
-  "Preview": "Visualizar",
-  "Select operation": "Selecionar operação",
-  "`&quot;text&quot;`": "`&quot;texto&quot;`",
-
-  // new messages - see: http://xinha.webfactional.com/wiki/TranslationChanges
-  "Attention Internet Explorer users: Please note that there is no WYSIWYG representation of the formula in the editor! You might wish to use Mozilla Firefox instead.": "Atenção usuários do Internet Explorer: Observe que não é possível representar fórmulas no editor no modo de visualização! É preferivelmente que você utilize o Mozilla Firefox.",
-  "Show MathML": "Mostrar MathML", 
-  // removed old messages - see: http://xinha.webfactional.com/wiki/TranslationChanges
-  "Attention: Editing the formula in the editor is not possible, please use this dialog!": "Atenção: Não é possível editar a fórmula no editor. Ppor favor, utilize este caixa de diálogo!"
-}
diff --git a/web/imcms/xinha/plugins/Equation/popups/dialog.html b/web/imcms/xinha/plugins/Equation/popups/dialog.html
deleted file mode 100644
index a891074a6b..0000000000
--- a/web/imcms/xinha/plugins/Equation/popups/dialog.html
+++ /dev/null
@@ -1,357 +0,0 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>AsciiMath Formula Input</title>
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-  <script type="text/javascript" src="../ASCIIMathML.js"></script>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-
-  <style type="text/css">
-	/* <![CDATA[ */
-	#outputNode,#inputText,#mathml {
-		padding:5px;
-		background-color:white;
-		width:98%;
-		height:200px;
-		font-size:1.3em;
-		border: 1px solid darkgrey;
-		overflow:auto;
-	}
-	#clickInput {
-		width:100%;
-		border-collapse:collapse;
-		background-color: white;
-		text-align:center;
-	}
-	#clickInput td {
-		border: thin solid gray;
-		cursor:pointer;
-		font-size:1.1em;
-		
-	}
-	h3 {
-		font-size:1.6em;
-	}
-	/* ]]> */
-  </style>
-  <script type="text/javascript">
- // <![CDATA[
-   window.resizeTo(500, 300);
-var showasciiformulaonhover = false;
-if (typeof Xinha == "undefined")
-	Xinha = window.opener.Xinha;
-
-function i18n(str) {
-  return (Xinha._lc(str, 'Equation'));
-}
-function set (string)
-{
-	var inputField = document.getElementById("inputText");
-	inputField.value += string;
-	preview();
-	inputField.focus();
-	return false;
-}
-function preview() {
-  if (document.getElementById("inputText") != '') {
-      var str = document.getElementById("inputText").value;
-      var outnode = document.getElementById("outputNode");
-      var newnode = AMcreateElementXHTML("div");
-      newnode.setAttribute("id","outputNode");
-      outnode.parentNode.replaceChild(newnode,outnode);
-      outnode = document.getElementById("outputNode");
-      var n = outnode.childNodes.length;
-      for (var i = 0; i < n; i++)
-        outnode.removeChild(outnode.firstChild);
-      outnode.appendChild(document.createComment("`"+str+"`"));
-      AMprocessNode(outnode,true);
-  }
-}
-function Init() {
-	__dlg_translate('Equation');
-	__dlg_init();
-	var param = window.dialogArguments;
-	var cfg = param["editor"].config;
-	
-	mathcolor = cfg.Equation.mathcolor;
-	mathfontfamily = cfg.Equation.mathfontfamily;
-	
-	var inputField = document.getElementById("inputText"); 
-	
-	if (param["editedNode"] && param["editedNode"].tagName.toLowerCase() == 'span')
-	{
-		var formula = param["editedNode"].getAttribute("title").replace(/^`*(.*?)`*$/m,"$1");
-		if (!formula) formula = param["editedNode"].innerHTML.replace(/^`*(.*?)`*$/m,"$1"); 
-		inputField.value = formula;
-		preview();
-	}
-	else inputField.value = '';
-	inputField.focus();
-}
-  
-function onOK() {
- 	
- var param = {
- 	"editedNode":window.dialogArguments.editedNode,
- 	"formula" : document.getElementById("inputText").value
- };
- 
- __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-function translate() {
-  if (!AMtranslated) { // run this only once
-    AMtranslated = true;
-    AMinitSymbols();
-    AMprocessNode(document.getElementById("clickInput"),true);
-    preview();
-  }
-}
-window.onload = Init;
-
-function AMnode2string(inNode,indent) {
-// thanks to James Frazer for contributing an initial version of this function
-   var i, str = "";
-   if(inNode.nodeType == 1) {
-       var name = inNode.nodeName.toLowerCase(); // (IE fix)
-       str = "\r" + indent + "<" + name;
-       for(i=0; i < inNode.attributes.length; i++)
-           if (inNode.attributes[i].nodeValue!="italic" &&
-               inNode.attributes[i].nodeValue!="" &&  //stop junk attributes
-               inNode.attributes[i].nodeValue!="inherit" && // (mostly IE)
-               inNode.attributes[i].nodeValue!=undefined &&
-               inNode.attributes[i].nodeName[0] != '-'
-               )
-               str += " "+inNode.attributes[i].nodeName+"="+
-                     "\""+inNode.attributes[i].nodeValue+"\"";
-       if (name == "math") 
-           str += " xmlns=\"http://www.w3.org/1998/Math/MathML\"";
-       str += ">";
-       for(i=0; i<inNode.childNodes.length; i++)
-           str += AMnode2string(inNode.childNodes[i], indent+"  ");
-       if (name != "mo" && name != "mi" && name != "mn") str += "\r"+indent;
-       str += "</" + name + ">";
-   }
-   else if(inNode.nodeType == 3) {
-       var st = inNode.nodeValue;
-       for (i=0; i<st.length; i++)
-           if (st.charCodeAt(i)<32 || st.charCodeAt(i)>126)
-               str += "&#"+st.charCodeAt(i)+";";
-           else if (st.charAt(i)=="<" && indent != "  ") str += "&lt;";
-           else if (st.charAt(i)==">" && indent != "  ") str += "&gt;";
-           else if (st.charAt(i)=="&" && indent != "  ") str += "&amp;";
-           else str += st.charAt(i);
-   }
-   return str;
-} 
-function showMathML()
-{
-	var math = document.getElementById("outputNode").getElementsByTagName("math")[0];
-	if (math)
-		math.parentNode.innerHTML = '<pre>'+Xinha.htmlEncode(AMnode2string(math,''))+'</pre>';
-}
-// ]]>
-</script>
-
-</head>
-
-<body class="dialog">
-<div class="title">AsciiMath Formula Input</div>
-<!--
-Table modified from CharacterMap for ASCIIMathML by Peter Jipsen
-HTMLSource based on HTMLArea XTD 1.5 (http://mosforge.net/projects/htmlarea3xtd/) modified by Holger Hees
-Original Author - Bernhard Pfeifer novocaine@gmx.net
--->
-<table  id="clickInput">
-<tr>
-<td colspan="3" class="character" title="(x+1)/(x-1)" onclick="set('(x+1)/(x-1)')">`(x+1)/(x-1)`</td>
-<td colspan="2" class="character" title="x^(m+n)" onclick="set('x^(m+n)')">`x^(m+n)`</td>
-<td colspan="2" class="character" title="x_(mn)" onclick="set('x_(mn)')">`x_(mn)`</td>
-<td colspan="2" class="character" title="sqrt(x)" onclick="set('sqrt(x)')">`sqrt(x)`</td>
-<td colspan="3" class="character" title="root(n)(x)" onclick="set('root(n)(x)')">`root(n)(x)`</td>
-<td colspan="2" class="character" title="&quot;text&quot;" onclick="set('&quot;text&quot;')">`&quot;text&quot;`</td>
-<td colspan="2" class="character" style="cursor:default"></td>
-</tr><tr>
-<td colspan="2" class="character" title="dy/dx" onclick="set('dy/dx')">`dy/dx`</td>
-<td colspan="3" class="character" title="lim_(x-&gt;oo)" onclick="set('lim_(x-&gt;oo)')">`lim_(x-&gt;oo)`</td>
-<td colspan="3" class="character" title="sum_(n=1)^oo" onclick="set('sum_(n=1)^oo')">`sum_(n=1)^oo`</td>
-<td colspan="3" class="character" title="int_a^bf(x)dx" onclick="set('int_a^bf(x)dx')">`int_a^bf(x)dx`</td>
-<td colspan="3" class="character" title="[[a,b],[c,d]]" onclick="set('[[a,b],[c,d]]')">`[[a,b],[c,d]]`</td>
-<td colspan="2" class="character" title="((n),(k))" onclick="set('((n),(k))')">`((n),(k))`</td>
-</tr><tr>
-<td class="character" title="*" onclick="set('*')">`*`</td>
-<td class="character" title="**" onclick="set('**')">`**`</td>
-<td class="character" title="//" onclick="set('//')">`//`</td>
-<td class="character" title="\\" onclick="set('\\\\')">`\\`</td>
-<td class="character" title="xx" onclick="set('xx')">`xx`</td>
-<td class="character" title="-:" onclick="set('-:')">`-:`</td>
-<td class="character" title="@" onclick="set('@')">`@`</td>
-<td class="character" title="o+" onclick="set('o+')">`o+`</td>
-<td class="character" title="ox" onclick="set('ox')">`ox`</td>
-<td class="character" title="o." onclick="set('o.')">`o.`</td>
-<td class="character" title="sum" onclick="set('sum')">`sum`</td>
-<td class="character" title="prod" onclick="set('prod')">`prod`</td>
-<td class="character" title="^^" onclick="set('^^')">`^^`</td>
-<td class="character" title="^^^" onclick="set('^^^')"><span style="font-size:larger">`&and;`</span></td>
-<td class="character" title="vv" onclick="set('vv')">`vv`</td>
-<td class="character" title="vvv" onclick="set('vvv')"><span style="font-size:larger">`&or;`</span></td>
-</tr><tr>
-<td class="character" title="!=" onclick="set('!=')">`!=`</td>
-<td class="character" title="&lt;=" onclick="set('&lt;=')">`&lt;=`</td>
-<td class="character" title="&gt;=" onclick="set('&gt;=')">`&gt;=`</td>
-<td class="character" title="-&lt;" onclick="set('-&lt;')">`-&lt;`</td>
-<td class="character" title="&gt;-" onclick="set('&gt;-')">`&gt;-`</td>
-<td class="character" title="in" onclick="set('in')">`in`</td>
-<td class="character" title="!in" onclick="set('!in')">`!in`</td>
-<td class="character" title="sub" onclick="set('sub')">`sub`</td>
-<td class="character" title="sup" onclick="set('sup')">`sup`</td>
-<td class="character" title="sube" onclick="set('sube')">`sube`</td>
-<td class="character" title="supe" onclick="set('supe')">`supe`</td>
-<td class="character" title="O/" onclick="set('O/')">`O/`</td>
-<td class="character" title="nn" onclick="set('nn')">`nn`</td>
-<td class="character" title="nnn" onclick="set('nnn')"><span style="font-size:larger">`&cap;`</span></td>
-<td class="character" title="uu" onclick="set('uu')">`uu`</td>
-<td class="character" title="uuu" onclick="set('uuu')"><span style="font-size:larger">`&cup;`</span></td>
-</tr><tr>
-<td class="character" title="and" onclick="set('and')">`and`</td>
-<td class="character" title="or" onclick="set('or')">`or`</td>
-<td class="character" title="not" onclick="set('not')">`not`</td>
-<td class="character" title="=&gt;" onclick="set('==&gt;')">`=&gt;`</td>
-<td class="character" title="if" onclick="set('if')">`if`</td>
-<td class="character" title="&lt;=&gt;" onclick="set('&lt;=&gt;')">`&lt;=&gt;`</td>
-<td class="character" title="AA" onclick="set('AA')">`AA`</td>
-<td class="character" title="EE" onclick="set('EE')">`EE`</td>
-<td class="character" title="_|_" onclick="set('_|_')">`_|_`</td>
-<td class="character" title="TT" onclick="set('TT')">`TT`</td>
-<td class="character" title="|--" onclick="set('|--')">`|--`</td>
-<td class="character" title="|==" onclick="set('|==')">`|==`</td>
-<td class="character" title="-=" onclick="set('-=')">`-=`</td>
-<td class="character" title="~=" onclick="set('~=')">`~=`</td>
-<td class="character" title="~~" onclick="set('~~')">`~~`</td>
-<td class="character" title="prop" onclick="set('prop')">`prop`</td>
-</tr><tr>
-<td class="character" title="int" onclick="set('int')">`int`</td>
-<td class="character" title="oint" onclick="set('oint')">`oint`</td>
-<td class="character" title="del" onclick="set('del')">`del`</td>
-<td class="character" title="grad" onclick="set('grad')">`grad`</td>
-<td class="character" title="+-" onclick="set('+-')">`+-`</td>
-<td class="character" title="oo" onclick="set('oo')">`oo`</td>
-<td class="character" title="aleph" onclick="set('aleph')">`aleph`</td>
-<td class="character" title="quad" onclick="set('quad')">`quad`</td>
-<td class="character" title="diamond" onclick="set('diamond')">`diamond`</td>
-<td class="character" title="square" onclick="set('square')">`square`</td>
-<td class="character" title="|__" onclick="set('|__')">`|__`</td>
-<td class="character" title="__|" onclick="set('__|')">`__|`</td>
-<td class="character" title="|~" onclick="set('|~')">`|~`</td>
-<td class="character" title="~|" onclick="set('~|')">`~|`</td>
-<td class="character" title="&lt;x&gt;" onclick="set('&lt;x&gt;')">`&lt;x&gt;`</td>
-<td class="character" title="/_" onclick="set('/_')">`/_`</td>
-</tr><tr>
-<td class="character" title="uarr" onclick="set('uarr')">`uarr`</td>
-<td class="character" title="darr" onclick="set('darr')">`darr`</td>
-<td class="character" title="larr" onclick="set('larr')">`larr`</td>
-<td class="character" title="-&gt;" onclick="set('-&gt;')">`-&gt;`</td>
-<td class="character" title="|-&gt;" onclick="set('|-&gt;')">`|-&gt;`</td>
-<td class="character" title="harr" onclick="set('harr')">`harr`</td>
-<td class="character" title="lArr" onclick="set('lArr')">`lArr`</td>
-<td class="character" title="rArr" onclick="set('rArr')">`rArr`</td>
-<td class="character" title="hArr" onclick="set('hArr')">`hArr`</td>
-<td class="character" title="hata" onclick="set('hat')">`hata`</td>
-<td class="character" title="ula" onclick="set('ul')">`ula`</td>
-<td class="character" title="dota" onclick="set('dot')">`dota`</td>
-<td class="character" title="ddota" onclick="set('ddot')">`ddota`</td>
-<td class="character" title="veca" onclick="set('vec')">`veca`</td>
-<td class="character" title="bara" onclick="set('bar')">`bara`</td>
-<td class="character" title=":." onclick="set(':.')">`:.`</td>
-</tr><tr>
-<td class="character" title="NN" onclick="set('NN')">`NN`</td>
-<td class="character" title="ZZ" onclick="set('ZZ')">`ZZ`</td>
-<td class="character" title="QQ" onclick="set('QQ')">`QQ`</td>
-<td class="character" title="RR" onclick="set('RR')">`RR`</td>
-<td class="character" title="CC" onclick="set('CC')">`CC`</td>
-<td class="character" title="bba" onclick="set('bb')">`bba`</td>
-<td class="character" title="bbba" onclick="set('bbb')">`bbba`</td>
-<td class="character" title="cca" onclick="set('cc')">`cca`</td>
-<td class="character" title="fra" onclick="set('fr')">`fra`</td>
-<td class="character" title="sfa" onclick="set('sf')">`sfa`</td>
-<td class="character" title="tta" onclick="set('tt')">`tta`</td>
-<td colspan="4" class="character" title="stackrel(-&gt;)(+)" onclick="set('stackrel(-&gt;)(+)')">`stackrel(-&gt;)(+)`</td>
-<td class="character" title="upsilon" onclick="set('upsilon')">`upsilon`</td>
-</tr><tr>
-<td class="character" title="alpha" onclick="set('alpha')">`alpha`</td>
-<td class="character" title="beta" onclick="set('beta')">`beta`</td>
-<td class="character" title="gamma" onclick="set('gamma')">`gamma`</td>
-<td class="character" title="Gamma" onclick="set('Gamma')">`Gamma`</td>
-<td class="character" title="delta" onclick="set('delta')">`delta`</td>
-<td class="character" title="Delta" onclick="set('Delta')">`Delta`</td>
-<td class="character" title="epsi" onclick="set('epsi')">`epsi`</td>
-<td class="character" title="zeta" onclick="set('zeta')">`zeta`</td>
-<td class="character" title="eta" onclick="set('eta')">`eta`</td>
-<td class="character" title="theta" onclick="set('theta')">`theta`</td>
-<td class="character" title="Theta" onclick="set('Theta')">`Theta`</td>
-<td class="character" title="iota" onclick="set('iota')">`iota`</td>
-<td class="character" title="kappa" onclick="set('kappa')">`kappa`</td>
-<td class="character" title="lambda" onclick="set('lambda')">`lambda`</td>
-<td class="character" title="Lambda" onclick="set('Lambda')">`Lambda`</td>
-<td class="character" title="mu" onclick="set('mu')">`mu`</td>
-</tr><tr>
-<td class="character" title="nu" onclick="set('nu')">`nu`</td>
-<td class="character" title="pi" onclick="set('pi')">`pi`</td>
-<td class="character" title="Pi" onclick="set('Pi')">`Pi`</td>
-<td class="character" title="rho" onclick="set('rho')">`rho`</td>
-<td class="character" title="sigma" onclick="set('sigma')">`sigma`</td>
-<td class="character" title="Sigma" onclick="set('Sigma')">`Sigma`</td>
-<td class="character" title="tau" onclick="set('tau')">`tau`</td>
-<td class="character" title="xi" onclick="set('xi')">`xi`</td>
-<td class="character" title="Xi" onclick="set('Xi')">`Xi`</td>
-<td class="character" title="phi" onclick="set('phi')">`phi`</td>
-<td class="character" title="Phi" onclick="set('Phi')">`Phi`</td>
-<td class="character" title="chi" onclick="set('chi')">`chi`</td>
-<td class="character" title="psi" onclick="set('psi')">`psi`</td>
-<td class="character" title="Psi" onclick="set('Psi')">`Psi`</td>
-<td class="character" title="omega" onclick="set('omega')">`omega`</td>
-<td class="character" title="Omega" onclick="set('Omega')">`Omega`</td>
-</tr>
-</table>
-<form action="javascript:void(0);">
-<table style="width: 100%;border:none">
-  <tr>
-    <td style="width:50%">Input</td><td style="width:50%"><input type="button" onclick="showMathML()" style="float:right;font-size:10px" value="Show MathML" /><span>Preview</span></td>
-  </tr>
-  <tr>
-    <td>
-    <textarea id="inputText" onkeyup="preview()"></textarea>
-    </td>
-    <td>
-    <div id="outputNode"></div>
-    <textarea id="mathml" style="display:none"></textarea>
-    </td>
-  </tr>
-  <tr><td colspan="2">
-  <span>Based on ASCIIMathML by </span><a href="http://www.chapman.edu/~jipsen" onclick="window.open(this.href,'_blank','');return false;">Peter Jipsen</a>, 
-<a href="http://www.chapman.edu" onclick="window.open(this.href,'_blank','');return false;">Chapman University</a><br />
-  <span>For more information on AsciiMathML visit this page: </span><a href="http://www1.chapman.edu/~jipsen/mathml/asciimath.html" onclick="window.open(this.href,'_blank','');return false;">http://www1.chapman.edu/~jipsen/mathml/asciimath.html</a></td></tr>
-</table>
-
-<div id="buttons">
-<script type="text/javascript">
-// <![CDATA[
-if (Xinha.is_ie)
- document.write('<span style="color:red;float:left">'+i18n('Attention Internet Explorer users: Please note that there is no WYSIWYG representation of the formula in the editor!<br />You might wish to use <a href="http://www.mozilla.com" target="_blank">Mozilla Firefox</a> instead.')+'</span>');
-// ]]>
-</script>
-  <button type="submit" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/popups/operations.html b/web/imcms/xinha/plugins/Equation/popups/operations.html
deleted file mode 100644
index ff719b0304..0000000000
--- a/web/imcms/xinha/plugins/Equation/popups/operations.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
-Equation Editor plugin for HTMLArea v3.0
-
-brought to you by the Center for Distributed Learning <http://www.cdlonline.org>
-a division of the Butte County Office of Education.
-
-Working sample can be found at
-	http://www.cdlonline.org/works/wysiwyg/examples/eq.html
-
-Questions? Suggestions? email us... webmaster@cdlonline.org
-
-Last Modified : 2004-09-22 19:15:16
--->
-
-<html>
-<head>
-  <title>Equation</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-function Init() {
-  window.resizeTo(190, 225);
-  __dlg_translate('Equation');
-  __dlg_init();
-  var selected_op="none";
-  document.getElementById("cancel").focus();
-}
-
-function SelectOperation(sop,sop_name) {
-   document.getElementById('less_equal').style.backgroundColor='ButtonFace';
-   document.getElementById('greater_egual').style.backgroundColor='ButtonFace';
-   document.getElementById('notequal').style.backgroundColor='ButtonFace';
-   document.getElementById('square_root').style.backgroundColor='ButtonFace';
-   document.getElementById('divide').style.backgroundColor='ButtonFace';
-   document.getElementById('mul').style.backgroundColor='ButtonFace';
-   document.getElementById('parenthesis').style.backgroundColor='ButtonFace';
-   document.getElementById('hor_fraction').style.backgroundColor='ButtonFace';
-   document.getElementById('diag_fraction').style.backgroundColor='ButtonFace';
-   document.getElementById('abs_value').style.backgroundColor='ButtonFace';
-   document.getElementById('root').style.backgroundColor='ButtonFace';
-   sop.style.backgroundColor='blue';
-   selected_op=sop_name;
-}
-
-function onOK() {
-  var param = {};
-  param['op']=selected_op;
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">Select operation</div>
-<table align="center" border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td id="less_equal" align="center" onclick="SelectOperation(this,'less_equal')"><span><img src="../img/less_equal_than.gif"></span></td>
-    <td id="greater_egual" align="center" onclick="SelectOperation(this,'greater_egual')"><span><img src="../img/greater_equal_than.gif"></span></td>
-    <td id="notequal" align="center" onclick="SelectOperation(this,'notequal')"><span><img src="../img/notequal.gif"></span></td>
-  </tr>
-  <tr>
-    <td id="square_root" align="center" onclick="SelectOperation(this,'square_root')"><span><img src="../img/square_root.gif"></span></td>
-    <td id="root" align="center" onclick="SelectOperation(this,'root')"><span><img src="../img/root.gif"></span></td>
-    <td id="parenthesis" align="center" onclick="SelectOperation(this,'parenthesis')"><span><img src="../img/parenthesis.gif"></span></td>
-  </tr>
-  <tr>
-    <td id="hor_fraction" align="center" onclick="SelectOperation(this,'hor_fraction')"><span><img src="../img/hor_fraction.gif"></span></td>
-    <td id="diag_fraction" align="center" onclick="SelectOperation(this,'diag_fraction')"><span><img src="../img/diag_fraction.gif"></span></td>
-    <td id="abs_value" align="center" onclick="SelectOperation(this,'abs_value')"><span><img src="../img/abs_value.gif"></span></td>
-  </tr>
-  <tr>
-    <td id="divide" align="center" onclick="SelectOperation(this,'divide')"><span><img src="../img/divide.gif"></span></td>
-    <td id="mul" align="center" onclick="SelectOperation(this,'mul')"><span><img src="../img/mul.gif"></span></td>
-    <td ><span>&nbsp;</span></td>
-  </tr>
-</table>
-<div id="buttons">
-  <button type="button" name="ok" onclick="return onOK();"><span>Insert</span></button>
-  <button type="button" name="cancel" id="cancel" onclick="return onCancel();"><span>Cancel</span></button>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Equation/readme.txt b/web/imcms/xinha/plugins/Equation/readme.txt
deleted file mode 100644
index 117f9000f2..0000000000
--- a/web/imcms/xinha/plugins/Equation/readme.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-AsciiMathML Formula Editor for Xinha
- _______________________
- 
-Based on AsciiMathML by Peter Jipsen (http://www.chapman.edu/~jipsen).
-Plugin by Raimund Meyer (ray) xinha@raimundmeyer.de
-
-AsciiMathML is a JavaScript library for translating ASCII math notation to Presentation MathML.
-
-Usage
- The formmulae are stored in their ASCII representation, so you have to include the 
- ASCIIMathML library which can be found in the plugin folder in order render the MathML output in your pages. 
- 
- Example (also see example.html):
-  var mathcolor = "black"; //  You may change the color of the formulae (default: red)
-  var mathfontfamily = "Arial"; //and the font (default: serif, which is good I think)
-  var showasciiformulaonhover = false; // if true helps students learn ASCIIMath (default:true)
-  <script type="text/javascript" src="/xinha/plugins/AsciiMath/ASCIIMathML.js"></script>
-
-  
- The recommended browser for using this plugin is Mozilla/Firefox. At the moment showing the MathML output
- inside the editor is not supported in Internet Explorer.
- 
- 
-License information
-
- This program 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 program 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 (at http://www.gnu.org/licenses/lgpl.html) 
- for more details.
- 
- NOTE: I have changed the license of AsciiMathML from GPL to LGPL according to a permission 
- from the author (see http://xinha.gogo.co.nz/punbb/viewtopic.php?pid=4150#p4150)
- Raimund Meyer 11-29-2006
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php b/web/imcms/xinha/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php
deleted file mode 100644
index cd96d93a7f..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php
+++ /dev/null
@@ -1,825 +0,0 @@
-<?php
-/**
- * ExtendedFileManager, list images, directories, and thumbnails.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz, Raimund Meyer
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
- * Version: Updated on 29-10-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
- * http://www.afrusoft.com/htmlarea
- */
-
-/**
- * We use classes from ImageManager to avoid code duplication
- */
-require_once '../ImageManager/Classes/Files.php';
-
-/**
- * ExtendedFileManager Class.
- * @author $Author: koto $
- * @author $Author: koto $
- * @version $Id: ExtendedFileManager.php 841 2007-05-27 13:31:51Z koto $
- */
-class ExtendedFileManager 
-{
-	/**
-	 * Configuration array.
-	 */
-	var $config;
-
-	/**
-	 * Array of directory information.
-	 */
-	var $dirs;
-	
-    /**
-     * Manager mode - image | link
-     */
-	var $mode;
-
-	/**
-	 * Constructor. Create a new Image Manager instance.
-	 * @param array $config configuration array, see config.inc.php
-	 */
-	function ExtendedFileManager($config, $mode = null)
-	{
-		$this->config = $config;
-		
-		$this->mode = empty($mode) ? (empty($config['insert_mode']) ? 'image' : $config['insert_mode']): $mode;
-	}
-
-	/**
-	 * Get the base directory.
-	 * @return string base dir, see config.inc.php
-	 */
-	function getImagesDir()
-	{
-		if ($this->mode == 'link' && isset($this->config['files_dir']))
-			Return $this->config['files_dir'];
-		else Return $this->config['images_dir'];
-	}
-
-	/**
-	 * Get the base URL.
-	 * @return string base url, see config.inc.php
-	 */
-	function getImagesURL()
-	{
-		if ($this->mode == 'link' && isset($this->config['files_url']))
-				Return $this->config['files_url'];
-		else Return $this->config['images_url'];
-	}
-
-	function isValidBase()
-	{
-		return is_dir($this->getImagesDir());
-	}
-
-	/**
-	 * Get the tmp file prefix.
-     * @return string tmp file prefix.
-	 */
-	function getTmpPrefix() 
-	{
-		Return $this->config['tmp_prefix'];
-	}
-
-	/**
-	 * Get the sub directories in the base dir.
-	 * Each array element contain
-	 * the relative path (relative to the base dir) as key and the 
-	 * full path as value.
-	 * @return array of sub directries
-	 * <code>array('path name' => 'full directory path', ...)</code>
-	 */
-	function getDirs() 
-	{
-		if(is_null($this->dirs))
-		{
-			$dirs = $this->_dirs($this->getImagesDir(),'/');
-			ksort($dirs);
-			$this->dirs = $dirs;
-		}
-		return $this->dirs;
-	}
-
-	/**
-	 * Recursively travese the directories to get a list
-	 * of accessable directories.
-	 * @param string $base the full path to the current directory
-	 * @param string $path the relative path name
-	 * @return array of accessiable sub-directories
-	 * <code>array('path name' => 'full directory path', ...)</code>
-	 */
-	function _dirs($base, $path) 
-	{
-		$base = Files::fixPath($base);
-		$dirs = array();
-
-		if($this->isValidBase() == false)
-			return $dirs;
-
-		$d = @dir($base);
-		
-		while (false !== ($entry = $d->read())) 
-		{
-			//If it is a directory, and it doesn't start with
-			// a dot, and if is it not the thumbnail directory
-			if(is_dir($base.$entry) 
-				&& substr($entry,0,1) != '.'
-				&& $this->isThumbDir($entry) == false) 
-			{
-				$relative = Files::fixPath($path.$entry);
-				$fullpath = Files::fixPath($base.$entry);
-				$dirs[$relative] = $fullpath;
-				$dirs = array_merge($dirs, $this->_dirs($fullpath, $relative));
-			}
-		}
-		$d->close();
-
-		Return $dirs;
-	}
-
-	/**
-	 * Get all the files and directories of a relative path.
-	 * @param string $path relative path to be base path.
-	 * @return array of file and path information.
-	 * <code>array(0=>array('relative'=>'fullpath',...), 1=>array('filename'=>fileinfo array(),...)</code>
-	 * fileinfo array: <code>array('url'=>'full url', 
-	 *                       'relative'=>'relative to base', 
-	 *                        'fullpath'=>'full file path', 
-	 *                        'image'=>imageInfo array() false if not image,
-	 *                        'stat' => filestat)</code>
-	 */
-	function getFiles($path) 
-	{
-		$files = array();
-		$dirs = array();
-
-        $valid_extensions = $this->mode == 'image' ? $this->config['allowed_image_extensions'] : $this->config['allowed_link_extensions'];
-
-		if($this->isValidBase() == false)
-			return array($files,$dirs);
-
-		$path = Files::fixPath($path);
-		$base = Files::fixPath($this->getImagesDir());
-		$fullpath = Files::makePath($base,$path);
-
-
-		$d = @dir($fullpath);
-		
-		while (false !== ($entry = $d->read())) 
-		{
-			//not a dot file or directory
-			if(substr($entry,0,1) != '.')
-			{
-				if(is_dir($fullpath.$entry)
-					&& $this->isThumbDir($entry) == false)
-				{
-					$relative = Files::fixPath($path.$entry);
-					$full = Files::fixPath($fullpath.$entry);
-					$count = $this->countFiles($full);
-					$dirs[$relative] = array('fullpath'=>$full,'entry'=>$entry,'count'=>$count, 'stat'=>stat($fullpath.$entry));
-				}
-
-				else if(is_file($fullpath.$entry) && $this->isThumb($entry)==false && $this->isTmpFile($entry) == false) 
-				{
-					$afruext = strtolower(substr(strrchr($entry, "."), 1));
-
-                    if(in_array($afruext,$valid_extensions))
-					{
-
-						$file['url'] = Files::makePath($this->config['base_url'],$path).$entry;
-						$file['relative'] = $path.$entry;
-						$file['fullpath'] = $fullpath.$entry;
-						$img = $this->getImageInfo($fullpath.$entry);
-						if(!is_array($img)) $img[0]=$img[1]=0;
-						$file['image'] = $img;
-						$file['stat'] = stat($fullpath.$entry);
-						$file['ext'] = $afruext;
-						$files[$entry] = $file;
-					}
-
-				}
-			}
-		}
-		$d->close();
-		ksort($dirs);
-		ksort($files);
-		
-		Return array($dirs, $files);
-	}	
-
-	/**
-	 * Count the number of files and directories in a given folder
-	 * minus the thumbnail folders and thumbnails.
-	 */
-	function countFiles($path) 
-	{
-		$total = 0;
-
-		if(is_dir($path)) 
-		{
-			$d = @dir($path);
-
-			while (false !== ($entry = $d->read())) 
-			{
-				//echo $entry."<br>";
-				if(substr($entry,0,1) != '.'
-					&& $this->isThumbDir($entry) == false
-					&& $this->isTmpFile($entry) == false
-					&& $this->isThumb($entry) == false) 
-				{
-					$total++;
-				}
-			}
-			$d->close();
-		}
-		return $total;
-	}
-
-	/**
-	 * Get image size information.
-	 * @param string $file the image file
-	 * @return array of getImageSize information, 
-	 *  false if the file is not an image.
-	 */
-	function getImageInfo($file) 
-	{
-		Return @getImageSize($file);
-	}
-
-	/**
-	 * Check if the file contains the thumbnail prefix.
-	 * @param string $file filename to be checked
-	 * @return true if the file contains the thumbnail prefix, false otherwise.
-	 */
-	function isThumb($file) 
-	{
-		$len = strlen($this->config['thumbnail_prefix']);
-		if(substr($file,0,$len)==$this->config['thumbnail_prefix'])
-			Return true;
-		else
-			Return false;
-	}
-
-	/**
-	 * Check if the given directory is a thumbnail directory.
-	 * @param string $entry directory name
-	 * @return true if it is a thumbnail directory, false otherwise
-	 */
-	function isThumbDir($entry) 
-	{
-		if($this->config['thumbnail_dir'] == false
-			|| strlen(trim($this->config['thumbnail_dir'])) == 0)
-			Return false;		
-		else
-			Return ($entry == $this->config['thumbnail_dir']);
-	}
-
-	/**
-	 * Check if the given file is a tmp file.
-	 * @param string $file file name
-	 * @return boolean true if it is a tmp file, false otherwise
-	 */
-	function isTmpFile($file) 
-	{
-		$len = strlen($this->config['tmp_prefix']);
-		if(substr($file,0,$len)==$this->config['tmp_prefix'])
-			Return true;
-		else
-			Return false;	 	
-	}
-
-	/**
-	 * For a given image file, get the respective thumbnail filename
-	 * no file existence check is done.
-	 * @param string $fullpathfile the full path to the image file
-	 * @return string of the thumbnail file
-	 */
-	function getThumbName($fullpathfile) 
-	{
-		$path_parts = pathinfo($fullpathfile);
-		
-		$thumbnail = $this->config['thumbnail_prefix'].$path_parts['basename'];
-
-		if($this->config['safe_mode'] == true
-			|| strlen(trim($this->config['thumbnail_dir'])) == 0)
-		{
-			Return Files::makeFile($path_parts['dirname'],$thumbnail);
-		}
-		else
-		{
-			if(strlen(trim($this->config['thumbnail_dir'])) > 0)
-			{
-				$path = Files::makePath($path_parts['dirname'],$this->config['thumbnail_dir']);
-				if(!is_dir($path))
-					Files::createFolder($path);
-				Return Files::makeFile($path,$thumbnail);
-			}
-			else //should this ever happen?
-			{
-				//error_log('ExtendedFileManager: Error in creating thumbnail name');
-			}
-		}
-	}
-	
-	/**
-	 * Similar to getThumbName, but returns the URL, base on the
-	 * given base_url in config.inc.php
-	 * @param string $relative the relative image file name, 
-	 * relative to the base_dir path
-	 * @return string the url of the thumbnail
-	 */
-	function getThumbURL($relative) 
-	{
-		$path_parts = pathinfo($relative);
-		$thumbnail = $this->config['thumbnail_prefix'].$path_parts['basename'];
-		if($path_parts['dirname']=='\\') $path_parts['dirname']='/';
-
-		if($this->config['safe_mode'] == true
-			|| strlen(trim($this->config['thumbnail_dir'])) == 0)
-		{
-			Return Files::makeFile($this->getImagesURL(),$thumbnail);
-		}
-		else
-		{
-			if(strlen(trim($this->config['thumbnail_dir'])) > 0)
-			{
-				$path = Files::makePath($path_parts['dirname'],$this->config['thumbnail_dir']);
-				$url_path = Files::makePath($this->getImagesURL(), $path);
-				Return Files::makeFile($url_path,$thumbnail);
-			}
-			else //should this ever happen?
-			{
-				//error_log('ExtendedFileManager: Error in creating thumbnail url');
-			}
-
-		}
-	}
-
-   /**
-    * For a given image file, get the respective resized filename
-    * no file existence check is done.
-    * @param string $fullpathfile the full path to the image file
-    * @param integer $width the intended width
-    * @param integer $height the intended height
-    * @param boolean $mkDir whether to attempt to make the resized_dir if it doesn't exist
-    * @return string of the resized filename
-    */
-	function getResizedName($fullpathfile, $width, $height, $mkDir = TRUE)
-	{
-		$path_parts = pathinfo($fullpathfile);
-
-		$thumbnail = $this->config['resized_prefix']."_{$width}x{$height}_{$path_parts['basename']}";
-
-		if( strlen(trim($this->config['resized_dir'])) == 0 || $this->config['safe_mode'] == true )
-		{
-			Return Files::makeFile($path_parts['dirname'],$thumbnail);
-		}
-		else
-		{
-      $path = Files::makePath($path_parts['dirname'],$this->config['resized_dir']);
-      if($mkDir && !is_dir($path))
-        Files::createFolder($path);
-      Return Files::makeFile($path,$thumbnail);
-		}
-	}
-
-	/**
-	 * Check if the given path is part of the subdirectories
-	 * under the base_dir.
-	 * @param string $path the relative path to be checked
-	 * @return boolean true if the path exists, false otherwise
-	 */
-	function validRelativePath($path) 
-	{
-		$dirs = $this->getDirs();
-		if($path == '/')
-			Return true;
-		//check the path given in the url against the 
-		//list of paths in the system.
-		for($i = 0; $i < count($dirs); $i++)
-		{
-			$key = key($dirs);
-			//we found the path
-			if($key == $path)
-				Return true;
-		
-			next($dirs);
-		}		
-		Return false;
-	}
-
-	/**
-	 * Process uploaded files, assumes the file is in 
-	 * $_FILES['upload'] and $_POST['dir'] is set.
-	 * The dir must be relative to the base_dir and exists.
-	 * @return null
-	 */
-	function processUploads() 
-	{
-		if($this->isValidBase() == false)
-			return;
-
-		$relative = null;
-
-		if(isset($_POST['dir'])) 
-			$relative = rawurldecode($_POST['dir']);
-		else
-			return;
-
-		//check for the file, and must have valid relative path
-		if(isset($_FILES['upload']) && $this->validRelativePath($relative))
-		{
-			Return $this->_processFiles($relative, $_FILES['upload']);
-		}
-	}
-
-	/**
-	 * Process upload files. The file must be an 
-	 * uploaded file. Any duplicate
-	 * file will be renamed. See Files::copyFile for details
-	 * on renaming.
-	 * @param string $relative the relative path where the file
-	 * should be copied to.
-	 * @param array $file the uploaded file from $_FILES
-	 * @return boolean true if the file was processed successfully, 
-	 * false otherwise
-	 */
-	function _processFiles($relative, $file)
-	{
-		
-		if($file['error']!=0)
-		{
-			Return false;
-		}
-
-		if(!is_file($file['tmp_name']))
-		{
-			Return false;
-		}
-
-		if(!is_uploaded_file($file['tmp_name']))
-		{
-			Files::delFile($file['tmp_name']);
-			Return false;
-		}
-
-        $valid_extensions = $this->mode == 'image' ? $this->config['allowed_image_extensions'] : $this->config['allowed_link_extensions'];
-        $max_size = $this->mode == 'image' ? $this->config['max_filesize_kb_image'] : $this->config['max_filesize_kb_link'];
-		$afruext = strtolower(substr(strrchr($file['name'], "."), 1));
-
-		if(!in_array($afruext, $valid_extensions))
-		{
-			Files::delFile($file['tmp_name']);
-			Return 'Cannot upload $extension='.$afruext.'$ Files. Permission denied.';
-		}
-
-		if($file['size']>($max_size*1024))
-		{
-			Files::delFile($file['tmp_name']);
-			Return 'Unble to upload file. Maximum file size [$max_size='.$max_size.'$ KB] exceeded.';
-		}
-
-		if(!empty($this->config['max_foldersize_mb']) &&  (Files::dirSize($this->getImagesDir()))+$file['size']> ($this->config['max_foldersize_mb']*1048576))
-		{
-			Files::delFile($file['tmp_name']);
-			Return ("Cannot upload. Maximum folder size reached. Delete unwanted files and try again.");
-		}
-
-		//now copy the file
-		$path = Files::makePath($this->getImagesDir(),$relative);
-		$result = Files::copyFile($file['tmp_name'], $path, $file['name']);
-
-		//no copy error
-		if(!is_int($result))
-		{
-			Files::delFile($file['tmp_name']);
-			Return 'File "$file='.$file['name'].'$" successfully uploaded.';
-		}
-
-		//delete tmp files.
-		Files::delFile($file['tmp_name']);
-		Return false;
-
-	}
-
-
-	function getDiskInfo()
-	{
-        if (empty($this->config['max_foldersize_mb']))
-            return '';
-            
-		$tmpFreeSize=($this->config['max_foldersize_mb']*1048576)-Files::dirSize($this->getImagesDir());
-
-		if(!is_numeric($tmpFreeSize) || $tmpFreeSize<0)	$tmpFreeSize=0;
-        
-		Return 'Total Size : $max_foldersize_mb='.$this->config['max_foldersize_mb'].'$ MB, Free Space: $free_space='.Files::formatSize($tmpFreeSize).'$';
-	}
-
-
-
-	/**
-	 * Get the URL of the relative file.
-	 * basically appends the relative file to the 
-	 * base_url given in config.inc.php
-	 * @param string $relative a file the relative to the base_dir
-	 * @return string the URL of the relative file.
-	 */
-	function getFileURL($relative) 
-	{
-		Return Files::makeFile($this->getImagesURL(),$relative);
-	}
-
-	/**
-	 * Get the fullpath to a relative file.
-	 * @param string $relative the relative file.
-	 * @return string the full path, .ie. the base_dir + relative.
-	 */
-	function getFullPath($relative) 
-	{
-		Return Files::makeFile($this->getImagesDir(),$relative);;
-	}
-
-	/**
-	 * Get the default thumbnail.
-	 * @return string default thumbnail, empty string if 
-	 * the thumbnail doesn't exist.
-	 */
-	function getDefaultThumb() 
-	{
-		if(is_file($this->config['default_thumbnail']))
-			Return $this->config['default_thumbnail'];
-		else 
-			Return '';
-	}
-
-
-	/**
-	 * Checks image size. If the image size is less than default size
-	 * returns the original size else returns default size to display thumbnail
-	*/
-	function checkImageSize($relative)
-	{
-		$fullpath = Files::makeFile($this->getImagesDir(),$relative);
-
-		$afruext = strtolower(substr(strrchr($relative, "."), 1));
-		
-		if(!in_array($afruext,$this->config['thumbnail_extensions']))
-		{
-			$imgInfo=array(0,0);
-			Return $imgInfo;
-		}
-		else
-		{
-			$imgInfo = @getImageSize($fullpath);
-			//not an image
-			if(!is_array($imgInfo))
-			{
-				$imgInfo=array(0,0);
-				Return $imgInfo;
-			}
-			else
-			{
-				if($imgInfo[0] > $this->config['thumbnail_width'])
-				$imgInfo[0] = $this->config['thumbnail_width'];
-
-				if($imgInfo[1] > $this->config['thumbnail_height'])
-				$imgInfo[1] = $this->config['thumbnail_height'];
-
-				Return $imgInfo;
-			}
-		}
-
-	}
-
-
-	/**
-	 * Get the thumbnail url to be displayed. 
-	 * If the thumbnail exists, and it is up-to-date
-	 * the thumbnail url will be returns. If the 
-	 * file is not an image, a default image will be returned.
-	 * If it is an image file, and no thumbnail exists or 
-	 * the thumbnail is out-of-date (i.e. the thumbnail 
-	 * modified time is less than the original file)
-	 * then a thumbs.php?img=filename.jpg is returned.
-	 * The thumbs.php url will generate a new thumbnail
-	 * on the fly. If the image is less than the dimensions
-	 * of the thumbnails, the image will be display instead.
-	 * @param string $relative the relative image file.
-	 * @return string the url of the thumbnail, be it
-	 * actually thumbnail or a script to generate the
-	 * thumbnail on the fly.
-	 */
-	function getThumbnail($relative) 
-	{
-		global $IMConfig;
-		
-		$fullpath = Files::makeFile($this->getImagesDir(),$relative);
-
-		//not a file???
-		if(!is_file($fullpath))
-			Return $this->getDefaultThumb();
-
-		$afruext = strtolower(substr(strrchr($relative, "."), 1));
-		
-		if(!in_array($afruext,$this->config['thumbnail_extensions']))
-		{
-			if(is_file('icons/'.$afruext.'.gif')) 
-				Return('icons/'.$afruext.'.gif');
-			else
-				Return $this->getDefaultThumb();
-		}
-
-		$imgInfo = @getImageSize($fullpath);
-
-		//not an image
-		if(!is_array($imgInfo))
-			Return $this->getDefaultThumb();
-
-
-		//Returning original image as thumbnail without Image Library by Afru
-		if(!$this->config['img_library']) Return $this->getFileURL($relative);
-
-
-		//the original image is smaller than thumbnails,
-		//so just return the url to the original image.
-		if ($imgInfo[0] <= $this->config['thumbnail_width']
-		 && $imgInfo[1] <= $this->config['thumbnail_height'])
-			Return $this->getFileURL($relative);
-
-		$thumbnail = $this->getThumbName($fullpath);
-		
-		//check for thumbnails, if exists and
-		// it is up-to-date, return the thumbnail url
-		if(is_file($thumbnail))
-		{
-			if(filemtime($thumbnail) >= filemtime($fullpath))
-				Return $this->getThumbURL($relative);
-		}
-
-		//well, no thumbnail was found, so ask the thumbs.php
-		//to generate the thumbnail on the fly.
-		Return $IMConfig['backend_url'] . '__function=thumbs&img='.rawurlencode($relative)."&mode=$this->mode";
-	}
-
-	/**
-	 * Delete and specified files.
-	 * @return boolean true if delete, false otherwise
-	 */
-	function deleteFiles() 
-	{
-		if(isset($_GET['delf']))
-			return $this->_delFile(rawurldecode($_GET['delf']));
-        return false;
-	}
-
-	/**
-	 * Delete and specified directories.
-	 * @return boolean true if delete, false otherwise
-	 */
-	function deleteDirs() 
-	{
-		 if(isset($_GET['deld']))
-			return $this->_delDir(rawurldecode($_GET['deld']));		
-		 else
-			 Return false;
-	}
-
-	/**
-	 * Delete the relative file, and any thumbnails.
-	 * @param string $relative the relative file.
-	 * @return boolean true if deleted, false otherwise.
-	 */
-	function _delFile($relative) 
-	{
-		$fullpath = Files::makeFile($this->getImagesDir(),$relative);
-	
-		$afruext = strtolower(substr(strrchr($relative, "."), 1));
-
-        $valid_extensions = $this->mode == 'image' ? $this->config['allowed_image_extensions'] : $this->config['allowed_link_extensions'];
-
-		if(!in_array($afruext,$valid_extensions))
-		{
-			return false;
-		}
-
-		//check that the file is an image
-		if(is_array($this->getImageInfo($fullpath)))
-		{
-			$thumbnail = $this->getThumbName($fullpath);
-			Files::delFile($thumbnail);
-		}
-
-		Return Files::delFile($fullpath);
-	}
-
-	/**
-	 * Delete directories recursively.
-	 * @param string $relative the relative path to be deleted.
-	 * @return boolean true if deleted, false otherwise.
-	 */
-	function _delDir($relative) 
-	{
-		$fullpath = Files::makePath($this->getImagesDir(),$relative);
-	//	if($this->countFiles($fullpath) <= 0)
-			return Files::delFolder($fullpath,true); //delete recursively.
-		//else
-			//Return false;
-	}
-
-	/**
-	 * Create new directories.
-	 * If in safe_mode, nothing happens.
-	 * @return boolean true if created, false otherwise.
-	 */
-	function processNewDir() 
-	{
-		if($this->config['safe_mode'] == true)
-			Return false;
-
-		if(isset($_GET['newDir']) && isset($_GET['dir']))
-		{
-			$newDir = rawurldecode($_GET['newDir']);
-			$dir = rawurldecode($_GET['dir']);
-			$path = Files::makePath($this->getImagesDir(),$dir);
-			$fullpath = Files::makePath($path, Files::escape($newDir));
-			if(is_dir($fullpath))
-				Return false;
-
-			Return Files::createFolder($fullpath);
-		}
-	}
-
-	/**
-	 * Renames files if certain GET variables are set
-	 * @return bool
-	 */
-	function processRenames()
-	{
-		if(!empty($_GET['rename']) && !empty($_GET['renameTo']))
-		{
-			// new file name (without path and extension)
-			$newName = Files::escape(rawurldecode($_GET['renameTo']));
-			$newName = str_replace('.', '', $newName);
-
-			// path to file (from base images directory)
-			$oldName = rawurldecode($_GET['rename']);
-
-			// strip parent dir ("..") to avoid escaping from base directiory
-			$oldName = preg_replace('#\.\.#', '', $oldName);
-
-			if (is_dir($oldPath = Files::makeFile($this->getImagesDir(), $_GET['dir'].$oldName)))
-			{
-				$newPath = Files::makeFile($this->getImagesDir(), $_GET['dir'].$newName);
-				return Files::rename($oldPath,$newPath);
-			}
-			else 
-			{
-				// path to old file
-				$oldPath = Files::makeFile($this->getImagesDir(), $oldName);
-	
-				$ret = Files::renameFile($oldPath, $newName);
-				if ($ret === true) {
-					// delete old thumbnail
-					Files::delFile($this->getThumbname($oldPath));
-				}
-			}
-			return $ret;
-		}
-		
-		return null;
-	}
-
-	function processPaste()
-	{
-		switch ($_GET['paste'])
-		{
-			case 'copyFile':
-				$src = Files::makeFile($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
-				$file = $_GET['file'];
-				$dest = Files::makeFile($this->getImagesDir(), $_GET['dir']);
-				return Files::copyFile($src,$dest,$file);
-			break;
-			case 'copyDir':
-				$basePath = $this->getImagesDir();
-				$src = $_GET['srcdir'].$_GET['file'];
-				$dest = $_GET['dir'].$_GET['file'];
-				return Files::copyDir($basePath,$src,$dest);
-			break;
-			case 'moveFile':
-				$src = Files::makePath($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
-				$dest = Files::makePath($this->getImagesDir(), $_GET['dir'].$_GET['file']);
-				return Files::rename($src,$dest);
-			break;
-			case 'moveDir':
-				$src = Files::makeFile($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
-				$dest = Files::makeFile($this->getImagesDir(), $_GET['dir'].$_GET['file']);
-				return Files::rename($src,$dest);
-			break;
-		}
-	}
-}
-
-?>
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/Readme.txt b/web/imcms/xinha/plugins/ExtendedFileManager/Readme.txt
deleted file mode 100644
index ea19a87eb7..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/Readme.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-Package : Extended File Manager EFM 1.1.1
-
-Version 1.1 created from 1.0 beta by Krzysztof Kotowicz <koto@webworkers.pl>
-
-Overview :
-----------
-
-Extended File Manager is an advanced plugin for Xinha 
-
-It works in two different modes.
-1). Insert Image Mode and 
-2). Insert File Link Mode.
-
-In Insert Image Mode, it replaces the basic insert image functionality of Xinha with its advanced image manager.
-
-If Insert File Link Mode is enabled, a new icon will be added to the toolbar with advanced file linking capability.
-
-
-
-Complete Features :
--------------------
-* Easy config.inc file that enables individual options for both modes.
-* Thumnail View 
-* List View 
-* Nice icons for both views 
-* Create Folders 
-* Vertical Scrolling 
-* Allowed extensions to view or upload.
-* File Uploads 
-* Max File upload limit 
-* Max Upload Folder size (Including all subfolders and files. A must see option.)
-* Dynamic display of available free space in the Upload Folder 
-* Dynamic Thumbnails using Image libraries or browser resize 
-* Image Editor (Actually done by Wei...a great addon) 
-* Can be used to insert images along with properties. 
-* Can be used to insert link to non-image files like pdf or zip.
-* You can specify image margin / padding / background and border colors
-* You may edit Alt/title tags for inserted images
-
-(Most of the features can be enabled/disabled as needed)
-
-Installation :
---------------
-
-Installing involves extracting the archive to 'plugins' subdirectory of Xinha
-and selecting the plugin in appropriate xinha_plugins list.
-
-Plugin may be configured via xinha_config.ExtendedFileManager object.
-Look into ImageManager plugin documentation as this plugin uses almost identical
-settings. All available options can be found in the file config.inc.php.
-
-// only snippets of code from initializing file shown below
-
-
-  xinha_plugins = xinha_plugins ? xinha_plugins :
-  [
-   'ContextMenu',
-   'SuperClean',
-   'CharacterMap',
-   'GetHtml',
-   'ExtendedFileManager',
-   /*'ImageManager',*/  // replace image manager with EFM
-   'Linker'
-  ];
-
-...
-
-//If you don't want to add a button for linking files and use only the advanced ImageManager
-xinha_config.ExtendedFileManager.use_linker = false;
-// pass the configuration to plugin
-if (xinha_config.ExtendedFileManager) {
-   	    with (xinha_config.ExtendedFileManager)
-        {
-            <?php
-
-            // define backend configuration for the plugin
-            $IMConfig = array();
-            $IMConfig['images_dir'] = '<images dir>';
-            $IMConfig['images_url'] = '<images url>';
-            $IMConfig['files_dir'] = '<files dir>';
-            $IMConfig['files_url'] = '<files url>';
-            $IMConfig['thumbnail_prefix'] = 't_';
-            $IMConfig['thumbnail_dir'] = 't';
-            $IMConfig['resized_prefix'] = 'resized_';
-            $IMConfig['resized_dir'] = '';
-            $IMConfig['tmp_prefix'] = '_tmp';
-            $IMConfig['max_filesize_kb_image'] = 2000;
-            // maximum size for uploading files in 'insert image' mode (2000 kB here)
-
-            $IMConfig['max_filesize_kb_link'] = 5000;
-            // maximum size for uploading files in 'insert link' mode (5000 kB here)
-
-            // Maximum upload folder size in Megabytes.
-            // Use 0 to disable limit
-            $IMConfig['max_foldersize_mb'] = 0;
-            
-            $IMConfig['allowed_image_extensions'] = array("jpg","gif","png");
-            $IMConfig['allowed_link_extensions'] = array("jpg","gif","pdf","ip","txt",
-                                                         "psd","png","html","swf",
-                                                         "xml","xls");
-
-            require_once '/path/to/xinha/contrib/php-xinha.php';
-            xinha_pass_to_php_backend($IMConfig);
-            
-            ?>
-        }
-}
-
-=====
-afrusoft@gmail.com - author of EFM 1.0 beta
-koto@webworkers.pl - EFM 1.1 (most of the code taken from Xinha codebase)
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/EditorContent.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/EditorContent.js
deleted file mode 100644
index 40a4b4637b..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/EditorContent.js
+++ /dev/null
@@ -1,739 +0,0 @@
-/**
- * ImageEditor Interface file.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-
-function MM_findObj(n, d) { //v4.01
-  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
-    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
-  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
-  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
-  if(!x && d.getElementById) x=d.getElementById(n); return x;
-}
-
-var pic_x, pic_y;
-function P7_Snap() { //v2.62 by PVII
-  var x,y,ox,bx,oy,p,tx,a,b,k,d,da,e,el,args=P7_Snap.arguments;a=parseInt(a);
-  for (k=0; k<(args.length-3); k+=4)
-   if ((g=MM_findObj(args[k]))!=null) {
-    el=eval(MM_findObj(args[k+1]));
-    a=parseInt(args[k+2]);b=parseInt(args[k+3]);
-    x=0;y=0;ox=0;oy=0;p="";tx=1;da="document.all['"+args[k]+"']";
-    if(document.getElementById) {
-     d="document.getElementsByName('"+args[k]+"')[0]";
-     if(!eval(d)) {d="document.getElementById('"+args[k]+"')";if(!eval(d)) {d=da;}}
-    }else if(document.all) {d=da;}
-    if (document.all || document.getElementById) {
-     while (tx==1) {p+=".offsetParent";
-      if(eval(d+p)) {x+=parseInt(eval(d+p+".offsetLeft"));y+=parseInt(eval(d+p+".offsetTop"));
-      }else{tx=0;}}
-     ox=parseInt(g.offsetLeft);oy=parseInt(g.offsetTop);var tw=x+ox+y+oy;
-     if(tw==0 || (navigator.appVersion.indexOf("MSIE 4")>-1 && navigator.appVersion.indexOf("Mac")>-1)) {
-      ox=0;oy=0;if(g.style.left){x=parseInt(g.style.left);y=parseInt(g.style.top);
-      }else{var w1=parseInt(el.style.width);bx=(a<0)?-5-w1:-10;
-      a=(Math.abs(a)<1000)?0:a;b=(Math.abs(b)<1000)?0:b;
-      //alert(event.clientX);
-      if (event == null) x=document.body.scrollLeft + bx;
-        else x=document.body.scrollLeft + event.clientX + bx;
-      if (event == null) y=document.body.scrollTop;
-        else y=document.body.scrollTop + event.clientY;}}
-   }else if (document.layers) {x=g.x;y=g.y;var q0=document.layers,dd="";
-    for(var s=0;s<q0.length;s++) {dd='document.'+q0[s].name;
-     if(eval(dd+'.document.'+args[k])) {x+=eval(dd+'.left');y+=eval(dd+'.top');break;}}}
-   if(el) {e=(document.layers)?el:el.style;
-   var xx=parseInt(x+ox+a),yy=parseInt(y+oy+b);
-   //alert(xx+":"+yy);
-   if(navigator.appName=="Netscape" && parseInt(navigator.appVersion)>4){xx+="px";yy+="px";}
-   if(navigator.appVersion.indexOf("MSIE 5")>-1 && navigator.appVersion.indexOf("Mac")>-1){
-    xx+=parseInt(document.body.leftMargin);yy+=parseInt(document.body.topMargin);
-    xx+="px";yy+="px";}e.left=xx;e.top=yy;}
-    pic_x = parseInt(xx); pic_y = parseInt(yy);
-    //alert(xx+":"+yy);
-    }
-}
-
-var ie=document.all;
-var ns6=document.getElementById&&!document.all;
-
-var dragapproved=false;
-var z,x,y,status, ant, canvas, content, pic_width, pic_height, image, resizeHandle, oa_w, oa_h, oa_x, oa_y, mx2, my2;
-
-function init_resize()
-{
-    if(mode == "scale")
-    {
-        P7_Snap('theImage','ant',0,0);
-
-        if (canvas == null)
-            canvas = MM_findObj("imgCanvas");
-
-        if (pic_width == null || pic_height == null)
-        {
-            image = MM_findObj("theImage");
-            pic_width = image.width;
-            pic_height = image.height;
-        }
-
-        if (ant == null)
-            ant = MM_findObj("ant");
-
-        ant.style.left = pic_x; ant.style.top = pic_y;
-        ant.style.width = pic_width; ant.style.height = pic_height;
-        ant.style.visibility = "visible";
-
-        drawBoundHandle();
-        jg_doc.paint();
-    }
-}
-
-initEditor = function ()
-{
-    init_crop();
-    init_resize();
-    var markerImg = MM_findObj('markerImg', window.top.document);
-
-    if (markerImg.src.indexOf("img/t_white.gif")>0)
-        toggleMarker() ;
-}
-
-function init_crop()
-{
-    //if(mode == "crop") {
-        P7_Snap('theImage','ant',0,0);
-    //}
-}
-
-function setMode(newMode)
-{
-    mode = newMode;
-    reset();
-}
-
-function reset()
-{
-    if (ant == null)
-        ant = MM_findObj("ant");
-
-    ant.style.visibility = "hidden";
-    ant.style.left = 0;
-    ant.style.top = 0;
-    ant.style.width = 0;
-    ant.style.height = 0;
-
-    mx2 = null;
-    my2 = null;
-
-    jg_doc.clear();
-    if(mode != 'measure')
-        showStatus();
-
-    if(mode == "scale") {
-        init_resize();
-    }
-
-    P7_Snap('theImage','ant',0,0);
-}
-
-function toggleMarker()
-{
-    //alert("Toggle");
-    if (ant == null)
-        ant = MM_findObj("ant");
-
-    if(ant.className=="selection")
-        ant.className="selectionWhite";
-    else
-        ant.className="selection";
-
-    if (jg_doc.getColor() == "#000000")
-        jg_doc.setColor("#FFFFFF");
-    else
-        jg_doc.setColor("#000000");
-
-    drawBoundHandle
-    jg_doc.paint();
-}
-
-function move(e)
-{
-    if (dragapproved)
-    {
-        //z.style.left=ns6? temp1+e.clientX-x: temp1+event.clientX-x
-        //z.style.top=ns6? temp2+e.clientY-y : temp2+event.clientY-y
-        var w = ns6? temp1+e.clientX - x : temp1+event.clientX - x;
-        var h = ns6? temp2+e.clientY - y : temp2+event.clientY - y;
-
-        //alert(canvas.style.left);
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" w:"+w+" h:"+h+" can_h:"+pic_height;
-            status.innerHTML += " can_w:"+pic_width+" px:"+pic_x+" py:"+pic_y;
-            status.innerHTML += " pix:"+image.style.left+" piy:"+image.style.top+" obj:"+obj.id;
-        }*/
-
-        /*jg_doc.clear();
-        jg_doc.fillRectPattern(0,0,Math.abs(w),Math.abs(h),pattern);
-        jg_doc.paint();
-*/
-        if (ant != null)
-        {
-            if (w >= 0)
-            {
-                ant.style.left = x;
-                ant.style.width = w;
-            }
-            else
-            {
-                ant.style.left = x+w;
-                ant.style.width = -1*w;
-            }
-
-            if (h >= 0)
-            {
-                ant.style.top = y;
-                ant.style.height = h;
-            }
-            else
-            {
-                ant.style.top = y+h;
-                ant.style.height = -1*h
-            }
-        }
-
-        showStatus();
-        return false
-    }
-}
-
-function moveContent(e)
-{
-    if (dragapproved)
-    {
-
-        var dx =ns6? oa_x + e.clientX-x: oa_x + event.clientX-x
-        var dy =ns6? oa_y + e.clientY-y : oa_y + event.clientY-y
-
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" dx:"+dx+" dy:"+dy;
-        }*/
-
-        ant.style.left = dx;
-        ant.style.top = dy;
-
-        showStatus();
-
-        return false;
-    }
-}
-
-//Code add for constraints by Frédéric Klee <fklee@isuisse.com>
-function moveHandle(e)
-{
-    if (dragapproved)
-    {
-        var w = ns6? e.clientX - x : event.clientX - x;
-        var h = ns6? e.clientY - y : event.clientY - y;
-
-        var constrained = MM_findObj('constProp', window.top.document);
-        var orginal_height = document.theImage.height ;
-        var orginal_width = document.theImage.width ;
-        rapp = orginal_width/orginal_height ;
-        rapp_inv = orginal_height / orginal_width ;
-
-        switch(resizeHandle)
-        {
-
-            case "s-resize":
-                if (oa_h + h >= 0)
-                {
-                    ant.style.height = oa_h + h;
-                    if(constrained.checked)
-                    {
-                        ant.style.width = rapp * (oa_h + h) ;
-                        ant.style.left = oa_x - rapp * h/2;
-                    }
-
-                }
-                break;
-            case "e-resize":
-                if(oa_w + w >= 0)
-                {
-                    ant.style.width = oa_w + w;
-                    if(constrained.checked)
-                    {
-                        ant.style.height = rapp_inv * (oa_w + w) ;
-                        ant.style.top = oa_y - rapp_inv * w/2;
-                    }
-
-                }
-                break;
-            case "n-resize":
-                if (oa_h - h >= 0)
-                {
-                    ant.style.top = oa_y + h;
-                    ant.style.height = oa_h - h;
-                    if(constrained.checked)
-                    {
-                        ant.style.width = rapp * (oa_h - h) ;
-                        ant.style.left = oa_x + rapp * h/2;
-                    }
-
-                }
-                break;
-            case "w-resize":
-                if(oa_w - w >= 0)
-                {
-                    ant.style.left = oa_x + w;
-                    ant.style.width = oa_w - w;
-                    if(constrained.checked)
-                    {
-                        ant.style.height = rapp_inv * (oa_w - w) ;
-                        ant.style.top = oa_y + rapp_inv * w/2;
-                    }
-
-                }break;
-            case "nw-resize":
-                if(oa_h - h >= 0 && oa_w - w >= 0) {
-                    ant.style.left = oa_x + w;
-                    ant.style.width = oa_w - w;
-                    ant.style.top = oa_y + h;
-                    if(constrained.checked)
-                        ant.style.height = rapp_inv * (oa_w - w) ;
-                    else
-                        ant.style.height = oa_h - h;
-                }
-            break;
-            case "ne-resize":
-                if (oa_h - h >= 0 && oa_w + w >= 0){
-                    ant.style.top = oa_y + h;
-                    ant.style.width = oa_w + w;
-                    if(constrained.checked)
-                        ant.style.height = rapp_inv * (oa_w + w) ;
-                    else
-                        ant.style.height = oa_h - h;
-                }
-                break;
-            case "se-resize":
-                if (oa_h + h >= 0 && oa_w + w >= 0)
-                {
-                    ant.style.width = oa_w + w;
-                    if(constrained.checked)
-                        ant.style.height = rapp_inv * (oa_w + w) ;
-                    else
-                        ant.style.height = oa_h + h;
-                }
-                break;
-            case "sw-resize":
-                if (oa_h + h >= 0 && oa_w - w >= 0)
-                {
-                    ant.style.left = oa_x + w;
-                    ant.style.width = oa_w - w;
-                    if(constrained.checked)
-                        ant.style.height = rapp_inv * (oa_w - w) ;
-                    else
-                       ant.style.height = oa_h + h;
-                }
-        }
-
-        showStatus();
-        return false;
-
-    }
-}
-
-function drags(e)
-{
-    if (!ie&&!ns6)
-        return
-
-    var firedobj=ns6? e.target : event.srcElement
-    var topelement=ns6? "HTML" : "BODY"
-
-    while (firedobj.tagName!=topelement&&
-            !(firedobj.className=="crop"
-                || firedobj.className=="handleBox"
-                || firedobj.className=="selection" || firedobj.className=="selectionWhite"))
-    {
-        firedobj=ns6? firedobj.parentNode : firedobj.parentElement
-    }
-
-    if(firedobj.className=="handleBox") {
-
-        if(content != null) {
-            if(content.width != null && content.height != null) {
-                content.width = 0;
-                content.height = 0;
-            }
-            //alert(content.width+":"+content.height);
-        }
-        resizeHandle = firedobj.id;
-
-        /*if(status!=null) {
-            status.innerHTML  = " obj:"+firedobj.id;
-        }*/
-
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
-
-        oa_w = parseInt(ant.style.width);
-        oa_h = parseInt(ant.style.height);
-        oa_x = parseInt(ant.style.left);
-        oa_y = parseInt(ant.style.top);
-
-        dragapproved=true
-        document.onmousemove=moveHandle;
-        return false;
-    }
-    else
-    if((firedobj.className == "selection" || firedobj.className=="selectionWhite")&& mode == "crop") {
-
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
-
-        oa_x = parseInt(ant.style.left);
-        oa_y = parseInt(ant.style.top);
-
-        dragapproved=true
-        document.onmousemove=moveContent;
-        return false;
-    }
-    else
-    if (firedobj.className=="crop" && mode == "crop")
-    {
-        if(content != null) {
-            if(content.width != null && content.height != null) {
-                content.width = 0;
-                content.height = 0;
-            }
-            //alert(content.width+":"+content.height);
-        }
-
-        if (status == null)
-            status = MM_findObj("status");
-
-        if (ant == null)
-            ant = MM_findObj("ant");
-
-        if (canvas == null)
-            canvas = MM_findObj("imgCanvas");
-        if(content == null) {
-            content = MM_findObj("cropContent");
-        }
-
-        if (pic_width == null || pic_height == null)
-        {
-            image = MM_findObj("theImage");
-            pic_width = image.width;
-            pic_height = image.height;
-        }
-
-        ant.style.visibility = "visible";
-
-        obj = firedobj;
-        dragapproved=true
-        z=firedobj
-        temp1=parseInt(z.style.left+0)
-        temp2=parseInt(z.style.top+0)
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
-        document.onmousemove=move
-        return false
-    }
-        else if(firedobj.className=="crop" && mode == "measure") {
-
-            if (ant == null)
-                ant = MM_findObj("ant");
-
-            if (canvas == null)
-                canvas = MM_findObj("imgCanvas");
-
-            x=ns6? e.clientX: event.clientX
-            y=ns6? e.clientY: event.clientY
-
-                //jg_doc.draw
-            dragapproved=true
-            document.onmousemove=measure
-
-            return false
-        }
-}
-
-function measure(e)
-{
-    if (dragapproved)
-    {
-        mx2 = ns6? e.clientX : event.clientX;
-        my2 = ns6? e.clientY : event.clientY;
-
-        jg_doc.clear();
-        jg_doc.setStroke(Stroke.DOTTED);
-        jg_doc.drawLine(x,y,mx2,my2);
-        jg_doc.paint();
-        showStatus();
-        return false;
-    }
-}
-
-function setMarker(nx,ny,nw,nh)
-{
-    if (isNaN(nx)) nx = 0; 
-    if (isNaN(ny)) ny = 0; 
-    if (isNaN(nw)) nw = 0; 
-    if (isNaN(nh)) nh = 0; 
-
-    if (ant == null)
-        ant = MM_findObj("ant");
-
-    if (canvas == null)
-        canvas = MM_findObj("imgCanvas");
-    if(content == null) {
-        content = MM_findObj("cropContent");
-    }
-
-    if (pic_width == null || pic_height == null)
-    {
-        image = MM_findObj("theImage");
-        pic_width = image.width;
-        pic_height = image.height;
-    }
-
-    ant.style.visibility = "visible";
-
-    nx = pic_x + nx;
-    ny = pic_y + ny;
-
-    if (nw >= 0)
-    {
-        ant.style.left = nx;
-        ant.style.width = nw;
-    }
-    else
-    {
-        ant.style.left = nx+nw;
-        ant.style.width = -1*nw;
-    }
-
-    if (nh >= 0)
-    {
-        ant.style.top = ny;
-        ant.style.height = nh;
-    }
-    else
-    {
-        ant.style.top = ny+nh;
-        ant.style.height = -1*nh
-    }
-
-}
-
-function max(x,y)
-{
-    if(y > x)
-        return x;
-    else
-        return y;
-}
-
-function drawBoundHandle()
-{
-    if(ant == null || ant.style == null)
-        return false;
-
-    var ah = parseInt(ant.style.height);
-    var aw = parseInt(ant.style.width);
-    var ax = parseInt(ant.style.left);
-    var ay = parseInt(ant.style.top);
-
-    jg_doc.drawHandle(ax-15,ay-15,30,30,"nw-resize"); //upper left
-    jg_doc.drawHandle(ax-15,ay+ah-15,30,30,"sw-resize"); //lower left
-    jg_doc.drawHandle(ax+aw-15,ay-15,30,30,"ne-resize"); //upper right
-    jg_doc.drawHandle(ax+aw-15,ay+ah-15,30,30,"se-resize"); //lower right
-
-    jg_doc.drawHandle(ax+max(15,aw/10),ay-8,aw-2*max(15,aw/10),8,"n-resize"); //top middle
-    jg_doc.drawHandle(ax+max(15,aw/10),ay+ah,aw-2*max(15,aw/10),8,"s-resize"); //bottom middle
-    jg_doc.drawHandle(ax-8, ay+max(15,ah/10),8,ah-2*max(15,ah/10),"w-resize"); //left middle
-    jg_doc.drawHandle(ax+aw, ay+max(15,ah/10),8,ah-2*max(15,ah/10),"e-resize"); //right middle
-
-    jg_doc.drawHandleBox(ax-4,ay-4,8,8,"nw-resize"); //upper left
-    jg_doc.drawHandleBox(ax-4,ay+ah-4,8,8,"sw-resize"); //lower left
-    jg_doc.drawHandleBox(ax+aw-4,ay-4,8,8,"ne-resize"); //upper right
-    jg_doc.drawHandleBox(ax+aw-4,ay+ah-4,8,8,"se-resize"); //lower right
-
-    jg_doc.drawHandleBox(ax+aw/2-4,ay-4,8,8,"n-resize"); //top middle
-    jg_doc.drawHandleBox(ax+aw/2-4,ay+ah-4,8,8,"s-resize"); //bottom middle
-    jg_doc.drawHandleBox(ax-4, ay+ah/2-4,8,8,"w-resize"); //left middle
-    jg_doc.drawHandleBox(ax+aw-4, ay+ah/2-4,8,8,"e-resize"); //right middle
-
-    //jg_doc.paint();
-}
-
-function showStatus()
-{
-    if(ant == null || ant.style == null) {
-        return false;
-    }
-
-    if(mode == "measure") {
-        //alert(pic_x);
-        mx1 = x - pic_x;
-        my1 = y - pic_y;
-
-        mw = mx2 - x;
-        mh = my2 - y;
-
-        md = parseInt(Math.sqrt(mw*mw + mh*mh)*100)/100;
-
-        ma = (Math.atan(-1*mh/mw)/Math.PI)*180;
-        if(mw < 0 && mh < 0)
-            ma = ma+180;
-
-        if (mw <0 && mh >0)
-            ma = ma - 180;
-
-        ma = parseInt(ma*100)/100;
-
-        if (m_sx != null && !isNaN(mx1))
-            m_sx.value = mx1+"px";
-        if (m_sy != null && !isNaN(my1))
-            m_sy.value = my1+"px";
-        if(m_w != null && !isNaN(mw))
-            m_w.value = mw + "px";
-        if(m_h != null && !isNaN(mh))
-            m_h.value = mh + "px";
-
-        if(m_d != null && !isNaN(md))
-            m_d.value = md + "px";
-        if(m_a != null && !isNaN(ma))
-            m_a.value = ma + "";
-
-        if(r_ra != null &&!isNaN(ma))
-            r_ra.value = ma;
-
-        //alert("mx1:"+mx1+" my1"+my1);
-        return false;
-    }
-
-    var ah = parseInt(ant.style.height);
-    var aw = parseInt(ant.style.width);
-    var ax = parseInt(ant.style.left);
-    var ay = parseInt(ant.style.top);
-
-    var cx = ax-pic_x<0?0:ax-pic_x;
-    var cy = ay-pic_y<0?0:ay-pic_y;
-    cx = cx>pic_width?pic_width:cx;
-    cy = cy>pic_height?pic_height:cy;
-
-    var cw = ax-pic_x>0?aw:aw-(pic_x-ax);
-    var ch = ay-pic_y>0?ah:ah-(pic_y-ay);
-
-    ch = ay+ah<pic_y+pic_height?ch:ch-(ay+ah-pic_y-pic_height);
-    cw = ax+aw<pic_x+pic_width?cw:cw-(ax+aw-pic_x-pic_width);
-
-    ch = ch<0?0:ch; cw = cw<0?0:cw;
-
-    if (ant.style.visibility == "hidden")
-    {
-        cx = ""; cy = ""; cw=""; ch="";
-    }
-
-    if(mode == 'crop') {
-        if(t_cx != null)
-            t_cx.value = cx;
-        if (t_cy != null)
-            t_cy.value = cy;
-        if(t_cw != null)
-            t_cw.value = cw;
-        if (t_ch != null)
-            t_ch.value = ch;
-    }
-    else if(mode == 'scale') {
-
-        var sw = aw, sh = ah;
-
-        if (s_sw.value.indexOf('%')>0 && s_sh.value.indexOf('%')>0)
-        {
-            sw = cw/pic_width;
-            sh = ch/pic_height;
-        }
-        if (s_sw != null)
-            s_sw.value = sw;
-        if (s_sh != null)
-            s_sh.value = sh;
-    }
-
-}
-
-function dragStopped()
-{
-    dragapproved=false;
-
-    if(ant == null || ant.style == null) {
-        return false;
-    }
-
-    if(mode == "measure") {
-        jg_doc.drawLine(x-4,y,x+4,y);
-        jg_doc.drawLine(x,y-4,x,y+4);
-        jg_doc.drawLine(mx2-4,my2,mx2+4,my2);
-        jg_doc.drawLine(mx2,my2-4,mx2,my2+4);
-
-        jg_doc.paint();
-        showStatus();
-        return false;
-    }
-        var ah = parseInt(ant.style.height);
-        var aw = parseInt(ant.style.width);
-        var ax = parseInt(ant.style.left);
-        var ay = parseInt(ant.style.top);
-        jg_doc.clear();
-
-        if(content != null) {
-            if(content.width != null && content.height != null) {
-                content.width = aw-1;
-                content.height = ah-1;
-            }
-            //alert(content.width+":"+content.height);
-        }
-        if(mode == "crop") {
-            //alert(pic_y);
-            jg_doc.fillRectPattern(pic_x,pic_y,pic_width,ay-pic_y,pattern);
-
-            var h1 = ah;
-            var y1 = ay;
-            if (ah+ay >= pic_height+pic_y)
-                h1 = pic_height+pic_y-ay;
-            else if (ay <= pic_y)
-            {
-                h1 = ay+ah-pic_y;
-                y1 = pic_y;
-            }
-            jg_doc.fillRectPattern(pic_x,y1,ax-pic_x,h1,pattern);
-            jg_doc.fillRectPattern(ax+aw,y1,pic_x+pic_width-ax-aw,h1,pattern);
-            jg_doc.fillRectPattern(pic_x,ay+ah,pic_width,pic_height+pic_y-ay-ah,pattern);
-        }
-        else if(mode == "scale") {
-            //alert("Resizing: iw:"+image.width+" nw:"+aw);
-            document.theImage.height = ah;
-            document.theImage.width = aw;
-            document.theImage.style.height = ah+" px";
-            document.theImage.style.width = aw+" px";
-
-            P7_Snap('theImage','ant',0,0);
-
-            //alert("After Resizing: iw:"+image.width+" nw:"+aw);
-        }
-
-        drawBoundHandle();
-        jg_doc.paint();
-
-        showStatus();
-    return false;
-}
-
-document.onmousedown=drags;
-document.onmouseup=dragStopped;
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/ImageEditor.css b/web/imcms/xinha/plugins/ExtendedFileManager/assets/ImageEditor.css
deleted file mode 100644
index 7cefe46cd7..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/ImageEditor.css
+++ /dev/null
@@ -1,76 +0,0 @@
-.icons {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-align: center;
-    text-decoration: none;
-    border: 1px solid #EEEEFF;
-    -Moz-Border-Radius: 6px 6px 6px 6px;
-}
-
-body, td, p {
-    font: 11px Tahoma,Verdana,sans-serif;
-}
-.iconsOver {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-align: center;
-    text-decoration: none;
-    background-color: #F9F9FF;
-    border: 1px solid #666699;
-    -Moz-Border-Radius: 6px 6px 6px 6px;
-}
-.topBar {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-}
-.iconsSel {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-align: center;
-    text-decoration: none;
-    border: 1px solid #666699;
-    -Moz-Border-Radius: 6px 6px 6px 6px;
-}
-.iconText {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-decoration: none;
-    text-align: center;
-}
-.measureStats{
-    width: 50px;
-}
-
-#slidercasing {
-    /*border:1px solid #CCCCCC;
-    background-color:#FFFFFF;*/
-    width:100px;
-    height:5px;
-    position:relative;
-    z-index:4;
-    padding:10px;
-}
-
-
-#slidertrack {
-    position:relative;
-    border:1px solid #CCCCCC;
-    background-color:#FFFFCC;
-    z-index:5;
-    height:5px;
-}
-
-
-#sliderbar {
-    position:absolute;
-    z-index:6;
-    border:1px solid #CCCCCC;
-    background-color:#DDDDDD;
-    width:15px;     
-    padding:0px;
-    height:20px; 
-    cursor: pointer;
-    top:2px;
-}
-
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/dialog.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/dialog.js
deleted file mode 100644
index 456785d853..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/dialog.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Dialog v3.0 - Copyright (c) 2003-2004 interactivetools.com, inc.
-// This copyright notice MUST stay intact for use (see license.txt).
-//
-// Portions (c) dynarch.com, 2003-2004
-//
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon.
-//   http://dynarch.com/mishoo
-//
-// $Id: dialog.js 677 2007-01-19 22:24:36Z ray $
-
-// Though "Dialog" looks like an object, it isn't really an object.  Instead
-// it's just namespace for protecting global symbols.
-
-function Dialog(url, action, init) {
-    if (typeof init == "undefined") {
-        init = window;  // pass this window object by default
-    }
-    Dialog._geckoOpenModal(url, action, init);
-}
-
-Dialog._parentEvent = function(ev) {
-    setTimeout( function() { if (Dialog._modal && !Dialog._modal.closed) { Dialog._modal.focus() } }, 50);
-    if (Dialog._modal && !Dialog._modal.closed) {
-        Dialog._stopEvent(ev);
-    }
-};
-
-// should be a function, the return handler of the currently opened dialog.
-Dialog._return = null;
-
-// constant, the currently opened dialog
-Dialog._modal = null;
-
-// the dialog will read it's args from this variable
-Dialog._arguments = null;
-
-Dialog._geckoOpenModal = function(url, action, init) {
-    //var urlLink = "hadialog"+url.toString();
-    var myURL = "hadialog"+url;
-    var regObj = /\W/g;
-    myURL = myURL.replace(regObj,'_');
-    var dlg = window.open(url, myURL,
-                  "toolbar=no,menubar=no,personalbar=no,width=10,height=10," +
-                  "scrollbars=no,resizable=yes,modal=yes,dependable=yes");
-    Dialog._modal = dlg;
-    Dialog._arguments = init;
-
-    // capture some window's events
-    function capwin(w) {
-        Dialog._addEvent(w, "click", Dialog._parentEvent);
-        Dialog._addEvent(w, "mousedown", Dialog._parentEvent);
-        Dialog._addEvent(w, "focus", Dialog._parentEvent);
-    };
-    // release the captured events
-    function relwin(w) {
-        Dialog._removeEvent(w, "click", Dialog._parentEvent);
-        Dialog._removeEvent(w, "mousedown", Dialog._parentEvent);
-        Dialog._removeEvent(w, "focus", Dialog._parentEvent);
-    };
-    capwin(window);
-    // capture other frames
-    for (var i = 0; i < window.frames.length; capwin(window.frames[i++]));
-    // make up a function to be called when the Dialog ends.
-    Dialog._return = function (val) {
-        if (val && action) {
-            action(val);
-        }
-        relwin(window);
-        // capture other frames
-        for (var i = 0; i < window.frames.length; relwin(window.frames[i++]));
-        Dialog._modal = null;
-    };
-};
-
-// event handling
-
-Dialog._addEvent = function(el, evname, func) {
-    if (Dialog.is_ie) {
-        el.attachEvent("on" + evname, func);
-    } else {
-        el.addEventListener(evname, func, true);
-    }
-};
-
-Dialog._removeEvent = function(el, evname, func) {
-    if (Dialog.is_ie) {
-        el.detachEvent("on" + evname, func);
-    } else {
-        el.removeEventListener(evname, func, true);
-    }
-};
-
-Dialog._stopEvent = function(ev) {
-    if (Dialog.is_ie) {
-        ev.cancelBubble = true;
-        ev.returnValue = false;
-    } else {
-        ev.preventDefault();
-        ev.stopPropagation();
-    }
-};
-
-Dialog.agt = navigator.userAgent.toLowerCase();
-Dialog.is_ie = ((Dialog.agt.indexOf("msie") != -1) && (Dialog.agt.indexOf("opera") == -1));
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editor.css b/web/imcms/xinha/plugins/ExtendedFileManager/assets/editor.css
deleted file mode 100644
index 1699a8cff7..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editor.css
+++ /dev/null
@@ -1,196 +0,0 @@
-		body
-		{
-			margin: 0; padding: 0;
-			font: 11px Tahoma,Verdana,sans-serif;
-		}
-		select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-
-		#indicator
-		{
-			width: 25px;
-			height: 20px;
-			background-color: #eef;			
-			padding: 15px 20px;
-			position: absolute;
-			left: 0; top: 0;
-		}
-		* html #indicator
-		{
-			padding: 14px 22px;
-		}
-		#tools
-		{
-			width: 600px;
-			height: 50px;
-			background-color: #eef;
-			padding: 0;
-			position: absolute;
-			left: 63px;
-			border-left: 1px solid white;
-			border-bottom: 1px solid white;
-		}
-		#toolbar
-		{
-			width: 53px;
-			height: 435px;
-			background-color: #eef;
-			float: left;
-			text-align: center;
-			padding: 5px;
-			position: absolute;
-			top: 50px;
-			border-top: 1px solid white;
-			border-right: 1px solid white;
-		}
-		
-		#contents
-		{
-			width: 600px;
-			height: 445px;
-			position: absolute;
-			left: 64px; top: 51px;
-		}
-		
-		#editor
-		{
-			width: 600px;
-			height: 445px;
-		}
-
-		#toolbar a 
-		{
-			padding: 5px;
-			width: 40px;
-			display: block;
-			border: 1px solid #eef;
-			text-align: center;
-			text-decoration: none;
-			color: #669;
-			margin: 5px 0;
-		}
-		#toolbar a:hover
-		{
-			background-color: #F9F9FF;
-			border-color: #669;
-		}
-		
-		#toolbar a.iconActive
-		{
-			border-color: #669;
-		}
-
-		#toolbar a span
-		{
-			display: block;
-			text-decoration: none;
-			
-		}
-		#toolbar a img
-		{
-			border: 0 none;
-		}
-		
-		#tools .textInput
-		{
-			width: 3em;
-			vertical-align: 0px;
-
-		}
-		* html #tools .textInput
-		{
-			vertical-align: middle;
-		}
-		#tools .measureStats
-		{
-			width: 4.5em;
-			border: 0 none;
-			background-color: #eef;
-			vertical-align: 0px;
-		}
-		* html #tools .measureStats
-		{
-			vertical-align: middle;
-		}
-		#tools label
-		{
-			margin: 0 2px 0 5px;
-		}
-		#tools input
-		{
-			vertical-align: middle;
-		}
-		#tools #tool_inputs
-		{
-			padding-top: 10px;
-			float: left;			
-		}
-		#tools .div
-		{
-			vertical-align: middle;
-			margin: 0 5px;
-		}
-		#tools img
-		{
-			border: 0 none;
-		}
-		#tools a.buttons
-		{
-			margin-top: 10px;
-			border: 1px solid #eef;
-			display: block;
-			float: left;
-		}
-		#tools a.buttons:hover
-		{
-			background-color: #F9F9FF;
-			border-color: #669;
-		}
-		#slidercasing {
-    /*border:1px solid #CCCCCC;
-    background-color:#FFFFFF;*/
-    width:100px;
-    height:5px;
-    position:relative;
-    z-index:4;
-    padding:10px;
-	 top: 6px;
-	 margin: 0 -5px 0 -10px;
-
-	
-}
-
-
-#slidertrack {
-    position:relative;
-    border:1px solid #CCCCCC;
-    background-color:#FFFFCC;
-    z-index:5;
-    height:5px;
-}
-
-
-#sliderbar {
-    position:absolute;
-    z-index:6;
-    border:1px solid #CCCCCC;
-    background-color:#DDDDDD;
-    width:15px;     
-    padding:0px;
-    height:20px; 
-    cursor: pointer;
-    top:2px;
-}
-
-* html #slidercasing
-{
-	top:0;
-}
-
-
-#bottom
-{
-	position: relative;
-	top: 490px;
-}
-
-#save_filename {width: 100px;}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editor.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/editor.js
deleted file mode 100644
index 45c92a5b99..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editor.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Functions for the ImageEditor interface, used by editor.php only
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-
-var current_action = null;
-var actions = ['crop', 'scale', 'rotate', 'measure', 'save'];
-var orginal_width = null, orginal_height=null;
-function toggle(action)
-{
-    if(current_action != action)
-    {
-
-        for (var i in actions)
-        {
-            if(actions[i] != action)
-            {
-                var tools = document.getElementById('tools_'+actions[i]);
-                tools.style.display = 'none';
-                var icon = document.getElementById('icon_'+actions[i]);
-                icon.className = '';
-            }
-        }
-
-        current_action = action;
-
-        var tools = document.getElementById('tools_'+action);
-        tools.style.display = 'block';
-        var icon = document.getElementById('icon_'+action);
-        icon.className = 'iconActive';
-
-        var indicator = document.getElementById('indicator_image');
-        indicator.src = 'img/'+action+'.gif';
-
-        editor.setMode(current_action);
-
-        //constraints on the scale,
-        //code by Frédéric Klee <fklee@isuisse.com>
-        if(action == 'scale')
-        {
-            var theImage = editor.window.document.getElementById('theImage');
-            orginal_width = theImage.width ;
-            orginal_height = theImage.height;
-
-            var w = document.getElementById('sw');
-            w.value = orginal_width ;
-            var h = document.getElementById('sh') ;
-            h.value = orginal_height ;
-        }
-
-    }
-}
-
-function toggleMarker()
-{
-    var marker = document.getElementById("markerImg");
-
-    if(marker != null && marker.src != null) {
-        if(marker.src.indexOf("t_black.gif") >= 0)
-            marker.src = "img/t_white.gif";
-        else
-            marker.src = "img/t_black.gif";
-
-        editor.toggleMarker();
-    }
-}
-
-//Togggle constraints, by Frédéric Klee <fklee@isuisse.com>
-function toggleConstraints()
-{
-    var lock = document.getElementById("scaleConstImg");
-    var checkbox = document.getElementById("constProp");
-
-    if(lock != null && lock.src != null) {
-        if(lock.src.indexOf("unlocked2.gif") >= 0)
-        {
-            lock.src = "img/islocked2.gif";
-            checkbox.checked = true;
-            checkConstrains('width');
-
-        }
-        else
-        {
-            lock.src = "img/unlocked2.gif";
-            checkbox.checked = false;
-        }
-    }
-}
-
-//check the constraints, by Frédéric Klee <fklee@isuisse.com>
-function checkConstrains(changed)
-{
-    var constrained = document.getElementById('constProp');
-    if(constrained.checked)
-    {
-        var w = document.getElementById('sw') ;
-        var width = w.value ;
-        var h = document.getElementById('sh') ;
-        var height = h.value ;
-
-        if(orginal_width > 0 && orginal_height > 0)
-        {
-            if(changed == 'width' && width > 0)
-                h.value = parseInt((width/orginal_width)*orginal_height);
-            else if(changed == 'height' && height > 0)
-                w.value = parseInt((height/orginal_height)*orginal_width);
-        }
-    }
-
-    updateMarker('scale') ;
-}
-
-function updateMarker(mode)
-{
-    if (mode == 'crop')
-    {
-        var t_cx = document.getElementById('cx');
-        var t_cy = document.getElementById('cy');
-        var t_cw = document.getElementById('cw');
-        var t_ch = document.getElementById('ch');
-
-        editor.setMarker(parseInt(t_cx.value), parseInt(t_cy.value), parseInt(t_cw.value), parseInt(t_ch.value));
-    }
-    else if(mode == 'scale') {
-        var s_sw = document.getElementById('sw');
-        var s_sh = document.getElementById('sh');
-        editor.setMarker(0, 0, parseInt(s_sw.value), parseInt(s_sh.value));
-    }
-}
-
-function rotatePreset(selection)
-{
-    var value = selection.options[selection.selectedIndex].value;
-
-    if(value.length > 0 && parseInt(value) != 0) {
-        var ra = document.getElementById('ra');
-        ra.value = parseInt(value);
-    }
-}
-
-function updateFormat(selection)
-{
-    var selected = selection.options[selection.selectedIndex].value;
-
-    var values = selected.split(",");
-    if(values.length >1) {
-        updateSlider(parseInt(values[1]));
-    }
-
-}
-function addEvent(obj, evType, fn)
-{
-    if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
-    else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
-    else {  return false; }
-}
-
-init = function()
-{
-    var bottom = document.getElementById('bottom');
-    if(window.opener)
-    {
-        __dlg_init(null, {width: 673, height: 531});
-        __dlg_translate('ExtendedFileManager');
-    }
-}
-
-addEvent(window, 'load', init);
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editorFrame.css b/web/imcms/xinha/plugins/ExtendedFileManager/assets/editorFrame.css
deleted file mode 100644
index a95e421055..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editorFrame.css
+++ /dev/null
@@ -1,8 +0,0 @@
-body { margin: 0; padding: 0;  background-color: #eee; }
-table { width: 100%; }
-table td { text-align: center; }
-.crop{cursor:crosshair;}
-.selection { border: dotted 1px #000000; position:absolute; width: 0px; height: 1px; z-index:5; }
-.selectionWhite{ border: dotted 1px #FFFFFF; position:absolute; width: 0px; height: 1px; z-index:5; }
-.handleBox{ z-index:105; }
-.error { font-size:large; font-weight:bold; color:#c00; font-family: Helvetica, sans-serif; } 
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editorFrame.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/editorFrame.js
deleted file mode 100644
index 0bda35d345..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/editorFrame.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Javascript used by the editorFrame.php, it basically initializes the frame.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-
-var topDoc = window.top.document;
-
-var t_cx = topDoc.getElementById('cx');
-var t_cy = topDoc.getElementById('cy');
-var t_cw = topDoc.getElementById('cw');
-var t_ch = topDoc.getElementById('ch');
-
-var m_sx = topDoc.getElementById('sx');
-var m_sy = topDoc.getElementById('sy');
-var m_w = topDoc.getElementById('mw');
-var m_h = topDoc.getElementById('mh');
-var m_a = topDoc.getElementById('ma');
-var m_d = topDoc.getElementById('md');
-
-var s_sw = topDoc.getElementById('sw');
-var s_sh = topDoc.getElementById('sh');
-
-var r_ra = topDoc.getElementById('ra');
-
-var pattern = "img/2x2.gif";
-
-function doSubmit(action)
-{
-    if (action == 'crop')
-    {
-        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=crop&params="+parseInt(t_cx.value)+','+parseInt(t_cy.value)+','+ parseInt(t_cw.value)+','+parseInt(t_ch.value);
-
-        //alert(url);
-        location.href = url;
-
-        //location.reload();
-    }
-    else if (action == 'scale')
-    {
-        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=scale&params="+parseInt(s_sw.value)+','+parseInt(s_sh.value);
-        //alert(url);
-        location.href = url;
-
-    }
-    else if (action == 'rotate')
-    {
-        var flip = topDoc.getElementById('flip');
-
-        if(flip.value == 'hoz' || flip.value == 'ver')
-            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=flip&params="+flip.value;
-        else if (isNaN(parseFloat(r_ra.value))==false)
-            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=rotate&params="+parseFloat(r_ra.value);
-    }
-    else if(action == 'save') {
-        var s_file = topDoc.getElementById('save_filename');
-        var s_format = topDoc.getElementById('save_format');
-        var s_quality = topDoc.getElementById('quality');
-
-        var format = s_format.value.split(",");
-        if(s_file.value.length <= 0)
-        {
-            alert(i18n('Please enter a filename to save.'));
-        }
-        else
-        {
-            var filename = encodeURI(s_file.value);
-            var quality = parseInt(s_quality.value);
-            var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
-            //alert(url);
-            location.href = url;
-        }
-    }
-}
-
-function addEvent(obj, evType, fn)
-{
-    if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
-    else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
-    else {  return false; }
-}
-
-var jg_doc;
-
-init = function()
-{
-    jg_doc = new jsGraphics("imgCanvas"); // draw directly into document
-    jg_doc.setColor("#000000"); // black
-
-    initEditor();
-};
-
-addEvent(window, 'load', init);
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/hover.htc b/web/imcms/xinha/plugins/ExtendedFileManager/assets/hover.htc
deleted file mode 100644
index 4e81af4e37..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/hover.htc
+++ /dev/null
@@ -1,34 +0,0 @@
-<attach event="onmouseover" handler="hoverRollOver" />
-<attach event="onmouseout" handler="hoverRollOff" />
-<script type="text/javascript">
-//
-//	Simple behaviour for IE5+ to emulate :hover CSS pseudo-class.
-//  Experimental ver 0.1
-//
-//	This is an experimental version! Handle with care!
-//	Manual at: http://www.hszk.bme.hu/~hj130/css/list_menu/hover/
-//
-
-function hoverRollOver() {
-	
-	element.origClassName = element.className;	// backup origonal className
-	
-	var tempClassStr = element.className;		
-	
-	tempClassStr += "Hover";					// convert name+'Hover' the last class name	to emulate tag.class:hover
-	
-	tempClassStr = tempClassStr.replace(/\s/g,"Hover ");	//convert name+'Hover' the others to emulate tag.class:hover
-	
-	tempClassStr += " hover";				// add simple 'hover' class name to emulate tag:hover
-	
-	element.className = element.className + " " + tempClassStr; 
-	
-	//alert(element.className);
-	//window.status = element.className;		// only for TEST
-}
-function hoverRollOff() {
-	element.className = element.origClassName;
-}
-
-</script>
-
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/imagelist.css b/web/imcms/xinha/plugins/ExtendedFileManager/assets/imagelist.css
deleted file mode 100644
index 12ed61657f..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/imagelist.css
+++ /dev/null
@@ -1,54 +0,0 @@
-body { margin: 0; padding: 0;}
-.edit,.dir_holder .fileName, .thumb_holder .fileName    { font-size: 8pt; font-family: small-caption, sans-serif; padding-top: 3px;}
-.edit a { border: none; padding: 0; text-decoration:none; }
-.edit a:hover { background-color: ButtonHighlight; }
-.edit a img { border: none; vertical-align: bottom; }
-.noResult { font-size:large; font-weight:bold; color:#ccc; font-family: Helvetica, sans-serif;  text-align: center;  padding-top: 60px;   }
-.error { color:#c00; font-weight:bold; font-size: medium; font-family: Helvetica, sans-serif; text-align: center;  padding-top: 65px;}
-
-.dir_holder, .thumb_holder
-{
-  width:106px; height:132px;
-  float:left;
-  margin:6px 4px;
-  background-color:ButtonFace;
-  border: 1px outset;
-}
-
-.thumb_holder.active
-{
-  background:Highlight;
-  color:HighlightText;
-  border:1px dashed Highlight;
-}
-
-.dir_holder a.dir, .thumb_holder a.thumb
-{
-  height:85px;
-  display:block;
-  text-align:center;
-  padding:5px;
-  text-decoration:none;
-}
-
-.thumb_holder a.thumb img
-{
-  border:1px solid black;
-}
-
-.dir_holder a.dir img
-{
-  border:none;
-}
-
-.listview { width:100% }
-.listview td, .listview th { text-align:left; font-size:small; }
-.listview td.actions { text-align: right; }
-.listview td.actions img { border:0; }
-
-.listview thead th {background-color: ButtonFace; border: 1px solid threedface; border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; padding-top:2px; padding-bottom:2px; padding-left: 5px; padding-right: 5px; font-size: 9pt; font-family: "MS Sans Serif", Geneva, sans-serif;}
-.listview tbody td, .listview tbody th {padding-top:2px; padding-left: 3px; font-size: 9pt; font-family: "MS Sans Serif", Geneva, sans-serif;}
-.listview tbody a, listview tbody a:visited { font-weight: normal; text-decoration: none; color: #000; border:0px; padding:2px;}
-.listview tbody a:hover { background-color:#0B256B; color:#fff;}
-
-.listview tbody tr:hover {background-color: rgb(221,221,255);
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/images.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/images.js
deleted file mode 100644
index ceac68eb53..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/images.js
+++ /dev/null
@@ -1,313 +0,0 @@
-/**
- * Functions for the image listing, used by images.php only
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz, Raimund Meyer
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
- * Version: Updated on 17-11-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
- * http://www.afrusoft.com/htmlarea
- */
-
-function i18n(str) {
-    return Xinha._lc(str, 'ExtendedFileManager');
-}
-
-function changeDir(newDir)
-{
-    showMessage('Loading');
-    var mode=window.top.document.getElementById('manager_mode').value;
-    var selection = window.top.document.getElementById('viewtype');
-    var viewtype = selection.options[selection.selectedIndex].value;
-    location.href = _backend_url + "__function=images&mode="+mode+"&dir="+newDir+"&viewtype="+viewtype;
-	document.cookie = "EFMStartDir" + mode + "="+newDir;
-}
-
-function newFolder(dir, newDir)
-{
-    var mode=window.top.document.getElementById('manager_mode').value;
-    var selection = window.top.document.getElementById('viewtype');
-    var viewtype = selection.options[selection.selectedIndex].value;
-    location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&newDir="+newDir+"&viewtype="+viewtype;
-}
-
-function renameFile(oldPath) {
- // strip directory and extension
-  var oldName=oldPath.replace(/.*%2F/,'').replace(/\..*$/,'');
-  
-  var rename = function (newName)
-  {
-    if(newName == '' || newName == null || newName == oldName)
-    {
-        alert(i18n('Cancelled rename.'));
-        return false;
-    }
-    var mode=window.top.document.getElementById('manager_mode').value;
-    var selection = window.top.document.getElementById('dirPath');
-    var dir = selection.options[selection.selectedIndex].value;
-    selection = window.top.document.getElementById('viewtype');
-    var viewtype = selection.options[selection.selectedIndex].value;
-    location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&rename="+oldPath+"&renameTo="+newName+"&viewtype="+viewtype;
-  }
-  
-   // IE7 has crippled the prompt()
-  if ( Xinha.ie_version > 6 )
-  {
-    popupPrompt(i18n("Please enter new name for this file..."), oldName, rename, i18n("Rename"));
-  }
-  else
-  {
-    var newName = prompt(i18n('Please enter new name for this file...'), oldName);
-    rename(newName);
-  }
-}
-function renameDir(oldName) 
-{
-  // strip directory and extension
-
-  function rename(newName)
-  {
-    if(newName == '' || newName == null || newName == oldName)
-    {
-      alert(i18n('Cancelled rename.'));
-      return false;
-    }
-    var mode=window.top.document.getElementById('manager_mode').value;
-    var selection = window.top.document.getElementById('dirPath');
-    var dir = selection.options[selection.selectedIndex].value;
-    selection = window.top.document.getElementById('viewtype');
-    var viewtype = selection.options[selection.selectedIndex].value;
-    location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&rename="+oldName+"&renameTo="+newName+"&viewtype="+viewtype;
-  }
-  
-  // IE7 has crippled the prompt()
-  if ( Xinha.ie_version > 6 )
-  {
-    popupPrompt(i18n('Please enter new name for this folder...'), oldName, rename, i18n("Rename"));
-  }
-  else
-  {
-    var newName = prompt(i18n('Please enter new name for this folder...'), oldName);
-    rename(newName);
-  }
-}
-function copyFile(file,action)
-{
-	var selection = window.top.document.getElementById('dirPath');
-    var dir = selection.options[selection.selectedIndex].value;
-	window.top.pasteButton({'dir':dir,'file':file,'action':action+'File'});
-}
-function copyDir(dirToCopy,action)
-{
-	var selection = window.top.document.getElementById('dirPath');
-    var dir = selection.options[selection.selectedIndex].value;
-	window.top.pasteButton({'dir':dir,'file':dirToCopy,'action':action+'Dir'});
-}
-function paste(action)
-{
-    var mode=window.top.document.getElementById('manager_mode').value;
-    var selection = window.top.document.getElementById('dirPath');
-    var dir = selection.options[selection.selectedIndex].value;
-    selection = window.top.document.getElementById('viewtype');
-    var viewtype = selection.options[selection.selectedIndex].value;
-	location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&paste="+action.action+"&srcdir="+action.dir+"&file="+action.file+"&viewtype="+viewtype;
-}
-//update the dir list in the parent window.
-function updateDir(newDir)
-{
-	var mode = window.top.document.getElementById('manager_mode').value;
-	document.cookie = "EFMStartDir" + mode + "="+newDir;
-    
-	var selection = window.top.document.getElementById('dirPath');
-    if(selection)
-    {
-        for(var i = 0; i < selection.length; i++)
-        {
-            var thisDir = selection.options[i].text;
-            if(thisDir == newDir)
-            {
-                selection.selectedIndex = i;
-                showMessage('Loading');
-                break;
-            }
-        }
-    }
-
-}
-
-function emptyProperties()
-{
-    toggleImageProperties(false);
-    var topDoc = window.top.document;
-    topDoc.getElementById('f_url').value = '';
-    topDoc.getElementById('f_alt').value = '';
-    topDoc.getElementById('f_title').value = '';
-    topDoc.getElementById('f_width').value = '';
-    topDoc.getElementById('f_margin').value = '';
-    topDoc.getElementById('f_height').value = '';
-    topDoc.getElementById('f_padding').value = '';
-    topDoc.getElementById('f_border').value = '';
-    topDoc.getElementById('f_borderColor').value = '';
-    topDoc.getElementById('f_backgroundColor').value = '';
-}
-
-function toggleImageProperties(val)
-{
-    var topDoc = window.top.document;
-    if(val==true)
-    {
-        topDoc.getElementById('f_width').value = '';
-        topDoc.getElementById('f_margin').value = '';
-        topDoc.getElementById('f_height').value = '';
-        topDoc.getElementById('f_padding').value = '';
-        topDoc.getElementById('f_border').value = '';
-        topDoc.getElementById('f_borderColor').value = '';
-        topDoc.getElementById('f_backgroundColor').value = '';
-    }
-    topDoc.getElementById('f_width').disabled = val;
-    topDoc.getElementById('f_margin').disabled = val;
-    topDoc.getElementById('f_height').disabled = val;
-    topDoc.getElementById('f_padding').disabled = val;
-    topDoc.getElementById('f_align').disabled = val;
-    topDoc.getElementById('f_border').disabled = val;
-    topDoc.getElementById('f_borderColor').value = '';
-    topDoc.getElementById('f_backgroundColor').value = '';
-    topDoc.getElementById('constrain_prop').disabled = val;
-}
-
-function selectImage(filename, alt, width, height)
-{
-    var topDoc = window.top.document;
-
-    if(topDoc.getElementById('manager_mode').value=="image")
-    {
-        var obj = topDoc.getElementById('f_url');  obj.value = filename;
-        obj = topDoc.getElementById('f_alt'); obj.value = alt;
-        obj = topDoc.getElementById('f_title'); obj.value = alt;
-
-        if(width==0 && height==0) toggleImageProperties(true);
-        else
-        {
-            toggleImageProperties(false);
-            var obj = topDoc.getElementById('f_width');  obj.value = width;
-            var obj = topDoc.getElementById('f_height'); obj.value = height;
-            var obj = topDoc.getElementById('orginal_width'); obj.value = width;
-            var obj = topDoc.getElementById('orginal_height'); obj.value = height;
-            update_selected();
-        }
-    }
-    else if (topDoc.getElementById('manager_mode').value=="link")
-    {
-        var obj = topDoc.getElementById('f_href');  obj.value = filename;
-        var obj = topDoc.getElementById('f_title'); obj.value = alt;
-    }
-
-    return false;
-}
-
-var _current_selected = null;
-
-function update_selected()
-{
-    var topDoc = window.top.document;
-    if(_current_selected)
-    {
-        _current_selected.className = _current_selected.className.replace(/(^| )active( |$)/, '$1$2');
-        _current_selected = null;
-    }
-    // Grab the current file, and highlight it if we have it
-    var c_file = topDoc.getElementById('f_url').value;
-    var selection = topDoc.getElementById('dirPath');
-    var currentDir = selection.options[selection.selectedIndex].text;
-    var dRe = new RegExp('^(' + currentDir.replace(/([\/\^$*+?.()|{}[\]])/g, '\\$1') + ')([^/]*)$');
-    if(dRe.test(c_file))
-    {
-        var holder = document.getElementById('holder_' + asc2hex(RegExp.$2));
-        if(holder)
-        {
-            _current_selected = holder;
-            holder.className += ' active';
-        }
-    }
-    showPreview(c_file);
-}
-
-function asc2hex(str)
-{
-    var hexstr = '';
-    for(var i = 0; i < str.length; i++)
-    {
-        var hex = (str.charCodeAt(i)).toString(16);
-        if(hex.length == 1) hex = '0' + hex;
-        hexstr += hex;
-    }
-    return hexstr;
-}
-
-function showMessage(newMessage)
-{
-    var topDoc = window.top.document;
-
-    var message = topDoc.getElementById('message');
-    var messages = topDoc.getElementById('messages');
-    if(message && messages)
-    {
-        if(message.firstChild)
-            message.removeChild(message.firstChild);
-
-        message.appendChild(topDoc.createTextNode(i18n(newMessage)));
-
-        messages.style.display = "block";
-    }
-}
-
-function updateDiskMesg(newMessage)
-{
-    var topDoc = window.top.document;
-
-    var diskmesg = topDoc.getElementById('diskmesg');
-    if(diskmesg)
-    {
-        if(diskmesg.firstChild)
-            diskmesg.removeChild(diskmesg.firstChild);
-
-        diskmesg.appendChild(topDoc.createTextNode(newMessage));
-
-    }
-}
-
-function addEvent(obj, evType, fn)
-{
-    if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
-    else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
-    else {  return false; }
-}
-
-function confirmDeleteFile(file)
-{
-    if(confirm(i18n('Delete file "$file=' + file +'$"?')))
-        return true;
-
-    return false;
-}
-
-function confirmDeleteDir(dir, count)
-{
-   /* if(count > 0)
-    {
-        alert(i18n("Folder is not empty. Please delete all Files and Subfolders inside."));
-        return false;
-    }*/
-
-    if(confirm(i18n('Delete folder "$dir=' + dir +'$"?')))
-        return true;
-
-    return false;
-}
-
-function showPreview(f_url)
-{
-    window.parent.document.getElementById('f_preview').src =
-    f_url ? window.parent._backend_url + '__function=thumbs&img=' + f_url :window.parent.opener._editor_url+'plugins/ExtendedFileManager/img/1x1_transparent.gif';
-}
-
-addEvent(window, 'load', init);
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/manager.css b/web/imcms/xinha/plugins/ExtendedFileManager/assets/manager.css
deleted file mode 100644
index dec44b7908..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/manager.css
+++ /dev/null
@@ -1,49 +0,0 @@
-html, body, .dialog {  background-color: ButtonFace;  color: ButtonText; font: 11px Tahoma,Verdana,sans-serif; margin: 0; padding: 0;}
-body { padding: 5px; }
-fieldset { padding: 0;}
-.title { background-color: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px; border-bottom: 1px  solid black; letter-spacing: 2px;}
-form { padding: 0px;  margin: 0 auto; width: 100%;}
-/*.dirWidth { width: 60%; }*/
-a { padding: 5px; border: 1px solid ButtonFace;	}	
-a img	{ border: 0; }	
-a:hover { border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; }
-.dirs {	padding: 1em; 	}
-
-.imageFrame { overflow-x:hidden; width: 100%; height: 145px; margin:0px; background-color: #fff;}
-.smallWidth{ width: 4em; }
-.largelWidth{ width: 30em; }
-.extralargelWidth{ width: 100%; }
-.inputTable { margin: 1em auto 1em 0;width:100%}
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-.buttons { width: 70px; text-align: center; }
-.clearboth{ clear: both; }
-#messages { position: relative; left: 175px; top: 115px; background-color: white; width:200px;  float: left; margin-top: -52px; border: 1px solid #ccc; text-align: center; padding: 15px; }
-#message  { font-size: 15px; font-weight: bold; color: #69c; }
-iframe { border:1px inset; border-right:none; border-left:none; border-bottom:none; }
-
-table { margin-top:10px; }
-th, td { padding-right:3px; text-align:left; font-family:small-caption,helvetica,sans-serif; }
-.dirWidth {width: 59%}
-
-.buttonColor {
-  width :1em;
-  margin-left: 2px;
-  cursor: default;
-}
-
-.buttonColor .chooser, .buttonColor .nocolor {
-  height: 0.6em;
-  border: 1px solid;
-  padding: 0px 1em;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-
-.buttonColor .buttonClick {
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-.buttonColor .buttonColor-hilite {
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.buttonColor .nocolor { padding: 0px; }
-.buttonColor .nocolor-hilite { background-color: #fff; color: #f00; }
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/manager.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/manager.js
deleted file mode 100644
index 11988a63d3..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/manager.js
+++ /dev/null
@@ -1,562 +0,0 @@
-/**
- * Functions for the ExtendedFileManager, used by manager.php only
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz, Raimund Meyer
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Version: Updated on 17-11-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
- * http://www.afrusoft.com/htmlarea
- */
-
-function comboSelectValue(c, val) {
-    var ops = c.getElementsByTagName("option");
-    for (var i = ops.length; --i >= 0;) {
-        var op = ops[i];
-        op.selected = (op.value == val);
-    }
-    c.value = val;
-}
-
-//Translation
-function i18n(str) {
-    return Xinha._lc(str, 'ExtendedFileManager');
-}
-
-//set the alignment options
-function setAlign(align)
-{
-    var selection = document.getElementById('f_align');
-    for(var i = 0; i < selection.length; i++)
-    {
-        if(selection.options[i].value == align)
-        {
-            selection.selectedIndex = i;
-            break;
-        }
-    }
-}
-
-function onTargetChanged() {
-  var f = document.getElementById("f_other_target");
-  if (this.value == "_other") {
-    f.style.visibility = "visible";
-    f.select();
-    f.focus();
-  } else f.style.visibility = "hidden";
-}
-
-//initialise the form
-
-if (manager_mode == "link")
-{
-    var offsetForInputs = (Xinha.is_ie) ? 165 : 150;
-}
-else
-{
-    var offsetForInputs = (Xinha.is_ie) ? 230 : 210;
-}   
-
-var h =  100 // space above files 
-       + 250 // files iframe
-       + offsetForInputs; 
-
-var win_dim = {width:650,height:h};
-window.resizeTo(win_dim.width,win_dim.height);
-if (!Xinha.is_ie)
-{
-  var x = opener.screenX + (opener.outerWidth - win_dim.width) / 2;
-  var y = opener.screenY + (opener.outerHeight - win_dim.height) / 2;
-}
-else
-{//IE does not have window.outer... , so center it on the screen at least
-  var x =  (self.screen.availWidth - win_dim.width) / 2;
-  var y =  (self.screen.availHeight - win_dim.height) / 2;	
-}
-window.moveTo(x,y);
-
-init = function ()
-{
-    
-    
-    __dlg_init(null,  {width:650,height:h});
-
-    __dlg_translate('ExtendedFileManager');
-
-    var uploadForm = document.getElementById('uploadForm');
-    if(uploadForm) uploadForm.target = 'imgManager';
-    
-    var editor = window.dialogArguments.editor;
-
-    var param = window.dialogArguments.param;
-    var startDir = null;
-	
-    if(manager_mode=="image" && param)
-    {
-        var absoluteURL = new RegExp('^https?://');
-
-        if (param.f_url.length > 0 && !absoluteURL.test(param.f_url) && typeof param.baseHref == "string") {
-            // URL is not absolute, prepend baseHref
-            param.f_url = param.baseHref + param.f_url;
-        }
-
-        // strip base_url from url
-        var image_regex = new RegExp( '(https?://[^/]*)?' + base_url.replace(/\/$/, '') );
-        param.f_url = param.f_url.replace( image_regex, "" );
-
-        // The image URL may reference one of the automatically resized images
-        // (when the user alters the dimensions in the picker), clean that up
-        // so it looks right and we get back to a normal f_url
-        var rd = (_resized_dir) ? _resized_dir.replace(Xinha.RE_Specials, '\\$1') + '/' : '';
-        var rp = _resized_prefix.replace(Xinha.RE_Specials, '\\$1');
-        var dreg = new RegExp('^(.*/)' + rd + rp + '_([0-9]+)x([0-9]+)_([^/]+)$');
-
-        var match = param.f_url.match(dreg);
-
-        if(dreg.test(param.f_url))
-        {
-          param.f_url    = RegExp.$1 + RegExp.$4;
-          param.f_width  = RegExp.$2;
-          param.f_height = RegExp.$3;
-        }
-
-        document.getElementById("f_url").value = param["f_url"];
-        document.getElementById("f_alt").value = param["f_alt"];
-        document.getElementById("f_title").value = param["f_title"];
-        document.getElementById("f_border").value = param["f_border"];
-        document.getElementById("f_width").value = param["f_width"];
-        document.getElementById("f_height").value = param["f_height"];
-        document.getElementById("f_margin").value = param["f_margin"];
-        document.getElementById("f_padding").value = param["f_padding"];
-        document.getElementById("f_borderColor").value = param["f_borderColor"];
-        document.getElementById("f_backgroundColor").value = param["f_backgroundColor"];
-
-        setAlign(param["f_align"]);
-
-        document.getElementById("f_url").focus();
-
-        document.getElementById("orginal_width").value = param["f_width"];
-        document.getElementById("orginal_height").value = param["f_height"];
-
-        // Locate to the correct directory
-        var dreg = new RegExp('^(.*/)([^/]+)$');
-        if (dreg.test(param['f_url']))
-        {
-		  startDir = RegExp.$1;
-        }
-
-        document.getElementById('f_preview').src = _backend_url + '__function=thumbs&img=' + param.f_url;
-
-    }
-
-    else if(manager_mode=="link" && param)
-    {
-        var target_select = document.getElementById("f_target");
-        var use_target = true;
-
-        var absoluteURL = new RegExp('^https?://');
-
-        if (param.f_href.length > 0 && !absoluteURL.test(param.f_href) && typeof param.baseHref == "string") {
-            // URL is not absolute, prepend baseHref
-            param.f_href = param.baseHref + param.f_href;
-        }
-
-        // strip base_url from href
-        var href_regex = new RegExp( '(https?://[^/]*)?' + base_url.replace(/\/$/, '') );
-        param.f_href = param.f_href.replace( href_regex, "" );
-
-        // Locate to the correct directory
-        var dreg = new RegExp('^(.*/)([^/]+)$');
-        if (dreg.test(param['f_href']))
-        {
-        	startDir = RegExp.$1;
-        }
-        else
-        {
-        	startDir = document.cookie.match(/EFMStartDirlink=(.*?)(;|$)/);
-        	if (startDir) startDir = startDir[1];
-        }
-        
-        if (param)
-        {
-            if ( typeof param["f_usetarget"] != "undefined" )
-            {
-                use_target = param["f_usetarget"];
-            }
-            if ( typeof param["f_href"] != "undefined" )
-            {
-                document.getElementById("f_href").value = param["f_href"];
-                document.getElementById("f_title").value = param["f_title"];
-                comboSelectValue(target_select, param["f_target"]);
-                if (target_select.value != param.f_target)
-                {
-                    var opt = document.createElement("option");
-                    opt.value = param.f_target;
-                    opt.innerHTML = opt.value;
-                    target_select.appendChild(opt);
-                    opt.selected = true;
-                }
-            }
-        }
-        if (! use_target)
-        {
-            document.getElementById("f_target_label").style.visibility = "hidden";
-            document.getElementById("f_target").style.visibility = "hidden";
-            document.getElementById("f_other_target").style.visibility = "hidden";
-        }
-
-        var opt = document.createElement("option");
-        opt.value = "_other";
-        opt.innerHTML = i18n("Other");
-        target_select.appendChild(opt);
-        target_select.onchange = onTargetChanged;
-        
-        document.getElementById("f_href").focus();
-    }
-    else if (!param)
-    {
-    	startDir = document.cookie.match(new RegExp ("EFMStartDir" + manager_mode + "=(.*?)(;|$)"));
-    	if (startDir)
-    	{
-    		startDir = startDir[1];
-    	}
-    }
-	if ( startDir )
-    {
-         Xinha._addEvent(imgManager,'load', function () {
-                changeDir(startDir);
-                var dirPath = document.getElementById('dirPath');
-                for(var i = 0; i < dirPath.options.length; i++)
-                {
-                    if(dirPath.options[i].value == encodeURIComponent(startDir))
-                    {
-                        dirPath.options[i].selected = true;
-                        break;
-                    }
-                }
-            } );
-    }
-    if (manager_mode == 'image' && typeof Xinha.colorPicker != "undefined" && document.getElementById('f_backgroundColor') && document.getElementById('f_backgroundColor').type == 'text') {
-      // Hookup color pickers
-
-      var pickerConfig = {
-        cellsize:editor.config.colorPickerCellSize,
-        granularity:editor.config.colorPickerGranularity,
-        websafe:editor.config.colorPickerWebSafe,
-        savecolors:editor.config.colorPickerSaveColors
-      };
-
-      new Xinha.colorPicker.InputBinding(document.getElementById('f_backgroundColor'),pickerConfig);
-      new Xinha.colorPicker.InputBinding(document.getElementById('f_borderColor'),pickerConfig);
-    }
-}
-
-function pasteButton(action)
-{
-	var buttonHolder = document.getElementById('pasteBtn');
-	if (!buttonHolder.firstChild)
-	{
-		var a = document.createElement('a');
-			a.href = "javascript:void(0);";
-			
-		var img = document.createElement('img');
-			img.src = window.opener._editor_url+'plugins/ExtendedFileManager/img/edit_paste.gif';
-			img.alt = i18n('Paste');
-			a.appendChild(img);
-			buttonHolder.appendChild(a);
-	}
-	buttonHolder.onclick = function() {  
-				if(typeof imgManager != 'undefined') imgManager.paste(action);
-				if (action.action ==  'moveFile' || action.action ==  'moveDir' )
-				{
-					this.onclick = null;
-					this.removeChild(this.firstChild)
-				}
-	}
-	switch (action.action)
-	{
-		case 'copyFile':
-			buttonHolder.firstChild.title = i18n('Copy "$file='+action.file+'$" from "$dir='+decodeURIComponent(action.dir)+'$" here');			
-		break;
-		case 'copyDir':
-			buttonHolder.firstChild.title = i18n('Copy folder "$file='+action.file+'$" from "$dir='+decodeURIComponent(action.dir)+'$" here');		
-		break;
-		case 'moveFile':
-			buttonHolder.firstChild.title = i18n('Move "$file='+action.file+'$" from "$dir='+decodeURIComponent(action.dir)+'$" here');
-		break;
-		break;
-		case 'moveDir':
-			buttonHolder.firstChild.title = i18n('Move folder "$file='+action.file+'$" from "$dir='+decodeURIComponent(action.dir)+'$" here');
-		break;	
-	}
-	
-}
-function onCancel()
-{
-    __dlg_close(null);
-    return false;
-}
-
-function onOK()
-{
-    if(manager_mode=="image")
-    {
-        // pass data back to the calling window
-        var fields = ["f_url", "f_alt", "f_title", "f_align", "f_border", "f_margin", "f_padding", "f_height", "f_width", "f_borderColor", "f_backgroundColor"];
-        var param = new Object();
-        for (var i in fields)
-        {
-            var id = fields[i];
-            var el = document.getElementById(id);
-            if(id == "f_url" && el.value.indexOf('://') < 0 && el.value )
-                param[id] = makeURL(base_url,el.value);
-            else
-                param[id] = el.value;
-        }
-
-        // See if we need to resize the image
-        var origsize =
-        {
-          w:document.getElementById('orginal_width').value,
-          h:document.getElementById('orginal_height').value
-        }
-
-        if(  (origsize.w != param.f_width)
-          || (origsize.h != param.f_height) )
-        {
-          // Yup, need to resize
-          var resized = Xinha._geturlcontent(window.opener._editor_url + 'plugins/ExtendedFileManager/' + _backend_url + '&__function=resizer&img=' + encodeURIComponent(document.getElementById('f_url').value) + '&width=' + param.f_width + '&height=' + param.f_height);
-
-          // alert(resized);
-          resized = eval(resized);
-          if(resized)
-          {
-            param.f_url = makeURL(base_url, resized);
-          }
-        }
-        __dlg_close(param);
-        return false;
-    }
-    else if(manager_mode=="link")
-    {
-        var required = {
-            // f_href shouldn't be required or otherwise removing the link by entering an empty
-
-            // url isn't possible anymore.
-
-            // "f_href": i18n("You must enter the URL where this link points to")
-
-        };
-        for (var i in required) {
-        var el = document.getElementById(i);
-            if (!el.value) {
-              alert(required[i]);
-              el.focus();
-              return false;
-            }
-        }
-
-        // pass data back to the calling window
-        var fields = ["f_href", "f_title", "f_target" ];
-        var param = new Object();
-        for (var i in fields) {
-            var id = fields[i];
-            var el = document.getElementById(id);
-
-            if(id == "f_href" && el.value.indexOf('://') < 0 )
-                param[id] = makeURL(base_url,el.value);
-            else
-                param[id] = el.value;
-
-        }
-        if (param.f_target == "_other")
-            param.f_target = document.getElementById("f_other_target").value;
-
-//          alert(param.f_target);
-          __dlg_close(param);
-        return false;
-    }
-}
-
-//similar to the Files::makeFile() in Files.php
-function makeURL(pathA, pathB)
-{
-    if(pathA.substring(pathA.length-1) != '/')
-        pathA += '/';
-
-    if(pathB.charAt(0) == '/');
-        pathB = pathB.substring(1);
-
-    return pathA+pathB;
-}
-
-function updateDir(selection)
-{
-    var newDir = selection.options[selection.selectedIndex].value;
-    changeDir(newDir);
-}
-
-function goUpDir()
-{
-    var selection = document.getElementById('dirPath');
-    var currentDir = selection.options[selection.selectedIndex].text;
-    if(currentDir.length < 2)
-        return false;
-    var dirs = currentDir.split('/');
-
-    var search = '';
-
-    for(var i = 0; i < dirs.length - 2; i++)
-    {
-        search += dirs[i]+'/';
-    }
-
-    for(var i = 0; i < selection.length; i++)
-    {
-        var thisDir = selection.options[i].text;
-        if(thisDir == search)
-        {
-            selection.selectedIndex = i;
-            var newDir = selection.options[i].value;
-            changeDir(newDir);
-            break;
-        }
-    }
-}
-
-function changeDir(newDir)
-{
-    if(typeof imgManager != 'undefined')
-        imgManager.changeDir(newDir);
-}
-
-function updateView()
-{
-    refresh();
-}
-
-function toggleConstrains(constrains)
-{
-    var lockImage = document.getElementById('imgLock');
-    var constrains = document.getElementById('constrain_prop');
-
-    if(constrains.checked)
-    {
-        lockImage.src = "img/locked.gif";
-        checkConstrains('width')
-    }
-    else
-    {
-        lockImage.src = "img/unlocked.gif";
-    }
-}
-
-function checkConstrains(changed)
-{
-    //alert(document.form1.constrain_prop);
-    var constrains = document.getElementById('constrain_prop');
-
-    if(constrains.checked)
-    {
-        var obj = document.getElementById('orginal_width');
-        var orginal_width = parseInt(obj.value);
-        var obj = document.getElementById('orginal_height');
-        var orginal_height = parseInt(obj.value);
-
-        var widthObj = document.getElementById('f_width');
-        var heightObj = document.getElementById('f_height');
-
-        var width = parseInt(widthObj.value);
-        var height = parseInt(heightObj.value);
-
-        if(orginal_width > 0 && orginal_height > 0)
-        {
-            if(changed == 'width' && width > 0) {
-                heightObj.value = parseInt((width/orginal_width)*orginal_height);
-            }
-
-            if(changed == 'height' && height > 0) {
-                widthObj.value = parseInt((height/orginal_height)*orginal_width);
-            }
-        }
-    }
-}
-
-function showMessage(newMessage)
-{
-    var message = document.getElementById('message');
-    var messages = document.getElementById('messages');
-    if(message.firstChild)
-        message.removeChild(message.firstChild);
-
-    message.appendChild(document.createTextNode(i18n(newMessage)));
-
-    messages.style.display = "block";
-}
-
-function addEvent(obj, evType, fn)
-{
-    if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
-    else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
-    else {  return false; }
-}
-
-function doUpload()
-{
-    var uploadForm = document.getElementById('uploadForm');
-    if(uploadForm)
-        showMessage('Uploading');
-}
-
-function refresh()
-{
-    var selection = document.getElementById('dirPath');
-    updateDir(selection);
-}
-
-function newFolder()
-{
-  function createFolder(folder)
-  {
-    var selection = document.getElementById('dirPath');
-    var dir = selection.options[selection.selectedIndex].value;
-
-    if(folder == thumbdir)
-    {
-      alert(i18n('Invalid folder name, please choose another folder name.'));
-      return false;
-    }
-
-    if (folder && folder != '' && typeof imgManager != 'undefined')
-    {
-      imgManager.newFolder(dir, encodeURI(folder));
-    }
-  }
-    // IE7 has crippled the prompt()
-  if ( Xinha.ie_version > 6 )
-  {
-    popupPrompt(i18n('Please enter name for new folder...'), i18n('Untitled'), createFolder, i18n("New Folder"));
-  }
-  else
-  {
-    var folder = prompt(i18n('Please enter name for new folder...'), i18n('Untitled'));
-    createFolder(folder);
-  }
-}
-
-
-function resize()
-{
-	var win = Xinha.viewportSize(window);
-	document.getElementById('imgManager').style.height = parseInt( win.y - 130 - offsetForInputs, 10 ) + 'px';
-	
-	return true;
-}
-addEvent(window, 'resize', resize);
-if (Xinha.is_gecko)
-{// this runs the init function (translation) before all the images in the iframe have loaded
-	document.addEventListener("DOMContentLoaded", init, false);
-}
-else
-{
-	addEvent(window, 'load', init);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/popup.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/popup.js
deleted file mode 100644
index 8c2ef1a6a0..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/popup.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// htmlArea v3.0 - Copyright (c) 2002, 2003 interactivetools.com, inc.
-// This copyright notice MUST stay intact for use (see license.txt).
-//
-// Portions (c) dynarch.com, 2003
-//
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon.
-//   http://dynarch.com/mishoo
-//
-// $Id: popup.js 799 2007-03-27 23:30:28Z ray $
-
-function __dlg_onclose() {
-    if(opener.Dialog._return)
-        opener.Dialog._return(null);
-}
-
-function __dlg_translate(context) {
-    var types = ["span", "option", "td", "th", "button", "div", "label", "a","img", "legend"];
-    for (var type = 0; type < types.length; type++) {
-        var spans = document.getElementsByTagName(types[type]);
-        for (var i = spans.length; --i >= 0;) {
-            var span = spans[i];
-            if (span.firstChild && span.firstChild.data) {
-                var txt = Xinha._lc(span.firstChild.data, context);
-                if (txt)
-                    span.firstChild.data = txt;
-            }
-            if (span.title) {
-                var txt = Xinha._lc(span.title, context);
-                if (txt)
-                    span.title = txt;
-            }
-            if (span.alt) {
-                var txt = Xinha._lc(span.alt, context);
-                if (txt)
-                    span.alt = txt;
-            }
-        }
-    }
-    document.title = Xinha._lc(document.title, context);
-}
-
-// closes the dialog and passes the return info upper.
-function __dlg_close(val) {
-    opener.Dialog._return(val);
-    window.close();
-}
-
-function popupPrompt( prompt, value, handler, title)
-{
-  
-    Dialog("prompt.html", function(param)
-    {
-      if (!param) // user must have pressed Cancel
-      {
-        return false;
-      }
-      else
-      {
-        handler (param.value);
-      }
-    }, {prompt:prompt,value:value,title:title});
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/slider.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/slider.js
deleted file mode 100644
index c203ef01f1..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/slider.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * ImageEditor slider file.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-
-var ie=document.all;
-var ns6=document.getElementById&&!document.all;
-
-document.onmouseup = captureStop;
-
-var currentSlider = null,sliderField = null;
-var rangeMin = null, rangeMax= null, sx = -1, sy = -1, initX=0;
-
-function getMouseXY(e) {
-
-    //alert('hello');
-    x = ns6? e.clientX: event.clientX
-    y = ns6? e.clientY: event.clientY
-
-    if (sx < 0) sx = x; if (sy < 0) sy = y;
-
-    var dx = initX +(x-sx);
-
-    if (dx <= rangeMin)
-        dx = rangeMin;
-    else if (dx >= rangeMax)
-        dx = rangeMax;
-
-    var range = (dx-rangeMin)/(rangeMax - rangeMin)*100;
-
-    if (currentSlider !=  null)
-        currentSlider.style.left = dx+"px";
-
-    if (sliderField != null)
-    {
-        sliderField.value = parseInt(range);
-    }
-    return false;
-
-}
-
-function initSlider()
-{
-    if (currentSlider == null)
-        currentSlider = document.getElementById('sliderbar');
-
-    if (sliderField == null)
-        sliderField = document.getElementById('quality');
-
-    if (rangeMin == null)
-        rangeMin = 3
-    if (rangeMax == null)
-    {
-        var track = document.getElementById('slidertrack');
-        rangeMax = parseInt(track.style.width);
-    }
-
-}
-
-function updateSlider(value)
-{
-    initSlider();
-
-    var newValue = parseInt(value)/100*(rangeMax-rangeMin);
-
-    if (newValue <= rangeMin)
-        newValue = rangeMin;
-    else if (newValue >= rangeMax)
-        newValue = rangeMax;
-
-    if (currentSlider !=  null)
-        currentSlider.style.left = newValue+"px";
-
-    var range = newValue/(rangeMax - rangeMin)*100;
-
-    if (sliderField != null)
-        sliderField.value = parseInt(range);
-}
-
-function captureStart()
-{
-
-    initSlider();
-
-    initX = parseInt(currentSlider.style.left);
-    if (initX > rangeMax)
-        initX = rangeMax;
-    else if (initX < rangeMin)
-        initX = rangeMin;
-
-    document.onmousemove = getMouseXY;
-
-    return false;
-}
-
-function captureStop()
-{
-    sx = -1; sy = -1;
-    document.onmousemove = null;
-    return false;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/assets/wz_jsgraphics.js b/web/imcms/xinha/plugins/ExtendedFileManager/assets/wz_jsgraphics.js
deleted file mode 100644
index afe6957d44..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/assets/wz_jsgraphics.js
+++ /dev/null
@@ -1,826 +0,0 @@
-/***********************************************************************
-** Title.........:  Javascript Graphics
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  wz_jsgraphics.js
-** Last changed..:  31 Aug 2003  
-** Notes.........:  Modified for Image Editor, added extra commands
-**/ 
-
-/* This notice must be untouched at all times.
-
-wz_jsgraphics.js    v. 2.03
-The latest version is available at
-http://www.walterzorn.com
-or http://www.devira.com
-or http://www.walterzorn.de
-
-Copyright (c) 2002-2003 Walter Zorn. All rights reserved.
-Created 3. 11. 2002 by Walter Zorn <walter@kreuzotter.de>
-Last modified: 11. 6. 2003
-
-High Performance JavaScript Graphics Library.
-Provides methods
-- to draw lines, rectangles, ellipses, polygons
-  with specifiable line thickness,
-- to fill rectangles and ellipses
-- to draw text.
-NOTE: Operations, functions and branching have rather been optimized
-to efficiency and speed than to shortness of source code.
-
-This program is free software;
-you can redistribute it and/or modify it under the terms of the
-GNU General Public License as published by the Free Software Foundation;
-either version 2 of the License, or (at your option) any later version.
-This program 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 General Public License
-at http://www.gnu.org/copyleft/gpl.html for more details.
-*/
-
-var jg_ihtm, jg_ie, jg_dom, jg_n4 = (document.layers && typeof document.classes != "undefined");
-
-function chkDHTM(x, i)
-{
-    x = document.body || null;
-    jg_ie = (x && typeof x.insertAdjacentHTML != "undefined");
-    jg_dom = (x && !jg_ie &&
-        typeof x.appendChild != "undefined" &&
-        typeof document.createRange != "undefined" &&
-        typeof (i = document.createRange()).setStartBefore != "undefined" &&
-        typeof i.createContextualFragment != "undefined");
-    jg_ihtm = (!jg_ie && !jg_dom && x && typeof x.innerHTML != "undefined");
-}
-
-function pntDoc()
-{
-    this.wnd.document.write(this.htm);
-    this.htm = '';
-}
-
-function pntCnvDom()
-{
-    var x = document.createRange();
-    x.setStartBefore(this.cnv);
-    x = x.createContextualFragment(this.htm);
-    this.cnv.appendChild(x);
-    this.htm = '';
-}
-
-function pntCnvIe()
-{
-    this.cnv.insertAdjacentHTML("BeforeEnd", this.htm);
-    this.htm = '';
-}
-
-function pntCnvIhtm()
-{
-    this.cnv.innerHTML += this.htm;
-    this.htm = '';
-}
-
-function pntCnv()
-{
-    this.htm = '';
-}
-
-function mkDiv(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-
-    //alert(this.htm);
-}
-
-function mkDivPrint(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'border-left:' + w + 'px solid ' + this.color + ';'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-}
-
-function mkLyr(x, y, w, h)
-{
-    this.htm += '<layer '+
-        'left="' + x + '" '+
-        'top="' + y + '" '+
-        'width="' + w + '" '+
-        'height="' + h + '" '+
-        'bgcolor="' + this.color + '"><\/layer>\n';
-}
-
-function mkLbl(txt, x, y)
-{
-    this.htm += '<div style="position:absolute;white-space:nowrap;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'font-family:' +  this.ftFam + ';'+
-        'font-size:' + this.ftSz + ';'+
-        'color:' + this.color + ';' + this.ftSty + '">'+
-        txt +
-        '<\/div>';
-}
-
-function mkLin(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox, 1);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, 1, oy-y+1);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, 1, oy-y2+1);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, 1, y-oy);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, 1, y2-oy+1);
-        }
-    }
-}
-
-function mkLin2D(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-
-    var s = this.stroke;
-    if (dx >= dy)
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.ceil(s/2);
-
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox+ad, _s);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+ad+1, _s);
-    }
-
-    else
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.round(s/2);
-
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            ++ad;
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, _s, oy-y+ad);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, _s, oy-y2+ad);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, _s, y-oy+ad);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, _s, y2-oy+ad+1);
-        }
-    }
-}
-
-function mkLinDott(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1,
-    drw = true;
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx;
-        while ((dx--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            if (p > 0)
-            {
-                y += yIncr;
-                p += pru;
-            }
-            else p += pr;
-            ++x;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy;
-        while ((dy--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            y += yIncr;
-            if (p > 0)
-            {
-                ++x;
-                p += pru;
-            }
-            else p += pr;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-}
-
-function mkOv(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    ox = 0, oy = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1),
-    w, h;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-            tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-            w = x-ox;
-            h = oy-y;
-            if (w&0x2 && h&0x2)
-            {
-                this.mkOvQds(cx, cy, -x+0x2, ox+wod, -oy, oy-1+hod, 1, 1);
-                this.mkOvQds(cx, cy, -x+1, x-1+wod, -y-1, y+hod, 1, 1);
-            }
-            else this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, oy-h+hod, w, h);
-            ox = x;
-            oy = y;
-        }
-        else
-        {
-            tt -= aa*((y<<1)-0x3);
-            st -= (aa<<1)*(--y);
-        }
-    }
-    this.mkDiv(cx-a, cy-oy, a-ox+1, (oy<<1)+hod);
-    this.mkDiv(cx+ox+wod, cy-oy, a-ox+1, (oy<<1)+hod);
-}
-
-function mkOv2D(left, top, width, height)
-{
-    var s = this.stroke;
-    width += s-1;
-    height += s-1;
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1);
-
-
-    if (s-0x4 < 0 && (!(s-0x2) || width-0x33 > 0 && height-0x33 > 0))
-    {
-        var ox = 0, oy = b,
-        w, h,
-        pxl, pxr, pxt, pxb, pxw;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                w = x-ox;
-                h = oy-y;
-
-                if (w-1)
-                {
-                    pxw = w+1+(s&1);
-                    h = s;
-                }
-                else if (h-1)
-                {
-                    pxw = s;
-                    h += 1+(s&1);
-                }
-                else pxw = h = s;
-                this.mkOvQds(cx, cy, -x+1, ox-pxw+w+wod, -oy, -h+oy+hod, pxw, h);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
-        this.mkDiv(cx+a+wod-s+1, cy-oy, s, (oy<<1)+hod);
-    }
-
-
-    else
-    {
-        var _a = (width-((s-1)<<1))>>1,
-        _b = (height-((s-1)<<1))>>1,
-        _x = 0, _y = _b,
-        _aa = (_a*_a)<<1, _bb = (_b*_b)<<1,
-        _st = (_aa>>1)*(1-(_b<<1)) + _bb,
-        _tt = (_bb>>1) - _aa*((_b<<1)-1),
-
-        pxl = new Array(),
-        pxt = new Array(),
-        _pxb = new Array();
-        pxl[0] = 0;
-        pxt[0] = b;
-        _pxb[0] = _b-1;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-
-            if (_y > 0)
-            {
-                if (_st < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3);
-                    _tt += (_bb<<1)*(++_x);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else if (_tt < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3) - (_aa<<1)*(_y-1);
-                    _tt += (_bb<<1)*(++_x) - _aa*(((_y--)<<1)-0x3);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else
-                {
-                    _tt -= _aa*((_y<<1)-0x3);
-                    _st -= (_aa<<1)*(--_y);
-                    _pxb[_pxb.length-1]--;
-                }
-            }
-        }
-
-        var ox = 0, oy = b,
-        _oy = _pxb[0],
-        l = pxl.length,
-        w, h;
-        for (var i = 0; i < l; i++)
-        {
-            if (typeof _pxb[i] != "undefined")
-            {
-                if (_pxb[i] < _oy || pxt[i] < oy)
-                {
-                    x = pxl[i];
-                    this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, _oy+hod, x-ox, oy-_oy);
-                    ox = x;
-                    oy = pxt[i];
-                    _oy = _pxb[i];
-                }
-            }
-            else
-            {
-                x = pxl[i];
-                this.mkDiv(cx-x+1, cy-oy, 1, (oy<<1)+hod);
-                this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-                ox = x;
-                oy = pxt[i];
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
-        this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-    }
-}
-
-function mkOvDott(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = height&1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-    st = (aa2>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa2*((b<<1)-1),
-    drw = true;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - aa4*(y-1);
-            tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-        }
-        else
-        {
-            tt -= aa2*((y<<1)-0x3);
-            st -= aa4*(--y);
-        }
-        if (drw) this.mkOvQds(cx, cy, -x, x+wod, -y, y+hod, 1, 1);
-        drw = !drw;
-    }
-}
-
-function mkRect(x, y, w, h)
-{
-    var s = this.stroke;
-    this.mkDiv(x, y, w, s);
-    this.mkDiv(x+w, y, s, h);
-    this.mkDiv(x, y+h, w+s, s);
-    this.mkDiv(x, y+s, s, h-s);
-}
-
-function mkRectDott(x, y, w, h)
-{
-    this.drawLine(x, y, x+w, y);
-    this.drawLine(x+w, y, x+w, y+h);
-    this.drawLine(x, y+h, x+w, y+h);
-    this.drawLine(x, y, x, y+h);
-}
-
-function jsgFont()
-{
-    this.PLAIN = 'font-weight:normal;';
-    this.BOLD = 'font-weight:bold;';
-    this.ITALIC = 'font-style:italic;';
-    this.ITALIC_BOLD = this.ITALIC + this.BOLD;
-    this.BOLD_ITALIC = this.ITALIC_BOLD;
-}
-var Font = new jsgFont();
-
-function jsgStroke()
-{
-    this.DOTTED = -1;
-}
-
-var Stroke = new jsgStroke();
-
-function jsGraphics(id, wnd)
-{
-    this.setColor = new Function('arg', 'this.color = arg;');
-
-
-    this.getColor = new Function('return this.color');
-
-    this.setStroke = function(x)
-    {
-        this.stroke = x;
-        if (!(x+1))
-        {
-            this.drawLine = mkLinDott;
-            this.mkOv = mkOvDott;
-            this.drawRect = mkRectDott;
-        }
-        else if (x-1 > 0)
-        {
-            this.drawLine = mkLin2D;
-            this.mkOv = mkOv2D;
-            this.drawRect = mkRect;
-        }
-        else
-        {
-            this.drawLine = mkLin;
-            this.mkOv = mkOv;
-            this.drawRect = mkRect;
-        }
-    };
-
-
-
-    this.setPrintable = function(arg)
-    {
-        this.printable = arg;
-        this.mkDiv = jg_n4? mkLyr : arg? mkDivPrint : mkDiv;
-    };
-
-
-
-    this.setFont = function(fam, sz, sty)
-    {
-        this.ftFam = fam;
-        this.ftSz = sz;
-        this.ftSty = sty || Font.PLAIN;
-    };
-
-
-
-    this.drawPolyline = this.drawPolyLine = function(x, y, s)
-    {
-        var i = x.length-1; while (i >= 0)
-            this.drawLine(x[i], y[i], x[--i], y[i]);
-    };
-
-
-
-    this.fillRect = function(x, y, w, h)
-    {
-        this.mkDiv(x, y, w, h);
-    };
-
-
-    this.fillRectPattern = function(x, y, w, h, url)
-    {
-        this.htm += '<div style="position:absolute;'+
-            'left:' + x + 'px;'+
-            'top:' + y + 'px;'+
-            'width:' + w + 'px;'+
-            'height:' + h + 'px;'+
-            'clip:rect(0,'+w+'px,'+h+'px,0);'+
-            'overflow:hidden;'+
-            //'background-color:' + this.color + ';'+
-            "background-image: url('" + url + "');"+
-            "layer-background-image: url('" + url + "');"+
-            'z-index:100;"><\/div>';
-        //alert(this.htm);
-    }
-
-    this.drawHandle = function(x, y, w, h, cursor)
-    {
-        
-        this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'padding: 2px;overflow:hidden;'+
-        "cursor: '" + cursor + "';"+
-        '" class="handleBox" id="' + cursor + '" ><\/div>';
-    }
-
-    this.drawHandleBox = function(x, y, w, h, cursor)
-    {
-        
-        this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+(w+2)+'px,'+(h+2)+'px,0);'+
-        'overflow:hidden; border: solid 1px '+ this.color+';'+
-        "cursor: '" + cursor + "';"+
-        '" class="handleBox" id="' + cursor + '" ><\/div>';
-
-        
-    }
-
-    this.drawPolygon = function(x, y)
-    {
-        this.drawPolyline(x, y);
-        this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
-    };
-
-
-
-    this.drawEllipse = this.drawOval = function(x, y, w, h)
-    {
-        this.mkOv(x, y, w, h);
-    };
-
-
-
-    this.fillEllipse = this.fillOval = function(left, top, w, h)
-    {
-        var a = (w -= 1)>>1, b = (h -= 1)>>1,
-        wod = (w&1)+1, hod = (h&1)+1,
-        cx = left+a, cy = top+b,
-        x = 0, y = b,
-        ox = 0, oy = b,
-        aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-        st = (aa2>>1)*(1-(b<<1)) + bb,
-        tt = (bb>>1) - aa2*((b<<1)-1),
-        pxl, dw, dh;
-        if (w+1) while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - aa4*(y-1);
-                pxl = cx-x;
-                dw = (x<<1)+wod;
-                tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-                dh = oy-y;
-                this.mkDiv(pxl, cy-oy, dw, dh);
-                this.mkDiv(pxl, cy+oy-dh+hod, dw, dh);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa2*((y<<1)-0x3);
-                st -= aa4*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, w+1, (oy<<1)+hod);
-    };
-
-    this.drawString = mkLbl;
-
-    this.clear = function()
-    {
-        this.htm = "";
-        if (this.cnv) this.cnv.innerHTML = this.defhtm;
-        
-    };
-
-    this.mkOvQds = function(cx, cy, xl, xr, yt, yb, w, h)
-    {
-        this.mkDiv(xr+cx, yt+cy, w, h);
-        this.mkDiv(xr+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yt+cy, w, h);
-    };
-
-    this.setStroke(1);
-    this.setPrintable(false);
-    this.setFont('verdana,geneva,helvetica,sans-serif', String.fromCharCode(0x31, 0x32, 0x70, 0x78), Font.PLAIN);
-    this.color = '#000000';
-    this.htm = '';
-    this.wnd = wnd || window;
-
-    if (!(jg_ie || jg_dom || jg_ihtm)) chkDHTM();
-    if (typeof id != 'string' || !id) this.paint = pntDoc;
-    else
-    {
-        this.cnv = document.all? (this.wnd.document.all[id] || null)
-            : document.getElementById? (this.wnd.document.getElementById(id) || null)
-            : null;
-        this.defhtm = (this.cnv && this.cnv.innerHTML)? this.cnv.innerHTML : '';
-        this.paint = jg_dom? pntCnvDom : jg_ie? pntCnvIe : jg_ihtm? pntCnvIhtm : pntCnv;
-    }
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/backend.php b/web/imcms/xinha/plugins/ExtendedFileManager/backend.php
deleted file mode 100644
index f6c5f38717..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/backend.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php 
-/**
-* Unified backend for ExtendedFileManager - copied from ImageManager
-*
-* Image Manager was originally developed by:
-*   Xiang Wei Zhuo, email: xiangweizhuo(at)hotmail.com Wei Shou.
-*
-* Unified backend sponsored by DTLink Software, http://www.dtlink.com
-* Implementation by Yermo Lamers, http://www.formvista.com
-*
-* (c) DTLink, LLC 2005.
-* Distributed under the same terms as Xinha itself.
-* This notice MUST stay intact for use (see license.txt).
-*
-* DESCRIPTION:
-*
-* Instead of using separate URL's for each function, ImageManager now
-* routes all requests to the server through this single, replaceable,
-* entry point. backend.php expects at least two URL variable parameters: 
-*
-* __plugin=ImageManager   for future expansion; identify the plugin being requested.
-* __function=thumbs|images|editorFrame|editor|manager  function being called.
-*
-* Having a single entry point that strictly adheres to a defined interface will 
-* make the backend code much easier to maintain and expand. It will make it easier
-* on integrators, not to mention it'll make it easier to have separate 
-* implementations of the backend in different languages (Perl, Python, ASP, etc.) 
-*
-* @see config.inc.php
-*/
-
-/**
-* ImageManager configuration
-*/
-
-require_once('config.inc.php');
-
-
-// Strip slashes if MQGPC is on
-set_magic_quotes_runtime(0);
-if(get_magic_quotes_gpc())
-{
-  $to_clean = array(&$_GET, &$_POST, &$_REQUEST, &$_COOKIE);
-  while(count($to_clean))
-  {
-    $cleaning =& $to_clean[array_pop($junk = array_keys($to_clean))];
-    unset($to_clean[array_pop($junk = array_keys($to_clean))]);
-    foreach(array_keys($cleaning) as $k)
-    {
-      if(is_array($cleaning[$k]))
-      {
-        $to_clean[] =& $cleaning[$k];
-      }
-      else
-      {
-        $cleaning[$k] = stripslashes($cleaning[$k]);
-      }
-    }
-  }
-}
-
-/**
-* ImageManager configuration
-*/
-
-$formVars = empty($_POST) ? $_GET : $_POST;
-
-// make sure the request is for us (this gives us the ability to eventually organize
-// a backend event handler system) For an include file the return doesn't make alot of
-// sense but eventually we'll want to turn all of this into at least functions 
-// separating out all the presentation HTML from the logic. (Right now all the HTML
-// used by ImageManager is in the same files as the PHP code ...)
-
-if ( @$formVars[ "__plugin" ] != "ExtendedFileManager" )
-	{
-	// not for us.
-
-	return true;
-	}
-
-// so we don't have to re-engineer the entire thing right now, since it's probably
-// going to get rewritten anyway, we just include the correct file based on the 
-// function request.
-
-switch ( @$formVars[ "__function" ] )
-	{
-
-	case "editor": 
-	case "editorFrame":
-	case "manager":
-	case "images":
-	case "thumbs":
-	case "resizer":
-
-		include_once $IMConfig['base_dir'] . '/' . $formVars['__function'] . '.php' ;
-		exit();
-		
-		break;
-
-	default:
-
-		break;
-
-	}	// end of switch.
-
-return false ;
-
-// END
-
-?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/config.inc.php b/web/imcms/xinha/plugins/ExtendedFileManager/config.inc.php
deleted file mode 100644
index e92dbf43b7..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/config.inc.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-/**
- * ExtendedFileManager configuration file.
- * Authors: Wei Zhuo, Afru
- * Version: Updated on 08-01-2005 by Afru
- * Version 1.1.2: Updated on 04-07-2006 by Krzysztof Kotowicz <koto@webworkers.pl>
- * Package: ExtendedFileManager
- * http://www.afrusoft.com/htmlarea
- */
-
-/*  Configuration file usage:
- *	There are two insertModes for this filemanager.
- *	One is "image" and another is "link".
- *	So you can assign config values as below
- *
- *	if($insertMode=="image") $IMConfig['property']=somevalueforimagemode;
- *	else if($insertMode=="link") $IMConfig['property']=somevalueforlinkmode;
- *
- *	(or) you can directly as $IMConfig['property']=somevalueforbothmodes;
- *
- *	Best of Luck :) Afru.
- */
- 
-/*
- *	Getting the mode for further differentiation
- */
-
-if(empty($insertMode))
-    $insertMode="image";
-
-/**
-* Default backend URL
-*
-* URL to use for unified backend.
-*
-* The ?__plugin=ExtendedFileManager& is required.
-*/
-
-$IMConfig['backend_url'] = "backend.php?__plugin=ExtendedFileManager&";
-
-/**
-* Backend Installation Directory
-*
-* location of backend install; these are used to link to css and js
-* assets because we may have the front end installed in a different
-* directory than the backend. (i.e. nothing assumes that the frontend
-* and the backend are in the same directory)
-*/
-$IMConfig['base_dir'] = getcwd();
-$IMConfig['base_url'] = '';
-
-
-/*
-	 File system path to the directory you want to manage the images
-	 for multiple user systems, set it dynamically.
-
-	 NOTE: This directory requires write access by PHP. That is,
-		   PHP must be able to create files in this directory.
-		   Able to create directories is nice, but not necessary.
-*/
-$IMConfig['images_dir'] = 'demo_images';
-//You may set a different directory for the link mode; if you don't, the above setting will be used for both modes
-//$IMConfig['files_dir'] = 'demo_files';
-
-/*
- The URL to the above path, the web browser needs to be able to see it.
- It can be protected via .htaccess on apache or directory permissions on IIS,
- check you web server documentation for futher information on directory protection
- If this directory needs to be publicly accessiable, remove scripting capabilities
- for this directory (i.e. disable PHP, Perl, CGI). We only want to store assets
- in this directory and its subdirectories.
-*/
-$IMConfig['images_url'] = str_replace( array("backend.php","manager.php"), "", $_SERVER["PHP_SELF"] ) . $IMConfig['images_dir'];
-//$IMConfig['files_url'] = 'url/to/files_dir';
-
-/*
-  Possible values: true, false
-
-  TRUE - If PHP on the web server is in safe mode, set this to true.
-         SAFE MODE restrictions: directory creation will not be possible,
-		 only the GD library can be used, other libraries require
-		 Safe Mode to be off.
-
-  FALSE - Set to false if PHP on the web server is not in safe mode.
-*/
-$IMConfig['safe_mode'] = false;
-
-/*
-This specifies whether any image library is available to resize and edit images.TRUE - Thumbnails will be resized by image libraries and if there is no library, default thumbnail will be shown.
-FALSE - Thumbnails will be resized by browser ignoring image libraries.
-*/
-$IMConfig['img_library'] = true;
-
-
-/*
-View type when the File manager is in insert image mode.
-Valid values are "thumbview" and "listview".
-*/
-
-    
-if ($insertMode == 'image')
-	$IMConfig['view_type'] = "thumbview";
-	
-else if($insertMode == "link")
-	$IMConfig['view_type'] = "listview";
-
-$IMConfig['insert_mode'] = $insertMode;
-
-/* 
- Possible values: 'GD', 'IM', or 'NetPBM'
-
- The image manipulation library to use, either GD or ImageMagick or NetPBM.
- If you have safe mode ON, or don't have the binaries to other packages, 
- your choice is 'GD' only. Other packages require Safe Mode to be off.
-*/
-define('IMAGE_CLASS', 'GD');
-
-
-/*
- After defining which library to use, if it is NetPBM or IM, you need to
- specify where the binary for the selected library are. And of course
- your server and PHP must be able to execute them (i.e. safe mode is OFF).
- GD does not require the following definition.
-*/
-define('IMAGE_TRANSFORM_LIB_PATH', 'C:/"Program Files"/ImageMagick-5.5.7-Q16/');
-
-
-/*
-  The prefix for thumbnail files, something like .thumb will do. The
-  thumbnails files will be named as "prefix_imagefile.ext", that is,
-  prefix + orginal filename.
-*/
-$IMConfig['thumbnail_prefix'] = 't_';
-
-
-/*
-  Thumbnail can also be stored in a directory, this directory
-  will be created by PHP. If PHP is in safe mode, this parameter
-  is ignored, you can not create directories.
-
-  If you do not want to store thumbnails in a directory, set this
-  to false or empty string '';
-*/
-$IMConfig['thumbnail_dir'] = 't';
-
-/**
-* Resized prefix
-*
-* The prefix for resized files, something like .resized will do.  The
-* resized files will be named <prefix>_<width>x<height>_<original>
-* resized files are created when one changes the dimensions of an image
-* in the image manager selection dialog - the image is scaled when the
-* user clicks the ok button.
-*/
-
-$IMConfig['resized_prefix'] = '.resized';
-
-// -------------------------------------------------------------------------
-
-/**
-* Resized Directory
-*
-* Resized images may also be stored in a directory, except in safe mode.
-*/
-
-$IMConfig['resized_dir'] = '';
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to create new sub-directories in the
-         $IMConfig['images_dir']/$IMConfig['files_dir'].
-
- FALSE - No directory creation.
-
- NOTE: If $IMConfig['safe_mode'] = true, this parameter
-       is ignored, you can not create directories
-*/
-$IMConfig['allow_new_dir'] = true;
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to edit image by image editor.
-
- FALSE - No edit icon will be displayed.
-
- NOTE: If $IMConfig['img_library'] = false, this parameter
-       is ignored, you can not edit images.
-*/
-$IMConfig['allow_edit_image'] = true;
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to rename files and folders.
-
- FALSE - No rename icon will be displayed.
-
-*/
-$IMConfig['allow_rename'] = true;
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to perform cut/copy/paste actions.
-
- FALSE - No cut/copy/paste icons will be displayed.
-
-*/
-$IMConfig['allow_cut_copy_paste'] = true;
-
-/*
-  Possible values: true, false
-
-  TRUE - Display color pickers for image background / border colors
-
-  FALSE - Don't display color pickers
-*/
-$IMConfig['use_color_pickers'] = true;
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to set alt (alternative text) attribute.
-
- FALSE - No input field for alt attribute will be displayed.
-
- NOTE: The alt attribute is _obligatory_ for images, so <img alt="" /> will be inserted
-      if 'images_enable_alt' is set to false
-*/
-$IMConfig['images_enable_alt'] = true;
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to set title attribute (usually displayed when mouse is over element).
-
- FALSE - No input field for title attribute will be displayed.
-
-*/
-$IMConfig['images_enable_title'] = false;
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to set align attribute.
-
- FALSE - No selection box for align attribute will be displayed.
-
-*/
-$IMConfig['images_enable_align'] = true;
-
-/*
-  Possible values: true, false
-
- TRUE -  Allow the user to set margin, padding, and border styles for the image
-
- FALSE - No styling input fields will be displayed.
-
-*/
-$IMConfig['images_enable_styling'] = true;
-
-/*
-  Possible values: true, false
-
- TRUE -   Allow the user to set target attribute for link (the window in which the link will be opened).
-
- FALSE - No selection box for target attribute will be displayed.
-
-*/
-$IMConfig['link_enable_target'] = true;
-/*
-  Possible values: true, false
-
-  TRUE - Allow the user to upload files.
-
-  FALSE - No uploading allowed.
-*/
-$IMConfig['allow_upload'] = true;
-
-/* Maximum upload file size
-
-  Possible values: number, "max"
-
-  number - maximum size in Kilobytes.
-
-  "max"  - the maximum allowed by the server (the value is retrieved from the server configuration).
-*/
-$IMConfig['max_filesize_kb_image'] = 2000000;
-
-$IMConfig['max_filesize_kb_link'] = 5000;
-
-/* Maximum upload folder size in Megabytes. Use 0 to disable limit */
-$IMConfig['max_foldersize_mb'] = 0;
-
-/*
-Allowed extensions that can be shown and allowed to upload.
-Available icons are for "doc,fla,gif,gz,html,jpg,js,mov,pdf,php,png,ppt,rar,txt,xls,zip"
--Changed by AFRU.
-*/
-
-$IMConfig['allowed_image_extensions'] = array("jpg","gif","png","bmp");
-$IMConfig['allowed_link_extensions'] = array("jpg","gif","js","php","pdf","zip","txt","psd","png","html","swf","xml","xls","doc");
-
-
-/*
- The default thumbnail and list view icon in case thumbnails are not created and the files are of unknown.
-*/
-$IMConfig['default_thumbnail'] = 'icons/def.gif';
-$IMConfig['default_listicon'] = 'icons/def_small.gif';
-
-
-/*
-Only files with these extensions will be shown as thumbnails. All other files will be shown as icons.
-*/
-$IMConfig['thumbnail_extensions'] = array("jpg", "gif", "png", "bmp");
-
-/*
-  Thumbnail dimensions.
-*/
-$IMConfig['thumbnail_width'] = 84;
-$IMConfig['thumbnail_height'] = 84;
-
-/*
-  Image Editor temporary filename prefix.
-*/
-$IMConfig['tmp_prefix'] = '.editor_';
-
-
-// Standard PHP Backend Data Passing
-//  if data was passed using xinha_pass_to_php_backend() we merge the items
-//  provided into the Config
-require_once(realpath(dirname(__FILE__) . '/../../contrib/php-xinha.php'));
-if($passed_data = xinha_read_passed_data())
-{
-  $IMConfig = array_merge($IMConfig, $passed_data);
-  $IMConfig['backend_url'] .= xinha_passed_data_querystring() . '&';
-}
-// Deprecated config passing, don't use this way any more!
-elseif(isset($_REQUEST['backend_config']))
-{
-  if(get_magic_quotes_gpc()) {
-    $_REQUEST['backend_config'] = stripslashes($_REQUEST['backend_config']);
-  }
-
-  // Config specified from front end, check that it's valid
-  session_start();
-  if (!array_key_exists($_REQUEST['backend_config_secret_key_location'], $_SESSION))
-    die("Backend security error.");
-
-  $secret = $_SESSION[$_REQUEST['backend_config_secret_key_location']];
-
-  if($_REQUEST['backend_config_hash'] !== sha1($_REQUEST['backend_config'] . $secret))
-  {
-    die("Backend security error.");
-  }
-
-  $to_merge = unserialize($_REQUEST['backend_config']);
-  if(!is_array($to_merge))
-  {
-    die("Backend config syntax error.");
-  }
-
-  $IMConfig = array_merge($IMConfig, $to_merge);
-
-   // changed config settings keys in relation to ImageManager
-  $IMConfig['backend_url'] .= "backend_config=" . rawurlencode($_REQUEST['backend_config']) . '&';
-  $IMConfig['backend_url'] .= "backend_config_hash=" . rawurlencode($_REQUEST['backend_config_hash']) . '&';
-  $IMConfig['backend_url'] .= "backend_config_secret_key_location=" . rawurlencode($_REQUEST['backend_config_secret_key_location']) . '&';
-
-}
-if ($IMConfig['max_filesize_kb_link'] == "max")
-{
-  $IMConfig['max_filesize_kb_link'] = upload_max_filesize_kb();
-}
-
-if ($IMConfig['max_filesize_kb_image'] == "max")
-{
-  $IMConfig['max_filesize_kb_image'] = upload_max_filesize_kb();
-}
-// END
-
-?>
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/.htaccess b/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/.htaccess
deleted file mode 100644
index 0471132208..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-php_flag engine off
-AddType text/html .html .htm .shtml .php .php3 .phtml .phtm .pl .py .cgi
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/bikerpeep.jpg b/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/bikerpeep.jpg
deleted file mode 100644
index a2e7028eb7..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/bikerpeep.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/linux/linux.gif b/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/linux/linux.gif
deleted file mode 100644
index 86e174cc97..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/linux/linux.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/wesnoth078.jpg b/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/wesnoth078.jpg
deleted file mode 100644
index ea37d1aea7..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/demo_images/wesnoth078.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/editor.php b/web/imcms/xinha/plugins/ExtendedFileManager/editor.php
deleted file mode 100644
index 3256b5f217..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/editor.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * ExtendedFileManager editor.php file.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 21-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
-	if(!isset($insertMode)) $insertMode="image";
-
-require_once('config.inc.php');
-require_once('Classes/ExtendedFileManager.php');
-require_once('../ImageManager/Classes/ImageEditor.php');
-
-$manager = new ExtendedFileManager($IMConfig,$insertMode);
-$editor = new ImageEditor($manager);
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-	<title></title>
-	<link href="<?php print $IMConfig['base_url'];?>assets/editor.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/slider.js"></script>
-<script type="text/javascript" src="../../popups/popup.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/popup.js"></script>
-<script type="text/javascript">
-/*<![CDATA[*/
-
-    var _backend_url = "<?php print $IMConfig['backend_url']."&mode=$insertMode"; ?>&";
-
-	if(window.opener)
-		Xinha = window.opener.Xinha;
-/*]]>*/
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/editor.js"></script>
-</head>
-
-<body>
-<div id="indicator">
-<img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" id="indicator_image" height="20" width="20" alt="" />
-</div>
-<div id="tools">
-	<div id="tools_crop" style="display:none;">
-		<div id="tool_inputs">
-			<label for="cx">Start X:</label><input type="text" id="cx"  class="textInput" onchange="updateMarker('crop')"/>
-			<label for="cy">Start Y:</label><input type="text" id="cy" class="textInput" onchange="updateMarker('crop')"/>
-			<label for="cw">Width:</label><input type="text" id="cw" class="textInput" onchange="updateMarker('crop')"/>
-			<label for="ch">Height:</label><input type="text" id="ch" class="textInput" onchange="updateMarker('crop')"/>			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('crop');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancel"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>
-	</div>	
-	<div id="tools_scale" style="display:none;">
-		<div id="tool_inputs">
-			<label for="sw">Width:</label><input type="text" id="sw" class="textInput" onchange="checkConstrains('width')"/>
-			<a href="javascript:toggleConstraints();" title="Lock"><img src="<?php print $IMConfig['base_url'];?>img/islocked2.gif" id="scaleConstImg" height="14" width="8" alt="Lock" class="div" /></a><label for="sh">Height:</label>
-			<input type="text" id="sh" class="textInput" onchange="checkConstrains('height')"/>
-			<input type="checkbox" id="constProp" value="1" checked="checked" onclick="toggleConstraints()"/>
-			<label for="constProp">Constrain Proportions</label>
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('scale');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancle"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>
-	</div>	
-	<div id="tools_rotate" style="display:none;">
-		<div id="tool_inputs">
-			<select id="flip" name="flip" style="margin-left: 10px; vertical-align: middle;">
-              <option selected>Flip Image</option>
-              <option>-----------------</option>
-              <option value="hoz">Flip Horizontal</option>
-              <option value="ver">Flip Vertical</option>
-         </select>
-			<select name="rotate" onchange="rotatePreset(this)" style="margin-left: 20px; vertical-align: middle;">
-              <option selected>Rotate Image</option>
-              <option>-----------------</option>
-
-              <option value="180">Rotate 180 &deg;</option>
-              <option value="90">Rotate 90 &deg; CW</option>
-              <option value="-90">Rotate 90 &deg; CCW</option>
-         </select>
-			<label for="ra">Angle:</label><input type="text" id="ra" class="textInput" />
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('rotate');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancle"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>
-	</div>		
-	<div id="tools_measure" style="display:none;">
-		<div id="tool_inputs">
-			<label>X:</label><input type="text" class="measureStats" id="sx" />
-			<label>Y:</label><input type="text" class="measureStats" id="sy" />
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-			<label>W:</label><input type="text" class="measureStats" id="mw" />
-			<label>H:</label><input type="text" class="measureStats" id="mh" />
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-			<label>A:</label><input type="text" class="measureStats" id="ma" />		
-			<label>D:</label><input type="text" class="measureStats" id="md" />		
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-			<button type="button" onclick="editor.reset();" >Clear</button>
-		</div>	
-	</div>
-	<div id="tools_save" style="display:none;">
-		<div id="tool_inputs">
-			<label for="save_filename">Filename:</label><input type="text" id="save_filename" value="<?php echo $editor->getDefaultSaveFile();?>"/>
-			<select name="format" id="save_format" style="margin-left: 10px; vertical-align: middle;" onchange="updateFormat(this)">
-            <option value="" selected>Image Format</option>
-            <option value="">---------------------</option>
-            <option value="jpeg,85">JPEG High</option>
-            <option value="jpeg,60">JPEG Medium</option>
-            <option value="jpeg,35">JPEG Low</option>
-            <option value="png">PNG</option>
-			<?php if($editor->isGDGIFAble() != -1) { ?>
-            <option value="gif">GIF</option>
-			<?php } ?>
-         </select>
-			<label>Quality:</label>
-			<table style="display: inline; vertical-align: middle;" cellpadding="0" cellspacing="0">
-				<tr>
-				<td>
-					<div id="slidercasing"> 
-				<div id="slidertrack" style="width:100px"><img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" width="1" height="1" border="0" alt="track"></div>
-            <div id="sliderbar" style="left:85px" onmousedown="captureStart();"><img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" width="1" height="1" border="0" alt="track"></div>
-			</div>	
-				</td>
-				</tr>
-			</table>				
-			<input type="text" id="quality" onchange="updateSlider(this.value)" style="width: 2em;" value="85"/>
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('save');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancel"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>
-	</div>	
-</div>
-<div id="toolbar">
-<a href="javascript:toggle('crop')" id="icon_crop" title="Crop"><img src="<?php print $IMConfig['base_url'];?>img/crop.gif" height="20" width="20" alt="Crop" /><span>Crop</span></a>
-<a href="javascript:toggle('scale')" id="icon_scale" title="Resize"><img src="<?php print $IMConfig['base_url'];?>img/scale.gif" height="20" width="20" alt="Resize" /><span>Resize</span></a>
-<a href="javascript:toggle('rotate')" id="icon_rotate" title="Rotate"><img src="<?php print $IMConfig['base_url'];?>img/rotate.gif" height="20" width="20" alt="Rotate" /><span>Rotate</span></a>
-<a href="javascript:toggle('measure')" id="icon_measure" title="Measure"><img src="<?php print $IMConfig['base_url'];?>img/measure.gif" height="20" width="20" alt="Measure" /><span>Measure</span></a>
-<a href="javascript: toggleMarker();" title="Marker"><img id="markerImg" src="<?php print $IMConfig['base_url'];?>img/t_black.gif" height="20" width="20" alt="Marker" /><span>Marker</span></a>
-<a href="javascript:toggle('save')" id="icon_save" title="Save"><img src="<?php print $IMConfig['base_url'];?>img/save.gif" height="20" width="20" alt="Save" /><span>Save</span></a>
-</div>
-<div id="contents">
-<iframe src="<?php print $IMConfig['backend_url']; ?>__function=editorFrame&img=<?php if(isset($_GET['img'])) echo rawurlencode($_GET['img']); ?>&mode=<?php echo $insertMode ?>" name="editor" id="editor"  scrolling="auto" title="Image Editor" frameborder="0"></iframe>
-</div>
-<div id="bottom"></div>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/editorFrame.php b/web/imcms/xinha/plugins/ExtendedFileManager/editorFrame.php
deleted file mode 100644
index a44d218f9f..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/editorFrame.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * ExtendedFileManager editorframe.php file.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 21-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
-	if(!isset($insertMode)) $insertMode="image";
-
-require_once('config.inc.php');
-require_once('Classes/ExtendedFileManager.php');
-require_once('../ImageManager/Classes/ImageEditor.php');
-
-$manager = new ExtendedFileManager($IMConfig,$insertMode);
-$editor = new ImageEditor($manager);
-$imageInfo = $editor->processImage();
-
-?>
-
-<html>
-<head>
-	<title></title>
-<link href="<?php print $IMConfig['base_url'];?>assets/editorFrame.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/wz_jsgraphics.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/EditorContent.js"></script>
-<script type="text/javascript">
-    var _backend_url = "<?php print $IMConfig['backend_url']."&mode=$insertMode"; ?>&";
-
-    if(window.top)
-    	Xinha = window.top.Xinha;
-
-    function i18n(str) {
-        return Xinha._lc(str, 'ImageManager');
-    }
-
-	var mode = "<?php echo $editor->getAction(); ?>" //crop, scale, measure
-
-var currentImageFile = "<?php if(count($imageInfo)>0) echo rawurlencode($imageInfo['file']); ?>";
-
-<?php if ($editor->isFileSaved() == 1) { ?>
-	alert(i18n('File saved.'));
-
-    window.parent.opener.parent.refresh();
-    window.parent.opener.selectImage
-    (
-  	'<?php echo $imageInfo['saveFile'] ?>',
-  	'<?php echo $imageInfo['saveFile'] ?>'.replace(/^.*\/?([^\/]*)$/, '$1'),
-  	<?php echo $imageInfo['width'] ?>,
-  	<?php echo $imageInfo['height'] ?>
-  	);
-  	window.parent.close();
-  	
-<?php } else if ($editor->isFileSaved() == -1) { ?>
-	alert(i18n('File was not saved.'));
-<?php } ?>
-
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/editorFrame.js"></script>
-</head>
-
-<body>
-<div id="status"></div>
-<div id="ant" class="selection" style="visibility:hidden"><img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" width="0" height="0" border="0" alt="" id="cropContent"></div>
-<?php if ($editor->isGDEditable() == -1) { ?>
-	<div style="text-align:center; padding:10px;"><span class="error">GIF format is not supported, image editing not supported.</span></div>
-<?php } ?>
-<table height="100%" width="100%">
-	<tr>
-		<td>
-<?php if(count($imageInfo) > 0 && is_file($imageInfo['fullpath'])) { ?>
-	<span id="imgCanvas" class="crop"><img src="<?php echo $imageInfo['src']; ?>" <?php echo $imageInfo['dimensions']; ?> alt="" id="theImage" name="theImage"></span>
-<?php } else { ?>
-	<span class="error">No Image Available</span>
-<?php } ?>
-		</td>
-	</tr>
-</table>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/extended-file-manager.js b/web/imcms/xinha/plugins/ExtendedFileManager/extended-file-manager.js
deleted file mode 100644
index 6f2626e9b4..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/extended-file-manager.js
+++ /dev/null
@@ -1,346 +0,0 @@
-/**
- * ExtendedFileManager extended-file-manager.js file.
- * Authors: Wei Zhuo, Afru
- * Modified by: Krzysztof Kotowicz <koto@webworkers.pl>
- * Version: Updated on 08-01-2005 by Afru
- * Version: Modified on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-
-/**
- * For installation details see Readme.txt in the plugin folder
- *
- */
-
-function ExtendedFileManager(editor)
-{
-
-    this.editor = editor;
-
-    var cfg = editor.config;
-    var toolbar = cfg.toolbar;
-    var self = this;
-    
-    if (cfg.ExtendedFileManager.use_linker) {
-        cfg.registerButton({
-            id        : "linkfile",
-            tooltip   : Xinha._lc("Insert File Link",'ExtendedFileManager'),
-            image     : _editor_url + 'plugins/ExtendedFileManager/img/ed_linkfile.gif',
-            textMode  : false,
-            action    : function(editor) {
-                    editor._linkFile();
-                  }
-            });
-        cfg.addToolbarElement("linkfile", "createlink", 1);
-        };
-    }
-
-ExtendedFileManager._pluginInfo = {
-    name          : "ExtendedFileManager",
-    version       : "1.1.1",
-    developer     : "Afru, Krzysztof Kotowicz",
-    developer_url : "http://www.afrusoft.com/htmlarea/",
-    license       : "htmlArea"
-};
-
-Xinha.Config.prototype.ExtendedFileManager =
-{
-  'use_linker': true,
-  'backend'    : _editor_url + 'plugins/ExtendedFileManager/backend.php?__plugin=ExtendedFileManager&',
-  'backend_data' : null,
-  // deprecated keys, use passing data through e.g. xinha_pass_to_php_backend()
-  'backend_config'     : null,
-  'backend_config_hash': null,
-  'backend_config_secret_key_location': 'Xinha:ImageManager'
-};
-
-// Over ride the _insertImage function in htmlarea.js.
-// Open up the ExtendedFileManger script instead.
-if(typeof ImageManager == 'undefined')
-{
-Xinha.prototype._insertImage = function(image) {
-
-    var editor = this;  // for nested functions
-    var outparam = {"editor" : this, param : null};
-    
-    if (typeof image == "undefined") {
-        image = this.getParentElement();
-        if (image && !/^img$/i.test(image.tagName))
-            image = null;
-    }
-
-    if (image) {
-        outparam.param = {
-            f_url    : Xinha.is_ie ? image.src : image.getAttribute("src"),
-            f_alt    : image.alt,
-            f_title  : image.title,
-            f_border : image.style.borderWidth ? image.style.borderWidth : image.border,
-            f_align  : image.align,
-            f_width  : image.width,
-            f_height  : image.height,
-            f_padding: image.style.padding,
-            f_margin : image.style.margin,
-            f_backgroundColor: image.style.backgroundColor,
-            f_borderColor: image.style.borderColor,
-            baseHref: editor.config.baseHref
-        };
-
-        // compress 'top right bottom left' syntax into one value if possible
-        outparam.param.f_border = shortSize(outparam.param.f_border);
-        outparam.param.f_padding = shortSize(outparam.param.f_padding);
-        outparam.param.f_margin = shortSize(outparam.param.f_margin);
-
-        // convert rgb() calls to rgb hex
-        outparam.param.f_backgroundColor = convertToHex(outparam.param.f_backgroundColor);
-        outparam.param.f_borderColor = convertToHex(outparam.param.f_borderColor);
-
-    }
-
-    var manager = editor.config.ExtendedFileManager.backend + '__function=manager';
-    if(editor.config.ExtendedFileManager.backend_config != null)
-    {
-      manager += '&backend_config='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config);
-      manager += '&backend_config_hash='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_hash);
-      manager += '&backend_config_secret_key_location='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_secret_key_location);
-    }
-
-    if(editor.config.ExtendedFileManager.backend_data != null)
-    {
-        for ( var i in editor.config.ExtendedFileManager.backend_data )
-        {
-            manager += '&' + i + '=' + encodeURIComponent(editor.config.ExtendedFileManager.backend_data[i]);
-        }
-    }
-
-    Dialog(manager, function(param){
-        if (!param)
-        {   // user must have pressed Cancel
-            return false;
-        }
-
-        var img = image;
-        if (!img) {
-        	if ( !param.f_url ) return false;
-            if (Xinha.is_ie) {
-                var sel = editor.getSelection();
-                var range = editor.createRange(sel);
-                editor._doc.execCommand("insertimage", false, param.f_url);
-                img = range.parentElement();
-                // wonder if this works...
-                if (img.tagName.toLowerCase() != "img") {
-                    img = img.previousSibling;
-                }
-
-            } else {
-                img = document.createElement('img');
-                img.src = param.f_url;
-                editor.insertNodeAtSelection(img);
-            }
-
-        } else {
-        	if ( !param.f_url ) { // delete the image if empty url passed
-        		img.parentNode.removeChild(img);
-        		editor.updateToolbar();
-        		return false;
-        	} else {
-                img.src = param.f_url;
-        	}
-        }
-
-        img.alt = img.alt ? img.alt : '';
-        
-        for (field in param)
-        {
-            var value = param[field];
-            switch (field)
-            {
-                case "f_alt"    : img.alt    = value; break;
-                case "f_title"  : img.title = value; break;
-                case "f_border" : 
-                    if (value)
-                    {
-                        img.style.borderWidth = /[^0-9]/.test(value) ? value : (value != '') ? (parseInt(value) + 'px') : '';
-                        if(img.style.borderWidth && !img.style.borderStyle)
-                        {
-                            img.style.borderStyle = 'solid';
-                        }
-                        else if (!img.style.borderWidth)
-                        {
-                        	img.style.border = '';
-                        }
-                    }
-                break;
-                case "f_borderColor": img.style.borderColor =  value; break;
-                case "f_backgroundColor": img.style.backgroundColor = value; break;
-                case "f_align"  : img.align  = value; break;
-                case "f_width"  : 
-                    if ( parseInt( value ) > 0 )
-                    {
-                        img.width = parseInt(value);
-                    }
-                break;
-                case "f_height"  : 
-                    if ( parseInt( value ) > 0 )
-                    {
-                        img.height = parseInt(value);
-                    }
-                break;
-                case "f_padding": img.style.padding =
-                                          /[^0-9]/.test(value) ? value : (value != '') ? (parseInt(value) + 'px') :''; break;
-                case "f_margin": img.style.margin =
-                                          /[^0-9]/.test(value) ? value : (value != '') ? (parseInt(value) + 'px') :''; break;
-            }
-        }
-
-    }, outparam);
-
-};
-}
-
-Xinha.prototype._linkFile = function(link) {
-
-    var editor = this;
-    var outparam = {"editor" : this, param : null};
-    if (typeof link == "undefined") {
-        link = this.getParentElement();
-        if (link) {
-            if (/^img$/i.test(link.tagName))
-                link = link.parentNode;
-            if (!/^a$/i.test(link.tagName))
-                link = null;
-        }
-    }
-    if (!link) {
-        var sel = editor.getSelection();
-        var range = editor.createRange(sel);
-        var compare = 0;
-        if (Xinha.is_ie) {
-            if ( sel.type == "Control" )
-                compare = range.length;
-            else
-                compare = range.compareEndPoints("StartToEnd", range);
-        } else {
-            compare = range.compareBoundaryPoints(range.START_TO_END, range);
-        }
-        if (compare == 0) {
-            alert(Xinha._lc("You must select some text before making a new link.", 'ExtendedFileManager'));
-            return;
-        }
-        outparam.param = {
-            f_href : '',
-            f_title : '',
-            f_target : '',
-            f_usetarget : editor.config.makeLinkShowsTarget,
-            baseHref: editor.config.baseHref
-        };
-    } else
-        outparam.param = {
-            f_href   : Xinha.is_ie ? link.href : link.getAttribute("href"),
-            f_title  : link.title,
-            f_target : link.target,
-            f_usetarget : editor.config.makeLinkShowsTarget,
-            baseHref: editor.config.baseHref
-        };
-
-    var manager = _editor_url + 'plugins/ExtendedFileManager/manager.php?mode=link';
-    if(editor.config.ExtendedFileManager.backend_config != null)
-    {
-       manager += '&backend_config='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config);
-       manager += '&backend_config_hash='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_hash);
-       manager += '&backend_config_secret_key_location='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_secret_key_location);
-    }
-
-    if(editor.config.ExtendedFileManager.backend_data != null)
-    {
-        for ( var i in editor.config.ExtendedFileManager.backend_data )
-        {
-            manager += '&' + i + '=' + encodeURIComponent(editor.config.ExtendedFileManager.backend_data[i]);
-        }
-    }
-
-
-    Dialog(manager, function(param){
-        if (!param)
-            return false;
-        var a = link;
-        if (!a) try {
-            editor._doc.execCommand("createlink", false, param.f_href);
-            a = editor.getParentElement();
-            var sel = editor.getSelection();
-            var range = editor.createRange(sel);
-            if (!Xinha.is_ie) {
-                a = range.startContainer;
-                if (!/^a$/i.test(a.tagName)) {
-                    a = a.nextSibling;
-                    if (a == null)
-                        a = range.startContainer.parentNode;
-                }
-            }
-        } catch(e) {}
-        else {
-            var href = param.f_href.trim();
-            editor.selectNodeContents(a);
-            if (href == "") {
-                editor._doc.execCommand("unlink", false, null);
-                editor.updateToolbar();
-                return false;
-            }
-            else {
-                a.href = href;
-            }
-        }
-        if (!(a && /^a$/i.test(a.tagName)))
-            return false;
-        a.target = param.f_target.trim();
-        a.title = param.f_title.trim();
-        editor.selectNodeContents(a);
-        editor.updateToolbar();
-    }, outparam);
-
-};
-
-function shortSize(cssSize)
-{
-    if(/ /.test(cssSize))
-    {
-        var sizes = cssSize.split(' ');
-        var useFirstSize = true;
-        for(var i = 1; i < sizes.length; i++)
-        {
-            if(sizes[0] != sizes[i])
-            {
-                useFirstSize = false;
-                break;
-            }
-        }
-        if(useFirstSize) cssSize = sizes[0];
-    }
-
-    return cssSize;
-}
-
-function convertToHex(color) {
-
-    if (typeof color == "string" && /, /.test.color)
-        color = color.replace(/, /, ','); // rgb(a, b) => rgb(a,b)
-
-    if (typeof color == "string" && / /.test.color) { // multiple values
-        var colors = color.split(' ');
-        var colorstring = '';
-        for (var i = 0; i < colors.length; i++) {
-            colorstring += Xinha._colorToRgb(colors[i]);
-            if (i + 1 < colors.length)
-                colorstring += " ";
-        }
-        return colorstring;
-    }
-
-    return Xinha._colorToRgb(color);
-}
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/def.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/def.gif
deleted file mode 100644
index 2845b96ac1..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/def.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/def_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/def_small.gif
deleted file mode 100644
index 54fd484ec5..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/def_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/doc.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/doc.gif
deleted file mode 100644
index f197227e3f..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/doc.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/doc_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/doc_small.gif
deleted file mode 100644
index a343a3ca7e..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/doc_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/fla.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/fla.gif
deleted file mode 100644
index 7135f2590d..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/fla.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/fla_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/fla_small.gif
deleted file mode 100644
index 02b13d166c..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/fla_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/folder.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/folder.gif
deleted file mode 100644
index 9003f58942..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/folder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/folder_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/folder_small.gif
deleted file mode 100644
index b50e98a2e1..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/folder_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/gif_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/gif_small.gif
deleted file mode 100644
index 837747334e..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/gif_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/gz.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/gz.gif
deleted file mode 100644
index f59ecef082..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/gz.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/gz_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/gz_small.gif
deleted file mode 100644
index 639556e638..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/gz_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/html.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/html.gif
deleted file mode 100644
index 2d54999ccb..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/html.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/html_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/html_small.gif
deleted file mode 100644
index 2d30ebd71d..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/html_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/jpg_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/jpg_small.gif
deleted file mode 100644
index a6a4e78b22..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/jpg_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/js.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/js.gif
deleted file mode 100644
index 9ab9878f07..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/js.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/js_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/js_small.gif
deleted file mode 100644
index 24e14fbe87..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/js_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/mov.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/mov.gif
deleted file mode 100644
index 26b659564f..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/mov.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/mov_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/mov_small.gif
deleted file mode 100644
index 5a35d21e91..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/mov_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/pdf.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/pdf.gif
deleted file mode 100644
index d3e3d55ac7..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/pdf.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/pdf_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/pdf_small.gif
deleted file mode 100644
index 71e00596a4..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/pdf_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/php.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/php.gif
deleted file mode 100644
index 20e563662d..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/php.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/php_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/php_small.gif
deleted file mode 100644
index 608691f964..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/php_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/png_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/png_small.gif
deleted file mode 100644
index f2684ace7a..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/png_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/ppt.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/ppt.gif
deleted file mode 100644
index 4339292fe3..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/ppt.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/ppt_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/ppt_small.gif
deleted file mode 100644
index f37bb09efe..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/ppt_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/rar.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/rar.gif
deleted file mode 100644
index e39549e62d..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/rar.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/rar_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/rar_small.gif
deleted file mode 100644
index eff38f4fd1..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/rar_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/txt.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/txt.gif
deleted file mode 100644
index fe76a19fe5..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/txt.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/txt_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/txt_small.gif
deleted file mode 100644
index 0279f99952..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/txt_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/xls.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/xls.gif
deleted file mode 100644
index e99e099850..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/xls.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/xls_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/xls_small.gif
deleted file mode 100644
index 347c0c36cd..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/xls_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/zip.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/zip.gif
deleted file mode 100644
index f59ecef082..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/zip.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/icons/zip_small.gif b/web/imcms/xinha/plugins/ExtendedFileManager/icons/zip_small.gif
deleted file mode 100644
index 639556e638..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/icons/zip_small.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/images.php b/web/imcms/xinha/plugins/ExtendedFileManager/images.php
deleted file mode 100644
index 36e15a8a50..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/images.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/**
- * ExtendedFileManager images.php file. Shows folders and files.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz, Raimund Meyer
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
- * Version: Updated on 29-10-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
- * http://www.afrusoft.com/htmlarea
- */
-
-	if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
-	if(!isset($insertMode)) $insertMode="image";
-
-require_once('config.inc.php');
-require_once('Classes/ExtendedFileManager.php');
-
-//default path is /
-$relative = '/';
-$manager = new ExtendedFileManager($IMConfig, $insertMode);
-
-//process any file uploads
-$uploadStatus=$manager->processUploads();
-
-//process any file renames
-$renameStatus=$manager->processRenames();
-
-//process paste
-$pasteStatus = (isset($_GET['paste'])) ? 	$manager->processPaste() : false;
-
-$refreshFile = ($manager->deleteFiles()) ? true : false;
-
-$refreshDir = false;
-//process any directory functions
-if($manager->deleteDirs() || $manager->processNewDir() || $pasteStatus || $renameStatus )
-	$refreshDir = true;
-
-
-$diskInfo=$manager->getDiskInfo();
-
-//check for any sub-directory request
-//check that the requested sub-directory exists
-//and valid
-if(isset($_REQUEST['dir']))
-{
-	$path = rawurldecode($_REQUEST['dir']);
-	if($manager->validRelativePath($path))
-		$relative = $path;
-}
-
-$afruViewType = (isset($_REQUEST['viewtype'])) ? $afruViewType=$_REQUEST['viewtype'] : '';
-
-if($afruViewType!="thumbview" && $afruViewType!="listview")
-{
-  $afruViewType=$IMConfig['view_type'];
-}
-//get the list of files and directories
-$list = $manager->getFiles($relative);
-
-
-/* ================= OUTPUT/DRAW FUNCTIONS ======================= */
-
-
-/**
- * Draw folders and files. Changed by Afru
- */
-function drawDirs_Files($list, &$manager) 
-{
-	global $relative, $afruViewType, $IMConfig, $insertMode;
-
-    switch ($afruViewType) {
-        case 'listview':
-    		$maxNameLength = 30;
-    		?>
-            <table class="listview">
-            <thead>
-            <tr><th colspan="2">Name</th><th>Size</th><th>Image Size</th><th>Date Modified</th><th>&nbsp;</th></tr></thead>
-            <tbody>
-            <?php
-    		// start of foreach for draw listview folders .
-    		foreach($list[0] as $path => $dir)
-    		{ ?>
-    			<tr>
-    			<td><img src="<?php print $IMConfig['base_url'];?>icons/folder_small.gif" alt="" /></td>
-    			<th nowrap="nowrap"><a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>">
-    			<?php
-    			if(strlen($dir['entry'])>$maxNameLength) echo substr($dir['entry'],0,$maxNameLength)."..."; else echo $dir['entry'];
-    			?>
-    			</a></th>
-    			<td colspan="2" nowrap="nowrap">Folder</td>
-
-    			<td nowrap="nowrap"><?php echo date("d.m.y H:i",$dir['stat']['mtime']); ?></td>
-
-    			<td class="actions" nowrap="nowrap">
-    				<a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);" style="border:0px;"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0" /></a>
-			    	<?php if ($IMConfig['allow_rename']) { ?>
-			                    <a href="#" title="Rename" onclick="renameDir('<?php echo rawurlencode($dir['entry']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" border="0" /></a>
-			        <?php }  ?>
-    				<?php if ($IMConfig['allow_cut_copy_paste']) { ?>
-                    <a href="#" title="Cut" onclick="copyDir('<?php echo rawurlencode($dir['entry']);?>','move'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_cut.gif" height="15" width="15" alt="Cut" /></a>
-                     <a href="#" title="Copy" onclick="copyDir('<?php echo rawurlencode($dir['entry']);?>','copy'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_copy.gif" height="15" width="15" alt="Copy" /></a>
-     		   		<?php }  ?>
-    			</td>
-    			</tr>
-    		  <?php
-    		} // end of foreach for draw listview folders .
-
-    		clearstatcache();
-
-    		// start of foreach for draw listview files .
-    		foreach($list[1] as $entry => $file)
-    		{
-    			?>
-                <tr>
-        		  <td><img src="<?php print $IMConfig['base_url']; if(is_file('icons/'.$file['ext'].'_small.gif')) echo "icons/".$file['ext']."_small.gif"; else echo $IMConfig['default_listicon']; ?>" alt="" /></td>
-                  <th><a href="#" class="thumb" style="cursor: pointer;" ondblclick="this.onclick();window.top.onOK();" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" <?php if ($insertMode == 'image') { ?> onmouseover="showPreview('<?php echo $file['relative'];?>')" onmouseout="showPreview(window.parent.document.getElementById('f_url').value)" <?php } ?> >
-        			<?php
-        			if(strlen($entry)>$maxNameLength) echo substr($entry,0,$maxNameLength)."..."; else echo $entry;
-        			?>
-                  </a></th>
-                  <td><?php echo Files::formatSize($file['stat']['size']); ?></td>
-                  <td><?php if($file['image'][0] > 0){ echo $file['image'][0].'x'.$file['image'][1]; } ?></td>
-    			  <td nowrap="nowrap"><?php echo date("d.m.y H:i",$file['stat']['mtime']); ?></td>
-                  <td class="actions">
-                    <?php if($IMConfig['img_library'] && $IMConfig['allow_edit_image'] && $file['image'][0] > 0) { ?>
-                    <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" border="0" /></a>
-                    <?php }  ?>  
-                    <a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;mode=<?php echo $insertMode;?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0" /></a>
-        			<?php if ($IMConfig['allow_rename']) { ?>
-                    <a href="#" title="Rename" onclick="renameFile('<?php echo rawurlencode($file['relative']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" border="0" /></a>
-                    <?php }  ?>
-        			<?php if ($IMConfig['allow_cut_copy_paste']) { ?>
-                    <a href="#" title="Cut" onclick="copyFile('<?php echo rawurlencode($entry);?>','move'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_cut.gif" height="15" width="15" alt="Cut" /></a>
-                     <a href="#" title="Copy" onclick="copyFile('<?php echo rawurlencode($entry);?>','copy'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_copy.gif" height="15" width="15" alt="Copy" /></a>
-                    <?php }  ?>
-                  </td>
-                </tr>
-    		  <?php
-    		}//end of foreach of draw listview files
-            ?>
-            </tbody>
-            </table>
-            <?php
-        break;
-        case 'thumbview': // thumbview is default
-        default:
-    		$maxFileNameLength=16;
-    		$maxFolderNameLength=16;
-    		// start of foreach for draw thumbview folders.
-    		foreach($list[0] as $path => $dir)
-    		{ ?>
-    <div class="dir_holder">
-      <a class="dir" href="<?php print $IMConfig['backend_url'];?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>"><img src="<?php print $IMConfig['base_url'];?>img/folder.gif" height="80" width="80" alt="<?php echo $dir['entry']; ?>" /></a>
-
-      <div class="fileName">
-      <?php if(strlen($dir['entry']) > $maxFolderNameLength)
-                echo substr($dir['entry'], 0, $maxFolderNameLength) . "...";
-              else
-                echo $dir['entry']; ?>
-      </div>
-      <div class="edit">
-        <a href="<?php print $IMConfig['backend_url'];?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" /></a>
-    	<?php if ($IMConfig['allow_rename']) { ?>
-                    <a href="#" title="Rename" onclick="renameDir('<?php echo rawurlencode($dir['entry']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" border="0" /></a>
-        <?php }  ?>
-        <?php if ($IMConfig['allow_cut_copy_paste']) { ?>
-                    <a href="#" title="Cut" onclick="copyDir('<?php echo rawurlencode($dir['entry']);?>','move'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_cut.gif" height="15" width="15" alt="Cut" /></a>
-                     <a href="#" title="Copy" onclick="copyDir('<?php echo rawurlencode($dir['entry']);?>','copy'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_copy.gif" height="15" width="15" alt="Copy" /></a>
-        <?php }  ?>
-      </div>
-    </div>
-    		  <?php
-    		} // end of foreach for draw thumbview folders.
-
-
-    		// start of foreach for draw thumbview files.
-    		foreach($list[1] as $entry => $file)
-    		{
-    			$afruimgdimensions=$manager->checkImageSize($file['relative']);
-    			$thisFileNameLength = $maxFileNameLength;
-    			?>
-                <div class="thumb_holder" id="holder_<?php echo asc2hex($entry) ?>">
-                  <a href="#" class="thumb" style="cursor: pointer;" ondblclick="this.onclick();window.top.onOK();" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>">
-                    <img src="<?php print $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" />
-                  </a>
-                   <div class="fileName">
-                   <?php
-            			if(strlen($entry) > $thisFileNameLength + 3) echo strtolower(substr($entry,0,$thisFileNameLength))."..."; else echo $entry;
-            		?>
-                   </div>
-                  <div class="edit">
-                    <?php if($IMConfig['img_library'] && $IMConfig['allow_edit_image'] && $file['image'][0] > 0 )
-                    { ?>
-                    <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" /></a>
-            		<?php $thisFileNameLength -= 3; } ?>
-                    <a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" /></a>
-        			<?php if ($IMConfig['allow_rename']) { ?>
-                    <a href="#" title="Rename" onclick="renameFile('<?php echo rawurlencode($file['relative']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" /></a>
-                    <?php $thisFileNameLength -= 3; }  ?>
-                	<?php if ($IMConfig['allow_cut_copy_paste']) { ?>
-                    <a href="#" title="Cut" onclick="copyFile('<?php echo rawurlencode($entry);?>','move'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_cut.gif" height="15" width="15" alt="Cut" /></a>
-                     <a href="#" title="Copy" onclick="copyFile('<?php echo rawurlencode($entry);?>','copy'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_copy.gif" height="15" width="15" alt="Copy" /></a>
-                    <?php $thisFileNameLength -= 6; }  ?>
-            		
-                  </div>
-                </div>
-    		  <?php
-    		}//end of foreach of draw thumbview files
-
-    }
-}//end of function drawDirs_Files
-
-
-/**
- * No directories and no files.
- */
-function drawNoResults() 
-{
-?>
-<div class="noResult">No Files Found</div>
-<?php
-}
-
-/**
- * No directories and no files.
- */
-function drawErrorBase(&$manager) 
-{
-?>
-<div class="error"><span>Invalid base directory:</span> <?php echo $manager->getImagesDir(); ?></div>
-<?php
-}
-
-/**
- * Utility to convert ascii string to hex
- */
-function asc2hex ($temp)
-{
-  $data = '';
-  $len = strlen($temp);
-  for ($i=0; $i<$len; $i++) $data.=sprintf("%02x",ord(substr($temp,$i,1)));
-  return $data;
-}
-
-?>
-<!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>
-	<title>File List</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link href="<?php print $IMConfig['base_url'];?>assets/imagelist.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/dialog.js"></script>
-<script type="text/javascript">
-/*<![CDATA[*/
-
-    var _backend_url = "<?php print $IMConfig['backend_url']; ?>";
-
-	if(window.top)
-		Xinha = window.top.Xinha;
-
-	function hideMessage()
-	{
-		var topDoc = window.top.document;
-		var messages = topDoc.getElementById('messages');
-		if(messages)
-			messages.style.display = "none";
-	}
-
-	init = function()
-	{
-        __dlg_translate('ExtendedFileManager');
-        
-		hideMessage();
-
-		<?php
-		if(isset($uploadStatus) && !is_numeric($uploadStatus) && !is_bool($uploadStatus))
-		echo "alert(i18n('$uploadStatus'));";
-		else if(isset($uploadStatus) && $uploadStatus==false)
-		echo 'alert(i18n("Unable to upload File. \nEither Maximum file size [$max_size='.($insertMode == 'image' ? $IMConfig['max_filesize_kb_image'] : $IMConfig['max_filesize_kb_link'] ).'$ KB] exceeded or\nFolder doesn\'t have write permission."));';
-		?>
-
-		<?php
-		if(isset($renameStatus) && !is_numeric($renameStatus) && !is_bool($renameStatus))
-		echo 'alert(i18n("'.$renameStatus.'"));';
-		else if(isset($renameStatus) && $renameStatus===false)
-		echo 'alert(i18n("Unable to rename file. File of the same name already exists or\nfolder doesn\'t have write permission."));';
-		?>
-		
-		<?php
-		if (isset($pasteStatus) && is_numeric($pasteStatus))
-		{
-			switch ($pasteStatus)
-			{
-				case 100 :
-					$pasteStatus = 'Source file/folder not found.';
-				break;
-				case 101 :
-					$pasteStatus = 'Copy failed.\nMaybe folder doesn\'t have write permission.';
-				break;
-				case 102 :
-					$pasteStatus = 'Could not create destination folder.';
-				break;
-				case 103 :
-					$pasteStatus = 'File pasted OK.';
-				break;
-				case 104 :
-					$pasteStatus = 'Destination file/folder already exists.';
-				break;
-			}
-		}
-		if(isset($pasteStatus) && !is_bool($pasteStatus))
-		{
-			echo 'alert(i18n("'.$pasteStatus.'"));';
-		}
-		?>
-
-		var topDoc = window.top.document;
-
-<?php
-	//we need to refesh the drop directory list
-	//save the current dir, delete all select options
-	//add the new list, re-select the saved dir.
-	if($refreshDir) 
-	{ 
-		$dirs = $manager->getDirs();
-?>
-		var selection = topDoc.getElementById('dirPath');
-		var currentDir = selection.options[selection.selectedIndex].text;
-
-		while(selection.length > 0)
-		{	selection.remove(0); }
-		
-		selection.options[selection.length] = new Option("/","<?php echo rawurlencode('/'); ?>");
-		<?php foreach($dirs as $relative=>$fullpath) { ?>
-		selection.options[selection.length] = new Option("<?php echo $relative; ?>","<?php echo rawurlencode($relative); ?>");
-		<?php } ?>
-		
-		for(var i = 0; i < selection.length; i++)
-		{
-			var thisDir = selection.options[i].text;
-			if(thisDir == currentDir)
-			{
-				selection.selectedIndex = i;
-				break;
-			}
-		}		
-<?php } ?>
-	}
-    
-	function editImage(image) 
-	{
-		var url = "<?php print $IMConfig['backend_url']; ?>__function=editor&img="+image+"&mode=<?php print $insertMode ?>";
-        Dialog(url, function(param)
-		{
-			if (!param) { // user must have pressed Cancel
-				return false;
-			} else
-			{
-				return true;
-			}
-		}, null);
-	}
-
-/*]]>*/
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/images.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/popup.js"></script>
-<script type="text/javascript">
-<!--
-// Koto: why emptying? commented out
-//if(window.top.document.getElementById('manager_mode').value=="image")
-//emptyProperties();
-<?php if(isset($diskInfo)) echo 'updateDiskMesg(i18n(\''.$diskInfo.'\'));'; ?>
-//-->
-</script>
-
-</head>
-
-<body>
-<?php if ($manager->isValidBase() == false) { drawErrorBase($manager); }
-	elseif(count($list[0]) > 0 || count($list[1]) > 0) { ?>
-	<?php drawDirs_Files($list, $manager); ?>
-<?php } else { drawNoResults(); } ?>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/1x1_transparent.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/1x1_transparent.gif
deleted file mode 100644
index 35d42e808f..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/1x1_transparent.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/2x2.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/2x2.gif
deleted file mode 100644
index 2f2ec4aaf4..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/2x2.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/2x2_w.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/2x2_w.gif
deleted file mode 100644
index 9b560a8c57..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/2x2_w.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderNew.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderNew.gif
deleted file mode 100644
index 541d09bb08..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderNew.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderNew1.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderNew1.gif
deleted file mode 100644
index db01742d67..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderNew1.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderUp.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderUp.gif
deleted file mode 100644
index 36ac56fa73..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderUp.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderUp1.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderUp1.gif
deleted file mode 100644
index 7b7349db0b..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/btnFolderUp1.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/btn_cancel.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/btn_cancel.gif
deleted file mode 100644
index ae9401ce6c..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/btn_cancel.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/btn_ok.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/btn_ok.gif
deleted file mode 100644
index e8b027ca34..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/btn_ok.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/crop.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/crop.gif
deleted file mode 100644
index 8ef53b275c..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/crop.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/default.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/default.gif
deleted file mode 100644
index 7419c1d62f..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/default.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/div.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/div.gif
deleted file mode 100644
index 6d25c022a8..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/div.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/dots.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/dots.gif
deleted file mode 100644
index a213e5b3c5..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/dots.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/ed_linkfile.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/ed_linkfile.gif
deleted file mode 100644
index 38ac232397..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/ed_linkfile.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/ed_linkfile1.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/ed_linkfile1.gif
deleted file mode 100644
index 50fde2fed3..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/ed_linkfile1.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_active.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_active.gif
deleted file mode 100644
index 928c25d91f..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_active.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_copy.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_copy.gif
deleted file mode 100644
index 7a14568943..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_copy.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_cut.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_cut.gif
deleted file mode 100644
index 3d11146d5c..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_cut.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_paste.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_paste.gif
deleted file mode 100644
index beea91234b..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_paste.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_pencil.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_pencil.gif
deleted file mode 100644
index 04fe5a275c..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_pencil.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_rename.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_rename.gif
deleted file mode 100644
index e061d52e00..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_rename.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_trash.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_trash.gif
deleted file mode 100644
index 8754ac7e6b..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/edit_trash.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/folder.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/folder.gif
deleted file mode 100644
index 9003f58942..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/folder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/hand.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/hand.gif
deleted file mode 100644
index 23c900fe7b..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/hand.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/islocked2.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/islocked2.gif
deleted file mode 100644
index 1dfd2ec73f..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/islocked2.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/locked.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/locked.gif
deleted file mode 100644
index 92472389de..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/locked.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/measure.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/measure.gif
deleted file mode 100644
index 9e496db4c5..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/measure.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/noimages.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/noimages.gif
deleted file mode 100644
index 22e6dd3899..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/noimages.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/rotate.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/rotate.gif
deleted file mode 100644
index cf8764f21d..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/rotate.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/save.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/save.gif
deleted file mode 100644
index dadb9b0756..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/save.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/scale.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/scale.gif
deleted file mode 100644
index e36bec39c7..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/scale.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/spacer.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/spacer.gif
deleted file mode 100644
index fc2560981e..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/spacer.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/t_black.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/t_black.gif
deleted file mode 100644
index 4f362f16c0..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/t_black.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/t_white.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/t_white.gif
deleted file mode 100644
index bcddeec9e8..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/t_white.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked.gif
deleted file mode 100644
index e28e7d1bf9..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked2.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked2.gif
deleted file mode 100644
index ce703c94cb..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked2.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked_empty.gif b/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked_empty.gif
deleted file mode 100644
index fe4e0d4bbd..0000000000
Binary files a/web/imcms/xinha/plugins/ExtendedFileManager/img/unlocked_empty.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/lang/de.js b/web/imcms/xinha/plugins/ExtendedFileManager/lang/de.js
deleted file mode 100644
index 0ccbf42fe7..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/lang/de.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: sven schomacker, http://www.hilope.de, mail@hilope.de
-{
-  "File Manager": "Dateimanager",
-  "Insert Image": "Bild einfügen",
-  "Directory": "Verzeichnis",
-  "Directory Up": "Aufwärts",
-  "New Folder": "Neues Verzeichnis erstellen",
-  "Trash": "Papierkorb",
-  "Edit": "Bearbeiten",
-  "Image File": "Bilddatei",
-  "Upload": "Hochladen",
-  "Width": "Breite",
-  "Height": "Höhe",
-  "Width:": "Breite:",
-  "Height:": "Höhe:",
-  "Constrain Proportions": "Proportionen beibehalten",
-  "Border": "Rahmen",
-  "Margin": "Aussenabstand",
-  "Padding": "Innenabstand",
-  "Refresh": "Aktualisieren",
-  "Uploading...": "Lade hoch...",
-  "Uploading": "Hochladen",
-  "Crop": "Beschneiden",
-  "Resize": "Größe ändern",
-  "Rotate": "Drehen",
-  "Measure": "Maße",
-  "Marker": "Marker",
-  "Save": "Speichern",
-  "Filename:": "Dateiname:",
-  "Image Format": "Bildformat:",
-  "Quality:": "Qualität",
-  "JPEG High": "JPEG hoch",
-  "JPEG Medium": "JPEG mittel",
-  "JPEG Low": "JPEG niedrig",
-  "File saved.": "Datei gespeichert.",
-  "File was not saved.": "Datei wurde nicht gespeichert.",
-  "Start X:": "Start X",
-  "Start Y:": "Start Y",
-  "Lock": "Feststellen",
-  "Flip Image": "Bild spiegeln",
-  "Flip Horizontal": "hor. spiegeln",
-  "Flip Vertical": "ver. spiegeln",
-  "Rotate Image": "Bild drehen",
-  "Rotate 180 °": "Drehung um 180°",
-  "Rotate 90 ° CW": "Drehung um 90° im Uhrzeigersinn",
-  "Rotate 90 ° CCW": "Drehung um 90° gegen Uhrzeigersinn",
-  "Angle:": "Winkel:",
-  "W:": "W:",
-  "Clear": "Löschen",
-  "Loading": "Laden",
-  "Invalid base directory:": "Ungültiges Basisverzeichnis:",
-  'Delete file "$file"?': 'Datei "$file" löschen?',
-  "Please delete all files/folders inside the folder you wish to delete first.": "Bitte zuerst alle untergeordneten Ordner löschen.",
-  'Delete folder "$dir"?': 'Verzeichnis "$dir" löschen?',
-  "Folder Name:": "Verzeichnisname",
-  "No Files Found": "Keine Dateien gefunden",
-  "Invalid folder name, please choose another folder name.": "Ungültiger Verzeichnisname - bitte neu wählen.",
-  "GIF format is not supported, image editing not supported.": "GIF-Format nicht unterstützt, bearbeiten nicht möglich.",
-  "No Image Available": "Kein Bild verfügbar",
-  "No Image selected.": "Kein Bild ausgewählt.",
-  "Description:": "Beschreibung:",
-  "Align": "Anordnung",
-  "Margin": "Aussenabstand",
-  "Padding": "Innenabstand",
-  "Border": "Rahmen",
-  "Color": "Farbe",
-  "Border Color": "Rahmenfarbe",
-  "Upload": "Hochladen",
-  "Alt": "Alt",
-  "File Name": "Dateiname",
-  "Thumbnail View": "Miniaturansicht",
-  "List View": "Listenansicht",
-  "Title (tooltip)": "Titel (Tooltip)",
-  "Target Window": "Zielfenster",
-  "Name": "Name",
-  "Size": "Größe",
-  "Date Modified": "Datum letzte Änderung",
-  "Total Size": "Gesamtgröße",
-  "Free Space": "Freier Speicher",
-  "Positioning of this image" : "Anordnung dieses Bildes",
-  "Insert File Link": "Dateilink einfügen",
-  "Untitled": "Unbetitelt",
-  'Please enter name for new folder...': "Bitte Namen für neuen Ordner eingeben...",
-  "You must select some text before making a new link.": "Bitte zuerst Text markieren.",
-  "Folder is not empty. Please delete all Files and Subfolders inside.": "Verzeichnis ist nicht leer. Bitte zuerst alle Unterordner und Dateien löschen.",
-  "Image Size": "Bildgröße",
-  "Other" : "Andere...",
-  "Rename": "Umbenennen",
-  "Please enter new name for this file...": "Bitte neuen Namen für diese Datei eingeben...",
-  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Umbenennen nicht möglich. Evtl. Dateiname schon vorhanden oder keine Schreibrechte.",
-  "Cancelled rename.": "Umbenennen abgebrochen.",
-  'File "$file" successfully uploaded.': 'Datei "$file" erfolgreich hochgeladen.',
-  "Cannot upload. Maximum folder size reached. Delete unwanted files and try again.":"Die maximale Ordnergröße ist erreicht. Bitte löschen Sie Dateien, die Sie nicht mehr benötigen.",
-  "Maximum file size [$max_size KB] exceeded.":"Maximale Dateigröße [$max_size KB] überschritten.",
-  "Cannot upload $extension Files. Permission denied.": "$extension Dateien dürfen nicht hochgeladen werden.",
-  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.":"Konnte Datei nicht hochladen.\nEntweder die maximale Dateigröße [$max_size KB] ist überschritten\noder das Verzeichnis hat keine Schreibrechte.",
-  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Max. Ordergröße: $max_foldersize_mb MB, noch frei: $free_space",
-  "Please enter new name for this folder...":"Bitte neuen Namen für diesen Ordner eingeben...",
-
-  "Cut":"Ausschneiden",
-  "Copy":"Kopieren",
-  "Paste":"Einfügen",
-  
-  'Copy "$file" from "$dir" here': '"$file" aus Ordner "$dir" hierher kopieren',
-  'Copy folder "$file" from "$dir" here' : '"Ordner $file" aus "$dir" hierher kopieren',
-  'Move "$file" from "$dir" here':'"$file" aus Ordner "$dir" hierher verschieben',
-  'Move folder "$file" from "$dir" here':'Ordner "$file" aus "$dir" hierher verschieben',
-  
-  "Source file/folder not found.":"Quelldatei/-ordner nicht gefunden",
-  "Paste failed.\nMaybe folder doesn't have write permission.": "Einfügen fehlgeschlagen.\nMöglicherweise hat der Ordner keine Schreibberechtigung.",
-  "Could not create destination folder.":"Konnte Zielordner nicht erstellen.",
-  "Destination file/folder already exists.":"Zieldatei/-ordner existiert bereits",
-  "File pasted OK.": "File pasted OK."
-};
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/lang/ja.js b/web/imcms/xinha/plugins/ExtendedFileManager/lang/ja.js
deleted file mode 100644
index 84ef26b0ce..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/lang/ja.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "File Manager": "ファイルマ�ージャ",
-  "Insert Image": "画��挿入",
-  "Directory": "ディレクトリ",
-  "Directory Up": "親ディレクトリ�",
-  "New Folder": "新�フォルダ",
-  "Trash": "削除",
-  "Edit": "編集",
-  "Image File": "画�ファイル",
-  "Upload": "アップロード",
-  "Width": "å¹…",
-  "Height": "高�",
-  "Width:": "å¹…:",
-  "Height:": "高�:",
-  "Constrain Proportions": "縦横比を固定",
-  "Border": "ボーダー",
-  "Margin": "é–“éš”",
-  "Padding": "余白",
-  "Refresh": "æ›´æ–°",
-  "Uploading...": "アップロード中...",
-  "Uploading": "アップロード中",
-  "Crop": "切り抜�",
-  "Resize": "サイズ変更",
-  "Rotate": "回転",
-  "Measure": "計測",
-  "Marker": "マーカー",
-  "Save": "�存",
-  "Filename:": "ファイル�:",
-  "Image Format": "画�形�",
-  "Quality:": "画質:",
-  "JPEG High": "JPEG 高画質",
-  "JPEG Medium": "JPEG 標準",
-  "JPEG Low": "JPEG 低画質",
-  "File saved.": "ファイルを�存����。",
-  "File was not saved.": "ファイルを�存����ん���。",
-  "Start X:": "開始 X",
-  "Start Y:": "開始 Y",
-  "Lock": "ロック",
-  "Flip Image": "画�を�転",
-  "Flip Horizontal": "左��転",
-  "Flip Vertical": "上下�転",
-  "Rotate Image": "画�を回転",
-  "Rotate 180 °": "180°",
-  "Rotate 90 ° CW": "90° 時計回り",
-  "Rotate 90 ° CCW": "90° �時計回り",
-  "Angle:": "角度:",
-  "W:": "W:",
-  "Clear": "クリア",
-  "Loading": "ロード中",
-  "Invalid base directory:": "無効�ディレクトリ:",
-  'Delete file "$file"?': 'ファイル "$file" を削除����?',
-  "Please delete all files/folders inside the folder you wish to delete first.": "削除���フォルダ内�ファイル�フォルダを全�削除���������。",
-  'Delete folder "$dir"?': 'フォルダ "$dir" を削除����?',
-  "Folder Name:": "フォルダ�:",
-  "No Files Found": "ファイル��り��ん",
-  "Invalid folder name, please choose another folder name.": "無効�フォルダ���。別�フォルダ�を�ん�����。",
-  "GIF format is not supported, image editing not supported.": "GIF形��サ�ート�れ�������画�編集����ん。",
-  "No Image Available": "画���り��ん",
-  "No Image selected.": "画���択�れ����ん。",
-  "Description:": "詳細:",
-  "Align": "行��",
-  "Description:": "説明:",
-  "Margin:": "é–“éš”:",
-  "Padding:": "余白:",
-  "Border:": "境界線:",
-  "Color:": "色:",
-  "Border Color:": "境界色:",
-  "Upload:": "アップロード:",
-  "Alt": "Alt",
-  "Alt": "Alt",
-  "File Name": "ファイル�",
-  "Thumbnail View": "サム�ール表示",
-  "List View": "一覧表示",
-  "Title (tooltip)": "タイトル",
-  "Target Window": "ターゲット",
-  "Name": "��",
-  "Size": "サイズ",
-  "Date Modified": "æ›´æ–°æ—¥",
-  "Total Size": "�計サイズ",
-  "Free Space": "空�容�",
-  "Positioning of this image" : "��画���置",
-  "Insert File Link": "ファイル��リンクを挿入",
-  "Untitled": "無題",
-  'Please enter name for new folder...': "新�フォルダ���を入力������...",
-  "You must select some text before making a new link.": "リンクを作��る��テキストを�択�る必���り��。",
-  "Folder is not empty. Please delete all Files and Subfolders inside.": "フォルダ�空���り��ん。中�ファイル�サブフォルダを���削除������。",
-  "Image Size": "画�サイズ",
-  "Other" : "��他",
-  "Rename": "���変更",
-  "Please enter new name for this file...": "ファイル�新����を入力������...",
-  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": 
-  "ファイル�を変更����ん。���ファイル�存在�る��\nフォルダ�書�込�権���り��ん。",
-  "Cancelled rename.": "��変更を中止����。",
-  'File "$file" successfully uploaded.': 'ファイル "$file" �アップロード��功����。',
-  "Cannot upload. Maximum folder size reached. Delete unwanted files and try again.":"アップロード����ん。フォルダ容��上�������。���ファイルを削除����試行������。",
-  "Maximum file size [$max_size KB] exceeded.":"ファイルサイズ上� [$max_size KB] を超�����。",
-  "Cannot upload $extension Files. Permission denied.": "$extension ファイルをアップロード����ん。�作��止�れ����。",
-  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.":"ファイルをアップロード����ん。\nファイルサイズ上� [$max_size KB] を超���る��\nフォルダ�書�込�権���り��ん。",
-  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "�計サイズ: $max_foldersize_mb MB, 空�容�: $free_space",
-  "Please enter new name for this folder...":"��フォルダ�新����を入力������...",
-
-  "Cut":"切り�り",
-  "Copy":"コピー",
-  "Paste":"貼り付�",
-  
-  'Copy "$file" from "$dir" here': '"$file" を "$dir" �ら���コピー',
-  'Copy folder "$file" from "$dir" here' : 'フォルダ "$file" を "$dir" �ら���コピー',
-  'Move "$file" from "$dir" here':'"$file" を "$dir" �ら���移動',
-  'Move folder "$file" from "$dir" here':'フォルダ "$file" を "$dir" �ら���移動',
-  
-  "Source file/folder not found.":"転�元ファイル/フォルダ�見��り��ん。",
-  "Paste failed.\nMaybe folder doesn't have write permission.": "貼り付��失敗����。\nフォルダ�書�込�権�����能性��り��。",
-  "Could not create destination folder.":"転�先フォルダを作�����ん���。",
-  "Destination file/folder already exists.":"転�先ファイル/フォルダ����存在���。",
-  "File pasted OK.": "ファイル�貼り付���功����。"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/lang/nb.js b/web/imcms/xinha/plugins/ExtendedFileManager/lang/nb.js
deleted file mode 100644
index b6fad48941..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/lang/nb.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.easycms.no/, kim@easycms.no
-{
-  "File Manager": "Filbehandler",
-  "Insert Image": "Sett inn bilde",
-  "Directory": "Mappe",
-  "Directory Up": "Opp et nivå",
-  "New Folder": "Ny mappe",
-  "Trash": "Søppel",
-  "Edit": "Rediger",
-  "Image File": "Bildefil",
-  "Upload": "Last opp",
-  "Upload:": "Last opp:",
-  "Width": "Bredde",
-  "Height": "Høyde",
-  "Constrain Proportions": "Beholde proposjoner",
-  "Border": "Ramme",
-  "Margin": "Marg",
-  "Padding": "Innvendig marg",
-  "Refresh": "Oppfrisk side",
-  "Uploading...": "Laster opp...",
-  "Uploading": "Laster opp",
-  "Crop": "Beskjær",
-  "Resize": "Endre størrelse",
-  "Rotate": "Roter",
-  "Measure": "MÃ¥l",
-  "Marker": "Markør",
-  "Save": "Lagre",
-  "Filename:": "Filnavn:",
-  "Image Format": "Bildeformat:",
-  "Quality:": "Kvalitet",
-  "JPEG High": "JPEG høy",
-  "JPEG Medium": "JPEG middels",
-  "JPEG Low": "JPEG lav",
-  "File saved.": "Fil er lagret.",
-  "File was not saved.": "Filen ble ikke lagret.",
-  "Start X:": "Start X",
-  "Start Y:": "Start Y",
-  "Lock": "LÃ¥s",
-  "Flip Image": "Vend bilde",
-  "Flip Horizontal": "Vend horisontal",
-  "Flip Vertical": "Vend vertikal",
-  "Rotate Image": "Roter bilde",
-  "Rotate 180 °": "Roter 180°",
-  "Rotate 90 ° CW": "Roter 90° med klokka",
-  "Rotate 90 ° CCW": "Roter 90° mot klokka",
-  "Angle:": "Vinkel:",
-  "W:": "L:",
-  "Clear": "Tøm",
-  "Loading": "Laster",
-  "Invalid base directory:": "Ugyldig sti til mappe:",
-  'Delete file "$file"?': "$file\n\nSlette fil?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Vennligst slett alle filer og mapper i mappen du ønsker å slette først!",
-  'Delete folder "$dir"?': "$dir\n\nSlette mappe?",
-  "Folder Name:": "Mappe navn",
-  "No Files Found": "Ingen filer funnet",
-  "Invalid folder name, please choose another folder name.": "Ugyldig mappenavn, vennligst velg et annet mappenavn",
-  "GIF format is not supported, image editing not supported.": "GIF format er ikke støttet og bilderedigering er derfor ikke tilgjengelig.",
-  "No Image Available": "Inget bilde tilgjengelig.",
-  "No Image selected.": "Inget bilde valgt.",
-  "Description:": "Beskrivelse:",
-  "Align": "Juster",
-  "Color:": "Farge:",
-  "Border Color:": "Ramme farge:",
-  "Alt": "Alt",
-  "File Name": "Filnavn",
-  "Thumbnail View": "Miniatyrbilde",
-  "List View": "Liste",
-  "Title (tooltip)": "Tittel (tooltip)",
-  "Target Window": "MÃ¥l",
-  "Name": "Navn",
-  "Size": "Størrelse",
-  "Date Modified": "Siste endret",
-  "Total Size": "Total størrelse",
-  "Free Space": "Ledig plass",
-  "Positioning of this image" : "Bildepossisjon",
-  "Insert File Link": "Sett inn lenke til fil",
-  "Untitled": "Uten navn",
-  'Please enter name for new folder...': "Skriv inn navn for ny mappe...",
-  "You must select some text before making a new link.": "Du må velge noe tekst før du kan lage en ny lenke.",
-  "Folder is not empty. Please delete all Files and Subfolders inside.": "Mappen er ikke tom. Du må slette alle filer og mapper i mappen først.",
-  "Image Size": "Bilde størrelse",
-  "Other" : "Andre...",
-  "Rename": "Nytt navn",
-  "Please enter new name for this file...": "Vennligst skriv inn nytt navn for denne fil...",
-  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Kan ikke omdøpe fil. En fil har allerede samme navn eller\nmappen har ikke skriverettigheter.",
-  "Cancelled rename.": "Omdøping av filnavn avbrutt.",
-   'File "$file" successfully uploaded.':  'File "$file" successfully uploaded.',
-  "Cannot upload. Maximum folder size reached. Delete unwanted files and try again.":"Cannot upload. Maximum folder size reached. Delete unwanted files and try again.",
-  "Maximum file size [$max_size KB] exceeded.":"Maximum file size [$max_size KB] exceeded.",
-  "Cannot upload $extension Files. Permission denied.": "Cannot upload $extension Files. Permission denied.",
-  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.":"Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.",
-  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Total Size : $max_foldersize_mb MB, Free Space: $free_space",
-  "Please enter new name for this folder...":"Please enter new name for this folder...",
-
-  "Cut":"Cut",
-  "Copy":"Copy",
-  "Paste":"Paste",
-  
-  'Copy "$file" from "$dir" here': 'Copy "$file" from "$dir" here',
-  'Copy folder "$file" from "$dir" here' : 'Copy folder "$file" from "$dir" here',
-  'Move "$file" from "$dir" here':'Move "$file" from "$dir" here',
-  'Move folder "$file" from "$dir" here':'Move folder "$file" from "$dir" here',
-  
-  "Source file/folder not found.":"Source file/folder not found.",
-  "Paste failed.\nMaybe folder doesn't have write permission.": "Paste failed.\nMaybe folder doesn't have write permission.",
-  "Could not create destination folder.":"Could not create destination folder.",
-  "Destination file/folder already exists.":"Destination file/folder already exists.",
-  "File pasted OK.": "File pasted OK."
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/lang/nl.js b/web/imcms/xinha/plugins/ExtendedFileManager/lang/nl.js
deleted file mode 100644
index 704798d86c..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/lang/nl.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "File Manager": "Bestandsbeheer",
-  "Insert Image": "Beeld invoegen",
-  "Directory": "Map",
-  "Directory Up": "Bovenliggende map",
-  "New Folder": "Nieuw map",
-  "Trash": "Prullenbak",
-  "Edit": "Bewerken",
-  "Image File": "Beeldbestand",
-  "Upload": "Upload",
-  "Upload:": "Upload:",
-  "Width": "Breed",
-  "Height": "Hoog",
-  "Constrain Proportions": "Proportie behouden",
-  "Border": "Kader",
-  "Margin": "Inspringen",
-  "Padding": "Uitvullen",
-  "Refresh": "Vernieuwen",
-  "Uploading...": "Uploaden...",
-  "Uploading": "Uploaden",
-  "Crop": "Uitsneden",
-  "Resize": "Formaat wijzigen",
-  "Rotate": "Draaien",
-  "Measure": "Opmeten",
-  "Marker": "Markeren",
-  "Save": "Opslaan",
-  "Filename:": "Bestandsnaam:",
-  "Image Format": "Beeldformaat:",
-  "Quality:": "Kwaliteit",
-  "JPEG High": "JPEG hoog",
-  "JPEG Medium": "JPEG midden",
-  "JPEG Low": "JPEG laag",
-  "File saved.": "Bestand opgeslagen.",
-  "File was not saved.": "Bestand niet opgeslagen.",
-  "Start X:": "Start X",
-  "Start Y:": "Start Y",
-  "Lock": "Op-slot",
-  "Flip Image": "Beeld spiegelen",
-  "Flip Horizontal": "hor. spiegelen",
-  "Flip Vertical": "ver. spiegelen",
-  "Rotate Image": "Beeld draaien",
-  "Rotate 180 °": "Draai 180° om",
-  "Rotate 90 ° CW": "Draai rechts om 90°",
-  "Rotate 90 ° CCW": "Draai links om 90°",
-  "Angle:": "Hoek:",
-  "W:": "W:",
-  "Clear": "Wissen",
-  "Loading": "Laden",
-  "Invalid base directory:": "Ongeldig pad:",
-  'Delete file "$file"?': 'Bestand "$file" verwijderen?',
-  "Please delete all files/folders inside the folder you wish to delete first.": "Vewijder alle onderliggende bestanden/mappen eerst.",
-  'Delete folder "$dir"?': 'Wis map "$dir"?',
-  "Folder Name:": "Map naam",
-  "No Files Found": "Geen bestaand gevonden",
-  "Invalid folder name, please choose another folder name.": "Ongeldig map naam, kies een andere naam s.v.p..",
-  "GIF format is not supported, image editing not supported.": "GIF-format niet ondersteund, beeldbewerking niet ondersteund.",
-  "No Image Available": "Geen beeld beschikbaar",
-  "No Image selected.": "Geen beeld geselecteerd.",
-  "Description:": "Beschrijving:",
-  "Align": "Uitlijnen",
-  "Description:": "Beschrijving:",
-  "Margin": "Inspringen",
-  "Padding": "Uitvullen",
-  "Border": "Kader",
-  "Color:": "Kleur:",
-  "Border Color:": "Kaderkleur:",
-  "Upload:": "Upload:",
-  "Alt": "Alt",
-  "Alt": "Alt",
-  "File Name": "Bestandsnaam",
-  "Thumbnail View": "Miniaturen",
-  "List View": "Lijst",
-  "Title (tooltip)": "Titel (tooltip)",
-  "Target Window": "Doel venster",
-  "Name": "Naam",
-  "Size": "Grootte",
-  "Date Modified": "Datum aangepast",
-  "Total Size": "Totaalgrootte",
-  "Free Space": "Vrije ruimte",
-  "Positioning of this image" : "Uitlijnen van dit beeld",
-  "Insert File Link": "Hypelink van bestandinvoegen",
-  "Untitled": "Geen titel",
-  'Please enter name for new folder...': "Naam van nieuwe map...",
-  "You must select some text before making a new link.": "Eerst tekst selecteren.",
-  "Folder is not empty. Please delete all Files and Subfolders inside.": "Map is niet leeg. Verwijder eerst alle bestanden en onderliggendemappen.",
-  "Image Size": "Beeld afmetingen",
-  "Other" : "Andere...",
-  "Rename": "Naam wijzigen",
-  "Please enter new name for this file...": "Nieuwe bestandsnaam...",
-  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Hernoemen niet mogelijk. Bestand bestaat al of\nmap heeft geen schrijf toestemming.",
-  "Cancelled rename.": "Hernoemen geannuleerd.",
-  'File "$file" successfully uploaded.': '"$file" bestand upload voltooid.',
-  "Cannot upload. Maximum folder size reached.": "Uploaden is niet mogelijk. De doel map is vol.",
-  "Maximum file size [$max_size KB] exceeded.": "Maximale bestandgrootte [$max_size KB] overschreden.",
-  "Cannot upload $extension Files. Permission denied.": "Het is niet mogelijk om $extension bestanden te uploaden.",
-  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.": "Bestands upload niet mogelijk.\nMaximale bestandsgrootte [$max_size KB] overtreden\nof de map heeft geen schrijf toestemming.",
-  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Totaalgrootte: $max_foldersize_mb MB, nog vrij: $free_space",
-  "Please enter new name for this folder...":"Geef een nieuwe naam voor deze map...",
-
-  "Cut":"Knippen",
-  "Copy":"Kopiëren",
-  "Paste":"Plakken",
-  
-  'Copy "$file" from "$dir" here': 'Kopieer "$file" van "$dir" naar',
-  'Copy folder "$file" from "$dir" here' : 'Kopieer map "$file" van "$dir" naar',
-  'Move "$file" from "$dir" here':'Verplaats "$file" van "$dir" naar',
-  'Move folder "$file" from "$dir" here':'Verplaats map "$file" van "$dir" naar',
-  
-  "Source file/folder not found.":"Bron bestand/map niet gevonden.",
-  "Paste failed.\nMaybe folder doesn't have write permission.": "Plakken mislukt..\nDe map heeft mogelijk niet de juiste schrijfrechten.",
-  "Could not create destination folder.":"Bestemmings map kon niet worden gemaakt..",
-  "Destination file/folder already exists.":"Bestemmings bestand/map bestaat al."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/lang/pl.js b/web/imcms/xinha/plugins/ExtendedFileManager/lang/pl.js
deleted file mode 100644
index af529266f3..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/lang/pl.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, http://www.web.eskot.pl, koto@webworkers.pl
-{
-  "File Manager": "Menedżer plików",
-  "Insert Image": "Wstaw obrazek",
-  "Directory": "Katalog",
-  "Directory Up": "Katalog wyżej",
-  "New Folder": "Nowy katalog",
-  "Trash": "Usuń",
-  "Edit": "Edytuj",
-  "Image File": "Plik obrazka",
-  "Upload": "Wgraj",
-  "Width": "Szerokość",
-  "Height": "Wysokość",
-  "Width:": "Szerokość:",
-  "Height:": "Wysokość:",
-  "Constrain Proportions": "Zachowaj proporcje",
-  "Border": "Ramka",
-  "Margin": "Odstęp",
-  "Padding": "Wcięcie",
-  "Refresh": "Odśwież",
-  "Uploading...": "Wgrywanie...",
-  "Uploading": "Wgrywam",
-  "Crop": "Przytnij",
-  "Resize": "Przeskaluj",
-  "Rotate": "Obróć",
-  "Measure": "Zmierz",
-  "Marker": "Zaznacz",
-  "Save": "Zapisz",
-  "Filename:": "Nazwa pliku:",
-  "Image Format": "Format pliku:",
-  "Quality:": "Jakość",
-  "JPEG High": "JPEG wysoka",
-  "JPEG Medium": "JPEG średnia",
-  "JPEG Low": "JPEG niska",
-  "File saved.": "Zapisano plik.",
-  "File was not saved.": "Nie zapisano pliku.",
-  "Start X:": "PoczÄ…tek X:",
-  "Start Y:": "PoczÄ…tek Y:",
-  "Lock": "Zablokuj",
-  "Flip Image": "Odwróć",
-  "Flip Horizontal": "Odwróć poziomo",
-  "Flip Vertical": "Odwróć pionowo",
-  "Rotate Image": "Obróć",
-  "Rotate 180 °": "Obróć 180°",
-  "Rotate 90 ° CW": "Obróć 90° w prawo",
-  "Rotate 90 ° CCW": "Obróć 90° w lewo",
-  "Angle:": "KÄ…t:",
-  "W:": "L:",
-  "Clear": "Wyczyść",
-  "Loading": "�adowanie",
-  "Invalid base directory:": "Nieprawidłowy katalog bazowy:",
-  'Delete file "$file"?': "$file\n\nUsunąć plik?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Najpierw usuń wszystkie pliki i podkatalogi katalogu.",
-  'Delete folder "$dir"?': "$dir\n\nUsunąć katalog ?",
-  "No Files Found": "Nie znaleziono plików",
-  "Invalid folder name, please choose another folder name.": "Nieprawidłowa nazwa katalogu, wybierz inną.",
-  "GIF format is not supported, image editing not supported.": "Brak obsługi plików GIF, edycja jest niemożliwa.",
-  "No Image Available": "Obrazek niedostępny",
-  "No Image selected.": "Nie zaznaczono obrazka.",
-  "Align": "Wyrównanie",
-  "Color": "Kolor",
-  "Border Color": "Kolor ramki",
-  "Alt": "Alt",
-  "File Name": "Nazwa pliku",
-  "Thumbnail View": "Miniaturki",
-  "List View": "Lista",
-  "Title (tooltip)": "Tytuł",
-  "Target Window": "Docelowe okno",
-  "Name": "Nazwa",
-  "Size": "Rozmiar",
-  "Date Modified": "Data ost.modyf.",
-  "Total Size": "Miejsce na serwerze",
-  "Free Space": "Pozostało",
-  "Positioning of this image" : "Wyrównanie tego obrazka na stronie",
-  "Insert File Link": "Wstaw odnośnik do pliku na serwerze",
-  "Untitled": "Bez_nazwy",
-  'Please enter name for new folder...': "Podaj nazwÄ™ nowego folderu...",
-  "You must select some text before making a new link.": "Zaznacz tekst przed dodaniem odnośnika.",
-  "Folder is not empty. Please delete all Files and Subfolders inside.": "Folder nie jest pusty. Najpierw usuń wszystkie pliki i podfoldery tego folderu.",
-  "Image Size": "Wymiary",
-  "Other" : "Inne...",
-  "Rename": "Zmień nazwę",
-  "Please enter new name for this file...": "Podaj nowÄ… nazwÄ™ dla tego pliku...",
-  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Nie mogłem zmienić nazwy pliku. Plik o nowej nazwie już istnieje\nlub prak praw zapisu do katalogu.",
-  "Cancelled rename.": "Anulowano zmianÄ™ nazwy pliku.",
-  'File "$file" successfully uploaded.':  'Plik "$file" wgrano na serwer.',
-  "Cannot upload. Maximum folder size reached. Delete unwanted files and try again.":"Wgrywanie nie powiodło się.\n\nPrzekroczono dozwolony limit miejsca. Usuń niechciane pliki i spróbuj ponownie.",
-  "Maximum file size [$max_size KB] exceeded.":"Wgrywanie nie powiodło się.\n\nPrzekroczono maksymalny rozmiar pliku [$max_size KB].",
-  "Cannot upload $extension Files. Permission denied.": "Nie można było wgrać pliku.\n\nNiedozwolone rozszerzenie pliku [$extension].",
-  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.":"Wgrywanie nie powiodło się.\n\nPrzekroczono maksymalny rozmiar pliku [$max_size KB] lub nie ma ustawionych praw zapisu do folderu.",
-  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Dostępny limit: $max_foldersize_mb MB, Wolne: $free_space",
-  "Please enter new name for this folder...":"Podaj nowÄ… nazwÄ™ dla tego folderu...",
-
-  "Cut":"Wytnij",
-  "Copy":"Kopiuj",
-  "Paste":"Wklej",
-  
-  'Copy "$file" from "$dir" here': 'Skopiuj "$file" z "$dir" tutaj',
-  'Copy folder "$file" from "$dir" here' : 'Skopiuj folder "$file" z "$dir" tutaj',
-  'Move "$file" from "$dir" here':'PrzenieÅ› "$file" z "$dir" tutaj',
-  'Move folder "$file" from "$dir" here':'PrzenieÅ› folder "$file" z "$dir" tutaj',
-  
-  "Source file/folder not found.":"Nie znaleziono pliku/folderu źródłowego.",
-  "Paste failed.\nMaybe folder doesn't have write permission.": "Wklejenie nie powiodło się.\nPrawdopodobnie nie masz praw zapisu w tym folderze.",
-  "Could not create destination folder.":"Nie można było utworzyć folderu docelowego.",
-  "Destination file/folder already exists.":"Plik/folder docelowy już istnieje.",
-  "File pasted OK.": "Wklejono plik."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/lang/pt_br.js b/web/imcms/xinha/plugins/ExtendedFileManager/lang/pt_br.js
deleted file mode 100644
index 66ef7c1928..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/lang/pt_br.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  ">List View": ">Lista",
-  ">Thumbnail View": ">Miniaturas",
-  "A:": "A:",
-  "Absbottom": "Inferior absoluto",
-  "Absmiddle": "Meio absoluto",
-  "Align": "Alinhamento",
-  "Alt": "Alt",
-  "Angle:": "Angulo:",
-  "Baseline": "Linha de base",
-  "Border": "Borda",
-  "Border Color": "Côr da Borda",
-  "Bottom": "Inferior",
-  "Cancel": "Cancelar",
-  "Clear": "Limpar",
-  "Color": "Côr",
-  "Constrain Proportions": "Manter Proporcionalidade",
-  "Copy": "Copiar",
-  "Crop": "Recortar",
-  "Cut": "Cortar",
-  "Directory": "Diretório",
-  "Directory Up": "Diretório Acima",
-  "Edit": "Editar",
-  "File List": "Lista de Arquivos",
-  "File Manager": "Gerenciador de Arquivos",
-  "Filename:": "Nome do Arquivo:",
-  "Flip Horizontal": "Espelhar Horizontalmente",
-  "Flip Image": "Espelhar Imagem",
-  "Flip Vertical": "Espelhar Verticalmente",
-  "Folder": "Pasta",
-  "GIF format is not supported, image editing not supported.": "Formato GIF não é suportado, não é possível editar imagem.",
-  "H:": "A:",
-  "Height": "Altura",
-  "Height:": "Altura:",
-  "Image Editor": "Editor de Imagem",
-  "Image Format": "Formato da Imagem",
-  "Image Selection": "Seleção de Imagem",
-  "Insert File Link": "Inserir Link de Arquivo",
-  "Invalid base directory:": "Diretório base inválido",
-  "JPEG High": "JPEG Alto",
-  "JPEG Low": "JPEG Baixo",
-  "JPEG Medium": "JPEG Médio",
-  "Left": "Esquerda",
-  "Loading": "Carregando",
-  "Lock": "Travar",
-  "Margin": "Margem",
-  "Marker": "Marcar",
-  "Maximum folder size limit reached. Upload disabled.": "Atingido o limite máximo da pasta. Envio desativado.",
-  "Measure": "Medida:",
-  "Middle": "Meio",
-  "New Folder": "Nova Pasta",
-  "New window (_blank)": "Nova janela (_blank)",
-  "No Files Found": "Nenhum Arquivo Encontrado",
-  "No Image Available": "Nenhuma Imagem Disponível",
-  "None (use implicit)": "Nenhum (uso implícito)",
-  "Not set": "Não definido",
-  "Padding": "Espaçamento Interno",
-  "Please enter value": "Por favor, entre o valor",
-  "Positioning of this image": "Posicionamento desta imagem",
-  "Quality:": "Qualidade:",
-  "Refresh": "Atualizar",
-  "Rename": "Renomear",
-  "Resize": "Redimencionar",
-  "Right": "Direita(o)",
-  "Rotate": "Rotacionar",
-  "Rotate 180 &deg;": "Rotacionar 180 &deg;",
-  "Rotate 90 &deg; CCW": "Rotacionar 90 &deg; anti-horário",
-  "Rotate 90 &deg; CW": "Rotacionar 90 &deg; horário",
-  "Rotate Image": "Rotacionar Imagem",
-  "Same frame (_self)": "Mesma frame (_self)",
-  "Save": "Gravar",
-  "Start X:": "Início X:",
-  "Start Y:": "Início Y",
-  "Target Window": "Janela Destino",
-  "Texttop": "Texto no topo",
-  "Title (tooltip)": "Título (tooltip)",
-  "Top": "Topo",
-  "Top frame (_top)": "Frame do topo (_top)",
-  "Trash": "Lixo",
-  "Upload": "Enviar",
-  "W:": "L:",
-  "Width": "Largura",
-  "Width:": "Largura:",
-  "X:": "X:",
-  "Y:": "Y:",
-  "You must select some text before making a new link.": "Você precisa selecionar um texto antes de criar um novo link."
-}
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/manager.php b/web/imcms/xinha/plugins/ExtendedFileManager/manager.php
deleted file mode 100644
index 0250df3a16..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/manager.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/**
- * The main GUI for the ExtendedFileManager.
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz, Raimund Meyer
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
- * Version: Updated on 29-10-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
- * http://www.afrusoft.com/htmlarea
- */
-
-	if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
-	if(!isset($insertMode)) $insertMode="image";
-
-	require_once('config.inc.php');
-	require_once('Classes/ExtendedFileManager.php');
-	
-	$manager = new ExtendedFileManager($IMConfig);
-	$dirs = $manager->getDirs();
-
-	// calculate number of table rows to span for the preview cell
-	$num_rows = 4; // filename & upload & disk info message & width+margin
-		
-	if ($insertMode=='image')
-	{
-		if ($IMConfig['images_enable_styling'] === false)
-		{
-			$hidden_fields[] = 'f_margin';
-			$hidden_fields[] = 'f_padding';
-			$hidden_fields[] = 'f_border';
-			$hidden_fields[] = 'f_backgroundColor';
-			$hidden_fields[] = 'f_borderColor';
-			$num_rows +=2;
-		}
-		else if ($IMConfig['use_color_pickers'] === false)
-		{
-			$hidden_fields[] = 'f_backgroundColor';
-			$hidden_fields[] = 'f_borderColor';
-			$num_rows +=2;
-		}
-		
-		if ($IMConfig['images_enable_align'] === false)
-		{
-			$hidden_fields[] = 'f_align';
-		}
-		if ($IMConfig['images_enable_alt'])
-		{
-			$num_rows++;
-		}
-		else 
-		{
-			$hidden_fields[] = 'f_alt';
-		}
-		if ($IMConfig['images_enable_title'])
-		{
-			$num_rows++;
-		}
-		else 
-		{
-			$hidden_fields[] = 'f_title';
-		}
-	}
-	
-	if ($insertMode == 'link')
-	{
-		if ($IMConfig['link_enable_target'] === false)
-		{
-			$hidden_fields[] = 'f_target';
-		}
-		$num_rows +=2;
-	}
-?>
-<!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>
-	<title>Insert <?php echo ($insertMode == 'image' ? 'Image' : 'File Link') ?></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link href="<?php print $IMConfig['base_url'];?>assets/manager.css" rel="stylesheet" type="text/css" />
- <link href="../../popups/popup.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../../popups/popup.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/popup.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/dialog.js"></script>
-<?php if (!empty($IMConfig['use_color_pickers'])) { ?><script type="text/javascript" src="../../modules/ColorPicker/ColorPicker.js"></script><?php } ?>
-<script type="text/javascript">
-/* <![CDATA[ */
-
-	if(window.opener)
-		Xinha = window.opener.Xinha;
-		
-	var thumbdir = "<?php echo $IMConfig['thumbnail_dir']; ?>";
-	var base_url = "<?php echo $manager->getImagesURL(); ?>";
-    var _backend_url = "<?php print $IMConfig['backend_url']; ?>";
-    var _resized_prefix = "<?php echo $IMConfig['resized_prefix']; ?>";
-  	var _resized_dir = "<?php echo $IMConfig['resized_dir']; ?>";
-	<?php
-	if(isset($_REQUEST['mode']))
-	{
-		echo 'var manager_mode="'.$_REQUEST['mode'].'";';
-	}
-	else
-	{
-		echo 'var manager_mode="image";';
-	}
-	?>
-	
-/* ]]> */
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/manager.js"></script>
-</head>
-<body class="dialog" >
-<div class="title">Insert <?php echo ($insertMode == 'image' ? 'Image' : 'File Link') ?></div>
-<form action="<?php print $IMConfig['backend_url']; ?>" id="uploadForm" method="post" enctype="multipart/form-data">
-<input type="hidden" name="__plugin" value="ExtendedFileManager" />
-<input type="hidden" name="__function" value="images" />
-<input type="hidden" name="mode" value="<?php echo $insertMode; ?>" />
-<input type="hidden" id="manager_mode" value="<?php echo $insertMode;?>" />
-<fieldset><legend>File Manager</legend>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td nowrap style="padding:10px;">
-
-	<label for="dirPath">Directory</label>
-	<select name="dir" class="dirWidth" id="dirPath" onchange="updateDir(this)">
-	<option value="/">/</option>
-<?php foreach($dirs as $relative=>$fullpath) { ?>
-		<option value="<?php echo rawurlencode($relative); ?>"><?php echo $relative; ?></option>
-<?php } ?>
-	</select>
-
-	<a href="#" onclick="javascript: goUpDir();" title="Directory Up"><img src="<?php print $IMConfig['base_url'];?>img/btnFolderUp.gif" height="15" width="15" alt="Directory Up" /></a>
-
-
-<?php if($IMConfig['safe_mode'] == false && $IMConfig['allow_new_dir']) { ?>
-	<a href="#" onclick="newFolder();" title="New Folder"><img src="<?php print $IMConfig['base_url'];?>img/btnFolderNew.gif" height="15" width="15" alt="New Folder" /></a>
-<?php } ?>
-<span id="pasteBtn"></span>
-
-	<select name="viewtype" id="viewtype" onChange="updateView()">
-	<option value="thumbview" <?php if($IMConfig['view_type']=="thumbview") echo "selected";?> >Thumbnail View</option>
-	<option value="listview" <?php if($IMConfig['view_type']=="listview") echo "selected";?> >List View</option>
-	</select>
-</td>
-</tr>
-<tr><td style="padding:10px; padding-top:0px;">
-	<div id="messages"><span id="message">Loading</span><img src="<?php print $IMConfig['base_url'];?>img/dots.gif" width="22" height="12" alt="..." /></div>
-	<iframe src="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;viewtype=<?php echo $IMConfig['view_type'] ?>" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
-</td></tr>
-</table>
-</fieldset>
-<!-- image properties -->
-	<table class="inputTable">
-		<tr>
-			<td align="right" nowrap><label for="f_url"><?php if($insertMode=='image') echo 'File Name'; else echo 'URL';?></label></td>
-			<td colspan="5"><input type="text" id="<?php if($insertMode=='image') echo 'f_url'; else echo 'f_href';?>" class="largelWidth" value="" /></td>
-            <td rowspan="<?php echo $num_rows ?>" colspan="2" valign="top" align="center"><?php if($insertMode=='image') { ?>
-            <div style="padding:4px;background-color:#CCC;border:1px inset;width: 100px; height: 100px;">
-            <img src="<?php print $IMConfig['base_url'];?>img/1x1_transparent.gif" alt="" id="f_preview" />
-            </div>
-            <?php } else if($insertMode=="link" && $IMConfig['link_enable_target'] !== false) {?><label for="f_align" id="f_target_label">Target Window</label>
-			<select id="f_target" style="width:125px;">
-			  <option value="">None (use implicit)</option>
-			  <option value="_blank">New window (_blank)</option>
-			  <option value="_self">Same frame (_self)</option>
-		      <option value="_top">Top frame (_top)</option>
-		    </select><br /><br />
-<input type="text" name="f_other_target" id="f_other_target" style="visibility:hidden; width:120px;" />
-            <?php } ?></td>
-            </tr>
-<?php if($insertMode == 'image' && $IMConfig['images_enable_alt']) { ?>
-		<tr>
-			<td align="right"><label for="f_alt">Alt</label></td>
-			<td colspan="5"><input type="text" id="f_alt" class="largelWidth" value="" /></td>
-        </tr>
-<?php }
-      if ($insertMode == 'link' || $IMConfig['images_enable_title']) { ?>
-      <tr>
-			<td align="right"><label for="f_title">Title (tooltip)</label></td>
-			<td colspan="5"><input type="text" id="f_title" class="largelWidth" value="" /></td>
-      </tr>
-<?php } ?>
-		<tr>
-<?php
-if (!empty($IMConfig['max_foldersize_mb']) && Files::dirSize($manager->getImagesDir()) > ($IMConfig['max_foldersize_mb']*1048576))
-{ ?>
-	<td colspan="6" align="right">Maximum folder size limit reached. Upload disabled.</td>
-<?php }
-else if($IMConfig['allow_upload']) { ?>
-			<td align="right"><label for="upload">Upload</label></td>
-			<td colspan="5">
-				<table cellpadding="0" cellspacing="0" border="0">
-                  <tr>
-                    <td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max = (($insertMode == 'image' ? $IMConfig['max_filesize_kb_image'] : $IMConfig['max_filesize_kb_link'] )*1024); ?>" />
-<input type="file" name="upload" id="upload" /></td>
-                    <td><button type="submit" name="submit" onclick="doUpload();">Upload</button>(<?php echo $max/1024 . 'KB'?> max.)</td>
-                  </tr>
-                </table>
-			</td>
-<?php } else { ?>
-			<td colspan="6"></td>
-<?php } ?>
-		</tr>
-		<tr>
-		 <td><?php if (!empty($hidden_fields)) foreach ($hidden_fields as $hf) echo "<input type=\"hidden\" id=\"{$hf}\" name=\"{$hf}\" value=\"\" />"; ?></td>
-		 <td colspan="5"><span id="diskmesg"></span></td>
-      </tr>
-<tr>
-			<td align="right"><?php if($insertMode=='image') { ?> <label for="f_width">Width</label><?php }?></td>
-
-			<td><?php if($insertMode=='image') { ?> <input type="text" id="f_width" class="smallWidth" value="" onchange="javascript:checkConstrains('width');"/><?php } else echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";?></td>
-
-			<td rowspan="2"><?php if($insertMode=='image') { ?><img src="<?php print $IMConfig['base_url'];?>img/locked.gif" id="imgLock" width="25" height="32" alt="Constrained Proportions" />
-				<input type="hidden" id="orginal_width" />
-				<input type="hidden" id="orginal_height" />
-            <input type="checkbox" id="constrain_prop" checked="checked" onclick="javascript:toggleConstrains(this);" /><br />
-            <label for="constrain_prop">Constrain Proportions</label><?php }?>
-            </td>
-
-			<td rowspan="3" align="right"></td>
-
-			<td align="right"><?php if($insertMode=='image' && $IMConfig['images_enable_styling'] !== false) { ?><label for="f_margin">Margin</label><?php }?></td>
-
-			<td><?php if($insertMode=='image' && $IMConfig['images_enable_styling'] !== false) { ?><input type="text" id="f_margin" class="smallWidth" value="" /><?php } ?></td>
-</tr>
-<tr>
-			<td align="right"><?php if($insertMode=='image') { ?><label for="f_height">Height</label><?php }?></td>
-
-			<td class="smallWidth"><?php if($insertMode=='image') { ?><input type="text" id="f_height" class="smallWidth" value="" onchange="javascript:checkConstrains('height');"/><?php }?></td>
-
-			<td align="right"><?php if($insertMode=='image' && $IMConfig['images_enable_styling'] !== false) { ?><label for="f_padding">Padding</label><?php }?></td>
-
-			<td><?php if($insertMode=='image' && $IMConfig['images_enable_styling'] !== false) { ?><input type="text" id="f_padding" class="smallWidth" value="" />
-			<?php }?></td>
-
-            <?php if($insertMode=='image' && !empty($IMConfig['use_color_pickers']) && $IMConfig['images_enable_styling'] !== false) { ?>
-   	            <td align="left">Color</td>
-  	            <td>
-                  <input name="f_backgroundColor" type="text" id="f_backgroundColor" size="7" />
-                </td>
-  	        <?php } ?>
-</tr>
-<tr>
-			<td align="right"><?php if($insertMode=='image' && $IMConfig['images_enable_align'] !== false) { ?><label for="f_align">Align</label><?php }?></td>
-
-			<td colspan="2"><?php if($insertMode=='image' && $IMConfig['images_enable_align'] !== false) { ?>
-				<select size="1" id="f_align"  title="Positioning of this image">
-				  <option value="" selected="selected"         >Not set</option>
-				  <option value="left"                         >Left</option>
-				  <option value="right"                        >Right</option>
-				  <option value="texttop"                      >Texttop</option>
-				  <option value="absmiddle"                    >Absmiddle</option>
-				  <option value="baseline"                     >Baseline</option>
-				  <option value="absbottom"                    >Absbottom</option>
-				  <option value="bottom"                       >Bottom</option>
-				  <option value="middle"                       >Middle</option>
-				  <option value="top"                          >Top</option>
-				</select><?php } ?>
-			</td>
-
-			<td align="right"><?php if($insertMode=='image' && $IMConfig['images_enable_styling'] !== false) { ?><label for="f_border">Border</label><?php }?></td>
-			<td><?php if($insertMode=='image' && $IMConfig['images_enable_styling'] !== false) { ?><input type="text" id="f_border" class="smallWidth" value="" /><?php }?></td>
-			<?php if($insertMode=='image' && !empty($IMConfig['use_color_pickers']) && $IMConfig['images_enable_styling'] !== false) { ?>
-  	        <td align="left">Border Color</td>
-            <td><input name="f_borderColor" type="text" id="f_borderColor" size="7" /></td>
-            <?php } ?>
-</tr>
-</table>
-
-<!--// image properties -->	
-	<div style="text-align: right;"> 
-          <hr />
-		  <button type="button" class="buttons" onclick="return refresh();">Refresh</button>
-          <button type="button" class="buttons" onclick="return onOK();">OK</button>
-          <button type="button" class="buttons" onclick="return onCancel();">Cancel</button>
-    </div>
-</form>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/prompt.html b/web/imcms/xinha/plugins/ExtendedFileManager/prompt.html
deleted file mode 100644
index ffe6784d3b..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/prompt.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title></title>
- <script type="text/javascript" src="../../popups/popup.js"></script>
- <style type="text/css">
- /*<![CDATA[*/
- html, body {  background-color: ButtonFace;  color: ButtonText; font: 11px Tahoma,Verdana,sans-serif; margin: 0; padding: 0;}
-body { padding: 5px; }
- .title { background-color: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px; border-bottom: 1px  solid black; letter-spacing: 2px;}
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-.buttons { width: 70px; text-align: center; }
-form { padding: 0px;  margin: 0;}
-form .elements{
-	padding: 10px; text-align: center;
-}
- /*]]>*/
- </style>
-<script type="text/javascript" src="../../popups/popup.js"></script>
-<script type="text/javascript">
-/*<![CDATA[*/
-	
-    if(window.opener)
-        HTMLArea = window.opener.HTMLArea;
-
-	init = function ()
-	{
-		__dlg_translate('ImageManager');
-		
-		var param = opener.Dialog._arguments;
-		
-		if ( param )
-		{
-		  if ( param.title )
-		  {
-		    document.title = param.title;
-		    document.getElementById("title").innerHTML = param.title;
-		  }
-		  if ( param.prompt )
-		  {
-		    document.getElementById("prompt").innerHTML = param.prompt;
-		  }
-		  if ( param.value )
-		  {
-		    document.getElementById("f_input").value = param.value;
-		  }
-		}
-		document.getElementById("f_input").focus();
-		
-		__xinha_dlg_init();
-		
-	};
-
-	function onCancel()
-	{
-		__dlg_close(null);
-		return false;
-	}
-
-	function onOK()
-	{
-		 // pass data back to the calling window
-	  __dlg_close({value:document.getElementById("f_input").value});
-	  return false;
-	}
-
-	function addEvent(obj, evType, fn)
-	{
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
-		else {  return false; }
-	}
-
-	addEvent(window, 'load', init);
-//-->
-</script>
-</head>
-<body >
-<div class="title" id="title" style="white-space:nowrap">Please enter value</div>
-<form action="">
-<div class="elements">
-	<label for="f_input" id="prompt"></label>
-	<input type="text" id="f_input" style="width:50%"/>
-</div>
-<div style="text-align: right;">
-	  <hr />
-	  <button type="button" class="buttons" onclick="return onOK();">OK</button>
-	  <button type="button" class="buttons" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/resizer.php b/web/imcms/xinha/plugins/ExtendedFileManager/resizer.php
deleted file mode 100644
index bc9eafcc93..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/resizer.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-header('Content-Type: text/javascript');
-
-/**
- * Resize images to a given size, and saving in a new file.
- * resize.php?img=/relative/path/to/image.jpg&width=<pixels>&height=<pixels>[&to=/relative/path/to/newimage.jpg]
- * relative to the base_dir given in config.inc.php
- * This is pretty much just thumbs.php with some mods, I'm too lazy to do it properly
- * @author $Author: ray $
- * @version $Id: resizer.php 677 2007-01-19 22:24:36Z ray $
- * @package ImageManager
- */
-
-require_once('config.inc.php');
-require_once('Classes/ExtendedFileManager.php');
-require_once('../ImageManager/Classes/Thumbnail.php');
-
-function js_fail($message)    { echo 'alert(\'ha ' . $message . '\'); false'; exit;   }
-function js_success($resultFile)    { echo '\'' . $resultFile . '\''; exit;   }
-
-//check for img parameter in the url
-if(!isset($_GET['img']) || !isset($_GET['width']) || !isset($_GET['height']))
-{
-  js_fail('Missing parameter.');
-}
-
-$manager = new ExtendedFileManager($IMConfig);
-
-//get the image and the full path to the image
-$image = $_GET['img'];
-$fullpath = Files::makeFile($manager->getImagesDir(),$image);
-
-//not a file, so exit
-if(!is_file($fullpath))
-{
-  js_fail("File {$fullpath} does not exist.");
-}
-
-$imgInfo = @getImageSize($fullpath);
-
-//Not an image, bail out.
-if(!is_array($imgInfo))
-{
-	js_fail("File {$fullpath} is not an image.");
-}
-
-if(!isset($_GET['to']))
-{
-  $resized    = $manager->getResizedName($fullpath,$_GET['width'],$_GET['height']);
-  $_GET['to'] = $manager->getResizedName($image,$_GET['width'],$_GET['height'], FALSE);
-}
-else
-{
-  $resized = Files::makeFile($manager->getImagesDir(),$_GET['to']);
-}
-
-// Check to see if it already exists
-if(is_file($resized))
-{
-	// And is newer
-	if(filemtime($resized) >= filemtime($fullpath))
-	{
-		js_success($_GET['to']);
-	}
-}
-
-
-
-// resize (thumbnailer will do this for us just fine)
-$thumbnailer = new Thumbnail($_GET['width'],$_GET['height']);
-$thumbnailer->proportional = FALSE;
-$thumbnailer->createThumbnail($fullpath, $resized);
-
-// did it work?
-if(is_file($resized))
-{
-	js_success($_GET['to']);
-}
-else
-{
-	js_fail("Resize Failed.");
-}
-?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ExtendedFileManager/thumbs.php b/web/imcms/xinha/plugins/ExtendedFileManager/thumbs.php
deleted file mode 100644
index 849bb192ed..0000000000
--- a/web/imcms/xinha/plugins/ExtendedFileManager/thumbs.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * On the fly Thumbnail generation.
- * Creates thumbnails given by thumbs.php?img=/relative/path/to/image.jpg
- * relative to the base_dir given in config.inc.php
- * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
- * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 21-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
- */
-if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
-if(!isset($insertMode)) $insertMode="image";
-
-require_once('config.inc.php');
-require_once('Classes/ExtendedFileManager.php');
-require_once('../ImageManager/Classes/Thumbnail.php');
-
-//check for img parameter in the url
-if(!isset($_GET['img']))
-	exit();
-
-$manager = new ExtendedFileManager($IMConfig,$insertMode);
-
-//get the image and the full path to the image
-$image = rawurldecode($_GET['img']);
-$fullpath = Files::makeFile($manager->getImagesDir(),$image);
-
-//not a file, so exit
-if(!is_file($fullpath))
-	exit();
-
-$imgInfo = @getImageSize($fullpath);
-
-//Not an image, send default thumbnail
-if(!is_array($imgInfo))
-{
-	//show the default image, otherwise we quit!
-	$default = $manager->getDefaultThumb();
-	if($default)
-	{
-		header('Location: '.$default);
-		exit();
-	}
-}
-//if the image is less than the thumbnail dimensions
-//send the original image as thumbnail
-if ($imgInfo[0] <= $IMConfig['thumbnail_width']
- && $imgInfo[1] <= $IMConfig['thumbnail_height'])
- {
-	 header('Location: '.$manager->getFileURL($image));
-	 exit();
- }
-
-//Check for thumbnails
-$thumbnail = $manager->getThumbName($fullpath);
-if(is_file($thumbnail))
-{
-	//if the thumbnail is newer, send it
-	if(filemtime($thumbnail) >= filemtime($fullpath))
-	{
-		header('Location: '.$manager->getThumbURL($image));
-		exit();
-	}
-}
-
-//creating thumbnails
-$thumbnailer = new Thumbnail($IMConfig['thumbnail_width'],$IMConfig['thumbnail_height']);
-$thumbnailer->createThumbnail($fullpath, $thumbnail);
-
-//Check for NEW thumbnails
-if(is_file($thumbnail))
-{
-	//send the new thumbnail
-	header('Location: '.$manager->getThumbURL($image));
-	exit();
-}
-else
-{
-	//show the default image, otherwise we quit!
-	$default = $manager->getDefaultThumb();
-	if($default)
-		header('Location: '.$default);
-}
-?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Filter/filter.js b/web/imcms/xinha/plugins/Filter/filter.js
deleted file mode 100644
index ed350a8d86..0000000000
--- a/web/imcms/xinha/plugins/Filter/filter.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Filter plugin for Xinha
-// Implementation by Udo Schmal & Schaffrath NeueMedien
-// Original Author - Udo Schmal
-//
-// (c) Udo Schmal & Schaffrath NeueMedien 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-function Filter(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-  // register the toolbar buttons provided by this plugin
-  cfg.registerButton({
-    id: "filter",
-    tooltip  : this._lc("Filter"),
-    image    : editor.imgURL("ed_filter.gif", "Filter"),
-    textMode : false,
-    action   : function(editor) {
-                 self.buttonPress(editor);
-               }
-  });
-  if (!cfg.Filters)
-    cfg.Filters = ["Paragraph","Word"];
-  for (var i = 0; i < editor.config.Filters.length; i++) {
-    self.add(editor.config.Filters[i]);
-  }
-  cfg.addToolbarElement("filter", "removeformat", 1);
-}
-
-Filter._pluginInfo =
-{
-  name          : "Filter",
-  version       : "1.0",
-  developer     : "Udo Schmal (gocher)",
-  developer_url : "",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de/",
-  c_owner       : "Udo Schmal & Schaffrath-NeueMedien",
-  license       : "htmlArea"
-};
-
-Filter.prototype.add = function(filterName) {
-  if(eval('typeof ' + filterName) == 'undefined') {
-    var filter = _editor_url + "plugins/filter/filters/" + filterName + ".js";
-    var head = document.getElementsByTagName("head")[0];
-    var evt = Xinha.is_ie ? "onreadystatechange" : "onload";
-    var script = document.createElement("script");
-    script.type = "text/javascript";
-    script.src = filter;
-    script[evt] = function() {
-      if(Xinha.is_ie && !/loaded|complete/.test(window.event.srcElement.readyState))  return;
-    }
-    head.appendChild(script);
-    //document.write("<script type='text/javascript' src='" + plugin_file + "'></script>");
-  }
-};
-
-Filter.prototype._lc = function(string) {
-    return Xinha._lc(string, 'Filter');
-};
-
-Filter.prototype.buttonPress = function(editor) {
-  var html = editor.getInnerHTML();
-  for (var i = 0; i < editor.config.Filters.length; i++) {
-    html = eval(editor.config.Filters[i])(html);
-  }
-  editor.setHTML(html);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Filter/filters/paragraph.js b/web/imcms/xinha/plugins/Filter/filters/paragraph.js
deleted file mode 100644
index 3d4a3de058..0000000000
--- a/web/imcms/xinha/plugins/Filter/filters/paragraph.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Paragraph = function(html) {
-  html = html.replace(/<\s*p[^>]*>/gi, '');
-  html = html.replace(/<\/\s*p\s*>/gi, '');
-  html = html.trim();
-  return html;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Filter/filters/word.js b/web/imcms/xinha/plugins/Filter/filters/word.js
deleted file mode 100644
index 57cd995ed2..0000000000
--- a/web/imcms/xinha/plugins/Filter/filters/word.js
+++ /dev/null
@@ -1,53 +0,0 @@
-Word = function(html) {
-    // Remove HTML comments
-	html = html.replace(/<!--[\w\s\d@{}:.;,'"%!#_=&|?~()[*+\/\-\]]*-->/gi, "" );
-	html = html.replace(/<!--[^\0]*-->/gi, '');
-    // Remove all HTML tags
-	html = html.replace(/<\/?\s*HTML[^>]*>/gi, "" );
-    // Remove all BODY tags
-    html = html.replace(/<\/?\s*BODY[^>]*>/gi, "" );
-    // Remove all META tags
-	html = html.replace(/<\/?\s*META[^>]*>/gi, "" );
-    // Remove all SPAN tags
-	html = html.replace(/<\/?\s*SPAN[^>]*>/gi, "" );
-	// Remove all FONT tags
-    html = html.replace(/<\/?\s*FONT[^>]*>/gi, "");
-    // Remove all IFRAME tags.
-    html = html.replace(/<\/?\s*IFRAME[^>]*>/gi, "");
-    // Remove all STYLE tags & content
-	html = html.replace(/<\/?\s*STYLE[^>]*>(.|[\n\r\t])*<\/\s*STYLE\s*>/gi, "" );
-    // Remove all TITLE tags & content
-	html = html.replace(/<\s*TITLE[^>]*>(.|[\n\r\t])*<\/\s*TITLE\s*>/gi, "" );
-	// Remove javascript
-    html = html.replace(/<\s*SCRIPT[^>]*>[^\0]*<\/\s*SCRIPT\s*>/gi, "");
-    // Remove all HEAD tags & content
-	html = html.replace(/<\s*HEAD[^>]*>(.|[\n\r\t])*<\/\s*HEAD\s*>/gi, "" );
-	// Remove Class attributes
-	html = html.replace(/<\s*(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ;
-	// Remove Style attributes
-	html = html.replace(/<\s*(\w[^>]*) style="([^"]*)"([^>]*)/gi, "<$1$3") ;
-	// Remove Lang attributes
-	html = html.replace(/<\s*(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ;
-	// Remove XML elements and declarations
-	html = html.replace(/<\\?\?xml[^>]*>/gi, "") ;
-	// Remove Tags with XML namespace declarations: <o:p></o:p>
-	html = html.replace(/<\/?\w+:[^>]*>/gi, "") ;
-	// Replace the &nbsp;
-	html = html.replace(/&nbsp;/, " " );
-
-	// Transform <p><br /></p> to <br>
-	//html = html.replace(/<\s*p[^>]*>\s*<\s*br\s*\/>\s*<\/\s*p[^>]*>/gi, "<br>");
-	html = html.replace(/<\s*p[^>]*><\s*br\s*\/?>\s*<\/\s*p[^>]*>/gi, "<br>");
-	
-	// Remove <P> 
-	html = html.replace(/<\s*p[^>]*>/gi, "");
-	
-	// Replace </p> with <br>
-	html = html.replace(/<\/\s*p[^>]*>/gi, "<br>");
-	
-	// Remove any <br> at the end
-	html = html.replace(/(\s*<br>\s*)*$/, "");
-	
-	html = html.trim();
-	return html;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Filter/img/ed_filter.gif b/web/imcms/xinha/plugins/Filter/img/ed_filter.gif
deleted file mode 100644
index 53180a80ba..0000000000
Binary files a/web/imcms/xinha/plugins/Filter/img/ed_filter.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Filter/lang/ja.js b/web/imcms/xinha/plugins/Filter/lang/ja.js
deleted file mode 100644
index 4ff9439ebc..0000000000
--- a/web/imcms/xinha/plugins/Filter/lang/ja.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Filter": "フィルター"
-};
diff --git a/web/imcms/xinha/plugins/Filter/lang/nl.js b/web/imcms/xinha/plugins/Filter/lang/nl.js
deleted file mode 100644
index eaf9cfe556..0000000000
--- a/web/imcms/xinha/plugins/Filter/lang/nl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Filter": "Filter"
-};
diff --git a/web/imcms/xinha/plugins/Filter/lang/pt_br.js b/web/imcms/xinha/plugins/Filter/lang/pt_br.js
deleted file mode 100644
index f650e4872c..0000000000
--- a/web/imcms/xinha/plugins/Filter/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Filter": "Filtro"
-};
diff --git a/web/imcms/xinha/plugins/FindReplace/find-replace.js b/web/imcms/xinha/plugins/FindReplace/find-replace.js
deleted file mode 100644
index 065e683908..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/find-replace.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------*\
- Find and Replace Plugin for HTMLArea-3.0
- -----------------------------------------
- author: Cau guanabara 
- e-mail: caugb@ibest.com.br
-\*---------------------------------------*/
-
-function FindReplace(editor) {
-this.editor = editor;
-var cfg = editor.config;
-var self = this;
-cfg.registerButton("FR-findreplace", this._lc("Find and Replace"),
-                   editor.imgURL("ed_find.gif", "FindReplace"), false,
-                   function(editor) { self.buttonPress(editor); });
-cfg.addToolbarElement(["FR-findreplace","separator"], ["formatblock","fontsize","fontname"], -1);
-}
-
-FindReplace.prototype.buttonPress = function(editor) { 
-FindReplace.editor = editor;
-var sel = editor.getSelectedHTML();
-  if(/\w/.test(sel)) {
-  sel = sel.replace(/<[^>]*>/g,"");
-  sel = sel.replace(/&nbsp;/g,"");
-  }
-var param = /\w/.test(sel) ? {fr_pattern: sel} : null;
-editor._popupDialog("plugin://FindReplace/find_replace", null, param);
-};
-
-FindReplace._pluginInfo = {
-  name          : "FindReplace",
-  version       : "1.0 - beta",
-  developer     : "Cau Guanabara",
-  developer_url : "mailto:caugb@ibest.com.br",
-  c_owner       : "Cau Guanabara",
-  sponsor       : "Independent production",
-  sponsor_url   : "http://www.netflash.com.br/gb/HA3-rc1/examples/find-replace.html",
-  license       : "htmlArea"
-};
-
-FindReplace.prototype._lc = function(string) {
-    return Xinha._lc(string, 'FindReplace');
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/fr_engine.js b/web/imcms/xinha/plugins/FindReplace/fr_engine.js
deleted file mode 100644
index 12484842a7..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/fr_engine.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*---------------------------------------*\
- Find and Replace Plugin for HTMLArea-3.0
- -----------------------------------------
- author: Cau guanabara 
- e-mail: caugb@ibest.com.br
-\*---------------------------------------*/
-
-var FindReplace = window.opener.FindReplace;
-var editor = FindReplace.editor;
-var is_mo = window.opener.Xinha.is_gecko;
-var tosearch = '';
-var pater = null;
-var buffer = null;
-var matches = 0;
-var replaces = 0;
-var fr_spans = new Array();
-function _lc(string) {
-    return(window.opener.Xinha._lc(string, 'FindReplace'));
-}
-function execSearch(params) {
-var ihtml = editor._doc.body.innerHTML;
-  if(buffer == null) 
-    buffer = ihtml;
-    
-  if(params['fr_pattern'] != tosearch) {
-    if(tosearch != '')
-      clearDoc();
-  tosearch = params['fr_pattern'];
-  }
-  
-  if(matches == 0) {
-  er = params['fr_words'] ? "/(?!<[^>]*)(\\b"+params['fr_pattern']+"\\b)(?![^<]*>)/g" :
-                            "/(?!<[^>]*)("+params['fr_pattern']+")(?![^<]*>)/g";
-    if(!params['fr_matchcase'])
-      er += "i"; 
-
-  pater = eval(er);
-  
-  var tago = '<span id=frmark>';
-  var tagc = '</span>';
-  var newHtml = ihtml.replace(pater,tago+"$1"+tagc);
-  
-  editor.setHTML(newHtml);
-  
-  var getallspans = editor._doc.body.getElementsByTagName("span"); 
-    for (var i = 0; i < getallspans.length; i++) 
-      if(/^frmark/.test(getallspans[i].id))
-        fr_spans.push(getallspans[i]);
-  }
-
-spanWalker(params['fr_pattern'],params['fr_replacement'],params['fr_replaceall']);
-}
-
-function spanWalker(pattern,replacement,replaceall) {
-var foundtrue = false;
-clearMarks();
-
-  for (var i = matches; i < fr_spans.length; i++) {
-  var elm = fr_spans[i];
-  foundtrue = true;
-    if(!(/[0-9]$/.test(elm.id))) { 
-    matches++;
-    disab('fr_clear',false);
-    elm.id = 'frmark_'+matches;
-    elm.style.color = 'white';
-    elm.style.backgroundColor = 'highlight';
-    elm.style.fontWeight = 'bold';
-    elm.scrollIntoView(false);
-      if(/\w/.test(replacement)) {
-        if(replaceall || confirm(_lc("Substitute this occurrence?"))) {
-        elm.firstChild.replaceData(0,elm.firstChild.data.length,replacement);
-        replaces++;
-        disab('fr_undo',false);
-        }
-        if(replaceall) {
-        clearMarks();
-        continue;
-        }
-      }
-    break;
-    }
-  }
-  var last = (i >= fr_spans.length - 1);
-  if(last || !foundtrue) { // EOF
-  var message = _lc("Done")+':\n\n';
-    if(matches > 0) {
-      if(matches == 1) message += matches+' '+_lc("found item");
-      else             message += matches+' '+_lc("found items");
-      if(replaces > 0) {
-        if(replaces == 1) message += ',\n'+replaces+' '+_lc("replaced item");
-        else              message += ',\n'+replaces+' '+_lc("replaced items");
-      }
-    hiliteAll();
-    disab('fr_hiliteall',false);
-    } else { message += '"'+pattern+'" '+_lc("not found"); }
-  alert(message+'.');
-  }
-}
-
-function clearDoc() {
-var doc = editor._doc.body.innerHTML; 
-var er = /(<span\s+[^>]*id=.?frmark[^>]*>)([^<>]*)(<\/span>)/gi;
-editor._doc.body.innerHTML = doc.replace(er,"$2");
-pater = null;
-tosearch = '';
-fr_spans = new Array();
-matches = 0;
-replaces = 0;
-disab("fr_hiliteall,fr_clear",true);
-}
-
-function clearMarks() {
-var getall = editor._doc.body.getElementsByTagName("span"); 
-  for (var i = 0; i < getall.length; i++) {
-  var elm = getall[i];
-    if(/^frmark/.test(elm.id)) {
-    var objStyle = editor._doc.getElementById(elm.id).style;
-    objStyle.backgroundColor = "";
-    objStyle.color = "";
-    objStyle.fontWeight = "";
-    }
-  }
-}
-
-function hiliteAll() { 
-var getall = editor._doc.body.getElementsByTagName("span"); 
-  for (var i = 0; i < getall.length; i++) {
-  var elm = getall[i];
-    if(/^frmark/.test(elm.id)) { 
-    var objStyle = editor._doc.getElementById(elm.id).style;
-    objStyle.backgroundColor = "highlight";
-    objStyle.color = "white";
-    objStyle.fontWeight = "bold";
-    }
-  }
-}
-
-function resetContents() { 
-  if(buffer == null) return;
-var transp = editor._doc.body.innerHTML;
-editor._doc.body.innerHTML = buffer;
-buffer = transp;
-}
-
-function disab(elms,toset) { 
-var names = elms.split(/[,; ]+/);
-  for(var i = 0; i < names.length; i++) 
-    document.getElementById(names[i]).disabled = toset;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/img/ed_find.gif b/web/imcms/xinha/plugins/FindReplace/img/ed_find.gif
deleted file mode 100644
index 11877d4c39..0000000000
Binary files a/web/imcms/xinha/plugins/FindReplace/img/ed_find.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/de.js b/web/imcms/xinha/plugins/FindReplace/lang/de.js
deleted file mode 100644
index 2c775b9a71..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/de.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  // messages
-  "Substitute this occurrence?": "Treffer ersetzen?",
-  "Enter the text you want to find": "Geben Sie einen Text ein den Sie finden möchten",
-  "Inform a replacement word": "Geben sie einen Text zum ersetzen ein",
-  "found items": "alle Treffer",
-  "replaced items": "ersetzte Treffer",
-  "found item": "Treffer",
-  "replaced item": "ersetzter Treffer",
-  "not found": "kein Teffer",
-  // window
-  "Find and Replace": "Suchen und ersetzen",
-  "Search for:": "Suchen nach:",
-  "Replace with:": "Ersetzen durch:",
-  "Options": "Optionen",
-  "Whole words only": "Ganze Wörter",
-  "Case sensitive search": "Groß-/Kleinschreibung",
-  "Substitute all occurrences": "alle Treffer ersetzen",
-  "Clear": "Nächstes ersetzen",
-  "Highlight": "Hervorheben",
-  "Undo": "Rückgängig",
-  "Next": "Nächster",
-  "Done": "Fertig"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/fr.js b/web/imcms/xinha/plugins/FindReplace/lang/fr.js
deleted file mode 100644
index 4869e76d2c..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/fr.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  // messages
-  "Substitute this occurrence?": "Remplacer cette occurrence ?",
-  "Enter the text you want to find": "Texte à trouver",
-  "Inform a replacement word": "Indiquez un mot de remplacement",
-  "found items": "éléments trouvés",
-  "replaced items": "éléments remplacés",
-  "found item": "élément trouvé",
-  "replaced item": "élément remplacé",
-  "not found": "non trouvé",
-  // window
-  "Find and Replace": "Chercher et Remplacer",
-  "Search for:": "Chercher",
-  "Replace with:": "Remplacer par",
-  "Options": "Options",
-  "Whole words only": "Mots entiers seulement",
-  "Case sensitive search": "Recherche sensible à la casse",
-  "Substitute all occurrences": "Remplacer toutes les occurences",
-  "Clear": "Effacer",
-  "Highlight": "Surligner",
-  "Undo": "Annuler",
-  "Next": "Suivant",
-  "Done": "Fin"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/ja.js b/web/imcms/xinha/plugins/FindReplace/lang/ja.js
deleted file mode 100644
index 3fc68e502c..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/ja.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  // messages
-  "Substitute this occurrence?": "置�����?",
-  "Enter the text you want to find": "検索���テキストを入力���",
-  "Inform a replacement word": "�語�置�を知ら�る",
-  "found items": "件�検索�れ���",
-  "replaced items": "件�置��れ���",
-  "found item": "件�検索�れ���",
-  "replaced item": "件�置��れ���",
-  "not found": "��り��ん",
-  // window
-  "Find and Replace": "検索/置�",
-  "Search for:": "検索:",
-  "Replace with:": "置�:",
-  "Options": "設定",
-  "Whole words only": "完全一致��",
-  "Case sensitive search": "大文字/�文字区別",
-  "Substitute all occurrences": "���置�",
-  "Clear": "通常表示",
-  "Highlight": "強調表示",
-  "Undo": "元�戻�",
-  "Next": "次を検索",
-  "Done": "終了"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/nb.js b/web/imcms/xinha/plugins/FindReplace/lang/nb.js
deleted file mode 100644
index fed5bf4bdc..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/nb.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  // messages
-  "Substitute this occurrence?": "Vennligst bekreft at du vil erstatte?",
-  "Enter the text you want to find": "Skriv inn teksten du ønsker å finne",
-  "Inform a replacement word": "Vennligst skriv inn et erstatningsord / setning",
-  "found items": "forekomster funnet i søket",
-  "replaced items": "forekomster erstattet",
-  "found item": "Treff",
-  "replaced item": "erstattet treff",
-  "not found": "ikke funnet",
-  // window
-  "Find and Replace": "Søk og erstatt",
-  "Search for:": "Søk etter:",
-  "Replace with:": "Erstatt med:",
-  "Options": "Valg", 
-  "Whole words only": "Bare hele ord",
-  "Case sensitive search": "Skille mellom store og små bokstaver",
-  "Substitute all occurrences": "Erstatt alle treff",
-  "Clear": "Tøm",
-  "Highlight": "Uthev",
-  "Undo": "Tilbake",
-  "Next": "Neste",
-  "Done": "Ferdig"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/nl.js b/web/imcms/xinha/plugins/FindReplace/lang/nl.js
deleted file mode 100644
index a69b14f0cf..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/nl.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  // messages
-  "Substitute this occurrence?": "Deze overeenkomst vervangen?",
-  "Enter the text you want to find": "Voer tekst in waar je op wilt zoeken",
-  "Inform a replacement word": "Voer een vervang woord of zin in",
-  "found items": "gevonden overeenkomsten",
-  "replaced items": "vervangen items",
-  "found item": "gevonden overeenkomst",
-  "replaced item": "vervangen item",
-  "not found": "niet gevonden",
-  // window
-  "Find and Replace": "Zoek en vervang",
-  "Search for:": "Zoek naar:",
-  "Replace with:": "Vervang met:",
-  "Options": "Opties", 
-  "Whole words only": "Alleen hele woorden",
-  "Case sensitive search": "Exact zoeken",
-  "Substitute all occurrences": "Vervang alle overeenkomsten",
-  "Clear": "Leeg",
-  "Highlight": "Markeren",
-  "Undo": "Ongedaan maken",
-  "Next": "Volgende",
-  "Done": "Voltooien"
-};
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/no.js b/web/imcms/xinha/plugins/FindReplace/lang/no.js
deleted file mode 100644
index b059a2808d..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/no.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  // messages
-  "Substitute this occurrence?": "Vennligst bekreft at du vil erstatte?",
-  "Enter the text you want to find": "Skriv inn teksten du ønsker å finne",
-  "Inform a replacement word": "Vennligst skriv inn et erstatningsord / setning",
-  "found items": "forekomster funnet i søket",
-  "replaced items": "forekomster erstattet",
-  "found item": "Treff",
-  "replaced item": "erstattet treff",
-  "not found": "ikke funnet",
-  // window
-  "Find and Replace": "Søk og erstatt",
-  "Search for:": "Søk etter:",
-  "Replace with:": "Erstatt med:",
-  "Options": "Valg", 
-  "Whole words only": "Bare hele ord",
-  "Case sensitive search": "Skille mellom store og små bokstaver",
-  "Substitute all occurrences": "Erstatt alle treff",
-  "Clear": "Tøm",
-  "Highlight": "Uthev",
-  "Undo": "Tilbake",
-  "Next": "Neste",
-  "Done": "Ferdig"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/pl.js b/web/imcms/xinha/plugins/FindReplace/lang/pl.js
deleted file mode 100644
index bc446c76f9..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/pl.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, koto1sa@o2.pl, http://www.eskot.krakow.pl/portfolio
-{
-  // messages
-  "Substitute this occurrence?": "Zamienić to wystąpienie?",
-  "Enter the text you want to find": "Podaj tekst, jaki chcesz wyszukać",
-  "Inform a replacement word": "Podaj tekst do zamiany",
-  "found items": "znalezionych",
-  "replaced items": "zamienionych",
-  "found item": "znaleziony",
-  "replaced item": "zamieniony",
-  "not found": "nie znaleziony",
-  // window
-  "Find and Replace": "Znajdź i zamień",
-  "Search for:": "Szukaj:",
-  "Replace with:": "Zamień na:",
-  "Options": "Opcje",
-  "Whole words only": "Całe słowa",
-  "Case sensitive search": "Wg wielkości liter",
-  "Substitute all occurrences": "Zamień wszystkie wystąpienia",
-  "Clear": "Wyczyść",
-  "Highlight": "Podświetl",
-  "Undo": "Cofnij",
-  "Next": "Następny",
-  "Done": "Gotowe"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/pt_br.js b/web/imcms/xinha/plugins/FindReplace/lang/pt_br.js
deleted file mode 100644
index 487cb29624..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/pt_br.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Initial basic translation
-// Author: Cau guanabara (independent developer), caugb@ibest.com.br
-//
-// Final translation
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Case sensitive search": "Procura diferenciada Maiúsculas/Minúsculas",
-  "Clear": "Limpar",
-  "Done": "Executado",
-  "Enter the text you want to find": "Forneça o texto que deseja procurar",
-  "Find and Replace": "Procurar e Substituir",
-  "Highlight": "Marcar",
-  "Inform a replacement word": "Informe uma palavra para substituir",
-  "Next": "Próxima",
-  "Options": "Opções",
-  "Replace with:": "Substituir por:",
-  "Search for:": "Procurar por:",
-  "Substitute all occurrences": "Substituir todas as ocorrências",
-  "Substitute this occurrence?": "Substituir todas as ocorrências?",
-  "Undo": "Desfazer",
-  "Whole words only": "Apenas palavras inteiras",
-  "found item": "Item encontrado",
-  "found items": "Itens encontrados",
-  "not found": "nada encontrado",
-  "replaced item": "substituir item",
-  "replaced items": "substituir itens"
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/ru.js b/web/imcms/xinha/plugins/FindReplace/lang/ru.js
deleted file mode 100644
index c5b8c25a89..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/ru.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Author: Andrei Blagorazumov, a@fnr.ru
-
-{
-  // messages
-  "Substitute this occurrence?": "Заменить �то вхождение?",
-  "Enter the text you want to find": "Введите тек�т, который вы хотите найти",
-  "Inform a replacement word": "Показать замещающее �лово",
-  "found items": "найти",
-  "replaced items": "замененные",
-  "found item": "найти",
-  "replaced item": "замененна�",
-  "not found": "не найдено",
-  // window
-  "Find and Replace": "�айти и заменить",
-  "Search for:": "�айти",
-  "Replace with:": "Заменить �",
-  "Options": "Опции",
-  "Whole words only": "Только �лова целиком",
-  "Case sensitive search": "Пои�к � учетом реги�тра",
-  "Substitute all occurrences": "Заменить в�е вхождени�",
-  "Clear": "Очи�тить",
-  "Highlight": "Выделить",
-  "Undo": "Отменить",
-  "Next": "След.",
-  "Done": "OK"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FindReplace/lang/sv.js b/web/imcms/xinha/plugins/FindReplace/lang/sv.js
deleted file mode 100755
index 60c843279d..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/lang/sv.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "sv" (Swedish), ENCODING: UTF-8
-// translated: Erik Dalén, <dalen@jpl.se>
-{
-  // messages
-  "Substitute this occurrence?": "Ersätt denna?",
-  "Enter the text you want to find": "Skriv in text du vill söka",
-  "Inform a replacement word": "Skriv in ett ersättningsord",
-  "found items": "förekomster funna i sökningen",
-  "replaced items": "förekomster erstatta",
-  "found item": "Träff",
-  "replaced item": "erstatt träff",
-  "not found": "inte funnet",
-  // window
-  "Find and Replace": "Sök och ersätt",
-  "Search for:": "Sök efter:",
-  "Replace with:": "Ersätt med:",
-  "Options": "Välj", 
-  "Whole words only": "Bara hela ord",
-  "Case sensitive search": "Skilj mellan stora och små bokstäver",
-  "Substitute all occurrences": "Erstatt alla träffar",
-  "Clear": "Töm",
-  "Highlight": "Markera",
-  "Undo": "Tillbaka",
-  "Next": "Nästa",
-  "Done": "Färdig"
-};
diff --git a/web/imcms/xinha/plugins/FindReplace/popups/find_replace.html b/web/imcms/xinha/plugins/FindReplace/popups/find_replace.html
deleted file mode 100644
index 0759c254ef..0000000000
--- a/web/imcms/xinha/plugins/FindReplace/popups/find_replace.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<html>
-<head>
-  <title>Find and Replace</title>
-<!--
-/*---------------------------------------*\
- Find and Replace Plugin for HTMLArea-3.0
- -----------------------------------------
- author: Cau guanabara 
- e-mail: caugb@ibest.com.br
-\*---------------------------------------*/
--->
-<script type="text/javascript" src="../fr_engine.js"></script>
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-
-<script type="text/javascript">
-
-window.resizeTo(335, 250);
-
-var accepted = {
-                'fr_pattern'       : true,
-                'fr_replacement'   : true,
-                'fr_words'         : true,
-                'fr_matchcase'     : true,
-                'fr_replaceall'    : true
-               };
-
-function Init() {
-__dlg_translate('FindReplace');
-__dlg_init();
-
-disab("fr_undo,fr_clear,fr_hiliteall",true);
-
-var params = window.dialogArguments;
-  if(params) {
-  document.getElementById('fr_pattern').value = params["fr_pattern"];
-  document.getElementById('fr_replacement').focus();
-  } else {
-  document.getElementById('fr_pattern').focus();
-  }
-  
-document.body.onkeypress = __dlg_key_press;
-}
-
-function onCancel() {
-  clearDoc();
-  __dlg_close(null);
-  return false;
-}
-
-function onOK() {
-  var required = {'fr_pattern' : _lc("Enter the text you want to find")};
-  for (var i in required) {
-    var el = document.getElementById(i);
-      if (!el.value) {
-        alert(required[i]);
-        el.focus();
-        return false;
-      }
-  }
-
-  var param = {};
-  for (var i in accepted) {
-  var el = document.getElementById(i);
-  param[i] = el.type == 'checkbox' ? el.checked : el.value;
-  }
-  execSearch(param);
-  return false;
-}
-
-function __dlg_key_press(ev) {
-ev || (ev = window.event);
-  switch(ev.keyCode) {
-    case 13:
-    document.getElementById('fr_go').click();
-    document.getElementById('fr_pattern').focus();
-      break;
-    case 27:
-    clearDoc();
-    window.close();
-    return false;
-  }
-return true;
-}
-
-</script>
-
-<style type="text/css">
-table .label { text-align: right; width: 12em; }
-.title {
-background: #ddf;
-color: #000;
-font-weight: bold;
-font-size: 120%;
-padding: 3px 10px;
-margin-bottom: 10px;
-border-bottom: 1px solid black;
-letter-spacing: 2px;
-}
-.buttons { border-top: 1px solid #999; padding: 2px; text-align: right; }
-.hrstyle { border-width: 1px; border-color: #666; width: 95%; padding: 2px; }
-</style>
-  </head>
-  <body class="dialog" onload="Init()">
-  <div class="title">Find and Replace</div>
-  <form action="" method="get">
-  <table border="0" style="width: 100%; padding: 2px;"><!---->
-    <tbody>
-      <tr> 
-        <td width="29%" align="right" valign="bottom">Search for:</td>
-        <td width="71%" colspan="2" valign="bottom"> 
-        <input id="fr_pattern" type="text" style="width: 200px" onFocus="this.select();"> 
-        </td>
-      </tr>
-      <tr> 
-        <td align="right">Replace with:</td>
-        <td colspan="2"> 
-        <input id="fr_replacement" type="text" style="width: 200px" onFocus="this.select();"> 
-        </td>
-      </tr>
-      <tr> 
-        <td colspan="3"><table width="100%" border="0" cellpadding="1" cellspacing="0">
-            <tr> 
-              <td width="78%" style="padding: 2px">
-              <FIELDSET style="width:90%; padding: 5px">
-                <LEGEND><span>Options</span></LEGEND>
-                  <input id="fr_words" type="checkbox" checked onClick="clearDoc();">
-                <span onClick="e = document.getElementById('fr_words'); 
-                e.click(); e.focus();" style="cursor:default"> 
-                  <span>Whole words only</span></span><br />
-                  <input id="fr_matchcase" type="checkbox" onClick="clearDoc();">
-                <span onClick="e = document.getElementById('fr_matchcase'); 
-                e.click(); e.focus();" style="cursor:default"> 
-                  <span>Case sensitive search</span></span><br />
-                  <input id="fr_replaceall" type="checkbox" onClick="
-                  if(document.getElementById('fr_replacement').value == '') {
-                  alert(_lc('Inform a replacement word'));
-                  return false;
-                  }
-                  clearDoc();">
-                <span onClick="e = document.getElementById('fr_replaceall'); 
-                e.click(); e.focus();" style="cursor:default"> 
-                  <span>Substitute all occurrences</span></span>
-                </FIELDSET></td>
-<td width="22%" align="center" valign="bottom" style="text-align: right; padding: 4px"> 
-<button type="button" id="fr_clear" onClick="clearMarks()">Clear</button>
-<div class="space"></div>
-<button type="button" id="fr_hiliteall" onClick="hiliteAll()">Highlight</button>
-<div class="space"></div>
-<button type="button" id="fr_undo" onClick="resetContents();">Undo</button>
-</td>
-            </tr>
-          </table></td>
-      </tr>
-    </tbody>
-  </table>
-<div style="border-top: 1px solid #999; padding: 2px; padding: 5px; text-align: right; height: 20px"><button type="button" id="fr_go" onclick="return onOK();">Next</button>
-<button type="button" name="cancel" onclick="return onCancel();">Done</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/README b/web/imcms/xinha/plugins/FormOperations/README
deleted file mode 100644
index d816c67e22..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/README
+++ /dev/null
@@ -1,32 +0,0 @@
-Form Operations Plugin
-----------------------
-
-Usage:
-  1. Follow the standard procedure for loading a plugin.
-  2. You may configure the plugin by setting the following configuration variables, or leave them as the defaults.
-
-      xinha_config.FormOperations.multiple_field_format
-        = 'php'
-              this will cause checkbox and "multiple" select fields to have []
-              appended to thier field names silently
-        = 'unmodified'
-              field names will not be silently modified
-
-      xinha_config.FormOperations.allow_edit_form
-        = true
-              the user will be able to edit the action, and method of forms
-        = false
-              neither action, nor method is editable
-
-      xinha_config.FormOperations.default_form_action
-        = 'whatever you want'
-              the default form action to set when inserting a form.  The standard one is a php file in the Form Operations directory which will email the form post to enquiries@<server hostname here>
-
-      xinha_config.FormOperations.default_form_html
-        = '<form>whatever you want here</form>'
-              the default html to insert when inserting a form.  The standard one is a basic contact form.  If you would like to specify an external file which contains the HTML for the form, you may do so via
-              = HTMLArea._geturlcontent('http://absolute/url/to/file.html')
-              see default_form.html for a suitable example, pay attention to the form tag.
-
-
-
diff --git a/web/imcms/xinha/plugins/FormOperations/default_form.html b/web/imcms/xinha/plugins/FormOperations/default_form.html
deleted file mode 100644
index 9e7d4e12a6..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/default_form.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<form>
-  <table class="contact_form">
-    <caption>Contact Us</caption>
-    <tbody>
-      <tr>
-        <th>Your name:</th>
-        <td><input type="text" name="Name" value="" /></td>
-      </tr>
-      <tr>
-        <th>Your email:</th>
-        <td><input type="text" name="Email" value="" /></td>
-      </tr>
-      <tr>
-        <th>Message Subject:</th>
-        <td><input type="text" name="Subject" value="" /></td>
-      </tr>
-      <tr>
-        <th>What are your hobbies?</th>
-        <td>
-          <input type="checkbox" value="Marbles" name="Hobbies[]" /> Marbles <br />
-          <input type="checkbox" value="Conkers" name="Hobbies[]" /> Conkers <br />
-          <input type="checkbox" value="Jacks" name="Hobbies[]" /> Jacks
-        </td>
-      </tr>
-      <tr>
-        <th>Message Body:</th>
-      </tr>
-      <tr>
-        <td colspan="2">
-          <textarea name="Message"> </textarea>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <input type="submit" value="Send" /> &nbsp;&nbsp; <input type="reset" value="Reset" />
-</form>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/form-operations.js b/web/imcms/xinha/plugins/FormOperations/form-operations.js
deleted file mode 100644
index 5b802fe552..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/form-operations.js
+++ /dev/null
@@ -1,756 +0,0 @@
-
-  /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  FormOperations Plugin
-    --
-    --  $HeadURL: http://svn.xinha.webfactional.com/trunk/plugins/FormOperations/form-operations.js $
-    --  $LastChangedDate: 2007-02-08 08:12:42 +1300 (Thu, 08 Feb 2007) $
-    --  $LastChangedRevision: 715 $
-    --  $LastChangedBy: htanaka $
-    --------------------------------------------------------------------------*/
-
-Xinha.Config.prototype.FormOperations =
-{
-  // format for fields where multiple values may be selected
-  //    'php'          => FieldName[]
-  //    'unmodified'   => FieldName
-  'multiple_field_format': 'php',
-  'allow_edit_form'      : false,
-  'default_form_action'  : _editor_url + 'plugins/FormOperations/formmail.php',
-  'default_form_html'    : Xinha._geturlcontent(_editor_url + 'plugins/FormOperations/default_form.html')
-};
-
-FormOperations._pluginInfo =
-{
-  name     : "FormOperations",
-  version  : "1.0",
-  developer: "James Sleeman",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "htmlArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-function FormOperations(editor)
-{
-  this.editor = editor;
-  this.panel  = false;
-  this.html   = false;
-  this.ready  = false;
-  this.activeElement = null;
-  this._preparePanel();
-
-
-  editor.config.pageStyleSheets.push(_editor_url + 'plugins/FormOperations/iframe.css');
-
-  var toolbar =
-  [
-    'separator',
-    'insert_form',
-    'insert_text_field',
-    'insert_textarea_field',
-    'insert_select_field',
-    'insert_cb_field',
-    'insert_rb_field',
-    'insert_button'
-  ];
-
-  this.editor.config.toolbar.push(toolbar);
-
-  function pasteAndSelect(htmlTag)
-  {
-    var id = Xinha.uniq('fo');
-    htmlTag = htmlTag.replace(/^<([^ \/>]+)/i, '<$1 id="'+id+'"');
-    editor.insertHTML(htmlTag);
-    var el = editor._doc.getElementById(id);
-    el.setAttribute('id', '');
-    editor.selectNodeContents(el);
-    editor.updateToolbar();
-    return el;
-  }
-
-  var buttonsImage = editor.imgURL('buttons.gif', 'FormOperations');
-
-  FormOperations.prototype._lc = function(string) {
-    return Xinha._lc(string, 'FormOperations');
-  };
-
-  this.editor.config.btnList.insert_form =
-  [ this._lc("Insert a Form."),
-    [buttonsImage, 0, 0],
-    false,
-    function()
-    {
-      var form = null;
-      if(editor.config.FormOperations.default_form_html)
-      {
-        form = pasteAndSelect(editor.config.FormOperations.default_form_html);
-      }
-      else
-      {
-        form = pasteAndSelect('<form>&nbsp;</form>');
-      }
-
-      if(editor.config.FormOperations.default_form_action && !form.action)
-      {
-        form.action = editor.config.FormOperations.default_form_action;
-      }
-    }
-  ];
-
-  this.editor.config.btnList.insert_text_field =
-  [ this._lc("Insert a text, password or hidden field."),
-    [buttonsImage, 1, 0],
-    false,
-    function()
-    {
-      pasteAndSelect('<input type="text" />');
-    },
-    'form'
-  ];
-
-  this.editor.config.btnList.insert_textarea_field =
-  [ this._lc("Insert a multi-line text field."),
-    [buttonsImage, 2, 0],
-    false,
-    function()
-    {
-      pasteAndSelect('<textarea> </textarea>');
-    },
-    'form'
-  ];
-
-  this.editor.config.btnList.insert_select_field =
-  [ this._lc("Insert a select field."),
-    [buttonsImage, 3, 0],
-    false,
-    function()
-    {
-      pasteAndSelect('<select> <option value="">Please Select...</option> </select>');
-    },
-    'form'
-  ];
-
-  this.editor.config.btnList.insert_cb_field =
-  [ this._lc("Insert a check box."),
-    [buttonsImage, 4, 0],
-    false,
-    function()
-    {
-      pasteAndSelect('<input type="checkbox" />');
-    },
-    'form'
-  ];
-
-  this.editor.config.btnList.insert_rb_field =
-  [ this._lc("Insert a radio button."),
-    [buttonsImage, 5, 0],
-    false,
-    function()
-    {
-      pasteAndSelect('<input type="radio" />');
-    },
-    'form'
-  ];
-
-  this.editor.config.btnList.insert_button =
-  [ this._lc("Insert a submit/reset button."),
-    [buttonsImage, 6, 0],
-    false,
-    function()
-    {
-      pasteAndSelect('<input type="submit" value="Send" />');
-    },
-    'form'
-  ];
-}
-
-FormOperations.prototype.onGenerate = function()
-{
-  // Gecko does not register click events on select lists inside the iframe
-  // so the only way of detecting that is to do an event on mouse move.
-  if( Xinha.is_gecko)
-  {
-    var editor = this.editor;
-    var doc    = this.editor._doc;
-    Xinha._addEvents
-    (doc, ["mousemove"],
-     function (event) {
-       return editor._editorEvent(event);
-     });
-  }
-};
-
-FormOperations.prototype._preparePanel = function ()
-{
-  var fo = this;
-  if(this.html == false)
-  {
-
-    Xinha._getback(_editor_url + 'plugins/FormOperations/panel.html',
-      function(txt)
-      {
-        fo.html = txt;
-        fo._preparePanel();
-      }
-    );
-    return false;
-  }
-
-  if(typeof Xinha.Dialog == 'undefined')
-  {
-    Xinha._loadback
-      (_editor_url + 'modules/Dialogs/inline-dialog.js', function() { fo._preparePanel(); } );
-      return false;
-  }
-
-  if(typeof Xinha.PanelDialog == 'undefined')
-  {
-    Xinha._loadback
-      (_editor_url + 'modules/Dialogs/panel-dialog.js', function() { fo._preparePanel(); } );
-      return false;
-  }
-
-
-
-  this.panel = new Xinha.PanelDialog(this.editor,'bottom',this.html,'FormOperations');
-  this.panel.hide();
-  this.ready = true;
-};
-
-FormOperations.prototype.onUpdateToolbar = function()
-{
-  if(!this.ready) return true;
-  var activeElement = this.editor._activeElement(this.editor._getSelection());
-  if(activeElement != null)
-  {
-    if(activeElement == this.activeElement) return true;
-
-    var tag = activeElement.tagName.toLowerCase();
-    
-    this.hideAll();
-    if(tag === 'form')
-    {
-      if(this.editor.config.FormOperations.allow_edit_form)
-      {
-        this.showForm(activeElement);
-      }
-      else
-      {
-        this.panel.hide();
-        this.activeElement = null;
-        this.panel.hide();
-        return true;
-      }
-    }
-    else
-    {
-
-      if(this.editor.config.FormOperations.allow_edit_form && typeof activeElement.form != 'undefined' && activeElement.form)
-      {
-        this.showForm(activeElement.form);
-      }
-
-      switch(tag)
-      {
-        case 'form':
-        {
-          this.showForm(activeElement);
-        }
-        break;
-
-        case 'input':
-        {
-          switch(activeElement.getAttribute('type').toLowerCase())
-          {
-            case 'text'    :
-            case 'password':
-            case 'hidden'  :
-            {
-              this.showText(activeElement);
-            }
-            break;
-
-            case 'radio'   :
-            case 'checkbox':
-            {
-              this.showCbRd(activeElement);
-            }
-            break;
-
-            case 'submit'  :
-            case 'reset'   :
-            case 'button'  :
-            {
-              this.showButton(activeElement);
-            }
-            break;
-          }
-        }
-        break;
-
-        case 'textarea':
-        {
-          this.showTextarea(activeElement);
-        }
-        break;
-
-        case 'select':
-        {
-          this.showSelect(activeElement);
-        }
-        break;
-
-        default:
-        {
-          this.activeElement = null;
-          this.panel.hide();
-          return true;
-        }
-      }
-    }
-    
-    this.panel.show();
-    
-    //this.editor.scrollToElement(activeElement);
-    this.activeElement = activeElement;
-    return true;
-  }
-  else
-  {
-    this.activeElement = null;
-    this.panel.hide();
-    return true;
-  }
-};
-
-
-FormOperations.prototype.hideAll = function()
-{
-  this.panel.getElementById('fs_form').style.display = 'none';
-  this.panel.getElementById('fs_text').style.display = 'none';
-  this.panel.getElementById('fs_textarea').style.display = 'none';
-  this.panel.getElementById('fs_select').style.display = 'none';
-  this.panel.getElementById('fs_cbrd').style.display = 'none';
-  this.panel.getElementById('fs_button').style.display = 'none';
-};
-
-FormOperations.prototype.showForm = function(form)
-{
-  this.panel.getElementById('fs_form').style.display = '';
-  var vals =
-  {
-    'action' : form.action,
-    'method' : form.method.toUpperCase()
-  }
-  this.panel.setValues(vals);
-  var f = form;
-  this.panel.getElementById('action').onkeyup = function () { f.action = this.value; };
-  this.panel.getElementById('method').onchange   = function () { f.method = this.options[this.selectedIndex].value; };
-};
-
-FormOperations.prototype.showText = function (input)
-{
-  this.panel.getElementById('fs_text').style.display = '';
-
-  var vals =
-  {
-    'text_name'  : this.deformatName(input, input.name),
-    'text_value' : input.value,
-    'text_type'  : input.type.toLowerCase(),
-    'text_width' : input.style.width ? parseFloat(input.style.width.replace(/[^0-9.]/, '')) : '',
-    'text_width_units': input.style.width ? input.style.width.replace(/[0-9.]/, '').toLowerCase() : 'ex',
-    'text_maxlength'  : input.maxlength   ? input.maxlength : ''
-  }
-  this.panel.setValues(vals);
-
-  var i = input;
-  var fo = this;
-
-  this.panel.getElementById('text_name').onkeyup   = function () { i.name = fo.formatName(i, this.value); }
-  this.panel.getElementById('text_value').onkeyup  = function () { i.value = this.value; }
-  this.panel.getElementById('text_type').onchange   = function ()
-    {
-      if(!Xinha.is_ie)
-      {
-        i.type = this.options[this.selectedIndex].value;
-      }
-      else
-      {
-        // IE does not permit modifications of the type of a form field once it is set
-        // We therefor have to destroy and recreate it.  I swear, if I ever
-        // meet any of the Internet Explorer development team I'm gonna
-        // kick them in the nuts!
-        var tmpContainer = fo.editor._doc.createElement('div');
-        if(!/type=/.test(i.outerHTML))
-        {
-          tmpContainer.innerHTML = i.outerHTML.replace(/<INPUT/i, '<input type="'+ this.options[this.selectedIndex].value + '"');
-        }
-        else
-        {
-          tmpContainer.innerHTML = i.outerHTML.replace(/type="?[a-z]+"?/i, 'type="' + this.options[this.selectedIndex].value + '"');
-        }
-        var newElement = Xinha.removeFromParent(tmpContainer.childNodes[0]);
-        i.parentNode.insertBefore(newElement, i);
-        Xinha.removeFromParent(i);
-        input = i = newElement;
-      }
-    }
-
-  var w  = this.panel.getElementById('text_width');
-  var wu = this.panel.getElementById('text_width_units');
-
-  this.panel.getElementById('text_width').onkeyup     =
-  this.panel.getElementById('text_width_units').onchange =
-    function ()
-    {
-      if(!w.value || isNaN(parseFloat(w.value)))
-      {
-        i.style.width = '';
-      }
-      i.style.width = parseFloat(w.value) + wu.options[wu.selectedIndex].value;
-    }
-
-  this.panel.getElementById('text_maxlength').onkeyup = function () { i.maxlength = this.value; }
-};
-
-FormOperations.prototype.showCbRd = function (input)
-{
-  this.panel.getElementById('fs_cbrd').style.display = '';
-  var vals =
-  {
-    'cbrd_name'    : this.deformatName(input, input.name),
-    'cbrd_value'   : input.value,
-    'cbrd_checked' : input.checked ? 1 : 0,
-    'cbrd_type'    : input.type.toLowerCase()
-  };
-  this.panel.setValues(vals);
-
-  var i = input;
-  var fo = this;
-  this.panel.getElementById('cbrd_name').onkeyup   = function () { i.name = fo.formatName(i, this.value); }
-  this.panel.getElementById('cbrd_value').onkeyup  = function () { i.value = this.value; }
-  this.panel.getElementById('cbrd_type').onchange   = function ()
-    {
-      if(!Xinha.is_ie)
-      {
-        i.type = this.options[this.selectedIndex].value;
-      }
-      else
-      {
-        // IE does not permit modifications of the type of a form field once it is set
-        // We therefor have to destroy and recreate it.  I swear, if I ever
-        // meet any of the Internet Explorer development team I'm gonna
-        // kick them in the nuts!
-        var tmpContainer = fo.editor._doc.createElement('div');
-        if(!/type=/.test(i.outerHTML))
-        {
-          tmpContainer.innerHTML = i.outerHTML.replace(/<INPUT/i, '<input type="'+ this.options[this.selectedIndex].value + '"');
-        }
-        else
-        {
-          tmpContainer.innerHTML = i.outerHTML.replace(/type="?[a-z]+"?/i, 'type="' + this.options[this.selectedIndex].value + '"');
-        }
-        var newElement = Xinha.removeFromParent(tmpContainer.childNodes[0]);
-        i.parentNode.insertBefore(newElement, i);
-        Xinha.removeFromParent(i);
-        input = i = newElement;
-      }
-    }
-  this.panel.getElementById('cbrd_checked').onclick   = function () { i.checked = this.checked; }
-};
-
-FormOperations.prototype.showButton = function (input)
-{
-  this.panel.getElementById('fs_button').style.display = '';
-  var vals =
-  {
-    'button_name'    : this.deformatName(input, input.name),
-    'button_value'   : input.value,
-    'button_type'    : input.type.toLowerCase()
-  };
-  this.panel.setValues(vals);
-
-  var i = input;
-  var fo = this;
-  this.panel.getElementById('button_name').onkeyup   = function () { i.name = fo.formatName(i, this.value); };
-  this.panel.getElementById('button_value').onkeyup  = function () { i.value = this.value; };
-  this.panel.getElementById('button_type').onchange   = function ()
-    {
-      if(!Xinha.is_ie)
-      {
-        i.type = this.options[this.selectedIndex].value;
-      }
-      else
-      {
-        // IE does not permit modifications of the type of a form field once it is set
-        // We therefor have to destroy and recreate it.  I swear, if I ever
-        // meet any of the Internet Explorer development team I'm gonna
-        // kick them in the nuts!
-        var tmpContainer = fo.editor._doc.createElement('div');
-        if(!/type=/.test(i.outerHTML))
-        {
-          tmpContainer.innerHTML = i.outerHTML.replace(/<INPUT/i, '<input type="'+ this.options[this.selectedIndex].value + '"');
-        }
-        else
-        {
-          tmpContainer.innerHTML = i.outerHTML.replace(/type="?[a-z]+"?/i, 'type="' + this.options[this.selectedIndex].value + '"');
-        }
-        var newElement = Xinha.removeFromParent(tmpContainer.childNodes[0]);
-        i.parentNode.insertBefore(newElement, i);
-        Xinha.removeFromParent(i);
-        input = i = newElement;
-      }
-    };
-};
-
-FormOperations.prototype.showTextarea = function (input)
-{
-  this.panel.getElementById('fs_textarea').style.display = '';
-  var vals =
-  {
-    'textarea_name'  : this.deformatName(input, input.name),
-    'textarea_value' : input.value,
-    'textarea_width' : input.style.width ? parseFloat(input.style.width.replace(/[^0-9.]/, '')) : '',
-    'textarea_width_units' : input.style.width ? input.style.width.replace(/[0-9.]/, '').toLowerCase() : 'ex',
-    'textarea_height'      : input.style.height ? parseFloat(input.style.height.replace(/[^0-9.]/, '')) : '',
-    'textarea_height_units': input.style.height ? input.style.height.replace(/[0-9.]/, '').toLowerCase() : 'ex'
-  };
-
-  this.panel.setValues(vals);
-
-  var i = input;
-  var fo = this;
-  this.panel.getElementById('textarea_name').onkeyup   = function () { i.name = fo.formatName(i, this.value); };
-  this.panel.getElementById('textarea_value').onkeyup  = function () { i.value = i.innerHTML = this.value; };
-
-  var w  = this.panel.getElementById('textarea_width');
-  var wu = this.panel.getElementById('textarea_width_units');
-
-  this.panel.getElementById('textarea_width').onkeyup     =
-  this.panel.getElementById('textarea_width_units').onchange =
-    function ()
-    {
-      if(!w.value || isNaN(parseFloat(w.value)))
-      {
-        i.style.width = '';
-      }
-      i.style.width = parseFloat(w.value) + wu.options[wu.selectedIndex].value;
-    };
-
-  var h  = this.panel.getElementById('textarea_height');
-  var hu = this.panel.getElementById('textarea_height_units');
-
-  this.panel.getElementById('textarea_height').onkeyup     =
-  this.panel.getElementById('textarea_height_units').onchange =
-    function ()
-    {
-      if(!h.value || isNaN(parseFloat(h.value)))
-      {
-        i.style.height = '';
-      }
-      i.style.height = parseFloat(h.value) + hu.options[hu.selectedIndex].value;
-    };
-
-};
-
-FormOperations.prototype.showSelect = function (input)
-{
-  this.panel.getElementById('fs_select').style.display = '';
-  var vals =
-  {
-    'select_name'  : this.deformatName(input, input.name),
-    'select_multiple' : input.multiple ? 1 : 0,
-    'select_width' : input.style.width ? parseFloat(input.style.width.replace(/[^0-9.]/, '')) : '',
-    'select_width_units' : input.style.width ? input.style.width.replace(/[0-9.]/, '').toLowerCase() : 'ex',
-      'select_height'      : input.style.height ? parseFloat(input.style.height.replace(/[^0-9.]/, '')) : (input.size && input.size > 0 ? input.size : 1),
-    'select_height_units': input.style.height ? input.style.height.replace(/[0-9.]/, '').toLowerCase() : 'items'
-  };
-
-  this.panel.setValues(vals);
-
-  var i = input;
-  var fo = this;
-  this.panel.getElementById('select_name').onkeyup   = function () { i.name = fo.formatName(i, this.value); };
-  this.panel.getElementById('select_multiple').onclick   = function () { i.multiple = this.checked; };
-
-  var w  = this.panel.getElementById('select_width');
-  var wu = this.panel.getElementById('select_width_units');
-
-  this.panel.getElementById('select_width').onkeyup     =
-  this.panel.getElementById('select_width_units').onchange =
-    function ()
-    {
-      if(!w.value || isNaN(parseFloat(w.value)))
-      {
-        i.style.width = '';
-      }
-      i.style.width = parseFloat(w.value) + wu.options[wu.selectedIndex].value;
-    };
-
-  var h  = this.panel.getElementById('select_height');
-  var hu = this.panel.getElementById('select_height_units');
-
-  this.panel.getElementById('select_height').onkeyup     =
-  this.panel.getElementById('select_height_units').onchange =
-    function ()
-    {
-      if(!h.value || isNaN(parseFloat(h.value)))
-      {
-        i.style.height = '';
-        return;
-      }
-
-      if(hu.selectedIndex == 0)
-      {
-        i.style.height = '';
-        i.size = parseInt(h.value);
-      }
-      else
-      {
-        i.style.height = parseFloat(h.value) + hu.options[hu.selectedIndex].value;
-      }
-    };
-
-
-  var fo_sel = this.panel.getElementById('select_options');
-  this.arrayToOpts(this.optsToArray(input.options), fo_sel.options);
-
-  this.panel.getElementById('add_option').onclick =
-    function()
-    {
-      var txt = prompt(Xinha._lc("Enter the name for new option.", 'FormOperations'));
-      if(txt == null) return;
-      var newOpt = new Option(txt);
-      var opts   = fo.optsToArray(fo_sel.options);
-      if(fo_sel.selectedIndex >= 0)
-      {
-        opts.splice(fo_sel.selectedIndex, 0, newOpt);
-      }
-      else
-      {
-        opts.push(newOpt);
-      }
-      fo.arrayToOpts(opts, input.options);
-      fo.arrayToOpts(opts, fo_sel.options);
-    };
-
-  this.panel.getElementById('del_option').onclick =
-    function()
-    {
-      var opts    = fo.optsToArray(fo_sel.options);
-      var newOpts = [ ];
-      for(var i = 0; i < opts.length; i++)
-      {
-        if(opts[i].selected) continue;
-        newOpts.push(opts[i]);
-      }
-      fo.arrayToOpts(newOpts, input.options);
-      fo.arrayToOpts(newOpts, fo_sel.options);
-    };
-
-  this.panel.getElementById('up_option').onclick =
-    function()
-    {
-      if(!(fo_sel.selectedIndex > 0)) return;
-      var opts    = fo.optsToArray(fo_sel.options);
-      var move    = opts.splice(fo_sel.selectedIndex, 1).pop();
-      opts.splice(fo_sel.selectedIndex - 1, 0, move);
-      fo.arrayToOpts(opts, input.options);
-      fo.arrayToOpts(opts, fo_sel.options);
-    };
-
-  this.panel.getElementById('down_option').onclick =
-    function()
-    {
-      if(fo_sel.selectedIndex == fo_sel.options.length - 1) return;
-      var opts    = fo.optsToArray(fo_sel.options);
-      var move    = opts.splice(fo_sel.selectedIndex, 1).pop();
-      opts.splice(fo_sel.selectedIndex+1, 0, move);
-      fo.arrayToOpts(opts, input.options);
-      fo.arrayToOpts(opts, fo_sel.options);
-    };
-
-  this.panel.getElementById('select_options').onchange =
-    function()
-    {
-      fo.arrayToOpts(fo.optsToArray(fo_sel.options), input.options);
-    };
-};
-
-FormOperations.prototype.optsToArray = function(o)
-{
-  var a = [ ];
-  for(var i = 0; i < o.length; i++)
-  {
-    a.push(
-      {
-        'text'            : o[i].text,
-        'value'           : o[i].value,
-        'defaultSelected' : o[i].defaultSelected,
-        'selected'        : o[i].selected
-      }
-    );
-  }
-  return a;
-};
-
-FormOperations.prototype.arrayToOpts = function(a, o)
-{
-  for(var i = o.length -1; i >= 0; i--)
-  {
-    o[i] = null;
-  }
-
-  for(var i = 0; i < a.length; i++)
-  {
-    o[i] = new Option(a[i].text, a[i].value, a[i].defaultSelected, a[i].selected);
-  }
-};
-
-FormOperations.prototype.formatName = function(input, name)
-{
-
-  // Multiple name
-  var mname = name;
-  switch(this.editor.config.FormOperations.multiple_field_format)
-  {
-    case 'php':
-    {
-      mname += '[]';
-    }
-    break;
-
-    case 'unmodified':
-    {
-      // Leave as is.
-    }
-    break;
-
-    default:
-    {
-      throw("Unknown multiple field format " + this.editor.config.FormOperations.multiple_field_format);
-    }
-  }
-
-  if
-  (
-       (input.tagName.toLowerCase() == 'select' && input.multiple)
-    || (input.tagName.toLowerCase() == 'input'  && input.type.toLowerCase() == 'checkbox')
-  )
-  {
-    name = mname;
-  }
-
-  return name;
-};
-
-FormOperations.prototype.deformatName = function(input, name)
-{
-  if(this.editor.config.FormOperations.multiple_field_format == 'php')
-  {
-    name = name.replace(/\[\]$/, '');
-  }
-
-  return name;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/formmail.php b/web/imcms/xinha/plugins/FormOperations/formmail.php
deleted file mode 100644
index 5d8b328327..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/formmail.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-  $send_to      = 'Website Enquiries <enquiries@' . preg_replace('/^www./', '', $_SERVER['HTTP_HOST']) . '>';
-
-  $emailfield   = NULL;
-  $subjectfield = NULL;
-  $namefield    = NULL;
-
-  $when_done_goto    = isset($_REQUEST['when_done_goto']) ? $_REQUEST['when_done_goto'] : NULL;
-
-  if($_POST)
-  {
-    unset($_POST['when_done_goto']);
-    $message    = '';
-    $longestKey = 0;
-    foreach(array_keys($_POST) as $key)
-    {
-      $longestKey = max(strlen($key), $longestKey);
-    }
-    $longestKey = max($longestKey, 15);
-
-    foreach($_POST as $Var => $Val)
-    {
-      if(!$emailfield)
-      {
-        if(preg_match('/(^|\s)e-?mail(\s|$)/i', $Var))
-        {
-          $emailfield = $Var;
-        }
-      }
-
-      if(!$subjectfield)
-      {
-        if(preg_match('/(^|\s)subject(\s|$)/i', $Var))
-        {
-          $subjectfield = $Var;
-        }
-      }
-
-      if(!$namefield)
-      {
-        if(preg_match('/(^|\s)from(\s|$)/i', $Var) || preg_match('/(^|\s)name(\s|$)/i', $Var))
-        {
-          $namefield = $Var;
-        }
-      }
-
-      if(is_array($Val))
-      {
-        $Val = implode(', ', $Val);
-      }
-
-      $message .= $Var;
-      if(strlen($Var) < $longestKey)
-      {
-        $message .= str_repeat('.', $longestKey - strlen($Var));
-      }
-      $message .= ':';
-      if((64 - max(strlen($Var), $longestKey) < strlen($Val)) || preg_match('/\r?\n/', $Val))
-      {
-        $message .= "\r\n  ";
-        $message .= preg_replace('/\r?\n/', "\r\n  ", wordwrap($Val, 62));
-      }
-      else
-      {
-        $message .= ' ' . $Val . "\r\n";
-      }
-    }
-
-    $subject = $subjectfield ? $_POST[$subjectfield] : 'Enquiry';
-    $email   = $emailfield   ? $_POST[$emailfield]   :  $send_to;
-    if($namefield)
-    {
-      $from = $_POST[$namefield] . ' <' . $email . '>';
-    }
-    else
-    {
-      $from = 'Website Visitor' . ' <' . $email . '>';
-    }
-
-    mail($send_to, $subject, $message, "From: $from");
-
-    if(!$when_done_goto)
-    {
-      ?>
-      <html><head><title>Message Sent</title></head><body><h1>Message Sent</h1></body></html>
-      <?php
-    }
-    else
-    {
-      header("location: $when_done_goto");
-      exit;
-    }
-  }
-?>
diff --git a/web/imcms/xinha/plugins/FormOperations/iframe.css b/web/imcms/xinha/plugins/FormOperations/iframe.css
deleted file mode 100644
index 2ee1dceffb..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/iframe.css
+++ /dev/null
@@ -1 +0,0 @@
-form { border: 1px red dotted; }
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/img/buttons.gif b/web/imcms/xinha/plugins/FormOperations/img/buttons.gif
deleted file mode 100644
index f414171a33..0000000000
Binary files a/web/imcms/xinha/plugins/FormOperations/img/buttons.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/FormOperations/lang/de.js b/web/imcms/xinha/plugins/FormOperations/lang/de.js
deleted file mode 100644
index 1ae24c45c1..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/lang/de.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Insert a Form.": "Email Form einfügen.",
-  "Insert a text, password or hidden field.": "Passwort oder unsichtbares Feld einfügen.",
-  "Insert a multi-line text field.": "Mehrzeiliges Textfeld einfügen.",
-  "Insert a select field.": "Auswahlfeld einfügen.",
-  "Insert a check box.": "Häkchenfeld einfügen",
-  "Insert a radio button.": "Optionsfeld einfügen",
-  "Insert a submit/reset button.": "Senden/zurücksetzen Schaltfläche"
-};
diff --git a/web/imcms/xinha/plugins/FormOperations/lang/fr.js b/web/imcms/xinha/plugins/FormOperations/lang/fr.js
deleted file mode 100644
index a02208e924..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/lang/fr.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Insert a Form.": "Insérer un formulaire",
-  "Insert a text, password or hidden field.": "Insérer un texte, un mot de passe ou un champ invisible",
-  "Insert a multi-line text field.": "Insérer un champ texte à lignes multiples",
-  "Insert a select field.": "Insérer une boite de sélection",
-  "Insert a check box.": "Insérer une case à cocher",
-  "Insert a radio button.": "Insérer un bouton radio",
-  "Insert a submit/reset button.": "Insérer un bouton de soumission/annulation"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/lang/ja.js b/web/imcms/xinha/plugins/FormOperations/lang/ja.js
deleted file mode 100644
index d716a4a51b..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/lang/ja.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Insert a Form.": "フォームを挿入",
-  "Insert a text, password or hidden field.": "テキスト/パスワード/�表示フィールドを挿入",
-  "Insert a multi-line text field.": "複数行テキストフィールドを挿入",
-  "Insert a select field.": "�択リストを挿入",
-  "Insert a check box.": "�ェックボックスを挿入",
-  "Insert a radio button.": "ラジオボタンを挿入",
-  "Insert a submit/reset button.": "�信/リセットボタンを挿入",
-  "Form Editor": "フォームエディタ",
-  "Form": "フォーム",
-  "Text Field": "テキストフィールド",
-  "Check Box/Radio Button": "�ェックボックス/ラジオボタン",
-  "Button": "ボタン",
-  "Multi-line Field": "複数行フィールド",
-  "Drop-Down/List Field": "ドロップダウン/リスト",
-  "Action:": "アクション:",
-  "Method:": "メソッド:",
-  "Name:": "��:",
-  "Type:": "タイプ:",
-  "Label:": "ラベル:",
-  "Value:": "値:",
-  "Width:": "å¹…:",
-  "Height:": "高�:",
-  "Initial Value:": "�期値:",
-  "Initial Value": "�期値",
-  "Max Length:": "最大長:",
-  "Selected by default:": "デフォルト�択:",
-  "May Choose Multiple:": "複数�択�能:",
-  "Options": "�択肢",
-  "POST": "POST",
-  "GET": "GET",
-  'Check Box ("Select Many")': "�ェックボックス(複数�択)",
-  'Radio Button ("Select One")': "ラジオボタン(�一�択)",
-  "normal text field": "標準テキストフィールド",
-  "password": "パスワード",
-  "hidden field": "�表示フィールド",
-  "Submit": "�信",
-  "Reset": "リセット",
-  "chars": "文字",
-  "px": "ピクセル",
-  "%": "%",
-  "items": "é …ç›®",
-  "Add": "追加",
-  "Delete": "削除",
-  "Move Up": "上�",
-  "Move Down": "下�",
-  "Tip: Check boxes (select many) and radio buttons (select one only) that are choices for a single question should have the same Name to work correctly.": "ヒント:����質������複数��ェックボックス(複数�択)����複数�ラジオボタン(�一�択)��る場����������を付���れ�正��機能���ん。",
-  "Enter the name for new option.": "新���択肢���を�������。"
-};
diff --git a/web/imcms/xinha/plugins/FormOperations/lang/nb.js b/web/imcms/xinha/plugins/FormOperations/lang/nb.js
deleted file mode 100644
index 9a47a66c76..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/lang/nb.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert a Form.": "Sett inn skjema",
-  "Insert a text, password or hidden field.": "Sett inn formfelt",
-  "Insert a multi-line text field.": "Sett inn tekstfelt med flere linjer",
-  "Insert a select field.": "Sett inn valgboks/ netrekksboks",
-  "Insert a check box.": "Hakeboks",
-  "Insert a radio button.": "Sett inn en radioknapp",
-  "Insert a submit/reset button.": "Sett inn send-/nullstill knapp for skjemaet"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/lang/nl.js b/web/imcms/xinha/plugins/FormOperations/lang/nl.js
deleted file mode 100644
index 375afe423d..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/lang/nl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Insert a Form.": "Formulier invoegen",
-  "Insert a text, password or hidden field.": "Tekst, wachtwoord of verborgen veld invoegen",
-  "Insert a multi-line text field.": "Een tekstveld met meerdere lijnen invoegen",
-  "Insert a select field.": "Een selectielijst invoegen",
-  "Insert a check box.": "Een checkbox invoegen",
-  "Insert a radio button.": "Een radio knop invoegen",
-  "Insert a submit/reset button.": "Een verzend/wis knop invoegen"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/lang/no.js b/web/imcms/xinha/plugins/FormOperations/lang/no.js
deleted file mode 100644
index 26032e0d50..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/lang/no.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert a Form.": "Sett inn skjema",
-  "Insert a text, password or hidden field.": "Sett inn formfelt",
-  "Insert a multi-line text field.": "Sett inn tekstfelt med flere linjer",
-  "Insert a select field.": "Sett inn valgboks/ netrekksboks",
-  "Insert a check box.": "Hakeboks",
-  "Insert a radio button.": "Sett inn en radioknapp",
-  "Insert a submit/reset button.": "Sett inn send-/nullstill knapp for skjemaet"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FormOperations/lang/pt_br.js b/web/imcms/xinha/plugins/FormOperations/lang/pt_br.js
deleted file mode 100644
index bc3ac5ab90..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/lang/pt_br.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Enter the name for new option.": "Entre com o nome para nova opção",
-  "Form Editor": "Editor de Formulários",
-  "Insert a Form.": "Inserir um Formulário.",
-  "Insert a check box.": "Inserir uma caixa de opção",
-  "Insert a multi-line text field.": "Inserir um texto multi-linha.",
-  "Insert a radio button.": "Inserir um campo de escolha",
-  "Insert a select field.": "Inserir seleção.",
-  "Insert a submit/reset button.": "Inserir um botão de envio/reset",
-  "Insert a text, password or hidden field.": "Inserir um texto, senha ou campo escondido."
-}
diff --git a/web/imcms/xinha/plugins/FormOperations/panel.html b/web/imcms/xinha/plugins/FormOperations/panel.html
deleted file mode 100644
index 661b775475..0000000000
--- a/web/imcms/xinha/plugins/FormOperations/panel.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<div>
-<h1 id="[h1]"><l10n>Form Editor</l10n></h1>
-  <fieldset id="[fs_form]">
-    <legend>Form</legend>
-    <table>
-      <tr>
-        <th><label>Action:</label></th>
-        <td><input type="text" size="25" name="[action]" id="[action]" /></td>
-
-        <th><label>Method:</label></th>
-        <td><select name="[method]" id="[method]"><option value="POST">POST</option><option value="GET">GET</option></select></td>
-      </tr>
-    </table>
-  </fieldset>
-
-  <fieldset id="[fs_text]">
-    <legend>Text Field</legend>
-
-    <table>
-      <tr>
-        <th>Name:</th>
-        <td>
-          <input type="text" name="[text_name]" id="[text_name]" size="25" />
-        </td>
-        <th>&nbsp;</th>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <th>Type:</th>
-        <td>
-          <select name="[text_type]" id="[text_type]">
-            <option value="text">normal text field</option>
-            <option value="password">password</option>
-            <option value="hidden">hidden field</option>
-          </select>
-        </td>
-        <th>Initial Value:</th>
-        <td>
-          <input type="text" name="[text_value]" id="[text_value]" size="25" />
-        </td>
-      </tr>
-      <tr>
-        <th>Width:</th>
-        <td>
-          <input type="text" name="[text_width]" id="[text_width]" size="5" />
-          <select name="[text_width_units]" id="[text_width_units]">
-            <option value="em">chars</option>
-            <option value="px">px</option
-                >
-            <option value="%">%</option>
-          </select>
-        </td>
-        <th>Max Length:</th>
-        <td>
-          <input type="text" name="[text_maxlength]" id="[text_maxlength]"   size="5" />
-        </td>
-      </tr>
-    </table>
-  </fieldset>
-
-  <fieldset  id="[fs_cbrd]">
-    <legend>Check Box/Radio Button</legend>
-    <table>
-      <tr>
-        <th>Name:</th>
-        <td>
-          <input type="text" name="[cbrd_name]" id="[cbrd_name]" size="25" />
-        </td>
-        <th>Value:</th>
-        <td>
-          <input type="text" name="[cbrd_value]" id="[cbrd_value]" size="25" />
-        </td>
-      </tr>
-      <tr>
-        <th>Type:</th>
-        <td>
-          <select name="[cbrd_type]" id="[cbrd_type]">
-            <option value="checkbox">Check Box ("Select Many")</option>
-            <option value="radio">Radio Button ("Select One")</option>
-          </select>
-        </td>
-        <th>Selected by default:</th>
-        <td><input type="checkbox" name="[cbrd_checked]" id="[cbrd_checked]" value="1" /></td>
-      </tr>
-      <tr>
-        <td colspan="4">
-          <p class="help">
-            Tip: Check boxes (select many) and radio buttons (select one only) that are choices for a single question should have the same Name to work correctly.
-          </p>
-        </td>
-      </tr>
-    </table>
-  </fieldset>
-
-  <fieldset  id="[fs_button]">
-    <legend>Button</legend>
-    <table>
-      <tr>
-        <th>Name:</th>
-        <td>
-          <input type="text" name="[button_name]" id="[button_name]" size="25" />
-        </td>
-        <th>Label:</th>
-        <td>
-          <input type="text" name="[button_value]" id="[button_value]" size="25" />
-        </td>
-      </tr>
-      <tr>
-        <th>Type:</th>
-        <td>
-          <select name="[button_type]" id="[button_type]">
-            <option value="submit">Submit</option>
-            <option value="reset">Reset</option>
-          </select>
-        </td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-    </table>
-  </fieldset>
-
-
-  <fieldset  id="[fs_textarea]">
-    <legend>Multi-line Field</legend>
-    <table>
-      <tr>
-        <th>Name:</th>
-        <td><input type="text" name="[textarea_name]" id="[textarea_name]" size="25" /></td>
-
-    <th>Initial Value</th>
-      </tr>
-
-      <tr>
-        <th>Width:</th>
-        <td>
-          <input type="text" name="[textarea_width]" id="[textarea_width]" size="5" />
-          <select name="[textarea_width_units]" id="[textarea_width_units]">
-            <option value="em">chars</option>
-            <option value="px">px</option>
-            <option value="%">%</option>
-          </select>
-        </td>
-        <td rowspan="2"><textarea name="[textarea_value]" cols="40" rows="4" id="[textarea_value]"></textarea></td>
-      </tr>
-
-      <tr>
-        <th>Height:</th>
-        <td>
-          <input type="text" name="[textarea_height]" id="[textarea_height]" size="5" />
-          <select name="[textarea_height_units]" id="[textarea_height_units]">
-            <option value="em">chars</option>
-            <option value="px">px</option>
-          </select>
-        </td>
-      </tr>
-
-    </table>
-  </fieldset>
-
-  <fieldset  id="[fs_select]">
-    <legend>Drop-Down/List Field</legend>
-
-<table>
-  <tr>
-    <th>Name:</th>
-    <td>
-      <input type="text" name="[select_name]" id="[select_name]" size="25" />
-    </td>
-    <th colspan="2">Options</th>
-  </tr>
-  <tr>
-    <th>May Choose Multiple:</th>
-    <td>
-      <input type="checkbox" name="[select_multiple]" id="[select_multiple]" size="25" value="1" />
-    </td>
-    <td rowspan="3">
-      <select name="[select_options]" size="5" id="[select_options]" >
-      </select>
-    </td>
-    <td rowspan="3">
-      <input name="button" type="button" id="[add_option]" value="Add"       />
-      <br>
-      <input name="button2" type="button" id="[del_option]" value="Delete"    />
-      <br>
-      <input name="button2"  type="button" id="[up_option]" value="Move Up"   />
-      <br>
-      <input name="button2"  type="button" id="[down_option]" value="Move Down" />
-    </td>
-  </tr>
-  <tr>
-    <th>Width:</th>
-    <td>
-      <input type="text" name="[select_width]" id="[select_width]" size="5" />
-      <select name="[select_width_units]" id="[select_width_units]">
-        <option value="em">chars</option>
-        <option value="px">px</option>
-        <option value="%">%</option>
-      </select>
-    </td>
-  </tr>
-  <tr>
-    <th>Height:</th>
-    <td>
-      <input type="text" name="[select_height]" id="[select_height]" size="5" />
-      <select name="[select_height_units]" id="[select_height_units]">
-        <option value="items">items</option>
-        <option value="px">px</option>
-      </select>
-    </td>
-  </tr>
-</table>
-  </fieldset>
-</div>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Forms/forms.css b/web/imcms/xinha/plugins/Forms/forms.css
deleted file mode 100644
index ba0fca64d8..0000000000
--- a/web/imcms/xinha/plugins/Forms/forms.css
+++ /dev/null
@@ -1,3 +0,0 @@
-form {
-  border: 1px dotted red;
-}
diff --git a/web/imcms/xinha/plugins/Forms/forms.js b/web/imcms/xinha/plugins/Forms/forms.js
deleted file mode 100644
index 1aa3878deb..0000000000
--- a/web/imcms/xinha/plugins/Forms/forms.js
+++ /dev/null
@@ -1,353 +0,0 @@
-// Form plugin for Xinha
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-
-function Forms(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var bl = Forms.btnList;
-  var self = this;
-  // register the toolbar buttons provided by this plugin
-  var toolbar = ["linebreak"];
-  for (var i = 0; i < bl.length; ++i) {
-    var btn = bl[i];
-    if (!btn) {
-      toolbar.push("separator");
-    } else {
-      var id = btn[0];
-      if (i<3)
-        cfg.registerButton(id, this._lc(btn[1]), editor.imgURL("ed_" + btn[0] + ".gif", "Forms"), false,
-             function(editor, id) {
-               // dispatch button press event
-               self.buttonPress(editor, id);
-             });
-      else
-        cfg.registerButton(id, this._lc(btn[1]), editor.imgURL("ed_" + btn[0] + ".gif", "Forms"), false,
-             function(editor, id) {
-               // dispatch button press event
-               self.buttonPress(editor, id);
-             },"form");
-      toolbar.push(id);
-    }
-  }
-  // add a new line in the toolbar
-  cfg.toolbar.push(toolbar);
-}
-
-Forms._pluginInfo = {
-  name          : "Forms",
-  origin        : "version: 1.0, by Nelson Bright, BrightWork, Inc., http://www.brightworkweb.com",
-  version       : "2.0",
-  developer     : "Udo Schmal",
-  developer_url : "",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de/",
-  c_owner       : "Udo Schmal & Schaffrath-NeueMedien",
-  license       : "htmlArea"
-};
-
-// the list of buttons added by this plugin
-Forms.btnList = [
-  // form properties button
-  null, // separator
-  ["form",        "Form"],
-  null, // separator
-  // form elements
-  ["textarea",    "Textarea"],
-  ["select",      "Selection Field"],
-  ["checkbox",    "Checkbox"],
-  ["radio",       "Radio Button"],
-  ["text",        "Text Field"],
-  ["password",    "Password Field"],
-  ["file",        "File Field"],
-  ["button",      "Button"],
-  ["submit",      "Submit Button"],
-  ["reset",       "Reset Button"],
-  ["image",       "Image Button"],
-  ["hidden",      "Hidden Field"],
-  ["label",       "Label"],
-  ["fieldset",    "Field Set"]
-  ];
-
-Forms.prototype._lc = function(string) {
-    return Xinha._lc(string, 'Forms');
-};
-
-Forms.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(_editor_url + 'plugins/Forms/forms.css');
-};
-
-Forms.prototype.buttonPress = function(editor,button_id, node) {
-  function optionValues(text,value) {
-    this.text = text;
-    this.value = value;
-  }
-  var outparam = new Object();
-  var type = button_id;
-  var sel = editor._getSelection();
-  var range = editor._createRange(sel);
-  if (button_id=="form") { //Form
-    // see if selection is inside an existing 'form' tag
-    var pe = editor.getParentElement();
-    var frm = null;
-    while (pe && (pe.nodeType == 1) && (pe.tagName.toLowerCase() != 'body')) {
-      if(pe.tagName.toLowerCase() == "form") {
-        frm = pe;
-        break;
-      } else
-        pe = pe.parentNode;
-    }
-    if (frm) {
-      outparam.f_name = frm.name;
-      outparam.f_action = frm.action;
-      outparam.f_method = frm.method;
-      outparam.f_enctype = frm.enctype;
-      outparam.f_target = frm.target;
-    } else {;
-      outparam.f_name = "";
-      outparam.f_action = "";
-      outparam.f_method = "";
-      outparam.f_enctype = "";
-      outparam.f_target = "";
-    }
-    editor._popupDialog("plugin://Forms/form", function(param) {
-      if (param) {
-        if(frm) {
-          frm.name = param["f_name"];
-          frm.setAttribute("action", param["f_action"]);
-          frm.setAttribute("method", param["f_method"]);
-          frm.setAttribute("enctype",param["f_enctype"]);
-          frm.setAttribute("target", param["f_target"]);
-        } else {
-          frm = '<form name="' + param["f_name"] + '"';
-          if (param["f_action"] != "") frm += ' action="' + param["f_action"] + '"';
-          if (param["f_method"] != "") frm += ' method="' + param["f_method"] + '"';
-          if (param["f_enctype"] != "") frm += ' enctype="' + param["f_enctype"] + '"';
-          if (param["f_target"] != "") frm += ' target="' + param["f_target"] + '"';
-          frm += '>';
-          editor.surroundHTML(frm, '&nbsp;</form>');
-        }
-      }
-    }, outparam);
-
-  } else { // form element (checkbox, radio, text, password, textarea, select, button, submit, reset, image, hidden)
-    var tagName = "";
-    // see if selection is an form element
-    if (typeof node == "undefined") {
-      node = editor.getParentElement();
-      var tag = node.tagName.toLowerCase()
-      if (node && (tag == "legend")) {
-        node = node.parentElement;
-        tag = node.tagName.toLowerCase();
-      }
-      if (node && !(tag == "textarea" || tag == "select" || tag == "input" || tag == "label" || tag == "fieldset"))
-        node = null;
-    }
-
-    if(node) {
-      type = node.tagName.toLowerCase();
-      outparam.f_name = node.name;
-      tagName = node.tagName;
-      if (type == "input") {
-        outparam.f_type = node.type;
-        type = node.type;
-      }
-      switch (type) {
-        case "textarea":
-          outparam.f_cols = node.cols;
-          outparam.f_rows = node.rows;
-          outparam.f_text = node.innerHTML;
-          outparam.f_wrap = node.getAttribute("wrap");
-          outparam.f_readOnly = node.getAttribute("readOnly");
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "select":
-          outparam.f_size = parseInt(node.size);
-          outparam.f_multiple = node.getAttribute("multiple");
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          var a_options = new Array();
-          for (var i=0; i<=node.options.length-1; i++) {
-            a_options[i] = new optionValues(node.options[i].text, node.options[i].value);
-          }
-          outparam.f_options = a_options;
-          break;
-        case "text":
-        case "password":
-          outparam.f_value = node.value;
-          outparam.f_size = node.size;
-          outparam.f_maxLength = node.maxLength;
-          outparam.f_readOnly = node.getAttribute("readOnly");
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "hidden":
-          outparam.f_value = node.value;
-          break;
-        case "submit":
-        case "reset":
-          outparam.f_value = node.value;
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "checkbox":
-        case "radio":
-          outparam.f_value = node.value;
-          outparam.f_checked = node.checked;
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "button":
-          outparam.f_value = node.value;
-          outparam.f_onclick = node.getAttribute("onclick");
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "image":
-          outparam.f_value = node.value;
-          outparam.f_src = node.src;
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "file":
-          outparam.f_disabled = node.getAttribute("disabled");
-          outparam.f_tabindex = node.getAttribute("tabindex");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "label":
-          outparam.f_text = node.innerHTML;
-          outparam.f_for = node.getAttribute("for");
-          outparam.f_accesskey = node.getAttribute("accesskey");
-          break;
-        case "fieldset":
-          if(node.firstChild.tagName.toLowerCase()=="legend")
-            outparam.f_text = node.firstChild.innerHTML;
-          else
-            outparam.f_text = "";
-          break;
-      }
-    } else {
-      outparam.f_name = "";
-      switch (button_id) {
-        case "textarea":
-        case "select":
-        case "label":
-        case "fieldset":
-          tagName = button_id;
-          break;
-        default:
-          tagName = "input";
-          outparam.f_type = button_id;
-          break;
-      }
-      outparam.f_options = "";
-      outparam.f_cols = "20";
-      outparam.f_rows = "4";
-      outparam.f_multiple = "false";
-      outparam.f_value = "";
-      outparam.f_size = "";
-      outparam.f_maxLength = "";
-      outparam.f_checked = "";
-      outparam.f_src = "";
-      outparam.f_onclick = "";
-      outparam.f_wrap = "";
-      outparam.f_readOnly = "false";
-      outparam.f_disabled = "false";
-      outparam.f_tabindex = "";
-      outparam.f_accesskey = "";
-      outparam.f_for = "";
-      outparam.f_text = "";
-      outparam.f_legend = "";
-    }
-    editor._popupDialog("plugin://Forms/" + tagName + ".html", function(param) {
-      if (param) {
-        if(param["f_cols"])
-          if (isNaN(parseInt(param["f_cols"],10)) || parseInt(param["f_cols"],10) <= 0)
-            param["f_cols"] = "";
-        if(param["f_rows"])
-          if(isNaN(parseInt(param["f_rows"],10)) || parseInt(param["f_rows"],10) <= 0)
-            param["f_rows"] = "";
-        if(param["f_size"])
-          if(isNaN(parseInt(param["f_size"],10)) || parseInt(param["f_size"],10) <= 0)
-            param["f_size"] = "";
-        if(param["f_maxlength"])
-          if(isNaN(parseInt(param["f_maxLength"],10)) || parseInt(param["f_maxLength"],10) <= 0)
-            param["f_maxLength"] = "";
-        if(node) {
-          //prepare existing Element
-          for (field in param) {
-            //alert(field.substring(2,20) + '=' + param[field]);  //to be silent! by htanaka
-            if ((field=="f_text") || (field=="f_options") || (field=="f_onclick") || (field=="f_checked"))continue;
-            if (param[field] != "")
-              node.setAttribute(field.substring(2,20), param[field]);
-            else
-              node.removeAttribute(field.substring(2,20));
-          }
-          if (type == "textarea") {
-            node.innerHTML = param["f_text"];
-          } else if(type == "select") {
-            node.options.length = 0;
-            var optionsList =  param["f_options"];
-            for (i=0; i<= optionsList.length-1; i++) {
-              node.options[i] = new Option(optionsList[i].text, optionsList[i].value)
-            }
-          } else if(type == "label") {
-            node.innerHTML = param["f_text"];
-          } else if(type == "fieldset") {
-            if(outparam.f_text != "") {
-              if(node.firstChild.tagName.toLowerCase()=="legend")
-                node.firstChild.innerHTML = param["f_text"];
-            } else {}// not implemented jet
-          } else if((type == "checkbox") || (type == "radio")) { //input
-              if(param["f_checked"]!="")
-                node.checked = true;
-              else
-                node.checked = false;
-          } else {
-            if(param["f_onclick"]){
-              node.onclick = "";
-              if(param["f_onclick"]!="")
-                node.onclick = param["f_onclick"];
-            }
-          }
-        } else {
-          //create Element
-          var text = "";
-          for (field in param) {
-            if (!param[field]) continue;
-            if ((param[field]=="") || (field=="f_text")|| (field=="f_options"))continue;
-            text += " " + field.substring(2,20) + '="' + param[field] + '"';
-          }
-
-          if(type == "textarea") {
-            text = '<textarea' + text + '>' + param["f_text"] + '</textarea>';
-          } else if(type == "select") {
-            text = '<select' + text + '>';
-            var optionsList =  param["f_options"];
-            for (i=0; i<= optionsList.length-1; i++) {
-              text += '<option value="'+optionsList[i].value+'">'+optionsList[i].text+'</option>';
-            }
-            text += '</select>';
-          } else if(type == "label") {
-            text = '<label' + text + '>' + param["f_text"] + '</label>';
-          } else if(type == "fieldset") {
-            text = '<fieldset' + text + '>';
-            if (param["f_legend"] != "") text += '<legend>' + param["f_text"] + '</legend>';
-            text += '</fieldset>';
-          } else {
-            text = '<input type="'+type+'"' + text + '>';
-          }
-          editor.insertHTML(text);
-        }
-      }
-    }, outparam);
-  }
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_button.gif b/web/imcms/xinha/plugins/Forms/img/ed_button.gif
deleted file mode 100644
index cfa4e7d715..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_button.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_checkbox.gif b/web/imcms/xinha/plugins/Forms/img/ed_checkbox.gif
deleted file mode 100644
index ea7affae5f..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_checkbox.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_fieldset.gif b/web/imcms/xinha/plugins/Forms/img/ed_fieldset.gif
deleted file mode 100644
index af358e53a6..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_fieldset.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_file.gif b/web/imcms/xinha/plugins/Forms/img/ed_file.gif
deleted file mode 100644
index 7f61ce1373..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_file.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_form.gif b/web/imcms/xinha/plugins/Forms/img/ed_form.gif
deleted file mode 100644
index a2c293e530..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_form.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_hidden.gif b/web/imcms/xinha/plugins/Forms/img/ed_hidden.gif
deleted file mode 100644
index 26b325de6b..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_hidden.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_image.gif b/web/imcms/xinha/plugins/Forms/img/ed_image.gif
deleted file mode 100644
index 3c8c88ecec..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_image.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_label.gif b/web/imcms/xinha/plugins/Forms/img/ed_label.gif
deleted file mode 100644
index f93fce7dfe..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_label.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_password.gif b/web/imcms/xinha/plugins/Forms/img/ed_password.gif
deleted file mode 100644
index a799218fde..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_password.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_radio.gif b/web/imcms/xinha/plugins/Forms/img/ed_radio.gif
deleted file mode 100644
index 5b72ef6e86..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_radio.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_reset.gif b/web/imcms/xinha/plugins/Forms/img/ed_reset.gif
deleted file mode 100644
index 68fee8e222..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_reset.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_select.gif b/web/imcms/xinha/plugins/Forms/img/ed_select.gif
deleted file mode 100644
index 3ea59f5c95..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_select.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_submit.gif b/web/imcms/xinha/plugins/Forms/img/ed_submit.gif
deleted file mode 100644
index 0b12a19a0b..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_submit.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_text.gif b/web/imcms/xinha/plugins/Forms/img/ed_text.gif
deleted file mode 100644
index fb8159c01b..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_text.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/img/ed_textarea.gif b/web/imcms/xinha/plugins/Forms/img/ed_textarea.gif
deleted file mode 100644
index c2c874a1cc..0000000000
Binary files a/web/imcms/xinha/plugins/Forms/img/ed_textarea.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Forms/lang/ja.js b/web/imcms/xinha/plugins/Forms/lang/ja.js
deleted file mode 100644
index 05409f3ff0..0000000000
--- a/web/imcms/xinha/plugins/Forms/lang/ja.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Form": "フォーム",
-  "Textarea": "テキストエリア",
-  "Selection Field": "�択肢フィールド",
-  "Checkbox": "�ェックボックス",
-  "Radio Button": "ラジオボタン",
-  "Text Field": "テキストフィールド",
-  "Password Field": "パスワードフィールド",
-  "File Field": "ファイルフィールド",
-  "Submit Button": "�信ボタン",
-  "Reset Button": "リセットボタン",
-  "Image Button": "画�ボタン",
-  "Button": "ボタン",
-  "Hidden Field": "�表示フィールド",
-  "Label": "ラベル",
-  "Field Set": "フィールドセット",
-  "Form Element: INPUT": "フォーム�素: INPUT",
-  "Form Element: SELECT": "フォーム�素: SELECT",
-  "Form Element: TEXTAREA": "フォーム�素: TEXTAREA",
-  "Form Element: LABEL": "フォーム�素: LABEL",
-  "Form Element: FIELDSET": "フォーム�素: FIELDSET",
-  "Form Name:": "フォーム�:",
-  "Form handler script": "フォーム処�スクリプト",
-  "Action URL:": "アクションURL:",
-  "Method:": "メソッド:",
-  "Post": "POST",
-  "Get": "GET",
-  "Encoding:": "エンコード:",
-  "HTML-Form to CGI (default)": "HTMLフォーム�らCGI�(デフォルト)",
-  "multipart Form Data (File-Upload)": "マル�パート(ファイルアップロード用)",
-  "Target Frame:": "ターゲット:",
-  "Name/ID:": "��/ID:",
-  "Value:": "値:",
-  "Disabled": "無効",
-  "Checked": "�ェック済�",
-  "Tab Index:": "タブ順�:",
-  "Access Key:": "アクセスキー:",
-  "Read Only": "読��り専用",
-  "Dimensions": "大��",
-  "Size:": "サイズ:",
-  "Max length:": "最大長:",
-  "Button Script": "ボタンスクリプト",
-  "'onClick'=": "'onClick'=",
-  "Image source": "画�ソース",
-  "Image URL:": "画�URL:",
-  "Multiple Select": "複数�択",
-  "Options": "�択肢",
-  "Lable:": "ラベル:",
-  "Move Up": "上�",
-  "Move Down": "下�",
-  "Delete": "削除",
-  "Add": "追加",
-  "Columns:": "列数:",
-  "Rows:": "行数:",
-  "Wrap Mode:": "折り返�:",
-  "Off": "オフ",
-  "Soft": "ソフト",
-  "Hard": "�ード",
-  "Physical": "物�的",
-  "Virtual": "仮想",
-  "normal": "標準",
-  "nowrap": "折り返���",
-  "pre": "フォーマット済�",
-  "Initial Text:": "�期テキスト:",
-  "Text:": "テキスト:",
-  "For Control:": "制御対象:",
-  "Legend:": "グループ�:",
-  "Cancel": "中止",
-  "Name": "��",
-  "Name of the form input": "フォーム入力���",
-  "Value of the form input": "フォーム入力�値",
-  "Size of text box in characters": "文字数�よるテキストボックス�大��",
-  "Maximum number of characters accepted": "入力�能�最大文字数",
-  "Javascript for button click": "ボタンクリック時�JavaScritp",
-  "URL of image": "画��URL",
-  "Name of the form select": "",
-  "name of the textarea": "テキストエリア���",
-  "Width in number of characters": "文字数�よる幅",
-  "Height in number of rows": "行数�よる高�",
-  "Default text (optional)": "テキスト�期値(オプション)",
-  "You must enter the form name": "フォーム��必���",
-  "You must enter a Name": "���必���",
-  "Please enter a Label": "ラベルを入力������"
-};
diff --git a/web/imcms/xinha/plugins/Forms/lang/nl.js b/web/imcms/xinha/plugins/Forms/lang/nl.js
deleted file mode 100644
index fc5c58286b..0000000000
--- a/web/imcms/xinha/plugins/Forms/lang/nl.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Form": "Formulier",
-  "Textarea": "Tekstgebied",
-  "Selection Field": "Selectielijst",
-  "Checkbox": "Checkbox",
-  "Radio Button": "Radio knop",
-  "Text Field": "Tekstveld",
-  "Password Field": "Wachtwoordveld",
-  "File Field": "Bestandsveld",
-  "Submit Button": "Verzend knop",
-  "Reset Button": "Wis knop",
-  "Image Button": "Afbeelding knop",
-  "Button": "Knop",
-  "Hidden Field": "Verborgen veld",
-  "Label": "Label",
-  "Field Set": "Veldset",
-  "Form Element: INPUT": "Formulier element: INPUT",
-  "Form Element: SELECT": "Formulier element: SELECT",
-  "Form Element: TEXTAREA": "Formulier element: TEXTAREA",
-  "Form Element: LABEL": "Formulier element: LABEL",
-  "Form Element: FIELDSET": "Formulier element: FIELDSET",
-  "Form Name:": "Formulier naame:",
-  "Form handler script": "Formulier script",
-  "Action URL:": "Actie URL:",
-  "Method:": "Methode:",
-  "Post": "POST",
-  "Get": "GET",
-  "Encoding:": "Encodering:",
-  "HTML-Form to CGI (default)": "HTML formulier naar CGI (standaard)",
-  "multipart Form Data (File-Upload)": "Multipart formulier data(Bestands upload)",
-  "Target Frame:": "Doel venster:",
-  "Name/ID:": "Naam/ID:",
-  "Value:": "Waarde:",
-  "Disabled": "Uitgeschakeld",
-  "Checked": "Checked",
-  "Tab Index:": "Tab volgorde:",
-  "Access Key:": "Toegangs toets:",
-  "Read Only": "Alleen lezen",
-  "Dimensions": "Dimenties",
-  "Size:": "Grootte:",
-  "Max length:": "Maximale lengte:",
-  "Button Script": "Knop script",
-  "'onClick'=": "'onClick'=",
-  "Image source": "Afbeelding bron",
-  "Image URL:": "Afbeelding URL:",
-  "Multiple Select": "Meerdere selectie mogelijkheden",
-  "Options": "Opties",
-  "Lable:": "Label:",
-  "Move Up": "Omhoog",
-  "Move Down": "Omlaag",
-  "Delete": "Verwijderen",
-  "Add": "Toevoegen",
-  "Columns:": "Kolommen:",
-  "Rows:": "Rijen:",
-  "Wrap Mode:": "Terugloop:",
-  "Off": "Uit",
-  "Soft": "Zacht",
-  "Hard": "Hard",
-  "Physical": "Fysiek",
-  "Virtual": "Virtueel",
-  "normal": "normaal",
-  "nowrap": "geen terugloop",
-  "pre": "pre",
-  "Initial Text:": "Start tekst:",
-  "Text:": "Tekst:",
-  "For Control:": "Voor controle:",
-  "Legend:": "Legend:",
-  "Cancel": "Annuleren",
-  "Name": "Naame",
-  "Name of the form input": "Naam van formulier invoer",
-  "Value of the form input": "Waarde van formulier invoer",
-  "Size of text box in characters": "Grootte van tekstveld in tekens",
-  "Maximum number of characters accepted": "Maximaal aantal tekens toegestaan",
-  "Javascript for button click": "Knop klik met JavaScript",
-  "URL of image": "Afbeelding URL",
-  "Name of the form select": "Naam van formulier select",
-  "name of the textarea": "Naam van tekst gebied",
-  "Width in number of characters": "Breedte in aantal tekens",
-  "Height in number of rows": "Hoogte in aantal tekens",
-  "Default text (optional)": "Standaard tekst (optioneel)",
-  "You must enter the form name": "Voer een formulier Naam in",
-  "You must enter a Name": "Voer een Naam in",
-  "Please enter a Label": "Voer een Label in"
-};
diff --git a/web/imcms/xinha/plugins/Forms/lang/pt_br.js b/web/imcms/xinha/plugins/Forms/lang/pt_br.js
deleted file mode 100644
index 640bf61d45..0000000000
--- a/web/imcms/xinha/plugins/Forms/lang/pt_br.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Access Key:": "Tecla de Acesso:",
-  "Action URL:": "Ação - URL:",
-  "Button Script": "Script de Botão",
-  "Cancel": "Cancelar",
-  "Checked": "Definido",
-  "Columns:": "Colunas:",
-  "Default text (optional)": "Texto padrão (opcional)",
-  "Dimensions": "Dimensões",
-  "Disabled": "Desativado",
-  "Encoding:": "Codificação:",
-  "For Control:": "Para Controle:",
-  "Form": "Formulário",
-  "Form Element: FIELDSET": "Elemento do formulário: FIELDSET",
-  "Form Element: INPUT": "Elemento do formulário: INPUT",
-  "Form Element: LABEL": "Elemento do formulário: LABEL",
-  "Form Element: SELECT": "Elemento do formulário: SELECT",
-	"Form Element: TEXTAREA": "Elemento do formulário: TEXTAREA",
-  "Form Name:": "Nome do Formulário:",
-  "Form handler script": "Script do Formulário",
-  "HTML-Form to CGI (default)": "Formulário para CGI (padrão)",
-  "Hard": "Difícil",
-  "Height in number of rows": "Altura em número de linhas",
-  "Image URL:": "URL da imagem:",
-  "Image source": "Imagem de Origem",
-  "Initial Text:": "Texto Inicial:",
-  "Insert/Edit Form": "Inserir/Editar Formulário",
-  "Insert/Edit Form Element FIELDSET": "Inserir/Editar Elemento FIELDSET",
-  "Insert/Edit Form Element INPUT": "Inserir/Editar Elemento INPUT",
-  "Insert/Edit Form Element LABEL": "Inserir/Editar Elemento LABEL",
-  "Insert/Edit Form Element SELECT": "Inserir/Editar Elemento SELECT",
-  "Insert/Edit Form Element TEXTAREA": "Inserir/Editar Elemento TEXTAREA",
-  "Javascript for button click": "Javascript para botão de clicar",
-  "Label:": "Etiqueta:",
-  "Legend:": "Legenda:",
-  "Max length:": "Comprimento Máx.:",
-  "Maximum number of characters accepted": "Máximo número de caracteres aceitos",
-  "Method:": "Método:",
-  "Name": "Nome",
-  "Name of the form input": "Nome do formulário de entrada",
-  "Name of the form select": "Nome do formulário de seleção",
-  "Name/ID:": "Nome/ID:",
-  "OK": "OK",
-  "Off": "Desligado",
-  "Options": "Opções",
-  "Physical": "Físico",
-  "Please enter a Label": "Por favor, entre uma Etiqueta",
-  "Post": "Post",
-  "Read Only": "Somente Leitura",
-  "Rows:": "Linhas:",
-  "Size of text box in characters": "Tamanho da caixa de texto em caracteres",
-  "Size:": "Tamanho:",
-  "Soft": "Fácil",
-  "Tab Index:": "Ordem de Tabulação:",
-  "Target Frame:": "Frame de destino:",
-  "Text:": "Texto:",
-  "URL of image": "URL da imagem",
-  "Value of the form input": "Valor do formulário de entrada",
-  "Value:": "Valor:",
-  "Virtual": "Virtual",
-  "Width in number of characters": "Largura em número de caracteres",
-  "Wrap Mode:": "Modo de quebras:",
-  "You must enter a Name": "Você precisa entrar com um Nome",
-  "multipart Form Data (File-Upload)": "Formulário de dados multipart (Enviar arquivo)",
-  "name of the textarea": "nome da área de texto",
-  "normal": "normal",
-  "nowrap": "sem quebras"
-}
diff --git a/web/imcms/xinha/plugins/Forms/popups/fieldset.html b/web/imcms/xinha/plugins/Forms/popups/fieldset.html
deleted file mode 100644
index 2f38d4d882..0000000000
--- a/web/imcms/xinha/plugins/Forms/popups/fieldset.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-
-<head>
-  <title>Insert/Edit Form Element FIELDSET</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-function Init() {
-  __dlg_translate("Forms");
-  __dlg_init(null,{width:260, height:150});
-  var param = window.dialogArguments;
-  document.getElementById("f_text").value = param["f_text"];
-  document.getElementById("f_text").focus();
-}
-
-function onOK() {
-  // pass data back to the calling window
-  var param = new Object();
-  param["f_text"] = document.getElementById("f_text").value;
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-  <div id="f_type" class="title">Form Element: FIELDSET</div>
-  <form action="" method="get">
-    <div class="fr">Legend:</div>
-    <input type="text" name="text" id="f_text" />
-    <p />
-    <div id="buttons">
-      <button type="button" name="ok" onclick="return onOK();">OK</button>
-      <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-    </div>
-  </form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Forms/popups/form.html b/web/imcms/xinha/plugins/Forms/popups/form.html
deleted file mode 100644
index daf377f1a8..0000000000
--- a/web/imcms/xinha/plugins/Forms/popups/form.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-
-<head>
-  <title>Insert/Edit Form</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-
-var fields = ["f_name", "f_action", "f_method", "f_enctype", "f_target"];
-
-function Init() {
-  __dlg_translate("Forms");
-  __dlg_init(null,{width:360, height:280});
-  var param = window.dialogArguments;
-  for (var i in fields) {
-    document.getElementById(fields[i]).value = param[fields[i]];
-  }
-  document.getElementById("f_name").focus();
-}
-
-function onOK() {
-  var required = {
-    "f_name": "You must enter the form name"
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(Xinha._lc(required[i],"Forms"));
-      el.focus();
-      return false;
-    }
-  }
-  // pass data back to the calling window
-  var param = new Object();
-  for (var i in fields) {
-    param[fields[i]] = document.getElementById(fields[i]).value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">Form</div>
-<form action="" method="get">
-  <div class="fr">Form Name:</div>
-  <input type="text" name="name" id="f_name" size="20" title="Name" />
-  <p />
-
-  <fieldset>
-  <legend>Form handler script</legend>
-  <div class="space"></div>
-  <div class="fr">Action URL:</div>
-  <input name="action" id="f_action" type="text" size="30">
-  <p />
-  <div class="fr">Method:</div>
-  <select name="f_method" id="f_method">
-    <option value=""></option>
-    <option value="post">Post</option>
-    <option value="get">Get</option>
-  </select>
-  <div class="space"></div>
-  <div class="fr">Encoding:</div>
-  <select name="enctype" id="f_enctype">
-    <option value=""></option>
-    <option value="application/x-www-form-urlencoded">HTML-Form to CGI (default)</option>
-    <option value="multipart/form-data">multipart Form Data (File-Upload)</option>
-  </select>
-  <p />
-  <div class="fr">Target Frame:</div>
-  <input name="target" id="f_target" type="text" size="30">
-  <p />
-  </fieldset>
-
-<div id="buttons">
-  <button type="button" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/Forms/popups/input.html b/web/imcms/xinha/plugins/Forms/popups/input.html
deleted file mode 100644
index 59b9cd928b..0000000000
--- a/web/imcms/xinha/plugins/Forms/popups/input.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<html>
-
-<head>
-  <title>Insert/Edit Form Element INPUT</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-var fields = null;
-var type;
-function Init() {
-  __dlg_translate("Forms");
-  __dlg_init();
-  var param = window.dialogArguments;
-  type = param.f_type;
-  document.getElementById("f_type").innerHTML = Xinha._lc('Form Element: INPUT', "Forms") + '(' + type + ')';
-  document.getElementById("txt").style.display = "none";
-  document.getElementById("chk").style.display = "none";
-  document.getElementById("btn").style.display = "none";
-  document.getElementById("img").style.display = "none";
-  switch (type) {
-    case "text":
-    case "password":
-      fields = ["f_name", "f_value", "f_readOnly", "f_disabled", "f_tabindex", "f_accesskey", "f_size", "f_maxLength"];
-      height = 350;
-      document.getElementById("txt").style.display = "block";
-      break;
-    case "checkbox":
-    case "radio":
-      fields = ["f_name", "f_value", "f_checked", "f_disabled", "f_tabindex", "f_accesskey"];
-      document.getElementById("chk").style.display = "block";
-      height = 280;
-      break;
-    case "button":
-      fields = ["f_name", "f_value", "f_disabled", "f_onclick", "f_tabindex", "f_accesskey"];
-      document.getElementById("btn").style.display = "block";
-      height = 300;
-      break;
-    case "file":
-      fields = ["f_name", "f_disabled", "f_tabindex", "f_accesskey"];
-      document.getElementById("f_value").disabled = true;
-      height = 280;
-      break;
-    case "image":
-      fields = ["f_name", "f_disabled", "f_tabindex", "f_accesskey", "f_src"];
-      document.getElementById("img").style.display = "block";
-      document.getElementById("f_value").disabled = true;
-      height = 300;
-      break;
-    case "reset":
-    case "submit":
-      fields = ["f_name", "f_value", "f_disabled", "f_tabindex", "f_accesskey"];
-      height =260;
-      break;
-    case "hidden":
-      fields = ["f_name", "f_value"];
-      document.getElementById("f_disabled").disabled = true;
-      document.getElementById("f_tabindex").disabled = true;
-      document.getElementById("f_accesskey").disabled = true;
-      height =260;
-      break;
-  }
-  for (var i in fields) {
-    switch (fields[i]) {
-    case "f_readOnly":
-    case "f_disabled":
-    case "f_checked":
-      document.getElementById(fields[i]).checked = (param[fields[i]]==fields[i].substring(2,20)) || (param[fields[i]] == true); break;
-    default:
-      document.getElementById(fields[i]).value = param[fields[i]]; break;
-    }
-  }
-  window.resizeTo(320,height);
-  document.getElementById("f_name").focus();
-}
-
-function onOK() {
-  var el = document.getElementById("f_name");
-  if (!el.value) {
-    alert(Xinha._lc("You must enter a Name","Forms"));
-    el.focus();
-    return false;
-  }
-  // pass data back to the calling window
-  var param = new Object();
-  for (var i in fields) {
-    switch (fields[i]) {
-    case "f_readOnly":
-    case "f_disabled":
-    case "f_checked":
-      if(Xinha.is_ie)
-        param[fields[i]] = (document.getElementById(fields[i]).checked)?true:"";
-      else
-        param[fields[i]] = (document.getElementById(fields[i]).checked)?fields[i].substring(2,20):"";
-      break;
-    default:
-      param[fields[i]] = document.getElementById(fields[i]).value; break;
-    }
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-
-</head>
-
-<body class="dialog" onload="Init()">
-  <div id="f_type" class="title"></div>
-  <form action="" method="get">
-    <div class="fr">Name/ID:</div>
-    <input type="text" name="name" id="f_name" title="Name of the form input" />
-    <p />
-    <div class="fr">Value:</div>
-    <input type="text" name="value" id="f_value" title="Value of the form input" />
-    <p />
-    <div class="fr">Disabled</div>
-    <input type="checkbox" name="disabled" id="f_disabled" value="disabled" />
-    <p />
-
-  <div id="chk">
-    <div class="fr">Checked</div>
-      <input name="checked" id="f_checked" type="checkbox" />
-    <p />
-  </div>
-
-    <div class="fr">Tab Index:</div>
-    <input type="text" name="tabindex" id="f_tabindex" />
-    <p />
-    <div class="fr">Access Key:</div>
-    <input type="text" name="accesskey" id="f_accesskey" />
-    <p />
-
-  <div id="txt">
-    <div class="fr">Read Only</div>
-    <input type="checkbox" name="readOnly" id="f_readOnly" value="readOnly" />
-    <p />
-
-    <fieldset>
-    <legend>Dimensions</legend>
-      <div class="space"></div>
-      <div class="fr">Size:</div>
-      <input type="text" name="size" id="f_size" size="5" title="Size of text box in characters" />
-      <div class="space"></div>
-      <div class="fr">Max length:</div>
-      <input type="text" name="maxLength" id="f_maxLength" size="5"	title="Maximum number of characters accepted" />
-      <div class="space"></div>
-    </fieldset>
-  </div>
-  <div id="btn">
-    <fieldset>
-    <legend> Button Script</legend>
-      <div class="space"></div>
-      <div class="fr">'onClick'=</div>
-      <input type="text" name="onClick" id="f_onclick" title="Javascript for button click" />
-      <div class="space"></div>
-    </fieldset>
-  </div>
-  <div id="img">
-    <fieldset>
-    <legend>Image source</legend>
-      <div class="space"></div>
-      <div class="fr">Image URL:</div>
-      <input type="text" name="src" id="f_src" title="URL of image" />
-      <div class="space"></div>
-    </fieldset>
-  </div>
-  <div id="buttons">
-    <button type="button" name="ok" onclick="return onOK();">OK</button>
-    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-  </div>
-</form>
-
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/Forms/popups/label.html b/web/imcms/xinha/plugins/Forms/popups/label.html
deleted file mode 100644
index ada1e8e127..0000000000
--- a/web/imcms/xinha/plugins/Forms/popups/label.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html>
-
-<head>
-  <title>Insert/Edit Form Element LABEL</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-var fields = ["f_text","f_for","f_accesskey"];
-
-function Init() {
-  __dlg_translate("Forms");
-  __dlg_init(null,{width:260, height:220});
-  var param = window.dialogArguments;
-  for (var i in fields) {
-    document.getElementById(fields[i]).value = param[fields[i]];
-  }
-  document.getElementById("f_text").focus();
-}
-
-function onOK() {
-  // pass data back to the calling window
-    // pass data back to the calling window
-  var param = new Object();
-  for (var i in fields) {
-    param[fields[i]] = document.getElementById(fields[i]).value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-  <div id="f_type" class="title">Form Element: LABEL</div>
-  <form action="" method="get">
-    <div class="fr">Text:</div>
-    <input type="text" name="text" id="f_text" />
-    <p />
-    <div class="fr">For Control:</div>
-    <input type="text" name="for" id="f_for" />
-    <p />
-    <div class="fr">Access Key:</div>
-    <input type="text" name="accesskey" id="f_accesskey" />
-    <p />
-    <div id="buttons">
-      <button type="button" name="ok" onclick="return onOK();">OK</button>
-      <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-    </div>
-  </form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Forms/popups/select.html b/web/imcms/xinha/plugins/Forms/popups/select.html
deleted file mode 100644
index 33e60cb239..0000000000
--- a/web/imcms/xinha/plugins/Forms/popups/select.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<html>
-
-<head>
-  <title>Insert/Edit Form Element SELECT</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-var fields = ["f_name", "f_size", "f_tabindex", "f_multiple", "f_disabled"];
-
-function Init() {
-  __dlg_translate("Forms");
-  __dlg_init(null,{width:360, height:400});
-  var param = window.dialogArguments;
-  for (var i in fields) {
-    switch (fields[i]) {
-    case "f_multiple":
-    case "f_disabled":
-      document.getElementById(fields[i]).checked = (param[fields[i]]==fields[i].substring(2,20)) || (param[fields[i]] == true); break;
-    case "f_size":
-      document.getElementById(fields[i]).value = (param[fields[i]]<=0)?"":param[fields[i]]; break;
-    default:
-      document.getElementById(fields[i]).value = param[fields[i]]; break;
-    }
-  }
-  for (var i=0; i<=param.f_options.length-1; i++) {
-    document.getElementById("f_select").options[i] = new Option(param.f_options[i].text, param.f_options[i].value);
-  }
-  document.getElementById("f_name").focus();
-}
-
-function onOK() {
-  var el = document.getElementById("f_name");
-  if (!el.value) {
-    alert(Xinha._lc("You must enter a Name","Forms"));
-    el.focus();
-    return false;
-  }
-  // pass data back to the calling window
-  var param = new Object();
-  for (var i in fields) {
-    switch (fields[i]) {
-    case "f_multiple":
-      if (document.getElementById("f_size").value=="1")
-        param["f_multiple"] = "";
-      else
-        param["f_multiple"] = (document.getElementById(fields[i]).checked)?"multiple":"";
-      break;
-    case "f_disabled":
-      param[fields[i]] = (document.getElementById(fields[i]).checked)?"disabled":""; break;
-    default:
-      param[fields[i]] = document.getElementById(fields[i]).value; break;
-    }
-  }
-  function optionValues(text,value) {
-    this.text = text;
-    this.value = value;
-  }
-  optionNodes = new Array(); // for option text/value pairs
-  for (var i=0; i<= document.getElementById("f_select").options.length-1; i++) {
-    optionNodes[i] = new optionValues(document.getElementById("f_select").options[i].text, document.getElementById("f_select").options[i].value);
-  }
-  param["f_options"] = optionNodes;
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-
-//functions to build select options list
-//Populates Label and Value fields with selected option values
-function getValues(){
-  var d = document;
-  d.getElementById("f_optionvalue").value = d.getElementById("f_select").options[d.getElementById("f_select").selectedIndex].value;
-  d.getElementById("f_optiontext").value = d.getElementById("f_select").options[d.getElementById("f_select").selectedIndex].text;
-  d.getElementById("f_update").value ="Update Option";
-}
-
-//Add or update options to the select box
-function addItem(item) {
-  var d = document;
-  if (item.f_optiontext.value =="") {alert(Xinha._lc("Please enter a Label","Forms"));}
-  else {
-    if (d.getElementById("f_select").options.selectedIndex != -1) { //update item
-      var indx = d.getElementById("f_select").options.selectedIndex;
-      d.getElementById("f_select").options[indx].text=d.getElementById("f_optiontext").value;
-      d.getElementById("f_select").options[indx].value=d.getElementById("f_optionvalue").value;
-    } else { //add new item
-      var newItem = d.getElementById("f_select").options.length++;
-      d.getElementById("f_select").options[newItem].text=d.getElementById("f_optiontext").value;
-      d.getElementById("f_select").options[newItem].value=d.getElementById("f_optionvalue").value;
-    }
-    d.getElementById("f_select").selectedIndex = -1; //deselect
-    d.getElementById("f_optiontext").value="";//clean up
-    d.getElementById("f_optionvalue").value="";
-    d.getElementById("f_update").value ="Add Option";
-    d.getElementById("f_optiontext").focus();
-  }
-}
-//Clears selected option
-function deleteItem() {
-  var d = document;
-  for (var i = d.getElementById("f_select").options.length - 1; i>=0; i--) {
-    var opt = d.getElementById("f_select").options[i];
-    if (opt.selected) {
-      d.getElementById("f_select").options[i] = null;
-    }
-  }
-  d.getElementById("f_select").selectedIndex = -1;
-  d.getElementById("f_optiontext").value="";
-  d.getElementById("f_optionvalue").value="";
-  d.getElementById("f_optiontext").focus();
-}
-//Moves selected option up
-function moveOptionUp() {
-  var d = document;
-  for (i=0; i<d.getElementById("f_select").options.length; i++) {
-    if (d.getElementById("f_select").options[i].selected) {
-      if (i != 0 && !d.getElementById("f_select").options[i-1].selected) {
-        swapOptions(d.getElementById("f_select"),i,i-1);
-        d.getElementById("f_select").options[i-1].selected = true;
-      }
-    }
-  }
-}
-//Moves selected option down
-function moveOptionDown() {
-  var d = document;
-  for (i=d.getElementById("f_select").options.length-1; i>=0; i--) {
-    if (d.getElementById("f_select").options[i].selected) {
-      if (i != (d.getElementById("f_select").options.length-1) && ! d.getElementById("f_select").options[i+1].selected) {
-        swapOptions(d.getElementById("f_select"),i,i+1);
-        d.getElementById("f_select").options[i+1].selected = true;
-      }
-    }
-  }
-}
-
-function swapOptions(obj,i,j) {
-  var o = obj.options;
-  var i_selected = o[i].selected;
-  var j_selected = o[j].selected;
-  var temp = new Option(o[i].text, o[i].value);
-  var temp2= new Option(o[j].text, o[j].value);
-  o[i] = temp2;
-  o[j] = temp;
-  o[i].selected = j_selected;
-  o[j].selected = i_selected;
-}
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-  <div id="f_type" class="title">Form Element: SELECT</div>
-  <form action="" method="get">
-    <div class="fr">Name/ID:</div>
-    <input type="text" name="name" id="f_name" title="Name of the form select" />
-    <p />
-    <div class="fr">Size:</div>
-    <input name="size" id="f_size" type="text" value="" size="15" />
-    <p />
-    <div class="fr"><nobr>Multiple Select</nobr></div>
-    <input name="multiple" id="f_multiple" type="checkbox" value="multiple" />
-    <p />
-    <div class="fr">Disabled</div>
-    <input type="checkbox" name="disabled" id="f_disabled" value="disabled" />
-    <p />
-    <div class="fr">Tab Index:</div>
-    <input type="text" name="tabindex" id="f_tabindex" />
-    <p />
-    <div class="space"></div>
-    <fieldset id="fldLayout">
-    <legend>Options</legend>
-      <table border="0" cellspacing="0">
-      <tr>
-      <td align="right">
-        <select name="select" id="f_select" Size="6" onchange="getValues();"  style="width:16em">
-        </select>
-      </td>
-      <td align="center">
-        <input type="button" name="up" value="Move Up" style="width:6em" onClick="moveOptionUp()"><br />
-        <input type="button" name="down" value="Move Down" style="width:6em" onClick="moveOptionDown()"><br />
-        <input type="button" name="delete" value="Delete" style="width:6em" onClick="deleteItem();">
-      </td>
-      </tr>
-      </table>
-      <div class="space"></div>
-      <table border="0" cellspacing="0">
-      <tr>
-        <td align="right">Label:</td>
-        <td><input type="text" id="f_optiontext" name="optionText" value="" size="15"></td>
-        <td align="right">Value:</td>
-        <td><input name="optionValue" id="f_optionvalue" type="text" value="" size="15"></td>
-        <td><input type="button" name="update" id="f_update" value="Add" onclick="addItem(document.forms[0])"></td>
-      </tr>
-      </table>
-    </fieldset>
-    <div id="buttons">
-      <button type="button" name="ok" onclick="return onOK();">OK</button>
-      <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-    </div>
-  </form>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/Forms/popups/textarea.html b/web/imcms/xinha/plugins/Forms/popups/textarea.html
deleted file mode 100644
index f591251220..0000000000
--- a/web/imcms/xinha/plugins/Forms/popups/textarea.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<html>
-
-<head>
-  <title>Insert/Edit Form Element TEXTAREA</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-
-var fields = ["f_name", "f_text", "f_cols", "f_rows", "f_wrap", "f_tabindex", "f_accesskey", "f_readOnly", "f_disabled"];
-
-function Init() {
-  __dlg_translate("Forms");
-  __dlg_init(null,{width:260, height:380});
-  var param = window.dialogArguments;
-  for (var i in fields) {
-    switch (fields[i]) {
-    case "f_readOnly":
-    case "f_disabled":
-      document.getElementById(fields[i]).checked = (param[fields[i]]==fields[i].substring(2,20)) || (param[fields[i]] == true);  break;
-    default:
-      document.getElementById(fields[i]).value = param[fields[i]]; break;
-    }
-  }
-  document.getElementById("f_name").focus();
-}
-
-function onOK() {
-  var el = document.getElementById("f_name");
-  if (!el.value) {
-    alert(Xinha._lc("You must enter a Name","Forms"));
-    el.focus();
-    return false;
-  }
-  // pass data back to the calling window
-  var param = new Object();
-  for (var i in fields) {
-    switch (fields[i]) {
-    case "f_readOnly":
-    case "f_disabled":
-      if(Xinha.is_ie)
-        param[fields[i]] = (document.getElementById(fields[i]).checked)?true:"";
-      else
-        param[fields[i]] = (document.getElementById(fields[i]).checked)?fields[i].substring(2,20):"";
-      break;
-    default:
-      param[fields[i]] = document.getElementById(fields[i]).value; break;
-    }
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-<div id="f_type" class="title">Form Element: TEXTAREA</div>
-<form action="" method="get">
-  <div class="fr">Name/ID:</div>
-  <input type="text" name="name" id="f_name" title="name of the textarea" />
-  <p />
-  <fieldset>
-  <legend>Dimensions</legend>
-    <div class="fr">Columns:</div>
-    <input type="text" name="cols" id="f_cols" size="5" title="Width in number of characters" />
-    <p />
-    <div class="fr">Rows:</div>
-    <input type="text" name="rows" id="f_rows" size="5" title="Height in number of rows" />
-    <p />
-  </fieldset>
-  <div class="space"></div>
-  <div class="fr">Wrap Mode:</div>
-  <select name="wrap" id="f_wrap">
-    <option value=""></option>
-    <option value="off">Off</option>
-    <option value="soft">Soft</option>
-    <option value="hard">Hard</option>
-    <option value="physical">Physical</option>
-    <option value="virtual">Virtual</option>
-    <option value="normal">normal</option>
-    <option value="nowrap">nowrap</option>
-    <option value="pre">pre</option>
-  </select>
-  <p />
-  <div class="fr">Read Only</div>
-  <input type="checkbox" name="readOnly" id="f_readOnly" value="readOnly" />
-  <p />
-  <div class="fr">Disabled</div>
-  <input type="checkbox" name="disabled" id="f_disabled" value="disabled" />
-  <p />
-  <div class="fr">Tab Index:</div>
-  <input type="text" name="tabindex" id="f_tabindex" />
-  <p />
-  <div class="fr">Access Key:</div>
-  <input type="text" name="accesskey" id="f_accesskey" />
-  <p />
-
-  <div class="fr">Initial Text:</div>
-  <input type="text" name="text" id="f_text" title="Default text (optional)" />
-  <div id="buttons">
-    <button type="button" name="ok" onclick="return onOK();">OK</button>
-    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-  </div>
-</form>
-
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/FullPage/full-page.js b/web/imcms/xinha/plugins/FullPage/full-page.js
deleted file mode 100644
index 54fb4cd99e..0000000000
--- a/web/imcms/xinha/plugins/FullPage/full-page.js
+++ /dev/null
@@ -1,209 +0,0 @@
-// FullPage Plugin for HTMLArea-3.0
-// Implementation by Mihai Bazon.  Sponsored by http://thycotic.com
-//
-// htmlArea v3.0 - Copyright (c) 2002 interactivetools.com, inc.
-// This notice MUST stay intact for use (see license.txt).
-//
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon for InteractiveTools.
-//   http://dynarch.com/mishoo
-//
-// $Id: full-page.js 856 2007-06-13 18:34:34Z wymsy $
-
-function FullPage(editor) {
-	this.editor = editor;
-
-	var cfg = editor.config;
-	cfg.fullPage = true;
-	var self = this;
-
-	cfg.registerButton("FP-docprop", this._lc("Document properties"), editor.imgURL("docprop.gif", "FullPage"), false,
-			   function(editor, id) {
-				   self.buttonPress(editor, id);
-			   });
-
-	// add a new line in the toolbar
-	cfg.addToolbarElement(["separator","FP-docprop"],"separator",-1);
-}
-
-FullPage._pluginInfo = {
-	name          : "FullPage",
-	version       : "1.0",
-	developer     : "Mihai Bazon",
-	developer_url : "http://dynarch.com/mishoo/",
-	c_owner       : "Mihai Bazon",
-	sponsor       : "Thycotic Software Ltd.",
-	sponsor_url   : "http://thycotic.com",
-	license       : "htmlArea"
-};
-
-FullPage.prototype._lc = function(string) {
-    return Xinha._lc(string, 'FullPage');
-};
-
-FullPage.prototype.buttonPress = function(editor, id) {
-	var self = this;
-	switch (id) {
-	    case "FP-docprop":
-		var doc = editor._doc;
-		var links = doc.getElementsByTagName("link");
-		var style1 = '';
-		var style2 = '';
-		var keywords = '';
-		var description = '';
-		var charset = '';
-		for (var i = links.length; --i >= 0;) {
-			var link = links[i];
-			if (/stylesheet/i.test(link.rel)) {
-				if (/alternate/i.test(link.rel))
-					style2 = link.href;
-				else
-					style1 = link.href;
-			}
-		}
-		var metas = doc.getElementsByTagName("meta");
-		for (var i = metas.length; --i >= 0;) {
-			var meta = metas[i];
-			if (/content-type/i.test(meta.httpEquiv)) {
-				r = /^text\/html; *charset=(.*)$/i.exec(meta.content);
-				charset = r[1];
-			} else if ((/keywords/i.test(meta.name)) || (/keywords/i.test(meta.id))) {
-				keywords = meta.content;
-			}	else if ((/description/i.test(meta.name)) || (/description/i.test(meta.id))) {
-				description = meta.content;
-			}
-		}
-		var title = doc.getElementsByTagName("title")[0];
-		title = title ? title.innerHTML : '';
-		var init = {
-			f_doctype      : editor.doctype,
-			f_title        : title,
-			f_body_bgcolor : Xinha._colorToRgb(doc.body.style.backgroundColor),
-			f_body_fgcolor : Xinha._colorToRgb(doc.body.style.color),
-			f_base_style   : style1,
-			f_alt_style    : style2,
-			f_charset      : charset,
-			f_keywords     : keywords,
-			f_description  : description,
-			editor         : editor
-		};
-		editor._popupDialog("plugin://FullPage/docprop", function(params) {
-			self.setDocProp(params);
-		}, init);
-		break;
-	}
-};
-
-FullPage.prototype.setDocProp = function(params) {
-	var txt = "";
-	var doc = this.editor._doc;
-	var head = doc.getElementsByTagName("head")[0];
-	var links = doc.getElementsByTagName("link");
-	var metas = doc.getElementsByTagName("meta");
-	var style1 = null;
-	var style2 = null;
-	var charset = null;
-	var charset_meta = null;
-	var keywords = null;
-	var description = null;
-	for (var i = links.length; --i >= 0;) {
-		var link = links[i];
-		if (/stylesheet/i.test(link.rel)) {
-			if (/alternate/i.test(link.rel))
-				style2 = link;
-			else
-				style1 = link;
-		}
-	}
-	for (var i = metas.length; --i >= 0;) {
-		var meta = metas[i];
-		if (/content-type/i.test(meta.httpEquiv)) {
-			r = /^text\/html; *charset=(.*)$/i.exec(meta.content);
-			charset = r[1];
-			charset_meta = meta;
-		} else if ((/keywords/i.test(meta.name)) || (/keywords/i.test(meta.id))) {
-			keywords = meta;
-		}	else if ((/description/i.test(meta.name)) || (/description/i.test(meta.id))) {
-			description = meta;
-		}
-	}
-	function createLink(alt) {
-		var link = doc.createElement("link");
-		link.rel = alt ? "alternate stylesheet" : "stylesheet";
-		head.appendChild(link);
-		return link;
-	}
-	function createMeta(httpEquiv, name, content) {
-		var meta = doc.createElement("meta");
-		if (httpEquiv!="") meta.httpEquiv = httpEquiv;
-		if (name!="") meta.name = name;
-		if (name!="") meta.id = name;
-		meta.content = content;
-		head.appendChild(meta);
-		return meta;
-	}
-
-	if (!style1 && params.f_base_style)
-		style1 = createLink(false);
-	if (params.f_base_style)
-		style1.href = params.f_base_style;
-	else if (style1)
-		head.removeChild(style1);
-
-	if (!style2 && params.f_alt_style)
-		style2 = createLink(true);
-	if (params.f_alt_style)
-		style2.href = params.f_alt_style;
-	else if (style2)
-		head.removeChild(style2);
-
-	if (charset_meta) {
-		head.removeChild(charset_meta);
-		charset_meta = null;
-	}
-	if (!charset_meta && params.f_charset)
-		charset_meta = createMeta("Content-Type","", "text/html; charset="+params.f_charset);
-
-	if (!keywords && params.f_keywords)
-		keywords = createMeta("","keywords", params.f_keywords);
-	else if (params.f_keywords)
-		keywords.content = params.f_keywords;
-	else if (keywords)
-		head.removeChild(keywords);
-
-	if (!description && params.f_description)
-		description = createMeta("","description", params.f_description);
-	else if (params.f_description)
-		description.content = params.f_description;
-	else if (description)
-		head.removeChild(description);
-
-  	for (var i in params) {
-		var val = params[i];
-		switch (i) {
-		    case "f_title":
-			var title = doc.getElementsByTagName("title")[0];
-			if (!title) {
-				title = doc.createElement("title");
-				head.appendChild(title);
-			} else while (node = title.lastChild)
-				title.removeChild(node);
-			if (!Xinha.is_ie)
-				title.appendChild(doc.createTextNode(val));
-			else
-				doc.title = val;
-			break;
-		    case "f_doctype":
-			this.editor.setDoctype(val);
-			break;
-		    case "f_body_bgcolor":
-			doc.body.style.backgroundColor = val;
-			break;
-		    case "f_body_fgcolor":
-			doc.body.style.color = val;
-			break;
-		}
-	}
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullPage/img/docprop.gif b/web/imcms/xinha/plugins/FullPage/img/docprop.gif
deleted file mode 100644
index fd008892c0..0000000000
Binary files a/web/imcms/xinha/plugins/FullPage/img/docprop.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/FullPage/lang/de.js b/web/imcms/xinha/plugins/FullPage/lang/de.js
deleted file mode 100644
index 55f2ede430..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/de.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N for the FullPage plugin
-// LANG: "de", ENCODING: UTF-8
-// Author: Holger Hees, http://www.systemconcept.de
-{
-  "Alternate style-sheet:": "Alternativer Stylesheet:",
-  "Background color:": "Hintergrundfarbe:",
-  "Cancel": "Abbrechen",
-  "DOCTYPE:": "DOCTYPE:",
-  "Document properties": "Dokumenteigenschaften",
-  "Document title:": "Dokumenttitel:",
-  "OK": "OK",
-  "Primary style-sheet:": "Stylesheet:",
-  "Text color:": "Textfarbe:",
-  "Character set:": "Zeichensatz",
-  "Description:": "Beschreibung",
-  "Keywords:": "Schlüsselworte",
-  "UTF-8 (recommended)": "UTF-8 (empfohlen)"
-}
diff --git a/web/imcms/xinha/plugins/FullPage/lang/fr.js b/web/imcms/xinha/plugins/FullPage/lang/fr.js
deleted file mode 100644
index b19a0a0163..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/fr.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N for the FullPage plugin
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Alternate style-sheet:": "Feuille CSS alternative",
-  "Background color:": "Couleur d'arrière plan",
-  "Cancel": "Annuler",
-  "DOCTYPE:": "DOCTYPE",
-  "Document properties": "Propriétés du document",
-  "Document title:": "Titre du document",
-  "OK": "OK",
-  "Primary style-sheet:": "Feuille CSS primaire",
-  "Text color:": "Couleur de texte",
-  "Character set:": "Jeu de caractères",
-  "Description:": "Description",
-  "Keywords:": "Mots clés",
-  "UTF-8 (recommended)": "UTF-8 (recommandé)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullPage/lang/he.js b/web/imcms/xinha/plugins/FullPage/lang/he.js
deleted file mode 100644
index cdd1ae2d75..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/he.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// I18N for the FullPage plugin
-// LANG: "he", ENCODING: UTF-8
-// Author: Liron Newman, http://www.eesh.net, <plastish at ultinet dot org>
-{
-  "Alternate style-sheet:": "גיליון סגנון �חר:",
-  "Background color:": "צבע רקע:",
-  "Cancel": "ביטול",
-  "DOCTYPE:": "DOCTYPE:",
-  "Document properties": "מ�פייני מסמך",
-  "Document title:": "כותרת מסמך:",
-  "OK": "�ישור",
-  "Primary style-sheet:": "גיליון סגנון ר�שי:",
-  "Text color:": "צבע טקסט:"
-};
diff --git a/web/imcms/xinha/plugins/FullPage/lang/ja.js b/web/imcms/xinha/plugins/FullPage/lang/ja.js
deleted file mode 100644
index 34f51ffdfd..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/ja.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Alternate style-sheet:": "代替スタイルシート:",
-  "Background color:": "背景色:",
-  "Cancel": "中止",
-  "DOCTYPE:": "DOCTYPE:",
-  "Document properties": "文書�プロパティ",
-  "Document title:": "文書�表題:",
-  "OK": "OK",
-  "Primary style-sheet:": "優先スタイルシート:",
-  "Text color:": "文字色:",
-  "Character set:": "文字セット:",
-  "Description:": "説明:",
-  "Keywords:": "キーワード:",
-  "UTF-8 (recommended)": "UTF-8 (推奨)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullPage/lang/nb.js b/web/imcms/xinha/plugins/FullPage/lang/nb.js
deleted file mode 100644
index cda95b8eb4..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/nb.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Alternate style-sheet:": "Alternativt stilsett:",
-  "Background color:": "Bakgrunnsfarge:",
-  "Cancel": "Avbryt",
-  "DOCTYPE:": "DOCTYPE:",
-  "Keywords:": "Nøkkelord",
-  "Description:": "Beskrivelse",
-  "Character set:": "Tegnsett",
-  "Document properties": "Egenskaper for dokument",
-  "Document title:": "Tittel på dokument:",
-  "OK": "OK",
-  "Primary style-sheet:": "Stilsett:",
-  "Text color:": "Tekstfarge:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullPage/lang/nl.js b/web/imcms/xinha/plugins/FullPage/lang/nl.js
deleted file mode 100644
index 5c2785717b..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/nl.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// I18N for the FullPage plugin
-// LANG: "nl", ENCODING: UTF-8
-{
-  "Alternate style-sheet:": "Wisselen van style-sheet:",
-  "Background color:": "Achtergrondkleur:",
-  "Cancel": "Annuleren",
-  "DOCTYPE:": "DOCTYPE:",
-  "Document properties": "Documenteigenschappen",
-  "Document title:": "Documenttitel:",
-  "OK": "OK",
-  "Primary style-sheet:": "Primaire style-sheet:",
-  "Text color:": "Tekstkleur:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullPage/lang/no.js b/web/imcms/xinha/plugins/FullPage/lang/no.js
deleted file mode 100644
index 11eb5e1e4f..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/no.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Alternate style-sheet:": "Alternativt stilsett:",
-  "Background color:": "Bakgrunnsfarge:",
-  "Cancel": "Avbryt",
-  "DOCTYPE:": "DOCTYPE:",
-  "Keywords:": "Nøkkelord",
-  "Description:": "Beskrivelse",
-  "Character set:": "Tegnsett",
-  "Document properties": "Egenskaper for dokument",
-  "Document title:": "Tittel på dokument:",
-  "OK": "OK",
-  "Primary style-sheet:": "Stilsett:",
-  "Text color:": "Tekstfarge:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullPage/lang/pl.js b/web/imcms/xinha/plugins/FullPage/lang/pl.js
deleted file mode 100644
index 3c5188eb2f..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/pl.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N for the FullPage plugin
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, koto1sa@o2.pl, http://www.eskot.krakow.pl/portfolio
-{
-  "Alternate style-sheet:": "Alternatywny arkusz stylów:",
-  "Background color:": "Kolor tła:",
-  "Cancel": "Anuluj",
-  "DOCTYPE:": "DOCTYPE:",
-  "Document properties": "Właściwości dokumentu",
-  "Document title:": "Tytuł dokumentu:",
-  "OK": "OK",
-  "Primary style-sheet:": "Arkusz stylów:",
-  "Text color:": "Kolor tekstu:",
-  "Character set:": "Zestaw znaków",
-  "Description:": "Opis",
-  "Keywords:": "SÅ‚owa kluczowe",
-  "UTF-8 (recommended)": "UTF-8 (zalecany)"
-};
diff --git a/web/imcms/xinha/plugins/FullPage/lang/pt_br.js b/web/imcms/xinha/plugins/FullPage/lang/pt_br.js
deleted file mode 100644
index b0ce1a1753..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/pt_br.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Alternate style-sheet:": "Estilo alternativo:",
-  "Background color:": "Côr de Fundo:",
-  "Cancel": "Cancelar",
-  "Character set:": "Conjunto de Caracteres:",
-  "DOCTYPE:": "DOCTYPE:",
-  "Description:": "Descrição:",
-  "Document properties": "Propriedades do Documento",
-  "Document title:": "Título do Documento:",
-  "Keywords:": "Palavras chave:",
-  "OK": "OK",
-  "Primary style-sheet:": "Estilo Primário:",
-  "Test of FullPage plugin": "Teste do Plugin FullPage",
-  "Text color:": "Côr do Texto:",
-  "UTF-8 (recommended)": "UTF-8 (recomendado)",
-  "cyrillic (ISO-8859-5)": "Cirílico (ISO-8859-5)",
-  "cyrillic (KOI8-R)": "Cirílico (KOI8-R)",
-  "cyrillic (WINDOWS-1251)": "Círilico (WINDOWS-1251)",
-  "western (ISO-8859-1)": "Ocidental (ISO-8859-1)"
-}
diff --git a/web/imcms/xinha/plugins/FullPage/lang/ro.js b/web/imcms/xinha/plugins/FullPage/lang/ro.js
deleted file mode 100644
index 540f0eb8ce..0000000000
--- a/web/imcms/xinha/plugins/FullPage/lang/ro.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// I18N for the FullPage plugin
-// LANG: "en", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-{
-  "Alternate style-sheet:": "Template CSS alternativ:",
-  "Background color:": "Culoare de fundal:",
-  "Cancel": "Renunţă",
-  "DOCTYPE:": "DOCTYPE:",
-  "Document properties": "Proprietăţile documentului",
-  "Document title:": "Titlul documentului:",
-  "OK": "Acceptă",
-  "Primary style-sheet:": "Template CSS principal:",
-  "Text color:": "Culoare text:"
-};
diff --git a/web/imcms/xinha/plugins/FullPage/popups/docprop.html b/web/imcms/xinha/plugins/FullPage/popups/docprop.html
deleted file mode 100644
index 00131fef97..0000000000
--- a/web/imcms/xinha/plugins/FullPage/popups/docprop.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<head>
-<title>Document properties</title>
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<script type="text/javascript" src="../../../modules/ColorPicker/ColorPicker.js"></script>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<script type="text/javascript">
-FullPage = window.opener.FullPage; // load the FullPage plugin and lang file ;-)
-window.resizeTo(400, 130);
-var accepted = {
-  f_doctype       : true,
-  f_title         : true,
-  f_body_bgcolor  : true,
-  f_body_fgcolor  : true,
-  f_base_style    : true,
-  f_alt_style     : true,
-  f_charset       : true,
-  f_keywords      : true,
-  f_description   : true
-};
-
-var editor = null;
-function Init() {
-  __dlg_translate('FullPage');
-  __dlg_init();
-  var params = window.dialogArguments;
-  for (var i in params) {
-    if (i in accepted) {
-      var el = document.getElementById(i);
-      el.value = params[i];
-    }
-  }
-  editor = params.editor;
-
-  var bgCol_pick = document.getElementById('bgCol_pick');
-  var f_body_bgcolor = document.getElementById('f_body_bgcolor');
-  var bgColPicker = new Xinha.colorPicker({cellsize:'5px',callback:function(color){f_body_bgcolor.value=color;}});
-  bgCol_pick.onclick = function() { bgColPicker.open('top,right', f_body_bgcolor ); }
-
-  var fgCol_pick = document.getElementById('fgCol_pick');
-  var f_body_fgcolor = document.getElementById('f_body_fgcolor');
-  var fgColPicker = new Xinha.colorPicker({cellsize:'5px',callback:function(color){f_body_fgcolor.value=color;}});
-  fgCol_pick.onclick = function() { fgColPicker.open('top,right', f_body_fgcolor ); }
-
-  document.getElementById("f_title").focus();
-  document.getElementById("f_title").select();
-}
-
-function onOK() {
-  var required = {
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(required[i]);
-      el.focus();
-      return false;
-    }
-  }
-
-  var param = {};
-  for (var i in accepted) {
-    var el = document.getElementById(i);
-    param[i] = el.value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-<style type="text/css">
-.fr { width: 11em; float: left; padding: 2px 5px; text-align: right; }
-.txt { width:200px; }
-div { clear:both; }
-.picker { width:30px; }
-</style>
-</head>
-
-<body class="dialog" onload="Init()">
-
-<div class="title">Document properties</div>
-
-<div>
-  <label class="fr" for="f_title">Document title:</label>
-  <input type="text" id="f_title" class="txt" />
-</div>
-<div>
-  <label class="fr" for="f_doctype">DOCTYPE:</label>
-  <input type="text" id="f_doctype" class="txt" />
-</div>
-<div>
-  <label class="fr" for="f_keywords">Keywords:</label>
-
-  <input type="text" id="f_keywords" class="txt" />
-</div>
-<div>
-  <label class="fr" for="f_description">Description:</label>
-  <input type="text" id="f_description" class="txt" />
-</div>
-<div>
-  <label class="fr" for="f_charset">Character set:</label>
-  <select id="f_charset" class="txt">
-    <option value=""></option>
-    <option value="utf-8">UTF-8 (recommended)</option>
-    <option value="windows-1251">cyrillic (WINDOWS-1251)</option>
-
-    <option value="koi8-r">cyrillic (KOI8-R)</option>
-    <option value="iso-8859-5">cyrillic (ISO-8859-5)</option>
-    <option value="iso-8859-1">western (ISO-8859-1)</option>
-  </select>
-</div>
-<div>
-  <label class="fr" for="f_base_style">Primary style-sheet:</label>
-  <input type="text" id="f_base_style" class="txt" />
-</div>
-<div>
-  <label class="fr" for="f_alt_style">Alternate style-sheet:</label>
-  <input type="text" id="f_alt_style" class="txt" />
-</div>
-<div>
-  <label class="fr" for="f_body_bgcolor">Background color:</label>
-  <input name="f_body_bgcolor" type="text" id="f_body_bgcolor" size="7" />
-  <button type="button" id="bgCol_pick" class="picker">...</button>
-</div>
-<div>
-  <label class="fr" for="f_body_fgcolor">Text color:</label>
-  <input name="f_body_fgcolor" type="text" id="f_body_fgcolor" size="7" />
-  <button type="button" id="fgCol_pick" class="picker">...</button>
-</div>
-
-<div id="buttons">
-  <button type="button" name="ok" onclick="return onOK();"><span>OK</span></button>
-
-  <button type="button" name="cancel" onclick="return onCancel();"><span>Cancel</span></button>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullPage/test.html b/web/imcms/xinha/plugins/FullPage/test.html
deleted file mode 100644
index ad4be93ac5..0000000000
--- a/web/imcms/xinha/plugins/FullPage/test.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-  <head>
-    <title>Test of FullPage plugin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <script type="text/javascript">
-      _editor_url = "../../";
-    </script>
-
-    <!-- load the main HTMLArea files -->
-    <script type="text/javascript" src="../../htmlarea.js"></script>
-    <script type="text/javascript" src="../../lang/en.js"></script>
-    <script type="text/javascript" src="../../dialog.js"></script>
-
-    <!-- <script type="text/javascript" src="popupdiv.js"></script> -->
-    <script type="text/javascript" src="../../popupwin.js"></script>
-
-    <script type="text/javascript">
-      HTMLArea.loadPlugin("TableOperations");
-      HTMLArea.loadPlugin("SpellChecker");
-      HTMLArea.loadPlugin("FullPage");
-
-      function initDocument() {
-        var editor = new HTMLArea("editor");
-        editor.registerPlugin(TableOperations);
-        editor.registerPlugin(SpellChecker);
-        editor.registerPlugin(FullPage);
-        editor.generate();
-      }
-    </script>
-
-    <style type="text/css">
-      @import url(../../htmlarea.css);
-    </style>
-
-  </head>
-
-  <body onload="initDocument()">
-    <h1>Test of FullPage plugin</h1>
-
-    <textarea id="editor" style="height: 30em; width: 100%;">
-      &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"&gt;
-      &lt;html&gt;
-        &lt;head&gt;
-          &lt;title&gt;FullPage plugin for HTMLArea&lt;/title&gt;
-          &lt;link rel="alternate stylesheet" href="http://dynarch.com/mishoo/css/dark.css" /&gt;
-          &lt;link rel="stylesheet" href="http://dynarch.com/mishoo/css/cool-light.css" /&gt;
-        &lt;/head&gt;
-        &lt;body style="background-color: #ddddee; color: #000077;"&gt;
-          &lt;table style="width:60%; height: 90%; margin: 2% auto 1% auto;" align="center" border="0" cellpadding="0" cellspacing="0"&gt;
-            &lt;tr&gt;
-              &lt;td style="background-color: #ddeedd; border: 2px solid #002; height: 1.5em; padding: 2px; font: bold 24px Verdana;"&gt;
-                FullPage plugin
-              &lt;/td&gt;
-            &lt;/tr&gt;
-            &lt;tr&gt;
-              &lt;td style="background-color: #fff; border: 1px solid #aab; padding: 1em 3em; font: 12px Verdana;"&gt;
-                &lt;p&gt;
-                  This plugin enables one to edit a full HTML file in &lt;a
-                    href="http://dynarch.com/htmlarea/"&gt;HTMLArea&lt;/a&gt;.  This is not
-                  normally possible with just the core editor since it only
-                  retrieves the HTML inside the &lt;code&gt;body&lt;/code&gt; tag.
-                &lt;/p&gt;
-                &lt;p&gt;
-                  It provides the ability to change the &lt;code&gt;DOCTYPE&lt;/code&gt; of
-                  the document, &lt;code&gt;body&lt;/code&gt; &lt;code&gt;bgcolor&lt;/code&gt; and
-                  &lt;code&gt;fgcolor&lt;/code&gt; attributes as well as to add additional
-                  &lt;code&gt;link&lt;/code&gt;-ed stylesheets.  Cool, eh?
-                &lt;/p&gt;
-                &lt;p&gt;
-                  The development of this plugin was initiated and sponsored by
-                  &lt;a href="http://thycotic.com"&gt;Thycotic Software Ltd.&lt;/a&gt;.
-                  That's also cool, isn't it? ;-)
-                &lt;/p&gt;
-              &lt;/td&gt;
-            &lt;/tr&gt;
-          &lt;/table&gt;
-        &lt;/body&gt;
-      &lt;/html&gt;
-    </textarea>
-
-    <hr />
-    <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
-<!-- Created: Wed Oct  1 19:55:37 EEST 2003 -->
-<!-- hhmts start -->
-Last modified on Sat Oct 25 01:06:59 2003
-<!-- hhmts end -->
-<!-- doc-lang: English -->
-  </body>
-</html>
diff --git a/web/imcms/xinha/plugins/FullScreen/full-screen.js b/web/imcms/xinha/plugins/FullScreen/full-screen.js
deleted file mode 100644
index eb56b72e75..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/full-screen.js
+++ /dev/null
@@ -1,187 +0,0 @@
-function FullScreen(editor, args)
-{
-  this.editor = editor;
-  editor._superclean_on = false;
-  cfg = editor.config;
-
-  cfg.registerButton
-  ( 'fullscreen',
-    this._lc("Maximize/Minimize Editor"),
-    [_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0], true,
-      function(e, objname, obj)
-      {
-        e._fullScreen();
-        if(e._isFullScreen)
-        {
-          obj.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',9,0]);
-        }
-        else
-        {
-          obj.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0]);
-        }
-      }
-  );
-
-  // See if we can find 'popupeditor' and replace it with fullscreen
-  cfg.addToolbarElement("fullscreen", "popupeditor", 0);
-}
-
-FullScreen._pluginInfo =
-{
-  name     : "FullScreen",
-  version  : "1.0",
-  developer: "James Sleeman",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "htmlArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-FullScreen.prototype._lc = function(string) {
-    return HTMLArea._lc(string, 'FullScreen');
-};
-
-/** fullScreen makes an editor take up the full window space (and resizes when the browser is resized)
- *  the principle is the same as the "popupwindow" functionality in the original htmlArea, except
- *  this one doesn't popup a window (it just uses to positioning hackery) so it's much more reliable
- *  and much faster to switch between
- */
-
-HTMLArea.prototype._fullScreen = function()
-{
-  var e = this;
-  function sizeItUp()
-  {
-    if(!e._isFullScreen || e._sizing) return false;
-    e._sizing = true;
-    // Width & Height of window
-    var dim = HTMLArea.viewportSize();
-
-    e.sizeEditor(dim.x + 'px',dim.y + 'px',true,true);
-    e._sizing = false;
-  }
-
-  function sizeItDown()
-  {
-    if(e._isFullScreen || e._sizing) return false;
-    e._sizing = true;
-    e.initSize();
-    e._sizing = false;
-  }
-
-  /** It's not possible to reliably get scroll events, particularly when we are hiding the scrollbars
-   *   so we just reset the scroll ever so often while in fullscreen mode
-   */
-  function resetScroll()
-  {
-    if(e._isFullScreen)
-    {
-      window.scroll(0,0);
-      window.setTimeout(resetScroll,150);
-    }
-  }
-
-  if(typeof this._isFullScreen == 'undefined')
-  {
-    this._isFullScreen = false;
-    if(e.target != e._iframe)
-    {
-      HTMLArea._addEvent(window, 'resize', sizeItUp);
-    }
-  }
-
-  // Gecko has a bug where if you change position/display on a
-  // designMode iframe that designMode dies.
-  if(HTMLArea.is_gecko)
-  {
-    this.deactivateEditor();
-  }
-
-  if(this._isFullScreen)
-  {
-    // Unmaximize
-    this._htmlArea.style.position = '';
-    try
-    {
-      if(HTMLArea.is_ie)
-      {
-        var bod = document.getElementsByTagName('html');
-      }
-      else
-      {
-        var bod = document.getElementsByTagName('body');
-      }
-      bod[0].style.overflow='';
-    }
-    catch(e)
-    {
-      // Nutthin
-    }
-    this._isFullScreen = false;
-    sizeItDown();
-
-    // Restore all ancestor positions
-    var ancestor = this._htmlArea;
-    while((ancestor = ancestor.parentNode) && ancestor.style)
-    {
-      ancestor.style.position = ancestor._xinha_fullScreenOldPosition;
-      ancestor._xinha_fullScreenOldPosition = null;
-    }
-
-    window.scroll(this._unScroll.x, this._unScroll.y);
-  }
-  else
-  {
-
-    // Get the current Scroll Positions
-    this._unScroll =
-    {
-     x:(window.pageXOffset)?(window.pageXOffset):(document.documentElement)?document.documentElement.scrollLeft:document.body.scrollLeft,
-     y:(window.pageYOffset)?(window.pageYOffset):(document.documentElement)?document.documentElement.scrollTop:document.body.scrollTop
-    };
-
-
-    // Make all ancestors position = static
-    var ancestor = this._htmlArea;
-    while((ancestor = ancestor.parentNode) && ancestor.style)
-    {
-      ancestor._xinha_fullScreenOldPosition = ancestor.style.position;
-      ancestor.style.position = 'static';
-    }
-
-    // Maximize
-    window.scroll(0,0);
-    this._htmlArea.style.position = 'absolute';
-    this._htmlArea.style.zIndex   = 999;
-    this._htmlArea.style.left     = 0;
-    this._htmlArea.style.top      = 0;
-    this._isFullScreen = true;
-    resetScroll();
-
-    try
-    {
-      if(HTMLArea.is_ie)
-      {
-        var bod = document.getElementsByTagName('html');
-      }
-      else
-      {
-        var bod = document.getElementsByTagName('body');
-      }
-      bod[0].style.overflow='hidden';
-    }
-    catch(e)
-    {
-      // Nutthin
-    }
-
-    sizeItUp();
-  }
-
-  if(HTMLArea.is_gecko)
-  {
-    this.activateEditor();
-  }
-  this.focusEditor();
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/de.js b/web/imcms/xinha/plugins/FullScreen/lang/de.js
deleted file mode 100644
index 72ff5a3a62..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/de.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Maximize/Minimize Editor": "Editor maximieren/verkleinern"
-};
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/fr.js b/web/imcms/xinha/plugins/FullScreen/lang/fr.js
deleted file mode 100644
index af4b014f94..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/fr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Maximize/Minimize Editor": "Agrandir/Réduire l'éditeur"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/ja.js b/web/imcms/xinha/plugins/FullScreen/lang/ja.js
deleted file mode 100644
index f10c4da110..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/ja.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Maximize/Minimize Editor": "エディタ�最大化/最�化"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/nb.js b/web/imcms/xinha/plugins/FullScreen/lang/nb.js
deleted file mode 100644
index aba7c2b69e..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/nb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Maximize/Minimize Editor": "Maksimer/Minimer WYSIWYG vindu"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/no.js b/web/imcms/xinha/plugins/FullScreen/lang/no.js
deleted file mode 100644
index 9e4fdda9b6..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/no.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Maximize/Minimize Editor": "Maksimer/Minimer WYSIWYG vindu"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/pl.js b/web/imcms/xinha/plugins/FullScreen/lang/pl.js
deleted file mode 100644
index 0c639bb495..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/pl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, koto1sa@o2.pl, http://www.eskot.krakow.pl/portfolio
-{
-  "Maximize/Minimize Editor": "Maksymalizuj/minimalizuj edytor"
-};
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/pt_br.js b/web/imcms/xinha/plugins/FullScreen/lang/pt_br.js
deleted file mode 100644
index cd1cd43300..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Maximize/Minimize Editor": "Maximizar/Minimizar Editor"
-};
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/ru.js b/web/imcms/xinha/plugins/FullScreen/lang/ru.js
deleted file mode 100644
index b2248ef880..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/ru.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Author: Andrei Blagorazumov, a@fnr.ru
-{
-  "Maximize/Minimize Editor": "Развернуть/Свернуть редактор"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/FullScreen/lang/sv.js b/web/imcms/xinha/plugins/FullScreen/lang/sv.js
deleted file mode 100644
index c27fee57a2..0000000000
--- a/web/imcms/xinha/plugins/FullScreen/lang/sv.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "sv" (Swedish), ENCODING: UTF-8
-// translated: Erik Dalén, <dalen@jpl.se>
-{
-  "Maximize/Minimize Editor": "Maximera/Minimera WYSIWYG fönster"
-};
diff --git a/web/imcms/xinha/plugins/GetHtml/get-html.js b/web/imcms/xinha/plugins/GetHtml/get-html.js
deleted file mode 100644
index 7418f85578..0000000000
--- a/web/imcms/xinha/plugins/GetHtml/get-html.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- Implemented now as GetHtmlImplementation plugin in modules/GetHtml/TransformInnerHTML.js
-  */
-  
-function GetHtml(editor) {
-    editor.config.getHtmlMethod = "TransformInnerHTML";
-}
-
-GetHtml._pluginInfo = {
-	name          : "GetHtml",
-	version       : "1.0",
-	developer     : "Nelson Bright",
-	developer_url : "http://www.brightworkweb.com/",
-	sponsor       : "",
-    sponsor_url   : "",
-	license       : "htmlArea"
-};
diff --git a/web/imcms/xinha/plugins/HorizontalRule/horizontal-rule.js b/web/imcms/xinha/plugins/HorizontalRule/horizontal-rule.js
deleted file mode 100644
index fe9ca0872a..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/horizontal-rule.js
+++ /dev/null
@@ -1,163 +0,0 @@
-
-HorizontalRule._pluginInfo = {
-	name          : "HorizontalRule",
-	version       : "1.0",
-	developer     : "Nelson Bright",
-	developer_url : "http://www.brightworkweb.com/",
-	c_owner       : "Nelson Bright",
-	sponsor       : "BrightWork, Inc.",
-	sponsor_url   : "http://www.brightworkweb.com/",
-	license       : "htmlArea"
-};
-
-function HorizontalRule(editor) {
-    this.editor = editor;
-
-    var cfg = editor.config;
-	var toolbar = cfg.toolbar;
-	var self = this;
-        
-	cfg.registerButton({
-		id       : "edithorizontalrule",
-		tooltip  : this._lc("Insert/edit horizontal rule"),
-	//	image    : editor.imgURL("ed_hr.gif", "HorizontalRule"),
-		image    : [_editor_url + "images/ed_buttons_main.gif",6,0],
-		textMode : false,
-		action   : function(editor) {
-						self.buttonPress(editor);
-				   }
-	});
-
-	cfg.addToolbarElement("edithorizontalrule","inserthorizontalrule",0);
-}
-
-HorizontalRule.prototype._lc = function(string) {
-    return  Xinha._lc(string, 'HorizontalRule');
-};
-
-HorizontalRule.prototype.buttonPress = function(editor) {
-	this.editor = editor;
-	this._editHorizontalRule();
-};
-
-HorizontalRule.prototype._editHorizontalRule = function(rule) {
-	editor = this.editor;
-	var sel = editor._getSelection();
-	var range = editor._createRange(sel);
-	var outparam = null;
-	if (typeof rule == "undefined") {
-		rule = editor.getParentElement();
-		if (rule && !/^hr$/i.test(rule.tagName))
-			rule = null;
-	}
-	if (rule) {
-		var f_widthValue    = rule.style.width || rule.width;
-		outparam = {
-			f_size      : parseInt(rule.style.height,10) || rule.size,
-			f_widthUnit : (/(%|px)$/.test(f_widthValue)) ? RegExp.$1 : 'px',
-			f_width     : parseInt (f_widthValue,10),
-			f_color     : Xinha._colorToRgb(rule.style.backgroundColor) || rule.color,
-			f_align     : rule.style.textAlign || rule.align,
-			f_noshade   : (parseInt(rule.style.borderWidth,10) == 0) || rule.noShade
-		};
-	}
-	editor._popupDialog("plugin://HorizontalRule/edit_horizontal_rule.html", function(param) {
-		if (!param) {	// user pressed Cancel
-			return false;
-		}
-		var hr = rule;
-		if (!hr) {
-			var hrule = editor._doc.createElement("hr");
-			for (var field in param) {
-				var value = param[field];
-				if(value == "") continue;
-				switch (field) { 
-				case "f_width" :
-					if(param["f_widthUnit"]=="%")
-					{
-						hrule.style.width = value + "%";
-					}
-					else
-					{
-						hrule.style.width = value + "px";
-					}
-				break;
-				case "f_size" :
-					hrule.style.height = value + "px"; 
-				break;
-				case "f_align" : // Gecko needs the margins for alignment
-					hrule.style.textAlign = value;
-					switch (value) {
-						case 'left':
-							hrule.style.marginLeft = "0";
-						break;
-						case 'right':
-							hrule.style.marginRight = "0";
-						break;
-						case 'center':
-							hrule.style.marginLeft = "auto";
-							hrule.style.marginRight = "auto";
-						break;
-					}
-				break;
-				case "f_color" :
-					hrule.style.backgroundColor = value; 
-				break;
-				case "f_noshade" :
-					hrule.style.border = "0"; 
-				break;
-				}
-			}
-			if ( Xinha.is_gecko )
-			{   // If I use editor.insertNodeAtSelection(hrule) here I get get a </hr> closing tag
-				editor.execCommand("inserthtml",false,Xinha.getOuterHTML(hrule));
-			}
-			else editor.insertNodeAtSelection(hrule);
-			
-		} else {
-			for (var field in param) {
-			  var value = param[field];
-			  switch (field) {
-				case "f_width" :
-					if(param["f_widthUnit"]=="%")
-					{
-						hr.style.width = value + "%";
-					}
-					else
-					{
-						hr.style.width = value + "px";
-					}
-				break;
-				case "f_size" :
-					hr.style.height = value + "px"; 
-				break;
-				case "f_align" :
-					hr.style.textAlign = value;
-					switch (value) {
-						case 'left':
-							hr.style.marginLeft = "0";
-							hr.style.marginRight = null;
-						break;
-						case 'right':
-							hr.style.marginRight = "0";
-							hr.style.marginLeft = null;
-						break;
-						case 'center':
-							hr.style.marginLeft = "auto";
-							hr.style.marginRight = "auto";
-						break;
-					}
-				break;
-				case "f_color" :
-					hr.style.backgroundColor = value; 
-				break;
-				case "f_noshade" :
-					
-				break;
-			  }
-			  hr.style.border = (param["f_noshade"]) ? "0" : null; 
-			}
-		}
-	}, outparam);
-};
-	
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HorizontalRule/lang/de.js b/web/imcms/xinha/plugins/HorizontalRule/lang/de.js
deleted file mode 100644
index 4981c5215a..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/lang/de.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Insert/edit horizontal rule": "horizontale Linie einfügen/bearbeiten",
-  "Horizontal Rule": "Horizontale Linie",
-  "Layout": "Gestaltung",
-  "Width:": "Breite:",
-  "percent": "Prozent",
-  "pixels": "Pixel",
-  "Height:": "Höhe:",
-  "Alignment:": "Ausrichtung:",
-  "Left": "links",
-  "Center": "zentriert",
-  "Right": "rechts",
-  "Style": "Stil",
-  "Color:": "Farbe",
-  "No shading": "keine Schattierung",
-  "Note:": "Anmerkung",
-  "To select an existing horizontal rule, a double-click may be needed.": "Um eine horizontale Linie auszuwählen kann ein Doppelklick erforderlich sein."
-};
diff --git a/web/imcms/xinha/plugins/HorizontalRule/lang/fr.js b/web/imcms/xinha/plugins/HorizontalRule/lang/fr.js
deleted file mode 100644
index 5e521bb9b1..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/lang/fr.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Insert/edit horizontal rule": "Insérer une règle horizontale",
-  "Horizontal Rule": "Règle horizontale",
-  "Layout": "Layout",
-  "Width:": "Largeur",
-  "percent": "pourcent",
-  "pixels": "pixels",
-  "Height:": "Hauteur",
-  "Alignment:": "Alignement",
-  "Left": "Gauche",
-  "Center": "Centre",
-  "Right": "Droite",
-  "Style": "Style",
-  "Color:": "Couleur",
-  "No shading": "Pas d'ombre",
-  "Note:": "Note",
-  "To select an existing horizontal rule, a double-click may be needed.": "Pour sélectionner une règle horizontale, un double-clic peut être nécessaire."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HorizontalRule/lang/ja.js b/web/imcms/xinha/plugins/HorizontalRule/lang/ja.js
deleted file mode 100644
index 42fc9a894b..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/lang/ja.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-// This string is for auto detection of multi-encoding editor : 国際化文字検出用文字列
-{
-  "Insert/edit horizontal rule": "水平線�挿入/修正",
-  "Horizontal Rule": "水平線",
-  "Layout": "レイアウト",
-  "Width:": "å¹…:",
-  "percent": "パーセント",
-  "pixels": "ピクセル",
-  "Height:": "高�:",
-  "Alignment:": "行��:",
-  "Left": "å·¦",
-  "Center": "中央",
-  "Right": "�",
-  "Style": "スタイル",
-  "Color:": "色:",
-  "No shading": "影付���",
-  "Note:": "備考",
-  "To select an existing horizontal rule, a double-click may be needed.":"既存�水平線を�択�る��DoubleClick�必�。"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HorizontalRule/lang/nb.js b/web/imcms/xinha/plugins/HorizontalRule/lang/nb.js
deleted file mode 100644
index ca2d0500f3..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/lang/nb.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert/edit horizontal rule": "Sett inn/ rediger horisontal linje",
-  "Horizontal Rule": "Horisontal linje",
-  "Layout": "Oppsett",
-  "Width:": "Bredde:",
-  "percent": "prosent",
-  "pixels": "Piksel",
-  "Height:": "Høyde:",
-  "Alignment:": "Justering:",
-  "Left": "Venstre",
-  "Center": "Sentrert",
-  "Right": "Høyre",
-  "Style": "Stil",
-  "Color:": "Farge",
-  "No shading": "Ingen skygge",
-  "Note:": "Notat",
-  "To select an existing horizontal rule, a double-click may be needed.": "For å velge en horisontal linje kan det hende du må dobbeltklikke."
-};
diff --git a/web/imcms/xinha/plugins/HorizontalRule/lang/nl.js b/web/imcms/xinha/plugins/HorizontalRule/lang/nl.js
deleted file mode 100644
index 1332e9d4d3..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/lang/nl.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Insert/edit horizontal rule": "Horizontale lijn invoegen/bewerken",
-  "Horizontal Rule": "Horizontale lijn",
-  "Layout": "Weergave",
-  "Width:": "Breedte:",
-  "percent": "procent",
-  "pixels": "pixels",
-  "Height:": "Hoogte:",
-  "Alignment:": "Uitvulling:",
-  "Left": "Links",
-  "Center": "Midden",
-  "Right": "Rechts",
-  "Style": "Style",
-  "Color:": "kleur",
-  "No shading": "Geen schaduw",
-  "Note:": "Notitie",
-  "To select an existing horizontal rule, a double-click may be needed.": "Om een bestaande horizontale lijn te selecteren moet je mogelijk dubbel klikken."
-};
diff --git a/web/imcms/xinha/plugins/HorizontalRule/lang/no.js b/web/imcms/xinha/plugins/HorizontalRule/lang/no.js
deleted file mode 100644
index 12ec4694f8..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/lang/no.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert/edit horizontal rule": "Sett inn/ rediger horisontal linje",
-  "Horizontal Rule": "Horisontal linje",
-  "Layout": "Oppsett",
-  "Width:": "Bredde:",
-  "percent": "prosent",
-  "pixels": "Piksel",
-  "Height:": "Høyde:",
-  "Alignment:": "Justering:",
-  "Left": "Venstre",
-  "Center": "Sentrert",
-  "Right": "Høyre",
-  "Style": "Stil",
-  "Color:": "Farge",
-  "No shading": "Ingen skygge",
-  "Note:": "Notat",
-  "To select an existing horizontal rule, a double-click may be needed.": "For å velge en horisontal linje kan det hende du må dobbeltklikke."
-};
diff --git a/web/imcms/xinha/plugins/HorizontalRule/lang/pt_br.js b/web/imcms/xinha/plugins/HorizontalRule/lang/pt_br.js
deleted file mode 100644
index b7b979dadd..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/lang/pt_br.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Alignment:": "Alinhamento:",
-  "Cancel": "Cancelar",
-  "Center": "Centralizar",
-  "Color:": "Côr:",
-  "Height:": "Alturar:",
-  "Horizontal Rule": "Linha Horizontal",
-  "Insert/Edit Horizontal Rule": "Inserir/Editar Linha Horizontal",
-  "Insert/edit horizontal rule": "Inserir/editar linha horizontal",
-  "Layout": "Esquema",
-  "Left": "Esquerda",
-  "No shading": "Sem sombra",
-  "OK": "OK",
-  "Right": "Direita",
-  "Style": "Estilo",
-  "Width:": "Largura:",
-  "percent": "porcentagem",
-  "pixels": "pixels"
-}
diff --git a/web/imcms/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html b/web/imcms/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html
deleted file mode 100644
index aad7302df3..0000000000
--- a/web/imcms/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Insert/Edit Horizontal Rule</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-  <script type="text/javascript" src="../../../modules/ColorPicker/ColorPicker.js"></script>
-<script type="text/javascript">
-editor = window.opener.editor;
-
-function Init() {
-	__dlg_translate("HorizontalRule");
-	__dlg_init(null,{width:320,height:290});
-	var params = window.dialogArguments;
-	if(params) {
-		document.getElementById("f_size").value = params.f_size;
-		document.getElementById("f_width").value = params.f_width;
-		document.getElementById("f_widthUnit").value = params.f_widthUnit;
-		document.getElementById("f_align").value = params.f_align;
-		document.getElementById("f_color").value = params.f_color;
-		document.getElementById("hrpv").style.backgroundColor = params.f_color;
-		document.getElementById("f_noshade").checked = params.f_noshade;
-	}
-	
-	var colpick = document.getElementById('hrpv');
-	var f_color = document.getElementById('f_color');
-	var colPicker = new Xinha.colorPicker({cellsize:'5px',callback:selectColor});
-	colpick.onclick = function() { colPicker.open('top,left',colpick, f_color.value ); }
-	
-	document.getElementById("f_width").focus();
-}
-
-function onOK() {
-  var fields = ["f_size", "f_width", "f_widthUnit", "f_align", "f_color", "f_noshade"];
-  var param = {};
-  for (var i in fields) {
-    var id = fields[i];
-	var el = document.getElementById(id);
-    param[id] = (el.type == "checkbox") ? el.checked : el.value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-function selectColor(color) {
-	document.getElementById('hrpv').style.backgroundColor = color;
-	document.getElementById('f_color').value = color;
-}
-window.onload = Init;
-</script>
-
-<style type="text/css">
-.buttonColor {
-  padding: 1px;
-  cursor: default;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-
-.buttonColor-hilite {
-  border-color: #000;
-}
-
-.buttonColor .chooser {
-  height: 0.6em;
-  border: 1px solid;
-  padding: 0px 1em;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.buttonColor .nocolor {
-  padding: 0px;
-  height: 0.6em;
-  border: 1px solid;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-.buttonColor .nocolor-hilite { background-color: #fff; color: #f00; }
-</style>
-
-</head>
-
-<body class="dialog">
-<div class="title">Horizontal Rule</div>
-<form action="" method="get">
-  <fieldset>
-  <legend>Layout</legend>
-    <div class="fr">Width:</div>
-    <input style="margin-right: 0.5em;" name="f_width" id="f_width" size="5" type="text" />
-    <select style="margin-right: 0.5em;" name="f_widthUnit" id="f_widthUnit">
-      <option value="%">percent</option>
-      <option value="px">pixels</option>
-    </select>
-	<br />
-    <div class="fr">Height:</div>
-    <input style="margin-right: 0.5em;" name="f_size" id="f_size" size="5" type="text" /> <span>pixels</span>
-	<br />
-    <div class="fr">Alignment:</div>
-    <select name="f_align" id="f_align">
-      <option value="left">Left</option>
-      <option value="center">Center</option>
-      <option value="right">Right</option>
-    </select>
-
-  </fieldset>
-  <fieldset>
-  <legend>Style</legend>
-    <div class="fr">Color:</div>
-    <table cellpadding="2" cellspacing="0" id="hrbtn" class="buttonColor">
-    <tr>
-      <td class="chooser" id="hrpv"
-          onmouseover="document.getElementById('hrbtn').style.borderColor='black'"
-          onmouseout="document.getElementById('hrbtn').style.borderColor='ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight'"
-          >&nbsp;</td>
-      <td class="nocolor" id="hrclr"
-          onmouseover="document.getElementById('hrclr').style.color='#f00'"
-          onmouseout="document.getElementById('hrclr').style.color='#000'"
-          onclick="document.getElementById('f_color').value='';	document.getElementById('hrpv').style.backgroundColor=''">&#x00d7;</td>
-    </tr>
-    </table>
-    <br />
-    <div class="fr"> </div>
-    <input type="hidden" name="f_color" id="f_color" />
-    <input type="checkbox" name="f_noshade" id="f_noshade" value="noshade" />
-    <span>No shading</span>
-    <br />
-  </fieldset>
-<div id="buttons">
-  <button type="submit" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlEntities/Entities.js b/web/imcms/xinha/plugins/HtmlEntities/Entities.js
deleted file mode 100644
index b9e6b9a19a..0000000000
--- a/web/imcms/xinha/plugins/HtmlEntities/Entities.js
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-"&iexcl;" : "¡",
-"&cent;" : "¢",
-"&pound;" : "£",
-"&curren;" : "¤",
-"&yen;" : "Â¥",
-"&brvbar;" : "¦",
-"&sect;" : "§",
-"&uml;" : "¨",
-"&copy;" : "©",
-"&ordf;" : "ª",
-"&laquo;" : "«",
-"&not;" : "¬",
-"&reg;" : "®",
-"&macr;" : "¯",
-"&deg;" : "°",
-"&plusmn;" : "±",
-"&sup2;" : "²",
-"&sup3;" : "³",
-"&acute;" : "´",
-"&micro;" : "µ",
-"&para;" : "¶",
-"&middot;" : "·",
-"&cedil;" : "¸",
-"&sup1;" : "¹",
-"&ordm;" : "º",
-"&raquo;" : "»",
-"&frac14;" : "¼",
-"&frac12;" : "½",
-"&frac34;" : "¾",
-"&iquest;" : "¿",
-"&Agrave;" : "À",
-"&Aacute;" : "�",
-"&Acirc;" : "Â",
-"&Atilde;" : "Ã",
-"&Auml;" : "Ä",
-"&Aring;" : "Ã…",
-"&AElig;" : "Æ",
-"&Ccedil;" : "Ç",
-"&Egrave;" : "È",
-"&Eacute;" : "É",
-"&Ecirc;" : "Ê",
-"&Euml;" : "Ë",
-"&Igrave;" : "Ì",
-"&Iacute;" : "�",
-"&Icirc;" : "ÃŽ",
-"&Iuml;" : "�",
-"&ETH;" : "�",
-"&Ntilde;" : "Ñ",
-"&Ograve;" : "Ã’",
-"&Oacute;" : "Ó",
-"&Ocirc;" : "Ô",
-"&Otilde;" : "Õ",
-"&Ouml;" : "Ö",
-"&times;" : "×",
-"&Oslash;" : "Ø",
-"&Ugrave;" : "Ù",
-"&Uacute;" : "Ú",
-"&Ucirc;" : "Û",
-"&Uuml;" : "Ü",
-"&Yacute;" : "�",
-"&THORN;" : "Þ",
-"&szlig;" : "ß",
-"&agrave;" : "à",
-"&aacute;" : "á",
-"&acirc;" : "â",
-"&atilde;" : "ã",
-"&auml;" : "ä",
-"&aring;" : "Ã¥",
-"&aelig;" : "æ",
-"&ccedil;" : "ç",
-"&egrave;" : "è",
-"&eacute;" : "é",
-"&ecirc;" : "ê",
-"&euml;" : "ë",
-"&igrave;" : "ì",
-"&iacute;" : "í",
-"&icirc;" : "î",
-"&iuml;" : "ï",
-"&eth;" : "ð",
-"&ntilde;" : "ñ",
-"&ograve;" : "ò",
-"&oacute;" : "ó",
-"&oacute;" : "ó",
-"&ocirc;" : "ô",
-"&otilde;" : "õ",
-"&ouml;" : "ö",
-"&divide;" : "÷",
-"&oslash;" : "ø",
-"&ugrave;" : "ù",
-"&uacute;" : "ú",
-"&ucirc;" : "û",
-"&uuml;" : "ü",
-"&yacute;" : "ý",
-"&thorn;" : "þ",
-"&yuml;" : "ÿ",
-"&fnof;" : "Æ’",
-"&Alpha;" : "Α",
-"&Beta;" : "Î’",
-"&Gamma;" : "Γ",
-"&Delta;" : "Δ",
-"&Epsilon;" : "Ε",
-"&Zeta;" : "Ζ",
-"&Eta;" : "Η",
-"&Theta;" : "Θ",
-"&Iota;" : "Ι",
-"&Kappa;" : "Κ",
-"&Lambda;" : "Λ",
-"&Mu;" : "Μ",
-"&Nu;" : "�",
-"&Xi;" : "Ξ",
-"&Omicron;" : "Ο ",
-"&Pi;" : "Π",
-"&Rho;" : "Ρ",
-"&Sigma;" : "Σ",
-"&Tau;" : "Τ",
-"&Upsilon;" : "Î¥",
-"&Phi;" : "Φ",
-"&Chi;" : "Χ",
-"&Psi;" : "Ψ",
-"&Omega;" : "Ω",
-"&alpha;" : "α",
-"&beta;" : "β",
-"&gamma;" : "γ",
-"&delta;" : "δ",
-"&epsilon;" : "ε",
-"&zeta;" : "ζ",
-"&eta;" : "η",
-"&theta;" : "θ",
-"&iota;" : "ι",
-"&kappa;" : "κ",
-"&lambda;" : "λ",
-"&mu;" : "μ",
-"&nu;" : "ν",
-"&xi;" : "ξ",
-"&omicron;" : "ο",
-"&pi;" : "Ï€",
-"&rho;" : "�",
-"&sigmaf;" : "Ï‚",
-"&sigma;" : "σ",
-"&tau;" : "Ï„",
-"&upsilon;" : "Ï…",
-"&phi;" : "φ",
-"&omega;" : "ω",
-"&bull;" : "•",
-"&hellip;" : "…",
-"&prime;" : "′",
-"&Prime;" : "″",
-"&oline;" : "‾",
-"&frasl;" : "�",
-"&trade;" : "â„¢",
-"&larr;" : "�",
-"&uarr;" : "↑",
-"&rarr;" : "→",
-"&darr;" : "↓",
-"&harr;" : "↔",
-"&rArr;" : "⇒",
-"&part;" : "∂",
-"&prod;" : "�",
-"&sum;" : "∑",
-"&minus;" : "−",
-"&radic;" : "√",
-"&infin;" : "∞",
-"&cap;" : "∩",
-"&int;" : "∫",
-"&asymp;" : "≈",
-"&ne;" : "≠",
-"&equiv;" : "≡",
-"&le;" : "≤",
-"&ge;" : "≥",
-"&loz;" : "â—Š",
-"&spades;" : "â™ ",
-"&clubs;" : "♣",
-"&hearts;" : "♥",
-"&diams;" : "♦",
-"&OElig;" : "Å’",
-"&oelig;" : "Å“",
-"&Scaron;" : "Å ",
-"&scaron;" : "Å¡",
-"&Yuml;" : "Ÿ",
-"&circ;" : "ˆ",
-"&tilde;" : "˜",
-"&ndash;" : "–",
-"&mdash;" : "—",
-"&lsquo;" : "‘",
-"&rsquo;" : "’",
-"&sbquo;" : "‚",
-"&ldquo;" : "“",
-"&rdquo;" : "�",
-"&bdquo;" : "„",
-"&dagger;" : "†",
-"&Dagger;" : "‡",
-"&permil;" : "‰",
-"&lsaquo;" : "‹",
-"&rsaquo;" : "›",
-"&euro;" : "€",
-
-	// \x22 means '"' -- we use hex reprezentation so that we don't disturb
-	// JS compressors (well, at least mine fails.. ;)
-	
-	"&nbsp;" : "\xA0",
-	"&#8804;" : String.fromCharCode(0x2264), 
-	"&#8805;" : String.fromCharCode(0x2265)
-}
diff --git a/web/imcms/xinha/plugins/HtmlEntities/html-entities.js b/web/imcms/xinha/plugins/HtmlEntities/html-entities.js
deleted file mode 100644
index 69e493d355..0000000000
--- a/web/imcms/xinha/plugins/HtmlEntities/html-entities.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*------------------------------------------*\
-HtmlEntities for Xinha
-____________________
-
-Intended to faciliate the use of special characters with ISO 8 bit encodings.
-
-Using the conversion map provided by mharrisonline in ticket #127
-
-If you want to adjust the list, e.g. to except the characters that are available in the used charset,
-edit Entities.js. 
-You may save it under a different name using the xinha_config.HtmlEntities.EntitiesFile variable
-
-ISO-8859-1 preset is default, set
-  
-  xinha_config.HtmlEntities.Encoding = null;
-
-if you want all special characters to be converted or want to load a custom file 
-\*------------------------------------------*/
-
-function HtmlEntities(editor) {
-	this.editor = editor;
-}
-
-HtmlEntities._pluginInfo = {
-  name          : "HtmlEntities",
-  version       : "1.0",
-  developer     : "Raimund Meyer",
-  developer_url : "http://rheinauf.de",
-  c_owner       : "Xinha community",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "Creative Commons Attribution-ShareAlike License"
-}
-Xinha.Config.prototype.HtmlEntities =
-{
-	Encoding     : 'iso-8859-1',
-	EntitiesFile : _editor_url + "plugins/HtmlEntities/Entities.js"
-}
-HtmlEntities.prototype.onGenerate = function() {
-    var e = this.editor;
-    var url = (e.config.HtmlEntities.Encoding) ?  _editor_url + "plugins/HtmlEntities/"+e.config.HtmlEntities.Encoding+".js" : e.config.HtmlEntities.EntitiesFile;
-    var callback = function (getback) {
-    	var specialReplacements = e.config.specialReplacements;
-    	eval("var replacements =" + getback);
-    	for (var i in  replacements)
-		{
-			specialReplacements[i] =  replacements[i];	
-		}
-    }
-    Xinha._getback(url,callback);
-}
diff --git a/web/imcms/xinha/plugins/HtmlEntities/iso-8859-1.js b/web/imcms/xinha/plugins/HtmlEntities/iso-8859-1.js
deleted file mode 100644
index 92c5aaeec6..0000000000
--- a/web/imcms/xinha/plugins/HtmlEntities/iso-8859-1.js
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-"&fnof;" : "Æ’",
-"&Alpha;" : "Α",
-"&Beta;" : "Î’",
-"&Gamma;" : "Γ",
-"&Delta;" : "Δ",
-"&Epsilon;" : "Ε",
-"&Zeta;" : "Ζ",
-"&Eta;" : "Η",
-"&Theta;" : "Θ",
-"&Iota;" : "Ι",
-"&Kappa;" : "Κ",
-"&Lambda;" : "Λ",
-"&Mu;" : "Μ",
-"&Nu;" : "�",
-"&Xi;" : "Ξ",
-"&Omicron;" : "Ο ",
-"&Pi;" : "Π",
-"&Rho;" : "Ρ",
-"&Sigma;" : "Σ",
-"&Tau;" : "Τ",
-"&Upsilon;" : "Î¥",
-"&Phi;" : "Φ",
-"&Chi;" : "Χ",
-"&Psi;" : "Ψ",
-"&Omega;" : "Ω",
-"&alpha;" : "α",
-"&beta;" : "β",
-"&gamma;" : "γ",
-"&delta;" : "δ",
-"&epsilon;" : "ε",
-"&zeta;" : "ζ",
-"&eta;" : "η",
-"&theta;" : "θ",
-"&iota;" : "ι",
-"&kappa;" : "κ",
-"&lambda;" : "λ",
-"&mu;" : "μ",
-"&nu;" : "ν",
-"&xi;" : "ξ",
-"&omicron;" : "ο",
-"&pi;" : "Ï€",
-"&rho;" : "�",
-"&sigmaf;" : "Ï‚",
-"&sigma;" : "σ",
-"&tau;" : "Ï„",
-"&upsilon;" : "Ï…",
-"&phi;" : "φ",
-"&omega;" : "ω",
-"&bull;" : "•",
-"&hellip;" : "…",
-"&prime;" : "′",
-"&Prime;" : "″",
-"&oline;" : "‾",
-"&frasl;" : "�",
-"&trade;" : "â„¢",
-"&larr;" : "�",
-"&uarr;" : "↑",
-"&rarr;" : "→",
-"&darr;" : "↓",
-"&harr;" : "↔",
-"&rArr;" : "⇒",
-"&part;" : "∂",
-"&prod;" : "�",
-"&sum;" : "∑",
-"&minus;" : "−",
-"&radic;" : "√",
-"&infin;" : "∞",
-"&cap;" : "∩",
-"&int;" : "∫",
-"&asymp;" : "≈",
-"&ne;" : "≠",
-"&equiv;" : "≡",
-"&le;" : "≤",
-"&ge;" : "≥",
-"&loz;" : "â—Š",
-"&spades;" : "â™ ",
-"&clubs;" : "♣",
-"&hearts;" : "♥",
-"&diams;" : "♦",
-"&OElig;" : "Å’",
-"&oelig;" : "Å“",
-"&Scaron;" : "Å ",
-"&scaron;" : "Å¡",
-"&Yuml;" : "Ÿ",
-"&circ;" : "ˆ",
-"&tilde;" : "˜",
-"&ndash;" : "–",
-"&mdash;" : "—",
-"&lsquo;" : "‘",
-"&rsquo;" : "’",
-"&sbquo;" : "‚",
-"&ldquo;" : "“",
-"&rdquo;" : "�",
-"&bdquo;" : "„",
-"&dagger;" : "†",
-"&Dagger;" : "‡",
-"&permil;" : "‰",
-"&lsaquo;" : "‹",
-"&rsaquo;" : "›",
-"&euro;" : "€",
-
-	// \x22 means '"' -- we use hex reprezentation so that we don't disturb
-	// JS compressors (well, at least mine fails.. ;)
-	
-	"&nbsp;" : "\xA0",
-	"&#8804;" : String.fromCharCode(0x2264), 
-	"&#8805;" : String.fromCharCode(0x2265)
-}
diff --git a/web/imcms/xinha/plugins/HtmlTidy/README b/web/imcms/xinha/plugins/HtmlTidy/README
deleted file mode 100644
index a3e19f2c85..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/README
+++ /dev/null
@@ -1,104 +0,0 @@
-// Plugin for htmlArea to run code through the server's HTML Tidy
-// By Adam Wright, for The University of Western Australia
-//
-//   Email:      zeno@ucc.gu.uwa.edu.au
-//   Homepage:   http://blog.hipikat.org/
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-//
-// Version: 0.5
-// Released to the outside world: 04/03/04
-
-
-HtmlTidy is a plugin for the popular cross-browser TTY WYSIWYG editor,
-htmlArea (http://www.interactivetools.com/products/htmlarea/). HtmlTidy
-basically queries HTML Tidy (http://tidy.sourceforge.net/) on the
-server side, getting it to make-html-nice, instead of relying on masses
-of javascript, which the client would have to download.
-
-Hi, this is a quick explanation of how to install HtmlTidy. Much better
-documentation is probably required, and you're welcome to write it :)
-
-
-* The HtmlTidy directory you should have found this file in should
-  include the following:
-
-  - README
-        This file, providing help installing the plugin.
-
-  - html-tidy-config.cfg
-        This file contains the configuration options HTML Tidy uses to
-        clean html, and can be modified to suit your organizations
-        requirements.
-
-  - html-tidy-logic.php
-        This is the php script, which is queried with dirty html and is
-        responsible for invoking HTML Tidy, getting nice new html and
-        returning it to the client.
-
-  - html-tidy.js
-        The main htmlArea plugin, providing functionality to tidy html
-        through the htmlArea interface.
-
-  - htmlarea.js.onmode_event.diff
-        At the time of publishing, an extra event handler was required
-        inside the main htmlarea.js file. htmlarea.js may be patched
-        against this file to make the changes reuquired, but be aware
-        that the event handler may either now be in the core or
-        htmlarea.js may have changed enough to invalidate the patch.
-	
-	UPDATE: now it exists in the official htmlarea.js; applying
-	this patch is thus no longer necessary.
-
-  - img/html-tidy.gif
-        The HtmlTidy icon, for the htmlArea toolbar. Created by Dan
-        Petty for The University of Western Australia.
-
-  - lang/en.js
-        English language file. Add your own language files here and
-        please contribute back into the htmlArea community!
-
-  The HtmlArea directory should be extracted to your htmlarea/plugins/
-  directory.
-
-
-* Make sure the onMode event handler mentioned above, regarding
-  htmlarea.js.onmode_event.diff, exists in your htmlarea.js
-
-
-* html-tidy-logic.php should be executable, and your web server should
-  be configured to execute php scripts in the directory
-  html-tidy-logic.php exists in.
-
-
-* HTML Tidy needs to be installed on your server, and 'tidy' should be
-  an alias to it, lying in the PATH known to the user executing such
-  web scripts.
-
-
-* In your htmlArea configuration, do something like this:
-
-    HTMLArea.loadPlugin("HtmlTidy");
-
-    editor = new HTMLArea("doc");
-    editor.registerPlugin("HtmlTidy");
-
-
-* Then, in your htmlArea toolbar configuration, use:
-
-    - "HT-html-tidy"
-        This will create the 'tidy broom' icon on the toolbar, which
-        will attempt to tidy html source when clicked, and;
-
-    - "HT-auto-tidy"
-        This will create an "Auto Tidy" / "Don't Tidy" dropdown, to
-        select whether the source should be tidied automatically when
-        entering source view. On by default, if you'd like it otherwise
-        you can do so programatically after generating the toolbar :)
-        (Or just hack it to be otherwise...)
-    
-
-Thank you.
-
-Any bugs you find can be emailed to zeno@ucc.gu.uwa.edu.au
diff --git a/web/imcms/xinha/plugins/HtmlTidy/html-tidy-config.cfg b/web/imcms/xinha/plugins/HtmlTidy/html-tidy-config.cfg
deleted file mode 100644
index 7616992769..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/html-tidy-config.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-// Default configuration file for the htmlArea, HtmlTidy plugin
-// By Adam Wright, for The University of Western Australia
-//
-// Evertything you always wanted to know about HTML Tidy *
-// can be found at http://tidy.sourceforge.net/, and a
-// quick reference to the configuration options exists at
-// http://tidy.sourceforge.net/docs/quickref.html
-//
-// * But were afraid to ask
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-word-2000: yes
-clean: yes
-drop-font-tags: no
-doctype: auto
-drop-empty-paras: yes
-drop-proprietary-attributes: yes
-enclose-block-text: yes
-enclose-text: yes
-escape-cdata: yes
-logical-emphasis: yes
-indent: auto
-indent-spaces: 2
-break-before-br: yes
-output-xhtml: yes
-
-force-output: yes
diff --git a/web/imcms/xinha/plugins/HtmlTidy/html-tidy-logic.php b/web/imcms/xinha/plugins/HtmlTidy/html-tidy-logic.php
deleted file mode 100755
index c457e0fee0..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/html-tidy-logic.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php 
-##
-##  Plugin for htmlArea, to run code through the server's HTML Tidy
-##   By Adam Wright, for The University of Western Australia
-##    This is the server-side script, which dirty code is run through.
-##
-##  Distributed under the same terms as HTMLArea itself.
-##  This notice MUST stay intact for use (see license.txt).
-##
-
-	// Get the original source
-	$source = $_POST['htisource_name'];
-	$source = stripslashes($source);
-  $cwd = str_replace("\\","/",getcwd())."/";
-  
-	// Open a tidy process - I hope it's installed!
-	$descriptorspec = array(
-		0 => array("pipe", "r"),
-		1 => array("pipe", "w")
-	);
-	$process = @proc_open("tidy -utf8 -config {$cwd}html-tidy-config.cfg", $descriptorspec, $pipes);
-
-
-	// Make sure the program started and we got the hooks...
-	// Either way, get some source code into $source
-	if (is_resource($process)) {
-
-		// Feed untidy source into the stdin
-		fwrite($pipes[0], $source);
-		fclose($pipes[0]);
-
-		// Read clean source out to the browser
-		while (!feof($pipes[1])) {
-			//echo fgets($pipes[1], 1024);
-			$newsrc .= fgets($pipes[1], 1024);
-		}
-		fclose($pipes[1]);
-
-		// Clean up after ourselves
-		proc_close($process);
-
-	} else {
-    /* Use tidy if it's available from PECL */
-    if( function_exists('tidy_parse_string') )
-    {
-      $tempsrc = tidy_parse_string($source);
-      tidy_clean_repair();
-      $newsrc = tidy_get_output();
-    }
-    else
-    {
-      // Better give them back what they came with, so they don't lose it all...
-      $newsrc = "<body>\n" .$source. "\n</body>";
-    }
-	}
-
-	// Split our source into an array by lines
-	$srcLines = preg_split("/\n/",$newsrc,-1,PREG_SPLIT_NO_EMPTY);
-
-	// Get only the lines between the body tags
-	$startLn = 0;
-	while ( strpos( $srcLines[$startLn++], '<body' ) === false && $startLn < sizeof($srcLines) );
-	$endLn = $startLn;
-	while ( strpos( $srcLines[$endLn++], '</body' ) === false && $endLn < sizeof($srcLines) );
-
-	$srcLines = array_slice( $srcLines, $startLn, ($endLn - $startLn - 1) );
-
-	// Create a set of javascript code to compile a new source string
-	foreach ($srcLines as $line) {
-		$jsMakeSrc .= "\tns += '" . str_replace("'","\'",$line) . "\\n';\n";
-	}
-if(!sizeof($srcLines)) {
-    echo "alert(HTMLArea._lc('Tidy failed.  Check your HTML for syntax errors.', 'HtmlTidy'));\n";
-} else {
-?>
-var ns="";
-<?php echo $jsMakeSrc; ?>
-editor.setHTML(ns);
-<? } ?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlTidy/html-tidy.js b/web/imcms/xinha/plugins/HtmlTidy/html-tidy.js
deleted file mode 100644
index 464ef13cc4..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/html-tidy.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Plugin for htmlArea to run code through the server's HTML Tidy
-// By Adam Wright, for The University of Western Australia
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function HtmlTidy(editor) {
-	this.editor = editor;
-
-	var cfg = editor.config;
-	var bl = HtmlTidy.btnList;
-	var self = this;
-
-	this.onMode = this.__onMode;
-
-	// register the toolbar buttons provided by this plugin
-	var toolbar = [];
-	for (var i = 0; i < bl.length; ++i) {
-		var btn = bl[i];
-		if (btn == "html-tidy") {
-			var id = "HT-html-tidy";
-			cfg.registerButton(id, this._lc("HTML Tidy"), editor.imgURL(btn[0] + ".gif", "HtmlTidy"), true,
-					   function(editor, id) {
-						   // dispatch button press event
-						   self.buttonPress(editor, id);
-					   }, btn[1]);
-			toolbar.push(id);
-		} else if (btn == "html-auto-tidy") {
-            var btnTxt = [this._lc("Auto-Tidy"), this._lc("Don't Tidy")];
-            var optionItems = new Object();
-            optionItems[btnTxt[0]] = "auto";
-            optionItems[btnTxt[1]] = "noauto";
-			var ht_class = {
-				id	: "HT-auto-tidy",
-				options	: optionItems,
-				action	: function (editor) { self.__onSelect(editor, this); },
-				refresh	: function (editor) { },
-				context	: "body"
-			};
-			cfg.registerDropdown(ht_class);
-		}
-	}
-
-	for (var i in toolbar) {
-		cfg.toolbar[0].push(toolbar[i]);
-	}
-}
-
-HtmlTidy._pluginInfo = {
-	name          : "HtmlTidy",
-	version       : "1.0",
-	developer     : "Adam Wright",
-	developer_url : "http://blog.hipikat.org/",
-	sponsor       : "The University of Western Australia",
-	sponsor_url   : "http://www.uwa.edu.au/",
-	license       : "htmlArea"
-};
-
-HtmlTidy.prototype._lc = function(string) {
-    return Xinha._lc(string, 'HtmlTidy');
-};
-
-HtmlTidy.prototype.__onSelect = function(editor, obj) {
-	// Get the toolbar element object
-	var elem = editor._toolbarObjects[obj.id].element;
-
-	// Set our onMode event appropriately
-	if (elem.value == "auto")
-		this.onMode = this.__onMode;
-	else
-		this.onMode = null;
-};
-
-HtmlTidy.prototype.__onMode = function(mode) {
-	if ( mode == "textmode" ) {
-		this.buttonPress(this.editor, "HT-html-tidy");
-	}
-};
-
-HtmlTidy.btnList = [
-		    null, // separator
-		    ["html-tidy"],
-		    ["html-auto-tidy"]
-];
-
-HtmlTidy.prototype.buttonPress = function(editor, id) {
-
-	switch (id)
-  {
-    case "HT-html-tidy":
-    {
-      var oldhtml = editor.getHTML();
-      if(oldhtml=="") break; //don't clean empty text
-      // Ask the server for some nice new html, based on the old...
-      Xinha._postback(_editor_url + 'plugins/HtmlTidy/html-tidy-logic.php', {'htisource_name' : oldhtml},
-                            function(javascriptResponse) { eval(javascriptResponse) });
-    }
-		break;
-	}
-};
-
-HtmlTidy.prototype.processTidied = function(newSrc) {
-	editor = this.editor;
-	editor.setHTML(newSrc);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlTidy/img/html-tidy.gif b/web/imcms/xinha/plugins/HtmlTidy/img/html-tidy.gif
deleted file mode 100644
index 50cc6a7f2f..0000000000
Binary files a/web/imcms/xinha/plugins/HtmlTidy/img/html-tidy.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/HtmlTidy/lang/de.js b/web/imcms/xinha/plugins/HtmlTidy/lang/de.js
deleted file mode 100644
index ce69fc2647..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/lang/de.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Author: Raimund Meyer ray@ray-of-light.org
-{
-  "HTML Tidy": "HTML Tidy",
-	"Tidy failed.  Check your HTML for syntax errors.": "Tidy fehlgeschlagen. Prüfen Sie den HTML Code nach Syntax-Fehlern."  
-};
diff --git a/web/imcms/xinha/plugins/HtmlTidy/lang/fr.js b/web/imcms/xinha/plugins/HtmlTidy/lang/fr.js
deleted file mode 100644
index 5312a08651..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/lang/fr.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "HTML Tidy": "HTML Tidy",
-  "Auto-Tidy": "Tidy automatique",
-  "Don't Tidy": "Tidy non utilisé",
-  "Tidy failed.  Check your HTML for syntax errors.": "Tidy a échoué. Vérifiez votre HTML for des erreurs de syntaxe"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlTidy/lang/ja.js b/web/imcms/xinha/plugins/HtmlTidy/lang/ja.js
deleted file mode 100644
index 539e0dd892..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/lang/ja.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "HTML Tidy": "HTML Tidy",
-  "Auto-Tidy": "自動�正化",
-  "Don't Tidy": "�正化���",
-  "Tidy failed.  Check your HTML for syntax errors.":"�正化�失敗����。HTML�文法エラーを確�������。"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlTidy/lang/nb.js b/web/imcms/xinha/plugins/HtmlTidy/lang/nb.js
deleted file mode 100644
index d94d44f4a6..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/lang/nb.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "HTML Tidy": "HTML Tidy",
-  "Tidy failed.  Check your HTML for syntax errors.": "Tidy feilet. Sjekk HTML koden for syntaksfeil."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlTidy/lang/nl.js b/web/imcms/xinha/plugins/HtmlTidy/lang/nl.js
deleted file mode 100644
index bc2f7188ba..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/lang/nl.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-{
-  "HT-html-tidy": "HTML opschonen"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlTidy/lang/no.js b/web/imcms/xinha/plugins/HtmlTidy/lang/no.js
deleted file mode 100644
index f7fafef265..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/lang/no.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "HTML Tidy": "HTML Tidy",
-  "Tidy failed.  Check your HTML for syntax errors.": "Tidy feilet. Sjekk HTML koden for syntaksfeil."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/HtmlTidy/lang/pt_br.js b/web/imcms/xinha/plugins/HtmlTidy/lang/pt_br.js
deleted file mode 100644
index 859bbbf6fb..0000000000
--- a/web/imcms/xinha/plugins/HtmlTidy/lang/pt_br.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-
-// Last revision: 05 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Auto-Tidy": "Auto-Tidy",
-  "Don't Tidy": "Sem Tidy",
-  "HTML Tidy": "HTML Tidy",
-  "Tidy failed.  Check your HTML for syntax errors.": "Tidy falhou. Verifique erros de sintaxe em seu HTML."
-}
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/Files.php b/web/imcms/xinha/plugins/ImageManager/Classes/Files.php
deleted file mode 100644
index 2275112e3c..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/Files.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-/**
- * File Utilities.
- * @author $Author: koto $
- * @version $Id: Files.php 841 2007-05-27 13:31:51Z koto $
- * @package ImageManager
- */
-
-define('FILE_ERROR_NO_SOURCE', 100);
-define('FILE_ERROR_COPY_FAILED', 101);
-define('FILE_ERROR_DST_DIR_FAILED', 102);
-define('FILE_COPY_OK', 103);
-define('FILE_ERROR_DST_DIR_EXIST', 104);
-
-/**
- * File Utilities
- * @author $Author: koto $
- * @version $Id: Files.php 841 2007-05-27 13:31:51Z koto $
- * @package ImageManager
- * @subpackage files
- */
-class Files 
-{
-	
-	/**
-	 * Copy a file from source to destination. If unique == true, then if
-	 * the destination exists, it will be renamed by appending an increamenting 
-	 * counting number.
-	 * @param string $source where the file is from, full path to the files required
-	 * @param string $destination_file name of the new file, just the filename
-	 * @param string $destination_dir where the files, just the destination dir,
-	 * e.g., /www/html/gallery/
-	 * @param boolean $unique create unique destination file if true.
-	 * @return string the new copied filename, else error if anything goes bad.
-	 */
-	function copyFile($source, $destination_dir, $destination_file, $unique=true) 
-	{
-		if(!(file_exists($source) && is_file($source))) 
-			return FILE_ERROR_NO_SOURCE;
-
-		$destination_dir = Files::fixPath($destination_dir);
-
-		if(!is_dir($destination_dir)) 
-			Return FILE_ERROR_DST_DIR_FAILED;
-
-		$filename = Files::escape($destination_file);
-
-		if($unique) 
-		{
-			$dotIndex = strrpos($destination_file, '.');
-			$ext = '';
-			if(is_int($dotIndex)) 
-			{
-				$ext = substr($destination_file, $dotIndex);
-				$base = substr($destination_file, 0, $dotIndex);
-			}
-			$counter = 0;
-			while(is_file($destination_dir.$filename)) 
-			{
-				$counter++;
-				$filename = $base.'_'.$counter.$ext;
-			}
-		}
-
-		if (!copy($source, $destination_dir.$filename))
-			return FILE_ERROR_COPY_FAILED;
-		
-		//verify that it copied, new file must exists
-		if (is_file($destination_dir.$filename))
-			Return $filename;
-		else
-			return FILE_ERROR_COPY_FAILED;
-	}
-
-	/**
-	 * Create a new folder.
-	 * @param string $newFolder specifiy the full path of the new folder.
-	 * @return boolean true if the new folder is created, false otherwise.
-	 */
-	function createFolder($newFolder) 
-	{
-		mkdir ($newFolder, 0777);
-		return chmod($newFolder, 0777);
-	}
-
-
-	/**
-	 * Escape the filenames, any non-word characters will be
-	 * replaced by an underscore.
-	 * @param string $filename the orginal filename
-	 * @return string the escaped safe filename
-	 */
-	function escape($filename)
-	{
-		Return preg_replace('/[^\w\._]/', '_', $filename);
-	}
-
-	/**
-	 * Delete a file.
-	 * @param string $file file to be deleted
-	 * @return boolean true if deleted, false otherwise.
-	 */
-	function delFile($file) 
-	{
-		if(is_file($file)) 
-			Return unlink($file);
-		else
-			Return false;
-	}
-
-	/**
-	 * Delete folder(s), can delete recursively.
-	 * @param string $folder the folder to be deleted.
-	 * @param boolean $recursive if true, all files and sub-directories
-	 * are delete. If false, tries to delete the folder, can throw
-	 * error if the directory is not empty.
-	 * @return boolean true if deleted.
-	 */
-	function delFolder($folder, $recursive=false) 
-	{
-		$deleted = true;
-		if($recursive) 
-		{
-			$d = dir($folder);
-			while (false !== ($entry = $d->read())) 
-			{
-				if ($entry != '.' && $entry != '..')
-				{
-					$obj = Files::fixPath($folder).$entry;
-					//var_dump($obj);
-					if (is_file($obj))
-					{
-						$deleted &= Files::delFile($obj);					
-					}
-					else if(is_dir($obj))
-					{
-						$deleted &= Files::delFolder($obj, $recursive);
-					}
-					
-				}
-			}
-			$d->close();
-
-		}
-
-		//$folder= $folder.'/thumbs';
-		//var_dump($folder);
-		if(is_dir($folder)) 
-			$deleted &= rmdir($folder);
-		else
-			$deleted &= false;
-
-		Return $deleted;
-	}
-
-	/**
-	 * Append a / to the path if required.
-	 * @param string $path the path
-	 * @return string path with trailing /
-	 */
-	function fixPath($path) 
-	{
-		//append a slash to the path if it doesn't exists.
-		if(!(substr($path,-1) == '/'))
-			$path .= '/';
-		Return $path;
-	}
-
-	/**
-	 * Concat two paths together. Basically $pathA+$pathB
-	 * @param string $pathA path one
-	 * @param string $pathB path two
-	 * @return string a trailing slash combinded path.
-	 */
-	function makePath($pathA, $pathB) 
-	{
-		$pathA = Files::fixPath($pathA);
-		if(substr($pathB,0,1)=='/')
-			$pathB = substr($pathB,1);
-		Return Files::fixPath($pathA.$pathB);
-	}
-
-	/**
-	 * Similar to makePath, but the second parameter
-	 * is not only a path, it may contain say a file ending.
-	 * @param string $pathA the leading path
-	 * @param string $pathB the ending path with file
-	 * @return string combined file path.
-	 */
-	function makeFile($pathA, $pathB) 
-	{		
-		$pathA = Files::fixPath($pathA);
-		if(substr($pathB,0,1)=='/')
-			$pathB = substr($pathB,1);
-		
-		Return $pathA.$pathB;
-	}
-
-	
-	/**
-	 * Format the file size, limits to Mb.
-	 * @param int $size the raw filesize
-	 * @return string formated file size.
-	 */
-	function formatSize($size) 
-	{
-		if($size < 1024) 
-			return $size.' bytes';	
-		else if($size >= 1024 && $size < 1024*1024) 
-			return sprintf('%01.2f',$size/1024.0).' KB';
-		else
-			return sprintf('%01.2f',$size/(1024.0*1024)).' MB';
-	}
-
-	/**
-	 * Returns size of a directory, with all file & subdirectory
-	 * sizes added up
-	 * @param string dir path
-	 * @return int
-	 */
-	function dirSize($dirName = '.')
-	{
-		$dir  = dir($dirName);
-		$size = 0;
-
-		while ($file = $dir->read()) {
-			if ($file != '.' && $file != '..')
-			{
-				if (is_dir("$dirName$file"))
-				{
-					$size += Files::dirSize($dirName . '/' . $file);
-				}
-				else
-				{
-					$size += filesize($dirName . '/' . $file);
-				}
-			}
-		}
-		$dir->close();
-		return $size;
-	}
-	
-	/**
-	 * Renames file, preserving its directory and extension
-	 * @param string $oldPath path to the old existing file
-	 * @param string new filename (just the name, without path or extension)
-	 * @author Krzysztof Kotowicz <koto@webworkers.pl>
-	 */
-	function renameFile($oldPath, $newName) {
-
-		if(!(file_exists($oldPath) && is_file($oldPath)))
-			return FILE_ERROR_NO_SOURCE;
-
-		$oldFileParts = pathinfo($oldPath);
-
-		$newPath = $oldFileParts['dirname'] . '/'
-				   . $newName
-				   . (!empty($oldFileParts['extension']) ? '.' . $oldFileParts['extension'] : '');
-
-		if (file_exists($newPath))
-			return false;
-
-		if (!rename($oldPath, $newPath))
-			return FILE_ERROR_COPY_FAILED;
-
-	}
-	
-	function rename ($oldPath,$newPath)
-	{
-		if(!(is_dir($oldPath) || is_file($oldPath)))
-			return FILE_ERROR_NO_SOURCE;
-		
-		if (file_exists($newPath))
-			return FILE_ERROR_DST_DIR_EXIST;
-
-		$ret = rename($oldPath, $newPath);
-		if (!$ret)
-			return FILE_ERROR_COPY_FAILED;
-		else return FILE_COPY_OK;
-	}
-	
-	/**
-	 * copy a directory and all subdirectories and files (recursive)
-	 * @author SBoisvert at Don'tSpamMe dot Bryxal dot ca (adapted from php.net)
-	 * @author Raimund Meyer
-	 * @param string base path
-	 * @param string source directory
-	 * @param string destination directory
-	 * @param bool   overwrite existing files
-	 *  
-	 * @return mixed bool true on pass, number on fail
-	 */
-  	function copyDir($basePath, $source, $dest, $overwrite = false)
-	{
-		if(!is_dir($basePath . $dest))
-		{
-			if (!@mkdir($basePath . $dest)) return FILE_ERROR_DST_DIR_FAILED;	
-		}
-		if($handle = opendir($basePath . $source))
-		{        // if the folder exploration is sucsessful, continue
-			while( ($file = readdir($handle)) !== false)
-			{ // as long as storing the next file to $file is successful, continue
-				if($file != '.' && $file != '..')
-				{
-					$path = $source . '/' . $file;
-					if(is_file($basePath . $path))
-					{
-						/*if(!is_file($basePath . $dest . '/' . $file) || $overwrite)
-						{
-							if(!@copy($basePath . $path, $basePath . $dest . '/' . $file))
-							{
-							  return FILE_ERROR_COPY_FAILED;
-							}
-						}*/
-						Files::copyFile($basePath . $path, $basePath . $dest . '/', $file, true);
-					} 
-					elseif(is_dir($basePath . $path))
-					{
-						if(!is_dir($basePath . $dest . '/' . $file))
-						{
-							mkdir($basePath . $dest . '/' . $file); // make subdirectory before subdirectory is copied
-							Files::copyDir($basePath, $path, $dest . '/' . $file, $overwrite); //recurse!
-						}
-					}
-				}
-			}
-			closedir($handle);
-		}
-		return true;
-	}
-}
-
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/GD.php b/web/imcms/xinha/plugins/ImageManager/Classes/GD.php
deleted file mode 100644
index 68b7a85af8..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/GD.php
+++ /dev/null
@@ -1,503 +0,0 @@
-<?php
-/***********************************************************************
-** Title.........:  GD Driver
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  GD.php
-** Last changed..:  30 Aug 2003 
-** Notes.........:  Orginal is from PEAR
-**/
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Peter Bowyer <peter@mapledesign.co.uk>                      |
-// |          Alan Knowles <alan@akbkhome.com>                            |
-// +----------------------------------------------------------------------+
-//
-//    Usage :
-//    $img    = new Image_Transform_GD();
-//    $angle  = -78;
-//    $img->load('magick.png');
-//
-//    if($img->rotate($angle,array('autoresize'=>true,'color_mask'=>array(255,0,0)))){
-//        $img->addText(array('text'=>"Rotation $angle",'x'=>0,'y'=>100,'font'=>'/usr/share/fonts/default/TrueType/cogb____.ttf'));
-//        $img->display();
-//    } else {
-//        echo "Error";
-//    }
-//
-//
-// $Id: GD.php 709 2007-01-30 23:22:04Z ray $
-//
-// Image Transformation interface using the GD library
-//
-
-require_once "../ImageManager/Classes/Transform.php";
-
-Class Image_Transform_Driver_GD extends Image_Transform
-{
-    /**
-     * Holds the image file for manipulation
-     */
-    var $imageHandle = '';
-
-    /**
-     * Holds the original image file
-     */
-    var $old_image = '';
-
-    /**
-     * Check settings
-     *
-     * @return mixed true or  or a PEAR error object on error
-     *
-     * @see PEAR::isError()
-     */
-    function Image_Transform_GD()
-    {
-        return;
-    } // End function Image
-
-    /**
-     * Load image
-     *
-     * @param string filename
-     *
-     * @return mixed none or a PEAR error object on error
-     * @see PEAR::isError()
-     */
-    function load($image)
-    {
-        $this->uid = md5($_SERVER['REMOTE_ADDR']);
-        $this->image = $image;
-        $this->_get_image_details($image);
-        $functionName = 'ImageCreateFrom' . $this->type;
-		if(function_exists($functionName))
-		{
-			$this->imageHandle = $functionName($this->image);
-		}
-    } // End load
-
-    /**
-     * addText
-     *
-     * @param   array   options     Array contains options
-     *                              array(
-     *                                  'text'  The string to draw
-     *                                  'x'     Horizontal position
-     *                                  'y'     Vertical Position
-     *                                  'Color' Font color
-     *                                  'font'  Font to be used
-     *                                  'size'  Size of the fonts in pixel
-     *                                  'resize_first'  Tell if the image has to be resized
-     *                                                  before drawing the text
-     *                              )
-     *
-     * @return none
-     * @see PEAR::isError()
-     */
-    function addText($params)
-    {
-        $default_params = array(
-                                'text' => 'This is Text',
-                                'x' => 10,
-                                'y' => 20,
-                                'color' => array(255,0,0),
-                                'font' => 'Arial.ttf',
-                                'size' => '12',
-                                'angle' => 0,
-                                'resize_first' => false // Carry out the scaling of the image before annotation?  Not used for GD
-                                );
-        $params = array_merge($default_params, $params);
-        extract($params);
-
-        if( !is_array($color) ){
-            if ($color[0]=='#'){
-                $this->colorhex2colorarray( $color );
-            } else {
-                include_once('Image/Transform/Driver/ColorsDefs.php');
-                $color = isset($colornames[$color])?$colornames[$color]:false;
-            }
-        }
-
-        $c = imagecolorresolve ($this->imageHandle, $color[0], $color[1], $color[2]);
-
-        if ('ttf' == substr($font, -3)) {
-            ImageTTFText($this->imageHandle, $size, $angle, $x, $y, $c, $font, $text);
-        } else {
-            ImagePSText($this->imageHandle, $size, $angle, $x, $y, $c, $font, $text);
-        }
-        return true;
-    } // End addText
-
-
-    /**
-     * Rotate image by the given angle
-     * Uses a fast rotation algorythm for custom angles
-     * or lines copy for multiple of 90 degrees
-     *
-     * @param int       $angle      Rotation angle
-     * @param array     $options    array(  'autoresize'=>true|false,
-     *                                      'color_mask'=>array(r,g,b), named color or #rrggbb
-     *                                   )
-     * @author Pierre-Alain Joye
-     * @return mixed none or a PEAR error object on error
-     * @see PEAR::isError()
-     */
-    function rotate($angle, $options=null)
-    {
-        if(function_exists('imagerotate')) {
-            $white = imagecolorallocate ($this->imageHandle, 255, 255, 255);
-			$this->imageHandle = imagerotate($this->imageHandle, $angle, $white);
-            return true;
-        }
-
-        if ( $options==null ){
-            $autoresize = true;
-            $color_mask = array(255,255,0);
-        } else {
-            extract( $options );
-        }
-
-        while ($angle <= -45) {
-            $angle  += 360;
-        }
-        while ($angle > 270) {
-            $angle  -= 360;
-        }
-
-        $t      = deg2rad($angle);
-
-        if( !is_array($color_mask) ){
-            if ($color[0]=='#'){
-                $this->colorhex2colorarray( $color_mask );
-            } else {
-                include_once('Image/Transform/Driver/ColorDefs.php');
-                $color = isset($colornames[$color_mask])?$colornames[$color_mask]:false;
-            }
-        }
-
-        // Do not round it, too much lost of quality
-        $cosT   = cos($t);
-        $sinT   = sin($t);
-
-        $img    =& $this->imageHandle;
-
-        $width  = $max_x  = $this->img_x;
-        $height = $max_y  = $this->img_y;
-        $min_y  = 0;
-        $min_x  = 0;
-
-        $x1     = round($max_x/2,0);
-        $y1     = round($max_y/2,0);
-
-        if ( $autoresize ){
-            $t      = abs($t);
-            $a      = round($angle,0);
-            switch((int)($angle)){
-                case 0:
-                        $width2     = $width;
-                        $height2    = $height;
-                    break;
-                case 90:
-                        $width2     = $height;
-                        $height2    = $width;
-                    break;
-                case 180:
-                        $width2     = $width;
-                        $height2    = $height;
-                    break;
-                case 270:
-                        $width2     = $height;
-                        $height2    = $width;
-                    break;
-                default:
-                    $width2     = (int)(abs(sin($t) * $height + cos($t) * $width));
-                    $height2    = (int)(abs(cos($t) * $height+sin($t) * $width));
-            }
-
-            $width2     -= $width2%2;
-            $height2    -= $height2%2;
-
-            $d_width    = abs($width - $width2);
-            $d_height   = abs($height - $height2);
-            $x_offset   = $d_width/2;
-            $y_offset   = $d_height/2;
-            $min_x2     = -abs($x_offset);
-            $min_y2     = -abs($y_offset);
-            $max_x2     = $width2;
-            $max_y2     = $height2;
-        }
-
-        $img2   = @imagecreate($width2,$height2);
-
-        if ( !is_resource($img2) ){
-            return false;/*PEAR::raiseError('Cannot create buffer for the rotataion.',
-                                null, PEAR_ERROR_TRIGGER, E_USER_NOTICE);*/
-        }
-
-        $this->img_x = $width2;
-        $this->img_y = $height2;
-
-
-        imagepalettecopy($img2,$img);
-
-        $mask   = imagecolorresolve($img2,$color_mask[0],$color_mask[1],$color_mask[2]);
-
-        // use simple lines copy for axes angles
-        switch((int)($angle)){
-            case 0:
-                imagefill ($img2, 0, 0,$mask);
-                for ($y=0; $y < $max_y; $y++) {
-                    for ($x = $min_x; $x < $max_x; $x++){
-                        $c  = @imagecolorat ( $img, $x, $y);
-                        imagesetpixel($img2,$x+$x_offset,$y+$y_offset,$c);
-                    }
-                }
-                break;
-            case 90:
-                imagefill ($img2, 0, 0,$mask);
-                for ($x = $min_x; $x < $max_x; $x++){
-                    for ($y=$min_y; $y < $max_y; $y++) {
-                        $c  = imagecolorat ( $img, $x, $y);
-                        imagesetpixel($img2,$max_y-$y-1,$x,$c);
-                    }
-                }
-                break;
-            case 180:
-                imagefill ($img2, 0, 0,$mask);
-                for ($y=0; $y < $max_y; $y++) {
-                    for ($x = $min_x; $x < $max_x; $x++){
-                        $c  = @imagecolorat ( $img, $x, $y);
-                        imagesetpixel($img2, $max_x2-$x-1, $max_y2-$y-1, $c);
-                    }
-                }
-                break;
-            case 270:
-                imagefill ($img2, 0, 0,$mask);
-                for ($y=0; $y < $max_y; $y++) {
-                    for ($x = $max_x; $x >= $min_x; $x--){
-                        $c  = @imagecolorat ( $img, $x, $y);
-                        imagesetpixel($img2,$y,$max_x-$x-1,$c);
-                    }
-                }
-                break;
-            // simple reverse rotation algo
-            default:
-                $i=0;
-                for ($y = $min_y2; $y < $max_y2; $y++){
-
-                    // Algebra :)
-                    $x2 = round((($min_x2-$x1) * $cosT) + (($y-$y1) * $sinT + $x1),0);
-                    $y2 = round((($y-$y1) * $cosT - ($min_x2-$x1) * $sinT + $y1),0);
-
-                    for ($x = $min_x2; $x < $max_x2; $x++){
-
-                        // Check if we are out of original bounces, if we are
-                        // use the default color mask
-                        if ( $x2>=0 && $x2<$max_x && $y2>=0 && $y2<$max_y ){
-                            $c  = imagecolorat ( $img, $x2, $y2);
-                        } else {
-                            $c  = $mask;
-                        }
-                        imagesetpixel($img2,$x+$x_offset,$y+$y_offset,$c);
-
-                        // round verboten!
-                        $x2  += $cosT;
-                        $y2  -= $sinT;
-                    }
-                }
-                break;
-        }
-        $this->old_image    = $this->imageHandle;
-        $this->imageHandle  =  $img2;
-        return true;
-    }
-
-
-   /**
-    * Resize Action
-    *
-    * For GD 2.01+ the new copyresampled function is used
-    * It uses a bicubic interpolation algorithm to get far
-    * better result.
-    *
-    * @param int  $new_x new width
-    * @param int  $new_y new height
-    *
-    * @return true on success or pear error
-    * @see PEAR::isError()
-    */
-    function _resize($new_x, $new_y) {
-        if ($this->resized === true) {
-            return false; /*PEAR::raiseError('You have already resized the image without saving it.  Your previous resizing will be overwritten', null, PEAR_ERROR_TRIGGER, E_USER_NOTICE);*/
-        }
-        if(function_exists('ImageCreateTrueColor')){
-            $new_img =ImageCreateTrueColor($new_x,$new_y);
-        } else {
-            $new_img =ImageCreate($new_x,$new_y);
-        }
-        if(function_exists('ImageCopyResampled')){
-            ImageCopyResampled($new_img, $this->imageHandle, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
-        } else {
-            ImageCopyResized($new_img, $this->imageHandle, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
-        }
-        $this->old_image = $this->imageHandle;
-        $this->imageHandle = $new_img;
-        $this->resized = true;
-
-        $this->new_x = $new_x;
-        $this->new_y = $new_y;
-        return true;
-    }
-
-    /**
-     * Crop the image
-     *
-     * @param int $crop_x left column of the image
-     * @param int $crop_y top row of the image
-     * @param int $crop_width new cropped image width
-     * @param int $crop_height new cropped image height
-     */
-    function crop($new_x, $new_y, $new_width, $new_height) 
-    {
-        if(function_exists('ImageCreateTrueColor')){
-            $new_img =ImageCreateTrueColor($new_width,$new_height);
-        } else {
-            $new_img =ImageCreate($new_width,$new_height);
-        }
-        if(function_exists('ImageCopyResampled')){
-            ImageCopyResampled($new_img, $this->imageHandle, 0, 0, $new_x, $new_y,$new_width,$new_height,$new_width,$new_height);
-        } else {
-            ImageCopyResized($new_img, $this->imageHandle, 0, 0, $new_x, $new_y, $new_width,$new_height,$new_width,$new_height);
-        }
-        $this->old_image = $this->imageHandle;
-        $this->imageHandle = $new_img;
-        $this->resized = true;
-
-        $this->new_x = $new_x;
-        $this->new_y = $new_y;
-        return true;
-    }
-   
-    /**
-     * Flip the image horizontally or vertically
-     *
-     * @param boolean $horizontal true if horizontal flip, vertical otherwise
-     */
-    function flip($horizontal)
-    {
-        if(!$horizontal) {
-            $this->rotate(180);
-        }
-
-        $width = imagesx($this->imageHandle); 
-        $height = imagesy($this->imageHandle); 
-
-        for ($j = 0; $j < $height; $j++) { 
-                $left = 0; 
-                $right = $width-1; 
-
-
-                while ($left < $right) { 
-                    //echo " j:".$j." l:".$left." r:".$right."\n<br>";
-                    $t = imagecolorat($this->imageHandle, $left, $j); 
-                    imagesetpixel($this->imageHandle, $left, $j, imagecolorat($this->imageHandle, $right, $j)); 
-                    imagesetpixel($this->imageHandle, $right, $j, $t); 
-                    $left++; $right--; 
-                } 
-            
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Adjust the image gamma
-     *
-     * @param float $outputgamma
-     *
-     * @return none
-     */
-    function gamma($outputgamma=1.0) {
-        ImageGammaCorrect($this->imageHandle, 1.0, $outputgamma);
-    }
-
-    /**
-     * Save the image file
-     *
-     * @param string  $filename the name of the file to write to
-     * @param int     $quality  output DPI, default is 85
-     * @param string  $types    define the output format, default
-     *                          is the current used format
-     *
-     * @return none
-     */
-    function save($filename, $type = '', $quality = 85)
-    {
-		$type           = $type==''? $this->type : $type;
-		$functionName   = 'image' . $type;
-
-		if(function_exists($functionName))
-		{
-			$this->old_image = $this->imageHandle;
-			if($type=='jpeg')
-				$functionName($this->imageHandle, $filename, $quality);
-			else
-				$functionName($this->imageHandle, $filename);
-			$this->imageHandle = $this->old_image;
-			$this->resized = false;
-		}
-    } // End save
-
-
-    /**
-     * Display image without saving and lose changes
-     *
-     * @param string type (JPG,PNG...);
-     * @param int quality 75
-     *
-     * @return none
-     */
-    function display($type = '', $quality = 75)
-    {
-        if ($type != '') {
-            $this->type = $type;
-        }
-        $functionName = 'Image' . $this->type;
-		if(function_exists($functionName))
-		{
-			header('Content-type: image/' . strtolower($this->type));
-			$functionName($this->imageHandle, '', $quality);
-			$this->imageHandle = $this->old_image;
-			$this->resized = false;
-			ImageDestroy($this->old_image);
-			$this->free();
-		}
-    }
-
-    /**
-     * Destroy image handle
-     *
-     * @return none
-     */
-    function free()
-    {
-        if ($this->imageHandle){
-            ImageDestroy($this->imageHandle);
-        }
-    }
-
-} // End class ImageGD
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/IM.php b/web/imcms/xinha/plugins/ImageManager/Classes/IM.php
deleted file mode 100644
index 37f73b6483..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/IM.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-
-/***********************************************************************
-** Title.........:  ImageMagick Driver
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  IM.php
-** Last changed..:  30 Aug 2003 
-** Notes.........:  Orginal is from PEAR
-**/
-
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Peter Bowyer <peter@mapledesign.co.uk>                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: IM.php 709 2007-01-30 23:22:04Z ray $
-//
-// Image Transformation interface using command line ImageMagick
-//
-
-require_once "../ImageManager/Classes/Transform.php";
-
-Class Image_Transform_Driver_IM extends Image_Transform
-{
-    /**
-     * associative array commands to be executed
-     * @var array
-     */
-    var $command = array();
-
-    /**
-     *
-     *
-     */
-    function Image_Transform_Driver_IM()
-    {
-        return true;
-    } // End Image_IM
-
-    /**
-     * Load image
-     *
-     * @param string filename
-     *
-     * @return mixed none or a PEAR error object on error
-     * @see PEAR::isError()
-     */
-    function load($image)
-    {
-
-        $this->uid = md5($_SERVER['REMOTE_ADDR']);
-        /*if (!file_exists($image)) {
-            return PEAR::raiseError('The image file ' . $image . ' does\'t exist', true);
-        }*/
-        $this->image = $image;
-        $this->_get_image_details($image);
-    } // End load
-
-    /**
-     * Resize Action
-     *
-     * @param int   new_x   new width
-     * @param int   new_y   new height
-     *
-     * @return none
-     * @see PEAR::isError()
-     */
-    function _resize($new_x, $new_y)
-    {
-        /*if (isset($this->command['resize'])) {
-            return PEAR::raiseError("You cannot scale or resize an image more than once without calling save or display", true);
-        }*/
-        $this->command['resize'] = "-geometry ${new_x}x${new_y}!";
-
-        $this->new_x = $new_x;
-        $this->new_y = $new_y;
-    } // End resize
-
-    /**
-     * Crop the image
-     *
-     * @param int $crop_x left column of the image
-     * @param int $crop_y top row of the image
-     * @param int $crop_width new cropped image width
-     * @param int $crop_height new cropped image height
-     */
-    function crop($crop_x, $crop_y, $crop_width, $crop_height) 
-    {
-        $this->command['crop'] = "-crop {$crop_width}x{$crop_height}+{$crop_x}+{$crop_y}";
-    }
-
-    /**
-     * Flip the image horizontally or vertically
-     *
-     * @param boolean $horizontal true if horizontal flip, vertical otherwise
-     */
-    function flip($horizontal) 
-    {
-        if($horizontal)
-            $this->command['flop'] = "-flop";
-        else
-            $this->command['flip'] = "-flip";
-    }
-    /**
-     * rotate
-     *
-     * @param   int     angle   rotation angle
-     * @param   array   options no option allowed
-     *
-     */
-    function rotate($angle, $options=null)
-    {
-        if ('-' == $angle{0}) {
-            $angle = 360 - substr($angle, 1);
-        }
-         $this->command['rotate'] = "-rotate $angle";
-    } // End rotate
-
-    /**
-     * addText
-     *
-     * @param   array   options     Array contains options
-     *                              array(
-     *                                  'text'  The string to draw
-     *                                  'x'     Horizontal position
-     *                                  'y'     Vertical Position
-     *                                  'Color' Font color
-     *                                  'font'  Font to be used
-     *                                  'size'  Size of the fonts in pixel
-     *                                  'resize_first'  Tell if the image has to be resized
-     *                                                  before drawing the text
-     *                              )
-     *
-     * @return none
-     * @see PEAR::isError()
-     */
-    function addText($params)
-    {
-        $default_params = array(
-                                'text' => 'This is Text',
-                                'x' => 10,
-                                'y' => 20,
-                                'color' => 'red',
-                                'font' => 'Arial.ttf',
-                                'resize_first' => false // Carry out the scaling of the image before annotation?
-                                );
-         $params = array_merge($default_params, $params);
-         extract($params);
-         if (true === $resize_first) {
-             // Set the key so that this will be the last item in the array
-            $key = 'ztext';
-         } else {
-            $key = 'text';
-         }
-         $this->command[$key] = "-font $font -fill $color -draw 'text $x,$y \"$text\"'";
-         // Producing error: gs: not found gs: not found convert: Postscript delegate failed [No such file or directory].
-    } // End addText
-
-    /**
-     * Adjust the image gamma
-     *
-     * @param float $outputgamma
-     *
-     * @return none
-     */
-    function gamma($outputgamma=1.0) {
-        $this->command['gamma'] = "-gamma $outputgamma";
-    }
-
-    /**
-     * Save the image file
-     *
-     * @param string  $filename the name of the file to write to
-     * @param quality $quality  image dpi, default=75
-     * @param string  $type     (JPG,PNG...)
-     *
-     * @return none
-     */
-    function save($filename, $type='', $quality = 85)
-    {
-        $type == '' ? $this->type : $type;
-        $cmd = '' . IMAGE_TRANSFORM_LIB_PATH . 'convert ';
-		$cmd .= implode(' ', $this->command) . " -quality $quality ";
-		$cmd .= '"'.($this->image) . '" "' . ($filename) . '"';
-        
-        //$cmd = str_replace('/', '\\', $cmd);
-		//echo($cmd.'<br>');
-        exec($cmd,$retval);
-		//error_log('IM '.print_r($retval,true));
-    } // End save
-
-    /**
-     * Display image without saving and lose changes
-     *
-     * @param string type (JPG,PNG...);
-     * @param int quality 75
-     *
-     * @return none
-     */
-    function display($type = '', $quality = 75)
-    {
-        if ($type == '') {
-            header('Content-type: image/' . $this->type);
-            passthru(IMAGE_TRANSFORM_LIB_PATH . 'convert ' . implode(' ', $this->command) . " -quality $quality "  . escapeshellarg($this->image) . ' ' . strtoupper($this->type) . ":-");
-        } else {
-            header('Content-type: image/' . $type);
-            passthru(IMAGE_TRANSFORM_LIB_PATH . 'convert ' . implode(' ', $this->command) . " -quality $quality "  . escapeshellarg($this->image) . ' ' . strtoupper($type) . ":-");
-        }
-    }
-
-
-    /**
-     * Destroy image handle
-     *
-     * @return none
-     */
-    function free()
-    {
-        return true;
-    }
-
-} // End class ImageIM
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/ImageEditor.php b/web/imcms/xinha/plugins/ImageManager/Classes/ImageEditor.php
deleted file mode 100644
index d489c65113..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/ImageEditor.php
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-/**
- * Image Editor. Editing tools, crop, rotate, scale and save.
- * @author $Author: ray $
- * @version $Id: ImageEditor.php 709 2007-01-30 23:22:04Z ray $
- * @package ImageManager
- */
-
-require_once('../ImageManager/Classes/Transform.php');
-
-/**
- * Handles the basic image editing capbabilities.
- * @author $Author: ray $
- * @version $Id: ImageEditor.php 709 2007-01-30 23:22:04Z ray $
- * @package ImageManager
- * @subpackage Editor
- */
-class ImageEditor 
-{
-	/**
-	 * ImageManager instance.
-	 */
-	var $manager;
-
-	/**
-	 * user based on IP address
-	 */
-	var $_uid;
-
-	/**
-	 * tmp file storage time.
-	 */
-	var $lapse_time =900; //15 mins
-
-	var $filesaved = 0;
-
-	/**
-	 * Create a new ImageEditor instance. Editing requires a 
-	 * tmp file, which is saved in the current directory where the
-	 * image is edited. The tmp file is assigned by md5 hash of the
-	 * user IP address. This hashed is used as an ID for cleaning up
-	 * the tmp files. In addition, any tmp files older than the
-	 * the specified period will be deleted.
-	 * @param ImageManager $manager the image manager, we need this
-	 * for some file and path handling functions.
-	 */
-	function ImageEditor($manager) 
-	{
-		$this->manager = $manager;
-		$this->_uid = md5($_SERVER['REMOTE_ADDR']);
-	}
-	
-	/**
-	 * Did we save a file?
-	 * @return int 1 if the file was saved sucessfully, 
-	 * 0 no save operation, -1 file save error.
-	 */
-	function isFileSaved() 
-	{
-		Return $this->filesaved;
-	}
-
-	/**
-	 * Process the image, if not action, just display the image.
-	 * @return array with image information, empty array if not an image.
-	 * <code>array('src'=>'url of the image', 'dimensions'=>'width="xx" height="yy"',
-	 * 'file'=>'image file, relative', 'fullpath'=>'full path to the image');</code>
-	 */
-	function processImage() 
-	{
-		if(isset($_GET['img']))
-			$relative = rawurldecode($_GET['img']);
-		else
-			Return array();
-		
-		//$relative = '/Series2004NoteFront.jpg';
-
-		$imgURL = $this->manager->getFileURL($relative);
-		$fullpath = $this->manager->getFullPath($relative);
-		
-		$imgInfo = @getImageSize($fullpath);
-		if(!is_array($imgInfo))
-			Return array();
-
-		$action = $this->getAction();
-
-		if(!is_null($action))
-		{
-			$image = $this->processAction($action, $relative, $fullpath);
-		}
-		else
-		{
-			$image['src'] = $imgURL;
-			$image['dimensions'] = $imgInfo[3];
-			$image['file'] = $relative;
-			$image['fullpath'] = $fullpath;
-		}
-
-		Return $image;
-	}
-
-	/**
-	 * Process the actions, crop, scale(resize), rotate, flip, and save.
-	 * When ever an action is performed, the result is save into a
-	 * temporary image file, see createUnique on the filename specs.
-	 * It does not return the saved file, alway returning the tmp file.
-	 * @param string $action, should be 'crop', 'scale', 'rotate','flip', or 'save'
-	 * @param string $relative the relative image filename
-	 * @param string $fullpath the fullpath to the image file
-	 * @return array with image information
-	 * <code>array('src'=>'url of the image', 'dimensions'=>'width="xx" height="yy"',
-	 * 'file'=>'image file, relative', 'fullpath'=>'full path to the image');</code>
-	 */
-	function processAction($action, $relative, $fullpath) 
-	{
-		$params = '';
-		
-		if(isset($_GET['params']))
-			$params = $_GET['params'];
-
-		$values =  explode(',',$params,4);
-		$saveFile = $this->getSaveFileName($values[0]);
-
-		$img = Image_Transform::factory(IMAGE_CLASS);
-		$img->load($fullpath);
-
-		switch ($action) 
-		{
-			case 'crop':
-				$img->crop(intval($values[0]),intval($values[1]),
-							intval($values[2]),intval($values[3]));
-			break;
-			case 'scale':
-				$img->resize(intval($values[0]),intval($values[1]));
-				break;
-			case 'rotate':
-				$img->rotate(floatval($values[0]));
-				break;
-			case 'flip':
-				if ($values[0] == 'hoz')
-					$img->flip(true);
-				else if($values[0] == 'ver') 
-					$img->flip(false);
-				break;
-			case 'save':
-				if(!is_null($saveFile))
-				{
-					$quality = intval($values[1]);
-		            if($quality <0) $quality = 85;
-					$newSaveFile = $this->makeRelative($relative, $saveFile);
-					$newSaveFile = $this->getUniqueFilename($newSaveFile);
-					
-					//get unique filename just returns the filename, so
-					//we need to make the relative path once more.
-					$newSaveFile = $this->makeRelative($relative, $newSaveFile);
-          $image['saveFile'] = $newSaveFile;
-					$newSaveFullpath = $this->manager->getFullPath($newSaveFile);
-					$img->save($newSaveFullpath, $values[0], $quality);
-					if(is_file($newSaveFullpath))
-						$this->filesaved = 1;
-					else
-						$this->filesaved = -1;
-				}
-				break;
-		}
-		
-		//create the tmp image file
-		$filename = $this->createUnique($fullpath);
-		$newRelative = $this->makeRelative($relative, $filename);
-		$newFullpath = $this->manager->getFullPath($newRelative);
-		$newURL = $this->manager->getFileURL($newRelative);
-		
-		//save the file.
-		$img->save($newFullpath);
-		$img->free();
-
-		//get the image information
-		$imgInfo = @getimagesize($newFullpath);
-
-		$image['src'] = $newURL;
-    $image['width'] = $imgInfo[0];
-    $image['height'] = $imgInfo[1];
-		$image['dimensions'] = $imgInfo[3];
-		$image['file'] = $newRelative;
-		$image['fullpath'] = $newFullpath;
-
-		Return $image;
-	
-	}
-
-	/**
-	 * Get the file name base on the save name
-	 * and the save type.
-	 * @param string $type image type, 'jpeg', 'png', or 'gif'
-	 * @return string the filename according to save type
-	 */
-	function getSaveFileName($type) 
-	{
-		if(!isset($_GET['file']))
-			Return null;
-
-		$filename = Files::escape(rawurldecode($_GET['file']));
-		$index = strrpos($filename,'.');
-		$base = substr($filename,0,$index);
-		$ext = strtolower(substr($filename,$index+1,strlen($filename)));
-
-		if($type == 'jpeg' && !($ext=='jpeg' || $ext=='jpg'))
-		{
-			Return $base.'.jpeg';
-		}
-		if($type=='png' && $ext != 'png')
-			Return $base.'.png';
-		if($type=='gif' && $ext != 'gif')
-			Return $base.'.gif';
-
-		Return $filename;
-	}
-
-	/**
-	 * Get the default save file name, used by editor.php.
-	 * @return string a suggestive filename, this should be unique
-	 */
-	function getDefaultSaveFile() 
-	{
-		if(isset($_GET['img']))
-			$relative = rawurldecode($_GET['img']);
-		else
-			Return null;
-
-		Return $this->getUniqueFilename($relative);
-	}
-
-	/**
-	 * Get a unique filename. If the file exists, the filename
-	 * base is appended with an increasing integer.
-	 * @param string $relative the relative filename to the base_dir
-	 * @return string a unique filename in the current path
-	 */
-	function getUniqueFilename($relative) 
-	{
-		$fullpath = $this->manager->getFullPath($relative);
-		
-		$pathinfo = pathinfo($fullpath);
-
-		$path = Files::fixPath($pathinfo['dirname']);
-		$file = Files::escape($pathinfo['basename']);
-		
-		$filename = $file;
-
-		$dotIndex = strrpos($file, '.');
-		$ext = '';
-
-		if(is_int($dotIndex)) 
-		{
-			$ext = substr($file, $dotIndex);
-			$base = substr($file, 0, $dotIndex);
-		}
-
-		$counter = 0;
-		while(is_file($path.$filename)) 
-		{
-			$counter++;
-			$filename = $base.'_'.$counter.$ext;
-		}
-		
-		Return $filename;
-		
-	}
-
-	/**
-	 * Specifiy the original relative path, a new filename
-	 * and return the new filename with relative path.
-	 * i.e. $pathA (-filename) + $file
-	 * @param string $pathA the relative file
-	 * @param string $file the new filename
-	 * @return string relative path with the new filename
-	 */
-	function makeRelative($pathA, $file) 
-	{
-		$index = strrpos($pathA,'/');
-		if(!is_int($index))
-			Return $file;
-
-		$path = substr($pathA, 0, $index);
-		Return Files::fixPath($path).$file;
-	}
-
-	/**
-	 * Get the action GET parameter
-	 * @return string action parameter
-	 */
-	function getAction() 
-	{
-		$action = null;
-		if(isset($_GET['action']))
-			$action = $_GET['action'];
-		Return $action;
-	}
-
-	/**
-	 * Generate a unique string based on md5(microtime()).
-	 * Well not so uniqe, as it is limited to 6 characters
-	 * @return string unique string.
-	 */
-    function uniqueStr()
-    {
-      return substr(md5(microtime()),0,6);
-    }
-
-	/**
-	 * Create unique tmp image file name.
-	 * The filename is based on the tmp file prefix
-	 * specified in config.inc.php plus 
-	 * the UID (basically a md5 of the remote IP)
-	 * and some random 6 character string.
-	 * This function also calls to clean up the tmp files.
-	 * @param string $file the fullpath to a file
-	 * @return string a unique filename for that path
-	 * NOTE: it only returns the filename, path no included.
-	 */
-	function createUnique($file) 
-	{
-		$pathinfo = pathinfo($file);
-		$path = Files::fixPath($pathinfo['dirname']);
-		$imgType = $this->getImageType($file);
-
-		$unique_str = $this->manager->getTmpPrefix().$this->_uid.'_'.$this->uniqueStr().".".$imgType;
-
-	   //make sure the the unique temp file does not exists
-        while (file_exists($path.$unique_str))
-        {
-            $unique_str = $this->manager->getTmpPrefix().$this->_uid.'_'.$this->uniqueStr().".".$imgType;
-        }
-
-		$this->cleanUp($path,$pathinfo['basename']);
-
-		Return $unique_str;
-	}
-
-	/**
-	 * Delete any tmp image files.
-	 * @param string $path the full path 
-	 * where the clean should take place.
-	 */
-	function cleanUp($path,$file) 
-	{
-		$path = Files::fixPath($path);
-
-		if(!is_dir($path))
-			Return false;
-
-		$d = @dir($path);
-		
-		$tmp = $this->manager->getTmpPrefix();
-		$tmpLen = strlen($tmp);
-
-		$prefix = $tmp.$this->_uid;
-		$len = strlen($prefix);
-
-		while (false !== ($entry = $d->read())) 
-		{
-			//echo $entry."<br>";
-			if(is_file($path.$entry) && $this->manager->isTmpFile($entry))
-			{
-				if(substr($entry,0,$len)==$prefix && $entry != $file)
-					Files::delFile($path.$entry);
-				else if(substr($entry,0,$tmpLen)==$tmp && $entry != $file)
-				{
-					if(filemtime($path.$entry)+$this->lapse_time < time())
-						Files::delFile($path.$entry);
-				}
-			}
-		}
-		$d->close();
-	}
-
-	/**
-	 * Get the image type base on an image file.
-	 * @param string $file the full path to the image file.
-	 * @return string of either 'gif', 'jpeg', 'png' or 'bmp'
-	 * otherwise it will return null.
-	 */
-	function getImageType($file) 
-	{
-		$imageInfo = @getImageSize($file);
-
-		if(!is_array($imageInfo))
-			Return null;
-
-		switch($imageInfo[2]) 
-		{
-			case 1:
-				Return 'gif';
-			case 2:
-				Return 'jpeg';
-			case 3:
-				Return 'png';
-			case 6:
-				Return 'bmp';
-		}
-
-		Return null;
-	}
-
-	/**
-	 * Check if the specified image can be edit by GD
-	 * mainly to check that GD can read and save GIFs
-	 * @return int 0 if it is not a GIF file, 1 is GIF is editable, -1 if not editable.
-	 */
-	function isGDEditable() 
-	{
-		if(isset($_GET['img']))
-			$relative = rawurldecode($_GET['img']);
-		else
-			Return 0;
-		if(IMAGE_CLASS != 'GD')
-			Return 0;
-
-		$fullpath = $this->manager->getFullPath($relative);
-
-		$type = $this->getImageType($fullpath);
-		if($type != 'gif')
-			Return 0;
-
-		if(function_exists('ImageCreateFrom'+$type)
-			&& function_exists('image'+$type))
-			Return 1;
-		else
-			Return -1;
-	}
-
-	/**
-	 * Check if GIF can be edit by GD.
-	 * @return int 0 if it is not using the GD library, 1 is GIF is editable, -1 if not editable.
-	 */
-	function isGDGIFAble() 
-	{
-		if(IMAGE_CLASS != 'GD')
-			Return 0;
-
-		if(function_exists('ImageCreateFromGif')
-			&& function_exists('imagegif'))
-			Return 1;
-		else
-			Return -1;
-	}
-}
-
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/ImageManager.php b/web/imcms/xinha/plugins/ImageManager/Classes/ImageManager.php
deleted file mode 100644
index 5695fbb7cb..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/ImageManager.php
+++ /dev/null
@@ -1,664 +0,0 @@
-<?php
-/**
- * ImageManager, list images, directories, and thumbnails.
- * @author $Author: ray $
- * @version $Id: ImageManager.php 709 2007-01-30 23:22:04Z ray $
- * @package ImageManager
- */
-
-require_once('../ImageManager/Classes/Files.php');
-
-// uncomment to turn on debugging
-
-// _ddtOn();
-
-/**
- * ImageManager Class.
- * @author $Author: ray $
- * @version $Id: ImageManager.php 709 2007-01-30 23:22:04Z ray $
- */
-class ImageManager 
-{
-	/**
-	 * Configuration array.
-	 */
-	var $config;
-
-	/**
-	 * Array of directory information.
-	 */
-	var $dirs;
-
-	/**
-	 * Constructor. Create a new Image Manager instance.
-	 * @param array $config configuration array, see config.inc.php
-	 */
-	function ImageManager($config) 
-	{
-		$this->config = $config;
-	}
-
-	/**
-	 * Get the images base directory.
-	 * @return string base dir, see config.inc.php
-	 */
-	function getImagesDir() 
-	{
-		Return $this->config['images_dir'];
-	}
-
-	/**
-	 * Get the images base URL.
-	 * @return string base url, see config.inc.php
-	 */
-	function getImagesURL() 
-	{
-		Return $this->config['images_url'];
-	}
-
-	function isValidBase()
-	{
-		return is_dir($this->getImagesDir());
-	}
-
-	/**
-	 * Get the tmp file prefix.
-	 * @return string tmp file prefix.
-	 */
-	function getTmpPrefix() 
-	{
-		Return $this->config['tmp_prefix'];
-	}
-
-	/**
-	 * Get the sub directories in the base dir.
-	 * Each array element contain
-	 * the relative path (relative to the base dir) as key and the 
-	 * full path as value.
-	 * @return array of sub directries
-	 * <code>array('path name' => 'full directory path', ...)</code>
-	 */
-	function getDirs() 
-	{
-		if(is_null($this->dirs))
-		{
-			$dirs = $this->_dirs($this->getImagesDir(),'/');
-			ksort($dirs);
-			$this->dirs = $dirs;
-		}
-		return $this->dirs;
-	}
-
-	/**
-	 * Recursively travese the directories to get a list
-	 * of accessable directories.
-	 * @param string $base the full path to the current directory
-	 * @param string $path the relative path name
-	 * @return array of accessiable sub-directories
-	 * <code>array('path name' => 'full directory path', ...)</code>
-	 */
-	function _dirs($base, $path) 
-	{
-		$base = Files::fixPath($base);
-		$dirs = array();
-
-		if($this->isValidBase() == false)
-			return $dirs;
-
-		$d = @dir($base);
-		
-		while (false !== ($entry = $d->read())) 
-		{
-			//If it is a directory, and it doesn't start with
-			// a dot, and if is it not the thumbnail directory
-			if(is_dir($base.$entry) 
-				&& substr($entry,0,1) != '.'
-				&& $this->isThumbDir($entry) == false) 
-			{
-				$relative = Files::fixPath($path.$entry);
-				$fullpath = Files::fixPath($base.$entry);
-				$dirs[$relative] = $fullpath;
-				$dirs = array_merge($dirs, $this->_dirs($fullpath, $relative));
-			}
-		}
-		$d->close();
-
-		Return $dirs;
-	}
-
-	/**
-	 * Get all the files and directories of a relative path.
-	 * @param string $path relative path to be base path.
-	 * @return array of file and path information.
-	 * <code>array(0=>array('relative'=>'fullpath',...), 1=>array('filename'=>fileinfo array(),...)</code>
-	 * fileinfo array: <code>array('url'=>'full url', 
-	 *                       'relative'=>'relative to base', 
-	 *                        'fullpath'=>'full file path', 
-	 *                        'image'=>imageInfo array() false if not image,
-	 *                        'stat' => filestat)</code>
-	 */
-	function getFiles($path) 
-	{
-		$files = array();
-		$dirs = array();
-
-		if($this->isValidBase() == false)
-			return array($files,$dirs);
-
-		$path = Files::fixPath($path);
-		$base = Files::fixPath($this->getImagesDir());
-		$fullpath = Files::makePath($base,$path);
-
-
-		$d = @dir($fullpath);
-		
-		while (false !== ($entry = $d->read())) 
-		{
-			//not a dot file or directory
-			if(substr($entry,0,1) != '.')
-			{
-				if(is_dir($fullpath.$entry)
-					&& $this->isThumbDir($entry) == false)
-				{
-					$relative = Files::fixPath($path.$entry);
-					$full = Files::fixPath($fullpath.$entry);
-					$count = $this->countFiles($full);
-					$dirs[$relative] = array('fullpath'=>$full,'entry'=>$entry,'count'=>$count);
-				}
-				else if(is_file($fullpath.$entry) && $this->isThumb($entry)==false && $this->isTmpFile($entry) == false) 
-				{
-					$img = $this->getImageInfo($fullpath.$entry);
-
-					if(!(!is_array($img)&&$this->config['validate_images']))
-					{
-						$file['url'] = Files::makePath($this->config['base_url'],$path).$entry;
-						$file['relative'] = $path.$entry;
-						$file['fullpath'] = $fullpath.$entry;
-						$file['image'] = $img;
-						$file['stat'] = stat($fullpath.$entry);
-						$files[$entry] = $file;
-					}
-				}
-			}
-		}
-		$d->close();
-		ksort($dirs);
-		ksort($files);
-		
-		Return array($dirs, $files);
-	}	
-
-	/**
-	 * Count the number of files and directories in a given folder
-	 * minus the thumbnail folders and thumbnails.
-	 */
-	function countFiles($path) 
-	{
-		$total = 0;
-
-		if(is_dir($path)) 
-		{
-			$d = @dir($path);
-
-			while (false !== ($entry = $d->read())) 
-			{
-				//echo $entry."<br>";
-				if(substr($entry,0,1) != '.'
-					&& $this->isThumbDir($entry) == false
-					&& $this->isTmpFile($entry) == false
-					&& $this->isThumb($entry) == false) 
-				{
-					$total++;
-				}
-			}
-			$d->close();
-		}
-		return $total;
-	}
-
-	/**
-	 * Get image size information.
-	 * @param string $file the image file
-	 * @return array of getImageSize information, 
-	 *  false if the file is not an image.
-	 */
-	function getImageInfo($file) 
-	{
-		Return @getImageSize($file);
-	}
-
-	/**
-	 * Check if the file contains the thumbnail prefix.
-	 * @param string $file filename to be checked
-	 * @return true if the file contains the thumbnail prefix, false otherwise.
-	 */
-	function isThumb($file) 
-	{
-		$len = strlen($this->config['thumbnail_prefix']);
-		if(substr($file,0,$len)==$this->config['thumbnail_prefix'])
-			Return true;
-		else
-			Return false;
-	}
-
-	/**
-	 * Check if the given directory is a thumbnail directory.
-	 * @param string $entry directory name
-	 * @return true if it is a thumbnail directory, false otherwise
-	 */
-	function isThumbDir($entry) 
-	{
-		if($this->config['thumbnail_dir'] == false
-			|| strlen(trim($this->config['thumbnail_dir'])) == 0)
-			Return false;		
-		else
-			Return ($entry == $this->config['thumbnail_dir']);
-	}
-
-	/**
-	 * Check if the given file is a tmp file.
-	 * @param string $file file name
-	 * @return boolean true if it is a tmp file, false otherwise
-	 */
-	function isTmpFile($file) 
-	{
-		$len = strlen($this->config['tmp_prefix']);
-		if(substr($file,0,$len)==$this->config['tmp_prefix'])
-			Return true;
-		else
-			Return false;	 	
-	}
-
-	/**
-	 * For a given image file, get the respective thumbnail filename
-	 * no file existence check is done.
-	 * @param string $fullpathfile the full path to the image file
-	 * @return string of the thumbnail file
-	 */
-	function getThumbName($fullpathfile) 
-	{
-		$path_parts = pathinfo($fullpathfile);
-		
-		$thumbnail = $this->config['thumbnail_prefix'].$path_parts['basename'];
-
-		if( strlen(trim($this->config['thumbnail_dir'])) == 0 || $this->config['safe_mode'] == true)
-		{
-			Return Files::makeFile($path_parts['dirname'],$thumbnail);
-		}
-		else
-		{
-				$path = Files::makePath($path_parts['dirname'],$this->config['thumbnail_dir']);
-				if(!is_dir($path))
-					Files::createFolder($path);
-				Return Files::makeFile($path,$thumbnail);
-		}
-	}
-	
-	/**
-	 * Similar to getThumbName, but returns the URL, base on the
-	 * given base_url in config.inc.php
-	 * @param string $relative the relative image file name, 
-	 * relative to the base_dir path
-	 * @return string the url of the thumbnail
-	 */
-	function getThumbURL($relative) 
-	{
-
-		_ddt( __FILE__, __LINE__, "getThumbURL(): relative is '$relative'" );
-
-		$path_parts = pathinfo($relative);
-		$thumbnail = $this->config['thumbnail_prefix'].$path_parts['basename'];
-		if($path_parts['dirname']=='\\') $path_parts['dirname']='/';
-
-		if($this->config['safe_mode'] == true
-			|| strlen(trim($this->config['thumbnail_dir'])) == 0)
-		{
-			Return Files::makeFile($this->getImagesURL(),$thumbnail);
-		}
-		else
-		{
-			if(strlen(trim($this->config['thumbnail_dir'])) > 0)
-			{
-				$path = Files::makePath($path_parts['dirname'],$this->config['thumbnail_dir']);
-				$url_path = Files::makePath($this->getImagesURL(), $path);
-
-				_ddt( __FILE__, __LINE__, "getThumbURL(): url_path is '$url_path'" );
-
-				Return Files::makeFile($url_path,$thumbnail);
-			}
-			else //should this ever happen?
-			{
-				//error_log('ImageManager: Error in creating thumbnail url');
-			}
-
-		}
-	}
-
-
-	/**
-	 * For a given image file, get the respective resized filename
-	 * no file existence check is done.
-	 * @param string $fullpathfile the full path to the image file
-	 * @param integer $width the intended width
-	 * @param integer $height the intended height
-	 * @param boolean $mkDir whether to attempt to make the resized_dir if it doesn't exist
-	 * @return string of the resized filename
-	 */
-	function getResizedName($fullpathfile, $width, $height, $mkDir = TRUE)
-	{
-		$path_parts = pathinfo($fullpathfile);
-
-		$thumbnail = $this->config['resized_prefix']."_{$width}x{$height}_{$path_parts['basename']}";
-
-		if( strlen(trim($this->config['resized_dir'])) == 0 || $this->config['safe_mode'] == true )
-		{
-			Return Files::makeFile($path_parts['dirname'],$thumbnail);
-		}
-		else
-		{
-			$path = Files::makePath($path_parts['dirname'],$this->config['resized_dir']);
-			if($mkDir && !is_dir($path))
-				Files::createFolder($path);
-			Return Files::makeFile($path,$thumbnail);
-		}
-	}
-
-	/**
-	 * Check if the given path is part of the subdirectories
-	 * under the base_dir.
-	 * @param string $path the relative path to be checked
-	 * @return boolean true if the path exists, false otherwise
-	 */
-	function validRelativePath($path) 
-	{
-		$dirs = $this->getDirs();
-		if($path == '/')
-			Return true;
-		//check the path given in the url against the 
-		//list of paths in the system.
-		for($i = 0; $i < count($dirs); $i++)
-		{
-			$key = key($dirs);
-			//we found the path
-			if($key == $path)
-				Return true;
-		
-			next($dirs);
-		}		
-		Return false;
-	}
-
-	/**
-	 * Process uploaded files, assumes the file is in 
-	 * $_FILES['upload'] and $_POST['dir'] is set.
-	 * The dir must be relative to the base_dir and exists.
-	 * If 'validate_images' is set to true, only file with
-	 * image dimensions will be accepted.
-	 * @return null
-	 */
-	function processUploads() 
-	{
-		if($this->isValidBase() == false)
-			return;
-
-		$relative = null;
-
-		if(isset($_POST['dir'])) 
-			$relative = rawurldecode($_POST['dir']);
-		else
-			return;
-
-		//check for the file, and must have valid relative path
-		if(isset($_FILES['upload']) && $this->validRelativePath($relative))
-		{
-			$this->_processFiles($relative, $_FILES['upload']);
-		}
-	}
-
-	/**
-	 * Process upload files. The file must be an 
-	 * uploaded file. If 'validate_images' is set to
-	 * true, only images will be processed. Any duplicate
-	 * file will be renamed. See Files::copyFile for details
-	 * on renaming.
-	 * @param string $relative the relative path where the file
-	 * should be copied to.
-	 * @param array $file the uploaded file from $_FILES
-	 * @return boolean true if the file was processed successfully, 
-	 * false otherwise
-	 */
-	function _processFiles($relative, $file)
-	{
-		
-		if($file['error']!=0)
-		{
-			Return false;
-		}
-
-		if(!is_file($file['tmp_name']))
-		{
-			Return false;
-		}
-
-		if(!is_uploaded_file($file['tmp_name']))
-		{
-			Files::delFile($file['tmp_name']);
-			Return false;
-		}
-		
-
-		if($this->config['validate_images'] == true)
-		{
-			$imgInfo = @getImageSize($file['tmp_name']);
-			if(!is_array($imgInfo))
-			{
-				Files::delFile($file['tmp_name']);
-				Return false;
-			}
-		}
-
-		//now copy the file
-		$path = Files::makePath($this->getImagesDir(),$relative);
-		$result = Files::copyFile($file['tmp_name'], $path, $file['name']);
-
-		//no copy error
-		if(!is_int($result))
-		{
-			Files::delFile($file['tmp_name']);
-			Return true;
-		}
-
-		//delete tmp files.
-		Files::delFile($file['tmp_name']);
-		Return false;
-	}
-
-	/**
-	 * Get the URL of the relative file.
-	 * basically appends the relative file to the 
-	 * base_url given in config.inc.php
-	 * @param string $relative a file the relative to the base_dir
-	 * @return string the URL of the relative file.
-	 */
-	function getFileURL($relative) 
-	{
-		Return Files::makeFile($this->getImagesURL(),$relative);
-	}
-
-	/**
-	 * Get the fullpath to a relative file.
-	 * @param string $relative the relative file.
-	 * @return string the full path, .ie. the base_dir + relative.
-	 */
-	function getFullPath($relative) 
-	{
-		Return Files::makeFile($this->getImagesDir(),$relative);;
-	}
-
-	/**
-	 * Get the default thumbnail.
-	 * @return string default thumbnail, empty string if 
-	 * the thumbnail doesn't exist.
-	 */
-	function getDefaultThumb() 
-	{
-
-		// FIXME: hack
-
-		Return $this->config['default_thumbnail'];
-
-		if(is_file($this->config['default_thumbnail']))
-			{
-			Return $this->config['default_thumbnail'];
-			}
-		else 
-			Return '';
-	}
-
-
-	/**
-	 * Get the thumbnail url to be displayed. 
-	 * If the thumbnail exists, and it is up-to-date
-	 * the thumbnail url will be returns. If the 
-	 * file is not an image, a default image will be returned.
-	 * If it is an image file, and no thumbnail exists or 
-	 * the thumbnail is out-of-date (i.e. the thumbnail 
-	 * modified time is less than the original file)
-	 * then a thumbs.php?img=filename.jpg is returned.
-	 * The thumbs.php url will generate a new thumbnail
-	 * on the fly. If the image is less than the dimensions
-	 * of the thumbnails, the image will be display instead.
-	 * @param string $relative the relative image file.
-	 * @return string the url of the thumbnail, be it
-	 * actually thumbnail or a script to generate the
-	 * thumbnail on the fly.
-	 */
-	function getThumbnail($relative) 
-	{
-
-		global $IMConfig;
-
-		_ddt( __FILE__, __LINE__, "getThumbnail(): top with '$relative'" );
-
-		$fullpath = Files::makeFile($this->getImagesDir(),$relative);
-
-		//not a file???
-		if(!is_file($fullpath))
-			Return $this->getDefaultThumb();
-
-		$imgInfo = @getImageSize($fullpath);
-		
-		//not an image
-		if(!is_array($imgInfo))
-			Return $this->getDefaultThumb();
-
-		//the original image is smaller than thumbnails,
-		//so just return the url to the original image.
-		if ($imgInfo[0] <= $this->config['thumbnail_width']
-		 && $imgInfo[1] <= $this->config['thumbnail_height'])
-			Return $this->getFileURL($relative);
-
-		$thumbnail = $this->getThumbName($fullpath);
-		
-		//check for thumbnails, if exists and
-		// it is up-to-date, return the thumbnail url
-		if(is_file($thumbnail))
-		{
-			if(filemtime($thumbnail) >= filemtime($fullpath))
-				{
-				_ddt( __FILE__, __LINE__, "getThumbnail(): returning url '" . $this->getThumbURL($relative) . "'" );
-
-				Return $this->getThumbURL($relative);
-				}
-		}
-
-		//well, no thumbnail was found, so ask the thumbs.php
-		//to generate the thumbnail on the fly.
-		Return $IMConfig['backend_url'] . '__function=thumbs&img='.rawurlencode($relative);
-	}
-
-	/**
-	 * Delete and specified files.
-	 * @return boolean true if delete, false otherwise
-	 */
-	function deleteFiles() 
-	{
-		if(isset($_GET['delf']))
-			$this->_delFile(rawurldecode($_GET['delf']));
-	}
-
-	/**
-	 * Delete and specified directories.
-	 * @return boolean true if delete, false otherwise
-	 */
-	function deleteDirs() 
-	{
-		 if(isset($_GET['deld']))
-			return $this->_delDir(rawurldecode($_GET['deld']));		
-		 else
-			 Return false;
-	}
-
-	/**
-	 * Delete the relative file, and any thumbnails.
-	 * @param string $relative the relative file.
-	 * @return boolean true if deleted, false otherwise.
-	 */
-	function _delFile($relative) 
-	{
-		$fullpath = Files::makeFile($this->getImagesDir(),$relative);
-		
-		//check that the file is an image
-		if($this->config['validate_images'] == true)
-		{
-			if(!is_array($this->getImageInfo($fullpath)))
-				return false; //hmmm not an Image!!???
-		}
-
-		$thumbnail = $this->getThumbName($fullpath);
-
-		if(Files::delFile($fullpath))
-			Return Files::delFile($thumbnail);
-		else
-			Return false;
-	}
-
-	/**
-	 * Delete directories recursively.
-	 * @param string $relative the relative path to be deleted.
-	 * @return boolean true if deleted, false otherwise.
-	 */
-	function _delDir($relative) 
-	{
-		$fullpath = Files::makePath($this->getImagesDir(),$relative);
-		if($this->countFiles($fullpath) <= 0)
-			return Files::delFolder($fullpath,true); //delete recursively.
-		else
-			Return false;
-	}
-
-	/**
-	 * Create new directories.
-	 * If in safe_mode, nothing happens.
-	 * @return boolean true if created, false otherwise.
-	 */
-	function processNewDir() 
-	{
-		if($this->config['safe_mode'] == true)
-			Return false;
-
-		if(isset($_GET['newDir']) && isset($_GET['dir']))
-		{
-			$newDir = rawurldecode($_GET['newDir']);
-			$dir = rawurldecode($_GET['dir']);
-			$path = Files::makePath($this->getImagesDir(),$dir);
-			$fullpath = Files::makePath($path, Files::escape($newDir));
-			if(is_dir($fullpath))
-				Return false;
-
-			Return Files::createFolder($fullpath);
-		}
-	}
-}
-
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/NetPBM.php b/web/imcms/xinha/plugins/ImageManager/Classes/NetPBM.php
deleted file mode 100644
index 0b570dab6b..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/NetPBM.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/***********************************************************************
-** Title.........:  NetPBM Driver
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  NetPBM.php
-** Last changed..:  30 Aug 2003 
-** Notes.........:  Orginal is from PEAR
-**/
-
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Peter Bowyer <peter@mapledesign.co.uk>                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: NetPBM.php 709 2007-01-30 23:22:04Z ray $
-//
-// Image Transformation interface using command line NetPBM
-
-require_once "../ImageManager/Classes/Transform.php";
-
-Class Image_Transform_Driver_NetPBM extends Image_Transform
-{
-
-    /**
-     * associative array commands to be executed
-     * @var array
-     */
-    var $command = array();
-
-    /**
-     * Class Constructor
-     */
-    function Image_Transform_Driver_NetPBM()
-    {
-        $this->uid = md5($_SERVER['REMOTE_ADDR']);
-            
-        return true;
-    } // End function Image_NetPBM
-
-    /**
-     * Load image
-     *
-     * @param string filename
-     *
-     * @return mixed none or a PEAR error object on error
-     * @see PEAR::isError()
-     */
-    function load($image)
-    {
-        //echo $image;
-        $this->image = $image;
-        $this->_get_image_details($image);
-    } // End load
-
-    /**
-     * Resizes the image
-     *
-     * @return none
-     * @see PEAR::isError()
-     */
-    function _resize($new_x, $new_y)
-    {
-        // there's no technical reason why resize can't be called multiple
-        // times...it's just silly to do so
-
-        $this->command[] = IMAGE_TRANSFORM_LIB_PATH .
-                           "pnmscale -width $new_x -height $new_y";
-
-        $this->_set_new_x($new_x);
-        $this->_set_new_y($new_y);
-    } // End resize
-
-    /**
-     * Crop the image
-     *
-     * @param int $crop_x left column of the image
-     * @param int $crop_y top row of the image
-     * @param int $crop_width new cropped image width
-     * @param int $crop_height new cropped image height
-     */
-    function crop($crop_x, $crop_y, $crop_width, $crop_height) 
-    {
-        $this->command[] = IMAGE_TRANSFORM_LIB_PATH .
-                            "pnmcut -left $crop_x -top $crop_y -width $crop_width -height $crop_height";
-    }
-
-    /**
-     * Rotates the image
-     *
-     * @param int $angle The angle to rotate the image through
-     */
-    function rotate($angle)
-    {
-        $angle = -1*floatval($angle);
-
-        if($angle > 90)
-        {   
-            $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "pnmrotate -noantialias 90";
-            $this->rotate(-1*($angle-90));
-        }
-        else if ($angle < -90)
-        {
-            $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "pnmrotate -noantialias -90";
-            $this->rotate(-1*($angle+90));
-        }
-        else
-            $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "pnmrotate -noantialias $angle";
-    } // End rotate
-
-    /**
-     * Flip the image horizontally or vertically
-     *
-     * @param boolean $horizontal true if horizontal flip, vertical otherwise
-     */
-    function flip($horizontal) 
-    {
-        if($horizontal) 
-            $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "pnmflip -lr";
-        else
-            $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "pnmflip -tb";
-    }
-
-    /**
-     * Adjust the image gamma
-     *
-     * @param float $outputgamma
-     *
-     * @return none
-     */
-    function gamma($outputgamma = 1.0) {
-        $this->command[13] = IMAGE_TRANSFORM_LIB_PATH . "pnmgamma $outputgamma";
-    }
-
-    /**
-     * adds text to an image
-     *
-     * @param   array   options     Array contains options
-     *             array(
-     *                  'text'          // The string to draw
-     *                  'x'             // Horizontal position
-     *                  'y'             // Vertical Position
-     *                  'Color'         // Font color
-     *                  'font'          // Font to be used
-     *                  'size'          // Size of the fonts in pixel
-     *                  'resize_first'  // Tell if the image has to be resized
-     *                                  // before drawing the text
-     *                   )
-     *
-     * @return none
-     */
-    function addText($params)
-    {
-        $default_params = array('text' => 'This is Text',
-                                'x' => 10,
-                                'y' => 20,
-                                'color' => 'red',
-                                'font' => 'Arial.ttf',
-                                'size' => '12',
-                                'angle' => 0,
-                                'resize_first' => false);
-        // we ignore 'resize_first' since the more logical approach would be
-        // for the user to just call $this->_resize() _first_ ;)
-        extract(array_merge($default_params, $params));
-        $this->command[] = "ppmlabel -angle $angle -colour $color -size "
-                           ."$size -x $x -y ".$y+$size." -text \"$text\"";
-    } // End addText
-
-    function _postProcess($type, $quality, $save_type)
-    {
-        $type = is_null($type) || $type==''? $this->type : $type;
-        $save_type = is_null($save_type) || $save_type==''? $this->type : $save_type;
-        //echo "TYPE:". $this->type;
-        array_unshift($this->command, IMAGE_TRANSFORM_LIB_PATH
-                      . $type.'topnm '. $this->image);
-        $arg = '';
-        switch(strtolower($save_type)){
-            case 'gif':
-                $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "ppmquant 256";
-                $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "ppmto$save_type";
-                break;
-            case 'jpg':
-            case 'jpeg':
-                $arg = "--quality=$quality";
-                $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "ppmto$save_type $arg";
-                break;
-            default:
-                $this->command[] = IMAGE_TRANSFORM_LIB_PATH . "pnmto$save_type $arg";
-                break;
-        } // switch
-        return implode('|', $this->command);
-    } 
-
-    /**
-     * Save the image file
-     *
-     * @param string $filename the name of the file to write to
-     * @param string $type (jpeg,png...);
-     * @param int $quality 75
-     * @return none
-     */
-    function save($filename, $type=null, $quality = 85)
-    {
-        $cmd = $this->_postProcess('', $quality, $type) . ">$filename";
-            
-		//if we have windows server
-        if(isset($_ENV['OS']) && eregi('window',$_ENV['OS']))
-			$cmd = ereg_replace('/','\\',$cmd);
-        //echo $cmd."##";
-        $output = system($cmd);
-		error_log('NETPBM: '.$cmd);
-		//error_log($output);
-        $this->command = array();
-    } // End save
-
-
-    /**
-     * Display image without saving and lose changes
-     *
-     * @param string $type (jpeg,png...);
-     * @param int $quality 75
-     * @return none
-     */
-    function display($type = null, $quality = 75)
-    {
-        header('Content-type: image/' . $type);
-        $cmd = $this->_postProcess($type, $quality);
-        
-        passthru($cmd);
-        $this->command = array();
-    }
-
-    /**
-     * Destroy image handle
-     *
-     * @return none
-     */
-    function free()
-    {
-        // there is no image handle here
-        return true;
-    }
-
-
-} // End class NetPBM
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/Thumbnail.php b/web/imcms/xinha/plugins/ImageManager/Classes/Thumbnail.php
deleted file mode 100644
index 84ffc530ab..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/Thumbnail.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Create thumbnails.
- * @author $Author: ray $
- * @version $Id: Thumbnail.php 709 2007-01-30 23:22:04Z ray $
- * @package ImageManager
- */
-
-
-require_once('../ImageManager/Classes/Transform.php');
-
-/**
- * Thumbnail creation
- * @author $Author: ray $
- * @version $Id: Thumbnail.php 709 2007-01-30 23:22:04Z ray $
- * @package ImageManager
- * @subpackage Images
- */
-class Thumbnail 
-{
-	/**
-	 * Graphics driver, GD, NetPBM or ImageMagick.
-	 */
-	var $driver;
-
-	/**
-	 * Thumbnail default width.
-	 */
-	var $width = 96;
-
-	/**
-	 * Thumbnail default height.
-	 */
-	var $height = 96;
-
-	/**
-	 * Thumbnail default JPEG quality.
-	 */
-	var $quality = 85;
-
-	/**
-	 * Thumbnail is proportional
-	 */
-	var $proportional = true;
-
-	/**
-	 * Default image type is JPEG.
-	 */
-	var $type = 'jpeg';
-
-	/**
-	 * Create a new Thumbnail instance.
-	 * @param int $width thumbnail width
-	 * @param int $height thumbnail height
-	 */
-	function Thumbnail($width=96, $height=96) 
-	{
-		$this->driver = Image_Transform::factory(IMAGE_CLASS);
-		$this->width = $width;
-		$this->height = $height;
-	}
-
-	/**
-	 * Create a thumbnail.
-	 * @param string $file the image for the thumbnail
-	 * @param string $thumbnail if not null, the thumbnail will be saved
-	 * as this parameter value.
-	 * @return boolean true if thumbnail is created, false otherwise
-	 */
-	function createThumbnail($file, $thumbnail=null) 
-	{
-		if(!is_file($file)) 
-			Return false;
-
-		//error_log('Creating Thumbs: '.$file);
-
-		$this->driver->load($file);
-
-		if($this->proportional) 
-		{
-			$width = $this->driver->img_x;
-			$height = $this->driver->img_y;
-
-			if ($width > $height)
-				$this->height = intval($this->width/$width*$height);
-			else if ($height > $width)
-				$this->width = intval($this->height/$height*$width);
-		}
-
-		$this->driver->resize($this->width, $this->height);
-
-		if(is_null($thumbnail)) 
-			$this->save($file);
-		else
-			$this->save($thumbnail);
-
-
-		$this->free();
-
-		if(is_file($thumbnail)) 
-			Return true;
-		else
-			Return false;
-	}
-
-	/**
-	 * Save the thumbnail file.
-	 * @param string $file file name to be saved as.
-	 */
-	function save($file) 
-	{
-		$this->driver->save($file);
-	}
-
-	/**
-	 * Free up the graphic driver resources.
-	 */
-	function free() 
-	{
-		$this->driver->free();
-	}
-}
-
-
-?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/Classes/Transform.php b/web/imcms/xinha/plugins/ImageManager/Classes/Transform.php
deleted file mode 100644
index b13428c393..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/Classes/Transform.php
+++ /dev/null
@@ -1,569 +0,0 @@
-<?php
-/***********************************************************************
-** Title.........:  Image Transformation Interface
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  Transform.php
-** Last changed..:  30 Aug 2003 
-** Notes.........:  Orginal is from PEAR
-                    
-                    Added a few extra,
-                        - create unique filename in a particular directory,
-                          used for temp image files.
-                        - added cropping to GD, NetPBM, ImageMagick
-**/
-
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Peter Bowyer <peter@mapledesign.co.uk>                      |
-// |          Alan Knowles <alan@akbkhome.com>                            |
-// |          Vincent Oostindie <vincent@sunlight.tmfweb.nl>              |
-// +----------------------------------------------------------------------+
-//
-// $Id: Transform.php 709 2007-01-30 23:22:04Z ray $
-//
-// Image Transformation interface
-//
-
-
-/**
- * The main "Image_Resize" class is a container and base class which
- * provides the static methods for creating Image objects as well as
- * some utility functions (maths) common to all parts of Image Resize.
- *
- * The object model of DB is as follows (indentation means inheritance):
- *
- * Image_Resize The base for each Image implementation.  Provides default
- * |            implementations (in OO lingo virtual methods) for
- * |            the actual Image implementations as well as a bunch of
- * |            maths methods.
- * |
- * +-Image_GD   The Image implementation for the PHP GD extension .  Inherits
- *              Image_Resize
- *              When calling DB::setup for GD images the object returned is an
- *              instance of this class.
- *
- * @package  Image Resize
- * @version  1.00
- * @author   Peter Bowyer <peter@mapledesign.co.uk>
- * @since    PHP 4.0
- */
-Class Image_Transform
-{
-    /**
-     * Name of the image file
-     * @var string
-     */
-    var $image = '';
-    /**
-     * Type of the image file (eg. jpg, gif png ...)
-     * @var string
-     */
-    var $type = '';
-    /**
-     * Original image width in x direction
-     * @var int
-     */
-    var $img_x = '';
-    /**
-     * Original image width in y direction
-     * @var int
-     */
-    var $img_y = '';
-    /**
-     * New image width in x direction
-     * @var int
-     */
-    var $new_x = '';
-    /**
-     * New image width in y direction
-     * @var int
-     */
-    var $new_y = '';
-    /**
-     * Path the the library used
-     * e.g. /usr/local/ImageMagick/bin/ or
-     * /usr/local/netpbm/
-     */
-    var $lib_path = '';
-    /**
-     * Flag to warn if image has been resized more than once before displaying
-     * or saving.
-     */
-     var $resized = false;
-
-
-     var $uid = '';
-
-     var $lapse_time =900; //15 mins
-
-    /**
-     * Create a new Image_resize object
-     *
-     * @param string $driver name of driver class to initialize
-     *
-     * @return mixed a newly created Image_Transform object, or a PEAR
-     * error object on error
-     *
-     * @see PEAR::isError()
-     * @see Image_Transform::setOption()
-     */
-    function &factory($driver)
-    {
-        if ('' == $driver) {
-            die("No image library specified... aborting.  You must call ::factory() with one parameter, the library to load.");
-
-        }
-        $this->uid = md5($_SERVER['REMOTE_ADDR']);
-
-        include_once "../ImageManager/Classes/$driver.php";
-
-        $classname = "Image_Transform_Driver_{$driver}";
-        $obj =& new $classname;
-        return $obj;
-    }
-
-
-    /**
-     * Resize the Image in the X and/or Y direction
-     * If either is 0 it will be scaled proportionally
-     *
-     * @access public
-     *
-     * @param mixed $new_x (0, number, percentage 10% or 0.1)
-     * @param mixed $new_y (0, number, percentage 10% or 0.1)
-     *
-     * @return mixed none or PEAR_error
-     */
-    function resize($new_x = 0, $new_y = 0)
-    {
-        // 0 means keep original size
-        $new_x = (0 == $new_x) ? $this->img_x : $this->_parse_size($new_x, $this->img_x);
-        $new_y = (0 == $new_y) ? $this->img_y : $this->_parse_size($new_y, $this->img_y);
-        // Now do the library specific resizing.
-        return $this->_resize($new_x, $new_y);
-    } // End resize
-
-
-    /**
-     * Scale the image to have the max x dimension specified.
-     *
-     * @param int $new_x Size to scale X-dimension to
-     * @return none
-     */
-    function scaleMaxX($new_x)
-    {
-        $new_y = round(($new_x / $this->img_x) * $this->img_y, 0);
-        return $this->_resize($new_x, $new_y);
-    } // End resizeX
-
-    /**
-     * Scale the image to have the max y dimension specified.
-     *
-     * @access public
-     * @param int $new_y Size to scale Y-dimension to
-     * @return none
-     */
-    function scaleMaxY($new_y)
-    {
-        $new_x = round(($new_y / $this->img_y) * $this->img_x, 0);
-        return $this->_resize($new_x, $new_y);
-    } // End resizeY
-
-    /**
-     * Scale Image to a maximum or percentage
-     *
-     * @access public
-     * @param mixed (number, percentage 10% or 0.1)
-     * @return mixed none or PEAR_error
-     */
-    function scale($size)
-    {
-        if ((strlen($size) > 1) && (substr($size,-1) == '%')) {
-            return $this->scaleByPercentage(substr($size, 0, -1));
-        } elseif ($size < 1) {
-            return $this->scaleByFactor($size);
-        } else {
-            return $this->scaleByLength($size);
-        }
-    } // End scale
-
-    /**
-     * Scales an image to a percentage of its original size.  For example, if
-     * my image was 640x480 and I called scaleByPercentage(10) then the image
-     * would be resized to 64x48
-     *
-     * @access public
-     * @param int $size Percentage of original size to scale to
-     * @return none
-     */
-    function scaleByPercentage($size)
-    {
-        return $this->scaleByFactor($size / 100);
-    } // End scaleByPercentage
-
-    /**
-     * Scales an image to a factor of its original size.  For example, if
-     * my image was 640x480 and I called scaleByFactor(0.5) then the image
-     * would be resized to 320x240.
-     *
-     * @access public
-     * @param float $size Factor of original size to scale to
-     * @return none
-     */
-    function scaleByFactor($size)
-    {
-        $new_x = round($size * $this->img_x, 0);
-        $new_y = round($size * $this->img_y, 0);
-        return $this->_resize($new_x, $new_y);
-    } // End scaleByFactor
-
-    /**
-     * Scales an image so that the longest side has this dimension.
-     *
-     * @access public
-     * @param int $size Max dimension in pixels
-     * @return none
-     */
-    function scaleByLength($size)
-    {
-         if ($this->img_x >= $this->img_y) {
-            $new_x = $size;
-            $new_y = round(($new_x / $this->img_x) * $this->img_y, 0);
-        } else {
-            $new_y = $size;
-            $new_x = round(($new_y / $this->img_y) * $this->img_x, 0);
-        }
-        return $this->_resize($new_x, $new_y);
-    } // End scaleByLength
-
-
-    /**
-     *
-     * @access public
-     * @return void
-     */
-    function _get_image_details($image)
-    {
-        //echo $image;
-        $data = @GetImageSize($image);
-        #1 = GIF, 2 = JPG, 3 = PNG, 4 = SWF, 5 = PSD, 6 = BMP, 7 = TIFF(intel byte order), 8 = TIFF(motorola byte order,
-        # 9 = JPC, 10 = JP2, 11 = JPX, 12 = JB2, 13 = SWC
-        if (is_array($data)){
-            switch($data[2]){
-                case 1:
-                    $type = 'gif';
-                    break;
-                case 2:
-                    $type = 'jpeg';
-                    break;
-                case 3:
-                    $type = 'png';
-                    break;
-                case 4:
-                    $type = 'swf';
-                    break;
-                case 5:
-                    $type = 'psd';
-                case 6:
-                    $type = 'bmp';
-                case 7:
-                case 8:
-                    $type = 'tiff';
-                default:
-                    echo("We do not recognize this image format");
-            }
-            $this->img_x = $data[0];
-            $this->img_y = $data[1];
-            $this->type = $type;
-
-            return true;
-        } else {
-            echo("Cannot fetch image or images details.");
-            return null;
-        }
-        /*
-        $output = array(
-                        'width' => $data[0],
-                        'height' => $data[1],
-                        'type' => $type
-                        );
-        return $output;
-        */
-    }
-
-
-    /**
-     * Parse input and convert
-     * If either is 0 it will be scaled proportionally
-     *
-     * @access private
-     *
-     * @param mixed $new_size (0, number, percentage 10% or 0.1)
-     * @param int $old_size
-     *
-     * @return mixed none or PEAR_error
-     */
-    function _parse_size($new_size, $old_size)
-    {
-        if ('%' == $new_size) {
-            $new_size = str_replace('%','',$new_size);
-            $new_size = $new_size / 100;
-        }
-        if ($new_size > 1) {
-            return (int) $new_size;
-        } elseif ($new_size == 0) {
-            return (int) $old_size;
-        } else {
-            return (int) round($new_size * $old_size, 0);
-        }
-    }
-
-
-    function uniqueStr()
-    {
-      return substr(md5(microtime()),0,6);
-    }
-
-    //delete old tmp files, and allow only 1 file per remote host.
-    function cleanUp($id, $dir)
-    {
-        $d = dir($dir);
-        $id_length = strlen($id);
-
-        while (false !== ($entry = $d->read())) {
-            if (is_file($dir.'/'.$entry) && substr($entry,0,1) == '.' && !ereg($entry, $this->image))
-            {
-                //echo filemtime($this->directory.'/'.$entry)."<br>"; 
-                //echo time();
-
-                if (filemtime($dir.'/'.$entry) + $this->lapse_time < time())
-                    unlink($dir.'/'.$entry);
-
-                if (substr($entry, 1, $id_length) == $id)
-                {
-                    if (is_file($dir.'/'.$entry))
-                        unlink($dir.'/'.$entry);
-                }
-            }
-        }
-        $d->close();
-    }
-
-
-    function createUnique($dir)
-    {
-       $unique_str = '.'.$this->uid.'_'.$this->uniqueStr().".".$this->type;
-        
-       //make sure the the unique temp file does not exists
-        while (file_exists($dir.$unique_str))
-        {
-            $unique_str = '.'.$this->uid.'_'.$this->uniqueStr().".".$this->type;
-        }
-        
-      $this->cleanUp($this->uid, $dir);
-
-       return $unique_str;
-    }
-
-
-    /**
-     * Set the image width
-     * @param int $size dimension to set
-     * @since 29/05/02 13:36:31
-     * @return
-     */
-    function _set_img_x($size)
-    {
-        $this->img_x = $size;
-    }
-
-    /**
-     * Set the image height
-     * @param int $size dimension to set
-     * @since 29/05/02 13:36:31
-     * @return
-     */
-    function _set_img_y($size)
-    {
-        $this->img_y = $size;
-    }
-
-    /**
-     * Set the image width
-     * @param int $size dimension to set
-     * @since 29/05/02 13:36:31
-     * @return
-     */
-    function _set_new_x($size)
-    {
-        $this->new_x = $size;
-    }
-
-    /**
-     * Set the image height
-     * @param int $size dimension to set
-     * @since 29/05/02 13:36:31
-     * @return
-     */
-    function _set_new_y($size)
-    {
-        $this->new_y = $size;
-    }
-
-    /**
-     * Get the type of the image being manipulated
-     *
-     * @return string $this->type the image type
-     */
-    function getImageType()
-    {
-        return $this->type;
-    }
-
-    /**
-     *
-     * @access public
-     * @return string web-safe image type
-     */
-    function getWebSafeFormat()
-    {
-        switch($this->type){
-            case 'gif':
-            case 'png':
-                return 'png';
-                break;
-            default:
-                return 'jpeg';
-        } // switch
-    }
-
-    /**
-     * Place holder for the real resize method
-     * used by extended methods to do the resizing
-     *
-     * @access private
-     * @return PEAR_error
-     */
-    function _resize() {
-        return null; //PEAR::raiseError("No Resize method exists", true);
-    }
-
-    /**
-     * Place holder for the real load method
-     * used by extended methods to do the resizing
-     *
-     * @access public
-     * @return PEAR_error
-     */
-    function load($filename) {
-        return null; //PEAR::raiseError("No Load method exists", true);
-    }
-
-    /**
-     * Place holder for the real display method
-     * used by extended methods to do the resizing
-     *
-     * @access public
-     * @param string filename
-     * @return PEAR_error
-     */
-    function display($type, $quality) {
-        return null; //PEAR::raiseError("No Display method exists", true);
-    }
-
-    /**
-     * Place holder for the real save method
-     * used by extended methods to do the resizing
-     *
-     * @access public
-     * @param string filename
-     * @return PEAR_error
-     */
-    function save($filename, $type, $quality) {
-        return null; //PEAR::raiseError("No Save method exists", true);
-    }
-
-    /**
-     * Place holder for the real free method
-     * used by extended methods to do the resizing
-     *
-     * @access public
-     * @return PEAR_error
-     */
-    function free() {
-        return null; //PEAR::raiseError("No Free method exists", true);
-    }
-
-    /**
-     * Reverse of rgb2colorname.
-     *
-     * @access public
-     * @return PEAR_error
-     *
-     * @see rgb2colorname
-     */
-    function colorhex2colorarray($colorhex) {
-        $r = hexdec(substr($colorhex, 1, 2));
-        $g = hexdec(substr($colorhex, 3, 2));
-        $b = hexdec(substr($colorhex, 4, 2));
-        return array($r,$g,$b);
-    }
-
-    /**
-     * Reverse of rgb2colorname.
-     *
-     * @access public
-     * @return PEAR_error
-     *
-     * @see rgb2colorname
-     */
-    function colorarray2colorhex($color) {
-        $color = '#'.dechex($color[0]).dechex($color[1]).dechex($color[2]);
-        return strlen($color)>6?false:$color;
-    }
-
-
-    /* Methods to add to the driver classes in the future */
-    function addText()
-    {
-        return null; //PEAR::raiseError("No addText method exists", true);
-    }
-
-    function addDropShadow()
-    {
-        return null; //PEAR::raiseError("No AddDropShadow method exists", true);
-    }
-
-    function addBorder()
-    {
-        return null; //PEAR::raiseError("No addBorder method exists", true);
-    }
-
-    function crop()
-    {
-        return null; //PEAR::raiseError("No crop method exists", true);
-    }
-
-    function flip() 
-    {
-        return null;
-    }
-
-    function gamma()
-    {
-        return null; //PEAR::raiseError("No gamma method exists", true);
-    }
-}
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/README.txt b/web/imcms/xinha/plugins/ImageManager/README.txt
deleted file mode 100644
index fa99392335..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/README.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-Originally Developed by: http://www.zhuo.org/htmlarea/
-
-> This is a plug-in for HTMLArea 3.0
-> 
-> The PHP ImageManager + Editor provides an interface to 
-> browser for image files on your web server. The Editor
-> allows some basic image manipulations such as, cropping,
-> rotation, flip, and scaling.
-> 
-> Further and up-to-date documentation can be found at
-> http://www.zhuo.org/htmlarea/docs/index.html
-> 
-> Cheer,
-> Wei
-
-2005-03-20 
-  by Yermo Lamers of DTLink, LLC (http://www.formvista.com/contact.html)
-
-Please post questions/comments/flames about this plugin in the Xinha forums
-at 
-
-   http://xinha.gogo.co.nz/punbb/viewforum.php?id=1
-
-------------------------------------------------------------------------------
-If you have GD installed and configured in PHP this should work out of the 
-box. 
-
-For production use see config.inc.php for configuration values. You will 
-want to adjust images_dir and images_url for your application.
-
-For demo purposes ImageManager is set up to view images in the
-
-   /xinha/plugins/ImageManager/demo_images
-
-directory. This is governed by the images_dir and images_url config options.
-
-The permissions on the demo_images directory may not be correct. The directory
-should be owned by the user your webserver runs as and should have 755 
-permissions.
-
---------------------------------------------------------------------------------
-
-By  default this ImageManager is set up to browse some graphics
-in plugins/ImageManager/demo_images.
-
-For  security reasons image uploading is turned off by default.
-You can enable it by editing config.inc.php.
-
----------------------------------
-For Developers
----------------------------------
-
-CHANGES FROM Wei's Original Code:
-
-Single Backend:								 
----------------
-
-All  requests  from  the javascript code back to the server now
-are  routed  through  a  single  configurable  backend  script,
-backend.php.
-
-Request URLs are of the form:
-
- <config backend URL>(?|&)__plugin=ImageManager&__function=<function>&arg=value&arg=value
-
-The default URL is plugins/xinha/backend.php.
-
-This  approach  makes  it  possible  to  completely replace the
-backend  with  a  perl  or ASP implementation without having to
-change any of the client side code.
-
-You  can  override  the  location  and  name of the backend.php
-script by setting the config.ImageManager.backend property from
-the  calling  page. Make sure the URL ends in an "&". The code,
-for now, assumes it can just tack on variables.
-
-For  the moment the javascript files in the assets directory do
-not  have access to the main editor object and as a result have
-not  access to the config. For the moment we use a _backend_url
-variable  output  from  PHP  to communicate the location of the
-backend  to  these  assets.  It's  a  kludge. Ideally all these
-config  values  should  be  set  from  the  calling page and be
-available through the editor.config.ImageManager object.
-
-Debug Messages
----------------
-
-The  php files include a simple debugging library, ddt.php. See
-config.inc.php  for  how  to  turn  it on. It can display trace
-messages to the browser or dump them to a log file.
-
-I'll  try  to  package  up  the client-side tracing-to-textarea
-_ddt()  functions  I've  put  together.  Having a trace message
-infrastructure has always served me well.
-
--------------
-Flakey Editor
--------------
-
-The  editor  I  use  is  flakey  (but  very  very fast). It has
-problems with tab to space conversion so if the indenting looks
-weird that's why.
-
-----
-TODO
-----
-
-ImageManager really needs a complete rewrite. 
-
-. ImageManager should appear in a pane instead of a popup
-  window using Sleeman's windowpane support.
-
-.  html  and  php code are intermixed. It would be very nice to
-use  some  kind  of templating for the dialogs; this templating
-should be done long hand so it can be re-used regardless of the
-backend implementation language.
-
-.  the  config  should  probably  be  some format that would be
-easily  read  by  multiple  implementations of the back end. It
-would  be nice to have a single configuration system regardless
-of whether the backend is PHP, Perl or ASP.
-
-.  javascript assets are not objects. Passing config options to
-the  assets  functions requires intermediate variables which is
-really  ugly.  Everything should be cleanly integrated into the
-object heirarchy akin to the way Linker is done.
-
-.  if  an  image is selected from the document editor window it
-should  be  focused  and  highlighted  in  the  image selection
-window.
-
-. fix fully-qualified url in image selection box under MSIE.
-
-. per-image permissions. We should include some kind of backend
-permissions      management      so      users     can     only
-delete/edit/move/rename images that they have uploaded.
-
-. add a CANCEL button and a SAVE AS button to the editor.
-
-.  add  a  list view akin to EFM. (and include image properties
-width/height/depth/etc.)
-
-.  figure  out  a way for ImageManager to work "out of the box"
-regardless of install.
-
-. client-side tracing.
-
-. fancy stuff like adding a UI to define rollovers, animations,
-etc.
-
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/EditorContent.js b/web/imcms/xinha/plugins/ImageManager/assets/EditorContent.js
deleted file mode 100644
index 35655f0267..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/EditorContent.js
+++ /dev/null
@@ -1,749 +0,0 @@
-/***********************************************************************
-** Title.........:  Online Image Editor Interface
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  EditorContents.js
-** Last changed..:  31 Mar 2004 
-** Notes.........:  Handles most of the interface routines for the ImageEditor.
-*
-* Added:  29 Mar 2004  - Constrainted resizing/scaling
-**/ 
-
-
-function MM_findObj(n, d) { //v4.01
-  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
-    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
-  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
-  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
-  if(!x && d.getElementById) x=d.getElementById(n); return x;
-}
-
-var pic_x, pic_y;
-function P7_Snap() { //v2.62 by PVII
-  var x,y,ox,bx,oy,p,tx,a,b,k,d,da,e,el,args=P7_Snap.arguments;a=parseInt(a);
-  for (k=0; k<(args.length-3); k+=4)
-   if ((g=MM_findObj(args[k]))!=null) {
-    el=eval(MM_findObj(args[k+1]));
-    a=parseInt(args[k+2]);b=parseInt(args[k+3]);
-    x=0;y=0;ox=0;oy=0;p="";tx=1;da="document.all['"+args[k]+"']";
-    if(document.getElementById) {
-     d="document.getElementsByName('"+args[k]+"')[0]";
-     if(!eval(d)) {d="document.getElementById('"+args[k]+"')";if(!eval(d)) {d=da;}}
-    }else if(document.all) {d=da;} 
-    if (document.all || document.getElementById) {
-     while (tx==1) {p+=".offsetParent";
-      if(eval(d+p)) {x+=parseInt(eval(d+p+".offsetLeft"));y+=parseInt(eval(d+p+".offsetTop"));
-      }else{tx=0;}}
-     ox=parseInt(g.offsetLeft);oy=parseInt(g.offsetTop);var tw=x+ox+y+oy;
-     if(tw==0 || (navigator.appVersion.indexOf("MSIE 4")>-1 && navigator.appVersion.indexOf("Mac")>-1)) {
-      ox=0;oy=0;if(g.style.left){x=parseInt(g.style.left);y=parseInt(g.style.top);
-      }else{var w1=parseInt(el.style.width);bx=(a<0)?-5-w1:-10;
-      a=(Math.abs(a)<1000)?0:a;b=(Math.abs(b)<1000)?0:b;
-      //alert(event.clientX);
-	  if (event == null) x=document.body.scrollLeft + bx;
-		else x=document.body.scrollLeft + event.clientX + bx;
-	  if (event == null) y=document.body.scrollTop;
-		else y=document.body.scrollTop + event.clientY;}}
-   }else if (document.layers) {x=g.x;y=g.y;var q0=document.layers,dd="";
-    for(var s=0;s<q0.length;s++) {dd='document.'+q0[s].name;
-     if(eval(dd+'.document.'+args[k])) {x+=eval(dd+'.left');y+=eval(dd+'.top');break;}}}
-   if(el) {e=(document.layers)?el:el.style;
-   var xx=parseInt(x+ox+a),yy=parseInt(y+oy+b);
-   //alert(xx+":"+yy);
-   if(navigator.appName=="Netscape" && parseInt(navigator.appVersion)>4){xx+="px";yy+="px";}
-   if(navigator.appVersion.indexOf("MSIE 5")>-1 && navigator.appVersion.indexOf("Mac")>-1){
-    xx+=parseInt(document.body.leftMargin);yy+=parseInt(document.body.topMargin);
-    xx+="px";yy+="px";}e.left=xx;e.top=yy;}
-    pic_x = parseInt(xx); pic_y = parseInt(yy);
-    //alert(xx+":"+yy);
-    }
-}
-
-var ie=document.all
-var ns6=document.getElementById&&!document.all
-
-var dragapproved=false
-var z,x,y,status, ant, canvas, content, pic_width, pic_height, image, resizeHandle, oa_w, oa_h, oa_x, oa_y, mx2, my2;
-
-
-function init_resize() 
-{
-    if(mode == "scale") 
-    {
-        P7_Snap('theImage','ant',0,0);
-
-        if (canvas == null)
-            canvas = MM_findObj("imgCanvas");
-
-        if (pic_width == null || pic_height == null)
-        {
-            image = MM_findObj("theImage");
-            pic_width = image.width;
-            pic_height = image.height;
-        }
-        
-        if (ant == null)
-            ant = MM_findObj("ant");
-
-        ant.style.left = pic_x; ant.style.top = pic_y;
-        ant.style.width = pic_width; ant.style.height = pic_height;
-        ant.style.visibility = "visible";
-
-        drawBoundHandle();
-        jg_doc.paint();
-    }
-}
-
-initEditor = function () 
-{
-    init_crop();
-    init_resize();
-    var markerImg = MM_findObj('markerImg', window.top.document);
-
-    if (markerImg.src.indexOf("img/t_white.gif")>0)
-        toggleMarker() ;
-};
-
-function init_crop() 
-{
-    //if(mode == "crop") {
-        P7_Snap('theImage','ant',0,0);
-    //}
-}
-
-function setMode(newMode) 
-{
-    mode = newMode;
-    reset();
-}
-
-function reset() 
-{
-    if (ant == null)
-        ant = MM_findObj("ant");
-
-    ant.style.visibility = "hidden";
-    ant.style.left = 0;
-    ant.style.top = 0;
-    ant.style.width = 0;
-    ant.style.height = 0;
-
-    mx2 = null;
-    my2 = null;
-
-    jg_doc.clear();
-    if(mode != 'measure')
-        showStatus();   
-
-    if(mode == "scale") {
-        init_resize();
-    }
-
-    P7_Snap('theImage','ant',0,0);
-}
-
-function toggleMarker() 
-{
-    //alert("Toggle");
-    if (ant == null)
-        ant = MM_findObj("ant");
-
-    if(ant.className=="selection")
-        ant.className="selectionWhite";
-    else
-        ant.className="selection";
-    
-    if (jg_doc.getColor() == "#000000")
-        jg_doc.setColor("#FFFFFF");
-    else
-        jg_doc.setColor("#000000");
-    
-    drawBoundHandle
-    jg_doc.paint();
-}
-
-
-function move(e)
-{
-    if (dragapproved)
-    {
-        //z.style.left=ns6? temp1+e.clientX-x: temp1+event.clientX-x
-        //z.style.top=ns6? temp2+e.clientY-y : temp2+event.clientY-y
-        var w = ns6? temp1+e.clientX - x : temp1+event.clientX - x;
-        var h = ns6? temp2+e.clientY - y : temp2+event.clientY - y;
-
-        //alert(canvas.style.left);
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" w:"+w+" h:"+h+" can_h:"+pic_height;
-            status.innerHTML += " can_w:"+pic_width+" px:"+pic_x+" py:"+pic_y;
-            status.innerHTML += " pix:"+image.style.left+" piy:"+image.style.top+" obj:"+obj.id;
-        }*/
-
-        /*jg_doc.clear();
-        jg_doc.fillRectPattern(0,0,Math.abs(w),Math.abs(h),pattern);
-        jg_doc.paint();
-*/
-        if (ant != null)
-        {
-            if (w >= 0)
-            {
-                ant.style.left = x;
-                ant.style.width = w;
-            }
-            else
-            {
-                ant.style.left = x+w;
-                ant.style.width = -1*w;
-            }
-
-            if (h >= 0)
-            {
-                ant.style.top = y;
-                ant.style.height = h;
-            }
-            else
-            {
-                ant.style.top = y+h;
-                ant.style.height = -1*h
-            }
-        }
-        
-        showStatus();
-        return false
-    }
-}
-
-function moveContent(e) 
-{
-    if (dragapproved)
-    {
-
-        var dx =ns6? oa_x + e.clientX-x: oa_x + event.clientX-x
-        var dy =ns6? oa_y + e.clientY-y : oa_y + event.clientY-y
-
-
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" dx:"+dx+" dy:"+dy;
-        }*/
-
-        ant.style.left = dx;
-        ant.style.top = dy;
-
-        showStatus();
-
-        return false;
-    }
-}
-
-//Code add for constraints by Frédéric Klee <fklee@isuisse.com>
-function moveHandle(e) 
-{
-    if (dragapproved)
-    {
-        var w = ns6? e.clientX - x : event.clientX - x;
-        var h = ns6? e.clientY - y : event.clientY - y;
-        
-		var constrained = MM_findObj('constProp', window.top.document);
-        var orginal_height = document.theImage.height ;
-        var orginal_width = document.theImage.width ;
-        rapp = orginal_width/orginal_height ;
-        rapp_inv = orginal_height / orginal_width ;
-
-        switch(resizeHandle) 
-        {
-
-            case "s-resize":
-                if (oa_h + h >= 0) 
-				{
-                    ant.style.height = oa_h + h;
-					if(constrained.checked) 
-					{
-						ant.style.width = rapp * (oa_h + h) ;
-                        ant.style.left = oa_x - rapp * h/2;
-					}
-
-				}
-                break;
-            case "e-resize":
-                if(oa_w + w >= 0)
-				{
-                    ant.style.width = oa_w + w;
-					if(constrained.checked) 
-					{
-                        ant.style.height = rapp_inv * (oa_w + w) ;
-                        ant.style.top = oa_y - rapp_inv * w/2;
-                    }
-
-				}
-                break;
-            case "n-resize":
-                if (oa_h - h >= 0)
-                {
-                    ant.style.top = oa_y + h;
-                    ant.style.height = oa_h - h;
-					if(constrained.checked) 
-					{
-						ant.style.width = rapp * (oa_h - h) ;
-                        ant.style.left = oa_x + rapp * h/2;
-                    }
-
-                }
-                break;
-            case "w-resize":
-                if(oa_w - w >= 0) 
-				{
-                    ant.style.left = oa_x + w;
-                    ant.style.width = oa_w - w;
-					if(constrained.checked) 
-					{
-						ant.style.height = rapp_inv * (oa_w - w) ;
-						ant.style.top = oa_y + rapp_inv * w/2;
-                    }
-
-                }break;
-            case "nw-resize":
-                if(oa_h - h >= 0 && oa_w - w >= 0) {
-                    ant.style.left = oa_x + w;
-                    ant.style.width = oa_w - w;
-                    ant.style.top = oa_y + h;
-                    if(constrained.checked) 
-                        ant.style.height = rapp_inv * (oa_w - w) ;
-                    else
-                        ant.style.height = oa_h - h;
-                }
-            break;
-            case "ne-resize":
-                if (oa_h - h >= 0 && oa_w + w >= 0){
-                    ant.style.top = oa_y + h;
-					ant.style.width = oa_w + w;
-					if(constrained.checked) 
-                        ant.style.height = rapp_inv * (oa_w + w) ;
-                    else
-                        ant.style.height = oa_h - h;
-                }
-                break;
-            case "se-resize":
-                if (oa_h + h >= 0 && oa_w + w >= 0) 
-                {
-                    ant.style.width = oa_w + w;
-                    if(constrained.checked)
-                        ant.style.height = rapp_inv * (oa_w + w) ;
-                    else
-                        ant.style.height = oa_h + h;
-                }
-                break;
-            case "sw-resize":
-                if (oa_h + h >= 0 && oa_w - w >= 0)
-                {
-                    ant.style.left = oa_x + w;
-                    ant.style.width = oa_w - w;
-					if(constrained.checked)
-                        ant.style.height = rapp_inv * (oa_w - w) ;
-                    else
-                       ant.style.height = oa_h + h;
-				}
-        }
-        
-        showStatus();
-        return false;
-        
-    }
-}
-
-function drags(e)
-{
-    if (!ie&&!ns6)
-        return
-    
-    var firedobj=ns6? e.target : event.srcElement
-    var topelement=ns6? "HTML" : "BODY"
-
-    while (firedobj.tagName!=topelement&&
-            !(firedobj.className=="crop" 
-                || firedobj.className=="handleBox" 
-                || firedobj.className=="selection" || firedobj.className=="selectionWhite"))
-    {
-        firedobj=ns6? firedobj.parentNode : firedobj.parentElement
-    }
-
-    if(firedobj.className=="handleBox") {
-        
-        if(content != null) {
-            if(content.width != null && content.height != null) {
-                content.width = 0;
-                content.height = 0;
-            }
-            //alert(content.width+":"+content.height);
-        }
-        resizeHandle = firedobj.id;
-        
-        /*if(status!=null) {
-            status.innerHTML  = " obj:"+firedobj.id;
-        }*/
-
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
-
-        oa_w = parseInt(ant.style.width);
-        oa_h = parseInt(ant.style.height);
-        oa_x = parseInt(ant.style.left);
-        oa_y = parseInt(ant.style.top);
-
-        dragapproved=true
-        document.onmousemove=moveHandle;
-        return false;
-    }
-    else
-    if((firedobj.className == "selection" || firedobj.className=="selectionWhite")&& mode == "crop") {
-        
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
-        
-        oa_x = parseInt(ant.style.left);
-        oa_y = parseInt(ant.style.top);
-
-        dragapproved=true
-        document.onmousemove=moveContent;
-        return false;
-    }
-    else
-    if (firedobj.className=="crop" && mode == "crop")
-    {
-        if(content != null) {
-            if(content.width != null && content.height != null) {
-                content.width = 0;
-                content.height = 0;
-            }
-            //alert(content.width+":"+content.height);
-        }
-
-        if (status == null)
-            status = MM_findObj("status");
-
-        if (ant == null)
-            ant = MM_findObj("ant");
-
-        if (canvas == null)
-            canvas = MM_findObj("imgCanvas");
-        if(content == null) {
-            content = MM_findObj("cropContent");
-        }
-
-        if (pic_width == null || pic_height == null)
-        {
-            image = MM_findObj("theImage");
-            pic_width = image.width;
-            pic_height = image.height;
-        }
-
-        ant.style.visibility = "visible";
-
-        obj = firedobj;
-        dragapproved=true
-        z=firedobj
-        temp1=parseInt(z.style.left+0)
-        temp2=parseInt(z.style.top+0)
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
-        document.onmousemove=move
-        return false
-    }
-        else if(firedobj.className=="crop" && mode == "measure") {
-
-            if (ant == null)
-                ant = MM_findObj("ant");
-
-            if (canvas == null)
-                canvas = MM_findObj("imgCanvas");
-
-            x=ns6? e.clientX: event.clientX
-            y=ns6? e.clientY: event.clientY
-
-                //jg_doc.draw
-            dragapproved=true
-            document.onmousemove=measure
-
-            return false
-        }
-}
-
-function measure(e) 
-{
-    if (dragapproved)
-    {
-        mx2 = ns6? e.clientX : event.clientX;
-        my2 = ns6? e.clientY : event.clientY;
-        
-        jg_doc.clear();
-        jg_doc.setStroke(Stroke.DOTTED); 
-        jg_doc.drawLine(x,y,mx2,my2);
-        jg_doc.paint();
-        showStatus();
-        return false;
-    }
-}
-
-function setMarker(nx,ny,nw,nh) 
-{
-    if (isNaN(nx)) nx = 0;
-    if (isNaN(ny)) ny = 0;
-    if (isNaN(nw)) nw = 0;
-    if (isNaN(nh)) nh = 0;
-  
-    if (ant == null)
-      ant = MM_findObj("ant");
-
-    if (canvas == null)
-        canvas = MM_findObj("imgCanvas");
-    if(content == null) {
-        content = MM_findObj("cropContent");
-    }
-
-    if (pic_width == null || pic_height == null)
-    {
-        image = MM_findObj("theImage");
-        pic_width = image.width;
-        pic_height = image.height;
-    }
-
-    ant.style.visibility = "visible";
-
-    nx = pic_x + nx;
-    ny = pic_y + ny;
-
-    if (nw >= 0)
-    {
-        ant.style.left = nx;
-        ant.style.width = nw;
-    }
-    else
-    {
-        ant.style.left = nx+nw;
-        ant.style.width = -1*nw;
-    }
-
-    if (nh >= 0)
-    {
-        ant.style.top = ny;
-        ant.style.height = nh;
-    }
-    else
-    {
-        ant.style.top = ny+nh;
-        ant.style.height = -1*nh
-    }
-
-    
-}
-
-function max(x,y) 
-{
-    if(y > x)
-        return x;
-    else 
-        return y;
-}
-
-function drawBoundHandle() 
-{
-    if(ant == null || ant.style == null) 
-        return false;
-
-    var ah = parseInt(ant.style.height);
-    var aw = parseInt(ant.style.width);
-    var ax = parseInt(ant.style.left);
-    var ay = parseInt(ant.style.top);
-
-    jg_doc.drawHandle(ax-15,ay-15,30,30,"nw-resize"); //upper left
-    jg_doc.drawHandle(ax-15,ay+ah-15,30,30,"sw-resize"); //lower left
-    jg_doc.drawHandle(ax+aw-15,ay-15,30,30,"ne-resize"); //upper right
-    jg_doc.drawHandle(ax+aw-15,ay+ah-15,30,30,"se-resize"); //lower right
-
-    jg_doc.drawHandle(ax+max(15,aw/10),ay-8,aw-2*max(15,aw/10),8,"n-resize"); //top middle
-    jg_doc.drawHandle(ax+max(15,aw/10),ay+ah,aw-2*max(15,aw/10),8,"s-resize"); //bottom middle
-    jg_doc.drawHandle(ax-8, ay+max(15,ah/10),8,ah-2*max(15,ah/10),"w-resize"); //left middle
-    jg_doc.drawHandle(ax+aw, ay+max(15,ah/10),8,ah-2*max(15,ah/10),"e-resize"); //right middle
-
-
-
-    jg_doc.drawHandleBox(ax-4,ay-4,8,8,"nw-resize"); //upper left
-    jg_doc.drawHandleBox(ax-4,ay+ah-4,8,8,"sw-resize"); //lower left
-    jg_doc.drawHandleBox(ax+aw-4,ay-4,8,8,"ne-resize"); //upper right
-    jg_doc.drawHandleBox(ax+aw-4,ay+ah-4,8,8,"se-resize"); //lower right
-
-    jg_doc.drawHandleBox(ax+aw/2-4,ay-4,8,8,"n-resize"); //top middle
-    jg_doc.drawHandleBox(ax+aw/2-4,ay+ah-4,8,8,"s-resize"); //bottom middle
-    jg_doc.drawHandleBox(ax-4, ay+ah/2-4,8,8,"w-resize"); //left middle
-    jg_doc.drawHandleBox(ax+aw-4, ay+ah/2-4,8,8,"e-resize"); //right middle
-
-    //jg_doc.paint();
-}
-
-function showStatus() 
-{
-    if(ant == null || ant.style == null) {
-        return false;
-    }
-
-    if(mode == "measure") {
-        //alert(pic_x);
-        mx1 = x - pic_x;
-        my1 = y - pic_y;
-
-        mw = mx2 - x;
-        mh = my2 - y;
-
-        md = parseInt(Math.sqrt(mw*mw + mh*mh)*100)/100;
-
-        ma = (Math.atan(-1*mh/mw)/Math.PI)*180;
-        if(mw < 0 && mh < 0)
-            ma = ma+180;
-
-        if (mw <0 && mh >0)
-            ma = ma - 180;
-
-        ma = parseInt(ma*100)/100;
-
-        if (m_sx != null && !isNaN(mx1))
-            m_sx.value = mx1+"px";
-        if (m_sy != null && !isNaN(my1))
-            m_sy.value = my1+"px";
-        if(m_w != null && !isNaN(mw))
-            m_w.value = mw + "px";
-        if(m_h != null && !isNaN(mh))
-            m_h.value = mh + "px";
-
-        if(m_d != null && !isNaN(md))
-            m_d.value = md + "px";
-        if(m_a != null && !isNaN(ma))
-            m_a.value = ma + "";
-
-        if(r_ra != null &&!isNaN(ma))
-            r_ra.value = ma;            
-
-        //alert("mx1:"+mx1+" my1"+my1);
-        return false;
-    }
-
-    var ah = parseInt(ant.style.height);
-    var aw = parseInt(ant.style.width);
-    var ax = parseInt(ant.style.left);
-    var ay = parseInt(ant.style.top);
-
-    var cx = ax-pic_x<0?0:ax-pic_x;
-    var cy = ay-pic_y<0?0:ay-pic_y;
-    cx = cx>pic_width?pic_width:cx;
-    cy = cy>pic_height?pic_height:cy;
-    
-    var cw = ax-pic_x>0?aw:aw-(pic_x-ax);
-    var ch = ay-pic_y>0?ah:ah-(pic_y-ay);
-
-    ch = ay+ah<pic_y+pic_height?ch:ch-(ay+ah-pic_y-pic_height);
-    cw = ax+aw<pic_x+pic_width?cw:cw-(ax+aw-pic_x-pic_width);
-
-    ch = ch<0?0:ch; cw = cw<0?0:cw;
-    
-    if (ant.style.visibility == "hidden")
-    {
-        cx = ""; cy = ""; cw=""; ch="";
-    }
-
-    if(mode == 'crop') {
-        if(t_cx != null)
-            t_cx.value = cx;
-        if (t_cy != null)   
-            t_cy.value = cy;
-        if(t_cw != null)
-            t_cw.value = cw;
-        if (t_ch != null)   
-            t_ch.value = ch;
-    }
-    else if(mode == 'scale') {
-
-        var sw = aw, sh = ah;
-
-        if (s_sw.value.indexOf('%')>0 && s_sh.value.indexOf('%')>0)
-        {   
-            sw = cw/pic_width;
-            sh = ch/pic_height;
-        }
-        if (s_sw != null)
-            s_sw.value = sw;
-        if (s_sh != null)
-            s_sh.value = sh;
-    }
-
-}
-
-function dragStopped()
-{
-    dragapproved=false;
-
-    if(ant == null || ant.style == null) {
-        return false;
-    }
-
-    if(mode == "measure") {
-        jg_doc.drawLine(x-4,y,x+4,y);
-        jg_doc.drawLine(x,y-4,x,y+4);
-        jg_doc.drawLine(mx2-4,my2,mx2+4,my2);
-        jg_doc.drawLine(mx2,my2-4,mx2,my2+4);
-
-        jg_doc.paint();
-        showStatus();
-        return false;
-    }
-        var ah = parseInt(ant.style.height);
-        var aw = parseInt(ant.style.width);
-        var ax = parseInt(ant.style.left);
-        var ay = parseInt(ant.style.top);
-        jg_doc.clear();
-        
-        if(content != null) {
-            if(content.width != null && content.height != null) {
-                content.width = aw-1;
-                content.height = ah-1;
-            }
-            //alert(content.width+":"+content.height);
-        }
-        if(mode == "crop") {
-            //alert(pic_y);
-            jg_doc.fillRectPattern(pic_x,pic_y,pic_width,ay-pic_y,pattern);
-            
-            var h1 = ah;
-            var y1 = ay;
-            if (ah+ay >= pic_height+pic_y)
-                h1 = pic_height+pic_y-ay;
-            else if (ay <= pic_y)
-            {
-                h1 = ay+ah-pic_y;
-                y1 = pic_y;
-            }
-            jg_doc.fillRectPattern(pic_x,y1,ax-pic_x,h1,pattern);
-            jg_doc.fillRectPattern(ax+aw,y1,pic_x+pic_width-ax-aw,h1,pattern);
-            jg_doc.fillRectPattern(pic_x,ay+ah,pic_width,pic_height+pic_y-ay-ah,pattern);
-        }
-        else if(mode == "scale") {
-            //alert("Resizing: iw:"+image.width+" nw:"+aw);
-            document.theImage.height = ah;
-            document.theImage.width = aw;
-            document.theImage.style.height = ah+" px";
-            document.theImage.style.width = aw+" px";
-
-            P7_Snap('theImage','ant',0,0);
-
-            //alert("After Resizing: iw:"+image.width+" nw:"+aw);
-        }
-
-        drawBoundHandle();
-        jg_doc.paint();
-    
-        showStatus();
-    return false;
-}
-
-document.onmousedown=drags
-document.onmouseup=dragStopped;
-
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/ImageEditor.css b/web/imcms/xinha/plugins/ImageManager/assets/ImageEditor.css
deleted file mode 100644
index 7cefe46cd7..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/ImageEditor.css
+++ /dev/null
@@ -1,76 +0,0 @@
-.icons {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-align: center;
-    text-decoration: none;
-    border: 1px solid #EEEEFF;
-    -Moz-Border-Radius: 6px 6px 6px 6px;
-}
-
-body, td, p {
-    font: 11px Tahoma,Verdana,sans-serif;
-}
-.iconsOver {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-align: center;
-    text-decoration: none;
-    background-color: #F9F9FF;
-    border: 1px solid #666699;
-    -Moz-Border-Radius: 6px 6px 6px 6px;
-}
-.topBar {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-}
-.iconsSel {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-align: center;
-    text-decoration: none;
-    border: 1px solid #666699;
-    -Moz-Border-Radius: 6px 6px 6px 6px;
-}
-.iconText {
-    font: 11px Tahoma,Verdana,sans-serif;
-    color: #666699;
-    text-decoration: none;
-    text-align: center;
-}
-.measureStats{
-    width: 50px;
-}
-
-#slidercasing {
-    /*border:1px solid #CCCCCC;
-    background-color:#FFFFFF;*/
-    width:100px;
-    height:5px;
-    position:relative;
-    z-index:4;
-    padding:10px;
-}
-
-
-#slidertrack {
-    position:relative;
-    border:1px solid #CCCCCC;
-    background-color:#FFFFCC;
-    z-index:5;
-    height:5px;
-}
-
-
-#sliderbar {
-    position:absolute;
-    z-index:6;
-    border:1px solid #CCCCCC;
-    background-color:#DDDDDD;
-    width:15px;     
-    padding:0px;
-    height:20px; 
-    cursor: pointer;
-    top:2px;
-}
-
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/dialog.js b/web/imcms/xinha/plugins/ImageManager/assets/dialog.js
deleted file mode 100644
index 12c0bac19c..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/dialog.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Dialog v3.0 - Copyright (c) 2003-2004 interactivetools.com, inc.
-// This copyright notice MUST stay intact for use (see license.txt).
-//
-// Portions (c) dynarch.com, 2003-2004
-//
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon.
-//   http://dynarch.com/mishoo
-//
-// $Id: dialog.js 677 2007-01-19 22:24:36Z ray $
-
-// Though "Dialog" looks like an object, it isn't really an object.  Instead
-// it's just namespace for protecting global symbols.
-
-function Dialog(url, action, init) {
-	if (typeof init == "undefined") {
-		init = window;	// pass this window object by default
-	}
-	Dialog._geckoOpenModal(url, action, init);
-}
-
-Dialog._parentEvent = function(ev) {
-	setTimeout( function() { if (Dialog._modal && !Dialog._modal.closed) { Dialog._modal.focus() } }, 50);
-	if (Dialog._modal && !Dialog._modal.closed) {
-		Dialog._stopEvent(ev);
-	}
-};
-
-
-// should be a function, the return handler of the currently opened dialog.
-Dialog._return = null;
-
-// constant, the currently opened dialog
-Dialog._modal = null;
-
-// the dialog will read it's args from this variable
-Dialog._arguments = null;
-
-Dialog._geckoOpenModal = function(url, action, init) {
-	//var urlLink = "hadialog"+url.toString();
-	var myURL = "hadialog"+url;
-	var regObj = /\W/g;
-	myURL = myURL.replace(regObj,'_');
-	var dlg = window.open(url, myURL,
-			      "toolbar=no,menubar=no,personalbar=no,width=10,height=10," +
-			      "scrollbars=no,resizable=yes,modal=yes,dependable=yes");
-	Dialog._modal = dlg;
-	Dialog._arguments = init;
-
-	// capture some window's events
-	function capwin(w) {
-		Dialog._addEvent(w, "click", Dialog._parentEvent);
-		Dialog._addEvent(w, "mousedown", Dialog._parentEvent);
-		Dialog._addEvent(w, "focus", Dialog._parentEvent);
-	}
-	// release the captured events
-	function relwin(w) {
-		Dialog._removeEvent(w, "click", Dialog._parentEvent);
-		Dialog._removeEvent(w, "mousedown", Dialog._parentEvent);
-		Dialog._removeEvent(w, "focus", Dialog._parentEvent);
-	}
-	capwin(window);
-	// capture other frames
-	for (var i = 0; i < window.frames.length; capwin(window.frames[i++]));
-	// make up a function to be called when the Dialog ends.
-	Dialog._return = function (val) {
-		if (val && action) {
-			action(val);
-		}
-		relwin(window);
-		// capture other frames
-		for (var i = 0; i < window.frames.length; relwin(window.frames[i++]));
-		Dialog._modal = null;
-	};
-};
-
-
-// event handling
-
-Dialog._addEvent = function(el, evname, func) {
-	if (Dialog.is_ie) {
-		el.attachEvent("on" + evname, func);
-	} else {
-		el.addEventListener(evname, func, true);
-	}
-};
-
-
-Dialog._removeEvent = function(el, evname, func) {
-	if (Dialog.is_ie) {
-		el.detachEvent("on" + evname, func);
-	} else {
-		el.removeEventListener(evname, func, true);
-	}
-};
-
-
-Dialog._stopEvent = function(ev) {
-	if (Dialog.is_ie) {
-		ev.cancelBubble = true;
-		ev.returnValue = false;
-	} else {
-		ev.preventDefault();
-		ev.stopPropagation();
-	}
-};
-
-Dialog.agt = navigator.userAgent.toLowerCase();
-Dialog.is_ie	   = ((Dialog.agt.indexOf("msie") != -1) && (Dialog.agt.indexOf("opera") == -1));
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/editor.css b/web/imcms/xinha/plugins/ImageManager/assets/editor.css
deleted file mode 100644
index 0bb553d636..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/editor.css
+++ /dev/null
@@ -1,194 +0,0 @@
-		body
-		{
-			margin: 0; padding: 0;
-			font: 11px Tahoma,Verdana,sans-serif;
-		}
-		select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-
-		#indicator
-		{
-			width: 25px;
-			height: 20px;
-			background-color: #eef;			
-			padding: 15px 20px;
-			position: absolute;
-			left: 0; top: 0;
-		}
-		* html #indicator
-		{
-			padding: 14px 22px;
-		}
-		#tools
-		{
-			width: 600px;
-			height: 50px;
-			background-color: #eef;
-			padding: 0;
-			position: absolute;
-			left: 63px;
-			border-left: 1px solid white;
-			border-bottom: 1px solid white;
-		}
-		#toolbar
-		{
-			width: 53px;
-			height: 435px;
-			background-color: #eef;
-			float: left;
-			text-align: center;
-			padding: 5px;
-			position: absolute;
-			top: 50px;
-			border-top: 1px solid white;
-			border-right: 1px solid white;
-		}
-		
-		#contents
-		{
-			width: 600px;
-			height: 445px;
-			position: absolute;
-			left: 64px; top: 51px;
-		}
-		
-		#editor
-		{
-			width: 600px;
-			height: 445px;
-		}
-
-		#toolbar a 
-		{
-			padding: 5px;
-			width: 40px;
-			display: block;
-			border: 1px solid #eef;
-			text-align: center;
-			text-decoration: none;
-			color: #669;
-			margin: 5px 0;
-		}
-		#toolbar a:hover
-		{
-			background-color: #F9F9FF;
-			border-color: #669;
-		}
-		
-		#toolbar a.iconActive
-		{
-			border-color: #669;
-		}
-
-		#toolbar a span
-		{
-			display: block;
-			text-decoration: none;
-			
-		}
-		#toolbar a img
-		{
-			border: 0 none;
-		}
-		
-		#tools .textInput
-		{
-			width: 3em;
-			vertical-align: 0px;
-
-		}
-		* html #tools .textInput
-		{
-			vertical-align: middle;
-		}
-		#tools .measureStats
-		{
-			width: 4.5em;
-			border: 0 none;
-			background-color: #eef;
-			vertical-align: 0px;
-		}
-		* html #tools .measureStats
-		{
-			vertical-align: middle;
-		}
-		#tools label
-		{
-			margin: 0 2px 0 5px;
-		}
-		#tools input
-		{
-			vertical-align: middle;
-		}
-		#tools #tool_inputs
-		{
-			padding-top: 10px;
-			float: left;			
-		}
-		#tools .div
-		{
-			vertical-align: middle;
-			margin: 0 5px;
-		}
-		#tools img
-		{
-			border: 0 none;
-		}
-		#tools a.buttons
-		{
-			margin-top: 10px;
-			border: 1px solid #eef;
-			display: block;
-			float: left;
-		}
-		#tools a.buttons:hover
-		{
-			background-color: #F9F9FF;
-			border-color: #669;
-		}
-		#slidercasing {
-    /*border:1px solid #CCCCCC;
-    background-color:#FFFFFF;*/
-    width:100px;
-    height:5px;
-    position:relative;
-    z-index:4;
-    padding:10px;
-	 top: 6px;
-	 margin: 0 -5px 0 -10px;
-
-	
-}
-
-
-#slidertrack {
-    position:relative;
-    border:1px solid #CCCCCC;
-    background-color:#FFFFCC;
-    z-index:5;
-    height:5px;
-}
-
-
-#sliderbar {
-    position:absolute;
-    z-index:6;
-    border:1px solid #CCCCCC;
-    background-color:#DDDDDD;
-    width:15px;     
-    padding:0px;
-    height:20px; 
-    cursor: pointer;
-    top:2px;
-}
-
-* html #slidercasing
-{
-	top:0;
-}
-
-
-#bottom
-{
-	position: relative;
-	top: 490px;
-}
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/editor.js b/web/imcms/xinha/plugins/ImageManager/assets/editor.js
deleted file mode 100644
index f379d24531..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/editor.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Functions for the ImageEditor interface, used by editor.php only	
- * @author $Author: ray $
- * @version $Id: editor.js 677 2007-01-19 22:24:36Z ray $
- * @package ImageManager
- */
-
-	var current_action = null;
-	var actions = ['crop', 'scale', 'rotate', 'measure', 'save'];
-	var orginal_width = null, orginal_height=null;
-	function toggle(action) 
-	{
-		if(current_action != action)
-		{
-
-			for (var i in actions)
-			{
-				if(actions[i] != action)
-				{
-					var tools = document.getElementById('tools_'+actions[i]);
-					tools.style.display = 'none';
-					var icon = document.getElementById('icon_'+actions[i]);
-					icon.className = '';
-				}
-			}
-
-			current_action = action;
-			
-			var tools = document.getElementById('tools_'+action);
-			tools.style.display = 'block';
-			var icon = document.getElementById('icon_'+action);
-			icon.className = 'iconActive';
-
-			var indicator = document.getElementById('indicator_image');
-			indicator.src = 'img/'+action+'.gif';
-
-			editor.setMode(current_action);
-
-			//constraints on the scale,
-			//code by Frédéric Klee <fklee@isuisse.com>
-			if(action == 'scale') 
-			{
-				var theImage = editor.window.document.getElementById('theImage');
-				orginal_width = theImage.width ;
-				orginal_height = theImage.height;
-
-                var w = document.getElementById('sw');
-				w.value = orginal_width ;
-				var h = document.getElementById('sh') ;
-				h.value = orginal_height ;
-			}
-
-		}
-	}
-
-	function toggleMarker() 
-	{
-		var marker = document.getElementById("markerImg");
-		
-		if(marker != null && marker.src != null) {
-			if(marker.src.indexOf("t_black.gif") >= 0)
-				marker.src = "img/t_white.gif";
-			else
-				marker.src = "img/t_black.gif";
-
-			editor.toggleMarker();
-		}
-	}
-
-	//Togggle constraints, by Frédéric Klee <fklee@isuisse.com>
-	function toggleConstraints() 
-	{
-		var lock = document.getElementById("scaleConstImg");
-		var checkbox = document.getElementById("constProp");
-		
-		if(lock != null && lock.src != null) {
-			if(lock.src.indexOf("unlocked2.gif") >= 0)
-			{
-				lock.src = "img/islocked2.gif";
-				checkbox.checked = true;
-				checkConstrains('width');
-
-			}
-			else
-			{
-				lock.src = "img/unlocked2.gif";
-				checkbox.checked = false;
-			}
-		}
-	}
-	
-	//check the constraints, by Frédéric Klee <fklee@isuisse.com>
-	function checkConstrains(changed) 
-	{
-		var constrained = document.getElementById('constProp');
-		if(constrained.checked) 
-		{
-			var w = document.getElementById('sw') ;
-			var width = w.value ;
-			var h = document.getElementById('sh') ;
-			var height = h.value ;
-			
-			if(orginal_width > 0 && orginal_height > 0) 
-			{
-				if(changed == 'width' && width > 0) 
-					h.value = parseInt((width/orginal_width)*orginal_height);
-				else if(changed == 'height' && height > 0) 
-					w.value = parseInt((height/orginal_height)*orginal_width);
-			}
-		}
-		
-		updateMarker('scale') ;
-	}
-
-
-	function updateMarker(mode) 
-	{
-		if (mode == 'crop')
-		{
-			var t_cx = document.getElementById('cx');
-			var t_cy = document.getElementById('cy');
-			var t_cw = document.getElementById('cw');
-			var t_ch = document.getElementById('ch');
-
-			editor.setMarker(parseInt(t_cx.value), parseInt(t_cy.value), parseInt(t_cw.value), parseInt(t_ch.value));
-		}
-		else if(mode == 'scale') {
-			var s_sw = document.getElementById('sw');
-			var s_sh = document.getElementById('sh');
-			editor.setMarker(0, 0, parseInt(s_sw.value), parseInt(s_sh.value));
-		}
-	}
-
-	
-	function rotatePreset(selection) 
-	{
-		var value = selection.options[selection.selectedIndex].value;
-		
-		if(value.length > 0 && parseInt(value) != 0) {
-			var ra = document.getElementById('ra');
-			ra.value = parseInt(value);
-		}
-	}
-
-	function updateFormat(selection) 
-	{
-		var selected = selection.options[selection.selectedIndex].value;
-
-		var values = selected.split(",");
-		if(values.length >1) {
-			updateSlider(parseInt(values[1]));
-		}
-
-	}
-	function addEvent(obj, evType, fn)
-	{ 
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-		else {  return false; } 
-	} 
-
-	init = function()
-	{
-		var bottom = document.getElementById('bottom');
-		if(window.opener)
-		{
-			__dlg_init(bottom);
-			__dlg_translate('ImageManager');
-		}
-	}
-
-	addEvent(window, 'load', init);
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/editorFrame.css b/web/imcms/xinha/plugins/ImageManager/assets/editorFrame.css
deleted file mode 100644
index a95e421055..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/editorFrame.css
+++ /dev/null
@@ -1,8 +0,0 @@
-body { margin: 0; padding: 0;  background-color: #eee; }
-table { width: 100%; }
-table td { text-align: center; }
-.crop{cursor:crosshair;}
-.selection { border: dotted 1px #000000; position:absolute; width: 0px; height: 1px; z-index:5; }
-.selectionWhite{ border: dotted 1px #FFFFFF; position:absolute; width: 0px; height: 1px; z-index:5; }
-.handleBox{ z-index:105; }
-.error { font-size:large; font-weight:bold; color:#c00; font-family: Helvetica, sans-serif; } 
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/editorFrame.js b/web/imcms/xinha/plugins/ImageManager/assets/editorFrame.js
deleted file mode 100644
index 7b7c9cac74..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/editorFrame.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Javascript used by the editorFrame.php, it basically initializes the frame.
- * @author $Author: ray $
- * @version $Id: editorFrame.js 677 2007-01-19 22:24:36Z ray $
- * @package ImageManager
- */
-
-var topDoc = window.top.document;
-
-var t_cx = topDoc.getElementById('cx');
-var t_cy = topDoc.getElementById('cy');
-var t_cw = topDoc.getElementById('cw');
-var t_ch = topDoc.getElementById('ch');
-
-var m_sx = topDoc.getElementById('sx');
-var m_sy = topDoc.getElementById('sy');
-var m_w = topDoc.getElementById('mw');
-var m_h = topDoc.getElementById('mh');
-var m_a = topDoc.getElementById('ma');
-var m_d = topDoc.getElementById('md');
-
-var s_sw = topDoc.getElementById('sw');
-var s_sh = topDoc.getElementById('sh');
-
-var r_ra = topDoc.getElementById('ra');
-
-var pattern = "img/2x2.gif";
-
-function doSubmit(action)
-{
-    if (action == 'crop')
-    {
-        // backend_url is set by the calling page. For now we assume it contains
-		  // a trailing &
-
-        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=crop&params="+parseInt(t_cx.value)+','+parseInt(t_cy.value)+','+ parseInt(t_cw.value)+','+parseInt(t_ch.value);
-
-        //alert(url);
-        location.href = url;
-
-        //location.reload();
-    }   
-    else if (action == 'scale')
-    {
-        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=scale&params="+parseInt(s_sw.value)+','+parseInt(s_sh.value);
-        //alert(url);
-        location.href = url;
-        
-    }
-    else if (action == 'rotate')
-    {
-        var flip = topDoc.getElementById('flip');
-
-        if(flip.value == 'hoz' || flip.value == 'ver') 
-            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=flip&params="+flip.value;
-        else if (isNaN(parseFloat(r_ra.value))==false)
-            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=rotate&params="+parseFloat(r_ra.value);
-    }
-    else if(action == 'save') {
-        var s_file = topDoc.getElementById('save_filename');
-        var s_format = topDoc.getElementById('save_format');
-        var s_quality = topDoc.getElementById('quality');
-
-        var format = s_format.value.split(",");
-        if(s_file.value.length <= 0) 
-		{
-            alert(i18n('Please enter a filename to save.'));
-        }
-        else
-        {
-            var filename = encodeURI(s_file.value);
-            var quality = parseInt(s_quality.value);
-            var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
-            //alert(url);
-            location.href = url;
-        }
-    }
-}
-
-
-function addEvent(obj, evType, fn)
-{ 
-	if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-	else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-	else {  return false; } 
-} 
-
-var jg_doc
-
-init = function()
-{
-	jg_doc = new jsGraphics("imgCanvas"); // draw directly into document
-	jg_doc.setColor("#000000"); // black
-
-	initEditor();
-};
-
-addEvent(window, 'load', init);
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/hover.htc b/web/imcms/xinha/plugins/ImageManager/assets/hover.htc
deleted file mode 100644
index 555d820633..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/hover.htc
+++ /dev/null
@@ -1,34 +0,0 @@
-<attach event="onmouseover" handler="hoverRollOver" />
-<attach event="onmouseout" handler="hoverRollOff" />
-<script type="text/javascript">
-//
-//	Simple behaviour for IE5+ to emulate :hover CSS pseudo-class.
-//  Experimental ver 0.1
-//
-//	This is an experimental version! Handle with care!
-//	Manual at: http://www.hszk.bme.hu/~hj130/css/list_menu/hover/
-//
-
-function hoverRollOver() {
-	
-	element.origClassName = element.className;	// backup origonal className
-	
-	var tempClassStr = element.className;		
-	
-	tempClassStr += "Hover";					// convert name+'Hover' the last class name	to emulate tag.class:hover
-	
-	tempClassStr = tempClassStr.replace(/\s/g,"Hover ");	//convert name+'Hover' the others to emulate tag.class:hover
-	
-	tempClassStr += " hover";				// add simple 'hover' class name to emulate tag:hover
-	
-	element.className = element.className + " " + tempClassStr; 
-	
-	//alert(element.className);
-	//window.status = element.className;		// only for TEST
-}
-function hoverRollOff() {
-	element.className = element.origClassName;
-}
-
-</script>
-
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/imagelist.css b/web/imcms/xinha/plugins/ImageManager/assets/imagelist.css
deleted file mode 100644
index cb07791a16..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/imagelist.css
+++ /dev/null
@@ -1,46 +0,0 @@
-body { margin: 0; padding: 0; }
-.edit   { font-size: small; font-family: small-caption, sans-serif; padding-top: 3px;}
-.edit a { border: none; padding: 3px; text-decoration:none; }
-.edit a:hover { background-color: ButtonHighlight; }
-.edit a img { border: none; vertical-align: bottom; }
-.noResult { font-size:large; font-weight:bold; color:#ccc; font-family: Helvetica, sans-serif;  text-align: center;  padding-top: 60px;   }
-.error { color:#c00; font-weight:bold; font-size: medium; font-family: Helvetica, sans-serif; text-align: center;  padding-top: 65px;}
-
-.dir_holder, .thumb_holder
-{
-  width:110px; height:132px;
-  float:left;
-  margin:6px;
-  background-color:ButtonFace;
-  border: 1px outset;
-}
-
-.thumb_holder.active
-{
-  background:Highlight;
-  color:HighlightText;
-  border:1px dashed Highlight;
-}
-
-.dir_holder a.dir, .thumb_holder a.thumb
-{
-  height:100px;
-  display:block;
-  text-align:center;
-  padding:5px;
-  text-decoration:none;
-}
-
-.thumb_holder a.thumb img
-{
-  border:1px solid black;
-}
-
-.dir_holder a.dir img
-{
-  border:none;
-}
-.listview { width:100% }
-.listview td, .listview th { text-align:left; font-size:small; }
-.listview td.actions { text-align:right; }
-.listview td.actions img { border:0px; }
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/images.js b/web/imcms/xinha/plugins/ImageManager/assets/images.js
deleted file mode 100644
index 5a8baabb9b..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/images.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Functions for the image listing, used by images.php only	
- * @author $Author: wymsy $
- * @version $Id: images.js 856 2007-06-13 18:34:34Z wymsy $
- * @package ImageManager
- */
-
-	function i18n(str) {
-        return Xinha._lc(str, 'ImageManager');
-	}
-
-	function changeDir(newDir) 
-	{
-		showMessage('Loading');
-
-		// backend_url is defined in the calling page. For now we 
-		// assume it has a trailing &
-
-		location.href = _backend_url + "__function=images&dir="+encodeURIComponent(newDir);
-	}
-
-
-	function newFolder(dir, newDir) 
-	{
-		location.href = _backend_url + "__function=images&dir="+encodeURIComponent(dir)+"&newDir="+encodeURIComponent(newDir);
-	}
-
-	//update the dir list in the parent window.
-	function updateDir(newDir)
-	{
-		var selection = window.top.document.getElementById('dirPath');
-		if(selection)
-		{
-			for(var i = 0; i < selection.length; i++)
-			{
-				var thisDir = selection.options[i].text;
-				if(thisDir == newDir)
-				{
-					selection.selectedIndex = i;
-					showMessage('Loading');
-					break;
-				}
-			}		
-		}
-	}
-
-	function selectImage(filename, alt, width, height) 
-	{
-		var topDoc = window.top.document;
-		
-		var obj = topDoc.getElementById('f_url');  obj.value = filename;
-		var obj = topDoc.getElementById('f_width');  obj.value = width;
-		var obj = topDoc.getElementById('f_width'); obj.value = width;
-		var obj = topDoc.getElementById('f_height'); obj.value = height;
-		var obj = topDoc.getElementById('f_alt'); obj.value = alt;
-		var obj = topDoc.getElementById('orginal_width'); obj.value = width;
-		var obj = topDoc.getElementById('orginal_height'); obj.value = height;		
-    // Set preview for the selected
-    topDoc.getElementById('f_preview').src = window.parent._backend_url + '__function=thumbs&img=' + filename;
-    
-    update_selected();
-	}
-
-  var _current_selected = null;
-  function update_selected()
-  {
-    var topDoc = window.top.document;
-    if(_current_selected)
-    {
-      _current_selected.className = _current_selected.className.replace(/(^| )active( |$)/, '$1$2');
-      _current_selected = null;
-    }
-    // Grab the current file, and highlight it if we have it
-    var c_file = topDoc.getElementById('f_url').value;
-    var selection = topDoc.getElementById('dirPath');
-		var currentDir = selection.options[selection.selectedIndex].text;
-    var dRe = new RegExp('^(' + currentDir.replace(/([\/\^$*+?.()|{}[\]])/g, '\\$1') + ')([^/]*)$');
-    if(dRe.test(c_file))
-    {
-      var holder = document.getElementById('holder_' + asc2hex(RegExp.$2));
-      if(holder)
-      {
-        _current_selected = holder;
-        holder.className += ' active';
-      }
-    }
-  }
-
-  function asc2hex(str)
-  {
-    var hexstr = '';
-    for(var i = 0; i < str.length; i++)
-    {
-      var hex = (str.charCodeAt(i)).toString(16);
-      if(hex.length == 1) hex = '0' + hex;
-      hexstr += hex;
-    }
-    return hexstr;
-  }
-
-	function showMessage(newMessage) 
-	{
-		var topDoc = window.top.document;
-
-		var message = topDoc.getElementById('message');
-		var messages = topDoc.getElementById('messages');
-		if(message && messages)
-		{
-			if(message.firstChild)
-				message.removeChild(message.firstChild);
-
-			message.appendChild(topDoc.createTextNode(i18n(newMessage)));
-			
-			messages.style.display = "block";
-		}
-	}
-
-	function addEvent(obj, evType, fn)
-	{ 
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-		else {  return false; } 
-	} 
-
-	function confirmDeleteFile(file) 
-	{
-		if(confirm(i18n("Delete file?")))
-			return true;
-	
-		return false;		
-	}
-
-	function confirmDeleteDir(dir, count) 
-	{
-		if(count > 0)
-		{
-			alert(i18n("Please delete all files/folders inside the folder you wish to delete first."));
-			return;
-		}
-
-		if(confirm(i18n("Delete folder?"))) 
-			return true;
-
-		return false;
-	}
-
-	addEvent(window, 'load', init);
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/manager.css b/web/imcms/xinha/plugins/ImageManager/assets/manager.css
deleted file mode 100644
index 5de75de7f7..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/manager.css
+++ /dev/null
@@ -1,46 +0,0 @@
-html, body, .dialog {  background-color: ButtonFace;  color: ButtonText; font: 11px Tahoma,Verdana,sans-serif; margin: 0; padding: 0;}
-body { padding: 5px; }
-fieldset { padding: 0;}
-.title { background-color: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px; border-bottom: 1px  solid black; letter-spacing: 2px;}
-form { padding: 0px;  margin: 0 auto; width: 550px;}
-
-a { padding: 5px; border: 1px solid ButtonFace;	}	
-a img	{ border: 0; }	
-a:hover { border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; }
-.dirs {	padding: 1em; 	}
-.imageFrame { width: 100%; height: 145px; margin: 0 auto; margin-top: 1em; background-color: White;}
-.smallWidth{ width: 4em; }
-.largelWidth{ width: 22em; }
-.inputTable { margin: 1em auto; }
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-.buttons { width: 70px; text-align: center; }
-.clearboth{ clear: both; }
-#messages { position: relative; left: 175px; top: 115px; background-color: white; width:200px;  float: left; margin-top: -52px; border: 1px solid #ccc; text-align: center; padding: 15px; }
-#message  { font-size: 15px; font-weight: bold; color: #69c; }
-iframe { border:1px inset; border-right:none; border-left:none; border-bottom:none; }
-
-table { margin-top:10px; }
-th, td { padding-right:3px; text-align:left; font-family:small-caption,helvetica,sans-serif; }
-
-.buttonColor {
-  width :1em;
-  margin-left: 2px;
-  cursor: default;
-}
-
-.buttonColor .chooser, .buttonColor .nocolor {
-  height: 0.6em;
-  border: 1px solid;
-  padding: 0px 1em;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-
-.buttonColor .buttonClick {
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-.buttonColor .buttonColor-hilite {
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.buttonColor .nocolor { padding: 0px; }
-.buttonColor .nocolor-hilite { background-color: #fff; color: #f00; }
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/manager.js b/web/imcms/xinha/plugins/ImageManager/assets/manager.js
deleted file mode 100644
index f3a392522a..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/manager.js
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
- * Functions for the ImageManager, used by manager.php only	
- * @author $Author: gogo $
- * @version $Id: manager.js 877 2007-08-12 15:50:03Z gogo $
- * @package ImageManager
- */
-	
-	//Translation
-	function i18n(str) {
-        return Xinha._lc(str, 'ImageManager');
-	}
-
-
-	//set the alignment options
-	function setAlign(align) 
-	{
-		var selection = document.getElementById('f_align');
-		for(var i = 0; i < selection.length; i++)
-		{
-			if(selection.options[i].value == align)
-			{
-				selection.selectedIndex = i;
-				break;
-			}
-		}
-	}
-
-	//initialise the form
-  doneinit = 0; // Seems that in Opera the load event of the iframe re-fires this one also.
-	init = function () 
-	{
-    if(doneinit++) return;
-    
-		__dlg_init(null, {width:600,height:460});
-
-		__dlg_translate('ImageManager');
-        
-        // This is so the translated string shows up in the drop down.
-        document.getElementById("f_align").selectedIndex = 1;
-        document.getElementById("f_align").selectedIndex = 0;
-        
-
-		var uploadForm = document.getElementById('uploadForm');
-		if(uploadForm) uploadForm.target = 'imgManager';
-
-		var param = window.dialogArguments;
-		if (param) 
-		{
-      var image_regex = new RegExp( '(https?://[^/]*)?' + base_url.replace(/\/$/, '') );
-      param.f_url = param.f_url.replace( image_regex, "" );
-
-      // The image URL may reference one of the automatically resized images 
-      // (when the user alters the dimensions in the picker), clean that up
-      // so it looks right and we get back to a normal f_url
-      var rd = (_resized_dir) ? _resized_dir.replace(Xinha.RE_Specials, '\\$1') + '/' : '';
-      var rp = _resized_prefix.replace(Xinha.RE_Specials, '\\$1');
-      var dreg = new RegExp('^(.*/)' + rd + rp + '_([0-9]+)x([0-9]+)_([^/]+)$');
-  
-      if(dreg.test(param.f_url))
-      {
-        param.f_url    = RegExp.$1 + RegExp.$4;
-        param.f_width  = RegExp.$2;
-        param.f_height = RegExp.$3;
-      }
-      
-      for (var id in param)
-      {
-        if(id == 'f_align') continue;
-        if(document.getElementById(id))
-        {
-          document.getElementById(id).value = param[id];
-        }
-      }
-
-
-
-      document.getElementById("orginal_width").value = param["f_width"];
-			document.getElementById("orginal_height").value = param["f_height"];
-			setAlign(param["f_align"]);
-
-      // Locate to the correct directory
-      var dreg = new RegExp('^(.*/)([^/]+)$');
-      if(dreg.test(param['f_url']) && !(new RegExp('^https?://','i')).test(param['f_url']))
-      {
-        changeDir(RegExp.$1);
-        var dirPath = document.getElementById('dirPath');
-        for(var i = 0; i < dirPath.options.length; i++)
-        {
-          if(dirPath.options[i].value == encodeURIComponent(RegExp.$1))
-          {
-            dirPath.options[i].selected = true;
-            break;
-          }
-        }
-      }
-      document.getElementById('f_preview').src = _backend_url + '__function=thumbs&img=' + param.f_url;      
-		}
-		
-		 // Hookup color pickers
-    new Xinha.colorPicker.InputBinding(document.getElementById('f_backgroundColor'));
-    new Xinha.colorPicker.InputBinding(document.getElementById('f_borderColor'));
-
-		document.getElementById("f_alt").focus();
-	};
-
-
-	function onCancel() 
-	{
-		__dlg_close(null);
-		return false;
-	}
-
-	function onOK() 
-	{
-		// pass data back to the calling window
-		var fields = ["f_url", "f_alt", "f_align", "f_width", "f_height", "f_padding", "f_margin", "f_border", "f_borderColor", "f_backgroundColor"];
-		var param = new Object();
-		for (var i in fields) 
-		{
-			var id = fields[i];
-			var el = document.getElementById(id);
-			if(id == "f_url" && el.value.indexOf('://') < 0 )
-				{
-
-				if ( el.value == "" )
-					{
-					alert( i18n("No Image selected.") );
-					return( false );
-					}
-
-				param[id] = makeURL(base_url,el.value);
-				}
-			else if (el)
-				param[id] = el.value;
-      else alert("Missing " + fields[i]);
-
-		}
-
-    // See if we need to resize the image
-    var origsize =
-    {
-      w:document.getElementById('orginal_width').value,
-      h:document.getElementById('orginal_height').value
-    }
-
-    if(  (origsize.w != param.f_width)
-      || (origsize.h != param.f_height) )
-    {
-      // Yup, need to resize
-      var resized = Xinha._geturlcontent(_backend_url + '&__function=resizer&img=' + encodeURIComponent(document.getElementById('f_url').value) + '&width=' + param.f_width + '&height=' + param.f_height);
-      // alert(resized);
-      resized = eval(resized);
-      if(resized)
-      {
-        param.f_url = makeURL(base_url, resized);
-      }
-    }
-
-
-		__dlg_close(param);
-		return false;
-	}
-
-	//similar to the Files::makeFile() in Files.php
-	function makeURL(pathA, pathB) 
-	{
-		if(pathA.substring(pathA.length-1) != '/')
-			pathA += '/';
-
-		if(pathB.charAt(0) == '/');	
-			pathB = pathB.substring(1);
-
-		return pathA+pathB;
-	}
-
-
-	function updateDir(selection) 
-	{
-		var newDir = selection.options[selection.selectedIndex].value;
-		changeDir(newDir);
-	}
-
-	function goUpDir() 
-	{
-		var selection = document.getElementById('dirPath');
-		var currentDir = selection.options[selection.selectedIndex].text;
-		if(currentDir.length < 2)
-			return false;
-		var dirs = currentDir.split('/');
-		
-		var search = '';
-
-		for(var i = 0; i < dirs.length - 2; i++)
-		{
-			search += dirs[i]+'/';
-		}
-
-		for(var i = 0; i < selection.length; i++)
-		{
-			var thisDir = selection.options[i].text;
-			if(thisDir == search)
-			{
-				selection.selectedIndex = i;
-				var newDir = selection.options[i].value;
-				changeDir(newDir);
-				break;
-			}
-		}
-	}
-
-	function changeDir(newDir) 
-	{
-		if(typeof imgManager != 'undefined')
-    {      
-	    imgManager.changeDir(newDir);
-    }
-	}
-
-	function toggleConstrains(constrains) 
-	{
-		var lockImage = document.getElementById('imgLock');
-		var constrains = document.getElementById('constrain_prop');
-
-		if(constrains.checked) 
-		{
-			lockImage.src = "img/locked.gif";	
-			checkConstrains('width') 
-		}
-		else
-		{
-			lockImage.src = "img/unlocked.gif";	
-		}
-	}
-
-	function checkConstrains(changed) 
-	{
-		//alert(document.form1.constrain_prop);
-		var constrains = document.getElementById('constrain_prop');
-		
-		if(constrains.checked) 
-		{
-			var obj = document.getElementById('orginal_width');
-			var orginal_width = parseInt(obj.value);
-			var obj = document.getElementById('orginal_height');
-			var orginal_height = parseInt(obj.value);
-
-			var widthObj = document.getElementById('f_width');
-			var heightObj = document.getElementById('f_height');
-			
-			var width = parseInt(widthObj.value);
-			var height = parseInt(heightObj.value);
-
-			if(orginal_width > 0 && orginal_height > 0) 
-			{
-				if(changed == 'width' && width > 0) {
-					heightObj.value = parseInt((width/orginal_width)*orginal_height);
-				}
-
-				if(changed == 'height' && height > 0) {
-					widthObj.value = parseInt((height/orginal_height)*orginal_width);
-				}
-			}			
-		}
-	}
-
-	function showMessage(newMessage) 
-	{
-		var message = document.getElementById('message');
-		var messages = document.getElementById('messages');
-		if(message.firstChild)
-			message.removeChild(message.firstChild);
-
-		message.appendChild(document.createTextNode(i18n(newMessage)));
-		
-		messages.style.display = '';
-	}
-
-	function addEvent(obj, evType, fn)
-	{ 
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-		else {  return false; } 
-	} 
-
-	function doUpload() 
-	{
-		
-		var uploadForm = document.getElementById('uploadForm');
-		if(uploadForm)
-			showMessage('Uploading');
-	}
-
-	function refresh()
-	{
-		var selection = document.getElementById('dirPath');
-		updateDir(selection);
-	}
-
-
-	function newFolder()
-	{
-		function createFolder(folder)
-		{
-			var selection = document.getElementById('dirPath');
-			var dir = selection.options[selection.selectedIndex].value;
-
-			if(folder == thumbdir)
-			{
-				alert(i18n('Invalid folder name, please choose another folder name.'));
-				return false;
-			}
-
-			if (folder && folder != '' && typeof imgManager != 'undefined')
-			{
-				imgManager.newFolder(dir, encodeURI(folder));
-			}
-		}
-		// IE7 has crippled the prompt()
-		if (Xinha.ie_version > 6)
-		{
-			Dialog("newFolder.html", function(param)
-			{
-				if (!param) // user must have pressed Cancel
-				{
-					return false;
-				}
-				else
-				{
-					var folder = param['f_foldername'];
-					createFolder(folder);
-				}
-			}, null);
-		}
-		else
-		{
-			var folder = prompt(i18n('Please enter name for new folder...'), i18n('Untitled'));
-			createFolder(folder);
-		}
-	}
-  
-	addEvent(window, 'load', init);
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/popup.js b/web/imcms/xinha/plugins/ImageManager/assets/popup.js
deleted file mode 100644
index 3b5fb75d8c..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/popup.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// htmlArea v3.0 - Copyright (c) 2002, 2003 interactivetools.com, inc.
-// This copyright notice MUST stay intact for use (see license.txt).
-//
-// Portions (c) dynarch.com, 2003
-//
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon.
-//   http://dynarch.com/mishoo
-//
-// $Id: popup.js 856 2007-06-13 18:34:34Z wymsy $
-
-// Override the ordinary popup.js translation to add translation for a few other HTML elements.
-
-function __dlg_translate(context) {
-    var types = ["span", "option", "td", "th", "button", "div", "label", "a","img", "legend"];
-    for (var type = 0; type < types.length; ++type) {
-        var spans = document.getElementsByTagName(types[type]);
-        for (var i = spans.length; --i >= 0;) {
-            var span = spans[i];
-            if (span.firstChild && span.firstChild.data) {
-                var txt = Xinha._lc(span.firstChild.data, context);
-                if (txt)
-                    span.firstChild.data = txt;
-            }
-            if (span.title) {
-                var txt = Xinha._lc(span.title, context);
-                if (txt)
-                    span.title = txt;
-            }
-            if (span.alt) {
-                var txt = Xinha._lc(span.alt, context);
-                if (txt)
-                    span.alt = txt;
-            }
-        }
-    }
-    document.title = Xinha._lc(document.title, context);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/slider.js b/web/imcms/xinha/plugins/ImageManager/assets/slider.js
deleted file mode 100644
index 5ddee75156..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/slider.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/***********************************************************************
-** Title.........:  Simple Lite Slider for Image Editor
-** Version.......:  1.1
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  slider.js
-** Last changed..:  31 Mar 2004 
-** Notes.........:  Works in IE and Mozilla
-**/ 
-
-var ie=document.all
-var ns6=document.getElementById&&!document.all
-
-document.onmouseup = captureStop;
-
-var currentSlider = null,sliderField = null;
-var rangeMin = null, rangeMax= null, sx = -1, sy = -1, initX=0;
-
-function getMouseXY(e) {
-
-    //alert('hello');
-    x = ns6? e.clientX: event.clientX
-    y = ns6? e.clientY: event.clientY
-    
-    if (sx < 0) sx = x; if (sy < 0) sy = y;
-
-    var dx = initX +(x-sx);
-    
-    if (dx <= rangeMin)
-        dx = rangeMin;
-    else if (dx >= rangeMax)
-        dx = rangeMax;
-
-    var range = (dx-rangeMin)/(rangeMax - rangeMin)*100;
-
-    if (currentSlider !=  null)
-        currentSlider.style.left = dx+"px";
-        
-    if (sliderField != null)
-    {
-        sliderField.value = parseInt(range);
-    }
-    return false;
-
-}
-
-function initSlider()
-{
-    if (currentSlider == null)
-        currentSlider = document.getElementById('sliderbar');
-   
-    if (sliderField == null)
-        sliderField = document.getElementById('quality');
-
-    if (rangeMin == null)
-        rangeMin = 3
-    if (rangeMax == null)
-    {
-        var track = document.getElementById('slidertrack');
-        rangeMax = parseInt(track.style.width);
-    }
-
-}
-
-function updateSlider(value)
-{
-    initSlider();
-
-    var newValue = parseInt(value)/100*(rangeMax-rangeMin);
-
-    if (newValue <= rangeMin)
-        newValue = rangeMin;
-    else if (newValue >= rangeMax)
-        newValue = rangeMax;
-
-    if (currentSlider !=  null)
-        currentSlider.style.left = newValue+"px";
-    
-    var range = newValue/(rangeMax - rangeMin)*100;
-
-    if (sliderField != null)
-        sliderField.value = parseInt(range);
-}
-
-function captureStart()
-{
-    
-    initSlider();
-
-    initX = parseInt(currentSlider.style.left);
-    if (initX > rangeMax)
-        initX = rangeMax;
-    else if (initX < rangeMin)
-        initX = rangeMin;
-
-    document.onmousemove = getMouseXY;
-
-    return false;
-}
-
-function captureStop()
-{
-    sx = -1; sy = -1;
-    document.onmousemove = null;
-    return false;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/assets/wz_jsgraphics.js b/web/imcms/xinha/plugins/ImageManager/assets/wz_jsgraphics.js
deleted file mode 100644
index b5c215191e..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/assets/wz_jsgraphics.js
+++ /dev/null
@@ -1,921 +0,0 @@
-/***********************************************************************
-** Title.........:  Javascript Graphics
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
-** Filename......:  wz_jsgraphics.js
-** Last changed..:  31 Aug 2003  
-** Notes.........:  Modified for Image Editor, added extra commands
-**/ 
-
-/* This notice must be untouched at all times.
-
-wz_jsgraphics.js    v. 2.03
-The latest version is available at
-http://www.walterzorn.com
-or http://www.devira.com
-or http://www.walterzorn.de
-
-Copyright (c) 2002-2003 Walter Zorn. All rights reserved.
-Created 3. 11. 2002 by Walter Zorn <walter@kreuzotter.de>
-Last modified: 11. 6. 2003
-
-High Performance JavaScript Graphics Library.
-Provides methods
-- to draw lines, rectangles, ellipses, polygons
-  with specifiable line thickness,
-- to fill rectangles and ellipses
-- to draw text.
-NOTE: Operations, functions and branching have rather been optimized
-to efficiency and speed than to shortness of source code.
-
-This program is free software;
-you can redistribute it and/or modify it under the terms of the
-GNU General Public License as published by the Free Software Foundation;
-either version 2 of the License, or (at your option) any later version.
-This program 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 General Public License
-at http://www.gnu.org/copyleft/gpl.html for more details.
-*/
-
-
-
-
-
-var jg_ihtm, jg_ie, jg_dom,
-jg_n4 = (document.layers && typeof document.classes != "undefined");
-
-
-
-
-
-function chkDHTM(x, i)
-{
-    x = document.body || null;
-    jg_ie = (x && typeof x.insertAdjacentHTML != "undefined");
-    jg_dom = (x && !jg_ie &&
-        typeof x.appendChild != "undefined" &&
-        typeof document.createRange != "undefined" &&
-        typeof (i = document.createRange()).setStartBefore != "undefined" &&
-        typeof i.createContextualFragment != "undefined");
-    jg_ihtm = (!jg_ie && !jg_dom && x && typeof x.innerHTML != "undefined");
-}
-
-
-
-
-
-function pntDoc()
-{
-    this.wnd.document.write(this.htm);
-    this.htm = '';
-}
-
-
-
-
-
-function pntCnvDom()
-{
-    var x = document.createRange();
-    x.setStartBefore(this.cnv);
-    x = x.createContextualFragment(this.htm);
-    this.cnv.appendChild(x);
-    this.htm = '';
-}
-
-
-
-
-
-function pntCnvIe()
-{
-    this.cnv.insertAdjacentHTML("BeforeEnd", this.htm);
-    this.htm = '';
-}
-
-
-
-
-
-function pntCnvIhtm()
-{
-    this.cnv.innerHTML += this.htm;
-    this.htm = '';
-}
-
-
-
-
-
-function pntCnv()
-{
-    this.htm = '';
-}
-
-
-
-
-
-function mkDiv(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-
-    //alert(this.htm);
-}
-
-
-
-
-function mkDivPrint(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'border-left:' + w + 'px solid ' + this.color + ';'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-}
-
-
-
-
-
-function mkLyr(x, y, w, h)
-{
-    this.htm += '<layer '+
-        'left="' + x + '" '+
-        'top="' + y + '" '+
-        'width="' + w + '" '+
-        'height="' + h + '" '+
-        'bgcolor="' + this.color + '"><\/layer>\n';
-}
-
-
-
-
-
-function mkLbl(txt, x, y)
-{
-    this.htm += '<div style="position:absolute;white-space:nowrap;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'font-family:' +  this.ftFam + ';'+
-        'font-size:' + this.ftSz + ';'+
-        'color:' + this.color + ';' + this.ftSty + '">'+
-        txt +
-        '<\/div>';
-}
-
-
-
-
-
-function mkLin(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox, 1);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, 1, oy-y+1);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, 1, oy-y2+1);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, 1, y-oy);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, 1, y2-oy+1);
-        }
-    }
-}
-
-
-
-
-
-function mkLin2D(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-
-    var s = this.stroke;
-    if (dx >= dy)
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.ceil(s/2);
-
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox+ad, _s);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+ad+1, _s);
-    }
-
-    else
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.round(s/2);
-
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            ++ad;
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, _s, oy-y+ad);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, _s, oy-y2+ad);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, _s, y-oy+ad);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, _s, y2-oy+ad+1);
-        }
-    }
-}
-
-
-
-
-
-function mkLinDott(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1,
-    drw = true;
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx;
-        while ((dx--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            if (p > 0)
-            {
-                y += yIncr;
-                p += pru;
-            }
-            else p += pr;
-            ++x;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy;
-        while ((dy--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            y += yIncr;
-            if (p > 0)
-            {
-                ++x;
-                p += pru;
-            }
-            else p += pr;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-}
-
-
-
-
-
-function mkOv(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    ox = 0, oy = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1),
-    w, h;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-            tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-            w = x-ox;
-            h = oy-y;
-            if (w&0x2 && h&0x2)
-            {
-                this.mkOvQds(cx, cy, -x+0x2, ox+wod, -oy, oy-1+hod, 1, 1);
-                this.mkOvQds(cx, cy, -x+1, x-1+wod, -y-1, y+hod, 1, 1);
-            }
-            else this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, oy-h+hod, w, h);
-            ox = x;
-            oy = y;
-        }
-        else
-        {
-            tt -= aa*((y<<1)-0x3);
-            st -= (aa<<1)*(--y);
-        }
-    }
-    this.mkDiv(cx-a, cy-oy, a-ox+1, (oy<<1)+hod);
-    this.mkDiv(cx+ox+wod, cy-oy, a-ox+1, (oy<<1)+hod);
-}
-
-
-
-
-
-function mkOv2D(left, top, width, height)
-{
-    var s = this.stroke;
-    width += s-1;
-    height += s-1;
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1);
-
-
-    if (s-0x4 < 0 && (!(s-0x2) || width-0x33 > 0 && height-0x33 > 0))
-    {
-        var ox = 0, oy = b,
-        w, h,
-        pxl, pxr, pxt, pxb, pxw;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                w = x-ox;
-                h = oy-y;
-
-                if (w-1)
-                {
-                    pxw = w+1+(s&1);
-                    h = s;
-                }
-                else if (h-1)
-                {
-                    pxw = s;
-                    h += 1+(s&1);
-                }
-                else pxw = h = s;
-                this.mkOvQds(cx, cy, -x+1, ox-pxw+w+wod, -oy, -h+oy+hod, pxw, h);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
-        this.mkDiv(cx+a+wod-s+1, cy-oy, s, (oy<<1)+hod);
-    }
-
-
-    else
-    {
-        var _a = (width-((s-1)<<1))>>1,
-        _b = (height-((s-1)<<1))>>1,
-        _x = 0, _y = _b,
-        _aa = (_a*_a)<<1, _bb = (_b*_b)<<1,
-        _st = (_aa>>1)*(1-(_b<<1)) + _bb,
-        _tt = (_bb>>1) - _aa*((_b<<1)-1),
-
-        pxl = new Array(),
-        pxt = new Array(),
-        _pxb = new Array();
-        pxl[0] = 0;
-        pxt[0] = b;
-        _pxb[0] = _b-1;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-
-            if (_y > 0)
-            {
-                if (_st < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3);
-                    _tt += (_bb<<1)*(++_x);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else if (_tt < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3) - (_aa<<1)*(_y-1);
-                    _tt += (_bb<<1)*(++_x) - _aa*(((_y--)<<1)-0x3);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else
-                {
-                    _tt -= _aa*((_y<<1)-0x3);
-                    _st -= (_aa<<1)*(--_y);
-                    _pxb[_pxb.length-1]--;
-                }
-            }
-        }
-
-        var ox = 0, oy = b,
-        _oy = _pxb[0],
-        l = pxl.length,
-        w, h;
-        for (var i = 0; i < l; i++)
-        {
-            if (typeof _pxb[i] != "undefined")
-            {
-                if (_pxb[i] < _oy || pxt[i] < oy)
-                {
-                    x = pxl[i];
-                    this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, _oy+hod, x-ox, oy-_oy);
-                    ox = x;
-                    oy = pxt[i];
-                    _oy = _pxb[i];
-                }
-            }
-            else
-            {
-                x = pxl[i];
-                this.mkDiv(cx-x+1, cy-oy, 1, (oy<<1)+hod);
-                this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-                ox = x;
-                oy = pxt[i];
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
-        this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-    }
-}
-
-
-
-
-
-function mkOvDott(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = height&1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-    st = (aa2>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa2*((b<<1)-1),
-    drw = true;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - aa4*(y-1);
-            tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-        }
-        else
-        {
-            tt -= aa2*((y<<1)-0x3);
-            st -= aa4*(--y);
-        }
-        if (drw) this.mkOvQds(cx, cy, -x, x+wod, -y, y+hod, 1, 1);
-        drw = !drw;
-    }
-}
-
-
-
-
-
-function mkRect(x, y, w, h)
-{
-    var s = this.stroke;
-    this.mkDiv(x, y, w, s);
-    this.mkDiv(x+w, y, s, h);
-    this.mkDiv(x, y+h, w+s, s);
-    this.mkDiv(x, y+s, s, h-s);
-}
-
-
-
-
-
-function mkRectDott(x, y, w, h)
-{
-    this.drawLine(x, y, x+w, y);
-    this.drawLine(x+w, y, x+w, y+h);
-    this.drawLine(x, y+h, x+w, y+h);
-    this.drawLine(x, y, x, y+h);
-}
-
-
-
-
-
-function jsgFont()
-{
-    this.PLAIN = 'font-weight:normal;';
-    this.BOLD = 'font-weight:bold;';
-    this.ITALIC = 'font-style:italic;';
-    this.ITALIC_BOLD = this.ITALIC + this.BOLD;
-    this.BOLD_ITALIC = this.ITALIC_BOLD;
-}
-var Font = new jsgFont();
-
-
-
-
-
-function jsgStroke()
-{
-    this.DOTTED = -1;
-}
-var Stroke = new jsgStroke();
-
-
-
-
-
-function jsGraphics(id, wnd)
-{
-    this.setColor = new Function('arg', 'this.color = arg;');
-
-
-    this.getColor = new Function('return this.color');
-
-    this.setStroke = function(x)
-    {
-        this.stroke = x;
-        if (!(x+1))
-        {
-            this.drawLine = mkLinDott;
-            this.mkOv = mkOvDott;
-            this.drawRect = mkRectDott;
-        }
-        else if (x-1 > 0)
-        {
-            this.drawLine = mkLin2D;
-            this.mkOv = mkOv2D;
-            this.drawRect = mkRect;
-        }
-        else
-        {
-            this.drawLine = mkLin;
-            this.mkOv = mkOv;
-            this.drawRect = mkRect;
-        }
-    };
-
-
-
-    this.setPrintable = function(arg)
-    {
-        this.printable = arg;
-        this.mkDiv = jg_n4? mkLyr : arg? mkDivPrint : mkDiv;
-    };
-
-
-
-    this.setFont = function(fam, sz, sty)
-    {
-        this.ftFam = fam;
-        this.ftSz = sz;
-        this.ftSty = sty || Font.PLAIN;
-    };
-
-
-
-    this.drawPolyline = this.drawPolyLine = function(x, y, s)
-    {
-        var i = x.length-1; while (i >= 0)
-            this.drawLine(x[i], y[i], x[--i], y[i]);
-    };
-
-
-
-    this.fillRect = function(x, y, w, h)
-    {
-        this.mkDiv(x, y, w, h);
-    };
-
-
-    this.fillRectPattern = function(x, y, w, h, url)
-    {
-        this.htm += '<div style="position:absolute;'+
-            'left:' + x + 'px;'+
-            'top:' + y + 'px;'+
-            'width:' + w + 'px;'+
-            'height:' + h + 'px;'+
-            'clip:rect(0,'+w+'px,'+h+'px,0);'+
-            'overflow:hidden;'+
-            //'background-color:' + this.color + ';'+
-            "background-image: url('" + url + "');"+
-            "layer-background-image: url('" + url + "');"+
-            'z-index:100;"><\/div>';
-        //alert(this.htm);
-    }
-
-    this.drawHandle = function(x, y, w, h, cursor)
-    {
-        
-        this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'padding: 2px;overflow:hidden;'+
-        "cursor: '" + cursor + "';"+
-        '" class="handleBox" id="' + cursor + '" ><\/div>';
-    }
-
-    this.drawHandleBox = function(x, y, w, h, cursor)
-    {
-        
-        this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+(w+2)+'px,'+(h+2)+'px,0);'+
-        'overflow:hidden; border: solid 1px '+ this.color+';'+
-        "cursor: '" + cursor + "';"+
-        '" class="handleBox" id="' + cursor + '" ><\/div>';
-
-        
-    }
-
-    this.drawPolygon = function(x, y)
-    {
-        this.drawPolyline(x, y);
-        this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
-    };
-
-
-
-    this.drawEllipse = this.drawOval = function(x, y, w, h)
-    {
-        this.mkOv(x, y, w, h);
-    };
-
-
-
-    this.fillEllipse = this.fillOval = function(left, top, w, h)
-    {
-        var a = (w -= 1)>>1, b = (h -= 1)>>1,
-        wod = (w&1)+1, hod = (h&1)+1,
-        cx = left+a, cy = top+b,
-        x = 0, y = b,
-        ox = 0, oy = b,
-        aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-        st = (aa2>>1)*(1-(b<<1)) + bb,
-        tt = (bb>>1) - aa2*((b<<1)-1),
-        pxl, dw, dh;
-        if (w+1) while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - aa4*(y-1);
-                pxl = cx-x;
-                dw = (x<<1)+wod;
-                tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-                dh = oy-y;
-                this.mkDiv(pxl, cy-oy, dw, dh);
-                this.mkDiv(pxl, cy+oy-dh+hod, dw, dh);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa2*((y<<1)-0x3);
-                st -= aa4*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, w+1, (oy<<1)+hod);
-    };
-
-
-
-    this.drawString = mkLbl;
-
-
-
-    this.clear = function()
-    {
-        this.htm = "";
-        if (this.cnv) this.cnv.innerHTML = this.defhtm;
-        
-    };
-
-
-
-    this.mkOvQds = function(cx, cy, xl, xr, yt, yb, w, h)
-    {
-        this.mkDiv(xr+cx, yt+cy, w, h);
-        this.mkDiv(xr+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yt+cy, w, h);
-    };
-
-
-    this.setStroke(1);
-    this.setPrintable(false);
-    this.setFont('verdana,geneva,helvetica,sans-serif', String.fromCharCode(0x31, 0x32, 0x70, 0x78), Font.PLAIN);
-    this.color = '#000000';
-    this.htm = '';
-    this.wnd = wnd || window;
-
-
-    if (!(jg_ie || jg_dom || jg_ihtm)) chkDHTM();
-    if (typeof id != 'string' || !id) this.paint = pntDoc;
-    else
-    {
-        this.cnv = document.all? (this.wnd.document.all[id] || null)
-            : document.getElementById? (this.wnd.document.getElementById(id) || null)
-            : null;
-        this.defhtm = (this.cnv && this.cnv.innerHTML)? this.cnv.innerHTML : '';
-        this.paint = jg_dom? pntCnvDom : jg_ie? pntCnvIe : jg_ihtm? pntCnvIhtm : pntCnv;
-    }
-}
diff --git a/web/imcms/xinha/plugins/ImageManager/backend.php b/web/imcms/xinha/plugins/ImageManager/backend.php
deleted file mode 100644
index 481ece7fc4..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/backend.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php 
-/**
-* Unified backend for ImageManager 
-*
-* Image Manager was originally developed by:
-*   Xiang Wei Zhuo, email: xiangweizhuo(at)hotmail.com Wei Shou.
-*
-* Unified backend sponsored by DTLink Software, http://www.dtlink.com
-* Implementation by Yermo Lamers, http://www.formvista.com
-*
-* (c) DTLink, LLC 2005.
-* Distributed under the same terms as HTMLArea itself.
-* This notice MUST stay intact for use (see license.txt).
-*
-* DESCRIPTION:
-*
-* Instead of using separate URL's for each function, ImageManager now
-* routes all requests to the server through this single, replaceable,
-* entry point. backend.php expects at least two URL variable parameters: 
-*
-* __plugin=ImageManager   for future expansion; identify the plugin being requested.
-* __function=thumbs|images|editorFrame|editor|manager  function being called.
-*
-* Having a single entry point that strictly adheres to a defined interface will 
-* make the backend code much easier to maintain and expand. It will make it easier
-* on integrators, not to mention it'll make it easier to have separate 
-* implementations of the backend in different languages (Perl, Python, ASP, etc.) 
-*
-* @see config.inc.php
-*/
-
-// Strip slashes if MQGPC is on
-set_magic_quotes_runtime(0);
-if(get_magic_quotes_gpc())
-{
-  $to_clean = array(&$_GET, &$_POST, &$_REQUEST, &$_COOKIE);
-  while(count($to_clean))
-  {
-    $cleaning =& $to_clean[array_pop($junk = array_keys($to_clean))];
-    unset($to_clean[array_pop($junk = array_keys($to_clean))]);
-    foreach(array_keys($cleaning) as $k)
-    {
-      if(is_array($cleaning[$k]))
-      {
-        $to_clean[] =& $cleaning[$k];
-      }
-      else
-      {
-        $cleaning[$k] = stripslashes($cleaning[$k]);
-      }
-    }
-  }
-}
-
-/**
-* ImageManager configuration
-*/
-
-require_once('config.inc.php');
-
-/**
-* debug message library
-*/
-
-include_once( "ddt.php" );
-
-// uncomment to turn on debugging
-// _ddtOn();
-
-_ddt( __FILE__, __LINE__, "backend.php: top with query '" . $_SERVER["PHP_SELF"] . "' string '" . $_SERVER["QUERY_STRING"] . "'" );
-
-$formVars = empty($_POST) ? $_GET : $_POST;
-
-// make sure the request is for us (this gives us the ability to eventually organize
-// a backend event handler system) For an include file the return doesn't make alot of
-// sense but eventually we'll want to turn all of this into at least functions 
-// separating out all the presentation HTML from the logic. (Right now all the HTML
-// used by ImageManager is in the same files as the PHP code ...)
-
-if ( @$formVars[ "__plugin" ] != "ImageManager" )
-	{
-	// not for us.
-
-	_ddt( __FILE__, __LINE__, "request was not for us" );
-
-	return true;
-	}
-
-// so we don't have to re-engineer the entire thing right now, since it's probably
-// going to get rewritten anyway, we just include the correct file based on the 
-// function request.
-
-_ddt( __FILE__, __LINE__, "backend.php(): handling function '" . $formVars[ "__function" ] . "' base_dir is '" . $IMConfig["base_dir"] . "'" );
-
-switch ( @$formVars[ "__function" ] )
-	{
-
-	case "editor": 
-
-		include_once( $IMConfig['base_dir'] . "/editor.php" );
-		exit();
-		
-		break;
-
-	case "editorFrame":
-
-		include_once( $IMConfig['base_dir'] . "/editorFrame.php" );
-		exit();
-
-		break;
-
-	case "manager":
-
-		_ddt( __FILE__, __LINE__, "including '" . $IMConfig['base_dir'] . "/manager.php" );
-
-		include_once( $IMConfig['base_dir'] . "/manager.php" );
-		exit();
-
-		break;
-
-	case "images":
-
-		include_once( $IMConfig['base_dir'] . "/images.php" );
-		exit();
-
-		break;
-
-	case "thumbs":
-
-		include_once( $IMConfig['base_dir'] . "/thumbs.php" );
-		exit();
-
-		break;
-
-	case "resizer":
-
-		include_once( $IMConfig['base_dir'] . "/resizer.php" );
-		exit();
-
-		break;
-
-	default:
-
-		_ddt( __FILE__, __LINE__, "function request not supported" );
-		_error( __FILE__, __LINE__, "function request not supported" );
-
-		break;
-
-	}	// end of switch.
-
-return false ;
-
-// END
-
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/config.inc.php b/web/imcms/xinha/plugins/ImageManager/config.inc.php
deleted file mode 100644
index 595f6eb2c3..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/config.inc.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-/**
- * Image Manager configuration file.
- * @author $Author: gogo $
- * @version $Id: config.inc.php 830 2007-05-09 13:27:34Z gogo $
- * @package ImageManager
- *
- * @todo change all these config values to defines()
- */
-
-// REVISION HISTORY:
-//
-// 2005-03-20 Yermo Lamers (www.formvista.com):
-//	. unified backend.
-// . created a set of defaults that make sense for bundling with Xinha.
-
-// -------------------------------------------------------------------------
-
-/**
-* Default backend URL
-*
-* URL to use for unified backend.
-*
-* The ?__plugin=ImageManager& is required. 
-*/
-
-$IMConfig['backend_url'] = "backend.php?__plugin=ImageManager&";
-
-/**
-* Backend Installation Directory
-*
-* location of backend install; these are used to link to css and js
-* assets because we may have the front end installed in a different
-* directory than the backend. (i.e. nothing assumes that the frontend
-* and the backend are in the same directory)
-*/
-
-$IMConfig['base_dir'] = getcwd();
-$IMConfig['base_url'] = '';
-
-// ------------------------------------------------------------
-
-/**
-* Path to directory containing images.
-*
-* File system path to the directory you want to manage the images
-* for multiple user systems, set it dynamically.
-*
-* NOTE: This directory requires write access by PHP. That is, 
-* PHP must be able to create files in this directory.
-* Able to create directories is nice, but not necessary.
-*
-* CHANGE THIS: for out-of-the-box demo purposes we're setting this to ./demo_images
-* which has some graphics in it.
-*/
-
-// $IMConfig['images_dir'] = "/some/path/to/images/directory;
-
-$IMConfig['images_dir'] = "demo_images";
-
-// -------------------------------------------------------------------------
-
-/**
-* URL of directory containing images.
-*
-* The URL to the above path, the web browser needs to be able to see it.
-* It can be protected via .htaccess on apache or directory permissions on IIS,
-* check you web server documentation for futher information on directory protection
-* If this directory needs to be publicly accessiable, remove scripting capabilities
-* for this directory (i.e. disable PHP, Perl, CGI). We only want to store assets
-* in this directory and its subdirectories.
-*
-* CHANGE THIS: You need to change this to match the url where you have Xinha
-* installed. If the images show up blank chances are this is not set correctly.
-*/
-
-// $IMConfig['images_url'] = "/url/to/above";
-
-// try to figure out the URL of the sample images directory. For your installation
-// you will probably want to keep images in another directory.
-
-$IMConfig['images_url'] = str_replace( "backend.php", "", $_SERVER["PHP_SELF"] ) . "demo_images";
-
-// -------------------------------------------------------------------------
-
-/**
-* PHP Safe Mode?
-*
-* Possible values: true, false
-*
-* TRUE - If PHP on the web server is in safe mode, set this to true.
-* SAFE MODE restrictions: directory creation will not be possible,
-* only the GD library can be used, other libraries require
-* Safe Mode to be off.
-*
-* FALSE - Set to false if PHP on the web server is not in safe mode.
-*/
-
-$IMConfig['safe_mode'] = false;
-
-// -------------------------------------------------------------------------
-
-/**
-* Image Library to use.
-*
-* Possible values: 'GD', 'IM', or 'NetPBM'
-*
-* The image manipulation library to use, either GD or ImageMagick or NetPBM.
-* If you have safe mode ON, or don't have the binaries to other packages, 
-* your choice is 'GD' only. Other packages require Safe Mode to be off.
-*
-* DEFAULT: GD is probably the most likely to be available. 
-*/
-
-$IMConfig['IMAGE_CLASS'] = 'GD';
-
-
-// -------------------------------------------------------------------------
-
-/**
-* NetPBM or IM binary path.
-*
-* After defining which library to use, if it is NetPBM or IM, you need to
-* specify where the binary for the selected library are. And of course
-* your server and PHP must be able to execute them (i.e. safe mode is OFF).
-* GD does not require the following definition.
-*/
-
-$IMConfig['IMAGE_TRANSFORM_LIB_PATH'] ='/usr/bin/';
-
-// For windows, something like
-// C:/"Program Files"/ImageMagick-5.5.7-Q16/
-
-// -------------------------------------------------------------------------
-//                OPTIONAL SETTINGS 
-// -------------------------------------------------------------------------
-
-/**
-* Thumbnail prefix
-*
-* The prefix for thumbnail files, something like .thumb will do. The
-* thumbnails files will be named as "prefix_imagefile.ext", that is,
-*  prefix + orginal filename.
-*/
-
-$IMConfig['thumbnail_prefix'] = '.';
-
-// -------------------------------------------------------------------------
-
-/**
-* Thumbnail Directory
-*
-* Thumbnail can also be stored in a directory, this directory
-* will be created by PHP. If PHP is in safe mode, this parameter
-*  is ignored, you can not create directories. 
-*
-*  If you do not want to store thumbnails in a directory, set this
-*  to false or empty string '';
-*/
-
-$IMConfig['thumbnail_dir'] = '.thumbs';
-
-// -------------------------------------------------------------------------
-
-/**
-* Resized prefix
-*
-* The prefix for resized files, something like .resized will do.  The
-* resized files will be named <prefix>_<width>x<height>_<original>
-* resized files are created when one changes the dimensions of an image
-* in the image manager selection dialog - the image is scaled when the
-* user clicks the ok button.
-*/
-
-$IMConfig['resized_prefix'] = '.resized';
-
-// -------------------------------------------------------------------------
-
-/**
-* Resized Directory
-*
-* Resized images may also be stored in a directory, except in safe mode.
-*/
-
-$IMConfig['resized_dir'] = '.resized';
-
-/**
- * Full options
- *
- * Determines whether the user is given options for padding, 
- * background/padding colour, margin, border and border colour. 
- */
-
-$IMConfig['show_full_options'] = true;
- 
-// -------------------------------------------------------------------------
-
-/**
-* Allow New Directories
-*
-*
-* Possible values: true, false
-*
-* TRUE -  Allow the user to create new sub-directories in the
-*        $IMConfig['base_dir'].
-*
-* FALSE - No directory creation.
-*
-* NOTE: If $IMConfig['safe_mode'] = true, this parameter
-*     is ignored, you can not create directories
-*
-* DEFAULT: for demo purposes we turn this off.
-*/
-
-$IMConfig['allow_new_dir'] = true;
-
-// -------------------------------------------------------------------------
-
-/**
-* Allow Uploads
-*
-*  Possible values: true, false
-*
-*  TRUE - Allow the user to upload files.
-*
-*  FALSE - No uploading allowed.
-*
-* DEFAULT: for demo purposes we turn this off.
-*/
-
-$IMConfig['allow_upload'] = true;
-
-// -------------------------------------------------------------------------
-
-/**
-* Validate Images
-*
-* Possible values: true, false
-*
-* TRUE - If set to true, uploaded files will be validated based on the 
-*        function getImageSize, if we can get the image dimensions then 
-*        I guess this should be a valid image. Otherwise the file will be rejected.
-*
-* FALSE - All uploaded files will be processed.
-*
-* NOTE: If uploading is not allowed, this parameter is ignored.
-*/
-
-$IMConfig['validate_images'] = true;
-
-// -------------------------------------------------------------------------
-
-/**
-* Default Thumnail.
-*
-* The default thumbnail if the thumbnails can not be created, either
-* due to error or bad image file.
-*/
-
-$IMConfig['default_thumbnail'] = 'img/default.gif';
-
-// -------------------------------------------------------------------------
-
-/**
-*  Thumbnail dimensions.
-*/
-
-$IMConfig['thumbnail_width'] = 96;
-$IMConfig['thumbnail_height'] = 96;
-
-// -------------------------------------------------------------------------
-
-/**
-* Editor Temporary File Prefix.
-*
-* Image Editor temporary filename prefix.
-*/
-
-$IMConfig['tmp_prefix'] = '.editor_';
-
-
-$IMConfig['ViewMode'] = 'thumbs';
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-//       ================== END OF CONFIGURATION =======================      //
-////////////////////////////////////////////////////////////////////////////////
-
-
-// Standard PHP Backend Data Passing
-//  if data was passed using xinha_pass_to_php_backend() we merge the items
-//  provided into the Config
-require_once(realpath(dirname(__FILE__) . '/../../contrib/php-xinha.php'));
-if($passed_data = xinha_read_passed_data())
-{
-  $IMConfig = array_merge($IMConfig, $passed_data);
-  $IMConfig['backend_url'] .= xinha_passed_data_querystring() . '&';
-}
-// Deprecated config passing, don't use this way any more!
-elseif(isset($_REQUEST['backend_config']))
-{
-  if(get_magic_quotes_gpc()) {
-    $_REQUEST['backend_config'] = stripslashes($_REQUEST['backend_config']);
-  }
-  
-  // Config specified from front end, check that it's valid
-  session_start();
-  $secret = $_SESSION[$_REQUEST['backend_config_secret_key_location']];
-
-  if($_REQUEST['backend_config_hash'] !== sha1($_REQUEST['backend_config'] . $secret))
-  {
-    die("Backend security error.");
-  }
-
-  $to_merge = unserialize($_REQUEST['backend_config']);
-  if(!is_array($to_merge))
-  {
-    die("Backend config syntax error.");
-  }
-
-  $IMConfig = array_merge($IMConfig, $to_merge);
-  $IMConfig['backend_url'] .= "backend_config=" . rawurlencode($_REQUEST['backend_config']) . '&';
-  $IMConfig['backend_url'] .= "backend_config_hash=" . rawurlencode($_REQUEST['backend_config_hash']) . '&';
-  $IMConfig['backend_url'] .= "backend_config_secret_key_location=" . rawurlencode($_REQUEST['backend_config_secret_key_location']) . '&';
-
-}
-
-define('IMAGE_CLASS', $IMConfig['IMAGE_CLASS']);
-define('IMAGE_TRANSFORM_LIB_PATH', $IMConfig['IMAGE_TRANSFORM_LIB_PATH']);
-define( "IM_CONFIG_LOADED", "yes" );
-
-// bring in the debugging library
-
-include_once( "ddt.php" );
-
-// uncomment to send debug messages to a local file
-// _setDebugLog( "/tmp/debug_log.txt" );
-
-// turn debugging on everywhere.
-// _ddtOn();
-
-// END
-
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/ddt.php b/web/imcms/xinha/plugins/ImageManager/ddt.php
deleted file mode 100644
index 4992b8b0b0..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/ddt.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php 
-/*
-This ddt library is released under the terms of the HTMLArea license. 
-See license.txt that is shipped with Xinha.
-*/
-
-// must be included after the configuration has been loaded.
-
-if ( ! defined( "IM_CONFIG_LOADED" ) )
-	die( "sorry" );
-
-/**
-* Debug and Error Message functions.
-*
-* These functions implement a procedural version of the formVista DDT debug
-* message system.
-*
-* @package formVista
-* @subpackage lib
-* @copyright DTLink, LLC 2005
-* @author Yermo Lamers
-* @see http://www.formvista.com/contact.html
-*/
-
-// REVISION HISTORY:
-//
-// 26 Jan 2001 YmL:
-//		. initial revision
-//
-// 2002-06-19 YmL:
-//		. added	logging	debug and error	messages to a file.
-//
-// 2004-02-06 YmL:
-//	.	added a newline to generated messages.
-//
-// 2005-01-09 YmL:
-//	.	now checks global $fvDEBUG[ "logfile" ] setting for 
-//		logfile to output to. 
-//	.	dumping to file has not been combined into a dumpmsg 
-//		method.
-//
-// 2005-02-25 YmL:
-//	.	added _error() support for cmdLine programs.
-//
-// 2005-03-20 YmL:
-//	.	changed license for this file to HTMLArea from RPL.
-//	.	quick hack to repurpose for Xinha.
-//
-// -------------------------------------------------------
-
-/**
-* dumps message to stdout or log file depending upon global.
-*
-* checks $fvDEBUG["logfile"] global for name of file to dump
-* messages to. Opens the file once.
-*/
-
-function dumpmsg( $msgline )
-{
-
-global $fvDEBUG;
-
-if ( @$fvDEBUG[ "logfile" ] != NULL )
-	{
-
-	// only open the file once and store the handle in the global
-	// fvDEBUG array .. for now.
-
-	if ( @$fvDEBUG[ "logfile_fp" ] == NULL )
-		{
-
-		// we clear out the debug file on each run.
-
-		if (( $fvDEBUG[ "logfile_fp" ] = fopen( $fvDEBUG[ "logfile" ], "a" )) == NULL )
-			{
-			die( "ddt(): unable to open debug log" );
-			return  false ;
-			}
-		}
-
-	fputs( $fvDEBUG[ "logfile_fp" ], "$msgline" );
-	fflush( $fvDEBUG[ "logfile_fp" ] );
-
-	}
-else
-	{
-	echo $msgline;
-	}
-
-}	// end of dumpmsg.
-
-/**
-* displays a formatted debugging message.
-*
-* If ddtOn() was called, outputs a formatted debugging message.
-*
-* @param string $file filename, usually __FILE__
-* @param string $line line number in file, usually __LINE__
-* @param string $msg debugging message to display
-*/
-
-function _ddt( $file, $line, $msg )
-{
-
-global $_DDT;
-global $_DDT_DEBUG_LOG;
-global $_DDT_CMDLINE;
-
-$basename = basename( $file );
-
-if ( @$_DDT == "yes" )
-	{
-
-	if ( @$_DDT_CMDLINE == "yes" )
-		{
-		dumpmsg( basename( $file ) . ":$line: $msg \n" );
-		flush();
-
-		}
-	else
-		{
-		dumpmsg( "<p>$basename:$line: $msg</p>\n" );
-		}
-	}
-
-}	// end of _ddt
-
-/**
-* displays a formatted dump of an associative array.
-*
-* If ddtOn() was called, outputs a formatted debugging message showing 
-* contents of array.
-*
-* @param string $file filename, usually __FILE__
-* @param string $line line number in file, usually __LINE__
-* @param string $msg debugging message to display
-* @param array $array_var array to dump.
-*/
-
-function _ddtArray( $file, $line, $msg,	$array_var )
-{
-
-global $_DDT;
-
-if ( $_DDT == "yes" )
-	{
-
-	dumpmsg( "<h2>$file:$line: $msg</h2>" );
-	
-	foreach	( $array_var as	$name => $value	)
-		{
-		dumpmsg( "<p><b>$name</b> => <b>$value</b>\n" );
-		}
-	}
-
-}	// end of _ddtArray
-
-// -----------------------------------------------------------------
-
-/**
-* Central Error Function.
-*
-* Displays a formatted error message to the user.
-* If the global _DDT_ERROR_LOG is set the error message is dumped 
-* to that file	instead	of being displayed to the user.
-*/
-
-function _error( $file,	$line, $msg )
-{
-
-global $_DDT_ERROR_LOG;
-global $_DDT_CMDLINE;
-
-if ( @$_DDT_ERROR_LOG == NULL )
-	{
-
-	if ( @$_DDT_CMDLINE == "yes" )
-		{
-		echo basename($file) . ":$line: $msg\n";
-		}
-	else
-		{
-		echo "<h2>$file:$line: $msg</h2>";
-		}
-	}
-else
-	{
-	 
-	if (( $fp = fopen( $_DDT_ERROR_LOG, "a"	)) != NULL )
-		{
-		fputs( $fp, date("D M j	G:i:s T	Y") . "	- $file:$line: $msg\n" );
-		fclose(	$fp );
-		}
-		
-	}
-	
-}	// end of _error
-
-// ----------------------------------------------------------------------
-
-function errorEcho( $title, $field )
-{
-
-global $error_msg;
-
-if ( $error_msg[ $field	] != ""	)
-	{
-	
-	echo "<FONT SIZE=\"+2\"	COLOR=\"RED\">$title</FONT>";
-	
-	}
-else
-	{
-	
-	echo $title;
-	
-	}
-	
-}	// end of errorEcho
-
-/**
-* turns on procedural debugging.
-*
-* Causes _ddt() calls to display debugging messages.
-*/
-
-function _ddtOn()
-{
-
-global $_DDT;
-
-$_DDT =	"yes";
-
-}
-
-/**
-* set error message destination.
-*
-* sets the destination for error messages.
-*
-* @param string $file full path to errorlog.
-*/
-
-function _setErrorLog( $errorLog )
-{
-
-global $_DDT_ERROR_LOG;
-
-$_DDT_ERROR_LOG	= $errorLog;
-
-}
-
-/**
-* set output file for debugging messages.
-*
-* sets the destination file for debugging messages.
-*
-* @param string $file full path to debuglog.
-*/
-
-function _setDebugLog( $debugLog )
-{
-
-global $fvDEBUG;
-
-$fvDEBUG[ "logfile" ] = $debugLog;
-
-}
-
-/**
-* set debugging output style to command line.
-*
-* tells ddt to format debugging messages for a 
-* command line program.
-*/
-
-function _ddtSetCmdLine()
-{
-
-global $_DDT_CMDLINE;
-
-$_DDT_CMDLINE = "yes";
-
-}
-
-// END
-
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/demo_images/bikerpeep.jpg b/web/imcms/xinha/plugins/ImageManager/demo_images/bikerpeep.jpg
deleted file mode 100644
index a2e7028eb7..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/demo_images/bikerpeep.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/demo_images/linux/linux.gif b/web/imcms/xinha/plugins/ImageManager/demo_images/linux/linux.gif
deleted file mode 100644
index 86e174cc97..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/demo_images/linux/linux.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/demo_images/wesnoth078.jpg b/web/imcms/xinha/plugins/ImageManager/demo_images/wesnoth078.jpg
deleted file mode 100644
index ea37d1aea7..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/demo_images/wesnoth078.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/editor.php b/web/imcms/xinha/plugins/ImageManager/editor.php
deleted file mode 100644
index 72f47e86a3..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/editor.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php 
-/**
- * The PHP Image Editor user interface.
- * @author $Author: ray $
- * @version $Id: editor.php 677 2007-01-19 22:24:36Z ray $
- * @package ImageManager
- */
-
-require_once('config.inc.php');
-require_once('Classes/ImageManager.php');
-require_once('Classes/ImageEditor.php');
-
-$manager = new ImageManager($IMConfig);
-$editor = new ImageEditor($manager);
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-	<title></title>
-<script type="text/javascript">
-_backend_url = "<?php print $IMConfig['backend_url']; ?>";
-</script>
-	<link href="<?php print $IMConfig['base_url'];?>assets/editor.css" rel="stylesheet" type="text/css" />	
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/slider.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/popup.js"></script>
-<script type="text/javascript">
-/*<![CDATA[*/
-	window.resizeTo(673, 531);
-
-	if(window.opener)
-		HTMLArea = window.opener.HTMLArea;
-/*]]>*/
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/editor.js"></script>
-</head>
-
-<body>
-<div id="indicator">
-<img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" id="indicator_image" height="20" width="20" alt="" />
-</div>
-<div id="tools">
-	<div id="tools_crop" style="display:none;">
-		<div id="tool_inputs">
-			<label for="cx">Start X:</label><input type="text" id="cx"  class="textInput" onchange="updateMarker('crop')"/>
-			<label for="cy">Start Y:</label><input type="text" id="cy" class="textInput" onchange="updateMarker('crop')"/>
-			<label for="cw">Width:</label><input type="text" id="cw" class="textInput" onchange="updateMarker('crop')"/>
-			<label for="ch">Height:</label><input type="text" id="ch" class="textInput" onchange="updateMarker('crop')"/>
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('crop');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancel"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>		
-	</div>	
-	<div id="tools_scale" style="display:none;">
-		<div id="tool_inputs">
-			<label for="sw">Width:</label><input type="text" id="sw" class="textInput" onchange="checkConstrains('width')"/>
-			<a href="javascript:toggleConstraints();" title="Lock"><img src="<?php print $IMConfig['base_url'];?>img/islocked2.gif" id="scaleConstImg" height="14" width="8" alt="Lock" class="div" /></a><label for="sh">Height:</label>
-			<input type="text" id="sh" class="textInput" onchange="checkConstrains('height')"/>
-			<input type="checkbox" id="constProp" value="1" checked="checked" onclick="toggleConstraints()"/>
-			<label for="constProp">Constrain Proportions</label>
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('scale');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancel"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>		
-	</div>	
-	<div id="tools_rotate" style="display:none;">
-		<div id="tool_inputs">
-			<select id="flip" name="flip" style="margin-left: 10px; vertical-align: middle;">
-              <option selected>Flip Image</option>
-              <option>-----------------</option>
-              <option value="hoz">Flip Horizontal</option>
-              <option value="ver">Flip Vertical</option>
-         </select>
-			<select name="rotate" onchange="rotatePreset(this)" style="margin-left: 20px; vertical-align: middle;">
-              <option selected>Rotate Image</option>
-              <option>-----------------</option>
-
-              <option value="180">Rotate 180 &deg;</option>
-              <option value="90">Rotate 90 &deg; CW</option>
-              <option value="-90">Rotate 90 &deg; CCW</option>
-         </select>
-			<label for="ra">Angle:</label><input type="text" id="ra" class="textInput" />
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('rotate');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancel"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>		
-	</div>		
-	<div id="tools_measure" style="display:none;">
-		<div id="tool_inputs">
-			<label>X:</label><input type="text" class="measureStats" id="sx" />
-			<label>Y:</label><input type="text" class="measureStats" id="sy" />
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-			<label>W:</label><input type="text" class="measureStats" id="mw" />
-			<label>H:</label><input type="text" class="measureStats" id="mh" />
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-			<label>A:</label><input type="text" class="measureStats" id="ma" />		
-			<label>D:</label><input type="text" class="measureStats" id="md" />		
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-			<button type="button" onclick="editor.reset();" >Clear</button>
-		</div>	
-	</div>
-	<div id="tools_save" style="display:none;">
-		<div id="tool_inputs">
-			<label for="save_filename">Filename:</label><input type="text" id="save_filename" value="<?php echo $editor->getDefaultSaveFile();?>"/>
-			<select name="format" id="save_format" style="margin-left: 10px; vertical-align: middle;" onchange="updateFormat(this)">
-            <option value="" selected>Image Format</option>
-            <option value="">---------------------</option>
-            <option value="jpeg,85">JPEG High</option>
-            <option value="jpeg,60">JPEG Medium</option>
-            <option value="jpeg,35">JPEG Low</option>
-            <option value="png">PNG</option>
-			<?php if($editor->isGDGIFAble() != -1) { ?>
-            <option value="gif">GIF</option>
-			<?php } ?>
-         </select>
-			<label>Quality:</label>
-			<table style="display: inline; vertical-align: middle;" cellpadding="0" cellspacing="0">
-				<tr>
-				<td>
-					<div id="slidercasing"> 
-				<div id="slidertrack" style="width:100px"><img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" width="1" height="1" border="0" alt="track"></div>
-            <div id="sliderbar" style="left:85px" onmousedown="captureStart();"><img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" width="1" height="1" border="0" alt="track"></div>
-			</div>	
-				</td>
-				</tr>
-			</table>				
-			<input type="text" id="quality" onchange="updateSlider(this.value)" style="width: 2em;" value="85"/>
-			<img src="<?php print $IMConfig['base_url'];?>img/div.gif" height="30" width="2" class="div" alt="|" />
-		</div>	
-		<a href="javascript: editor.doSubmit('save');" class="buttons" title="OK"><img src="<?php print $IMConfig['base_url'];?>img/btn_ok.gif" height="30" width="30" alt="OK" /></a>
-		<a href="javascript: editor.reset();" class="buttons" title="Cancel"><img src="<?php print $IMConfig['base_url'];?>img/btn_cancel.gif" height="30" width="30" alt="Cancel" /></a>		
-	</div>	
-</div>
-<div id="toolbar">
-<a href="javascript:toggle('crop')" id="icon_crop" title="Crop"><img src="<?php print $IMConfig['base_url'];?>img/crop.gif" height="20" width="20" alt="Crop" /><span>Crop</span></a>
-<a href="javascript:toggle('scale')" id="icon_scale" title="Resize"><img src="<?php print $IMConfig['base_url'];?>img/scale.gif" height="20" width="20" alt="Resize" /><span>Resize</span></a>
-<a href="javascript:toggle('rotate')" id="icon_rotate" title="Rotate"><img src="<?php print $IMConfig['base_url'];?>img/rotate.gif" height="20" width="20" alt="Rotate" /><span>Rotate</span></a>
-<a href="javascript:toggle('measure')" id="icon_measure" title="Measure"><img src="<?php print $IMConfig['base_url'];?>img/measure.gif" height="20" width="20" alt="Measure" /><span>Measure</span></a>
-<a href="javascript: toggleMarker();" title="Marker"><img id="markerImg" src="<?php print $IMConfig['base_url'];?>img/t_black.gif" height="20" width="20" alt="Marker" /><span>Marker</span></a>
-<a href="javascript:toggle('save')" id="icon_save" title="Save"><img src="<?php print $IMConfig['base_url'];?>img/save.gif" height="20" width="20" alt="Save" /><span>Save</span></a>
-</div>
-<div id="contents">
-<iframe src="<?php print $IMConfig['backend_url']; ?>__function=editorFrame&img=<?php if(isset($_GET['img'])) echo rawurlencode($_GET['img']); ?>" name="editor" id="editor"  scrolling="auto" title="Image Editor" frameborder="0"></iframe>
-</div>
-<div id="bottom"></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/editorFrame.php b/web/imcms/xinha/plugins/ImageManager/editorFrame.php
deleted file mode 100644
index 75346bac2a..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/editorFrame.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php 
-/**
- * The frame that contains the image to be edited.
- * @author $Author: ray $
- * @version $Id: editorFrame.php 677 2007-01-19 22:24:36Z ray $
- * @package ImageManager
- */
-
-require_once('config.inc.php');
-require_once('Classes/ImageManager.php');
-require_once('Classes/ImageEditor.php');
-
-$manager = new ImageManager($IMConfig);
-$editor = new ImageEditor($manager);
-$imageInfo = $editor->processImage();
-
-?>
-
-<html>
-<head>
-	<title></title>
-<script type="text/javascript">
-_backend_url = "<?php print $IMConfig['backend_url']; ?>";
-</script>
-
-<link href="<?php print $IMConfig['base_url'];?>assets/editorFrame.css" rel="stylesheet" type="text/css" />	
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/wz_jsgraphics.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/EditorContent.js"></script>
-<script type="text/javascript">
-
-if(window.top)
-	HTMLArea = window.top.HTMLArea;
-
-function i18n(str) {
-    return HTMLArea._lc(str, 'ImageManager');
-}
-	
-	var mode = "<?php echo $editor->getAction(); ?>" //crop, scale, measure
-
-var currentImageFile = "<?php if(count($imageInfo)>0) echo rawurlencode($imageInfo['file']); ?>";
-
-<?php if ($editor->isFileSaved() == 1) { ?>
-	alert(i18n('File saved.'));
-  window.parent.opener.selectImage
-    (
-      '<?php echo $imageInfo['savedFile'] ?>',
-      '<?php echo $imageInfo['savedFile'] ?>'.replace(/^.*\/?([^\/]*)$/, '$1'),
-      <?php echo $imageInfo['width'] ?>,
-      <?php echo $imageInfo['height'] ?>
-    );
-  window.parent.opener.parent.refresh();
-  window.parent.close();
-<?php } else if ($editor->isFileSaved() == -1) { ?>
-	alert(i18n('File was not saved.'));
-<?php } ?>
-
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/editorFrame.js"></script>
-</head>
-
-<body>
-<div id="status"></div>
-<div id="ant" class="selection" style="visibility:hidden"><img src="<?php print $IMConfig['base_url'];?>img/spacer.gif" width="0" height="0" border="0" alt="" id="cropContent"></div>
-<?php if ($editor->isGDEditable() == -1) { ?>
-	<div style="text-align:center; padding:10px;"><span class="error">GIF format is not supported, image editing not supported.</span></div>
-<?php } ?>
-<table height="100%" width="100%">
-	<tr>
-		<td>
-<?php if(count($imageInfo) > 0 && is_file($imageInfo['fullpath'])) { ?>
-	<span id="imgCanvas" class="crop"><img src="<?php echo $imageInfo['src']; ?>" <?php echo $imageInfo['dimensions']; ?> alt="" id="theImage" name="theImage"></span>
-<?php } else { ?>
-	<span class="error">No Image Available</span>
-<?php } ?>
-		</td>
-	</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/image-manager.js b/web/imcms/xinha/plugins/ImageManager/image-manager.js
deleted file mode 100644
index 3e8b0f7648..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/image-manager.js
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * The ImageManager plugin javascript.
- * @author $Author: wymsy $
- * @version $Id: image-manager.js 856 2007-06-13 18:34:34Z wymsy $
- * @package ImageManager
- */
-
-/**
- * To Enable the plug-in add the following line before Xinha is initialised.
- *
- * Xinha.loadPlugin("ImageManager");
- *
- * Then configure the config.inc.php file, that is all.
- * For up-to-date documentation, please visit http://www.zhuo.org/htmlarea/
- */
-
-/**
- * It is pretty simple, this file over rides the Xinha.prototype._insertImage
- * function with our own, only difference is the popupDialog url
- * point that to the php script.
- */
-
-function ImageManager(editor)
-{
-
-}
-
-ImageManager._pluginInfo = {
-	name          : "ImageManager",
-	version       : "1.0",
-	developer     : "Xiang Wei Zhuo",
-	developer_url : "http://www.zhuo.org/htmlarea/",
-	license       : "htmlArea"
-};
-
-
-// CONFIGURATION README:
-//
-//  It's useful to pass the configuration to the backend through javascript
-//  (this saves editing the backend config itself), this needs to be done
-//  in a trusted/secure manner... here is how to do it..
-//
-//  1. You need to be able to put PHP in your xinha_config setup
-//  2. In step 3 write something like
-//  --------------------------------------------------------------
-//  with (xinha_config.ImageManager)
-//  { 
-//    <?php 
-//      require_once('/path/to/xinha/contrib/php-xinha.php');
-//      xinha_pass_to_php_backend
-//      (       
-//        array
-//        (
-//         'images_dir' => '/home/your/directory',
-//         'images_url' => '/directory'
-//        )
-//      )
-//    ?>
-//  }
-//  --------------------------------------------------------------
-//
-//  this will work provided you are using normal file-based PHP sessions
-//  (most likely), if not, you may need to modify the php-xinha.php
-//  file to suit your setup.
-
-Xinha.Config.prototype.ImageManager =
-{
-  'backend'    : _editor_url + 'plugins/ImageManager/backend.php?__plugin=ImageManager&',
-  'backend_data' : null,
-  
-  // Deprecated method for passing config, use above instead!
-  //---------------------------------------------------------
-  'backend_config'     : null,
-  'backend_config_hash': null,
-  'backend_config_secret_key_location': 'Xinha:ImageManager'
-  //---------------------------------------------------------
-};
-
-// Over ride the _insertImage function in htmlarea.js.
-// Open up the ImageManger script instead.
-
-Xinha.prototype._insertImage = function(image) {
-
-	var editor = this;	// for nested functions
-	var outparam = null;
-	if (typeof image == "undefined") {
-		image = this.getParentElement();
-		if (image && !/^img$/i.test(image.tagName))
-			image = null;
-	}
-
-	// the selection will have the absolute url to the image. 
-	// coerce it to be relative to the images directory.
-	//
-	// FIXME: we have the correct URL, but how to get it to select?
-	// FIXME: need to do the same for MSIE.
-
-	if ( image )
-		{
-
-		outparam =
-			{
-			f_url    : Xinha.is_ie ? image.src : image.src,
-			f_alt    : image.alt,
-			f_border : image.style.borderWidth ? image.style.borderWidth : image.border,
-			f_align  : image.align,
-			f_padding: image.style.padding,
-			f_margin : image.style.margin,
-			f_width  : image.width,
-			f_height  : image.height,
-      f_backgroundColor: image.style.backgroundColor,
-      f_borderColor: image.style.borderColor
-			};
-
-    function shortSize(cssSize)
-    {
-      if(/ /.test(cssSize))
-      {
-        var sizes = cssSize.split(' ');
-        var useFirstSize = true;
-        for(var i = 1; i < sizes.length; i++)
-        {
-          if(sizes[0] != sizes[i])
-          {
-            useFirstSize = false;
-            break;
-          }
-        }
-        if(useFirstSize) cssSize = sizes[0];
-      }
-      return cssSize;
-    }
-    outparam.f_border = shortSize(outparam.f_border);
-    outparam.f_padding = shortSize(outparam.f_padding);
-    outparam.f_margin = shortSize(outparam.f_margin);
-    
-    function convertToHex(color) {
-
-      if (typeof color == "string" && /, /.test.color)
-      color = color.replace(/, /, ','); // rgb(a, b) => rgb(a,b)
-
-      if (typeof color == "string" && / /.test.color) { // multiple values
-        var colors = color.split(' ');
-        var colorstring = '';
-        for (var i = 0; i < colors.length; i++) {
-          colorstring += Xinha._colorToRgb(colors[i]);
-          if (i + 1 < colors.length)
-          colorstring += " ";
-        }
-        return colorstring;
-      }
-
-      return Xinha._colorToRgb(color);
-    }
-    
-    outparam.f_backgroundColor = convertToHex(outparam.f_backgroundColor);
-    outparam.f_borderColor = convertToHex(outparam.f_borderColor);
-
-		} // end of if we selected an image before raising the dialog.
-
-	// the "manager" var is legacy code. Should probably reference the
-	// actual config variable in each place .. for now this is good enough.
-
-	// alert( "backend is '" + editor.config.ImageManager.backend + "'" );
-
-	var manager = editor.config.ImageManager.backend + '__function=manager';
-  if(editor.config.ImageManager.backend_config != null)
-  {
-    manager += '&backend_config='
-      + encodeURIComponent(editor.config.ImageManager.backend_config);
-    manager += '&backend_config_hash='
-      + encodeURIComponent(editor.config.ImageManager.backend_config_hash);
-    manager += '&backend_config_secret_key_location='
-      + encodeURIComponent(editor.config.ImageManager.backend_config_secret_key_location);
-  }
-  
-  if(editor.config.ImageManager.backend_data != null)
-  {
-    for ( var i in editor.config.ImageManager.backend_data )
-    {
-      manager += '&' + i + '=' + encodeURIComponent(editor.config.ImageManager.backend_data[i]);
-    }
-  }
-  
-	Dialog(manager, function(param) {
-		if (!param) {	// user must have pressed Cancel
-			return false;
-		}
-		var img = image;
-		if (!img) {
-			if (Xinha.is_ie) {
-        var sel = editor._getSelection();
-        var range = editor._createRange(sel);
-        editor._doc.execCommand("insertimage", false, param.f_url);
-				img = range.parentElement();
-				// wonder if this works...
-				if (img.tagName.toLowerCase() != "img") {
-					img = img.previousSibling;
-				}
-			} else {
-				img = document.createElement('img');
-        img.src = param.f_url;
-        editor.insertNodeAtSelection(img);
-			}
-		} else {			
-			img.src = param.f_url;
-		}
-		
-		for (field in param) {
-			var value = param[field];
-			switch (field) {
-			    case "f_alt"    : img.alt	 = value; break;
-			    case "f_border" :
-          if(value.length)
-          {           
-            img.style.borderWidth = /[^0-9]/.test(value) ? value :  (parseInt(value) + 'px');
-            if(img.style.borderWidth && !img.style.borderStyle)
-            {
-              img.style.borderStyle = 'solid';
-            }
-          }
-          else
-          {
-            img.style.borderWidth = '';
-            img.style.borderStyle = '';
-          }
-          break;
-          
-          case "f_borderColor": img.style.borderColor = value; break;
-          case "f_backgroundColor": img.style.backgroundColor = value; break;
-            
-          case "f_padding": 
-          {
-            if(value.length)
-            {
-              img.style.padding = /[^0-9]/.test(value) ? value :  (parseInt(value) + 'px'); 
-            }
-            else
-            {
-              img.style.padding = '';
-            }
-          }
-          break;
-          
-          case "f_margin": 
-          {
-            if(value.length)
-            {
-              img.style.margin = /[^0-9]/.test(value) ? value :  (parseInt(value) + 'px'); 
-            }
-            else
-            {
-              img.style.margin = '';
-            }
-          }
-          break;
-          
-			    case "f_align"  : img.align	 = value; break;
-            
-          case "f_width" : 
-          {
-            if(!isNaN(parseInt(value))) { img.width  = parseInt(value); } else { img.width = ''; }
-          }
-          break;
-          
-				  case "f_height":
-          {
-            if(!isNaN(parseInt(value))) { img.height = parseInt(value); } else { img.height = ''; }
-          }
-          break;
-			}
-
-		}
-		
-		
-	}, outparam);
-};
diff --git a/web/imcms/xinha/plugins/ImageManager/image-picker.js b/web/imcms/xinha/plugins/ImageManager/image-picker.js
deleted file mode 100644
index 32e8ffe74d..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/image-picker.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * An input field Image Picker utilising the Xinha ImageManager.
- *
- * Hijack the Xinha ImageManager plugin to provide an image URL picker
- * for any form input field in the form of a "Browse" button to the
- * right of the field, in the same manner as a file type input field
- * except it opens the familiar ImageManager dialog to upload/select/edit
- * an image and returns the URL of the image to the field's value.
- *
- * Example Usage:
- *
- *  <script type="text/javascript">_editor_url = '/url/to/xinha';</script>
- *  <script type="text/javascript" src="image-picker.js" />
- *  <script type="text/javascript">
- *   <?php require_once('/path/to/xinha/contrib/php-xinha.php'); ?>
- *   with(ImagePicker.prototype)
- *   {
- *     <?php 
- *      $Conf = array
- *       (
- *         'images_dir' => '/path/to/images', 
- *         'images_url' => '/url/to/images', 
- *         'show_full_options' => false, // Full options are not useful as a URL picker
- *         // See ImageManager for more configuration options !           
- *       );
- *      xinha_pass_to_php_backend($Conf);
- *     ?>
- *   }
- *
- *   window.onload = function() { new ImagePicker(document.getElementById('idOfTheInputField')); }
- *  </script>
- *
- *
- * @author $Author$
- * @version $Id$
- * @package ImageManager
- */
-
-
-function ImagePicker(field)
-{
-  this.field = field;
-  var picker = this;
-  
-  var but = document.createElement('input');   
-  but.type = 'button';
-  but.value = 'Browse'; 
-  but.onclick = function() { picker.popup_picker(); }
-     
-  field.parentNode.insertBefore(but,field.nextSibling);
-  field.size = '20';
-  field.style.textAlign = 'right';
-};
-
-ImagePicker.prototype.backend             = _editor_url + 'plugins/ImageManager/backend.php?__plugin=ImageManager&';
-ImagePicker.prototype.backend_data        = null;
-
-ImagePicker.prototype.popup_picker = function()
-{
-  var picker = this; // closure for later  
-  var outparam = null;
-  if(picker.field.value)
-  {
-    outparam =
-		{      
-			f_url    : picker.field.value,			
-			f_width  : null,
-			f_height  : null,
-     
-      // None of this stuff is useful to us, we return only a URL.
-      f_alt    : picker.field.value,
-			f_border : null,
-			f_align  : null,
-			f_padding: null,
-			f_margin : null,
-      f_backgroundColor: null,
-      f_borderColor: null,
-      f_border : null,
-      f_padding: null,
-      f_margin: null
-    };
-  }
-
-  var manager = this.backend + '__function=manager';
-  if(this.backend_config != null)
-  {
-    manager += '&backend_config='
-      + encodeURIComponent(this.backend_config);
-    manager += '&backend_config_hash='
-      + encodeURIComponent(this.backend_config_hash);
-    manager += '&backend_config_secret_key_location='
-      + encodeURIComponent(this.backend_config_secret_key_location);
-  }
-  
-  if(this.backend_data != null)
-  {
-    for ( var i in this.backend_data )
-    {
-      manager += '&' + i + '=' + encodeURIComponent(this.backend_data[i]);
-    }
-  }
-
-  Dialog(manager, function(param) {
-		if (!param) {	// user must have pressed Cancel
-			return false;
-		}
-    picker.field.value = param.f_url;
-		}, outparam);
-}
-
-// Dialog is part of Xinha, but we'll provide it here incase Xinha's not being
-// loaded.
-if(typeof Dialog == 'undefined')
-{
-  // htmlArea v3.0 - Copyright (c) 2003-2004 interactivetools.com, inc.
-  // This copyright notice MUST stay intact for use (see license.txt).
-  //
-  // Portions (c) dynarch.com, 2003-2004
-  //
-  // A free WYSIWYG editor replacement for <textarea> fields.
-  // For full source code and docs, visit http://www.interactivetools.com/
-  //
-  // Version 3.0 developed by Mihai Bazon.
-  //   http://dynarch.com/mishoo
-  //
-  // $Id: dialog.js 183 2005-05-20 06:11:44Z gogo $
-  
-  // Though "Dialog" looks like an object, it isn't really an object.  Instead
-  // it's just namespace for protecting global symbols.
-  
-  function Dialog(url, action, init) {
-    if (typeof init == "undefined") {
-      init = window;	// pass this window object by default
-    }
-    var dlg = window.open(url, "hadialog",
-              "toolbar=no,menubar=no,personalbar=no,width=10,height=10," +
-              "scrollbars=yes,resizable=yes,modal=yes,dependable=yes");
-    Dialog._modal = dlg;
-    Dialog._arguments = init;
-
-    // make up a function to be called when the Dialog ends.
-    Dialog._return = function (val) 
-    {
-      if (val && action) {
-        action(val);
-      }
-
-      Dialog._modal = null;
-    };
-    Dialog._modal.focus();
-  };
-     
-  // should be a function, the return handler of the currently opened dialog.
-  Dialog._return = null;
-  
-  // constant, the currently opened dialog
-  Dialog._modal = null;
-  
-  // the dialog will read it's args from this variable
-  Dialog._arguments = null;
- 
-}
-
-// Deprecated method for passing config, use above instead!
-//---------------------------------------------------------
-ImagePicker.prototype.backend_config      = null;
-ImagePicker.prototype.backend_config_hash = null;
-ImagePicker.prototype.backend_config_secret_key_location = 'Xinha:ImageManager';
-//---------------------------------------------------------
diff --git a/web/imcms/xinha/plugins/ImageManager/images.php b/web/imcms/xinha/plugins/ImageManager/images.php
deleted file mode 100644
index 57bca61ff2..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/images.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php 
-/**
- * Show a list of images in a long horizontal table.
- * @author $Author: gogo $
- * @version $Id: images.php 877 2007-08-12 15:50:03Z gogo $
- * @package ImageManager
- */
-
-require_once('config.inc.php');
-require_once('ddt.php');
-require_once('Classes/ImageManager.php');
-
-// uncomment for debugging
-
-// _ddtOn();
-
-//default path is /
-$relative = '/';
-$manager = new ImageManager($IMConfig);
-
-//process any file uploads
-$manager->processUploads();
-
-$manager->deleteFiles();
-
-$refreshDir = false;
-//process any directory functions
-if($manager->deleteDirs() || $manager->processNewDir())
-	$refreshDir = true;
-
-//check for any sub-directory request
-//check that the requested sub-directory exists
-//and valid
-if(isset($_REQUEST['dir']))
-{
-	$path = rawurldecode($_REQUEST['dir']);
-	if($manager->validRelativePath($path))
-		$relative = $path;
-}
-
-
-$manager = new ImageManager($IMConfig);
-
-
-//get the list of files and directories
-$list = $manager->getFiles($relative);
-
-
-/* ================= OUTPUT/DRAW FUNCTIONS ======================= */
-
-/**
- * Draw the files in an table.
- */
-function drawFiles($list, &$manager)
-{
-	global $relative;
-	global $IMConfig;
-
-    switch($IMConfig['ViewMode'])
-    {
-      case 'details':
-      {
-        ?>
-        <script language="Javascript">
-          <!--
-            function showPreview(f_url)
-            {
-              
-              window.parent.document.getElementById('f_preview').src = 
-                window.parent._backend_url + '__function=thumbs&img=' + f_url;
-            }
-          //-->
-        </script>
-        <table class="listview">
-        <thead>
-        <tr><th>Name</th><th>Filesize</th><th>Dimensions</th></tr></thead>
-        <tbody>
-          <?php
-          foreach($list as $entry => $file)
-          {
-            ?>
-            <tr>
-              <th><a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" onmouseover="showPreview('<?php echo $file['relative'];?>')" onmouseout="showPreview(window.parent.document.getElementById('f_url').value)" ><?php echo $entry ?></a></th>
-              <td><?php echo Files::formatSize($file['stat']['size']); ?></td>
-              <td><?php if($file['image']){ echo $file['image'][0].'x'.$file['image'][1]; } ?>
-              <td class="actions">
-                <a href="<?php print $IMConfig['backend_url']; ?>__function=images&dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0"  /></a>
-        
-                <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" border="0" /></a>
-              </td>
-            </tr>
-            <?php        
-          }
-          ?>
-        </tbody>
-        </table>
-        <?php
-      }      
-      break;
-      
-      case 'thumbs':
-      default      :
-      {
-	foreach($list as $entry => $file)
-	{
-		?>
-    <div class="thumb_holder" id="holder_<?php echo asc2hex($entry) ?>">
-      <a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>">
-        <img src="<?php print $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"/>
-      </a>
-      <div class="edit">
-        <a href="<?php print $IMConfig['backend_url']; ?>__function=images&dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"  /></a>
-
-        <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" /></a>
-
-        <?php if($file['image']){ echo $file['image'][0].'x'.$file['image'][1]; } else echo $entry;?>
-      </div>
-    </div>
-	  <?php
-        }
-      }
-    }	
-}//function drawFiles
-
-
-/**
- * Draw the directory.
- */
-function drawDirs($list, &$manager) 
-{
-	global $relative;
-   global $IMConfig;
-
-  switch($IMConfig['ViewMode'])
-  {
-    case 'details':
-    {
-        
-    }
-    break; 
-    
-    case 'thumbs':
-    default      :
-    {
-	foreach($list as $path => $dir) 
-	{ ?>
-    <div class="dir_holder">
-      <a class="dir" href="<?php print $IMConfig['backend_url'];?>__function=images&dir=<?php echo rawurlencode($path); ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>"><img src="<?php print $IMConfig['base_url'];?>img/folder.gif" height="80" width="80" alt="<?php echo $dir['entry']; ?>" /></a>
-
-      <div class="edit">
-        <a href="<?php print $IMConfig['backend_url'];?>__function=images&dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"/></a>
-        <?php echo $dir['entry']; ?>
-      </div>
-    </div>
-	  <?php 
-	} //foreach
-    }
-  }
-  
-	
-}//function drawDirs
-
-
-/**
- * No directories and no files.
- */
-function drawNoResults() 
-{
-?>
-<div class="noResult">No Images Found</div>
-<?php 
-}
-
-/**
- * No directories and no files.
- */
-function drawErrorBase(&$manager) 
-{
-?>
-<div class="error"><span>Invalid base directory:</span> <?php echo $manager->config['images_dir']; ?></div>
-<?php 
-}
-
-/**
- * Utility to convert ascii string to hex
- */
-function asc2hex ($temp)
-{
-  $len = strlen($temp);
-  $data = "";
-  for ($i=0; $i<$len; $i++) $data.=sprintf("%02x",ord(substr($temp,$i,1)));
-  return $data;
-}
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-	<title>Image List</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link href="<?php print $IMConfig['base_url'];?>assets/imagelist.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript">
-_backend_url = "<?php print $IMConfig['backend_url']; ?>";
-</script>
-
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/dialog.js"></script>
-<script type="text/javascript">
-/*<![CDATA[*/
-
-	if(window.top)
-    HTMLArea = Xinha    = window.top.Xinha;
-
-	function hideMessage()
-	{
-		var topDoc = window.top.document;
-		var messages = topDoc.getElementById('messages');
-		if(messages)
-			messages.style.display = "none";
-	}
-
-	init = function()
-	{
-	  __dlg_translate('ImageManager');
-		hideMessage();
-		var topDoc = window.top.document;
-
-<?php 
-	//we need to refesh the drop directory list
-	//save the current dir, delete all select options
-	//add the new list, re-select the saved dir.
-	if($refreshDir) 
-	{ 
-		$dirs = $manager->getDirs();
-?>
-		var selection = topDoc.getElementById('dirPath');
-		var currentDir = selection.options[selection.selectedIndex].text;
-
-		while(selection.length > 0)
-		{	selection.remove(0); }
-		
-		selection.options[selection.length] = new Option("/","<?php echo rawurlencode('/'); ?>");	
-		<?php foreach($dirs as $relative=>$fullpath) { ?>
-		selection.options[selection.length] = new Option("<?php echo $relative; ?>","<?php echo rawurlencode($relative); ?>");		
-		<?php } ?>
-		
-		for(var i = 0; i < selection.length; i++)
-		{
-			var thisDir = selection.options[i].text;
-			if(thisDir == currentDir)
-			{
-				selection.selectedIndex = i;
-				break;
-			}
-		}		
-<?php } ?>
-    update_selected();
-	}	
-
-	function editImage(image) 
-	{
-		var url = "<?php print $IMConfig['backend_url']; ?>__function=editor&img="+image;
-		Dialog(url, function(param) 
-		{
-			if (!param) // user must have pressed Cancel
-				return false;
-			else
-			{
-				return true;
-			}
-		}, null);		
-	}
-
-/*]]>*/
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/images.js"></script>
-<script type="text/javascript" src="../../popups/popup.js"></script>
-<script type="text/javascript" src="assets/popup.js"></script>
-</head>
-
-<body>
-<?php if ($manager->isValidBase() == false) { drawErrorBase($manager); } 
-	elseif(count($list[0]) > 0 || count($list[1]) > 0) { ?>
-
-	<?php drawDirs($list[0], $manager); ?>
-	<?php drawFiles($list[1], $manager); ?>
-
-<?php } else { drawNoResults(); } ?>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/ImageManager/img/2x2.gif b/web/imcms/xinha/plugins/ImageManager/img/2x2.gif
deleted file mode 100644
index 2f2ec4aaf4..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/2x2.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/2x2_w.gif b/web/imcms/xinha/plugins/ImageManager/img/2x2_w.gif
deleted file mode 100644
index 9b560a8c57..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/2x2_w.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/Thumbs.db b/web/imcms/xinha/plugins/ImageManager/img/Thumbs.db
deleted file mode 100644
index 7bdcc63734..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/Thumbs.db and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/btnFolderNew.gif b/web/imcms/xinha/plugins/ImageManager/img/btnFolderNew.gif
deleted file mode 100644
index db01742d67..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/btnFolderNew.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/btnFolderUp.gif b/web/imcms/xinha/plugins/ImageManager/img/btnFolderUp.gif
deleted file mode 100644
index 7b7349db0b..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/btnFolderUp.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/btn_cancel.gif b/web/imcms/xinha/plugins/ImageManager/img/btn_cancel.gif
deleted file mode 100644
index ae9401ce6c..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/btn_cancel.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/btn_ok.gif b/web/imcms/xinha/plugins/ImageManager/img/btn_ok.gif
deleted file mode 100644
index e8b027ca34..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/btn_ok.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/crop.gif b/web/imcms/xinha/plugins/ImageManager/img/crop.gif
deleted file mode 100644
index 8ef53b275c..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/crop.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/default.gif b/web/imcms/xinha/plugins/ImageManager/img/default.gif
deleted file mode 100644
index 7419c1d62f..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/default.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/div.gif b/web/imcms/xinha/plugins/ImageManager/img/div.gif
deleted file mode 100644
index 6d25c022a8..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/div.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/dots.gif b/web/imcms/xinha/plugins/ImageManager/img/dots.gif
deleted file mode 100644
index a213e5b3c5..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/dots.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/edit_active.gif b/web/imcms/xinha/plugins/ImageManager/img/edit_active.gif
deleted file mode 100644
index 928c25d91f..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/edit_active.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/edit_pencil.gif b/web/imcms/xinha/plugins/ImageManager/img/edit_pencil.gif
deleted file mode 100644
index 04fe5a275c..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/edit_pencil.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/edit_trash.gif b/web/imcms/xinha/plugins/ImageManager/img/edit_trash.gif
deleted file mode 100644
index 8754ac7e6b..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/edit_trash.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/folder.gif b/web/imcms/xinha/plugins/ImageManager/img/folder.gif
deleted file mode 100644
index 9003f58942..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/folder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/hand.gif b/web/imcms/xinha/plugins/ImageManager/img/hand.gif
deleted file mode 100644
index 23c900fe7b..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/hand.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/islocked2.gif b/web/imcms/xinha/plugins/ImageManager/img/islocked2.gif
deleted file mode 100644
index 1dfd2ec73f..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/islocked2.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/locked.gif b/web/imcms/xinha/plugins/ImageManager/img/locked.gif
deleted file mode 100644
index 92472389de..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/locked.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/measure.gif b/web/imcms/xinha/plugins/ImageManager/img/measure.gif
deleted file mode 100644
index 9e496db4c5..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/measure.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/noimages.gif b/web/imcms/xinha/plugins/ImageManager/img/noimages.gif
deleted file mode 100644
index 22e6dd3899..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/noimages.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/rotate.gif b/web/imcms/xinha/plugins/ImageManager/img/rotate.gif
deleted file mode 100644
index cf8764f21d..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/rotate.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/save.gif b/web/imcms/xinha/plugins/ImageManager/img/save.gif
deleted file mode 100644
index dadb9b0756..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/save.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/scale.gif b/web/imcms/xinha/plugins/ImageManager/img/scale.gif
deleted file mode 100644
index e36bec39c7..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/scale.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/spacer.gif b/web/imcms/xinha/plugins/ImageManager/img/spacer.gif
deleted file mode 100644
index fc2560981e..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/spacer.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/t_black.gif b/web/imcms/xinha/plugins/ImageManager/img/t_black.gif
deleted file mode 100644
index 4f362f16c0..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/t_black.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/t_white.gif b/web/imcms/xinha/plugins/ImageManager/img/t_white.gif
deleted file mode 100644
index bcddeec9e8..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/t_white.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/unlocked.gif b/web/imcms/xinha/plugins/ImageManager/img/unlocked.gif
deleted file mode 100644
index fe4e0d4bbd..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/unlocked.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/img/unlocked2.gif b/web/imcms/xinha/plugins/ImageManager/img/unlocked2.gif
deleted file mode 100644
index ce703c94cb..0000000000
Binary files a/web/imcms/xinha/plugins/ImageManager/img/unlocked2.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/de.js b/web/imcms/xinha/plugins/ImageManager/lang/de.js
deleted file mode 100644
index e6103a1b29..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/de.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Image Manager": "Bildmanager",
-  "Insert Image": "Bild einfügen",
-  "Directory": "Ordner",
-  "Directory Up": "übergeordneter Ordner",
-  "New Folder": "Neuer Ordner",
-  "Trash": "Müll",
-  "Edit": "bearbeiten",
-  "Image File": "Bilddatei",
-  "Upload": "Hochladen",
-  "Width": "Breite",
-  "Height": "Höhe",
-  "Constrain Proportions": "Proportional",
-  "Border": "Rand",
-  "V Space": "vertikaler Freiraum",
-  "H Space": "horizontaler Freiraum",
-  "Refresh": "Aktualisieren",
-  "Uploading...": "Hochladen...",
-  "Crop": "Beschneiden",
-  "Resize": "Größe ändern",
-  "Rotate": "Drehen",
-  "Measure": "Abmessungen",
-  "Marker": "Marker",
-  "Save": "Speichern",
-  "Filename:": "Dateiname:",
-  "Image Format": "Bildformat:",
-  "Quality:": "Qualität",
-  "JPEG High": "JPEG hoch",
-  "JPEG Medium": "JPEG mittel",
-  "JPEG Low": "JPEG niedrig",
-  "File saved.": "Datei gespeichert.",
-  "File was not saved.": "Datei wurde nicht gespeichert.",
-  "Start X:": "Start X",
-  "Start Y:": "Start Y",
-  "Lock": "Sperren",
-  "Flip Image": "Bild spiegeln",
-  "Flip Horizontal": "horizontal spiegeln",
-  "Flip Vertical": "vertikal spiegeln",
-  "Rotate Image": "Bild drehen",
-  "Rotate 180 °": "180° drehen",
-  "Rotate 90 ° CW": "90° drehen im UZS",
-  "Rotate 90 ° CCW": "90° drehen gegen UZS",
-  "Angle:": "Winkel:",
-  "W:": "B:",
-  "Clear": "Entfernen",
-  "Loading": "Laden",
-  "Invalid base directory:": "Ungültiges Startverzeichnis:",
-  "Delete file?": "Datei löschen?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Bitte löschen Sie zuerst alle Dateien im Ordner den Sie löschen möchten.",
-  "Delete folder?": "Ordner löschen?",
-  "Folder Name:": "Ordnername:",
-  "No Images Found": "Kein Bild gefunden",
-  "Invalid folder name, please choose another folder name.": "Ungültiger Ordnername, bitte wählen sie einen anderen Namen.",
-  "GIF format is not supported, image editing not supported.": "GIF Format wird nicht unterstützt, Bildbearbeitung wird nicht unterstützt.",
-  "No Image Available": "Kein Bild verfügbar",
-  "No Image selected.": "Kein Bild ausgewählt.",
-  "Description:": "Beschreibung:",
-  "Align:": "Ausrichtung:",
-  "Margin:": "Außenabstand:",
-  "Padding:": "Innenabstand:",
-  "Color:": "Farbe:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/fr.js b/web/imcms/xinha/plugins/ImageManager/lang/fr.js
deleted file mode 100644
index 48e6aebdfe..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/fr.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Image Manager": "Bibliothèque d'images",
-  "Insert Image": "Insérer une image",
-  "Directory": "Répertoire",
-  "Directory Up": "Remonter",
-  "New Folder": "Nouveau répertoire",
-  "Trash": "Détruire",
-  "Edit": "Editer",
-  "Image File": "Fichier",
-  "Upload": "Télécharger",
-  "Width": "Largeur",
-  "Height": "Hauteur",
-  "Width:": "Largeur",
-  "Height:": "Hauteur",
-  "Constrain Proportions": "Conserver les proportions",
-  "Border": "Bordure",
-  "V Space": "Espace V",
-  "H Space": "Espace H",
-  "Refresh": "Rafraîchir",
-  "Uploading...": "Chargement...",
-  "Crop": "Recadrer",
-  "Resize": "Retailler",
-  "Rotate": "Pivoter",
-  "Measure": "Mesure",
-  "Marker": "Marqueur",
-  "Save": "Sauver",
-  "Filename:": "Nom",
-  "Image Format": "Format d'image",
-  "Quality:": "Qualité",
-  "JPEG High": "JPEG haut",
-  "JPEG Medium": "JPEG moyen",
-  "JPEG Low": "JPEG bas",
-  "File saved.": "Fichier sauvegardé.",
-  "File was not saved.": "Fichier non sauvegardé.",
-  "Start X:": "Début X",
-  "Start Y:": "Début Y",
-  "Lock": "Cadenas",
-  "Flip Image": "Symétrie",
-  "Flip Horizontal": "Symétrie horizontale",
-  "Flip Vertical": "Symétrie verticale",
-  "Rotate Image": "Rotation",
-  "Rotate 180 °": "Rotation 180°",
-  "Rotate 90 ° CW": "Rotation 90° horaire",
-  "Rotate 90 ° CCW": "Rotation 90° antihoraire",
-  "Angle:": "Angle",
-  "W:": "L:",
-  "Clear": "Effacer",
-  "Loading": "Chargement en cours",
-  "Invalid base directory:": "Répertoire de base invalide:",
-  "Delete file?": "Suppression du fichier ?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Veuillez tout d'abord supprimer tous les fichiers et répertoires contenus",
-  "Delete folder?": "Suppression du répertoire ?",
-  "Folder Name:": "Nom du répertoire",
-  "No Images Found": "Aucune image trouvée",
-  "Invalid folder name, please choose another folder name.": "Nom de répertoire invalide, veuillez choisir un autre nom",
-  "GIF format is not supported, image editing not supported.": "Format GIF non supporté, édition d'image non supportée",
-  "No Image Available": "Aucune image disponible",
-  "No Image selected.": "Aucune image sélectionnée.",
-  "Color:": "Couleur",
-  "Align:": "Alignement",
-  "Margin:": "Marge",
-  "Padding:": "Espacement",
-  "Border:": "Bordure"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/ja.js b/web/imcms/xinha/plugins/ImageManager/lang/ja.js
deleted file mode 100644
index 72e4984059..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/ja.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Image Manager": "画�マ�ージャ",
-  "Insert Image": "画��挿入",
-  "Directory": "ディレクトリ",
-  "Directory Up": "親ディレクトリ�",
-  "New Folder": "新�フォルダ",
-  "Trash": "削除",
-  "Edit": "編集",
-  "Image File": "画�ファイル",
-  "Upload": "アップロード",
-  "Width": "å¹…",
-  "Height": "高�",
-  "Width:": "å¹…:",
-  "Height:": "高�:",
-  "Constrain Proportions": "縦横比を固定",
-  "Border": "ボーダー",
-  "V Space": "垂直余白",
-  "H Space": "水平余白",
-  "Refresh": "æ›´æ–°",
-  "Uploading...": "アップロード中...",
-  "Crop": "切り抜�",
-  "Resize": "サイズ変更",
-  "Rotate": "回転",
-  "Measure": "計測",
-  "Marker": "マーカー",
-  "Save": "�存",
-  "Filename:": "ファイル�:",
-  "Image Format": "画�形�",
-  "Quality:": "画質:",
-  "JPEG High": "JPEG 高画質",
-  "JPEG Medium": "JPEG 標準",
-  "JPEG Low": "JPEG 低画質",
-  "File saved.": "ファイルを�存����。",
-  "File was not saved.": "ファイルを�存����ん���。",
-  "Start X:": "開始 X",
-  "Start Y:": "開始 Y",
-  "Lock": "ロック",
-  "Flip Image": "画�を�転",
-  "Flip Horizontal": "左��転",
-  "Flip Vertical": "上下�転",
-  "Rotate Image": "画�を回転",
-  "Rotate 180 °": "180°",
-  "Rotate 90 ° CW": "90° 時計回り",
-  "Rotate 90 ° CCW": "90° �時計回り",
-  "Angle:": "角度:",
-  "W:": "W:",
-  "Clear": "クリア",
-  "Loading": "ロード中",
-  "Invalid base directory:": "無効�ディレクトリ:",
-  'Delete file "$file"?': 'ファイル "$file" を削除����?',
-  "Please delete all files/folders inside the folder you wish to delete first.": "削除���フォルダ内�ファイル�フォルダを全�削除���������。",
-  'Delete folder "$dir"?': 'フォルダ "$dir" を削除����?',
-  "Folder Name:": "フォルダ�:",
-  "No Files Found": "ファイル��り��ん",
-  "Invalid folder name, please choose another folder name.": "無効�フォルダ���。別�フォルダ�を�ん�����。",
-  "GIF format is not supported, image editing not supported.": "GIF形��サ�ート�れ�������画�編集����ん。",
-  "No Image Available": "画���り��ん",
-  "No Image selected.": "画���択�れ����ん。",
-  "Color:": "色:",
-  "Align:": "行��",
-  "Margin:": "é–“éš”:",
-  "Padding:": "余白:",
-  "Border:": "境界線:",
-  
-  "Upload": "アップロード",
-  "Upload:": "アップロード:",
-  "Description:": "説明:",
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/nb.js b/web/imcms/xinha/plugins/ImageManager/lang/nb.js
deleted file mode 100644
index 93402a6feb..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/nb.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Image Manager": "Bildebehandler",
-  "Insert Image": "Sett inn bilde",
-  "Directory": "Mappe",
-  "Directory Up": "Opp en mappe",
-  "New Folder": "Ny mappe",
-  "Trash": "Søppelkurv",
-  "Edit": "Rediger",
-  "Image File": "Bildefil",
-  "Upload": "Last opp",
-  "Width": "Bredde",
-  "Height": "Høyde",
-  "Constrain Proportions": "Behold proposjoner",
-  "Border": "Ramme",
-  "V Space": "vertikal marg",
-  "H Space": "horisontal marg",
-  "Refresh": "Oppfrisk",
-  "Uploading...": "Laster opp...",
-  "Crop": "Beskjær",
-  "Resize": "Endre størrelse",
-  "Rotate": "Roter",
-  "Measure": "MÃ¥l",
-  "Marker": "Marker",
-  "Save": "Lagre",
-  "Filename:": "Filnavn:",
-  "Image Format": "Bildeformat:",
-  "Quality:": "Kvalitet",
-  "JPEG High": "JPEG høy",
-  "JPEG Medium": "JPEG middelse",
-  "JPEG Low": "JPEG lav",
-  "File saved.": "Fil lagret.",
-  "File was not saved.": "Fil ble ikke lagret.",
-  "Start X:": "Start X",
-  "Start Y:": "Start Y",
-  "Lock": "Sperre",
-  "Flip Image": "Vend bilde",
-  "Flip Horizontal": "Vend horisontal",
-  "Flip Vertical": "Vend vertikal",
-  "Rotate Image": "Roter bilde",
-  "Rotate 180 °": "Roter 180°",
-  "Rotate 90 ° CW": "Roter 90° med klokka",
-  "Rotate 90 ° CCW": "Roter 90° mot klokka",
-  "Angle:": "Vinkel:",
-  "W:": "B:",
-  "Clear": "Fjern",
-  "Loading": "Laster",
-  "Invalid base directory:": "Feil rot-mappe:",
-  "Delete file?": "Slette fil?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Vennligst slett alle filer og mapper i mappen du ønsker å slette og prøv igjen.",
-  "Delete folder?": "Slett mappe?",
-  "Folder Name:": "Mappenavn:",
-  "No Images Found": "Ingen bilder funnet",
-  "Invalid folder name, please choose another folder name.": "Ugyldig mappenavn, vennligst velg et annet navn på mappen.",
-  "GIF format is not supported, image editing not supported.": "Bildeformatet GIF er ikke støttet.",
-  "No Image Available": "Inget bilde er tilgjengelig",
-  "No Image selected.": "Inget bilde er valgt.",
-  "Description:": "Beskrivelse:",
-  "Align:": "Justering:",
-  "Margin:": "Marg:",
-  "Padding:": "Innsidemarg:",
-  "Color:": "Farge:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/nl.js b/web/imcms/xinha/plugins/ImageManager/lang/nl.js
deleted file mode 100644
index 1e8f55de2a..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/nl.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Image Manager": "Afbeeldingen Beheer",
-  "Crop": "Passend maken"
-};
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/no.js b/web/imcms/xinha/plugins/ImageManager/lang/no.js
deleted file mode 100644
index 8d86665c97..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/no.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Image Manager": "Bildebehandler",
-  "Insert Image": "Sett inn bilde",
-  "Directory": "Mappe",
-  "Directory Up": "Opp en mappe",
-  "New Folder": "Ny mappe",
-  "Trash": "Søppelkurv",
-  "Edit": "Rediger",
-  "Image File": "Bildefil",
-  "Upload": "Last opp",
-  "Width": "Bredde",
-  "Height": "Høyde",
-  "Constrain Proportions": "Behold proposjoner",
-  "Border": "Ramme",
-  "V Space": "vertikal marg",
-  "H Space": "horisontal marg",
-  "Refresh": "Oppfrisk",
-  "Uploading...": "Laster opp...",
-  "Crop": "Beskjær",
-  "Resize": "Endre størrelse",
-  "Rotate": "Roter",
-  "Measure": "MÃ¥l",
-  "Marker": "Marker",
-  "Save": "Lagre",
-  "Filename:": "Filnavn:",
-  "Image Format": "Bildeformat:",
-  "Quality:": "Kvalitet",
-  "JPEG High": "JPEG høy",
-  "JPEG Medium": "JPEG middelse",
-  "JPEG Low": "JPEG lav",
-  "File saved.": "Fil lagret.",
-  "File was not saved.": "Fil ble ikke lagret.",
-  "Start X:": "Start X",
-  "Start Y:": "Start Y",
-  "Lock": "Sperre",
-  "Flip Image": "Vend bilde",
-  "Flip Horizontal": "Vend horisontal",
-  "Flip Vertical": "Vend vertikal",
-  "Rotate Image": "Roter bilde",
-  "Rotate 180 °": "Roter 180°",
-  "Rotate 90 ° CW": "Roter 90° med klokka",
-  "Rotate 90 ° CCW": "Roter 90° mot klokka",
-  "Angle:": "Vinkel:",
-  "W:": "B:",
-  "Clear": "Fjern",
-  "Loading": "Laster",
-  "Invalid base directory:": "Feil rot-mappe:",
-  "Delete file?": "Slette fil?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Vennligst slett alle filer og mapper i mappen du ønsker å slette og prøv igjen.",
-  "Delete folder?": "Slett mappe?",
-  "Folder Name:": "Mappenavn:",
-  "No Images Found": "Ingen bilder funnet",
-  "Invalid folder name, please choose another folder name.": "Ugyldig mappenavn, vennligst velg et annet navn på mappen.",
-  "GIF format is not supported, image editing not supported.": "Bildeformatet GIF er ikke støttet.",
-  "No Image Available": "Inget bilde er tilgjengelig",
-  "No Image selected.": "Inget bilde er valgt.",
-  "Description:": "Beskrivelse:",
-  "Align:": "Justering:",
-  "Margin:": "Marg:",
-  "Padding:": "Innsidemarg:",
-  "Color:": "Farge:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/pl.js b/web/imcms/xinha/plugins/ImageManager/lang/pl.js
deleted file mode 100644
index d7dd09a7e1..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/pl.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, http://www.eskot.krakow.pl/portfolio/, koto@webworkers.pl
-{
-  "Image Manager": "Menedżer obrazków",
-  "Insert Image": "Wstaw obrazek",
-  "Directory": "Katalog",
-  "Directory Up": "Katalog wyżej",
-  "New Folder": "Nowy katalog",
-  "Trash": "Usuń",
-  "Edit": "Edytuj",
-  "Image File": "Plik obrazka",
-  "Upload": "Wgraj",
-  "Width": "Szerokość",
-  "Height": "Wysokość",
-  "Width:": "Szerokość:",
-  "Height:": "Wysokość:",
-  "Constrain Proportions": "Zachowaj proporcje",
-  "Border": "Ramka",
-  "V Space": "Odległość V",
-  "H Space": "Odległość H",
-  "Refresh": "Odśwież",
-  "Uploading...": "Wgrywanie...",
-  "Crop": "Przytnij",
-  "Resize": "Przeskaluj",
-  "Rotate": "Obróć",
-  "Measure": "Zmierz",
-  "Marker": "Zaznacz",
-  "Save": "Zapisz",
-  "Filename:": "Nazwa pliku:",
-  "Image Format": "Format pliku:",
-  "Quality:": "Jakość",
-  "JPEG High": "JPEG wysoka",
-  "JPEG Medium": "JPEG średnia",
-  "JPEG Low": "JPEG niska",
-  "File saved.": "Zapisano plik.",
-  "File was not saved.": "Nie zapisano pliku.",
-  "Start X:": "PoczÄ…tek X",
-  "Start Y:": "PoczÄ…tek Y",
-  "Lock": "Zablokuj",
-  "Flip Image": "Odwróć",
-  "Flip Horizontal": "Odwróć poziomo",
-  "Flip Vertical": "Odwróć pionowo",
-  "Rotate Image": "Obróć",
-  "Rotate 180 °": "Obróć 180°",
-  "Rotate 90 ° CW": "Obróć 90° w prawo",
-  "Rotate 90 ° CCW": "Obróć 90° w lewo",
-  "Angle:": "KÄ…t:",
-  "W:": "L:",
-  "Clear": "Wyczyść",
-  "Loading": "�adowanie",
-  "Invalid base directory:": "Nieprawidłowy katalog bazowy:",
-  "Delete file?": "Usunąć plik?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Najpierw usuń wszystkie pliki i podkatalogi katalogu.",
-  "Delete folder?": "Usunąć katalog ?",
-  "Folder Name:": "Nazwa katalogu",
-  "No Images Found": "Nie znaleziono obrazków",
-  "Invalid folder name, please choose another folder name.": "Nieprawidłowa nazwa katalogu, wybierz inną.",
-  "GIF format is not supported, image editing not supported.": "Brak obsługi plików GIF, edycja jest niemożliwa.",
-  "No Image Available": "Obrazek niedostępny",
-  "No Image selected.": "Nie zaznaczono obrazka.",
-  "Description:": "Opis:",
-  "Align:": "Wyrównanie:",
-  "Description:": "Opis:",
-  "Margin:": "Margines:",
-  "Padding:": "Wcięcie:",
-  "Border:": "Ramka:",
-  "Color:": "Kolor:",
-  "Upload:": "Wgraj:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/pt_br.js b/web/imcms/xinha/plugins/ImageManager/lang/pt_br.js
deleted file mode 100644
index 8817280ca0..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/pt_br.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "A:": "A:",
-  "Absbottom": "Inferior absoluto",
-  "Absmiddle": "Meio absoluto",
-  "Angle:": "Ângulo:",
-  "Baseline": "Linha de base",
-  "Bottom": "Base",
-  "Cancel": "Cancelar",
-  "Clear": "Limpar",
-  "Constrain Proportions": "Manter proporções",
-  "Crop": "Recortar",
-  "D:": "G:",
-  "Directory": "Diretório",
-  "Directory Up": "Diretório Acima",
-  "Edit": "Editar",
-  "Filename:": "Nome do arquivo:",
-  "Flip Horizontal": "Espelhar Horizontalmente",
-  "Flip Image": "Espelhar Imagem",
-  "Flip Vertical": "Espelhar Verticalmente",
-  "Folder Name:": "Nome da Pasta:",
-  "GIF": "GIF",
-  "GIF format is not supported, image editing not supported.": "Formato GIF não é suportado, edição de imagem não é suportada.",
-  "H:": "A:",
-  "Height:": "Altura:",
-  "Image Editor": "Editor de Imagem",
-  "Image Format": "Formato da Imagem",
-  "Image List": "Lista de Imagens",
-  "Image Manager": "Gerenciador de Imagens",
-  "Image Selection": "Seleção de Imagem",
-  "Insert Image": "Inserir Imagem",
-  "Invalid base directory:": "Diretório base inválido:",
-  "JPEG High": "JPEG Alto",
-  "JPEG Low": "JPEG Baixo",
-  "JPEG Medium": "JPEG Médio",
-  "Left": "Esquerda",
-  "Lock": "Travar",
-  "Marker": "Marcar",
-  "Measure": "Medida",
-  "Middle": "Meio",
-  "New Folder": "Nova Pasta",
-  "No Image Available": "Sem Imagem Disponível",
-  "No Images Found": "Nenhuma Imagem Encontrada",
-  "Not set": "Não definido",
-  "OK": "OK",
-  "PNG": "PNG",
-  "Positioning of this image": "Posicionamento desta imagem",
-  "Quality:": "Qualidade:",
-  "Refresh": "Atualização",
-  "Resize": "Redimencionar",
-  "Right": "Direita",
-  "Rotate": "Rotacionar",
-  "Rotate 180 &deg;": "Rotacionar 180 &deg;",
-  "Rotate 90 &deg; CCW": "Rotacionar 90 &deg; anti-horário",
-  "Rotate 90 &deg; CW": "Rotacionar 90 &deg; horário",
-  "Rotate Image": "Rotacionar Imagem",
-  "Save": "Gravar",
-  "Start X:": "Início X:",
-  "Start Y:": "Início Y:",
-  "Texttop": "Texto no topo",
-  "Top": "Topo",
-  "Trash": "Lixo",
-  "W:": "C:",
-  "Width:": "Largura:",
-  "X:": "X:",
-  "Y:": "Y:",
-  
-  // not find with lc_parse_strings.php  
-  "Image File": "Arquivo Imagem", 
-  "Upload": "Enviar",
-  "Upload:": "Enviar imagem:",
-  "Width": "Largura",
-  "Height": "Altura",  
-  "Border": "Borda",
-  "V Space": "Espaço vert.",
-  "H Space": "Espaço horiz.",
-  "Uploading...": "Enviando...",
-  "File saved.": "Arquivo gravado.",
-  "File was not saved.": "Arquivo não foi salvo.",
-  "Loading": "Lendo",
-	"Delete file?": "Apagar arquivo?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Por favor, primeiro apague todos os arquivos/pastas dentro da pasta que deseja apagar.",
-  "Delete folder?": "Apagar pasta?",
-  "Folder Name:": "Nome da Pasta:",
-  "No Files Found": "Nenhum arquivo encontrado",
-  "Invalid folder name, please choose another folder name.": "Nome inválido para pasta, escolha outro nome.",
-  "No Image selected.": "Nenhuma imagem selecionada.",
-  "Description:": "Descrição:",
-  "Align:": "Alinhamento:",
-  "Margin:": "Margem:",
-  "Padding:": "Espaçamento:",
-  "Border:": "Borda:",
-  "Color:": "Côr:"
-}
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/ru.js b/web/imcms/xinha/plugins/ImageManager/lang/ru.js
deleted file mode 100644
index 52c2a3792b..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/ru.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Author: Andrei Blagorazumov, a@fnr.ru
-{
-  "Image Manager": "Менеджер картинок",
-  "Insert Image": "В�тавка картинки",
-  "Directory": "Папка",
-  "Directory Up": "Папка наверх",
-  "New Folder": "�ова� папка",
-  "Trash": "Корзина",
-  "Edit": "Правка",
-  "Image File": "Файл картинки",
-  "Upload": "Загрузить",
-  "Width": "Ширина",
-  "Height": "Вы�ота",
-  "Width:": "Ширина",
-  "Height:": "Вы�ота",
-  "Constrain Proportions": "Сохранить пропорции",
-  "Border": "Рамка",
-  "V Space": "Поле V",
-  "H Space": "Поле H",
-  "Refresh": "Обновить",
-  "Uploading...": "Загрузка...",
-  "Crop": "Обрезать",
-  "Resize": "Ма�шабировать",
-  "Rotate": "Повернуть",
-  "Measure": "Измерение",
-  "Marker": "Маркер",
-  "Save": "Сохранить",
-  "Filename:": "Им� файла",
-  "Image Format": "Формат картинки",
-  "Quality:": "Каче�тво",
-  "JPEG High": "JPEG вы�ок.",
-  "JPEG Medium": "JPEG �редн.",
-  "JPEG Low": "JPEG низк.",
-  "File saved.": "Файл �охранен.",
-  "File was not saved.": "Файл не �охранен.",
-  "Start X:": "�ачало X",
-  "Start Y:": "�ачало Y",
-  "Lock": "Блокировка",
-  "Flip Image": "Развернуть картинку",
-  "Flip Horizontal": "Развернуть по горизонтали",
-  "Flip Vertical": "Развернуть по вертикали",
-  "Rotate Image": "Повернуть картинку",
-  "Rotate 180 В°": "Повернуть на 180°",
-  "Rotate 90 В° CW": "Повернуть на 90° по ча�овой",
-  "Rotate 90 В° CCW": "Повернуть на 90° против ча�овой",
-  "Angle:": "Угол",
-  "W:": "Ш:",
-  "Clear": "Очи�тить",
-  "Loading": "Загрузка",
-  "Invalid base directory:": "�еверна� базова� папка:",
-  "Delete file?": "Удалить файл?",
-  "Please delete all files/folders inside the folder you wish to delete first.": "Пожалуй�та удалите в�е файлы/папки в папке, которую вы хотите удалить.",
-  "Delete folder?": "Удалить папку?",
-  "Folder Name:": "�азвание папки:",
-  "No Images Found": "Картинок не найдено",
-  "Invalid folder name, please choose another folder name.": "�еправильное им� папки, пожалуй�та выберите другое.",
-  "GIF format is not supported, image editing not supported.": "Формат GIF не поддерживает��, редактирование картинки не поддерживает��.",
-  "No Image Available": "�ет до�тупных картинок",
-  "No Image selected.": "Картинки не выбраны.",
-  "Color:": "Цвет",
-  "Align:": "Выравнивание",
-  "Margin:": "От�туп",
-  "Padding:": "Пол�",
-  "Border:": "Рамка"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/lang/sv.js b/web/imcms/xinha/plugins/ImageManager/lang/sv.js
deleted file mode 100755
index 57acb39d54..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/lang/sv.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "sv" (Swedish), ENCODING: UTF-8
-// translated: Erik Dalén, <dalen@jpl.se>
-{
-  "Image Manager": "Bildbehandlare",
-  "Crop": "Beskjär"
-};
diff --git a/web/imcms/xinha/plugins/ImageManager/manager.php b/web/imcms/xinha/plugins/ImageManager/manager.php
deleted file mode 100644
index 54b9d7e1d5..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/manager.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * The main GUI for the ImageManager.
- * @author $Author: gogo $
- * @version $Id: manager.php 830 2007-05-09 13:27:34Z gogo $
- * @package ImageManager
- */
-
-	require_once('config.inc.php');
-	require_once('ddt.php');
-	require_once('Classes/ImageManager.php');
-	
-	$manager = new ImageManager($IMConfig);
-	$dirs = $manager->getDirs();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-	<title>Insert Image</title>
-  <script type="text/javascript">
-    // temporary. An ImageManager rewrite will take care of this kludge.
-    _backend_url = "<?php print $IMConfig['backend_url']; ?>";
-    _resized_prefix = "<?php echo $IMConfig['resized_prefix']; ?>";
-    _resized_dir = "<?php echo $IMConfig['resized_dir']; ?>";
-  </script>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link href="<?php print $IMConfig['base_url'];?>assets/manager.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../../popups/popup.js"></script>
-<script type="text/javascript" src="assets/popup.js"></script>
-<script type="text/javascript" src="../../modules/ColorPicker/ColorPicker.js"></script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/dialog.js"></script>
-<script type="text/javascript">
-/*<![CDATA[*/
-	if(window.opener)
-		HTMLArea = window.opener.HTMLArea;
-
-	var thumbdir = "<?php echo $IMConfig['thumbnail_dir']; ?>";
-	var base_url = "<?php echo $manager->getImagesURL(); ?>";
-/*]]>*/
-</script>
-<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/manager.js"></script>
-<?php
-  if(!$IMConfig['show_full_options'])
-  {
-    ?>
-    <style type="text/css">
-      .fullOptions { visibility:hidden; }
-    </style>
-    <?php
-  }
-?>
-</head>
-<body>
-
-<form action="<?php print $IMConfig['backend_url'] ?>" id="uploadForm" method="post" enctype="multipart/form-data">
-
-<input type="hidden" name="__plugin" value="ImageManager">
-<input type="hidden" name="__function" value="images">
-
-<fieldset>
-  <legend>Image Manager</legend>
-  <table width="100%">
-    <tr>
-      <th><label for="dirPath">Directory</label></th>
-      <td>
-        <select name="dir" class="dirWidth" id="dirPath" onchange="updateDir(this)">
-          <option value="/">/</option>
-          <?php
-            foreach($dirs as $relative=>$fullpath)
-            {
-              ?>
-              <option value="<?php echo rawurlencode($relative); ?>"><?php echo $relative; ?></option>
-              <?php
-            }
-          ?>
-        </select>
-      </td>
-      <td>
-        <a href="#" onclick="javascript: goUpDir();" title="Directory Up"><img src="<?php print $IMConfig['base_url']; ?>img/btnFolderUp.gif" height="15" width="15" alt="Directory Up" /></a>
-
-        <?php
-          if($IMConfig['safe_mode'] == false && $IMConfig['allow_new_dir'])
-          {
-            ?>
-            <a href="#" onclick="newFolder();" title="New Folder"><img src="<?php print $IMConfig['base_url']; ?>img/btnFolderNew.gif" height="15" width="15" alt="New Folder" /></a>
-            <?php
-          }
-          ?>
-      </td>
-    </tr>
-    <?php
-      if($IMConfig['allow_upload'] == TRUE)
-      {
-        ?>
-        <tr>
-          <th align="left">Upload:</th>
-          <td colspan="2">
-            <input type="file" name="upload" id="upload" />
-            <input name="Upload" type="submit" id="Upload" value="Upload" onclick="doUpload();" />
-          </td>
-        </tr>
-        <?php
-      }
-    ?>
-
-  </table>
-
-  <div id="messages" style="display: none;"><span id="message"></span><img SRC="<?php print $IMConfig['base_url']; ?>img/dots.gif" width="22" height="12" alt="..." /></div>
-
-  <iframe src="<?php print $IMConfig['backend_url']; ?>__function=images" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
-
-</fieldset>
-
-<!-- image properties -->
-
-<table  border="0" cellspacing="0" cellpadding="0" width="100%">
-  <tr>
-    <th align="left">Description:</th>
-    <td colspan="6">
-      <input type="text" id="f_alt" style="width:95%"/>
-    </td>
-    <td rowspan="4" width="100" height="100" valign="middle" style="padding:4px;background-color:#CCC;border:1px inset;">
-      <img src="" id="f_preview" />
-    </td>
-  </tr>
-
-  <tr>
-    <th align="left">Width:</th>
-    <td >
-      <input id="f_width" type="text" name="f_width" size="4" onchange="javascript:checkConstrains('width');" />
-    </td>
-    <td rowspan="2">
-      <div  style="position:relative">
-        <img src="<?php print $IMConfig['base_url']; ?>img/locked.gif" id="imgLock" width="25" height="32" alt="Constrained Proportions" valign="middle" /><input type="checkbox" id="constrain_prop" checked="checked" onclick="javascript:toggleConstrains(this);" style="position:absolute;top:8px;left:0px;" />
-      </div>
-    </td>
-    <th align="left" class="fullOptions">Margin:</th>
-    <td colspan="3" class="fullOptions">
-      <input name="f_margin" type="text" id="f_margin" size="3" />
-      px </td>
-  </tr>
-
-  <tr>
-    <th align="left">Height:</th>
-    <td>
-      <input name="f_height" type="text" id="f_height" size="4" />
-    </td>
-    <th align="left"  class="fullOptions">Padding:</th>
-    <td  class="fullOptions">
-      <input name="f_padding" type="text" id="f_padding" size="3" />
-      px </td>
-    <th align="left"  class="fullOptions">Color:</th>
-    <td  class="fullOptions">
-      <input name="f_backgroundColor" type="text" id="f_backgroundColor" size="7" />
-     
-    </td>
-  </tr>
-
-
-  <tr class="fullOptions">
-    <th align="left">Alignment:</th>
-    <td colspan="2">
-      <select size="1" id="f_align"  title="Positioning of this image">
-        <option value=""                             >Not set</option>
-        <option value="left"                         >Left</option>
-        <option value="right"                        >Right</option>
-        <option value="texttop"                      >Texttop</option>
-        <option value="absmiddle"                    >Absmiddle</option>
-        <option value="baseline" selected="selected" >Baseline</option>
-        <option value="absbottom"                    >Absbottom</option>
-        <option value="bottom"                       >Bottom</option>
-        <option value="middle"                       >Middle</option>
-        <option value="top"                          >Top</option>
-      </select>
-    </td>
-    <th align="left">Border:</th>
-    <td>
-      <input name="f_border" type="text" id="f_border" size="3" />
-      px </td>
-    <th align="left">Color:</th>
-    <td>
-      <input name="f_borderColor" type="text" id="f_borderColor" size="7" />
-      
-    </td>
-  </tr>
-
-</table>
-
-<div style="text-align: right;">
-  <hr />
-  <button type="button" class="buttons" onclick="return refresh();">Refresh</button>
-  <button type="button" class="buttons" onclick="return onOK();">OK</button>
-  <button type="button" class="buttons" onclick="return onCancel();">Cancel</button>
-</div>
-
-<!--// image properties -->
-<input type="hidden" id="orginal_width" />
-<input type="hidden" id="orginal_height" />
-<input type="hidden" id="f_url" class="largelWidth" value="" />
-</form>
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/ImageManager/newFolder.html b/web/imcms/xinha/plugins/ImageManager/newFolder.html
deleted file mode 100644
index cf6c38bc83..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/newFolder.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title>New Folder</title>
- <script type="text/javascript" src="../../popups/popup.js"></script>
- <style type="text/css">
- /*<![CDATA[*/
- html, body {  background-color: ButtonFace;  color: ButtonText; font: 11px Tahoma,Verdana,sans-serif; margin: 0; padding: 0;}
-body { padding: 5px; }
- .title { background-color: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px; border-bottom: 1px  solid black; letter-spacing: 2px;}
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-.buttons { width: 70px; text-align: center; }
-form { padding: 0px;  margin: 0;}
-form .elements{
-	padding: 10px; text-align: center;
-}
- /*]]>*/
- </style>
-<script type="text/javascript" src="assets/popup.js"></script>
-<script type="text/javascript">
-/*<![CDATA[*/
-	window.resizeTo(300, 160);
-
-    if(window.opener)
-        HTMLArea = window.opener.HTMLArea;
-
-	init = function ()
-	{
-		__dlg_init();
-		__dlg_translate('ImageManager');
-		document.getElementById("f_foldername").focus();
-	};
-
-	function onCancel()
-	{
-		__dlg_close(null);
-		return false;
-	}
-
-	function onOK()
-	{
-		 // pass data back to the calling window
-	  var fields = ["f_foldername"];
-	  var param = new Object();
-	  for (var i in fields) {
-		var id = fields[i];
-		var el = document.getElementById(id);
-		param[id] = el.value;
-	  }
-	  __dlg_close(param);
-	  return false;
-	}
-
-	function addEvent(obj, evType, fn)
-	{
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
-		else {  return false; }
-	}
-
-	addEvent(window, 'load', init);
-//-->
-</script>
-</head>
-<body >
-<div class="title">New Folder</div>
-<form action="">
-<div class="elements">
-	<label for="f_foldername">Folder Name:</label>
-	<input type="text" id="f_foldername" />
-</div>
-<div style="text-align: right;">
-	  <hr />
-	  <button type="button" class="buttons" onclick="return onOK();">OK</button>
-	  <button type="button" class="buttons" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImageManager/resizer.php b/web/imcms/xinha/plugins/ImageManager/resizer.php
deleted file mode 100644
index 6464ba7c8b..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/resizer.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-header('Content-Type: text/javascript');
-
-/**
- * Resize images to a given size, and saving in a new file.
- * resize.php?img=/relative/path/to/image.jpg&width=<pixels>&height=<pixels>[&to=/relative/path/to/newimage.jpg]
- * relative to the base_dir given in config.inc.php
- * This is pretty much just thumbs.php with some mods, I'm too lazy to do it properly
- * @author $Author: ray $
- * @version $Id: resizer.php 677 2007-01-19 22:24:36Z ray $
- * @package ImageManager
- */
-
-require_once('config.inc.php');
-require_once('Classes/ImageManager.php');
-require_once('Classes/Thumbnail.php');
-
-function js_fail($message)    { echo 'alert(\'' . $message . '\'); false'; exit;   }
-function js_success($resultFile)    { echo '\'' . $resultFile . '\''; exit;   }
-
-//check for img parameter in the url
-if(!isset($_GET['img']) || !isset($_GET['width']) || !isset($_GET['height']))
-{
-  js_fail('Missing parameter.');
-}
-
-$manager = new ImageManager($IMConfig);
-
-//get the image and the full path to the image
-$image = $_GET['img'];
-$fullpath = Files::makeFile($manager->getImagesDir(),$image);
-
-//not a file, so exit
-if(!is_file($fullpath))
-{
-  js_fail("File {$fullpath} does not exist.");
-}
-
-$imgInfo = @getImageSize($fullpath);
-
-//Not an image, bail out.
-if(!is_array($imgInfo))
-{
-	js_fail("File {$fullpath} is not an image.");
-}
-
-if(!isset($_GET['to']))
-{
-  $resized    = $manager->getResizedName($fullpath,$_GET['width'],$_GET['height']);
-  $_GET['to'] = $manager->getResizedName($image,$_GET['width'],$_GET['height'], FALSE);
-}
-else
-{
-  $resized = Files::makeFile($manager->getImagesDir(),$_GET['to']);
-}
-
-// Check to see if it already exists
-if(is_file($resized))
-{
-	// And is newer
-	if(filemtime($resized) >= filemtime($fullpath))
-	{
-		js_success($_GET['to']);
-	}
-}
-
-
-
-// resize (thumbnailer will do this for us just fine)
-$thumbnailer = new Thumbnail($_GET['width'],$_GET['height']);
-$thumbnailer->proportional = FALSE;
-$thumbnailer->createThumbnail($fullpath, $resized);
-
-// did it work?
-if(is_file($resized))
-{
-	js_success($_GET['to']);
-}
-else
-{
-	js_fail("Resize Failed.");
-}
-?>
diff --git a/web/imcms/xinha/plugins/ImageManager/thumbs.php b/web/imcms/xinha/plugins/ImageManager/thumbs.php
deleted file mode 100644
index 62d6936563..0000000000
--- a/web/imcms/xinha/plugins/ImageManager/thumbs.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * On the fly Thumbnail generation.
- * Creates thumbnails given by thumbs.php?img=/relative/path/to/image.jpg
- * relative to the base_dir given in config.inc.php
- * @author $Author: ray $
- * @version $Id: thumbs.php 677 2007-01-19 22:24:36Z ray $
- * @package ImageManager
- */
-
-require_once('config.inc.php');
-require_once('Classes/ImageManager.php');
-require_once('Classes/Thumbnail.php');
-
-//check for img parameter in the url
-if(!isset($_GET['img']))
-	{
-	exit();
-	}
-
-
-$manager = new ImageManager($IMConfig);
-
-//get the image and the full path to the image
-$image = rawurldecode($_GET['img']);
-$fullpath = Files::makeFile($manager->getImagesDir(),$image);
-
-//not a file, so exit
-if(!is_file($fullpath))
-	{
-	exit();
-	}
-
-$imgInfo = @getImageSize($fullpath);
-
-//Not an image, send default thumbnail
-if(!is_array($imgInfo))
-{
-	//show the default image, otherwise we quit!
-	$default = $manager->getDefaultThumb();
-	if($default)
-	{
-		header('Location: '.$default);
-		exit();
-	}
-}
-//if the image is less than the thumbnail dimensions
-//send the original image as thumbnail
-
-if ($imgInfo[0] <= $IMConfig['thumbnail_width']
- && $imgInfo[1] <= $IMConfig['thumbnail_height'])
- {
-
-	 header('Location: '. $manager->getFileURL($image));
-	 exit();
- }
-
-//Check for thumbnails
-$thumbnail = $manager->getThumbName($fullpath);
-
-if(is_file($thumbnail))
-{
-	//if the thumbnail is newer, send it
-	if(filemtime($thumbnail) >= filemtime($fullpath))
-	{
-		header('Location: '.$manager->getThumbURL($image));
-		exit();
-	}
-}
-
-//creating thumbnails
-$thumbnailer = new Thumbnail($IMConfig['thumbnail_width'],$IMConfig['thumbnail_height']);
-$thumbnailer->createThumbnail($fullpath, $thumbnail);
-
-//Check for NEW thumbnails
-if(is_file($thumbnail))
-{
-	//send the new thumbnail
-	header('Location: '.$manager->getThumbURL($image));
-	exit();
-}
-else
-{
-	//show the default image, otherwise we quit!
-	$default = $manager->getDefaultThumb();
-
-	if($default)
-		header('Location: '.$default);
-}
-?>
diff --git a/web/imcms/xinha/plugins/ImcmsIntegration/imcms-integration.js b/web/imcms/xinha/plugins/ImcmsIntegration/imcms-integration.js
deleted file mode 100644
index d66580be4e..0000000000
--- a/web/imcms/xinha/plugins/ImcmsIntegration/imcms-integration.js
+++ /dev/null
@@ -1,18 +0,0 @@
-function ImcmsIntegration(editor)
-{
-
-}
-
-ImcmsIntegration._pluginInfo = {
-	name          : "ImcmsIntegration",
-	version       : "1.0",
-	developer     : "imCode",
-	developer_url : "http://www.imcms.net/",
-	sponsor       : "",
-	sponsor_url   : "",
-	license       : "GPL"
-};
-
-Xinha._loadback(_editor_url + 'plugins/ImcmsIntegration/insert_image.js.jsp');
-Xinha._loadback(_editor_url + 'plugins/ImcmsIntegration/create_link.js.jsp');
-
diff --git a/web/imcms/xinha/plugins/ImcmsIntegration/init.js.jsp b/web/imcms/xinha/plugins/ImcmsIntegration/init.js.jsp
deleted file mode 100644
index cd83b01e9b..0000000000
--- a/web/imcms/xinha/plugins/ImcmsIntegration/init.js.jsp
+++ /dev/null
@@ -1,97 +0,0 @@
-<%@ page
-	contentType="text/javascript"
-%>
-xinha_editors = null;
-xinha_init    = null;
-xinha_config  = null;
-xinha_plugins = null;
-
-// This contains the names of textareas we will make into Xinha editors
-xinha_init = xinha_init ? xinha_init : function()
-{
-    xinha_plugins = xinha_plugins ? xinha_plugins :
-		[
-			'ImcmsIntegration',
-			'ContextMenu',
-			'TableOperations',
-			'CharacterMap',
-			'Stylist',
-			'ListType',
-			'InsertAnchor',
-			'SuperClean'
-		];
-    // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
-    if(!Xinha.loadPlugins(xinha_plugins, xinha_init)) return;
-
-    xinha_config = xinha_config ? xinha_config() : new Xinha.Config();
-    
-    xinha_config.pageStyleSheets = [
-        "<%= request.getContextPath() %>/css/editor_default.css",
-        "<%= request.getContextPath() %>/css/editor_default_classes.css"
-    ] ;
-    
-    xinha_config.stylistLoadStylesheet("<%= request.getContextPath() %>/css/editor_default_classes.css") ;
-		
-		xinha_config.SuperClean.show_dialog = true ;
-		xinha_config.SuperClean.filters = {
-			'remove_some_formatting': {label:Xinha._lc('Clean up Word formatting, but save text formatting', 'SuperClean'), checked:true},
-			'remove_word_formatting': {label:Xinha._lc('Clean up Word formatting only', 'SuperClean'), checked:false},
-			'remove_formatting': {label:Xinha._lc('Remove all formatting', 'SuperClean'), checked:false}
-		} ;
-		
-		xinha_config.toolbar = [
-			["popupeditor"],
-			["separator","formatblock","separator","bold","italic","underline","strikethrough"],
-			["separator","subscript","superscript"],
-			["separator","justifyleft","justifycenter","justifyright","justifyfull"],
-			["separator","insertorderedlist","insertunorderedlist","outdent","indent","separator","createlink","insertimage"],
-			["separator","toggleborders","selectall"], (Xinha.is_gecko ? [] : ["saveas"]),
-			["print","separator","showhelp","about","linebreak"],
-			["htmlmode","separator","undo","redo"], (Xinha.is_gecko ? [] : ["separator","cut","copy","paste","overwrite"]),
-			["separator","killword","clearfonts"]
-		] ;
-		
-		xinha_config.formatblock = {
-			"&mdash; format &mdash;": "",
-			"Normal"   : "p",
-			"Heading 1": "h1",
-			"Heading 2": "h2",
-			"Heading 3": "h3",
-			"Heading 4": "h4",
-			"Heading 5": "h5",
-			"Heading 6": "h6"
-		} ;
-		
-		xinha_config.CharacterMap.mode = "panel" ;
-		xinha_config.ListType.mode = "panel" ;
-		
-		xinha_config.panel_dimensions = {
-	    left:   "180px",
-	    right:  "180px",
-	    top:    "100px",
-	    bottom: "100px"
-	  } ;
-		
-		xinha_config.showLoading = true ;
-		xinha_config.flowToolbars = false ;
-		xinha_config.killWordOnPaste = true ;
-
-    var serverBase = location.href.replace(/(https?:\/\/[^\/]*)\/.*/, '$1') ;
-    xinha_config.baseHref = serverBase;
-    xinha_editors = xinha_editors ? xinha_editors : Xinha.makeEditors([ 'text' ], xinha_config, xinha_plugins);
-    <% if (null!=request.getParameter("html")) { %>
-    Xinha.startEditors(xinha_editors);
-
-    setTimeout(function() {
-            try {
-                xinha_editors.text.activateEditor();
-                xinha_editors.text.focusEditor() ;
-            } catch (e) {}
-        }, 500);
-    <% } %>
-}
-
-window.onload = xinha_init;
-
-
-
diff --git a/web/imcms/xinha/plugins/ImcmsIntegration/insert_image.js.jsp b/web/imcms/xinha/plugins/ImcmsIntegration/insert_image.js.jsp
deleted file mode 100644
index 960ed956e4..0000000000
--- a/web/imcms/xinha/plugins/ImcmsIntegration/insert_image.js.jsp
+++ /dev/null
@@ -1,115 +0,0 @@
-<%@ page import="com.imcode.imcms.servlet.admin.ImageEditPage, com.imcode.imcms.servlet.admin.EditImage"%><%@page contentType="text/javascript" %>
-Xinha.prototype._insertImage = function(image)
-{
-    var editor = this;	// for nested functions
-    var outparam = null;
-    if ( typeof image == "undefined" )
-    {
-        image = this.getParentElement();
-        if ( image && image.tagName.toLowerCase() != 'img' )
-        {
-            image = null;
-        }
-    }
-    if ( image )
-    {
-        outparam =
-        {
-            '<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_URL %>' : Xinha.is_ie ? editor.stripBaseURL(image.src) : image.getAttribute("src"),
-            '<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_ALT %>' : image.alt || image.title,
-            '<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_WIDTH %>'  : image.style.width.replace(/px/, '') || image.width,
-            '<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_HEIGHT %>'  : image.style.height.replace(/px/, '') || image.height,
-            '<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_BORDER %>' : (image.style.borderWidth || image.border || '').replace(/px/, ''),
-            '<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_ALIGN %>'  : image.align,
-            '<%= ImageEditPage.REQUEST_PARAMETER__VERTICAL_SPACE %>'   : (image.style.marginTop || image.vspace || '').replace(/px/, ''),
-            '<%= ImageEditPage.REQUEST_PARAMETER__HORIZONTAL_SPACE %>'  : (image.style.marginRight || image.hspace || '').replace(/px/, ''),
-            '<%= ImageEditPage.REQUEST_PARAMETER__IMAGE_NAME %>'  : image.id || image.name
-        };
-    }
-    var queryString = '';
-    for ( var i in outparam )
-    {
-        if (outparam[i]) {
-            queryString += '&' + i + '=' + encodeURIComponent(outparam[i]);
-        }
-    }
-    this._popupDialog(
-            '<%= EditImage.linkTo(request, "/imcms/xinha/plugins/ImcmsIntegration/return_image.jsp")%>'+queryString,
-            function(param)
-            {
-                // user must have pressed Cancel
-                if ( !param )
-                {
-                    return false;
-                }
-                var img = image;
-                if ( !img )
-                {
-                    if ( Xinha.is_ie )
-                    {
-                        var sel = editor._getSelection();
-                        var range = editor._createRange(sel);
-                        editor._doc.execCommand("insertimage", false, param.src);
-                        img = range.parentElement();
-                        // wonder if this works...
-                        if ( img.tagName.toLowerCase() != "img" )
-                        {
-                            img = img.previousSibling;
-                        }
-                    }
-                    else
-                    {
-                        img = document.createElement('img');
-                        img.src = param.src;
-                        editor.insertNodeAtSelection(img);
-                        if ( !img.tagName )
-                        {
-                            // if the cursor is at the beginning of the document
-                            img = range.startContainer.firstChild;
-                        }
-                    }
-                }
-                else
-                {
-                    img.src = param.src;
-                }
-
-                for ( var field in param )
-                {
-                    var value = param[field];
-                    switch (field)
-                            {
-                        case "alt":
-                            img.alt = value || " ";
-                            img.title = value;
-                            break;
-                        case "border":
-                            img.style.borderWidth = parseInt(value || "0", 10)+"px";
-                            break;
-                        case "align":
-                            img.align = value;
-                            break;
-                        case "vert":
-                            img.style.marginTop = parseInt(value || "0", 10)+"px";
-                            img.style.marginBottom = parseInt(value || "0", 10)+"px";
-                            break;
-                        case "horiz":
-                            img.style.marginLeft = parseInt(value || "0", 10)+"px";
-                            img.style.marginRight = parseInt(value || "0", 10)+"px";
-                            break;
-                        case "width":
-                            img.style.width = parseInt(value, 10)+"px";
-                            img.width = parseInt(value, 10);
-                            break;
-                        case "height":
-                            img.style.height = parseInt(value, 10)+"px";
-                            img.height = parseInt(value, 10);
-                            break;
-                        case "name":
-                            img.id = value;
-                            break;
-                    }
-                }
-            },
-            outparam);
-};
diff --git a/web/imcms/xinha/plugins/ImcmsIntegration/return_image.jsp b/web/imcms/xinha/plugins/ImcmsIntegration/return_image.jsp
deleted file mode 100644
index bc495a6cb9..0000000000
--- a/web/imcms/xinha/plugins/ImcmsIntegration/return_image.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ page import="org.apache.commons.lang.StringEscapeUtils, imcode.server.document.textdocument.ImageDomainObject, com.imcode.imcms.servlet.admin.EditImage, org.apache.commons.lang.StringUtils"%><%
-    ImageDomainObject image = EditImage.getImage(request);
-%><html>
-<body>
-<script type="text/javascript">
-    var param = null;
-    <% if (null != image && StringUtils.isNotBlank(image.getUrlPathRelativeToContextPath())) { %>
-        param = new Object();
-        param["src"] = '<%=StringEscapeUtils.escapeJavaScript(request.getContextPath()+image.getUrlPathRelativeToContextPath())%>';
-        param["alt"] = '<%= StringEscapeUtils.escapeJavaScript(image.getAlternateText())%>';
-        <% if (StringUtils.isNotBlank(image.getAlign())) { %>
-            param["align"] = '<%= StringEscapeUtils.escapeJavaScript(image.getAlign())%>';
-        <% } %>
-        param["border"] = '<%= image.getBorder() %>';
-        param["horiz"] = '<%= image.getHorizontalSpace() %>';
-        param["vert"] = '<%= image.getVerticalSpace() %>';
-        <% if (0 != image.getWidth()) { %>
-            param["width"] = '<%= image.getWidth() %>';
-        <% } %>
-        <% if (0 != image.getHeight()) { %>
-            param["height"] = '<%= image.getHeight() %>';
-        <% } %>
-        param["name"] = '<%= StringEscapeUtils.escapeJavaScript(image.getName()) %>';
-    <% } %>
-    window.opener.Dialog._return(param) ;
-    window.close();
-</script>    
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ImcmsIntegration/return_link.jsp b/web/imcms/xinha/plugins/ImcmsIntegration/return_link.jsp
deleted file mode 100644
index 6a6cafe1eb..0000000000
--- a/web/imcms/xinha/plugins/ImcmsIntegration/return_link.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page import="com.imcode.imcms.servlet.admin.EditLink, org.apache.commons.lang.StringEscapeUtils"%><%
-    EditLink.Link link = EditLink.getLink(request);
-%><html>
-<body>
-<script type="text/javascript">
-    var param = null;
-    <% if (null != link) { %>
-    param = new Object();
-    param["href"] = '<%=StringEscapeUtils.escapeJavaScript(link.getHref())%>';
-    param["title"] = '<%=StringEscapeUtils.escapeJavaScript(link.getTitle())%>';
-    param["target"] = '<%=StringEscapeUtils.escapeJavaScript(link.getTarget())%>';
-    <% } %>
-    window.opener.Dialog._return(param) ;
-    window.close();
-</script>    
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/InsertAnchor/img/insert-anchor.gif b/web/imcms/xinha/plugins/InsertAnchor/img/insert-anchor.gif
deleted file mode 100755
index 9da891b391..0000000000
Binary files a/web/imcms/xinha/plugins/InsertAnchor/img/insert-anchor.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertAnchor/img/placeholder.gif b/web/imcms/xinha/plugins/InsertAnchor/img/placeholder.gif
deleted file mode 100755
index 2c342777f5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertAnchor/img/placeholder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertAnchor/insert-anchor.css b/web/imcms/xinha/plugins/InsertAnchor/insert-anchor.css
deleted file mode 100755
index 097d511c36..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/insert-anchor.css
+++ /dev/null
@@ -1,9 +0,0 @@
-a.anchor {
-  width: 18px;
-  height: 18px;
-  background-image: url(img/insert-anchor.gif);
-  background-repeat: no-repeat;
-  background-position: left top;
-  padding-left: 19px;
-  border: 1px dotted blue;
-}
diff --git a/web/imcms/xinha/plugins/InsertAnchor/insert-anchor.js b/web/imcms/xinha/plugins/InsertAnchor/insert-anchor.js
deleted file mode 100755
index e07530a183..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/insert-anchor.js
+++ /dev/null
@@ -1,89 +0,0 @@
-function InsertAnchor(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  // register the toolbar buttons provided by this plugin
-  cfg.registerButton({
-  id       : "insert-anchor", 
-  tooltip  : this._lc("Insert Anchor"), 
-  image    : editor.imgURL("insert-anchor.gif", "InsertAnchor"),
-  textMode : false,
-  action   : function(editor) {
-               self.buttonPress(editor);
-             }
-  });
-  cfg.addToolbarElement("insert-anchor", "createlink", 1);
-}
-
-InsertAnchor._pluginInfo = {
-  name          : "InsertAnchor",
-  origin        : "version: 1.0, by Andre Rabold, MR Printware GmbH, http://www.mr-printware.de",
-  version       : "2.0",
-  developer     : "Udo Schmal",
-  developer_url : "http://www.schaffrath-neuemedien.de",
-  c_owner       : "Udo Schmal",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de",
-  license       : "htmlArea"
-};
-
-InsertAnchor.prototype._lc = function(string) {
-    return Xinha._lc(string, 'InsertAnchor');
-};
-
-InsertAnchor.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(_editor_url + 'plugins/InsertAnchor/insert-anchor.css');
-};
-
-InsertAnchor.prototype.buttonPress = function(editor) {
-  var outparam = null;
-  var html = editor.getSelectedHTML();
-  var sel  = editor._getSelection();
-  var range  = editor._createRange(sel);
-  var  a = editor._activeElement(sel);
-  if(!(a != null && a.tagName.toLowerCase() == 'a')) {
-    a = editor._getFirstAncestor(sel, 'a'); 
-  }
-  if (a != null && a.tagName.toLowerCase() == 'a')
-    outparam = { name : a.id };
-  else
-    outparam = { name : '' };
-
-  editor._popupDialog( "plugin://InsertAnchor/insert_anchor", function( param ) {
-    if ( param ) {
-      var anchor = param["name"];
-      if (anchor == "" || anchor == null) {
-        if (a) {
-          var child = a.innerHTML;
-          a.parentNode.removeChild(a);
-          editor.insertHTML(child);
-        }
-        return;
-      } 
-      try {
-        var doc = editor._doc;
-        if (!a) {
-//          editor.surroundHTML('<a id="' + anchor + '" name="' + anchor + '" title="' + anchor + '" class="anchor">', '</a>');
-          a = doc.createElement("a");
-          a.id = anchor;
-          a.name = anchor;
-          a.title = anchor;
-          a.className = "anchor";
-          a.innerHTML = html;
-          if (Xinha.is_ie) {
-            range.pasteHTML(a.outerHTML);
-          } else {
-            editor.insertNodeAtSelection(a);
-          }
-        } else {
-          a.id = anchor;
-          a.name = anchor;
-          a.title = anchor;
-          a.className = "anchor";
-        }
-      }
-      catch (e) { }
-    }
-  }, outparam);
-};
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/de.js b/web/imcms/xinha/plugins/InsertAnchor/lang/de.js
deleted file mode 100755
index 1b107857f5..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/de.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Insert Anchor": "Anker einfügen",
-  "Anchor name": "Name (ID)",
-  "Delete": "Löschen"
-};
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/fr.js b/web/imcms/xinha/plugins/InsertAnchor/lang/fr.js
deleted file mode 100644
index 17d76b61c1..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/fr.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Insert Anchor": "Insérer une ancre",
-  "Anchor name": "Nom de l'ancre",
-  "Delete": "Supprimer"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/ja.js b/web/imcms/xinha/plugins/InsertAnchor/lang/ja.js
deleted file mode 100644
index 347fb008f9..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/ja.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Insert Anchor": "アンカー�挿入",
-  "Anchor name": "アンカー���",
-  "Delete": "削除"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/nb.js b/web/imcms/xinha/plugins/InsertAnchor/lang/nb.js
deleted file mode 100644
index 25ca29af14..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/nb.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert Anchor": "Sett inn anker",
-  "Anchor name": "Ankernavn (ID)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/nl.js b/web/imcms/xinha/plugins/InsertAnchor/lang/nl.js
deleted file mode 100644
index 7751dea93b..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/nl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Insert Anchor": "Anker invoegen",
-  "Anchor name": "Naam (ID)",
-  "Delete": "Verwijderen"
-};
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/no.js b/web/imcms/xinha/plugins/InsertAnchor/lang/no.js
deleted file mode 100644
index bfe67315fb..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/no.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert Anchor": "Sett inn anker",
-  "Anchor name": "Ankernavn (ID)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/pl.js b/web/imcms/xinha/plugins/InsertAnchor/lang/pl.js
deleted file mode 100644
index cb938b6bc9..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/pl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz koto@webworkers.pl
-{
-  "Insert Anchor": "Wstaw kotwicÄ™",
-  "Anchor name": "Nazwa kotwicy",
-  "Delete": "Usuń"
-};
diff --git a/web/imcms/xinha/plugins/InsertAnchor/lang/pt_br.js b/web/imcms/xinha/plugins/InsertAnchor/lang/pt_br.js
deleted file mode 100644
index b154b61589..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/lang/pt_br.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Anchor name": "Nome da âncora",
-  "Cancel": "Cancelar",
-  "Delete": "Deletar",
-  "Insert Anchor": "Inserir Âncora",
-  "OK": "OK"
-}
diff --git a/web/imcms/xinha/plugins/InsertAnchor/popups/insert_anchor.html b/web/imcms/xinha/plugins/InsertAnchor/popups/insert_anchor.html
deleted file mode 100644
index 33e5f47603..0000000000
--- a/web/imcms/xinha/plugins/InsertAnchor/popups/insert_anchor.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<html>
-<head>
-  <title>Insert Anchor</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-  <script type="text/javascript">
-  window.resizeTo(400, 150);
-function Init() {
-  __dlg_translate("InsertAnchor");
-  __dlg_init();
-
-  var param = window.dialogArguments;
-  if (param) {
-    document.getElementById("name").value = param["name"];
-  }
-  document.getElementById("name").focus();
-}
-
-function onOK() {
-  // pass data back to the calling window
-  var param = new Object();
-  param["name"] = document.getElementById("name").value;
-  __dlg_close(param);
-  return false;
-}
-
-function onDelete() {
-  // pass data back to the calling window
-  var param = new Object();
-  param["name"] = "";
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">Insert Anchor</div>
-<form>
-<table border="0" style="width: 100%;">
-  <tr>
-    <td class="label">Anchor name</td>
-    <td><input type="text" id="name" style="width: 100%" /></td>
-  </tr>
-</table>
-
-<div id="buttons">
-  <button type="submit" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="delete" onclick="return onDelete();">Delete</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/img/ed_marquee.gif b/web/imcms/xinha/plugins/InsertMarquee/img/ed_marquee.gif
deleted file mode 100644
index f3ef44b96b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertMarquee/img/ed_marquee.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertMarquee/insert-marquee.js b/web/imcms/xinha/plugins/InsertMarquee/insert-marquee.js
deleted file mode 100644
index 8e7e60a67f..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/insert-marquee.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Marquee plugin for HTMLArea/Xinha
-// Implementation by Udo Schmal based on HTMLArea 3.0
-// Original Author - Udo Schmal, Schaffrath-NeueMedien
-//
-// (c) Udo Schmal.2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function InsertMarquee(editor) {
-	this.editor = editor;
-
-	var cfg = editor.config;
-	var self = this;
-
-	// register the toolbar buttons provided by this plugin
-	cfg.registerButton({
-	id       : "insertmarquee",
-	tooltip  : this._lc("Insert scrolling marquee"),
-	image    : editor.imgURL("ed_marquee.gif", "InsertMarquee"),
-	textMode : false,
-	action   : function(editor) {
-			self.buttonPress(editor);
-		}
-	})
-	cfg.addToolbarElement("insertmarquee", "inserthorizontalrule", -1);
-}
-
-InsertMarquee._pluginInfo = {
-	name          : "InsertMarquee",
-	version       : "1.0",
-	developer     : "Udo Schmal",
-	developer_url : "http://www.schaffrath-NeueMedien.de/",
-	c_owner       : "Udo Schmal & Schaffrath NeueMedien",
-	license       : "htmlArea"
-};
-
-InsertMarquee.prototype._lc = function(string) {
-    return Xinha._lc(string, "InsertMarquee");
-};
-
-InsertMarquee.prototype.buttonPress = function(editor, node) {
-  function setAttr(el, attr, value) {
-    if (value != "")
-      el.setAttribute(attr, value);
-    else
-      el.removeAttribute(attr);
-  }
-  var outparam = new Object();
-	if (typeof node == "undefined") {
-	  node = editor.getParentElement();
-	}
-  if ( node.tagName.toLowerCase() == "marquee") {
-    outparam.f_name         = node.name;
-		outparam.f_behavior     = node.behavior;
-		outparam.f_direction    = node.direction;
-		outparam.f_text         = node.innerHTML;
-		outparam.f_width	      = node.width;
-		outparam.f_height	      = node.height;
-		outparam.f_bgcolor      = node.bgColor;
-		outparam.f_scrollamount = node.scrollAmount;
-		outparam.f_scrolldelay  = node.scrollDelay;
-	} else {
-	outparam = {
-    f_name    : '',
-		f_behavior	: '',
-		f_direction	: '',
-		f_text		: '',
-		f_width		: '',
-		f_height	: '',
-		f_bgcolor	: '',
-		f_scrollamount	: '',
-		f_scrolldelay	: ''
-		};
-	}
-	editor._popupDialog( "plugin://InsertMarquee/insert_marquee", function( param )
-	{
-		if ( !param )
-		{ //user must have pressed Cancel
-			return false;
-		} else if ( node.tagName.toLowerCase() == "marquee") {
-        setAttr(node, "name", param["f_name"]);
-        setAttr(node, "id", param["f_name"]);
-				setAttr(node, "behavior",	param["f_behavior"]);
-				setAttr(node, "direction", param["f_direction"]);
-				setAttr(node, "width", param["f_width"]);
-				setAttr(node, "height", param["f_height"]);
-				setAttr(node, "bgColor", param["f_bgcolor"]);
-				setAttr(node, "scrollAmount", param["f_scrollamount"]);
-				setAttr(node, "scrollDelay", param["f_scrolldelay"]);
-        node.innerHTML = param["f_text"];
-		} else {
-			var text = '<marquee name="' + param["f_name"] + '" ' +
-          'id="' + param["f_name"] + '" ' + 
-          'behavior="' + param["f_behavior"] + '" ' +
-					'direction="' + param["f_direction"] + '" ' +
-					'width="' + param["f_width"] + '" ' +
-					'height="' + param["f_height"] + '" ' +
-					'bgcolor="' + param["f_bgcolor"] + '" ' +
-					'scrollamount="' + param["f_scrollamount"] + '" ' +
-					'scrolldelay="' + param["f_scrolldelay"] + '">\n';
-          alert(text);
-			text = text + param["f_text"];
-			text = text + '</marquee>';
-			editor.insertHTML( text );
-		}
-	}, outparam);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/de.js b/web/imcms/xinha/plugins/InsertMarquee/lang/de.js
deleted file mode 100644
index 6902c598f6..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/de.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Insert scrolling marquee": "Marquee einfügen",
-  "Insert marquee": "Marquee einfügen",
-  "Direction:": "Ausrichtung:",
-  "Behavior:": "Bewegung:",
-  "Text:": "Text:",
-  "Background-Color:": "Hintergrundfarbe:",
-  "Width:": "Breite:",
-  "Height:": "Höhe:",
-  "Speed Control": "Geschwindigkeitseinstellungen",
-  "Cancel": "Abbrechen"
-};
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/fr.js b/web/imcms/xinha/plugins/InsertMarquee/lang/fr.js
deleted file mode 100644
index 35f5a1ad71..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/fr.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Name/ID:": "Nom/ID",
-  "Insert scrolling marquee": "Insérer marquee défilant",
-  "Insert marquee": "Insérer marquee",
-  "Direction:": "Direction",
-  "Behavior:": "Comportement",
-  "Text:": "Texte",
-  "Background-Color:": "Couleur de fond",
-  "Width:": "Largeur",
-  "Height:": "Hauteur",
-  "Speed Control": "Controle de vitesse",
-  "Scroll Amount:": "Quantité de défilement",
-  "Scroll Delay:": "Délai du défilement",
-  "Cancel": "Annuler"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/it.js b/web/imcms/xinha/plugins/InsertMarquee/lang/it.js
deleted file mode 100644
index 750b61d821..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/it.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "it", ENCODING: UTF-8 | ISO-8859-1
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-	"Insert scrolling marquee": "Inserisca marquee",
-	"Cancel": "Annullamento"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/ja.js b/web/imcms/xinha/plugins/InsertMarquee/lang/ja.js
deleted file mode 100644
index 0f7e3ed2f4..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/ja.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Marquee Editor": "マーキーエディタ",
-  "Name/ID:": "��/ID",
-  "Insert scrolling marquee": "スクロールマーキー�挿入",
-  "Insert marquee": "マーキー�挿入",
-  "Direction:": "方�:",
-  "Behavior:": "動作:",
-  "Text:": "テキスト:",
-  "Background-Color:": "背景色:",
-  "Width:": "å¹…:",
-  "Height:": "高�:",
-  "Speed Control": "速度調整",
-  "Scroll Amount:": "スクロール�:",
-  "Scroll Delay:": "スクロール�延:",
-  "Cancel": "中止",
-  "Continuous": "左�連続",
-  "Slide": "スライド",
-  "Alternate": "折り返�",
-  "You must enter the form name": "���入力�必���"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/nb.js b/web/imcms/xinha/plugins/InsertMarquee/lang/nb.js
deleted file mode 100644
index 4a6bdc82cf..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/nb.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-  "Name/ID:": "Navn/ID:",
-  "Insert scrolling marquee": "Sett inn rulletekst",
-  "Insert marquee": "Sett inn rulletekst",	
-  "Direction:": "Rettning:",
-  "Behavior:": "Oppførsel:",
-  "Text:": "Tekst:",
-  "Background-Color:": "Bakgrunnsfarge:",
-  "Width:": "Bredde:",
-  "Height:": "Høyde:",
-  "Speed Control": "Egenskaper for hastigheten til rulleteksten",
-  "Scroll Amount:": "Hastighet:",
-  "Scroll Delay:": "Forsinkelse:",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/nl.js b/web/imcms/xinha/plugins/InsertMarquee/lang/nl.js
deleted file mode 100644
index 3fbd83a666..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/nl.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{ 
-  "Name/ID:": "Naam/ID:",
-  "Insert scrolling marquee": "Scrollende tekst invoegen",
-  "Insert marquee": "Tekst invoegen",	
-  "Direction:": "Richting:",
-  "Behavior:": "Gedrag:",
-  "Text:": "Tekst:",
-  "Background-Color:": "Achtergrondkleur:",
-  "Width:": "Breedte:",
-  "Height:": "Hoogte:",
-  "Speed Control": "Snelheidscontrole",
-  "Scroll Amount:": "Snelheid:",
-  "Scroll Delay:": "Vertraging:",
-  "Cancel": "Annuleren"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/no.js b/web/imcms/xinha/plugins/InsertMarquee/lang/no.js
deleted file mode 100644
index 996fbfdb2b..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/no.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-  "Name/ID:": "Navn/ID:",
-  "Insert scrolling marquee": "Sett inn rulletekst",
-  "Insert marquee": "Sett inn rulletekst",	
-  "Direction:": "Rettning:",
-  "Behavior:": "Oppførsel:",
-  "Text:": "Tekst:",
-  "Background-Color:": "Bakgrunnsfarge:",
-  "Width:": "Bredde:",
-  "Height:": "Høyde:",
-  "Speed Control": "Egenskaper for hastigheten til rulleteksten",
-  "Scroll Amount:": "Hastighet:",
-  "Scroll Delay:": "Forsinkelse:",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertMarquee/lang/pt_br.js b/web/imcms/xinha/plugins/InsertMarquee/lang/pt_br.js
deleted file mode 100644
index c2091514e4..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/lang/pt_br.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Alternate": "Alternativo",
-  "Background-Color:": "Côr de Fundo:",
-  "Behavior:": "Comportamento:",
-  "Cancel": "Cancelar",
-  "Continuous": "Contínuo",
-  "Direction:": "Direção:",
-  "Height:": "Altura:",
-  "Insert scrolling marquee": "Inserir faixa rolante",
-  "Left": "Esquerda",
-  "Marquee Editor": "Editor de Faixas",
-  "Name": "Nome",
-  "Name/ID:": "Nome/ID:",
-  "OK": "OK",
-  "Right": "Direita",
-  "Scroll Amount:": "Quantidade de Rolagem:",
-  "Scroll Delay:": "Atrazo de Rolagem:",
-  "Slide": "Corrediço",
-  "Speed Control": "Controle de Velocidade",
-  "Text:": "Texto:",
-  "Width:": "Largura:"
-}
diff --git a/web/imcms/xinha/plugins/InsertMarquee/popups/insert_marquee.html b/web/imcms/xinha/plugins/InsertMarquee/popups/insert_marquee.html
deleted file mode 100644
index d787cf5fe9..0000000000
--- a/web/imcms/xinha/plugins/InsertMarquee/popups/insert_marquee.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<html>
-<head>
-  <title>Marquee Editor</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-
-var fields = ["f_name", "f_text", "f_direction", "f_behavior", "f_bgcolor", "f_width", "f_height", "f_scrollamount", "f_scrolldelay"];
-
-function Init() {
-  window.resizeTo(350, 380);
-  __dlg_translate('InsertMarquee');
-	__dlg_init();
-  var param = window.dialogArguments;
-  for (var i in fields) {
-    document.getElementById(fields[i]).value = param[fields[i]];
-  }
- 	document.getElementById("f_name").focus();
-}
-
-function onOK() {
-  var required = {
-    "f_name": "You must enter the form name"
-  };
-  for (var i in required) {
-	  var el = document.getElementById(i);
-	  if (!el.value) {
-		alert(HTMLArea._lc(required[i], 'InsertMarquee'));
-		el.focus();
-		return false;
-	  }
-  }
-  // pass data back to the calling window
-  var param = new Object();
-  for (var i in fields) {
-    param[fields[i]] = document.getElementById(fields[i]).value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-<style type="text/css">
-.fr { width: 9em; float: left; padding: 2px 5px; text-align: right; }
-</style>
-</head>
-<body class="dialog" onload="Init()">
-<div class="title">Marquee Editor</div>
-<form>
-  <div class="fr">Name/ID:</div>
-  <input type="text" name="name" id="f_name" size="20" title="Name" value="" />
-  <p />
-  <div class="fr">Direction:</div>
-  <select id="f_direction" name="direction">
-	  <option value="">Left</option>
-	  <option value="right">Right</option>
-  </select>
-  <p />
-  <div class="fr">Behavior:</div>
-  <select id="f_behavior" name="behavior">
-   	<option value="">Continuous</option>
-   	<option value="slide">Slide</option>
-   	<option value="alternate">Alternate</option>
-  </select>
-  <p />
-  <div class="fr">Text:</div>
-  <input type="text" id="f_text" name="text" value="" size="30" />
-  <p />
-  <div class="fr">Background-Color:</div>
-  <input type="text" id="f_bgcolor" name="bgcolor" value="" size="30" />
-  <p />
-  <div class="fr">Width:</div>
-  <input type="text" id="f_width" name="width" value="100" size="5" maxlength="4" />
-  <p />
-  <div class="fr">Height:</div>
-  <input type="text" id="f_height" name="height" value="100" size="5" maxlength="4" />
-  <p />
-  <fieldset>
-  <legend>Speed Control</legend>
-    <div class="fr">Scroll Amount:</div>
-    <input type="text" id="f_scrollamount" name="scrollamount" value="100" maxlength="4" />
-    <p />
-    <div class="fr">Scroll Delay:</div>
-    <input type="text" id="f_scrolldelay" name="scrolldelay" value="100" maxlength="4" />
-    <p />
-  </fieldset>  
-<div id="buttons">
-   <button type="submit" name="ok" onclick="return onOK();">OK</button>
-   <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/img/pagebreak.gif b/web/imcms/xinha/plugins/InsertPagebreak/img/pagebreak.gif
deleted file mode 100644
index 8d42732cd3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertPagebreak/img/pagebreak.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/insert-pagebreak.js b/web/imcms/xinha/plugins/InsertPagebreak/insert-pagebreak.js
deleted file mode 100644
index c736ee19ff..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/insert-pagebreak.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// InsertPagebreak plugin for HTMLArea/Xinha
-// Implementation by Udo Schmal & Schaffrath NeueMedien
-// Original Author - Udo Schmal
-//
-// (c) Udo Schmal & Schaffrath NeueMedien 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function InsertPagebreak(editor, args) {
-	this.editor = editor;
-	var cfg = editor.config;
-	var self = this;
-
-	cfg.registerButton({
-	id       : "pagebreak",
-	tooltip  : this._lc("Page break"),
-	image    : editor.imgURL("pagebreak.gif", "InsertPagebreak"),
-	textMode : false,
-	action   : function(editor) {
-			self.buttonPress(editor);
-		}
-	});
-  cfg.addToolbarElement("pagebreak", "inserthorizontalrule", 1);
-}
-
-InsertPagebreak._pluginInfo = {
-	name          : "InsertPagebreak",
-	version       : "1.0",
-	developer     : "Udo Schmal",
-	developer_url : "",
-	sponsor       : "L.N.Schaffrath NeueMedien",
-	sponsor_url   : "http://www.schaffrath-neuemedien.de/",
-	c_owner       : "Udo Schmal & Schaffrath NeueMedien",
-	license       : "htmlArea"
-};
-
-InsertPagebreak.prototype._lc = function(string) {
-    return Xinha._lc(string, 'InsertPagebreak');
-};
-
-InsertPagebreak.prototype.buttonPress = function(editor, context, updatecontextclass) {
-	editor.insertHTML('<div style="font-size: 1px; page-break-after: always; height: 1px; background-color: rgb(192, 192, 192);" contenteditable="false" title="Page Break">');
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/lang/de.js b/web/imcms/xinha/plugins/InsertPagebreak/lang/de.js
deleted file mode 100644
index a7af513783..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/lang/de.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Page break": "Neue Seite"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/lang/fr.js b/web/imcms/xinha/plugins/InsertPagebreak/lang/fr.js
deleted file mode 100644
index 26d751cb55..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/lang/fr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Page break": "Séparateur de page"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/lang/ja.js b/web/imcms/xinha/plugins/InsertPagebreak/lang/ja.js
deleted file mode 100644
index aead7257c4..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/lang/ja.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Page break": "改ページ"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/lang/nb.js b/web/imcms/xinha/plugins/InsertPagebreak/lang/nb.js
deleted file mode 100644
index a0c25740d4..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/lang/nb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Page break": "Sett inn sideskift"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/lang/nl.js b/web/imcms/xinha/plugins/InsertPagebreak/lang/nl.js
deleted file mode 100644
index 750fc51d0f..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/lang/nl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Page break": "Pagina einde"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/lang/no.js b/web/imcms/xinha/plugins/InsertPagebreak/lang/no.js
deleted file mode 100644
index c9d5bf8bc5..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/lang/no.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Page break": "Sett inn sideskift"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPagebreak/lang/pt_br.js b/web/imcms/xinha/plugins/InsertPagebreak/lang/pt_br.js
deleted file mode 100644
index 092cdc47fb..0000000000
--- a/web/imcms/xinha/plugins/InsertPagebreak/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Page break": "Quebra de página"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPicture/InsertPicture.php b/web/imcms/xinha/plugins/InsertPicture/InsertPicture.php
deleted file mode 100644
index 5de94e4791..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/InsertPicture.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?PHP
-  //this plugin only use the relativ webpath to the picturefolder
-  //default ~  /Xinha/plugins/InsertPicture/demo_pictures/
-  strstr( PHP_OS, "WIN") ? $strPathSeparator = "\\" : $strPathSeparator = "/";
-  if (isset($_REQUEST['picturepath'])) {
-    $PicturePath = $_REQUEST['picturepath'];
-
-    $AInsertPicturePath = explode ('/', dirname($_SERVER['PHP_SELF']));
-    $ALocalInsertPicturePath = explode($strPathSeparator, dirname(__FILE__));
-    $AtheRootPath = array_values (array_diff ($ALocalInsertPicturePath, $AInsertPicturePath));
-    $RootPath = implode($strPathSeparator, $AtheRootPath);
-
-    $LocalPicturePath = str_replace('http://'.$_SERVER['HTTP_HOST'], "", $PicturePath);
-    $LocalPicturePath = str_replace('/', $strPathSeparator, $LocalPicturePath);
-    $LocalPicturePath = $RootPath.$LocalPicturePath;
-
-    $LocalPicturePath = dirname(__FILE__).$strPathSeparator.'demo_pictures'.$strPathSeparator;
-    //$LocalPicturePath = realpath('../../../../images/content/').$strPathSeparator;
-  }
-  $limitedext = array(".gif",".jpg",".png",".jpeg"); //Extensions you want files uploaded limited to.
-  $limitedsize = "1000000"; //size limit in bytes
-  $message = "";
-
-  function formatSize($size)
-  {
-    if($size < 1024)
-      return $size.' bytes';
-    else if($size >= 1024 && $size < 1024*1024)
-      return sprintf('%01.2f',$size/1024.0).' Kb';
-    else
-      return sprintf('%01.2f',$size/(1024.0*1024)).' Mb';
-  }
-  $DestFileName = "";
-  if (isset($_FILES['file'])) {
-    $file = $_FILES['file'];
-    $ext = strrchr($file['name'],'.');
-    if (!in_array($ext,$limitedext))
-      $message = "The file you are uploading doesn't have the correct extension.";
-    else if (file_exists($LocalPicturePath.$file['name']))
-      $message = "The file you are uploading already exists.";
-    else if ($file['size'] > $limitedsize)
-      $message = "The file you are uploading is to big. The max Filesize is</span><span> ".formatSize($limitedsize).".";
-    else
-      copy($file['tmp_name'], $LocalPicturePath.$file['name']);
-    $DestFileName = $file['name'];
-  }
-?>
-<html>
-<head>
-  <title>Insert Image</title>
-<link rel="stylesheet" type="text/css" href="../../popups/popup.css" />
-<script type="text/javascript" src="../../popups/popup.js"></script>
-
-<script type="text/javascript">
-  window.resizeTo(500, 490);
-var Xinha = window.opener.Xinha;
-function i18n(str) {
-  return (Xinha._lc(str, 'Xinha'));
-}
-
-function Init() {
-  __dlg_translate("InsertPicture");
-  __dlg_init();
-
-  // Make sure the translated string appears in the drop down. (for gecko)
-  document.getElementById("f_align").selectedIndex = 0;
-  document.getElementById("f_align").selectedIndex = document.getElementById("f_align").selectedIndex;
-  var param = window.dialogArguments;
-  if (param) {
-      document.getElementById("f_url").value = param["f_url"];
-      document.getElementById("f_alt").value = param["f_alt"];
-      document.getElementById("f_border").value = param["f_border"];
-      document.getElementById("f_align").value = param["f_align"];
-      document.getElementById("f_vert").value = (param["f_vert"]!="-1") ? param["f_vert"] : "";
-      document.getElementById("f_horiz").value = (param["f_horiz"]!="-1") ? param["f_horiz"] : "";
-      document.getElementById("f_height").value = param["f_height"];
-      document.getElementById("f_width").value = param["f_width"];
-      window.ipreview.location.replace(param.f_url);
-  }
-  document.getElementById("f_url").focus();
-  document.getElementById("filelist").selectedIndex = document.getElementById("filelist").selectedIndex;
-<?php If ($DestFileName<>"")
-  echo "CopyToURL(\"".$PicturePath.$DestFileName."\");"
-?>
-}
-
-function onOK() {
-  var required = {
-    "f_url": i18n("You must enter the URL")
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(required[i]);
-      el.focus();
-      return false;
-    }
-  }
-  // pass data back to the calling window
-  var fields = ["f_url", "f_alt", "f_align", "f_border", "f_horiz", "f_vert", "f_width", "f_height"];
-  var param = new Object();
-  for (var i in fields) {
-    var id = fields[i];
-    var el = document.getElementById(id);
-    param[id] = el.value;
-  }
-  __dlg_close(param);
-  return false;
-}
-
-function onUpload() {
-  var required = {
-    "file": i18n("Please select a file to upload.")
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(required[i]);
-      el.focus();
-      return false;
-    }
-  }
-  return true;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-function onPreview() {
-  var f_url = document.getElementById("f_url");
-  var url = f_url.value;
-  if (!url) {
-    alert(i18n("You must enter the URL"));
-    f_url.focus();
-    return false;
-  }
-  if (document.all) {
-    window.ipreview.location.replace('viewpicture.html?'+url);
-  } else {
-    window.ipreview.location.replace(url);
-  }
-  return false;
-}
-
-var img = new Image();
-function imgWait() {
-  waiting = window.setInterval("imgIsLoaded()", 1000)
-}
-function imgIsLoaded() {
-  if(img.width > 0) {
-    window.clearInterval(waiting)
-    document.getElementById("f_width").value = img.width;
-    document.getElementById("f_height").value = img.height;
-  }
-}
-
-function CopyToURL(imgName) {
-  document.getElementById("f_url").value = imgName;
-  onPreview();
-  img.src = imgName;
-  img.onLoad = imgWait()
-}
-
-function openFile() {
-  window.open(document.getElementById("f_url").value,'','');
-}
-</script>
-</head>
-<body class="dialog" onload="Init()">
-<div class="title">Insert Image</div>
-<table border="0" width="100%" style="padding: 0px; margin: 0px">
-  <tbody>
-  <tr>
-    <td>Images on the Server:<?php /*echo $LocalPicturePath*/ ?><br>
-    <select id="filelist" name="filelist" style="width:200" size="10" onClick="CopyToURL(this[this.selectedIndex].value);">
-<?php
-  $d = @dir($LocalPicturePath);
-  while (false !== ($entry = $d->read())) {
-    if(substr($entry,0,1) != '.') {  //not a dot file or directory
-      if ($entry == $DestFileName)
-        echo '<OPTION value="' . $PicturePath.$entry. '" selected="selected">' . $entry . '(' . formatSize(filesize($LocalPicturePath.'\\'.$entry)) .')</OPTION>';
-      else
-        echo '<OPTION value="' . $PicturePath.$entry. '">' . $entry . '(' . formatSize(filesize($LocalPicturePath.'\\'.$entry)) .')</OPTION>';
-    }
-  }
-  $d->close();
-?>
-    </select>
-
-      <form method="post" action="" enctype="multipart/form-data">
-        <input type="hidden" name="localpicturepath" value="<?php echo $LocalPicturePath ?>">
-        <input type="hidden" name="picturepath" value="<?php echo $PicturePath ?>">
-        <input type="file" name="file" id="file" size="30"><br>
-        <button type="submit" name="ok" onclick="onUpload();">Upload file</button><br>
-        <span><?php echo $message ?></span>
-      </form>
-
-    </td>
-    <td valign="center" width="200" height="230">
-    <span>Image Preview:</span>
-    <a href="#" onClick="javascript:openFile();"title=" Open file in new window"><img src="img/btn_open.gif"  width="18" height="18" border="0" title="Open file in new window" /></a><br />
-    <iframe name="ipreview" id="ipreview" frameborder="0" style="border : 1px solid gray;" height="200" width="200" src=""></iframe>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
-<form action="" method="get">
-  <input type="hidden" name="localpicturepath" value="<?php echo $LocalPicturePath ?>">
-  <input type="hidden" name="picturepath" value="<?php echo $PicturePath ?>">
-<table border="0" width="100%" style="padding: 0px; margin: 0px">
-  <tbody>
-
-  <tr>
-    <td style="width: 7em; text-align: right">Image URL:</td>
-    <td><input type="text" name="url" id="f_url" style="width:75%"
-      title="Enter the image URL here"  value="<?php echo $PicturePath.$DestFileName ?>"/>
-      <button name="preview" onclick="return onPreview();"
-      title="Preview the image in a new window">Preview</button>
-    </td>
-  </tr>
-  <tr>
-    <td style="width: 7em; text-align: right">Alternate text:</td>
-    <td><input type="text" name="alt" id="f_alt" style="width:100%"
-      title="For browsers that don't support images" /></td>
-  </tr>
-
-  </tbody>
-</table>
-
-<p />
-
-<fieldset style="float: left; margin-left: 5px;">
-<legend>Layout</legend>
-
-<div class="space"></div>
-
-<div class="fl" style="width: 6em;">Alignment:</div>
-<select size="1" name="align" id="f_align"
-  title="Positioning of this image">
-  <option value=""                             >Not set</option>
-  <option value="left"                         >Left</option>
-  <option value="right"                        >Right</option>
-  <option value="texttop"                      >Texttop</option>
-  <option value="absmiddle"                    >Absmiddle</option>
-  <option value="baseline"                     >Baseline</option>
-  <option value="absbottom"                    >Absbottom</option>
-  <option value="bottom"                       >Bottom</option>
-  <option value="middle"                       >Middle</option>
-  <option value="top"                          >Top</option>
-</select>
-
-<p />
-
-<div class="fl" style="width: 6em;">Border thickness:</div>
-<input type="text" name="border" id="f_border" size="5" title="Leave empty for no border" />
-<div class="space"></div>
-
-</fieldset>
-
-<fieldset style="float: left; margin-left: 5px;">
-<legend>Size</legend>
-
-<div class="space"></div>
-
-<div class="fl" style="width: 5em;">Width:</div>
-<input type="text" name="width" id="f_width" size="5" title="Leave empty for not defined" />
-<p />
-
-<div class="fl" style="width: 5em;">Height:</div>
-<input type="text" name="height" id="f_height" size="5" title="Leave empty for not defined" />
-<div class="space"></div>
-
-</fieldset>
-
-<fieldset style="float:right; margin-right: 5px;">
-<legend>Spacing</legend>
-
-<div class="space"></div>
-
-<div class="fr" style="width: 5em;">Horizontal:</div>
-<input type="text" name="horiz" id="f_horiz" size="5" title="Horizontal padding" />
-<p />
-
-<div class="fr" style="width: 5em;">Vertical:</div>
-<input type="text" name="vert" id="f_vert" size="5" title="Vertical padding" />
-
-<div class="space"></div>
-
-</fieldset>
-<br clear="all" />
-
-<div id="buttons">
-  <button type="submit" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPicture/demo_pictures/bikerpeep.jpg b/web/imcms/xinha/plugins/InsertPicture/demo_pictures/bikerpeep.jpg
deleted file mode 100644
index a2e7028eb7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertPicture/demo_pictures/bikerpeep.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertPicture/demo_pictures/wesnoth078.jpg b/web/imcms/xinha/plugins/InsertPicture/demo_pictures/wesnoth078.jpg
deleted file mode 100644
index ea37d1aea7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertPicture/demo_pictures/wesnoth078.jpg and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertPicture/img/btn_open.gif b/web/imcms/xinha/plugins/InsertPicture/img/btn_open.gif
deleted file mode 100644
index 2056f2c1ef..0000000000
Binary files a/web/imcms/xinha/plugins/InsertPicture/img/btn_open.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertPicture/img/nopic.gif b/web/imcms/xinha/plugins/InsertPicture/img/nopic.gif
deleted file mode 100644
index d4e8a786b4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertPicture/img/nopic.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertPicture/insert-picture.js b/web/imcms/xinha/plugins/InsertPicture/insert-picture.js
deleted file mode 100644
index 02f6c12cd1..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/insert-picture.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Insert Image plugin for Xinha
-// Original Author - Udo Schmal
-//
-// (c) www.Schaffrath-NeueMedien.de  2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function InsertPicture(editor) {
-  if ( typeof _editor_picturePath !== "string" )
-    _editor_picturePath = _editor_url + "plugins/InsertPicture/demo_pictures/";
-  InsertPicture.Scripting = "php"; //else "asp"
-  editor.config.URIs.insert_image =  '../plugins/InsertPicture/InsertPicture.' + InsertPicture.Scripting + '?picturepath=' + _editor_picturePath;
-}
-
-InsertPicture._pluginInfo = {
-  name          : "InsertPicture",
-  version       : "1.0.2",
-  developer     : "Udo Schmal",
-  developer_url : "http://www.Schaffrath-NeueMedien.de/",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de/",
-  c_owner       : "Udo Schmal",
-  license       : "htmlArea"
-};
-
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/de.js b/web/imcms/xinha/plugins/InsertPicture/lang/de.js
deleted file mode 100644
index 83bc5e58ac..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/de.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Sponsored by http://www.schaffrath-neuemedien.de
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "The file you are uploading doesn't have the correct extension.": "Die hochgeladene Datei ist im falschen Format.",
-  "The file you are uploading already exists.": "Eine Datei mit diesem Namen existiert schon.",
-  "The file you are uploading is to big. The max Filesize is": "Die hochgeladene Datei ist zu groß. Die maximakle Dateigröße beträgt",
-  "Images on the Server:": "Bilder auf dem Server:",
-  "Please select a file to upload.": "Wählen Sie eine Datei zum hochladen aus.",
-  "Upload file": "Datei hochladen",
-  "Open file in new window": "Datei in neuen Fenster anzeigen",
-  "Size": "Größe",
-  "Width:": "Breite",
-  "Height:": "Höhe"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/fr.js b/web/imcms/xinha/plugins/InsertPicture/lang/fr.js
deleted file mode 100644
index a1bfb2cfcc..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/fr.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Insert Image": "Insérer une image",
-  "Image Preview:": "Prévisualisation",
-  "Image URL:": "URL",
-  "Preview": "Prévisualisation",
-  "Alternate text:": "Texte alternatif",
-  "Layout": "Layout",
-  "Alignment:": "Alignement",
-  "Border thickness:": "Epaisseur bordure",
-  "Spacing": "Espacement",
-  "Horizontal:": "Horizontal",
-  "Vertical:": "Vertical",
-  "The file you are uploading doesn't have the correct extension.": "Le fichier que vous téléchargez ne possède pas la bonne extension.",
-  "The file you are uploading already exists.": "Le fichier que vous téléchargez existe déjà.",
-  "The file you are uploading is to big. The max Filesize is": "Le fichier que vous uploadez est trop gros. La taille maximum est",
-  "Images on the Server:": "Images sur le serveur",
-  "Please select a file to upload.": "Veuillez sélectionner un fichier a télécharger",
-  "Upload file": "Télécharger",
-  "Open file in new window": "Ouvrir le fichier dans une nouvelle fenêtre"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/ja.js b/web/imcms/xinha/plugins/InsertPicture/lang/ja.js
deleted file mode 100644
index 4093743b37..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/ja.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Insert Image": "画��挿入",
-  "Image Preview:": "画�プレビュー:",
-  "Image URL:": "画�URL:",
-  "Preview": "表示",
-  "Alternate text:": "代替テキスト:",
-  "Layout": "レイアウト",
-  "Alignment:": "行��:",
-  "Border thickness:": "境界線�幅:",
-  "Spacing": "é–“éš”",
-  "Horizontal:": "æ°´å¹³:",
-  "Vertical:": "åž‚ç›´:",
-  "The file you are uploading doesn't have the correct extension.": "アップロード対象ファイル�正��拡張���り��ん。",
-  "The file you are uploading already exists.": "アップロード対象ファイル����存在���。",
-  "The file you are uploading is to big. The max Filesize is": "アップロード対象ファイル�大�����。ファイルサイズ�上�:",
-  "Images on the Server:": "サー�上�画�:",
-  "Please select a file to upload.": "アップロード�るファイルを�択������。",
-  "Upload file": "UPLOAD FILE",
-  "Open file in new window": "新��ウィンドウ�ファイルを開�",
-  "Size": "サイズ",
-  "Width:": "å¹…:",
-  "Height:": "高�:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/nb.js b/web/imcms/xinha/plugins/InsertPicture/lang/nb.js
deleted file mode 100644
index e4598aa9c2..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/nb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// LANG: "nb", ENCODING: UTF-8 | ISO-8859-1
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert Image": "Sett inn bilde",
-  "Image Preview:": "Forhåndsvisning:",
-  "Image URL:": "Bildets URL:",
-  "Preview": "Forhåndsvisning",
-  "Alternate text:": "Alternativ tekst",  
-  "Layout": "Oppsett",
-  "Alignment:": "Plassering",
-  "Border thickness:": "Rammetykkelse:",
-  "Spacing": "Luft rundt bildet",
-  "Horizontal:": "Horisontal:",
-  "Vertical:": "Vertikal:",
-  "The file you are uploading doesn't have the correct extension.": "Bildet du laster opp har et ugyldig format, opplastning avbrutt",
-  "The file you are uploading already exists.": "Bildet du prøver å laste opp eksisterer allerede på serveren",
-  "The file you are uploading is to big. The max Filesize is": "Bildet du laster opp er for stort, maks tillatt størrelse er",
-  "Images on the Server:": "Bilder på serveren:",
-  "Please select a file to upload.": "Velg bilde du skal laste opp",
-  "Upload file": "Last opp bilde",
-  "Open file in new window": "Ã…pne bilde i nytt vindu"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/nl.js b/web/imcms/xinha/plugins/InsertPicture/lang/nl.js
deleted file mode 100644
index 97daba8f85..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/nl.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-
-{
-  "Insert Image": "Afbeelding invoegen",
-  "Image Preview:": "Afbeeldingsvoorbeeld:",
-  "Image URL:": "Afbeelding URL:",
-  "Preview": "Voorbeeld",
-  "Alternate text:": "Alternatieve tekst:",
-  "Layout": "Weergave",
-  "Alignment:": "Positie:",
-  "Border thickness:": "Rand dikte:",
-  "Spacing": "Marge",
-  "Horizontal:": "Horizontaal:",
-  "Vertical:": "Verticaal:",
-  "The file you are uploading doesn't have the correct extension.": "Het bestand dat is geupload heeft niet de juiste extentie.",
-  "The file you are uploading already exists.": "Het bestand dat is geupload bestaat al.",
-  "The file you are uploading is to big. The max Filesize is": "Het bestand dat is geupload is te groot. De maximaal toegestane grootte is:",
-  "Images on the Server:": "Afbeeldingen op de server:",
-  "Please select a file to upload.": "Selecteer een bestand om te uploaden",
-  "Upload file": "Upload bestand",
-  "Size": "Grootte",
-  "Width:": "Breedte:",
-  "Height:": "Hoogte:",
-  // tooltips
-  "Enter the image URL here":"Afbeeldingslocatie (URL)",
-  "Preview the image in a new window": "Afbeelding bekijken in nieuw venster",
-  "For browsers that don't support images":"Voor browsers welke geen afbeeldingen ondersteunen",
-  "Positioning of this image": "Positie van de afbeelding",
-  "Leave empty for no border": "Leeg voor geen rand",
-  "Leave empty for not defined": "Leeg voor niet gedefinieerd",
-  "Horizontal padding": "Horizontale ruimte",
-  "Vertical padding": "Verticale ruimte"
-};
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/no.js b/web/imcms/xinha/plugins/InsertPicture/lang/no.js
deleted file mode 100644
index 3c8a3a1b67..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/no.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Sponsored by http://www.schaffrath-neuemedien.de
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert Image": "Sett inn bilde",
-  "Image Preview:": "Forhåndsvisning:",
-  "Image URL:": "Bildets URL:",
-  "Preview": "Forhåndsvisning",
-  "Alternate text:": "Alternativ tekst",  
-  "Layout": "Oppsett",
-  "Alignment:": "Plassering",
-  "Border thickness:": "Rammetykkelse:",
-  "Spacing": "Luft rundt bildet",
-  "Horizontal:": "Horisontal:",
-  "Vertical:": "Vertikal:",
-  "The file you are uploading doesn't have the correct extension.": "Bildet du laster opp har et ugyldig format, opplastning avbrutt",
-  "The file you are uploading already exists.": "Bildet du prøver å laste opp eksisterer allerede på serveren",
-  "The file you are uploading is to big. The max Filesize is": "Bildet du laster opp er for stort, maks tillatt størrelse er",
-  "Images on the Server:": "Bilder på serveren:",
-  "Please select a file to upload.": "Velg bilde du skal laste opp",
-  "Upload file": "Last opp bilde",
-  "Open file in new window": "Ã…pne bilde i nytt vindu"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/pt_br.js b/web/imcms/xinha/plugins/InsertPicture/lang/pt_br.js
deleted file mode 100644
index aeca2fca19..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/pt_br.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  " Open file in new window": " Abrir arquivo em um nova janela",
-  "Absbottom": "Inferior Absoluto",
-  "Absmiddle": "Meio Absoluto",
-  "Alignment:": "Alinhamento:",
-  "Alternate text:": "Texto Alternativo:",
-  "Baseline": "Linha de Base",
-  "Border thickness:": "Espessura da Borda",
-  "Bottom": "Inferior",
-  "Cancel": "Cancelar",
-  "Enter the image URL here": "Entre aqui com a URL da imagem",
-  "For browsers that don't support images": "Para navegadores que não suportam imagens",
-  "Height:": "Altura:",
-  "Horizontal padding": "Espaço horizontal",
-  "Horizontal:": "Horizontal:",
-  "Image Preview:": "Visualização da Imagem:",
-  "Image URL:": "URL da Imagem:",
-  "Insert Image": "Inserir Imagem",
-  "Layout": "Esquema",
-  "Leave empty for no border": "Deixe em branco para sem bordas",
-  "Leave empty for not defined": "Deixe em branco para não definido",
-  "Left": "Esquerda",
-  "Middle": "Meio",
-  "Not set": "Não definido",
-  "OK": "OK",
-  "Open file in new window": "Abrir arquivo em uma nova janela",
-  "Positioning of this image": "Posicionamento desta imagem",
-  "Preview": "Visualização",
-  "Preview the image in a new window": "Visualizar imagem em uma nova janela",
-  "Right": "Direita",
-  "Size": "Tamanho",
-  "Spacing": "Espaço",
-  "Texttop": "Texto no topo",
-  "Top": "Topo",
-  "Upload file": "Enviar arquivo",
-  "Vertical padding": "Espaço vertical",
-  "Vertical:": "Vertical:",
-  "Width:": "Largura:",
-  
-  // not find with lc_parse_strings.php  
-  "The file you are uploading doesn't have the correct extension.": "O arquivo que você está enviando não possuia a extensão correta.",
-  "The file you are uploading already exists.": "Já existe o arquivo que você está enviando.",
-  "The file you are uploading is to big. The max Filesize is": "O arquivo que você está enviando é muito grande. O tamanho máximo é",
-  "Images on the Server:": "Imagens no Servidor:",
-  "Please select a file to upload.": "Por favor, selecione um arquivo para enviar."
-}
diff --git a/web/imcms/xinha/plugins/InsertPicture/lang/sv.js b/web/imcms/xinha/plugins/InsertPicture/lang/sv.js
deleted file mode 100644
index 6218489f31..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/lang/sv.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// I18N constants
-// LANG: "sv", ENCODING: UTF-8
-// Swedish version for rev. 477 (Mar 2006) by Thomas Loo <tloo@saltstorm.net>
-
-{
-  "Insert Image": "Infoga bild",
-  "Image Preview:": "Förhandsgranskning:",
-  "Image URL:": "Bildens URL:",
-  "Preview": "Förhandsgranska",
-  "Alternate text:": "Alternativ text:",
-  "Layout": "Layout",
-  "Alignment:": "Placering:",
-  "Border thickness:": "Ramtjocklek:",
-  "Spacing": "Marginal",
-  "Horizontal:": "Horisontell:",
-  "Vertical:": "Vertikal:",
-  "The file you are uploading doesn't have the correct extension.": "Uppladdat bild har en ogiltig filändelse, uppladdning avbruten",
-  "The file you are uploading already exists.": "En fil med detta namn finns redan",
-  "The file you are uploading is to big. The max Filesize is": "Filen är för stor, maximal filstorlek är",
-  "Images on the Server:": "Bilder på servern:",
-  "Please select a file to upload.": "Välj bild att ladda upp",
-  "Upload file": "Ladda upp bild",
-  "Size": "Storlek",
-  "Width:": "Bredd:",
-  "Height:": "Höjd:",
-  // tooltips
-  "Enter the image URL here":"Bildens sökväg (URL)",
-  "Preview the image in a new window": "Öppna bild i nytt fönster",
-  "For browsers that don't support images":"Beskrivande text för webläsare som inte stödjer inbäddade bilder",
-  "Positioning of this image": "Bildens positionering",
-  "Leave empty for no border": "Lämna tomt för att undvika ram",
-  "Leave empty for not defined": "Lämna tomt för att låta webläsaren bestämma",
-  "Horizontal padding": "Horizontellt indrag på bild",
-  "Vertical padding": "Vertikalt indrag på bild"
-};
diff --git a/web/imcms/xinha/plugins/InsertPicture/viewpicture.html b/web/imcms/xinha/plugins/InsertPicture/viewpicture.html
deleted file mode 100644
index 00823bf52c..0000000000
--- a/web/imcms/xinha/plugins/InsertPicture/viewpicture.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-	<title>Preview</title>
-<script language="JavaScript" type="text/javascript">
-<!--
-function imgWait() {
-	waiting = window.setInterval("imgIsLoaded()", 1000);
-}
-function imgIsLoaded() {
-	if(document.getElementById("myImg").width > 0) {
-	  window.clearInterval(waiting);
-	  imgShowWidth();
-	}
-}
-function imgShowWidth() {
-	var width    = document.getElementById("myImg").width;
-	var height   = document.getElementById("myImg").height;
-	if(width > 120) {
-	  var dx = (120 / width);
-	  var dy = (120 / height);
-	  ratio  = dx < dy ? dx : dy;
-	  // keep aspect ratio
-	  width  = width * ratio;
-	  height = height * ratio;
-	  document.getElementById("myImg").width  = width;
-	  document.getElementById("myImg").height = height;
-	}
-	document.getElementById("myImg").style.visibility = 'visible';
-}
-function showPreview() {
-	img = document.location.toString().split("?");
-    document.getElementById("myImg").src = img[1];
-	img.onLoad = imgWait();
-}
-//-->
-</script>
-</head>
-<body  marginwidth="5px" marginheight="5px" topmargin="5px" leftmargin="5px" rightmargin="5px">
-<img id="myImg" src="" Style="visibility:hidden">
-<script language="JavaScript" type="text/javascript">
-  showPreview();
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/README.txt b/web/imcms/xinha/plugins/InsertSmiley/README.txt
deleted file mode 100644
index 35b4842eee..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-By default the smileys are hosted on an external server. If you would like to put them on your own server, you can download a zip file from here:
-http://www.x-webservice.net/storage/xinha/plugins/InsertSmiley/smileys.zip
-
-1. Extract the file to your server
-2. Change xinha_config.InsertSmiley.smileyURL to the appropriate path (with trailing slash), e.g.
-   
-   xinha_config.InsertSmiley.smileyURL = "/smileys/";
-   
- You can also reduce/expand/replace the list of smileys with your own files by editing the file smileys.txt in the plugins's folder.
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/img/ed_smiley.gif b/web/imcms/xinha/plugins/InsertSmiley/img/ed_smiley.gif
deleted file mode 100644
index d6ee7f40d4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/img/ed_smiley.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/insert-smiley.js b/web/imcms/xinha/plugins/InsertSmiley/insert-smiley.js
deleted file mode 100644
index ad29d0559d..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/insert-smiley.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------*\
- Insert Smiley Plugin for Xinha
- -----------------------------------------
- author: Ki Master George
- e-mail: kimastergeorge@gmail.com
-\*---------------------------------------*/
-
-function InsertSmiley(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  // register the toolbar buttons provided by this plugin
-  cfg.registerButton({
-    id       : "insertsmiley",
-    tooltip  : this._lc("Insert Smiley"),
-    image    : editor.imgURL("ed_smiley.gif", "InsertSmiley"),
-    textMode : false,
-    action   : function(editor) {
-                 self.buttonPress(editor);
-               }
-  });
-  cfg.addToolbarElement("insertsmiley", "inserthorizontalrule", 1);
-}
-
-InsertSmiley._pluginInfo = {
-  name          : "InsertSmiley",
-  version       : "1.0",
-  developer     : "Ki Master George",
-  developer_url : "http://kimastergeorge.i4host.com/",
-  c_owner       : "Ki Master George",
-  sponsor       : "Ki Master George",
-  sponsor_url   : "http://kimastergeorge.i4host.com/",
-  license       : "htmlArea"
-};
-
-InsertSmiley.prototype._lc = function(string) {
-  return Xinha._lc(string, 'InsertSmiley');
-};
-Xinha.Config.prototype.InsertSmiley=  {
-  smileyURL : "http://www.x-webservice.net/storage/xinha/plugins/InsertSmiley/"
-};
-
-InsertSmiley.prototype.buttonPress = function(editor) {
-  var self = this;
-  var sel = editor.getSelectedHTML().replace(/(<[^>]*>|&nbsp;|\n|\r)/g,"");
-  var param = {};
-  param.editor = editor;
-  editor._popupDialog("plugin://InsertSmiley/insertsmiley", function(param) {
-    editor.insertHTML("<img src=\"" + editor.config.InsertSmiley.smileyURL + param.smileyfile + "\" alt=\"Smiley\" />");
-  }, param);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/lang/de.js b/web/imcms/xinha/plugins/InsertSmiley/lang/de.js
deleted file mode 100644
index 22927cbd7b..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/lang/de.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-{ 
-	"Insert Smiley": "Smiley einfügen",
-	"Smiley": "Smiley",
-	"Cancel": "Abbrechen"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/lang/fr.js b/web/imcms/xinha/plugins/InsertSmiley/lang/fr.js
deleted file mode 100644
index 7b99f61852..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/lang/fr.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{ 
-	"Insert Smiley": "Insérer un smiley",
-	"Smiley": "Smiley",
-	"Cancel": "Annuler"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/lang/ja.js b/web/imcms/xinha/plugins/InsertSmiley/lang/ja.js
deleted file mode 100644
index 5025f49801..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/lang/ja.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-	"Insert Smiley": "スマイリー�挿入",
-	"Smiley": "スマイリー",
-	"Cancel": "中止"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/lang/nb.js b/web/imcms/xinha/plugins/InsertSmiley/lang/nb.js
deleted file mode 100644
index c5d0d81623..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/lang/nb.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-  "Insert Smiley": "Sett inn smiley",
-  "Smiley": "Smiley",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/lang/nl.js b/web/imcms/xinha/plugins/InsertSmiley/lang/nl.js
deleted file mode 100644
index 6ef8e72254..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/lang/nl.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{ 
-  "Insert Smiley": "Smiley invoegen",
-  "Smiley": "Smiley",
-  "Cancel": "Annuleren"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/lang/no.js b/web/imcms/xinha/plugins/InsertSmiley/lang/no.js
deleted file mode 100644
index 1a424a2163..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/lang/no.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-  "Insert Smiley": "Sett inn smiley",
-  "Smiley": "Smiley",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/lang/pt_br.js b/web/imcms/xinha/plugins/InsertSmiley/lang/pt_br.js
deleted file mode 100644
index 08d194e845..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/lang/pt_br.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Cancel": "Cancelar",
-  "Insert Smiley": "Inserir Smiley"
-}
diff --git a/web/imcms/xinha/plugins/InsertSmiley/popups/insertsmiley.html b/web/imcms/xinha/plugins/InsertSmiley/popups/insertsmiley.html
deleted file mode 100644
index fe70069492..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/popups/insertsmiley.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>Insert Smiley</title>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<script type="text/javascript">
-  window.resizeTo(400, 300);
-var InsertSmiley = window.opener.InsertSmiley;
-var editor = null;
-var _editor_url = opener._editor_url;
-var param;
-var smileys = null;
-function Init() {
-  __dlg_translate("InsertSmiley");
-  __dlg_init();
-  param = window.dialogArguments;
-  editor = param['editor'];
-  var smileyList = Xinha._geturlcontent(_editor_url + 'plugins/InsertSmiley/smileys.txt');
-  smileyList = smileyList.match(/^.+$/mg);
-  var smileyURL = editor.config.InsertSmiley.smileyURL;
-  var tbody = document.getElementById("smileytable");
-  var inum;
-  var trow;
-  for(var i = 0; i < smileyList.length; i++) {
-    if((i) % 4 == 0) {
-      trow = tbody.insertRow((i ) / 4);
-    }
-   trow.insertCell((i) % 4).innerHTML = '<a onclick="onOK(\'' + encodeURIComponent( smileyList[i] ) + '\')" href="javascript:void(0);"><img style="border: 0px;" alt="Smiley ' + (i +1) + '" src="'+ smileyURL + encodeURIComponent(smileyList[i]) + '" />';
-  }
-}
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-function onOK(smileyfile) {
-  var params = {};
-  params.smileyfile = smileyfile;
-  __dlg_close(params);
-  return false;
-}
-
-</script>
-
-<style type="text/css">
-.buttons {border-top: 1px solid #999; padding: 5px; text-align: right; height: 20px; }
-</style>
-</head>
-  <body class="dialog" onload="Init()">
-<form action="" method="get">
-  <div class="title" style="width: 360px;">Insert Smiley</div>
-  <div style="height: 175px; overflow:auto;" align="center">
-  <table style="border: 0; width: 370px;" id="smileytable">
-  </table>
-  </div>
-<div class="space"></div>
-<div class="buttons">
-<button type="button" onclick="return onCancel();">Cancel</button>
-</div>
-<div id="showselect" style="position:absolute; left:7px; top:75px; width:150px; z-index:100; visibility: visible; height: 13px; color: red;">
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys.txt b/web/imcms/xinha/plugins/InsertSmiley/smileys.txt
deleted file mode 100644
index b9df21b5f9..0000000000
--- a/web/imcms/xinha/plugins/InsertSmiley/smileys.txt
+++ /dev/null
@@ -1,580 +0,0 @@
-0001.gif
-0002.gif
-0003.gif
-0004.gif
-0005.gif
-0006.gif
-0007.gif
-0008.gif
-0009.gif
-0010.gif
-0011.gif
-0012.gif
-0013.gif
-0014.gif
-0015.gif
-0016.gif
-0017.gif
-0018.gif
-0019.gif
-0020.gif
-0021.gif
-0022.gif
-0023.gif
-0024.gif
-0025.gif
-0026.gif
-0027.gif
-0028.gif
-0029.gif
-0030.gif
-0031.gif
-0032.gif
-0033.gif
-0034.gif
-0035.gif
-0036.gif
-0037.gif
-0038.gif
-0039.gif
-0040.gif
-0041.gif
-0042.gif
-0043.gif
-0044.gif
-0045.gif
-0046.gif
-0047.gif
-0048.gif
-0049.gif
-0050.gif
-0051.gif
-0052.gif
-0053.gif
-0054.gif
-0055.gif
-0056.gif
-0057.gif
-0058.gif
-0059.gif
-0060.gif
-0061.gif
-0062.gif
-0063.gif
-0064.gif
-0065.gif
-0066.gif
-0067.gif
-0068.gif
-0069.gif
-0070.gif
-0071.gif
-0072.gif
-0073.gif
-0074.gif
-0075.gif
-0076.gif
-0077.gif
-0078.gif
-0079.gif
-0080.gif
-0081.gif
-0082.gif
-0083.gif
-0084.gif
-0085.gif
-0086.gif
-0087.gif
-0088.gif
-0089.gif
-0090.gif
-0091.gif
-0092.gif
-0093.gif
-0094.gif
-0095.gif
-0096.gif
-0097.gif
-0098.gif
-0099.gif
-0100.gif
-0101.gif
-0102.gif
-0103.gif
-0104.gif
-0105.gif
-0106.gif
-0107.gif
-0108.gif
-0109.gif
-0110.gif
-0111.gif
-0112.gif
-0113.gif
-0114.gif
-0115.gif
-0116.gif
-0117.gif
-0118.gif
-0119.gif
-0120.gif
-0121.gif
-0122.gif
-0123.gif
-0124.gif
-0125.gif
-0126.gif
-0127.gif
-0128.gif
-0129.gif
-0130.gif
-0131.gif
-0132.gif
-0133.gif
-0134.gif
-0135.gif
-0136.gif
-0137.gif
-0138.gif
-0139.gif
-0140.gif
-0141.gif
-0142.gif
-0143.gif
-0144.gif
-0145.gif
-0146.gif
-0147.gif
-0148.gif
-0149.gif
-0150.gif
-0151.gif
-0152.gif
-0153.gif
-0154.gif
-0155.gif
-0156.gif
-0157.gif
-0158.gif
-0159.gif
-0160.gif
-0161.gif
-0162.gif
-0163.gif
-0164.gif
-0165.gif
-0166.gif
-0167.gif
-0168.gif
-0169.gif
-0170.gif
-0171.gif
-0172.gif
-0173.gif
-0174.gif
-0175.gif
-0176.gif
-0177.gif
-0178.gif
-0179.gif
-0180.gif
-0181.gif
-0182.gif
-0183.gif
-0184.gif
-0185.gif
-0186.gif
-0187.gif
-0188.gif
-0189.gif
-0190.gif
-0191.gif
-0192.gif
-0193.gif
-0194.gif
-0195.gif
-0196.gif
-0197.gif
-0198.gif
-0199.gif
-0200.gif
-0201.gif
-0202.gif
-0203.gif
-0204.gif
-0205.gif
-0206.gif
-0207.gif
-0208.gif
-0209.gif
-0210.gif
-0211.gif
-0212.gif
-0213.gif
-0214.gif
-0215.gif
-0216.gif
-0217.gif
-0218.gif
-0219.gif
-0220.gif
-0221.gif
-0222.gif
-0223.gif
-0224.gif
-0225.gif
-0226.gif
-0227.gif
-0228.gif
-0229.gif
-0230.gif
-0231.gif
-0232.gif
-0233.gif
-0234.gif
-0235.gif
-0236.gif
-0237.gif
-0238.gif
-0239.gif
-0240.gif
-0241.gif
-0242.gif
-0243.gif
-0244.gif
-0245.gif
-0246.gif
-0247.gif
-0248.gif
-0249.gif
-0250.gif
-0251.gif
-0252.gif
-0253.gif
-0254.gif
-0255.gif
-0256.gif
-0257.gif
-0258.gif
-0259.gif
-0260.gif
-0261.gif
-0262.gif
-0263.gif
-0264.gif
-0265.gif
-0266.gif
-0267.gif
-0268.gif
-0269.gif
-0270.gif
-0271.gif
-0272.gif
-0273.gif
-0274.gif
-0275.gif
-0276.gif
-0277.gif
-0278.gif
-0279.gif
-0280.gif
-0281.gif
-0282.gif
-0283.gif
-0284.gif
-0285.gif
-0286.gif
-0287.gif
-0288.gif
-0289.gif
-0290.gif
-0291.gif
-0292.gif
-0293.gif
-0294.gif
-0295.gif
-0296.gif
-0297.gif
-0298.gif
-0299.gif
-0300.gif
-0301.gif
-0302.gif
-0303.gif
-0304.gif
-0305.gif
-0306.gif
-0307.gif
-0308.gif
-0309.gif
-0310.gif
-0311.gif
-0312.gif
-0313.gif
-0314.gif
-0315.gif
-0316.gif
-0317.gif
-0318.gif
-0319.gif
-0320.gif
-0321.gif
-0322.gif
-0323.gif
-0324.gif
-0325.gif
-0326.gif
-0327.gif
-0328.gif
-0329.gif
-0330.gif
-0331.gif
-0332.gif
-0333.gif
-0334.gif
-0335.gif
-0336.gif
-0337.gif
-0338.gif
-0339.gif
-0340.gif
-0341.gif
-0342.gif
-0343.gif
-0344.gif
-0345.gif
-0346.gif
-0347.gif
-0348.gif
-0349.gif
-0350.gif
-0351.gif
-0352.gif
-0353.gif
-0354.gif
-0355.gif
-0356.gif
-0357.gif
-0358.gif
-0359.gif
-0360.gif
-0361.gif
-0362.gif
-0363.gif
-0364.gif
-0365.gif
-0366.gif
-0367.gif
-0368.gif
-0369.gif
-0370.gif
-0371.gif
-0372.gif
-0373.gif
-0374.gif
-0375.gif
-0376.gif
-0377.gif
-0378.gif
-0379.gif
-0380.gif
-0381.gif
-0382.gif
-0383.gif
-0384.gif
-0385.gif
-0386.gif
-0387.gif
-0388.gif
-0389.gif
-0390.gif
-0391.gif
-0392.gif
-0393.gif
-0394.gif
-0395.gif
-0396.gif
-0397.gif
-0398.gif
-0399.gif
-0400.gif
-0401.gif
-0402.gif
-0403.gif
-0404.gif
-0405.gif
-0406.gif
-0407.gif
-0408.gif
-0409.gif
-0410.gif
-0411.gif
-0412.gif
-0413.gif
-0414.gif
-0415.gif
-0416.gif
-0417.gif
-0418.gif
-0419.gif
-0420.gif
-0421.gif
-0422.gif
-0423.gif
-0424.gif
-0425.gif
-0426.gif
-0427.gif
-0428.gif
-0429.gif
-0430.gif
-0431.gif
-0432.gif
-0433.gif
-0434.gif
-0435.gif
-0436.gif
-0437.gif
-0438.gif
-0439.gif
-0440.gif
-0441.gif
-0442.gif
-0443.gif
-0444.gif
-0445.gif
-0446.gif
-0447.gif
-0448.gif
-0449.gif
-0450.gif
-0451.gif
-0452.gif
-0453.gif
-0454.gif
-0455.gif
-0456.gif
-0457.gif
-0458.gif
-0459.gif
-0460.gif
-0461.gif
-0462.gif
-0463.gif
-0464.gif
-0465.gif
-0466.gif
-0467.gif
-0468.gif
-0469.gif
-0470.gif
-0471.gif
-0472.gif
-0473.gif
-0474.gif
-0475.gif
-0476.gif
-0477.gif
-0478.gif
-0479.gif
-0480.gif
-0481.gif
-0482.gif
-0483.gif
-0484.gif
-0485.gif
-0486.gif
-0487.gif
-0488.gif
-0489.gif
-0490.gif
-0491.gif
-0492.gif
-0493.gif
-0494.gif
-0495.gif
-0496.gif
-0497.gif
-0498.gif
-0499.gif
-0500.gif
-0501.gif
-0502.gif
-0503.gif
-0504.gif
-0505.gif
-0506.gif
-0507.gif
-0508.gif
-0509.gif
-0510.gif
-0511.gif
-0512.gif
-0513.gif
-0514.gif
-0515.gif
-0516.gif
-0517.gif
-0518.gif
-0519.gif
-0520.gif
-0521.gif
-0522.gif
-0523.gif
-0524.gif
-0525.gif
-0526.gif
-0527.gif
-0528.gif
-0529.gif
-0530.gif
-0531.gif
-0532.gif
-0533.gif
-0534.gif
-0535.gif
-0536.gif
-0537.gif
-0538.gif
-0539.gif
-0540.gif
-0541.gif
-0542.gif
-0543.gif
-0544.gif
-0545.gif
-0546.gif
-0547.gif
-0548.gif
-0549.gif
-0550.gif
-0551.gif
-0552.gif
-0553.gif
-0554.gif
-0555.gif
-0556.gif
-0557.gif
-0558.gif
-0559.gif
-0560.gif
-0561.gif
-0562.gif
-0563.gif
-0564.gif
-0565.gif
-0566.gif
-0567.gif
-0568.gif
-0569.gif
-0570.gif
-0571.gif
-0572.gif
-0573.gif
-0574.gif
-0575.gif
-0576.gif
-0577.gif
-0578.gif
-0579.gif
-0580.gif
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0001.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0001.gif
deleted file mode 100644
index 238a578733..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0001.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0002.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0002.gif
deleted file mode 100644
index 56c69cf931..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0002.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0003.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0003.gif
deleted file mode 100644
index 4a1efb4605..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0003.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0004.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0004.gif
deleted file mode 100644
index 3bc068f10f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0004.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0005.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0005.gif
deleted file mode 100644
index a3aa1f0ea9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0005.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0006.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0006.gif
deleted file mode 100644
index 25047b2e7b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0006.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0007.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0007.gif
deleted file mode 100644
index 172e7f0d80..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0007.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0008.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0008.gif
deleted file mode 100644
index 484111b63e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0008.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0009.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0009.gif
deleted file mode 100644
index 55b44449ba..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0009.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0010.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0010.gif
deleted file mode 100644
index 37234b92f8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0010.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0011.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0011.gif
deleted file mode 100644
index 655740f3c1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0011.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0012.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0012.gif
deleted file mode 100644
index 7bc856de72..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0012.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0013.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0013.gif
deleted file mode 100644
index 99945846de..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0013.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0014.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0014.gif
deleted file mode 100644
index 7a872278a5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0014.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0015.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0015.gif
deleted file mode 100644
index b5c4a8d287..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0015.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0016.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0016.gif
deleted file mode 100644
index 987faf1add..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0016.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0017.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0017.gif
deleted file mode 100644
index 597209d9cc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0017.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0018.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0018.gif
deleted file mode 100644
index 340528d080..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0018.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0019.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0019.gif
deleted file mode 100644
index b064466530..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0019.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0020.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0020.gif
deleted file mode 100644
index 621017d422..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0020.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0021.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0021.gif
deleted file mode 100644
index 2bc7854180..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0021.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0022.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0022.gif
deleted file mode 100644
index d2ee1e24c0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0022.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0023.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0023.gif
deleted file mode 100644
index cafb2928f3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0023.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0024.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0024.gif
deleted file mode 100644
index a5f53a8717..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0024.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0025.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0025.gif
deleted file mode 100644
index b113cb3ec4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0025.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0026.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0026.gif
deleted file mode 100644
index 87de31e1c0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0026.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0027.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0027.gif
deleted file mode 100644
index c212261018..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0027.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0028.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0028.gif
deleted file mode 100644
index 31335117be..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0028.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0029.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0029.gif
deleted file mode 100644
index c211257712..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0029.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0030.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0030.gif
deleted file mode 100644
index e87e392177..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0030.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0031.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0031.gif
deleted file mode 100644
index 44854588b7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0031.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0032.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0032.gif
deleted file mode 100644
index df02ce1995..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0032.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0033.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0033.gif
deleted file mode 100644
index 6aaebdb38d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0033.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0034.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0034.gif
deleted file mode 100644
index d3db58a8ce..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0034.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0035.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0035.gif
deleted file mode 100644
index 0435edbf79..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0035.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0036.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0036.gif
deleted file mode 100644
index f571bdf4d1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0036.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0037.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0037.gif
deleted file mode 100644
index 0a65e0c3ed..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0037.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0038.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0038.gif
deleted file mode 100644
index c9011f1765..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0038.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0039.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0039.gif
deleted file mode 100644
index af1f39d3bf..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0039.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0040.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0040.gif
deleted file mode 100644
index 72bab2befa..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0040.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0041.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0041.gif
deleted file mode 100644
index e8cfaf7e9f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0041.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0042.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0042.gif
deleted file mode 100644
index 1d56ad38c9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0042.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0043.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0043.gif
deleted file mode 100644
index c523b7463d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0043.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0044.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0044.gif
deleted file mode 100644
index 6b9aeacac0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0044.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0045.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0045.gif
deleted file mode 100644
index 937784cd02..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0045.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0046.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0046.gif
deleted file mode 100644
index e7cf33e597..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0046.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0047.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0047.gif
deleted file mode 100644
index 7f63a31657..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0047.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0048.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0048.gif
deleted file mode 100644
index 54733f42eb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0048.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0049.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0049.gif
deleted file mode 100644
index 57fedea047..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0049.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0050.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0050.gif
deleted file mode 100644
index da34622a2e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0050.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0051.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0051.gif
deleted file mode 100644
index e55ed9b207..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0051.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0052.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0052.gif
deleted file mode 100644
index 4caf558a78..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0052.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0053.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0053.gif
deleted file mode 100644
index 13f5b60e72..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0053.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0054.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0054.gif
deleted file mode 100644
index d53ff3bb67..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0054.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0055.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0055.gif
deleted file mode 100644
index 2dc010af88..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0055.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0056.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0056.gif
deleted file mode 100644
index edbad31c80..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0056.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0057.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0057.gif
deleted file mode 100644
index 9db413b331..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0057.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0058.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0058.gif
deleted file mode 100644
index 2aaa34d942..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0058.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0059.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0059.gif
deleted file mode 100644
index de28637514..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0059.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0060.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0060.gif
deleted file mode 100644
index cc3187dfaf..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0060.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0061.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0061.gif
deleted file mode 100644
index b23482ff67..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0061.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0062.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0062.gif
deleted file mode 100644
index ce72ac3a42..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0062.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0063.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0063.gif
deleted file mode 100644
index 47106bb0df..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0063.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0064.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0064.gif
deleted file mode 100644
index 560a370572..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0064.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0065.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0065.gif
deleted file mode 100644
index 29dc07f6b5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0065.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0066.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0066.gif
deleted file mode 100644
index 872e9be008..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0066.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0067.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0067.gif
deleted file mode 100644
index 31b93c79e4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0067.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0068.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0068.gif
deleted file mode 100644
index ddc9f461a8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0068.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0069.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0069.gif
deleted file mode 100644
index 5357a5c11a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0069.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0070.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0070.gif
deleted file mode 100644
index abcd2f81ee..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0070.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0071.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0071.gif
deleted file mode 100644
index 7248d26700..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0071.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0072.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0072.gif
deleted file mode 100644
index 58bbe44e61..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0072.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0073.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0073.gif
deleted file mode 100644
index 3a637546a4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0073.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0074.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0074.gif
deleted file mode 100644
index 7b6f1267ac..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0074.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0075.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0075.gif
deleted file mode 100644
index 011a669822..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0075.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0076.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0076.gif
deleted file mode 100644
index 769fc706bd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0076.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0077.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0077.gif
deleted file mode 100644
index be55bcd221..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0077.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0078.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0078.gif
deleted file mode 100644
index 004b78fe6c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0078.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0079.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0079.gif
deleted file mode 100644
index 5993d1b272..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0079.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0080.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0080.gif
deleted file mode 100644
index 8d84c82c27..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0080.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0081.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0081.gif
deleted file mode 100644
index 970792675c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0081.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0082.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0082.gif
deleted file mode 100644
index aba12e1912..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0082.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0083.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0083.gif
deleted file mode 100644
index 1da72fdb2f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0083.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0084.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0084.gif
deleted file mode 100644
index a82e3fc643..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0084.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0085.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0085.gif
deleted file mode 100644
index 42640c6572..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0085.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0086.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0086.gif
deleted file mode 100644
index 56aef5b46a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0086.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0087.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0087.gif
deleted file mode 100644
index 4dcbd104bc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0087.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0088.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0088.gif
deleted file mode 100644
index 7f7f7e5022..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0088.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0089.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0089.gif
deleted file mode 100644
index d115137309..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0089.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0090.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0090.gif
deleted file mode 100644
index d49ac7c603..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0090.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0091.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0091.gif
deleted file mode 100644
index cae5f9c399..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0091.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0092.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0092.gif
deleted file mode 100644
index 7ffc5b64ff..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0092.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0093.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0093.gif
deleted file mode 100644
index 5b14b9f62f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0093.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0094.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0094.gif
deleted file mode 100644
index 6077070be3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0094.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0095.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0095.gif
deleted file mode 100644
index 7a443ef095..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0095.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0096.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0096.gif
deleted file mode 100644
index b399d37085..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0096.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0097.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0097.gif
deleted file mode 100644
index 0b43e39ac1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0097.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0098.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0098.gif
deleted file mode 100644
index c0815a2649..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0098.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0099.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0099.gif
deleted file mode 100644
index c58bba2894..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0099.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0100.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0100.gif
deleted file mode 100644
index fe8ec9890b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0100.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0101.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0101.gif
deleted file mode 100644
index 60b397f772..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0101.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0102.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0102.gif
deleted file mode 100644
index d24c18ff3d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0102.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0103.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0103.gif
deleted file mode 100644
index a3869958d5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0103.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0104.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0104.gif
deleted file mode 100644
index 677367a4f3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0104.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0105.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0105.gif
deleted file mode 100644
index 86387311f3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0105.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0106.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0106.gif
deleted file mode 100644
index 80f1911afd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0106.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0107.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0107.gif
deleted file mode 100644
index 0280285c50..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0107.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0108.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0108.gif
deleted file mode 100644
index a93448fae9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0108.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0109.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0109.gif
deleted file mode 100644
index 6ded79282b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0109.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0110.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0110.gif
deleted file mode 100644
index 4102a82083..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0110.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0111.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0111.gif
deleted file mode 100644
index 8df32aa85a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0111.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0112.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0112.gif
deleted file mode 100644
index d0aa063732..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0112.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0113.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0113.gif
deleted file mode 100644
index 7e1506da19..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0113.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0114.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0114.gif
deleted file mode 100644
index 5ad86ece3d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0114.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0115.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0115.gif
deleted file mode 100644
index 856bab2e25..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0115.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0116.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0116.gif
deleted file mode 100644
index 86049d353a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0116.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0117.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0117.gif
deleted file mode 100644
index 148fefaa1e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0117.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0118.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0118.gif
deleted file mode 100644
index 8cd9ca8c0c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0118.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0119.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0119.gif
deleted file mode 100644
index fde2e800bb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0119.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0120.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0120.gif
deleted file mode 100644
index ec6f14d58c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0120.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0121.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0121.gif
deleted file mode 100644
index 1526a4b35a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0121.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0122.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0122.gif
deleted file mode 100644
index 1052e3ba76..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0122.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0123.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0123.gif
deleted file mode 100644
index 21d0727411..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0123.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0124.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0124.gif
deleted file mode 100644
index c01da803b8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0124.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0125.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0125.gif
deleted file mode 100644
index 289fdd7fc1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0125.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0126.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0126.gif
deleted file mode 100644
index 03b2d4f51a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0126.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0127.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0127.gif
deleted file mode 100644
index 3c1a0dcf7c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0127.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0128.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0128.gif
deleted file mode 100644
index 53e2857d25..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0128.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0129.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0129.gif
deleted file mode 100644
index 8cd07ef74e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0129.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0130.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0130.gif
deleted file mode 100644
index 97ec68ba20..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0130.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0131.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0131.gif
deleted file mode 100644
index a2f4ebd074..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0131.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0132.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0132.gif
deleted file mode 100644
index 5643c24bfb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0132.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0133.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0133.gif
deleted file mode 100644
index b47dbae045..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0133.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0134.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0134.gif
deleted file mode 100644
index e5ea37053b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0134.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0135.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0135.gif
deleted file mode 100644
index 6b10d5da0c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0135.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0136.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0136.gif
deleted file mode 100644
index fbf0c43979..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0136.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0137.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0137.gif
deleted file mode 100644
index bc7f44b71a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0137.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0138.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0138.gif
deleted file mode 100644
index b64b9b86da..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0138.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0139.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0139.gif
deleted file mode 100644
index f1a45050b2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0139.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0140.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0140.gif
deleted file mode 100644
index beac2a909f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0140.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0141.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0141.gif
deleted file mode 100644
index 834eeba4d2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0141.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0142.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0142.gif
deleted file mode 100644
index 1906ffdae8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0142.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0143.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0143.gif
deleted file mode 100644
index 3888f75bb9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0143.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0144.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0144.gif
deleted file mode 100644
index af9b4aa4db..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0144.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0145.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0145.gif
deleted file mode 100644
index 12e8c667c1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0145.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0146.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0146.gif
deleted file mode 100644
index 892b02d48b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0146.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0147.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0147.gif
deleted file mode 100644
index 5fb2fb5773..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0147.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0148.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0148.gif
deleted file mode 100644
index 3af031f451..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0148.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0149.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0149.gif
deleted file mode 100644
index 5149195387..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0149.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0150.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0150.gif
deleted file mode 100644
index fce01fdb06..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0150.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0151.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0151.gif
deleted file mode 100644
index 066889a7c4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0151.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0152.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0152.gif
deleted file mode 100644
index fd7a2b116e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0152.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0153.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0153.gif
deleted file mode 100644
index 99f9ce478d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0153.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0154.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0154.gif
deleted file mode 100644
index 02c14ed33f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0154.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0155.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0155.gif
deleted file mode 100644
index 3935907a7b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0155.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0156.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0156.gif
deleted file mode 100644
index 4bc49532b3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0156.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0157.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0157.gif
deleted file mode 100644
index 6cd13ee3d3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0157.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0158.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0158.gif
deleted file mode 100644
index 0fa63122a8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0158.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0159.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0159.gif
deleted file mode 100644
index ef7eb8bc65..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0159.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0160.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0160.gif
deleted file mode 100644
index 964b20190d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0160.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0161.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0161.gif
deleted file mode 100644
index 1078bcd4b0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0161.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0162.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0162.gif
deleted file mode 100644
index 784966f46f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0162.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0163.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0163.gif
deleted file mode 100644
index 92d020695c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0163.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0164.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0164.gif
deleted file mode 100644
index 71590e6ce0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0164.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0165.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0165.gif
deleted file mode 100644
index e59c708c47..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0165.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0166.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0166.gif
deleted file mode 100644
index 523fdf047a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0166.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0167.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0167.gif
deleted file mode 100644
index 7219fec3ae..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0167.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0168.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0168.gif
deleted file mode 100644
index dba32c2806..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0168.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0169.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0169.gif
deleted file mode 100644
index b60b90d2fe..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0169.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0170.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0170.gif
deleted file mode 100644
index 3f93cc0c4c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0170.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0171.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0171.gif
deleted file mode 100644
index 91b4b4124e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0171.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0172.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0172.gif
deleted file mode 100644
index b4f299e6d1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0172.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0173.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0173.gif
deleted file mode 100644
index 149cf47869..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0173.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0174.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0174.gif
deleted file mode 100644
index 756d5ad28b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0174.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0175.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0175.gif
deleted file mode 100644
index c8a076d5f6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0175.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0176.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0176.gif
deleted file mode 100644
index d07e8b9d80..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0176.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0177.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0177.gif
deleted file mode 100644
index 3286e6dab5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0177.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0178.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0178.gif
deleted file mode 100644
index 1622eb0cdc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0178.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0179.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0179.gif
deleted file mode 100644
index 6be265a93d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0179.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0180.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0180.gif
deleted file mode 100644
index 8880fcae6e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0180.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0181.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0181.gif
deleted file mode 100644
index 1bbab8868e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0181.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0182.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0182.gif
deleted file mode 100644
index 72d3314e02..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0182.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0183.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0183.gif
deleted file mode 100644
index b23bf31e6f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0183.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0184.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0184.gif
deleted file mode 100644
index 8d717c9e77..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0184.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0185.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0185.gif
deleted file mode 100644
index bca62916c2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0185.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0186.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0186.gif
deleted file mode 100644
index 4fca00aef7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0186.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0187.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0187.gif
deleted file mode 100644
index b8cefee349..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0187.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0188.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0188.gif
deleted file mode 100644
index 148ac9528d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0188.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0189.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0189.gif
deleted file mode 100644
index aa10a16241..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0189.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0190.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0190.gif
deleted file mode 100644
index a70b333d6f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0190.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0191.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0191.gif
deleted file mode 100644
index 5d0b6c1fad..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0191.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0192.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0192.gif
deleted file mode 100644
index d727b47532..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0192.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0193.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0193.gif
deleted file mode 100644
index eee78fab14..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0193.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0194.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0194.gif
deleted file mode 100644
index 0ad20996d2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0194.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0195.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0195.gif
deleted file mode 100644
index eb6c3e0d37..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0195.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0196.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0196.gif
deleted file mode 100644
index 2b0dd097eb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0196.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0197.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0197.gif
deleted file mode 100644
index dc71a87b2c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0197.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0198.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0198.gif
deleted file mode 100644
index 344eca6cb7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0198.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0199.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0199.gif
deleted file mode 100644
index 24cb0c43fb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0199.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0200.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0200.gif
deleted file mode 100644
index c4dd7196f4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0200.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0201.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0201.gif
deleted file mode 100644
index db6a8248c6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0201.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0202.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0202.gif
deleted file mode 100644
index d71b2b3a69..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0202.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0203.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0203.gif
deleted file mode 100644
index 3927d9c47b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0203.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0204.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0204.gif
deleted file mode 100644
index b095e07b29..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0204.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0205.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0205.gif
deleted file mode 100644
index 1729c9a1c6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0205.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0206.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0206.gif
deleted file mode 100644
index 3230b3c8ca..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0206.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0207.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0207.gif
deleted file mode 100644
index 97ac0efe34..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0207.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0208.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0208.gif
deleted file mode 100644
index 9fbea09a10..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0208.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0209.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0209.gif
deleted file mode 100644
index fc37d0e543..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0209.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0210.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0210.gif
deleted file mode 100644
index 248a5ac9b3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0210.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0211.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0211.gif
deleted file mode 100644
index 6c0023d819..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0211.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0212.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0212.gif
deleted file mode 100644
index 9255a00566..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0212.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0213.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0213.gif
deleted file mode 100644
index 9c3190cfbf..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0213.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0214.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0214.gif
deleted file mode 100644
index 7b3615c34e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0214.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0215.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0215.gif
deleted file mode 100644
index fbb478e94c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0215.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0216.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0216.gif
deleted file mode 100644
index b1d4f3202d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0216.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0217.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0217.gif
deleted file mode 100644
index 0c15467690..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0217.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0218.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0218.gif
deleted file mode 100644
index 8ae775d599..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0218.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0219.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0219.gif
deleted file mode 100644
index b245fd7be7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0219.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0220.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0220.gif
deleted file mode 100644
index b2fbe37c70..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0220.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0221.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0221.gif
deleted file mode 100644
index b4a45fed90..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0221.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0222.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0222.gif
deleted file mode 100644
index 9ba6ca0134..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0222.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0223.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0223.gif
deleted file mode 100644
index 8740f4fdca..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0223.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0224.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0224.gif
deleted file mode 100644
index d47456c668..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0224.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0225.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0225.gif
deleted file mode 100644
index fa8ab24fab..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0225.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0226.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0226.gif
deleted file mode 100644
index 8f51d88f29..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0226.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0227.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0227.gif
deleted file mode 100644
index 73b8b2a94b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0227.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0228.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0228.gif
deleted file mode 100644
index 0acf7daf14..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0228.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0229.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0229.gif
deleted file mode 100644
index dd7e0462c4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0229.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0230.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0230.gif
deleted file mode 100644
index aff8f28ec4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0230.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0231.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0231.gif
deleted file mode 100644
index d7e5acc21a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0231.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0232.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0232.gif
deleted file mode 100644
index ccf5210ec2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0232.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0233.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0233.gif
deleted file mode 100644
index 427514227d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0233.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0234.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0234.gif
deleted file mode 100644
index 7411711c35..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0234.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0235.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0235.gif
deleted file mode 100644
index 0ac330c46d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0235.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0236.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0236.gif
deleted file mode 100644
index 2c8b5b21d1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0236.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0237.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0237.gif
deleted file mode 100644
index de8fc76f49..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0237.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0238.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0238.gif
deleted file mode 100644
index 74242dd5de..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0238.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0239.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0239.gif
deleted file mode 100644
index 0e7f749f90..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0239.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0240.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0240.gif
deleted file mode 100644
index ab1fbc7dad..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0240.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0241.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0241.gif
deleted file mode 100644
index 353338e33c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0241.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0242.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0242.gif
deleted file mode 100644
index 222f7cfbfb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0242.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0243.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0243.gif
deleted file mode 100644
index fdce1e18b8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0243.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0244.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0244.gif
deleted file mode 100644
index 76cf476eb0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0244.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0245.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0245.gif
deleted file mode 100644
index aae5398c8b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0245.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0246.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0246.gif
deleted file mode 100644
index c64d668113..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0246.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0247.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0247.gif
deleted file mode 100644
index 3b812ab762..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0247.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0248.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0248.gif
deleted file mode 100644
index f884b70454..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0248.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0249.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0249.gif
deleted file mode 100644
index b1fd527a02..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0249.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0250.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0250.gif
deleted file mode 100644
index 4de32eed24..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0250.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0251.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0251.gif
deleted file mode 100644
index f2b3ab79af..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0251.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0252.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0252.gif
deleted file mode 100644
index bb664e36fc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0252.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0253.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0253.gif
deleted file mode 100644
index e671bc002d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0253.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0254.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0254.gif
deleted file mode 100644
index 2c8abe140d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0254.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0255.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0255.gif
deleted file mode 100644
index b2370ffa91..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0255.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0256.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0256.gif
deleted file mode 100644
index 134d27059d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0256.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0257.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0257.gif
deleted file mode 100644
index 29f1f69ae2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0257.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0258.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0258.gif
deleted file mode 100644
index 16a2938cc9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0258.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0259.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0259.gif
deleted file mode 100644
index 48615dfa7d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0259.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0260.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0260.gif
deleted file mode 100644
index 499e1cb41d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0260.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0261.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0261.gif
deleted file mode 100644
index a4548a71d1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0261.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0262.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0262.gif
deleted file mode 100644
index 287a7629b8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0262.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0263.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0263.gif
deleted file mode 100644
index 7d063391cd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0263.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0264.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0264.gif
deleted file mode 100644
index f2bcff9dd2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0264.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0265.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0265.gif
deleted file mode 100644
index de93801cb6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0265.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0266.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0266.gif
deleted file mode 100644
index e6f75c9e4c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0266.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0267.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0267.gif
deleted file mode 100644
index 4451682d07..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0267.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0268.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0268.gif
deleted file mode 100644
index afb40aecb1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0268.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0269.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0269.gif
deleted file mode 100644
index d53e4dc62c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0269.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0270.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0270.gif
deleted file mode 100644
index 74b83af4e1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0270.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0271.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0271.gif
deleted file mode 100644
index d655621f92..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0271.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0272.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0272.gif
deleted file mode 100644
index 21590b116f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0272.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0273.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0273.gif
deleted file mode 100644
index 5fb0f9232c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0273.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0274.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0274.gif
deleted file mode 100644
index 79b22bcff4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0274.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0275.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0275.gif
deleted file mode 100644
index fbf0835212..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0275.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0276.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0276.gif
deleted file mode 100644
index f166b53e58..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0276.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0277.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0277.gif
deleted file mode 100644
index 9084bdbf43..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0277.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0278.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0278.gif
deleted file mode 100644
index 8614a33316..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0278.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0279.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0279.gif
deleted file mode 100644
index 264ff9b03e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0279.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0280.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0280.gif
deleted file mode 100644
index 43fe9c418a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0280.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0281.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0281.gif
deleted file mode 100644
index 9109644f23..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0281.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0282.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0282.gif
deleted file mode 100644
index 1135f2cf88..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0282.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0283.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0283.gif
deleted file mode 100644
index 93b02a32a2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0283.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0284.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0284.gif
deleted file mode 100644
index 0fb928887e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0284.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0285.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0285.gif
deleted file mode 100644
index ca651db3ca..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0285.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0286.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0286.gif
deleted file mode 100644
index f8b7b2b553..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0286.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0287.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0287.gif
deleted file mode 100644
index d3995bd505..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0287.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0288.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0288.gif
deleted file mode 100644
index fa30339eb5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0288.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0289.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0289.gif
deleted file mode 100644
index c256ec2265..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0289.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0290.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0290.gif
deleted file mode 100644
index 6ee69184e4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0290.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0291.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0291.gif
deleted file mode 100644
index d17ad8d927..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0291.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0292.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0292.gif
deleted file mode 100644
index e340e655fd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0292.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0293.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0293.gif
deleted file mode 100644
index 4344fc7433..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0293.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0294.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0294.gif
deleted file mode 100644
index 8bd045142c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0294.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0295.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0295.gif
deleted file mode 100644
index 433d4750d9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0295.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0296.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0296.gif
deleted file mode 100644
index 3ab9bfff9d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0296.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0297.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0297.gif
deleted file mode 100644
index 3b8e88cb3d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0297.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0298.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0298.gif
deleted file mode 100644
index 972c50631e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0298.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0299.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0299.gif
deleted file mode 100644
index 8531a3e591..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0299.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0300.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0300.gif
deleted file mode 100644
index 08f2cf01fd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0300.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0301.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0301.gif
deleted file mode 100644
index 52a8a0c96c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0301.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0302.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0302.gif
deleted file mode 100644
index 5820866fc4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0302.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0303.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0303.gif
deleted file mode 100644
index 70fc6b9878..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0303.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0304.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0304.gif
deleted file mode 100644
index 8a810e4e3a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0304.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0305.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0305.gif
deleted file mode 100644
index ccf8122cdf..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0305.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0306.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0306.gif
deleted file mode 100644
index 8e4b5389d7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0306.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0307.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0307.gif
deleted file mode 100644
index eb46d6b792..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0307.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0308.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0308.gif
deleted file mode 100644
index 5353eb49be..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0308.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0309.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0309.gif
deleted file mode 100644
index 63974c6f26..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0309.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0310.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0310.gif
deleted file mode 100644
index 10aeb5efa3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0310.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0311.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0311.gif
deleted file mode 100644
index 1c38f82602..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0311.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0312.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0312.gif
deleted file mode 100644
index bf21f7baf3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0312.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0313.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0313.gif
deleted file mode 100644
index 700842e1bd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0313.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0314.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0314.gif
deleted file mode 100644
index 52757dbe48..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0314.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0315.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0315.gif
deleted file mode 100644
index 52f47eac5d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0315.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0316.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0316.gif
deleted file mode 100644
index ccc868e320..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0316.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0317.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0317.gif
deleted file mode 100644
index 59c16e4e66..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0317.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0318.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0318.gif
deleted file mode 100644
index 0e99858c54..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0318.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0319.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0319.gif
deleted file mode 100644
index 8ae6ae540b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0319.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0320.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0320.gif
deleted file mode 100644
index fd3b26c766..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0320.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0321.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0321.gif
deleted file mode 100644
index baafb38756..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0321.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0322.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0322.gif
deleted file mode 100644
index 6dd94c205d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0322.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0323.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0323.gif
deleted file mode 100644
index 4a728a7e11..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0323.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0324.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0324.gif
deleted file mode 100644
index 35c1260155..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0324.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0325.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0325.gif
deleted file mode 100644
index 59dae12f38..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0325.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0326.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0326.gif
deleted file mode 100644
index e7854704a8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0326.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0327.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0327.gif
deleted file mode 100644
index 25d030cb7e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0327.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0328.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0328.gif
deleted file mode 100644
index a9e5405d73..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0328.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0329.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0329.gif
deleted file mode 100644
index 1594094f54..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0329.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0330.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0330.gif
deleted file mode 100644
index eac70906a1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0330.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0331.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0331.gif
deleted file mode 100644
index 3853f122ac..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0331.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0332.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0332.gif
deleted file mode 100644
index 46575a63fa..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0332.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0333.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0333.gif
deleted file mode 100644
index d9680041e5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0333.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0334.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0334.gif
deleted file mode 100644
index 93845e876a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0334.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0335.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0335.gif
deleted file mode 100644
index d87454b56f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0335.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0336.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0336.gif
deleted file mode 100644
index cd727847cd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0336.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0337.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0337.gif
deleted file mode 100644
index 1ffd693682..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0337.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0338.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0338.gif
deleted file mode 100644
index 58bcc4ddee..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0338.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0339.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0339.gif
deleted file mode 100644
index 532871acd3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0339.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0340.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0340.gif
deleted file mode 100644
index 8faca0100a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0340.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0341.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0341.gif
deleted file mode 100644
index 6310f4db71..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0341.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0342.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0342.gif
deleted file mode 100644
index d6cd98d9fb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0342.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0343.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0343.gif
deleted file mode 100644
index 3966faa7a6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0343.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0344.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0344.gif
deleted file mode 100644
index 13fbb1ced6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0344.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0345.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0345.gif
deleted file mode 100644
index 2d0f1861b4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0345.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0346.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0346.gif
deleted file mode 100644
index d19561feb3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0346.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0347.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0347.gif
deleted file mode 100644
index b76d6d4067..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0347.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0348.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0348.gif
deleted file mode 100644
index f0693f4a8f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0348.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0349.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0349.gif
deleted file mode 100644
index fa203322af..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0349.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0350.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0350.gif
deleted file mode 100644
index ef42ebd156..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0350.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0351.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0351.gif
deleted file mode 100644
index 128484221d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0351.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0352.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0352.gif
deleted file mode 100644
index 37c78138cd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0352.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0353.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0353.gif
deleted file mode 100644
index 17719e1da8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0353.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0354.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0354.gif
deleted file mode 100644
index 5014f20d51..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0354.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0355.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0355.gif
deleted file mode 100644
index 17676fdd6f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0355.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0356.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0356.gif
deleted file mode 100644
index 8f5d4336b4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0356.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0357.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0357.gif
deleted file mode 100644
index 3d15786673..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0357.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0358.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0358.gif
deleted file mode 100644
index 1dab12b888..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0358.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0359.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0359.gif
deleted file mode 100644
index d3e5b96f6e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0359.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0360.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0360.gif
deleted file mode 100644
index 3ba43e97b0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0360.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0361.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0361.gif
deleted file mode 100644
index 80f570c418..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0361.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0362.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0362.gif
deleted file mode 100644
index 415a64830f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0362.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0363.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0363.gif
deleted file mode 100644
index ff711ec910..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0363.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0364.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0364.gif
deleted file mode 100644
index 1c95898859..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0364.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0365.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0365.gif
deleted file mode 100644
index f1b8023141..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0365.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0366.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0366.gif
deleted file mode 100644
index 464e945167..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0366.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0367.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0367.gif
deleted file mode 100644
index f988f8eef2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0367.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0368.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0368.gif
deleted file mode 100644
index af4d48075a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0368.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0369.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0369.gif
deleted file mode 100644
index 76f8f5b6c0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0369.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0370.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0370.gif
deleted file mode 100644
index a687721b86..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0370.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0371.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0371.gif
deleted file mode 100644
index 039d04b6dc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0371.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0372.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0372.gif
deleted file mode 100644
index b4eb341761..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0372.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0373.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0373.gif
deleted file mode 100644
index a45a951b2d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0373.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0374.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0374.gif
deleted file mode 100644
index 11127316c5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0374.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0375.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0375.gif
deleted file mode 100644
index 1048c79141..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0375.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0376.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0376.gif
deleted file mode 100644
index 3ef8b5c77c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0376.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0377.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0377.gif
deleted file mode 100644
index 575661ad63..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0377.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0378.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0378.gif
deleted file mode 100644
index ec00d2ef60..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0378.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0379.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0379.gif
deleted file mode 100644
index bb78a3def1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0379.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0380.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0380.gif
deleted file mode 100644
index 6b48906b13..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0380.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0381.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0381.gif
deleted file mode 100644
index 7cd1f38c39..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0381.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0382.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0382.gif
deleted file mode 100644
index 250cbf65fc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0382.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0383.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0383.gif
deleted file mode 100644
index b1165ddd89..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0383.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0384.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0384.gif
deleted file mode 100644
index 5e11f12ef6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0384.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0385.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0385.gif
deleted file mode 100644
index cdd45bb7f3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0385.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0386.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0386.gif
deleted file mode 100644
index 26ec434b10..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0386.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0387.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0387.gif
deleted file mode 100644
index bd868bca2c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0387.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0388.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0388.gif
deleted file mode 100644
index 11ac139536..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0388.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0389.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0389.gif
deleted file mode 100644
index d292202503..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0389.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0390.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0390.gif
deleted file mode 100644
index adb8da5db7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0390.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0391.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0391.gif
deleted file mode 100644
index 2a8ac97af3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0391.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0392.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0392.gif
deleted file mode 100644
index 0b4d8c2a7e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0392.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0393.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0393.gif
deleted file mode 100644
index 6cc5548a8e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0393.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0394.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0394.gif
deleted file mode 100644
index 0aeb15acb2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0394.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0395.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0395.gif
deleted file mode 100644
index 7aa009a5d1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0395.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0396.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0396.gif
deleted file mode 100644
index 5326547788..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0396.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0397.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0397.gif
deleted file mode 100644
index e07a1058bd..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0397.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0398.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0398.gif
deleted file mode 100644
index 760cbda259..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0398.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0399.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0399.gif
deleted file mode 100644
index c7345fc655..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0399.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0400.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0400.gif
deleted file mode 100644
index f9aae9bf40..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0400.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0401.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0401.gif
deleted file mode 100644
index 6a7246901c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0401.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0402.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0402.gif
deleted file mode 100644
index 15fc4eb971..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0402.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0403.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0403.gif
deleted file mode 100644
index a6ecaa50e7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0403.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0404.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0404.gif
deleted file mode 100644
index 0f4c5f0a5f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0404.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0405.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0405.gif
deleted file mode 100644
index 5b0c5366aa..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0405.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0406.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0406.gif
deleted file mode 100644
index 9b791f5517..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0406.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0407.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0407.gif
deleted file mode 100644
index e4ca8ecb42..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0407.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0408.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0408.gif
deleted file mode 100644
index f0ae943401..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0408.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0409.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0409.gif
deleted file mode 100644
index de8e1b98b8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0409.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0410.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0410.gif
deleted file mode 100644
index 80907db00c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0410.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0411.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0411.gif
deleted file mode 100644
index a1d00819f4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0411.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0412.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0412.gif
deleted file mode 100644
index 3d2754d018..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0412.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0413.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0413.gif
deleted file mode 100644
index 358848c78b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0413.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0414.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0414.gif
deleted file mode 100644
index 82b228e937..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0414.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0415.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0415.gif
deleted file mode 100644
index d4020e1b5b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0415.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0416.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0416.gif
deleted file mode 100644
index 2984eb3a57..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0416.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0417.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0417.gif
deleted file mode 100644
index 8866359956..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0417.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0418.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0418.gif
deleted file mode 100644
index cfb252e11a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0418.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0419.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0419.gif
deleted file mode 100644
index 2081d0defe..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0419.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0420.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0420.gif
deleted file mode 100644
index c1739c77bc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0420.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0421.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0421.gif
deleted file mode 100644
index dec1b3e0ae..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0421.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0422.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0422.gif
deleted file mode 100644
index 46a1b95156..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0422.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0423.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0423.gif
deleted file mode 100644
index fd6d3e01ae..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0423.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0424.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0424.gif
deleted file mode 100644
index edf56a9378..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0424.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0425.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0425.gif
deleted file mode 100644
index 709b8da4e5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0425.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0426.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0426.gif
deleted file mode 100644
index 05a0428903..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0426.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0427.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0427.gif
deleted file mode 100644
index 9417463632..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0427.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0428.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0428.gif
deleted file mode 100644
index aef8802695..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0428.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0429.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0429.gif
deleted file mode 100644
index 9c91fbc88d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0429.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0430.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0430.gif
deleted file mode 100644
index a2090eebc4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0430.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0431.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0431.gif
deleted file mode 100644
index 643c540705..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0431.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0432.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0432.gif
deleted file mode 100644
index d4bc9de9fe..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0432.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0433.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0433.gif
deleted file mode 100644
index 4752195244..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0433.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0434.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0434.gif
deleted file mode 100644
index b3bc888da0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0434.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0435.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0435.gif
deleted file mode 100644
index 49e7d67b67..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0435.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0436.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0436.gif
deleted file mode 100644
index e9a78f4280..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0436.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0437.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0437.gif
deleted file mode 100644
index a1d9357841..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0437.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0438.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0438.gif
deleted file mode 100644
index defdaca1e9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0438.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0439.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0439.gif
deleted file mode 100644
index ef8dd539d5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0439.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0440.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0440.gif
deleted file mode 100644
index fec979c4df..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0440.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0441.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0441.gif
deleted file mode 100644
index 88915b2ea2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0441.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0442.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0442.gif
deleted file mode 100644
index 2662242ee9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0442.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0443.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0443.gif
deleted file mode 100644
index 7ee1684b11..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0443.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0444.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0444.gif
deleted file mode 100644
index 0afc238a33..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0444.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0445.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0445.gif
deleted file mode 100644
index 92624eda93..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0445.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0446.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0446.gif
deleted file mode 100644
index ff79030cab..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0446.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0447.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0447.gif
deleted file mode 100644
index 5a4acee7b6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0447.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0448.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0448.gif
deleted file mode 100644
index 6d67f6dc89..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0448.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0449.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0449.gif
deleted file mode 100644
index 5d85b7978c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0449.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0450.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0450.gif
deleted file mode 100644
index 7ea0eef58f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0450.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0451.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0451.gif
deleted file mode 100644
index 5f32d7b57b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0451.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0452.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0452.gif
deleted file mode 100644
index 48a86be792..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0452.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0453.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0453.gif
deleted file mode 100644
index 0344b24ded..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0453.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0454.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0454.gif
deleted file mode 100644
index 260502924e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0454.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0455.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0455.gif
deleted file mode 100644
index 7863ddbfd9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0455.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0456.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0456.gif
deleted file mode 100644
index bc5dfb02ed..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0456.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0457.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0457.gif
deleted file mode 100644
index dd3610a6a9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0457.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0458.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0458.gif
deleted file mode 100644
index b00823f589..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0458.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0459.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0459.gif
deleted file mode 100644
index da1cea87d5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0459.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0460.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0460.gif
deleted file mode 100644
index 04558db039..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0460.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0461.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0461.gif
deleted file mode 100644
index 7ebb94a27c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0461.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0462.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0462.gif
deleted file mode 100644
index 6f3fb206d8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0462.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0463.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0463.gif
deleted file mode 100644
index 8ee937d501..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0463.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0464.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0464.gif
deleted file mode 100644
index 6a8279a762..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0464.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0465.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0465.gif
deleted file mode 100644
index 1da6da8558..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0465.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0466.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0466.gif
deleted file mode 100644
index f55c7dc691..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0466.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0467.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0467.gif
deleted file mode 100644
index f01fb5acce..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0467.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0468.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0468.gif
deleted file mode 100644
index 7b3a92566c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0468.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0469.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0469.gif
deleted file mode 100644
index f89c6b8527..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0469.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0470.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0470.gif
deleted file mode 100644
index 820cd9a3b5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0470.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0471.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0471.gif
deleted file mode 100644
index 278bddc49d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0471.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0472.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0472.gif
deleted file mode 100644
index 2a1d9b6f44..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0472.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0473.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0473.gif
deleted file mode 100644
index afbe193910..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0473.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0474.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0474.gif
deleted file mode 100644
index ce54a52c1e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0474.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0475.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0475.gif
deleted file mode 100644
index bde39aec88..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0475.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0476.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0476.gif
deleted file mode 100644
index 4b9b85bfde..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0476.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0477.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0477.gif
deleted file mode 100644
index 44350357d7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0477.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0478.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0478.gif
deleted file mode 100644
index 5ca74d93a1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0478.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0479.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0479.gif
deleted file mode 100644
index 4cbcdc6238..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0479.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0480.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0480.gif
deleted file mode 100644
index 39d008864f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0480.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0481.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0481.gif
deleted file mode 100644
index 31adaba3f6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0481.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0482.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0482.gif
deleted file mode 100644
index 43ea16275b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0482.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0483.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0483.gif
deleted file mode 100644
index bc3609b6ed..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0483.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0484.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0484.gif
deleted file mode 100644
index da22b8335a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0484.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0485.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0485.gif
deleted file mode 100644
index b23b711835..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0485.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0486.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0486.gif
deleted file mode 100644
index ee91e755bf..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0486.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0487.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0487.gif
deleted file mode 100644
index 4a98dfb460..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0487.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0488.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0488.gif
deleted file mode 100644
index f948a43158..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0488.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0489.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0489.gif
deleted file mode 100644
index d2510fc909..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0489.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0490.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0490.gif
deleted file mode 100644
index 22f141c940..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0490.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0491.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0491.gif
deleted file mode 100644
index 98d674b4d3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0491.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0492.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0492.gif
deleted file mode 100644
index 86da75de31..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0492.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0493.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0493.gif
deleted file mode 100644
index 8b313902d3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0493.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0494.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0494.gif
deleted file mode 100644
index a6b4bfaabf..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0494.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0495.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0495.gif
deleted file mode 100644
index e1ea1351db..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0495.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0496.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0496.gif
deleted file mode 100644
index d5792a2cd9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0496.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0497.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0497.gif
deleted file mode 100644
index bb67f9761a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0497.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0498.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0498.gif
deleted file mode 100644
index 8e3fc76bb2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0498.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0499.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0499.gif
deleted file mode 100644
index c861ff30d3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0499.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0500.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0500.gif
deleted file mode 100644
index 4c017e8566..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0500.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0501.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0501.gif
deleted file mode 100644
index a9d1ee47d3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0501.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0502.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0502.gif
deleted file mode 100644
index 646c776879..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0502.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0503.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0503.gif
deleted file mode 100644
index 053bbdc7d1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0503.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0504.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0504.gif
deleted file mode 100644
index 04b80dc51f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0504.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0505.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0505.gif
deleted file mode 100644
index eafe899b94..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0505.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0506.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0506.gif
deleted file mode 100644
index ef9f77c9ae..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0506.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0507.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0507.gif
deleted file mode 100644
index 2bbe1c4f56..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0507.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0508.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0508.gif
deleted file mode 100644
index c3b293867e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0508.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0509.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0509.gif
deleted file mode 100644
index 21f2b07743..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0509.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0510.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0510.gif
deleted file mode 100644
index 4337e925b3..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0510.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0511.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0511.gif
deleted file mode 100644
index 8fc0bd22a0..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0511.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0512.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0512.gif
deleted file mode 100644
index aadcde745e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0512.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0513.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0513.gif
deleted file mode 100644
index 26d0af49fb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0513.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0514.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0514.gif
deleted file mode 100644
index 47ded6f18c..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0514.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0515.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0515.gif
deleted file mode 100644
index 30f66a72b8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0515.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0516.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0516.gif
deleted file mode 100644
index 5669f05b34..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0516.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0517.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0517.gif
deleted file mode 100644
index 06527af19f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0517.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0518.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0518.gif
deleted file mode 100644
index 47054747d6..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0518.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0519.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0519.gif
deleted file mode 100644
index ac114a3178..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0519.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0520.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0520.gif
deleted file mode 100644
index 91853a2d73..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0520.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0521.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0521.gif
deleted file mode 100644
index d70c177a9f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0521.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0522.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0522.gif
deleted file mode 100644
index ebf1278722..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0522.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0523.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0523.gif
deleted file mode 100644
index 77350e5c6e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0523.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0524.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0524.gif
deleted file mode 100644
index 3289f28e34..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0524.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0525.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0525.gif
deleted file mode 100644
index 7fb89d4f35..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0525.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0526.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0526.gif
deleted file mode 100644
index 9271d39640..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0526.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0527.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0527.gif
deleted file mode 100644
index 7401763ffb..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0527.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0528.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0528.gif
deleted file mode 100644
index 1cbfa2495e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0528.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0529.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0529.gif
deleted file mode 100644
index 03170e9847..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0529.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0530.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0530.gif
deleted file mode 100644
index 47a9b2636b..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0530.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0531.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0531.gif
deleted file mode 100644
index 63e15b53ab..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0531.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0532.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0532.gif
deleted file mode 100644
index 7a29cbf2ed..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0532.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0533.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0533.gif
deleted file mode 100644
index bbe593efef..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0533.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0534.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0534.gif
deleted file mode 100644
index 2f3ddac828..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0534.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0535.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0535.gif
deleted file mode 100644
index f3dacd4978..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0535.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0536.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0536.gif
deleted file mode 100644
index 2a47d0cf74..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0536.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0537.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0537.gif
deleted file mode 100644
index 3b16b59c3f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0537.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0538.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0538.gif
deleted file mode 100644
index baaf88f953..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0538.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0539.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0539.gif
deleted file mode 100644
index b97d7c6d40..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0539.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0540.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0540.gif
deleted file mode 100644
index 0522ab0f59..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0540.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0541.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0541.gif
deleted file mode 100644
index 345ccc3bd9..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0541.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0542.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0542.gif
deleted file mode 100644
index b58b31b300..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0542.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0543.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0543.gif
deleted file mode 100644
index 4c702d3f95..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0543.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0544.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0544.gif
deleted file mode 100644
index d1f32f1aa1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0544.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0545.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0545.gif
deleted file mode 100644
index a65ae2784a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0545.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0546.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0546.gif
deleted file mode 100644
index 58336a1742..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0546.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0547.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0547.gif
deleted file mode 100644
index 935b24f0bc..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0547.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0548.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0548.gif
deleted file mode 100644
index 3d51f357ca..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0548.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0549.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0549.gif
deleted file mode 100644
index d8ecf14a58..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0549.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0550.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0550.gif
deleted file mode 100644
index ef1a851f46..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0550.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0551.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0551.gif
deleted file mode 100644
index bca0a8155f..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0551.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0552.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0552.gif
deleted file mode 100644
index fc8fd10293..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0552.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0553.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0553.gif
deleted file mode 100644
index f5ab744fca..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0553.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0554.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0554.gif
deleted file mode 100644
index 370eb350e5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0554.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0555.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0555.gif
deleted file mode 100644
index da35c6e0c8..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0555.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0556.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0556.gif
deleted file mode 100644
index 5518d24a48..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0556.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0557.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0557.gif
deleted file mode 100644
index f853838ad4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0557.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0558.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0558.gif
deleted file mode 100644
index 201c907706..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0558.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0559.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0559.gif
deleted file mode 100644
index 6478e2b82a..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0559.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0560.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0560.gif
deleted file mode 100644
index 8de61608ee..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0560.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0561.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0561.gif
deleted file mode 100644
index dd7f0e658e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0561.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0562.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0562.gif
deleted file mode 100644
index 80bb63c683..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0562.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0563.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0563.gif
deleted file mode 100644
index da0300d7d1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0563.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0564.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0564.gif
deleted file mode 100644
index 5ecd04c1cf..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0564.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0565.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0565.gif
deleted file mode 100644
index 04acad64b5..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0565.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0566.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0566.gif
deleted file mode 100644
index 58e6104838..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0566.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0567.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0567.gif
deleted file mode 100644
index 170fa85946..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0567.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0568.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0568.gif
deleted file mode 100644
index 7441e52a1e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0568.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0569.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0569.gif
deleted file mode 100644
index 99689562f4..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0569.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0570.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0570.gif
deleted file mode 100644
index f2c6cb796e..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0570.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0571.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0571.gif
deleted file mode 100644
index 85d6341aaa..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0571.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0572.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0572.gif
deleted file mode 100644
index 34f189c865..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0572.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0573.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0573.gif
deleted file mode 100644
index 20172b44ef..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0573.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0574.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0574.gif
deleted file mode 100644
index 526acfdc33..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0574.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0575.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0575.gif
deleted file mode 100644
index 73e5589ee1..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0575.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0576.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0576.gif
deleted file mode 100644
index 6c91b10eb2..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0576.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0577.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0577.gif
deleted file mode 100644
index 34d09aa73d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0577.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0578.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0578.gif
deleted file mode 100644
index 1a2935f99d..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0578.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0579.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0579.gif
deleted file mode 100644
index 3117f50894..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0579.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSmiley/smileys/0580.gif b/web/imcms/xinha/plugins/InsertSmiley/smileys/0580.gif
deleted file mode 100644
index 71eff954e7..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSmiley/smileys/0580.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSnippet/InsertSnippet.css b/web/imcms/xinha/plugins/InsertSnippet/InsertSnippet.css
deleted file mode 100644
index 923eaa9847..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/InsertSnippet.css
+++ /dev/null
@@ -1,93 +0,0 @@
-.navi_links {
-	width: 177px;
-	margin: 0;
-	padding: 0px;
-	list-style:none;
-	border: none;
-}
-
-.navi_links li {
-	margin:0 0 3px 0;
-}
-
-.navi_links li a {
-	font-size: 13px;
-	line-height: 16px;
-	height: 16px;
-	display:block;
-	color:#000;
-	text-decoration: none;
-	font-weight: bold;
-	background-color: #fff;
-	cursor: pointer;
-	border: 2px solid white;
-	
-}
-
-.Link1 {
-background-color: #DF1D1F !important;
-
-}
-
-.Link2 {
-background-color: #F9A413 !important;
-
-}
-
-.Link3 {
-background-color: #167730 !important;
-}
-
-.Link4 {
-background-color: #233350 !important;
-}
-
-.Link5 {
-background-color: #70685B !important;
-}
-
-a.Link1:hover span{
-background-color: #DF1D1F !important;
-}
-
-a.Link2:hover span {
-background-color: #F9A413 !important;
-
-}
-
-.Link3:hover span {
-background-color: #167730 !important;
-color:white;
-}
-
-.Link4:hover span {
-background-color: #233350 !important;
-color:white;
-}
-
-.Link5:hover span {
-background-color: #70685B !important;
-color:white;
-}
-
-.navi_links li a span {
-	height: 16px;
-	text-indent: 4px;
-	display:block;
-	margin-left: 15px;
-	background-color: #FFF;
-}
-
-div.message_box {
-border: dotted 1px black;
-margin: 1em;
-padding:1em;
-}
-
-.red {
-color:red;
-}
-
-.green {
-color:green;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/demosnippets.js b/web/imcms/xinha/plugins/InsertSnippet/demosnippets.js
deleted file mode 100644
index d243632c83..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/demosnippets.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var snippets = [];
-var i = 0;
-snippets[i] = {};
-snippets[i]['id'] = 'Box 1';
-snippets[i]['HTML'] = '<div class="message_box red">\n  Visit the <a href="http://xinha.org">Xinha website</a></div>';
-
-i++;
-snippets[i] = {};
-snippets[i]['id'] = 'INFORMATION ABOUT SOMETHING';
-snippets[i]['HTML'] = '<div class="message_box green">\n  This is an information about something\n</div>';
-
-i++;
-snippets[i] = {};
-snippets[i]['id'] = 'Menu';
-snippets[i]['HTML'] = '<ul class="navi_links">\n	<li class="navi">\n		<a href="Link1" class="Link1" tabindex="1"><span class="span_class">Link1</span></a>\n    </li>\n	\n	<li class="navi">\n		<a href="Link2" class="Link2" tabindex="2"><span class="span_class">Link2</span></a>\n    </li>\n\n	\n	<li class="navi">\n		<a href="Link3" class="Link3" tabindex="3"><span class="span_class">Link3</span></a>\n    </li>\n	\n	<li class="navi">\n		<a href="Link4" class="Link4" tabindex="4"><span class="span_class">Link4</span></a>\n    </li>\n	\n	<li class="navi">\n		<a href="Link5" class="Link5" tabindex="5"><span class="span_class">Link5</span></a>\n\n    </li>\n\n</ul>';
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/img/ed_snippet.gif b/web/imcms/xinha/plugins/InsertSnippet/img/ed_snippet.gif
deleted file mode 100644
index 12684f8193..0000000000
Binary files a/web/imcms/xinha/plugins/InsertSnippet/img/ed_snippet.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/InsertSnippet/insert-snippet.js b/web/imcms/xinha/plugins/InsertSnippet/insert-snippet.js
deleted file mode 100644
index 8284dbcbe9..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/insert-snippet.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*------------------------------------------*\
- InsertSnippet for Xinha
- _______________________
- 
- Insert HTML fragments or template variables
- 
-\*------------------------------------------*/
-
-function InsertSnippet(editor) {
-	this.editor = editor;
-
-	var cfg = editor.config;
-	var self = this;
-	
-
-	cfg.registerButton({
-	id       : "insertsnippet",
-	tooltip  : this._lc("Insert Snippet"),
-	image    : editor.imgURL("ed_snippet.gif", "InsertSnippet"),
-	textMode : false,
-	action   : function(editor) {
-			self.buttonPress(editor);
-		}
-	});
-	cfg.addToolbarElement("insertsnippet", "insertimage", -1);
-	this.snippets = null;
-	var backend = cfg.InsertSnippet.snippets + '?';
-	
-	if(cfg.InsertSnippet.backend_data != null)
-    {
-    	for ( var i in cfg.InsertSnippet.backend_data )
-        {
-            backend += '&' + i + '=' + encodeURIComponent(cfg.InsertSnippet.backend_data[i]);
-        }
-    }
-    Xinha._getback(backend,function (getback) {eval(getback); self.snippets = snippets;});
-}
-
-InsertSnippet.prototype.onUpdateToolbar = function() {
-	if (!this.snippets){
-		this.editor._toolbarObjects.insertsnippet.state("enabled", false);
-	}
-	else InsertSnippet.prototype.onUpdateToolbar = null;
-}
-
-InsertSnippet._pluginInfo = {
-  name          : "InsertSnippet",
-  version       : "1.2",
-  developer     : "Raimund Meyer",
-  developer_url : "http://rheinauf.de",
-  c_owner       : "Raimund Meyer",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-InsertSnippet.prototype._lc = function(string) {
-    return Xinha._lc(string, 'InsertSnippet');
-};
-
-InsertSnippet.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(_editor_url + 'plugins/InsertSnippet/InsertSnippet.css');
-};
-
-Xinha.Config.prototype.InsertSnippet =
-{
-  'snippets' : _editor_url+"plugins/InsertSnippet/demosnippets.js", // purely demo purposes, you should change this
-  'css' : ['../InsertSnippet.css'], //deprecated, CSS is now pulled from xinha_config
-  'showInsertVariable': false,
-  'backend_data' : null
-};
-	
-InsertSnippet.prototype.buttonPress = function(editor) {
-		var args = editor.config;
-			args.snippets = this.snippets;
-		var self = this;
-		editor._popupDialog( "plugin://InsertSnippet/insertsnippet", function( param ) {
-	
-		if ( !param ) { 
-	      return false;
-	    }
-				   	   
-		
-		editor.focusEditor();
-		if (param['how'] == 'variable') {
-			editor.insertHTML('{'+self.snippets[param["snippetnum"]].id+'}');
-		} else {
-			editor.insertHTML(self.snippets[param["snippetnum"]].HTML);
-	   	}
-  
-    }, args);
-  };
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/lang/de.js b/web/imcms/xinha/plugins/InsertSnippet/lang/de.js
deleted file mode 100644
index dec55d23c6..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/lang/de.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-{ 
-	"Insert Snippet": "Snippet einfügen",
-	"Cancel": "Abbrechen",
-	"Variable":"Variable",
-	"Insert as":"Einfügen als",
-	"Show preview":"Vorschau zeigen",
-	"Hide preview":"Vorschau verbergen"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/lang/ja.js b/web/imcms/xinha/plugins/InsertSnippet/lang/ja.js
deleted file mode 100644
index 709972ab4a..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/lang/ja.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-	"Insert Snippet": "スニペット�挿入",
-	"Cancel": "中止",
-	"Variable":"変数",
-	"Insert as":"形�を�ん�挿入",
-	"Show preview":"プレビュー表示",
-	"Hide preview":"プレビュー�表示"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/lang/nb.js b/web/imcms/xinha/plugins/InsertSnippet/lang/nb.js
deleted file mode 100644
index 4f6babf859..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/lang/nb.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-"Insert Snippet": "Sett inn snutt",
-"Cancel": "Avbryt",
-"Variable":"Variabel",
-"Insert as":"Sett inn som",
-"Show preview":"Vis forhåndsvisning",
-"Hide preview":"Skjul forhåndsvisning"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/lang/nl.js b/web/imcms/xinha/plugins/InsertSnippet/lang/nl.js
deleted file mode 100644
index 28c68472bb..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/lang/nl.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{ 
-"Insert Snippet": "Snippet invoegen",
-"Cancel": "Annuleren",
-"Variable":"Variabele",
-"Insert as":"Invoegen als",
-"Show preview":"Laat voorbeeld zien",
-"Hide preview":"Verberg voorbeeld"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/lang/no.js b/web/imcms/xinha/plugins/InsertSnippet/lang/no.js
deleted file mode 100644
index 7722aa6559..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/lang/no.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-"Insert Snippet": "Sett inn snutt",
-"Cancel": "Avbryt",
-"Variable":"Variabel",
-"Insert as":"Sett inn som",
-"Show preview":"Vis forhåndsvisning",
-"Hide preview":"Skjul forhåndsvisning"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/lang/pt_br.js b/web/imcms/xinha/plugins/InsertSnippet/lang/pt_br.js
deleted file mode 100644
index 773aaa9d86..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/lang/pt_br.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Cancel": "Cancelar",
-  "Hide preview": "Esconder Visualização",
-  "Insert Snippet": "Inserir Fragmento de Código",
-  "Insert as": "Inserir como",
-  "InsertSnippet for Xinha": "Fragmento de Códigos para o Xinha",
-  "Show preview": "Mostrar Visualização",
-  "This is an information about something": "Isto é uma informação sobre alguma coisa",
-  "Variable": "Variável"
-}
diff --git a/web/imcms/xinha/plugins/InsertSnippet/popups/insertsnippet.html b/web/imcms/xinha/plugins/InsertSnippet/popups/insertsnippet.html
deleted file mode 100644
index 9c13869e19..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/popups/insertsnippet.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html
-		 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>Insert Snippet</title>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<link rel="stylesheet" type="text/css" href="../InsertSnippet.css" />
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<script type="text/javascript">
-
-var InsertSnippet = window.opener.InsertSnippet;
-var editor = null;
-
-
-function Init() {
-	__dlg_translate("InsertSnippet");
-	__dlg_init(null, {width:800,height:600});
-
-	var config = window.dialogArguments;
- 
-	var snippets = config.snippets;
-	
-	if ( config.pageStyle && !Xinha.is_ie)
-    {
-		var style = document.createElement("style");
-		style.type = "text/css";
-		style.innerHTML = config.pageStyle;
-		document.getElementsByTagName("HEAD")[0].appendChild(style);
-    }
-    
-	if ( typeof config.pageStyleSheets !== 'undefined' )
-	{
-		for ( var i = 0; i < config.pageStyleSheets.length; i++ )
-		{
-			var style = document.createElement("link");
-			style.type = "text/css";
-			style.rel = 'stylesheet';
-			style.href =	config.pageStyleSheets[i];
-			document.getElementsByTagName("HEAD")[0].appendChild(style);
-		}
-	}
-		
-	var tbody = document.getElementById("snippettable");
-	var snippet_html;
-	var snippet_name;
-	var trow;
-	for(var i = 0; i < snippets.length; i++) 
-	{
-		trow = tbody.insertRow(i);
-		snippet_html = snippets[i]['HTML'];
-		snippet_name = snippets[i]['id'];
-	 
-		var insertAsVariable = '';
-		if (config.InsertSnippet.showInsertVariable)
-		{
-			insertAsVariable = ' | <a href="javascript:onOK('+i+','+'\'variable\''+')">'+Xinha._lc("Variable","InsertSnippet")+'</a>';
-		}
-		var new_cell = trow.insertCell(0);
-		new_cell.innerHTML = snippet_name +': '+Xinha._lc("Insert as","InsertSnippet")+' <a href="javascript:onOK('+i+','+'\'html\''+')">HTML</a>'+insertAsVariable + ' (<a id="show_preview'+i+'" href="javascript:preview(\'show\','+i+')">'+Xinha._lc("Show preview","InsertSnippet")+'</a>)<div id="preview'+i+'" style="display:none">'+snippets[i]['HTML']+'</div>'; 
-		new_cell.id = 'cell' + i;
-			
-	}
-
-	document.body.onkeypress = __dlg_key_press;
-}
-
-function preview(action,i) {
-	var show_preview_link = document.getElementById('show_preview'+i); 
-	switch(action)
-	{
-		case 'show':
-			document.getElementById('preview'+i).style.display = 'block';
-			show_preview_link.innerHTML = Xinha._lc("Hide preview","InsertSnippet");
-			show_preview_link.href = "javascript:preview('hide','"+i+"');";
-			
-		break;
-		case 'hide':
-			document.getElementById('preview'+i).style.display = 'none';
-			show_preview_link.innerHTML = Xinha._lc("Show preview","InsertSnippet");
-			show_preview_link.href = "javascript:preview('show','"+i+"');";
-		break;
-	}
-}
-function onCancel() {
-	__dlg_close(null);
-	return false;
-}
-
-function onOK(snippetnum,how) {
-	var params = new Object();
-	params["snippetnum"] = snippetnum;
-	params["how"] = how;
-	__dlg_close(params);
-	return false;
-}
-
-function __dlg_key_press(ev) {
-	ev || (ev = window.event);
-	switch(ev.keyCode) {
-		case 13:
-		document.getElementById('bt_ok').click();
-			break;
-		case 27:
-		__dlg_close();
-		return false;
-	}
-return true;
-}
-</script>
-
-<style type="text/css">
-body {margin:0 !IMPORTANT;padding:0 !IMPORTANT;}
-.buttons {border-top: 1px solid #999; padding: 5px; text-align: right; height: 20px; }
-td {background:white;padding:5px;border:1px solid;border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;}
-.preview {}
-</style>
-</head>
-<body class="dialog" onload="Init()">
-<form action="" method="get">
-  <div class="title" >Insert Snippet</div>
-  <div style="height:470px;overflow:auto;">
-  <table style="border: 0; width: 100%;" id="snippettable">
-  </table>
-  </div>
-<div class="space"></div>
-<div class="buttons">
-<button type="button" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/readme.html b/web/imcms/xinha/plugins/InsertSnippet/readme.html
deleted file mode 100644
index 0ffdd38b1b..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/readme.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>InsertSnippet for Xinha</title>
-  
-<style type="text/css">
-  body { font-family: sans-serif; }
-  pre {border: dotted grey thin; background-color:LightYellow;padding:10px }
-  p { width:500px }
-  </style>
-</head>
-
-<body >
-<h1>InsertSnippet for Xinha</h1>
-<p>Insert HTML fragments in your document.
-
-</p>
-<h2>Usage</h2>
-<p>
-In order to use your own snippets you have to al least one parameter to your xinha_config:
-</p>
-<pre>
-xinha_config.InsertSnippet.snippets = _editor_url+"plugins/InsertSnippet/snippets.php";
-</pre>
-<p>
-The path above indicates the use of the provided backend. This parses a file that contains the snippets and 
-should have the following format:
-</p>
-<pre>
-&lt;!--Snippet ID--&gt;
-Snippet content
-&lt;!--/Snippet ID--&gt;
-...and so on
-</pre>
-<p>
-You can use the snippets.html in the plugin folder or tell the backend where to find the file like this
-</p>
-<pre>
-with (xinha_config.InsertSnippet)
-{
-	&lt;?php
-
-	// define backend configuration for the plugin
-	$backend_data['snippets_file'] = '/file/containing/snippets.html';
-	require_once '../contrib/php-xinha.php';
-	xinha_pass_to_php_backend($backend_data);
-    
-	?&gt;
-}
-</pre>
-
-<p style="font-size:80%">Raimund Meyer (xinha@raimundmeyer.de)</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/snippets.html b/web/imcms/xinha/plugins/InsertSnippet/snippets.html
deleted file mode 100644
index 3a8dad374f..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/snippets.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--Box 1-->
-<div class="message_box red">
-   Visit the <a href="http://xinha.org">Xinha website</a>
-</div>
-<!--/Box 1-->
-<!--INFORMATION ABOUT SOMETHING-->
-<div class="message_box green">
-   This is an information about something
-</div>
-<!--/INFORMATION ABOUT SOMETHING-->
-<!--Menu-->
-<ul class="navi_links">
-   <li class="navi">
-        <a href="Link1" class="Link1" tabindex="1"><span class="span_class"> Link1 </span></a>
-   </li>
-   <li class="navi">
-        <a href="Link2" class="Link2" tabindex="2"><span class="span_class"> Link2 </span></a>
-   </li>
-   <li class="navi">
-        <a href="Link3" class="Link3" tabindex="3"><span class="span_class"> Link3 </span></a>
-   </li>
-   <li class="navi">
-        <a href="Link4" class="Link4" tabindex="4"><span class="span_class"> Link4 </span></a>
-   </li>
-   <li class="navi">
-        <a href="Link5" class="Link5" tabindex="5"><span class="span_class"> Link5 </span></a>
-   </li>
-</ul>
-<!--/Menu-->
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/snippets.js b/web/imcms/xinha/plugins/InsertSnippet/snippets.js
deleted file mode 100644
index 119a395719..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/snippets.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var snippets = new Array();
-var i = 0;
-snippets[i] = new Object();
-snippets[i]['id'] = 'Box 1';
-snippets[i]['HTML'] = '<div class="message_box red">\n  Visit the <a href="http://xinha.org">Xinha website</a></div>';
-
-i++;
-snippets[i] = new Object();
-snippets[i]['id'] = 'INFORMATION ABOUT SOMETHING';
-snippets[i]['HTML'] = '<div class="message_box green">\n  This is an information about something\n</div>';
-
-i++;
-snippets[i] = new Object();
-snippets[i]['id'] = 'Menu';
-snippets[i]['HTML'] = '<ul class="navi_links">\n	<li class="navi">\n		<a href="Link1" class="Link1" tabindex="1"><span class="span_class">Link1</span></a>\n    </li>\n	\n	<li class="navi">\n		<a href="Link2" class="Link2" tabindex="2"><span class="span_class">Link2</span></a>\n    </li>\n\n	\n	<li class="navi">\n		<a href="Link3" class="Link3" tabindex="3"><span class="span_class">Link3</span></a>\n    </li>\n	\n	<li class="navi">\n		<a href="Link4" class="Link4" tabindex="4"><span class="span_class">Link4</span></a>\n    </li>\n	\n	<li class="navi">\n		<a href="Link5" class="Link5" tabindex="5"><span class="span_class">Link5</span></a>\n\n    </li>\n\n</ul>';
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertSnippet/snippets.php b/web/imcms/xinha/plugins/InsertSnippet/snippets.php
deleted file mode 100644
index 8c59db90da..0000000000
--- a/web/imcms/xinha/plugins/InsertSnippet/snippets.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$snippets_file = 'snippets.html';
-
-include_once('../../contrib/php-xinha.php');
-
-if($passed_data = xinha_read_passed_data())
-{
-	extract($passed_data);      
-}
-$snippets = file_get_contents($snippets_file);
-preg_match_all('/<!--(.*?)-->(.*?)<!--\/.*?-->/s',$snippets,$matches);
-	
-$array=array();
-for ($i=0;$i<count($matches[1]);$i++)
-{
-	$id = $matches[1][$i];
-	$html = $matches[2][$i];
-	$array[] = array('id'=>$id,'HTML'=>$html);
-}
-print "var snippets = " . xinha_to_js($array);
-
-?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/InsertWords/insert-words.js b/web/imcms/xinha/plugins/InsertWords/insert-words.js
deleted file mode 100755
index 907fc5693e..0000000000
--- a/web/imcms/xinha/plugins/InsertWords/insert-words.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Plugin for htmlArea to insert keywords, when a type of
-// keyword is selected from a dropdown list
-// By Adam Wright, for The University of Western Australia
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function InsertWords(editor, params) {
-	this.editor = editor;
-	var cfg = editor.config;
-	var self = this;
-
-    if(params[0] && params[0].combos) {
-      //if arguments where passed with registerPlugin use these
-	  var combos = params[0].combos;
-    } else if (cfg.InsertWords && cfg.InsertWords.combos) {
-      //if combos is found in config use these
-      var combos = cfg.InsertWords.combos;
-    } else {
-      //no combos found
-      var combos = [];
-    }
-
-	// register the toolbar with the keywords dropdown
-    var first = true;
-    var toolbar = [];
-
-	for (var i = combos.length; --i >= 0;) {
-		var combo = combos[i];
-		var id = "IW-id" + i;
-		var iw_class = {
-			id	: id,
-			options	: combo.options,
-			action	: function (editor) { self.onSelect(editor, this, combo.context); },
-			refresh	: function (editor) { },
-			context : combo.context
-		};
-        cfg.registerDropdown(iw_class);
-
-        if (combo.label)
-            toolbar.push("T[" + combo.label + "]");
-        toolbar.push(id);
-        toolbar.push(first ? "separator" : "space");
-	}
-
-    cfg.addToolbarElement(toolbar, "linebreak", 1);
-
-}
-
-InsertWords._pluginInfo = {
-	name          : "InsertWords",
-	version       : "1.0",
-	developer     : "Adam Wright",
-	developer_url : "http://blog.hipikat.org/",
-	sponsor       : "The University of Western Australia",
-	sponsor_url   : "http://www.uwa.edu.au/",
-	license       : "htmlArea"
-};
-
-InsertWords.prototype.onSelect = function(editor, obj, context) {
-
-	// Get the toolbar object element
-	var elem = editor._toolbarObjects[obj.id].element;
-
-	// Insert the keyword value blindly at the selection
-	editor.insertHTML(elem.value);
-
-	// Reset the dropdown to it's label
-	elem.selectedIndex = 0;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/img/el.gif b/web/imcms/xinha/plugins/LangMarks/img/el.gif
deleted file mode 100644
index f50a0aac9e..0000000000
Binary files a/web/imcms/xinha/plugins/LangMarks/img/el.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/LangMarks/img/en.gif b/web/imcms/xinha/plugins/LangMarks/img/en.gif
deleted file mode 100644
index ce814ab09a..0000000000
Binary files a/web/imcms/xinha/plugins/LangMarks/img/en.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/LangMarks/img/fr.gif b/web/imcms/xinha/plugins/LangMarks/img/fr.gif
deleted file mode 100644
index df69c43bb1..0000000000
Binary files a/web/imcms/xinha/plugins/LangMarks/img/fr.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/LangMarks/img/la.gif b/web/imcms/xinha/plugins/LangMarks/img/la.gif
deleted file mode 100644
index 3c9e19540c..0000000000
Binary files a/web/imcms/xinha/plugins/LangMarks/img/la.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/LangMarks/lang-marks.css b/web/imcms/xinha/plugins/LangMarks/lang-marks.css
deleted file mode 100644
index 68a501fc99..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang-marks.css
+++ /dev/null
@@ -1,20 +0,0 @@
-span.el, span.en, span.fr, span.la {
-	color: red;
-	padding-right: 25px;
-	background-repeat: no-repeat;
-	background-position: right top;
-	border-bottom: 1px solid red;
-	white-space : nowrap;
-}
-span.el { /*Griechisch*/
-	background-image: url(img/el.gif);
-}
-span.en { /*Englisch*/
-	background-image: url(img/en.gif);
-}
-span.fr { /*Französisch*/
-	background-image: url(img/fr.gif);
-}
-span.la { /*Latein*/
-	background-image: url(img/la.gif);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang-marks.js b/web/imcms/xinha/plugins/LangMarks/lang-marks.js
deleted file mode 100644
index a94843ad76..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang-marks.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// Mask Language plugin for Xinha
-// Implementation by Udo Schmal
-//
-// (c) Udo Schmal & Schaffrath NeueMedien 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function LangMarks(editor, args) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-  var options = {};
-  options[this._lc("&mdash; language &mdash;")] = "";
-  options[this._lc("Greek")] = "el";
-  options[this._lc("English")] = "en";
-  options[this._lc("French")] = "fr";
-  options[this._lc("Latin")] = "la";
-
-  cfg.registerDropdown({
-    id	: "langmarks",
-    tooltip	: this._lc("language select"),
-    options	: options,
-    action	: function(editor) { self.onSelect(editor, this); },
-    refresh	: function(editor) { self.updateValue(editor, this); }
-  });
-  cfg.addToolbarElement("langmarks", "inserthorizontalrule", 1);
-}
-
-LangMarks._pluginInfo = {
-  name          : "LangMarks",
-  version       : "1.0",
-  developer     : "Udo Schmal",
-  developer_url : "",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de/",
-  c_owner       : "Udo Schmal & Schaffrath NeueMedien",
-  license       : "htmlArea"
-};
-
-LangMarks.prototype._lc = function(string) {
-  return Xinha._lc(string, 'LangMarks');
-};
-
-LangMarks.prototype.onGenerate = function() {
-  var style_id = "LM-style"
-  var style = this.editor._doc.getElementById(style_id);
-  if (style == null) {
-    style = this.editor._doc.createElement("link");
-    style.id = style_id;
-    style.rel = 'stylesheet';
-    style.href = _editor_url + 'plugins/LangMarks/lang-marks.css';
-    this.editor._doc.getElementsByTagName("HEAD")[0].appendChild(style);
-  }
-};
-
-LangMarks.prototype.onSelect = function(editor, obj, context, updatecontextclass) {
-  var tbobj = editor._toolbarObjects[obj.id];
-  var index = tbobj.element.selectedIndex;
-  var className = tbobj.element.value;
-
-  // retrieve parent element of the selection
-  var parent = editor.getParentElement();
-  var surround = true;
-
-  var is_span = (parent && parent.tagName.toLowerCase() == "span");
-  var update_parent = (context && updatecontextclass && parent && parent.tagName.toLowerCase() == context);
-
-  if (update_parent) {
-    parent.className = className;
-    parent.lang = className;
-    editor.updateToolbar();
-    return;
-  }
-
-  if (is_span && index == 0 && !/\S/.test(parent.style.cssText)) {
-    while (parent.firstChild) {
-      parent.parentNode.insertBefore(parent.firstChild, parent);
-    }
-    parent.parentNode.removeChild(parent);
-    editor.updateToolbar();
-    return;
-  }
-
-  if (is_span) {
-    // maybe we could simply change the class of the parent node?
-    if (parent.childNodes.length == 1) {
-      parent.className = className;
-      parent.lang = className;
-      surround = false;
-      // in this case we should handle the toolbar updation
-      // ourselves.
-      editor.updateToolbar();
-    }
-  }
-
-  // Other possibilities could be checked but require a lot of code.  We
-  // can't afford to do that now.
-  if (surround) {
-    // shit happens ;-) most of the time.  this method works, but
-    // it's dangerous when selection spans multiple block-level
-    // elements.
-    editor.surroundHTML('<span lang="' + className + '" class="' + className + '">', '</span>');
-  }
-};
-
-LangMarks.prototype.updateValue = function(editor, obj) {
-  var select = editor._toolbarObjects[obj.id].element;
-  var parent = editor.getParentElement();
-  if (typeof parent.className != "undefined" && /\S/.test(parent.className)) {
-    var options = select.options;
-    var value = parent.className;
-    for (var i = options.length; --i >= 0;) {
-      var option = options[i];
-      if (value == option.value) {
-        select.selectedIndex = i;
-        return;
-      }
-    }
-  }
-  select.selectedIndex = 0;
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang/de.js b/web/imcms/xinha/plugins/LangMarks/lang/de.js
deleted file mode 100644
index f46a80b8d1..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang/de.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "language select": "Sprachauswahl",
-  "&mdash; language &mdash;":	"&mdash; Sprache &mdash;",
-  "Greek": "griechisch",
-  "English": "englisch",
-  "French": "französisch",
-  "Latin": "lateinisch"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang/fr.js b/web/imcms/xinha/plugins/LangMarks/lang/fr.js
deleted file mode 100644
index 45b16d362a..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang/fr.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "language select": "Sélection de la langue",
-  "&mdash; language &mdash;":	"&mdash; Langue &mdash;",
-  "Greek": "grec",
-  "English": "anglais",
-  "French": "français",
-  "Latin": "latin"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang/ja.js b/web/imcms/xinha/plugins/LangMarks/lang/ja.js
deleted file mode 100644
index f43067e9ce..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang/ja.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "language select": "言語��択",
-  "&mdash; language &mdash;":	"&mdash; 言語 &mdash;",
-  "Greek": "ギリシャ語",
-  "English": "英語",
-  "French": "フランス語",
-  "Latin": "ラテン語"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang/nb.js b/web/imcms/xinha/plugins/LangMarks/lang/nb.js
deleted file mode 100644
index 66221d9ae1..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang/nb.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "language select": "Språkvalg",
-  "&mdash; language &mdash;":	"&mdash; Språk &mdash;",
-  "Greek": "grekisk",
-  "English": "engelsk",
-  "French": "fransk",
-  "Latin": "latin"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang/nl.js b/web/imcms/xinha/plugins/LangMarks/lang/nl.js
deleted file mode 100644
index 387367f2fd..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang/nl.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "language select": "Taalkeuze",
-  "&mdash; language &mdash;":	"&mdash; taal &mdash;",
-  "Greek": "Grieks",
-  "English": "Engels",
-  "French": "Frans",
-  "Latin": "Latijns"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang/no.js b/web/imcms/xinha/plugins/LangMarks/lang/no.js
deleted file mode 100644
index 7baa162002..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang/no.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "language select": "Språkvalg",
-  "&mdash; language &mdash;":	"&mdash; Språk &mdash;",
-  "Greek": "grekisk",
-  "English": "engelsk",
-  "French": "fransk",
-  "Latin": "latin"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/LangMarks/lang/pt_br.js b/web/imcms/xinha/plugins/LangMarks/lang/pt_br.js
deleted file mode 100644
index b81a26d56e..0000000000
--- a/web/imcms/xinha/plugins/LangMarks/lang/pt_br.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "language select": "Selecionar idioma",
-  "&mdash; language &mdash;":	"&mdash; Idioma &mdash;",
-  "Greek": "Grego",
-  "English": "Inglês",
-  "French": "Francês",
-  "Latin": "Latim"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/dTree/api.html b/web/imcms/xinha/plugins/Linker/dTree/api.html
deleted file mode 100644
index 3686a80212..0000000000
--- a/web/imcms/xinha/plugins/Linker/dTree/api.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-
-<head>
-	<title>Destroydrop &raquo; Javascripts &raquo; Tree &raquo; Api</title>
-
-	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1" />
-	<link rel="stylesheet" href="/dd.css" type="text/css" />
-	<link rel="shortcut icon" href="/favicon.ico" />
-</head>
-
-<body>
-
-<div id="shadow">
-
-	<div id="content">
-
-		<div id="location">
-			<h1><a href="/">Destroydrop</a> &raquo; <a href="/javascripts/">Javascripts</a> &raquo; <a href="/javascripts/tree/">Tree</a> &raquo; <a href="/javascripts/tree/api/">Api</a></h1>
-		</div>
-
-
-		<div class="line"></div>
-
-		<div id="files">
-
-
-<h3>Overview</h3>
-<div class="line"></div>
-<div class="item">
-
-	<ul class="arrow">
-		<li><a href="#functions">Functions</a>
-			<ul class="arrow">
-				<li><a href="#add">add</a></li>
-				<li><a href="#openall">openAll</a></li>
-				<li><a href="#closeall">closeAll</a></li>
-				<li><a href="#opento">openTo</a></li>
-			</ul>
-		</li>
-		<li><a href="#configuration">Configuration</a></li>
-	</ul>
-
-</div>
-
-<a name="functions"></a>
-<h3>Functions</h3>
-<div class="line"></div>
-<div class="item">
-
-	<a name="add"></a>
-	<h4 class="func">add()</h4>
-	<p>Adds a node to the tree.<br />Can only be called before the tree is drawn.</p>
-	<p>id, pid and name are required.</p>
-
-	<h4>Parameters</h4>
-	<table class="files">
-	<tr>
-		<th>Name</th>
-		<th>Type</th>
-		<th>Description</th>
-	</tr>
-	<tr>
-		<td>id</td>
-		<td>Number</td>
-		<td>Unique identity number.</td>
-	</tr>
-	<tr>
-		<td>pid</td>
-		<td>Number</td>
-		<td>Number refering to the parent node. The value for the root node has to be -1.</td>
-	</tr>
-	<tr>
-		<td>name</td>
-		<td>String</td>
-		<td>Text label for the node.</td>
-	</tr>
-	<tr>
-		<td>url</td>
-		<td>String</td>
-		<td>Url for the node.</td>
-	</tr>
-	<tr>
-		<td>title</td>
-		<td>String</td>
-		<td>Title for the node.</td>
-	</tr>
-	<tr>
-		<td>target</td>
-		<td>String</td>
-		<td>Target for the node.</td>
-	</tr>
-	<tr>
-		<td>icon</td>
-		<td>String</td>
-		<td>Image file to use as the icon. Uses default if not specified.</td>
-	</tr>
-	<tr>
-		<td>iconOpen</td>
-		<td>String</td>
-		<td>Image file to use as the open icon. Uses default if not specified.</td>
-	</tr>
-	<tr>
-		<td>open</td>
-		<td>Boolean</td>
-		<td>Is the node open.</td>
-	</tr>
-	</table>
-	<br />
-
-
-	<h4>Example</h4>
-	<p><code>mytree.add(1, 0, 'My node', 'node.html', 'node title', 'mainframe', 'img/musicfolder.gif');</code></p>
-	<br />
-
-	<a name="openall"></a>
-	<h4 class="func">openAll()</h4>
-	<p>Opens all the nodes.<br />Can be called before and after the tree is drawn.</p>
-	<h4>Example</h4>
-	<p><code>mytree.openAll();</code></p>
-	<br />
-
-
-	<a name="closeall"></a>
-	<h4 class="func">closeAll()</h4>
-	<p>Closes all the nodes.<br />Can be called before and after the tree is drawn.</p>
-	<h4>Example</h4>
-	<p><code>mytree.closeAll();</code></p>
-	<br />
-
-
-	<a name="opento"></a>
-	<h4 class="func">openTo()</h4>
-	<p>Opens the tree to a certain node and can also select the node.<br />
-	Can only be called after the tree is drawn.</p>
-
-	<h4>Parameters</h4>
-	<table class="files">
-	<tr>
-		<th>Name</th>
-		<th>Type</th>
-		<th>Description</th>
-	</tr>
-	<tr>
-		<td>id</td>
-		<td>Number</td>
-		<td>Identity number for the node.</td>
-	</tr>
-	<tr>
-		<td>select</td>
-		<td>Boolean</td>
-		<td>Should the node be selected.</td>
-	</tr>
-	</table>
-
-	<h4>Example</h4>
-	<p><code>mytree.openTo(4, true);</code></p>
-
-</div>
-
-<a name="configuration"></a>
-<h3>Configuration</h3>
-<div class="line"></div>
-<div class="item">
-
-	<table class="files">
-	<tr>
-		<th>Variable</th>
-		<th>Type</th>
-		<th>Default</th>
-		<th>Description</th>
-	</tr>
-	<tr>
-		<td>target</td>
-		<td>String</td>
-		<td>true</td>
-		<td>Target for all the nodes.</td>
-	</tr>
-	<tr>
-		<td>folderLinks</td>
-		<td>Boolean</td>
-		<td>true</td>
-		<td>Should folders be links.</td>
-	</tr>
-	<tr>
-		<td>useSelection</td>
-		<td>Boolean</td>
-		<td>true</td>
-		<td>Nodes can be selected(highlighted).</td>
-	</tr>
-	<tr>
-		<td>useCookies</td>
-		<td>Boolean</td>
-		<td>true</td>
-		<td>The tree uses cookies to rember it's state.</td>
-	</tr>
-	<tr>
-		<td>useLines</td>
-		<td>Boolean</td>
-		<td>true</td>
-		<td>Tree is drawn with lines.</td>
-	</tr>
-	<tr>
-		<td>useIcons</td>
-		<td>Boolean</td>
-		<td>true</td>
-		<td>Tree is drawn with icons.</td>
-	</tr>
-	<tr>
-		<td>useStatusText</td>
-		<td>Boolean</td>
-		<td>false</td>
-		<td>Displays node names in the statusbar instead of the url.</td>
-	</tr>
-	<tr>
-		<td>closeSameLevel</td>
-		<td>Boolean</td>
-		<td>false</td>
-		<td>Only one node within a parent can be expanded at the same time.  openAll() and closeAll() functions do not work when this is enabled.</td>
-	</tr>
-	<tr>
-		<td>inOrder</td>
-		<td>Boolean</td>
-		<td>false</td>
-		<td>If parent nodes are always added before children, setting this to true speeds up the tree.</td>
-	</tr>
-	</table>
-
-	<h4>Example</h4>
-	<p><code>mytree.config.target = "mytarget";</code></p>
-
-</div>
-
-		</div>
-
-		<div class="line"></div>
-
-
-		<div id="copy">
-			<p class="right"><a href="http://validator.w3.org/check/referer">XHTML</a>, <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></p>
-			<p><a href="mailto&#58;drop&#64;destroydrop&#46;com">&copy;2002-2003 Geir Landr&ouml;</a></p>
-		</div>
-
-	</div>
-
-</div>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/dTree/dtree.css b/web/imcms/xinha/plugins/Linker/dTree/dtree.css
deleted file mode 100644
index 44c14fd806..0000000000
--- a/web/imcms/xinha/plugins/Linker/dTree/dtree.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------------------------|
-| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
-|---------------------------------------------------|
-| Copyright (c) 2002-2003 Geir Landr?               |
-|--------------------------------------------------*/
-
-.dtree {
-  font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-  font-size: 11px;
-  color: #666;
-  white-space: nowrap;
-}
-.dtree img {
-  border: 0px;
-  vertical-align: middle;
-}
-.dtree a,.dtree a:visited {
-  color: #333;
-  text-decoration: none;
-}
-.dtree a.node, .dtree a.nodeSel {
-  white-space: nowrap;
-  padding: 1px 2px 1px 2px;
-  /*padding: 0px 1px 0px 1px;*/
-}
-.dtree a.node:hover, .dtree a.nodeSel:hover {
-  color: #333;
-  text-decoration: underline;
-}
-.dtree a.nodeSel {
-  background-color: #c0d2ec;
-  /*
-  -moz-border-radius : 4px;
-  border:1px dotted #333;
-  */
-}
-.dtree .clip {
-  overflow: hidden;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/dTree/dtree.js b/web/imcms/xinha/plugins/Linker/dTree/dtree.js
deleted file mode 100644
index 4b9d5ea058..0000000000
--- a/web/imcms/xinha/plugins/Linker/dTree/dtree.js
+++ /dev/null
@@ -1,722 +0,0 @@
-/*--------------------------------------------------|
-
-| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
-
-|---------------------------------------------------|
-
-| Copyright (c) 2002-2003 Geir Landr?               |
-
-|                                                   |
-
-| This script can be used freely as long as all     |
-
-| copyright messages are intact.                    |
-
-|                                                   |
-
-| Updated: 17.04.2003                               |
-
-|--------------------------------------------------*/
-
-
-
-// Node object
-
-function Node(id, pid, name, url, title, target, icon, iconOpen, open) {
-
-  this.id = id;
-
-  this.pid = pid;
-
-  this.name = name;
-
-  this.url = url;
-
-  this.title = title;
-
-  this.target = target;
-
-  this.icon = icon;
-
-  this.iconOpen = iconOpen;
-
-  this._io = open || false;
-
-  this._is = false;
-
-  this._ls = false;
-
-  this._hc = false;
-
-  this._ai = 0;
-
-  this._p;
-
-}
-
-
-
-// Tree object
-
-function dTree(objName, baseDir) {
-
-  this.config = {
-
-    target					: null,
-
-    folderLinks			: true,
-
-    useSelection		: true,
-
-    useCookies			: true,
-
-    useLines				: true,
-
-    useIcons				: true,
-
-    useStatusText		: false,
-
-    closeSameLevel	: false,
-
-    inOrder					: false
-
-  };
-
-  this.icon = {
-
-    root				: baseDir + 'img/base.gif',
-
-    folder			: baseDir + 'img/folder.gif',
-
-    folderOpen	: baseDir + 'img/folderopen.gif',
-
-    node				: baseDir + 'img/page.gif',
-
-    empty				: baseDir + 'img/empty.gif',
-
-    line				: baseDir + 'img/line.gif',
-
-    join				: baseDir + 'img/join.gif',
-
-    joinBottom	: baseDir + 'img/joinbottom.gif',
-
-    plus				: baseDir + 'img/plus.gif',
-
-    plusBottom	: baseDir + 'img/plusbottom.gif',
-
-    minus				: baseDir + 'img/minus.gif',
-
-    minusBottom	: baseDir + 'img/minusbottom.gif',
-
-    nlPlus			: baseDir + 'img/nolines_plus.gif',
-
-    nlMinus			: baseDir + 'img/nolines_minus.gif'
-
-  };
-
-  this.obj = objName;
-
-  this.aNodes = [];
-
-  this.aIndent = [];
-
-  this.root = new Node(-1);
-
-  this.selectedNode = null;
-
-  this.selectedFound = false;
-
-  this.completed = false;
-
-}
-
-
-
-// Adds a new node to the node array
-
-dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {
-
-  this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
-
-};
-
-
-
-// Open/close all nodes
-
-dTree.prototype.openAll = function() {
-
-  this.oAll(true);
-
-};
-
-dTree.prototype.closeAll = function() {
-
-  this.oAll(false);
-
-};
-
-
-
-// Outputs the tree to the page
-
-dTree.prototype.toString = function() {
-  this.setCS_All();
-  var str = '<div class="dtree">\n';
-
-  if (document.getElementById) {
-
-    if (this.config.useCookies) this.selectedNode = this.getSelected();
-
-    str += this.addNode(this.root);
-
-  } else str += 'Browser not supported.';
-
-  str += '</div>';
-
-  if (!this.selectedFound) this.selectedNode = null;
-
-  this.completed = true;
-
-  return str;
-
-};
-
-
-
-// Creates the tree structure
-
-dTree.prototype.addNode = function(pNode) {
-
-  var str = '';
-
-  var n=0;
-
-  if (this.config.inOrder) n = pNode._ai;
-
-  for (n; n<this.aNodes.length; n++) {
-
-    if (this.aNodes[n].pid == pNode.id) {
-
-      var cn = this.aNodes[n];
-
-      cn._p = pNode;
-
-      cn._ai = n;
-
-      // this.setCS(cn);
-
-      if (!cn.target && this.config.target) cn.target = this.config.target;
-
-      if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
-
-      if (!this.config.folderLinks && cn._hc) cn.url = null;
-
-      if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
-
-          cn._is = true;
-
-          this.selectedNode = n;
-
-          this.selectedFound = true;
-
-      }
-
-      str += this.node(cn, n);
-
-      if (cn._ls) break;
-
-    }
-
-  }
-
-  return str;
-
-};
-
-
-
-// Creates the node icon, url and text
-
-dTree.prototype.node = function(node, nodeId) {
-
-  var str = '<div class="dTreeNode">' + this.indent(node, nodeId);
-
-  if (this.config.useIcons) {
-
-    if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
-
-    if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
-
-    if (this.root.id == node.pid) {
-
-      node.icon = this.icon.root;
-
-      node.iconOpen = this.icon.root;
-
-    }
-
-    str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
-
-  }
-
-  if (node.url) {
-
-    str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
-
-    if (node.title) str += ' title="' + node.title + '"';
-
-    if (node.target) str += ' target="' + node.target + '"';
-
-    if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
-
-    if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
-
-      str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';
-
-    str += '>';
-
-  }
-
-  else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
-
-    str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
-
-  str += node.name;
-
-  if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
-
-  str += '</div>';
-
-  if (node._hc) {
-
-    str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
-
-    str += this.addNode(node);
-
-    str += '</div>';
-
-  }
-
-  this.aIndent.pop();
-
-  return str;
-
-};
-
-
-
-// Adds the empty and line icons
-
-dTree.prototype.indent = function(node, nodeId) {
-
-  var str = '';
-
-  if (this.root.id != node.pid) {
-
-    for (var n=0; n<this.aIndent.length; n++)
-
-      str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
-
-    (node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
-
-    if (node._hc) {
-
-      str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';
-
-      if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
-
-      else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
-
-      str += '" alt="" /></a>';
-
-    } else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
-
-  }
-
-  return str;
-
-};
-
-
-
-// Checks if a node has any children and if it is the last sibling
-
-dTree.prototype.setCS = function(node) {
-
-  var lastId;
-
-  for (var n=0; n<this.aNodes.length; n++) {
-
-    if (this.aNodes[n].pid == node.id) node._hc = true;
-
-    if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
-
-  }
-
-  if (lastId==node.id) node._ls = true;
-
-};
-
-dTree.prototype.setCS_All = function()
-{
-  var ids = { }; // ID => { _hc: haschildren, _ls_is: lastsibling}
-
-  for(var n = 0; n < this.aNodes.length; n++)
-  {
-    var node = this.aNodes[n];
-    if(!ids[node.pid])
-    {
-      ids[node.pid] = { _hc: true, _ls_is: node.id };
-    }
-    else
-    {
-      ids[node.pid]._hc    = true;
-      ids[node.pid]._ls_is = node.id;
-    }
-
-    if(!ids[node.id])
-    {
-      ids[node.id] = { _hc: false, _ls_is: null }
-    }
-  }
-
-  for(var n = 0; n < this.aNodes.length; n++)
-  {
-    var node = this.aNodes[n];
-    node._ls = ids[node.pid]._ls_is == node.id ? true : false;
-    node._hc = ids[node.id]._hc;
-  }
-};
-
-// Returns the selected node
-
-dTree.prototype.getSelected = function() {
-
-  var sn = this.getCookie('cs' + this.obj);
-
-  return (sn) ? sn : null;
-
-};
-
-
-
-// Highlights the selected node
-
-dTree.prototype.s = function(id) {
-
-  if (!this.config.useSelection) return;
-
-  var cn = this.aNodes[id];
-
-  if (cn._hc && !this.config.folderLinks) return;
-
-  if (this.selectedNode != id) {
-
-    if (this.selectedNode || this.selectedNode==0) {
-
-      eOld = document.getElementById("s" + this.obj + this.selectedNode);
-
-      eOld.className = "node";
-
-    }
-
-    eNew = document.getElementById("s" + this.obj + id);
-
-    eNew.className = "nodeSel";
-
-    this.selectedNode = id;
-
-    if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
-
-  }
-
-};
-
-
-
-// Toggle Open or close
-
-dTree.prototype.o = function(id) {
-
-  var cn = this.aNodes[id];
-
-  this.nodeStatus(!cn._io, id, cn._ls);
-
-  cn._io = !cn._io;
-
-  if (this.config.closeSameLevel) this.closeLevel(cn);
-
-  if (this.config.useCookies) this.updateCookie();
-
-};
-
-
-
-// Open or close all nodes
-
-dTree.prototype.oAll = function(status) {
-
-  for (var n=0; n<this.aNodes.length; n++) {
-
-    if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
-
-      this.nodeStatus(status, n, this.aNodes[n]._ls)
-
-      this.aNodes[n]._io = status;
-
-    }
-
-  }
-
-  if (this.config.useCookies) this.updateCookie();
-
-};
-
-
-
-// Opens the tree to a specific node
-
-dTree.prototype.openTo = function(nId, bSelect, bFirst) {
-
-  if (!bFirst) {
-
-    for (var n=0; n<this.aNodes.length; n++) {
-
-      if (this.aNodes[n].id == nId) {
-
-        nId=n;
-
-        break;
-
-      }
-
-    }
-
-  }
-
-  var cn=this.aNodes[nId];
-
-  if (cn.pid==this.root.id || !cn._p) return;
-
-  cn._io = true;
-
-  cn._is = bSelect;
-
-  if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
-
-  if (this.completed && bSelect) this.s(cn._ai);
-
-  else if (bSelect) this._sn=cn._ai;
-
-  this.openTo(cn._p._ai, false, true);
-
-};
-
-
-
-// Closes all nodes on the same level as certain node
-
-dTree.prototype.closeLevel = function(node) {
-
-  for (var n=0; n<this.aNodes.length; n++) {
-
-    if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
-
-      this.nodeStatus(false, n, this.aNodes[n]._ls);
-
-      this.aNodes[n]._io = false;
-
-      this.closeAllChildren(this.aNodes[n]);
-
-    }
-
-  }
-
-}
-
-
-
-// Closes all children of a node
-
-dTree.prototype.closeAllChildren = function(node) {
-
-  for (var n=0; n<this.aNodes.length; n++) {
-
-    if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
-
-      if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
-
-      this.aNodes[n]._io = false;
-
-      this.closeAllChildren(this.aNodes[n]);
-
-    }
-
-  }
-
-}
-
-
-
-// Change the status of a node(open or closed)
-
-dTree.prototype.nodeStatus = function(status, id, bottom) {
-
-  eDiv	= document.getElementById('d' + this.obj + id);
-
-  eJoin	= document.getElementById('j' + this.obj + id);
-
-  if (this.config.useIcons) {
-
-    eIcon	= document.getElementById('i' + this.obj + id);
-
-    eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
-
-  }
-
-  eJoin.src = (this.config.useLines)?
-
-  ((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
-
-  ((status)?this.icon.nlMinus:this.icon.nlPlus);
-
-  eDiv.style.display = (status) ? 'block': 'none';
-
-};
-
-
-
-
-
-// [Cookie] Clears a cookie
-
-dTree.prototype.clearCookie = function() {
-
-  var now = new Date();
-
-  var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
-
-  this.setCookie('co'+this.obj, 'cookieValue', yesterday);
-
-  this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
-
-};
-
-
-
-// [Cookie] Sets value in a cookie
-
-dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
-
-  document.cookie =
-
-    escape(cookieName) + '=' + escape(cookieValue)
-
-    + (expires ? '; expires=' + expires.toGMTString() : '')
-
-    + (path ? '; path=' + path : '')
-
-    + (domain ? '; domain=' + domain : '')
-
-    + (secure ? '; secure' : '');
-
-};
-
-
-
-// [Cookie] Gets a value from a cookie
-
-dTree.prototype.getCookie = function(cookieName) {
-
-  var cookieValue = '';
-
-  var posName = document.cookie.indexOf(escape(cookieName) + '=');
-
-  if (posName != -1) {
-
-    var posValue = posName + (escape(cookieName) + '=').length;
-
-    var endPos = document.cookie.indexOf(';', posValue);
-
-    if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
-
-    else cookieValue = unescape(document.cookie.substring(posValue));
-
-  }
-
-  return (cookieValue);
-
-};
-
-
-
-// [Cookie] Returns ids of open nodes as a string
-
-dTree.prototype.updateCookie = function() {
-
-  var str = '';
-
-  for (var n=0; n<this.aNodes.length; n++) {
-
-    if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
-
-      if (str) str += '.';
-
-      str += this.aNodes[n].id;
-
-    }
-
-  }
-
-  this.setCookie('co' + this.obj, str);
-
-};
-
-
-
-// [Cookie] Checks if a node id is in a cookie
-
-dTree.prototype.isOpen = function(id) {
-
-  var aOpen = this.getCookie('co' + this.obj).split('.');
-
-  for (var n=0; n<aOpen.length; n++)
-
-    if (aOpen[n] == id) return true;
-
-  return false;
-
-};
-
-
-
-// If Push and pop is not implemented by the browser
-
-if (!Array.prototype.push) {
-
-  Array.prototype.push = function array_push() {
-
-    for(var i=0;i<arguments.length;i++)
-
-      this[this.length]=arguments[i];
-
-    return this.length;
-
-  };
-
-}
-
-if (!Array.prototype.pop) {
-
-  Array.prototype.pop = function array_pop() {
-
-    lastElement = this[this.length-1];
-
-    this.length = Math.max(this.length-1,0);
-
-    return lastElement;
-
-  };
-
-}
diff --git a/web/imcms/xinha/plugins/Linker/dTree/example01.html b/web/imcms/xinha/plugins/Linker/dTree/example01.html
deleted file mode 100644
index 07d47a2a58..0000000000
--- a/web/imcms/xinha/plugins/Linker/dTree/example01.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-
-<head>
-	<title>Destroydrop &raquo; Javascripts &raquo; Tree</title>
-
-	<link rel="StyleSheet" href="dtree.css" type="text/css" />
-	<script type="text/javascript" src="dtree.js"></script>
-
-</head>
-
-<body>
-
-<h1><a href="/">Destroydrop</a> &raquo; <a href="/javascripts/">Javascripts</a> &raquo; <a href="/javascripts/tree/">Tree</a></h1>
-
-<h2>Example</h2>
-
-<div class="dtree">
-
-	<p><a href="javascript: d.openAll();">open all</a> | <a href="javascript: d.closeAll();">close all</a></p>
-
-	<script type="text/javascript">
-		<!--
-
-		d = new dTree('d');
-
-		d.add(0,-1,'My example tree');
-		d.add(1,0,'Node 1','example01.html');
-		d.add(2,0,'Node 2','example01.html');
-		d.add(3,1,'Node 1.1','example01.html');
-		d.add(4,0,'Node 3','example01.html');
-		d.add(5,3,'Node 1.1.1','example01.html');
-		d.add(6,5,'Node 1.1.1.1','example01.html');
-		d.add(7,0,'Node 4','example01.html');
-		d.add(8,1,'Node 1.2','example01.html');
-		d.add(9,0,'My Pictures','example01.html','Pictures I\'ve taken over the years','','','img/imgfolder.gif');
-		d.add(10,9,'The trip to Iceland','example01.html','Pictures of Gullfoss and Geysir');
-		d.add(11,9,'Mom\'s birthday','example01.html');
-		d.add(12,0,'Recycle Bin','example01.html','','','img/trash.gif');
-
-		document.write(d);
-
-		//-->
-	</script>
-
-</div>
-
-<p><a href="mailto&#58;drop&#64;destroydrop&#46;com">&copy;2002-2003 Geir Landr&ouml;</a></p>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/base.gif b/web/imcms/xinha/plugins/Linker/dTree/img/base.gif
deleted file mode 100644
index 5aa538c1df..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/base.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/cd.gif b/web/imcms/xinha/plugins/Linker/dTree/img/cd.gif
deleted file mode 100644
index 6dfd68e2f0..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/cd.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/copy.gif b/web/imcms/xinha/plugins/Linker/dTree/img/copy.gif
deleted file mode 100644
index 330771cc1c..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/copy.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/empty.gif b/web/imcms/xinha/plugins/Linker/dTree/img/empty.gif
deleted file mode 100644
index b5cf52378f..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/empty.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/folder.gif b/web/imcms/xinha/plugins/Linker/dTree/img/folder.gif
deleted file mode 100644
index a4e2f29a7a..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/folder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/folderopen.gif b/web/imcms/xinha/plugins/Linker/dTree/img/folderopen.gif
deleted file mode 100644
index 074649b8b3..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/folderopen.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/globe.gif b/web/imcms/xinha/plugins/Linker/dTree/img/globe.gif
deleted file mode 100644
index f00ef00b0f..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/globe.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/imgfolder.gif b/web/imcms/xinha/plugins/Linker/dTree/img/imgfolder.gif
deleted file mode 100644
index 7906217681..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/imgfolder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/join.gif b/web/imcms/xinha/plugins/Linker/dTree/img/join.gif
deleted file mode 100644
index e5e2f6a490..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/join.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/joinbottom.gif b/web/imcms/xinha/plugins/Linker/dTree/img/joinbottom.gif
deleted file mode 100644
index dd83b1822d..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/joinbottom.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/line.gif b/web/imcms/xinha/plugins/Linker/dTree/img/line.gif
deleted file mode 100644
index 6dcdebea42..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/line.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/minus.gif b/web/imcms/xinha/plugins/Linker/dTree/img/minus.gif
deleted file mode 100644
index 6eb44b6848..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/minus.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/minusbottom.gif b/web/imcms/xinha/plugins/Linker/dTree/img/minusbottom.gif
deleted file mode 100644
index 1380d72cf3..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/minusbottom.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/move.gif b/web/imcms/xinha/plugins/Linker/dTree/img/move.gif
deleted file mode 100644
index 1aa1eab773..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/move.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/musicfolder.gif b/web/imcms/xinha/plugins/Linker/dTree/img/musicfolder.gif
deleted file mode 100644
index 5761a406f0..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/musicfolder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/nolines_minus.gif b/web/imcms/xinha/plugins/Linker/dTree/img/nolines_minus.gif
deleted file mode 100644
index daa8c20681..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/nolines_minus.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/nolines_plus.gif b/web/imcms/xinha/plugins/Linker/dTree/img/nolines_plus.gif
deleted file mode 100644
index 3e28a7a9c1..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/nolines_plus.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/offline.gif b/web/imcms/xinha/plugins/Linker/dTree/img/offline.gif
deleted file mode 100644
index 23163a49ef..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/offline.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/offline.png b/web/imcms/xinha/plugins/Linker/dTree/img/offline.png
deleted file mode 100644
index bb86270529..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/offline.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/page.gif b/web/imcms/xinha/plugins/Linker/dTree/img/page.gif
deleted file mode 100644
index 7c1cea690f..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/page.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/plus.gif b/web/imcms/xinha/plugins/Linker/dTree/img/plus.gif
deleted file mode 100644
index f6c9a11937..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/plus.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/plusbottom.gif b/web/imcms/xinha/plugins/Linker/dTree/img/plusbottom.gif
deleted file mode 100644
index c56ad93687..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/plusbottom.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/question.gif b/web/imcms/xinha/plugins/Linker/dTree/img/question.gif
deleted file mode 100644
index 5536f004fe..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/question.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dTree/img/trash.gif b/web/imcms/xinha/plugins/Linker/dTree/img/trash.gif
deleted file mode 100644
index 4d2fb72b67..0000000000
Binary files a/web/imcms/xinha/plugins/Linker/dTree/img/trash.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Linker/dialog.html b/web/imcms/xinha/plugins/Linker/dialog.html
deleted file mode 100644
index 54a91b927f..0000000000
--- a/web/imcms/xinha/plugins/Linker/dialog.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<h1 id="[h1]"><l10n>Insert/Modify Link</l10n></h1>
-<div style="position:relative">
-<div id="[dTree]">(the dTree goes in here)</div>
-<div id="[options]" >
-  <fieldset>
-    <legend><label><input type="radio" name="[type]" value="url" checked="checked" onclick="
-      document.getElementById('[urltable]').style.display=this.checked?'':'none';
-      document.getElementById('[mailtable]').style.display=this.checked?'none':'';
-      document.getElementById('[anchortable]').style.display=this.checked?'none':'';
-    " /> <l10n>URL Link</l10n></label></legend>
-    <table id="[urltable]" width="100%">
-      <tr>
-        <th><label for="[href]"><l10n>URL:</l10n> </label></th>
-        <td><input type="text" name="[href]" style="width:100%" value="http://www.example.com/" onfocus="if (this.value == 'http://www.example.com/') this.value = '';" /></td>
-      </tr>
-      <tr valign="top">
-        <th><l10n>Target:</l10n></th>
-        <td>
-          <div><label><input type="radio" name="[target]" value="" onclick="document.getElementById('[popuptable]').style.display='none';"  checked="checked" /> <l10n>Ordinary Link</l10n></label></div>
-          <div><label><input type="radio" name="[target]" value="_top" onclick="document.getElementById('[popuptable]').style.display='none';"   /> <l10n>Same Window (jump out of frames)</l10n></label></div>
-          <div><label><input type="radio" name="[target]" value="_blank" onclick="document.getElementById('[popuptable]').style.display='none';"/> <l10n>New Window</l10n> </label></div>
-          <div>
-            <label><input type="radio" name="[target]" value="popup"    onclick="document.getElementById('[popuptable]').style.display='';" /> <l10n>Popup Window</l10n> </label>
-             <div style="padding-left:10px">
-              <table id="[popuptable]">
-                <tr>
-                  <th align="left"><l10n>Size:</l10n></th>
-                  <td colspan="3"><input type="text" name="[p_width]" size="4" />x<input type="text" name="[p_height]" size="4" /> <l10n>(px)</l10n></td>
-                </tr>
-                <tr>
-                  <th align="left"><l10n>Name:</l10n></th>
-                  <td colspan="3"><input type="text" name="[p_name]" style="width:100%" value="_(PopupWindow)" /></td>
-                </tr>
-                <tr>
-                  <th align="left"><l10n>Menu Bar:</l10n></th>
-                  <td><input type="checkbox" name="[p_options]" value="menubar=yes" /></td>
-
-                  <th align="left"><l10n>Toolbar:</l10n></th>
-                  <td><input type="checkbox" name="[p_options]" value="toolbar=yes" checked="checked" /></td>
-                </tr>
-                <tr>
-                  <th align="left"><l10n>Location Bar:</l10n></th>
-                  <td><input type="checkbox" name="[p_options]" value="location=yes" /></td>
-
-                  <th align="left"><l10n>Status Bar:</l10n></th>
-                  <td><input type="checkbox" name="[p_options]" value="status=yes"   /></td>
-                </tr>
-                <tr>
-                  <th align="left"><l10n>Scrollbars:</l10n></th>
-                  <td><input type="checkbox" name="[p_options]" value="scrollbars=yes" checked="checked" /></td>
-
-                  <th align="left"><l10n>Resizeable:</l10n></th>
-                  <td><input type="checkbox" name="[p_options]" value="resizeable=yes" checked="checked" /></td>
-                </tr>
-              </table>
-            </div>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </fieldset>
-  <fieldset>
-    <legend><label><input type="radio" name="[type]" value="mailto" onclick="
-      document.getElementById('[mailtable]').style.display=this.checked?'':'none';
-      document.getElementById('[urltable]').style.display=this.checked?'none':'';
-      document.getElementById('[anchortable]').style.display=this.checked?'none':'';
-    "/> <l10n>Email Link</l10n></label></legend>
-    <table id="[mailtable]" width="100%">
-      <tr>
-        <th><label for="[to]"><l10n>Email Address:</l10n> </label></th>
-        <td><input type="text" name="[to]" style="width:100%" value="alice@example.com" onfocus="if (this.value == 'alice@example.com') this.value = '';" /></td>
-      </tr>
-      <tr>
-        <th><label for="[subject]"><l10n>Subject:</l10n> </label></th>
-        <td><input type="text" name="[subject]" style="width:100%" value="" /></td>
-      </tr>
-      <tr>
-        <th><label for="[body]"><l10n>Message Template:</l10n> </label></th>
-        <td><textarea name="[body]" style="width:100%" rows="5"></textarea></td>
-      </tr>
-    </table>
-  </fieldset>
-
-  <fieldset id="[anchorfieldset]">
-    <legend><label><input type="radio" name="[type]" value="anchor" onclick="
-      document.getElementById('[urltable]').style.display=this.checked?'none':'';
-      document.getElementById('[mailtable]').style.display=this.checked?'none':'';
-      document.getElementById('[anchortable]').style.display=this.checked?'':'none';
-    "/> <l10n>Anchor-Link</l10n></label></legend>
-    <table id="[anchortable]" width="100%">
-      <tr>
-        <th><label for="[anchor]"><l10n>Anchor:</l10n> </label></th>
-        <td>
-            <select name="[anchor]" id="[anchor]">
-            </select>
-        </td>
-      </tr>
-    </table>
-  </fieldset>
-
-  <div style="text-align:right">
-    <input type="button" id="[ok]"     value="_(OK)"     />
-    <input type="button" id="[clear]"  value="_(Remove Link)" onclick="this.form['[href]'].value='';this.form['[to]'].value='';document.getElementById('[ok]').click();" />
-    <input type="button" id="[cancel]" value="_(Cancel)" />
-  </div>
-</div>
-</div>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/de.js b/web/imcms/xinha/plugins/Linker/lang/de.js
deleted file mode 100644
index 7d0619b5f0..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/de.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "You must select some text before making a new link.": "Sie müssen einen Text markieren um einen Link zu erstellen",
-  "Are you sure you wish to remove this link?": "Wollen Sie diesen Link wirklich entfernen?",
-  "Remove Link": "Link entfernen",
-  "URL Link": "URL Adresse",
-  "Ordinary Link": "Standard Link",
-  "Same Window (jump out of frames)": "Selbes Fenster (ganzer Bereich)",
-  "New Window": "Neues Fenster",
-  "Popup Window": "Pop-Up Fenster",
-  "Email Link": "Email Link",
-  "Email Address:": "Email Adresse",
-  "Subject:": "Betreff:",
-  "Message Template:": "Nachrichten Vorlage:",
-  "Size:": "Größe:",
-  "Name:": "Name:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/fr.js b/web/imcms/xinha/plugins/Linker/lang/fr.js
deleted file mode 100644
index 6493e8639f..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/fr.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "You must select some text before making a new link.": "Vous devez sélectionner un texte avant de créer un nouveau lien",
-  "Are you sure you wish to remove this link?": "Confirmez-vous la suppression de ce lien ?",
-  "Remove Link": "Supprimer",
-  "URL Link": "Lien URL",
-  "Ordinary Link": "Lien standard",
-  "Same Window (jump out of frames)": "Même fenêtre (sort des frames)",
-  "New Window": "Nouvelle fenêtre",
-  "Popup Window": "Fenêtre popup",
-  "Email Link": "Lien email",
-  "Email Address:": "Adresse email",
-  "Subject:": "Sujet",
-  "Message Template:": "Message",
-  "Size:": "Taille",
-  "Name:": "Nom"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/ja.js b/web/imcms/xinha/plugins/Linker/lang/ja.js
deleted file mode 100644
index 931d04eae9..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/ja.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "You must select some text before making a new link.": "リンクを作��る��テキストを�択�る必���り��",
-  "Are you sure you wish to remove this link?": "本当���リンクを削除����?",
-  "Remove Link": "リンク削除",
-  "URL Link": "URLリンク",
-  "Ordinary Link": "標準リンク",
-  "Same Window (jump out of frames)": "�一ウィンドウ (フレーム最上�)",
-  "New Window": "新��ウィンドウ",
-  "Popup Window": "�ップアップウィンドウ",
-  "Email Link": "Eメールリンク",
-  "Email Address:": "アドレス:",
-  "Subject:": "件�:",
-  "Message Template:": "本文雛形:",
-  "Size:": "サイズ:",
-  "Name:": "��:",
-  "Menu Bar:": "メニュー",
-  "Toolbar:": "ツール�ー",
-  "Location Bar:": "アドレス�ー",
-  "Status Bar:": "ステータス�ー",
-  "Scrollbars:": "スクロール",
-  "Resizeable:": "リサイズ"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/nb.js b/web/imcms/xinha/plugins/Linker/lang/nb.js
deleted file mode 100644
index 0b5ba687fb..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/nb.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "You must select some text before making a new link.": "Du må markere tekst eller et bilde før du kan lage en lenke.",
-  "Are you sure you wish to remove this link?": "Er du sikker på at du vil fjerne lenken?"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/nl.js b/web/imcms/xinha/plugins/Linker/lang/nl.js
deleted file mode 100644
index 8bb3f208ff..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/nl.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "You must select some text before making a new link.": "Selecteer de tekst welke gelinkt moet worden.",
-  "Are you sure you wish to remove this link?": "Wilt u deze link werkelijk verwijderen?"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/no.js b/web/imcms/xinha/plugins/Linker/lang/no.js
deleted file mode 100644
index f7888b7a13..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/no.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "You must select some text before making a new link.": "Du må markere tekst eller et bilde før du kan lage en lenke.",
-  "Are you sure you wish to remove this link?": "Er du sikker på at du vil fjerne lenken?"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/pl.js b/web/imcms/xinha/plugins/Linker/lang/pl.js
deleted file mode 100644
index 9e875b0a8b..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/pl.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, http://www.eskot.krakow.pl/portfolio/, koto@webworkers.pl
-{
-  "You must select some text before making a new link.": "Zaznacz tekst przed dodaniem odnośnika.",
-  "Are you sure you wish to remove this link?": "Na pewno chcesz usunąć odnośnik?",
-  "Remove Link": "USUŃ ODNOŚNIK",
-  "URL Link": "Adres URL",
-  "Ordinary Link": "Zwykły odnośnik",
-  "Same Window (jump out of frames)": "To samo okno (wyskocz z ramek)",
-  "New Window": "Nowe okno",
-  "Popup Window": "Okienko pop-up",
-  "Email Link": "Link do e-maila",
-  "Email Address:": "Adres e-mail",
-  "Subject:": "Temat:",
-  "Message Template:": "Szablon wiadmości:",
-  "Size:": "Rozmiar:",
-  "Name:": "Nazwa:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/lang/pt_br.js b/web/imcms/xinha/plugins/Linker/lang/pt_br.js
deleted file mode 100644
index 92d07a25e8..0000000000
--- a/web/imcms/xinha/plugins/Linker/lang/pt_br.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt
-{
-  "Anchor-Link": "Link-Âncora",
-  "Anchor:": "Âncora:",
-  "Are you sure you wish to remove this link?": "Você tem certeza que deseja remover este link?",
-  "Cancel": "Cancelar",
-  "Email Address:": "Endereço de E-mail:",
-  "Email Link": "Link de E-mail",
-  "Insert/Modify Link": "Inserir/Modificar Link",
-  "Location Bar:": "Barra de Localização:",
-  "Menu Bar:": "Barra de Menu:",
-  "Message Template:": "Modelo de Mensagem:",
-  "Name:": "Nome:",
-  "New Window": "Nova Janela",
-  "OK": "OK",
-  "Ordinary Link": "Link Comum",
-  "Popup Window": "Janela Pop-up",
-  "Remove Link": "Remover Link",
-  "Resizeable:": "Redimensionável",
-  "Same Window (jump out of frames)": "Mesma Janela (Sair fora dos frames)",
-  "Scrollbars:": "Barra de Rolagem:",
-  "Size:": "Tamanho:",
-  "Status Bar:": "Barra de Informações:",
-  "Subject:": "Assunto:",
-  "Target:": "Destino:",
-  "Toolbar:": "Barra de Ferramentas:",
-  "URL Link": "URL do Link",
-  "You must select some text before making a new link.": "Você precisa selecionar algum texto antes de criar um novo link."
-}
diff --git a/web/imcms/xinha/plugins/Linker/linker.js b/web/imcms/xinha/plugins/Linker/linker.js
deleted file mode 100644
index 09aa61b3c9..0000000000
--- a/web/imcms/xinha/plugins/Linker/linker.js
+++ /dev/null
@@ -1,574 +0,0 @@
-/** htmlArea - James' Fork - Linker Plugin **/
-Linker._pluginInfo =
-{
-  name     : "Linker",
-  version  : "1.0",
-  developer: "James Sleeman",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "htmlArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-Xinha.loadStyle('dTree/dtree.css', 'Linker');
-
-Xinha.Config.prototype.Linker =
-{
-  'treeCaption' : document.location.host,
-  'backend' : _editor_url + 'plugins/Linker/scan.php',
-  'backend_data' : null,
-  'files' : null
-};
-
-
-function Linker(editor, args)
-{
-  this.editor  = editor;
-  this.lConfig = editor.config.Linker;
-
-  var linker = this;
-  if(editor.config.btnList.createlink)
-  {
-    editor.config.btnList.createlink[3]
-      =  function(e, objname, obj) { linker._createLink(linker._getSelectedAnchor()); };
-  }
-  else
-  {
-    editor.config.registerButton(
-                                 'createlink', 'Insert/Modify Hyperlink', [_editor_url + "images/ed_buttons_main.gif",6,1], false,
-                                 function(e, objname, obj) { linker._createLink(linker._getSelectedAnchor()); }
-                                 );
-  }
-
-  // See if we can find 'createlink'
- editor.config.addToolbarElement("createlink", "createlink", 0);
-}
-
-Linker.prototype._lc = function(string)
-{
-  return Xinha._lc(string, 'Linker');
-};
-
-Linker.prototype._createLink = function(a)
-{
-  if(!a && this.editor.selectionEmpty(this.editor.getSelection()))
-  {       
-    alert(this._lc("You must select some text before making a new link."));
-    return false;
-  }
-
-  var inputs =
-  {
-    type:     'url',
-    href:     'http://www.example.com/',
-    target:   '',
-    p_width:  '',
-    p_height: '',
-    p_options: ['menubar=no','toolbar=yes','location=no','status=no','scrollbars=yes','resizeable=yes'],
-    to:       'alice@example.com',
-    subject:  '',
-    body:     '',
-    anchor:   ''
-  };
-
-  if(a && a.tagName.toLowerCase() == 'a')
-  {
-    var href =this.editor.fixRelativeLinks(a.getAttribute('href'));
-    var m = href.match(/^mailto:(.*@[^?&]*)(\?(.*))?$/);
-    var anchor = href.match(/^#(.*)$/);
-
-    if(m)
-    {
-      // Mailto
-      inputs.type = 'mailto';
-      inputs.to = m[1];
-      if(m[3])
-      {
-        var args  = m[3].split('&');
-        for(var x = 0; x<args.length; x++)
-        {
-          var j = args[x].match(/(subject|body)=(.*)/);
-          if(j)
-          {
-            inputs[j[1]] = decodeURIComponent(j[2]);
-          }
-        }
-      }
-    }
-    else if (anchor)
-    {
-      //Anchor-Link
-      inputs.type = 'anchor';
-      inputs.anchor = anchor[1];
-      
-    }
-    else
-    {
-
-
-      if(a.getAttribute('onclick'))
-      {
-        var m = a.getAttribute('onclick').match(/window\.open\(\s*this\.href\s*,\s*'([a-z0-9_]*)'\s*,\s*'([a-z0-9_=,]*)'\s*\)/i);
-
-        // Popup Window
-        inputs.href   = href ? href : '';
-        inputs.target = 'popup';
-        inputs.p_name = m[1];
-        inputs.p_options = [ ];
-
-
-        var args = m[2].split(',');
-        for(var x = 0; x < args.length; x++)
-        {
-          var i = args[x].match(/(width|height)=([0-9]+)/);
-          if(i)
-          {
-            inputs['p_' + i[1]] = parseInt(i[2]);
-          }
-          else
-          {
-            inputs.p_options.push(args[x]);
-          }
-        }
-      }
-      else
-      {
-        // Normal
-        inputs.href   = href;
-        inputs.target = a.target;
-      }
-    }
-  }
-
-  var linker = this;
-
-  // If we are not editing a link, then we need to insert links now using execCommand
-  // because for some reason IE is losing the selection between now and when doOK is
-  // complete.  I guess because we are defocusing the iframe when we click stuff in the
-  // linker dialog.
-
-  this.a = a; // Why doesn't a get into the closure below, but if I set it as a property then it's fine?
-
-  var doOK = function()
-  {
-    //if(linker.a) alert(linker.a.tagName);
-    var a = linker.a;
-
-    var values = linker._dialog.hide();
-    var atr =
-    {
-      href: '',
-      target:'',
-      title:'',
-      onclick:''
-    };
-
-    if(values.type == 'url')
-    {
-     if(values.href)
-     {
-       atr.href = values.href;
-       atr.target = values.target;
-       if(values.target == 'popup')
-       {
-
-         if(values.p_width)
-         {
-           values.p_options.push('width=' + values.p_width);
-         }
-         if(values.p_height)
-         {
-           values.p_options.push('height=' + values.p_height);
-         }
-         atr.onclick = 'if(window.top && window.top.Xinha){return false}window.open(this.href, \'' + (values.p_name.replace(/[^a-z0-9_]/i, '_')) + '\', \'' + values.p_options.join(',') + '\');return false;';
-       }
-     }
-    }
-    else if(values.type == 'anchor')
-    {
-      if(values.anchor)
-      {
-        atr.href = values.anchor.value;
-      }
-    }
-    else
-    {
-      if(values.to)
-      {
-        atr.href = 'mailto:' + values.to;
-        if(values.subject) atr.href += '?subject=' + encodeURIComponent(values.subject);
-        if(values.body)    atr.href += (values.subject ? '&' : '?') + 'body=' + encodeURIComponent(values.body);
-      }
-    }
-
-    if(a && a.tagName.toLowerCase() == 'a')
-    {
-      if(!atr.href)
-      {
-        if(confirm(linker._dialog._lc('Are you sure you wish to remove this link?')))
-        {
-          var p = a.parentNode;
-          while(a.hasChildNodes())
-          {
-            p.insertBefore(a.removeChild(a.childNodes[0]), a);
-          }
-          p.removeChild(a);
-          linker.editor.updateToolbar();
-          return;
-        }
-      }
-      else
-      {
-        // Update the link
-        for(var i in atr)
-        {
-          a.setAttribute(i, atr[i]);
-        }
-        
-        // If we change a mailto link in IE for some hitherto unknown
-        // reason it sets the innerHTML of the link to be the 
-        // href of the link.  Stupid IE.
-        if(Xinha.is_ie)
-        {
-          if(/mailto:([^?<>]*)(\?[^<]*)?$/i.test(a.innerHTML))
-          {
-            a.innerHTML = RegExp.$1;
-          }
-        }
-      }
-    }
-    else
-    {
-      if(!atr.href) return true;
-
-      // Insert a link, we let the browser do this, we figure it knows best
-      var tmp = Xinha.uniq('http://www.example.com/Link');
-      linker.editor._doc.execCommand('createlink', false, tmp);
-
-      // Fix them up
-      var anchors = linker.editor._doc.getElementsByTagName('a');
-      for(var i = 0; i < anchors.length; i++)
-      {
-        var anchor = anchors[i];
-        if(anchor.href == tmp)
-        {
-          // Found one.
-          if (!a) a = anchor;
-          for(var j in atr)
-          {
-            anchor.setAttribute(j, atr[j]);
-          }
-        }
-      }
-    }
-    linker.editor.selectNodeContents(a);
-    linker.editor.updateToolbar();
-  };
-
-  this._dialog.show(inputs, doOK);
-
-};
-
-Linker.prototype._getSelectedAnchor = function()
-{
-  var sel  = this.editor.getSelection();
-  var rng  = this.editor.createRange(sel);
-  var a    = this.editor.activeElement(sel);
-  if(a != null && a.tagName.toLowerCase() == 'a')
-  {
-    return a;
-  }
-  else
-  {
-    a = this.editor._getFirstAncestor(sel, 'a');
-    if(a != null)
-    {
-      return a;
-    }
-  }
-  return null;
-};
-
-Linker.prototype.onGenerateOnce = function()
-{
-  this._dialog = new Linker.Dialog(this);
-};
-// Inline Dialog for Linker
-
-Linker.Dialog_dTrees = [ ];
-
-
-Linker.Dialog = function (linker)
-{
-  var  lDialog = this;
-  this.Dialog_nxtid = 0;
-  this.linker = linker;
-  this.id = { }; // This will be filled below with a replace, nifty
-
-  this.ready = false;
-  this.files  = false;
-  this.html   = false;
-  this.dialog = false;
-
-  // load the dTree script
-  this._prepareDialog();
-
-};
-
-Linker.Dialog.prototype._prepareDialog = function()
-{
-  var lDialog = this;
-  var linker = this.linker;
-
-  // We load some stuff up int he background, recalling this function
-  // when they have loaded.  This is to keep the editor responsive while
-  // we prepare the dialog.
-  if(typeof dTree == 'undefined')
-  {
-    Xinha._loadback(_editor_url + 'plugins/Linker/dTree/dtree.js',
-                       function() {lDialog._prepareDialog(); }
-                      );
-    return;
-  }
-
-  if(this.files == false)
-  {
-    if(linker.lConfig.backend)
-    {
-      //get files from backend
-      Xinha._postback(linker.lConfig.backend,
-                      linker.lConfig.backend_data, 
-                          function(txt) {
-                            try {
-                                lDialog.files = eval(txt);
-                            } catch(Error) {
-                                lDialog.files = [ {url:'',title:Error.toString()} ];
-                            }
-                            lDialog._prepareDialog(); });
-    }
-    else if(linker.lConfig.files != null)
-    {
-        //get files from plugin-config
-        lDialog.files = linker.lConfig.files;
-        lDialog._prepareDialog();
-    }
-    return;
-  }
-  var files = this.files;
-
-  if(this.html == false)
-  {
-    Xinha._getback(_editor_url + 'plugins/Linker/dialog.html', function(txt) { lDialog.html = txt; lDialog._prepareDialog(); });
-    return;
-  }
-  var html = this.html;
-
-  // Now we have everything we need, so we can build the dialog.
-  var dialog = this.dialog = new Xinha.Dialog(linker.editor, this.html, 'Linker');
-  var dTreeName = Xinha.uniq('dTree_');
-
-  this.dTree = new dTree(dTreeName, _editor_url + 'plugins/Linker/dTree/');
-  eval(dTreeName + ' = this.dTree');
-
-  this.dTree.add(this.Dialog_nxtid++, -1, linker.lConfig.treeCaption , null, linker.lConfig.treeCaption);
-  this.makeNodes(files, 0);
-
-  // Put it in
-  var ddTree = this.dialog.getElementById('dTree');
-  //ddTree.innerHTML = this.dTree.toString();
-  ddTree.innerHTML = '';
-  ddTree.style.position = 'absolute';
-  ddTree.style.left = 1 + 'px';
-  ddTree.style.top =  0 + 'px';
-  ddTree.style.overflow = 'auto';
-  ddTree.style.backgroundColor = 'white';
-  this.ddTree = ddTree;
-  this.dTree._linker_premade = this.dTree.toString();
-
-  var options = this.dialog.getElementById('options');
-  options.style.position = 'absolute';
-  options.style.top      = 0   + 'px';
-  options.style.right    = 0   + 'px';
-  options.style.width    = 320 + 'px';
-  options.style.overflow = 'auto';
-
-  // Hookup the resizer
-  this.dialog.onresize = function()
-    {
-      var h = parseInt(dialog.height) - dialog.getElementById('h1').offsetHeight;
-      var w = parseInt(dialog.width)  - 322 ;
-      // An error is thrown with IE when trying to set a negative width or a negative height
-      // But perhaps a width / height of 0 is not the minimum required we need to set
-      if (w<0) w = 0;
-      if (h<0) h = 0;
-      options.style.height = ddTree.style.height = h + 'px';
-      ddTree.style.width  = w + 'px';
-    }
-
-  this.ready = true;
-};
-
-Linker.Dialog.prototype.makeNodes = function(files, parent)
-{
-  for(var i = 0; i < files.length; i++)
-  {
-    if(typeof files[i] == 'string')
-    {
-      this.dTree.add(Linker.nxtid++, parent,
-                     files[i].replace(/^.*\//, ''),
-                     'javascript:document.getElementsByName(\'' + this.dialog.id.href + '\')[0].value=decodeURIComponent(\'' + encodeURIComponent(files[i]) + '\');document.getElementsByName(\'' + this.dialog.id.type + '\')[0].click();document.getElementsByName(\'' + this.dialog.id.href + '\')[0].focus();void(0);',
-                     files[i]);
-    }
-    else if(files[i].length)
-    {
-      var id = this.Dialog_nxtid++;
-      this.dTree.add(id, parent, files[i][0].replace(/^.*\//, ''), null, files[i][0]);
-      this.makeNodes(files[i][1], id);
-    }
-    else if(typeof files[i] == 'object')
-    {
-      if(files[i].children) {
-        var id = this.Dialog_nxtid++;
-      } else {
-        var id = Linker.nxtid++;
-      }
-
-      if(files[i].title) var title = files[i].title;
-      else if(files[i].url) var title = files[i].url.replace(/^.*\//, '');
-      else var title = "no title defined";
-      if(files[i].url) var link = 'javascript:document.getElementsByName(\'' + this.dialog.id.href + '\')[0].value=decodeURIComponent(\'' + encodeURIComponent(files[i].url) + '\');document.getElementsByName(\'' + this.dialog.id.type + '\')[0].click();document.getElementsByName(\'' + this.dialog.id.href + '\')[0].focus();void(0);';
-      else var link = '';
-      
-      this.dTree.add(id, parent, title, link, title);
-      if(files[i].children) {
-        this.makeNodes(files[i].children, id);
-      }
-    }
-  }
-};
-
-Linker.Dialog.prototype._lc = Linker.prototype._lc;
-
-Linker.Dialog.prototype.show = function(inputs, ok, cancel)
-{
-  if(!this.ready)
-  {
-    var lDialog = this;
-    window.setTimeout(function() {lDialog.show(inputs,ok,cancel);},100);
-    return;
-  }
-
-  if(this.ddTree.innerHTML == '')
-  {
-    this.ddTree.innerHTML = this.dTree._linker_premade;
-  }
-
-  if(inputs.type=='url')
-  {
-    this.dialog.getElementById('urltable').style.display = '';
-    this.dialog.getElementById('mailtable').style.display = 'none';
-    this.dialog.getElementById('anchortable').style.display = 'none';
-  }
-  else if(inputs.type=='anchor')
-  {
-    this.dialog.getElementById('urltable').style.display = 'none';
-    this.dialog.getElementById('mailtable').style.display = 'none';
-    this.dialog.getElementById('anchortable').style.display = '';
-  }
-  else
-  {
-    this.dialog.getElementById('urltable').style.display = 'none';
-    this.dialog.getElementById('mailtable').style.display = '';
-    this.dialog.getElementById('anchortable').style.display = 'none';
-  }
-
-  if(inputs.target=='popup')
-  {
-    this.dialog.getElementById('popuptable').style.display = '';
-  }
-  else
-  {
-    this.dialog.getElementById('popuptable').style.display = 'none';
-  }
-  
-  var anchor = this.dialog.getElementById('anchor');
-  for(var i=anchor.length;i>=0;i--) {
-    anchor[i] = null;
-  }
-
-  var html = this.linker.editor.getHTML();  
-  var anchors = new Array();
-
-  var m = html.match(/<a[^>]+name="([^"]+)"/gi);
-  if(m)
-  {
-    for(i=0;i<m.length;i++)
-    {
-        var n = m[i].match(/name="([^"]+)"/i);
-        if(!anchors.contains(n[1])) anchors.push(n[1]);
-    }
-  }
-  m = html.match(/id="([^"]+)"/gi);
-  if(m)
-  {
-    for(i=0;i<m.length;i++)
-    {
-        n = m[i].match(/id="([^"]+)"/i);
-        if(!anchors.contains(n[1])) anchors.push(n[1]);
-    }
-  }
-  
-  for(i=0;i<anchors.length;i++)
-  {
-    var opt = new Option(anchors[i],'#'+anchors[i],false,(inputs.anchor == anchors[i]));
-    anchor[anchor.length] = opt;
-  }
-
-  //if no anchors found completely hide Anchor-Link
-  if(anchor.length==0) {
-    this.dialog.getElementById('anchorfieldset').style.display = "none";
-  }
-  
-  // if we're not editing an existing link, hide the remove link button
-  if (inputs.href == 'http://www.example.com/' && inputs.to == 'alice@example.com') { 
-    this.dialog.getElementById('clear').style.display = "none";
-  }
-  else {
-    this.dialog.getElementById('clear').style.display = "";
-  }
-  // Connect the OK and Cancel buttons
-  var dialog = this.dialog;
-  var lDialog = this;
-  if(ok)
-  {
-    this.dialog.getElementById('ok').onclick = ok;
-  }
-  else
-  {
-    this.dialog.getElementById('ok').onclick = function() {lDialog.hide();};
-  }
-
-  if(cancel)
-  {
-    this.dialog.getElementById('cancel').onclick = cancel;
-  }
-  else
-  {
-    this.dialog.getElementById('cancel').onclick = function() { lDialog.hide()};
-  }
-
-  // Show the dialog
-  this.linker.editor.disableToolbar(['fullscreen','linker']);
-
-  this.dialog.show(inputs);
-
-  // Init the sizes
-  this.dialog.onresize();
-};
-
-Linker.Dialog.prototype.hide = function()
-{
-  this.linker.editor.enableToolbar();
-  return this.dialog.hide();
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Linker/scan.php b/web/imcms/xinha/plugins/Linker/scan.php
deleted file mode 100644
index fe55f1d0e7..0000000000
--- a/web/imcms/xinha/plugins/Linker/scan.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-    // /home/username/foo/public_html/
-    $dir          = dirname(__FILE__)."/../..";
-    $include      = '/\.(php|shtml|html|htm|shtm|cgi|txt|doc|pdf|rtf|xls|csv)$/';
-    $exclude      = '';
-    $dirinclude   = '';
-    $direxclude   = '/(^|\/)[._]|htmlarea/'; // Exclude the htmlarea tree by default
-
-    // New backend config data passing
-    //  if data was passed using xinha_pass_to_backend() we extract and use it
-    //  as the items above    
-    require_once(realpath(dirname(__FILE__) . '/../../contrib/php-xinha.php'));
-    if($passed_data = xinha_read_passed_data())
-    {
-      extract($passed_data);      
-    }
-
-    // Old deprecated backend config data passing
-    //  not described because you shouldn't use it.
-    //------------------------------------------------------------------------    
-    $hash = '';
-    foreach(explode(',', 'dir,include,exclude,dirinclude,direxclude') as $k)
-    {
-      if(isset($_REQUEST[$k]))
-      {
-        if(get_magic_quotes_gpc())
-        {
-          $_REQUEST[$k] = stripslashes($_REQUEST[$k]);
-        }
-        $hash .= $k . '=' . $_REQUEST[$k];
-        $$k = $_REQUEST[$k];
-      }
-    }
-
-    if($hash)
-    {
-      session_start();
-      if(!isset($_SESSION[sha1($hash)]))
-      {
-        ?>
-        [ ];
-        <?php
-        exit;
-      }
-    }
-    //------------------------------------------------------------------------
-
-
-    function scan($dir, $durl = '')
-    {
-      global $include, $exclude, $dirinclude, $direxclude;
-      static $seen = array();
-
-      $files = array();
-
-      $dir = realpath($dir);
-      if(isset($seen[$dir]))
-      {
-        return $files;
-      }
-      $seen[$dir] = TRUE;
-      $dh = @opendir($dir);
-
-
-      while($dh && ($file = readdir($dh)))
-      {
-        if($file !== '.' && $file !== '..')
-        {
-          $path = realpath($dir . '/' . $file);
-          $url  = $durl . '/' . $file;
-
-          if(($dirinclude && !preg_match($dirinclude, $url)) || ($direxclude && preg_match($direxclude, $url))) continue;
-          if(is_dir($path))
-          {
-            if($subdir = scan($path, $url))
-            {
-              $files[] = array('url'=>$url, 'children'=>$subdir);
-            }
-          }
-          elseif(is_file($path))
-          {
-            if(($include && !preg_match($include, $url)) || ($exclude && preg_match($exclude, $url))) continue;
-            $files[] = array('url'=>$url);
-          }
-
-        }
-      }
-      @closedir($dh);
-      return dirsort($files);
-    }
-
-    function dirsort($files)
-    {
-      usort($files, 'dircomp');
-      return $files;
-    }
-
-    function dircomp($a, $b)
-    {
-      if(is_array($a)) $a = array_shift($a);
-      if(is_array($b)) $b = array_shift($b);
-      return strcmp(strtolower($a), strtolower($b));
-    }
-   
-    echo xinha_to_js(scan($dir));
-?>
diff --git a/web/imcms/xinha/plugins/ListType/ListType.css b/web/imcms/xinha/plugins/ListType/ListType.css
deleted file mode 100644
index 8ad84b9fc1..0000000000
--- a/web/imcms/xinha/plugins/ListType/ListType.css
+++ /dev/null
@@ -1,43 +0,0 @@
-.ListType { }
-.ListType a {
-  display:block;
-  float:left;
-  margin:2px 0 0 5px;
-  padding:0;
-  width:50px;
-  height:40px;
-  border:1px solid #9c96a5;
-}
-.ListType a:hover {
-  border:1px solid #ffd760;
-}
-.ListType a.active {
-  border:1px solid #000084;
-}
-.ListType a.circle {
-  background:url(img/circle.png);
-}
-.ListType a.disc {
-  background:url(img/disc.png);
-}
-.ListType a.square {
-  background:url(img/square.png);
-}
-.ListType a.decimal {
-  background:url(img/decimal.png);
-}
-.ListType a.lower-alpha {
-  background:url(img/lower-alpha.png);
-}
-.ListType a.upper-alpha {
-  background:url(img/upper-alpha.png);
-}
-.ListType a.lower-roman {
-  background:url(img/lower-roman.png);
-}
-.ListType a.upper-roman {
-  background:url(img/upper-roman.png);
-}
-.ListType a.none {
-  background:url(img/none.png);
-}
diff --git a/web/imcms/xinha/plugins/ListType/img/circle.png b/web/imcms/xinha/plugins/ListType/img/circle.png
deleted file mode 100644
index e8fd0b6012..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/circle.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/decimal.png b/web/imcms/xinha/plugins/ListType/img/decimal.png
deleted file mode 100644
index cda75180ee..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/decimal.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/disc.png b/web/imcms/xinha/plugins/ListType/img/disc.png
deleted file mode 100644
index 0dd7b6296f..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/disc.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/lower-alpha.png b/web/imcms/xinha/plugins/ListType/img/lower-alpha.png
deleted file mode 100644
index 1714b702fa..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/lower-alpha.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/lower-roman.png b/web/imcms/xinha/plugins/ListType/img/lower-roman.png
deleted file mode 100644
index 7c934ffd0f..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/lower-roman.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/none.png b/web/imcms/xinha/plugins/ListType/img/none.png
deleted file mode 100644
index 3343f3d2fe..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/none.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/square.png b/web/imcms/xinha/plugins/ListType/img/square.png
deleted file mode 100644
index 884fffc70a..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/square.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/upper-alpha.png b/web/imcms/xinha/plugins/ListType/img/upper-alpha.png
deleted file mode 100644
index 1654508274..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/upper-alpha.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/img/upper-roman.png b/web/imcms/xinha/plugins/ListType/img/upper-roman.png
deleted file mode 100644
index 8d08ce51c8..0000000000
Binary files a/web/imcms/xinha/plugins/ListType/img/upper-roman.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/ListType/lang/de.js b/web/imcms/xinha/plugins/ListType/lang/de.js
deleted file mode 100644
index a835f5a59f..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/de.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Decimal numbers": "Zahlen",
-  "Lower roman numbers": "Römisch klein",
-  "Upper roman numbers": "Römisch groß",
-  "Lower latin letters": "Zeichen klein",
-  "Upper latin letters": "Zeichen groß",
-  "Lower greek letters": "Griechisch",
-  "Choose list style type (for ordered lists)": "Wählen Sie einen Typ für die Nummerierung aus"
-};
diff --git a/web/imcms/xinha/plugins/ListType/lang/fr.js b/web/imcms/xinha/plugins/ListType/lang/fr.js
deleted file mode 100644
index 300d92ffaa..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/fr.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Decimal numbers": "Nombres décimaux",
-  "Lower roman numbers": "Nombres romains minuscule",
-  "Upper roman numbers": "Nombres romains majuscule",
-  "Lower latin letters": "Lettres latines minuscule",
-  "Upper latin letters": "Lettres latines majuscule",
-  "Lower greek letters": "Lettres grecques minuscule",
-  "Choose list style type (for ordered lists)": "Choisissez le style de liste (pour les listes ordonnées)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ListType/lang/ja.js b/web/imcms/xinha/plugins/ListType/lang/ja.js
deleted file mode 100644
index 3d96430d1d..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/ja.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Decimal numbers": "10進数",
-  "Lower roman numbers": "ローマ数字(�文字)",
-  "Upper roman numbers": "ローマ数字(大文字)",
-  "Lower latin letters": "アルファベット(�文字)",
-  "Upper latin letters": "アルファベット(大文字)",
-  "Lower greek letters": "ギリシャ文字(�文字)",
-  "Choose list style type (for ordered lists)": "リスト形���択(順�付�リスト用)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ListType/lang/nb.js b/web/imcms/xinha/plugins/ListType/lang/nb.js
deleted file mode 100644
index 3647ee685c..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/nb.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Decimal numbers": "Desimaltall",
-  "Lower roman numbers": "Lower roman numbers",
-  "Upper roman numbers": "Upper roman numbers",
-  "Lower latin letters": "Lower latin letters",
-  "Upper latin letters": "Upper latin letters",
-  "Lower greek letters": "Lower greek letters",
-  "Choose list style type (for ordered lists)": "Velg listetype (for nummererte lister)"
-};
diff --git a/web/imcms/xinha/plugins/ListType/lang/nl.js b/web/imcms/xinha/plugins/ListType/lang/nl.js
deleted file mode 100644
index d5702ea729..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/nl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-{
-  "Decimal numbers": "Decimale nummers",
-  "Lower roman numbers": "Romeinse nummers klein",
-  "Upper roman numbers": "Romeinse nummers groot",
-  "Lower latin letters": "Latijnse letters klein",
-  "Upper latin letters": "Latijnse letters groot",
-  "Lower greek letters": "Griekse letters",
-  "Choose list style type (for ordered lists)": "Kies stijl type (voor ordered lists)"
-};
diff --git a/web/imcms/xinha/plugins/ListType/lang/no.js b/web/imcms/xinha/plugins/ListType/lang/no.js
deleted file mode 100644
index 93d58b684e..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/no.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Decimal numbers": "Desimaltall",
-  "Lower roman numbers": "Lower roman numbers",
-  "Upper roman numbers": "Upper roman numbers",
-  "Lower latin letters": "Lower latin letters",
-  "Upper latin letters": "Upper latin letters",
-  "Lower greek letters": "Lower greek letters",
-  "Choose list style type (for ordered lists)": "Velg listetype (for nummererte lister)"
-};
diff --git a/web/imcms/xinha/plugins/ListType/lang/pl.js b/web/imcms/xinha/plugins/ListType/lang/pl.js
deleted file mode 100644
index 44accd1e79..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/pl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, koto1sa@o2.pl, http://www.eskot.krakow.pl/portfolio
-{
-  "Decimal numbers": "Cyfry arabskie",
-  "Lower roman numbers": "Małe rzymskie",
-  "Upper roman numbers": "Duże rzymskie",
-  "Lower latin letters": "Małe litery",
-  "Upper latin letters": "Duże litery",
-  "Lower greek letters": "Małe litery greckie",
-  "Choose list style type (for ordered lists)": "Wybierz typ listy numerowanej"
-};
diff --git a/web/imcms/xinha/plugins/ListType/lang/pt_br.js b/web/imcms/xinha/plugins/ListType/lang/pt_br.js
deleted file mode 100644
index 4f5a8623bb..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/pt_br.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Decimal numbers": "Números decimais",
-  "Lower roman numbers": "Números romanos inferiores",
-  "Upper roman numbers": "Números romanos superiores",
-  "Lower latin letters": "Letras latinas inferiores",
-  "Upper latin letters": "Letras latinas superiores",
-  "Lower greek letters": "Letras gregas inferiores",
-  "Choose list style type (for ordered lists)": "Escolha um tipo de lista (para lista ordenada)"
-};
diff --git a/web/imcms/xinha/plugins/ListType/lang/ru.js b/web/imcms/xinha/plugins/ListType/lang/ru.js
deleted file mode 100644
index 337e096604..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/ru.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Author: Andrei Blagorazumov, a@fnr.ru
-{
-  "Decimal numbers": "Де��тичные чи�ла",
-  "Lower roman numbers": "Строчные роман�кие чи�ла",
-  "Upper roman numbers": "Заглавные роман�кие чи�ла",
-  "Lower latin letters": "Строчные латин�кие �имволы",
-  "Upper latin letters": "Заглавные латин�кие �имволы",
-  "Lower greek letters": "Строчные грече�кие �имволы",
-  "Choose list style type (for ordered lists)": "Выберите �тиль �пи�ков (дл� упор�доченных �пи�ков)"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/ListType/lang/sv.js b/web/imcms/xinha/plugins/ListType/lang/sv.js
deleted file mode 100755
index 111a5730ac..0000000000
--- a/web/imcms/xinha/plugins/ListType/lang/sv.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "sv" (Swedish), ENCODING: UTF-8
-// translated: Erik Dalén, <dalen@jpl.se>
-{
-  "Decimal numbers": "Desimaltal",
-  "Lower roman numbers": "Små romerska siffror",
-  "Upper roman numbers": "Stora romerska siffror",
-  "Lower latin letters": "Små latinska bokstäver",
-  "Upper latin letters": "Stora latinska bokstäver",
-  "Lower greek letters": "Små grekiska bokstäver",
-  "Choose list style type (for ordered lists)": "Välj listtyp (för numrerade listor)"
-};
diff --git a/web/imcms/xinha/plugins/ListType/list-type.js b/web/imcms/xinha/plugins/ListType/list-type.js
deleted file mode 100644
index 8558c26883..0000000000
--- a/web/imcms/xinha/plugins/ListType/list-type.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// ListType Plugin for Xinha
-// Toolbar Implementation by Mihai Bazon, http://dynarch.com/mishoo/
-Xinha.loadStyle( 'ListType.css', 'ListType' );
-
-function ListType( editor )
-{
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  if ( cfg.ListType.mode == 'toolbar' )
-  {
-  var options = {};
-    options[Xinha._lc( "Decimal numbers", "ListType" )] = "decimal";
-    options[Xinha._lc( "Lower roman numbers", "ListType" )] = "lower-roman";
-    options[Xinha._lc( "Upper roman numbers", "ListType" )] = "upper-roman";
-    options[Xinha._lc( "Lower latin letters", "ListType" )] = "lower-alpha";
-    options[Xinha._lc( "Upper latin letters", "ListType" )] = "upper-alpha";
-    if (!Xinha.is_ie)
-      // IE doesn't support this property; even worse, it complains
-      // with a gross error message when we tried to select it,
-      // therefore let's hide it from the damn "browser".
-      options[Xinha._lc( "Lower greek letters", "ListType" )] = "lower-greek";
-    var obj =
-    {
-      id            : "listtype",
-      tooltip       : Xinha._lc( "Choose list style type (for ordered lists)", "ListType" ),
-      options       : options,
-      action        : function( editor ) { self.onSelect( editor, this ); },
-      refresh       : function( editor ) { self.updateValue( editor, this ); },
-      context       : "ol"
-    };
-    cfg.registerDropdown( obj );
-    cfg.addToolbarElement( "listtype", ["insertorderedlist","orderedlist"], 1 );
-  }
-  else
-  {
-    editor._ListType = editor.addPanel( 'right' );
-    Xinha.freeLater( editor, '_ListType' );
-    Xinha.addClass( editor._ListType, 'ListType' );
-    // hurm, ok it's pretty to use the background color for the whole panel,
-    // but should not it be set by default when creating the panel ?
-    Xinha.addClass( editor._ListType.parentNode, 'dialog' );
-
-    editor.notifyOn( 'modechange',
-      function(e,args)
-      {
-        if ( args.mode == 'text' ) editor.hidePanel( editor._ListType );
-      }
-    );
-
-    var elts_ul = ['disc', 'circle', 'square', 'none'];
-    var elts_ol = ['decimal', 'lower-alpha', 'upper-alpha', 'lower-roman', 'upper-roman', 'none'];
-    var divglobal = document.createElement( 'div' );
-    divglobal.style.height = '90px';
-    var div = document.createElement( 'div' );
-    this.divUL = div;
-    div.style.display = 'none';
-    for ( var i=0; i<elts_ul.length; i++ )
-    {
-      div.appendChild( this.createImage( elts_ul[i] ) );
-    }
-    divglobal.appendChild( div );
-    var div = document.createElement( 'div' );
-    this.divOL = div;
-    div.style.display = 'none';
-    for ( var i=0; i<elts_ol.length; i++ )
-    {
-      div.appendChild( this.createImage( elts_ol[i] ) );
-    }
-    divglobal.appendChild( div );
-
-    editor._ListType.appendChild( divglobal );
-
-    editor.hidePanel( editor._ListType );
-  }
-}
-
-Xinha.Config.prototype.ListType =
-{
-  'mode': 'toolbar' // configuration mode : toolbar or panel
-};
-
-ListType._pluginInfo =
-{
-  name          : "ListType",
-  version       : "2.1",
-  developer     : "Laurent Vilday",
-  developer_url : "http://www.mokhet.com/",
-  c_owner       : "Xinha community",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "Creative Commons Attribution-ShareAlike License"
-};
-
-ListType.prototype.onSelect = function( editor, combo )
-{
-  var tbobj = editor._toolbarObjects[ combo.id ].element;
-  var parent = editor.getParentElement();
-  while (!/^ol$/i.test( parent.tagName ))
-    parent = parent.parentNode;
-  parent.style.listStyleType = tbobj.value;
-};
-
-ListType.prototype.updateValue = function( editor, combo )
-{
-  var tbobj = editor._toolbarObjects[ combo.id ].element;
-  var parent = editor.getParentElement();
-  while ( parent && !/^ol$/i.test( parent.tagName ) )
-    parent = parent.parentNode;
-  if (!parent)
-  {
-    tbobj.selectedIndex = 0;
-    return;
-  }
-  var type = parent.style.listStyleType;
-  if (!type)
-  {
-    tbobj.selectedIndex = 0;
-  }
-  else
-  {
-    for ( var i = tbobj.firstChild; i; i = i.nextSibling )
-    {
-      i.selected = (type.indexOf(i.value) != -1);
-    }
-  }
-};
-
-ListType.prototype.onUpdateToolbar = function()
-{
-  if ( this.editor.config.ListType.mode == 'toolbar' ) return ;
-  var parent = this.editor.getParentElement();
-  while ( parent && !/^[o|u]l$/i.test( parent.tagName ) )
-    parent = parent.parentNode;
-  if (parent && /^[o|u]l$/i.test( parent.tagName ) )
-  {
-    this.showPanel( parent );
-  }
-  else if (this.editor._ListType.style.display != 'none')
-  {
-    this.editor.hidePanel( this.editor._ListType );
-  }
-};
-
-ListType.prototype.createImage = function( listStyleType )
-{
-  var self = this;
-  var editor = this.editor;
-  var a = document.createElement( 'a' );
-  a.href = 'javascript:void(0)';
-  Xinha._addClass( a, listStyleType );
-  Xinha._addEvent( a, "click", function ()
-    {
-      var parent = editor._ListType.currentListTypeParent;
-      parent.style.listStyleType = listStyleType;
-      self.showActive( parent );
-      return false;
-    }
-  );
-  return a;
-};
-
-ListType.prototype.showActive = function( parent )
-{
-  var activeDiv = ( parent.tagName.toLowerCase() == 'ul' ) ? this.divUL : this.divOL;
-  this.divUL.style.display = 'none';
-  this.divOL.style.display = 'none';
-  activeDiv.style.display = 'block';
-  var defaultType = parent.style.listStyleType;
-  if ( '' == defaultType ) defaultType = ( parent.tagName.toLowerCase() == 'ul' )? 'disc':'decimal';
-  for ( var i=0; i<activeDiv.childNodes.length; i++ )
-  {
-    var elt = activeDiv.childNodes[i];
-    if ( Xinha._hasClass( elt, defaultType ) )
-    {
-      Xinha._addClass( elt, 'active' );
-    }
-    else
-    {
-      Xinha._removeClass( elt, 'active' );
-    }
-  }
-};
-
-ListType.prototype.showPanel = function( parent )
-{
-  this.editor._ListType.currentListTypeParent = parent;
-  this.showActive(parent);
-  this.editor.showPanel( this.editor._ListType );
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/NoteServer/img/note.gif b/web/imcms/xinha/plugins/NoteServer/img/note.gif
deleted file mode 100644
index e3c117a7c5..0000000000
Binary files a/web/imcms/xinha/plugins/NoteServer/img/note.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/NoteServer/lang/de.js b/web/imcms/xinha/plugins/NoteServer/lang/de.js
deleted file mode 100644
index 58b0f9205d..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/lang/de.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Sponsored by http://www.systemconcept.de
-// Author: Holger Hees, <hhees@systemconcept.de>
-// (c) systemconcept.de 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Insert GUIDO Music Notation": "Einfügung einer GUIDO Musik-Tonfolge",
-  "Guido code": "Guido code",
-  "Options": "Einstellungen",
-  "Format": "Format",
-  "Image in applet": "Bild im Applet",
-  "Zoom": "Zoom",
-  "MIDI File": "MIDI Datei",
-  "Image Preview": "Bild Voransicht",
-  "Source Code": "Quell-Code",
-  "Preview": "Voransicht",
-  "Add MIDI link to allow students to hear the music": "MIDI-Link hinzufügen um Studenten das hören der Musik zu ermöglichen",
-  "Add GUIDO Code in a textbox on the page": "GUIDO Code in einer Textbox auf der Seite anzeigen"
-};
diff --git a/web/imcms/xinha/plugins/NoteServer/lang/fr.js b/web/imcms/xinha/plugins/NoteServer/lang/fr.js
deleted file mode 100644
index f0510d3a5c..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/lang/fr.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Insert GUIDO Music Notation": "Insérer une partition musicale GUIDO",
-  "Guido code": "Code Guido",
-  "Options": "Options",
-  "Format": "Format",
-  "Image in applet": "Image dans une applet",
-  "Zoom": "Zoom",
-  "MIDI File": "Fichier MIDI",
-  "Image Preview": "Aperçu de l'image",
-  "Source Code": "Code source",
-  "Preview": "Aperçu ",
-  "Add MIDI link to allow students to hear the music": "Ajouter un lien MIDI pour permettre aux étudiants d'écouter la partition",
-  "Add GUIDO Code in a textbox on the page": "Ajouter le code source GUIDO dans un cadre"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/NoteServer/lang/ja.js b/web/imcms/xinha/plugins/NoteServer/lang/ja.js
deleted file mode 100644
index a1d5041bdc..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/lang/ja.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-// This string is for auto detection of multi-encoding editor : 国際化文字検出用文字列
-{
-  "Insert GUIDO Music Notation": "GUIDO Music Notation�挿入",
-  "Guido code": "GUIDOコード",
-  "Options": "オプション",
-  "Format": "フォーマット",
-  "Image in applet": "アプレット画�",
-  "Zoom": "拡大率:",
-  "MIDI File": "MIDIファイル",
-  "Image Preview": "画�プレビュー",
-  "Source Code": "ソースコード",
-  "Preview": "表示",
-  "Add MIDI link to allow students to hear the music": "MIDI��リンクを追加��楽曲を����もよ�",
-  "Add GUIDO Code in a textbox on the page": "ページ内�テキストボックス�GUIDOコードを追加",
-  "With Mozilla, the applet will not be visible in editor, but only in Web page after submitting.": "Mozilla��エディタ内�アプレット�表示�れ��ん���信後�Webページ内��有効��。"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/NoteServer/lang/nb.js b/web/imcms/xinha/plugins/NoteServer/lang/nb.js
deleted file mode 100644
index 90b58b03e4..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/lang/nb.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert GUIDO Music Notation": "Sett inn GUIDO-noter",
-  "Guido code": "GUIDO-kode",
-  "Options": "Muligheter",
-  "Format": "Format",
-  "Image in applet": "Bilde i applet",
-  "Zoom": "Forstørr",
-  "MIDI File": "MIDIfil",
-  "Image Preview": "Bilde forhåndsvisning",
-  "Source Code": "Kildekode",
-  "Preview": "Preview",
-  "Add MIDI link to allow students to hear the music": "Legg til MIDI-link for at studenter kan høre musikken",
-  "Add GUIDO Code in a textbox on the page": "Sett inn GUIDO-kode i et tekstfelt på siden"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/NoteServer/lang/nl.js b/web/imcms/xinha/plugins/NoteServer/lang/nl.js
deleted file mode 100644
index ad456ae79f..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/lang/nl.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Insert GUIDO Music Notation": "GUIDO muziek notatie invoegen",
-  "Guido code": "GUIDO-code",
-  "Options": "Opties",
-  "Format": "Indeling",
-  "Image in applet": "Afbeelding in applet",
-  "Zoom": "Vergroot/verklein",
-  "MIDI File": "MIDI bestand",
-  "Image Preview": "Afbeeldingsvoorbeeld",
-  "Source Code": "Broncode",
-  "Preview": "Voorbeeld",
-  "Add MIDI link to allow students to hear the music": "MIDI link invoegen om de muziek te beluisteren",
-  "Add GUIDO Code in a textbox on the page": "GUIDO code in een tekstgebied op de pagina invoegen"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/NoteServer/lang/no.js b/web/imcms/xinha/plugins/NoteServer/lang/no.js
deleted file mode 100644
index 2a45299a16..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/lang/no.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert GUIDO Music Notation": "Sett inn GUIDO-noter",
-  "Guido code": "GUIDO-kode",
-  "Options": "Muligheter",
-  "Format": "Format",
-  "Image in applet": "Bilde i applet",
-  "Zoom": "Forstørr",
-  "MIDI File": "MIDIfil",
-  "Image Preview": "Bilde forhåndsvisning",
-  "Source Code": "Kildekode",
-  "Preview": "Preview",
-  "Add MIDI link to allow students to hear the music": "Legg til MIDI-link for at studenter kan høre musikken",
-  "Add GUIDO Code in a textbox on the page": "Sett inn GUIDO-kode i et tekstfelt på siden"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/NoteServer/lang/pt_br.js b/web/imcms/xinha/plugins/NoteServer/lang/pt_br.js
deleted file mode 100644
index 2fed8511a4..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/lang/pt_br.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt)
-{
-  "Add GUIDO Code in a textbox on the page": "Adicionar código GUIDO em uma caixa de texto na página",
-  "Add MIDI link to allow students to hear the music": "Adicionar um link MIDI para permitir que os estudantes escutem a música",  
-  "Cancel": "Cancelar",
-  "Format": "Formato",
-  "GUIDO Code": "Código GUIDO",
-  "Guido code": "Código Guido",
-  "Image Preview": "Visualização da Imagem",
-  "Image in applet": "Imagem em Applet",
-  "Insert GUIDO Music Notation": "Inserir Notação GUIDO de Música",
-  "MIDI File": "Arquivo MIDI",
-  "OK": "OK",
-  "Options": "Opções",
-  "Preview": "Visualização",
-  "Preview the image in a new window": "Visualizar imagem em uma nova janela",
-  "Source Code": "Codigo Fonte",
-  "With Mozilla, the applet will not be visible in editor, but only in Web page after submitting.": "Com Mozilla, o applet não estará visível no editor, somente na Página Web depois do envio.",
-  "Zoom": "Ampliação",
-  "Zoom :": "Ampliação :"
-}
-
-
diff --git a/web/imcms/xinha/plugins/NoteServer/note-server.js b/web/imcms/xinha/plugins/NoteServer/note-server.js
deleted file mode 100644
index c43a32af84..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/note-server.js
+++ /dev/null
@@ -1,208 +0,0 @@
-// GUIDO Music Notation plugin for Xinha
-// Implementation by Richard Christophe
-// Original Author - Richard Christophe cvrichard@infonie.fr
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-// this is a collection of JavaScript routines that
-// facilitate accessing the GUIDO NoteServer.
-//
-// These Functions can be used within WEB-Pages
-// examples can be found at
-// www.noteserver.org/javascript/index.html
-//
-
-function NoteServer(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  cfg.registerButton({
-                id       : "insertscore",
-                tooltip  : this._lc("Insert GUIDO Music Notation"),
-                image    : editor.imgURL("note.gif", "NoteServer"),
-                textMode : false,
-                action   : function(editor) {
-                                self.buttonPress(editor);
-                           }
-            });
-	cfg.addToolbarElement("insertscore", "insertimage", 1);
-}
-
-NoteServer._pluginInfo = {
-  name          : "NoteServer",
-  version       : "1.1",
-  developer     : "Richard Christophe",
-  developer_url : "http://piano-go.chez.tiscali.fr/guido.html",
-  c_owner       : "Richard Christophe",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-NoteServer.prototype._lc = function(string) {
-  return Xinha._lc(string, 'NoteServer');
-};
-
-NoteServer.prototype.buttonPress = function(editor) {
-  editor._popupDialog( "plugin://NoteServer/codenote", function(param) {
-    if (!param) {	// user must have pressed Cancel
-      return false;
-    } else IncludeGuido(editor,param);
-  }, null);
-};
-
-// this variable is the address of the noteserver
-// can be set to another address (local address if availalble) 
-
-// var noteserveraddress = "www.noteserver.org";
-// var htmlbase = "";
-
-// alternative: specify server-adress directly:
-var noteserveraddress = "clef.cs.ubc.ca"; //"www.noteserver.org"
-var htmlbase = "/salieri/nview";
-
-
-// this is the version of the NoteServer used.
-// one of "0_4", "0_5", "0_6", or "0_7", or ""
-// "" means: take the current version
-// var versionstring = "0_7";
-var versionstring = "";
-
-// this functions takes a GMN-string and returns the URL
-// that converts it into a GIF-file
-function GetGIFURL(gmnstring,zoom,pagenum) {
-  gmnstring = escape(gmnstring);
-  gmnstring = gmnstring.replace(/\//g,"%2F");
-
-  if (!zoom) {
-    zoom = "1.0";
-  }
-  if (!pagenum) {
-    pagenum = "1";
-  }
-
-  var string = "http://" + noteserveraddress +
-               "/scripts/salieri" + versionstring +
-               "/gifserv.pl?" +
-               "pagewidth=21" +
-               "&pageheight=29.7" +
-               "&zoomfactor=" + zoom +
-               "&pagesizeadjust=yes" +
-               "&outputformat=gif87" +
-               "&pagenum=" + pagenum +
-               "&gmndata=" + gmnstring;
-
-  //	document.write(string);
-  return string;
-}
-
-// this functions takes a GMN-string and returns the URL
-// that converts it into a MIDI-file
-function GetMIDIURL(gmnstring) {
-  gmnstring = escape(gmnstring);
-  gmnstring = gmnstring.replace(/\//g,"%2F");
-
-  var string = "http://" + noteserveraddress +
-               "/scripts/salieri" + versionstring + 
-               "/midserv.pl?" +
-               "gmndata=" + gmnstring;
-
-  return string;
-}
-
-// this functions takes a GMN-string and returns the URL
-// that insert Applet
-function GetAPPLETURL(gmnstring,zoom) {
-  gmnstring = escape(gmnstring);
-  gmnstring = gmnstring.replace(/\//g,"%2F");
-
-  var string = '<applet ' +
-               'code="NoteServerApplet" ' +
-               'codebase="http://' +
-               noteserveraddress + htmlbase + '/java" ' +
-               ' width=700 height=300>' +
-               '<param name=server value="' +
-               noteserveraddress + '">' +
-               '<param name=serverVersion value="' +
-               versionstring + '">' +
-               '<param name=zoomFactor value="' +
-               zoom + '">' +
-               '<param name=pageWidth value="21">' +
-               '<param name=pageHeight value="29.7">' +
-               '<param name=gmn value="' +
-               gmnstring + '">' +
-               '</applet>';
-
-  return string;
-}
-
-// This function takes a GUIDO string, accesses the
-// NoteServer (address specified as a constant above)
-// and then embeds the GIF-Image in the document.
-
-
-function IncludeGuido(editor,param) {
-  // this  holds the URL for retrieving the picture ...
-
-  if (!param["f_zoom"])
-    zoom = "";
-  //if (!pagenum)
-   // pagenum = "";
-
-  var string = GetGIFURL(param["f_code"],param["f_zoom"],"");
-  var stringmidi = GetMIDIURL(param["f_code"]);
-  var string2 = "<br>";
-
-if (param["f_applet"] == false ){
-  if (((navigator.userAgent.toLowerCase().indexOf("msie") != -1)
-    && (navigator.userAgent.toLowerCase().indexOf("opera") == -1))) {
-    editor.focusEditor();
-    editor.insertHTML("<img src=" + string + ">");
-  }	else {
-    img = new Image();
-    img.src = string;
-
-    var doc = editor._doc;
-    var sel = editor._getSelection();
-    var range = editor._createRange(sel);
-    editor._doc.execCommand("insertimage", false, img.src);
-  }
-} else {
-  var stringapplet = GetAPPLETURL(param["f_code"],param["f_zoom"]);
-  string2 = string2 + stringapplet + "<br>";
-}
-
-// To test code source in textarea
-//if (param["f_affcode"]) string2 = string2 + Xinha._lc("Source Code","NoteServer") + " :" + '<br> <textarea  cols=60 rows=10 style = "background: #FFFFE6">' +  param["f_code"] + '</textarea> <br>';
-
-if (param["f_affcode"]) string2 = string2 + Xinha._lc("GUIDO Code","NoteServer") + " : "  + param["f_code"] + "<br>";
-if (param["f_midi"]) string2 = string2 + "<a href=" + stringmidi + ">" + Xinha._lc("MIDI File","NoteServer") + "</a> <br>";
-
-  editor.focusEditor();
-  editor.insertHTML(string2);
-
-    //var html = linktext.link(stringmidi);
-    //editor.insertHTML(html);
-}
-
-// this routine includes the applet-definition 
-function IncludeGuidoStringAsApplet(editor, gmnstring, zoom) {
-  gmnstring = escape(gmnstring);
-  gmnstring = gmnstring.replace(/\//g,"%2F");
-
-  var string = '<applet ' + 
-               'codebase="http://' + noteserveraddress + htmlbase + '/java"\n' +
-               'code="NoteServerApplet" width=480 height=230>' +
-               "<PARAM NAME=server VALUE='" + noteserveraddress + "'>" +
-               "<PARAM NAME=serverVersion VALUE='" + versionstring + "'>" +
-               "<PARAM NAME=zoomFactor VALUE='"	+ zoom + "'>" +
-               '<param name=pageWidth value="21">' +
-               '<param name=pageHeight value="29.7">' +
-               "<PARAM NAME=gmn VALUE='" + gmnstring + "'>" +
-               "</applet>";
-  alert(string);
-  editor.focusEditor();
-  editor.insertHTML(string);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/NoteServer/popups/codenote.html b/web/imcms/xinha/plugins/NoteServer/popups/codenote.html
deleted file mode 100644
index 9d9c9bb32d..0000000000
--- a/web/imcms/xinha/plugins/NoteServer/popups/codenote.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<html>
-
-<head>
-
-<title>Insert GUIDO Music Notation</title>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<script type="text/javascript"  src="../note-server.js"></script>
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-
-window.resizeTo(500, 200);
-
-NoteServer = window.opener.NoteServer;
-
-var editor = null;
-function Init() {
-  __dlg_translate('NoteServer');
-  __dlg_init();
-
-//   var param = window.dialogArguments;
-//  if (param) {
-//    document.getElementById("f_midi").value = param["f_midi"];
-//    document.getElementById("f_code").value = param["f_code"];
-//    document.getElementById("f_zoom").value = param["f_zoom"];
-//    document.getElementById("f_affcode").value = param["f_affcode"];
-//    document.getElementById("f_applet").value = param["f_applet"];
-//  }
-//  editor = param.editor;
-  document.getElementById("f_code").focus();
-//  document.getElementById("f_code").select();
-}
-
-function onOK() {
-  var f_code = document.getElementById("f_code");
-  if (!f_code.value) {
-    alert("You have to enter GUIDO code");
-    f_code.focus();
-    return false;
-}
-
-  // pass data back to the calling window
-
-  var param = {};
-  param["f_code"] = f_code.value;
-  var f_zoom = document.getElementById("f_zoom");
-  var z = "1.0";
-  if (f_zoom.value == "1.0" || f_zoom.value == "100%") z = 1.0;
-  else if (f_zoom.value == "0.8" || f_zoom.value == "80%") z = 0.8;
-  else if (f_zoom.value == "1.2" || f_zoom.value == "120%") z = 1.2;
-  else if (f_zoom.value == "1.5" || f_zoom.value == "150%") z = 1.5;
-
-  param["f_zoom"] = z;
-
-  param["f_midi"] = document.getElementById("f_midi").checked;
-
-  param["f_affcode"] = document.getElementById("f_affcode").checked;
-  param["f_applet"] = document.getElementById("f_applet").checked;
-
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-
-}
-
-
-function message(){
-if (document.getElementById("f_applet").checked)
-  if (!((navigator.userAgent.toLowerCase().indexOf("msie") != -1)
-    && (navigator.userAgent.toLowerCase().indexOf("opera") == -1))) {
-    alert(HTMLArea._lc("With Mozilla, the applet will not be visible in editor, but only in Web page after submitting.", 'NoteServer'));
-  }
-}
-
-function onPreview() {
-
-  var f_code = document.getElementById("f_code");
-  var f_zoom = document.getElementById("f_zoom");
-
-var z = "1.0";
-if (f_zoom.value == "1.0" || f_zoom.value == "100%") z = 1.0;
-else if (f_zoom.value == "0.8" || f_zoom.value == "80%") z = 0.8;
-else if (f_zoom.value == "1.2" || f_zoom.value == "120%") z = 1.2;
-else if (f_zoom.value == "1.5" || f_zoom.value == "150%") z = 1.5;
-
-  var url = GetGIFURL(f_code.value,z,"");
-  if (!f_code.value) {
-    alert("You have to enter GUIDO code");
-    f_code.focus();
-    return false;
- }
-
-
-  window.ipreview.location.replace(url);
-
-  return false;
-}
-
-</script>
-</head>
-
-<body class="Dialog" onload="Init()">
-<div class="title">Insert GUIDO Music Notation</div>
-
-<span>Guido code</span> :
-  <br><textarea rows="7" id="f_code" cols="55"></textarea><br>
-
-<div class="space"></div>
-<fieldset style="float: left; margin-left: 5px;">
-<legend>Options</legend>
-  <input type="checkbox" id="f_midi" value="ON"> <span>Add MIDI link to allow students to hear the music</span>
-  <div class="space"></div>
-  <input type="checkbox" id="f_affcode" value="ON"> <span>Add GUIDO Code in a textbox on the page</span>
-  <div class="space"></div>
-</fieldset>
-
-<fieldset style="float: right; margin-left: 5px;">
-<legend>Format</legend>
-  <input type="checkbox" id="f_applet" value="ON" onclick="message();" > <span>Image in applet</span>
-  <div class="space"></div>
-  <span>Zoom</span> :
-  <select size="1" id="f_zoom" title="Zoom :">
-    <option value="0.8">80%</option>
-    <option selected="selected">100%</option>
-    <option value="1.2">120%</option>
-    <option value="1.5">150%</option>
-  </select>
-  <div class="space"></div>
-</fieldset>
-
-<br clear="all" />
-
-<table width="100%" style="margin-bottom: 0.2em">
- <tr>
-  <td valign="bottom">
-    <span>Image Preview</span>:<br />
-    <iframe name="ipreview" id="ipreview" frameborder="0" style="border : 1px solid gray;" height="200" width="350" src=""></iframe>
-  </td>
-
-  <td valign="bottom" style="text-align: right">
-    <button type="button" name="preview" onclick="return onPreview();"
-      title="Preview the image in a new window">Preview</button><br>
-    <button type="button" name="ok" onclick="return onOK();"><span>OK</span></button><br>
-    <button type="button" name="cancel" onclick="return onCancel();"><span>Cancel</span></button>
-  </td>
- </tr>
- <tr>
-  <td colspan="2">
-   <p>Sample Guido Codes:</p>
-   <p><a href="http://piano-go.chez.tiscali.fr/rachmaninoff.gmn" target="_blank">Code Sample 1</a> or type [ do re mi fa sol la si ] | <a href="http://www.informatik.tu-darmstadt.de/AFS/SALIERI/guido/demos.html" target="_blank">Code Sample 2</a></p>
-   <p>Resources: </p>
-   <p>The Guido Specification (<a href="http://piano-go.chez.tiscali.fr/GUIDO-Music%20Notation%20Format.pdf" target="_blank">PDF)</a> | <a href="http://www.salieri.org/guido/doc.html" target="_blank">(HTML)</a></p>
-   <p><a href="http://www.salieri.org/guido/" target="_blank">GUIDO Music Notation Format Site</a> | <a href="http://www.noteserver.org/" target="_blank">Guido Note Server</a> | <a href="http://sourceforge.net/projects/guidolib/" target="_blank">SourceForge Homepage</a></p>
-  </td>
- </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/PasteText/img/ed_paste_text.gif b/web/imcms/xinha/plugins/PasteText/img/ed_paste_text.gif
deleted file mode 100644
index 039a6498b3..0000000000
Binary files a/web/imcms/xinha/plugins/PasteText/img/ed_paste_text.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/PasteText/lang/de.js b/web/imcms/xinha/plugins/PasteText/lang/de.js
deleted file mode 100644
index 1c88da3b0f..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/de.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-{
-  "Paste as Plain Text": "unformatierten Text einfügen"
-};
diff --git a/web/imcms/xinha/plugins/PasteText/lang/es.js b/web/imcms/xinha/plugins/PasteText/lang/es.js
deleted file mode 100644
index 1cb112461a..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/es.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-
-// LANG: "es", ENCODING: UTF-8
-{
-	"Paste as Plain Text"       			: "Paste as Plain Text"
-};
diff --git a/web/imcms/xinha/plugins/PasteText/lang/fr.js b/web/imcms/xinha/plugins/PasteText/lang/fr.js
deleted file mode 100644
index 54816c1854..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/fr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Paste as Plain Text": "Copier comme texte pur"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/PasteText/lang/ja.js b/web/imcms/xinha/plugins/PasteText/lang/ja.js
deleted file mode 100644
index bc3037f59b..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/ja.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Paste as Plain Text": "プレーンテキスト���貼り付�"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/PasteText/lang/nb.js b/web/imcms/xinha/plugins/PasteText/lang/nb.js
deleted file mode 100644
index ba5004946b..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/nb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Paste as Plain Text": "Lim inn som ren tekst"
-};
diff --git a/web/imcms/xinha/plugins/PasteText/lang/nl.js b/web/imcms/xinha/plugins/PasteText/lang/nl.js
deleted file mode 100644
index df9fa72f08..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/nl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Paste as Plain Text": "Kopieer als platte tekst (geen opmaak)"
-};
diff --git a/web/imcms/xinha/plugins/PasteText/lang/no.js b/web/imcms/xinha/plugins/PasteText/lang/no.js
deleted file mode 100644
index 40107beb1c..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/no.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Paste as Plain Text": "Lim inn som ren tekst"
-};
diff --git a/web/imcms/xinha/plugins/PasteText/lang/pl.js b/web/imcms/xinha/plugins/PasteText/lang/pl.js
deleted file mode 100644
index fb201da3a2..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/pl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, http://www.eskot.krakow.pl/portfolio/, koto@webworkers.pl
-{
-  "Paste as Plain Text": "Wklej jako czysty tekst"
-};
diff --git a/web/imcms/xinha/plugins/PasteText/lang/pt_br.js b/web/imcms/xinha/plugins/PasteText/lang/pt_br.js
deleted file mode 100644
index c913e0042f..0000000000
--- a/web/imcms/xinha/plugins/PasteText/lang/pt_br.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt)
-{
-  "Cancel": "Cancelar",
-  "OK": "OK",
-  "Paste Text": "Colar Texto",
-  "Paste as Plain Text": "Colar um texto básico"
-}
diff --git a/web/imcms/xinha/plugins/PasteText/paste-text.js b/web/imcms/xinha/plugins/PasteText/paste-text.js
deleted file mode 100644
index 9945de6f12..0000000000
--- a/web/imcms/xinha/plugins/PasteText/paste-text.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Paste Plain Text plugin for Xinha
-
-// Distributed under the same terms as Xinha itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function PasteText(editor) {
-	this.editor = editor;
-	var cfg = editor.config;
-	var self = this;
-        
-	cfg.registerButton({
-                id       : "pastetext",
-                tooltip  : this._lc("Paste as Plain Text"),
-                image    : editor.imgURL("ed_paste_text.gif", "PasteText"),
-                textMode : false,
-                action   : function(editor) {
-                             self.buttonPress(editor);
-                           }
-            });
-
-	cfg.addToolbarElement("pastetext", ["paste", "killword"], 1);
-}
-
-PasteText._pluginInfo = {
-	name          : "PasteText",
-	version       : "1.2",
-	developer     : "Michael Harris",
-	developer_url : "http://www.jonesadvisorygroup.com",
-	c_owner       : "Jones Advisory Group",
-	sponsor       : "Jones International University",
-	sponsor_url   : "http://www.jonesinternational.edu",
-	license       : "htmlArea"
-};
-
-PasteText.prototype._lc = function(string) {
-    return Xinha._lc(string, 'PasteText');
-};
-
-Xinha.Config.prototype.PasteText =
-{
-	showParagraphOption : true,
-	newParagraphDefault :true
-}
-
-PasteText.prototype.buttonPress = function(editor) {
-
-	var editor = this.editor;
-	var outparam = editor.config.PasteText; 
-	var action = function( ret ) {
-		var html = ret.text;
-		var insertParagraphs = ret.insertParagraphs;
-		html = html.replace(/</g, "&lt;");
-  		html = html.replace(/>/g, "&gt;");
-  		if ( ret.insertParagraphs)
-  		{
-  			html = html.replace(/\t/g,"&nbsp;&nbsp;&nbsp;&nbsp;");
-			html = html.replace(/\n/g,"</p><p>");
-			html="<p>" + html + "</p>";
-			if (Xinha.is_ie)
-			{
-				editor.insertHTML(html);
-			}
-			else
-			{
-				editor.execCommand("inserthtml",false,html);
-			}
-		}
-		else
-		{
-			html = html.replace(/\n/g,"<br />");
-			editor.insertHTML(html);
-		}
-	}
-	Dialog( _editor_url+ "plugins/PasteText/popups/paste_text.html", action, outparam);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/PasteText/popups/paste_text.html b/web/imcms/xinha/plugins/PasteText/popups/paste_text.html
deleted file mode 100644
index 6be6491800..0000000000
--- a/web/imcms/xinha/plugins/PasteText/popups/paste_text.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Paste Text</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-<script type="text/javascript">
-
-function init() {
-
-  __dlg_translate("PasteText");
-  __dlg_init(null,{width:600,height:480});
-
-  var param = window.dialogArguments;
-  document.getElementById("paragraphOption").style.display = (param.showParagraphOption) ? '' : 'none';
-   document.getElementById("insertParagraphs").checked = param.newParagraphDefault;
-  document.getElementById("inputArea").focus();
-}
-
-function onCancel() {
-  __dlg_close( null );
-  return false;
-}
-
-function onOK() {
-  var ret = {};
-  ret.text = document.getElementById("inputArea").value;
-  ret.insertParagraphs = document.getElementById("insertParagraphs").checked;
-  __dlg_close( ret );
-}
-window.onload = init;
-</script>
-</head>
-
-<body class="dialog">
-<div class="title">Paste as Plain Text</div>
-<form>
-<div>
-<textarea name="inputArea" id="inputArea" cols=22 rows=5 style="width: 100%; height: 315px; margin-top: 8px; margin-bottom: 4px; font-family: monospace; font-size: 11px;"></textarea>
-<div id="buttons">
-<label for="insertParagraphs" style="float:left;display:none" id="paragraphOption">
-<input type="checkbox" id="insertParagraphs" /> Insert text in new paragraph 
-</label>
-    <button type="button" name="ok" onclick="return onOK();">OK</button>
-    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/PreserveScripts/js.png b/web/imcms/xinha/plugins/PreserveScripts/js.png
deleted file mode 100644
index 8afcdcaf8e..0000000000
Binary files a/web/imcms/xinha/plugins/PreserveScripts/js.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/PreserveScripts/php.png b/web/imcms/xinha/plugins/PreserveScripts/php.png
deleted file mode 100644
index 5ea5bf199b..0000000000
Binary files a/web/imcms/xinha/plugins/PreserveScripts/php.png and /dev/null differ
diff --git a/web/imcms/xinha/plugins/PreserveScripts/preserve-scripts.js b/web/imcms/xinha/plugins/PreserveScripts/preserve-scripts.js
deleted file mode 100644
index 6c0aa46ab1..0000000000
--- a/web/imcms/xinha/plugins/PreserveScripts/preserve-scripts.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*------------------------------------------*\
-PreserveScripts for Xinha
-____________________
-Replace blocks of of PHP or JavaScript with icons in the editor, this way making it possible to edit sourcecode containing PHP, 
-and preventing Javascript from being accidentally deleted because it's normally invisible
-
-\*------------------------------------------*/
-
-function PreserveScripts(editor) {
-	this.editor = editor;
-}
-
-PreserveScripts._pluginInfo = {
-  name          : "PreserveScripts",
-  version       : "1.0",
-  developer     : "Raimund Meyer",
-  developer_url : "http://x-webservice.net",
-  c_owner       : "Raimund Meyer",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "LGPL"
-}
-Xinha.Config.prototype.PreserveScripts =
-{
-	'preservePHP' : true,
-	'preserveJS' : true
-}
-PreserveScripts.prototype.inwardHtml = function(html)
-{
-	var s = this;
-	var c = s.editor.config.PreserveScripts;
-	this.storage = {}; //empty the cache
-	var i = 1;
-	html = html.replace(/\n?<\?php(\s|[^\s])*?\?>\n?/ig,
-		function(m)
-		{
-			if ( c.preservePHP ) // if config set to false wipe out php completely, otherwise ugly fragments may remain
-			{
-				s.storage['PreserveScripts_'+i] = m;
-				var r = '<img title="PHP" id="PreserveScripts_'+i+'" src="'+_editor_url+'plugins/PreserveScripts/php.png" />';
-				i++;
-				return r;
-			}
-			else
-			{
-				return '';
-			}
-		});
-	if ( c.preserveJS )
-	{
-		html = html.replace(/\n?<script(\s|[^\s])*?<\/script>\n?/g,
-			function(m)
-			{
-				s.storage['PreserveScripts_'+i] = m;
-				var r = '<img title="JavaScript" id="PreserveScripts_'+i+'" src="' + _editor_url + 'plugins/PreserveScripts/js.png" />';
-				i++;
-				return r;
-			});	
-	}
-	return html;
-}
-
-PreserveScripts.prototype.outwardHtml = function(html)
-{
-	var s = this;
-	html = html.replace(/<img[^>]*id="(PreserveScripts_\d+)"[^>]*>/g,function(m0,m1){return s.storage[m1];});
-	return html;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/img/ed_quicktag.gif b/web/imcms/xinha/plugins/QuickTag/img/ed_quicktag.gif
deleted file mode 100644
index 2ae5ce511d..0000000000
Binary files a/web/imcms/xinha/plugins/QuickTag/img/ed_quicktag.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/de.js b/web/imcms/xinha/plugins/QuickTag/lang/de.js
deleted file mode 100644
index 197c6aa621..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/de.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-{ 
-  "Quick Tag Editor": "Quick TAG Editor",
-  "Enter the TAG you want to insert": "Enter the TAG you want to insert",
-  "You have to select some text": "You have to select some text",
-  "There are some unclosed quote": "There are some unclosed quote",
-  "This attribute already exists in the TAG": "This attribute already exists in the TAG",
-  "No CSS class avaiable": "No CSS classes avaiable",
-  "OPTIONS": "OPTIONS",
-  "ATTRIBUTES": "ATTRIBUTES",
-  "TAGs": "TAGs",
-  "Colors": "Colors",
-  "Ok": "Ok",
-  "Cancel": "Cancel"
-};
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/fr.js b/web/imcms/xinha/plugins/QuickTag/lang/fr.js
deleted file mode 100644
index b4b2d541c1..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/fr.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{ 
-  "Quick Tag Editor": "Editeur rapide de balise",
-  "Enter the TAG you want to insert": "Entrez la balise que vous voulez insérer",
-  "You have to select some text": "Vous devez sélectionner du texte",
-  "There are some unclosed quote": "Il y a des apostrophes mal fermées",
-  "This attribute already exists in the TAG": "Cet attribute existe déjà sur cette balise",
-  "No CSS class avaiable": "Pas de classe CSS accessible",
-  "OPTIONS": "OPTIONS",
-  "ATTRIBUTES": "ATTRIBUTS",
-  "TAGs": "Balises",
-  "Colors": "Couleurs",
-  "Ok": "OK",
-  "Cancel": "Annuler"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/ja.js b/web/imcms/xinha/plugins/QuickTag/lang/ja.js
deleted file mode 100644
index 45d1e6c04c..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/ja.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Quick Tag Editor": "クイックタグエディタ",
-  "Enter the TAG you want to insert": "挿入���タグを入力",
-  "You have to select some text": "テキストを�択���れ��り��ん",
-  "There are some unclosed quote": "閉�����引用符��り��",
-  "This attribute already exists in the TAG": "タグ�������属性��り��",
-  "No CSS class avaiable": "CSSクラス��り��ん",
-  "OPTIONS": "�択肢",
-  "ATTRIBUTES": "属性",
-  "TAGs": "ã‚¿ã‚°",
-  "Colors": "色",
-  "Ok": "OK",
-  "Cancel": "中止"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/nb.js b/web/imcms/xinha/plugins/QuickTag/lang/nb.js
deleted file mode 100644
index c9819b091a..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/nb.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-  "Quick Tag Editor": "Kjapp TAGG-Editor",
-  "Enter the TAG you want to insert": "Skriv inn taggen du vil ønsker å sette inn",
-  "You have to select some text": "Du må velge noe tekst",
-  "There are some unclosed quote": "Det mangler et hermetegn",
-  "This attribute already exists in the TAG": "Denne attributten eksisterer allerede i taggen",
-  "No CSS class avaiable": "Ingen CSS klasse tilgjengelig",
-  "OPTIONS": "EGENSKAPER",
-  "ATTRIBUTES": "ATTRIBUTTER",
-  "TAGs": "TAGGer",
-  "Colors": "Farger",
-  "Ok": "OK",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/nl.js b/web/imcms/xinha/plugins/QuickTag/lang/nl.js
deleted file mode 100644
index bfe0c95c7a..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/nl.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{ 
-  "Quick Tag Editor": "Quick Tag Editor",
-  "Enter the TAG you want to insert": "Voer de Tag naam in",
-  "You have to select some text": "Selecteer tekst",
-  "There are some unclosed quote": "Er zijn niet gesloten quotes",
-  "This attribute already exists in the TAG": "Dit attribuut bestaat al in de tag",
-  "No CSS class avaiable": "Geen CSS class beschikbaar",
-  "OPTIONS": "OPTIES",
-  "ATTRIBUTES": "ATTRIBUTEN",
-  "TAGs": "TAGs",
-  "Colors": "Kleuren",
-  "Ok": "Ok",
-  "Cancel": "Annuleren"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/no.js b/web/imcms/xinha/plugins/QuickTag/lang/no.js
deleted file mode 100644
index de410d042d..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/no.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{ 
-  "Quick Tag Editor": "Kjapp TAGG-Editor",
-  "Enter the TAG you want to insert": "Skriv inn taggen du vil ønsker å sette inn",
-  "You have to select some text": "Du må velge noe tekst",
-  "There are some unclosed quote": "Det mangler et hermetegn",
-  "This attribute already exists in the TAG": "Denne attributten eksisterer allerede i taggen",
-  "No CSS class avaiable": "Ingen CSS klasse tilgjengelig",
-  "OPTIONS": "EGENSKAPER",
-  "ATTRIBUTES": "ATTRIBUTTER",
-  "TAGs": "TAGGer",
-  "Colors": "Farger",
-  "Ok": "OK",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/pl.js b/web/imcms/xinha/plugins/QuickTag/lang/pl.js
deleted file mode 100644
index fa5d68db3d..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/pl.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz, http://www.eskot.krakow.pl/portfolio/, koto@webworkers.pl
-{ 
-  "Quick Tag Editor": "Edytor Quick Tag",
-  "Enter the TAG you want to insert": "Podaj TAG, który chcesz wstawić",
-  "You have to select some text": "Musisz zaznaczyć tekst.",
-  "There are some unclosed quote": "Są jakieś niezamknięte cudzysłowia",
-  "This attribute already exists in the TAG": "TAG posiada już ten atrybut",
-  "No CSS class avaiable": "Brak dostępnych klas CSS",
-  "OPTIONS": "OPCJE",
-  "ATTRIBUTES": "ATRYBUTY",
-  "TAGs": "TAGi",
-  "Colors": "Kolory",
-  "Ok": "Ok",
-  "Cancel": "Anuluj"
-};
diff --git a/web/imcms/xinha/plugins/QuickTag/lang/pt_br.js b/web/imcms/xinha/plugins/QuickTag/lang/pt_br.js
deleted file mode 100644
index 9ce443367c..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/lang/pt_br.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt)
-
-{
-  "Quick Tag Editor": "Editor Rápido",
-  "Enter the TAG you want to insert": "Entre com a TAG que deseja inserir",
-  "You have to select some text": "É preciso selecionar algum texto",
-  "No CSS class avaiable": "Não há classes CSS disponível",
-  "There are some unclosed quote": "Há uma ou mais aspas sem fechamento",
-  "This attribute already exists in the TAG": "Esse atributo já existe na TAG",
-  "OPTIONS": "OPÇÕES",
-  "ATTRIBUTES": "ATRIBUTOS",
-  "TAGs": "TAGs",
-  "Colors": "Cores",
-  "Ok": "Ok",
-  "Cancel": "Cancelar"
-}
diff --git a/web/imcms/xinha/plugins/QuickTag/popups/quicktag.html b/web/imcms/xinha/plugins/QuickTag/popups/quicktag.html
deleted file mode 100644
index 5ee1143ed4..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/popups/quicktag.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<html>
-<head>
-<title>Quick Tag Editor</title>
-<script type="text/javascript" src="../tag-lib.js"></script>
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<script type="text/javascript">
-
-window.resizeTo(400, 180);
-var QuickTag = window.opener.QuickTag;
-var curTag = 'none';
-var curTagOpt = false;
-var CSSEdit = false;
-var editor = null;
-
-function Init() {
-  __dlg_translate("QuickTag");
-  __dlg_init();
-
-  var param = window.dialogArguments;
-  editor = param['editor'];
-  var selectext = param['selectedText']; // sem uso...
-
-  createDropdown("tags");
-
-  var to = document.getElementById('tagopen');
-  if (document.all) 
-    to.attachEvent("onkeypress", function(e) { choice_dropdown(e) });
-  else 
-    to.addEventListener("keypress", function(e) { choice_dropdown(e) }, true);
-  to.focus();
-
-  document.getElementById('bt_colors').style.display = 'none';
-  document.body.onkeypress = __dlg_key_press;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-function quoteTest(val) {
-  var er = /^\w+\s*(\w+=\"[^\"]*\"\s*|\w+=\'[^\']*\'\s*)*$/;
-  return er.test(val);
-}
-
-function onOK() {
-  var el = document.getElementById('tagopen');
-  if(!el.value) {
-  alert(HTMLArea._lc("Enter the TAG you want to insert", "QuickTag"));
-  el.focus();
-  return false;
-  }
-  if(!quoteTest(el.value)) {
-    alert(HTMLArea._lc("There are some unclosed quote", "QuickTag"));
-    el.focus();
-    el.select();
-    return false;
-  }
-  var param = {};
-  var cleanTO = document.getElementById('tagopen').value.replace(/(<|>)/g,"");
-  param.tagopen = "<"+cleanTO+">";
-  param.tagclose = param.tagopen.replace(/^<(\w+) ?.*>/,"</$1>");
-
-  var subtag = subTagLib[curTag];
-  if(typeof subtag == 'object') {
-    param.tagopen = param.tagopen+subtag.op;
-    param.tagclose = subtag.cl+param.tagclose;
-  }
-
-  __dlg_close(param);
-  return false;
-}
-
-function __dlg_key_press(ev) {
-  ev || (ev = window.event);
-  switch(ev.keyCode) {
-    case 13:
-    document.getElementById('bt_ok').click();
-      break;
-    case 27:
-    __dlg_close();
-    return false;
-  }
-  return true;
-}
-
-function selchange() {
-  var toadd = document.getElementById('selectag').value;
-  var oldval = document.getElementById('tagopen').value;
-  var text = (oldval+toadd).replace(/^\s*(.+)\s*$/,"$1");
-  var atrib = /(\w+)=\"$/.test(toadd) ? toadd.replace(/(\w+)=\"$/, "$1") : null;
-  var showcolors = (/color\: ?$/.test(toadd)) ? true : false;
-  var noCSSclasses = false;
-  var obj = null;
-  curTag = text.replace(/(^\w+) ?.*$/, "$1");
-  curTagOpt = (tagLib[curTag] == true);
-
-  if(atrib) {
-    var atrer = eval('/'+atrib+'=/ig');
-    if(atrer.test(oldval) && !(/[^=]\"$/.test(toadd))) {
-      alert(HTMLArea._lc("This attribute already exists in the TAG", "QuickTag"));
-      return false;
-    }
-
-    switch(atrib) {
-    case 'style':
-      CSSEdit = true;
-      break;
-    case 'class':
-      if(captureClasses() == 0) noCSSclasses = true;
-      break;
-    case 'color': case 'bgcolor': case 'bordercolor':
-    case 'bordercolorlight': case 'bordercolordark':
-      showcolors = true;
-      break;
-    }
-
-    if(curTagOpt == true)
-      obj = eval('opAtt_'+curTag+'["'+atrib+'"]');
-    else
-      obj = opAtt_all[atrib];
-  }
-  else if(!CSSEdit && (/(^\w+$|\"$)/.test(toadd))) {
-    obj = 'all';
-    if(curTagOpt == true) obj = curTag;
-    toadd += ' ';
-  }
-
-  if(CSSEdit && quoteTest(text))
-    CSSEdit = false;
-
-  if(showcolors)
-    document.getElementById('bt_colors').style.display = '';
-
-  if(obj)
-    createDropdown(obj);
-  else if(!CSSEdit)
-    document.getElementById('showselect').style.visibility = 'hidden';
-
-  if(noCSSclasses) {
-    document.getElementById('showselect').innerHTML = HTMLArea._lc("No CSS class avaiable", "QuickTag");
-    document.getElementById('showselect').style.visibility = 'visible';
-  }
-
-  addchanges();
-
-  function addchanges() {
-    document.getElementById('tagopen').focus();
-    document.getElementById('tagopen').value += toadd;
-  }
-}
-
-function captureClasses() {
-  var cont = 0;
-  // If there is no '<HTML>' in the HTMLArea content, when using
-  // styleSheets[..].rule, IE generates an error.
-  // In this case, we lost the classes in external CSS files.
-  // If FullPage is loaded, there is no problem.
-  if(!(/<\s*html\s*>/i.test(editor.getHTML())) && document.all) {
-    var styles = editor._doc.getElementsByTagName("style");
-    for(var i in styles) {
-      var cont = styles[i].innerHTML;
-      if(typeof cont != 'undefined') {
-        var cls = cont.match(/\.\w+/ig,"");
-        for(j in cls) if(/^\.\w+$/.test(cls[j])) {
-          var classname = cls[j].replace(/\./,"")+'"';
-          opAtt_all['class'][cls[j]] = classname;
-          cont++;
-        }
-      }
-    }
-    return cont;
-  }
-
-  var styleSheet = null;
-  var styles = editor._doc.styleSheets;
-
-  for (var i = 0; i < styles.length; i++) {
-    styleSheet = styles[i];
-    if(document.all)
-      var _rules = styleSheet.rules;
-    else
-      var _rules = styleSheet.cssRules;
-    for (var j = 0; j < _rules.length; j++) {
-      rule = _rules[j];
-      if(/^\.\w+$/.test(rule.selectorText)) {
-        var classname = rule.selectorText.replace(/\./,"")+'"';
-        opAtt_all['class'][rule.selectorText] = classname;
-        cont++;
-      }
-    }
-  }
-  return cont;
-}
-
-function choice_dropdown(e) {
-  if (document.all) Key = e.keyCode;
-  else Key = e.charCode;
-
-  if(Key != 32) return;
-
-  var text = document.getElementById('tagopen').value.replace(/^\s*([^\s]+)\s*$/,"$1");
-
-  if(CSSEdit && quoteTest(text)) CSSEdit = false;
-  if(CSSEdit) return;
-
-  if(curTag == 'none') {
-    curTag = text.replace(/(^\w+) ?.*$/, "$1");
-    curTagOpt = tagLib[curTag];
-  }
-
-  if(!/\w/.test(text)) {
-    document.getElementById('tagopen').value = '';
-    createDropdown("tags");
-    return;
-  }
-
-  var att = 'all';
-  if(curTagOpt == true)
-    att = curTag;
-
-  createDropdown(att);
-}
-
-function createDropdown(type) {
-  var _div = document.getElementById('showselect');
-  while(_div.hasChildNodes())
-    _div.removeChild(_div.firstChild);
-  _div.style.visibility = 'visible';
-
-  var _sel = document.createElement("select");
-  _sel.id = "selectag";
-  _sel.onchange = function() { selchange(); };
-
-  if(typeof type == 'object') {
-    var obj = type;
-    forObj(HTMLArea._lc("OPTIONS", "QuickTag"));
-    _div.appendChild(_sel);
-    return;
-  }
-
-  if(type == 'tags') {
-    var obj = allTags;
-    forObj(HTMLArea._lc("TAGs", "QuickTag"));
-    _div.appendChild(_sel);
-    return;
-  }
-
-  type = type.replace(/^h[1-6]$/,"h");
-  var topt = eval('opTag_'+type);
-  if(typeof topt == 'object') 
-    var obj = topt;
-  else 
-    return;
-
-  forObj(HTMLArea._lc("ATTRIBUTES", "QuickTag"));
-  _div.appendChild(_sel);
-
-  function forObj(first) {
-    if(first) {
-      var _op = document.createElement("option");
-      _op.appendChild(document.createTextNode(first));
-      _sel.appendChild(_op);
-    }
-    for(i in obj) {
-      var opt = document.createElement("option");
-      opt.appendChild(document.createTextNode(i));
-      opt.value = obj[i];
-      _sel.appendChild(opt);
-    }
-  }
-}
-
-function colors() {
-  var colloc = window.location.toString().replace(/plugins.+$/,"") +
-               "popups/select_color.html";
-  window.open(colloc, 'colors', "toolbar=no,location=no,directories=no," +
-              "status=no,menubar=no,scrollbars=no,resizable=no,width=240,height=182");
-}
-
-// simulation of Dialog._return - select_color.html needs it.
-var Dialog = new Object();
-Dialog._return = function (val) {
-  if(val != null) {
-    if(CSSEdit)
-      val += '; ';
-    else
-      val += '"';
-    document.getElementById('tagopen').focus();
-    document.getElementById('tagopen').value += "#"+val;
-    document.getElementById('bt_colors').style.display = 'none';
-  }
-};
-</script>
-<style type="text/css">
-html, body {
-background: ButtonFace;
-color: ButtonText;
-font: 11px Tahoma,Verdana,sans-serif;
-margin: 0px;
-padding: 0px;
-border-width: 0px;
-}
-body { padding: 5px; }
-table { font: 11px Tahoma,Verdana,sans-serif; }
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-button { width: 70px; }
-.space { padding: 2px; }
-.title {
-background: #ddf;
-color: #000;
-font-weight: bold;
-font-size: 120%;
-padding: 3px 10px;
-margin-bottom: 10px;
-border-bottom: 1px solid black;
-letter-spacing: 2px;
-}
-.buttons {
-border-top: 1px solid #999;
-padding: 5px;
-text-align: right;
-height: 20px;
-}
-form { padding: 0px; margin: 0px; }
-</style>
-</head>
-  <body class="dialog" onload="Init()">
-<form action="" method="get">
-  <div class="title" style="width: 360px">Quick Tag Editor</div>
-  <div align="center">
-  <table border="0" width="370">
-    <tbody>
-      <tr>
-        <td colspan="2" align="center" style="padding: 3px; background-color: #e9e9e9;">
-        <strong style="font-size: 14px">&lt;</strong>
-        <input id="tagopen" type="text" style="background-color: #e9e9e9; width: 327px; border-width: 0px;">
-        <strong style="font-size: 14px">&gt;</strong>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  </div>
-<div class="space"></div>
-<div class="buttons">
-<button type="button" id="bt_colors" onclick="colors();">Colors</button>
-<button type="button" id="bt_ok" onclick="return onOK();">Ok</button>
-<button type="button" onclick="return onCancel();">Cancel</button>
-</div>
-<div id="showselect" style="position:absolute; left:7px; top:75px; width:150px; z-index:100; visibility: visible; height: 13px; color: red;">
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/quick-tag.js b/web/imcms/xinha/plugins/QuickTag/quick-tag.js
deleted file mode 100644
index 73b28d9170..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/quick-tag.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------*\
- Quick Tag Editor Plugin for HTMLArea-3.0
- -----------------------------------------
- author: Cau guanabara 
- e-mail: caugb@ibest.com.br
-\*---------------------------------------*/
-
-function QuickTag(editor) {
-  var cfg = editor.config;
-  var self = this;
-
-  cfg.registerButton({
-	id       : "quickeditor",
-	tooltip  : this._lc("Quick Tag Editor"),
-	image    : editor.imgURL("ed_quicktag.gif", "QuickTag"), 
-	textMode : false,
-  action   : function(editor) { 
-               self.buttonPress(editor); 
-             }
-  });
-  cfg.addToolbarElement("quickeditor", "htmlmode", 1);  
-}
-
-QuickTag.prototype.buttonPress = function(editor) { 
-var self = this;
-var sel = editor.getSelectedHTML().replace(/(<[^>]*>|&nbsp;|\n|\r)/g,""); 
-var param = new Object();
-param.editor = editor;
-
-  if(/\w/.test(sel))
-    editor._popupDialog("plugin://QuickTag/quicktag", function(p) { self.setTag(editor, p); }, param);
-  else
-    alert(this._lc('You have to select some text'));
-};
-
-QuickTag.prototype.setTag = function(editor, param) {
-editor.surroundHTML(param.tagopen,param.tagclose);
-};
-
-QuickTag._pluginInfo = {
-name          : "QuickTag",
-version       : "1.0 - beta",
-developer     : "Cau Guanabara",
-developer_url : "mailto:caugb@ibest.com.br",
-c_owner       : "Cau Guanabara",
-sponsor       : "Independent production",
-sponsor_url   : "http://www.netflash.com.br/gb/HA3-rc1/examples/quick-tag.html",
-license       : "htmlArea"
-};
-
-QuickTag.prototype._lc = function(string) {
-    return Xinha._lc(string, 'QuickTag');
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/QuickTag/tag-lib.js b/web/imcms/xinha/plugins/QuickTag/tag-lib.js
deleted file mode 100644
index 0f22ad5303..0000000000
--- a/web/imcms/xinha/plugins/QuickTag/tag-lib.js
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-  TAG Library for QuickTag Plugin  
-  -------------------------------
-  
-  allTags = All tags that appears in the first dropdown ('TAGS') {'caption': 'value'}  
-  tagLib = The tags with options (just to check if current TAG have options) {'[TAG]': true}
-  subTagLib = Complements for some tags that needs it (TABLE) 
-    {'[TAG]': {'op': 'after tag open', 'cl': 'before tag close'}}
-  opTag_all = Common attributes to all TAGS {'caption': 'value'}  
-  opAtt_all = Options for the common attributes {'attribute': {'caption': 'value'}}
-  opTag_[TAG] = Attributes for [TAG] {'caption': 'value'}
-  opAtt_[TAG] = Options for the [TAG] attributes {'attribute': {'caption': 'value'}}
-  
-*/
-
-var allTags = {
-'a': 'a',
-'a (full)': 'a href="" target=""',
-'address': 'address',
-'b': 'b',
-'big': 'big',
-'blockquote': 'blockquote',
-'code': 'code',
-'div': 'div',
-'em': 'em',
-'fieldset': 'fieldset',
-'font': 'font',
-'font (full)': 'font face="" size="" color=""',
-'h1': 'h1',
-'h2': 'h2',
-'h3': 'h3',
-'h4': 'h4',
-'h5': 'h5',
-'h6': 'h6',
-'i': 'i',
-'legend': 'legend',
-'li': 'li',
-'ol': 'ol',
-'ul': 'ul',
-'p': 'p',
-'pre': 'pre',
-'small': 'small',
-'span': 'span',
-'strong': 'strong',
-'sub': 'sub',
-'sup': 'sup',
-'table': 'table'
-};
-
-// tags with options
-var tagLib =  {
-'a': true, 
-'div': true, 
-'font': true, 
-'h1': true,
-'h2': true,
-'h3': true,
-'h4': true,
-'h5': true,
-'h6': true,
-'p': true,
-'table': true
-};
-// tags that needs some complement
-var subTagLib = {'table': {'op': '<tbody><tr><td>',
-                           'cl': '</td></tr></tbody>'}
-};
-
-var opTag_a = {
-'href': 'href="',
-'name': 'name="',
-'target': 'target="'
-};
-var opAtt_a = {
-'href': {'http://': 'http://',
-         'https://': 'https://',
-         'ftp://': 'ftp://',
-         'mailto:': 'mailto:',
-         '#': '#"'},
-'target': {'_top': '_top"',
-           '_self': '_self"',
-           '_parent': '_parent"',
-           '_blank': '_blank"'}
-};
-
-var opTag_font = {
-'face': 'face="',
-'size': 'size="',
-'color': 'color="'
-};
-var opAtt_font = {
-'face': {'Verdana': 'Verdana"',
-         'Arial': 'Arial"',
-         'Tahoma': 'Tahoma"',
-         'Courier New': 'Courier New"',
-         'Times New Roman': 'Times New Roman"'},
-'size': {'1': '1"','2': '2"','3': '3"','4': '4"','5': '5"','6': '6"',
-         '+1': '+1"','+2': '+2"','+3': '+3"','+4': '+4"','+5': '+5"','+6': '+6"',
-         '-1': '-1"','-2': '-2"','-3': '-3"','-4': '-4"','-5': '-5"','-6': '-6"'}
-};
-
-var opTag_div = {
-'align': 'align="'
-};
-var opAtt_div = {
-'align': {'center': 'center"',
-          'left': 'left"',
-          'right': 'right"',
-          'justify': 'justify"'}
-};
-
-var opTag_h = {
-'align': 'align="'
-};
-var opAtt_h = {
-'align': {'center': 'center"',
-          'left': 'left"',
-          'right': 'right"',
-          'justify': 'justify"'}
-};
-
-var opTag_p = {
-'align': 'align="'
-};
-var opAtt_p = {
-'align': {'center': 'center"',
-          'left': 'left"',
-          'right': 'right"',
-          'justify': 'justify"'}
-};
-
-var opTag_table = {
-'align': 'align="',
-'width': 'width="',
-'height': 'height="',
-'cellpadding': 'cellpadding="',
-'cellspacing': 'cellspacing="',
-'background': 'background="',
-'bgcolor': 'bgcolor="',
-'border': 'border="',
-'bordercolor': 'bordercolor="',
-'bordercolorlight': 'bordercolorlight="',
-'bordercolordark': 'bordercolordark="'
-};
-var opAtt_table = {
-'align': {'center': 'center"',
-          'left': 'left"',
-          'right': 'right"'}
-};
-
-// for all tags 
-var opTag_all = {
-'class': 'class="',
-'dir': 'dir="',
-'id': 'id="',
-'lang': 'lang="',
-'onFocus': 'onFocus="',
-'onBlur': 'onBlur="',
-'onClick': 'onClick="',
-'onDblClick': 'onDblClick="',
-'onMouseDown': 'onMouseDown="',
-'onMouseUp': 'onMouseUp="',
-'onMouseOver': 'onMouseOver="',
-'onMouseMove': 'onMouseMove="',
-'onMouseOut': 'onMouseOut="',
-'onKeyPress': 'onKeyPress="',
-'onKeyDown': 'onKeyDown="',
-'onKeyUp': 'onKeyUp="',
-'style': 'style="',
-'title': 'title="'
-};
-var opAtt_all = {
-'class': {},
-'dir': {'rtl': 'rtl"','ltr': 'ltr"'},
-'lang': {'Afrikaans ': 'af"',
-         'Albanian ': 'sq"',
-         'Arabic ': 'ar"',
-         'Basque ': 'eu"',
-         'Breton ': 'br"',
-         'Bulgarian ': 'bg"',
-         'Belarusian ': 'be"',
-         'Catalan ': 'ca"',
-         'Chinese ': 'zh"',
-         'Croatian ': 'hr"',
-         'Czech ': 'cs"',
-         'Danish ': 'da"',
-         'Dutch ': 'nl"',
-         'English ': 'en"',
-         'Estonian ': 'et"',
-         'Faeroese ': 'fo"',
-         'Farsi ': 'fa"',
-         'Finnish ': 'fi"',
-         'French ': 'fr"',
-         'Gaelic ': 'gd"',
-         'German ': 'de"',
-         'Greek ': 'el"',
-         'Hebrew ': 'he"',
-         'Hindi ': 'hi"',
-         'Hungarian ': 'hu"',
-         'Icelandic ': 'is"',
-         'Indonesian ': 'id"',
-         'Italian ': 'it"',
-         'Japanese ': 'ja"',
-         'Korean ': 'ko"',
-         'Latvian ': 'lv"',
-         'Lithuanian ': 'lt"',
-         'Macedonian ': 'mk"',
-         'Malaysian ': 'ms"',
-         'Maltese ': 'mt"',
-         'Norwegian ': 'no"',
-         'Polish ': 'pl"',
-         'Portuguese ': 'pt"',
-         'Rhaeto-Romanic ': 'rm"',
-         'Romanian ': 'ro"',
-         'Russian ': 'ru"',
-         'Sami ': 'sz"',
-         'Serbian ': 'sr"',
-         'Setswana ': 'tn"',
-         'Slovak ': 'sk"',
-         'Slovenian ': 'sl"',
-         'Spanish ': 'es"',
-         'Sutu ': 'sx"',
-         'Swedish ': 'sv"',
-         'Thai ': 'th"',
-         'Tsonga ': 'ts"',
-         'Turkish ': 'tr"',
-         'Ukrainian ': 'uk"',
-         'Urdu ': 'ur"',
-         'Vietnamese ': 'vi"',
-         'Xhosa ': 'xh"',
-         'Yiddish ': 'yi"',
-         'Zulu': 'zu"'},
-'style': {'azimuth': 'azimuth: ',
-          'background': 'background: ',
-          'background-attachment': 'background-attachment: ',
-          'background-color': 'background-color: ',
-          'background-image': 'background-image: ',
-          'background-position': 'background-position: ',
-          'background-repeat': 'background-repeat: ',
-          'border': 'border: ',
-          'border-bottom': 'border-bottom: ',
-          'border-left': 'border-left: ',
-          'border-right': 'border-right: ',
-          'border-top': 'border-top: ',
-          'border-bottom-color': 'border-bottom-color: ',
-          'border-left-color': 'border-left-color: ',
-          'border-right-color': 'border-right-color: ',
-          'border-top-color': 'border-top-color: ',
-          'border-bottom-style': 'border-bottom-style: ',
-          'border-left-style': 'border-left-style: ',
-          'border-right-style': 'border-right-style: ',
-          'border-top-style': 'border-top-style: ',
-          'border-bottom-width': 'border-bottom-width: ',
-          'border-left-width': 'border-left-width: ',
-          'border-right-width': 'border-right-width: ',
-          'border-top-width': 'border-top-width: ',
-          'border-collapse': 'border-collapse: ',
-          'border-color': 'border-color: ',
-          'border-style': 'border-style: ',
-          'border-width': 'border-width: ',
-          'bottom': 'bottom: ',
-          'caption-side': 'caption-side: ',
-          'cell-spacing': 'cell-spacing: ',
-          'clear': 'clear: ',
-          'clip': 'clip: ',
-          'color': 'color: ',
-          'column-span': 'column-span: ',
-          'content': 'content: ',
-          'cue': 'cue: ',
-          'cue-after': 'cue-after: ',
-          'cue-before': 'cue-before: ',
-          'cursor': 'cursor: ',
-          'direction': 'direction: ',
-          'display': 'display: ',
-          'elevation': 'elevation: ',
-          'filter': 'filter: ',
-          'float': 'float: ',
-          'font-family': 'font-family: ',
-          'font-size': 'font-size: ',
-          'font-size-adjust': 'font-size-adjust: ',
-          'font-style': 'font-style: ',
-          'font-variant': 'font-variant: ',
-          'font-weight': 'font-weight: ',
-          'height': 'height: ',
-          '!important': '!important: ',
-          'left': 'left: ',
-          'letter-spacing': 'letter-spacing: ',
-          'line-height': 'line-height: ',
-          'list-style': 'list-style: ',
-          'list-style-image': 'list-style-image: ',
-          'list-style-position': 'list-style-position: ',
-          'list-style-type': 'list-style-type: ',
-          'margin': 'margin: ',
-          'margin-bottom': 'margin-bottom: ',
-          'margin-left': 'margin-left: ',
-          'margin-right': 'margin-right: ',
-          'margin-top': 'margin-top: ',
-          'marks': 'marks: ',
-          'max-height': 'max-height: ',
-          'min-height': 'min-height: ',
-          'max-width': 'max-width: ',
-          'min-width': 'min-width: ',
-          'orphans': 'orphans: ',
-          'overflow': 'overflow: ',
-          'padding': 'padding: ',
-          'padding-bottom': 'padding-bottom: ',
-          'padding-left': 'padding-left: ',
-          'padding-right': 'padding-right: ',
-          'padding-top': 'padding-top: ',
-          'page-break-after': 'page-break-after: ',
-          'page-break-before': 'page-break-before: ',
-          'pause': 'pause: ',
-          'pause-after': 'pause-after: ',
-          'pause-before': 'pause-before: ',
-          'pitch': 'pitch: ',
-          'pitch-range': 'pitch-range: ',
-          'play-during': 'play-during: ',
-          'position': 'position: ',
-          'richness': 'richness: ',
-          'right': 'right: ',
-          'row-span': 'row-span: ',
-          'size': 'size: ',
-          'speak': 'speak: ',
-          'speak-date': 'speak-date: ',
-          'speak-header': 'speak-header: ',
-          'speak-numeral': 'speak-numeral: ',
-          'speak-punctuation': 'speak-punctuation: ',
-          'speak-time': 'speak-time: ',
-          'speech-rate': 'speech-rate: ',
-          'stress': 'stress: ',
-          'table-layout': 'table-layout: ',
-          'text-align': 'text-align: ',
-          'text-decoration': 'text-decoration: ',
-          'text-indent': 'text-indent: ',
-          'text-shadow': 'text-shadow: ',
-          'text-transform': 'text-transform: ',
-          'top': 'top: ',
-          'vertical-align': 'vertical-align: ',
-          'visibility': 'visibility: ',
-          'voice-family': 'voice-family: ',
-          'volume': 'volume: ',
-          'white-space': 'white-space: ',
-          'widows': 'widows: ',
-          'width': 'width: ',
-          'word-spacing': 'word-spacing: ',
-          'z-index': 'z-index: ' }
-};
-
-// add the common items to all objects
-for(var i in tagLib) {
-i = i.replace(/^h[1-6]$/,"h"); // h1 .. h6
-  for(var j in opTag_all)
-    eval('opTag_'+i+'["'+j+'"] = opTag_all["'+j+'"];');
-  for(var j in opAtt_all)
-    eval('opAtt_'+i+'["'+j+'"] = opAtt_all["'+j+'"];');
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SaveSubmit/README.txt b/web/imcms/xinha/plugins/SaveSubmit/README.txt
deleted file mode 100644
index 22a71d8186..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-SaveSubmit for Xinha
-
-developed by Raimund Meyer (ray) xinha @ raimundmeyer.de
-
-Registers a button for submiting the Xinha form using asynchronous
-postback for sending the data to the server
-
-Usage: This should be a drop-in replacement for a normal submit button.
-While saving a message is displayed to inform the user what's going on.
-On successful transmission the output of the target script is shown, so it should print some information
-about the success of saving.
-
-ATTENTION: The data sent by this method is always UTF-8 encoded, regardless of the actual charset used. So, if you 
-are using a different encoding you have to convert on the server side.
-
diff --git a/web/imcms/xinha/plugins/SaveSubmit/img/ed_save_green.gif b/web/imcms/xinha/plugins/SaveSubmit/img/ed_save_green.gif
deleted file mode 100644
index 6804a744c9..0000000000
Binary files a/web/imcms/xinha/plugins/SaveSubmit/img/ed_save_green.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SaveSubmit/img/ed_save_red.gif b/web/imcms/xinha/plugins/SaveSubmit/img/ed_save_red.gif
deleted file mode 100644
index e4289b4e31..0000000000
Binary files a/web/imcms/xinha/plugins/SaveSubmit/img/ed_save_red.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SaveSubmit/lang/de.js b/web/imcms/xinha/plugins/SaveSubmit/lang/de.js
deleted file mode 100644
index 5971ba6e6c..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/lang/de.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-{ 
-	"Save": "Speichern",
-	"Saving...": "Speichern...",
-	"in progress": "in Arbeit",
-	"Ready": "Fertig"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SaveSubmit/lang/fr.js b/web/imcms/xinha/plugins/SaveSubmit/lang/fr.js
deleted file mode 100644
index c2422a2798..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/lang/fr.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{ 
-	"Save": "Enregistrer",
-	"Saving...": "Enregistrement...",
-	"in progress": "en cours",
-	"Ready": "Prêt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SaveSubmit/lang/ja.js b/web/imcms/xinha/plugins/SaveSubmit/lang/ja.js
deleted file mode 100644
index 30fa51ae6e..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/lang/ja.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-	"Save": "�存",
-	"Saving...": "�存中...",
-	"in progress": "処�中",
-	"Ready": "レディ"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SaveSubmit/lang/nl.js b/web/imcms/xinha/plugins/SaveSubmit/lang/nl.js
deleted file mode 100644
index bab1f08eff..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/lang/nl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{ 
-	"Save": "Opslaan",
-	"Saving...": "Bezig met opslaan...",
-	"in progress": "bezig met opslaan...",
-	"Ready": "Klaar"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SaveSubmit/lang/pt_br.js b/web/imcms/xinha/plugins/SaveSubmit/lang/pt_br.js
deleted file mode 100644
index dcd20a1735..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/lang/pt_br.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt)
-{ 
-	"Save": "Salvar",
-	"Saving...": "Gravando...",
-	"in progress": "em processo",
-	"Ready": "Pronto"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SaveSubmit/lang/ru.js b/web/imcms/xinha/plugins/SaveSubmit/lang/ru.js
deleted file mode 100644
index 04eac60072..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/lang/ru.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Simple job done by Alexey Kirpichnikov <alexkir at kiwistudio dot ru>
-{ 
-	"Save": "Сохранить",
-	"Saving...": "Сохранение...",
-	"in progress": "пожалуй�та, ждите",
-	"Ready": "Готово"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SaveSubmit/save-submit.js b/web/imcms/xinha/plugins/SaveSubmit/save-submit.js
deleted file mode 100644
index d36e007e22..0000000000
--- a/web/imcms/xinha/plugins/SaveSubmit/save-submit.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/*------------------------------------------*\
-SaveSubmit for Xinha
-____________________
-
-See README.txt for information
-
-\*------------------------------------------*/
-
-function SaveSubmit(editor) {
-	this.editor = editor;
-	this.changed = false;
-	var self = this;
-	var cfg = editor.config;
-	this.textarea = this.editor._textArea;
-
-	this.image_changed = _editor_url+"plugins/SaveSubmit/img/ed_save_red.gif";
-	this.image_unchanged = _editor_url+"plugins/SaveSubmit/img/ed_save_green.gif";
-	cfg.registerButton({
-	id       : "savesubmit",
-	tooltip  : self._lc("Save"),
-	image    : this.image_unchanged,
-	textMode : false,
-	action   :  function(editor) {
-			self.save(editor);
-		}
-	});
-	cfg.addToolbarElement("savesubmit", "popupeditor", -1);
-}
-
-SaveSubmit.prototype._lc = function(string) {
-    return Xinha._lc(string, 'SaveSubmit');
-}
-
-SaveSubmit._pluginInfo = {
-  name          : "SaveSubmit",
-  version       : "1.0",
-  developer     : "Raimund Meyer",
-  developer_url : "http://rheinauf.de",
-  c_owner       : "Raimund Meyer",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-}
-
-SaveSubmit.prototype.onGenerateOnce = function() {
-	this.initial_html = this.editor.getInnerHTML();
-}
-
-SaveSubmit.prototype.onKeyPress = function(ev) {
-	if ( ev.ctrlKey && this.editor.getKey(ev) == 's') {
-			this.save(this.editor);
-			Xinha._stopEvent(ev);
-			return true;
-	}
-	else {
-		if (!this.changed) {
-			if (this.getChanged()) this.setChanged();
-			return false;
-		}
-	}
-}
-SaveSubmit.prototype.onExecCommand = function (cmd) {
-	if (this.changed && cmd == 'undo') { 
-		if (this.initial_html == this.editor.getInnerHTML()) this.setUnChanged();
-		return false;
-	}
-}
-SaveSubmit.prototype.onUpdateToolbar = function () {
-	if (!this.changed) {
-		if (this.getChanged()) this.setChanged();
-		return false;
-	}	
-}
-SaveSubmit.prototype.getChanged = function() {
-	if (this.initial_html === null) this.initial_html = this.editor.getInnerHTML();
-	if (this.initial_html != this.editor.getInnerHTML() && this.changed == false) {
-		this.changed = true;
-		return true;
-	}
-	else return false;
-}
-SaveSubmit.prototype.setChanged = function() {
-	this.editor._toolbarObjects.savesubmit.swapImage(this.image_changed);
-	this.editor.updateToolbar();
-}
-SaveSubmit.prototype.setUnChanged = function() {
-	this.changed = false;
-	this.editor._toolbarObjects.savesubmit.swapImage(this.image_unchanged);
-}
-SaveSubmit.prototype.changedReset = function() {
-	this.initial_html = null;
-	this.setUnChanged();
-}
-
-SaveSubmit.prototype.save =  function(editor) {
-	this.buildMessage()
-	var self =this;
-	var form = editor._textArea.form;
-	form.onsubmit();
-
-	var name, value, content ='';
-	
-	for (var i=0;i<form.elements.length;i++)
-	{
-		if (( form.elements[i].type == 'checkbox' || form.elements[i].type == 'radio' ) && !form.elements[i].checked ) continue;
-
-		content += ((i>0) ? '&' : '') + form.elements[i].name + '=' + encodeURIComponent(form.elements[i].value);
-	}
-
-	Xinha._postback(editor._textArea.form.action, content, function(getback) {
-
-		if (getback) {
-			self.setMessage(getback);
-			//self.setMessage(self._lc("Ready"));
-			self.changedReset();
-		}
-		removeMessage = function() { self.removeMessage()} ;
-		window.setTimeout("removeMessage()",1000);
-	});
-}
-
-SaveSubmit.prototype.setMessage = function(string) {
-  var textarea = this.textarea;
-  if ( !document.getElementById("message_sub_" + textarea.id)) { return ; }
-  var elt = document.getElementById("message_sub_" + textarea.id);
-  elt.innerHTML = Xinha._lc(string, 'SaveSubmit');
-}
-
-SaveSubmit.prototype.removeMessage = function() {
-  var textarea = this.textarea;
-  if (!document.getElementById("message_" + textarea.id)) { return ; }
-  document.body.removeChild(document.getElementById("message_" + textarea.id));
-}
-
-//ripped mokhet's loading message function
-SaveSubmit.prototype.buildMessage   = function() {
-
-	var textarea = this.textarea;
-	var htmlarea = this.editor._htmlArea;
-	var loading_message = document.createElement("div");
-	loading_message.id = "message_" + textarea.id;
-	loading_message.className = "loading";
-	loading_message.style.width    = htmlarea.offsetWidth +'px' ;//(this.editor._iframe.offsetWidth != 0) ? this.editor._iframe.offsetWidth +'px' : this.editor._initial_ta_size.w;
-
-	loading_message.style.left     = Xinha.findPosX(htmlarea) +  'px';
-	loading_message.style.top      = (Xinha.findPosY(htmlarea) + parseInt(htmlarea.offsetHeight) / 2) - 50 +  'px';
-
-	var loading_main = document.createElement("div");
-	loading_main.className = "loading_main";
-	loading_main.id = "loading_main_" + textarea.id;
-	loading_main.appendChild(document.createTextNode(this._lc("Saving...")));
-
-	var loading_sub = document.createElement("div");
-	loading_sub.className = "loading_sub";
-	loading_sub.id = "message_sub_" + textarea.id;
-	loading_sub.appendChild(document.createTextNode(this._lc("in progress")));
-	loading_message.appendChild(loading_main);
-	loading_message.appendChild(loading_sub);
-	document.body.appendChild(loading_message);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SetId/img/placeholder.gif b/web/imcms/xinha/plugins/SetId/img/placeholder.gif
deleted file mode 100644
index 2c342777f5..0000000000
Binary files a/web/imcms/xinha/plugins/SetId/img/placeholder.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SetId/img/set-id.gif b/web/imcms/xinha/plugins/SetId/img/set-id.gif
deleted file mode 100644
index 4f6ee900f4..0000000000
Binary files a/web/imcms/xinha/plugins/SetId/img/set-id.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SetId/lang/de.js b/web/imcms/xinha/plugins/SetId/lang/de.js
deleted file mode 100644
index 1b16849883..0000000000
--- a/web/imcms/xinha/plugins/SetId/lang/de.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Set Id and Name": "Objekt ID und Name einfügen",
-  "Name/Id": "Name (ID)",
-  "Delete": "Löschen"
-};
diff --git a/web/imcms/xinha/plugins/SetId/lang/ja.js b/web/imcms/xinha/plugins/SetId/lang/ja.js
deleted file mode 100644
index f1126d0a76..0000000000
--- a/web/imcms/xinha/plugins/SetId/lang/ja.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Set Id and Name": "ID����設定",
-  "Name/Id": "��/ID",
-  "Delete": "削除",
-  "Set ID/Name": "ID����設定",
-  "ID/Name:": "ID/��:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SetId/lang/nb.js b/web/imcms/xinha/plugins/SetId/lang/nb.js
deleted file mode 100644
index fb29595d3a..0000000000
--- a/web/imcms/xinha/plugins/SetId/lang/nb.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Set Id and Name": "Sett ID og navn",
-  "Name/Id": "Navn (ID)",
-  "Delete": "Slett"
-};
diff --git a/web/imcms/xinha/plugins/SetId/lang/nl.js b/web/imcms/xinha/plugins/SetId/lang/nl.js
deleted file mode 100644
index 4571bd3b4c..0000000000
--- a/web/imcms/xinha/plugins/SetId/lang/nl.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Set Id and Name": "ID en Naam instellen",
-  "Name/Id": "Naam/ID",
-  "Delete": "Verwijderen",
-  "Set ID/Name": "ID/Naam instellen",
-  "ID/Name:": "ID/Naam:"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SetId/lang/no.js b/web/imcms/xinha/plugins/SetId/lang/no.js
deleted file mode 100644
index 9345e41c9f..0000000000
--- a/web/imcms/xinha/plugins/SetId/lang/no.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Set Id and Name": "Sett ID og navn",
-  "Name/Id": "Navn (ID)",
-  "Delete": "Slett"
-};
diff --git a/web/imcms/xinha/plugins/SetId/lang/pt_br.js b/web/imcms/xinha/plugins/SetId/lang/pt_br.js
deleted file mode 100644
index 75e12bddc3..0000000000
--- a/web/imcms/xinha/plugins/SetId/lang/pt_br.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Cancel": "Cancelar",
-  "Delete": "Apagar",
-  "ID/Name:": "ID/Nome:",
-  "OK": "OK",
-  "Set ID/Name": "Definir ID/Nome",
-  "Set Id and Name": "Definir Id e Nome",
-  "Set Id/Name": "Definir Id/Nome",
-  "Name/Id": "Nome/Id"
-};
diff --git a/web/imcms/xinha/plugins/SetId/popups/set_id.html b/web/imcms/xinha/plugins/SetId/popups/set_id.html
deleted file mode 100644
index 1ae59e40d3..0000000000
--- a/web/imcms/xinha/plugins/SetId/popups/set_id.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html>
-<head>
-  <title>Set Id/Name</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-  <script type="text/javascript">
-window.resizeTo(350, 100);
-function Init() {
-  __dlg_translate("SetId");
-  __dlg_init();
-  var param = window.dialogArguments;
-  if (param) {
-    document.getElementById("name").value = param["name"];
-  }
-  document.getElementById("name").focus();
-}
-
-function onOK() {
-  // pass data back to the calling window
-  var param = new Object();
-  param["name"] = document.getElementById("name").value;
-  __dlg_close(param);
-  return false;
-}
-
-function onDelete() {
-  // pass data back to the calling window
-  var param = new Object();
-  param["name"] = "";
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">Set ID/Name</div>
-<form>
-<table border="0" style="width: 300px;">
-  <tr>
-    <td class="label">ID/Name:</td>
-    <td><input type="text" id="name" style="width: 200px" /></td>
-  </tr>
-</table>
-
-<div id="buttons">
-  <button type="submit" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="delete" onclick="return onDelete();">Delete</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SetId/set-id.css b/web/imcms/xinha/plugins/SetId/set-id.css
deleted file mode 100644
index 01abaa0617..0000000000
--- a/web/imcms/xinha/plugins/SetId/set-id.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.hasid {
-  background-image: url(img/set-id.gif);
-  background-repeat: no-repeat;
-  background-position: left top;
-  padding-left: 19px;
-  border: 1px dotted blue;
-}
diff --git a/web/imcms/xinha/plugins/SetId/set-id.js b/web/imcms/xinha/plugins/SetId/set-id.js
deleted file mode 100644
index 44c2248079..0000000000
--- a/web/imcms/xinha/plugins/SetId/set-id.js
+++ /dev/null
@@ -1,88 +0,0 @@
-function SetId(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  // register the toolbar buttons provided by this plugin
-  cfg.registerButton({
-    id       : "setid",
-    tooltip  : this._lc("Set Id and Name"),
-    image    : editor.imgURL("set-id.gif", "SetId"),
-    textMode : false,
-    action   : function(editor) {
-                 self.buttonPress(editor);
-               }
-  });
-  cfg.addToolbarElement("setid", "createlink", 1);
-}
-
-SetId._pluginInfo = {
-  name          : "SetId",
-  version       : "2.0",
-  developer     : "Udo Schmal",
-  developer_url : "http://www.schaffrath-neuemedien.de",
-  c_owner       : "Udo Schmal",
-  sponsor       : "L.N.Schaffrath NeueMedien",
-  sponsor_url   : "http://www.schaffrath-neuemedien.de",
-  license       : "htmlArea"
-};
-
-SetId.prototype._lc = function(string) {
-  return Xinha._lc(string, 'SetId');
-};
-
-
-SetId.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(_editor_url + 'plugins/SetId/set-id.css');
-};
-
-SetId.prototype.buttonPress = function(editor) {
-  var outparam = null;
-  var html = editor.getSelectedHTML();
-  var sel  = editor._getSelection();
-  var range  = editor._createRange(sel);
-  var node = editor._activeElement(sel);
-  if (node)
-    outparam = { name : node.id };
-  else
-    outparam = { name : '' };
-
-  editor._popupDialog( "plugin://SetId/set_id", function( param ) {
-    if ( param ) {
-      var name = param["name"];
-      if (name == "" || name == null) {
-        if (node) {
-          node.removeAttribute("name");
-          node.removeAttribute("id");
-          node.removeAttribute("title");
-          if (node.className == "hasid") {
-            node.removeAttribute("class");
-          }
-        }
-        return;
-      }
-      try {
-        var doc = editor._doc;
-        if (!node) {
-          node = doc.createElement("span");
-          node.id = name;
-          node.name = name;
-          node.title = name;
-          node.className = "hasid";
-          node.innerHTML = html;
-          if (Xinha.is_ie) {
-            range.pasteHTML(node.outerHTML);
-          } else {
-            editor.insertNodeAtSelection(node);
-          }
-        } else {
-          node.id = name;
-          node.name = name;
-          node.title = name;
-          node.className = "hasid";
-        }
-      }
-      catch (e) { }
-    }
-  }, outparam);
-};
diff --git a/web/imcms/xinha/plugins/SmartReplace/dialog.html b/web/imcms/xinha/plugins/SmartReplace/dialog.html
deleted file mode 100644
index afb5625900..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/dialog.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1 id="[h1]"><l10n>SmartReplace Settings</l10n></h1>
-<div style="margin-left: 10px;">
-<table style="width: 100%;border:none">
-  <tr>
-    <td style="width:15px"><input type="checkbox" id="[enable]" name="[enable]"  /></td>
-    <td style="text-align:left"><l10n>Enable automatic replacements</l10n></td>
-  </tr>
-  <tr>
-    <td style="width:15px"><input type="checkbox" id="[convert]" name="[convert]" /></td>
-    <td style="text-align:left"><l10n>Convert all quotes and dashes in the current document</l10n></td>
-  </tr>
-</table>
-  <div style="margin-top: 10px;">
-    <input type="button" id="[ok]"     value="_(OK)"     />
-    <input type="button" id="[cancel]" value="_(Cancel)" />
-  </div>
-</div>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SmartReplace/img/smartquotes.gif b/web/imcms/xinha/plugins/SmartReplace/img/smartquotes.gif
deleted file mode 100644
index 5cbb0b6bbc..0000000000
Binary files a/web/imcms/xinha/plugins/SmartReplace/img/smartquotes.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SmartReplace/lang/de.js b/web/imcms/xinha/plugins/SmartReplace/lang/de.js
deleted file mode 100644
index 17bae639c0..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/lang/de.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-{
-	"SmartReplace Settings" : "SmartReplace Einstellungen",
-	"Enable automatic replacements" : "Automatische Ersetzung aktivieren",
-	"Convert all quotes and dashes in the current document": "Alle Anführungszeichen und Gedankenstriche umwandeln",
-	
-	"OpeningDoubleQuotes": "„",
-	"ClosingDoubleQuotes": "“",
-	"OpeningSingleQuote": "‚",
-	"ClosingSingleQuote": "‘"
-	
-	/*
-	"OpeningDoubleQuotes": "»",
-	"ClosingDoubleQuotes": "«",
-	"OpeningSingleQuote": "›",
-	"ClosingSingleQuote": "‹"
-*/
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SmartReplace/lang/ja.js b/web/imcms/xinha/plugins/SmartReplace/lang/ja.js
deleted file mode 100644
index 946a6e019d..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/lang/ja.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-	"SmartReplace Settings" : "SmartReplace設定",
-	"Enable automatic replacements" : "自動置��有効化",
-	"Convert all quotes and dashes in the current document": "文書内�引用符�ダッシュを���変�",
-	
-	"OpeningDoubleQuotes": "„",
-	"ClosingDoubleQuotes": "“",
-	"OpeningSingleQuote": "‚",
-	"ClosingSingleQuote": "‘"
-	
-	/*
-	"OpeningDoubleQuotes": "»",
-	"ClosingDoubleQuotes": "«",
-	"OpeningSingleQuote": "›",
-	"ClosingSingleQuote": "‹"
-*/
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SmartReplace/lang/nl.js b/web/imcms/xinha/plugins/SmartReplace/lang/nl.js
deleted file mode 100644
index 2ec9a6e5a9..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/lang/nl.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-	"SmartReplace Settings" : "SmartReplace Instellingen",
-	"Enable automatic replacements" : "Automatisch vervangen inschakelen",
-	"Convert all quotes and dashes in the current document": "Converteer alle quotes en schuine strepen",
-	
-	"OpeningDoubleQuotes": "„",
-	"ClosingDoubleQuotes": "“",
-	"OpeningSingleQuote": "‚",
-	"ClosingSingleQuote": "‘"
-	
-	/*
-	"OpeningDoubleQuotes": "»",
-	"ClosingDoubleQuotes": "«",
-	"OpeningSingleQuote": "›",
-	"ClosingSingleQuote": "‹"
-*/
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SmartReplace/lang/pt_br.js b/web/imcms/xinha/plugins/SmartReplace/lang/pt_br.js
deleted file mode 100644
index 819b4d9d35..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/lang/pt_br.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-{
-  "Cancel": "Cancelar",
-  "Convert all quotes and dashes in the current document": "Converter todas as citações e hífens no documento atual",
-  "Enable automatic replacements": "Ativar substituições automáticas",
-  "OK": "OK",
-  "SmartReplace": "Substituição Rápida",
-  "SmartReplace Settings": "Configurações da Substituição Rápida"
-}
diff --git a/web/imcms/xinha/plugins/SmartReplace/popups/dialog.html b/web/imcms/xinha/plugins/SmartReplace/popups/dialog.html
deleted file mode 100644
index 32ba9a0204..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/popups/dialog.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>SmartReplace Settings</title>
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-
-  <script type="text/javascript">
-   window.resizeTo(350, 200);
-
-Xinha = window.opener.Xinha;
-
-function i18n(str) {
-  return (Xinha._lc(str, 'SmartReplace'));
-}
-
-function Init() {
-	__dlg_translate('SmartReplace');
-	__dlg_init();
-	var param = window.dialogArguments;
-  	document.getElementById('enable').checked = param.active;
-}
-  
-function onOK() {
- 	
- var param = {
- 	enable  : document.getElementById("enable").checked, 
- 	convert : document.getElementById("convert").checked
- };
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">SmartReplace Settings</div>
-<form action="">
-<table style="width: 100%;border:none">
-  <tr>
-    <td style="width:15px"><input type="checkbox" id="enable"  /></td>
-    <td style="text-align:left">Enable automatic replacements</td>
-  </tr>
-  <tr>
-    <td style="width:15px"><input type="checkbox" id="convert"  /></td>
-    <td style="text-align:left">Convert all quotes and dashes in the current document</td>
-  </tr>
-</table>
-
-<div id="buttons">
-  <button type="submit" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SmartReplace/readme.txt b/web/imcms/xinha/plugins/SmartReplace/readme.txt
deleted file mode 100644
index be8fcc346c..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/readme.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-One irritating thing with text processing is the total absence of some typographic essentials on the keyboard -- "real" (typographic) quotes and the dash, typically miss-typed as inch or second sign (") and the hyphon(-).
-
-This plugin lends the good old Word behaviour to Xinha, as ",', and - get converted to their respective typographic correct relatives while typing.
-
- Configuration (to change the quote style from default English):
-  * through language file (see lang/de.js)
-  * through a config variable (an array that holds four values: opening single quote, closing single quote, opening double quote, closing double quote)
-  
- Additional config option:
-  * disable automatic replacement by default
-  
- Additional features:
-  * can be switched on/off
-  * convert all quotes/dashes in a document that still has the boring  "/- stuff
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SmartReplace/smart-replace.js b/web/imcms/xinha/plugins/SmartReplace/smart-replace.js
deleted file mode 100644
index 02ce3b7f73..0000000000
--- a/web/imcms/xinha/plugins/SmartReplace/smart-replace.js
+++ /dev/null
@@ -1,372 +0,0 @@
-/*------------------------------------------*\
- SmartReplace for Xinha
- _______________________
-     
-\*------------------------------------------*/
-
-function SmartReplace(editor) {
-	this.editor = editor;
-	
-	var cfg = editor.config;
-	var self = this;
-	
-	cfg.registerButton
-	({
-		id       : "smartreplace",
-		tooltip  : this._lc("SmartReplace"),
-		image    : _editor_url+"plugins/SmartReplace/img/smartquotes.gif",
-		textMode : false,
-	/*	action   : function(editor) {
-				self.dialog(editor);
-			}
-		});	*/
-		action   : function(e, objname, obj) { self.buttonPress(null, obj); }
-	});
-	cfg.addToolbarElement("smartreplace", "htmlmode", 1);
-}
-
-SmartReplace._pluginInfo = {
-  name          : "SmartReplace",
-  version       : "1.0",
-  developer     : "Raimund Meyer",
-  developer_url : "http://rheinauf.de",
-  c_owner       : "Raimund Meyer",
-  sponsor       : "",
-  sponsor_url   : "",
-  license       : "htmlArea"
-};
-
-SmartReplace.prototype._lc = function(string) {
-    return Xinha._lc(string, 'SmartReplace');
-};
-
-Xinha.Config.prototype.SmartReplace =
-{
-	'defaultActive' : true,
-	'quotes' : null//[String.fromCharCode(187),String.fromCharCode(171),String.fromCharCode(8250),String.fromCharCode(8249)]
-}
-SmartReplace.prototype.toggleActivity = function(newState) 
-{
-	if (typeof newState != 'undefined')
-	{
-		this.active = newState;
-	}
-	else
-	{
-		this.active = this.active ? false : true;		
-	}
-	this.editor._toolbarObjects.smartreplace.state("active", this.active);
-}
-
-SmartReplace.prototype.onUpdateToolbar = function() {
-	this.editor._toolbarObjects.smartreplace.state("active", this.active);
-}
-
-SmartReplace.prototype.onGenerate = function() {
-	this.active = this.editor.config.SmartReplace.defaultActive;
-	this.editor._toolbarObjects.smartreplace.state("active", this.active);
-	
-	var self = this;
-	Xinha._addEvents(
-        self.editor._doc,
-        [ "keypress"],
-        function (event)
-        {
-          return self.keyEvent(Xinha.is_ie ? self.editor._iframe.contentWindow.event : event);
-        });
-    
-    var quotes = this.editor.config.SmartReplace.quotes;
-   
-    if (quotes && typeof quotes == 'object')
-    {
-	    this.openingQuotes = quotes[0];
-		this.closingQuotes = quotes[1];
-		this.openingQuote  = quotes[2];
-		this.closingQuote  = quotes[3];
-    }
-    else
-    {
-    	this.openingQuotes = this._lc("OpeningDoubleQuotes");
-		this.closingQuote  = this._lc("ClosingSingleQuote");
-		this.closingQuotes = this._lc("ClosingDoubleQuotes");
-		this.openingQuote  = this._lc("OpeningSingleQuote");
-    }
- 	
-	if (this.openingQuotes == 'OpeningDoubleQuotes') //If nothing else is defined, English style as default
-	{
-		this.openingQuotes = String.fromCharCode(8220);
-		this.closingQuotes = String.fromCharCode(8221);
-		this.openingQuote = String.fromCharCode(8216);
-		this.closingQuote = String.fromCharCode(8217);
-	}
-};
-
-SmartReplace.prototype.keyEvent = function(ev)
-{
-	if ( !this.active) return true;
-	var editor = this.editor;
-	var charCode =  Xinha.is_ie ? ev.keyCode : ev.charCode;
-	
-	var key = String.fromCharCode(charCode);
-
-	if (charCode == 32) //space bar
-	{
-		return this.smartDash()
-	}
-	if ( key == '"' || key == "'")
-	{
-		Xinha._stopEvent(ev);
-		return this.smartQuotes(key);
-	}
-	return true;
-}
-
-SmartReplace.prototype.smartQuotes = function(kind)
-{
-	if (kind == "'")
-	{
-		var opening = this.openingQuote;
-		var closing = this.closingQuote;
-	}
-	else
-	{
-		var opening = this.openingQuotes;
-		var closing = this.closingQuotes;
-	}
-	
-	var editor = this.editor;
-		
-	var sel = editor.getSelection();
-	
-	if (Xinha.is_ie)
-	{
-		var r = editor.createRange(sel);
-		if (r.text !== '')
-		{
-			r.text = '';
-		}
-		r.moveStart('character', -1);
-		
-		if(r.text.match(/\S/))
-		{
-			r.moveStart('character', +1);
-			r.text = closing;
-		}
-		else
-		{
-			r.moveStart('character', +1);
-			r.text = opening;
-		}
-	}
-	else
-	{
-		if (!sel.isCollapsed)
-		{
-			editor.insertNodeAtSelection(document.createTextNode(''));
-		}
-		if (sel.anchorOffset > 0) sel.extend(sel.anchorNode,sel.anchorOffset-1);
-		
-		if(sel.toString().match(/\S/))
-		{
-			sel.collapse(sel.anchorNode,sel.anchorOffset);
-			editor.insertNodeAtSelection(document.createTextNode(closing));
-		}
-		else
-		{
-			sel.collapse(sel.anchorNode,sel.anchorOffset);
-			editor.insertNodeAtSelection(document.createTextNode(opening));
-		}
-	}
-}
-
-SmartReplace.prototype.smartDash = function()
-{
-	var editor = this.editor;
-	var sel = this.editor.getSelection();
-	if (Xinha.is_ie)
-	{
-		var r = this.editor.createRange(sel);
-		r.moveStart('character', -2);
-		
-		if(r.text.match(/\s-/))
-		{
-			r.text = ' '+ String.fromCharCode(8211);
-		}
-	}
-	else
-	{
-		sel.extend(sel.anchorNode,sel.anchorOffset-2);
-		if(sel.toString().match(/^-/))
-		{
-			this.editor.insertNodeAtSelection(document.createTextNode(' '+String.fromCharCode(8211)));
-		}
-		sel.collapse(sel.anchorNode,sel.anchorOffset);
-	}
-}
-
-SmartReplace.prototype.replaceAll = function()
-{
-	var doubleQuotes = [
-							'&quot;',
-							String.fromCharCode(8220),
-							String.fromCharCode(8221),
-							String.fromCharCode(8222),
-							String.fromCharCode(187),
-							String.fromCharCode(171)
-							
-						];
-	var singleQuotes = [
-							"'",
-							String.fromCharCode(8216),
-							String.fromCharCode(8217),
-							String.fromCharCode(8218),
-							String.fromCharCode(8250),
-							String.fromCharCode(8249)
-						];
-	
-	var html = this.editor.getHTML();
-	var reOpeningDouble = new RegExp ('(\\s|^|>)('+doubleQuotes.join('|')+')(\\S)','g');
-	html = html.replace(reOpeningDouble,'$1'+this.openingQuotes+'$3');
-	
-	var reOpeningSingle = new RegExp ('(\\s|^|>)('+singleQuotes.join('|')+')(\\S)','g');
-	html = html.replace(reOpeningSingle,'$1'+this.openingQuote+'$3');
-	
-	var reClosingDouble = new RegExp ('(\\S)('+doubleQuotes.join('|')+')','g');
-	html = html.replace(reClosingDouble,'$1'+this.closingQuotes);
-	
-	var reClosingSingle = new RegExp ('(\\S)('+singleQuotes.join('|')+')','g');
-	html = html.replace(reClosingSingle,'$1'+this.closingQuote);
-	
-	var reDash    = new RegExp ('( |&nbsp;)(-)( |&nbsp;)','g');
-	html = html.replace(reDash,' '+String.fromCharCode(8211)+' ');
-	
-	this.editor.setHTML(html);
-}
-SmartReplace.prototype.dialog = function()
-{
-	var self = this;
-	var action = function (param)
-	{
-		self.toggleActivity(param.enable); 
-		if (param.convert)
-		{
-			self.replaceAll();
-		}
-	}
-	var init = this;
-	Dialog(_editor_url+'plugins/SmartReplace/popups/dialog.html', action, init);
-}
-
-
-SmartReplace.prototype.buttonPress = function(opts, obj)
-{
-	var self = this;
-
-	if ( this._dialog.dialog.rootElem.style.display != 'none')
-	{
-		return this._dialog.hide();
-	}
-	var doOK = function()
-	{
-		var opts = self._dialog.hide();
-		self.toggleActivity((opts.enable) ? true : false); 
-		if (opts.convert)
-		{
-			self.replaceAll();
-			self._dialog.dialog.getElementById("convert").checked = false;
-		}
-	}
-	var inputs = 
-	{
-		enable : self.active ? "on" : '',
-		convert: ''
-	};
-	this._dialog.show(inputs, doOK);
-};
-
-SmartReplace.prototype.onGenerateOnce = function()
-{
-  if( !this._dialog)
-  {
-    this._dialog = new SmartReplace.Dialog(this);
-  }
-};
-
-SmartReplace.Dialog = function (mainPluginObject)
-{
-  this.Dialog_nxtid = 0;
-  this.mainPluginObject = mainPluginObject;
-  this.id = { }; // This will be filled below with a replace, nifty
-
-  this.ready = false;
-  this.files  = false;
-  this.html   = false;
-  this.dialog = false;
-
-  this._prepareDialog();
-
-};
-
-SmartReplace.Dialog.prototype._prepareDialog = function()
-{
-  var pluginDialogObject = this;
-  var editor = this.mainPluginObject.editor;
-
-  if(this.html == false)
-  {
-    Xinha._getback(_editor_url + 'plugins/SmartReplace/dialog.html', function(getback) { pluginDialogObject.html = getback; pluginDialogObject._prepareDialog(); });
-    return;
-  }
-  
-  // Now we have everything we need, so we can build the dialog.
-  this.dialog = new Xinha.Dialog(editor, this.html, 'SmartReplace');
-
-  this.ready = true;
-};
-
-SmartReplace.Dialog.prototype._lc = SmartReplace.prototype._lc;
-
-SmartReplace.Dialog.prototype.show = function(inputs, ok, cancel)
-{
-  if(!this.ready)
-  {
-    var pluginDialogObject = this;
-    window.setTimeout(function() {pluginDialogObject.show(inputs,ok,cancel);},100);
-    return;
-  }
-
-  // Connect the OK and Cancel buttons
-  var dialog = this.dialog;
-  var pluginDialogObject = this;
-  if(ok)
-  {
-    this.dialog.getElementById('ok').onclick = ok;
-  }
-  else
-  {
-    this.dialog.getElementById('ok').onclick = function() {pluginDialogObject.hide();};
-  }
-
-  if(cancel)
-  {
-    this.dialog.getElementById('cancel').onclick = cancel;
-  }
-  else
-  {
-    this.dialog.getElementById('cancel').onclick = function() { pluginDialogObject.hide()};
-  }
-
-  // Show the dialog
-  this.mainPluginObject.editor.disableToolbar(['fullscreen','smartreplace']);
-
-  this.dialog.show(inputs);
-
-  // Init the sizes
-  this.dialog.onresize();
-};
-
-SmartReplace.Dialog.prototype.hide = function()
-{
-  this.mainPluginObject.editor.enableToolbar();
-  return this.dialog.hide();
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/README b/web/imcms/xinha/plugins/SpellChecker/README
deleted file mode 100644
index 9b5a2c86f9..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/README
+++ /dev/null
@@ -1,8 +0,0 @@
-ExecCGI Note:
-If you intend to use the perl (.cgi) backend then you will need to have the ExecCGI option enabled for this directory (if you are using Apache), you may be able to do this by adding a file called .htaccess in this directory, with the below contents.
-
-## EXAMPLE .htaccess
-Options +ExecCGI
-####################
-
-It is however recommended that you use the PHP backend where possible.
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/aspell_setup.php b/web/imcms/xinha/plugins/SpellChecker/aspell_setup.php
deleted file mode 100644
index c13a5af82a..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/aspell_setup.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-// REVISION HISTORY:
-//
-// 2005-08-17 YmL:
-//	.	security fix on unchecked variables. Original author missed quite a few
-//		holes.
-
-  umask(000);
-  $temptext = tempnam('/tmp', 'spell_');
-  if ((!isset($_POST['dictionary'])) || (strlen(trim($_POST['dictionary'])) < 1))
-  {
-      $lang = 'en_GB';
-  }
-  else
-  {
-      $lang = $_POST['dictionary'];
-  }  
-  $lang = preg_replace('/[^a-z0-9_]/i', '', $lang);
-  
-  $aspell      = 'aspell';
-  $aspell_args = '-a --lang=' . $lang;
-
-  if(DIRECTORY_SEPARATOR == '\\') //windows
-  {
-    $aspell         = 'C:\Progra~1\Aspell\bin\aspell.exe';
-  }
-  else //linux
-  {
-    // See if there is a local install of aspell here
-    if(file_exists(dirname(__FILE__) . '/aspell/bin/aspell'))
-    {
-      putenv('PATH=' . dirname(__FILE__) . '/aspell/bin:' . getenv('PATH'));
-      putenv('LD_LIBRARY_PATH=' . dirname(__FILE__) . '/aspell/lib:' . getenv('LD_LIBRARY_PATH'));
-      $dicfil = dirname(__FILE__) .'/aspell/lib/' . preg_replace('/^.*\/lib\/(aspell\S*)\n.*/s', '$1', `aspell config dict-dir`);
-      $aspell_args .= ' --dict-dir=' . $dicfil . ' --add-filter-path=' . $dicfil ;
-    }
-  }
-
-
-  // Old aspell doesn't know about encoding, which means that unicode will be broke, but
-  // we should at least let it try.
-  preg_match('/really aspell ([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/i', `$aspell version`, $aVer);
-
-  $aVer = array('major' => (int)$aVer[1], 'minor' => (int)$aVer[2], 'release' => (int)@$aVer[3]);
-  if($aVer['major'] >= 0 && $aVer['minor'] >= 60)
-  {
-    $aspell_args   .= ' -H --encoding=utf-8';
-  }
-  elseif(preg_match('/--encoding/', shell_exec('aspell 2>&1')))
-  {
-    $aspell_args   .= ' --mode=none --add-filter=sgml --encoding=utf-8';
-  }
-  else
-  {
-    $aspell_args   .= ' --mode=none --add-filter=sgml';
-  }
-
-  // Personal dictionaries
-  $p_dicts_path = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'personal_dicts';
-
-  if(isset($_REQUEST['p_dicts_path']) && file_exists($_REQUEST['p_dicts_path']) && is_writable($_REQUEST['p_dicts_path']))
-  {
-    if(!isset($_REQUEST['p_dicts_name']))
-    {
-      if(isset($_COOKIE['SpellChecker_p_dicts_name']))
-      {
-        $_REQUEST['p_dicts_name'] = $_COOKIE['SpellChecker_p_dicts_name'];
-      }
-      else
-      {
-        $_REQUEST['p_dicts_name'] = uniqid('dict');
-        setcookie('SpellChecker_p_dicts_name', $_REQUEST['p_dicts_name'], time() + 60*60*24*365*10);
-      }
-    }    
-    $p_dict_path = $_REQUEST['p_dicts_path'] . DIRECTORY_SEPARATOR . preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['p_dicts_name']);
-
-    if(!file_exists($p_dict_path))
-    {
-	 	// since there is a single directory for all users this could end up containing
-		// quite a few subdirectories. To prevent a DOS situation we'll limit the 
-		// total directories created to 2000 (arbitrary). Adjust to suit your installation.
-
-		$count = 0;
-
-		if( $dir = @opendir( $p_dicts_path ) )
-			{
-
-			while( FALSE !== ($file = readdir($dir)) )
-				{
-				$count++;
-				}
-			}
-
-		// TODO: make this a config value.
-
-		if ( $count > 2000 )
-			{
-
-			// either very heavy use or a DOS attempt
-
-			die();
-
-			}
-
-      mkdir($p_dict_path);
-      chmod($p_dict_path, 02770);
-    }
-
-    if(file_exists($p_dict_path) && is_writable($p_dict_path))
-    {
-      // Good To Go!
-      $aspell_args .= ' --home-dir=' . $p_dict_path ;
-    }
-  }
-
-// as an additional precaution check the aspell_args for illegal 
-// characters
-  $aspell_args = preg_replace( "/[|><;\$]+/", '', $aspell_args );
-  $aspelldictionaries = "$aspell dump dicts";
-  $aspellcommand      = "$aspell $aspell_args < $temptext";
-
-
-?>
diff --git a/web/imcms/xinha/plugins/SpellChecker/img/he-spell-check.gif b/web/imcms/xinha/plugins/SpellChecker/img/he-spell-check.gif
deleted file mode 100644
index 8015d2ff22..0000000000
Binary files a/web/imcms/xinha/plugins/SpellChecker/img/he-spell-check.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SpellChecker/img/spell-check.gif b/web/imcms/xinha/plugins/SpellChecker/img/spell-check.gif
deleted file mode 100644
index fce009a552..0000000000
Binary files a/web/imcms/xinha/plugins/SpellChecker/img/spell-check.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/cz.js b/web/imcms/xinha/plugins/SpellChecker/lang/cz.js
deleted file mode 100644
index 0b345115d4..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/cz.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "cz", ENCODING: UTF-8
-// Author: Jiri Löw, <jirilow@jirilow.com>
-{
-  "Please confirm that you want to open this link": "Prosím potvr�te otevření tohoto odkazu",
-  "Cancel": "Zrušit",
-  "Dictionary": "Slovník",
-  "Finished list of mispelled words": "Dokon�en seznam chybných slov",
-  "I will open it in a new page.": "Bude otevřen jej v nové stránce.",
-  "Ignore all": "Ignorovat vše",
-  "Ignore": "Ignorovat",
-  "No mispelled words found with the selected dictionary.": "Podle zvoleného slovníku nebyla nalezena žádná chybná slova.",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Kontrola správnosti slov dokon�ena, nebyla nalezena žádná chybná slova. Ukon�ování ...",
-  "OK": "OK",
-  "Original word": "Původní slovo",
-  "Please wait.  Calling spell checker.": "Prosím �ekejte. Komunikuace s kontrolou správnosti slov.",
-  "Please wait: changing dictionary to": "Prosím �ekejte: změna adresáře na",
-  "This will drop changes and quit spell checker.  Please confirm.": "Změny budou zrušeny a kontrola správnosti slov ukon�ena. Prosím potvr�te.",
-  "Re-check": "Překontrolovat",
-  "Replace all": "Zaměnit všechno",
-  "Replace with": "Zaměnit za",
-  "Replace": "Zaměnit",
-  "Spell-check": "Kontrola správnosti slov",
-  "Suggestions": "Doporu�ení",
-  "One moment...": "strpení prosím ;-)"
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/da.js b/web/imcms/xinha/plugins/SpellChecker/lang/da.js
deleted file mode 100644
index d6f1aadfb8..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/da.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "da", ENCODING: UTF-8
-// Author: Steen SÞnderup, <steen@soenderup.com>
-{
-  "Please confirm that you want to open this link": "Vil du fÞlge dette link?",
-  "Cancel": "Anuler",
-  "Dictionary": "Ordbog",
-  "Finished list of mispelled words": "Listen med stavefejl er gennemgået",
-  "I will open it in a new page.": "Jeg vil åbne det i en ny side.",
-  "Ignore all": "Ignorer alle",
-  "Ignore": "Ignorer",
-  "No mispelled words found with the selected dictionary.": "Der blev ikke fundet nogle stavefejl med den valgte ordbog.",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Stavekontrollen er gennemfÞrt, der blev ikke fundet nogle stavefejl.  Lukker...",
-  "OK": "OK",
-  "Original word": "Oprindeligt ord",
-  "Please wait.  Calling spell checker.": "Vent venligst.  Henter stavekontrol.",
-  "Please wait: changing dictionary to": "Vent venligst: skifter ordbog til",
-  "This will drop changes and quit spell checker.  Please confirm.": "Alle dine Êndringer vil gå tabt, vil du fortsÊtte?",
-  "Re-check": "Tjek igen",
-  "Replace all": "Erstat alle",
-  "Replace with": "Erstat med",
-  "Replace": "Erstat",
-  "Spell-check": "Stavekontrol",
-  "Suggestions": "Forslag",
-  "One moment...": "Vent venligst"
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/de.js b/web/imcms/xinha/plugins/SpellChecker/lang/de.js
deleted file mode 100644
index 138dc64e6b..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/de.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "en", ENCODING: UTF-8
-// Author: Broxx, <broxx@broxx.com>
-{
-  "Please confirm that you want to open this link": "Wollen Sie diesen Link oeffnen",
-  "Cancel": "Abbrechen",
-  "Dictionary": "Woerterbuch",
-  "Finished list of mispelled words": "Liste der nicht bekannten Woerter",
-  "I will open it in a new page.": "Wird auf neuer Seite geoeffnet",
-  "Ignore all": "Alle ignorieren",
-  "Ignore": "Ignorieren",
-  "No mispelled words found with the selected dictionary.": "Keine falschen Woerter mit gewaehlten Woerterbuch gefunden",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Rechtsschreibpruefung wurde ohne Fehler fertiggestellt.  Wird nun geschlossen...",
-  "OK": "OK",
-  "Original word": "Original Wort",
-  "Please wait.  Calling spell checker.": "Bitte warten.  Woerterbuch wird durchsucht.",
-  "Please wait: changing dictionary to": "Bitte warten: Woerterbuch wechseln zu",
-  "This will drop changes and quit spell checker.  Please confirm.": "Aenderungen werden nicht uebernommen.  Bitte bestaettigen.",
-  "Re-check": "Neuueberpruefung",
-  "Replace all": "Alle ersetzen",
-  "Replace with": "Ersetzen mit",
-  "Replace": "Ersetzen",
-  "Spell-check": "Ueberpruefung",
-  "Suggestions": "Vorschlag",
-  "One moment...": "Bitte warten..."
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/fr.js b/web/imcms/xinha/plugins/SpellChecker/lang/fr.js
deleted file mode 100644
index 7cece8e5b7..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/fr.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Please confirm that you want to open this link": "Veuillez confirmer l'ouverture de ce lien",
-  "Cancel": "Annuler",
-  "Dictionary": "Dictionnaire",
-  "Finished list of mispelled words": "Liste des mots mal orthographiés",
-  "I will open it in a new page.": "Ouverture dans une nouvelle fenêtre",
-  "Ignore all": "Tout ignorer",
-  "Ignore": "Ignorer",
-  "No mispelled words found with the selected dictionary.": "Aucune erreur orthographique avec le dictionnaire sélectionné.",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Vérification terminée, aucune erreur orthographique détectée.  Fermeture en cours...",
-  "OK": "OK",
-  "Original word": "Mot original",
-  "Please wait.  Calling spell checker.": "Veuillez patienter.  Appel du correcteur.",
-  "Please wait: changing dictionary to": "Veuillez patienter. Changement du dictionnaire vers",
-  "This will drop changes and quit spell checker.  Please confirm.": "Ceci fermera la fenêtre et annulera les modifications. Veuillez confirmer.",
-  "Re-check": "Vérifier encore",
-  "Replace all": "Tout remplacer",
-  "Replace with": "Remplacer par",
-  "Replace": "Remplacer",
-  "Revert": "Annuler",
-  "Spell-check": "Correction",
-  "Suggestions": "Suggestions",
-  "One moment...": "Veuillez patienter"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/he.js b/web/imcms/xinha/plugins/SpellChecker/lang/he.js
deleted file mode 100644
index df0ddd9387..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/he.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "en", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-{
-  "Please confirm that you want to open this link": "�נ� �שר שברצונך לפתוח קישור זה",
-  "Cancel": "ביטול",
-  "Dictionary": "מילון",
-  "Finished list of mispelled words": "הסתיימה רשימת המילי� המ�ויתות ב�ופן שגוי",
-  "I will open it in a new page.": "�ני �פתח �ת זה בחלון חדש.",
-  "Ignore all": "התעל� מהכל",
-  "Ignore": "התעל�",
-  "No mispelled words found with the selected dictionary.": "ל� נמצ�ו מילי� מ�ויתות ב�ופן שגוי ע� המילון הנבחר.",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "בדיקת ה�יות נסתיימה, ל� נמצ�ו מילי� מ�ויתות ב�ופן שגוי.  נסגר כעת...",
-  "OK": "�ישור",
-  "Original word": "המילה המקורית",
-  "Please wait.  Calling spell checker.": "�נ� המתן.  קור� לבודק �יות.",
-  "Please wait: changing dictionary to": "�נ� המתן: מחליף מילון ל-",
-  "This will drop changes and quit spell checker.  Please confirm.": "זה יבטל �ת השינויי� ויצ� מבודק ה�יות.  �נ� �שר.",
-  "Re-check": "בדוק מחדש",
-  "Replace all": "החלף הכל",
-  "Replace with": "החלף ב-",
-  "Replace": "החלף",
-  "Revert": "החזר שינויי�",
-  "Spell-check": "בדיקת �יות",
-  "Suggestions": "הצעות",
-  "One moment...": "ענ� המטן ;-)"
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/hu.js b/web/imcms/xinha/plugins/SpellChecker/lang/hu.js
deleted file mode 100644
index e7e26d5b43..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/hu.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "hu", ENCODING: UTF-8
-// Author: Miklós Somogyi, <somogyine@vnet.hu>
-{
-  "Please confirm that you want to open this link": "Megerősítés",
-  "Cancel": "Mégsem",
-  "Dictionary": "Szótár",
-  "Finished list of mispelled words": "A tévesztett szavak listájának vége",
-  "I will open it in a new page.": "Megnyitás új lapon",
-  "Ignore all": "Minden elvetése",
-  "Ignore": "Elvetés",
-  "No mispelled words found with the selected dictionary.": "A választott szótár szerint nincs tévesztett szó.",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "A helyesírásellenőrzés kész, tévesztett szó nem fordult elő. Bezárás...",
-  "OK": "Rendben",
-  "Original word": "Eredeti szó",
-  "Please wait.  Calling spell checker.": "Kis türelmet, a helyesírásellenőrző hívása folyamatban.",
-  "Please wait: changing dictionary to": "Kis türelmet, szótár cseréje",
-  "This will drop changes and quit spell checker.  Please confirm.": "Kilépés a változások eldobásával. Jóváhagyja?",
-  "Re-check": "Újraellenőrzés",
-  "Replace all": "Mind cseréje",
-  "Replace with": "Csere a következőre:",
-  "Replace": "Csere",
-  "Spell-check": "Helyesírásellenőrzés",
-  "Suggestions": "Tippek",
-  "One moment...": "Kis türelmet ;-)"
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/ja.js b/web/imcms/xinha/plugins/SpellChecker/lang/ja.js
deleted file mode 100644
index 557169326a..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/ja.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Please confirm that you want to open this link": "本当���リンクを開����",
-  "Cancel": "中止",
-  "Dictionary": "辞書",
-  "Finished list of mispelled words": "��り間��語�一覧",
-  "I will open it in a new page.": "新��ページ�開���。",
-  "Ignore all": "���無視",
-  "Ignore": "無視",
-  "No mispelled words found with the selected dictionary.": "�択�れ�辞書����り間���語��り��ん。",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "スペル�ェック�完了��������り間���語��り��ん���。���閉���...",
-  "OK": "OK",
-  "Original word": "元��語",
-  "Please wait.  Calling spell checker.": "��ら��待�����。スペル�ェッカーを呼�出�����。",
-  "Please wait: changing dictionary to": "��ら��待�����: 辞書を切り替�����",
-  "This will drop changes and quit spell checker.  Please confirm.": "変更を破棄��スペル�ェッカーを終了���。よ�������。",
-  "Re-check": "��ェック",
-  "Replace all": "���置�",
-  "Replace with": "�れ�置�",
-  "Replace": "置�",
-  "Revert": "戻�",
-  "Spell-check": "スペル�ェック",
-  "Suggestions": "候補",
-  "One moment...": "��も�少�...",
-  "Info": "情報",
-  "Learn": "学習"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/nb.js b/web/imcms/xinha/plugins/SpellChecker/lang/nb.js
deleted file mode 100644
index 2a07646f12..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/nb.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Please confirm that you want to open this link": "Ønsker du å åpne denne lenken",
-  "Cancel": "Avbryt",
-  "Dictionary": "Ordliste",
-  "Finished list of mispelled words": "Ferdig med liste over feilstavede ord",
-  "I will open it in a new page.": "Ã…pnes i ny side",
-  "Ignore all": "Ignorer alle",
-  "Ignore": "Ignorer",
-  "No mispelled words found with the selected dictionary.": "Ingen feilstavede ord funnet med den valgte ordlisten",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Stavekontroll fullført, ingen feilstavede ord ble funnet, stavekontroll avsluttes.",
-  "OK": "OK",
-  "Original word": "Opprinnelig ord",
-  "Please wait.  Calling spell checker.": "Vennligst vent, kaller opp stavekontrollprogrammet",
-  "Please wait: changing dictionary to": "Vennligst vent, endrer ordliste til",
-  "This will drop changes and quit spell checker.  Please confirm.": "Dette vil droppe endringene og avbryte stavekontrollen, vennligst bekreft.",
-  "Re-check": "Kjør stavekontroll på nytt",
-  "Replace all": "Erstatt alle",
-  "Replace with": "Erstatt med",
-  "Replace": "Erstatt",
-  "Spell-check": "Stavekontroll",
-  "Suggestions": "Forslag",
-  "One moment...": "Et øyeblikk..."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/nl.js b/web/imcms/xinha/plugins/SpellChecker/lang/nl.js
deleted file mode 100644
index 8b1ee921ec..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/nl.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: A.H van den Broek  http://www.kontaktfm.nl, tonbroek@kontaktfm.nl
-{
-  "Please confirm that you want to open this link": "Weet u zeker dat u deze link wilt openen?",
-  "Cancel": "Annuleer",
-  "Dictionary": "Woordenboek",
-  "Finished list of mispelled words": "klaar met de lijst van fouten woorden",
-  "I will open it in a new page.": "Ik zal het in een nieuwe pagina openen.",
-  "Ignore all": "alles overslaan",
-  "Ignore": "Overslaan",
-  "No mispelled words found with the selected dictionary.": "Geen fouten gevonden met dit woordenboek.",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Spell checking is klaar, geen fouten gevonden.  spell checking word gesloten...",
-  "OK": "OK",
-  "Original word": "Originele woord",
-  "Please wait.  Calling spell checker.": "Even wachten. spell checker wordt geladen.",
-  "Please wait: changing dictionary to": "even wachten: woordenboek wordt veranderd naar",
-  "This will drop changes and quit spell checker.  Please confirm.": "Dit zal alle veranderingen annuleren en de spell checker sluiten.  Weet u het zeker?",
-  "Re-check": "Opnieuw",
-  "Replace all": "Alles vervangen",
-  "Replace with": "Vervangen met",
-  "Replace": "Vervangen",
-  "Revert": "Omkeren",
-  "Spell-check": "Spell-check",
-  "Suggestions": "Suggestie",
-  "One moment...": "Even wachten ;-)"
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/no.js b/web/imcms/xinha/plugins/SpellChecker/lang/no.js
deleted file mode 100644
index eb1d119d47..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/no.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Please confirm that you want to open this link": "Ønsker du å åpne denne lenken",
-  "Cancel": "Avbryt",
-  "Dictionary": "Ordliste",
-  "Finished list of mispelled words": "Ferdig med liste over feilstavede ord",
-  "I will open it in a new page.": "Ã…pnes i ny side",
-  "Ignore all": "Ignorer alle",
-  "Ignore": "Ignorer",
-  "No mispelled words found with the selected dictionary.": "Ingen feilstavede ord funnet med den valgte ordlisten",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Stavekontroll fullført, ingen feilstavede ord ble funnet, stavekontroll avsluttes.",
-  "OK": "OK",
-  "Original word": "Opprinnelig ord",
-  "Please wait.  Calling spell checker.": "Vennligst vent, kaller opp stavekontrollprogrammet",
-  "Please wait: changing dictionary to": "Vennligst vent, endrer ordliste til",
-  "This will drop changes and quit spell checker.  Please confirm.": "Dette vil droppe endringene og avbryte stavekontrollen, vennligst bekreft.",
-  "Re-check": "Kjør stavekontroll på nytt",
-  "Replace all": "Erstatt alle",
-  "Replace with": "Erstatt med",
-  "Replace": "Erstatt",
-  "Spell-check": "Stavekontroll",
-  "Suggestions": "Forslag",
-  "One moment...": "Et øyeblikk..."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/pt_br.js b/web/imcms/xinha/plugins/SpellChecker/lang/pt_br.js
deleted file mode 100644
index efc6ffa078..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/pt_br.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-{
-  "Cancel": "Cancelar",
-  "Dictionary": "Dicionário",
-  "Finished list of mispelled words": "Finalizada lista de palavras desconhecidas",
-  "HTMLArea Spell Checker": "Dicionário HTMLArea",
-  "I will open it in a new page.": "Será aberto em uma nova página",
-  "Ignore": "Ignorar",
-  "Ignore all": "Ignorar todas",
-  "Info": "Informação",
-  "Learn": "Aprender",
-  "No mispelled words found with the selected dictionary.": "Nenhuma palavra desconhecida foi encontrada no dicionário selecionado",
-  "OK": "OK",
-  "Original word": "Palavra Original",
-  "Please confirm that you want to open this link": "Por favor, confirme se deseja abrir este link",
-  "Please wait.  Calling spell checker.": "Por favor, aguarde. Chamando dicionário.",
-  "Please wait: changing dictionary to": "Por favor, aguarde: mudando dicionário para",
-  "Re-check": "Re-verificar",
-  "Replace": "Substituir",
-  "Replace all": "Substituir tudo",
-  "Replace with": "Substituir com",
-  "Revert": "Reverter",
-  "Spell Checker": "Dicionário",
-  "Spell-check": "Dicionário",
-  "Suggestions": "Sugestões",
-  "This will drop changes and quit spell checker.  Please confirm.": "Isso desfará as mudanças e finalizará o dicionário. Por favor, confirme.",
-  "pliz weit ;-)": "Por favor, aguarde...",
-  "One moment...": "Um momento..."
-}
diff --git a/web/imcms/xinha/plugins/SpellChecker/lang/ro.js b/web/imcms/xinha/plugins/SpellChecker/lang/ro.js
deleted file mode 100644
index 9a823a78ab..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/lang/ro.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// I18N constants
-// LANG: "ro", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-{
-  "Please confirm that you want to open this link": "Vă rog confirmaţi că vreţi să deschideţi acest link",
-  "Cancel": "Anulează",
-  "Dictionary": "Dicţionar",
-  "Finished list of mispelled words": "Am terminat lista de cuvinte greÅŸite",
-  "I will open it in a new page.": "O voi deschide într-o altă fereastră.",
-  "Ignore all": "Ignoră toate",
-  "Ignore": "Ignoră",
-  "No mispelled words found with the selected dictionary.": "Nu am găsit nici un cuvânt greşit cu acest dicţionar.",
-  "Spell check complete, didn't find any mispelled words.  Closing now...": "Am terminat, nu am detectat nici o greşeală.  Acum închid fereastra...",
-  "OK": "OK",
-  "Original word": "Cuvântul original",
-  "Please wait.  Calling spell checker.": "Vă rog aşteptaţi.  Apelez spell-checker-ul.",
-  "Please wait: changing dictionary to": "Vă rog aşteptaţi.  Schimb dicţionarul cu",
-  "This will drop changes and quit spell checker.  Please confirm.": "Doriţi să renunţaţi la modificări şi să închid spell-checker-ul?",
-  "Re-check": "Scanează",
-  "Replace all": "ÃŽnlocuieÅŸte toate",
-  "Replace with": "ÃŽnlocuieÅŸte cu",
-  "Replace": "ÃŽnlocuieÅŸte",
-  "Spell-check": "Detectează greşeli",
-  "Suggestions": "Sugestii",
-  "One moment...": "va rog ashteptatzi ;-)"
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/readme-tech.html b/web/imcms/xinha/plugins/SpellChecker/readme-tech.html
deleted file mode 100644
index 1afdf6d3f8..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/readme-tech.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
-<html>
-  <head>
-    <title>HTMLArea Spell Checker</title>
-  </head>
-
-  <body>
-    <h1>HTMLArea Spell Checker</h1>
-
-    <p>The HTMLArea Spell Checker subsystem consists of the following
-      files:</p>
-
-    <ul>
-
-      <li>spell-checker.js &mdash; the spell checker plugin interface for
-        HTMLArea</li>
-
-      <li>spell-checker-ui.html &mdash; the HTML code for the user
-        interface</li>
-
-      <li>spell-checker-ui.js &mdash; functionality of the user
-        interface</li>
-
-      <li>spell-checker-logic.cgi &mdash; Perl CGI script that checks a text
-        given through POST for spelling errors</li>
-
-      <li>spell-checker-style.css &mdash; style for mispelled words</li>
-
-      <li>lang/en.js &mdash; main language file (English).</li>
-
-    </ul>
-
-    <h2>Process overview</h2>
-
-    <p>
-      When an end-user clicks the "spell-check" button in the HTMLArea
-      editor, a new window is opened with the URL of "spell-check-ui.html".
-      This window initializes itself with the text found in the editor (uses
-      <tt>window.opener.SpellChecker.editor</tt> global variable) and it
-      submits the text to the server-side script "spell-check-logic.cgi".
-      The target of the FORM is an inline frame which is used both to
-      display the text and correcting.
-    </p>
-
-    <p>
-      Further, spell-check-logic.cgi calls Aspell for each portion of plain
-      text found in the given HTML.  It rebuilds an HTML file that contains
-      clear marks of which words are incorrect, along with suggestions for
-      each of them.  This file is then loaded in the inline frame.  Upon
-      loading, a JavaScript function from "spell-check-ui.js" is called.
-      This function will retrieve all mispelled words from the HTML of the
-      iframe and will setup the user interface so that it allows correction.
-    </p>
-
-    <h2>The server-side script (spell-check-logic.cgi)</h2>
-
-    <p>
-      <strong>Unicode safety</strong> &mdash; the program <em>is</em>
-      Unicode safe.  HTML entities are expanded into their corresponding
-      Unicode characters.  These characters will be matched as part of the
-      word passed to Aspell.  All texts passed to Aspell are in Unicode
-      (when appropriate).  <strike>However, Aspell seems to not support Unicode
-      yet (<a
-        href="http://mail.gnu.org/archive/html/aspell-user/2000-11/msg00007.html">thread concerning Aspell and Unicode</a>).
-      This mean that words containing Unicode
-      characters that are not in 0..255 are likely to be reported as "mispelled" by Aspell.</strike>
-    </p>
-
-    <p>
-      <strong style="font-variant: small-caps; color:
-      red;">Update:</strong> though I've never seen it mentioned
-      anywhere, it looks that Aspell <em>does</em>, in fact, speak
-      Unicode.  Or else, maybe <code>Text::Aspell</code> does
-      transparent conversion; anyway, this new version of our
-      SpellChecker plugin is, as tests show so far, fully
-      Unicode-safe... well, probably the <em>only</em> freeware
-      Web-based spell-checker which happens to have Unicode support.
-    </p>
-
-    <p>
-      The Perl Unicode manual (man perluniintro) states:
-    </p>
-
-    <blockquote>
-      <em>
-        Starting from Perl 5.6.0, Perl has had the capacity to handle Unicode
-        natively.  Perl 5.8.0, however, is the first recommended release for
-        serious Unicode work.  The maintenance release 5.6.1 fixed many of the
-        problems of the initial Unicode implementation, but for example regular
-        expressions still do not work with Unicode in 5.6.1.
-      </em>
-    </blockquote>
-
-    <p>In other words, do <em>not</em> assume that this script is
-      Unicode-safe on Perl interpreters older than 5.8.0.</p>
-
-    <p>The following Perl modules are required:</p>
-
-    <ul>
-      <li><a href="http://search.cpan.org/search?query=Text%3A%3AAspell&mode=all" target="_blank">Text::Aspell</a></li>
-      <li><a href="http://search.cpan.org/search?query=XML%3A%3ADOM&mode=all" target="_blank">XML::DOM</a></li>
-      <li><a href="http://search.cpan.org/search?query=CGI&mode=all" target="_blank">CGI</a></li>
-    </ul>
-
-    <p>Of these, only Text::Aspell might need to be installed manually.  The
-      others are likely to be available by default in most Perl distributions.</p>
-
-    <hr />
-    <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
-<!-- Created: Thu Jul 17 13:22:27 EEST 2003 -->
-<!-- hhmts start --> Last modified: Fri Jan 30 19:14:11 EET 2004 <!-- hhmts end -->
-<!-- doc-lang: English -->
-  </body>
-</html>
diff --git a/web/imcms/xinha/plugins/SpellChecker/spell-check-logic.cgi b/web/imcms/xinha/plugins/SpellChecker/spell-check-logic.cgi
deleted file mode 100755
index 3217375338..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/spell-check-logic.cgi
+++ /dev/null
@@ -1,210 +0,0 @@
-#! /usr/bin/perl -w
-
-# Spell Checker Plugin for HTMLArea-3.0
-# Sponsored by www.americanbible.org
-# Implementation by Mihai Bazon, http://dynarch.com/mishoo/
-#
-# (c) dynarch.com 2003.
-# Distributed under the same terms as HTMLArea itself.
-# This notice MUST stay intact for use (see license.txt).
-#
-# $Id: spell-check-logic.cgi 21 2005-02-19 05:23:56Z gogo $
-
-use strict;
-use utf8;
-use Encode;
-use Text::Aspell;
-use XML::DOM;
-use CGI;
-
-my $TIMER_start = undef;
-eval {
-    use Time::HiRes qw( gettimeofday tv_interval );
-    $TIMER_start = [gettimeofday()];
-};
-# use POSIX qw( locale_h );
-
-binmode STDIN, ':utf8';
-binmode STDOUT, ':utf8';
-
-my $debug = 0;
-
-my $speller = new Text::Aspell;
-my $cgi = new CGI;
-
-my $total_words = 0;
-my $total_mispelled = 0;
-my $total_suggestions = 0;
-my $total_words_suggested = 0;
-
-# FIXME: report a nice error...
-die "Can't create speller!" unless $speller;
-
-my $dict = $cgi->param('dictionary') || $cgi->cookie('dictionary') || 'en';
-
-# add configurable option for this
-$speller->set_option('lang', $dict);
-$speller->set_option('encoding', 'UTF-8');
-#setlocale(LC_CTYPE, $dict);
-
-# ultra, fast, normal, bad-spellers
-# bad-spellers seems to cause segmentation fault
-$speller->set_option('sug-mode', 'normal');
-
-my %suggested_words = ();
-keys %suggested_words = 128;
-
-my $file_content = decode('UTF-8', $cgi->param('content'));
-$file_content = parse_with_dom($file_content);
-
-my $ck_dictionary = $cgi->cookie(-name     => 'dictionary',
-                                 -value    => $dict,
-                                 -expires  => '+30d');
-
-print $cgi->header(-type    => 'text/html; charset: utf-8',
-                   -cookie  => $ck_dictionary);
-
-my $js_suggested_words = make_js_hash(\%suggested_words);
-my $js_spellcheck_info = make_js_hash_from_array
-  ([
-    [ 'Total words'           , $total_words ],
-    [ 'Mispelled words'       , $total_mispelled . ' in dictionary \"'.$dict.'\"' ],
-    [ 'Total suggestions'     , $total_suggestions ],
-    [ 'Total words suggested' , $total_words_suggested ],
-    [ 'Spell-checked in'      , defined $TIMER_start ? (tv_interval($TIMER_start) . ' seconds') : 'n/a' ]
-   ]);
-
-print qq^<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" media="all" href="spell-check-style.css" />
-<script type="text/javascript">
-  var suggested_words = { $js_suggested_words };
-  var spellcheck_info = { $js_spellcheck_info }; </script>
-</head>
-<body onload="window.parent.finishedSpellChecking();">^;
-
-print $file_content;
-if ($cgi->param('init') eq '1') {
-    my @dicts = $speller->dictionary_info();
-    my $dictionaries = '';
-    foreach my $i (@dicts) {
-        next if $i->{jargon};
-        my $name = $i->{name};
-        if ($name eq $dict) {
-            $name = '@'.$name;
-        }
-        $dictionaries .= ',' . $name;
-    }
-    $dictionaries =~ s/^,//;
-    print qq^<div id="HA-spellcheck-dictionaries">$dictionaries</div>^;
-}
-
-print '</body></html>';
-
-# Perl is beautiful.
-sub spellcheck {
-    my $node = shift;
-    my $doc = $node->getOwnerDocument;
-    my $check = sub {                 # called for each word in the text
-        # input is in UTF-8
-        my $word = shift;
-        my $already_suggested = defined $suggested_words{$word};
-        ++$total_words;
-        if (!$already_suggested && $speller->check($word)) {
-            return undef;
-        } else {
-            # we should have suggestions; give them back to browser in UTF-8
-            ++$total_mispelled;
-            if (!$already_suggested) {
-                # compute suggestions for this word
-                my @suggestions = $speller->suggest($word);
-                my $suggestions = decode($speller->get_option('encoding'), join(',', @suggestions));
-                $suggested_words{$word} = $suggestions;
-                ++$total_suggestions;
-                $total_words_suggested += scalar @suggestions;
-            }
-            # HA-spellcheck-error
-            my $err = $doc->createElement('span');
-            $err->setAttribute('class', 'HA-spellcheck-error');
-            my $tmp = $doc->createTextNode;
-            $tmp->setNodeValue($word);
-            $err->appendChild($tmp);
-            return $err;
-        }
-    };
-    while ($node->getNodeValue =~ /([\p{IsWord}']+)/) {
-        my $word = $1;
-        my $before = $`;
-        my $after = $';
-        my $df = &$check($word);
-        if (!$df) {
-            $before .= $word;
-        }
-        {
-            my $parent = $node->getParentNode;
-            my $n1 = $doc->createTextNode;
-            $n1->setNodeValue($before);
-            $parent->insertBefore($n1, $node);
-            $parent->insertBefore($df, $node) if $df;
-            $node->setNodeValue($after);
-        }
-    }
-};
-
-sub check_inner_text {
-    my $node = shift;
-    my $text = '';
-    for (my $i = $node->getFirstChild; defined $i; $i = $i->getNextSibling) {
-        if ($i->getNodeType == TEXT_NODE) {
-            spellcheck($i);
-        }
-    }
-};
-
-sub parse_with_dom {
-    my ($text) = @_;
-    $text = '<spellchecker>'.$text.'</spellchecker>';
-
-    my $parser = new XML::DOM::Parser;
-    if ($debug) {
-        open(FOO, '>:utf8', '/tmp/foo');
-        print FOO $text;
-        close FOO;
-    }
-    my $doc = $parser->parse($text);
-    my $nodes = $doc->getElementsByTagName('*');
-    my $n = $nodes->getLength;
-
-    for (my $i = 0; $i < $n; ++$i) {
-        my $node = $nodes->item($i);
-        if ($node->getNodeType == ELEMENT_NODE) {
-            check_inner_text($node);
-        }
-    }
-
-    my $ret = $doc->toString;
-    $ret =~ s{<spellchecker>(.*)</spellchecker>}{$1}sg;
-    return $ret;
-};
-
-sub make_js_hash {
-    my ($hash) = @_;
-    my $js_hash = '';
-    while (my ($key, $val) = each %$hash) {
-        $js_hash .= ',' if $js_hash;
-        $js_hash .= '"'.$key.'":"'.$val.'"';
-    }
-    return $js_hash;
-};
-
-sub make_js_hash_from_array {
-    my ($array) = @_;
-    my $js_hash = '';
-    foreach my $i (@$array) {
-        $js_hash .= ',' if $js_hash;
-        $js_hash .= '"'.$i->[0].'":"'.$i->[1].'"';
-    }
-    return $js_hash;
-};
diff --git a/web/imcms/xinha/plugins/SpellChecker/spell-check-logic.php b/web/imcms/xinha/plugins/SpellChecker/spell-check-logic.php
deleted file mode 100644
index e1e5e608d0..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/spell-check-logic.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-  $text = stripslashes($_POST['content']);
-
-  // Convert UTF-8 multi-bytes into decimal character entities.  This is because
-  // aspell isn't fully utf8-aware - ticket:120 raises the possibility 
-  // that this is not required (any more) and so you can turn it off
-  // with editor.config.SpellChecker.utf8_to_entities = false 
-  if(!isset($_REQUEST['utf8_to_entitis']) || $_REQUEST['utf8_to_entities'])
-  {
-    $text = preg_replace('/([\xC0-\xDF][\x80-\xBF])/e', "'&#' . utf8_ord('\$1') . ';'", $text);
-    $text = preg_replace('/([\xE0-\xEF][\x80-\xBF][\x80-\xBF])/e',             "'&#' . utf8_ord('\$1') . ';'",  $text);
-    $text = preg_replace('/([\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])/e', "'&#' . utf8_ord('\$1') . ';'",   $text);
-  }
-  
-  function utf8_ord($chr)
-  {
-    switch(strlen($chr))
-    {
-      case 1 :
-        return ord($chr);
-
-      case 2 :
-        $ord = ord($chr{1}) & 63;
-        $ord = $ord | ((ord($chr{0}) & 31) << 6);
-        return $ord;
-
-      case 3 :
-        $ord = ord($chr{2}) & 63;
-        $ord = $ord | ((ord($chr{1}) & 63) << 6);
-        $ord = $ord | ((ord($chr{0}) & 15) << 12);
-        return $ord;
-
-      case 4 :
-        $ord = ord($chr{3}) & 63;
-        $ord = $ord | ((ord($chr{2}) & 63) << 6);
-        $ord = $ord | ((ord($chr{1}) & 63) << 12);
-        $ord = $ord | ((ord($chr{0}) & 7)  << 18);
-        return $ord;
-
-      default :
-        trigger_error('Character not utf-8', E_USER_ERROR);
-    }
-  }
-
-  require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'aspell_setup.php');
-
-##############################################################################
-header('Content-Type: text/html; charset=utf-8');
-  echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" media="all" href="spell-check-style.css" />';
-
-// Lets define some values outside the condition below, in case we have an empty 
-// document.                                                                     
-$textarray = array();
-$varlines = '<script type="text/javascript">var suggested_words = { ';
-$infolines = 'var spellcheck_info = {';
-$counter = 0;
-$suggest_count = 0;
-
-if (trim($text) != "")
-{
-    if ($fd = fopen($temptext, 'w'))
-    {
-        $textarray = explode("\n", $text);
-        fwrite ($fd, "!\n");
-        foreach ($textarray as $key=>$value)
-        {
-            // adding the carat to each line prevents the use of aspell commands within the text...
-            fwrite($fd, "^$value\n");
-        }
-        fclose($fd);
-        chmod($temptext, 0777);
-        // next run aspell
-        $return = shell_exec($aspellcommand . ' 2>&1');
-        // echo $return;
-        unlink($temptext);
-        $returnarray = explode("\n", $return);
-        $returnlines = count($returnarray);
-//print_r(htmlentities($return));
-        $textlines = count($textarray);
-
-        $lineindex = -1;
-        $poscorrect = 0;
-        foreach ($returnarray as $key=>$value)
-        {
-            // if there is a correction here, processes it, else move the $textarray pointer to the next line
-            if (substr($value, 0, 1) == '&')
-            {
-               $counter=$counter+1;
-                $correction = explode(' ', $value);
-                $word = $correction[1];
-                $suggest_count += $correction[2];
-                $absposition = substr($correction[3], 0, -1) - 1;
-                $position = $absposition + $poscorrect;
-                $niceposition = $lineindex.','.$absposition;
-                $suggstart = strpos($value, ':') + 2;
-                $suggestions = substr($value, $suggstart);
-                $suggestionarray = explode(', ', $suggestions);
-
-                $beforeword = substr($textarray[$lineindex], 0, $position);
-                $afterword = substr($textarray[$lineindex], $position + strlen($word));
-                $textarray[$lineindex] = $beforeword.'<span class="HA-spellcheck-error">'.$word.'</span>'.$afterword;
-
-             $suggestion_list = '';
-                foreach ($suggestionarray as $key=>$value)
-                {
-                    $suggestion_list .= $value.',';
-                }
-                $suggestion_list = substr($suggestion_list, 0, strlen($suggestion_list) - 1);
-                $varlines .= '"'.$word.'":"'.$suggestion_list.'",';
-
-                $poscorrect = $poscorrect + 41;
-            }
-            elseif (substr($value, 0, 1) == '#')
-            {
-                $correction = explode(' ', $value);
-                $word = $correction[1];
-                $absposition = $correction[2] - 1;
-                $position = $absposition + $poscorrect;
-                $niceposition = $lineindex.','.$absposition;
-                $beforeword = substr($textarray[$lineindex], 0, $position);
-                $afterword = substr($textarray[$lineindex], $position + strlen($word));
-                $textarray[$lineindex] = $beforeword.$word.$afterword;
-                $textarray[$lineindex] = $beforeword.'<span class="HA-spellcheck-error">'.$word.'</span><span class="HA-spellcheck-suggestions">'.$word.'</span>'.$afterword;
-//                $poscorrect = $poscorrect;
-                $poscorrect = $poscorrect + 88 + strlen($word);
-            }
-            else
-            {
-                //print "Done with line $lineindex, next line...<br><br>";
-                $poscorrect = 0;
-                $lineindex = $lineindex + 1;
-            }
-         }
-     }
-     else
-     {
-       // This one isnt used for anything at the moment!
-       $return = 'failed to open!';
-     }
-} 
-else 
-{ 
-  $returnlines=0; 
-}
-$infolines .= '"Language Used":"'.$lang.'",';
-$infolines .= '"Mispelled words":"'.$counter.'",';
-$infolines .= '"Total words suggested":"'.$suggest_count.'",';
-$infolines .= '"Total Lines Checked":"'.$returnlines.'"';
-$infolines .= '};';
-$varlines = substr($varlines, 0, strlen($varlines) - 1);
-echo $varlines.'};'.$infolines.'</script>';
-
-echo '</head>
-<body onload="window.parent.finishedSpellChecking();">';
-
-foreach ($textarray as $key=>$value)
-{
-  echo $value;
-}
-
-$dictionaries = str_replace(chr(10),",", shell_exec($aspelldictionaries));
-if(ereg(",$",$dictionaries))
-  $dictionaries = ereg_replace(",$","",$dictionaries);
-echo '<div id="HA-spellcheck-dictionaries">'.$dictionaries.'</div>';
-
-echo '</body></html>';
-?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/spell-check-savedicts.php b/web/imcms/xinha/plugins/SpellChecker/spell-check-savedicts.php
deleted file mode 100644
index cb2d281567..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/spell-check-savedicts.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-  require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'aspell_setup.php');
-
-
-  $to_p_dict = $_REQUEST['to_p_dict'] ? $_REQUEST['to_p_dict'] : array();
-  $to_r_list = $_REQUEST['to_r_list'] ? $_REQUEST['to_r_list'] : array();
-print_r($to_r_list);
-  if($to_p_dict || $to_r_list)
-  {
-    if($fh = fopen($temptext, 'w'))
-    {
-      foreach($to_p_dict as $personal_word)
-      {
-        $cmd = '&' . $personal_word . "\n";
-        echo $cmd;
-        fwrite($fh, $cmd, strlen($cmd));
-      }
-
-      foreach($to_r_list as $replace_pair)
-      {
-        $cmd = '$$ra ' . $replace_pair[0] . ' , ' . $replace_pair[1] . "\n";
-        echo $cmd;
-        fwrite($fh, $cmd, strlen($cmd));
-      }
-      $cmd = "#\n";
-      echo $cmd;
-      fwrite($fh, $cmd, strlen($cmd));
-      fclose($fh);
-    }
-    else
-    {
-      die("Can't Write");
-    }
-    echo $aspellcommand."\n";
-    echo shell_exec($aspellcommand . ' 2>&1');
-    unlink($temptext);
-  }
-?>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/spell-check-style.css b/web/imcms/xinha/plugins/SpellChecker/spell-check-style.css
deleted file mode 100644
index 1408ba0626..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/spell-check-style.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.HA-spellcheck-error { border-bottom: 1px dashed #f00; cursor: default; }
-.HA-spellcheck-same { background-color: #cef; color: #000; }
-.HA-spellcheck-hover { background-color: #433; color: white; }
-.HA-spellcheck-fixed { border-bottom: 1px dashed #0b8; }
-.HA-spellcheck-current { background-color: #9be; color: #000; }
-.HA-spellcheck-suggestions { display: none; }
-
-#HA-spellcheck-dictionaries { display: none; }
-
-a:link, a:visited { color: #55e; }
diff --git a/web/imcms/xinha/plugins/SpellChecker/spell-check-ui.html b/web/imcms/xinha/plugins/SpellChecker/spell-check-ui.html
deleted file mode 100644
index 4454550375..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/spell-check-ui.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!--
-
-  Strangely, IE sucks with or without the DOCTYPE switch.
-  I thought it would only suck without it.
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-   Spell Checker Plugin for HTMLArea-3.0
-   Sponsored by www.americanbible.org
-   Implementation by Mihai Bazon, http://dynarch.com/mishoo/
-
-   (c) dynarch.com 2003.
-   Distributed under the same terms as HTMLArea itself.
-   This notice MUST stay intact for use (see license.txt).
-
-   $Id: spell-check-ui.html 859 2007-06-23 17:35:29Z ray $
-
--->
-<html>
-
-  <head>
-    <title>Spell Checker</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <script type="text/javascript" src="spell-check-ui.js"></script>
-
-    <style type="text/css">
-      html, body { height: 100%; margin: 0px; padding: 0px; background-color: #fff;
-      color: #000; }
-      a:link, a:visited { color: #00f; text-decoration: none; }
-      a:hover { color: #f00; text-decoration: underline; }
-
-      table { background-color: ButtonFace; color: ButtonText;
-      font-family: tahoma,verdana,sans-serif; font-size: 11px; }
-
-      iframe { background-color: #fff; color: #000; height: 100%; width: 100%; }
-
-      .controls { width: 13em; }
-      .controls .sectitle { /* background-color: #736c6c; color: #fff;
-      border-top: 1px solid #000; border-bottom: 1px solid #fff; */
-      text-align: center;
-      font-weight: bold; padding: 2px 4px; }
-      .controls .secbody { margin-bottom: 10px; }
-
-      button, select { font-family: tahoma,verdana,sans-serif; font-size: 11px; }
-      button { width: 6em; padding: 0px; }
-
-      input, select { font-family: fixed,"andale mono",monospace; }
-
-      #v_currentWord { color: #f00; font-weight: bold; }
-      #statusbar { padding: 7px 0px 0px 5px; }
-      #status { font-weight: bold; }
-    </style>
-
-  </head>
-
-  <body onload="initDocument()">
-
-    <form style="display: none;" action="spell-check-logic.cgi"
-          method="post" target="framecontent"
-          accept-charset="UTF-8"
-          ><input type="hidden" name="content" id="f_content"
-          /><input type="hidden" name="dictionary" id="f_dictionary"
-          /><input type="hidden" name="init" id="f_init" value="1"
-          /><input type="hidden" name="utf8_to_entities" id="utf8_to_entities" value="1"
-    /></form>
-
-    <table style="height: 100%; width: 100%; border-collapse: collapse;" cellspacing="0" cellpadding="0">
-      <tr>
-        <td colspan="2" style="height: 1em; padding: 2px;">
-          <div style="float: right; padding: 2px;"><span>Dictionary</span>
-            <select id="v_dictionaries" style="width: 10em"></select>
-            <button id="b_recheck">Re-check</button>
-          </div>
-          <span id="status">Please wait.  Calling spell checker.</span>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top" class="controls">
-          <div class="secbody" style="text-align: center">
-            <button id="b_info">Info</button>
-          </div>
-          <div class="sectitle">Original word</div>
-          <div class="secbody" id="v_currentWord" style="text-align:
-          center; margin-bottom: 0px;">pliz weit ;-)</div>
-          <div class="secbody" style="text-align: center">
-            <button id="b_revert">Revert</button>
-          </div>
-          <div class="sectitle">Replace with</div>
-          <div class="secbody">
-            <input type="text" id="v_replacement" style="width: 94%; margin-left: 3%;" /><br />
-            <div style="text-align: center; margin-top: 2px;">
-              <button id="b_replace">Replace</button><button
-                id="b_replall">Replace all</button><br /><button
-                id="b_ignore">Ignore</button><button
-                id="b_ignall">Ignore all</button>
-                <button
-                id="b_learn">Learn</button>
-            </div>
-          </div>
-          <div class="sectitle">Suggestions</div>
-          <div class="secbody">
-            <select size="11" style="width: 94%; margin-left: 3%;" id="v_suggestions"></select>
-          </div>
-        </td>
-
-        <td>
-          <iframe src="../../popups/blank.html" width="100%" height="100%"
-            id="i_framecontent" name="framecontent"></iframe>
-        </td>
-      </tr>
-      <tr>
-        <td style="height: 1em;" colspan="2">
-          <div style="padding: 4px 2px 2px 2px; float: right;">
-            <button id="b_ok">OK</button>
-            <button id="b_cancel">Cancel</button>
-          </div>
-          <div id="statusbar"></div>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-
-</html>
diff --git a/web/imcms/xinha/plugins/SpellChecker/spell-check-ui.js b/web/imcms/xinha/plugins/SpellChecker/spell-check-ui.js
deleted file mode 100644
index 9a87281f78..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/spell-check-ui.js
+++ /dev/null
@@ -1,454 +0,0 @@
-// Spell Checker Plugin for HTMLArea-3.0
-// Sponsored by www.americanbible.org
-// Implementation by Mihai Bazon, http://dynarch.com/mishoo/
-//
-// (c) dynarch.com 2003.
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-//
-// $Id: spell-check-ui.js 856 2007-06-13 18:34:34Z wymsy $
-
-// internationalization file was already loaded in parent ;-)
-var SpellChecker = window.opener.SpellChecker;
-
-var Xinha    = window.opener.Xinha;
-
-var _editor_url = window.opener._editor_url;
-
-var is_ie = Xinha.is_ie;
-var editor = SpellChecker.editor;
-var frame = null;
-var currentElement = null;
-var wrongWords = null;
-var modified = false;
-var allWords = {};
-var fixedWords = [];
-var suggested_words = {};
-
-var to_p_dict = []; // List of words to add to personal dictionary.
-var to_r_list = []; // List of words to add to replacement list.
-
-function _lc(string) {
-  return Xinha._lc(string, 'SpellChecker');
-}
-
-function makeCleanDoc(leaveFixed) {
-  // document.getElementById("status").innerHTML = 'Please wait: rendering valid HTML';
-  var words = wrongWords.concat(fixedWords);
-  for (var i = words.length; --i >= 0;) {
-    var el = words[i];
-    if (!(leaveFixed && /HA-spellcheck-fixed/.test(el.className))) {
-      if(el.firstChild)
-        el.parentNode.insertBefore(el.firstChild, el);
-      el.parentNode.removeChild(el);
-    } else
-      el.className = "HA-spellcheck-fixed";
-  }
-  // we should use innerHTML here, but IE6's implementation fucks up the
-  // HTML to such extent that our poor Perl parser doesn't understand it
-  // anymore.
-  return Xinha.getHTML(frame.contentWindow.document.body, true, editor);
-}
-
-function recheckClicked() {
-  document.getElementById("status").innerHTML = _lc("Please wait: changing dictionary to") + ': "' + document.getElementById("f_dictionary").value + '".';
-  var field = document.getElementById("f_content");
-  field.value = makeCleanDoc(true);
-  field.form.submit();
-}
-
-function saveClicked() {
-  if (modified) {
-    editor.setHTML(makeCleanDoc(false));
-  }
-
-  if(to_p_dict.length || to_r_list.length && editor.config.SpellChecker.backend == 'php')
-  {
-    var data = {};
-    for(var i = 0;i < to_p_dict.length;i++)
-    {
-      data['to_p_dict[' + i + ']'] = to_p_dict[i];
-    }
-    for(var i = 0;i < to_r_list.length;i++)
-    {
-      data['to_r_list[' + i + '][0]'] = to_r_list[i][0];
-      data['to_r_list[' + i + '][1]'] = to_r_list[i][1];
-    }
-    // var win = window;
-    window.opener.Xinha._postback(_editor_url + '/plugins/SpellChecker/spell-check-savedicts.php', data);
-    window.close();
-  }
-  else
-  {
-    window.close();
-  }
-  return false;
-}
-
-function cancelClicked() {
-  var ok = true;
-  if (modified) {
-    ok = confirm(_lc("This will drop changes and quit spell checker.  Please confirm."));
-  }
-  if (ok) {
-    window.close();
-  }
-  return false;
-}
-
-function replaceWord(el) {
-  var replacement = document.getElementById("v_replacement").value;
-  var this_word_modified = (el.innerHTML != replacement);
-  if (this_word_modified)
-    modified = true;
-  if (el) {
-    el.className = el.className.replace(/\s*HA-spellcheck-(hover|fixed)\s*/g, " ");
-  }
-  el.className += " HA-spellcheck-fixed";
-  el.__msh_fixed = true;
-  if (!this_word_modified) {
-    return false;
-  }
-  to_r_list.push([el.innerHTML, replacement]);
-  el.innerHTML = replacement;
-}
-
-function replaceClicked() {
-  replaceWord(currentElement);
-  var start = currentElement.__msh_id;
-  var index = start;
-  do {
-    ++index;
-    if (index == wrongWords.length) {
-      index = 0;
-    }
-  } while ((index != start) && wrongWords[index].__msh_fixed);
-  if (index == start) {
-    index = 0;
-    alert(_lc("Finished list of mispelled words"));
-  }
-  wrongWords[index].__msh_wordClicked(true);
-  return false;
-}
-
-function revertClicked() {
-  document.getElementById("v_replacement").value = currentElement.__msh_origWord;
-  replaceWord(currentElement);
-  currentElement.className = "HA-spellcheck-error HA-spellcheck-current";
-  return false;
-}
-
-function replaceAllClicked() {
-  var replacement = document.getElementById("v_replacement").value;
-  var ok = true;
-  var spans = allWords[currentElement.__msh_origWord];
-  if (spans.length == 0) {
-    alert("An impossible condition just happened.  Call FBI.  ;-)");
-  } else if (spans.length == 1) {
-    replaceClicked();
-    return false;
-  }
-  /*
-  var message = "The word \"" + currentElement.__msh_origWord + "\" occurs " + spans.length + " times.\n";
-  if (replacement == currentElement.__msh_origWord) {
-    ok = confirm(message + "Ignore all occurrences?");
-  } else {
-    ok = confirm(message + "Replace all occurrences with \"" + replacement + "\"?");
-  }
-  */
-  if (ok) {
-    for (var i = 0; i < spans.length; ++i) {
-      if (spans[i] != currentElement) {
-        replaceWord(spans[i]);
-      }
-    }
-    // replace current element the last, so that we jump to the next word ;-)
-    replaceClicked();
-  }
-  return false;
-}
-
-function ignoreClicked() {
-  document.getElementById("v_replacement").value = currentElement.__msh_origWord;
-  replaceClicked();
-  return false;
-}
-
-function ignoreAllClicked() {
-  document.getElementById("v_replacement").value = currentElement.__msh_origWord;
-  replaceAllClicked();
-  return false;
-}
-
-function learnClicked() {
-  to_p_dict.push(currentElement.__msh_origWord);
-  return ignoreAllClicked();
-}
-
-function internationalizeWindow() {
-  var types = ["div", "span", "button"];
-  for (var i = 0; i < types.length; ++i) {
-    var tag = types[i];
-    var els = document.getElementsByTagName(tag);
-    for (var j = els.length; --j >= 0;) {
-      var el = els[j];
-      if (el.childNodes.length == 1 && /\S/.test(el.innerHTML)) {
-        var txt = el.innerHTML;
-        el.innerHTML = _lc(txt);
-      }
-    }
-  }
-}
-
-function initDocument() {
-  internationalizeWindow();
-  modified = false;
-  frame = document.getElementById("i_framecontent");
-  var field = document.getElementById("f_content");
-  field.value = Xinha.getHTML(editor._doc.body, false, editor);
-  var dict = document.getElementById("f_dictionary");
-  if(typeof editor.config.SpellChecker.defaultDictionary != "undefined"
-     && editor.config.SpellChecker.defaultDictionary != "") {
-    dict.value = editor.config.SpellChecker.defaultDictionary;
-  } else {
-    dict.value = "en_GB";
-  }
-  if(editor.config.SpellChecker.backend == 'php')
-  {
-    field.form.action = _editor_url + '/plugins/SpellChecker/spell-check-logic.php';
-  }
-  if(editor.config.SpellChecker.utf8_to_entities)
-  {
-    document.getElementById('utf8_to_entities').value = 1;
-  }
-  else
-  {
-    document.getElementById('utf8_to_entities').value = 0;
-  }
-  field.form.submit();
-  document.getElementById("f_init").value = "0";
-
-  // assign some global event handlers
-
-  var select = document.getElementById("v_suggestions");
-  select.onchange = function() {
-    document.getElementById("v_replacement").value = this.value;
-  };
-  if (is_ie) {
-    select.attachEvent("ondblclick", replaceClicked);
-  } else {
-    select.addEventListener("dblclick", replaceClicked, true);
-  }
-
-  document.getElementById("b_replace").onclick = replaceClicked;
-  if(editor.config.SpellChecker.backend == 'php')
-  {
-    document.getElementById("b_learn").onclick = learnClicked;
-  }
-  else
-  {
-    document.getElementById("b_learn").parentNode.removeChild(document.getElementById("b_learn"));
-  }
-  document.getElementById("b_replall").onclick = replaceAllClicked;
-  document.getElementById("b_ignore").onclick = ignoreClicked;
-  document.getElementById("b_ignall").onclick = ignoreAllClicked;
-  document.getElementById("b_recheck").onclick = recheckClicked;
-  document.getElementById("b_revert").onclick = revertClicked;
-  document.getElementById("b_info").onclick = displayInfo;
-
-  document.getElementById("b_ok").onclick = saveClicked;
-  document.getElementById("b_cancel").onclick = cancelClicked;
-
-  select = document.getElementById("v_dictionaries");
-  select.onchange = function() {
-    document.getElementById("f_dictionary").value = this.value;
-  };
-}
-
-function getAbsolutePos(el) {
-  var r = { x: el.offsetLeft, y: el.offsetTop };
-  if (el.offsetParent) {
-    var tmp = getAbsolutePos(el.offsetParent);
-    r.x += tmp.x;
-    r.y += tmp.y;
-  }
-  return r;
-}
-
-function wordClicked(scroll) {
-  var self = this;
-  if (scroll) (function() {
-    var pos = getAbsolutePos(self);
-    var ws = { x: frame.offsetWidth - 4,
-         y: frame.offsetHeight - 4 };
-    var wp = { x: frame.contentWindow.document.body.scrollLeft,
-         y: frame.contentWindow.document.body.scrollTop };
-    pos.x -= Math.round(ws.x/2);
-    if (pos.x < 0) pos.x = 0;
-    pos.y -= Math.round(ws.y/2);
-    if (pos.y < 0) pos.y = 0;
-    frame.contentWindow.scrollTo(pos.x, pos.y);
-  })();
-  if (currentElement) {
-    var a = allWords[currentElement.__msh_origWord];
-    currentElement.className = currentElement.className.replace(/\s*HA-spellcheck-current\s*/g, " ");
-    for (var i = 0; i < a.length; ++i) {
-      var el = a[i];
-      if (el != currentElement) {
-        el.className = el.className.replace(/\s*HA-spellcheck-same\s*/g, " ");
-      }
-    }
-  }
-  currentElement = this;
-  this.className += " HA-spellcheck-current";
-  var a = allWords[currentElement.__msh_origWord];
-  for (var i = 0; i < a.length; ++i) {
-    var el = a[i];
-    if (el != currentElement) {
-      el.className += " HA-spellcheck-same";
-    }
-  }
-  // document.getElementById("b_replall").disabled = (a.length <= 1);
-  // document.getElementById("b_ignall").disabled = (a.length <= 1);
-  var txt;
-  if (a.length == 1) {
-    txt = "one occurrence";
-  } else if (a.length == 2) {
-    txt = "two occurrences";
-  } else {
-    txt = a.length + " occurrences";
-  }
-  var suggestions = suggested_words[this.__msh_origWord];
-  if (suggestions)
-    suggestions = suggestions.split(/,/);
-  else
-    suggestions = [];
-  var select = document.getElementById("v_suggestions");
-  document.getElementById("statusbar").innerHTML = "Found " + txt +
-    ' for word "<b>' + currentElement.__msh_origWord + '</b>"';
-  for (var i = select.length; --i >= 0;) {
-    select.remove(i);
-  }
-  for (var i = 0; i < suggestions.length; ++i) {
-    var txt = suggestions[i];
-    var option = document.createElement("option");
-    option.value = txt;
-    option.appendChild(document.createTextNode(txt));
-    select.appendChild(option);
-  }
-  document.getElementById("v_currentWord").innerHTML = this.__msh_origWord;
-  if (suggestions.length > 0) {
-    select.selectedIndex = 0;
-    select.onchange();
-  } else {
-    document.getElementById("v_replacement").value = this.innerHTML;
-  }
-  select.style.display = "none";
-  select.style.display = "block";
-  return false;
-}
-
-function wordMouseOver() {
-  this.className += " HA-spellcheck-hover";
-}
-
-function wordMouseOut() {
-  this.className = this.className.replace(/\s*HA-spellcheck-hover\s*/g, " ");
-}
-
-function displayInfo() {
-  var info = frame.contentWindow.spellcheck_info;
-  if (!info)
-    alert("No information available");
-  else {
-    var txt = "** Document information **";
-    for (var i in info) {
-      txt += "\n" + i + " : " + info[i];
-    }
-    alert(txt);
-  }
-  return false;
-}
-
-function finishedSpellChecking() {
-  // initialization of global variables
-  currentElement = null;
-  wrongWords = null;
-  allWords = {};
-  fixedWords = [];
-  suggested_words = frame.contentWindow.suggested_words;
-
-  document.getElementById("status").innerHTML = "Xinha Spell Checker (<a href='readme-tech.html' target='_blank' title='Technical information'>info</a>)";
-  var doc = frame.contentWindow.document;
-        var spans = doc.getElementsByTagName("span");
-        var sps = [];
-  var id = 0;
-        for (var i = 0; i < spans.length; ++i) {
-                var el = spans[i];
-                if (/HA-spellcheck-error/.test(el.className)) {
-                        sps.push(el);
-      el.__msh_wordClicked = wordClicked;
-      el.onclick = function(ev) {
-        ev || (ev = window.event);
-        ev && Xinha._stopEvent(ev);
-        return this.__msh_wordClicked(false);
-      };
-      el.onmouseover = wordMouseOver;
-      el.onmouseout = wordMouseOut;
-      el.__msh_id = id++;
-      var txt = (el.__msh_origWord = el.firstChild.data);
-      el.__msh_fixed = false;
-      if (typeof allWords[txt] == "undefined") {
-        allWords[txt] = [el];
-      } else {
-        allWords[txt].push(el);
-      }
-                } else if (/HA-spellcheck-fixed/.test(el.className)) {
-      fixedWords.push(el);
-    }
-        }
-        
-  var dicts = doc.getElementById("HA-spellcheck-dictionaries");
-  if (dicts) {
-    dicts.parentNode.removeChild(dicts);
-    dicts = dicts.innerHTML.split(/,/);
-    var select = document.getElementById("v_dictionaries");
-    for (var i = select.length; --i >= 0;) {
-      select.remove(i);
-    }
-    var activeDictionary = document.getElementById("f_dictionary").value;
-    for (var i = 0; i < dicts.length; ++i) {
-      var txt = dicts[i];
-      var option = document.createElement("option");
-      if(txt == activeDictionary) {
-        option.selected = true;
-      }
-      option.value = txt;
-      option.appendChild(document.createTextNode(txt));
-      select.appendChild(option);
-    }
-  }
-        
-  wrongWords = sps;
-  if (sps.length == 0) {
-    if (!modified) {
-      alert(_lc("No mispelled words found with the selected dictionary."));
-      // window.close();
-    } else {
-      alert(_lc("No mispelled words found with the selected dictionary."));
-    }
-    return false;
-  }
-  (currentElement = sps[0]).__msh_wordClicked(true);
-  var as = doc.getElementsByTagName("a");
-  for (var i = as.length; --i >= 0;) {
-    var a = as[i];
-    a.onclick = function() {
-      if (confirm(_lc("Please confirm that you want to open this link") + ":\n" +
-            this.href + "\n" + _lc("I will open it in a new page."))) {
-        window.open(this.href);
-      }
-      return false;
-    };
-  }  
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SpellChecker/spell-checker.js b/web/imcms/xinha/plugins/SpellChecker/spell-checker.js
deleted file mode 100644
index 9992a2e5be..0000000000
--- a/web/imcms/xinha/plugins/SpellChecker/spell-checker.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Spell Checker Plugin for HTMLArea-3.0
-// Sponsored by www.americanbible.org
-// Implementation by Mihai Bazon, http://dynarch.com/mishoo/
-//
-// (c) dynarch.com 2003.
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-//
-// $Id: spell-checker.js 856 2007-06-13 18:34:34Z wymsy $
-
-Xinha.Config.prototype.SpellChecker = { 'backend': 'php', 'personalFilesDir' : '', 'defaultDictionary' : 'en_GB', 'utf8_to_entities' : true };
-
-function SpellChecker(editor) {
-  this.editor = editor;
-
-  var cfg = editor.config;
-  var bl = SpellChecker.btnList;
-  var self = this;
-
-  // see if we can find the mode switch button, insert this before that
-  var id = "SC-spell-check";
-  cfg.registerButton(id, this._lc("Spell-check"), editor.imgURL("spell-check.gif", "SpellChecker"), false,
-             function(editor, id) {
-               // dispatch button press event
-               self.buttonPress(editor, id);
-             });
-
-  cfg.addToolbarElement("SC-spell-check", "htmlmode", 1);
-}
-
-SpellChecker._pluginInfo = {
-  name          : "SpellChecker",
-  version       : "1.0",
-  developer     : "Mihai Bazon",
-  developer_url : "http://dynarch.com/mishoo/",
-  c_owner       : "Mihai Bazon",
-  sponsor       : "American Bible Society",
-  sponsor_url   : "http://www.americanbible.org",
-  license       : "htmlArea"
-};
-
-SpellChecker.prototype._lc = function(string) {
-    return Xinha._lc(string, 'SpellChecker');
-};
-
-SpellChecker.btnList = [
-  null, // separator
-  ["spell-check"]
-  ];
-
-SpellChecker.prototype.buttonPress = function(editor, id) {
-  switch (id) {
-      case "SC-spell-check":
-    SpellChecker.editor = editor;
-    SpellChecker.init = true;
-    var uiurl = _editor_url + "plugins/SpellChecker/spell-check-ui.html";
-    var win;
-    if (Xinha.is_ie) {
-      win = window.open(uiurl, "SC_spell_checker",
-            "toolbar=no,location=no,directories=no,status=no,menubar=no," +
-            "scrollbars=no,resizable=yes,width=600,height=450");
-    } else {
-      win = window.open(uiurl, "SC_spell_checker",
-            "toolbar=no,menubar=no,personalbar=no,width=600,height=450," +
-            "scrollbars=no,resizable=yes");
-    }
-    win.focus();
-    break;
-  }
-};
-
-// this needs to be global, it's accessed from spell-check-ui.html
-SpellChecker.editor = null;
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Stylist/lang/de.js b/web/imcms/xinha/plugins/Stylist/lang/de.js
deleted file mode 100644
index b70497d24e..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/de.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-{
-  "Styles": "Stile"
-};
diff --git a/web/imcms/xinha/plugins/Stylist/lang/fr.js b/web/imcms/xinha/plugins/Stylist/lang/fr.js
deleted file mode 100644
index a09f734395..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/fr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Styles": "Styles"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Stylist/lang/ja.js b/web/imcms/xinha/plugins/Stylist/lang/ja.js
deleted file mode 100644
index 2e455d5fbc..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/ja.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Styles": "スタイル"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Stylist/lang/nb.js b/web/imcms/xinha/plugins/Stylist/lang/nb.js
deleted file mode 100644
index a5b899bf8c..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/nb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Styles": "Stiler"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Stylist/lang/nl.js b/web/imcms/xinha/plugins/Stylist/lang/nl.js
deleted file mode 100644
index 40b6321aa3..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/nl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Styles": "Style"
-};
diff --git a/web/imcms/xinha/plugins/Stylist/lang/no.js b/web/imcms/xinha/plugins/Stylist/lang/no.js
deleted file mode 100644
index 9ef039fb42..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/no.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Styles": "Stiler"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Stylist/lang/pl.js b/web/imcms/xinha/plugins/Stylist/lang/pl.js
deleted file mode 100644
index 8f17f08b18..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/pl.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz koto@webworkers.pl
-{
-  "Styles": "Style"
-};
diff --git a/web/imcms/xinha/plugins/Stylist/lang/pt_br.js b/web/imcms/xinha/plugins/Stylist/lang/pt_br.js
deleted file mode 100644
index 3aeee0b769..0000000000
--- a/web/imcms/xinha/plugins/Stylist/lang/pt_br.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Styles": "Estilos"
-};
diff --git a/web/imcms/xinha/plugins/Stylist/stylist.js b/web/imcms/xinha/plugins/Stylist/stylist.js
deleted file mode 100644
index e9f625baac..0000000000
--- a/web/imcms/xinha/plugins/Stylist/stylist.js
+++ /dev/null
@@ -1,606 +0,0 @@
-/**
- * Add an empty css_style to Config object's prototype
- *  the format is { '.className' : 'Description' }
- */
-
-Xinha.Config.prototype.css_style = { };
-
-/**
- * This method loads an external stylesheet and uses it in the stylist
- */
-Xinha.Config.prototype.stylistLoadStylesheet = function(url, altnames)
-{
-  if(!altnames) altnames = { };
-  var newStyles = Xinha.ripStylesFromCSSFile(url);
-  for(var i in newStyles)
-  {
-    if(altnames[i])
-    {
-      this.css_style[i] = altnames[i];
-    }
-    else
-    {
-      this.css_style[i] = newStyles[i];
-    }
-  }
-  this.pageStyleSheets[this.pageStyleSheets.length] = url;
-};
-
-/**
- * This method takes raw style definitions and uses them in the stylist
- */
-Xinha.Config.prototype.stylistLoadStyles = function(styles, altnames)
-{
-  if(!altnames) altnames = { };
-  var newStyles = Xinha.ripStylesFromCSSString(styles);
-  for(var i in newStyles)
-  {
-    if(altnames[i])
-    {
-      this.css_style[i] = altnames[i];
-    }
-    else
-    {
-      this.css_style[i] = newStyles[i];
-    }
-  }
-  this.pageStyle += styles;
-};
-
-
-
-/**
- * Fill the stylist panel with styles that may be applied to the current selection.  Styles
- * are supplied in the css_style property of the Xinha.Config object, which is in the format
- * { '.className' : 'Description' }
- * classes that are defined on a specific tag (eg 'a.email_link') are only shown in the panel
- *    when an element of that type is selected.
- * classes that are defined with selectors/psuedoclasses (eg 'a.email_link:hover') are never
- *    shown (if you have an 'a.email_link' without the pseudoclass it will be shown of course)
- * multiple classes (eg 'a.email_link.staff_member') are shown as a single class, and applied
- *    to the element as multiple classes (class="email_link staff_member")
- * you may click a class name in the stylist panel to add it, and click again to remove it
- * you may add multiple classes to any element
- * spans will be added where no single _and_entire_ element is selected
- */
-Xinha.prototype._fillStylist = function()
-{
-  if(!this._stylist) return false;
-  this.plugins.Stylist.instance.main.innerHTML = '';
-
-  var may_apply = true;
-  var sel       = this._getSelection();
-
-  // What is applied
-  // var applied = this._getAncestorsClassNames(this._getSelection());
-
-  // Get an active element
-  var active_elem = this._activeElement(sel);
-
-  for(var x in this.config.css_style)
-  {
-    var tag   = null;
-    var className = x.trim();
-    var applicable = true;
-    var apply_to   = active_elem;
-
-    if(applicable && /[^a-zA-Z0-9_.-]/.test(className))
-    {
-      applicable = false; // Only basic classes are accepted, no selectors, etc.. presumed
-                          // that if you have a.foo:visited you'll also have a.foo
-      // alert('complex');
-    }
-
-    if(className.indexOf('.') < 0)
-    {
-      // No class name, just redefines a tag
-      applicable = false;
-    }
-
-    if(applicable && (className.indexOf('.') > 0))
-    {
-      // requires specific html tag
-      tag = className.substring(0, className.indexOf('.')).toLowerCase();
-      className = className.substring(className.indexOf('.'), className.length);
-
-      // To apply we must have an ancestor tag that is the right type
-      if(active_elem != null && active_elem.tagName.toLowerCase() == tag)
-      {
-        applicable = true;
-        apply_to = active_elem;
-      }
-      else
-      {
-        if(this._getFirstAncestor(this._getSelection(), [tag]) != null)
-        {
-          applicable = true;
-          apply_to = this._getFirstAncestor(this._getSelection(), [tag]);
-        }
-        else
-        {
-          // alert (this._getFirstAncestor(this._getSelection(), tag));
-          // If we don't have an ancestor, but it's a div/span/p/hx stle, we can make one
-          if(( tag == 'div' || tag == 'span' || tag == 'p'
-              || (tag.substr(0,1) == 'h' && tag.length == 2 && tag != 'hr')))
-          {
-            if(!this._selectionEmpty(this._getSelection()))
-            {
-              applicable = true;
-              apply_to = 'new';
-            }
-            else
-            {
-              // See if we can get a paragraph or header that can be converted
-              apply_to = this._getFirstAncestor(sel, ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7']);
-              if(apply_to != null)
-              {
-                applicable = true;
-              }
-              else
-              {
-                applicable = false;
-              }
-            }
-          }
-          else
-          {
-            applicable = false;
-          }
-        }
-      }
-    }
-
-    if(applicable)
-    {
-      // Remove the first .
-      className = className.substring(className.indexOf('.'), className.length);
-
-      // Replace any futher ones with spaces (for multiple class definitions)
-      className = className.replace('.', ' ');
-
-      if(apply_to == null)
-      {
-        if(this._selectionEmpty(this._getSelection()))
-        {
-          // Get the previous element and apply to that
-          apply_to = this._getFirstAncestor(this._getSelection(), null);
-        }
-        else
-        {
-          apply_to = 'new';
-          tag      = 'span';
-        }
-      }
-    }
-
-    var applied    = (this._ancestorsWithClasses(sel, tag, className).length > 0 ? true : false);
-    var applied_to = this._ancestorsWithClasses(sel, tag, className);
-
-    if(applicable)
-    {
-      var anch = document.createElement('a');
-      anch._stylist_className = className.trim();
-      anch._stylist_applied   = applied;
-      anch._stylist_appliedTo = applied_to;
-      anch._stylist_applyTo = apply_to;
-      anch._stylist_applyTag = tag;
-
-      anch.innerHTML = this.config.css_style[x];
-      anch.href = 'javascript:void(0)';
-      var editor = this;
-      anch.onclick = function()
-      {
-        if(this._stylist_applied == true)
-        {
-          editor._stylistRemoveClasses(this._stylist_className, this._stylist_appliedTo);
-        }
-        else
-        {
-          editor._stylistAddClasses(this._stylist_applyTo, this._stylist_applyTag, this._stylist_className);
-        }
-        return false;
-      }
-
-      anch.style.display = 'block';
-      anch.style.paddingLeft = '3px';
-      anch.style.paddingTop = '1px';
-      anch.style.paddingBottom = '1px';
-      anch.style.textDecoration = 'none';
-
-      if(applied)
-      {
-        anch.style.background = 'Highlight';
-        anch.style.color = 'HighlightText';
-      }
-
-      this.plugins.Stylist.instance.main.appendChild(anch);
-    }
-  }
-};
-
-
-/**
- * Add the given classes (space seperated list) to the currently selected element
- * (will add a span if none selected)
- */
-Xinha.prototype._stylistAddClasses = function(el, tag, classes)
-  {
-    if(el == 'new')
-    {
-      this.insertHTML('<' + tag + ' class="' + classes + '">' + this.getSelectedHTML() + '</' + tag + '>');
-    }
-    else
-    {
-      if(tag != null && el.tagName.toLowerCase() != tag)
-      {
-        // Have to change the tag!
-        var new_el = this.switchElementTag(el, tag);
-
-        if(typeof el._stylist_usedToBe != 'undefined')
-        {
-          new_el._stylist_usedToBe = el._stylist_usedToBe;
-          new_el._stylist_usedToBe[new_el._stylist_usedToBe.length] = {'tagName' : el.tagName, 'className' : el.getAttribute('class')};
-        }
-        else
-        {
-          new_el._stylist_usedToBe = [{'tagName' : el.tagName, 'className' : el.getAttribute('class')}];
-        }
-
-        Xinha.addClasses(new_el, classes);
-      }
-      else
-      {
-        Xinha._addClasses(el, classes);
-      }
-    }
-    this.focusEditor();
-    this.updateToolbar();
-  };
-
-/**
- * Remove the given classes (space seperated list) from the given elements (array of elements)
- */
-Xinha.prototype._stylistRemoveClasses = function(classes, from)
-  {
-    for(var x = 0; x < from.length; x++)
-    {
-      this._stylistRemoveClassesFull(from[x], classes);
-    }
-    this.focusEditor();
-    this.updateToolbar();
-  };
-
-Xinha.prototype._stylistRemoveClassesFull = function(el, classes)
-{
-  if(el != null)
-  {
-    var thiers = el.className.trim().split(' ');
-    var new_thiers = [ ];
-    var ours   = classes.split(' ');
-    for(var x = 0; x < thiers.length; x++)
-    {
-      var exists = false;
-      for(var i = 0; exists == false && i < ours.length; i++)
-      {
-        if(ours[i] == thiers[x])
-        {
-          exists = true;
-        }
-      }
-      if(exists == false)
-      {
-        new_thiers[new_thiers.length] = thiers[x];
-      }
-    }
-
-    if(new_thiers.length == 0 && el._stylist_usedToBe && el._stylist_usedToBe.length > 0 && el._stylist_usedToBe[el._stylist_usedToBe.length - 1].className != null)
-    {
-      // Revert back to what we were IF the classes are identical
-      var last_el = el._stylist_usedToBe[el._stylist_usedToBe.length - 1];
-      var last_classes = Xinha.arrayFilter(last_el.className.trim().split(' '), function(c) { if (c == null || c.trim() == '') { return false;} return true; });
-
-      if(
-        (new_thiers.length == 0)
-        ||
-        (
-        Xinha.arrayContainsArray(new_thiers, last_classes)
-        && Xinha.arrayContainsArray(last_classes, new_thiers)
-        )
-      )
-      {
-        el = this.switchElementTag(el, last_el.tagName);
-        new_thiers = last_classes;
-      }
-      else
-      {
-        // We can't rely on the remembered tags any more
-        el._stylist_usedToBe = [ ];
-      }
-    }
-
-    if(     new_thiers.length > 0
-        ||  el.tagName.toLowerCase() != 'span'
-        || (el.id && el.id != '')
-      )
-    {
-      el.className = new_thiers.join(' ').trim();
-    }
-    else
-    {
-      // Must be a span with no classes and no id, so we can splice it out
-      var prnt = el.parentNode;
-      var childs = el.childNodes;
-      for(var x = 0; x < childs.length; x++)
-      {
-        prnt.insertBefore(childs[x], el);
-      }
-      prnt.removeChild(el);
-    }
-  }
-};
-
-/**
- * Change the tag of an element
- */
-Xinha.prototype.switchElementTag = function(el, tag)
-{
-  var prnt = el.parentNode;
-  var new_el = this._doc.createElement(tag);
-
-  if(Xinha.is_ie || el.hasAttribute('id'))    new_el.setAttribute('id', el.getAttribute('id'));
-  if(Xinha.is_ie || el.hasAttribute('style')) new_el.setAttribute('style', el.getAttribute('style'));
-
-  var childs = el.childNodes;
-  for(var x = 0; x < childs.length; x++)
-  {
-    new_el.appendChild(childs[x].cloneNode(true));
-  }
-
-  prnt.insertBefore(new_el, el);
-  new_el._stylist_usedToBe = [el.tagName];
-  prnt.removeChild(el);
-  this.selectNodeContents(new_el);
-  return new_el;
-};
-
-Xinha.prototype._getAncestorsClassNames = function(sel)
-{
-  // Scan upwards to find a block level element that we can change or apply to
-  var prnt = this._activeElement(sel);
-  if(prnt == null)
-  {
-    prnt = (Xinha.is_ie ? this._createRange(sel).parentElement() : this._createRange(sel).commonAncestorContainer);
-  }
-
-  var classNames = [ ];
-  while(prnt)
-  {
-    if(prnt.nodeType == 1)
-    {
-      var classes = prnt.className.trim().split(' ');
-      for(var x = 0; x < classes.length; x++)
-      {
-        classNames[classNames.length] = classes[x];
-      }
-
-      if(prnt.tagName.toLowerCase() == 'body') break;
-      if(prnt.tagName.toLowerCase() == 'table'  ) break;
-    }
-      prnt = prnt.parentNode;
-  }
-
-  return classNames;
-};
-
-Xinha.prototype._ancestorsWithClasses = function(sel, tag, classes)
-{
-  var ancestors = [ ];
-  var prnt = this._activeElement(sel);
-  if(prnt == null)
-  {
-    try
-    {
-      prnt = (Xinha.is_ie ? this._createRange(sel).parentElement() : this._createRange(sel).commonAncestorContainer);
-    }
-    catch(e)
-    {
-      return ancestors;
-    }
-  }
-  var search_classes = classes.trim().split(' ');
-
-  while(prnt)
-  {
-    if(prnt.nodeType == 1 && prnt.className)
-    {
-      if(tag == null || prnt.tagName.toLowerCase() == tag)
-      {
-        var classes = prnt.className.trim().split(' ');
-        var found_all = true;
-        for(var i = 0; i < search_classes.length; i++)
-        {
-          var found_class = false;
-          for(var x = 0; x < classes.length; x++)
-          {
-            if(search_classes[i] == classes[x])
-            {
-              found_class = true;
-              break;
-            }
-          }
-
-          if(!found_class)
-          {
-            found_all = false;
-            break;
-          }
-        }
-
-        if(found_all) ancestors[ancestors.length] = prnt;
-      }
-      if(prnt.tagName.toLowerCase() == 'body')    break;
-      if(prnt.tagName.toLowerCase() == 'table'  ) break;
-    }
-    prnt = prnt.parentNode;
-  }
-
-  return ancestors;
-};
-
-
-Xinha.ripStylesFromCSSFile = function(URL)
-{
-  var css = Xinha._geturlcontent(URL);
-  return Xinha.ripStylesFromCSSString(css);
-};
-
-Xinha.ripStylesFromCSSString = function(css)
-{
-  // We are only interested in the selectors, the rules are not important
-  //  so we'll drop out all coments and rules
-  RE_comment = /\/\*(.|\r|\n)*?\*\//g;
-  RE_rule    = /\{(.|\r|\n)*?\}/g;
-  css = css.replace(RE_comment, '');
-  css = css.replace(RE_rule, ',');
-
-  // And split on commas
-  css = css.split(',');
-
-  // And add those into our structure
-  var selectors = { };
-  for(var x = 0; x < css.length; x++)
-  {
-    if(css[x].trim())
-    {
-      selectors[css[x].trim()] = css[x].trim();
-    }
-  }
-
-
-  return selectors;
-};
-
-// Make our right side panel and insert appropriatly
-function Stylist(editor, args)
-{
-  this.editor = editor;
- 
-  var stylist = this;
-
-}
-
-Stylist._pluginInfo =
-{
-  name     : "Stylist",
-  version  : "1.0",
-  developer: "James Sleeman",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "HTMLArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-Stylist.prototype.onGenerateOnce = function()
-{
-  var editor = this.editor;
-  var stylist = this;
-  if(typeof editor.config.css_style != 'undefined' && Xinha.objectProperties(editor.config.css_style).length != 0)
-  {
-    editor._stylist = null; // This needs to be changes to be Stylist::_stylist sometime
-    editor._stylist = editor.addPanel('right');
-    Xinha.addClass(editor._stylist, 'stylist');
-
-    this.caption = document.createElement("h1");
-    this.caption.innerHTML = Xinha._lc('Styles', 'Stylist');
-    editor._stylist.appendChild(this.caption);
-    this.main = document.createElement("div");
-    this.main.style.overflow = "auto";
-    this.main.style.height = this.editor._framework.ed_cell.offsetHeight - this.caption.offsetHeight + 'px';
-
-    editor._stylist.appendChild(this.main);
-
-    Xinha.freeLater(this,"caption");
-    Xinha.freeLater(this,"main");
-
-    editor.notifyOn('modechange',
-      function(e,args)
-      {
-        switch(args.mode)
-        {
-          case 'text':
-          {
-            editor.hidePanel(editor._stylist);
-            break;
-          }
-          case 'wysiwyg':
-          {
-            editor.showPanel(editor._stylist);
-            break;
-          }
-        }
-      }
-    );
-    editor.notifyOn('panel_change',
-      function(e,args)
-      {
-        switch (args.action)
-        {
-          case 'show':
-          var newHeight = stylist.main.offsetHeight - args.panel.offsetHeight;
-          stylist.main.style.height = ((newHeight > 0) ?  stylist.main.offsetHeight - args.panel.offsetHeight : 0) + 'px';
-          editor._stylist.style.height = stylist.caption.offsetHeight + "px";
-          editor.sizeEditor();
-          break;
-          case 'hide':
-            stylist.resize();
-          break;
-        }
-      }
-    );
-    editor.notifyOn('before_resize',
-    function()
-      {
-        editor._stylist.style.height = stylist.caption.offsetHeight + "px";
-      }
-    );
-    editor.notifyOn('resize',
-      function()
-      {
-        stylist.resize();
-      }
-    );
-  }
-
-};
-Stylist.prototype.resize = function()
-{
-  var editor = this.editor;
-  var panelContainer = editor._stylist.parentNode;
-
-  var newSize = panelContainer.offsetHeight;
-  for (var i=0; i < panelContainer.childNodes.length;++i)
-  {
-    if (panelContainer.childNodes[i]==editor._stylist || !panelContainer.childNodes[i].offsetHeight)
-    {
-      continue;
-    }
-    newSize -= panelContainer.childNodes[i].offsetHeight;
-  }
-  editor._stylist.style.height = newSize + 'px';
-  this.main.style.height = newSize - this.caption.offsetHeight + 'px';
-}
-
-Stylist.prototype.onUpdateToolbar = function()
-{
-  if(this.editor._stylist)
-  {
-    if(this._timeoutID)
-    {
-      window.clearTimeout(this._timeoutID);
-    }
-
-    var e = this.editor;
-    this._timeoutID = window.setTimeout(function() { e._fillStylist(); }, 250);
-  }
-};
diff --git a/web/imcms/xinha/plugins/SuperClean/dialog.html b/web/imcms/xinha/plugins/SuperClean/dialog.html
deleted file mode 100644
index abced76259..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/dialog.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1 id="[h1]"><l10n>Clean up HTML</l10n></h1>
-<div style="margin-left: 10px;">
-    <l10n>Please select from the following cleaning options...</l10n>
-    <!--filters-->
-  <div style="margin-top: 10px;">
-    <input type="button" id="[ok]"     value="_(OK)"     />
-    <input type="button" id="[cancel]" value="_(Cancel)" />
-  </div>
-</div>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/filters/paragraph.js b/web/imcms/xinha/plugins/SuperClean/filters/paragraph.js
deleted file mode 100644
index 041a575c2d..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/filters/paragraph.js
+++ /dev/null
@@ -1,6 +0,0 @@
-function(html) {
-  html = html.replace(/<\s*p[^>]*>/gi, '');
-  html = html.replace(/<\/\s*p\s*>/gi, '');
-  html = html.trim();
-  return html;
-} 
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/filters/remove_formatting.js b/web/imcms/xinha/plugins/SuperClean/filters/remove_formatting.js
deleted file mode 100644
index 17f2643db3..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/filters/remove_formatting.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function(html) {
-	html = html
-		.replace(/\r\n/g, " ")
-		.replace(/\n/g, " ")
-		.replace(/\r/g, " ")
-		.replace(/(\&|\&amp\;)nbsp\;/g, " ") ;
-	
-	html = html
-		.replace(/[ ]+/g, " ") ;
-	
-	html = html
-		.replace(/<\/(P|DIV|TD|LI|H[1-6])>/gi, "\n\n")
-		.replace(/<br[^>]*?>/gi, "\n") ;
-	
-	html = html
-		.replace(/<[^>]+?>/g, "") ;
-	
-	html = html
-		.replace(/(\r?\n)\s*(\r?\n)+\s*/g, "$1$1") ;
-	
-	html = html.trim() ;
-	
-	html = html
-		.replace(/(\r?\n)/g, "<br/>$1")
-		.replace(/(\r?\n)[ ]+/g, "$1") ;
-	
-	return html.trim() ;
-}
-String.prototype.trim = function() {
-	return this.replace(/^\s+/g, "").replace(/\s+$/g, "") ;
-} ;
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/filters/remove_some_formatting.js b/web/imcms/xinha/plugins/SuperClean/filters/remove_some_formatting.js
deleted file mode 100644
index 323132de12..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/filters/remove_some_formatting.js
+++ /dev/null
@@ -1,60 +0,0 @@
-function(html) {
-	html = html
-		.replace(/\r\n/g, " ")
-		.replace(/\n/g, " ")
-		.replace(/\r/g, " ")
-		.replace(/\&nbsp\;/g, " ") ;
-	
-	html = html
-		.replace(/ class=[^\s|>]*/gi, "")
-		.replace(/ style=\"[^>]*\"/gi, "")
-		.replace(/ align=[^\s|>]*/gi, "") ;
-	
-	html = html
-		.replace(/<b [^>]*>/gi, "<b>")
-		.replace(/<i [^>]*>/gi, "<i>")
-		.replace(/<li [^>]*>/gi, "<li>")
-		.replace(/<ul [^>]*>/gi, "<ul>") ;
-	
-	html = html
-		.replace(/<strong>/gi, "<b>")
-		.replace(/<\/strong>/gi, "</b>") ;
-	
-	html = html
-		.replace(/<em>/gi, "<i>")
-		.replace(/<\/em>/gi, "</i>") ;
-	
-	html = html
-		.replace(/<\?xml:[^>]*>/g, "")
-		.replace(/<\/?st1:[^>]*>/g, "")
-		.replace(/<\/?[a-z]\:[^>]*>/g, "")
-		.replace(/<\/?font[^>]*>/gi, "")
-		.replace(/<\/?span[^>]*>/gi, " ")
-		.replace(/<\/?div[^>]*>/gi, " ")
-		.replace(/<\/?pre[^>]*>/gi, " ")
-		.replace(/<\/?h[1-6][^>]*>/gi, " ") ;
-	
-	oldlen = html.length + 1 ;
-	
-	while (oldlen > html.length) {
-		oldlen = html.length;
-		html = html
-			.replace(/<([a-z][a-z]*)> *<\/\1>/gi, " ")
-			.replace(/<([a-z][a-z]*)> *<([a-z][^>]*)> *<\/\1>/gi, "<$2>") ;
-	}
-	
-	html = html
-		.replace(/<([a-z][a-z]*)><\1>/gi, "<$1>")
-		.replace(/<\/([a-z][a-z]*)><\/\1>/gi, "</$1>") ;
-	
-	html = html
-		.replace(/<a name="_Toc[\d]+">([^<]*?)<\/a>/gi, "$1") ;
-	
-	html = html
-		.replace(/  */gi, " ") ;
-	
-	return html.trim() ;
-}
-String.prototype.trim = function() {
-	return this.replace(/^\s+/g, "").replace(/\s+$/g, "") ;
-} ;
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/filters/remove_word_formatting.js b/web/imcms/xinha/plugins/SuperClean/filters/remove_word_formatting.js
deleted file mode 100644
index 791274b59a..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/filters/remove_word_formatting.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function(html) {
-	html = html
-		.replace(/\r\n/g, " ")
-		.replace(/\n/g, " ")
-		.replace(/\r/g, " ")
-		.replace(/\&nbsp\;/g, " ") ;
-	
-	html = html
-		.replace(/ class=[^\s|>]*/gi, "")
-		.replace(/ style=\"[^>]*\"/gi, "")
-		.replace(/ align=[^\s|>]*/gi, "") ;
-	
-	html = html
-		.replace(/<b [^>]*>/gi, "<b>")
-		.replace(/<i [^>]*>/gi, "<i>")
-		.replace(/<li [^>]*>/gi, "<li>")
-		.replace(/<ul [^>]*>/gi, "<ul>") ;
-	
-	html = html
-		.replace(/(<\/?)strong(>)/gi, "$1b$2") ;
-	
-	html = html
-		.replace(/(<\/?)em(>)/gi, "$1i$2") ;
-	
-	html = html
-		.replace(/<\?xml:[^>]*>/g, "")
-		.replace(/<\/?st1:[^>]*>/g, "")
-		.replace(/<\/?[a-z]\:[^>]*>/g, "")
-		.replace(/<\/?font[^>]*>/gi, "")
-		.replace(/<\/?span[^>]*>/gi, " ")
-		.replace(/<\/?div[^>]*>/gi, " ")
-		.replace(/<\/?pre[^>]*>/gi, " ")
-		.replace(/<\/?h[1-6][^>]*>/gi, " ") ;
-	
-	oldlen = html.length + 1 ;
-	
-	while (oldlen > html.length) {
-		oldlen = html.length ;
-		html = html
-			.replace(/<([a-z][a-z]*)> *<\/\1>/gi, " ")
-			.replace(/<([a-z][a-z]*)> *<([a-z][^>]*)> *<\/\1>/gi, "<$2>") ;
-	}
-	
-	html = html
-		.replace(/<([a-z][a-z]*)><\1>/gi, "<$1>")
-		.replace(/<\/([a-z][a-z]*)><\/\1>/gi,"</$1>") ;
-	
-	html = html
-		.replace(/  */gi, " ") ;
-	
-	return html.trim() ;
-}
-String.prototype.trim = function() {
-	return this.replace(/^\s+/g, "").replace(/\s+$/g, "") ;
-} ;
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/filters/word.js b/web/imcms/xinha/plugins/SuperClean/filters/word.js
deleted file mode 100644
index 495a71942e..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/filters/word.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function(html) {
-    // Remove HTML comments
-	html = html.replace(/<!--[\w\s\d@{}:.;,'"%!#_=&|?~()[*+\/\-\]]*-->/gi, "" );
-	html = html.replace(/<!--[^\0]*-->/gi, '');
-    // Remove all HTML tags
-	html = html.replace(/<\/?\s*HTML[^>]*>/gi, "" );
-    // Remove all BODY tags
-    html = html.replace(/<\/?\s*BODY[^>]*>/gi, "" );
-    // Remove all META tags
-	html = html.replace(/<\/?\s*META[^>]*>/gi, "" );
-    // Remove all SPAN tags
-	html = html.replace(/<\/?\s*SPAN[^>]*>/gi, "" );
-	// Remove all FONT tags
-    html = html.replace(/<\/?\s*FONT[^>]*>/gi, "");
-    // Remove all IFRAME tags.
-    html = html.replace(/<\/?\s*IFRAME[^>]*>/gi, "");
-    // Remove all STYLE tags & content
-	html = html.replace(/<\/?\s*STYLE[^>]*>(.|[\n\r\t])*<\/\s*STYLE\s*>/gi, "" );
-    // Remove all TITLE tags & content
-	html = html.replace(/<\s*TITLE[^>]*>(.|[\n\r\t])*<\/\s*TITLE\s*>/gi, "" );
-	// Remove javascript
-    html = html.replace(/<\s*SCRIPT[^>]*>[^\0]*<\/\s*SCRIPT\s*>/gi, "");
-    // Remove all HEAD tags & content
-	html = html.replace(/<\s*HEAD[^>]*>(.|[\n\r\t])*<\/\s*HEAD\s*>/gi, "" );
-	// Remove Class attributes
-	html = html.replace(/<\s*(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ;
-	// Remove Style attributes
-	html = html.replace(/<\s*(\w[^>]*) style="([^"]*)"([^>]*)/gi, "<$1$3") ;
-	// Remove Lang attributes
-	html = html.replace(/<\s*(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ;
-	// Remove XML elements and declarations
-	html = html.replace(/<\\?\?xml[^>]*>/gi, "") ;
-	// Remove Tags with XML namespace declarations: <o:p></o:p>
-	html = html.replace(/<\/?\w+:[^>]*>/gi, "") ;
-	// Replace the &nbsp;
-	html = html.replace(/&nbsp;/, " " );
-
-	// Transform <p><br /></p> to <br>
-	//html = html.replace(/<\s*p[^>]*>\s*<\s*br\s*\/>\s*<\/\s*p[^>]*>/gi, "<br>");
-	html = html.replace(/<\s*p[^>]*><\s*br\s*\/?>\s*<\/\s*p[^>]*>/gi, "<br>");
-	
-	// Remove <P> 
-	html = html.replace(/<\s*p[^>]*>/gi, "");
-	
-	// Replace </p> with <br>
-	html = html.replace(/<\/\s*p[^>]*>/gi, "<br>");
-	
-	// Remove any <br> at the end
-	html = html.replace(/(\s*<br>\s*)*$/, "");
-	
-	html = html.trim();
-	return html;
-} 
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/img/ed_superclean.gif b/web/imcms/xinha/plugins/SuperClean/img/ed_superclean.gif
deleted file mode 100644
index 53180a80ba..0000000000
Binary files a/web/imcms/xinha/plugins/SuperClean/img/ed_superclean.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/SuperClean/lang/de.js b/web/imcms/xinha/plugins/SuperClean/lang/de.js
deleted file mode 100644
index 9e4f6c7aa7..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/lang/de.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Clean up HTML": "HTML säubern",
-  "Please select from the following cleaning options...": "Bitte Optionen auswählen...",
-  "General tidy up and correction of some problems.": "Allgemeines aufräumen und Korrektur einiger Probleme.",
-  "Clean bad HTML from Microsoft Word": "Schlechtes HTML aus Microsoft Word aufräumen",
-  "Remove custom typefaces (font \"styles\").": "Schriftarten entfernen (font face).",
-  "Remove custom font sizes.": "Schriftgrößen entfernen (font size).",
-  "Remove custom text colors.": "Schriftfarben entfernen (font color).",
-  "Remove lang attributes.": "Sprachattribute entfernen.",
-  "Go": "Go",
-  "Cancel": "Abbrechen",
-  "Tidy failed.  Check your HTML for syntax errors.": "Säubern fehlgeschlagen. Überprüfen Sie Ihren Code auf Fehler.",
-  "You don't have anything to tidy!": "Es gibt nichts zu säubern...!"
-};
diff --git a/web/imcms/xinha/plugins/SuperClean/lang/fr.js b/web/imcms/xinha/plugins/SuperClean/lang/fr.js
deleted file mode 100644
index 867489c8cc..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/lang/fr.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Clean up HTML": "Nettoyer le code HTML",
-  "Please select from the following cleaning options...": "Veuillez sélectionner une option de nettoyage.",
-  "General tidy up and correction of some problems.": "Nettoyage générique et correction des problèmes mineurs.",
-  "Clean bad HTML from Microsoft Word": "Nettoyer les balises HTML de Microsoft Word",
-  "Remove custom typefaces (font \"styles\").": "Supprimer les polices personalisées (font \"styles\").",
-  "Remove custom font sizes.": "Supprimer les tailles de polices personnalisées.",
-  "Remove custom text colors.": "Supprimer les couleurs de texte personalisées.",
-  "Remove lang attributes.": "Supprimer les attributs de langue.",
-  "Go": "Commencer",
-  "Cancel": "Annuler",
-  "Tidy failed.  Check your HTML for syntax errors.": "Tidy a échoué. Vérifier la syntaxe HTML.",
-  "You don't have anything to tidy!": "Rien à transmettre à tidy !"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/lang/ja.js b/web/imcms/xinha/plugins/SuperClean/lang/ja.js
deleted file mode 100644
index ae8b7976cc..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/lang/ja.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Clean up HTML": "HTML�クリーンナップ",
-  "Please select from the following cleaning options...": "以下�クリーンナップオプションを�択������...",
-  "General tidy up and correction of some problems.": "一般的��正化�������題を修正���。",
-  "Clean bad HTML from Microsoft Word": "Microsoft Word�よる�正�HTML�清潔化",
-  "Remove custom typefaces (font \"styles\").": "独自フォント�設定�除去 (font face)。",
-  "Remove custom font sizes.": "独自フォントサイズ設定�除去。",
-  "Remove custom text colors.": "独自文字色設定�除去。",
-  "Remove lang attributes.": "言語属性�除去。",
-  "Go": "実行",
-  "Cancel": "中止",
-  "Tidy failed.  Check your HTML for syntax errors.": "�正化�失敗����。HTML�文法エラーを確�������。",
-  "You don't have anything to tidy!": "�正化�るも��何も�り��ん!",
-  "Replace directional quote marks with non-directional quote marks.": "方���引用符を方���引用符�置�。",
-  "CANCEL": "中止"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/lang/nb.js b/web/imcms/xinha/plugins/SuperClean/lang/nb.js
deleted file mode 100644
index f8822d3613..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/lang/nb.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Clean up HTML": "Vask HTML kode",
-  "Please select from the following cleaning options...": "Vennligst velg blandt de forskjellige mulighetene å vaske/ rydde i HTML koden",
-  "General tidy up and correction of some problems.": "Generell opprydding i HTML koden samt korrigering av typiske feil",
-  "Clean bad HTML from Microsoft Word": "Vask HTML kode for feil og problemer etter Microsoft Word",
-  "Remove custom typefaces (font \"styles\").": "Fjerne egendefinerte skrifttyper (font face)",
-  "Remove custom font sizes.": "Fjerne egendefinerte skriftstørrelser (font size)",
-  "Remove custom text colors.": "Fjerne egendefinerte skriftfarger (font color)",
-  "Remove lang attributes.": "Fjerne lang-attributter.",
-  "Go": "Utfør",
-  "Cancel": "Avbryt",
-  "Tidy failed.  Check your HTML for syntax errors.": "Tidy (Programmet som retter HTML koden) feilet. Vennligst se over HTML koden for feil.",
-  "You don't have anything to tidy!": "Det finnes ingen HTML kode å vaske!"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/super-clean.js b/web/imcms/xinha/plugins/SuperClean/super-clean.js
deleted file mode 100644
index fa9d85d600..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/super-clean.js
+++ /dev/null
@@ -1,334 +0,0 @@
-// Make our right side panel and insert appropriatly
-function SuperClean(editor, args)
-{
-  this.editor = editor;
-  var superclean = this;
-  editor._superclean_on = false;
-  editor.config.registerButton('superclean', this._lc("Clean up HTML"), editor.imgURL('ed_superclean.gif', 'SuperClean'), true, function(e, objname, obj) { superclean._superClean(null, obj); });
-
-  // See if we can find 'killword' and replace it with superclean
-  editor.config.addToolbarElement("superclean", "killword", 0);
-}
-
-SuperClean._pluginInfo =
-{
-  name     : "SuperClean",
-  version  : "1.0",
-  developer: "James Sleeman, Niko Sams",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "htmlArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-SuperClean.prototype._lc = function(string) {
-    return Xinha._lc(string, 'SuperClean');
-};
-
-/** superClean combines HTMLTidy, Word Cleaning and font stripping into a single function
- *  it works a bit differently in how it asks for parameters */
-
-SuperClean.prototype._superClean = function(opts, obj)
-{
-  var superclean = this;
-
-  // Do the clean if we got options
-  var doOK = function()
-  {
-    var opts = superclean._dialog.hide();
-    var editor = superclean.editor;
-
-    if(opts.word_clean) editor._wordClean();
-    var D = editor.getInnerHTML();
-
-    for(var filter in editor.config.SuperClean.filters)
-    {
-      if(filter=='tidy' || filter=='word_clean') continue;
-      if(opts[filter])
-      {
-        D = SuperClean.filterFunctions[filter](D, editor);
-      }
-    }
-
-    D = D.replace(/(style|class)="\s*"/gi, '');
-    D = D.replace(/<(font|span)\s*>/gi, '');
-
-    editor.setHTML(D);
-
-    if(opts.tidy)
-    {
-      var callback = function(javascriptResponse) 
-      { 
-        eval("var response = " + javascriptResponse);
-        switch (response.action)
-        {
-          case 'setHTML':
-            editor.setHTML(response.value);
-          break;
-          case 'alert':
-            alert(superclean._lc(response.value));
-          break;
-        }
-      }
-      Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : editor.getInnerHTML()},callback);
-    }
-    return true;
-  }
-
-  if(this.editor.config.SuperClean.show_dialog)
-  {
-    var inputs = {};
-    this._dialog.show(inputs, doOK);
-  }
-  else
-  {
-    var editor = this.editor;
-    var html = editor.getInnerHTML();
-    for(var filter in editor.config.SuperClean.filters)
-    {
-      if(filter=='tidy') continue; //call tidy last
-      html = SuperClean.filterFunctions[filter](html, editor);
-    }
-
-    html = html.replace(/(style|class)="\s*"/gi, '');
-    html = html.replace(/<(font|span)\s*>/gi, '');
-
-    editor.setHTML(html);
-
-    if(editor.config.SuperClean.filters.tidy)
-    {
-      SuperClean.filterFunctions.tidy(html, editor);
-    }
-  }
-};
-
-Xinha.Config.prototype.SuperClean =
-{
-  // set to the URL of a handler for html tidy, this handler
-  //  (see tidy.php for an example) must that a single post variable
-  //  "content" which contains the HTML to tidy, and return javascript like
-  //  editor.setHTML('<strong>Tidied Html</strong>')
-  // it's called through XMLHTTPRequest
-  'tidy_handler': _editor_url + 'plugins/SuperClean/tidy.php',
-
-  //avaliable filters (these are built-in filters)
-  // You can either use
-  //    'filter_name' : "Label/Description String"
-  // or 'filter_name' : {label: "Label", checked: true/false, filterFunction: function(html) { ... return html;} }
-  // filterFunction in the second format above is optional.
-
-  'filters': { 'tidy': Xinha._lc('General tidy up and correction of some problems.', 'SuperClean'),
-               'word_clean': Xinha._lc('Clean bad HTML from Microsoft Word', 'SuperClean'),
-               'remove_faces': Xinha._lc('Remove custom typefaces (font "styles").', 'SuperClean'),
-               'remove_sizes': Xinha._lc('Remove custom font sizes.', 'SuperClean'),
-               'remove_colors': Xinha._lc('Remove custom text colors.', 'SuperClean'),
-               'remove_lang': Xinha._lc('Remove lang attributes.', 'SuperClean'),
-               'remove_fancy_quotes': {label:Xinha._lc('Replace directional quote marks with non-directional quote marks.', 'SuperClean'), checked:false}
-  //additional custom filters (defined in plugins/SuperClean/filters/word.js)
-               //'paragraph': 'remove paragraphs'},
-               //'word': 'exteded Word-Filter' },
-              },
-  //if false all filters are applied, if true a dialog asks what filters should be used
-  'show_dialog': true
-};
-
-SuperClean.filterFunctions = { };
-SuperClean.filterFunctions.remove_colors = function(D)
-{
-  D = D.replace(/color="?[^" >]*"?/gi, '');
-  // { (stops jedit's fold breaking)
-  D = D.replace(/([^-])color:[^;}"']+;?/gi, '$1');
-  return(D);
-};
-SuperClean.filterFunctions.remove_sizes = function(D)
-{
-  D = D.replace(/size="?[^" >]*"?/gi, '');
-  // { (stops jedit's fold breaking)
-  D = D.replace(/font-size:[^;}"']+;?/gi, '');
-  return(D);
-};
-SuperClean.filterFunctions.remove_faces = function(D)
-{
-  D = D.replace(/face="?[^" >]*"?/gi, '');
-  // { (stops jedit's fold breaking)
-  D = D.replace(/font-family:[^;}"']+;?/gi, '');
-  return(D);
-};
-SuperClean.filterFunctions.remove_lang = function(D)
-{
-  D = D.replace(/lang="?[^" >]*"?/gi, '');
-  return(D);
-};
-SuperClean.filterFunctions.word_clean = function(html, editor)
-{
-  editor.setHTML(html);
-  editor._wordClean();
-  return editor.getInnerHTML();
-};
-
-SuperClean.filterFunctions.remove_fancy_quotes = function(D)
-{
-  D = D.replace(new RegExp(String.fromCharCode(8216),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8217),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8218),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8219),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8220),"g"),"\"");
-  D = D.replace(new RegExp(String.fromCharCode(8221),"g"),"\"");
-  D = D.replace(new RegExp(String.fromCharCode(8222),"g"),"\"");
-  D = D.replace(new RegExp(String.fromCharCode(8223),"g"),"\"");
-  return D;
-};
-
-SuperClean.filterFunctions.tidy = function(html, editor)
-{
-  Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : html},
-                      function(javascriptResponse) { eval(javascriptResponse) });
-};
-
-
-
-SuperClean.prototype.onGenerate = function()
-{
-  if(this.editor.config.SuperClean.show_dialog && !this._dialog)
-  {
-    this._dialog = new SuperClean.Dialog(this);
-  }
-  if(this.editor.config.tidy_handler)
-  {
-    //for backwards compatibility
-    this.editor.config.SuperClean.tidy_handler = this.editor.config.tidy_handler;
-    this.editor.config.tidy_handler = null;
-  }
-  if(!this.editor.config.SuperClean.tidy_handler && this.editor.config.filters.tidy) {
-    //unset tidy-filter if no tidy_handler
-    this.editor.config.filters.tidy = null;
-  }
-
-  var sc = this;
-  //load the filter-functions
-  for(var filter in this.editor.config.SuperClean.filters)
-  {
-    if(!SuperClean.filterFunctions[filter])
-    {
-      var filtDetail = this.editor.config.SuperClean.filters[filter];
-      if(typeof filtDetail.filterFunction != 'undefined')
-      {
-        SuperClean.filterFunctions[filter] = filterFunction;
-      }
-      else
-      {
-        Xinha._getback(_editor_url + 'plugins/SuperClean/filters/'+filter+'.js',
-                      function(func) {
-                        eval('SuperClean.filterFunctions.'+filter+'='+func+';');
-                        sc.onGenerate();
-                      });
-      }
-      return;
-    }
-  }
-};
-// Inline Dialog for SuperClean
-
-
-SuperClean.Dialog = function (SuperClean)
-{
-  var  lDialog = this;
-  this.Dialog_nxtid = 0;
-  this.SuperClean = SuperClean;
-  this.id = { }; // This will be filled below with a replace, nifty
-
-  this.ready = false;
-  this.files  = false;
-  this.html   = false;
-  this.dialog = false;
-
-  // load the dTree script
-  this._prepareDialog();
-
-};
-
-SuperClean.Dialog.prototype._prepareDialog = function()
-{
-  var lDialog = this;
-  var SuperClean = this.SuperClean;
-
-  if(this.html == false)
-  {
-    Xinha._getback(_editor_url + 'plugins/SuperClean/dialog.html', function(txt) { lDialog.html = txt; lDialog._prepareDialog(); });
-    return;
-  }
-
-  var htmlFilters = "";
-  for(var filter in this.SuperClean.editor.config.SuperClean.filters)
-  {
-    htmlFilters += "    <div>\n";
-    var filtDetail = this.SuperClean.editor.config.SuperClean.filters[filter];
-    if(typeof filtDetail.label == 'undefined')
-    {
-      htmlFilters += "        <input type=\"checkbox\" name=\"["+filter+"]\" id=\"["+filter+"]\" checked />\n";
-      htmlFilters += "        <label for=\"["+filter+"]\">"+this.SuperClean.editor.config.SuperClean.filters[filter]+"</label>\n";
-    }
-    else
-    {
-      htmlFilters += "        <input type=\"checkbox\" name=\"["+filter+"]\" id=\"["+filter+"]\" " + (filtDetail.checked ? "checked" : "") + " />\n";
-      htmlFilters += "        <label for=\"["+filter+"]\">"+filtDetail.label+"</label>\n";
-    }
-    htmlFilters += "    </div>\n";
-  }
-  this.html = this.html.replace('<!--filters-->', htmlFilters);
-
-  var html = this.html;
-
-  // Now we have everything we need, so we can build the dialog.
-  var dialog = this.dialog = new Xinha.Dialog(SuperClean.editor, this.html, 'SuperClean');
-
-  this.ready = true;
-};
-
-SuperClean.Dialog.prototype._lc = SuperClean.prototype._lc;
-
-SuperClean.Dialog.prototype.show = function(inputs, ok, cancel)
-{
-  if(!this.ready)
-  {
-    var lDialog = this;
-    window.setTimeout(function() {lDialog.show(inputs,ok,cancel);},100);
-    return;
-  }
-
-  // Connect the OK and Cancel buttons
-  var dialog = this.dialog;
-  var lDialog = this;
-  if(ok)
-  {
-    this.dialog.getElementById('ok').onclick = ok;
-  }
-  else
-  {
-    this.dialog.getElementById('ok').onclick = function() {lDialog.hide();};
-  }
-
-  if(cancel)
-  {
-    this.dialog.getElementById('cancel').onclick = cancel;
-  }
-  else
-  {
-    this.dialog.getElementById('cancel').onclick = function() { lDialog.hide()};
-  }
-
-  // Show the dialog
-  this.SuperClean.editor.disableToolbar(['fullscreen','SuperClean']);
-
-  this.dialog.show(inputs);
-
-  // Init the sizes
-  this.dialog.onresize();
-};
-
-SuperClean.Dialog.prototype.hide = function()
-{
-  this.SuperClean.editor.enableToolbar();
-  return this.dialog.hide();
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/SuperClean/tidy.php b/web/imcms/xinha/plugins/SuperClean/tidy.php
deleted file mode 100644
index c8a6c5dece..0000000000
--- a/web/imcms/xinha/plugins/SuperClean/tidy.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-  /** This PHP file is intended for use with XMLHTTPRequest from Xinha
-   * it requrns javascript to set the Xinha html with tidied html that is
-   * submitted in a $_POST parameter called 'content'
-   */
-
-  if(get_magic_quotes_gpc())
-  {
-    // trigger_error('Magic Quotes GPC is on, cleaning GPC.', E_USER_NOTICE);
-    $to_clean = array(&$_GET, &$_POST, &$_REQUEST, &$_COOKIE);
-    while(count($to_clean))
-    {
-      $cleaning =& $to_clean[array_pop(array_keys($to_clean))];
-      unset($to_clean[array_pop(array_keys($to_clean))]);
-      foreach(array_keys($cleaning) as $k)
-      {
-        if(is_array($cleaning[$k]))
-        {
-          $to_clean[] =& $cleaning[$k];
-        }
-        else
-        {
-          $cleaning[$k] = stripslashes($cleaning[$k]);
-        }
-      }
-    }
-  }
-
-  header('Content-Type: text/javascript; charset=utf-8');
-
-  /** Function to POST some data to a URL */
-  function PostIt($DataStream, $URL)
-  {
-
-//  Strip http:// from the URL if present
-    $URL = ereg_replace("^http://", "", $URL);
-
-//  Separate into Host and URI
-    $Host = substr($URL, 0, strpos($URL, "/"));
-    $URI = strstr($URL, "/");
-
-//  Form up the request body
-    $ReqBody = "";
-    while (list($key, $val) = each($DataStream)) {
-      if ($ReqBody) $ReqBody.= "&";
-      $ReqBody.= $key."=".urlencode($val);
-    }
-    $ContentLength = strlen($ReqBody);
-
-//  Generate the request header
-    $ReqHeader =
-      "POST $URI HTTP/1.0\n".
-      "Host: $Host\n".
-      "User-Agent: PostIt\n".
-      "Content-Type: application/x-www-form-urlencoded\n".
-      "Content-Length: $ContentLength\n\n".
-      "$ReqBody\n";
-
-//     echo $ReqHeader;
-
-
-//  Open the connection to the host
-    $socket = fsockopen($Host, 80, &$errno, &$errstr);
-    if (!$socket) {
-      $result = "($errno) $errstr";
-      return $Result;
-    }
-
-    fputs($socket, $ReqHeader);
-
-    $result = '';
-    while(!feof($socket))
-    {
-      $result .= fgets($socket);
-    }
-    return $result;
-  }
-
-
-  function js_encode($string)
-  {
-    static $strings = "\\,\",',%,&,<,>,{,},@,\n,\r";
-
-    if(!is_array($strings))
-    {
-      $tr = array();
-      foreach(explode(',', $strings) as $chr)
-      {
-        $tr[$chr] = sprintf('\x%02X', ord($chr));
-      }
-      $strings = $tr;
-    }
-
-    return strtr($string, $strings);
-  }
-
-  // Any errors would screq up our javascript
-  error_reporting(E_NONE);
-  ini_set('display_errors', false);
-
-  if(trim(@$_REQUEST['content']))
-  {
-    // PHP's urldecode doesn't understand %uHHHH for unicode
-    $_REQUEST['content'] = preg_replace('/%u([a-f0-9]{4,4})/ei', 'utf8_chr(0x$1)', $_REQUEST['content']);
-    function utf8_chr($num)
-    {
-      if($num<128)return chr($num);
-      if($num<1024)return chr(($num>>6)+192).chr(($num&63)+128);
-      if($num<32768)return chr(($num>>12)+224).chr((($num>>6)&63)+128).chr(($num&63)+128);
-      if($num<2097152)return chr(($num>>18)+240).chr((($num>>12)&63)+128).chr((($num>>6)&63)+128) .chr(($num&63)+128);
-      return '';
-    }
-    ob_start();
-      passthru("echo " .  escapeshellarg($_REQUEST['content']) . " | tidy -q -i -u -wrap 9999 -utf8 -bare -asxhtml 2>/dev/null", $result);
-      $content = ob_get_contents();
-    ob_end_clean();
-
-    if(strlen($content) < 4)
-    {
-      // Tidy on the local machine failed, try a post
-      $res_1
-        = PostIt(
-          array
-            (
-              '_function' => 'tidy',
-              '_html'   => $_REQUEST['content'],
-              'char-encoding' => 'utf8',
-              '_output'       => 'warn',
-              'indent'        => 'auto',
-              'wrap'          => 9999,
-              'break-before-br' => 'y',
-              'bare'          => 'n',
-              'word-2000'     => 'n',
-              'drop-empty-paras' => 'y',
-              'drop-font-tags' => 'n',
-
-            ),
-          'http://infohound.net/tidy/tidy.pl');
-
-      if(preg_match('/<a href="([^"]+)" title="Save the tidied HTML/', $res_1, $m))
-      {
-        $tgt = strtr($m[1], array_flip(get_html_translation_table(HTML_ENTITIES)));
-        $content = implode('', file('http://infohound.net/tidy/' . $tgt));
-      }
-    }
-
-    if(strlen($content) && ! preg_match('/<\/body>/i', $_REQUEST['content']))
-    {
-      if( preg_match('/<body[^>]*>(.*)<\/body>/is', $content, $matches) )
-      {
-        $content = $matches[1];
-      }
-    }
-    elseif(!strlen($content))
-    {
-      $content = $_REQUEST['content'];
-    }
-
-    if($content)
-    {
-      ?>
-      {action:'setHTML',value:'<?php echo js_encode($content) ?>'};
-      <?php
-    }
-    else
-    {
-      ?>
-      {action:'alert',value:'Tidy failed.  Check your HTML for syntax errors.'};
-      <?php
-    }
-  }
-  else
-  {
-    ?>
-    {action:'alert',value:"You don't have anything to tidy!"}
-    <?php
-  }
-
-?>
diff --git a/web/imcms/xinha/plugins/TableOperations/img/cell-delete.gif b/web/imcms/xinha/plugins/TableOperations/img/cell-delete.gif
deleted file mode 100644
index 2fd629b59d..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/cell-delete.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/cell-insert-after.gif b/web/imcms/xinha/plugins/TableOperations/img/cell-insert-after.gif
deleted file mode 100644
index ddea8a0245..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/cell-insert-after.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/cell-insert-before.gif b/web/imcms/xinha/plugins/TableOperations/img/cell-insert-before.gif
deleted file mode 100644
index 2e7b36b63d..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/cell-insert-before.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/cell-merge.gif b/web/imcms/xinha/plugins/TableOperations/img/cell-merge.gif
deleted file mode 100644
index 2da38f3c14..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/cell-merge.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/cell-prop.gif b/web/imcms/xinha/plugins/TableOperations/img/cell-prop.gif
deleted file mode 100644
index e9495aa8bb..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/cell-prop.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/cell-split.gif b/web/imcms/xinha/plugins/TableOperations/img/cell-split.gif
deleted file mode 100644
index 0b22593c97..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/cell-split.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/col-delete.gif b/web/imcms/xinha/plugins/TableOperations/img/col-delete.gif
deleted file mode 100644
index 5202886e42..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/col-delete.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/col-insert-after.gif b/web/imcms/xinha/plugins/TableOperations/img/col-insert-after.gif
deleted file mode 100644
index a1ffb6ed0b..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/col-insert-after.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/col-insert-before.gif b/web/imcms/xinha/plugins/TableOperations/img/col-insert-before.gif
deleted file mode 100644
index 1a3359f2e4..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/col-insert-before.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/col-split.gif b/web/imcms/xinha/plugins/TableOperations/img/col-split.gif
deleted file mode 100644
index 2fbe9497b4..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/col-split.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/row-delete.gif b/web/imcms/xinha/plugins/TableOperations/img/row-delete.gif
deleted file mode 100644
index 1fed389153..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/row-delete.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/row-insert-above.gif b/web/imcms/xinha/plugins/TableOperations/img/row-insert-above.gif
deleted file mode 100644
index 3cbeceb396..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/row-insert-above.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/row-insert-under.gif b/web/imcms/xinha/plugins/TableOperations/img/row-insert-under.gif
deleted file mode 100644
index 89fc588998..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/row-insert-under.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/row-prop.gif b/web/imcms/xinha/plugins/TableOperations/img/row-prop.gif
deleted file mode 100644
index 7a900115f5..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/row-prop.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/row-split.gif b/web/imcms/xinha/plugins/TableOperations/img/row-split.gif
deleted file mode 100644
index 8d799f168b..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/row-split.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/img/table-prop.gif b/web/imcms/xinha/plugins/TableOperations/img/table-prop.gif
deleted file mode 100644
index 10ec55349f..0000000000
Binary files a/web/imcms/xinha/plugins/TableOperations/img/table-prop.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/cz.js b/web/imcms/xinha/plugins/TableOperations/lang/cz.js
deleted file mode 100644
index d2fe10877d..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/cz.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "cz", ENCODING: UTF-8
-// Author: Jiri Löw, <jirilow@jirilow.com>
-{
-  "Align": "Zarovnání",
-  "All four sides": "Všechny �tyři strany",
-  "Background": "Pozadí",
-  "Baseline": "Základní linka",
-  "Border": "Obrys",
-  "Borders": "Obrysy",
-  "Bottom": "Dolů",
-  "Style [CSS]": "Kaskádové styly (CSS)",
-  "Caption": "Titulek",
-  "Cell Properties": "Vlastnosti buňky",
-  "Center": "Na střed",
-  "Char": "Znak",
-  "Collapsed borders": "Stla�ené okraje",
-  "Color": "Barva",
-  "Description": "Popis",
-  "FG Color": "Barva popředí",
-  "Float": "Obtékání",
-  "Frames": "Ráme�ky",
-  "Height": "Výška",
-  "How many columns would you like to merge?": "Kolik sloupců si přejete spojit?",
-  "How many rows would you like to merge?": "Kolik řádků si přejete spojit?",
-  "Image URL": "Adresa obrázku",
-  "Justify": "Do stran",
-  "Layout": "Rozložení",
-  "Left": "Vlevo",
-  "Margin": "Okraj",
-  "Middle": "Na střed",
-  "No rules": "Žádné �áry",
-  "No sides": "Žádné strany",
-  "None": "Žádné",
-  "Padding": "Odsazování",
-  "Please click into some cell": "Prosím klikněte do některé buňky",
-  "Right": "Vpravo",
-  "Row Properties": "Vlastnosti řádku",
-  "Rules will appear between all rows and columns": "Čáry mezi všemi řádky i sloupci",
-  "Rules will appear between columns only": "Čáry pouze mezi sloupci",
-  "Rules will appear between rows only": "Čáry pouze mezi řádky",
-  "Rules": "Čáry",
-  "Spacing and padding": "Mezery a odsazování",
-  "Spacing": "Mezery",
-  "Summary": "Shrnutí",
-  "Delete cell": "Smazat buňku",
-  "Insert cell after": "Vložit buňku za",
-  "Insert cell before": "Vložit buňku před",
-  "Merge cells": "Spojit buňky",
-  "Cell properties": "Vlastnosti buňky",
-  "Split cell": "Rozdělit buňku",
-  "Delete column": "Smazat sloupec",
-  "Insert column after": "Vložit sloupec za",
-  "Insert column before": "Vložit sloupec před",
-  "Split column": "Rozdělit sloupec",
-  "Delete row": "Smazat řádek",
-  "Insert row before": "Smazat řádek nad",
-  "Insert row after": "Smazat řádek pod",
-  "Row properties": "Vlastnosti řádku",
-  "Split row": "Rozdělit řádek",
-  "Table properties": "Vlastnosti tabulky",
-  "Table Properties": "Vlastnosti tabulky",
-  "Text align": "Zarovnání textu",
-  "The bottom side only": "Pouze spodní strana",
-  "The left-hand side only": "Pouze levá strana",
-  "The right and left sides only": "Pouze levá a pravá strana",
-  "The right-hand side only": "Pouze pravá strana",
-  "The top and bottom sides only": "Pouze horní a dolní strana",
-  "The top side only": "Pouze horní strana",
-  "Top": "Nahoru",
-  "Unset color": "Zrušit barvu",
-  "Vertical align": "Svislé zarovnání",
-  "Width": "Šířka",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha zbaběle odmítá smazat poslední buňku v řádku.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha zbaběle odmítá smazat poslední sloupec v tabulce.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha zbaběle odmítá smazat poslední řádek v tabulce.",
-  "percent": "procent",
-  "pixels": "pixelů"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/da.js b/web/imcms/xinha/plugins/TableOperations/lang/da.js
deleted file mode 100644
index 94d068acf8..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/da.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "da", ENCODING: UTF-8
-// Author: Steen Sønderup, <steen@soenderup.com>
-{
-  "Align": "Placer",
-  "All four sides": "Alle fire sider",
-  "Background": "Baggrund",
-  "Baseline": "Bundlinie",
-  "Border": "Kant",
-  "Borders": "Kanter",
-  "Bottom": "Bund",
-  "Style [CSS]": "Stil [CSS]",
-  "Caption": "Titel",
-  "Cell Properties": "Celle egenskaber",
-  "Center": "Centrer",
-  "Char": "Plads",
-  "Collapsed borders": "Sammensmelt rammer",
-  "Color": "Farve",
-  "Description": "Beskrivelse",
-  "FG Color": "Font farve",
-  "Float": "Justering",
-  "Frames": "Udvendig",
-  "Height": "Højde",
-  "How many columns would you like to merge?": "Hvor mange kollonner vil du samle?",
-  "How many rows would you like to merge?": "Hvor mange rækker vil du samle?",
-  "Image URL": "Billede URL",
-  "Justify": "Lige margener",
-  "Layout": "Opsætning",
-  "Left": "Venstre",
-  "Margin": "Margen",
-  "Middle": "Centrer",
-  "No rules": "Ingen rammer",
-  "No sides": "Ingen sider",
-  "None": "Ingen",
-  "Padding": "Margen",
-  "Please click into some cell": "Klik på en celle",
-  "Right": "Højre",
-  "Row Properties": "Række egenskaber",
-  "Rules will appear between all rows and columns": "Rammer mellem rækker og kolonner",
-  "Rules will appear between columns only": "Kun rammer mellem kolonner",
-  "Rules will appear between rows only": "Kun rammer mellem rækker",
-  "Rules": "Invendig",
-  "Spacing and padding": "Afstand og margen",
-  "Spacing": "Afstand",
-  "Summary": "Beskrivelse",
-  "Delete cell": "Slet celle",
-  "Insert cell after": "Indsæt celle efter",
-  "Insert cell before": "Indsæt celle før",
-  "Merge cells": "Sammensæt celler",
-  "Cell properties": "Celle egenskaber",
-  "Split cell": "Opdel celle",
-  "Delete column": "Slet kollonne",
-  "Insert column after": "Indsæt kolonne efter",
-  "Insert column before": "Indsæt kolonne før",
-  "Split column": "Opdel kolonne",
-  "Delete row": "Slet række",
-  "Insert row before": "Indsæt række før",
-  "Insert row after": "Indsæt række efter",
-  "Row properties": "Række egenskaber",
-  "Split row": "Opdel række",
-  "Table properties": "Tabel egenskaber",
-  "Table Properties": "Tabel egenskaber",
-  "Text align": "Tekst",
-  "The bottom side only": "Kun i bunden",
-  "The left-hand side only": "Kun i højre side",
-  "The right and left sides only": "Kun i siderne",
-  "The right-hand side only": "Kun i venstre side",
-  "The top and bottom sides only": "Kun i top og bund",
-  "The top side only": "Kun i toppen",
-  "Top": "Top",
-  "Unset color": "Farve ikke valgt",
-  "Vertical align": "Vertikal placering",
-  "Width": "Bredde",
-  "Xinha cowardly refuses to delete the last cell in row.": "Du kan ikke slette den sidste celle i en række.",
-  "Xinha cowardly refuses to delete the last column in table.": "Du kan ikke slette den sidste kolonne i en tabel.",
-  "Xinha cowardly refuses to delete the last row in table.": "Du kan ikke slette den sidste række i en tabel.",
-  "percent": "procent",
-  "pixels": "pixel"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/de.js b/web/imcms/xinha/plugins/TableOperations/lang/de.js
deleted file mode 100644
index 68e249bdf1..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/de.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Raimund Meyer xinha@ray-of-light.org
-{
-  "Align": "Ausrichtung",
-  "All four sides": "Alle 4 Seiten",
-  "Background": "Hintergrund",
-  "Baseline": "Grundlinie",
-  "Border": "Rahmen",
-  "Borders": "Rahmen",
-  "Bottom": "Unten",
-  "Style [CSS]": "Style [CSS]",
-  "Caption": "Ãœberschrift",
-  "Cell Properties": "Zellenoptionen",
-  "Center": "Zentriert",
-  "Char": "Zeichen",
-  "Collapsed borders": "Rahmen fallen zusammen",
-  "Color": "Farbe",
-  "Description": "Beschreibung",
-  "FG Color": "Vordergrundfarbe",
-  "Float": "Float",
-  "Frames": "Rahmen",
-  "Height": "Höhe",
-  "How many columns would you like to merge?": "Wieviele Spalten wollen Sie verbinden?",
-  "How many rows would you like to merge?": "Wieviele Zeilen wollen Sie verbinden?",
-  "Image URL": "Bild-URL",
-  "Justify": "Blocksatz",
-  "Layout": "Layout",
-  "Left": "Links",
-  "Margin": "Rand",
-  "Middle": "Mitte",
-  "No rules": "Keine Gitterlinien",
-  "No sides": "Keine Ränder",
-  "None": "Keine",
-  "Padding": "Innenabstand",
-  "Please click into some cell": "Bitte eine Zelle auswählen",
-  "Right": "Rechts",
-  "Row Properties": "Zeilenoptionen",
-  "Rules will appear between all rows and columns": "Linien zwischen Zeilen und Spalten",
-  "Rules will appear between columns only": "Linien zwischen Spalten",
-  "Rules will appear between rows only": "Linien zwischen  Zeilen",
-  "Rules": "Linien",
-  "Spacing and padding": "Abstände",
-  "Spacing": "Abstand",
-  "Summary": "Zusammenfassung",
-  "Delete cell": "Zelle löschen",
-  "Insert cell after": "Zelle einfügen nach",
-  "Insert cell before": "Zelle einfügen vor",
-  "Merge cells": "Zellen zusammenfügen",
-  "Cell properties": "Zellenoptionen",
-  "Split cell": "Zellen teilen",
-  "Delete column": "Spalte löschen",
-  "Insert column after": "Spalte einfügen nach",
-  "Insert column before": "Spalte einfügen vor",
-  "Split column": "Spalte teilen",
-  "Delete row": "Reihe loeschen",
-  "Insert row before": "Reihe einfügen vor",
-  "Insert row after": "Reihe einfügen nach",
-  "Row properties": "Reiheneinstellungen",
-  "Split row": "Reihen aufteilen",
-  "Table properties": "Tabellenoptionen",
-  "Table Properties": "Tabellenoptionen",
-  "Text align": "Textausrichtung",
-  "The bottom side only": "Nur untere Seite",
-  "The left-hand side only": "Nur linke Seite",
-  "The right and left sides only": "Nur linke und rechte Seite",
-  "The right-hand side only": "Nur rechte Seite",
-  "The top and bottom sides only": "Nur obere und untere Seite",
-  "The top side only": "Nur obere Seite",
-  "Top": "Oben",
-  "Unset color": "Farbe entfernen",
-  "Vertical align": "Vertikale Ausrichtung",
-  "Width": "Breite",
-  "Xinha cowardly refuses to delete the last cell in row.": "Letzte Zelle in dieser Zeile kann nicht gelöscht werden",
-  "Xinha cowardly refuses to delete the last column in table.": "Letzte Spalte in dieser Tabelle kann nicht gelöscht werden",
-  "Xinha cowardly refuses to delete the last row in table.": "Letzte Reihe in dieser Tabelle kann nicht gelöscht werden",
-  "percent": "%",
-  "pixels": "Pixel",
-  "OK": "OK",
-  "Cancel": "Abbrechen"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/el.js b/web/imcms/xinha/plugins/TableOperations/lang/el.js
deleted file mode 100644
index 258e1fac9e..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/el.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "el", ENCODING: UTF-8
-// Author: Dimitris Glezos, dimitris@glezos.com
-{
-  "Align": "Στοίχηση",
-  "All four sides": "Και οι 4 πλευ�ές",
-  "Background": "Φόντο",
-  "Baseline": "Baseline",
-  "Border": "Πε�ίγ�αμμα",
-  "Borders": "Πε�ιγ�άμματα",
-  "Bottom": "Κάτω μέ�ος",
-  "Style [CSS]": "Στυλ [CSS]",
-  "Caption": "Λεζάντα",
-  "Cell Properties": "Ιδιότητες Κελιο�",
-  "Center": "Κέντ�ο",
-  "Char": "Χα�ακτή�ας",
-  "Collapsed borders": "Συμπτυγμένα πε�ιγ�άμματα",
-  "Color": "Χ�ώμα",
-  "Description": "Πε�ιγ�αφή",
-  "FG Color": "Χ�ώμα αντικειμένων",
-  "Float": "Float",
-  "Frames": "Frames",
-  "Height": "Ύψος",
-  "How many columns would you like to merge?": "Πόσες στήλες θέλετε να ενώσετε;",
-  "How many rows would you like to merge?": "Πόσες γ�αμμές θέλετε να ενώσετε;",
-  "Image URL": "URL εικόνας",
-  "Justify": "Πλή�ης στοίχηση",
-  "Layout": "Διάταξη",
-  "Left": "Α�ιστε�ά",
-  "Margin": "Πε�ιθώ�ιο",
-  "Middle": "Κέντ�ο",
-  "No rules": "Χω�ίς Γ�αμμές",
-  "No sides": "No sides",
-  "None": "Τίποτα",
-  "Padding": "Εσοχή",
-  "Please click into some cell": "Κάντε κλικ μέσα σε κάποιο κελί",
-  "Right": "Δεξιά",
-  "Row Properties": "Ιδιότητες Γ�αμμής",
-  "Rules will appear between all rows and columns": "Γ�αμμές θα εμφανίζονται μεταξ� όλων των γ�αμμών και στηλών",
-  "Rules will appear between columns only": "Γ�αμμές θα εμφανίζονται μόνο μεταξ� στηλών",
-  "Rules will appear between rows only": "Γ�αμμές θα εμφανίζονται μόνο μεταξ� γ�αμμών",
-  "Rules": "Γ�αμμές",
-  "Spacing and padding": "Αποστάσεις και εσοχές",
-  "Spacing": "Αποστάσεις",
-  "Summary": "Σ�νοψη",
-  "Delete cell": "Διαγ�αφή κελιο�",
-  "Insert cell after": "Εισαγωγή κελιο� μετά",
-  "Insert cell before": "Εισαγωγή κελιο� π�ιν",
-  "Merge cells": "Συγχώνευση κελιών",
-  "Cell properties": "Ιδιότητες κελιο�",
-  "Split cell": "Διαί�εση κελιο�",
-  "Delete column": "Διαγ�αφή στήλης",
-  "Insert column after": "Εισαγωγή στήλης μετά",
-  "Insert column before": "Εισαγωγή στήλης π�ιν",
-  "Split column": "Διαί�εση στήλης",
-  "Delete row": "Διαγ�αφή γ�αμμής",
-  "Insert row before": "Εισαγωγή γ�αμμής μετά",
-  "Insert row after": "Εισαγωγή γ�αμμής π�ιν",
-  "Row properties": "Ιδιότητες γ�αμμής",
-  "Split row": "Διαί�εση γ�αμμής",
-  "Table properties": "Ιδιότητες πίνακα",
-  "Table Properties": "Ιδιότητες πίνακα",
-  "Text align": "Στοίχηση κειμένου",
-  "The bottom side only": "Η κάτω πλευ�ά μόνο",
-  "The left-hand side only": "Η α�ιστε�ή πλευ�ά μόνο",
-  "The right and left sides only": "Οι δεξιές και α�ιστε�ές πλευ�ές μόνο",
-  "The right-hand side only": "Η δεξιά πλευ�ά μόνο",
-  "The top and bottom sides only": "Οι πάνω και κάτω πλευ�ές μόνο",
-  "The top side only": "Η πάνω πλευ�ά μόνο",
-  "Top": "Πάνω",
-  "Unset color": "Αναί�εση χ�ώματος",
-  "Vertical align": "Κατακό�υφη στοίχηση",
-  "Width": "Πλάτος",
-  "Xinha cowardly refuses to delete the last cell in row.": "Δεν μπο�εί να διαγ�αφεί το τελευταίο κελί σε μια γ�αμμή.",
-  "Xinha cowardly refuses to delete the last column in table.": "Δεν μπο�εί να διαγ�αφεί η τελευταία στήλη σε ένα πίνακα.",
-  "Xinha cowardly refuses to delete the last row in table.": "Δεν μπο�εί να διαγ�αφεί η τελευταία γ�αμμή σε ένα πίνακα.",
-  "percent": "τοις εκατόν",
-  "pixels": "pixels"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/fi.js b/web/imcms/xinha/plugins/TableOperations/lang/fi.js
deleted file mode 100644
index acb4ba448a..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/fi.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// I18N constants
-// LANG: "fi", ENCODING: UTF-8
-{
-  "Align": "Kohdistus",
-  "All four sides": "Kaikki neljä sivua",
-  "Background": "Tausta",
-  "Baseline": "Takaraja",
-  "Border": "Reuna",
-  "Borders": "Reunat",
-  "Bottom": "Alle",
-  "Style [CSS]": "Tyyli [CSS]",
-  "Caption": "Otsikko",
-  "Cell Properties": "Solun asetukset",
-  "Center": "Keskelle",
-  "Char": "Merkki",
-  "Collapsed borders": "Luhistetut reunat",
-  "Color": "Väri",
-  "Description": "Kuvaus",
-  "FG Color": "FG Väri",
-  "Frames": "Kehykset",
-  "Image URL": "Kuvan osoite",
-  "Layout": "Sommittelu",
-  "Left": "Vasen",
-  "Margin": "Marginaali",
-  "Middle": "Keskelle",
-  "No rules": "Ei viivoja",
-  "No sides": "Ei sivuja",
-  "Padding": "Palstantäyte",
-  "Right": "Oikea",
-  "Row Properties": "Rivin asetukset",
-  "Rules will appear between all rows and columns": "Viivat jokaisen rivin ja sarakkeen välillä",
-  "Rules will appear between columns only": "Viivat ainoastaan sarakkeiden välillä",
-  "Rules will appear between rows only": "Viivat ainoastaan rivien välillä",
-  "Rules": "Viivat",
-  "Spacing": "Palstatila",
-  "Summary": "Yhteenveto",
-  "Delete cell": "Poista solu",
-  "Insert cell after": "Lisää solu perään",
-  "Insert cell before": "Lisää solu ennen",
-  "Merge cells": "Yhdistä solut",
-  "Cell properties": "Solun asetukset",
-  "Split cell": "Jaa solu",
-  "Delete column": "Poista sarake",
-  "Insert column after": "Lisää sarake perään",
-  "Insert column before": "Lisää sarake ennen",
-  "Split column": "Jaa sarake",
-  "Delete row": "Poista rivi",
-  "Insert row before": "Lisää rivi yläpuolelle",
-  "Insert row after": "Lisää rivi alapuolelle",
-  "Row properties": "Rivin asetukset",
-  "Split row": "Jaa rivi",
-  "Table properties": "Taulukon asetukset",
-  "Top": "Ylös",
-  "Table Properties": "Taulukon asetukset",
-  "The bottom side only": "Ainoastaan alapuolelle",
-  "The left-hand side only": "Ainoastaan vasenreuna",
-  "The right and left sides only": "Oikea- ja vasenreuna",
-  "The right-hand side only": "Ainoastaan oikeareuna",
-  "The top and bottom sides only": "Ylä- ja alapuoli.",
-  "The top side only": "Ainoastaan yläpuoli",
-  "Vertical align": "Vertikaali kohdistus",
-  "Width": "Leveys",
-  "Xinha cowardly refuses to delete the last cell in row.": "Ei voida poistaa viimeistä solua rivistä.",
-  "Xinha cowardly refuses to delete the last column in table.": "Ei voida poistaa viimeistä saraketta taulusta.",
-  "Xinha cowardly refuses to delete the last row in table.": "Ei voida poistaa viimeistä riviä taulusta.",
-  "percent": "prosenttia",
-  "pixels": "pikseliä"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/fr.js b/web/imcms/xinha/plugins/TableOperations/lang/fr.js
deleted file mode 100644
index 436f3345a6..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/fr.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Align": "Aligner",
-  "All four sides": "Quatre cotés",
-  "Background": "Arrière plan",
-  "Baseline": "Ligne de base",
-  "Border": "Bordure",
-  "Borders": "Bordures",
-  "Bottom": "Bas",
-  "Style [CSS]": "Style [CSS]",
-  "Caption": "Étiquette",
-  "Cell Properties": "Propriétés de cellule",
-  "Center": "Centre",
-  "Char": "Charactère",
-  "Collapsed borders": "Bordure effondrés",
-  "Color": "Couleur",
-  "Description": "Description",
-  "FG Color": "Couleur de face",
-  "Float": "Flotteur",
-  "Frames": "Vues",
-  "Height": "Largeur",
-  "How many columns would you like to merge?": "Combien de colonnes voulez-vous fusionner?",
-  "How many rows would you like to merge?": "Combien de rangées voulez-vous fusionner?",
-  "Image URL": "URL pour l'image",
-  "Justify": "Justifié",
-  "Layout": "Arrangement",
-  "Left": "Gauche",
-  "Margin": "Marge",
-  "Middle": "Milieu",
-  "No rules": "Aucune règle",
-  "No sides": "Aucun côté",
-  "None": "Aucun",
-  "Padding": "Remplissage",
-  "Please click into some cell": "Cliquer sur une cellule",
-  "Right": "Droit",
-  "Row Properties": "Propriétés de rangée",
-  "Rules will appear between all rows and columns": "Règles entre les rangées et les cellules",
-  "Rules will appear between columns only": "Règles entre les colonnes seulement",
-  "Rules will appear between rows only": "Règles entre les rangées seulement",
-  "Rules": "Les règles",
-  "Spacing and padding": "Espacement et remplissage",
-  "Spacing": "Espacement",
-  "Summary": "Sommaire",
-  "Delete cell": "Supprimer une cellule",
-  "Insert cell after": "Insérer une cellule après",
-  "Insert cell before": "Insérer une cellule avant",
-  "Merge cells": "Fusionner les cellules",
-  "Cell properties": "Cell properties",
-  "Split cell": "Diviser la cellule",
-  "Delete column": "Supprimer la colonne",
-  "Insert column after": "Insérer une colonne après",
-  "Insert column before": "Insérer une colonne avant",
-  "Split column": "Diviser une colonne",
-  "Delete row": "Supprimer une rangée",
-  "Insert row before": "Insérer une rangée avant",
-  "Insert row after": "Insérer une rangée après",
-  "Row properties": "Propriétés de rangée",
-  "Split row": "Diviser la rangée",
-  "Table properties": "Propriétés de table",
-  "Table Properties": "Propriétés de table",
-  "Text align": "Alignement",
-  "The bottom side only": "Côté du bas seulement",
-  "The left-hand side only": "Côté gauche seulement",
-  "The right and left sides only": "Côté gauche et droit seulement",
-  "The right-hand side only": "Côté droit seulement",
-  "The top and bottom sides only": "Côté haut et bas seulement",
-  "The top side only": "Côté haut seulement",
-  "Top": "Haut",
-  "Unset color": "Enlever la couleur",
-  "Vertical align": "Vertical",
-  "Width": "Longeur",
-  "Xinha cowardly refuses to delete the last cell in row.": "Il est impossible de supprimer la dernière cellule de la rangée.",
-  "Xinha cowardly refuses to delete the last column in table.": "Il est impossible de supprimer la dernière colonne de la table.",
-  "Xinha cowardly refuses to delete the last row in table.": "Il est impossible de supprimer la dernière rangée de la table",
-  "percent": "%",
-  "pixels": "pixels"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/he.js b/web/imcms/xinha/plugins/TableOperations/lang/he.js
deleted file mode 100644
index 33b2bda2dd..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/he.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "he", ENCODING: UTF-8
-// Author: Liron Newman, http://www.eesh.net, <plastish at ultinet dot org>
-{
-  "Align": "ישור",
-  "All four sides": "כל �רבעת הצדדי�",
-  "Background": "רקע",
-  "Baseline": "קו בסיס",
-  "Border": "גבול",
-  "Borders": "גבולות",
-  "Bottom": "תחתון",
-  "Style [CSS]": "סגנון [CSS]",
-  "Caption": "כותרת",
-  "Cell Properties": "מ�פייני ת�",
-  "Center": "מרכז",
-  "Char": "תו",
-  "Collapsed borders": "גבולות קורסי�",
-  "Color": "צבע",
-  "Description": "תי�ור",
-  "FG Color": "צבע קידמה",
-  "Float": "מרחף",
-  "Frames": "מסגרות",
-  "Height": "גובה",
-  "How many columns would you like to merge?": "כמה טורי� ברצונך למזג?",
-  "How many rows would you like to merge?": "כמה שורות ברצונך למזג?",
-  "Image URL": "URL התמונה",
-  "Justify": "ישור",
-  "Layout": "פריסה",
-  "Left": "שמ�ל",
-  "Margin": "שוליי�",
-  "Middle": "�מצע",
-  "No rules": "לל� קווי�",
-  "No sides": "לל� צדדי�",
-  "None": "�ין",
-  "Padding": "ריווח בשוליי�",
-  "Please click into some cell": "�נ� לחץ על ת� כלשהו",
-  "Right": "ימין",
-  "Row Properties": "מ�פייני שורה",
-  "Rules will appear between all rows and columns": "קווי� יופיעו בין כל השורות והטורי�",
-  "Rules will appear between columns only": "קווי� יופיעו בין טורי� בלבד",
-  "Rules will appear between rows only": "קווי� יופיעו בין שורות בלבד",
-  "Rules": "קווי�",
-  "Spacing and padding": "ריווח ושוליי�",
-  "Spacing": "ריווח",
-  "Summary": "סיכו�",
-  "Delete cell": "מחק ת�",
-  "Insert cell after": "הכנס ת� �חרי",
-  "Insert cell before": "הכנס ת� לפני",
-  "Merge cells": "מזג ת�י�",
-  "Cell properties": "מ�פייני ת�",
-  "Split cell": "פצל ת�",
-  "Delete column": "מחק טור",
-  "Insert column after": "הכנס טור �חרי",
-  "Insert column before": "הכנס טור לפני",
-  "Split column": "פצל טור",
-  "Delete row": "מחק שורה",
-  "Insert row before": "הכנס שורה לפני",
-  "Insert row after": "הכנס שורה �חרי",
-  "Row properties": "מ�פייני שורה",
-  "Split row": "פצל שורה",
-  "Table properties": "מ�פייני טבלה",
-  "Table Properties": "מ�פייני טבלה",
-  "Text align": "ישור טקסט",
-  "The bottom side only": "הצד התחתון בלבד",
-  "The left-hand side only": "הצד השמ�לי בלבד",
-  "The right and left sides only": "הצדדי� הימני והשמ�לי בלבד",
-  "The right-hand side only": "הצד הימני בלבד",
-  "The top and bottom sides only": "הצדדי� העליון והתחתון בלבד",
-  "The top side only": "הצד העליון בלבד",
-  "Top": "עליון",
-  "Unset color": "צבע ל� נבחר",
-  "Vertical align": "יישור �נכי",
-  "Width": "רוחב",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha מסרב בפחדנות למחוק �ת הת� ה�חרון בשורה.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha מסרב בפחדנות למחוק �ת הטור ה�חרון בטבלה.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha מסרב בפחדנות למחוק �ת השורה ה�חרונה בטבלה.",
-  "percent": "�חוז",
-  "pixels": "פיקסלי�"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/it.js b/web/imcms/xinha/plugins/TableOperations/lang/it.js
deleted file mode 100644
index 8aad995f63..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/it.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "it", ENCODING: UTF-8
-// Author: Fabio Rotondo <fabio@rotondo.it>
-{
-  "Align": "Allinea",
-  "All four sides": "Tutti e quattro i lati",
-  "Background": "Sfondo",
-  "Baseline": "Allineamento",
-  "Border": "Bordo",
-  "Borders": "Bordi",
-  "Bottom": "Basso",
-  "Style [CSS]": "Stile [CSS]",
-  "Caption": "Titolo",
-  "Cell Properties": "Proprietà della Cella",
-  "Center": "Centra",
-  "Char": "Carattere",
-  "Collapsed borders": "Bordi chiusi",
-  "Color": "Colore",
-  "Description": "Descrizione",
-  "FG Color": "Colore Principale",
-  "Float": "Fluttuante",
-  "Frames": "Frames",
-  "Height": "Altezza",
-  "How many columns would you like to merge?": "Quante colonne vuoi unire?",
-  "How many rows would you like to merge?": "Quante righe vuoi unire?",
-  "Image URL": "URL dell'Immagine",
-  "Justify": "Justifica",
-  "Layout": "Layout",
-  "Left": "Sinistra",
-  "Margin": "Margine",
-  "Middle": "Centrale",
-  "No rules": "Nessun righello",
-  "No sides": "Nessun lato",
-  "None": "Nulla",
-  "Padding": "Padding",
-  "Please click into some cell": "Per favore, clicca in una cella",
-  "Right": "Destra",
-  "Row Properties": "Proprietà della Riga",
-  "Rules will appear between all rows and columns": "Le linee appariranno tra tutte le righe e colonne",
-  "Rules will appear between columns only": "Le linee appariranno solo tra le colonne",
-  "Rules will appear between rows only": "Le linee appariranno solo tra le righe",
-  "Rules": "Linee",
-  "Spacing and padding": "Spaziatura e Padding",
-  "Spacing": "Spaziatura",
-  "Summary": "Sommario",
-  "Delete cell": "Cancella cella",
-  "Insert cell after": "Inserisci cella dopo",
-  "Insert cell before": "Inserisci cella prima",
-  "Merge cells": "Unisci celle",
-  "Cell properties": "Proprietà della cella",
-  "Split cell": "Dividi cella",
-  "Delete column": "Cancella colonna",
-  "Insert column after": "Inserisci colonna dopo",
-  "Insert column before": "Inserisci colonna prima",
-  "Split column": "Dividi colonna",
-  "Delete row": "Cancella riga",
-  "Insert row before": "Inserisci riga prima",
-  "Insert row after": "Inserisci riga dopo",
-  "Row properties": "Proprietà della riga",
-  "Split row": "Dividi riga",
-  "Table properties": "Proprietà della Tabella",
-  "Table Properties": "Proprietà della Tabella",
-  "Text align": "Allineamento del Testo",
-  "The bottom side only": "Solo la parte inferiore",
-  "The left-hand side only": "Solo la parte sinistra",
-  "The right and left sides only": "Solo destra e sinistra",
-  "The right-hand side only": "Solo la parte destra",
-  "The top and bottom sides only": "Solo sopra e sotto",
-  "The top side only": "Solo la parte sopra",
-  "Top": "Alto",
-  "Unset color": "Rimuovi colore",
-  "Vertical align": "Allineamento verticale",
-  "Width": "Larghezza",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha si rifiuta codardamente di cancellare l'ultima cella nella riga.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha si rifiuta codardamente di cancellare l'ultima colonna nella tabella.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha si rifiuta codardamente di cancellare l'ultima riga nella tabella.",
-  "percent": "percento",
-  "pixels": "pixels"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/ja.js b/web/imcms/xinha/plugins/TableOperations/lang/ja.js
deleted file mode 100644
index 70238ceef8..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/ja.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Align": "行��",
-  "All four sides": "四辺���",
-  "Background": "背景",
-  "Baseline": "ベースライン",
-  "Border": "境界線",
-  "Borders": "境界線",
-  "Bottom": "下",
-  "Style [CSS]": "スタイル [CSS]",
-  "Caption": "キャプション",
-  "Cell Properties": "セルプロパティ",
-  "Center": "中央",
-  "Char": "文字",
-  "Collapsed borders": "隣接境界線を��る",
-  "Color": "色",
-  "Description": "説明",
-  "FG Color": "�景色",
-  "Float": "フロート",
-  "Frames": "外枠",
-  "Height": "高�",
-  "How many columns would you like to merge?": "何列������?",
-  "How many rows would you like to merge?": "何行������?",
-  "Image URL": "画�URL",
-  "Justify": "両端��",
-  "Layout": "レイアウト",
-  "Left": "å·¦",
-  "Margin": "é–“éš”",
-  "Middle": "中",
-  "No rules": "区切り��",
-  "No sides": "外枠��",
-  "None": "��",
-  "Padding": "余白",
-  "Please click into some cell": "��れ��セル内をクリック������",
-  "Please select the cells you want to merge.": "�����セルを複数�択������。",
-  "Right": "�",
-  "Row Properties": "行プロパティ",
-  "Rules will appear between all rows and columns": "����行間�列間�線を引�",
-  "Rules will appear between columns only": "列�間���線を引�",
-  "Rules will appear between rows only": "行�間���線を引�",
-  "Rules": "区切り",
-  "Spacing and padding": "間隔�余白",
-  "Spacing": "é–“éš”",
-  "Summary": "�約",
-  "Delete cell": "セル�削除",
-  "Insert cell after": "次�セルを挿入",
-  "Insert cell before": "��セルを挿入",
-  "Merge cells": "セル���",
-  "Cell properties": "セル�プロパティ",
-  "Split cell": "セル�分割",
-  "Delete column": "列�削除",
-  "Insert column after": "��列を挿入",
-  "Insert column before": "左�列を挿入",
-  "Split column": "列�分割",
-  "Delete row": "行�削除",
-  "Insert row before": "上�行を挿入",
-  "Insert row after": "下�行を挿入",
-  "Row properties": "行�プロパティ",
-  "Split row": "行�分割",
-  "Table properties": "テーブル�プロパティ",
-  "Table Properties": "テーブル�プロパティ",
-  "Text align": "水平�置",
-  "The bottom side only": "下辺��",
-  "The left-hand side only": "左辺��",
-  "The right and left sides only": "左�辺��",
-  "The right-hand side only": "�辺��",
-  "The top and bottom sides only": "上下辺��",
-  "The top side only": "上辺��",
-  "Top": "上",
-  "Unset color": "色指定解除",
-  "Vertical align": "垂直�置",
-  "Width": "å¹…",
-  "Xinha cowardly refuses to delete the last cell in row.": "安全�����行������残���る列�削除�拒��れ��。",
-  "Xinha cowardly refuses to delete the last column in table.": "安全�����テーブル������残���る列�削除�拒��れ��。",
-  "Xinha cowardly refuses to delete the last row in table.": "安全�����テーブル������残���る行�削除�拒��れ��。",
-  "percent": "パーセント",
-  "pixels": "ピクセル",
-  "OK": "OK",
-  "Cancel": "中止",
-  "CSS Style": "CSSスタイル",
-  "Frame and borders": "外枠�境界線"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/nb.js b/web/imcms/xinha/plugins/TableOperations/lang/nb.js
deleted file mode 100644
index a129262d1e..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/nb.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
-// translated into Norwegian: ses@online.no  11.11.03
-{
-  "Align": "Juster",
-  "All four sides": "Alle fire sider",
-  "Background": "Bakgrund",
-  "Baseline": "Grunnlinje",
-  "Border": "Kantlinje",
-  "Borders": "Kantlinjer",
-  "Bottom": "Bunn",
-  "Style [CSS]": "Stil [CSS]",
-  "Caption": "Overskrift",
-  "Cell Properties": "Celleegenskaper",
-  "Center": "Sentrer",
-  "Char": "Tegn",
-  "Collapsed borders": "Fjern kantlinjer",
-  "Color": "Farge",
-  "Description": "Beskrivelse",
-  "FG Color": "FG farge",
-  "Float": "Flytende",
-  "Frames": "rammer",
-  "Height": "Høyde",
-  "How many columns would you like to merge?": "Hvor mange kolonner vil du slå sammen?",
-  "How many rows would you like to merge?": "Hvor mange rader vil du slå sammen?",
-  "Image URL": "Bildets URL",
-  "Justify": "Juster",
-  "Layout": "Layout",
-  "Left": "Venstre",
-  "Margin": "Marg",
-  "Middle": "Midten",
-  "No rules": "Ingen linjal",
-  "No sides": "Ingen sider",
-  "None": "Ingen",
-  "Padding": "Luft",
-  "Please click into some cell": "Klikk i en eller annen celle",
-  "Right": "Høyre",
-  "Row Properties": "Egenskaper for rad",
-  "Rules will appear between all rows and columns": "Linjer vil synes mellom alle rader og kolonner",
-  "Rules will appear between columns only": "Linjer vil synes kun mellom kolonner",
-  "Rules will appear between rows only": "Linjer vil synes kun mellom rader",
-  "Rules": "Linjer",
-  "Spacing and padding": "Luft",
-  "Spacing": "Luft",
-  "Summary": "Sammendrag",
-  "Delete cell": "Slett celle",
-  "Insert cell after": "Sett inn celle etter",
-  "Insert cell before": "Sett inn celle foran",
-  "Merge cells": "Slå sammen celler",
-  "Cell properties": "Egenskaper for celle",
-  "Split cell": "Del celle",
-  "Delete column": "Slett kolonne",
-  "Insert column after": "Skyt inn kolonne etter",
-  "Insert column before": "Skyt inn kolonne før",
-  "Split column": "Del kolonne",
-  "Delete row": "Slett rad",
-  "Insert row before": "Skyt inn rad foran",
-  "Insert row after": "Skyt inn rad etter",
-  "Row properties": "Egenskaper for rad",
-  "Split row": "Del rad",
-  "Table properties": "Tabellegenskaper",
-  "Table Properties": "Tabellegenskaper",
-  "Text align": "Juster tekst",
-  "The bottom side only": "Bunnen kun",
-  "The left-hand side only": "Venstresiden kun",
-  "The right and left sides only": "Høyre- og venstresiden kun",
-  "The right-hand side only": "Høyresiden kun",
-  "The top and bottom sides only": "The top and bottom sides only",
-  "The top side only": "Overkanten kun",
-  "Top": "Overkant",
-  "Unset color": "Ikke-bestemt farge",
-  "Vertical align": "Vertikal justering",
-  "Width": "Bredde",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha nekter å slette siste cellen i tabellen.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha nekter å slette siste kolonnen i tabellen.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha nekter å slette siste raden i tabellen.",
-  "percent": "prosent",
-  "pixels": "billedpunkter"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/nl.js b/web/imcms/xinha/plugins/TableOperations/lang/nl.js
deleted file mode 100644
index ab0191dede..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/nl.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Michel Weegeerink (info@mmc-shop.nl), http://mmc-shop.nl
-{
-  "Align": "Uitlijning",
-  "All four sides": "Alle 4 zijden",
-  "Background": "Achtergrond",
-  "Baseline": "Basis",
-  "Border": "Rand",
-  "Borders": "Randen",
-  "Bottom": "Onder",
-  "Style [CSS]": "CSS Style",
-  "Caption": "Opmerking",
-  "Cell Properties": "Celeigenschappen",
-  "Center": "Centreren",
-  "Char": "Karakter",
-  "Collapsed borders": "Geen randen",
-  "Color": "Kleur",
-  "Description": "Omschrijving",
-  "FG Color": "Voorgrond",
-  "Float": "Zwevend",
-  "Frames": "Frames",
-  "Height": "Hoogte",
-  "How many columns would you like to merge?": "Hoeveel kolommen wilt u samenvoegen?",
-  "How many rows would you like to merge?": "Hoeveel rijen wilt u samenvoegen?",
-  "Image URL": "Afbeelding URL",
-  "Justify": "Uitvullen",
-  "Layout": "Opmaak",
-  "Left": "Links",
-  "Margin": "Marge",
-  "Middle": "Midden",
-  "No rules": "Geen regels",
-  "No sides": "Geen zijlijnen",
-  "None": "Geen",
-  "Padding": "Celmarge",
-  "Please click into some cell": "Klik in een cel a.u.b.",
-  "Right": "Rechts",
-  "Row Properties": "Rijeigenschappen",
-  "Rules will appear between all rows and columns": "Regels verschijnen tussen alle rijen en kolommen",
-  "Rules will appear between columns only": "Regels verschijnen enkel tussen de kolommen",
-  "Rules will appear between rows only": "Regels verschijnen enkel tussen de rijen",
-  "Rules": "Regels",
-  "Spacing and padding": "Celmarge en afstand tussen cellen",
-  "Spacing": "marge",
-  "Summary": "Overzicht",
-  "Delete cell": "Cel verwijderen",
-  "Insert cell after": "Voeg cel toe achter",
-  "Insert cell before": "Voeg cel toe voor",
-  "Merge cells": "Cellen samenvoegen",
-  "Cell properties": "Celeigenschappen",
-  "Split cell": "Cel splitsen",
-  "Delete column": "Kolom verwijderen",
-  "Insert column after": "Kolom invoegen achter",
-  "Insert column before": "Kolom invoegen voor",
-  "Split column": "Kolom splitsen",
-  "Delete row": "Rij verwijderen",
-  "Insert row before": "Rij invoegen boven",
-  "Insert row after": "Rij invoegen onder",
-  "Row properties": "Rij eigenschappen",
-  "Split row": "Rij splitsen",
-  "Table properties": "Tabel eigenschappen",
-  "Table Properties": "Tabel eigenschappen",
-  "Text align": "Text uitlijning",
-  "The bottom side only": "Enkel aan de onderkant",
-  "The left-hand side only": "Enkel aan de linkerkant",
-  "The right and left sides only": "Enkel aan de linker en rechterkant",
-  "The right-hand side only": "Enkel aan de rechterkant",
-  "The top and bottom sides only": "Enkel aan de bovenen onderkant",
-  "The top side only": "Enkel aan de bovenkant",
-  "Top": "Boven",
-  "Unset color": "Wis kleur",
-  "Vertical align": "Vertikale uitlijning",
-  "Width": "Breedte",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha kan de laatste cel in deze tabel niet verwijderen.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha kan de laatste kolom in deze tabel niet verwijderen.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha kan de laatste rij in deze tabel niet verwijderen.",
-  "percent": "procent",
-  "pixels": "pixels"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/no.js b/web/imcms/xinha/plugins/TableOperations/lang/no.js
deleted file mode 100644
index 1d05b099f1..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/no.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
-// translated into Norwegian: ses@online.no  11.11.03
-{
-  "Align": "Juster",
-  "All four sides": "Alle fire sider",
-  "Background": "Bakgrund",
-  "Baseline": "Grunnlinje",
-  "Border": "Kantlinje",
-  "Borders": "Kantlinjer",
-  "Bottom": "Bunn",
-  "Style [CSS]": "Stil [CSS]",
-  "Caption": "Overskrift",
-  "Cell Properties": "Celleegenskaper",
-  "Center": "Sentrer",
-  "Char": "Tegn",
-  "Collapsed borders": "Fjern kantlinjer",
-  "Color": "Farge",
-  "Description": "Beskrivelse",
-  "FG Color": "FG farge",
-  "Float": "Flytende",
-  "Frames": "rammer",
-  "Height": "Høyde",
-  "How many columns would you like to merge?": "Hvor mange kolonner vil du slå sammen?",
-  "How many rows would you like to merge?": "Hvor mange rader vil du slå sammen?",
-  "Image URL": "Bildets URL",
-  "Justify": "Juster",
-  "Layout": "Layout",
-  "Left": "Venstre",
-  "Margin": "Marg",
-  "Middle": "Midten",
-  "No rules": "Ingen linjal",
-  "No sides": "Ingen sider",
-  "None": "Ingen",
-  "Padding": "Luft",
-  "Please click into some cell": "Klikk i en eller annen celle",
-  "Right": "Høyre",
-  "Row Properties": "Egenskaper for rad",
-  "Rules will appear between all rows and columns": "Linjer vil synes mellom alle rader og kolonner",
-  "Rules will appear between columns only": "Linjer vil synes kun mellom kolonner",
-  "Rules will appear between rows only": "Linjer vil synes kun mellom rader",
-  "Rules": "Linjer",
-  "Spacing and padding": "Luft",
-  "Spacing": "Luft",
-  "Summary": "Sammendrag",
-  "Delete cell": "Slett celle",
-  "Insert cell after": "Sett inn celle etter",
-  "Insert cell before": "Sett inn celle foran",
-  "Merge cells": "Slå sammen celler",
-  "Cell properties": "Egenskaper for celle",
-  "Split cell": "Del celle",
-  "Delete column": "Slett kolonne",
-  "Insert column after": "Skyt inn kolonne etter",
-  "Insert column before": "Skyt inn kolonne før",
-  "Split column": "Del kolonne",
-  "Delete row": "Slett rad",
-  "Insert row before": "Skyt inn rad foran",
-  "Insert row after": "Skyt inn rad etter",
-  "Row properties": "Egenskaper for rad",
-  "Split row": "Del rad",
-  "Table properties": "Tabellegenskaper",
-  "Table Properties": "Tabellegenskaper",
-  "Text align": "Juster tekst",
-  "The bottom side only": "Bunnen kun",
-  "The left-hand side only": "Venstresiden kun",
-  "The right and left sides only": "Høyre- og venstresiden kun",
-  "The right-hand side only": "Høyresiden kun",
-  "The top and bottom sides only": "The top and bottom sides only",
-  "The top side only": "Overkanten kun",
-  "Top": "Overkant",
-  "Unset color": "Ikke-bestemt farge",
-  "Vertical align": "Vertikal justering",
-  "Width": "Bredde",
-  "HTMLArea cowardly refuses to delete the last cell in row.": "HTMLArea nekter å slette siste cellen i tabellen.",
-  "HTMLArea cowardly refuses to delete the last column in table.": "HTMLArea nekter å slette siste kolonnen i tabellen.",
-  "HTMLArea cowardly refuses to delete the last row in table.": "HTMLArea nekter å slette siste raden i tabellen.",
-  "percent": "prosent",
-  "pixels": "billedpunkter"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/pl.js b/web/imcms/xinha/plugins/TableOperations/lang/pl.js
deleted file mode 100644
index f626f69557..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/pl.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// I18N constants
-// LANG: "pl", ENCODING: UTF-8
-// translated: Krzysztof Kotowicz koto@webworkers.pl
-{
-  "Align": "Wyrównanie",
-  "All four sides": "Wszystkie 4 strony",
-  "Background": "TÅ‚o",
-  "Baseline": "Linia bazowa",
-  "Border": "Ramka",
-  "Borders": "Ramki",
-  "Bottom": "Dół",
-  "Style [CSS]": "Styl [CSS]",
-  "CSS Style": "Styl CSS",
-  "Caption": "Podpis",
-  "Cell Properties": "Właściwości komórki",
-  "Center": "Åšrodek",
-  "Char": "Znak",
-  "Collapsed borders": "Ramki skolapsowane",
-  "Color": "Kolor",
-  "Description": "Opis",
-  "FG Color": "Kolor czcionek",
-  "Float": "Opływanie",
-  "Frames": "Ramki zewn.",
-  "Frame and borders": "Obramowania",
-  "Height": "Wysokość",
-  "How many columns would you like to merge?": "Ile kolumn chcesz scalić?",
-  "How many rows would you like to merge?": "Ile wierszy chcesz scalić?",
-  "Image URL": "URL obrazka",
-  "Justify": "Wyjustuj",
-  "Layout": "Layout",
-  "Left": "Lewo",
-  "Margin": "Margines",
-  "Middle": "Åšrodek",
-  "No rules": "Bez wewnętrzych",
-  "No sides": "Bez ramek",
-  "None": "Brak",
-  "Padding": "Wcięcia",
-  "Please click into some cell": "Kliknij w jakąś komórkę",
-  "Right": "Prawo",
-  "Row Properties": "Właściwości wiersza",
-  "Rules will appear between all rows and columns": "Linie będą widoczne pomiędzy kolumnami i wierszami",
-  "Rules will appear between columns only": "Linie będą widoczne tylko pomiędzy kolumnami",
-  "Rules will appear between rows only": "Linie będą widoczne tylko pomiędzy wierszami",
-  "Rules": "Linie wewn.",
-  "Spacing and padding": "Spacjowanie",
-  "Spacing": "Odstęp",
-  "Summary": "Podsumowanie",
-  "Delete cell": "Usuń komórkę",
-  "Insert cell after": "Wstaw komórkę po",
-  "Insert cell before": "Wstaw komórkę przed",
-  "Merge cells": "Scal komórki",
-  "Cell properties": "Właściwości komórki",
-  "Split cell": "Rozdziel komórkę",
-  "Delete column": "Usuń kolumnę",
-  "Insert column after": "Wstaw kolumnÄ™ po",
-  "Insert column before": "Wstaw kolumnÄ™ przed",
-  "Split column": "Rozdziel kolumnÄ™",
-  "Delete row": "Usuń wiersz",
-  "Insert row before": "Wstaw wiersz przed",
-  "Insert row after": "Wstaw wiersz po",
-  "Row properties": "Właściwości wiersza",
-  "Split row": "Rozdziel wiersz",
-  "Table properties": "Właściwości tabeli",
-  "Table Properties": "Właściwości tabeli",
-  "Text align": "Wyr. w poziomie",
-  "The bottom side only": "Tylko dolna linia",
-  "The left-hand side only": "Tylko lewa linia",
-  "The right and left sides only": "Lewa i prawa linia",
-  "The right-hand side only": "Tylko prawa linia",
-  "The top and bottom sides only": "Górna i dolna linia",
-  "The top side only": "Tylko górna linia",
-  "Top": "Góra",
-  "Unset color": "Usuń kolor",
-  "Vertical align": "Wyr. w pionie",
-  "Width": "Szerokość",
-  "Xinha cowardly refuses to delete the last cell in row.": "Nie możesz skasować ostatniej komórki w wierszu.",
-  "Xinha cowardly refuses to delete the last column in table.": "Nie możesz skasować ostatniej kolumny w tabeli.",
-  "Xinha cowardly refuses to delete the last row in table.": "Nie możesz skasować ostatniego wiersza w tabeli.",
-  "percent": "%",
-  "pixels": "pikseli",
-  "OK": "OK",
-  "Cancel": "Anuluj"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/pt_br.js b/web/imcms/xinha/plugins/TableOperations/lang/pt_br.js
deleted file mode 100644
index 8ac09dd7da..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/pt_br.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "Align": "Alinhamento",
-  "All four sides": "todos os quatro lados",
-  "Background": "Fundo",
-  "Baseline": "Linha de base",
-  "Border": "Bordar",
-  "Borders": "Bordas",
-  "Bottom": "Botão",
-  "CSS Style": "Estilo (CSS)",
-  "Cancel": "Cancelar",  
-  "Style [CSS]": "Estilo [CSS]",
-  "Caption": "Captação",
-  "Cell Properties": "Propriedades da célula",
-  "Cells down": "Células para baixo",
-  "Cells to the right, and": "Células para direita, e",
-  "Center": "Centralizar",
-  "Char": "Caracter",
-  "Collapsed borders": "Bordas fechadas",
-  "Color": "Cores",
-  "Columns": "Colunas",
-  "Description": "Descrição",
-  "FG Color": "Cor de primeiro plano",
-  "Float": "Flutuante",
-  "Frame and borders": "Frames e bordas",
-  "Frames": "Frames",
-  "Height": "Altura",
-  "How many columns would you like to merge?": "Quantas colunas você deseja mesclar?",
-  "How many rows would you like to merge?": "Quantas linhas você deseja mesclar?",
-  "Image URL": "URL da imagem",
-  "Justify": "Justificado",
-  "Layout": "Layout",
-  "Left": "Esquerda",
-  "Margin": "Margem",
-  "Merge Cells": "Mesclar Células",
-  "Merge current cell with:": "Mesclar célula atual com:",	  
-  "Middle": "Meio",
-  "No rules": "Sem regras",
-  "No sides": "Sem lados",
-  "None": "Nenhum",
-  "OK": "OK",  
-  "Padding": "Espaço interno",
-  "Please click into some cell": "Por favor, clique em alguma célula",
-  "Right": "Direita",
-  "Row Properties": "Propriedades da Linha",
-  "Rows": "Linhas",
-  "Rules": "Regras",  
-  "Rules will appear between all rows and columns": "As Regras apareceram entre todas as linhas e colunas",
-  "Rules will appear between columns only": "Regras apareceram somente nas colunas",
-  "Rules will appear between rows only": "Regras apareceram somente nas linhas",
-  "Rules": "Regras",
-  "Spacing": "Espaçamento",
-	"Spacing and padding": "Espaçamentos",
-  "Summary": "Sumário",
-  "Table Properties": "Propriedades da Tabela",
-  "Text align": "Alinhamento do texto",  
-  "The bottom side only": "Somente na parte inferior",
-  "The left-hand side only": "Somente na parte esquerda",
-  "The right and left sides only": "Somente nas parte direita e esquerda",
-  "The right-hand side only": "Somente na parte direita",
-  "The top and bottom sides only": "Somente na parte inferior e superior",
-  "The top side only": "Somente na parte superior",
-  "Top": "Topo",
-  "Unset color": "Cor não definida",
-  "Vertical align": "Alinhamento vertical",
-  "Width": "Largura",	
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha recusa-se a apagar a última célula na linha",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha recusa-se a apagar a última coluna da tabela",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha recusa-se a apagar a última linha da tabela",
-  "percent": "%",
-  "pixels": "Pixel",
-  
-  // not find with lc_parse_strings.php	
-	"Delete cell": "Apagar célula",
-  "Insert cell after": "Inserir célula antes",
-  "Insert cell before": "Inserir célula depois",
-  "Split cell": "Separar célula",
-  "Delete column": "Apagar coluna",
-  "Insert column after": "Inserir coluna antes",
-  "Insert column before": "Inserir coluna depois",
-  "Split column": "Separar colunas",
-  "Delete row": "Apagar linha",
-  "Insert row before": "Inserir linha antes",
-  "Insert row after": "Inserir linha depois",
-  "Split row": "Separar linhas"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/ro.js b/web/imcms/xinha/plugins/TableOperations/lang/ro.js
deleted file mode 100644
index 69b5bdc58e..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/ro.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "ro", ENCODING: UTF-8
-// Author: Mihai Bazon, http://dynarch.com/mishoo
-{
-  "Align": "Aliniere",
-  "All four sides": "Toate părţile",
-  "Background": "Fundal",
-  "Baseline": "Baseline",
-  "Border": "Chenar",
-  "Borders": "Chenare",
-  "Bottom": "Jos",
-  "Style [CSS]": "Stil [CSS]",
-  "Caption": "Titlu de tabel",
-  "Cell Properties": "Proprietăţile celulei",
-  "Center": "Centru",
-  "Char": "Caracter",
-  "Collapsed borders": "Chenare asimilate",
-  "Color": "Culoare",
-  "Description": "Descriere",
-  "FG Color": "Culoare text",
-  "Float": "Poziţie",
-  "Frames": "Chenare",
-  "Height": "Înălţimea",
-  "How many columns would you like to merge?": "Câte coloane vrei să uneşti?",
-  "How many rows would you like to merge?": "Câte linii vrei să uneşti?",
-  "Image URL": "URL-ul imaginii",
-  "Justify": "Justify",
-  "Layout": "Aranjament",
-  "Left": "Stânga",
-  "Margin": "Margine",
-  "Middle": "Mijloc",
-  "No rules": "Fără linii",
-  "No sides": "Fără părţi",
-  "None": "Nimic",
-  "Padding": "Spaţiere",
-  "Please click into some cell": "Vă rog să daţi click într-o celulă",
-  "Right": "Dreapta",
-  "Row Properties": "Proprietăţile liniei",
-  "Rules will appear between all rows and columns": "Vor apărea linii între toate rândurile şi coloanele",
-  "Rules will appear between columns only": "Vor apărea doar linii verticale",
-  "Rules will appear between rows only": "Vor apărea doar linii orizontale",
-  "Rules": "Linii",
-  "Spacing and padding": "Spaţierea",
-  "Spacing": "ÃŽntre celule",
-  "Summary": "Sumar",
-  "Delete cell": "Åžterge celula",
-  "Insert cell after": "Inserează o celulă la dreapta",
-  "Insert cell before": "Inserează o celulă la stânga",
-  "Merge cells": "UneÅŸte celulele",
-  "Cell properties": "Proprietăţile celulei",
-  "Split cell": "ÃŽmparte celula",
-  "Delete column": "Åžterge coloana",
-  "Insert column after": "Inserează o coloană la dreapta",
-  "Insert column before": "Inserează o coloană la stânga",
-  "Split column": "ÃŽmparte coloana",
-  "Delete row": "Şterge rândul",
-  "Insert row before": "Inserează un rând înainte",
-  "Insert row after": "Inserează un rând după",
-  "Row properties": "Proprietăţile rândului",
-  "Split row": "Împarte rândul",
-  "Table properties": "Proprietăţile tabelei",
-  "Table Properties": "Proprietăţile tabelei",
-  "Text align": "Aliniere",
-  "The bottom side only": "Doar partea de jos",
-  "The left-hand side only": "Doar partea din stânga",
-  "The right and left sides only": "Partea din stânga şi cea din dreapta",
-  "The right-hand side only": "Doar partea din dreapta",
-  "The top and bottom sides only": "Partea de sus si cea de jos",
-  "The top side only": "Doar partea de sus",
-  "Top": "Sus",
-  "Unset color": "Dezactivează culoarea",
-  "Vertical align": "Aliniere pe verticală",
-  "Width": "Lăţime",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha refuză cu laşitate să şteargă ultima celulă din rând.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha refuză cu laşitate să şteargă ultima coloamă din tabela.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha refuză cu laşitate să şteargă ultimul rând din tabela.",
-  "percent": "procente",
-  "pixels": "pixeli"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/ru.js b/web/imcms/xinha/plugins/TableOperations/lang/ru.js
deleted file mode 100644
index 74db3d7853..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/ru.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "ru", ENCODING: UTF-8
-// Author: Andrei Blagorazumov, a@fnr.ru
-{
-  "Align": "Выравнивание",
-  "All four sides": "В�е 4 �тороны",
-  "Background": "Фон",
-  "Baseline": "Базова� лини�",
-  "Border": "Рамка",
-  "Borders": "Рамки",
-  "Bottom": "�из",
-  "Style [CSS]": "Стиль [CSS]",
-  "Caption": "Заголовок",
-  "Cell Properties": "Свой�тва �чеек",
-  "Center": "Центр",
-  "Char": "Символ",
-  "Collapsed borders": "�акладывающие�� рамки",
-  "Color": "Цвет",
-  "Description": "Опи�ание",
-  "FG Color": "Цвет переднего плана",
-  "Float": "Обтекание",
-  "Frames": "Фреймы",
-  "Height": "Вы�ота",
-  "How many columns would you like to merge?": "Сколько �толбцов вы хотите объединить?",
-  "How many rows would you like to merge?": "Сколько �трок вы хотите объединить?",
-  "Image URL": "URL картинки",
-  "Justify": "По правому краю",
-  "Layout": "Ра�кладка",
-  "Left": "Лево",
-  "Margin": "От�туп",
-  "Middle": "Середина",
-  "No rules": "�ет линейки",
-  "No sides": "�ет �торон",
-  "None": "�ичего",
-  "Padding": "Пол�",
-  "Please click into some cell": "Пожалуй�та щелкните в некоторые �чейки",
-  "Right": "Право",
-  "Row Properties": "Свой�тва �трок",
-  "Rules will appear between all rows and columns": "Линейки по�в�т�� между в�еми �троками и �толбцами",
-  "Rules will appear between columns only": "Линейки по�в�т�� только между �толбцами",
-  "Rules will appear between rows only": "Линейки по�в�т�� только между �троками",
-  "Rules": "Линейки",
-  "Spacing and padding": "Пол� и от�тупы",
-  "Spacing": "От�тупы",
-  "Summary": "Сводка",
-  "Delete cell": "Удалить �чейку",
-  "Insert cell after": "В�тавить �чейку по�ле",
-  "Insert cell before": "В�тавить �чейку до",
-  "Merge cells": "Объединить �чейки",
-  "Cell properties": "Свой�тва �чеек",
-  "Split cell": "Разделить �чейку",
-  "Delete column": "Удалить �толбец",
-  "Insert column after": "В�тавить �толбец по�ле",
-  "Insert column before": "В�тавить �толбец до",
-  "Split column": "Разделить �толбец",
-  "Delete row": "Удалить �троку",
-  "Insert row before": "В�тавить �троку до",
-  "Insert row after": "В�тавить �троку по�ле",
-  "Row properties": "Свой�тва �троки",
-  "Split row": "Разделить �троку",
-  "Table properties": "Свой�тва таблиц",
-  "Table Properties": "Свой�тва таблиц",
-  "Text align": "Выравнивание те�та",
-  "The bottom side only": "Только нижний край",
-  "The left-hand side only": "Только левый край",
-  "The right and left sides only": "Только левый и правый край",
-  "The right-hand side only": "Только правый край",
-  "The top and bottom sides only": "Только верхний и нижний край",
-  "The top side only": "Только верхний край",
-  "Top": "Верх",
-  "Unset color": "Отменить цвет",
-  "Vertical align": "Вертикальное  выравнивание",
-  "Width": "Ширина",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha отказала�ь удал�ть по�леднюю �чейку в �троке.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha отказала�ь удал�ть по�ледний �толбец в таблице.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha отказала�ь удал�ть по�леднюю �троку в таблице.",
-  "percent": "процентов",
-  "pixels": "пик�елей"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/TableOperations/lang/sv.js b/web/imcms/xinha/plugins/TableOperations/lang/sv.js
deleted file mode 100755
index 0ea6f5e338..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/lang/sv.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// I18N constants
-// LANG: "sv" (Swedish), ENCODING: UTF-8
-// translated into Swedish: Erik Dalén, <dalen@jpl.se>
-{
-  "Align": "Justera",
-  "All four sides": "Alla fyra sidor",
-  "Background": "Bakgrund",
-  "Baseline": "Baslinje",
-  "Border": "Kantlinje",
-  "Borders": "Kantlinjer",
-  "Bottom": "Botten",
-  "Style [CSS]": "Stil [CSS]",
-  "Caption": "Överskrift",
-  "Cell Properties": "Cellegenskaper",
-  "Center": "Centrera",
-  "Char": "Tecken",
-  "Collapsed borders": "Osynliga kantlinjer",
-  "Color": "Färg",
-  "Description": "Beskrivning",
-  "FG Color": "Förgrundsfärg",
-  "Float": "Flytande",
-  "Frames": "ramar",
-  "Height": "Höjd",
-  "How many columns would you like to merge?": "Hur många kolumner vill du slå samman?",
-  "How many rows would you like to merge?": "Hur många rader vill du slå samman?",
-  "Image URL": "Bildens URL",
-  "Justify": "Justera",
-  "Layout": "Layout",
-  "Left": "Venster",
-  "Margin": "Marginal",
-  "Middle": "Mitten",
-  "No rules": "Ingen linjal",
-  "No sides": "Inga sidor",
-  "None": "Ingen",
-  "Padding": "Luft",
-  "Please click into some cell": "Klicka i valfri cell",
-  "Right": "Höger",
-  "Row Properties": "Egenskaper for rad",
-  "Rules will appear between all rows and columns": "Linjaler kommer att synas mellan alla rader och kolumner",
-  "Rules will appear between columns only": "Linjaler kommer enbart synas mellan kolumner",
-  "Rules will appear between rows only": "Linjaler kommer enbart synas mellan rader",
-  "Rules": "Linjaler",
-  "Spacing and padding": "Mellanrum och luft",
-  "Spacing": "Mellanrum",
-  "Summary": "Sammandrag",
-  "Delete cell": "Radera cell",
-  "Insert cell after": "Infoga cell efter",
-  "Insert cell before": "Infoga cell före",
-  "Merge cells": "Slå samman celler",
-  "Cell properties": "Egenskaper for cell",
-  "Split cell": "Dela cell",
-  "Delete column": "Radera kolumn",
-  "Insert column after": "Infoga kolumn efter",
-  "Insert column before": "Infoga kolumn före",
-  "Split column": "Dela kolumn",
-  "Delete row": "Radera rad",
-  "Insert row before": "Infoga rad före",
-  "Insert row after": "Infoga rad efter",
-  "Row properties": "Egenskaper för rad",
-  "Split row": "Dela rad",
-  "Table properties": "Tabellegenskaper",
-  "Table Properties": "Tabellegenskaper",
-  "Text align": "Justera text",
-  "The bottom side only": "Nederkanten enbart",
-  "The left-hand side only": "Vänstersidan enbart",
-  "The right and left sides only": "Höger- och vänstersidan enbart",
-  "The right-hand side only": "Högersidan enbart",
-  "The top and bottom sides only": "Över- och nederkanten enbart",
-  "The top side only": "Överkanten enbart",
-  "Top": "Överkant",
-  "Unset color": "Obestämd färg",
-  "Vertical align": "Vertikal justering",
-  "Width": "Bredd",
-  "Xinha cowardly refuses to delete the last cell in row.": "Xinha nekar att radera sista cellen i tabellen.",
-  "Xinha cowardly refuses to delete the last column in table.": "Xinha nekar att radera sista kolumnen i tabellen.",
-  "Xinha cowardly refuses to delete the last row in table.": "Xinha nekar att radera sista raden i tabellen.",
-  "percent": "procent",
-  "pixels": "bildpunkter"
-};
diff --git a/web/imcms/xinha/plugins/TableOperations/popups/merge_cells.html b/web/imcms/xinha/plugins/TableOperations/popups/merge_cells.html
deleted file mode 100755
index f893b3ee96..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/popups/merge_cells.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>Merge Cells</title>
-
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<style type="text/css">
-  html,body {width: 400px; height: 150px;}
-</style>
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-function Init() {
-  window.resizeTo(400,170);
-	__dlg_init();
- 	document.getElementById("f_cols").focus();
-}
-
-function onOK() {
-  var param = new Object();
-  param["f_cols"] = document.getElementById("f_cols").value;
-  param["f_rows"] = document.getElementById("f_rows").value;
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-
-</head>
-
-<body onload="Init()">
-<form action="" method="get">
-<table width="100%">
-<tr>
-  <td colspan="2">
-	<div class="title">Merge Cells</div>
-  </td>
-</tr>
-<tr>
-  <td colspan="2">
-	Merge current cell with:
-  </td>
-</tr>
-<tr>
-  <td align="right" width="30%"><input type="text" name="cols" value="0" id="f_cols" size="4" title="Columns" /></td>
-  <td width="70%">Cells to the right, and</td>
-</tr>
-<tr>
-  <td align="right"><input type="text" name="rows" value="0" id="f_rows" size="4" title="Rows" /></td>
-  <td>Cells down</td>
-</tr>
-<tr>
-  <td colspan="2" align="right">
-    <hr />
-    <button type="button" name="ok" onclick="return onOK();">OK</button>
-    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-  </td>
-</tr>
-</table>
-</form>
-
-</body>
-</html>
diff --git a/web/imcms/xinha/plugins/TableOperations/table-operations.js b/web/imcms/xinha/plugins/TableOperations/table-operations.js
deleted file mode 100644
index ef5575dc38..0000000000
--- a/web/imcms/xinha/plugins/TableOperations/table-operations.js
+++ /dev/null
@@ -1,1220 +0,0 @@
-// Table Operations Plugin for HTMLArea-3.0
-// Implementation by Mihai Bazon.  Sponsored by http://www.bloki.com
-//
-// htmlArea v3.0 - Copyright (c) 2002 interactivetools.com, inc.
-// This notice MUST stay intact for use (see license.txt).
-//
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon for InteractiveTools.
-//   http://dynarch.com/mishoo
-//
-// $Id: table-operations.js 856 2007-06-13 18:34:34Z wymsy $
-
-// Object that will encapsulate all the table operations provided by
-// HTMLArea-3.0 (except "insert table" which is included in the main file)
-Xinha.Config.prototype.TableOperations = 
-{
-  'showButtons' : true // Set to false to hide all but inserttable and toggleborders buttons on the toolbar
-                       // this is useful if you have the ContextMenu plugin and want to save toolbar space
-                       // (the context menu can perform all the button operations)
-}
-
-function TableOperations(editor) {
-	this.editor = editor;
-
-	var cfg = editor.config;
-	var bl = TableOperations.btnList;
-	var self = this;
-
-	// register the toolbar buttons provided by this plugin
-
-  // Remove existing inserttable and toggleborders, we will replace it in our group  
-  cfg.removeToolbarElement(' inserttable toggleborders '); 
-  
-	var toolbar = ["linebreak", "inserttable", "toggleborders"];
-    
-  
-	for (var i = 0; i < bl.length; ++i) {
-		var btn = bl[i];
-		if (!btn) {
-		  if(cfg.TableOperations.showButtons)	toolbar.push("separator");
-		} else {
-			var id = "TO-" + btn[0];
-			cfg.registerButton(id, Xinha._lc(btn[2], "TableOperations"), editor.imgURL(btn[0] + ".gif", "TableOperations"), false,
-					   function(editor, id) {
-						   // dispatch button press event
-						   self.buttonPress(editor, id);
-					   }, btn[1]);
-			if(cfg.TableOperations.showButtons) toolbar.push(id);
-		}
-	}
-  
-
-	// add a new line in the toolbar
-	cfg.toolbar.push(toolbar);
-	
-  if ( typeof PopupWin == 'undefined' )
-  {
-    Xinha._loadback(_editor_url + 'modules/Dialogs/popupwin.js');
-  }
-}
-
-TableOperations._pluginInfo = {
-	name          : "TableOperations",
-	version       : "1.0",
-	developer     : "Mihai Bazon",
-	developer_url : "http://dynarch.com/mishoo/",
-	c_owner       : "Mihai Bazon",
-	sponsor       : "Zapatec Inc.",
-	sponsor_url   : "http://www.bloki.com",
-	license       : "htmlArea"
-};
-
-TableOperations.prototype._lc = function(string) {
-    return Xinha._lc(string, 'TableOperations');
-};
-
-/************************
- * UTILITIES
- ************************/
-
-// retrieves the closest element having the specified tagName in the list of
-// ancestors of the current selection/caret.
-TableOperations.prototype.getClosest = function(tagName) {
-	var editor = this.editor;
-	var ancestors = editor.getAllAncestors();
-	var ret = null;
-	tagName = ("" + tagName).toLowerCase();
-	for (var i = 0; i < ancestors.length; ++i) {
-		var el = ancestors[i];
-		if (el.tagName.toLowerCase() == tagName) {
-			ret = el;
-			break;
-		}
-	}
-	return ret;
-};
-
-// this function requires the file PopupDiv/PopupWin to be loaded from browser
-TableOperations.prototype.dialogTableProperties = function() {
-	// retrieve existing values
-	var table = this.getClosest("table");
-	// this.editor.selectNodeContents(table);
-	// this.editor.updateToolbar();
-
-	var dialog = new PopupWin(this.editor, Xinha._lc("Table Properties", "TableOperations"), function(dialog, params) {
-		TableOperations.processStyle(params, table);
-		for (var i in params) {
-      if(typeof params[i] == 'function') continue;
-			var val = params[i];
-			switch (i) {
-			    case "f_caption":
-				if (/\S/.test(val)) {
-					// contains non white-space characters
-					var caption = table.getElementsByTagName("caption")[0];
-					if (!caption) {
-						caption = dialog.editor._doc.createElement("caption");
-						table.insertBefore(caption, table.firstChild);
-					}
-					caption.innerHTML = val;
-				} else {
-					// search for caption and delete it if found
-					var caption = table.getElementsByTagName("caption")[0];
-					if (caption) {
-						caption.parentNode.removeChild(caption);
-					}
-				}
-				break;
-			    case "f_summary":
-				table.summary = val;
-				break;
-			    case "f_width":
-				table.style.width = ("" + val) + params.f_unit;
-				break;
-			    case "f_align":
-				table.align = val;
-				break;
-			    case "f_spacing":
-				table.cellSpacing = val;
-				break;
-			    case "f_padding":
-				table.cellPadding = val;
-				break;
-			    case "f_borders":
-				table.border = val;
-				break;
-			    case "f_frames":
-				table.frame = val;
-				break;
-			    case "f_rules":
-				table.rules = val;
-				break;
-			}
-		}
-		// various workarounds to refresh the table display (Gecko,
-		// what's going on?! do not disappoint me!)
-		dialog.editor.forceRedraw();
-		dialog.editor.focusEditor();
-		dialog.editor.updateToolbar();
-		var save_collapse = table.style.borderCollapse;
-		table.style.borderCollapse = "collapse";
-		table.style.borderCollapse = "separate";
-		table.style.borderCollapse = save_collapse;
-	},
-
-	// this function gets called when the dialog needs to be initialized
-	function (dialog) {
-
-		var f_caption = "";
-		var capel = table.getElementsByTagName("caption")[0];
-		if (capel) {
-			f_caption = capel.innerHTML;
-		}
-		var f_summary = table.summary;
-		var f_width = parseInt(table.style.width);
-		isNaN(f_width) && (f_width = "");
-		var f_unit = /%/.test(table.style.width) ? 'percent' : 'pixels';
-		var f_align = table.align;
-		var f_spacing = table.cellSpacing;
-		var f_padding = table.cellPadding;
-		var f_borders = table.border;
-		var f_frames = table.frame;
-		var f_rules = table.rules;
-
-		function selected(val) {
-			return val ? " selected" : "";
-		}
-
-		// dialog contents
-		dialog.content.style.width = "400px";
-		dialog.content.innerHTML = " \
-<div class='title'>" + Xinha._lc("Table Properties", "TableOperations") + "\
-</div> \
-<table style='width:100%'> \
-  <tr> \
-    <td> \
-      <fieldset><legend>" + Xinha._lc("Description", "TableOperations") + "</legend> \
-       <table style='width:100%'> \
-        <tr> \
-          <td class='label'>" + Xinha._lc("Caption", "TableOperations") + ":</td> \
-          <td class='value'><input type='text' name='f_caption' value='" + f_caption + "'/></td> \
-        </tr><tr> \
-          <td class='label'>" + Xinha._lc("Summary", "TableOperations") + ":</td> \
-          <td class='value'><input type='text' name='f_summary' value='" + f_summary + "'/></td> \
-        </tr> \
-       </table> \
-      </fieldset> \
-    </td> \
-  </tr> \
-  <tr><td id='--HA-layout'></td></tr> \
-  <tr> \
-    <td> \
-      <fieldset><legend>" + Xinha._lc("Spacing and padding", "TableOperations") + "</legend> \
-       <table style='width:100%'> \
-"+//        <tr> \
-//           <td class='label'>" + Xinha._lc("Width", "TableOperations") + ":</td> \
-//           <td><input type='text' name='f_width' value='" + f_width + "' size='5' /> \
-//             <select name='f_unit'> \
-//               <option value='%'" + selected(f_unit == "percent") + ">" + Xinha._lc("percent", "TableOperations") + "</option> \
-//               <option value='px'" + selected(f_unit == "pixels") + ">" + Xinha._lc("pixels", "TableOperations") + "</option> \
-//             </select> &nbsp;&nbsp;" + Xinha._lc("Align", "TableOperations") + ": \
-//             <select name='f_align'> \
-//               <option value='left'" + selected(f_align == "left") + ">" + Xinha._lc("Left", "TableOperations") + "</option> \
-//               <option value='center'" + selected(f_align == "center") + ">" + Xinha._lc("Center", "TableOperations") + "</option> \
-//               <option value='right'" + selected(f_align == "right") + ">" + Xinha._lc("Right", "TableOperations") + "</option> \
-//             </select> \
-//           </td> \
-//         </tr> \
-"        <tr> \
-          <td class='label'>" + Xinha._lc("Spacing", "TableOperations") + ":</td> \
-          <td><input type='text' name='f_spacing' size='5' value='" + f_spacing + "' /> &nbsp;" + Xinha._lc("Padding", "TableOperations") + ":\
-            <input type='text' name='f_padding' size='5' value='" + f_padding + "' /> &nbsp;&nbsp;" + Xinha._lc("pixels", "TableOperations") + "\
-          </td> \
-        </tr> \
-       </table> \
-      </fieldset> \
-    </td> \
-  </tr> \
-  <tr> \
-    <td> \
-      <fieldset><legend>" + Xinha._lc("Frame and borders", "TableOperations") + "</legend> \
-        <table width='100%'> \
-          <tr> \
-            <td class='label'>" + Xinha._lc("Borders", "TableOperations") + ":</td> \
-            <td><input name='f_borders' type='text' size='5' value='" + f_borders + "' /> &nbsp;&nbsp;" + Xinha._lc("pixels", "TableOperations") + "</td> \
-          </tr> \
-          <tr> \
-            <td class='label'>" + Xinha._lc("Frames", "TableOperations") + ":</td> \
-            <td> \
-              <select name='f_frames'> \
-                <option value='void'" + selected(f_frames == "void") + ">" + Xinha._lc("No sides", "TableOperations") + "</option> \
-                <option value='above'" + selected(f_frames == "above") + ">" + Xinha._lc("The top side only", "TableOperations") + "</option> \
-                <option value='below'" + selected(f_frames == "below") + ">" + Xinha._lc("The bottom side only", "TableOperations") + "</option> \
-                <option value='hsides'" + selected(f_frames == "hsides") + ">" + Xinha._lc("The top and bottom sides only", "TableOperations") + "</option> \
-                <option value='vsides'" + selected(f_frames == "vsides") + ">" + Xinha._lc("The right and left sides only", "TableOperations") + "</option> \
-                <option value='lhs'" + selected(f_frames == "lhs") + ">" + Xinha._lc("The left-hand side only", "TableOperations") + "</option> \
-                <option value='rhs'" + selected(f_frames == "rhs") + ">" + Xinha._lc("The right-hand side only", "TableOperations") + "</option> \
-                <option value='box'" + selected(f_frames == "box") + ">" + Xinha._lc("All four sides", "TableOperations") + "</option> \
-              </select> \
-            </td> \
-          </tr> \
-          <tr> \
-            <td class='label'>" + Xinha._lc("Rules", "TableOperations") + ":</td> \
-            <td> \
-              <select name='f_rules'> \
-                <option value='none'" + selected(f_rules == "none") + ">" + Xinha._lc("No rules", "TableOperations") + "</option> \
-                <option value='rows'" + selected(f_rules == "rows") + ">" + Xinha._lc("Rules will appear between rows only", "TableOperations") + "</option> \
-                <option value='cols'" + selected(f_rules == "cols") + ">" + Xinha._lc("Rules will appear between columns only", "TableOperations") + "</option> \
-                <option value='all'" + selected(f_rules == "all") + ">" + Xinha._lc("Rules will appear between all rows and columns", "TableOperations") + "</option> \
-              </select> \
-            </td> \
-          </tr> \
-        </table> \
-      </fieldset> \
-    </td> \
-  </tr> \
-  <tr> \
-    <td id='--HA-style'></td> \
-  </tr> \
-</table> \
-";
-		var st_prop = TableOperations.createStyleFieldset(dialog.doc, dialog.editor, table);
-		var p = dialog.doc.getElementById("--HA-style");
-		p.appendChild(st_prop);
-		var st_layout = TableOperations.createStyleLayoutFieldset(dialog.doc, dialog.editor, table);
-		p = dialog.doc.getElementById("--HA-layout");
-		p.appendChild(st_layout);
-		dialog.modal = true;
-		dialog.addButtons("OK", "Cancel");
-		dialog.showAtElement(dialog.editor._iframe, "c");
-	});
-};
-
-// this function requires the file PopupDiv/PopupWin to be loaded from browser
-TableOperations.prototype.dialogRowCellProperties = function(cell) {
-	// retrieve existing values
-	var element = this.getClosest(cell ? "td" : "tr");
-	var table = this.getClosest("table");
-	// this.editor.selectNodeContents(element);
-	// this.editor.updateToolbar();
-
-	var dialog = new PopupWin(this.editor, cell ? Xinha._lc("Cell Properties", "TableOperations") : Xinha._lc("Row Properties", "TableOperations"), function(dialog, params) {
-		TableOperations.processStyle(params, element);
-		for (var i in params) {
-      if(typeof params[i] == 'function') continue;
-			var val = params[i];
-			switch (i) {
-			    case "f_align":
-				element.align = val;
-				break;
-			    case "f_char":
-				element.ch = val;
-				break;
-			    case "f_valign":
-				element.vAlign = val;
-				break;
-			}
-		}
-		// various workarounds to refresh the table display (Gecko,
-		// what's going on?! do not disappoint me!)
-		dialog.editor.forceRedraw();
-		dialog.editor.focusEditor();
-		dialog.editor.updateToolbar();
-		var save_collapse = table.style.borderCollapse;
-		table.style.borderCollapse = "collapse";
-		table.style.borderCollapse = "separate";
-		table.style.borderCollapse = save_collapse;
-	},
-
-	// this function gets called when the dialog needs to be initialized
-	function (dialog) {
-
-		var f_align = element.align;
-		var f_valign = element.vAlign;
-		var f_char = element.ch;
-
-		function selected(val) {
-			return val ? " selected" : "";
-		}
-
-		// dialog contents
-		dialog.content.style.width = "400px";
-		dialog.content.innerHTML = " \
-<div class='title'>" + Xinha._lc(cell ? "Cell Properties" : "Row Properties", "TableOperations") + "</div> \
-<table style='width:100%'> \
-  <tr> \
-    <td id='--HA-layout'> \
-"+//      <fieldset><legend>" + Xinha._lc("Layout", "TableOperations") + "</legend> \
-//        <table style='width:100%'> \
-//         <tr> \
-//           <td class='label'>" + Xinha._lc("Align", "TableOperations") + ":</td> \
-//           <td> \
-//             <select name='f_align'> \
-//               <option value='left'" + selected(f_align == "left") + ">" + Xinha._lc("Left", "TableOperations") + "</option> \
-//               <option value='center'" + selected(f_align == "center") + ">" + Xinha._lc("Center", "TableOperations") + "</option> \
-//               <option value='right'" + selected(f_align == "right") + ">" + Xinha._lc("Right", "TableOperations") + "</option> \
-//               <option value='char'" + selected(f_align == "char") + ">" + Xinha._lc("Char", "TableOperations") + "</option> \
-//             </select> \
-//             &nbsp;&nbsp;" + Xinha._lc("Char", "TableOperations") + ": \
-//             <input type='text' style='font-family: monospace; text-align: center' name='f_char' size='1' value='" + f_char + "' /> \
-//           </td> \
-//         </tr><tr> \
-//           <td class='label'>" + Xinha._lc("Vertical align", "TableOperations") + ":</td> \
-//           <td> \
-//             <select name='f_valign'> \
-//               <option value='top'" + selected(f_valign == "top") + ">" + Xinha._lc("Top", "TableOperations") + "</option> \
-//               <option value='middle'" + selected(f_valign == "middle") + ">" + Xinha._lc("Middle", "TableOperations") + "</option> \
-//               <option value='bottom'" + selected(f_valign == "bottom") + ">" + Xinha._lc("Bottom", "TableOperations") + "</option> \
-//               <option value='baseline'" + selected(f_valign == "baseline") + ">" + Xinha._lc("Baseline", "TableOperations") + "</option> \
-//             </select> \
-//           </td> \
-//         </tr> \
-//        </table> \
-//       </fieldset> \
-"    </td> \
-  </tr> \
-  <tr> \
-    <td id='--HA-style'></td> \
-  </tr> \
-</table> \
-";
-		var st_prop = TableOperations.createStyleFieldset(dialog.doc, dialog.editor, element);
-		var p = dialog.doc.getElementById("--HA-style");
-		p.appendChild(st_prop);
-		var st_layout = TableOperations.createStyleLayoutFieldset(dialog.doc, dialog.editor, element);
-		p = dialog.doc.getElementById("--HA-layout");
-		p.appendChild(st_layout);
-		dialog.modal = true;
-		dialog.addButtons("OK", "Cancel");
-		dialog.showAtElement(dialog.editor._iframe, "c");
-	});
-};
-
-// this function gets called when some button from the TableOperations toolbar
-// was pressed.
-TableOperations.prototype.buttonPress = function(editor, button_id) {
-	this.editor = editor;
-	var mozbr = Xinha.is_gecko ? "<br />" : "";
-
-	// helper function that clears the content in a table row
-	function clearRow(tr) {
-		var tds = tr.getElementsByTagName("td");
-		for (var i = tds.length; --i >= 0;) {
-			var td = tds[i];
-			td.rowSpan = 1;
-			td.innerHTML = mozbr;
-		}
-	}
-
-	function splitRow(td) {
-		var n = parseInt("" + td.rowSpan);
-		var nc = parseInt("" + td.colSpan);
-		td.rowSpan = 1;
-		tr = td.parentNode;
-		var itr = tr.rowIndex;
-		var trs = tr.parentNode.rows;
-		var index = td.cellIndex;
-		while (--n > 0) {
-			tr = trs[++itr];
-			var otd = editor._doc.createElement("td");
-			otd.colSpan = td.colSpan;
-			otd.innerHTML = mozbr;
-			tr.insertBefore(otd, tr.cells[index]);
-		}
-		editor.forceRedraw();
-		editor.updateToolbar();
-	}
-
-	function splitCol(td) {
-		var nc = parseInt("" + td.colSpan);
-		td.colSpan = 1;
-		tr = td.parentNode;
-		var ref = td.nextSibling;
-		while (--nc > 0) {
-			var otd = editor._doc.createElement("td");
-			otd.rowSpan = td.rowSpan;
-			otd.innerHTML = mozbr;
-			tr.insertBefore(otd, ref);
-		}
-		editor.forceRedraw();
-		editor.updateToolbar();
-	}
-
-	function splitCell(td) {
-		var nc = parseInt("" + td.colSpan);
-		splitCol(td);
-		var items = td.parentNode.cells;
-		var index = td.cellIndex;
-		while (nc-- > 0) {
-			splitRow(items[index++]);
-		}
-	}
-
-	function selectNextNode(el) {
-		var node = el.nextSibling;
-		while (node && node.nodeType != 1) {
-			node = node.nextSibling;
-		}
-		if (!node) {
-			node = el.previousSibling;
-			while (node && node.nodeType != 1) {
-				node = node.previousSibling;
-			}
-		}
-		if (!node) {
-			node = el.parentNode;
-		}
-		editor.selectNodeContents(node);
-	}
-
-	function cellMerge(table, cell_index, row_index, no_cols, no_rows) {
-		var rows = [];
-		var cells = [];
-		try {
-			for (i=row_index; i<row_index+no_rows; i++) {
-				var row = table.rows[i];
-				for (j=cell_index; j<cell_index+no_cols; j++) {
-					if (row.cells[j].colSpan > 1 || row.cells[j].rowSpan > 1) {
-						splitCell(row.cells[j]);
-					}
-					cells.push(row.cells[j]);
-				}
-				if (cells.length > 0) {
-					rows.push(cells);
-					cells = [];
-				}
-			}
-		} catch(e) { 
-			alert("Invalid selection");
-			return false;
-		}
-		var row_index1 = rows[0][0].parentNode.rowIndex;
-		var row_index2 = rows[rows.length-1][0].parentNode.rowIndex;
-		var row_span2 = rows[rows.length-1][0].rowSpan;
-		var HTML = "";
-		for (i = 0; i < rows.length; ++i) {
-			var cells = rows[i];
-			for (var j = 0; j < cells.length; ++j) {
-				var cell = cells[j];
-				HTML += cell.innerHTML;
-				(i || j) && (cell.parentNode.removeChild(cell));
-			}
-		}
-		var td = rows[0][0];
-		td.innerHTML = HTML;
-		td.rowSpan = row_index2 - row_index1 + row_span2;
-		var col_span = 0;
-		for(j=0; j<rows[0].length; j++) {
-			col_span += rows[0][j].colSpan;
-		}
-		td.colSpan = col_span;
-		editor.selectNodeContents(td);
-		editor.forceRedraw();
-		editor.focusEditor();
-	}
-
-	switch (button_id) {
-		// ROWS
-
-	    case "TO-row-insert-above":
-	    case "TO-row-insert-under":
-		var tr = this.getClosest("tr");
-		if (!tr) {
-			break;
-		}
-		var otr = tr.cloneNode(true);
-		clearRow(otr);
-		tr.parentNode.insertBefore(otr, /under/.test(button_id) ? tr.nextSibling : tr);
-		editor.forceRedraw();
-		editor.focusEditor();
-		break;
-	    case "TO-row-delete":
-		var tr = this.getClosest("tr");
-		if (!tr) {
-			break;
-		}
-		var par = tr.parentNode;
-		if (par.rows.length == 1) {
-			alert(Xinha._lc("Xinha cowardly refuses to delete the last row in table.", "TableOperations"));
-			break;
-		}
-		// set the caret first to a position that doesn't
-		// disappear.
-		selectNextNode(tr);
-		par.removeChild(tr);
-		editor.forceRedraw();
-		editor.focusEditor();
-		editor.updateToolbar();
-		break;
-	    case "TO-row-split":
-		var td = this.getClosest("td");
-		if (!td) {
-			break;
-		}
-		splitRow(td);
-		break;
-
-		// COLUMNS
-
-	    case "TO-col-insert-before":
-	    case "TO-col-insert-after":
-		var td = this.getClosest("td");
-		if (!td) {
-			break;
-		}
-		var rows = td.parentNode.parentNode.rows;
-		var index = td.cellIndex;
-    var lastColumn = (td.parentNode.cells.length == index + 1);
-		for (var i = rows.length; --i >= 0;) {
-			var tr = rows[i];			
-			var otd = editor._doc.createElement("td");
-			otd.innerHTML = mozbr;
-      if (lastColumn && Xinha.is_ie) 
-      {
-        tr.insertBefore(otd);
-      } 
-      else 
-      {
-        var ref = tr.cells[index + (/after/.test(button_id) ? 1 : 0)];
-        tr.insertBefore(otd, ref);
-      }
-		}
-		editor.focusEditor();
-		break;
-	    case "TO-col-split":
-		var td = this.getClosest("td");
-		if (!td) {
-			break;
-		}
-		splitCol(td);
-		break;
-	    case "TO-col-delete":
-		var td = this.getClosest("td");
-		if (!td) {
-			break;
-		}
-		var index = td.cellIndex;
-		if (td.parentNode.cells.length == 1) {
-			alert(Xinha._lc("Xinha cowardly refuses to delete the last column in table.", "TableOperations"));
-			break;
-		}
-		// set the caret first to a position that doesn't disappear
-		selectNextNode(td);
-		var rows = td.parentNode.parentNode.rows;
-		for (var i = rows.length; --i >= 0;) {
-			var tr = rows[i];
-			tr.removeChild(tr.cells[index]);
-		}
-		editor.forceRedraw();
-		editor.focusEditor();
-		editor.updateToolbar();
-		break;
-
-		// CELLS
-
-	    case "TO-cell-split":
-		var td = this.getClosest("td");
-		if (!td) {
-			break;
-		}
-		splitCell(td);
-		break;
-	    case "TO-cell-insert-before":
-	    case "TO-cell-insert-after":
-		var td = this.getClosest("td");
-		if (!td) {
-			break;
-		}
-		var tr = td.parentNode;
-		var otd = editor._doc.createElement("td");
-		otd.innerHTML = mozbr;
-		tr.insertBefore(otd, /after/.test(button_id) ? td.nextSibling : td);
-		editor.forceRedraw();
-		editor.focusEditor();
-		break;
-	    case "TO-cell-delete":
-		var td = this.getClosest("td");
-		if (!td) {
-			break;
-		}
-		if (td.parentNode.cells.length == 1) {
-			alert(Xinha._lc("Xinha cowardly refuses to delete the last cell in row.", "TableOperations"));
-			break;
-		}
-		// set the caret first to a position that doesn't disappear
-		selectNextNode(td);
-		td.parentNode.removeChild(td);
-		editor.forceRedraw();
-		editor.updateToolbar();
-		break;
-	    case "TO-cell-merge":
-		//Mozilla, as opposed to IE, allows the selection of several cells, which is fine :)
-		var sel = editor._getSelection();
-		if (!Xinha.is_ie && sel.rangeCount > 1) {
-			var range = sel.getRangeAt(0);
-			var td = range.startContainer.childNodes[range.startOffset];
-			var tr = td.parentNode;
-			var cell_index = td.cellIndex;		
-			var row_index = tr.rowIndex;
-			var row_index2 = 0;
-			var rownum = row_index;
-			var no_cols = 0;
-			var row_colspan = 0;
-			var td2, tr2;
-			for(i=0; i<sel.rangeCount; i++) {
-				range = sel.getRangeAt(i);
-					td2 = range.startContainer.childNodes[range.startOffset];
-					tr2 = td2.parentNode;	
-					if(tr2.rowIndex != rownum) {
-						rownum = tr2.rowIndex;
-						row_colspan = 0;
-					}
-					row_colspan += td2.colSpan;
-					if(row_colspan > no_cols) {
-						no_cols = row_colspan;
-					}
-					if(tr2.rowIndex + td2.rowSpan - 1 > row_index2) {
-						row_index2 = tr2.rowIndex + td2.rowSpan - 1;
-					}
-				}
-			var no_rows = row_index2 - row_index + 1;
-			var table = tr.parentNode;
-			cellMerge(table, cell_index, row_index, no_cols, no_rows); 
-		} else {
-			// Internet Explorer "browser" or not more than one cell selected in Moz
-			var td = this.getClosest("td");
-			if (!td) {
-				alert(Xinha._lc("Please click into some cell", "TableOperations"));
-				break;
-			}
-			editor._popupDialog("plugin://TableOperations/merge_cells.html", function(param) {
-				if (!param) {	// user pressed Cancel
-					return false;
-				}
-				no_cols = parseInt(param['f_cols'],10) + 1;
-				no_rows = parseInt(param['f_rows'],10) + 1;
-				var tr = td.parentNode;
-				var cell_index = td.cellIndex;
-				var row_index = tr.rowIndex;
-				var table = tr.parentNode;
-				cellMerge(table, cell_index, row_index, no_cols, no_rows);
-			}, null);	
-		}
-		break;
-
-		// PROPERTIES
-
-	    case "TO-table-prop":
-		this.dialogTableProperties();
-		break;
-
-	    case "TO-row-prop":
-		this.dialogRowCellProperties(false);
-		break;
-
-	    case "TO-cell-prop":
-		this.dialogRowCellProperties(true);
-		break;
-
-	    default:
-		alert("Button [" + button_id + "] not yet implemented");
-	}
-};
-
-// the list of buttons added by this plugin
-TableOperations.btnList = [
-	// table properties button
-    ["table-prop",       "table", "Table properties"],
-	null,			// separator
-
-	// ROWS
-	["row-prop",         "tr", "Row properties"],
-	["row-insert-above", "tr", "Insert row before"],
-	["row-insert-under", "tr", "Insert row after"],
-	["row-delete",       "tr", "Delete row"],
-	["row-split",        "td[rowSpan!=1]", "Split row"],
-	null,
-
-	// COLS
-	["col-insert-before", "td", "Insert column before"],
-	["col-insert-after",  "td", "Insert column after"],
-	["col-delete",        "td", "Delete column"],
-	["col-split",         "td[colSpan!=1]", "Split column"],
-	null,
-
-	// CELLS
-	["cell-prop",          "td", "Cell properties"],
-	["cell-insert-before", "td", "Insert cell before"],
-	["cell-insert-after",  "td", "Insert cell after"],
-	["cell-delete",        "td", "Delete cell"],
-	["cell-merge",         "tr", "Merge cells"],
-	["cell-split",         "td[colSpan!=1,rowSpan!=1]", "Split cell"]
-	];
-
-
-
-//// GENERIC CODE [style of any element; this should be moved into a separate
-//// file as it'll be very useful]
-//// BEGIN GENERIC CODE -----------------------------------------------------
-
-TableOperations.getLength = function(value) {
-	var len = parseInt(value);
-	if (isNaN(len)) {
-		len = "";
-	}
-	return len;
-};
-
-// Applies the style found in "params" to the given element.
-TableOperations.processStyle = function(params, element) {
-	var style = element.style;
-	for (var i in params) {
-    if(typeof params[i] == 'function') continue;
-		var val = params[i];
-		switch (i) {
-		    case "f_st_backgroundColor":
-			style.backgroundColor = val;
-			break;
-		    case "f_st_color":
-			style.color = val;
-			break;
-		    case "f_st_backgroundImage":
-			if (/\S/.test(val)) {
-				style.backgroundImage = "url(" + val + ")";
-			} else {
-				style.backgroundImage = "none";
-			}
-			break;
-		    case "f_st_borderWidth":
-			style.borderWidth = val;
-			break;
-		    case "f_st_borderStyle":
-			style.borderStyle = val;
-			break;
-		    case "f_st_borderColor":
-			style.borderColor = val;
-			break;
-		    case "f_st_borderCollapse":
-			style.borderCollapse = val ? "collapse" : "";
-			break;
-		    case "f_st_width":
-			if (/\S/.test(val)) {
-				style.width = val + params["f_st_widthUnit"];
-			} else {
-				style.width = "";
-			}
-			break;
-		    case "f_st_height":
-			if (/\S/.test(val)) {
-				style.height = val + params["f_st_heightUnit"];
-			} else {
-				style.height = "";
-			}
-			break;
-		    case "f_st_textAlign":
-			if (val == "char") {
-				var ch = params["f_st_textAlignChar"];
-				if (ch == '"') {
-					ch = '\\"';
-				}
-				style.textAlign = '"' + ch + '"';
-			} else if (val == "-") {
-			    style.textAlign = "";
-			} else {
-				style.textAlign = val;
-			}
-			break;
-		    case "f_st_verticalAlign":
-		    element.vAlign = "";
-			if (val == "-") {
-			    style.verticalAlign = "";
-			    
-		    } else {
-			    style.verticalAlign = val;
-			}
-			break;
-		    case "f_st_float":
-			style.cssFloat = val;
-			break;
-// 		    case "f_st_margin":
-// 			style.margin = val + "px";
-// 			break;
-// 		    case "f_st_padding":
-// 			style.padding = val + "px";
-// 			break;
-		}
-	}
-};
-
-// Returns an HTML element for a widget that allows color selection.  That is,
-// a button that contains the given color, if any, and when pressed will popup
-// the sooner-or-later-to-be-rewritten select_color.html dialog allowing user
-// to select some color.  If a color is selected, an input field with the name
-// "f_st_"+name will be updated with the color value in #123456 format.
-TableOperations.createColorButton = function(doc, editor, color, name) {
-	if (!color) {
-		color = "";
-	} else if (!/#/.test(color)) {
-		color = Xinha._colorToRgb(color);
-	}
-
-	var df = doc.createElement("span");
- 	var field = doc.createElement("input");
-	field.type = "hidden";
-	df.appendChild(field);
- 	field.name = "f_st_" + name;
-	field.value = color;
-	var button = doc.createElement("span");
-	button.className = "buttonColor";
-	df.appendChild(button);
-	var span = doc.createElement("span");
-	span.className = "chooser";
-	// span.innerHTML = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-	span.style.backgroundColor = color;
-	button.appendChild(span);
-	button.onmouseover = function() { if (!this.disabled) { this.className += " buttonColor-hilite"; }};
-	button.onmouseout = function() { if (!this.disabled) { this.className = "buttonColor"; }};
-	span.onclick = function() {
-		if (this.parentNode.disabled) {
-			return false;
-		}
-		editor._popupDialog("select_color.html", function(color) {
-			if (color) {
-				span.style.backgroundColor = "#" + color;
-				field.value = "#" + color;
-			}
-		}, color);
-	};
-	var span2 = doc.createElement("span");
-	span2.innerHTML = "&#x00d7;";
-	span2.className = "nocolor";
-	span2.title = Xinha._lc("Unset color", "TableOperations");
-	button.appendChild(span2);
-	span2.onmouseover = function() { if (!this.parentNode.disabled) { this.className += " nocolor-hilite"; }};
-	span2.onmouseout = function() { if (!this.parentNode.disabled) { this.className = "nocolor"; }};
-	span2.onclick = function() {
-		span.style.backgroundColor = "";
-		field.value = "";
-	};
-	return df;
-};
-
-TableOperations.createStyleLayoutFieldset = function(doc, editor, el) {
-	var fieldset = doc.createElement("fieldset");
-	var legend = doc.createElement("legend");
-	fieldset.appendChild(legend);
-	legend.innerHTML = Xinha._lc("Layout", "TableOperations");
-	var table = doc.createElement("table");
-	fieldset.appendChild(table);
-	table.style.width = "100%";
-	var tbody = doc.createElement("tbody");
-	table.appendChild(tbody);
-
-	var tagname = el.tagName.toLowerCase();
-	var tr, td, input, select, option, options, i;
-
-	if (tagname != "td" && tagname != "tr" && tagname != "th") {
-		tr = doc.createElement("tr");
-		tbody.appendChild(tr);
-		td = doc.createElement("td");
-		td.className = "label";
-		tr.appendChild(td);
-		td.innerHTML = Xinha._lc("Float", "TableOperations") + ":";
-		td = doc.createElement("td");
-		tr.appendChild(td);
-		select = doc.createElement("select");
-		td.appendChild(select);
-		select.name = "f_st_float";
-		options = ["None", "Left", "Right"];
-		for (var i = 0; i < options.length; ++i) {
-			var Val = options[i];
-			var val = options[i].toLowerCase();
-			option = doc.createElement("option");
-			option.innerHTML = Xinha._lc(Val, "TableOperations");
-			option.value = val;
-			option.selected = (("" + el.style.cssFloat).toLowerCase() == val);
-			select.appendChild(option);
-		}
-	}
-
-	tr = doc.createElement("tr");
-	tbody.appendChild(tr);
-	td = doc.createElement("td");
-	td.className = "label";
-	tr.appendChild(td);
-	td.innerHTML = Xinha._lc("Width", "TableOperations") + ":";
-	td = doc.createElement("td");
-	tr.appendChild(td);
-	input = doc.createElement("input");
-	input.type = "text";
-	input.value = TableOperations.getLength(el.style.width);
-	input.size = "5";
-	input.name = "f_st_width";
-	input.style.marginRight = "0.5em";
-	td.appendChild(input);
-	select = doc.createElement("select");
-	select.name = "f_st_widthUnit";
-	option = doc.createElement("option");
-	option.innerHTML = Xinha._lc("percent", "TableOperations");
-	option.value = "%";
-	option.selected = /%/.test(el.style.width);
-	select.appendChild(option);
-	option = doc.createElement("option");
-	option.innerHTML = Xinha._lc("pixels", "TableOperations");
-	option.value = "px";
-	option.selected = /px/.test(el.style.width);
-	select.appendChild(option);
-	td.appendChild(select);
-
-	select.style.marginRight = "0.5em";
-	td.appendChild(doc.createTextNode(Xinha._lc("Text align", "TableOperations") + ":"));
-	select = doc.createElement("select");
-	select.style.marginLeft = select.style.marginRight = "0.5em";
-	td.appendChild(select);
-	select.name = "f_st_textAlign";
-	options = ["Left", "Center", "Right", "Justify", "-"];
-	if (tagname == "td") {
-		options.push("Char");
-	}
-	input = doc.createElement("input");
-	input.name = "f_st_textAlignChar";
-	input.size = "1";
-	input.style.fontFamily = "monospace";
-	td.appendChild(input);
-	for (var i = 0; i < options.length; ++i) {
-		var Val = options[i];
-		var val = Val.toLowerCase();
-		option = doc.createElement("option");
-		option.value = val;
-		option.innerHTML = Xinha._lc(Val, "TableOperations");
-		option.selected = ((el.style.textAlign.toLowerCase() == val) || (el.style.textAlign == "" && Val == "-"));
-		select.appendChild(option);
-	}
-	function setCharVisibility(value) {
-		input.style.visibility = value ? "visible" : "hidden";
-		if (value) {
-			input.focus();
-			input.select();
-		}
-	}
-	select.onchange = function() { setCharVisibility(this.value == "char"); };
-	setCharVisibility(select.value == "char");
-
-	tr = doc.createElement("tr");
-	tbody.appendChild(tr);
-	td = doc.createElement("td");
-	td.className = "label";
-	tr.appendChild(td);
-	td.innerHTML = Xinha._lc("Height", "TableOperations") + ":";
-	td = doc.createElement("td");
-	tr.appendChild(td);
-	input = doc.createElement("input");
-	input.type = "text";
-	input.value = TableOperations.getLength(el.style.height);
-	input.size = "5";
-	input.name = "f_st_height";
-	input.style.marginRight = "0.5em";
-	td.appendChild(input);
-	select = doc.createElement("select");
-	select.name = "f_st_heightUnit";
-	option = doc.createElement("option");
-	option.innerHTML = Xinha._lc("percent", "TableOperations");
-	option.value = "%";
-	option.selected = /%/.test(el.style.height);
-	select.appendChild(option);
-	option = doc.createElement("option");
-	option.innerHTML = Xinha._lc("pixels", "TableOperations");
-	option.value = "px";
-	option.selected = /px/.test(el.style.height);
-	select.appendChild(option);
-	td.appendChild(select);
-
-	select.style.marginRight = "0.5em";
-	td.appendChild(doc.createTextNode(Xinha._lc("Vertical align", "TableOperations") + ":"));
-	select = doc.createElement("select");
-	select.name = "f_st_verticalAlign";
-	select.style.marginLeft = "0.5em";
-	td.appendChild(select);
-	options = ["Top", "Middle", "Bottom", "Baseline", "-"];
-	for (var i = 0; i < options.length; ++i) {
-		var Val = options[i];
-		var val = Val.toLowerCase();
-		option = doc.createElement("option");
-		option.value = val;
-		option.innerHTML = Xinha._lc(Val, "TableOperations");
-		option.selected = ((el.style.verticalAlign.toLowerCase() == val) || (el.style.verticalAlign == "" && Val == "-"));
-		select.appendChild(option);
-	}
-
-	return fieldset;
-};
-
-// Returns an HTML element containing the style attributes for the given
-// element.  This can be easily embedded into any dialog; the functionality is
-// also provided.
-TableOperations.createStyleFieldset = function(doc, editor, el) {
-	var fieldset = doc.createElement("fieldset");
-	var legend = doc.createElement("legend");
-	fieldset.appendChild(legend);
-	legend.innerHTML = Xinha._lc("CSS Style", "TableOperations");
-	var table = doc.createElement("table");
-	fieldset.appendChild(table);
-	table.style.width = "100%";
-	var tbody = doc.createElement("tbody");
-	table.appendChild(tbody);
-
-	var tr, td, input, select, option, options, i;
-
-	tr = doc.createElement("tr");
-	tbody.appendChild(tr);
-	td = doc.createElement("td");
-	tr.appendChild(td);
-	td.className = "label";
-	td.innerHTML = Xinha._lc("Background", "TableOperations") + ":";
-	td = doc.createElement("td");
-	tr.appendChild(td);
-	var df = TableOperations.createColorButton(doc, editor, el.style.backgroundColor, "backgroundColor");
-	df.firstChild.nextSibling.style.marginRight = "0.5em";
-	td.appendChild(df);
-	td.appendChild(doc.createTextNode(Xinha._lc("Image URL", "TableOperations") + ": "));
-	input = doc.createElement("input");
-	input.type = "text";
-	input.name = "f_st_backgroundImage";
-	if (el.style.backgroundImage.match(/url\(\s*(.*?)\s*\)/)) {
-		input.value = RegExp.$1;
-	}
-	// input.style.width = "100%";
-	td.appendChild(input);
-
-	tr = doc.createElement("tr");
-	tbody.appendChild(tr);
-	td = doc.createElement("td");
-	tr.appendChild(td);
-	td.className = "label";
-	td.innerHTML = Xinha._lc("FG Color", "TableOperations") + ":";
-	td = doc.createElement("td");
-	tr.appendChild(td);
-	td.appendChild(TableOperations.createColorButton(doc, editor, el.style.color, "color"));
-
-	// for better alignment we include an invisible field.
-	input = doc.createElement("input");
-	input.style.visibility = "hidden";
-	input.type = "text";
-	td.appendChild(input);
-
-	tr = doc.createElement("tr");
-	tbody.appendChild(tr);
-	td = doc.createElement("td");
-	tr.appendChild(td);
-	td.className = "label";
-	td.innerHTML = Xinha._lc("Border", "TableOperations") + ":";
-	td = doc.createElement("td");
-	tr.appendChild(td);
-
-	var colorButton = TableOperations.createColorButton(doc, editor, el.style.borderColor, "borderColor");
-	var btn = colorButton.firstChild.nextSibling;
-	td.appendChild(colorButton);
-	// borderFields.push(btn);
-	btn.style.marginRight = "0.5em";
-
-	select = doc.createElement("select");
-	var borderFields = [];
-	td.appendChild(select);
-	select.name = "f_st_borderStyle";
-	options = ["none", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"];
-	var currentBorderStyle = el.style.borderStyle;
-	// Gecko reports "solid solid solid solid" for "border-style: solid".
-	// That is, "top right bottom left" -- we only consider the first
-	// value.
-	(currentBorderStyle.match(/([^\s]*)\s/)) && (currentBorderStyle = RegExp.$1);
-	for (var i in options) {
-    if(typeof options[i] == 'function') continue;
-		var val = options[i];
-		option = doc.createElement("option");
-		option.value = val;
-		option.innerHTML = val;
-		(val == currentBorderStyle) && (option.selected = true);
-		select.appendChild(option);
-	}
-	select.style.marginRight = "0.5em";
-	function setBorderFieldsStatus(value) {
-		for (var i = 0; i < borderFields.length; ++i) {
-			var el = borderFields[i];
-			el.style.visibility = value ? "hidden" : "visible";
-			if (!value && (el.tagName.toLowerCase() == "input")) {
-				el.focus();
-				el.select();
-			}
-		}
-	}
-	select.onchange = function() { setBorderFieldsStatus(this.value == "none"); };
-
-	input = doc.createElement("input");
-	borderFields.push(input);
-	input.type = "text";
-	input.name = "f_st_borderWidth";
-	input.value = TableOperations.getLength(el.style.borderWidth);
-	input.size = "5";
-	td.appendChild(input);
-	input.style.marginRight = "0.5em";
-	var span = doc.createElement("span");
-	span.innerHTML = Xinha._lc("pixels", "TableOperations");
-	td.appendChild(span);
-	borderFields.push(span);
-
-	setBorderFieldsStatus(select.value == "none");
-
-	if (el.tagName.toLowerCase() == "table") {
-		// the border-collapse style is only for tables
-		tr = doc.createElement("tr");
-		tbody.appendChild(tr);
-		td = doc.createElement("td");
-		td.className = "label";
-		tr.appendChild(td);
-		input = doc.createElement("input");
-		input.type = "checkbox";
-		input.name = "f_st_borderCollapse";
-		input.id = "f_st_borderCollapse";
-		var val = (/collapse/i.test(el.style.borderCollapse));
-		input.checked = val ? 1 : 0;
-		td.appendChild(input);
-
-		td = doc.createElement("td");
-		tr.appendChild(td);
-		var label = doc.createElement("label");
-		label.htmlFor = "f_st_borderCollapse";
-		label.innerHTML = Xinha._lc("Collapsed borders", "TableOperations");
-		td.appendChild(label);
-	}
-
-// 	tr = doc.createElement("tr");
-// 	tbody.appendChild(tr);
-// 	td = doc.createElement("td");
-// 	td.className = "label";
-// 	tr.appendChild(td);
-// 	td.innerHTML = Xinha._lc("Margin", "TableOperations") + ":";
-// 	td = doc.createElement("td");
-// 	tr.appendChild(td);
-// 	input = doc.createElement("input");
-// 	input.type = "text";
-// 	input.size = "5";
-// 	input.name = "f_st_margin";
-// 	td.appendChild(input);
-// 	input.style.marginRight = "0.5em";
-// 	td.appendChild(doc.createTextNode(Xinha._lc("Padding", "TableOperations") + ":"));
-
-// 	input = doc.createElement("input");
-// 	input.type = "text";
-// 	input.size = "5";
-// 	input.name = "f_st_padding";
-// 	td.appendChild(input);
-// 	input.style.marginLeft = "0.5em";
-// 	input.style.marginRight = "0.5em";
-// 	td.appendChild(doc.createTextNode(Xinha._lc("pixels", "TableOperations")));
-
-	return fieldset;
-};
-
-//// END GENERIC CODE -------------------------------------------------------
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/img/ed_template.gif b/web/imcms/xinha/plugins/Template/img/ed_template.gif
deleted file mode 100644
index 7715a5092b..0000000000
Binary files a/web/imcms/xinha/plugins/Template/img/ed_template.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Template/img/layout_01.gif b/web/imcms/xinha/plugins/Template/img/layout_01.gif
deleted file mode 100644
index d7133e50f5..0000000000
Binary files a/web/imcms/xinha/plugins/Template/img/layout_01.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Template/img/layout_02.gif b/web/imcms/xinha/plugins/Template/img/layout_02.gif
deleted file mode 100644
index e5e3d1e63f..0000000000
Binary files a/web/imcms/xinha/plugins/Template/img/layout_02.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Template/img/layout_03.gif b/web/imcms/xinha/plugins/Template/img/layout_03.gif
deleted file mode 100644
index 7757e26a6c..0000000000
Binary files a/web/imcms/xinha/plugins/Template/img/layout_03.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/Template/lang/de.js b/web/imcms/xinha/plugins/Template/lang/de.js
deleted file mode 100644
index c92c2d4928..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/de.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-// Author: Udo Schmal (gocher), http://www.schaffrath-neuemedien.de/, udo.schmal@t-online.de
-{
-  "Insert template": "Template einfügen",
-  "Cancel": "Abbrechen"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/lang/fr.js b/web/imcms/xinha/plugins/Template/lang/fr.js
deleted file mode 100644
index 91fd8cd1ee..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/fr.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Insert template": "Insérer un template",
-  "Cancel": "Annulation"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/lang/it.js b/web/imcms/xinha/plugins/Template/lang/it.js
deleted file mode 100644
index 4e8d96bf15..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/it.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "it", ENCODING: UTF-8 | ISO-8859-1
-{
-  "Insert template": "Inserisca il template",
-  "Cancel": "Annullamento"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/lang/ja.js b/web/imcms/xinha/plugins/Template/lang/ja.js
deleted file mode 100644
index 1dd5b68491..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/ja.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-	"Insert template"          : "テンプレート�挿入",
-	"Cancel"                   : "中止"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/lang/nb.js b/web/imcms/xinha/plugins/Template/lang/nb.js
deleted file mode 100644
index 80fdb80036..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/nb.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert template": "Sett inn template",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/lang/nl.js b/web/imcms/xinha/plugins/Template/lang/nl.js
deleted file mode 100644
index 90d30dd64d..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/nl.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-// Author: Maarten Molenschot, maarten@nrgmm.nl
-{
-  "Insert template": "Template invoegen",
-  "Cancel": "Annuleren"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/lang/no.js b/web/imcms/xinha/plugins/Template/lang/no.js
deleted file mode 100644
index 586627ba51..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/no.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Insert template": "Sett inn template",
-  "Cancel": "Avbryt"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/lang/pt_br.js b/web/imcms/xinha/plugins/Template/lang/pt_br.js
deleted file mode 100644
index 4bdc2eb87c..0000000000
--- a/web/imcms/xinha/plugins/Template/lang/pt_br.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-	"Insert template"          : "Inserir modelo",
-	"Cancel"                   : "Cancelar"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/popups/template.html b/web/imcms/xinha/plugins/Template/popups/template.html
deleted file mode 100644
index d94dd0b0ae..0000000000
--- a/web/imcms/xinha/plugins/Template/popups/template.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html>
-<head>
-<title>Insert template</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-
-<script type="text/javascript">
-function Init() {
-  __dlg_translate("Template");
-  __dlg_init();
-  window.resizeTo(400, 200);
-  document.getElementById("cancel").focus();
-}
-
-function onOK(sel) {
-  // pass data back to the calling window
-  var param = new Object();
-  param["templ"] = sel;
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">Insert template</div>
-<form>
-  <table border="0" cellspacing="0" cellpadding="5">
-	<tr>
-    <td align="center" valign="top"><a href="javascript:;" onClick="onOK('1');">
-      <img src="../img/layout_01.gif" alt="" width="106" height="68" border="0" /></a>
-    </td>
-    <td align="center" valign="top"><a href="javascript:;" onClick="onOK('2');">
-      <img src="../img/layout_02.gif" alt="" width="106" height="68" border="0" /></a>
-    </td>  
-	  <td align="center" valign="top"><a href="javascript:;" onClick="onOK('3');">
-	    <img src="../img/layout_03.gif" alt="" width="106" height="68" border="0" /></a><br/>
-    </td>
- 	</tr>
-  </table>
-
-  <div id="buttons">
-    <button type="button" name="cancel" id="cancel" onclick="return onCancel();">Cancel</button>
-  </div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/template.css b/web/imcms/xinha/plugins/Template/template.css
deleted file mode 100644
index 86c359afea..0000000000
--- a/web/imcms/xinha/plugins/Template/template.css
+++ /dev/null
@@ -1,3 +0,0 @@
-div {
-	border: 1px dotted ActiveBorder;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/Template/template.js b/web/imcms/xinha/plugins/Template/template.js
deleted file mode 100644
index ca663e66fa..0000000000
--- a/web/imcms/xinha/plugins/Template/template.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Template plugin for Xinha
-// Implementation by Udo Schmal based on HTMLArea 3.0
-// Original Author - Udo Schmal www.Schaffrath-NeueMedien.de
-//
-// (c) Udo Schmal & Schaffrath NeueMedien 2004
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function Template(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  // register the toolbar buttons provided by this plugin
-  cfg.registerButton({
-    id       : "template",
-    tooltip  : Xinha._lc("Insert template","Template"),
-    image    : editor.imgURL("ed_template.gif", "Template"),
-    textMode : false,
-    action   : function(editor) {
-                 self.buttonPress(editor);
-               }
-  });
-  cfg.addToolbarElement("template", "inserthorizontalrule", 1);
-}
-
-Template._pluginInfo = {
-  name          : "Template",
-  version       : "1.0",
-  developer     : "Udo Schmal",
-  developer_url : "http://www.schaffrath-neuemedien.de/",
-  c_owner       : "Udo Schmal & Schaffrath NeueMedien",
-  license       : "htmlArea"
-};
-
-Template.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(_editor_url + 'plugins/Template/template.css');
-};
-
-Template.prototype.buttonPress = function(editor) {
-  editor._popupDialog( "plugin://Template/template", function( obj ) {
-    if ( !obj ) {//user must have pressed Cancel
-      return false;
-    }
-
-    var bodys = editor._doc.getElementsByTagName("body");
-    var body = bodys[0];
-
-  function getElement(x) {
-    var result = editor._doc.getElementById(x);
-    if (!result) {
-      result = editor._doc.createElement("div");
-      result.id = x;
-      result.innerHTML = x;
-      body.appendChild(result);
-    }
-    if (result.style)
-      result.removeAttribute("style");
-    return result;
-  }
-
-    var content = getElement("content");
-    var menu1 = getElement("menu1");
-    var menu2 = getElement("menu2");
-    var menu3 = getElement("menu3");
-    switch (obj["templ"]) {
-      case "1": menu1.style.position = "absolute";
-                menu1.style.right = "0px";
-                menu1.style.width = "28%";
-                menu1.style.backgroundColor = "#e1ddd9";
-                menu1.style.padding = "2px 20px";
-                content.style.position = "absolute";
-                content.style.left = "0px";
-                content.style.width = "70%";
-                content.style.backgroundColor = "#fff";
-                menu2.style.visibility = "hidden";
-                menu3.style.visibility = "hidden";
-                break;
-      case "2": menu1.style.position = "absolute";
-                menu1.style.left = "0px";
-                menu1.style.width = "28%";
-                menu1.style.height = "100%";
-                menu1.style.backgroundColor = "#e1ddd9";
-                content.style.position = "absolute";
-                content.style.right = "0px";
-                content.style.width = "70%";
-                content.style.backgroundColor = "#fff";
-                menu2.style.visibility = "hidden";
-                menu3.style.visibility = "hidden";
-                break
-      case "3": menu1.style.position = "absolute";
-                menu1.style.left = "0px";
-                menu1.style.width = "28%";
-                menu1.style.backgroundColor = "#e1ddd9";
-                menu2.style.position = "absolute";
-                menu2.style.right = "0px";
-                menu2.style.width = "28%";
-                menu2.style.backgroundColor = "#e1ddd9";
-                content.style.position = "absolute";
-                content.style.right = "30%";
-                content.style.width = "60%";
-                content.style.backgroundColor = "#fff";
-                menu3.style.visibility = "hidden";
-                break
-    }
-  }, null);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/UnFormat/img/unformat.gif b/web/imcms/xinha/plugins/UnFormat/img/unformat.gif
deleted file mode 100644
index 606b902d01..0000000000
Binary files a/web/imcms/xinha/plugins/UnFormat/img/unformat.gif and /dev/null differ
diff --git a/web/imcms/xinha/plugins/UnFormat/lang/de.js b/web/imcms/xinha/plugins/UnFormat/lang/de.js
deleted file mode 100644
index 52c55be80b..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/lang/de.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "de", ENCODING: UTF-8 | ISO-8859-1
-{
-  "Page Cleaner": "Seite bereinigen",
-  "Cleaning Area": "Reinigungsbereich",
-  "Selection": "Ausgewählter Bereich",
-  "All": "Alles",
-  "Cleaning options": "Reinigungsoptionen",
-  "Formatting:": "Formatierung:",
-  "All HTML:": "Ganzes HTML:",
-  "Select which types of formatting you would like to remove." : "Wählen Sie aus welche Formatierungen Sie entfernen wollen."
-};
diff --git a/web/imcms/xinha/plugins/UnFormat/lang/fr.js b/web/imcms/xinha/plugins/UnFormat/lang/fr.js
deleted file mode 100644
index e439978907..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/lang/fr.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "fr", ENCODING: UTF-8
-{
-  "Page Cleaner": "Nettoyeur de page",
-  "Cleaning Area": "Zone de nettoyage",
-  "Selection": "Sélection",
-  "All": "Tout",
-  "Cleaning options": "Options de nettoyage",
-  "Formatting:": "Format",
-  "All HTML:": "Tout le HTML",
-  "Select which types of formatting you would like to remove.": "Sélectionnez quel type de formatage vous voulez supprimer."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/UnFormat/lang/ja.js b/web/imcms/xinha/plugins/UnFormat/lang/ja.js
deleted file mode 100644
index 579d9462ed..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/lang/ja.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "ja", ENCODING: UTF-8
-{
-  "Page Cleaner": "ページクリーナー",
-  "Cleaning Area": "クリーニング領域",
-  "Selection": "�択部分",
-  "All": "���",
-  "Cleaning options": "クリーニングオプション",
-  "Formatting:": "書�指定タグ:",
-  "All HTML:": "å…¨HTMLã‚¿ã‚°:",
-  "Select which types of formatting you would like to remove.": "削除�る書�を�択������。"
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/UnFormat/lang/nb.js b/web/imcms/xinha/plugins/UnFormat/lang/nb.js
deleted file mode 100644
index d6c0052b60..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/lang/nb.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// I18N constants
-// LANG: "nb", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Page Cleaner": "Dokumentvasker",
-  "Cleaning Area": "Vaskeområde",
-  "Selection": "Markert område",
-  "All": "Hele dokumentet",
-  "Cleaning options": "Vaskemetoder",
-  "Formatting:": "Formattering:",
-  "All HTML:": "All HTML-kode:",
-  "Select which types of formatting you would like to remove.": "Velg hva slags formattering du ønsker å fjerne."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/UnFormat/lang/nl.js b/web/imcms/xinha/plugins/UnFormat/lang/nl.js
deleted file mode 100644
index df46fd4ccd..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/lang/nl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// I18N constants
-// LANG: "nl", ENCODING: UTF-8
-{
-  "Page Cleaner": "Pagina Schoonmaker",
-  "Cleaning Area": "Schoonmaak gebied",
-  "Selection": "Geselecteerde tekst",
-  "All": "Alles",
-  "Cleaning options": "Schoonmaak opties",
-  "Formatting:": "Format",
-  "All HTML:": "Alle html",
-  "Select which types of formatting you would like to remove." : "Selecteer welke types van Formatteren je wilt verwijderen"
-};
diff --git a/web/imcms/xinha/plugins/UnFormat/lang/no.js b/web/imcms/xinha/plugins/UnFormat/lang/no.js
deleted file mode 100644
index 1520cff88d..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/lang/no.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// I18N constants
-// LANG: "no", ENCODING: UTF-8
-// translated: Kim Steinhaug, http://www.steinhaug.com/, kim@steinhaug.com
-{
-  "Page Cleaner": "Dokumentvasker",
-  "Cleaning Area": "Vaskeområde",
-  "Selection": "Markert område",
-  "All": "Hele dokumentet",
-  "Cleaning options": "Vaskemetoder",
-  "Formatting:": "Formattering:",
-  "All HTML:": "All HTML-kode:",
-  "Select which types of formatting you would like to remove.": "Velg hva slags formattering du ønsker å fjerne."
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/UnFormat/lang/pt_br.js b/web/imcms/xinha/plugins/UnFormat/lang/pt_br.js
deleted file mode 100644
index 257e966025..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/lang/pt_br.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// I18N constants
-//
-// LANG: "pt_br", ENCODING: UTF-8
-// Portuguese Brazilian Translation
-//
-// Author: Marcio Barbosa, <marcio@mpg.com.br>
-// MSN: tomarshall@msn.com - ICQ: 69419933
-// Site: http://www.mpg.com.br
-//
-// Last revision: 06 september 2007
-// Please don´t remove this information
-// If you modify any source, please insert a comment with your name and e-mail
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-{
-  "All": "Tudo",
-  "All HTML:": "Todo HTML:",
-  "Cancel": "Cancelar",
-  "Cleaning Area": "Limpando �rea",
-  "Cleaning options": "Opções de limpesa",
-  "Formatting:": "Formatação:",
-  "OK": "OK",
-  "Page Cleaner": "Limpesa de página",
-  "Select which types of formatting you would like to remove.": "Selecione o tipo de formatação que deseja remover.",
-  "Selection": "Seleção"
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/UnFormat/popups/unformat.html b/web/imcms/xinha/plugins/UnFormat/popups/unformat.html
deleted file mode 100644
index eb4371aae0..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/popups/unformat.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-
-<head>
-<title>Page Cleaner</title>
-<link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-<script type="text/javascript" src="../../../popups/popup.js"></script>
-<script type="text/javascript">
-
-
-
-UnFormat = window.opener.UnFormat;
-window.resizeTo(300, 100);
-
-var x = opener.screenX + (opener.outerWidth - window.outerWidth) / 2;
-var y = opener.screenY + (opener.outerHeight - window.outerHeight) / 2;
-window.moveTo(x, y);
-
-
-function Init() {
-  __dlg_translate('UnFormat');
-  __dlg_init();
-}
-
-function onOK() {
-  var param = new Object();
-
-  if (document.getElementById('clean_selection').checked) {
-    param["cleaning_area"] = "selection";
-  } else {
-    param["cleaning_area"] = "all";
-  }
-
-  var fields = ["formatting", "html_all"];
-
-  for (var i in fields) {
-    var id = fields[i];
-    var el = document.getElementById(id);
-    if (el.checked)	{param[id] = true;}
-  }
-
-  __dlg_close(param);
-  return false;
-}
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-</head>
-
-<body class="Dialog" onload="Init();self.focus();">
-
-<div class="title">Page Cleaner</div>
-
-<form action="" method="get">
-  <fieldset>
-  <legend>Cleaning Area</legend>
-    <span>Selection</span><input type="radio" name="cleaning_area" id="clean_selection" value="selection" checked="checked" />
-    <span>All</span><input type="radio" name="cleaning_area" id="clean_page" value="page" />
-  </fieldset>
-  <br>
-  <fieldset>
-  <legend>Cleaning options</legend>
-    <div class="space"></div>
-    <div class="fr">Formatting:</div>
-    <input type="checkbox" id="formatting" value="" checked />
-    <p />
-    <div class="fr">All HTML:</div>
-    <input type="checkbox" id="html_all" value="" />
-    <p />
-   </fieldset>
-   <br /><br />
-   <p style="text-align:center"><span>Select which types of formatting you would like to remove.</span></p>
-
-<div id="buttons">
-  <button type="button" name="ok" onclick="return onOK();">OK</button>
-  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/plugins/UnFormat/un-format.js b/web/imcms/xinha/plugins/UnFormat/un-format.js
deleted file mode 100644
index e72c995d5b..0000000000
--- a/web/imcms/xinha/plugins/UnFormat/un-format.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Unormat plugin for Xinha
-
-
-function UnFormat(editor) {
-  this.editor = editor;
-  var cfg = editor.config;
-  var self = this;
-
-  cfg.registerButton({
-    id       : "unformat",
-    tooltip  : this._lc("Page Cleaner"),
-    image    : editor.imgURL("unformat.gif", "UnFormat"),
-    textMode : false,
-    action   : function(editor) {
-                 self.buttonPress(editor);
-               }
-  });
-
-  cfg.addToolbarElement("unformat", "killword", 1);
-}
-
-UnFormat._pluginInfo = {
-  name          : "UnFormat",
-  version       : "1.0",
-  license       : "htmlArea"
-};
-
-
-UnFormat.prototype._lc = function(string) {
-  return Xinha._lc(string, 'UnFormat');
-};
-
-UnFormat.prototype.buttonPress = function(editor){
-  editor._popupDialog( "plugin://UnFormat/unformat", function( param){
-    if (param) {
-      if (param["cleaning_area"] == "all") {
-        var html = editor._doc.body.innerHTML;
-      } else {
-        var html = editor.getSelectedHTML();
-      }
-
-      if (param["html_all"]== true) {
-        html = html.replace(/<[\!]*?[^<>]*?>/g, ""); 				
-      }
-
-      if (param["formatting"] == true) {
-        html = html.replace(/style="[^"]*"/gi, "");
-        html = html.replace(/<\/?font[^>]*>/gi,"");
-        html = html.replace(/<\/?b>/gi,"");
-        html = html.replace(/<\/?strong[^>]*>/gi,"");
-        html = html.replace(/<\/?i>/gi,"");
-        html = html.replace(/<\/?em[^>]*>/gi,"");
-        html = html.replace(/<\/?u[^>]*>/gi,"");
-        html = html.replace(/<\/?strike[^>]*>/gi,"");
-        html = html.replace(/ align=[^\s|>]*/gi,"");
-        html = html.replace(/ class=[^\s|>]*/gi,"");
-      }
-      if (param["cleaning_area"] == "all") {
-        editor._doc.body.innerHTML = html;
-      } else	{
-        editor.insertHTML(html);
-      }
-    } else { return false; }
-  }, null);
-};
\ No newline at end of file
diff --git a/web/imcms/xinha/popups/about.html b/web/imcms/xinha/popups/about.html
deleted file mode 100644
index d8f20a4784..0000000000
--- a/web/imcms/xinha/popups/about.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!--
-
-(c) dynarch.com, 2003-2004
-Author: Mihai Bazon, http://dynarch.com/mishoo
-Distributed as part of HTMLArea 3.0
-
-"You are not expected to understand this...  I don't neither."
-
-                      (from The Linux Kernel Source Code,
-                            ./arch/x86_64/ia32/ptrace.c:90)
-
-;-)
-
--->
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>About Xinha</title>
-<script type="text/javascript" src="popup.js"></script>
-<script type="text/javascript">
-window.resizeTo(450, 365);
-var TABS = [];
-var CURRENT_TAB = 0;
-var CONTENT_HEIGHT_DIFF = 0;
-var CONTENT_WIDTH_DIFF = 0;
-function selectTab(idx) {
-  var ct = TABS[CURRENT_TAB];
-  ct.className = ct.className.replace(/\s*tab-current\s*/, ' ');
-  ct = TABS[CURRENT_TAB = idx];
-  ct.className += ' tab-current';
-  for (var i = TABS.length; --i >= 0;) {
-    var area = document.getElementById("tab-area-" + i);
-    if (CURRENT_TAB == i) {
-      area.style.display = "block";
-    } else {
-      area.style.display = "none";
-    }
-  }
-  document.body.style.visibility = "hidden";
-  document.body.style.visibility = "visible";
-  document.cookie = "HTMLAREA-ABOUT-TAB=" + idx;
-}
-var editor = null;
-function initDocument() {
-  editor = window.dialogArguments;
-  Xinha = window.opener.Xinha;
-
-  var plugins = document.getElementById("plugins");
-  var j = 0;
-  var html = "<table width='99%' cellpadding='2' cellspacing=2 style='margin-top: 1em; collapse-borders: collapse; border: 1px solid black;'>" +
-    "<thead><tr>" +
-    "<td>Name</td>" +
-    "<td>Developer</td>" +
-    "<td>Sponsored by</td>" +
-    "<td>License</td>" +
-    "</tr></thead><tbody>";
-  for (var i in editor.plugins) {
-    var info = editor.plugins[i];
-    if (typeof info != 'object' || !info.name || typeof info.name !='string')   continue;
-    html += "<tr><td>" + info.name + " v" + info.version + "</td>" +
-            "<td><a href='" + info.developer_url + "' target='_blank' title='Visit developer website'>" +
-      info.developer + "</a></td>" +
-      "<td><a href='" + info.sponsor_url + "' target='_blank' title='Visit sponsor website'>" +
-      info.sponsor + "</a></td>" +
-      "<td>" + info.license + "</td></tr>";
-    ++j;
-  }
-
-  if (j) {
-          html += "</tbody></table>" +
-      "<p>License \"htmlArea\" means that the plugin is distributed under the same terms " +
-      "as Xinha itself.</p>";
-    plugins.innerHTML = "<p>The following plugins have been loaded.</p>" + html;
-  } else {
-    plugins.innerHTML = "<p>No plugins have been loaded</p>";
-  }
-
-  plugins.innerHTML += "<p>User agent reports:<br/>" + navigator.userAgent + "</p>";
-
-  var content = document.getElementById("content");
-  if (window.innerHeight) {
-    CONTENT_HEIGHT_DIFF = window.innerHeight - 250;
-    CONTENT_WIDTH_DIFF = window.innerWidth - content.offsetWidth;
-  } else {
-    CONTENT_HEIGHT_DIFF = document.body.offsetHeight - 250;
-    CONTENT_WIDTH_DIFF = document.body.offsetWidth - 400;
-  }
-  window.onresize();
-  var bar = document.getElementById("tabbar");
-  j = 0;
-  for (var i = bar.firstChild; i; i = i.nextSibling) {
-    TABS.push(i);
-    i.__msh_tab = j;
-    i.onmousedown = function(ev) { selectTab(this.__msh_tab); Xinha._stopEvent(ev || window.event); };
-    var area = document.getElementById("tab-area-" + j);
-    if (/tab-current/.test(i.className)) {
-      CURRENT_TAB = j;
-      area.style.display = "block";
-    } else {
-      area.style.display = "none";
-    }
-    ++j;
-  }
-  if (document.cookie.match(/HTMLAREA-ABOUT-TAB=([0-9]+)/))
-    selectTab(RegExp.$1);
-}
-window.onresize = function() {
-  var content = document.getElementById("content");
-  if (window.innerHeight) {
-    content.style.height = (window.innerHeight - CONTENT_HEIGHT_DIFF) + "px";
-    content.style.width = (window.innerWidth - CONTENT_WIDTH_DIFF) + "px";
-  } else {
-    content.style.height = (document.body.offsetHeight - CONTENT_HEIGHT_DIFF) + "px";
-    //content.style.width = (document.body.offsetWidth - CONTENT_WIDTH_DIFF) + "px";
-  }
-}
-</script>
-<style>
-  html, body { height: 100%}
-  html,body,textarea,table
-  { font-family: helvetica,arial,sans-serif;
-    font-size: 11px; padding: 0px; margin: 0px;
-  }
-
-  body { padding: 0px; background: #f5f6f6; color: black; }
-  a:link, a:visited { color: #00f; }
-  a:hover           { color: #f00; }
-  a:active          { color: #f80; }
-  button            { font: 11px; border-width: 1px; background-color:#f5f6f6; color:black; }
-
-  p { margin: 0.5em 0px; }
-
-  #tdheader h1
-  { font: bold 40px "Staccato222 BT", cursive; margin: 0px; padding-left:4px; border-bottom: 1px solid #6a6; }
-  h1 { font: bold 20px; margin: 0px; border-bottom: 1px solid #6a6; }
-  h2 { font: bold 110%; margin: 0.7em 0px; }
-
-  thead {
-    font-weight: bold;
-    background-color: #CCC;
-  }
-
-  thead td { padding-left:4px; }
-
-  .buttons {
-    text-align: right; padding: 3px;
-    background-color: white;
-    border-top: 1px solid #555;
-  }
-
-  #tabbar {
-    position: relative;
-    left: 10px;
-  }
-  .tab {
-    color: #OOO;
-    cursor: pointer;
-    margin-left: -5px;
-    float: left; position: relative;
-    border: 1px solid #555;
-    top: -3px; left: -2px;
-    padding: 2px 10px 3px 10px;
-    border-top: none; background-color: #CCC;
-    -moz-border-radius: 0px 0px 4px 4px;
-    z-index: 0;
-  }
-  .tab-current
-  {
-    color: #000;
-    top: -4px;
-    background-color: #f5f6f6;
-    padding: 3px 10px 4px 10px;
-    z-index: 10;
-  }
-
-  li, ol, ul { margin-top: 0px; margin-bottom: 0px; }
-</style></head>
-<body onload="__dlg_init(); initDocument();"
-><table cellspacing="0" cellpadding="0" style="border-collapse: collapse;
-      width: 100%; height: 100%;">
-
-<tr style="height: 1em"><td id="tdheader">
-
-<h1><img src="../images/xinha_logo.gif" alt="Xinha" /></h1>
-
-</td></tr>
-<tr><td id="tdcontent" style="padding: 0.5em;">
-
-<div style="overflow: auto; height: 250px;" id="content">
-<div id="tab-areas">
-
-<div id="tab-area-0">
-
-  <p>A free WYSIWYG editor replacement for <tt>&lt;textarea&gt;</tt> fields.</p>
-  <p>Visit the <a href="http://xinha.gogo.co.nz/">Xinha Website</a> for more information.</p>
-
-  <p>
-   Use of Xinha is granted by the terms of the htmlArea License (based on BSD license)
-  </p>
- <pre>
-Copyright (c) 2005-2007 Xinha Developer Team and contributors
-	</pre>
-  <p>
-    Xinha was originally based on work by Mihai Bazon which is:
-  </p>
-  <pre>
-Copyright (c) 2003-2004 dynarch.com.
-Copyright (c) 2002-2003 interactivetools.com, inc.
-This copyright notice MUST stay intact for use.
-  </pre>
-</div>
-
-<div id="tab-area-1">
-
-  <p>
-   The development of Xinha would not have been possible without the original work of <a href="http://dynarch.com/">Mihai Bazon</a>, <a href="http://interactivetools.com" target="_blank">InteractiveTools.com</a>, and the many sponsors and contributors from around the world.
-  </p>
-
-</div>
-
-<div id="tab-area-2">
-<pre>htmlArea License (based on BSD license)
-Copyright (c) 2002-2004, interactivetools.com, inc.
-Copyright (c) 2003-2004 dynarch.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1) Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2) 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.
-
-3) Neither the name of interactivetools.com, inc. nor the names of its
-   contributors may be used to endorse or promote products derived from this
-   software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR 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.</pre>
-</div>
-
-<div id="tab-area-3">
-<div id="plugins">
-</div>
-</div>
-
-
-<div id="tab-area-4">
-  <script type="text/javascript">
-    if(window.opener && window.opener.Xinha)
-    {
-      var ver = window.opener.Xinha.version;
-      document.write('<pre>'
-                      + '\nRelease: ' + ver.Release + ' (' + ver.Date + ')'
-                      + '\nHead: ' + ver.Head
-                      + '\nRevision: ' + ver.Revision
-                      + '\nLast Changed By: ' + ver.RevisionBy
-                      + '\n' +
-                      '</pre>');
-    }
-    else
-    {
-      document.write('<pre>Version information unavailable.</pre>');
-    }
-  </script>
-</div>
-
-</div></div>
-
-
-</td></tr>
-<tr style="height: 1em"><td id="tdfooter">
-
-
-<div class="buttons">
-<div id="tabbar"
-><div class="tab tab-current"
->About</div><div class="tab"
->Thanks</div><div class="tab"
->License</div><div class="tab"
->Plugins</div><div class="tab"
->Version</div></div>
-<button type="button" onclick="__dlg_close(null);">Close</button>
-</div>
-
-</td></tr></table>
-
-</body></html>
diff --git a/web/imcms/xinha/popups/blank.html b/web/imcms/xinha/popups/blank.html
deleted file mode 100644
index 8c7fe21114..0000000000
--- a/web/imcms/xinha/popups/blank.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/popups/editor_help.html b/web/imcms/xinha/popups/editor_help.html
deleted file mode 100644
index f19781364d..0000000000
--- a/web/imcms/xinha/popups/editor_help.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
- <head>
-  <title>Editor Help</title>
-  <script type="text/javascript" src="popup.js"></script>
-  <link rel="stylesheet" type="text/css" href="popup.css" />
-
-<script type="text/javascript">
-  window.resizeTo(400, 480);
-Xinha = window.opener.Xinha;
-function Init() {
-  __dlg_translate('Xinha');
-  __dlg_init();
-
-}
-
-
-function onCancel() {
-  __dlg_close(null);
-  return false;
-}
-
-</script>
-</head>
-
-<body class="dialog" onload="Init()">
-<div class="title">Xinha Help</div>
-<table width="100%" style="background: white none repeat scroll 0%;">
-  <thead style="border: 1px solid gray; background: silver none repeat scroll 0%;">
-  <tr>
-    <th colspan="2"> 
-      <span style="text-align:center">Keyboard shortcuts</span><br />
-      <span>The editor provides the following key combinations:</span>
-    </th>
-  </tr>
-  </thead>
-  <tbody>
-  <tr><td>ENTER</td><td><span>new paragraph</span>(&lt;P&gt;)</td></tr>
-  <tr><td>SHIFT-ENTER</td><td><span>insert linebreak</span>(&lt;BR&gt;)</td></tr>
-  <tr><td>CTRL-A</td><td><span>Select all</span></td></tr>
-  <tr><td>CTRL-B</td><td><span>Bold</span></td></tr>
-  <tr><td>CTRL-I</td><td><span>Italic</span></td></tr>
-  <tr><td>CTRL-U</td><td><span>Underline</span></td></tr>
-  <tr><td>CTRL-S</td><td><span>Strikethrough</span></td></tr>
-  <tr><td>CTRL-L</td><td><span>Justify Left</span></td></tr>
-  <tr><td>CTRL-E</td><td><span>Justify Center</span></td></tr>
-  <tr><td>CTRL-R</td><td><span>Justify Right</span></td></tr>
-  <tr><td>CTRL-J</td><td><span>Justify Full</span></td></tr>
-  <tr><td>CTRL-Z</td><td><span>Undoes your last action</span></td></tr>
-  <tr><td>CTRL-Y</td><td><span>Redoes your last action</span></td></tr>
-  <tr><td>CTRL-N</td><td><span>Set format to paragraph</span></td></tr>
-  <tr><td>CTRL-0 (zero)</td><td><span>Clean content pasted from Word</span></td></tr>
-  <tr><td>CTRL-1 .. CTRL-6</td><td><span>Headings</span> (&lt;h1&gt; .. &lt;h6&gt;)</td></tr>
-  <tr><td>CTRL-X</td><td><span>Cut selection</span></td></tr>
-  <tr><td>CTRL-C</td><td><span>Copy selection</span></td></tr>
-  <tr><td>CTRL-V</td><td><span>Paste from clipboard</span></td></tr>
-  </tbody>
-</table>
-<div id="buttons">
-  <button type="button" name="cancel" onclick="return onCancel();">Close</button>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/imcms/xinha/popups/popup.css b/web/imcms/xinha/popups/popup.css
deleted file mode 100644
index 7bf935893b..0000000000
--- a/web/imcms/xinha/popups/popup.css
+++ /dev/null
@@ -1,39 +0,0 @@
-html, body, .dialog {
-  background: ButtonFace;
-  color: ButtonText;
-  font: 11px Tahoma,Verdana,sans-serif;
-  margin: 0px;
-  padding: 0px;
-}
-body { padding: 5px; }
-form { padding: 0px; margin: 0px; }
-form p {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-table {
-  font: 11px Tahoma,Verdana,sans-serif;
-}
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-button { width: 70px; }
-table .label { text-align: right; width: 8em; }
-
-.fl { width: 9em; float: left; padding: 2px 5px; text-align: right; }
-.fr { width: 7em; float: left; padding: 2px 5px; text-align: right; }
-fieldset { padding: 0px 10px 5px 5px; }
-.space { padding: 2px; }
-.title { background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
-border-bottom: 1px solid black; letter-spacing: 2px;
-}
-.buttonColor {
-  padding: 1px;
-  cursor: default;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-#buttons {
-      margin-top: 1em; 
-      border-top: 1px solid #999;
-      padding: 1em; 
-      text-align: right;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/popups/popup.js b/web/imcms/xinha/popups/popup.js
deleted file mode 100644
index 11112960b2..0000000000
--- a/web/imcms/xinha/popups/popup.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// htmlArea v3.0 - Copyright (c) 2002, 2003 interactivetools.com, inc.
-// This copyright notice MUST stay intact for use (see license.txt).
-//
-// Portions (c) dynarch.com, 2003
-//
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon.
-//   http://dynarch.com/mishoo
-//
-// $Id: popup.js 877 2007-08-12 15:50:03Z gogo $
-if(typeof Xinha == 'undefined')
-  Xinha = window.opener.Xinha;
-
-// Backward compatibility will be removed some time or not?
-HTMLArea = Xinha;
-
-function getAbsolutePos(el) {
-	var r = { x: el.offsetLeft, y: el.offsetTop };
-	if (el.offsetParent) {
-		var tmp = getAbsolutePos(el.offsetParent);
-		r.x += tmp.x;
-		r.y += tmp.y;
-	}
-	return r;
-}
-
-function comboSelectValue(c, val) {
-	var ops = c.getElementsByTagName("option");
-	for (var i = ops.length; --i >= 0;) {
-		var op = ops[i];
-		op.selected = (op.value == val);
-	}
-	c.value = val;
-}
-
-function __dlg_onclose() {
-	opener.Dialog._return(null);
-}
-// ray: I mark this on deprecated, because bottom is never used
-function __dlg_init( bottom, win_dim ) {
-  __xinha_dlg_init(win_dim);
-}
-
-function __xinha_dlg_init( win_dim ) {
-  if(window.__dlg_init_done) return true;
-  
-  if(window.opener._editor_skin) {
-    var head = document.getElementsByTagName("head")[0];
-    var link = document.createElement("link");
-    link.type = "text/css";
-    link.href = window.opener._editor_url + 'skins/' + window.opener._editor_skin + '/skin.css';
-    link.rel = "stylesheet";
-    head.appendChild(link);
-  }
-	window.dialogArguments = opener.Dialog._arguments;
-
-  var page = Xinha.pageSize(window);
-  if ( !win_dim )
-  {
-    win_dim = {width:page.x, height: page.y};
-  }
-  window.resizeTo(win_dim.width, win_dim.height);
-
-  var dim = Xinha.viewportSize(window);
-
-  window.resizeBy(0, page.y - dim.y);
-
-  if(win_dim.top && win_dim.left)
-  {
-    window.moveTo(win_dim.left,win_dim.top);
-  }
-  else
-  {
-    if (!Xinha.is_ie)
-    {
-      var x = opener.screenX + (opener.outerWidth - win_dim.width) / 2;
-      var y = opener.screenY + (opener.outerHeight - win_dim.height) / 2;
-    }
-    else
-    {//IE does not have window.outer... , so center it on the screen at least
-      var x =  (self.screen.availWidth - win_dim.width) / 2;
-      var y =  (self.screen.availHeight - win_dim.height) / 2;	
-    }
-    window.moveTo(x,y);
-  }
-  
-  Xinha.addDom0Event(document.body, 'keypress', __dlg_close_on_esc);
-  window.__dlg_init_done = true;
-}
-
-function __dlg_translate(context) {
-	var types = ["input", "select", "legend", "span", "option", "td", "th", "button", "div", "label", "a", "img"];
-	for (var type = 0; type < types.length; ++type) {
-		var spans = document.getElementsByTagName(types[type]);
-		for (var i = spans.length; --i >= 0;) {
-			var span = spans[i];
-			if (span.firstChild && span.firstChild.data) {
-				var txt = Xinha._lc(span.firstChild.data, context);
-				if (txt) {
-					span.firstChild.data = txt;
-				}
-			}
-			if (span.title) {
-				var txt = Xinha._lc(span.title, context);
-				if (txt) {
-					span.title = txt;
-				}
-			}
-			if (span.tagName.toLowerCase() == 'input' && 
-					(/^(button|submit|reset)$/i.test(span.type))) {
-				var txt = Xinha._lc(span.value, context);
-				if (txt) {
-					span.value = txt;
-				}
-			}
-		}
-	}
-	document.title = Xinha._lc(document.title, context);
-}
-
-// closes the dialog and passes the return info upper.
-function __dlg_close(val) {
-	opener.Dialog._return(val);
-	window.close();
-}
-
-function __dlg_close_on_esc(ev) {
-	ev || (ev = window.event);
-	if (ev.keyCode == 27) {
-		__dlg_close(null);
-		return false;
-	}
-	return true;
-}
diff --git a/web/imcms/xinha/popups/select_color.html b/web/imcms/xinha/popups/select_color.html
deleted file mode 100644
index 2116eb635a..0000000000
--- a/web/imcms/xinha/popups/select_color.html
+++ /dev/null
@@ -1,359 +0,0 @@
-<!--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">-->
-<html><head><title>Select Color</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<script type="text/javascript" src="popup.js"></script>
-<script type="text/javascript">
-window.resizeTo(240, 182);
-// run on page load
-function Init()
-{
-  __dlg_translate('Xinha');
-  __dlg_init();
-  Xinha.addDom0Event(document, 'keypress', __dlg_close_on_esc);
-
-  var color = window.dialogArguments;
-  color = ValidateColor(color) || '000000';
-  View(color);
-}
-// preview color
-function View(color)
-{
-  document.getElementById("ColorPreview").style.backgroundColor = '#' + color;
-  document.getElementById("ColorHex").value = '#' + color;
-}
-// select color
-function Set(string)
-{
-  var color = ValidateColor(string);
-  if (color == null)
-  {
-    alert("Invalid color code: " + string);
-  }
-  else
-  {
-    View(color);
-    __dlg_close(color);
-  }
-}
-// return valid color code
-function ValidateColor(string)
-{
-  string = string || '';
-  string = string + "";
-  string = string.toUpperCase();
-  var chars = '0123456789ABCDEF';
-  var out   = '';
-  // remove invalid color chars
-  for (var i=0; i<string.length; i++)
-  {
-    var schar = string.charAt(i);
-    if (chars.indexOf(schar) != -1) out += schar;
-  }
-  // check length
-  if (out.length != 6) return null;
-  return out;
-}
-</script>
-<style type="text/css">
-body { background:buttonface; margin:0; padding:0; }
-form { margin:0; padding:0; }
-#containerpreview td { background:buttonface; }
-#preview { background-color:#000000; padding:1px; height:21px; width:50px; }
-#ColorPreview { height:100%; width:100%; }
-#ColorHex { font-size:12px; background:buttonface; border:0; }
-#palettecolor { cursor:pointer; }
-#palettecolor td { width:10px; height:10px; }
-</style>
-</head>
-<body class="dialog" onload="Init()">
-
-<form action="#" method="get" onsubmit="Set(document.getElementById('ColorHex').value); return false;">
-<table border="0" cellspacing="0" cellpadding="4" width="100%" id="containerpreview">
- <tr>
-  <td valign="middle"><div id="preview"><div id="ColorPreview"></div></div></td>
-  <td valign="middle" width="100%"><input type="text" name="ColorHex"
-    id="ColorHex" value="" size=15></td>
- </tr>
-</table>
-</form>
-
-<table id="palettecolor" border="0" cellspacing="1" cellpadding="0" width="100%" bgcolor="#000000">
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#003300" onmouseover="View('003300')" onclick="Set('003300')"></td>
-<td bgcolor="#006600" onmouseover="View('006600')" onclick="Set('006600')"></td>
-<td bgcolor="#009900" onmouseover="View('009900')" onclick="Set('009900')"></td>
-<td bgcolor="#00CC00" onmouseover="View('00CC00')" onclick="Set('00CC00')"></td>
-<td bgcolor="#00FF00" onmouseover="View('00FF00')" onclick="Set('00FF00')"></td>
-<td bgcolor="#330000" onmouseover="View('330000')" onclick="Set('330000')"></td>
-<td bgcolor="#333300" onmouseover="View('333300')" onclick="Set('333300')"></td>
-<td bgcolor="#336600" onmouseover="View('336600')" onclick="Set('336600')"></td>
-<td bgcolor="#339900" onmouseover="View('339900')" onclick="Set('339900')"></td>
-<td bgcolor="#33CC00" onmouseover="View('33CC00')" onclick="Set('33CC00')"></td>
-<td bgcolor="#33FF00" onmouseover="View('33FF00')" onclick="Set('33FF00')"></td>
-<td bgcolor="#660000" onmouseover="View('660000')" onclick="Set('660000')"></td>
-<td bgcolor="#663300" onmouseover="View('663300')" onclick="Set('663300')"></td>
-<td bgcolor="#666600" onmouseover="View('666600')" onclick="Set('666600')"></td>
-<td bgcolor="#669900" onmouseover="View('669900')" onclick="Set('669900')"></td>
-<td bgcolor="#66CC00" onmouseover="View('66CC00')" onclick="Set('66CC00')"></td>
-<td bgcolor="#66FF00" onmouseover="View('66FF00')" onclick="Set('66FF00')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#333333" onmouseover="View('333333')" onclick="Set('333333')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#000033" onmouseover="View('000033')" onclick="Set('000033')"></td>
-<td bgcolor="#003333" onmouseover="View('003333')" onclick="Set('003333')"></td>
-<td bgcolor="#006633" onmouseover="View('006633')" onclick="Set('006633')"></td>
-<td bgcolor="#009933" onmouseover="View('009933')" onclick="Set('009933')"></td>
-<td bgcolor="#00CC33" onmouseover="View('00CC33')" onclick="Set('00CC33')"></td>
-<td bgcolor="#00FF33" onmouseover="View('00FF33')" onclick="Set('00FF33')"></td>
-<td bgcolor="#330033" onmouseover="View('330033')" onclick="Set('330033')"></td>
-<td bgcolor="#333333" onmouseover="View('333333')" onclick="Set('333333')"></td>
-<td bgcolor="#336633" onmouseover="View('336633')" onclick="Set('336633')"></td>
-<td bgcolor="#339933" onmouseover="View('339933')" onclick="Set('339933')"></td>
-<td bgcolor="#33CC33" onmouseover="View('33CC33')" onclick="Set('33CC33')"></td>
-<td bgcolor="#33FF33" onmouseover="View('33FF33')" onclick="Set('33FF33')"></td>
-<td bgcolor="#660033" onmouseover="View('660033')" onclick="Set('660033')"></td>
-<td bgcolor="#663333" onmouseover="View('663333')" onclick="Set('663333')"></td>
-<td bgcolor="#666633" onmouseover="View('666633')" onclick="Set('666633')"></td>
-<td bgcolor="#669933" onmouseover="View('669933')" onclick="Set('669933')"></td>
-<td bgcolor="#66CC33" onmouseover="View('66CC33')" onclick="Set('66CC33')"></td>
-<td bgcolor="#66FF33" onmouseover="View('66FF33')" onclick="Set('66FF33')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#666666" onmouseover="View('666666')" onclick="Set('666666')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#000066" onmouseover="View('000066')" onclick="Set('000066')"></td>
-<td bgcolor="#003366" onmouseover="View('003366')" onclick="Set('003366')"></td>
-<td bgcolor="#006666" onmouseover="View('006666')" onclick="Set('006666')"></td>
-<td bgcolor="#009966" onmouseover="View('009966')" onclick="Set('009966')"></td>
-<td bgcolor="#00CC66" onmouseover="View('00CC66')" onclick="Set('00CC66')"></td>
-<td bgcolor="#00FF66" onmouseover="View('00FF66')" onclick="Set('00FF66')"></td>
-<td bgcolor="#330066" onmouseover="View('330066')" onclick="Set('330066')"></td>
-<td bgcolor="#333366" onmouseover="View('333366')" onclick="Set('333366')"></td>
-<td bgcolor="#336666" onmouseover="View('336666')" onclick="Set('336666')"></td>
-<td bgcolor="#339966" onmouseover="View('339966')" onclick="Set('339966')"></td>
-<td bgcolor="#33CC66" onmouseover="View('33CC66')" onclick="Set('33CC66')"></td>
-<td bgcolor="#33FF66" onmouseover="View('33FF66')" onclick="Set('33FF66')"></td>
-<td bgcolor="#660066" onmouseover="View('660066')" onclick="Set('660066')"></td>
-<td bgcolor="#663366" onmouseover="View('663366')" onclick="Set('663366')"></td>
-<td bgcolor="#666666" onmouseover="View('666666')" onclick="Set('666666')"></td>
-<td bgcolor="#669966" onmouseover="View('669966')" onclick="Set('669966')"></td>
-<td bgcolor="#66CC66" onmouseover="View('66CC66')" onclick="Set('66CC66')"></td>
-<td bgcolor="#66FF66" onmouseover="View('66FF66')" onclick="Set('66FF66')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#999999" onmouseover="View('999999')" onclick="Set('999999')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#000099" onmouseover="View('000099')" onclick="Set('000099')"></td>
-<td bgcolor="#003399" onmouseover="View('003399')" onclick="Set('003399')"></td>
-<td bgcolor="#006699" onmouseover="View('006699')" onclick="Set('006699')"></td>
-<td bgcolor="#009999" onmouseover="View('009999')" onclick="Set('009999')"></td>
-<td bgcolor="#00CC99" onmouseover="View('00CC99')" onclick="Set('00CC99')"></td>
-<td bgcolor="#00FF99" onmouseover="View('00FF99')" onclick="Set('00FF99')"></td>
-<td bgcolor="#330099" onmouseover="View('330099')" onclick="Set('330099')"></td>
-<td bgcolor="#333399" onmouseover="View('333399')" onclick="Set('333399')"></td>
-<td bgcolor="#336699" onmouseover="View('336699')" onclick="Set('336699')"></td>
-<td bgcolor="#339999" onmouseover="View('339999')" onclick="Set('339999')"></td>
-<td bgcolor="#33CC99" onmouseover="View('33CC99')" onclick="Set('33CC99')"></td>
-<td bgcolor="#33FF99" onmouseover="View('33FF99')" onclick="Set('33FF99')"></td>
-<td bgcolor="#660099" onmouseover="View('660099')" onclick="Set('660099')"></td>
-<td bgcolor="#663399" onmouseover="View('663399')" onclick="Set('663399')"></td>
-<td bgcolor="#666699" onmouseover="View('666699')" onclick="Set('666699')"></td>
-<td bgcolor="#669999" onmouseover="View('669999')" onclick="Set('669999')"></td>
-<td bgcolor="#66CC99" onmouseover="View('66CC99')" onclick="Set('66CC99')"></td>
-<td bgcolor="#66FF99" onmouseover="View('66FF99')" onclick="Set('66FF99')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#CCCCCC" onmouseover="View('CCCCCC')" onclick="Set('CCCCCC')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#0000CC" onmouseover="View('0000CC')" onclick="Set('0000CC')"></td>
-<td bgcolor="#0033CC" onmouseover="View('0033CC')" onclick="Set('0033CC')"></td>
-<td bgcolor="#0066CC" onmouseover="View('0066CC')" onclick="Set('0066CC')"></td>
-<td bgcolor="#0099CC" onmouseover="View('0099CC')" onclick="Set('0099CC')"></td>
-<td bgcolor="#00CCCC" onmouseover="View('00CCCC')" onclick="Set('00CCCC')"></td>
-<td bgcolor="#00FFCC" onmouseover="View('00FFCC')" onclick="Set('00FFCC')"></td>
-<td bgcolor="#3300CC" onmouseover="View('3300CC')" onclick="Set('3300CC')"></td>
-<td bgcolor="#3333CC" onmouseover="View('3333CC')" onclick="Set('3333CC')"></td>
-<td bgcolor="#3366CC" onmouseover="View('3366CC')" onclick="Set('3366CC')"></td>
-<td bgcolor="#3399CC" onmouseover="View('3399CC')" onclick="Set('3399CC')"></td>
-<td bgcolor="#33CCCC" onmouseover="View('33CCCC')" onclick="Set('33CCCC')"></td>
-<td bgcolor="#33FFCC" onmouseover="View('33FFCC')" onclick="Set('33FFCC')"></td>
-<td bgcolor="#6600CC" onmouseover="View('6600CC')" onclick="Set('6600CC')"></td>
-<td bgcolor="#6633CC" onmouseover="View('6633CC')" onclick="Set('6633CC')"></td>
-<td bgcolor="#6666CC" onmouseover="View('6666CC')" onclick="Set('6666CC')"></td>
-<td bgcolor="#6699CC" onmouseover="View('6699CC')" onclick="Set('6699CC')"></td>
-<td bgcolor="#66CCCC" onmouseover="View('66CCCC')" onclick="Set('66CCCC')"></td>
-<td bgcolor="#66FFCC" onmouseover="View('66FFCC')" onclick="Set('66FFCC')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#FFFFFF" onmouseover="View('FFFFFF')" onclick="Set('FFFFFF')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#0000FF" onmouseover="View('0000FF')" onclick="Set('0000FF')"></td>
-<td bgcolor="#0033FF" onmouseover="View('0033FF')" onclick="Set('0033FF')"></td>
-<td bgcolor="#0066FF" onmouseover="View('0066FF')" onclick="Set('0066FF')"></td>
-<td bgcolor="#0099FF" onmouseover="View('0099FF')" onclick="Set('0099FF')"></td>
-<td bgcolor="#00CCFF" onmouseover="View('00CCFF')" onclick="Set('00CCFF')"></td>
-<td bgcolor="#00FFFF" onmouseover="View('00FFFF')" onclick="Set('00FFFF')"></td>
-<td bgcolor="#3300FF" onmouseover="View('3300FF')" onclick="Set('3300FF')"></td>
-<td bgcolor="#3333FF" onmouseover="View('3333FF')" onclick="Set('3333FF')"></td>
-<td bgcolor="#3366FF" onmouseover="View('3366FF')" onclick="Set('3366FF')"></td>
-<td bgcolor="#3399FF" onmouseover="View('3399FF')" onclick="Set('3399FF')"></td>
-<td bgcolor="#33CCFF" onmouseover="View('33CCFF')" onclick="Set('33CCFF')"></td>
-<td bgcolor="#33FFFF" onmouseover="View('33FFFF')" onclick="Set('33FFFF')"></td>
-<td bgcolor="#6600FF" onmouseover="View('6600FF')" onclick="Set('6600FF')"></td>
-<td bgcolor="#6633FF" onmouseover="View('6633FF')" onclick="Set('6633FF')"></td>
-<td bgcolor="#6666FF" onmouseover="View('6666FF')" onclick="Set('6666FF')"></td>
-<td bgcolor="#6699FF" onmouseover="View('6699FF')" onclick="Set('6699FF')"></td>
-<td bgcolor="#66CCFF" onmouseover="View('66CCFF')" onclick="Set('66CCFF')"></td>
-<td bgcolor="#66FFFF" onmouseover="View('66FFFF')" onclick="Set('66FFFF')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#FF0000" onmouseover="View('FF0000')" onclick="Set('FF0000')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#990000" onmouseover="View('990000')" onclick="Set('990000')"></td>
-<td bgcolor="#993300" onmouseover="View('993300')" onclick="Set('993300')"></td>
-<td bgcolor="#996600" onmouseover="View('996600')" onclick="Set('996600')"></td>
-<td bgcolor="#999900" onmouseover="View('999900')" onclick="Set('999900')"></td>
-<td bgcolor="#99CC00" onmouseover="View('99CC00')" onclick="Set('99CC00')"></td>
-<td bgcolor="#99FF00" onmouseover="View('99FF00')" onclick="Set('99FF00')"></td>
-<td bgcolor="#CC0000" onmouseover="View('CC0000')" onclick="Set('CC0000')"></td>
-<td bgcolor="#CC3300" onmouseover="View('CC3300')" onclick="Set('CC3300')"></td>
-<td bgcolor="#CC6600" onmouseover="View('CC6600')" onclick="Set('CC6600')"></td>
-<td bgcolor="#CC9900" onmouseover="View('CC9900')" onclick="Set('CC9900')"></td>
-<td bgcolor="#CCCC00" onmouseover="View('CCCC00')" onclick="Set('CCCC00')"></td>
-<td bgcolor="#CCFF00" onmouseover="View('CCFF00')" onclick="Set('CCFF00')"></td>
-<td bgcolor="#FF0000" onmouseover="View('FF0000')" onclick="Set('FF0000')"></td>
-<td bgcolor="#FF3300" onmouseover="View('FF3300')" onclick="Set('FF3300')"></td>
-<td bgcolor="#FF6600" onmouseover="View('FF6600')" onclick="Set('FF6600')"></td>
-<td bgcolor="#FF9900" onmouseover="View('FF9900')" onclick="Set('FF9900')"></td>
-<td bgcolor="#FFCC00" onmouseover="View('FFCC00')" onclick="Set('FFCC00')"></td>
-<td bgcolor="#FFFF00" onmouseover="View('FFFF00')" onclick="Set('FFFF00')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#00FF00" onmouseover="View('00FF00')" onclick="Set('00FF00')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#990033" onmouseover="View('990033')" onclick="Set('990033')"></td>
-<td bgcolor="#993333" onmouseover="View('993333')" onclick="Set('993333')"></td>
-<td bgcolor="#996633" onmouseover="View('996633')" onclick="Set('996633')"></td>
-<td bgcolor="#999933" onmouseover="View('999933')" onclick="Set('999933')"></td>
-<td bgcolor="#99CC33" onmouseover="View('99CC33')" onclick="Set('99CC33')"></td>
-<td bgcolor="#99FF33" onmouseover="View('99FF33')" onclick="Set('99FF33')"></td>
-<td bgcolor="#CC0033" onmouseover="View('CC0033')" onclick="Set('CC0033')"></td>
-<td bgcolor="#CC3333" onmouseover="View('CC3333')" onclick="Set('CC3333')"></td>
-<td bgcolor="#CC6633" onmouseover="View('CC6633')" onclick="Set('CC6633')"></td>
-<td bgcolor="#CC9933" onmouseover="View('CC9933')" onclick="Set('CC9933')"></td>
-<td bgcolor="#CCCC33" onmouseover="View('CCCC33')" onclick="Set('CCCC33')"></td>
-<td bgcolor="#CCFF33" onmouseover="View('CCFF33')" onclick="Set('CCFF33')"></td>
-<td bgcolor="#FF0033" onmouseover="View('FF0033')" onclick="Set('FF0033')"></td>
-<td bgcolor="#FF3333" onmouseover="View('FF3333')" onclick="Set('FF3333')"></td>
-<td bgcolor="#FF6633" onmouseover="View('FF6633')" onclick="Set('FF6633')"></td>
-<td bgcolor="#FF9933" onmouseover="View('FF9933')" onclick="Set('FF9933')"></td>
-<td bgcolor="#FFCC33" onmouseover="View('FFCC33')" onclick="Set('FFCC33')"></td>
-<td bgcolor="#FFFF33" onmouseover="View('FFFF33')" onclick="Set('FFFF33')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#0000FF" onmouseover="View('0000FF')" onclick="Set('0000FF')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#990066" onmouseover="View('990066')" onclick="Set('990066')"></td>
-<td bgcolor="#993366" onmouseover="View('993366')" onclick="Set('993366')"></td>
-<td bgcolor="#996666" onmouseover="View('996666')" onclick="Set('996666')"></td>
-<td bgcolor="#999966" onmouseover="View('999966')" onclick="Set('999966')"></td>
-<td bgcolor="#99CC66" onmouseover="View('99CC66')" onclick="Set('99CC66')"></td>
-<td bgcolor="#99FF66" onmouseover="View('99FF66')" onclick="Set('99FF66')"></td>
-<td bgcolor="#CC0066" onmouseover="View('CC0066')" onclick="Set('CC0066')"></td>
-<td bgcolor="#CC3366" onmouseover="View('CC3366')" onclick="Set('CC3366')"></td>
-<td bgcolor="#CC6666" onmouseover="View('CC6666')" onclick="Set('CC6666')"></td>
-<td bgcolor="#CC9966" onmouseover="View('CC9966')" onclick="Set('CC9966')"></td>
-<td bgcolor="#CCCC66" onmouseover="View('CCCC66')" onclick="Set('CCCC66')"></td>
-<td bgcolor="#CCFF66" onmouseover="View('CCFF66')" onclick="Set('CCFF66')"></td>
-<td bgcolor="#FF0066" onmouseover="View('FF0066')" onclick="Set('FF0066')"></td>
-<td bgcolor="#FF3366" onmouseover="View('FF3366')" onclick="Set('FF3366')"></td>
-<td bgcolor="#FF6666" onmouseover="View('FF6666')" onclick="Set('FF6666')"></td>
-<td bgcolor="#FF9966" onmouseover="View('FF9966')" onclick="Set('FF9966')"></td>
-<td bgcolor="#FFCC66" onmouseover="View('FFCC66')" onclick="Set('FFCC66')"></td>
-<td bgcolor="#FFFF66" onmouseover="View('FFFF66')" onclick="Set('FFFF66')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#FFFF00" onmouseover="View('FFFF00')" onclick="Set('FFFF00')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#990099" onmouseover="View('990099')" onclick="Set('990099')"></td>
-<td bgcolor="#993399" onmouseover="View('993399')" onclick="Set('993399')"></td>
-<td bgcolor="#996699" onmouseover="View('996699')" onclick="Set('996699')"></td>
-<td bgcolor="#999999" onmouseover="View('999999')" onclick="Set('999999')"></td>
-<td bgcolor="#99CC99" onmouseover="View('99CC99')" onclick="Set('99CC99')"></td>
-<td bgcolor="#99FF99" onmouseover="View('99FF99')" onclick="Set('99FF99')"></td>
-<td bgcolor="#CC0099" onmouseover="View('CC0099')" onclick="Set('CC0099')"></td>
-<td bgcolor="#CC3399" onmouseover="View('CC3399')" onclick="Set('CC3399')"></td>
-<td bgcolor="#CC6699" onmouseover="View('CC6699')" onclick="Set('CC6699')"></td>
-<td bgcolor="#CC9999" onmouseover="View('CC9999')" onclick="Set('CC9999')"></td>
-<td bgcolor="#CCCC99" onmouseover="View('CCCC99')" onclick="Set('CCCC99')"></td>
-<td bgcolor="#CCFF99" onmouseover="View('CCFF99')" onclick="Set('CCFF99')"></td>
-<td bgcolor="#FF0099" onmouseover="View('FF0099')" onclick="Set('FF0099')"></td>
-<td bgcolor="#FF3399" onmouseover="View('FF3399')" onclick="Set('FF3399')"></td>
-<td bgcolor="#FF6699" onmouseover="View('FF6699')" onclick="Set('FF6699')"></td>
-<td bgcolor="#FF9999" onmouseover="View('FF9999')" onclick="Set('FF9999')"></td>
-<td bgcolor="#FFCC99" onmouseover="View('FFCC99')" onclick="Set('FFCC99')"></td>
-<td bgcolor="#FFFF99" onmouseover="View('FFFF99')" onclick="Set('FFFF99')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#00FFFF" onmouseover="View('00FFFF')" onclick="Set('00FFFF')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#9900CC" onmouseover="View('9900CC')" onclick="Set('9900CC')"></td>
-<td bgcolor="#9933CC" onmouseover="View('9933CC')" onclick="Set('9933CC')"></td>
-<td bgcolor="#9966CC" onmouseover="View('9966CC')" onclick="Set('9966CC')"></td>
-<td bgcolor="#9999CC" onmouseover="View('9999CC')" onclick="Set('9999CC')"></td>
-<td bgcolor="#99CCCC" onmouseover="View('99CCCC')" onclick="Set('99CCCC')"></td>
-<td bgcolor="#99FFCC" onmouseover="View('99FFCC')" onclick="Set('99FFCC')"></td>
-<td bgcolor="#CC00CC" onmouseover="View('CC00CC')" onclick="Set('CC00CC')"></td>
-<td bgcolor="#CC33CC" onmouseover="View('CC33CC')" onclick="Set('CC33CC')"></td>
-<td bgcolor="#CC66CC" onmouseover="View('CC66CC')" onclick="Set('CC66CC')"></td>
-<td bgcolor="#CC99CC" onmouseover="View('CC99CC')" onclick="Set('CC99CC')"></td>
-<td bgcolor="#CCCCCC" onmouseover="View('CCCCCC')" onclick="Set('CCCCCC')"></td>
-<td bgcolor="#CCFFCC" onmouseover="View('CCFFCC')" onclick="Set('CCFFCC')"></td>
-<td bgcolor="#FF00CC" onmouseover="View('FF00CC')" onclick="Set('FF00CC')"></td>
-<td bgcolor="#FF33CC" onmouseover="View('FF33CC')" onclick="Set('FF33CC')"></td>
-<td bgcolor="#FF66CC" onmouseover="View('FF66CC')" onclick="Set('FF66CC')"></td>
-<td bgcolor="#FF99CC" onmouseover="View('FF99CC')" onclick="Set('FF99CC')"></td>
-<td bgcolor="#FFCCCC" onmouseover="View('FFCCCC')" onclick="Set('FFCCCC')"></td>
-<td bgcolor="#FFFFCC" onmouseover="View('FFFFCC')" onclick="Set('FFFFCC')"></td>
-</tr>
-<tr>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#FF00FF" onmouseover="View('FF00FF')" onclick="Set('FF00FF')"></td>
-<td bgcolor="#000000" onmouseover="View('000000')" onclick="Set('000000')"></td>
-<td bgcolor="#9900FF" onmouseover="View('9900FF')" onclick="Set('9900FF')"></td>
-<td bgcolor="#9933FF" onmouseover="View('9933FF')" onclick="Set('9933FF')"></td>
-<td bgcolor="#9966FF" onmouseover="View('9966FF')" onclick="Set('9966FF')"></td>
-<td bgcolor="#9999FF" onmouseover="View('9999FF')" onclick="Set('9999FF')"></td>
-<td bgcolor="#99CCFF" onmouseover="View('99CCFF')" onclick="Set('99CCFF')"></td>
-<td bgcolor="#99FFFF" onmouseover="View('99FFFF')" onclick="Set('99FFFF')"></td>
-<td bgcolor="#CC00FF" onmouseover="View('CC00FF')" onclick="Set('CC00FF')"></td>
-<td bgcolor="#CC33FF" onmouseover="View('CC33FF')" onclick="Set('CC33FF')"></td>
-<td bgcolor="#CC66FF" onmouseover="View('CC66FF')" onclick="Set('CC66FF')"></td>
-<td bgcolor="#CC99FF" onmouseover="View('CC99FF')" onclick="Set('CC99FF')"></td>
-<td bgcolor="#CCCCFF" onmouseover="View('CCCCFF')" onclick="Set('CCCCFF')"></td>
-<td bgcolor="#CCFFFF" onmouseover="View('CCFFFF')" onclick="Set('CCFFFF')"></td>
-<td bgcolor="#FF00FF" onmouseover="View('FF00FF')" onclick="Set('FF00FF')"></td>
-<td bgcolor="#FF33FF" onmouseover="View('FF33FF')" onclick="Set('FF33FF')"></td>
-<td bgcolor="#FF66FF" onmouseover="View('FF66FF')" onclick="Set('FF66FF')"></td>
-<td bgcolor="#FF99FF" onmouseover="View('FF99FF')" onclick="Set('FF99FF')"></td>
-<td bgcolor="#FFCCFF" onmouseover="View('FFCCFF')" onclick="Set('FFCCFF')"></td>
-<td bgcolor="#FFFFFF" onmouseover="View('FFFFFF')" onclick="Set('FFFFFF')"></td>
-</tr>
-</table>
-
-</body></html>
\ No newline at end of file
diff --git a/web/imcms/xinha/release-notes.txt b/web/imcms/xinha/release-notes.txt
deleted file mode 100644
index 8bd19b3284..0000000000
--- a/web/imcms/xinha/release-notes.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-Xinha - The Community-Built Online HTML Editor
-
-For bug reports, forum, and updates go to 
-http://xinha.org
-
-Release History
-
-Xinha 0.93
- - fixed Ticket #967 Font Color Picker stops working after using one of ImageManager, ExtendedFileManager, FullPage, or HorizontalRule
- - fixed Ticket #965 When switching between Xinhas in the same page, in textmode toolbar stays disabled
- - fixwd Ticket #963 DOMwalk IE: head tag attributes without quotes and closing slash
- - Ticket #962 DOMwalk Mozilla: improved source indentation
- - fixed Ticket #957 If item in in xinha_editors is not a textarea: skip gracefully
- - fixed Ticket #900: catch an fatal error that occured sometimes when switching between modes in fullpage mode in Mozilla
- - fixed Ticket #969 DOMwalk Gecko: line breaks rendered as <br>s inside <pre> blocks
- - fixed Ticket #976 Loading message misplaced in IE7
- - fixed Ticket #977 TableOperations toolbar off-place in ext_example.html
- - fixed Ticket #978 defining a padding for <td>s in global css affects Xinha framework
- - Ticket #979 improve checking for non-supported browsers
- - fixed Ticket #934 SuperClean plugin returns just quotation when executed on localhost
- - Ticket #929 Save changes on page unload fixed for Mozilla 
- - fixed Ticket #980 ImageManager color format bug
- - fixed Ticket #981 No doctype in iframe content document/ editor always in quirks mode
- - fixed Ticket #543 Stylist Panel overflow broken
- - Ticket #983 added id for iframe
- - fixed Ticket #984 !ExtendedFileManager produces php warning
- - optimized icon file size
- - fixed !JavaScript error in !ImageManager/!ExtendedFileManager image editor
- - Ticket #908* Prompts broken in IE7: fixed for EFM, !ImageManager & !TableOperations
- - Fixes for TableOperations, tickets #82, #908*, #912 and #947
- - fixed Ticket #998* whitespace added before and/or after content (in non-fullpage mode)
- - fixed slow unloading in Mozilla
- - Fix focus problem when switching from html to wysiwyg in Gecko. See ticket #900.
- - fixed toolbar floating issue
- - fixed #1003 HTML length limited to 1024 characters with plugin CharCounter
- - Ticket #1000 new public methods for getting/setting editor content
- - fixed #735 - IE eating scripts and comments at the beginning of pages.
- - Added new config variables to set iframe width if less than editor width (ticket:322) and set alignment of toolbar buttons.
- - added Basque translation for XinhaCore
- - prevent an error if server is set to parse .js files as PHP
- - Ticket #127 plugin HtmlEntities: Entities.js  file corrupt
-
-Xinha 0.92beta
- - fixed Ticket #831 stop empty anchors from being removed
- - Make htmlarea.js just load XinhaCore.js instead of being a copy of it.
- - fixed Ticket #445 Toggle TableBorder doesn't work if this.fullpage=true or using FullPage plugin
- - fixed Ticket #551 shape and coord attributes of area element are ignored by IE
- - fixed Ticket #650 SpellChecker is not compatible with FullPage plugin
- - fixed Ticket #816 CharacterMap and ListType panel modes make editor jump to top in IE
- - fixed Ticket #570 change behaviour of justify when an image is selected to make the image float left/right, 
-   click the justify button again to undo it
- - fixed Ticket #891 noscript content got escaped
- - fixed Ticket #857 Firefox fails to load in fullpage mode when <link ..> tag in wrong place.
- - fixed Ticket #841 Spell Checker - Won't return to xinha.
- - fixed Ticket #914 All buttons stay grey & this.getParentElement is not a function message when not calling
-   Xinha.loadPlugins() in xinha_init function
- - fixed Ticket #911 Background color does not work in Firefox
- - fixed Ticket #912 an error is thrown in Mozilla when clicking merge cells button and fewer than 2 cells are selected
- - fixed Ticket #816 CharacterMap and ListType panel modes make editor jump to top in IE
- - fixed Ticket #917 getHTMLWrapper in IE renders attributes like _stylist_usedtobe="[object Object]"
- - fixed Ticket #556 stripBaseHref didn't work without baseHref defined explicitly.
- - Update InsertPicture plugin Update
- - fixed Ticket #921 EFM extended file manager - iframe height problem (IE)
- - Ticket #923 colorPicker face lift & localisation
- - fixed Ticket #924 EFM + ImageManager re-transforming of url to original image after automatic resize broken
- - Ticket #900- retain editing position position between modes
- - fixed Ticket #928 ImageManager fails if (another) Files.php exists in include path
- - fixed Ticket #935 EFM demo_images php upload allowed: possible security risk
- - Ticket #939 Japanese langage support 
- - fixed Ticket #3 Horizontal Rule Selection
- - Plugin ExtendedFileManager: added doc to allowed upload extensions
- - Plugin PasteText update
- - Plugin HtmlEntities: default preset iso-8859-1
- - fixed Ticket #948 IE: inline styles are not rendered by DOMwalk getHTML()
- - Plugin HorizontalRule update
- - Plugin SaveSubmit update
- - Plugin Linker update
- - fixed Ticket #823 editor contents was not submitted when using JavaScript form.submit() without prior form.onsubmit()
- - fixed Ticket #459 all body attributes removed in full page mode in FireFox
- - _editor_url is now converted to absolute if it is relative. 
- - fixed Ticket #594 IE: insertHTML() inserts HTML outside editor when editor is not focussed
- - Ticket #954 FullScreen mode can now be called programmatically or on startup with or without button
- - fixed Ticket #321 FullScreen : select elements show through in IE6 
- - fixed Ticket #953 Statusbar has ugly white gap at the bottom when switching back from full screen in IE 
- - fixed Ticket #952 FullScreen: scrollbars don't disappear in IE in QuirksMode
- - fixed Ticket #603 Popop Dialog Height problems
- - fixed Ticket #955 DOMwalk getHTML outputs empty attribute with value "true" instead of attribute name and some are skipped at all
- 
-Xinha 0.91beta
- - changed namespace from HTMLArea to Xinha
- - the core file is now named XinhaCore.js instead of htmlarea.js,
-   please change your pages accordingly (the htmlarea.js will be removed!)
- - the color picker script is now loaded on demand to reduce initial loading time
- 
-Xinha 0.9beta
-This equals Xinha revision 635 of Jan 11 2007
- - All JavaScript files over 2kb have been compressed using the dojo JavaScript compressor
- - All gifs have been optimized using Trout's GIF Optimizer version 2.3
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/blue-look/button-background.png b/web/imcms/xinha/skins/blue-look/button-background.png
deleted file mode 100644
index 96806840dd..0000000000
Binary files a/web/imcms/xinha/skins/blue-look/button-background.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/blue-look/separator.gif b/web/imcms/xinha/skins/blue-look/separator.gif
deleted file mode 100644
index 5ae3d59cb5..0000000000
Binary files a/web/imcms/xinha/skins/blue-look/separator.gif and /dev/null differ
diff --git a/web/imcms/xinha/skins/blue-look/skin.css b/web/imcms/xinha/skins/blue-look/skin.css
deleted file mode 100644
index 9f22add8d6..0000000000
--- a/web/imcms/xinha/skins/blue-look/skin.css
+++ /dev/null
@@ -1,98 +0,0 @@
-.htmlarea .toolbar, .htmlarea .toolbar .button
-{
-  background-color:#f7f8fd;
-}
-
-.htmlarea .toolbarRow
-{
-  margin-top:2px;
-  margin-bottom:2px;
-  border:1px dotted #DEDEDE;
-  padding:2px;
-  -moz-border-radius:3px;
-  margin:4px;
-  height:25px;
-}
-
-.htmlarea .toolbar .button
-{
-  background-image: url(button-background.png);
-  width:20px;
-  height:20px;
-  padding:0px;
-  border:1px solid #f7f8fd;
-}
-
-.buttonImageContainer
-{
-  position:relative;
-  left:1px;
-  top :1px;
-}
-
-.htmlarea .toolbar .separator {
-  margin:0px;
-  background-image: url(separator.gif);
-  border:1px #f7f8fd;
-  width:   7px;
-  height: 20px;
-  padding: 0px;
-}
-
-.htmlarea .toolbar a.button:hover
-{
-  border: 1px solid;
-  border-color: white #CCC #CCC white;
-}
-
-.htmlarea .toolbar a.buttonDisabled:hover
-{
-  border-color: #f7f8fd;
-}
-
-.htmlarea .toolbar .button.buttonActive,
-.htmlarea .toolbar .button.buttonPressed
-{
-  border: 1px solid;
-  border-color: #CCC white white #CCC;
-}
-
-.htmlarea .statusBar {
-  border-color: #CCC white white #CCC;
-  padding: 0px;
-  height:20px;
-  background-image: url(button-background.png);
-  background-repeat: repeat-x;
-  background-color: #f7f8fd;
-  color: ButtonText;
-  font: 11px helvetica,arial,sans-serif;
-}
-
-.htmlarea .statusBar .statusBarTree
-{
-  display:block;
-  margin: 3px;
-}
-
-.htmlarea .statusBar .statusBarTree a
-{
-  padding: 2px 5px;
-  color: #00f;
-  text-decoration:none;
-}
-
-.htmlarea .panel h1
-{
-  background-image: url('button-background.png');
-  background-repeat: repeat-x;
-  background-color: #f7f8fd;
-}
-.dialog {
-  background-color:#f7f8fd;
-}
-.dialog .title {
-  background-image: url(button-background.png);
-}  
-.dialog button{
-  background-image: url(button-background.png);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/blue-metallic/button-background.png b/web/imcms/xinha/skins/blue-metallic/button-background.png
deleted file mode 100644
index 41c18db252..0000000000
Binary files a/web/imcms/xinha/skins/blue-metallic/button-background.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/blue-metallic/separator.gif b/web/imcms/xinha/skins/blue-metallic/separator.gif
deleted file mode 100644
index bc9297abc5..0000000000
Binary files a/web/imcms/xinha/skins/blue-metallic/separator.gif and /dev/null differ
diff --git a/web/imcms/xinha/skins/blue-metallic/skin.css b/web/imcms/xinha/skins/blue-metallic/skin.css
deleted file mode 100644
index e798e47899..0000000000
--- a/web/imcms/xinha/skins/blue-metallic/skin.css
+++ /dev/null
@@ -1,96 +0,0 @@
-.htmlarea .toolbar { background-color:#f7f8fd;}
-
-.htmlarea .toolbarRow
-{
-  /*background-image: url(button-background.png);*/
-  background-color: #C5DCEC;
-  margin-top:2px;
-  margin-bottom:2px;
-  border:1px solid #7A8A99;
-  padding:2px;
-  -moz-border-radius:4px;
-  margin:4px;
-  height:25px;
-}
-
-.htmlarea .toolbar .button {
-  background-image: url(button-background.png);
-  width:20px;
-  height:21px;
-  padding:1px;
-  border:0px;
-}
-
-.buttonImageContainer
-{
-  position:relative;
-  left:1px;
-  top :1px;
-}
-
-.htmlarea .toolbar .separator
-{
-  margin:0px;
-  background-image: url(separator.gif);
-  border:1px #f7f8fd;
-  width:   7px;
-  height: 21px;
-  padding: 0px;
-}
-
-.htmlarea .toolbar a.button:hover,
-.htmlarea .toolbar a.buttonDisabled:hover
-{
-  padding: 0px;
-  border: 1px solid;
-  border-color: #7A8A99;
-}
-
-.htmlarea .toolbar .button.buttonActive,
-.htmlarea .toolbar .button.buttonPressed
-{
-  padding: 0px;
-  border: 1px solid;
-  border-color: #79A4CC #FFFFFF #FFFFFF #79A4CC;
-}
-
-.htmlarea .statusBar {
-  border-color: #CCC white white #CCC;
-  padding: 0px;
-  height:20px;
-  background-image: url(button-background.png);
-  background-repeat: repeat-x;
-  background-color: #f7f8fd;
-  color: ButtonText;
-  font: 11px helvetica,arial,sans-serif;
-}
-
-.htmlarea .statusBar .statusBarTree
-{
-  display:block;
-  margin: 3px;
-}
-
-.htmlarea .statusBar .statusBarTree a
-{
-  padding: 2px 5px;
-  color: #00f;
-  text-decoration:none;
-}
-
-.htmlarea .panel h1
-{
-  background-image: url('button-background.png');
-  background-repeat: repeat-x;
-  background-color: #f7f8fd;
-}
-
-.dialog {
-  background-color: #EEEEEE;
-}
-.dialog .title {
-  background-image: url(button-background.png);
-}
-.dialog button{
-  background-image: url(button-background.png);
-}
diff --git a/web/imcms/xinha/skins/green-look/button-background.gif b/web/imcms/xinha/skins/green-look/button-background.gif
deleted file mode 100644
index d137119852..0000000000
Binary files a/web/imcms/xinha/skins/green-look/button-background.gif and /dev/null differ
diff --git a/web/imcms/xinha/skins/green-look/button-background.png b/web/imcms/xinha/skins/green-look/button-background.png
deleted file mode 100644
index 6fae8c0402..0000000000
Binary files a/web/imcms/xinha/skins/green-look/button-background.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/green-look/separator.gif b/web/imcms/xinha/skins/green-look/separator.gif
deleted file mode 100644
index 0357233e0c..0000000000
Binary files a/web/imcms/xinha/skins/green-look/separator.gif and /dev/null differ
diff --git a/web/imcms/xinha/skins/green-look/skin.css b/web/imcms/xinha/skins/green-look/skin.css
deleted file mode 100644
index bbbec28551..0000000000
--- a/web/imcms/xinha/skins/green-look/skin.css
+++ /dev/null
@@ -1,88 +0,0 @@
-.htmlarea .toolbar, .htmlarea .toolbar .button
-{
-  background-color:#f8fdf8;
-}
-.htmlarea .toolbarRow
-{
-  margin-top:2px;
-  margin-bottom:2px;
-  border:1px dotted #DEDEDE;
-  padding:2px;
-  -moz-border-radius:3px;
-  margin:4px;
-  height:25px;
-}
-.htmlarea .toolbar .button
-{
-  background-image:url(button-background.gif);
-  width:20px;
-  height:20px;
-  padding:0;
-  border:1px solid #f8fdf8;
-}
-.buttonImageContainer
-{
-  position:relative;
-  left:1px;
-  top:1px;
-}
-.htmlarea .toolbar .separator {
-  margin:0;
-  background-image:url(separator.gif);
-  border:1px #f8fdf8;
-  width:7px;
-  height:20px;
-  padding:0;
-}
-.htmlarea .toolbar a.button:hover
-{
-  border:1px solid;
-  border-color:#fff #ccc #ccc #fff;
-}
-.htmlarea .toolbar a.buttonDisabled:hover
-{
-  border-color:#f8fdf8;
-}
-.htmlarea .toolbar .buttonActive,
-.htmlarea .toolbar .buttonPressed
-{
-  border:1px solid;
-  border-color:#ccc #fff #fff #ccc;
-  background:#ffb166;
-}
-.htmlarea .statusBar {
-  border-color:#ccc #fff #fff #ccc;
-  padding:0;
-  height:20px;
-  background-image:url(button-background.gif);
-  background-repeat:repeat-x;
-  background-color:#f8fdf8;
-  color:ButtonText;
-  font:11px helvetica,arial,sans-serif;
-}
-.htmlarea .statusBar .statusBarTree
-{
-  display:block;
-  margin:3px;
-}
-.htmlarea .statusBar .statusBarTree a
-{
-  padding:2px 5px;
-  color:#00f;
-  text-decoration:none;
-}
-.htmlarea .panel h1
-{
-  background-image:url(button-background.gif);
-  background-repeat:repeat-x;
-  background-color:#f8fdf8;
-}
-.dialog {
-  background-color:#f8fdf8;
-}
-.dialog .title {
-  background-image: url(button-background.png);
-}  
-.dialog button{
-  background-image: url(button-background.png);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/inditreuse/README b/web/imcms/xinha/skins/inditreuse/README
deleted file mode 100644
index b66accd29d..0000000000
--- a/web/imcms/xinha/skins/inditreuse/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Skin inditreuse
-Author: Kyle Kochis (http://completesiteservices.com/)
-This work is licensed under the Creative Commons Attribution-ShareAlike License.
-To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/
-or send a letter to
-Creative Commons,
-559 Nathan Abbott Way
-Stanford, California 94305
-USA
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/inditreuse/back.png b/web/imcms/xinha/skins/inditreuse/back.png
deleted file mode 100644
index 7a71fe6b2e..0000000000
Binary files a/web/imcms/xinha/skins/inditreuse/back.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/inditreuse/button-background.png b/web/imcms/xinha/skins/inditreuse/button-background.png
deleted file mode 100644
index 5e4a827fb2..0000000000
Binary files a/web/imcms/xinha/skins/inditreuse/button-background.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/inditreuse/hover.png b/web/imcms/xinha/skins/inditreuse/hover.png
deleted file mode 100644
index 5e45483299..0000000000
Binary files a/web/imcms/xinha/skins/inditreuse/hover.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/inditreuse/selected.png b/web/imcms/xinha/skins/inditreuse/selected.png
deleted file mode 100644
index 5ade5f77cc..0000000000
Binary files a/web/imcms/xinha/skins/inditreuse/selected.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/inditreuse/separator.png b/web/imcms/xinha/skins/inditreuse/separator.png
deleted file mode 100644
index cb77e5d67c..0000000000
Binary files a/web/imcms/xinha/skins/inditreuse/separator.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/inditreuse/skin.css b/web/imcms/xinha/skins/inditreuse/skin.css
deleted file mode 100644
index f7c77e6dfc..0000000000
--- a/web/imcms/xinha/skins/inditreuse/skin.css
+++ /dev/null
@@ -1,73 +0,0 @@
-.htmlarea .toolbar {
-	background-color:#889fc9;
-  background-image:url(back.png);
-  background-repeat:repeat-y;
-}
-.htmlarea .toolbarRow {
-  margin-top:2px;
-  margin-bottom:2px;
-  background-image:url(button-background.png);
-  height:25px;
-}
-.htmlarea .toolbar .button {
-  width:20px;
-  height:20px;
-  padding:1px;
-  border:none;
-  background-image:url(button-background.png);
-}
-.buttonImageContainer {
-  position:relative;
-  left:1px;
-  top:1px;
-}
-.htmlarea .toolbar .separator {
-  margin:0;
-  background-image: url(separator.png);
-  width:7px;
-  height:20px;
-  padding:1px;
-  border:none;
-}
-.htmlarea .toolbar a.button:hover {
-  border:none !important;
-  padding:1px;
-  background-image:url(hover.png);
-}
-.htmlarea .toolbar .button.buttonPressed
-{
-  padding:1px;
-  background-image:url(selected.png);
-}
-.htmlarea .statusBar {
-  padding:0;
-  height:20px;
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#889fc9;
-  color:ButtonText;
-  font:11px helvetica,arial,sans-serif;
-}
-.htmlarea .statusBar .statusBarTree {
-  display:block;
-  margin:3px;
-}
-.htmlarea .statusBar .statusBarTree a {
-  padding:2px 5px;
-  color:#00f;
-  text-decoration:none;
-}
-.htmlarea .panel h1 {
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#889fc9;
-}
-.dialog {
-  background-color:#889fc9;
-}
-.dialog .title {
-  background-image: url(button-background.png);
-}  
-.dialog button{
-  background-image: url(button-background.png);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/silva/dialog.jpg b/web/imcms/xinha/skins/silva/dialog.jpg
deleted file mode 100644
index 05676b5fbc..0000000000
Binary files a/web/imcms/xinha/skins/silva/dialog.jpg and /dev/null differ
diff --git a/web/imcms/xinha/skins/silva/html.gif b/web/imcms/xinha/skins/silva/html.gif
deleted file mode 100644
index ddd6531ef3..0000000000
Binary files a/web/imcms/xinha/skins/silva/html.gif and /dev/null differ
diff --git a/web/imcms/xinha/skins/silva/skin.css b/web/imcms/xinha/skins/silva/skin.css
deleted file mode 100644
index 34919b4d77..0000000000
--- a/web/imcms/xinha/skins/silva/skin.css
+++ /dev/null
@@ -1,172 +0,0 @@
-/*--------------------------------*/ 
-/*      silva skin for Xinha      */ 
-/*                                */ 
-/*      by Raimund Meyer (ray)    */ 
-/*      xinha@raimundmeyer.de     */
-/*           2007-1-9             */ 
-/*--------------------------------*/ 
-
-.htmlarea .toolbar, .htmlarea .toolbar .button
-{
-  background-color:transparent;
-}
-.htmlarea .toolbar
-{
-  padding:0;
-  background-image: url(toolbar.png);
-}
-.htmlarea .toolbarRow
-{
-  margin-top:0px;
-  margin-bottom:0px;
-  border:1px solid #F1F1F1;
-  padding:0px;
-  -moz-border-radius:15px;
-  margin:4px;
-  height:20px;
-}
-/* hack: IE6 does not know border-color: transparent;*/
-html > body .htmlarea .toolbarRow {
-  border-color: transparent;
-}
-
-.htmlarea .toolbar .button
-{
-  width:18px;
-  height:18px;
-  padding:1px 2px 2px 1px ;
-  border: solid #F1F1F1;
-  border-width:1px;
-}
-
-html > body .htmlarea .toolbar .button {
-  border-color: transparent;
-}
-
-.buttonImageContainer
-{
-  position:relative;
-  left:1px;
-  top :1px;
-}
-
-.htmlarea .toolbar a.button:hover
-{
-  border: solid 1px;
-  border-color: black;
-}
-.htmlarea .toolbar a.buttonDisabled:hover
-{
-  border: solid transparent 1px;
-}
-
-.htmlarea .toolbar .button.buttonActive,
-.htmlarea .toolbar .button.buttonPressed
-{
-  border: black dotted 1px;
-  padding:2px 1px 1px 2px;  
-}
-
-.htmlarea .toolbar .button.buttonPressed {
-  padding:1px 2px 2px 1px ;
-}
-.htmlarea .toolbar .separator {
-  margin: 3px;
-  border-left: 1px dotted black;
-  border-right: none;
-  width: 1px;
-  height: 18px;
-  padding: 0px;
-}
-
-.htmlarea .statusBar {
-  border-color: #CCC white white #CCC;
-  padding: 0px;
-  height:20px;
-  background-image: url(statusbar.png);
-  background-repeat: repeat-x;
-  background-color: white;
-  color: grey;
-  font: 11px Arial,Helvetica,sans-serif;
-  vertical-align: middle;
-}
-
-.htmlarea .statusBar .statusBarTree
-{
-  display:block;
-  margin: 3px;
-}
-.htmlarea .statusBar span {
- display:none;
-}
-.htmlarea .statusBar .statusBarTree a
-{
-  padding: 0 5px;
-  color: green;
-  text-decoration:none;
-  letter-spacing:0.15em;
-  font-size:120%;
-  border: none;
-  padding: 2px 5px;
-}
-.htmlarea .statusBar .statusBarTree a:visited { color:green; }
-.htmlarea .statusBar .statusBarTree a:hover {
-  background-color: transparent;
-  color: green;
-  border: none;
-  padding: 1px 5px;
-}
-
-.dialog {
-  /* background: url(dialog.jpg) #f0f0f0 no-repeat; */
-  background-color: #f0f0f0;
- }
-body.dialog {
-	padding-top:0;
-}
-.dialog, .dialog button, .dialog input, .dialog select, .dialog textarea, .dialog table,.dialog td,.dialog th, .panel {
-  font: 11px Arial,Helvetica,sans-serif !IMPORTANT;
-}
-.panel a {
-  color:#444;
-  border-bottom: 1px dotted #bbb;
-}
-.panel a:hover {
-  background-color: #eee;
-}
-.dialog .title,.dialog  h1,.htmlarea .panel h1 {
-  background-image: url(toolbar.png);
-  background-repeat: repeat-x;
-  color:black;
-  font:Arial,Helvetica,sans-serif !IMPORTANT;
-  letter-spacing:0.2em;
-  font-size:13px;
-  font-weight:400;
-}  
-.dialog .title {
-
-}
-
-.dialog button{
-  background: url(statusbar.png) bottom repeat-x;
-  border:1px solid grey;
-  height:18px;
-  vertical-align: middle
-}
-/* separate definition for the sake of IE6*/
-.dialog input[type=button],.dialog input[type=submit]{
-  background: url(statusbar.png) bottom repeat-x;
-  border:1px solid grey;
-  height:18px;
-  vertical-align: middle
-}
-.htmlarea textarea.xinha_textarea {
-  background:url(html.gif) bottom right no-repeat;
-  /*padding:5px;
-  border:2px dotted #bbb;*/
-  font-family: "Lucida Console",Courier,monospace;
-  font-size: 10pt;
-}
-.htmlarea .dTreeNode {
-  color:black;
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/silva/statusbar.png b/web/imcms/xinha/skins/silva/statusbar.png
deleted file mode 100644
index 16db3c65d1..0000000000
Binary files a/web/imcms/xinha/skins/silva/statusbar.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/silva/toolbar.png b/web/imcms/xinha/skins/silva/toolbar.png
deleted file mode 100644
index 6f46299af8..0000000000
Binary files a/web/imcms/xinha/skins/silva/toolbar.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/titan/README b/web/imcms/xinha/skins/titan/README
deleted file mode 100644
index 1272a27b5c..0000000000
--- a/web/imcms/xinha/skins/titan/README
+++ /dev/null
@@ -1,12 +0,0 @@
-Skin Titan, a modification of Skin inditreuse by Mike Harris (www.jonesstandard.org)
-I simply changed the background to look more like nickel, and the dots on the separator have been replaced.  
-Everything else is the same.
-
-Skin inditreuse Author: Kyle Kochis (http://completesiteservices.com/)
-This work is licensed under the Creative Commons Attribution-ShareAlike License.
-To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/
-or send a letter to
-Creative Commons,
-559 Nathan Abbott Way
-Stanford, California 94305
-USA
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/titan/back.png b/web/imcms/xinha/skins/titan/back.png
deleted file mode 100644
index 7a71fe6b2e..0000000000
Binary files a/web/imcms/xinha/skins/titan/back.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/titan/button-background.png b/web/imcms/xinha/skins/titan/button-background.png
deleted file mode 100644
index 4ee6aaeb8b..0000000000
Binary files a/web/imcms/xinha/skins/titan/button-background.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/titan/hover.png b/web/imcms/xinha/skins/titan/hover.png
deleted file mode 100644
index 2e87d8497b..0000000000
Binary files a/web/imcms/xinha/skins/titan/hover.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/titan/selected.png b/web/imcms/xinha/skins/titan/selected.png
deleted file mode 100644
index ffcf8a5a31..0000000000
Binary files a/web/imcms/xinha/skins/titan/selected.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/titan/separator.png b/web/imcms/xinha/skins/titan/separator.png
deleted file mode 100644
index 75e009f6e0..0000000000
Binary files a/web/imcms/xinha/skins/titan/separator.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/titan/skin.css b/web/imcms/xinha/skins/titan/skin.css
deleted file mode 100644
index cac3401919..0000000000
--- a/web/imcms/xinha/skins/titan/skin.css
+++ /dev/null
@@ -1,73 +0,0 @@
-.htmlarea .toolbar {
-        background-color:#889fc9;
-  background-image:url(back.png);
-  background-repeat:repeat-y;
-}
-.htmlarea .toolbarRow {
-  margin-top:2px;
-  margin-bottom:2px;
-  background-image:url(button-background.png);
-  height:25px;
-}
-.htmlarea .toolbar .button {
-  width:20px;
-  height:20px;
-  padding:1px;
-  border:none;
-  background-image:url(button-background.png);
-}
-.buttonImageContainer {
-  position:relative;
-  left:1px;
-  top:1px;
-}
-.htmlarea .toolbar .separator {
-  margin:0;
-  background-image: url(separator.png);
-  width:7px;
-  height:20px;
-  padding:1px;
-  border:none;
-}
-.htmlarea .toolbar a.button:hover {
-  border:none !important;
-  padding:1px;
-  background-image:url(hover.png);
-}
-.htmlarea .toolbar .button.buttonPressed
-{
-  padding:1px;
-  background-image:url(selected.png);
-}
-.htmlarea .statusBar {
-  padding:0;
-  height:20px;
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#889fc9;
-  color:ButtonText;
-  font:11px helvetica,arial,sans-serif;
-}
-.htmlarea .statusBar .statusBarTree {
-  display:block;
-  margin:3px;
-}
-.htmlarea .statusBar .statusBarTree a {
-  padding:2px 5px;
-  color:#00f;
-  text-decoration:none;
-}
-.htmlarea .panel h1 {
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#889fc9;
-}
-.dialog {
-  background-color:#f7f8fd;
-}
-.dialog .title {
-  background-image: url(button-background.png);
-}  
-.dialog button{
-  background-image: url(button-background.png);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/xp-blue/back.png b/web/imcms/xinha/skins/xp-blue/back.png
deleted file mode 100644
index 478debb1de..0000000000
Binary files a/web/imcms/xinha/skins/xp-blue/back.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-blue/button-background.png b/web/imcms/xinha/skins/xp-blue/button-background.png
deleted file mode 100644
index 69488d345d..0000000000
Binary files a/web/imcms/xinha/skins/xp-blue/button-background.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-blue/hover.png b/web/imcms/xinha/skins/xp-blue/hover.png
deleted file mode 100644
index f55e355e39..0000000000
Binary files a/web/imcms/xinha/skins/xp-blue/hover.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-blue/selected.png b/web/imcms/xinha/skins/xp-blue/selected.png
deleted file mode 100644
index c0c3339bc9..0000000000
Binary files a/web/imcms/xinha/skins/xp-blue/selected.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-blue/separator.png b/web/imcms/xinha/skins/xp-blue/separator.png
deleted file mode 100644
index 02ceb37935..0000000000
Binary files a/web/imcms/xinha/skins/xp-blue/separator.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-blue/skin.css b/web/imcms/xinha/skins/xp-blue/skin.css
deleted file mode 100644
index bd7b955097..0000000000
--- a/web/imcms/xinha/skins/xp-blue/skin.css
+++ /dev/null
@@ -1,76 +0,0 @@
-.htmlarea .toolbar {
-	background-color:#c3daf9;
-  background-image:url(back.png);
-  background-repeat:repeat-y;
-}
-.htmlarea .toolbarRow {
-  margin-top:2px;
-  margin-bottom:2px;
-  background-image:url(button-background.png);
-  height:25px;  
-}
-.htmlarea .toolbar .button {
-  width:20px;
-  height:20px;
-  padding:1px;
-  border:none;
-  background-image:url(button-background.png);
-}
-.buttonImageContainer {
-  position:relative;
-  left:1px;
-  top:1px;
-}
-.htmlarea .toolbar .separator {
-  margin:0;
-  background-image:url(separator.png);
-  width:7px;
-  height:20px;
-  padding:0;
-}
-.separator {
-  border:none;
-}
-.htmlarea .toolbar a.button:hover {
-  border:1px solid #003355;
-  padding:0;
-  background-image:url(hover.png);
-}
-.htmlarea .toolbar .button.buttonPressed
-{
-  border:1px solid #003355;
-  padding:0;
-  background-image:url(selected.png);
-}
-.htmlarea .statusBar {
-  padding:0;
-  height:20px;
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#c3daf9;
-  color:ButtonText;
-  font:11px helvetica,arial,sans-serif;
-}
-.htmlarea .statusBar .statusBarTree {
-  display:block;
-  margin:3px;
-}
-.htmlarea .statusBar .statusBarTree a {
-  padding:2px 5px;
-  color:#00f;
-  text-decoration:none;
-}
-.htmlarea .panel h1 {
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#c3daf9;
-}
-.dialog {
-  background-color:#c3daf9;
-}
-.dialog .title {
-  background-image: url(button-background.png);
-}  
-.dialog button{
-  background-image: url(button-background.png);
-}
\ No newline at end of file
diff --git a/web/imcms/xinha/skins/xp-green/back.png b/web/imcms/xinha/skins/xp-green/back.png
deleted file mode 100644
index 0d0a7499af..0000000000
Binary files a/web/imcms/xinha/skins/xp-green/back.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-green/button-background.png b/web/imcms/xinha/skins/xp-green/button-background.png
deleted file mode 100644
index 81a4657080..0000000000
Binary files a/web/imcms/xinha/skins/xp-green/button-background.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-green/hover.png b/web/imcms/xinha/skins/xp-green/hover.png
deleted file mode 100644
index f55e355e39..0000000000
Binary files a/web/imcms/xinha/skins/xp-green/hover.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-green/selected.png b/web/imcms/xinha/skins/xp-green/selected.png
deleted file mode 100644
index c0c3339bc9..0000000000
Binary files a/web/imcms/xinha/skins/xp-green/selected.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-green/separator.png b/web/imcms/xinha/skins/xp-green/separator.png
deleted file mode 100644
index 18c5a57ba7..0000000000
Binary files a/web/imcms/xinha/skins/xp-green/separator.png and /dev/null differ
diff --git a/web/imcms/xinha/skins/xp-green/skin.css b/web/imcms/xinha/skins/xp-green/skin.css
deleted file mode 100644
index 9e4733c62c..0000000000
--- a/web/imcms/xinha/skins/xp-green/skin.css
+++ /dev/null
@@ -1,76 +0,0 @@
-.htmlarea .toolbar {
-  background-color:#f2f0e4;
-  background-image:url(back.png);
-  background-repeat:repeat-y;
-}
-.htmlarea .toolbarRow {
-  margin-top:2px;
-  margin-bottom:2px;
-  background-image:url(button-background.png);
-  height:25px;
-}
-.htmlarea .toolbar .button {
-  width:20px;
-  height:20px;
-  padding:1px;
-  border:none;
-  background-image:url(button-background.png);
-}
-.buttonImageContainer {
-  position:relative;
-  left:1px;
-  top:1px;
-}
-.htmlarea .toolbar .separator {
-  margin:0;
-  background-image:url(separator.png);
-  width:7px;
-  height:20px;
-  padding:0;
-}
-.separator {
-  border:none;
-}
-.htmlarea .toolbar a.button:hover {
-  border:1px solid #335500;
-  padding:0;
-  background-image:url(hover.png);
-}
-.htmlarea .toolbar .button.buttonPressed
-{
-  border:1px solid #335500;
-  padding:0;
-  background-image:url(selected.png);
-}
-.htmlarea .statusBar {
-  padding:0;
-  height:20px;
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#f2f0e4;
-  color:ButtonText;
-  font:11px helvetica,arial,sans-serif;
-}
-.htmlarea .statusBar .statusBarTree {
-  display:block;
-  margin:3px;
-}
-.htmlarea .statusBar .statusBarTree a {
-  padding:2px 5px;
-  color:#00f;
-  text-decoration:none;
-}
-.htmlarea .panel h1 {
-  background-image:url(button-background.png);
-  background-repeat:repeat-x;
-  background-color:#f2f0e4;
-}
-.dialog {
-  background-color:#f2f0e4;
-}
-.dialog .title {
-  background-image: url(button-background.png);
-}  
-.dialog button{
-  background-image: url(button-background.png);
-}
\ No newline at end of file
diff --git a/web/javascript/README b/web/javascript/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/jsp/README b/web/jsp/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/new_images/README b/web/new_images/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/user/README b/web/user/README
new file mode 100644
index 0000000000..e69de29bb2